author | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
commit | 55ea6367fba8a82fbdca74599422717e4b3c3ec6 (patch) (unidiff) | |
tree | b40bb13a1b4f05b4eda61cf0c4a02e32719a70c4 /core/settings/light-and-power | |
parent | 56ad1eb7fb39ddc78026a0df096703fcf42f5a94 (diff) | |
download | opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.zip opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.gz opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.bz2 |
merge core/settings/*
- light-and-power and security were a bit ugly, so I recommend someone
who actually dealt with these files looking into if I got it right
(not to tell about the frustratation about the fact that the ones who
dealt with these files didn't do the merge in the first place :(
Diffstat (limited to 'core/settings/light-and-power') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/light-and-power/light-and-power.pro | 5 | ||||
-rw-r--r-- | core/settings/light-and-power/light.h | 1 | ||||
-rw-r--r-- | core/settings/light-and-power/lightsettingsbase.ui | 16 | ||||
-rw-r--r-- | core/settings/light-and-power/main.cpp | 13 |
4 files changed, 13 insertions, 22 deletions
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro index 9304fa8..4972701 100644 --- a/core/settings/light-and-power/light-and-power.pro +++ b/core/settings/light-and-power/light-and-power.pro | |||
@@ -1,12 +1,11 @@ | |||
1 | TEMPLATE= app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on debug | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = light.h sensor.h calibration.h | 2 | HEADERS = light.h sensor.h calibration.h |
5 | SOURCES = light.cpp main.cpp sensor.cpp calibration.cpp | 3 | SOURCES = light.cpp main.cpp sensor.cpp calibration.cpp |
6 | INTERFACES= lightsettingsbase.ui sensorbase.ui | 4 | INTERFACES= lightsettingsbase.ui sensorbase.ui |
7 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH+= ../$(OPIEDIR)/include | 6 | DEPENDPATH+= ../$(OPIEDIR)/include |
9 | LIBS += -lqpe -lopie | 7 | LIBS += -lqpe -lopie |
8 | |||
10 | TARGET = light-and-power | 9 | TARGET = light-and-power |
11 | 10 | ||
12 | TRANSLATIONS = ../../../i18n/de/light-and-power.ts \ | 11 | TRANSLATIONS = ../../../i18n/de/light-and-power.ts \ |
diff --git a/core/settings/light-and-power/light.h b/core/settings/light-and-power/light.h index c48e5f6..83d5520 100644 --- a/core/settings/light-and-power/light.h +++ b/core/settings/light-and-power/light.h | |||
@@ -42,6 +42,7 @@ class LightSettings : public LightSettingsBase | |||
42 | public: | 42 | public: |
43 | LightSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 43 | LightSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
44 | ~LightSettings(); | 44 | ~LightSettings(); |
45 | static QString appName() { return QString::fromLatin1("light-and-power"); } | ||
45 | 46 | ||
46 | protected: | 47 | protected: |
47 | virtual void accept(); | 48 | virtual void accept(); |
diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui index 1f5d594..e4d5f0e 100644 --- a/core/settings/light-and-power/lightsettingsbase.ui +++ b/core/settings/light-and-power/lightsettingsbase.ui | |||
@@ -1263,11 +1263,11 @@ | |||
1263 | <images> | 1263 | <images> |
1264 | <image> | 1264 | <image> |
1265 | <name>image0</name> | 1265 | <name>image0</name> |
1266 | <data format="XPM.GZ" length="680">789c5dd04d6ac3301005e0bd4f21ec5d280931b1c0941ca1a5cb42e962a4194956e2d8f9e9a294debd9e9168ec3cbcd0f72ca1b1372bf5fef6a2569be27a835b67950d70512bfceafbef8fcffd4f516eb59a9e7aabb6e55351ae9555afc389787d9ed6556bdbb6b5cc2b1376d0c08e79115a0090b74326258e4cb333b591cd27a66d6c6d1b669fa9134988162c328f99945831b1c11a65f32153271a2121a0cc1c3329b16392a69a3413327562101201c9669f4989c874dad54e36bb4c9d6885ce8173f2df24158049abff0eec14a479371de1f859573944873e00dd3b8353ba18e3e1de1dbcf7d04d31b3b39033eb8e1052aad9bdc64be262bec0b784e5cc81c78387efe0ae5b767decba785a76c3380cc379d9ad2fe3787df82fb394bfcfc51f5517a686</data> | 1266 | <data format="XPM.GZ" length="1025">789c5dd2cd4ec2401846e13d57d1c08e18a58a20312e44f913419626c6c5cc500a42f92b60c178eff6bc2642fd0e8b79be0d43e945d17b1df4bce2452ede98cdc4796e6cd65e71b88da2fddbfbdd572eef57bcf4532e7b7efe2c973ff79cd75fcc03cefdf45ca859820368aa045f440d7c1287047b6240f0591c11ec425b22d881ce27d8122b0417a22138122dc17b51030f70582258107d821fe225c18d784d702b56092ec51b824eac11dc8b96e0a3e808c6a206b6c580e0270c4a0413d127b8162f09866299a011af095ab142b02e56093e8837049b628d6043d49f04e7a22518898ee04ed46f8013510303382a115c893ec1997845702a96098ec52ac1a168492fa4a660acfb3dfded2c0f37189deec2b16672b2fb98ce66d35934378be36eb94a671dc7f1e6b8dbee263bf39924c9feb83b84260cd3d73b5c1e77f7f587df399c7caf8b348f99fb357836cdec9d1bd374ead99d2e9d6477ad7692b43bd9dd53f7b9d7eb6777e72fddeee0df733999fcf76dee0748aaf77c</data> |
1267 | </image> | 1267 | </image> |
1268 | <image> | 1268 | <image> |
1269 | <name>image1</name> | 1269 | <name>image1</name> |
1270 | <data format="XPM.GZ" length="1220">789c5dd35f53e2301000f0773e4507de981ba4a5443a37f7a028fe41101514bcb987344d0515a8b4a0e0dc77bfee6e36d0dbe121bf4d48361b38aa3ae341cfa91e95d24c6633e5a8a95c39d5683d9f6f7ffff9f55d2abbc2c93fcd63c72dff28956b8e72facb8586f1733eae042a080205f480d2974de903eb4825a5c4d927434d9c30435c3c26861ed105863ef31118692584043e18cae306700ad43af27c9cbd00c622120d2cf8c350d65bc02b66230056984d0f786ea83d9c7d67fab89562d2b92ba2f6e8bb4343d10a81236680579086927a1532a957d7c898b7fa32146e1db865d28d7acc26def7de50b6b0aa3b4b2ce3cc507bb8d58c498b0796b8386252cd1b62ec51199f96d8c95326f5aacfa49d6f99b455db50d0e235935ea1c3a43e279678c14ba6c0e62c99f40a5d4bbcc21b931afbc20c23e0c250d2e21b26d5bcb3c4d913265d21b5c417cc9874d09c49bfd857c358e1b931530ba0b6c4ff510da3224345239b8b74bee6657a989bbd62bc1de4dee7108b65f2b1cfadd22ccdd69bcde7d73eb7dd9dec92d376bb7db6cf9d77924e02b1dde72e2e4d5c1d9c7bddbdc9a3db2bd4d74ff3e8176bbe856206c5dc1d947c5fcc3d0c47a3e16331f7349e4c26cfc55cadeebade7f7d3988f2df9fa57f7da120b4</data> | 1270 | <data format="XPM.GZ" length="1885">789c75d4576fdb301000e077ff0ac17c0b8a8bad49a2e843f61ece4e8a3e481cde198eb3d1ff5eeaeecca675ecb3047cd68922ef282f2f4557c707d1d272e3715a4efb3ad2bd72122d99a7f1f8ede7af1f1f8d663b8ffcb75051dcfcd66876a6918e0eef6e6d0d31f010aaf2a1d1e3da6551077a88c60fdaa14d694b87eea36d692b1c5cf4d88edd45bbaa5525e8516d2f1f685bdb289de7065da28dae8aac36e0f8d69a38add067b55d6cb224470bb6cc52f4153a316582f9c2906d2a255ed7e8d4b882d65791fd7585d79fd199512dac071cb0758cf383db99539a3f8d97d95ca1e1059ddb386ba3713daeb04a61bda0629725adef1a2d6d92517d045b4a346ca295cd12ca3f65e7ec36bbc8b03f60d85a513d24dab74752fd36d0952ddad81f18b0353faf605b89fb037a649756b4fe0cad5dace8f9fb6863754c4ec92e96e4989d48ead7989df2facfd1d66539d5ef929de734bf55b473719bee5f0bc6fec17a30f577979d70bff6d8694ceb599939a1fc437696d2f8c7c1347e2798f28f8269bf3c05d37ed909a67e9fb073beff62e69cfa336517bcdf6f8269be8f6c59d07a5a334baad756308dbf3db3a2fa256c45ef37bcb34b45e3bd06d37cdf662e69fc8799e97d86fb609aff2498ea77174cf5cbd9155d17c0d69aeaa78269ff8e8269bf0e83a91e8e6d2c3dafcbb66c1b2ce9cfee6f8080122ad09f7ffb37070c58703ebad083fe57393080218cfc41e7f17c0edcc21ddcc3034cfcf911a6f004cf73392ff00a6ff0ee8f1558853558878db99c4dd8826d7fecc02eec61eccfe51cc0211cc13174e004a303a7733967700e179fe212aebe58d735dc408be306da0bea1343c2912eac6106b95ffbc49f8b85391294afdf4880108b7244292aa17d186117e638d1153dd1f7315894e3b38662e463fcf9b7ff73be8ae6efef8d3f188ce126</data> |
1271 | </image> | 1271 | </image> |
1272 | </images> | 1272 | </images> |
1273 | <connections> | 1273 | <connections> |
@@ -1287,20 +1287,20 @@ | |||
1287 | <slot access="public">calibrateSensorAC()</slot> | 1287 | <slot access="public">calibrateSensorAC()</slot> |
1288 | </connections> | 1288 | </connections> |
1289 | <tabstops> | 1289 | <tabstops> |
1290 | <tabstop>brightness</tabstop> | ||
1290 | <tabstop>interval_dim</tabstop> | 1291 | <tabstop>interval_dim</tabstop> |
1291 | <tabstop>interval_lightoff</tabstop> | 1292 | <tabstop>interval_lightoff</tabstop> |
1292 | <tabstop>interval_suspend</tabstop> | 1293 | <tabstop>interval_suspend</tabstop> |
1293 | <tabstop>LcdOffOnly</tabstop> | 1294 | <tabstop>LcdOffOnly</tabstop> |
1294 | <tabstop>brightness</tabstop> | ||
1295 | <tabstop>auto_brightness</tabstop> | 1295 | <tabstop>auto_brightness</tabstop> |
1296 | <tabstop>CalibrateLightSensor</tabstop> | 1296 | <tabstop>CalibrateLightSensor</tabstop> |
1297 | <tabstop>brightness</tabstop> | ||
1297 | <tabstop>tabs</tabstop> | 1298 | <tabstop>tabs</tabstop> |
1298 | <tabstop>interval_lightoff_ac</tabstop> | 1299 | <tabstop>interval_lightoff</tabstop> |
1299 | <tabstop>interval_suspend_ac</tabstop> | 1300 | <tabstop>interval_suspend</tabstop> |
1300 | <tabstop>interval_dim_ac</tabstop> | 1301 | <tabstop>interval_dim</tabstop> |
1301 | <tabstop>LcdOffOnly_ac</tabstop> | 1302 | <tabstop>LcdOffOnly_ac</tabstop> |
1302 | <tabstop>brightness_ac</tabstop> | 1303 | <tabstop>auto_brightness</tabstop> |
1303 | <tabstop>auto_brightness_ac</tabstop> | ||
1304 | <tabstop>CalibrateLightSensor_ac</tabstop> | 1304 | <tabstop>CalibrateLightSensor_ac</tabstop> |
1305 | <tabstop>lowSpinBox</tabstop> | 1305 | <tabstop>lowSpinBox</tabstop> |
1306 | <tabstop>warnintervalBox</tabstop> | 1306 | <tabstop>warnintervalBox</tabstop> |
diff --git a/core/settings/light-and-power/main.cpp b/core/settings/light-and-power/main.cpp index ecacf69..68d433b 100644 --- a/core/settings/light-and-power/main.cpp +++ b/core/settings/light-and-power/main.cpp | |||
@@ -23,16 +23,7 @@ | |||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <qpe/qcopenvelope_qws.h> | 24 | #include <qpe/qcopenvelope_qws.h> |
25 | #include <qpe/global.h> | 25 | #include <qpe/global.h> |
26 | #include <opie/oapplicationfactory.h> | ||
26 | 27 | ||
27 | 28 | ||
28 | int main(int argc, char** argv) | 29 | OPIE_EXPORT_APP( OApplicationFactory<LightSettings> ) |
29 | { | ||
30 | QPEApplication a(argc,argv); | ||
31 | |||
32 | LightSettings dlg; | ||
33 | |||
34 | a.showMainWidget(&dlg); | ||
35 | |||
36 | return a.exec(); | ||
37 | } | ||
38 | |||