author | benmeyer <benmeyer> | 2002-11-04 15:17:58 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-11-04 15:17:58 (UTC) |
commit | 17a29825dcf56cb0e224848e71e24ee6a884890b (patch) (unidiff) | |
tree | 91a7f024de51081800a13312dd1b16822d86c188 /noncore/net | |
parent | a5f1f8a58a5a654503d72042b12f36ab30216a16 (diff) | |
download | opie-17a29825dcf56cb0e224848e71e24ee6a884890b.zip opie-17a29825dcf56cb0e224848e71e24ee6a884890b.tar.gz opie-17a29825dcf56cb0e224848e71e24ee6a884890b.tar.bz2 |
Fix bug and gives more user feedback now
5 files changed, 30 insertions, 7 deletions
diff --git a/noncore/net/networksetup/interfaces/interface.cpp b/noncore/net/networksetup/interfaces/interface.cpp index 929b3a1..e4f405e 100644 --- a/noncore/net/networksetup/interfaces/interface.cpp +++ b/noncore/net/networksetup/interfaces/interface.cpp | |||
@@ -63,16 +63,21 @@ void Interface::setModuleOwner(Module *owner){ | |||
63 | */ | 63 | */ |
64 | void Interface::start(){ | 64 | void Interface::start(){ |
65 | // check to see if we are already running. | 65 | // check to see if we are already running. |
66 | if(true == status) | 66 | if(true == status){ |
67 | emit (updateMessage("Unable to start interface,\n already started")); | ||
67 | return; | 68 | return; |
69 | } | ||
68 | 70 | ||
69 | int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(this->name()).latin1()); | 71 | int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(this->name()).latin1()); |
70 | // See if it was successfull... | 72 | // See if it was successfull... |
71 | if(ret != 0) | 73 | if(ret != 0){ |
74 | emit (updateMessage("Starting interface failed.")); | ||
72 | return; | 75 | return; |
76 | } | ||
73 | 77 | ||
74 | status = true; | 78 | status = true; |
75 | refresh(); | 79 | refresh(); |
80 | emit (updateMessage("Start successfull")); | ||
76 | } | 81 | } |
77 | 82 | ||
78 | /** | 83 | /** |
@@ -80,15 +85,20 @@ void Interface::start(){ | |||
80 | */ | 85 | */ |
81 | void Interface::stop(){ | 86 | void Interface::stop(){ |
82 | // check to see if we are already stopped. | 87 | // check to see if we are already stopped. |
83 | if(false == status) | 88 | if(false == status){ |
89 | emit (updateMessage("Unable to stop interface,\n already stopped")); | ||
84 | return; | 90 | return; |
91 | } | ||
85 | 92 | ||
86 | int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(this->name()).latin1()); | 93 | int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(this->name()).latin1()); |
87 | if(ret != 0) | 94 | if(ret != 0){ |
95 | emit (updateMessage("Stopping interface failed.")); | ||
88 | return; | 96 | return; |
97 | } | ||
89 | 98 | ||
90 | status = true; | 99 | status = false; |
91 | refresh(); | 100 | refresh(); |
101 | emit (updateMessage("Stop successfull")); | ||
92 | } | 102 | } |
93 | 103 | ||
94 | /** | 104 | /** |
diff --git a/noncore/net/networksetup/interfaces/interface.h b/noncore/net/networksetup/interfaces/interface.h index dc9c6d3..fc064fe 100644 --- a/noncore/net/networksetup/interfaces/interface.h +++ b/noncore/net/networksetup/interfaces/interface.h | |||
@@ -11,6 +11,7 @@ class Interface : public QObject{ | |||
11 | 11 | ||
12 | signals: | 12 | signals: |
13 | void updateInterface(Interface *i); | 13 | void updateInterface(Interface *i); |
14 | void updateMessage(const QString &message); | ||
14 | 15 | ||
15 | public: | 16 | public: |
16 | Interface(QObject * parent=0, const char * name= "unknown", bool status = false); | 17 | Interface(QObject * parent=0, const char * name= "unknown", bool status = false); |
diff --git a/noncore/net/networksetup/interfaces/interfaceinformationimp.cpp b/noncore/net/networksetup/interfaces/interfaceinformationimp.cpp index 43483fb..39575c4 100644 --- a/noncore/net/networksetup/interfaces/interfaceinformationimp.cpp +++ b/noncore/net/networksetup/interfaces/interfaceinformationimp.cpp | |||
@@ -4,6 +4,8 @@ | |||
4 | #include <qpushbutton.h> | 4 | #include <qpushbutton.h> |
5 | #include <qlabel.h> | 5 | #include <qlabel.h> |
6 | #include <qgroupbox.h> | 6 | #include <qgroupbox.h> |
7 | #include <qmessagebox.h> | ||
8 | |||
7 | #include <assert.h> | 9 | #include <assert.h> |
8 | 10 | ||
9 | /** | 11 | /** |
@@ -15,13 +17,13 @@ InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *na | |||
15 | 17 | ||
16 | interface = i; | 18 | interface = i; |
17 | connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); | 19 | connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); |
20 | connect(i, SIGNAL(updateMessage(const QString &)), this, SLOT(showMessage(const QString &))); | ||
18 | updateInterface(interface); | 21 | updateInterface(interface); |
19 | connect(startButton, SIGNAL(clicked()), interface, SLOT(start())); | 22 | connect(startButton, SIGNAL(clicked()), interface, SLOT(start())); |
20 | connect(stopButton, SIGNAL(clicked()), interface, SLOT(stop())); | 23 | connect(stopButton, SIGNAL(clicked()), interface, SLOT(stop())); |
21 | connect(restartButton, SIGNAL(clicked()), interface, SLOT(restart())); | 24 | connect(restartButton, SIGNAL(clicked()), interface, SLOT(restart())); |
22 | connect(refreshButton, SIGNAL(clicked()), interface, SLOT(refresh())); | 25 | connect(refreshButton, SIGNAL(clicked()), interface, SLOT(refresh())); |
23 | connect(advancedButton, SIGNAL(clicked()), this, SLOT(advanced())); | 26 | connect(advancedButton, SIGNAL(clicked()), this, SLOT(advanced())); |
24 | |||
25 | } | 27 | } |
26 | 28 | ||
27 | /** | 29 | /** |
@@ -66,5 +68,14 @@ void InterfaceInformationImp::advanced(){ | |||
66 | a->show(); | 68 | a->show(); |
67 | } | 69 | } |
68 | 70 | ||
71 | /** | ||
72 | * Messages from the interface if start/stop went as planned. | ||
73 | * Purly for user feedback. | ||
74 | * @param message the message to display. | ||
75 | */ | ||
76 | void InterfaceInformationImp::showMessage(const QString &message){ | ||
77 | QMessageBox::information(this, "Message", message, QMessageBox::Ok); | ||
78 | } | ||
79 | |||
69 | // infoimp.cpp | 80 | // infoimp.cpp |
70 | 81 | ||
diff --git a/noncore/net/networksetup/interfaces/interfaceinformationimp.h b/noncore/net/networksetup/interfaces/interfaceinformationimp.h index 42213cc..65cdfe0 100644 --- a/noncore/net/networksetup/interfaces/interfaceinformationimp.h +++ b/noncore/net/networksetup/interfaces/interfaceinformationimp.h | |||
@@ -15,6 +15,7 @@ public: | |||
15 | private slots: | 15 | private slots: |
16 | void advanced(); | 16 | void advanced(); |
17 | void updateInterface(Interface *i); | 17 | void updateInterface(Interface *i); |
18 | void showMessage(const QString &message); | ||
18 | 19 | ||
19 | private: | 20 | private: |
20 | Interface *interface; | 21 | Interface *interface; |
diff --git a/noncore/net/networksetup/interfaces/interfaces.pro b/noncore/net/networksetup/interfaces/interfaces.pro index 9a024f6..d6b43fb 100644 --- a/noncore/net/networksetup/interfaces/interfaces.pro +++ b/noncore/net/networksetup/interfaces/interfaces.pro | |||
@@ -1,7 +1,7 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | #CONFIG += qt warn_on debug | 3 | #CONFIG += qt warn_on debug |
4 | DESTDIR = $(QTDIR)/lib$(PROJMAK) | 4 | #DESTDIR = $(QTDIR)/lib$(PROJMAK) |
5 | HEADERS = interface.h interfaceinformationimp.h interfaces.h interfacesetupimp.h | 5 | HEADERS = interface.h interfaceinformationimp.h interfaces.h interfacesetupimp.h |
6 | SOURCES = interface.cpp interfaces.cpp interfaceinformationimp.cpp interfacesetupimp.cpp | 6 | SOURCES = interface.cpp interfaces.cpp interfaceinformationimp.cpp interfacesetupimp.cpp |
7 | INCLUDEPATH+= $(OPIEDIR)/include ../ | 7 | INCLUDEPATH+= $(OPIEDIR)/include ../ |