Hello community,
here is the log from the commit of package NetworkManager-kde4 for openSUSE:Factory
checked in at Wed Jun 10 14:51:15 CEST 2009.
--------
--- KDE/NetworkManager-kde4/NetworkManager-kde4.changes 2009-06-04 17:55:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/NetworkManager-kde4/NetworkManager-kde4.changes 2009-06-05 08:05:26.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Jun 5 08:02:33 CEST 2009 - tittiatcoke@gmail.com
+
+- Update to svn977685
+ + Change labels to Wired vs Wireless
+ + Fix showing up of VPN
+ + Don't block too much on startup. The plasmoid has held up starting up
+ Plasma for a bit. We're now only adding networkinterfaces after a bit
+ of waiting so things can settle down a bit
+
+-------------------------------------------------------------------
@@ -6,0 +17,20 @@
+Sun May 31 10:07:38 CEST 2009 - tittiatcoke@gmail.com
+
+- update to r975779
+ + Make clear that "Connect to hidden network" is a clickable item and set its height so that matches lineedit's, fixing a visual glitch
+
+-------------------------------------------------------------------
+Fri May 29 20:14:44 CEST 2009 - tittiatcoke@gmail.com
+
+- Update to r974487
+ + Don't crash when we rfkill
+ + Improved display of accesspoint
+
+-------------------------------------------------------------------
+Sat May 23 21:22:47 CEST 2009 - tittiatcoke@gmail.com
+
+- Update to r971920
+ + make Passphrase default (seems more common than hex)
+ + make sure only one of the hex/passphrase labels is shown in the wepwidget ctor
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-kde4.spec ++++++
--- /var/tmp/diff_new_pack.U16053/_old 2009-06-10 14:50:36.000000000 +0200
+++ /var/tmp/diff_new_pack.U16053/_new 2009-06-10 14:50:36.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package NetworkManager-kde4 (Version 0.7.svn970012)
+# spec file for package NetworkManager-kde4 (Version 0.7.svn977685)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,7 +20,7 @@
Name: NetworkManager-kde4
BuildRequires: NetworkManager-devel kdebase4-workspace-devel
-Version: 0.7.svn970012
+Version: 0.7.svn977685
Release: 1
License: GPL v2 or later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -148,8 +148,26 @@
%{_datadir}/kde4/services/networkmanagement_vpncui.desktop
%changelog
+* Fri Jun 05 2009 tittiatcoke@gmail.com
+- Update to svn977685
+ + Change labels to Wired vs Wireless
+ + Fix showing up of VPN
+ + Don't block too much on startup. The plasmoid has held up starting up
+ Plasma for a bit. We're now only adding networkinterfaces after a bit
+ of waiting so things can settle down a bit
* Thu Jun 04 2009 wstephenson@suse.de
- Fix file list conflicts
+* Sun May 31 2009 tittiatcoke@gmail.com
+- update to r975779
+ + Make clear that "Connect to hidden network" is a clickable item and set its height so that matches lineedit's, fixing a visual glitch
+* Fri May 29 2009 tittiatcoke@gmail.com
+- Update to r974487
+ + Don't crash when we rfkill
+ + Improved display of accesspoint
+* Sat May 23 2009 tittiatcoke@gmail.com
+- Update to r971920
+ + make Passphrase default (seems more common than hex)
+ + make sure only one of the hex/passphrase labels is shown in the wepwidget ctor
* Wed May 20 2009 tittiatcoke@gmail.com
- Update to r970021
+ Show the correct last used time in the KCM
++++++ networkmanager.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/applet/connectionlist.cpp new/networkmanager/applet/connectionlist.cpp
--- old/networkmanager/applet/connectionlist.cpp 2009-05-03 19:05:35.000000000 +0200
+++ new/networkmanager/applet/connectionlist.cpp 2009-06-05 07:58:31.000000000 +0200
@@ -21,19 +21,29 @@
#include "connectionlist.h"
#include
-#include <KDebug>
+
+
#include <QGraphicsLinearLayout>
+
+#include
+#include <KDebug>
+
#include "connectionitem.h"
#include "networkmanagersettings.h"
#include "remoteconnection.h"
-ConnectionList::ConnectionList(NetworkManagerSettings * userSettings, NetworkManagerSettings * systemSettings, QGraphicsWidget * parent)
-: QGraphicsWidget(parent), m_userSettings(userSettings), m_systemSettings(systemSettings), m_layout(new QGraphicsLinearLayout(Qt::Vertical, this)), m_connectionLayout(new QGraphicsLinearLayout(Qt::Vertical))
+ConnectionList::ConnectionList(NetworkManagerSettings * userSettings,
+ NetworkManagerSettings * systemSettings, Plasma::Extender * ext)
+ : Plasma::ExtenderItem(ext), m_userSettings(userSettings), m_systemSettings(systemSettings),
+ m_connectionLayout(new QGraphicsLinearLayout(Qt::Vertical))
{
+ m_widget = new QGraphicsWidget(this);
+ m_layout = new QGraphicsLinearLayout(Qt::Vertical, m_widget);
m_layout->addItem(m_connectionLayout);
- setLayout(m_layout);
+ m_widget->setLayout(m_layout);
+ setWidget(m_widget);
}
ConnectionList::~ConnectionList()
@@ -52,6 +62,11 @@
m_layout->addStretch(5);
}
+QGraphicsItem * ConnectionList::widget()
+{
+ return m_widget;
+}
+
void ConnectionList::addSettingsService(NetworkManagerSettings * service)
{
connect(service, SIGNAL(connectionAdded(NetworkManagerSettings *, const QString&)), SLOT(connectionAddedToService(NetworkManagerSettings *, const QString&)));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/applet/connectionlist.h new/networkmanager/applet/connectionlist.h
--- old/networkmanager/applet/connectionlist.h 2009-02-25 18:57:16.000000000 +0100
+++ new/networkmanager/applet/connectionlist.h 2009-06-05 07:58:31.000000000 +0200
@@ -25,6 +25,9 @@
#include <QHash>
#include <QPair>
+#include
+#include
+
class AbstractConnectableItem;
class NetworkManagerSettings;
class QGraphicsLinearLayout;
@@ -34,11 +37,11 @@
typedef QPair QStringPair;
typedef QHash ServiceConnectionHash;
-class ConnectionList : public QGraphicsWidget
+class ConnectionList : public Plasma::ExtenderItem
{
Q_OBJECT
public:
- ConnectionList(NetworkManagerSettings * userSettings, NetworkManagerSettings * systemSettings, QGraphicsWidget * parent = 0);
+ ConnectionList(NetworkManagerSettings * userSettings, NetworkManagerSettings * systemSettings, Plasma::Extender * ext = 0);
virtual ~ConnectionList();
void init(); // fill connection list, after ctor has run so subclasses are initialised
@@ -54,6 +57,7 @@
virtual void setupFooter() = 0; // puts the interfaceitems at the top if needed
virtual bool accept(RemoteConnection *) const = 0; // do type specific checks
virtual ConnectionItem * createItem(RemoteConnection * conn); // instantiate type-specific connectionitem
+ virtual QGraphicsItem * widget();
bool isEmpty();
public Q_SLOTS:
@@ -79,6 +83,7 @@
NetworkManagerSettings * m_userSettings;
NetworkManagerSettings * m_systemSettings;
QGraphicsLinearLayout * m_layout;
+ QGraphicsWidget * m_widget;
// list of connection objects for this interface type
ServiceConnectionHash m_connections;
private:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/applet/hiddenwirelessnetworkitem.cpp new/networkmanager/applet/hiddenwirelessnetworkitem.cpp
--- old/networkmanager/applet/hiddenwirelessnetworkitem.cpp 2009-05-13 19:22:34.000000000 +0200
+++ new/networkmanager/applet/hiddenwirelessnetworkitem.cpp 2009-05-31 09:57:43.000000000 +0200
@@ -72,8 +72,12 @@
void HiddenWirelessNetworkItem::setupItem()
{
if (!m_layout) {
+ int rowHeight = 24;
+
m_layout = new QGraphicsLinearLayout(this);
m_connect = new Plasma::IconWidget(this);
+ m_connect->setDrawBackground(true);
+ m_connect->setMaximumHeight(rowHeight);
m_connect->setText(i18nc("label for creating a connection to a hidden wireless network", "Connect to hidden network"));
m_layout->addItem(m_connect);
connect(m_connect, SIGNAL(activated()), SLOT(connectClicked()));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/applet/interfacegroup.cpp new/networkmanager/applet/interfacegroup.cpp
--- old/networkmanager/applet/interfacegroup.cpp 2009-05-19 18:21:15.000000000 +0200
+++ new/networkmanager/applet/interfacegroup.cpp 2009-06-05 07:58:31.000000000 +0200
@@ -61,13 +61,13 @@
InterfaceGroup::InterfaceGroup(Solid::Control::NetworkInterface::Type type,
NetworkManagerSettings * userSettings,
NetworkManagerSettings * systemSettings,
- QGraphicsWidget * parent)
- : ConnectionList(userSettings, systemSettings, parent), m_type(type),
- m_wirelessInspector(0),
- m_wirelessEnvironment(new WirelessEnvironmentMerged(this)),
+ Plasma::Extender * ext)
+ : ConnectionList(userSettings, systemSettings, ext), m_type(type),
m_interfaceLayout(new QGraphicsLinearLayout(Qt::Vertical)),
m_networkLayout(new QGraphicsLinearLayout(Qt::Vertical)),
- m_numberOfWlans( 1 )
+ m_numberOfWlans( 4 ),
+ m_wirelessInspector(0),
+ m_wirelessEnvironment(new WirelessEnvironmentMerged(this))
{
if (m_type == Solid::Control::NetworkInterface::Ieee80211) {
m_enabled = Solid::Control::NetworkManager::isWirelessEnabled();
@@ -88,6 +88,7 @@
if (m_type == Solid::Control::NetworkInterface::Gsm) {
setMinimumSize(QSize(285, 60)); // WTF?
}
+ init();
}
InterfaceGroup::~InterfaceGroup()
@@ -106,6 +107,7 @@
void InterfaceGroup::setupHeader()
{
+ kDebug() << "setupHeader ===========================================";
m_layout->insertItem(0, m_interfaceLayout);
// create an interfaceItem for each interface of our type
foreach (Solid::Control::NetworkInterface * iface, Solid::Control::NetworkManager::networkInterfaces()) {
@@ -123,7 +125,6 @@
if (m_interfaces.count() == 0) {
hide();
}
- setLayout(m_layout);
}
void InterfaceGroup::setupFooter()
@@ -202,7 +203,8 @@
m_networkLayout->updateGeometry();
m_interfaceLayout->updateGeometry();
m_layout->updateGeometry();
-
+ updateGeometry();
+ emit updateLayout();
}
void InterfaceGroup::setNetworksLimit( int wlans )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/applet/interfacegroup.h new/networkmanager/applet/interfacegroup.h
--- old/networkmanager/applet/interfacegroup.h 2009-05-11 19:07:49.000000000 +0200
+++ new/networkmanager/applet/interfacegroup.h 2009-06-05 07:58:31.000000000 +0200
@@ -23,6 +23,8 @@
#include "connectionlist.h"
+#include
+
#include
#include
@@ -42,7 +44,7 @@
{
Q_OBJECT
public:
- InterfaceGroup(Solid::Control::NetworkInterface::Type type, NetworkManagerSettings * userSettings, NetworkManagerSettings * systemSettings, QGraphicsWidget * parent = 0);
+ InterfaceGroup(Solid::Control::NetworkInterface::Type type, NetworkManagerSettings * userSettings, NetworkManagerSettings * systemSettings, Plasma::Extender * ext = 0);
virtual ~InterfaceGroup();
Solid::Control::NetworkInterface::Type interfaceType() const;
bool accept(RemoteConnection *) const;
@@ -82,11 +84,11 @@
QHash m_networks;
HiddenWirelessNetworkItem * m_hiddenItem;
Solid::Control::NetworkInterface::Type m_type;
- WirelessEnvironmentMerged * m_wirelessEnvironment;
QGraphicsLinearLayout * m_interfaceLayout;
QGraphicsLinearLayout * m_networkLayout;
bool m_enabled;
int m_numberOfWlans;
WirelessConnectionInspector * m_wirelessInspector;
+ WirelessEnvironmentMerged * m_wirelessEnvironment;
};
#endif // INTERFACEGROUP_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/applet/networkmanager.cpp new/networkmanager/applet/networkmanager.cpp
--- old/networkmanager/applet/networkmanager.cpp 2009-05-18 19:39:57.000000000 +0200
+++ new/networkmanager/applet/networkmanager.cpp 2009-06-05 07:58:31.000000000 +0200
@@ -133,12 +133,12 @@
// Set up the extender with its various groups. The first call to extender() triggers calls to
// initExtenderItem() if there are any detached items.
- extender()->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+ //extender()->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
- // calling this initialises the extenderitems
- networkInterfaceAdded(QString());
+ // Give Plasma some time to start up before we add the network interfaces, we don't want to block
+ // the startup with all the setting up of Extenders and connection items
+ QTimer::singleShot(2000, this, SLOT(networkInterfaceAdded()));
// add VPN and General Settings last
- showVpn(cg.readEntry("showVpn", true));
showGeneral(true);
QObject::connect(Solid::Control::NetworkManager::notifier(), SIGNAL(statusChanged(Solid::Networking::Status)),
this, SLOT(managerStatusChanged(Solid::Networking::Status)));
@@ -147,6 +147,7 @@
void NetworkManagerApplet::initExtenderItem(Plasma::ExtenderItem * eItem)
{
+ return;
const QString WIRED_EXTENDER_ITEM_NAME = QLatin1String("wired");
const QString WIRELESS_EXTENDER_ITEM_NAME = QLatin1String("wireless");
const QString GSM_EXTENDER_ITEM_NAME = QLatin1String("gsm");
@@ -155,37 +156,13 @@
const QString GENERAL_EXTENDER_ITEM_NAME = QLatin1String("general");
if (eItem->name() == WIRED_EXTENDER_ITEM_NAME) {
- InterfaceGroup * ethernetGroup = new InterfaceGroup(Solid::Control::NetworkInterface::Ieee8023, m_userSettings, m_systemSettings, eItem);
- ethernetGroup->setObjectName("ethernet-interface-group");
- ethernetGroup->init();
- eItem->setWidget(ethernetGroup);
+ showWired(true);
} else if (eItem->name() == WIRELESS_EXTENDER_ITEM_NAME) {
- m_wifiGroup = new InterfaceGroup(Solid::Control::NetworkInterface::Ieee80211, m_userSettings, m_systemSettings, eItem);
- m_wifiGroup->setObjectName("wifi-interface-group");
- m_wifiGroup->init();
- KConfigGroup cg = config();
- m_numberWirelessShown = cg.readEntry("numberOfWlans", 4);
- m_wifiGroup->setNetworksLimit( m_numberWirelessShown );
-
- eItem->setWidget(m_wifiGroup);
- } else if (eItem->name() == GSM_EXTENDER_ITEM_NAME) {
- InterfaceGroup * gsmGroup = new InterfaceGroup(Solid::Control::NetworkInterface::Gsm, m_userSettings, m_systemSettings, eItem);
- gsmGroup->setObjectName("gsm-interface-group");
- gsmGroup->init();
-
- eItem->setWidget(gsmGroup);
- } else if (eItem->name() == CDMA_EXTENDER_ITEM_NAME) {
- InterfaceGroup * cdmaGroup = new InterfaceGroup(Solid::Control::NetworkInterface::Cdma, m_userSettings, m_systemSettings, eItem);
- cdmaGroup->setObjectName("cdma-interface-group");
- cdmaGroup->init();
-
- eItem->setWidget(cdmaGroup);
+ showWireless(true);
+ } else if (eItem->name() == CDMA_EXTENDER_ITEM_NAME || eItem->name() == GSM_EXTENDER_ITEM_NAME) {
+ showCellular(true);
} else if (eItem->name() == VPN_EXTENDER_ITEM_NAME) {
- VpnConnectionGroup * vpnGroup = new VpnConnectionGroup(m_userSettings, m_systemSettings, eItem);
- vpnGroup->setObjectName("vpn-interface-group");
- vpnGroup->init();
- eItem->setWidget(vpnGroup);
- connect(vpnGroup, SIGNAL(hideClicked()), SLOT(hideVpnGroup()));
+ showVpn(true);
} else if (eItem->name() == GENERAL_EXTENDER_ITEM_NAME) {
GeneralExtender* item = dynamic_cast(eItem);
if (item) {
@@ -193,6 +170,7 @@
}
} else {
kDebug() << "Unrecognised extender name! Is the config from the future?";
+ //eItem->init();
}
}
@@ -396,9 +374,11 @@
KConfigGroup cg = config();
showWired(cg.readEntry("showWired", true));
showWireless(cg.readEntry("showWireless", true));
+ showVpn(cg.readEntry("showVpn", true));
//showPppoe(cg.readEntry("showPppoe", true));
showCellular(cg.readEntry("showCellular", true));
//showCdma(cg.readEntry("showCdma", true));
+ //showGeneral(true);
interfaceConnectionStateChanged();
update();
@@ -724,40 +704,41 @@
hidePopup();
}
-void NetworkManagerApplet::showWired(bool show)
+void NetworkManagerApplet::showGeneral(bool show)
{
- m_showWired = show;
- Plasma::ExtenderItem *eItem = extender()->item("wired");
- if (show && hasInterfaceOfType(Solid::Control::NetworkInterface::Ieee8023)) {
- if (!eItem) {
- kDebug() << "SHOWING";
- eItem = new Plasma::ExtenderItem(extender());
- eItem->setName("wired");
- eItem->setIcon("network-wired");
- eItem->setTitle(i18nc("Label for ethernet group in popup","Ethernet"));
- initExtenderItem(eItem);
+ m_showGeneral = show;
+ Plasma::ExtenderItem *eItem = extender()->item("general");
+ if (show) {
+ if (eItem) {
+ eItem->destroy(); // Apparently, we need to "refresh the extenderitem
}
+ GeneralExtender * eItem = new GeneralExtender(extender());
+ eItem->graphicsWidget();
+ //initExtenderItem(eItem);
} else {
if (eItem) {
- kDebug() << "HIDING";
+ kDebug() << "Hiding General Settings extender";
eItem->destroy();
}
}
}
-void NetworkManagerApplet::showGeneral(bool show)
+void NetworkManagerApplet::showWired(bool show)
{
- m_showGeneral = show;
- Plasma::ExtenderItem *eItem = extender()->item("general");
- if (show) {
+ m_showWired = show;
+ Plasma::ExtenderItem *eItem = extender()->item("wired");
+ if (show && hasInterfaceOfType(Solid::Control::NetworkInterface::Ieee8023)) {
if (eItem) {
- eItem->destroy(); // Apparently, we need to "refresh the extenderitem
+ eItem->destroy();
}
- eItem = new GeneralExtender(extender());
- initExtenderItem(eItem);
+ kDebug() << "SHOWING";
+ InterfaceGroup * eItem = new InterfaceGroup(Solid::Control::NetworkInterface::Ieee8023, m_userSettings, m_systemSettings, extender());
+ eItem->setName("wired");
+ eItem->setIcon("network-wired");
+ eItem->setTitle(i18nc("Label for ethernet group in popup","Wired Networking"));
} else {
if (eItem) {
- kDebug() << "Hiding General Settings extender";
+ kDebug() << "HIDING";
eItem->destroy();
}
}
@@ -768,17 +749,17 @@
m_showWireless = show;
Plasma::ExtenderItem *eItem = extender()->item("wireless");
if (show && hasInterfaceOfType(Solid::Control::NetworkInterface::Ieee80211)) {
- if (!eItem) {
- kDebug() << "SHOWING";
- eItem = new Plasma::ExtenderItem(extender());
- eItem->setName("wireless");
- eItem->setIcon("network-wireless");
- eItem->setTitle(i18nc("Label for wifi networks in popup","Wireless"));
- initExtenderItem(eItem);
+ if (eItem) {
+ eItem->destroy();
}
+ kDebug() << "Showing wireless";
+ InterfaceGroup *eItem = new InterfaceGroup(Solid::Control::NetworkInterface::Ieee80211, m_userSettings, m_systemSettings, extender());
+ eItem->setName("wireless");
+ eItem->setIcon("network-wireless");
+ eItem->setTitle(i18nc("Label for wifi networks in popup","Wireless Networking"));
} else {
if (eItem) {
- kDebug() << "HIDING";
+ kDebug() << "Hiding wireless";
eItem->destroy();
}
}
@@ -789,14 +770,15 @@
m_showVpn = show;
Plasma::ExtenderItem *eItem = extender()->item("vpn");
if (show) {
- if (!eItem) {
- kDebug() << "SHOWING";
- eItem = new Plasma::ExtenderItem(extender());
- eItem->setName("vpn");
- eItem->setIcon("network-server");
- eItem->setTitle(i18nc("Label for vpn connections in popup","VPN Connections"));
- initExtenderItem(eItem);
+ if (eItem) {
+ eItem->destroy();
}
+ kDebug() << "SHOWING";
+ VpnConnectionGroup * eItem = new VpnConnectionGroup(m_userSettings, m_systemSettings, extender());
+ eItem->setName("vpn");
+ eItem->setIcon("network-server");
+ eItem->setTitle(i18nc("Label for vpn connections in popup","VPN Connections"));
+ connect(eItem, SIGNAL(hideClicked()), SLOT(hideVpnGroup()));
} else {
if (eItem) {
kDebug() << "HIDING";
@@ -811,7 +793,7 @@
Plasma::ExtenderItem *gsmItem = extender()->item("gsm");
if (show && hasInterfaceOfType(Solid::Control::NetworkInterface::Gsm)) {
if (!gsmItem) {
- gsmItem = new Plasma::ExtenderItem(extender());
+ InterfaceGroup * gsmItem = new InterfaceGroup(Solid::Control::NetworkInterface::Gsm, m_userSettings, m_systemSettings, extender());
gsmItem->setName("gsm");
gsmItem->setIcon("phone");
gsmItem->setTitle(i18nc("Label for mobile broadband (GSM/CDMA/UMTS/HDSPA etc)","Mobile Broadband"));
@@ -825,7 +807,7 @@
Plasma::ExtenderItem *cdmaItem = extender()->item("cdma");
if (show && hasInterfaceOfType(Solid::Control::NetworkInterface::Cdma)) {
if (!cdmaItem) {
- cdmaItem = new Plasma::ExtenderItem(extender());
+ InterfaceGroup * cdmaItem = new InterfaceGroup(Solid::Control::NetworkInterface::Cdma, m_userSettings, m_systemSettings, extender());
cdmaItem->setName("cdma");
cdmaItem->setIcon("phone");
cdmaItem->setTitle(i18nc("Label for mobile broadband (GSM/CDMA/UMTS/HDSPA etc)","Mobile Broadband"));
@@ -907,6 +889,7 @@
{
// Notify the wireless extender of popup events so it can revert its hidden wireless network
// item to button mode
+ return;
Plasma::ExtenderItem *eItem = extender()->item("wireless");
if (eItem) {
InterfaceGroup * wireless = static_cast(eItem->widget());
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/applet/networkmanager.h new/networkmanager/applet/networkmanager.h
--- old/networkmanager/applet/networkmanager.h 2009-05-18 19:39:57.000000000 +0200
+++ new/networkmanager/applet/networkmanager.h 2009-06-05 07:58:31.000000000 +0200
@@ -128,7 +128,7 @@
//void manageConnections();
public Q_SLOTS:
-
+
protected Q_SLOTS:
// called by Plasma::ToolTipManager
void toolTipAboutToShow();
@@ -140,7 +140,7 @@
*/
void popupEvent(bool);
private Q_SLOTS:
- void networkInterfaceAdded(const QString&);
+ void networkInterfaceAdded(const QString& = QString());
void networkInterfaceRemoved(const QString&);
void interfaceConnectionStateChanged();
void manageConnections();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/applet/plasma-applet-networkmanagement.desktop new/networkmanager/applet/plasma-applet-networkmanagement.desktop
--- old/networkmanager/applet/plasma-applet-networkmanagement.desktop 2009-05-11 23:38:09.000000000 +0200
+++ new/networkmanager/applet/plasma-applet-networkmanagement.desktop 2009-06-02 16:03:09.000000000 +0200
@@ -5,6 +5,7 @@
Name[fr]=Gestion du réseau
Name[ga]=Bainisteoireacht an Líonra
Name[gl]=Xestión da rede
+Name[km]=ការគ្រប់គ្រងបណ្ដាញ
Name[pt]=Gestão de Rede
Name[pt_BR]=Gestão de Rede
Name[sv]=Nätverkshantering
@@ -16,6 +17,7 @@
Comment[et]=Võrgu oleku ja juhtimise tööriist
Comment[fr]=Outil présentant le statut du réseau et permettant son contrôle
Comment[gl]=Utensilio de estado e control da rede
+Comment[km]=ស្ថានភាពបណ្ដាញ និងការត្រួតពិនិត្យឧបករណ៍
Comment[pt]=Utilitário de estado e controlo da rede
Comment[pt_BR]=Utilitário de estado e controlo da rede
Comment[sv]=Verktyg för nätverksstatus och kontroll
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/applet/vpnconnectiongroup.cpp new/networkmanager/applet/vpnconnectiongroup.cpp
--- old/networkmanager/applet/vpnconnectiongroup.cpp 2009-02-25 18:57:16.000000000 +0100
+++ new/networkmanager/applet/vpnconnectiongroup.cpp 2009-06-05 07:58:31.000000000 +0200
@@ -36,12 +36,13 @@
#include "nm-setting-vpn.h"
#include "remoteconnection.h"
-VpnConnectionGroup::VpnConnectionGroup(NetworkManagerSettings * userSettings, NetworkManagerSettings * systemSettings, QGraphicsWidget * parent)
- : ConnectionList(userSettings, systemSettings, parent), m_hideButton(0)
+VpnConnectionGroup::VpnConnectionGroup(NetworkManagerSettings * userSettings, NetworkManagerSettings * systemSettings, Plasma::Extender * ext)
+ : ConnectionList(userSettings, systemSettings, ext), m_hideButton(0)
{
setPreferredSize(QSize(285, 60));
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
connect(this, SIGNAL(connectionListUpdated()), SLOT(connectionListChanged()));
+ init();
}
VpnConnectionGroup::~VpnConnectionGroup()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/applet/vpnconnectiongroup.h new/networkmanager/applet/vpnconnectiongroup.h
--- old/networkmanager/applet/vpnconnectiongroup.h 2009-02-25 18:57:16.000000000 +0100
+++ new/networkmanager/applet/vpnconnectiongroup.h 2009-06-05 07:58:31.000000000 +0200
@@ -33,7 +33,7 @@
{
Q_OBJECT
public:
- VpnConnectionGroup(NetworkManagerSettings * userSettings, NetworkManagerSettings * systemSettings, QGraphicsWidget * parent = 0);
+ VpnConnectionGroup(NetworkManagerSettings * userSettings, NetworkManagerSettings * systemSettings, Plasma::Extender * ext = 0);
virtual ~VpnConnectionGroup();
void setupHeader();
void setupFooter();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/applet/wirelessconnectionitem.cpp new/networkmanager/applet/wirelessconnectionitem.cpp
--- old/networkmanager/applet/wirelessconnectionitem.cpp 2009-05-02 18:24:04.000000000 +0200
+++ new/networkmanager/applet/wirelessconnectionitem.cpp 2009-05-29 20:07:15.000000000 +0200
@@ -39,14 +39,15 @@
#include "wirelessnetwork.h"
WirelessConnectionItem::WirelessConnectionItem(RemoteConnection * conn, QGraphicsItem * parent)
-: ConnectionItem(conn, parent), m_connection(conn), m_wirelessNetwork(0), m_strengthMeter(0), m_securityIcon(0), m_strength(0)
+: ConnectionItem(conn, parent), m_connectButton(0),m_connection(conn),
+ m_wirelessNetwork(0), m_strengthMeter(0), m_securityIcon(0), m_strength(0)
{
}
void WirelessConnectionItem::setupItem()
{
readSettings();
- QString ssid = m_connection->id();
+ m_ssid = m_connection->id();
kDebug() << "Connection Settings:" << m_connection->settings();
kDebug() << "Security:" << m_connection->type() << m_security;
// painting of a non-active wifi network
@@ -69,7 +70,12 @@
m_connectButton = new Plasma::IconWidget(this);
m_connectButton->setDrawBackground(true);
m_connectButton->setIcon("network-wireless");
- m_connectButton->setText(ssid);
+ if (!m_ssid.isEmpty()) {
+ m_connectButton->setText(m_ssid);
+ } else {
+ m_connectButton->setText(i18n("Unknown Network"));
+ }
+
m_connectButton->setMinimumWidth(160);
m_connectButton->setMinimumHeight(rowHeight);
m_connectButton->setMaximumHeight(rowHeight);
@@ -111,7 +117,10 @@
return;
}
m_wirelessNetwork = network;
- setStrength(network->ssid(), network->strength());
+ QString ssid = network->ssid();
+ if (m_connectButton && !ssid.isEmpty() && ssid != m_ssid) {
+ m_connectButton->setText(ssid);
+ }
connect(m_wirelessNetwork, SIGNAL(strengthChanged(const QString&, int)), SLOT(setStrength(const QString&, int)));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/applet/wirelessconnectionitem.h new/networkmanager/applet/wirelessconnectionitem.h
--- old/networkmanager/applet/wirelessconnectionitem.h 2009-05-02 18:24:04.000000000 +0200
+++ new/networkmanager/applet/wirelessconnectionitem.h 2009-05-29 20:07:15.000000000 +0200
@@ -23,6 +23,8 @@
#include <QGraphicsWidget>
+#include
+
#include "connectionitem.h"
@@ -31,7 +33,6 @@
namespace Plasma
{
- class IconWidget;
class Meter;
}
@@ -59,6 +60,7 @@
QString m_security;
QString m_securityIconName;
QString m_securityIconToolTip;
+ Plasma::IconWidget * m_connectButton;
QString m_ssid;
int m_strength;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/applet/wirelessinterfaceitem.cpp new/networkmanager/applet/wirelessinterfaceitem.cpp
--- old/networkmanager/applet/wirelessinterfaceitem.cpp 2009-05-07 20:49:48.000000000 +0200
+++ new/networkmanager/applet/wirelessinterfaceitem.cpp 2009-05-29 20:07:15.000000000 +0200
@@ -64,6 +64,7 @@
// this is not called when the device is deactivated..
if (m_activeAccessPoint) {
m_activeAccessPoint->disconnect(this);
+ m_activeAccessPoint = 0;
}
if (uni != "/") {
m_activeAccessPoint = m_wirelessIface->findAccessPoint(uni);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/applet/wirelessnetworkitem.cpp new/networkmanager/applet/wirelessnetworkitem.cpp
--- old/networkmanager/applet/wirelessnetworkitem.cpp 2009-05-11 19:07:49.000000000 +0200
+++ new/networkmanager/applet/wirelessnetworkitem.cpp 2009-05-29 20:07:15.000000000 +0200
@@ -97,7 +97,6 @@
|icon essid |meter|sec|
+----+-------------+-----+---+
*/
- QString ssid = m_ssid;
int rowHeight = 24;
int spacing = 4;
@@ -112,7 +111,7 @@
m_connectButton = new Plasma::IconWidget(this);
m_connectButton->setDrawBackground(true);
m_connectButton->setIcon("network-wireless");
- m_connectButton->setText(ssid);
+ m_connectButton->setText(m_ssid);
m_connectButton->setMinimumWidth(160);
m_connectButton->setOrientation(Qt::Horizontal);
#if KDE_IS_VERSION(4,2,60)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/libs/dbus/networkmanagersettings.cpp new/networkmanager/libs/dbus/networkmanagersettings.cpp
--- old/networkmanager/libs/dbus/networkmanagersettings.cpp 2009-02-25 18:57:17.000000000 +0100
+++ new/networkmanager/libs/dbus/networkmanagersettings.cpp 2009-06-05 07:58:31.000000000 +0200
@@ -31,7 +31,7 @@
QLatin1String(NM_DBUS_PATH_SETTINGS),
QDBusConnection::systemBus(), parent)
{
- kDebug() << service << isValid();
+ //kDebug() << service << isValid();
if (isValid())
{
initConnections();
@@ -48,9 +48,9 @@
{
QList<QDBusObjectPath> userConnections = ListConnections();
foreach (QDBusObjectPath op, userConnections) {
- kDebug() << op.path();
+ //kDebug() << op.path();
if (m_connections.contains(op.path())) {
- kDebug() << "Service" << service() << "is reporting the same connection more than once in ListConnections!";
+ //kDebug() << "Service" << service() << "is reporting the same connection more than once in ListConnections!";
} else {
RemoteConnection * connectionIface = new RemoteConnection(service(), op.path(), this);
makeConnections(connectionIface);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/libs/dbus/remoteconnection.cpp new/networkmanager/libs/dbus/remoteconnection.cpp
--- old/networkmanager/libs/dbus/remoteconnection.cpp 2009-02-25 18:57:17.000000000 +0100
+++ new/networkmanager/libs/dbus/remoteconnection.cpp 2009-06-05 07:58:31.000000000 +0200
@@ -58,7 +58,7 @@
if (connectionSetting.contains(QLatin1String(NM_SETTING_CONNECTION_TYPE))) {
nmType = connectionSetting.value(QLatin1String(NM_SETTING_CONNECTION_TYPE)).toString();
}
- kDebug() << nmType;
+ //kDebug() << nmType;
if (nmType == QLatin1String(NM_SETTING_CDMA_SETTING_NAME)) {
m_type = Solid::Control::NetworkInterface::Cdma;
} else if (nmType == QLatin1String(NM_SETTING_GSM_SETTING_NAME)) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/libs/ui/networkmanagement_vpnuiplugin.desktop new/networkmanager/libs/ui/networkmanagement_vpnuiplugin.desktop
--- old/networkmanager/libs/ui/networkmanagement_vpnuiplugin.desktop 2009-05-11 23:38:09.000000000 +0200
+++ new/networkmanager/libs/ui/networkmanagement_vpnuiplugin.desktop 2009-06-02 16:03:09.000000000 +0200
@@ -6,6 +6,7 @@
Name[et]=Võrguhalduri VPN-i UI plugin
Name[fr]=Module d'interface graphique pour le gestionnaire de VPN
Name[gl]=Extensión de GUI VPN para a xestión da rede
+Name[km]=កម្មវិធីជំនួយចំណុចប្រទាក់អ្នកប្រើ VPN គ្រប់គ្រងបណ្ដាញ
Name[pt]='Plugin' de Interface VPN da Gestão de Rede
Name[pt_BR]=Plug-in de interface do gerenciamento de redes VPN
Name[sv]=Insticksprogram till nätverkshantering med VPN-användargränssnitt
@@ -17,6 +18,7 @@
Comment[et]=Võrguhalduri UI pluginate määratlus
Comment[fr]=Défini les modules d'interface graphique pour l'outil de gestion réseau de KDE
Comment[gl]=Define extensión de UI para a xestión da rede
+Comment[km]=កំណត់កម្មវិធីជំនួយចំណុចប្រទាក់អ្នកប្រើគ្រប់គ្រងបណ្ដាញរបស់ KDE
Comment[pt]=Define os 'plugins' de interface da Gestão de Rede
Comment[pt_BR]=Define os plug-ins de interface do gerenciamento de redes VPN
Comment[sv]=Definierar insticksprogram för KDE:s nätverkshantering
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/libs/ui/security/802_11_wireless_security_widget.cpp new/networkmanager/libs/ui/security/802_11_wireless_security_widget.cpp
--- old/networkmanager/libs/ui/security/802_11_wireless_security_widget.cpp 2009-02-25 18:57:20.000000000 +0100
+++ new/networkmanager/libs/ui/security/802_11_wireless_security_widget.cpp 2009-05-23 21:18:45.000000000 +0200
@@ -73,7 +73,7 @@
// Fixme: add distinct types of WEP
d->ui.cmbType->insertItem(index, i18nc("Label for WEP wireless security", "WEP"));
- SecurityWidget * sw = new WepWidget(WepWidget::Hex, connection, this);
+ SecurityWidget * sw = new WepWidget(WepWidget::Passphrase, connection, this);
d->securityWidgetHash.insert(index, sw);
d->ui.stackedWidget->insertWidget(index, sw);
d->staticWepHexIndex = index++;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/libs/ui/security/wepwidget.cpp new/networkmanager/libs/ui/security/wepwidget.cpp
--- old/networkmanager/libs/ui/security/wepwidget.cpp 2009-05-04 20:45:29.000000000 +0200
+++ new/networkmanager/libs/ui/security/wepwidget.cpp 2009-05-23 21:18:45.000000000 +0200
@@ -61,9 +61,9 @@
connect(d->ui.keyType, SIGNAL(currentIndexChanged(int)), this, SLOT(keyTypeChanged(int)));
if (d->format == WepWidget::Passphrase) {
- d->ui.keyType->setCurrentIndex(0);
+ keyTypeChanged(0);
} else {
- d->ui.keyType->setCurrentIndex(1);
+ keyTypeChanged(1);
}
connect(d->ui.weptxkeyindex, SIGNAL(currentIndexChanged(int)), this, SLOT(keyIndexChanged(int)));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/networkmanagement.notifyrc new/networkmanager/networkmanagement.notifyrc
--- old/networkmanager/networkmanagement.notifyrc 2009-05-11 23:38:09.000000000 +0200
+++ new/networkmanager/networkmanagement.notifyrc 2009-06-02 16:03:09.000000000 +0200
@@ -5,6 +5,7 @@
Name[fr]=Gestion du réseau
Name[ga]=Bainisteoireacht an Líonra
Name[gl]=Xestión da rede
+Name[km]=ការគ្រប់គ្រងបណ្ដាញ
Name[pt]=Gestão de Rede
Name[pt_BR]=Gestão de Rede
Name[sv]=Nätverkshantering
@@ -18,6 +19,8 @@
Comment[fr]=Gestion réseau
Comment[ga]=Bainisteoireacht an Líonra
Comment[gl]=Xestión da rede
+Comment[km]=ការគ្រប់គ្រងបណ្ដាញ
+Comment[nds]=Nettwarkpleeg
Comment[pt]=Gestão de Rede
Comment[pt_BR]=Gerenciamento de rede
Comment[sv]=Nätverkshantering
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/networkmanager/settings/config/kcm_networkmanagement.desktop new/networkmanager/settings/config/kcm_networkmanagement.desktop
--- old/networkmanager/settings/config/kcm_networkmanagement.desktop 2009-05-12 17:45:01.000000000 +0200
+++ new/networkmanager/settings/config/kcm_networkmanagement.desktop 2009-06-02 16:03:09.000000000 +0200
@@ -5,6 +5,7 @@
Name[fr]=Gestion du réseau
Name[ga]=Bainisteoireacht an Líonra
Name[gl]=Xestión da rede
+Name[km]=ការគ្រប់គ្រងបណ្ដាញ
Name[pt]=Gestão de Rede
Name[pt_BR]=Gestão de Rede
Name[sv]=Nätverkshantering
@@ -12,7 +13,9 @@
Name[uk]=Керування мережею
Name[x-test]=xxNetwork Managementxx
Comment=Manage Network Connections
+Comment[de]=Netzwerkverbindungen verwalten
Comment[et]=Võrguühenduste haldus
+Comment[km]=គ្រប់គ្រងការតភ្ជាប់បណ្ដាញ
Comment[pt]=Gerir as Ligações de Rede
Comment[pt_BR]=Gerir as Ligações de Rede
Comment[sv]=Hantera nätverksanslutningar
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org