author | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
commit | 55ea6367fba8a82fbdca74599422717e4b3c3ec6 (patch) (side-by-side diff) | |
tree | b40bb13a1b4f05b4eda61cf0c4a02e32719a70c4 /core/settings/button | |
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 :(
-rw-r--r-- | core/settings/button/button.pro | 9 | ||||
-rw-r--r-- | core/settings/button/buttonsettings.cpp | 66 | ||||
-rw-r--r-- | core/settings/button/buttonsettings.h | 3 | ||||
-rw-r--r-- | core/settings/button/main.cpp | 16 |
4 files changed, 41 insertions, 53 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,5 +1,4 @@ -TEMPLATE = app -CONFIG += qt warn_on release -DESTDIR = $(OPIEDIR)/bin +CONFIG += qt warn_on release quick-app + HEADERS = buttonsettings.h \ buttonutils.h \ @@ -16,5 +15,5 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lopie -TARGET = buttonsettings +TARGET = buttonsettings TRANSLATIONS = ../../../i18n/de/buttonsettings.ts \ @@ -36,5 +35,3 @@ TRANSLATIONS = ../../../i18n/de/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 @@ -16,5 +16,5 @@ _.=:. : :=>`: 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; @@ -51,5 +51,5 @@ struct buttoninfo { QLabel *m_hicon; QLabel *m_hlabel; - + bool m_pdirty : 1; bool m_hdirty : 1; @@ -57,5 +57,5 @@ struct buttoninfo { -ButtonSettings::ButtonSettings ( ) +ButtonSettings::ButtonSettings ( QWidget *parent , const char *name, bool modal, WFlags f ) : QDialog ( 0, "ButtonSettings", false, WStyle_ContextHelp ) { @@ -66,8 +66,8 @@ ButtonSettings::ButtonSettings ( ) 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 ); @@ -78,5 +78,5 @@ ButtonSettings::ButtonSettings ( ) m_infos. setAutoDelete ( true ); - + int i = 1; int index = 0; @@ -96,15 +96,15 @@ ButtonSettings::ButtonSettings ( ) 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 ); @@ -116,5 +116,5 @@ ButtonSettings::ButtonSettings ( ) lay-> addWidget ( l, i, 3, AlignLeft | AlignBottom ); bi-> m_plabel = l; - + l = new QLabel ( this ); l-> setFixedSize ( 16, 16 ); @@ -126,9 +126,9 @@ ButtonSettings::ButtonSettings ( ) lay-> addWidget ( l, i + 1, 3, AlignLeft | AlignTop ); bi-> m_hlabel = l; - + i += 2; - + m_infos. append ( bi ); - } + } toplay-> addStretch ( 10 ); @@ -136,10 +136,10 @@ ButtonSettings::ButtonSettings ( ) m_last_button = 0; m_lock = false; - + m_timer = new QTimer ( this ); connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( keyTimeout ( ))); - updateLabels ( ); - + updateLabels ( ); + QPEApplication::grabKeyboard ( ); } @@ -154,5 +154,5 @@ 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 ); @@ -169,7 +169,7 @@ 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; } @@ -177,6 +177,6 @@ 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; @@ -190,8 +190,8 @@ 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 @@ -209,15 +209,15 @@ 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 ( ); @@ -228,10 +228,10 @@ void ButtonSettings::edit ( buttoninfo *bi, bool hold ) bi-> m_pdirty = true; } - + updateLabels ( ); } - + delete d; - + m_lock = false; } @@ -241,5 +241,5 @@ 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 ); 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 @@ -43,7 +43,8 @@ class ButtonSettings : public QDialog { 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 @@ -16,5 +16,5 @@ _.=:. : :=>`: 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; @@ -29,15 +29,5 @@ #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> ) |