-rw-r--r-- | core/settings/launcher/launcher.pro | 4 | ||||
-rw-r--r-- | core/settings/launcher/launchersettings.cpp | 3 | ||||
-rw-r--r-- | core/settings/launcher/launchersettings.h | 3 | ||||
-rw-r--r-- | core/settings/launcher/main.cpp | 12 | ||||
-rw-r--r-- | core/settings/launcher/menusettings.cpp | 12 | ||||
-rw-r--r-- | core/settings/launcher/menusettings.h | 2 | ||||
-rw-r--r-- | core/settings/launcher/tabssettings.cpp | 10 | ||||
-rw-r--r-- | core/settings/launcher/tabssettings.h | 2 |
8 files changed, 26 insertions, 22 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,9 +1,7 @@ | |||
1 | TEMPLATE = app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on release | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = launchersettings.h \ | 2 | HEADERS = launchersettings.h \ |
5 | tabssettings.h \ | 3 | tabssettings.h \ |
6 | taskbarsettings.h \ | 4 | taskbarsettings.h \ |
7 | menusettings.h \ | 5 | menusettings.h \ |
8 | inputmethodsettings.h \ | 6 | inputmethodsettings.h \ |
9 | tabconfig.h \ | 7 | tabconfig.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 | |||
@@ -34,13 +34,14 @@ | |||
34 | #include "launchersettings.h" | 34 | #include "launchersettings.h" |
35 | #include "tabssettings.h" | 35 | #include "tabssettings.h" |
36 | #include "menusettings.h" | 36 | #include "menusettings.h" |
37 | #include "taskbarsettings.h" | 37 | #include "taskbarsettings.h" |
38 | #include "inputmethodsettings.h" | 38 | #include "inputmethodsettings.h" |
39 | 39 | ||
40 | LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) | 40 | LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags) |
41 | : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) | ||
41 | { | 42 | { |
42 | setCaption ( tr( "Launcher Settings" )); | 43 | setCaption ( tr( "Launcher Settings" )); |
43 | 44 | ||
44 | QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); | 45 | QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); |
45 | 46 | ||
46 | OTabWidget *tw = new OTabWidget ( this, "otab" ); | 47 | OTabWidget *tw = new OTabWidget ( this, "otab" ); |
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 | |||
@@ -36,13 +36,14 @@ class MenuSettings; | |||
36 | class InputMethodSettings; | 36 | class InputMethodSettings; |
37 | 37 | ||
38 | class LauncherSettings : public QDialog { | 38 | class LauncherSettings : public QDialog { |
39 | Q_OBJECT | 39 | Q_OBJECT |
40 | 40 | ||
41 | public: | 41 | public: |
42 | LauncherSettings ( ); | 42 | static QString appName() { return QString::fromLatin1("launchersettings"); } |
43 | LauncherSettings (QWidget *parent = 0, const char* name = 0, WFlags fl = 0 ); | ||
43 | 44 | ||
44 | virtual void accept ( ); | 45 | virtual void accept ( ); |
45 | virtual void done ( int r ); | 46 | virtual void done ( int r ); |
46 | 47 | ||
47 | private: | 48 | private: |
48 | TabsSettings *m_tabs; | 49 | TabsSettings *m_tabs; |
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 | |||
@@ -25,19 +25,11 @@ | |||
25 | 25 | ||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "launchersettings.h" | 28 | #include "launchersettings.h" |
29 | 29 | ||
30 | #include <qpe/qpeapplication.h> | 30 | #include <qpe/qpeapplication.h> |
31 | #include <opie/oapplicationfactory.h> | ||
31 | 32 | ||
33 | OPIE_EXPORT_APP( OApplicationFactory<LauncherSettings> ) | ||
32 | 34 | ||
33 | int main ( int argc, char** argv ) | ||
34 | { | ||
35 | QPEApplication a ( argc,argv ); | ||
36 | |||
37 | LauncherSettings dlg; | ||
38 | a. showMainWidget ( &dlg ); | ||
39 | dlg. showMaximized ( ); | ||
40 | |||
41 | return a. exec ( ); | ||
42 | } | ||
43 | 35 | ||
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 | |||
@@ -61,12 +61,15 @@ MenuSettings::MenuSettings ( QWidget *parent, const char *name ) | |||
61 | 61 | ||
62 | lay-> addWidget ( m_list ); | 62 | lay-> addWidget ( m_list ); |
63 | 63 | ||
64 | m_menutabs = new QCheckBox ( tr( "Show Launcher tabs in O-Menu" ), this ); | 64 | m_menutabs = new QCheckBox ( tr( "Show Launcher tabs in O-Menu" ), this ); |
65 | lay-> addWidget ( m_menutabs ); | 65 | lay-> addWidget ( m_menutabs ); |
66 | 66 | ||
67 | m_menusubpopup = new QCheckBox ( tr( "Show Applications in subpopups" ), this ); | ||
68 | lay-> addWidget ( m_menusubpopup ); | ||
69 | |||
67 | QWhatsThis::add ( m_list, tr( "Check the applets that you want to have included in the O-Menu." )); | 70 | QWhatsThis::add ( m_list, tr( "Check the applets that you want to have included in the O-Menu." )); |
68 | QWhatsThis::add ( m_menutabs, tr( "Adds the contents of the Launcher Tabs as menus in the O-Menu." )); | 71 | QWhatsThis::add ( m_menutabs, tr( "Adds the contents of the Launcher Tabs as menus in the O-Menu." )); |
69 | 72 | ||
70 | connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( ))); | 73 | connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( ))); |
71 | 74 | ||
72 | init ( ); | 75 | init ( ); |
@@ -116,12 +119,13 @@ void MenuSettings::init ( ) | |||
116 | delete lib; | 119 | delete lib; |
117 | } | 120 | } |
118 | } | 121 | } |
119 | 122 | ||
120 | cfg. setGroup ( "Menu" ); | 123 | cfg. setGroup ( "Menu" ); |
121 | m_menutabs-> setChecked ( cfg. readBoolEntry ( "LauncherTabs", true )); | 124 | m_menutabs-> setChecked ( cfg. readBoolEntry ( "LauncherTabs", true )); |
125 | m_menusubpopup-> setChecked ( cfg. readBoolEntry ( "LauncherSubPopup", true )); | ||
122 | } | 126 | } |
123 | 127 | ||
124 | void MenuSettings::appletChanged() | 128 | void MenuSettings::appletChanged() |
125 | { | 129 | { |
126 | m_applets_changed = true; | 130 | m_applets_changed = true; |
127 | } | 131 | } |
@@ -147,17 +151,25 @@ void MenuSettings::accept ( ) | |||
147 | 151 | ||
148 | if ( m_menutabs-> isChecked ( ) != cfg. readBoolEntry ( "LauncherTabs", true )) { | 152 | if ( m_menutabs-> isChecked ( ) != cfg. readBoolEntry ( "LauncherTabs", true )) { |
149 | apps_changed = true; | 153 | apps_changed = true; |
150 | cfg. writeEntry ( "LauncherTabs", m_menutabs-> isChecked ( )); | 154 | cfg. writeEntry ( "LauncherTabs", m_menutabs-> isChecked ( )); |
151 | } | 155 | } |
152 | 156 | ||
157 | if ( m_menusubpopup-> isChecked ( ) != cfg. readBoolEntry ( "LauncherSubPopup", true )) { | ||
158 | apps_changed = true; | ||
159 | cfg. writeEntry ( "LauncherSubPopup", m_menusubpopup-> isChecked ( )); | ||
160 | } | ||
161 | |||
153 | cfg. write ( ); | 162 | cfg. write ( ); |
154 | 163 | ||
155 | if ( m_applets_changed ) { | 164 | if ( m_applets_changed ) { |
156 | QCopEnvelope ( "QPE/TaskBar", "reloadApplets()" ); | 165 | QCopEnvelope ( "QPE/TaskBar", "reloadApplets()" ); |
157 | m_applets_changed = false; | 166 | m_applets_changed = false; |
158 | } | 167 | } |
159 | if ( apps_changed ) { | 168 | if ( apps_changed ) { |
169 | // currently use reloadApplets() since reloadApps is now used exclusive for server | ||
170 | // to refresh the tabs. But what we want here is also a refresh of the startmenu entries | ||
160 | QCopEnvelope ( "QPE/TaskBar", "reloadApps()" ); | 171 | QCopEnvelope ( "QPE/TaskBar", "reloadApps()" ); |
172 | QCopEnvelope ( "QPE/TaskBar", "reloadApplets()" ); | ||
161 | } | 173 | } |
162 | } | 174 | } |
163 | 175 | ||
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 | |||
@@ -51,10 +51,10 @@ protected: | |||
51 | void init ( ); | 51 | void init ( ); |
52 | 52 | ||
53 | private: | 53 | private: |
54 | QListView *m_list; | 54 | QListView *m_list; |
55 | QMap <QString, QCheckListItem *> m_applets; | 55 | QMap <QString, QCheckListItem *> m_applets; |
56 | bool m_applets_changed; | 56 | bool m_applets_changed; |
57 | QCheckBox *m_menutabs; | 57 | QCheckBox *m_menutabs, *m_menusubpopup; |
58 | }; | 58 | }; |
59 | 59 | ||
60 | #endif | 60 | #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 | |||
@@ -78,26 +78,26 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name ) | |||
78 | 78 | ||
79 | lay-> setRowStretch ( 4, 10 ); | 79 | lay-> setRowStretch ( 4, 10 ); |
80 | 80 | ||
81 | m_bigbusy = new QCheckBox( tr( "Enable big busy indicator" ), this ); | 81 | m_bigbusy = new QCheckBox( tr( "Enable big busy indicator" ), this ); |
82 | lay-> addMultiCellWidget ( m_bigbusy, 5, 5, 0, 1 ); | 82 | lay-> addMultiCellWidget ( m_bigbusy, 5, 5, 0, 1 ); |
83 | 83 | ||
84 | m_busyblink = new QCheckBox ( tr( "Enable blinking busy indicator" ), this ); | 84 | m_busyani = new QCheckBox ( tr( "Enable animated busy indicator" ), this ); |
85 | lay-> addMultiCellWidget ( m_busyblink, 6, 6, 0, 1 ); | 85 | lay-> addMultiCellWidget ( m_busyani, 6, 6, 0, 1 ); |
86 | 86 | ||
87 | p1-> setEnabled ( false ); | 87 | p1-> setEnabled ( false ); |
88 | p3-> setEnabled ( false ); | 88 | p3-> setEnabled ( false ); |
89 | 89 | ||
90 | init ( ); | 90 | init ( ); |
91 | 91 | ||
92 | QWhatsThis::add ( m_list, tr( "Select the Launcher Tab you want to edit or delete." )); | 92 | QWhatsThis::add ( m_list, tr( "Select the Launcher Tab you want to edit or delete." )); |
93 | QWhatsThis::add ( p1, tr( "Adds a new Tab to the Launcher." ) + QString ( "<center><br><i>not yet implemented</i><br>Please use the tabmanager</center>." )); | 93 | QWhatsThis::add ( p1, tr( "Adds a new Tab to the Launcher." ) + QString ( "<center><br><i>not yet implemented</i><br>Please use the tabmanager</center>." )); |
94 | QWhatsThis::add ( p2, tr( "Opens a new dialog to customize the select Tab." )); | 94 | QWhatsThis::add ( p2, tr( "Opens a new dialog to customize the select Tab." )); |
95 | QWhatsThis::add ( p3, tr( "Deletes a Tab from the Launcher." ) + QString ( "<center><br><i>not yet implemented</i><br>Please use the tabmanager</center>." )); | 95 | QWhatsThis::add ( p3, tr( "Deletes a Tab from the Launcher." ) + QString ( "<center><br><i>not yet implemented</i><br>Please use the tabmanager</center>." )); |
96 | 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." )); | 96 | 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." )); |
97 | QWhatsThis::add ( m_busyblink, tr( "Activate this, if you want a blinking busy indicator for starting applications in the Launcher." )); | 97 | QWhatsThis::add ( m_busyani, tr( "Activate this, if you want an animatedbusy indicator for starting applications in the Launcher." )); |
98 | } | 98 | } |
99 | 99 | ||
100 | void TabsSettings::init ( ) | 100 | void TabsSettings::init ( ) |
101 | { | 101 | { |
102 | AppLnkSet rootFolder( MimeType::appsFolderName ( )); | 102 | AppLnkSet rootFolder( MimeType::appsFolderName ( )); |
103 | QStringList types = rootFolder. types ( ); | 103 | QStringList types = rootFolder. types ( ); |
@@ -117,13 +117,13 @@ void TabsSettings::init ( ) | |||
117 | 117 | ||
118 | Config cfg ( "Launcher" ); | 118 | Config cfg ( "Launcher" ); |
119 | 119 | ||
120 | readTabSettings ( cfg ); | 120 | readTabSettings ( cfg ); |
121 | 121 | ||
122 | cfg. setGroup ( "GUI" ); | 122 | cfg. setGroup ( "GUI" ); |
123 | m_busyblink-> setChecked ( cfg. readEntry ( "BusyType" ). lower ( ) == "blink" ); | 123 | m_busyani-> setChecked ( cfg. readEntry ( "BusyType" ). lower ( ) == "animated" ); |
124 | m_bigbusy->setChecked( cfg. readBoolEntry ( "BigBusy" ) ); | 124 | m_bigbusy->setChecked( cfg. readBoolEntry ( "BigBusy" ) ); |
125 | } | 125 | } |
126 | 126 | ||
127 | 127 | ||
128 | void TabsSettings::readTabSettings ( Config &cfg ) | 128 | void TabsSettings::readTabSettings ( Config &cfg ) |
129 | { | 129 | { |
@@ -261,13 +261,13 @@ void TabsSettings::accept ( ) | |||
261 | fe << tc. m_font_weight; | 261 | fe << tc. m_font_weight; |
262 | fe << ( tc. m_font_italic ? 1 : 0 ); | 262 | fe << ( tc. m_font_italic ? 1 : 0 ); |
263 | 263 | ||
264 | tc. m_changed = false; | 264 | tc. m_changed = false; |
265 | } | 265 | } |
266 | cfg. setGroup ( "GUI" ); | 266 | cfg. setGroup ( "GUI" ); |
267 | QString busytype = QString ( m_busyblink-> isChecked ( ) ? "blink" : "" ); | 267 | QString busytype = QString ( m_busyani-> isChecked ( ) ? "Animated" : "" ); |
268 | cfg. writeEntry ( "BusyType", busytype ); | 268 | cfg. writeEntry ( "BusyType", busytype ); |
269 | 269 | ||
270 | cfg. writeEntry ( "BigBusy", m_bigbusy->isChecked( ) ); | 270 | cfg. writeEntry ( "BigBusy", m_bigbusy->isChecked( ) ); |
271 | 271 | ||
272 | { | 272 | { |
273 | QCopEnvelope e ( "QPE/Launcher", "setBusyIndicatorType(QString)" ); | 273 | QCopEnvelope e ( "QPE/Launcher", "setBusyIndicatorType(QString)" ); |
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 | |||
@@ -56,13 +56,13 @@ protected: | |||
56 | 56 | ||
57 | private: | 57 | private: |
58 | QListBox *m_list; | 58 | QListBox *m_list; |
59 | //QString currentTab; | 59 | //QString currentTab; |
60 | QStringList m_ids; | 60 | QStringList m_ids; |
61 | QMap <QString, TabConfig> m_tabs; | 61 | QMap <QString, TabConfig> m_tabs; |
62 | QCheckBox *m_busyblink, *m_bigbusy; | 62 | QCheckBox *m_busyani, *m_bigbusy; |
63 | }; | 63 | }; |
64 | 64 | ||
65 | 65 | ||
66 | 66 | ||
67 | 67 | ||
68 | #endif | 68 | #endif |