summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-11-06 10:17:45 (UTC)
committer mickeyl <mickeyl>2003-11-06 10:17:45 (UTC)
commit55ea6367fba8a82fbdca74599422717e4b3c3ec6 (patch) (side-by-side diff)
treeb40bb13a1b4f05b4eda61cf0c4a02e32719a70c4
parent56ad1eb7fb39ddc78026a0df096703fcf42f5a94 (diff)
downloadopie-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 (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/button/button.pro9
-rw-r--r--core/settings/button/buttonsettings.cpp66
-rw-r--r--core/settings/button/buttonsettings.h3
-rw-r--r--core/settings/button/main.cpp16
-rw-r--r--core/settings/citytime/citytime.h2
-rw-r--r--core/settings/citytime/citytime.pro8
-rw-r--r--core/settings/citytime/main.cpp9
-rw-r--r--core/settings/launcher/launcher.pro4
-rw-r--r--core/settings/launcher/launchersettings.cpp3
-rw-r--r--core/settings/launcher/launchersettings.h3
-rw-r--r--core/settings/launcher/main.cpp12
-rw-r--r--core/settings/launcher/menusettings.cpp18
-rw-r--r--core/settings/launcher/menusettings.h2
-rw-r--r--core/settings/launcher/tabssettings.cpp10
-rw-r--r--core/settings/launcher/tabssettings.h2
-rw-r--r--core/settings/light-and-power/light-and-power.pro5
-rw-r--r--core/settings/light-and-power/light.h1
-rw-r--r--core/settings/light-and-power/lightsettingsbase.ui16
-rw-r--r--core/settings/light-and-power/main.cpp13
-rw-r--r--core/settings/security/main.cpp10
-rw-r--r--core/settings/security/security.cpp5
-rw-r--r--core/settings/security/security.h1
-rw-r--r--core/settings/security/security.pro4
-rw-r--r--core/settings/security/securitybase.ui2
24 files changed, 94 insertions, 130 deletions
diff --git a/core/settings/button/button.pro b/core/settings/button/button.pro
index b10b619..e1c6724 100644
--- a/core/settings/button/button.pro
+++ b/core/settings/button/button.pro
@@ -1,6 +1,5 @@
-TEMPLATE = app
-CONFIG += qt warn_on release
-DESTDIR = $(OPIEDIR)/bin
+CONFIG += qt warn_on release quick-app
+
HEADERS = buttonsettings.h \
buttonutils.h \
remapdlg.h
@@ -15,7 +14,7 @@ INTERFACES = remapdlgbase.ui
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopie
-TARGET = buttonsettings
+TARGET = buttonsettings
TRANSLATIONS = ../../../i18n/de/buttonsettings.ts \
../../../i18n/nl/buttonsettings.ts \
@@ -35,6 +34,4 @@ TRANSLATIONS = ../../../i18n/de/buttonsettings.ts \
../../../i18n/zh_TW/buttonsettings.ts \
../../../i18n/da/buttonsettings.ts
-
-
include ( $(OPIEDIR)/include.pro )
diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp
index 942d5e4..b6a07a8 100644
--- a/core/settings/button/buttonsettings.cpp
+++ b/core/settings/button/buttonsettings.cpp
@@ -15,7 +15,7 @@
    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
..}^=.=       =       ; Public License for more details.
-++=   -.     .`     .:
+++=   -.     .`     .:
 :     =  ...= . :.=- You should have received a copy of the GNU
 -.   .:....=;==+<; General Public License along with this file;
  -_. . .   )=.  = see the file COPYING. If not, write to the
