diff --git a/.abf.yml b/.abf.yml index d9df2f7..ae39eb4 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,3 @@ sources: - "networkmanagement-0.9.0.2.tar.bz2": 58b530d0dc97cc742f24413a54c58f20318cfa14 - "networkmanagement-l10n.tar.bz2": e5a106283fd5ab2cc7ad7c01d646d286fc9c2c59 + "networkmanagement-0.9.0.4.tar.bz2": e6173bcf3c9bc96094ed43d436218675b76da333 + "networkmanagement-l10n.tar.bz2": 113dbde180d6d107daf8872d81bf58621568d42b diff --git a/knetworkmanager.spec b/knetworkmanager.spec index c8e92f8..6129ea2 100644 --- a/knetworkmanager.spec +++ b/knetworkmanager.spec @@ -13,8 +13,8 @@ Name: knetworkmanager Summary: KDE NetworkManager -Version: 0.9.0.2 -Release: 3 +Version: 0.9.0.4 +Release: 1 Epoch: 2 Group: Graphical desktop/KDE License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and LGPLv2 @@ -26,8 +26,8 @@ Source0: http://download.kde.org/unstable/networkmanagement/0.9.0.2/src/% Source1: networkmanagement-l10n.tar.bz2 Patch0: networkmanagement-0.9-useversion.patch Patch1: networkmanagement-0.9-compile-po-files.patch -Patch2: networkmanagement-0.9.0.2-applet.desktop.patch -Patch3: networkmanagement-0.9.0.2-kcm.desktop.patch +#Patch2: networkmanagement-0.9.0.2-applet.desktop.patch +#Patch3: networkmanagement-0.9.0.2-kcm.desktop.patch Patch4: networkmanagement-0.9.0.2-ui-fix.patch BuildRequires: pkgconfig(libnm-util) >= 0.9 BuildRequires: pkgconfig(libnm-glib) >= 0.9 @@ -339,7 +339,7 @@ Openconnect plugin for %name %prep -%setup -q -n %{srcname}-0.9.0.2 -a1 +%setup -q -n %{srcname}-%{version} -a1 %apply_patches %build diff --git a/networkmanagement-0.9.0.2-ui-fix.patch b/networkmanagement-0.9.0.2-ui-fix.patch index 9ccc39b..2c88753 100644 --- a/networkmanagement-0.9.0.2-ui-fix.patch +++ b/networkmanagement-0.9.0.2-ui-fix.patch @@ -1,6 +1,27 @@ -diff -Nuar networkmanagement-0.9.0.2/applet/nmpopup.cpp networkmanagement-0.9.0.2_new/applet/nmpopup.cpp ---- networkmanagement-0.9.0.2/applet/nmpopup.cpp 2012-05-07 20:16:57.000000000 +0400 -+++ networkmanagement-0.9.0.2_new/applet/nmpopup.cpp 2012-05-30 15:01:33.000000000 +0400 +diff -Nuar networkmanagement-0.9.0.2_old/applet/activatableitem.cpp networkmanagement-0.9.0.2/applet/activatableitem.cpp +--- networkmanagement-0.9.0.2_old/applet/activatableitem.cpp 2012-05-07 20:16:57.000000000 +0400 ++++ networkmanagement-0.9.0.2/applet/activatableitem.cpp 2012-06-26 16:27:34.000000000 +0400 +@@ -41,7 +41,7 @@ + + K_GLOBAL_STATIC_WITH_ARGS(KComponentData, s_networkManagementComponentData, ("networkmanagement", "networkmanagement", KComponentData::SkipMainComponentRegistration)) + static const int m_iconSize = 48; +-int rowHeight = qMax(30, QFontMetrics(KGlobalSettings::generalFont()).height()+10); ++int rowHeight = qMax(40, QFontMetrics(KGlobalSettings::generalFont()).height()+10); + int maxConnectionNameWidth = QFontMetrics(KGlobalSettings::generalFont()).width("12345678901234567890123"); + + ActivatableItem::ActivatableItem(RemoteActivatable *remote, QGraphicsItem * parent) : Plasma::IconWidget(parent), +@@ -139,7 +139,7 @@ + if (m_hasDefaultRoute) { + // TODO: this draws the pixmap behind the connection icon. This is the same + // problem described in a comment in networkmanager.cpp:NetworkManagerApplet::paintInterface. +- painter->drawPixmap(QRect(4,4,12,12), KIcon("network-defaultroute").pixmap(QSize(16,16))); ++ painter->drawPixmap(QRect(6,4,12,12), KIcon("network-defaultroute").pixmap(QSize(16,16))); + } + } + +diff -Nuar networkmanagement-0.9.0.2_old/applet/nmpopup.cpp networkmanagement-0.9.0.2/applet/nmpopup.cpp +--- networkmanagement-0.9.0.2_old/applet/nmpopup.cpp 2012-05-07 20:16:57.000000000 +0400 ++++ networkmanagement-0.9.0.2/applet/nmpopup.cpp 2012-06-26 11:38:38.000000000 +0400 @@ -39,6 +39,7 @@ // Plasma #include @@ -14,8 +35,8 @@ diff -Nuar networkmanagement-0.9.0.2/applet/nmpopup.cpp networkmanagement-0.9.0. // flight-mode checkbox m_networkingCheckBox = new Plasma::CheckBox(m_leftWidget); + QColor textC = Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor); -+ QString css = QString("QCheckBox { color: %1; border: none} " -+ "QCheckBox::hover { border: 1px solid #b4c9db}").arg(textC.name()); ++ QString css = QString("QCheckBox { color: %1; border: none; padding-left: 1px} " ++ "QCheckBox::hover { border: 1px solid #b4c9db; padding-left: 0px}").arg(textC.name()); + m_networkingCheckBox->setStyleSheet(css); m_networkingCheckBox->setText(i18nc("CheckBox to enable or disable networking completely", "Enable networking")); checkboxLayout->addItem(m_networkingCheckBox, 0, 0); @@ -36,3 +57,23 @@ diff -Nuar networkmanagement-0.9.0.2/applet/nmpopup.cpp networkmanagement-0.9.0. checkboxLayout->addItem(m_wifiCheckBox, 1, 0); connect(m_wifiCheckBox, SIGNAL(toggled(bool)), SLOT(wirelessEnabledToggled(bool))); +diff -Nuar networkmanagement-0.9.0.2_old/applet/wirelessnetworkitem.cpp networkmanagement-0.9.0.2/applet/wirelessnetworkitem.cpp +--- networkmanagement-0.9.0.2_old/applet/wirelessnetworkitem.cpp 2012-05-07 20:16:57.000000000 +0400 ++++ networkmanagement-0.9.0.2/applet/wirelessnetworkitem.cpp 2012-06-26 16:56:08.000000000 +0400 +@@ -84,7 +84,7 @@ + // First, third and fourth colunm are fixed width for the icons + m_layout->setColumnPreferredWidth(0, 150); + m_layout->setColumnFixedWidth(2, 60); +- m_layout->setColumnFixedWidth(3, rowHeight); ++ m_layout->setColumnFixedWidth(3, rowHeight-20); + m_layout->setColumnSpacing(2, spacing); + + // icon on the left +@@ -137,7 +137,6 @@ + m_securityIcon->nativeWidget()->setPixmap(KIcon(m_wirelessStatus->securityIcon()).pixmap(22,22)); + m_securityIcon->setToolTip(m_wirelessStatus->securityTooltip()); + m_layout->addItem(m_securityIcon, 0, 3, 1, 1, Qt::AlignVCenter | Qt::AlignRight); +- + connect(this, SIGNAL(clicked()), this, SLOT(emitClicked())); + + // Forward clicks and presses between our widgets and this