-rw-r--r-- | noncore/settings/networksettings/mainwindow.ui | 24 | ||||
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 8 |
2 files changed, 31 insertions, 1 deletions
diff --git a/noncore/settings/networksettings/mainwindow.ui b/noncore/settings/networksettings/mainwindow.ui index f61a1ae..a730dd5 100644 --- a/noncore/settings/networksettings/mainwindow.ui +++ b/noncore/settings/networksettings/mainwindow.ui @@ -29,16 +29,20 @@ <number>6</number> </property> <widget> <class>QTabWidget</class> <property stdset="1"> <name>name</name> <cstring>tabWidget</cstring> </property> + <property stdset="1"> + <name>enabled</name> + <bool>true</bool> + </property> <property> <name>layoutMargin</name> </property> <widget> <class>QWidget</class> <property stdset="1"> <name>name</name> <cstring>Widget3</cstring> @@ -131,16 +135,20 @@ <property stdset="1"> <name>name</name> <cstring>connectionList</cstring> </property> <property stdset="1"> <name>allColumnsShowFocus</name> <bool>true</bool> </property> + <property> + <name>whatsThis</name> + <string>A list of network settings to be choosen from</string> + </property> </widget> <widget> <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> <cstring>Layout2</cstring> </property> <property> @@ -160,49 +168,65 @@ <property stdset="1"> <name>name</name> <cstring>addConnectionButton</cstring> </property> <property stdset="1"> <name>text</name> <string>&Add</string> </property> + <property> + <name>whatsThis</name> + <string>Add a new interface to the list.</string> + </property> </widget> <widget row="0" column="0" > <class>QPushButton</class> <property stdset="1"> <name>name</name> <cstring>informationConnectionButton</cstring> </property> <property stdset="1"> <name>text</name> <string>&Start/Stop</string> </property> + <property> + <name>whatsThis</name> + <string>Start and Stop the current interface, gives additional information about the interface.</string> + </property> </widget> <widget row="0" column="1" > <class>QPushButton</class> <property stdset="1"> <name>name</name> <cstring>configureConnectionButton</cstring> </property> <property stdset="1"> <name>text</name> <string>&Configure</string> </property> + <property> + <name>whatsThis</name> + <string>Configure the current interface</string> + </property> </widget> <widget row="1" column="1" > <class>QPushButton</class> <property stdset="1"> <name>name</name> <cstring>removeConnectionButton</cstring> </property> <property stdset="1"> <name>text</name> <string>&Remove</string> </property> + <property> + <name>whatsThis</name> + <string>Remove the current interface from the list.</string> + </property> </widget> </grid> </widget> </vbox> </widget> <widget> <class>QWidget</class> <property stdset="1"> diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index 63b9603..abf5663 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp @@ -6,16 +6,17 @@ #include "module.h" #include <qpushbutton.h> #include <qlistbox.h> #include <qlineedit.h> #include <qlistview.h> #include <qheader.h> #include <qlabel.h> +#include <qtabwidget.h> // in order to disable the profiles tab #include <qmessagebox.h> #ifdef QWS #include <qpe/config.h> #include <qpe/qlibrary.h> #include <qpe/resource.h> #include <qpe/qpeapplication.h> @@ -53,16 +54,20 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked())); connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked())); connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile())); connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile())); connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile())); connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&))); + + //FIXME: disable profiles for the moment: + tabWidget->setTabEnabled( tab, false ); + // Load connections. // /usr/local/kde/lib/libinterfaces.la #ifdef QWS loadModules(QPEApplication::qpeDir() + "/plugins/networksettings"); #else loader = KLibLoader::self(); loadModules(QString("/usr/")+KStandardDirs::kde_default("lib")); #endif @@ -89,17 +94,18 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par } } //getInterfaceList(); connectionList->header()->hide(); Config cfg("NetworkSetup"); profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All")); - for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it) + for ( QStringList::Iterator it = profiles.begin(); + it != profiles.end(); ++it) profilesList->insertItem((*it)); currentProfileLabel->setText(cfg.readEntry("CurrentProfile", "All")); advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false); scheme = cfg.readEntry("SchemeFile", DEFAULT_SCHEME); QFile file(scheme); if ( file.open(IO_ReadOnly) ) { // file opened successfully QTextStream stream( &file ); // use a text stream |