@@ -50,13 +50,13 @@ struct buttoninfo {
OQCopMessage m_hmsg;
QLabel *m_hicon;
QLabel *m_hlabel;
-
+
bool m_pdirty : 1;
bool m_hdirty : 1;
};
-ButtonSettings::ButtonSettings ( )
+ButtonSettings::ButtonSettings ( QWidget *parent , const char *name, bool modal, WFlags f )
: QDialog ( 0, "ButtonSettings", false, WStyle_ContextHelp )
{
const QValueList <ODeviceButton> &buttons = ODevice::inst ( )-> buttons ( );
@@ -65,10 +65,10 @@ ButtonSettings::ButtonSettings ( )
setCaption ( tr( "Button Settings" ));
QVBoxLayout *toplay = new QVBoxLayout ( this, 3, 3 );
-
+
QLabel *l = new QLabel ( tr( "<center>Press or hold the button you want to remap.</center>" ), this );
toplay-> addWidget ( l );
-
+
QGridLayout *lay = new QGridLayout ( toplay );
lay-> setMargin ( 0 );
lay-> setColStretch ( 0, 0 );
@@ -77,7 +77,7 @@ ButtonSettings::ButtonSettings ( )
lay-> setColStretch ( 3, 10 );
m_infos. setAutoDelete ( true );
-
+
int i = 1;
int index = 0;
for ( QValueList<ODeviceButton>::ConstIterator it = buttons. begin ( ); it != buttons. end ( ); it++ ) {
@@ -95,17 +95,17 @@ ButtonSettings::ButtonSettings ( )
bi-> m_hmsg = (*it). heldAction ( );
bi-> m_pdirty = false;
bi-> m_hdirty = false;
-
+
l = new QLabel ( this );
l-> setPixmap (( *it ). pixmap ( ));
-
+
lay-> addMultiCellWidget ( l, i, i + 1, 0, 0 );
-
+
l = new QLabel ( tr( "Press:" ), this );
lay-> addWidget ( l, i, 1, AlignLeft | AlignBottom );
l = new QLabel ( tr( "Hold:" ), this );
lay-> addWidget ( l, i + 1, 1, AlignLeft | AlignTop );
-
+
l = new QLabel ( this );
l-> setFixedSize ( 16, 16 );
lay-> addWidget ( l, i, 2, AlignLeft | AlignBottom );
@@ -115,7 +115,7 @@ ButtonSettings::ButtonSettings ( )
l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
lay-> addWidget ( l, i, 3, AlignLeft | AlignBottom );
bi-> m_plabel = l;
-
+
l = new QLabel ( this );
l-> setFixedSize ( 16, 16 );
lay-> addWidget ( l, i + 1, 2, AlignLeft | AlignTop );
@@ -125,22 +125,22 @@ ButtonSettings::ButtonSettings ( )
l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
lay-> addWidget ( l, i + 1, 3, AlignLeft | AlignTop );
bi-> m_hlabel = l;
-
+
i += 2;
-
+
m_infos. append ( bi );
- }
+ }
toplay-> addStretch ( 10 );
m_last_button = 0;
m_lock = false;
-
+
m_timer = new QTimer ( this );
connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( keyTimeout ( )));
- updateLabels ( );
-
+ updateLabels ( );
+
QPEApplication::grabKeyboard ( );
}
@@ -153,7 +153,7 @@ void ButtonSettings::updateLabels ( )
{
for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) {
qCopInfo cip = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_pmsg );
-
+
(*it)-> m_picon-> setPixmap ( cip. m_icon );
(*it)-> m_plabel-> setText ( cip. m_name );
@@ -168,16 +168,16 @@ buttoninfo *ButtonSettings::buttonInfoForKeycode ( ushort key )
{
for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) {
if ((*it)-> m_button-> keycode ( ) == key )
- return *it;
- }
- return 0;
+ return *it;
+ }
+ return 0;
}
void ButtonSettings::keyPressEvent ( QKeyEvent *e )
{
buttoninfo *bi = buttonInfoForKeycode ( e-> key ( ));
-
- if ( bi && !e-> isAutoRepeat ( )) {
+
+ if ( bi && !e-> isAutoRepeat ( )) {
m_timer-> stop ( );
m_last_button = bi;
m_timer-> start ( ODevice::inst ( )-> buttonHoldTime ( ), true );
@@ -189,10 +189,10 @@ void ButtonSettings::keyPressEvent ( QKeyEvent *e )
void ButtonSettings::keyReleaseEvent ( QKeyEvent *e )
{
buttoninfo *bi = buttonInfoForKeycode ( e-> key ( ));
-
+
if ( bi && !e-> isAutoRepeat ( ) && m_timer-> isActive ( )) {
m_timer-> stop ( );
- edit ( bi, false );
+ edit ( bi, false );
}
else
QDialog::keyReleaseEvent ( e );
@@ -208,17 +208,17 @@ void ButtonSettings::keyTimeout ( )
void ButtonSettings::edit ( buttoninfo *bi, bool hold )
{
-
+
if ( m_lock )
return;
m_lock = true;
-
+
RemapDlg *d = new RemapDlg ( bi-> m_button, hold, this );
- d-> showMaximized ( );
+ d-> showMaximized ( );
if ( d-> exec ( ) == QDialog::Accepted ) {
-
+
if ( hold ) {
bi-> m_hmsg = d-> message ( );
bi-> m_hdirty = true;
@@ -227,12 +227,12 @@ void ButtonSettings::edit ( buttoninfo *bi, bool hold )
bi-> m_pmsg = d-> message ( );
bi-> m_pdirty = true;
}
-
+
updateLabels ( );
}
-
+
delete d;
-
+
m_lock = false;
}
@@ -240,7 +240,7 @@ void ButtonSettings::accept ( )
{
for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) {
buttoninfo *bi = *it;
-
+
if ( bi-> m_pdirty )
ODevice::inst ( )-> remapPressedAction ( bi-> m_index, bi-> m_pmsg );
if ( bi-> m_hdirty )
diff --git a/core/settings/button/buttonsettings.h b/core/settings/button/buttonsettings.h
index d41a209..67694d3 100644
--- a/core/settings/button/buttonsettings.h
+++ b/core/settings/button/buttonsettings.h
@@ -42,9 +42,10 @@ class ButtonSettings : public QDialog {
Q_OBJECT
public:
- ButtonSettings ( );
+ ButtonSettings ( QWidget *parent = 0, const char *name = 0, bool modal = FALSE,WFlags f = 0 );
~ButtonSettings ( );
+ static QString appName() { return QString::fromLatin1("buttonsettings"); }
virtual void accept ( );
virtual void done ( int r );
diff --git a/core/settings/button/main.cpp b/core/settings/button/main.cpp
index db274f8..c063c3c 100644
--- a/core/settings/button/main.cpp
+++ b/core/settings/button/main.cpp
@@ -15,7 +15,7 @@
    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
..}^=.=       =       ; Public License for more details.
-++=   -.     .`     .:
+++=   -.     .`     .:
 :     =  ...= . :.=- You should have received a copy of the GNU
 -.   .:....=;==+<; General Public License along with this file;
  -_. . .   )=.  = see the file COPYING. If not, write to the
@@ -28,16 +28,6 @@
#include "buttonsettings.h"
#include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
-
-int main ( int argc, char** argv )
-{
- QPEApplication a ( argc,argv );
-
- ButtonSettings dlg;
- a. showMainWidget ( &dlg );
- dlg. showMaximized ( );
-
- return a. exec ( );
-}
-
+OPIE_EXPORT_APP( OApplicationFactory<ButtonSettings> )
diff --git a/core/settings/citytime/citytime.h b/core/settings/citytime/citytime.h
index 63e3102..cc3d487 100644
--- a/core/settings/citytime/citytime.h
+++ b/core/settings/citytime/citytime.h
@@ -36,7 +36,7 @@ class CityTime : public CityTimeBase
public:
CityTime(QWidget* parent = 0, const char *name = 0, WFlags fl = 0);
~CityTime();
-
+ static QString appName() { return QString::fromLatin1("citytime"); }
public slots:
void beginNewTz();
void slotNewTz( const QString& strNewCountry, const QString& strNewCity );
diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro
index c7f4d08..402bcf6 100644
--- a/core/settings/citytime/citytime.pro
+++ b/core/settings/citytime/citytime.pro
@@ -1,14 +1,12 @@
-CONFIG += qt warn_on release
-TEMPLATE = app
-DESTDIR = $(OPIEDIR)/bin
-#INTERFACES = citytimebase.ui
+CONFIG += qt warn_on release quick-app
HEADERS = citytime.h citytimebase.h zonemap.h sun.h stylusnormalizer.h
SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp
-TARGET = citytime
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
+TARGET = citytime
+
TRANSLATIONS = ../../../i18n/de/citytime.ts \
../../../i18n/nl/citytime.ts \
../../../i18n/xx/citytime.ts \
diff --git a/core/settings/citytime/main.cpp b/core/settings/citytime/main.cpp
index e8664c6..69bfe44 100644
--- a/core/settings/citytime/main.cpp
+++ b/core/settings/citytime/main.cpp
@@ -20,11 +20,6 @@
#include "citytime.h"
#include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
-int main( int argc, char** argv )
-{
- QPEApplication a( argc, argv );
- CityTime main;
- a.showMainWidget( &main );
- return a.exec();
-}
+OPIE_EXPORT_APP( OApplicationFactory<CityTime> )
diff --git a/core/settings/launcher/launcher.pro b/core/settings/launcher/launcher.pro
index cea268d..9d05832 100644
--- a/core/settings/launcher/launcher.pro
+++ b/core/settings/launcher/launcher.pro
@@ -1,6 +1,4 @@
-TEMPLATE = app
-CONFIG += qt warn_on release
-DESTDIR = $(OPIEDIR)/bin
+CONFIG += qt warn_on release quick-app
HEADERS = launchersettings.h \
tabssettings.h \
taskbarsettings.h \
diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp
index 3982194..efc4a86 100644
--- a/core/settings/launcher/launchersettings.cpp
+++ b/core/settings/launcher/launchersettings.cpp
@@ -37,7 +37,8 @@
#include "taskbarsettings.h"
#include "inputmethodsettings.h"
-LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp )
+LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags)
+ : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp )
{
setCaption ( tr( "Launcher Settings" ));
diff --git a/core/settings/launcher/launchersettings.h b/core/settings/launcher/launchersettings.h
index 71165a3..7458d8b 100644
--- a/core/settings/launcher/launchersettings.h
+++ b/core/settings/launcher/launchersettings.h
@@ -39,7 +39,8 @@ class LauncherSettings : public QDialog {
Q_OBJECT
public:
- LauncherSettings ( );
+ static QString appName() { return QString::fromLatin1("launchersettings"); }
+ LauncherSettings (QWidget *parent = 0, const char* name = 0, WFlags fl = 0 );
virtual void accept ( );
virtual void done ( int r );
diff --git a/core/settings/launcher/main.cpp b/core/settings/launcher/main.cpp
index f65dab8..4cc1d35 100644
--- a/core/settings/launcher/main.cpp
+++ b/core/settings/launcher/main.cpp
@@ -28,16 +28,8 @@
#include "launchersettings.h"
#include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
+OPIE_EXPORT_APP( OApplicationFactory<LauncherSettings> )
-int main ( int argc, char** argv )
-{
- QPEApplication a ( argc,argv );
-
- LauncherSettings dlg;
- a. showMainWidget ( &dlg );
- dlg. showMaximized ( );
-
- return a. exec ( );
-}
diff --git a/core/settings/launcher/menusettings.cpp b/core/settings/launcher/menusettings.cpp
index 6fca621..faa7cf4 100644
--- a/core/settings/launcher/menusettings.cpp
+++ b/core/settings/launcher/menusettings.cpp
@@ -16,7 +16,7 @@
    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
..}^=.=       =       ; Public License for more details.
-++=   -.     .`     .:
+++=   -.     .`     .:
 :     =  ...= . :.=- You should have received a copy of the GNU
 -.   .:....=;==+<; General Public License along with this file;
  -_. . .   )=.  = see the file COPYING. If not, write to the
@@ -60,10 +60,13 @@ MenuSettings::MenuSettings ( QWidget *parent, const char *name )
m_list-> header ( )-> hide ( );
lay-> addWidget ( m_list );
-
+
m_menutabs = new QCheckBox ( tr( "Show Launcher tabs in O-Menu" ), this );
lay-> addWidget ( m_menutabs );
+ m_menusubpopup = new QCheckBox ( tr( "Show Applications in subpopups" ), this );
+ lay-> addWidget ( m_menusubpopup );
+
QWhatsThis::add ( m_list, tr( "Check the applets that you want to have included in the O-Menu." ));
QWhatsThis::add ( m_menutabs, tr( "Adds the contents of the Launcher Tabs as menus in the O-Menu." ));
@@ -119,6 +122,7 @@ void MenuSettings::init ( )
cfg. setGroup ( "Menu" );
m_menutabs-> setChecked ( cfg. readBoolEntry ( "LauncherTabs", true ));
+ m_menusubpopup-> setChecked ( cfg. readBoolEntry ( "LauncherSubPopup", true ));
}
void MenuSettings::appletChanged()
@@ -149,7 +153,12 @@ void MenuSettings::accept ( )
apps_changed = true;
cfg. writeEntry ( "LauncherTabs", m_menutabs-> isChecked ( ));
}
-
+
+ if ( m_menusubpopup-> isChecked ( ) != cfg. readBoolEntry ( "LauncherSubPopup", true )) {
+ apps_changed = true;
+ cfg. writeEntry ( "LauncherSubPopup", m_menusubpopup-> isChecked ( ));
+ }
+
cfg. write ( );
if ( m_applets_changed ) {
@@ -157,7 +166,10 @@ void MenuSettings::accept ( )
m_applets_changed = false;
}
if ( apps_changed ) {
+ // currently use reloadApplets() since reloadApps is now used exclusive for server
+ // to refresh the tabs. But what we want here is also a refresh of the startmenu entries
QCopEnvelope ( "QPE/TaskBar", "reloadApps()" );
+ QCopEnvelope ( "QPE/TaskBar", "reloadApplets()" );
}
}
diff --git a/core/settings/launcher/menusettings.h b/core/settings/launcher/menusettings.h
index 5986958..5bb7afa 100644
--- a/core/settings/launcher/menusettings.h
+++ b/core/settings/launcher/menusettings.h
@@ -54,7 +54,7 @@ private:
QListView *m_list;
QMap <QString, QCheckListItem *> m_applets;
bool m_applets_changed;
- QCheckBox *m_menutabs;
+ QCheckBox *m_menutabs, *m_menusubpopup;
};
#endif
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp
index 7cd00bd..3d8b456 100644
--- a/core/settings/launcher/tabssettings.cpp
+++ b/core/settings/launcher/tabssettings.cpp
@@ -81,8 +81,8 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name )
m_bigbusy = new QCheckBox( tr( "Enable big busy indicator" ), this );
lay-> addMultiCellWidget ( m_bigbusy, 5, 5, 0, 1 );
- m_busyblink = new QCheckBox ( tr( "Enable blinking busy indicator" ), this );
- lay-> addMultiCellWidget ( m_busyblink, 6, 6, 0, 1 );
+ m_busyani = new QCheckBox ( tr( "Enable animated busy indicator" ), this );
+ lay-> addMultiCellWidget ( m_busyani, 6, 6, 0, 1 );
p1-> setEnabled ( false );
p3-> setEnabled ( false );
@@ -94,7 +94,7 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name )
QWhatsThis::add ( p2, tr( "Opens a new dialog to customize the select Tab." ));
QWhatsThis::add ( p3, tr( "Deletes a Tab from the Launcher." ) + QString ( "<center><br><i>not yet implemented</i><br>Please use the tabmanager</center>." ));
QWhatsThis::add ( m_bigbusy, tr( "Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar." ));
- QWhatsThis::add ( m_busyblink, tr( "Activate this, if you want a blinking busy indicator for starting applications in the Launcher." ));
+ QWhatsThis::add ( m_busyani, tr( "Activate this, if you want an animatedbusy indicator for starting applications in the Launcher." ));
}
void TabsSettings::init ( )
@@ -120,7 +120,7 @@ void TabsSettings::init ( )
readTabSettings ( cfg );
cfg. setGroup ( "GUI" );
- m_busyblink-> setChecked ( cfg. readEntry ( "BusyType" ). lower ( ) == "blink" );
+ m_busyani-> setChecked ( cfg. readEntry ( "BusyType" ). lower ( ) == "animated" );
m_bigbusy->setChecked( cfg. readBoolEntry ( "BigBusy" ) );
}
@@ -264,7 +264,7 @@ void TabsSettings::accept ( )
tc. m_changed = false;
}
cfg. setGroup ( "GUI" );
- QString busytype = QString ( m_busyblink-> isChecked ( ) ? "blink" : "" );
+ QString busytype = QString ( m_busyani-> isChecked ( ) ? "Animated" : "" );
cfg. writeEntry ( "BusyType", busytype );
cfg. writeEntry ( "BigBusy", m_bigbusy->isChecked( ) );
diff --git a/core/settings/launcher/tabssettings.h b/core/settings/launcher/tabssettings.h
index 439def6..600c65c 100644
--- a/core/settings/launcher/tabssettings.h
+++ b/core/settings/launcher/tabssettings.h
@@ -59,7 +59,7 @@ private:
// QString currentTab;
QStringList m_ids;
QMap <QString, TabConfig> m_tabs;
- QCheckBox *m_busyblink, *m_bigbusy;
+ QCheckBox *m_busyani, *m_bigbusy;
};
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 @@
-TEMPLATE = app
-CONFIG += qt warn_on debug
-DESTDIR = $(OPIEDIR)/bin
+CONFIG += qt warn_on release quick-app
HEADERS = light.h sensor.h calibration.h
SOURCES = light.cpp main.cpp sensor.cpp calibration.cpp
INTERFACES = lightsettingsbase.ui sensorbase.ui
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += ../$(OPIEDIR)/include
LIBS += -lqpe -lopie
+
TARGET = light-and-power
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
public:
LightSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~LightSettings();
+ static QString appName() { return QString::fromLatin1("light-and-power"); }
protected:
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 @@
<images>
<image>
<name>image0</name>
- <data format="XPM.GZ" length="680">789c5dd04d6ac3301005e0bd4f21ec5d280931b1c0941ca1a5cb42e962a4194956e2d8f9e9a294debd9e9168ec3cbcd0f72ca1b1372bf5fef6a2569be27a835b67950d70512bfceafbef8fcffd4f516eb59a9e7aabb6e55351ae9555afc389787d9ed6556bdbb6b5cc2b1376d0c08e79115a0090b74326258e4cb333b591cd27a66d6c6d1b669fa9134988162c328f99945831b1c11a65f32153271a2121a0cc1c3329b16392a69a3413327562101201c9669f4989c874dad54e36bb4c9d6885ce8173f2df24158049abff0eec14a479371de1f859573944873e00dd3b8353ba18e3e1de1dbcf7d04d31b3b39033eb8e1052aad9bdc64be262bec0b784e5cc81c78387efe0ae5b767decba785a76c3380cc379d9ad2fe3787df82fb394bfcfc51f5517a686</data>
+ <data format="XPM.GZ" length="1025">789c5dd2cd4ec2401846e13d57d1c08e18a58a20312e44f913419626c6c5cc500a42f92b60c178eff6bc2642fd0e8b79be0d43e945d17b1df4bce2452ede98cdc4796e6cd65e71b88da2fddbfbdd572eef57bcf4532e7b7efe2c973ff79cd75fcc03cefdf45ca859820368aa045f440d7c1287047b6240f0591c11ec425b22d881ce27d8122b0417a22138122dc17b51030f70582258107d821fe225c18d784d702b56092ec51b824eac11dc8b96e0a3e808c6a206b6c580e0270c4a0413d127b8162f09866299a011af095ab142b02e56093e8837049b628d6043d49f04e7a22518898ee04ed46f8013510303382a115c893ec1997845702a96098ec52ac1a168492fa4a660acfb3dfded2c0f37189deec2b16672b2fb98ce66d35934378be36eb94a671dc7f1e6b8dbee263bf39924c9feb83b84260cd3d73b5c1e77f7f587df399c7caf8b348f99fb357836cdec9d1bd374ead99d2e9d6477ad7692b43bd9dd53f7b9d7eb6777e72fddeee0df733999fcf76dee0748aaf77c</data>
</image>
<image>
<name>image1</name>
- <data format="XPM.GZ" length="1220">789c5dd35f53e2301000f0773e4507de981ba4a5443a37f7a028fe41101514bcb987344d0515a8b4a0e0dc77bfee6e36d0dbe121bf4d48361b38aa3ae341cfa91e95d24c6633e5a8a95c39d5683d9f6f7ffff9f55d2abbc2c93fcd63c72dff28956b8e72facb8586f1733eae042a080205f480d2974de903eb4825a5c4d927434d9c30435c3c26861ed105863ef31118692584043e18cae306700ad43af27c9cbd00c622120d2cf8c350d65bc02b66230056984d0f786ea83d9c7d67fab89562d2b92ba2f6e8bb4343d10a81236680579086927a1532a957d7c898b7fa32146e1db865d28d7acc26def7de50b6b0aa3b4b2ce3cc507bb8d58c498b0796b8386252cd1b62ec51199f96d8c95326f5aacfa49d6f99b455db50d0e235935ea1c3a43e279678c14ba6c0e62c99f40a5d4bbcc21b931afbc20c23e0c250d2e21b26d5bcb3c4d913265d21b5c417cc9874d09c49bfd857c358e1b931530ba0b6c4ff510da3224345239b8b74bee6657a989bbd62bc1de4dee7108b65f2b1cfadd22ccdd69bcde7d73eb7dd9dec92d376bb7db6cf9d77924e02b1dde72e2e4d5c1d9c7bddbdc9a3db2bd4d74ff3e8176bbe856206c5dc1d947c5fcc3d0c47a3e16331f7349e4c26cfc55cadeebade7f7d3988f2df9fa57f7da120b4</data>
+ <data format="XPM.GZ" length="1885">789c75d4576fdb301000e077ff0ac17c0b8a8bad49a2e843f61ece4e8a3e481cde198eb3d1ff5eeaeecca675ecb3047cd68922ef282f2f4557c707d1d272e3715a4efb3ad2bd72122d99a7f1f8ede7af1f1f8d663b8ffcb75051dcfcd66876a6918e0eef6e6d0d31f010aaf2a1d1e3da6551077a88c60fdaa14d694b87eea36d692b1c5cf4d88edd45bbaa5525e8516d2f1f685bdb289de7065da28dae8aac36e0f8d69a38add067b55d6cb224470bb6cc52f4153a316582f9c2906d2a255ed7e8d4b882d65791fd7585d79fd199512dac071cb0758cf383db99539a3f8d97d95ca1e1059ddb386ba3713daeb04a61bda0629725adef1a2d6d92517d045b4a346ca295cd12ca3f65e7ec36bbc8b03f60d85a513d24dab74752fd36d0952ddad81f18b0353faf605b89fb037a649756b4fe0cad5dace8f9fb6863754c4ec92e96e4989d48ead7989df2facfd1d66539d5ef929de734bf55b473719bee5f0bc6fec17a30f577979d70bff6d8694ceb599939a1fc437696d2f8c7c1347e2798f28f8269bf3c05d37ed909a67e9fb073beff62e69cfa336517bcdf6f8269be8f6c59d07a5a334baad756308dbf3db3a2fa256c45ef37bcb34b45e3bd06d37cdf662e69fc8799e97d86fb609aff2498ea77174cf5cbd9155d17c0d69aeaa78269ff8e8269bf0e83a91e8e6d2c3dafcbb66c1b2ce9cfee6f8080122ad09f7ffb37070c58703ebad083fe57393080218cfc41e7f17c0edcc21ddcc3034cfcf911a6f004cf73392ff00a6ff0ee8f1558853558878db99c4dd8826d7fecc02eec61eccfe51cc0211cc13174e004a303a7733967700e179fe212aebe58d735dc408be306da0bea1343c2912eac6106b95ffbc49f8b85391294afdf4880108b7244292aa17d186117e638d1153dd1f7315894e3b38662e463fcf9b7ff73be8ae6efef8d3f188ce126</data>
</image>
</images>
<connections>
@@ -1287,20 +1287,20 @@
<slot access="public">calibrateSensorAC()</slot>
</connections>
<tabstops>
+ <tabstop>brightness</tabstop>
<tabstop>interval_dim</tabstop>
<tabstop>interval_lightoff</tabstop>
<tabstop>interval_suspend</tabstop>
<tabstop>LcdOffOnly</tabstop>
- <tabstop>brightness</tabstop>
<tabstop>auto_brightness</tabstop>
<tabstop>CalibrateLightSensor</tabstop>
+ <tabstop>brightness</tabstop>
<tabstop>tabs</tabstop>
- <tabstop>interval_lightoff_ac</tabstop>
- <tabstop>interval_suspend_ac</tabstop>
- <tabstop>interval_dim_ac</tabstop>
+ <tabstop>interval_lightoff</tabstop>
+ <tabstop>interval_suspend</tabstop>
+ <tabstop>interval_dim</tabstop>
<tabstop>LcdOffOnly_ac</tabstop>
- <tabstop>brightness_ac</tabstop>
- <tabstop>auto_brightness_ac</tabstop>
+ <tabstop>auto_brightness</tabstop>
<tabstop>CalibrateLightSensor_ac</tabstop>
<tabstop>lowSpinBox</tabstop>
<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 @@
#include <qpe/qpeapplication.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/global.h>
+#include <opie/oapplicationfactory.h>
-int main(int argc, char** argv)
-{
- QPEApplication a(argc,argv);
-
- LightSettings dlg;
-
- a.showMainWidget(&dlg);
-
- return a.exec();
-}
-
+OPIE_EXPORT_APP( OApplicationFactory<LightSettings> )
diff --git a/core/settings/security/main.cpp b/core/settings/security/main.cpp
index c15bb31..3141fb8 100644
--- a/core/settings/security/main.cpp
+++ b/core/settings/security/main.cpp
@@ -24,15 +24,9 @@
#include "security.h"
+#include <opie/oapplicationfactory.h>
-int main(int argc, char** argv)
-{
- QPEApplication a(argc,argv);
+OPIE_EXPORT_APP( OApplicationFactory<Security> )
- Security dlg;
- a.showMainWidget(&dlg);
-
- return a.exec();
-}
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp
index 42a39c2..81363d2 100644
--- a/core/settings/security/security.cpp
+++ b/core/settings/security/security.cpp
@@ -120,7 +120,6 @@ void Security::show()
//if ( passcode.isEmpty() )
//reject();
} else {
-
if (!valid) // security passcode was not asked yet, so ask now
{
QString pc = enterPassCode(tr("Enter passcode"));
@@ -239,7 +238,6 @@ void Security::setSyncNet(const QString& sn)
void Security::applySecurity()
{
if ( valid ) {
-
Config cfg("Security");
cfg.setGroup("Passcode");
cfg.writeEntry("passcode",passcode);
@@ -270,9 +268,6 @@ void Security::applySecurity()
loginCfg.removeEntry("AutoLogin");
}
- cfg.setGroup("SyncMode");
- cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 );
-
}
}
diff --git a/core/settings/security/security.h b/core/settings/security/security.h
index 2f18f91..52d56de 100644
--- a/core/settings/security/security.h
+++ b/core/settings/security/security.h
@@ -29,6 +29,7 @@ class Security : public SecurityBase
Q_OBJECT
public:
+ static QString appName() { return QString::fromLatin1("security"); }
Security( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~Security();
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index c359537..67995d4 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -1,6 +1,4 @@
-TEMPLATE = app
-CONFIG += qt warn_on release
-DESTDIR = $(OPIEDIR)/bin
+CONFIG += qt warn_on release quick-app
HEADERS = security.h
SOURCES = security.cpp main.cpp
INTERFACES = securitybase.ui
diff --git a/core/settings/security/securitybase.ui b/core/settings/security/securitybase.ui
index 73290e5..9fb63a8 100644
--- a/core/settings/security/securitybase.ui
+++ b/core/settings/security/securitybase.ui
@@ -11,7 +11,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>339</width>
+ <width>329</width>
<height>483</height>
</rect>
</property>