summaryrefslogtreecommitdiff
path: root/core/settings/launcher
Side-by-side diff
Diffstat (limited to 'core/settings/launcher') (more/less context) (ignore whitespace changes)
-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
8 files changed, 29 insertions, 25 deletions
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,4 +1,2 @@
-TEMPLATE = app
-CONFIG += qt warn_on release
-DESTDIR = $(OPIEDIR)/bin
+CONFIG += qt warn_on release quick-app
HEADERS = launchersettings.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
@@ -39,3 +39,4 @@
-LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp )
+LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags)
+ : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp )
{
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
@@ -41,3 +41,4 @@ class LauncherSettings : public QDialog {
public:
- LauncherSettings ( );
+ static QString appName() { return QString::fromLatin1("launchersettings"); }
+ LauncherSettings (QWidget *parent = 0, const char* name = 0, WFlags fl = 0 );
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
@@ -30,14 +30,6 @@
#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
@@ -18,3 +18,3 @@
..}^=.=       =       ; Public License for more details.
-++=   -.     .`     .:
+++=   -.     .`     .:
 :     =  ...= . :.=- You should have received a copy of the GNU
@@ -62,3 +62,3 @@ MenuSettings::MenuSettings ( QWidget *parent, const char *name )
lay-> addWidget ( m_list );
-
+
m_menutabs = new QCheckBox ( tr( "Show Launcher tabs in O-Menu" ), this );
@@ -66,2 +66,5 @@ MenuSettings::MenuSettings ( QWidget *parent, const char *name )
+ 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." ));
@@ -121,2 +124,3 @@ void MenuSettings::init ( )
m_menutabs-> setChecked ( cfg. readBoolEntry ( "LauncherTabs", true ));
+ m_menusubpopup-> setChecked ( cfg. readBoolEntry ( "LauncherSubPopup", true ));
}
@@ -151,3 +155,8 @@ void MenuSettings::accept ( )
}
-
+
+ if ( m_menusubpopup-> isChecked ( ) != cfg. readBoolEntry ( "LauncherSubPopup", true )) {
+ apps_changed = true;
+ cfg. writeEntry ( "LauncherSubPopup", m_menusubpopup-> isChecked ( ));
+ }
+
cfg. write ( );
@@ -159,3 +168,6 @@ void MenuSettings::accept ( )
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
@@ -56,3 +56,3 @@ private:
bool m_applets_changed;
- QCheckBox *m_menutabs;
+ QCheckBox *m_menutabs, *m_menusubpopup;
};
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
@@ -83,4 +83,4 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name )
- 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 );
@@ -96,3 +96,3 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name )
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." ));
}
@@ -122,3 +122,3 @@ void TabsSettings::init ( )
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" ) );
@@ -266,3 +266,3 @@ void TabsSettings::accept ( )
cfg. setGroup ( "GUI" );
- QString busytype = QString ( m_busyblink-> isChecked ( ) ? "blink" : "" );
+ QString busytype = QString ( m_busyani-> isChecked ( ) ? "Animated" : "" );
cfg. writeEntry ( "BusyType", busytype );
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
@@ -61,3 +61,3 @@ private:
QMap <QString, TabConfig> m_tabs;
- QCheckBox *m_busyblink, *m_bigbusy;
+ QCheckBox *m_busyani, *m_bigbusy;
};