author | sandman <sandman> | 2002-10-01 22:43:23 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-01 22:43:23 (UTC) |
commit | 895280b5ff189fff2e77d6f5f27668e7dad0d88d (patch) (unidiff) | |
tree | d097848e85b307d94445fb247e8e1a11204bc58b /core/settings | |
parent | 430b2838137a953a39939a992fc6f08a79954752 (diff) | |
download | opie-895280b5ff189fff2e77d6f5f27668e7dad0d88d.zip opie-895280b5ff189fff2e77d6f5f27668e7dad0d88d.tar.gz opie-895280b5ff189fff2e77d6f5f27668e7dad0d88d.tar.bz2 |
- added a config item for the new busyindicator
- added configs for O Menu (launcher part missing at the moment)
-rw-r--r-- | core/settings/launcher/guisettings.cpp | 153 | ||||
-rw-r--r-- | core/settings/launcher/guisettings.h | 65 | ||||
-rw-r--r-- | core/settings/launcher/launcher.pro | 2 | ||||
-rw-r--r-- | core/settings/launcher/launchersettings.cpp | 8 | ||||
-rw-r--r-- | core/settings/launcher/launchersettings.h | 2 | ||||
-rw-r--r-- | core/settings/launcher/taskbarsettings.cpp | 31 | ||||
-rw-r--r-- | core/settings/launcher/taskbarsettings.h | 3 |
7 files changed, 228 insertions, 36 deletions
diff --git a/core/settings/launcher/guisettings.cpp b/core/settings/launcher/guisettings.cpp new file mode 100644 index 0000000..a292663 --- a/dev/null +++ b/core/settings/launcher/guisettings.cpp | |||
@@ -0,0 +1,153 @@ | |||
1 | /* | ||
2 | This file is part of the OPIE Project | ||
3 | =. Copyright (c) 2002 Trolltech AS <info@trolltech.com> | ||
4 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> | ||
5 | .>+-= | ||
6 | _;:, .> :=|. This file is free software; you can | ||
7 | .> <`_, > . <= redistribute it and/or modify it under | ||
8 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | ||
9 | .="- .-=="i, .._ License as published by the Free Software | ||
10 | - . .-<_> .<> Foundation; either version 2 of the License, | ||
11 | ._= =} : or (at your option) any later version. | ||
12 | .%`+i> _;_. | ||
13 | .i_,=:_. -<s. This file is distributed in the hope that | ||
14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
15 | : .. .:, . . . without even the implied warranty of | ||
16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | ||
17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | ||
18 | ..}^=.= = ; Public License for more details. | ||
19 | ++= -. .` .: | ||
20 | : = ...= . :.=- You should have received a copy of the GNU | ||
21 | -. .:....=;==+<; General Public License along with this file; | ||
22 | -_. . . )=. = see the file COPYING. If not, write to the | ||
23 | -- :-=` Free Software Foundation, Inc., | ||
24 | 59 Temple Place - Suite 330, | ||
25 | Boston, MA 02111-1307, USA. | ||
26 | |||
27 | */ | ||
28 | |||
29 | #include "guisettings.h" | ||
30 | |||
31 | #include <qpe/config.h> | ||
32 | #include <qpe/qpeapplication.h> | ||
33 | #include <qpe/qcopenvelope_qws.h> | ||
34 | |||
35 | #include <qlistview.h> | ||
36 | #include <qcheckbox.h> | ||
37 | #include <qheader.h> | ||
38 | #include <qlayout.h> | ||
39 | #include <qlabel.h> | ||
40 | #include <qwhatsthis.h> | ||
41 | |||
42 | #include <stdlib.h> | ||
43 | |||
44 | |||
45 | GuiSettings::GuiSettings ( QWidget *parent, const char *name ) | ||
46 | : QWidget ( parent, name ) | ||
47 | { | ||
48 | m_menu_changed = false; | ||
49 | m_busy_changed = false; | ||
50 | |||
51 | QGridLayout *lay = new QGridLayout ( this, 0, 0, 4, 4 ); | ||
52 | lay-> addColSpacing ( 0, 16 ); | ||
53 | |||
54 | m_omenu = new QCheckBox ( tr( "Show O-Menu" ), this ); | ||
55 | lay-> addMultiCellWidget ( m_omenu, 0, 0, 0, 1 ); | ||
56 | |||
57 | m_omenu_tabs = new QCheckBox ( tr( "Add Launcher tabs to O-Menu" ), this ); | ||
58 | lay-> addWidget ( m_omenu_tabs, 1, 1 ); | ||
59 | |||
60 | m_omenu_home = new QCheckBox ( tr( "Add 'Home' shortcut to O-Menu" ), this ); | ||
61 | lay-> addWidget ( m_omenu_home, 2, 1 ); | ||
62 | |||
63 | m_omenu_suspend = new QCheckBox ( tr( "Add 'Suspend' shortcut to O-Menu" ), this ); | ||
64 | lay-> addWidget ( m_omenu_suspend, 3, 1 ); | ||
65 | |||
66 | QWhatsThis::add( m_omenu_tabs, tr( "Adds the contents of the Launcher as menus in the O-Menu." )); | ||
67 | QWhatsThis::add( m_omenu, tr( "Check if you want the O-Menu in the taskbar." )); | ||
68 | |||
69 | connect ( m_omenu, SIGNAL( toggled ( bool )), m_omenu_tabs, SLOT( setEnabled ( bool ))); | ||
70 | connect ( m_omenu, SIGNAL( toggled ( bool )), m_omenu_home, SLOT( setEnabled ( bool ))); | ||
71 | connect ( m_omenu, SIGNAL( toggled ( bool )), m_omenu_suspend, SLOT( setEnabled ( bool ))); | ||
72 | |||
73 | connect ( m_omenu, SIGNAL( toggled ( bool )), this, SLOT( menuChanged ( ))); | ||
74 | connect ( m_omenu_tabs, SIGNAL( toggled ( bool )), this, SLOT( menuChanged ( ))); | ||
75 | connect ( m_omenu_home, SIGNAL( toggled ( bool )), this, SLOT( menuChanged ( ))); | ||
76 | connect ( m_omenu_suspend, SIGNAL( toggled ( bool )), this, SLOT( menuChanged ( ))); | ||
77 | |||
78 | lay-> addRowSpacing ( 4, 8 ); | ||
79 | |||
80 | m_busy = new QCheckBox ( tr( "Enable blinking busy indicator" ), this ); | ||
81 | lay-> addMultiCellWidget ( m_busy, 5, 5, 0, 1 ); | ||
82 | |||
83 | connect ( m_busy, SIGNAL( toggled( bool )), this, SLOT( busyChanged ( ))); | ||
84 | |||
85 | lay-> setRowStretch ( 6, 10 ); | ||
86 | |||
87 | init ( ); | ||
88 | } | ||
89 | |||
90 | void GuiSettings::init ( ) | ||
91 | { | ||
92 | Config cfg ( "Taskbar" ); | ||
93 | cfg. setGroup ( "Menu" ); | ||
94 | |||
95 | m_omenu-> setChecked ( cfg. readBoolEntry ( "ShowMenu", true )); | ||
96 | m_omenu_tabs-> setChecked ( cfg. readBoolEntry ( "LauncherTabs", true )); | ||
97 | m_omenu_home-> setChecked ( cfg. readBoolEntry ( "Home", true )); | ||
98 | m_omenu_suspend-> setChecked ( cfg. readBoolEntry ( "Suspend", true )); | ||
99 | |||
100 | m_omenu_tabs-> setEnabled ( m_omenu-> isChecked ( )); | ||
101 | m_omenu_home-> setEnabled ( m_omenu-> isChecked ( )); | ||
102 | m_omenu_suspend-> setEnabled ( m_omenu-> isChecked ( )); | ||
103 | |||
104 | Config cfg2 ( "Launcher" ); | ||
105 | cfg2. setGroup ( "GUI" ); | ||
106 | |||
107 | m_busy-> setChecked ( cfg2. readEntry ( "BusyType" ). lower ( ) == "blink" ); | ||
108 | } | ||
109 | |||
110 | void GuiSettings::menuChanged() | ||
111 | { | ||
112 | m_menu_changed = true; | ||
113 | } | ||
114 | |||
115 | void GuiSettings::busyChanged() | ||
116 | { | ||
117 | m_busy_changed = true; | ||
118 | } | ||
119 | |||
120 | void GuiSettings::accept ( ) | ||
121 | { | ||
122 | Config cfg ( "Taskbar" ); | ||
123 | cfg. setGroup ( "Menu" ); | ||
124 | |||
125 | if ( m_menu_changed ) { | ||
126 | cfg. writeEntry ( "ShowMenu", m_omenu-> isChecked ( )); | ||
127 | cfg. writeEntry ( "LauncherTabs", m_omenu_tabs-> isChecked ( )); | ||
128 | cfg. writeEntry ( "Home", m_omenu_home-> isChecked ( )); | ||
129 | cfg. writeEntry ( "Suspend", m_omenu_suspend-> isChecked ( )); | ||
130 | } | ||
131 | cfg. write ( ); | ||
132 | |||
133 | if ( m_menu_changed ) | ||
134 | QCopEnvelope ( "QPE/TaskBar", "reloadApplets()" ); | ||
135 | |||
136 | Config cfg2 ( "Launcher" ); | ||
137 | cfg2. setGroup ( "GUI" ); | ||
138 | |||
139 | QString busytype = QString ( m_busy-> isChecked ( ) ? "blink" : "" ); | ||
140 | |||
141 | if ( m_busy_changed ) { | ||
142 | |||
143 | cfg2. writeEntry ( "BusyType", busytype ); | ||
144 | } | ||
145 | |||
146 | cfg2. write ( ); | ||
147 | |||
148 | if ( m_busy_changed ) { | ||
149 | QCopEnvelope e ( "QPE/Launcher", "setBusyIndicatorType(QString)" ); | ||
150 | e << busytype; | ||
151 | } | ||
152 | } | ||
153 | |||
diff --git a/core/settings/launcher/guisettings.h b/core/settings/launcher/guisettings.h new file mode 100644 index 0000000..2673981 --- a/dev/null +++ b/core/settings/launcher/guisettings.h | |||
@@ -0,0 +1,65 @@ | |||
1 | /* | ||
2 | =. This file is part of the OPIE Project | ||
3 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> | ||
4 | .>+-= | ||
5 | _;:, .> :=|. This file is free software; you can | ||
6 | .> <`_, > . <= redistribute it and/or modify it under | ||
7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | ||
8 | .="- .-=="i, .._ License as published by the Free Software | ||
9 | - . .-<_> .<> Foundation; either version 2 of the License, | ||
10 | ._= =} : or (at your option) any later version. | ||
11 | .%`+i> _;_. | ||
12 | .i_,=:_. -<s. This file is distributed in the hope that | ||
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
14 | : .. .:, . . . without even the implied warranty of | ||
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | ||
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | ||
17 | ..}^=.= = ; Public License for more details. | ||
18 | ++= -. .` .: | ||
19 | : = ...= . :.=- You should have received a copy of the GNU | ||
20 | -. .:....=;==+<; General Public License along with this file; | ||
21 | -_. . . )=. = see the file COPYING. If not, write to the | ||
22 | -- :-=` Free Software Foundation, Inc., | ||
23 | 59 Temple Place - Suite 330, | ||
24 | Boston, MA 02111-1307, USA. | ||
25 | |||
26 | */ | ||
27 | |||
28 | #ifndef __GUI_SETTINGS_H__ | ||
29 | #define __GUI_SETTINGS_H__ | ||
30 | |||
31 | #include <qwidget.h> | ||
32 | #include <qmap.h> | ||
33 | |||
34 | class QListView; | ||
35 | class QCheckListItem; | ||
36 | class QCheckBox; | ||
37 | |||
38 | |||
39 | class GuiSettings : public QWidget { | ||
40 | Q_OBJECT | ||
41 | |||
42 | public: | ||
43 | GuiSettings ( QWidget *parent = 0, const char *name = 0 ); | ||
44 | |||
45 | void accept ( ); | ||
46 | |||
47 | protected slots: | ||
48 | void menuChanged ( ); | ||
49 | void busyChanged ( ); | ||
50 | |||
51 | protected: | ||
52 | void init ( ); | ||
53 | |||
54 | private: | ||
55 | QCheckBox *m_omenu; | ||
56 | QCheckBox *m_omenu_tabs; | ||
57 | QCheckBox *m_omenu_home; | ||
58 | QCheckBox *m_omenu_suspend; | ||
59 | QCheckBox *m_busy; | ||
60 | |||
61 | bool m_menu_changed; | ||
62 | bool m_busy_changed; | ||
63 | }; | ||
64 | |||
65 | #endif | ||
diff --git a/core/settings/launcher/launcher.pro b/core/settings/launcher/launcher.pro index 484b159..0554d0a 100644 --- a/core/settings/launcher/launcher.pro +++ b/core/settings/launcher/launcher.pro | |||
@@ -4,6 +4,7 @@ DESTDIR = $(OPIEDIR)/bin | |||
4 | HEADERS = launchersettings.h \ | 4 | HEADERS = launchersettings.h \ |
5 | tabssettings.h \ | 5 | tabssettings.h \ |
6 | taskbarsettings.h \ | 6 | taskbarsettings.h \ |
7 | guisettings.h \ | ||
7 | tabconfig.h \ | 8 | tabconfig.h \ |
8 | tabdialog.h | 9 | tabdialog.h |
9 | 10 | ||
@@ -11,6 +12,7 @@ SOURCES = main.cpp \ | |||
11 | launchersettings.cpp \ | 12 | launchersettings.cpp \ |
12 | tabssettings.cpp \ | 13 | tabssettings.cpp \ |
13 | taskbarsettings.cpp \ | 14 | taskbarsettings.cpp \ |
15 | guisettings.cpp \ | ||
14 | tabdialog.cpp | 16 | tabdialog.cpp |
15 | 17 | ||
16 | INCLUDEPATH += $(OPIEDIR)/include | 18 | INCLUDEPATH += $(OPIEDIR)/include |
diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp index 7a020a0..22bf1d1 100644 --- a/core/settings/launcher/launchersettings.cpp +++ b/core/settings/launcher/launchersettings.cpp | |||
@@ -32,6 +32,7 @@ | |||
32 | #include "launchersettings.h" | 32 | #include "launchersettings.h" |
33 | #include "tabssettings.h" | 33 | #include "tabssettings.h" |
34 | #include "taskbarsettings.h" | 34 | #include "taskbarsettings.h" |
35 | #include "guisettings.h" | ||
35 | 36 | ||
36 | 37 | ||
37 | LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false ) | 38 | LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false ) |
@@ -45,9 +46,11 @@ LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false | |||
45 | 46 | ||
46 | m_tabs = new TabsSettings ( tw ); | 47 | m_tabs = new TabsSettings ( tw ); |
47 | m_taskbar = new TaskbarSettings ( tw ); | 48 | m_taskbar = new TaskbarSettings ( tw ); |
49 | m_gui = new GuiSettings ( tw ); | ||
48 | 50 | ||
49 | tw-> addTab ( m_taskbar, "appearance/styletabicon.png", tr( "Taskbar" )); | 51 | tw-> addTab ( m_taskbar, "launchersettings/taskbartab.png", tr( "Taskbar" )); |
50 | tw-> addTab ( m_tabs, "appearance/styletabicon.png", tr( "Tabs" )); | 52 | tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" )); |
53 | tw-> addTab ( m_gui, "launchersettings/guitab.png", tr( "GUI" )); | ||
51 | 54 | ||
52 | tw-> setCurrentTab ( m_taskbar ); | 55 | tw-> setCurrentTab ( m_taskbar ); |
53 | } | 56 | } |
@@ -56,6 +59,7 @@ void LauncherSettings::accept ( ) | |||
56 | { | 59 | { |
57 | m_taskbar-> accept ( ); | 60 | m_taskbar-> accept ( ); |
58 | m_tabs-> accept ( ); | 61 | m_tabs-> accept ( ); |
62 | m_gui-> accept ( ); | ||
59 | 63 | ||
60 | QDialog::accept ( ); | 64 | QDialog::accept ( ); |
61 | } | 65 | } |
diff --git a/core/settings/launcher/launchersettings.h b/core/settings/launcher/launchersettings.h index 09ea933..fa9977e 100644 --- a/core/settings/launcher/launchersettings.h +++ b/core/settings/launcher/launchersettings.h | |||
@@ -32,6 +32,7 @@ | |||
32 | 32 | ||
33 | class TabsSettings; | 33 | class TabsSettings; |
34 | class TaskbarSettings; | 34 | class TaskbarSettings; |
35 | class GuiSettings; | ||
35 | 36 | ||
36 | class LauncherSettings : public QDialog { | 37 | class LauncherSettings : public QDialog { |
37 | Q_OBJECT | 38 | Q_OBJECT |
@@ -45,6 +46,7 @@ public: | |||
45 | private: | 46 | private: |
46 | TabsSettings *m_tabs; | 47 | TabsSettings *m_tabs; |
47 | TaskbarSettings *m_taskbar; | 48 | TaskbarSettings *m_taskbar; |
49 | GuiSettings *m_gui; | ||
48 | }; | 50 | }; |
49 | 51 | ||
50 | #endif | 52 | #endif |
diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp index 6921ee8..b5c03c8 100644 --- a/core/settings/launcher/taskbarsettings.cpp +++ b/core/settings/launcher/taskbarsettings.cpp | |||
@@ -61,21 +61,9 @@ TaskbarSettings::TaskbarSettings ( QWidget *parent, const char *name ) | |||
61 | 61 | ||
62 | lay-> addWidget ( m_list ); | 62 | lay-> addWidget ( m_list ); |
63 | 63 | ||
64 | m_omenu = new QCheckBox ( tr( "Show O-Menu" ), this ); | ||
65 | lay-> addWidget ( m_omenu ); | ||
66 | |||
67 | m_omenu_tabs = new QCheckBox ( tr( "Show Launcher tabs in O-Menu" ), this ); | ||
68 | lay-> addWidget ( m_omenu_tabs ); | ||
69 | |||
70 | QWhatsThis::add ( m_list, tr( "Check the applets that you want displayed in the Taskbar." )); | 64 | QWhatsThis::add ( m_list, tr( "Check the applets that you want displayed in the Taskbar." )); |
71 | QWhatsThis::add( m_omenu_tabs, tr( "Adds the contents of the Launcher as menus in the O-Menu." )); | ||
72 | QWhatsThis::add( m_omenu, tr( "Check if you want the O-Menu in the taskbar." )); | ||
73 | 65 | ||
74 | connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( ))); | 66 | connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( ))); |
75 | connect ( m_omenu, SIGNAL( toggled ( bool )), m_omenu_tabs, SLOT( setEnabled ( bool ))); | ||
76 | |||
77 | // This option does not make sense ! (sandman) | ||
78 | m_omenu_tabs-> hide ( ); | ||
79 | 67 | ||
80 | init ( ); | 68 | init ( ); |
81 | } | 69 | } |
@@ -128,13 +116,6 @@ void TaskbarSettings::init ( ) | |||
128 | item-> setOn ( exclude. find ( *it ) == exclude. end ( )); | 116 | item-> setOn ( exclude. find ( *it ) == exclude. end ( )); |
129 | m_applets [*it] = item; | 117 | m_applets [*it] = item; |
130 | } | 118 | } |
131 | |||
132 | cfg. setGroup ( "Menu" ); | ||
133 | |||
134 | m_omenu_tabs-> setChecked ( cfg. readBoolEntry ( "LauncherTabs", true )); | ||
135 | m_omenu-> setChecked ( cfg. readBoolEntry ( "ShowMenu", true )); | ||
136 | |||
137 | m_omenu_tabs-> setEnabled ( m_omenu-> isChecked ( )); | ||
138 | } | 119 | } |
139 | 120 | ||
140 | void TaskbarSettings::appletChanged() | 121 | void TaskbarSettings::appletChanged() |
@@ -156,18 +137,6 @@ void TaskbarSettings::accept ( ) | |||
156 | cfg. writeEntry ( "ExcludeApplets", exclude, ',' ); | 137 | cfg. writeEntry ( "ExcludeApplets", exclude, ',' ); |
157 | } | 138 | } |
158 | cfg. writeEntry ( "SafeMode", false ); | 139 | cfg. writeEntry ( "SafeMode", false ); |
159 | |||
160 | cfg. setGroup ( "Menu" ); | ||
161 | |||
162 | if ( m_omenu_tabs-> isChecked ( ) != cfg. readBoolEntry ( "LauncherTabs", true )) { | ||
163 | m_applets_changed = true; | ||
164 | cfg. writeEntry ( "LauncherTabs", m_omenu_tabs-> isChecked ( )); | ||
165 | } | ||
166 | |||
167 | if ( m_omenu-> isChecked ( ) != cfg. readBoolEntry ( "ShowMenu", true )) { | ||
168 | m_applets_changed = true; | ||
169 | cfg. writeEntry ( "ShowMenu", m_omenu-> isChecked ( )); | ||
170 | } | ||
171 | cfg. write ( ); | 140 | cfg. write ( ); |
172 | 141 | ||
173 | if ( m_applets_changed ) { | 142 | if ( m_applets_changed ) { |
diff --git a/core/settings/launcher/taskbarsettings.h b/core/settings/launcher/taskbarsettings.h index 2f5242f..b99720d 100644 --- a/core/settings/launcher/taskbarsettings.h +++ b/core/settings/launcher/taskbarsettings.h | |||
@@ -52,9 +52,6 @@ protected: | |||
52 | 52 | ||
53 | private: | 53 | private: |
54 | QListView *m_list; | 54 | QListView *m_list; |
55 | QCheckBox *m_omenu; | ||
56 | QCheckBox *m_omenu_tabs; | ||
57 | |||
58 | QMap <QString, QCheckListItem *> m_applets; | 55 | QMap <QString, QCheckListItem *> m_applets; |
59 | bool m_applets_changed; | 56 | bool m_applets_changed; |
60 | }; | 57 | }; |