author | wimpie <wimpie> | 2005-01-06 23:52:47 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2005-01-06 23:52:47 (UTC) |
commit | a8e5ecd107a79f940d8a99d4a77071606a3a932f (patch) (unidiff) | |
tree | 3b2603d07877fb05fc5f2a0dbbbcf3ad1cce74c3 /noncore/settings | |
parent | a056b6d067800486d9c1ce99d1b923289d335e8f (diff) | |
download | opie-a8e5ecd107a79f940d8a99d4a77071606a3a932f.zip opie-a8e5ecd107a79f940d8a99d4a77071606a3a932f.tar.gz opie-a8e5ecd107a79f940d8a99d4a77071606a3a932f.tar.bz2 |
Some namespace } -> };
added NS2SetMac.sh script in control file
added activate/disactivate for usb
renamed templates directory to NS2templates
13 files changed, 25 insertions, 25 deletions
diff --git a/noncore/settings/networksettings2/main.cpp b/noncore/settings/networksettings2/main.cpp index 8487e3e..973b4b7 100644 --- a/noncore/settings/networksettings2/main.cpp +++ b/noncore/settings/networksettings2/main.cpp | |||
@@ -43,11 +43,7 @@ int main( int argc, char * argv[] ) { | |||
43 | // could be overruled by -qws | 43 | // could be overruled by -qws |
44 | QApplication::Type GuiType = QApplication::GuiClient; | 44 | QApplication::Type GuiType = QApplication::GuiClient; |
45 | 45 | ||
46 | #ifdef _WS_QWS_ | ||
47 | QPEApplication * TheApp; | 46 | QPEApplication * TheApp; |
48 | #else | ||
49 | QApplication * TheApp; | ||
50 | #endif | ||
51 | 47 | ||
52 | for ( int i = 1; i < argc; i ++ ) { | 48 | for ( int i = 1; i < argc; i ++ ) { |
53 | int rmv; | 49 | int rmv; |
@@ -84,7 +80,6 @@ int main( int argc, char * argv[] ) { | |||
84 | } | 80 | } |
85 | 81 | ||
86 | // Start Qt | 82 | // Start Qt |
87 | #ifdef _WS_QWS_ | ||
88 | // because QPEApplication does not handle GuiType well | 83 | // because QPEApplication does not handle GuiType well |
89 | if( GuiType == QApplication::Tty ) { | 84 | if( GuiType == QApplication::Tty ) { |
90 | // this cast is NOT correct but we do not use | 85 | // this cast is NOT correct but we do not use |
@@ -93,9 +88,6 @@ int main( int argc, char * argv[] ) { | |||
93 | } else { | 88 | } else { |
94 | TheApp = new QPEApplication( argc, argv, GuiType ); | 89 | TheApp = new QPEApplication( argc, argv, GuiType ); |
95 | } | 90 | } |
96 | #else | ||
97 | TheApp = new QApplication( argc, argv, GuiType ); | ||
98 | #endif | ||
99 | 91 | ||
100 | // init qt with app widget | 92 | // init qt with app widget |
101 | 93 | ||
@@ -151,11 +143,7 @@ int main( int argc, char * argv[] ) { | |||
151 | TheApp->setMainWidget( W ); | 143 | TheApp->setMainWidget( W ); |
152 | 144 | ||
153 | W->show(); | 145 | W->show(); |
154 | #ifdef _WS_QWS_ | ||
155 | W->showMaximized(); | 146 | W->showMaximized(); |
156 | #else | ||
157 | W->resize( W->sizeHint() ); | ||
158 | #endif | ||
159 | rv = TheApp->exec(); | 147 | rv = TheApp->exec(); |
160 | 148 | ||
161 | delete W; | 149 | delete W; |
diff --git a/noncore/settings/networksettings2/networksettings2/systemfile.cpp b/noncore/settings/networksettings2/networksettings2/systemfile.cpp index 82fd43a..8deef94 100644 --- a/noncore/settings/networksettings2/networksettings2/systemfile.cpp +++ b/noncore/settings/networksettings2/networksettings2/systemfile.cpp | |||
@@ -8,7 +8,7 @@ | |||
8 | #include "resources.h" | 8 | #include "resources.h" |
9 | #include "systemfile.h" | 9 | #include "systemfile.h" |
10 | 10 | ||
11 | #define TEMPLATEDIR "networktemplates/" | 11 | #define TEMPLATEDIR "NS2templates/" |
12 | QString TemplDir; | 12 | QString TemplDir; |
13 | 13 | ||
14 | SystemFile::SystemFile( const QString & N, | 14 | SystemFile::SystemFile( const QString & N, |
diff --git a/noncore/settings/networksettings2/opie-networksettings2.control b/noncore/settings/networksettings2/opie-networksettings2.control index 874833c..a79a740 100644 --- a/noncore/settings/networksettings2/opie-networksettings2.control +++ b/noncore/settings/networksettings2/opie-networksettings2.control | |||
@@ -1,5 +1,5 @@ | |||
1 | Package: opie-networksettings2 | 1 | Package: opie-networksettings2 |
2 | Files: bin/networksettings2 apps/Settings/networksettings2.desktop pics/networksettings2/*.png lib/libnetworksettings2.so* pics/networksettings2/Devices/*.png etc/NS2templates/* etc/NS2templates/*/* | 2 | Files: bin/networksettings2 apps/Settings/networksettings2.desktop pics/networksettings2/*.png lib/libnetworksettings2.so* pics/networksettings2/Devices/*.png etc/NS2templates/* etc/NS2templates/*/* bin/NS2SetMac.sh |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: wim delvaux <wimpie@handhelds.org> | 5 | Maintainer: wim delvaux <wimpie@handhelds.org> |
diff --git a/noncore/settings/networksettings2/opietooth2/OTDevice.h b/noncore/settings/networksettings2/opietooth2/OTDevice.h index c2abb09..cf1c4b6 100644 --- a/noncore/settings/networksettings2/opietooth2/OTDevice.h +++ b/noncore/settings/networksettings2/opietooth2/OTDevice.h | |||
@@ -16,8 +16,8 @@ class QTimerEvent; | |||
16 | namespace Opie { | 16 | namespace Opie { |
17 | namespace Core { | 17 | namespace Core { |
18 | class OProcess; | 18 | class OProcess; |
19 | } | 19 | }; |
20 | } | 20 | }; |
21 | 21 | ||
22 | namespace Opietooth2 { | 22 | namespace Opietooth2 { |
23 | 23 | ||
diff --git a/noncore/settings/networksettings2/opietooth2/OTDeviceAddress.h b/noncore/settings/networksettings2/opietooth2/OTDeviceAddress.h index 8395f37..50f28fc 100644 --- a/noncore/settings/networksettings2/opietooth2/OTDeviceAddress.h +++ b/noncore/settings/networksettings2/opietooth2/OTDeviceAddress.h | |||
@@ -103,6 +103,6 @@ protected: | |||
103 | 103 | ||
104 | }; | 104 | }; |
105 | 105 | ||
106 | } | 106 | }; |
107 | 107 | ||
108 | #endif | 108 | #endif |
diff --git a/noncore/settings/networksettings2/opietooth2/OTDriver.h b/noncore/settings/networksettings2/opietooth2/OTDriver.h index b54ffdf..f249cf7 100644 --- a/noncore/settings/networksettings2/opietooth2/OTDriver.h +++ b/noncore/settings/networksettings2/opietooth2/OTDriver.h | |||
@@ -228,5 +228,5 @@ private: | |||
228 | OTGateway * OT; | 228 | OTGateway * OT; |
229 | }; | 229 | }; |
230 | 230 | ||
231 | } | 231 | }; |
232 | #endif | 232 | #endif |
diff --git a/noncore/settings/networksettings2/opietooth2/OTIcons.h b/noncore/settings/networksettings2/opietooth2/OTIcons.h index ee10831..966ed24 100644 --- a/noncore/settings/networksettings2/opietooth2/OTIcons.h +++ b/noncore/settings/networksettings2/opietooth2/OTIcons.h | |||
@@ -49,6 +49,6 @@ private: | |||
49 | UUIDVector Networks; | 49 | UUIDVector Networks; |
50 | 50 | ||
51 | }; | 51 | }; |
52 | } | 52 | }; |
53 | 53 | ||
54 | #endif | 54 | #endif |
diff --git a/noncore/settings/networksettings2/opietooth2/OTInquiry.h b/noncore/settings/networksettings2/opietooth2/OTInquiry.h index f7bdeec..2682499 100644 --- a/noncore/settings/networksettings2/opietooth2/OTInquiry.h +++ b/noncore/settings/networksettings2/opietooth2/OTInquiry.h | |||
@@ -174,5 +174,5 @@ private slots: | |||
174 | 174 | ||
175 | }; | 175 | }; |
176 | 176 | ||
177 | } | 177 | }; |
178 | #endif | 178 | #endif |
diff --git a/noncore/settings/networksettings2/opietooth2/OTPeer.h b/noncore/settings/networksettings2/opietooth2/OTPeer.h index c09af15..9cd0dc7 100644 --- a/noncore/settings/networksettings2/opietooth2/OTPeer.h +++ b/noncore/settings/networksettings2/opietooth2/OTPeer.h | |||
@@ -130,6 +130,6 @@ private: | |||
130 | long ProbeTimeout; | 130 | long ProbeTimeout; |
131 | }; | 131 | }; |
132 | 132 | ||
133 | } | 133 | }; |
134 | 134 | ||
135 | #endif | 135 | #endif |
diff --git a/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.h b/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.h index e79e33d..86b5623 100644 --- a/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.h +++ b/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.h | |||
@@ -135,6 +135,6 @@ private: | |||
135 | 135 | ||
136 | }; | 136 | }; |
137 | 137 | ||
138 | } | 138 | }; |
139 | 139 | ||
140 | #endif | 140 | #endif |
diff --git a/noncore/settings/networksettings2/opietooth2/OTSDPService.h b/noncore/settings/networksettings2/opietooth2/OTSDPService.h index 4831df0..21d7344 100644 --- a/noncore/settings/networksettings2/opietooth2/OTSDPService.h +++ b/noncore/settings/networksettings2/opietooth2/OTSDPService.h | |||
@@ -70,6 +70,6 @@ private: | |||
70 | QArray<AttributeEntry> attributeList; | 70 | QArray<AttributeEntry> attributeList; |
71 | }; | 71 | }; |
72 | 72 | ||
73 | } | 73 | }; |
74 | 74 | ||
75 | #endif | 75 | #endif |
diff --git a/noncore/settings/networksettings2/opietooth2/OTUUID.h b/noncore/settings/networksettings2/opietooth2/OTUUID.h index aebd9b9..97df114 100644 --- a/noncore/settings/networksettings2/opietooth2/OTUUID.h +++ b/noncore/settings/networksettings2/opietooth2/OTUUID.h | |||
@@ -54,5 +54,5 @@ public : | |||
54 | uint64_t hi; | 54 | uint64_t hi; |
55 | uint64_t lo; | 55 | uint64_t lo; |
56 | }; | 56 | }; |
57 | } | 57 | }; |
58 | #endif | 58 | #endif |
diff --git a/noncore/settings/networksettings2/usb/usbrun.cpp b/noncore/settings/networksettings2/usb/usbrun.cpp index f8824e0..0a46642 100644 --- a/noncore/settings/networksettings2/usb/usbrun.cpp +++ b/noncore/settings/networksettings2/usb/usbrun.cpp | |||
@@ -71,7 +71,19 @@ State_t USBRun::detectState( void ) { | |||
71 | return Unavailable; | 71 | return Unavailable; |
72 | } | 72 | } |
73 | 73 | ||
74 | QString USBRun::setMyState( NodeCollection *, Action_t , bool ) { | 74 | QString USBRun::setMyState( NodeCollection * NC, Action_t A, bool ) { |
75 | |||
76 | // nothing needs to be done to 'activate' or 'deactivate' | ||
77 | // a cable | ||
78 | |||
79 | // perhaps (later) we can figure out if the device is IN the | ||
80 | // cradle | ||
81 | if( A == Activate ) { | ||
82 | NC->setCurrentState( Available ); | ||
83 | } else if ( A == Deactivate ) { | ||
84 | NC->setCurrentState( Unavailable ); | ||
85 | } | ||
86 | |||
75 | return QString(); | 87 | return QString(); |
76 | } | 88 | } |
77 | 89 | ||