author | tille <tille> | 2003-06-02 12:36:00 (UTC) |
---|---|---|
committer | tille <tille> | 2003-06-02 12:36:00 (UTC) |
commit | 2d0134f0bee1c0d33fc8cdc66ecc390080adba25 (patch) (unidiff) | |
tree | 430950574b78a060940fc1a00942550fb5d84cf6 | |
parent | ed171b266b1f42b358b2b814deb33be21c220683 (diff) | |
download | opie-2d0134f0bee1c0d33fc8cdc66ecc390080adba25.zip opie-2d0134f0bee1c0d33fc8cdc66ecc390080adba25.tar.gz opie-2d0134f0bee1c0d33fc8cdc66ecc390080adba25.tar.bz2 |
disable the profile tab and add some whatsthis
-rw-r--r-- | noncore/settings/networksettings/mainwindow.ui | 24 | ||||
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 10 |
2 files changed, 32 insertions, 2 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 | |||
@@ -25,24 +25,28 @@ | |||
25 | <number>0</number> | 25 | <number>0</number> |
26 | </property> | 26 | </property> |
27 | <property stdset="1"> | 27 | <property stdset="1"> |
28 | <name>spacing</name> | 28 | <name>spacing</name> |
29 | <number>6</number> | 29 | <number>6</number> |
30 | </property> | 30 | </property> |
31 | <widget> | 31 | <widget> |
32 | <class>QTabWidget</class> | 32 | <class>QTabWidget</class> |
33 | <property stdset="1"> | 33 | <property stdset="1"> |
34 | <name>name</name> | 34 | <name>name</name> |
35 | <cstring>tabWidget</cstring> | 35 | <cstring>tabWidget</cstring> |
36 | </property> | 36 | </property> |
37 | <property stdset="1"> | ||
38 | <name>enabled</name> | ||
39 | <bool>true</bool> | ||
40 | </property> | ||
37 | <property> | 41 | <property> |
38 | <name>layoutMargin</name> | 42 | <name>layoutMargin</name> |
39 | </property> | 43 | </property> |
40 | <widget> | 44 | <widget> |
41 | <class>QWidget</class> | 45 | <class>QWidget</class> |
42 | <property stdset="1"> | 46 | <property stdset="1"> |
43 | <name>name</name> | 47 | <name>name</name> |
44 | <cstring>Widget3</cstring> | 48 | <cstring>Widget3</cstring> |
45 | </property> | 49 | </property> |
46 | <attribute> | 50 | <attribute> |
47 | <name>title</name> | 51 | <name>title</name> |
48 | <string>Connections</string> | 52 | <string>Connections</string> |
@@ -127,24 +131,28 @@ | |||
127 | <name>resizeable</name> | 131 | <name>resizeable</name> |
128 | <bool>true</bool> | 132 | <bool>true</bool> |
129 | </property> | 133 | </property> |
130 | </column> | 134 | </column> |
131 | <property stdset="1"> | 135 | <property stdset="1"> |
132 | <name>name</name> | 136 | <name>name</name> |
133 | <cstring>connectionList</cstring> | 137 | <cstring>connectionList</cstring> |
134 | </property> | 138 | </property> |
135 | <property stdset="1"> | 139 | <property stdset="1"> |
136 | <name>allColumnsShowFocus</name> | 140 | <name>allColumnsShowFocus</name> |
137 | <bool>true</bool> | 141 | <bool>true</bool> |
138 | </property> | 142 | </property> |
143 | <property> | ||
144 | <name>whatsThis</name> | ||
145 | <string>A list of network settings to be choosen from</string> | ||
146 | </property> | ||
139 | </widget> | 147 | </widget> |
140 | <widget> | 148 | <widget> |
141 | <class>QLayoutWidget</class> | 149 | <class>QLayoutWidget</class> |
142 | <property stdset="1"> | 150 | <property stdset="1"> |
143 | <name>name</name> | 151 | <name>name</name> |
144 | <cstring>Layout2</cstring> | 152 | <cstring>Layout2</cstring> |
145 | </property> | 153 | </property> |
146 | <property> | 154 | <property> |
147 | <name>layoutMargin</name> | 155 | <name>layoutMargin</name> |
148 | </property> | 156 | </property> |
149 | <grid> | 157 | <grid> |
150 | <property stdset="1"> | 158 | <property stdset="1"> |
@@ -156,57 +164,73 @@ | |||
156 | <number>6</number> | 164 | <number>6</number> |
157 | </property> | 165 | </property> |
158 | <widget row="1" column="0" > | 166 | <widget row="1" column="0" > |
159 | <class>QPushButton</class> | 167 | <class>QPushButton</class> |
160 | <property stdset="1"> | 168 | <property stdset="1"> |
161 | <name>name</name> | 169 | <name>name</name> |
162 | <cstring>addConnectionButton</cstring> | 170 | <cstring>addConnectionButton</cstring> |
163 | </property> | 171 | </property> |
164 | <property stdset="1"> | 172 | <property stdset="1"> |
165 | <name>text</name> | 173 | <name>text</name> |
166 | <string>&Add</string> | 174 | <string>&Add</string> |
167 | </property> | 175 | </property> |
176 | <property> | ||
177 | <name>whatsThis</name> | ||
178 | <string>Add a new interface to the list.</string> | ||
179 | </property> | ||
168 | </widget> | 180 | </widget> |
169 | <widget row="0" column="0" > | 181 | <widget row="0" column="0" > |
170 | <class>QPushButton</class> | 182 | <class>QPushButton</class> |
171 | <property stdset="1"> | 183 | <property stdset="1"> |
172 | <name>name</name> | 184 | <name>name</name> |
173 | <cstring>informationConnectionButton</cstring> | 185 | <cstring>informationConnectionButton</cstring> |
174 | </property> | 186 | </property> |
175 | <property stdset="1"> | 187 | <property stdset="1"> |
176 | <name>text</name> | 188 | <name>text</name> |
177 | <string>&Start/Stop</string> | 189 | <string>&Start/Stop</string> |
178 | </property> | 190 | </property> |
191 | <property> | ||
192 | <name>whatsThis</name> | ||
193 | <string>Start and Stop the current interface, gives additional information about the interface.</string> | ||
194 | </property> | ||
179 | </widget> | 195 | </widget> |
180 | <widget row="0" column="1" > | 196 | <widget row="0" column="1" > |
181 | <class>QPushButton</class> | 197 | <class>QPushButton</class> |
182 | <property stdset="1"> | 198 | <property stdset="1"> |
183 | <name>name</name> | 199 | <name>name</name> |
184 | <cstring>configureConnectionButton</cstring> | 200 | <cstring>configureConnectionButton</cstring> |
185 | </property> | 201 | </property> |
186 | <property stdset="1"> | 202 | <property stdset="1"> |
187 | <name>text</name> | 203 | <name>text</name> |
188 | <string>&Configure</string> | 204 | <string>&Configure</string> |
189 | </property> | 205 | </property> |
206 | <property> | ||
207 | <name>whatsThis</name> | ||
208 | <string>Configure the current interface</string> | ||
209 | </property> | ||
190 | </widget> | 210 | </widget> |
191 | <widget row="1" column="1" > | 211 | <widget row="1" column="1" > |
192 | <class>QPushButton</class> | 212 | <class>QPushButton</class> |
193 | <property stdset="1"> | 213 | <property stdset="1"> |
194 | <name>name</name> | 214 | <name>name</name> |
195 | <cstring>removeConnectionButton</cstring> | 215 | <cstring>removeConnectionButton</cstring> |
196 | </property> | 216 | </property> |
197 | <property stdset="1"> | 217 | <property stdset="1"> |
198 | <name>text</name> | 218 | <name>text</name> |
199 | <string>&Remove</string> | 219 | <string>&Remove</string> |
200 | </property> | 220 | </property> |
221 | <property> | ||
222 | <name>whatsThis</name> | ||
223 | <string>Remove the current interface from the list.</string> | ||
224 | </property> | ||
201 | </widget> | 225 | </widget> |
202 | </grid> | 226 | </grid> |
203 | </widget> | 227 | </widget> |
204 | </vbox> | 228 | </vbox> |
205 | </widget> | 229 | </widget> |
206 | <widget> | 230 | <widget> |
207 | <class>QWidget</class> | 231 | <class>QWidget</class> |
208 | <property stdset="1"> | 232 | <property stdset="1"> |
209 | <name>name</name> | 233 | <name>name</name> |
210 | <cstring>tab</cstring> | 234 | <cstring>tab</cstring> |
211 | </property> | 235 | </property> |
212 | <attribute> | 236 | <attribute> |
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 | |||
@@ -2,24 +2,25 @@ | |||
2 | #include "addconnectionimp.h" | 2 | #include "addconnectionimp.h" |
3 | #include "interfaceinformationimp.h" | 3 | #include "interfaceinformationimp.h" |
4 | #include "interfacesetupimp.h" | 4 | #include "interfacesetupimp.h" |
5 | #include "interfaces.h" | 5 | #include "interfaces.h" |
6 | #include "module.h" | 6 | #include "module.h" |
7 | 7 | ||
8 | #include <qpushbutton.h> | 8 | #include <qpushbutton.h> |
9 | #include <qlistbox.h> | 9 | #include <qlistbox.h> |
10 | #include <qlineedit.h> | 10 | #include <qlineedit.h> |
11 | #include <qlistview.h> | 11 | #include <qlistview.h> |
12 | #include <qheader.h> | 12 | #include <qheader.h> |
13 | #include <qlabel.h> | 13 | #include <qlabel.h> |
14 | #include <qtabwidget.h> // in order to disable the profiles tab | ||
14 | 15 | ||
15 | #include <qmessagebox.h> | 16 | #include <qmessagebox.h> |
16 | 17 | ||
17 | #ifdef QWS | 18 | #ifdef QWS |
18 | #include <qpe/config.h> | 19 | #include <qpe/config.h> |
19 | #include <qpe/qlibrary.h> | 20 | #include <qpe/qlibrary.h> |
20 | #include <qpe/resource.h> | 21 | #include <qpe/resource.h> |
21 | #include <qpe/qpeapplication.h> | 22 | #include <qpe/qpeapplication.h> |
22 | #else | 23 | #else |
23 | #include <klibloader.h> | 24 | #include <klibloader.h> |
24 | #define QLibrary KLibrary | 25 | #define QLibrary KLibrary |
25 | #include <kconfig.h> | 26 | #include <kconfig.h> |
@@ -49,24 +50,28 @@ | |||
49 | 50 | ||
50 | MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name), advancedUserMode(true), scheme(DEFAULT_SCHEME){ | 51 | MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name), advancedUserMode(true), scheme(DEFAULT_SCHEME){ |
51 | connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked())); | 52 | connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked())); |
52 | connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked())); | 53 | connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked())); |
53 | connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked())); | 54 | connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked())); |
54 | connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked())); | 55 | connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked())); |
55 | 56 | ||
56 | connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile())); | 57 | connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile())); |
57 | connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile())); | 58 | connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile())); |
58 | connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile())); | 59 | connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile())); |
59 | 60 | ||
60 | connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&))); | 61 | connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&))); |
62 | |||
63 | //FIXME: disable profiles for the moment: | ||
64 | tabWidget->setTabEnabled( tab, false ); | ||
65 | |||
61 | // Load connections. | 66 | // Load connections. |
62 | // /usr/local/kde/lib/libinterfaces.la | 67 | // /usr/local/kde/lib/libinterfaces.la |
63 | #ifdef QWS | 68 | #ifdef QWS |
64 | loadModules(QPEApplication::qpeDir() + "/plugins/networksettings"); | 69 | loadModules(QPEApplication::qpeDir() + "/plugins/networksettings"); |
65 | #else | 70 | #else |
66 | loader = KLibLoader::self(); | 71 | loader = KLibLoader::self(); |
67 | loadModules(QString("/usr/")+KStandardDirs::kde_default("lib")); | 72 | loadModules(QString("/usr/")+KStandardDirs::kde_default("lib")); |
68 | #endif | 73 | #endif |
69 | getAllInterfaces(); | 74 | getAllInterfaces(); |
70 | 75 | ||
71 | Interfaces i; | 76 | Interfaces i; |
72 | QStringList list = i.getInterfaceList(); | 77 | QStringList list = i.getInterfaceList(); |
@@ -85,26 +90,27 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par | |||
85 | interfaceNames.insert(i->getInterfaceName(), i); | 90 | interfaceNames.insert(i->getInterfaceName(), i); |
86 | updateInterface(i); | 91 | updateInterface(i); |
87 | connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); | 92 | connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); |
88 | } | 93 | } |
89 | } | 94 | } |
90 | } | 95 | } |
91 | 96 | ||
92 | //getInterfaceList(); | 97 | //getInterfaceList(); |
93 | connectionList->header()->hide(); | 98 | connectionList->header()->hide(); |
94 | 99 | ||
95 | Config cfg("NetworkSetup"); | 100 | Config cfg("NetworkSetup"); |
96 | profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All")); | 101 | profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All")); |
97 | for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it) | 102 | for ( QStringList::Iterator it = profiles.begin(); |
98 | profilesList->insertItem((*it)); | 103 | it != profiles.end(); ++it) |
104 | profilesList->insertItem((*it)); | ||
99 | currentProfileLabel->setText(cfg.readEntry("CurrentProfile", "All")); | 105 | currentProfileLabel->setText(cfg.readEntry("CurrentProfile", "All")); |
100 | advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false); | 106 | advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false); |
101 | scheme = cfg.readEntry("SchemeFile", DEFAULT_SCHEME); | 107 | scheme = cfg.readEntry("SchemeFile", DEFAULT_SCHEME); |
102 | 108 | ||
103 | QFile file(scheme); | 109 | QFile file(scheme); |
104 | if ( file.open(IO_ReadOnly) ) { // file opened successfully | 110 | if ( file.open(IO_ReadOnly) ) { // file opened successfully |
105 | QTextStream stream( &file ); // use a text stream | 111 | QTextStream stream( &file ); // use a text stream |
106 | while ( !stream.eof() ) { // until end of file... | 112 | while ( !stream.eof() ) { // until end of file... |
107 | QString line = stream.readLine(); // line of text excluding '\n' | 113 | QString line = stream.readLine(); // line of text excluding '\n' |
108 | if(line.contains("SCHEME")){ | 114 | if(line.contains("SCHEME")){ |
109 | line = line.mid(7, line.length()); | 115 | line = line.mid(7, line.length()); |
110 | currentProfileLabel->setText(line); | 116 | currentProfileLabel->setText(line); |