Diffstat (limited to 'noncore/settings/networksettings2/main.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/main.cpp | 47 |
1 files changed, 35 insertions, 12 deletions
diff --git a/noncore/settings/networksettings2/main.cpp b/noncore/settings/networksettings2/main.cpp index bcef631..1e1270e 100644 --- a/noncore/settings/networksettings2/main.cpp +++ b/noncore/settings/networksettings2/main.cpp | |||
@@ -1,3 +1,5 @@ | |||
1 | #include "nsdata.h" | ||
2 | #include "activateprofile.h" | ||
1 | #include "networksettings.h" | 3 | #include "networksettings.h" |
2 | #include <qpe/qpeapplication.h> | 4 | #include <qpe/qpeapplication.h> |
3 | 5 | ||
@@ -9,9 +11,14 @@ OPIE_EXPORT_APP( OApplicationFactory<NetworkSettings> ) | |||
9 | 11 | ||
10 | #else | 12 | #else |
11 | 13 | ||
14 | // just standard GUI | ||
12 | #define ACT_GUI 0 | 15 | #define ACT_GUI 0 |
16 | // used by interfaces to request for allow of up/down | ||
13 | #define ACT_REQUEST 1 | 17 | #define ACT_REQUEST 1 |
18 | // regenerate config files | ||
14 | #define ACT_REGEN 2 | 19 | #define ACT_REGEN 2 |
20 | // used by interfaces to request user prompt | ||
21 | #define ACT_PROMPT 3 | ||
15 | 22 | ||
16 | int main( int argc, char * argv[] ) { | 23 | int main( int argc, char * argv[] ) { |
17 | int rv = 0; | 24 | int rv = 0; |
@@ -32,6 +39,9 @@ int main( int argc, char * argv[] ) { | |||
32 | Action = ACT_REGEN; | 39 | Action = ACT_REGEN; |
33 | GuiType = QApplication::Tty; | 40 | GuiType = QApplication::Tty; |
34 | rmv = 1; | 41 | rmv = 1; |
42 | } else if( strcmp( argv[i], "--prompt" ) == 0 ) { | ||
43 | Action = ACT_PROMPT; | ||
44 | rmv = 1; | ||
35 | } | 45 | } |
36 | if( rmv ) { | 46 | if( rmv ) { |
37 | memmove( argv+i, argv+i+rmv, | 47 | memmove( argv+i, argv+i+rmv, |
@@ -62,9 +72,30 @@ int main( int argc, char * argv[] ) { | |||
62 | #endif | 72 | #endif |
63 | 73 | ||
64 | // init qt with app widget | 74 | // init qt with app widget |
65 | if( GuiType != QApplication::Tty ) { | 75 | |
66 | QWidget * W = 0; | 76 | switch( Action ) { |
67 | W = new NetworkSettings(0); | 77 | case ACT_REQUEST : |
78 | { NetworkSettingsData NS; | ||
79 | NS.canStart( argv[1] ); | ||
80 | } | ||
81 | break; | ||
82 | case ACT_REGEN : | ||
83 | { NetworkSettingsData NS; | ||
84 | // regen returns 0 if OK | ||
85 | rv = (NS.regenerate()) ? 1 : 0; | ||
86 | } | ||
87 | break; | ||
88 | case ACT_PROMPT : | ||
89 | { ActivateProfile AP(argv[1]); | ||
90 | if( AP.exec() == QDialog::Accepted ) { | ||
91 | printf( "%s-c%d-allowed", AP.selectedProfile() ); | ||
92 | } else { | ||
93 | printf( "%s-cNN-disallowed" ); | ||
94 | } | ||
95 | } | ||
96 | break; | ||
97 | case ACT_GUI : | ||
98 | { QWidget * W = new NetworkSettings(0); | ||
68 | TheApp->setMainWidget( W ); | 99 | TheApp->setMainWidget( W ); |
69 | W->show(); | 100 | W->show(); |
70 | #ifdef _WS_QWS_ | 101 | #ifdef _WS_QWS_ |
@@ -74,16 +105,8 @@ int main( int argc, char * argv[] ) { | |||
74 | #endif | 105 | #endif |
75 | rv = TheApp->exec(); | 106 | rv = TheApp->exec(); |
76 | delete W; | 107 | delete W; |
77 | } else { | ||
78 | switch( Action ) { | ||
79 | case ACT_REQUEST : | ||
80 | NetworkSettings::canStart( argv[1] ); | ||
81 | break; | ||
82 | case ACT_REGEN : | ||
83 | // regen returns 0 if OK | ||
84 | rv = (NetworkSettings::regenerate()) ? 1 : 0; | ||
85 | break; | ||
86 | } | 108 | } |
109 | break; | ||
87 | } | 110 | } |
88 | 111 | ||
89 | return rv; | 112 | return rv; |