author | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
commit | 55ea6367fba8a82fbdca74599422717e4b3c3ec6 (patch) (unidiff) | |
tree | b40bb13a1b4f05b4eda61cf0c4a02e32719a70c4 /core/settings/launcher/menusettings.cpp | |
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 :(
Diffstat (limited to 'core/settings/launcher/menusettings.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/launcher/menusettings.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
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 | |||
@@ -15,9 +15,9 @@ | |||
15 | : .. .:, . . . without even the implied warranty of | 15 | : .. .:, . . . without even the implied warranty of |
16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
18 | ..}^=.= = ; Public License for more details. | 18 | ..}^=.= = ; Public License for more details. |
19 | ++= -. .` .: | 19 | ++= -. .` .: |
20 | : = ...= . :.=- You should have received a copy of the GNU | 20 | : = ...= . :.=- You should have received a copy of the GNU |
21 | -. .:....=;==+<; General Public License along with this file; | 21 | -. .:....=;==+<; General Public License along with this file; |
22 | -_. . . )=. = see the file COPYING. If not, write to the | 22 | -_. . . )=. = see the file COPYING. If not, write to the |
23 | -- :-=` Free Software Foundation, Inc., | 23 | -- :-=` Free Software Foundation, Inc., |
@@ -59,12 +59,15 @@ MenuSettings::MenuSettings ( QWidget *parent, const char *name ) | |||
59 | m_list-> addColumn ( "foobar" ); | 59 | m_list-> addColumn ( "foobar" ); |
60 | m_list-> header ( )-> hide ( ); | 60 | m_list-> header ( )-> hide ( ); |
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 ( ))); |
@@ -118,8 +121,9 @@ void MenuSettings::init ( ) | |||
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 | { |
@@ -148,16 +152,24 @@ void MenuSettings::accept ( ) | |||
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 | ||