author | sandman <sandman> | 2002-10-08 01:21:52 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-08 01:21:52 (UTC) |
commit | c43b5d600a7d1dcaadcba2cb047a60313b37f2f2 (patch) (unidiff) | |
tree | dbe1311d34631e7d933aa10b2d6a9dc8f97206ab | |
parent | 5e450f24ca13923535754b33a1d1645709a8259d (diff) | |
download | opie-c43b5d600a7d1dcaadcba2cb047a60313b37f2f2.zip opie-c43b5d600a7d1dcaadcba2cb047a60313b37f2f2.tar.gz opie-c43b5d600a7d1dcaadcba2cb047a60313b37f2f2.tar.bz2 |
- added an "All Tabs" tab entry, which will affect all tabs
- enabled "What's this" help mode -- many tooltips still missing
-rw-r--r-- | core/settings/launcher/launchersettings.cpp | 2 | ||||
-rw-r--r-- | core/settings/launcher/menusettings.cpp | 4 | ||||
-rw-r--r-- | core/settings/launcher/tabconfig.h | 13 | ||||
-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 5 | ||||
-rw-r--r-- | core/settings/launcher/tabssettings.cpp | 65 |
5 files changed, 73 insertions, 16 deletions
diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp index c32d998..7b85602 100644 --- a/core/settings/launcher/launchersettings.cpp +++ b/core/settings/launcher/launchersettings.cpp | |||
@@ -7,65 +7,65 @@ | |||
7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%`+i> _;_. | 11 | .%`+i> _;_. |
12 | .i_,=:_. -<s. This file is distributed in the hope that | 12 | .i_,=:_. -<s. This file is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
17 | ..}^=.= = ; Public License for more details. | 17 | ..}^=.= = ; Public License for more details. |
18 | ++= -. .` .: | 18 | ++= -. .` .: |
19 | : = ...= . :.=- You should have received a copy of the GNU | 19 | : = ...= . :.=- You should have received a copy of the GNU |
20 | -. .:....=;==+<; General Public License along with this file; | 20 | -. .:....=;==+<; General Public License along with this file; |
21 | -_. . . )=. = see the file COPYING. If not, write to the | 21 | -_. . . )=. = see the file COPYING. If not, write to the |
22 | -- :-=` Free Software Foundation, Inc., | 22 | -- :-=` Free Software Foundation, Inc., |
23 | 59 Temple Place - Suite 330, | 23 | 59 Temple Place - Suite 330, |
24 | Boston, MA 02111-1307, USA. | 24 | Boston, MA 02111-1307, USA. |
25 | 25 | ||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <qlayout.h> | 28 | #include <qlayout.h> |
29 | #include <qapplication.h> | 29 | #include <qapplication.h> |
30 | 30 | ||
31 | #include <opie/otabwidget.h> | 31 | #include <opie/otabwidget.h> |
32 | 32 | ||
33 | #include "launchersettings.h" | 33 | #include "launchersettings.h" |
34 | #include "tabssettings.h" | 34 | #include "tabssettings.h" |
35 | #include "menusettings.h" | 35 | #include "menusettings.h" |
36 | #include "taskbarsettings.h" | 36 | #include "taskbarsettings.h" |
37 | 37 | ||
38 | 38 | ||
39 | LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false ) | 39 | LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) |
40 | { | 40 | { |
41 | setCaption ( tr( "Launcher Settings" )); | 41 | setCaption ( tr( "Launcher Settings" )); |
42 | 42 | ||
43 | QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); | 43 | QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); |
44 | 44 | ||
45 | OTabWidget *tw = new OTabWidget ( this, "otab" ); | 45 | OTabWidget *tw = new OTabWidget ( this, "otab" ); |
46 | lay-> addWidget ( tw ); | 46 | lay-> addWidget ( tw ); |
47 | 47 | ||
48 | m_tabs = new TabsSettings ( tw ); | 48 | m_tabs = new TabsSettings ( tw ); |
49 | m_taskbar = new TaskbarSettings ( tw ); | 49 | m_taskbar = new TaskbarSettings ( tw ); |
50 | m_menu = new MenuSettings ( tw ); | 50 | m_menu = new MenuSettings ( tw ); |
51 | 51 | ||
52 | tw-> addTab ( m_taskbar, "launchersettings/taskbartab.png", tr( "Taskbar" )); | 52 | tw-> addTab ( m_taskbar, "launchersettings/taskbartab.png", tr( "Taskbar" )); |
53 | tw-> addTab ( m_menu, "launchersettings/menutab.png", tr( "O-Menu" )); | 53 | tw-> addTab ( m_menu, "launchersettings/menutab.png", tr( "O-Menu" )); |
54 | tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" )); | 54 | tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" )); |
55 | 55 | ||
56 | tw-> setCurrentTab ( m_taskbar ); | 56 | tw-> setCurrentTab ( m_taskbar ); |
57 | } | 57 | } |
58 | 58 | ||
59 | void LauncherSettings::accept ( ) | 59 | void LauncherSettings::accept ( ) |
60 | { | 60 | { |
61 | m_taskbar-> accept ( ); | 61 | m_taskbar-> accept ( ); |
62 | m_menu-> accept ( ); | 62 | m_menu-> accept ( ); |
63 | m_tabs-> accept ( ); | 63 | m_tabs-> accept ( ); |
64 | 64 | ||
65 | QDialog::accept ( ); | 65 | QDialog::accept ( ); |
66 | } | 66 | } |
67 | 67 | ||
68 | void LauncherSettings::done ( int r ) | 68 | void LauncherSettings::done ( int r ) |
69 | { | 69 | { |
70 | QDialog::done ( r ); | 70 | QDialog::done ( r ); |
71 | close ( ); | 71 | close ( ); |
diff --git a/core/settings/launcher/menusettings.cpp b/core/settings/launcher/menusettings.cpp index 8d363fa..5a9fada 100644 --- a/core/settings/launcher/menusettings.cpp +++ b/core/settings/launcher/menusettings.cpp | |||
@@ -35,66 +35,66 @@ | |||
35 | #include <qpe/qcopenvelope_qws.h> | 35 | #include <qpe/qcopenvelope_qws.h> |
36 | 36 | ||
37 | #include <qdir.h> | 37 | #include <qdir.h> |
38 | #include <qlistview.h> | 38 | #include <qlistview.h> |
39 | #include <qcheckbox.h> | 39 | #include <qcheckbox.h> |
40 | #include <qheader.h> | 40 | #include <qheader.h> |
41 | #include <qlayout.h> | 41 | #include <qlayout.h> |
42 | #include <qlabel.h> | 42 | #include <qlabel.h> |
43 | #include <qwhatsthis.h> | 43 | #include <qwhatsthis.h> |
44 | 44 | ||
45 | #include <stdlib.h> | 45 | #include <stdlib.h> |
46 | 46 | ||
47 | 47 | ||
48 | MenuSettings::MenuSettings ( QWidget *parent, const char *name ) | 48 | MenuSettings::MenuSettings ( QWidget *parent, const char *name ) |
49 | : QWidget ( parent, name ) | 49 | : QWidget ( parent, name ) |
50 | { | 50 | { |
51 | m_applets_changed = false; | 51 | m_applets_changed = false; |
52 | 52 | ||
53 | QBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); | 53 | QBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); |
54 | 54 | ||
55 | QLabel *l = new QLabel ( tr( "Load applets in O-Menu:" ), this ); | 55 | QLabel *l = new QLabel ( tr( "Load applets in O-Menu:" ), this ); |
56 | lay-> addWidget ( l ); | 56 | lay-> addWidget ( l ); |
57 | 57 | ||
58 | m_list = new QListView ( this ); | 58 | m_list = new QListView ( this ); |
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 | QWhatsThis::add ( m_list, tr( "Check the applets that you want displayed in the O-Menu." )); | 67 | 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 as menus in the O-Menu." )); | 68 | QWhatsThis::add ( m_menutabs, tr( "Adds the contents of the Launcher Tabs as menus in the O-Menu." )); |
69 | 69 | ||
70 | connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( ))); | 70 | connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( ))); |
71 | 71 | ||
72 | init ( ); | 72 | init ( ); |
73 | } | 73 | } |
74 | 74 | ||
75 | void MenuSettings::init ( ) | 75 | void MenuSettings::init ( ) |
76 | { | 76 | { |
77 | Config cfg ( "StartMenu" ); | 77 | Config cfg ( "StartMenu" ); |
78 | cfg. setGroup ( "Applets" ); | 78 | cfg. setGroup ( "Applets" ); |
79 | QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' ); | 79 | QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' ); |
80 | 80 | ||
81 | QString path = QPEApplication::qpeDir ( ) + "/plugins/applets"; | 81 | QString path = QPEApplication::qpeDir ( ) + "/plugins/applets"; |
82 | QStringList list = QDir ( path, "lib*.so" ). entryList ( ); | 82 | QStringList list = QDir ( path, "lib*.so" ). entryList ( ); |
83 | 83 | ||
84 | for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) { | 84 | for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) { |
85 | QString name; | 85 | QString name; |
86 | QPixmap icon; | 86 | QPixmap icon; |
87 | MenuAppletInterface *iface = 0; | 87 | MenuAppletInterface *iface = 0; |
88 | 88 | ||
89 | QLibrary *lib = new QLibrary ( path + "/" + *it ); | 89 | QLibrary *lib = new QLibrary ( path + "/" + *it ); |
90 | lib-> queryInterface ( IID_MenuApplet, (QUnknownInterface**) &iface ); | 90 | lib-> queryInterface ( IID_MenuApplet, (QUnknownInterface**) &iface ); |
91 | if ( iface ) { | 91 | if ( iface ) { |
92 | QString lang = getenv( "LANG" ); | 92 | QString lang = getenv( "LANG" ); |
93 | QTranslator *trans = new QTranslator ( qApp ); | 93 | QTranslator *trans = new QTranslator ( qApp ); |
94 | QString type = (*it). left ((*it). find (".")); | 94 | QString type = (*it). left ((*it). find (".")); |
95 | QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm"; | 95 | QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm"; |
96 | if ( trans-> load ( tfn )) | 96 | if ( trans-> load ( tfn )) |
97 | qApp-> installTranslator ( trans ); | 97 | qApp-> installTranslator ( trans ); |
98 | else | 98 | else |
99 | delete trans; | 99 | delete trans; |
100 | name = iface-> name ( ); | 100 | name = iface-> name ( ); |
diff --git a/core/settings/launcher/tabconfig.h b/core/settings/launcher/tabconfig.h index 8b6b103..eebfd36 100644 --- a/core/settings/launcher/tabconfig.h +++ b/core/settings/launcher/tabconfig.h | |||
@@ -19,35 +19,48 @@ | |||
19 | : = ...= . :.=- You should have received a copy of the GNU | 19 | : = ...= . :.=- You should have received a copy of the GNU |
20 | -. .:....=;==+<; General Public License along with this file; | 20 | -. .:....=;==+<; General Public License along with this file; |
21 | -_. . . )=. = see the file COPYING. If not, write to the | 21 | -_. . . )=. = see the file COPYING. If not, write to the |
22 | -- :-=` Free Software Foundation, Inc., | 22 | -- :-=` Free Software Foundation, Inc., |
23 | 59 Temple Place - Suite 330, | 23 | 59 Temple Place - Suite 330, |
24 | Boston, MA 02111-1307, USA. | 24 | Boston, MA 02111-1307, USA. |
25 | 25 | ||
26 | */ | 26 | */ |
27 | #ifndef __TABCONFIG_H__ | 27 | #ifndef __TABCONFIG_H__ |
28 | #define __TABCONFIG_H__ | 28 | #define __TABCONFIG_H__ |
29 | 29 | ||
30 | struct TabConfig { | 30 | struct TabConfig { |
31 | enum ViewMode { | 31 | enum ViewMode { |
32 | Icon, | 32 | Icon, |
33 | List | 33 | List |
34 | }; | 34 | }; |
35 | enum BackgroundType { | 35 | enum BackgroundType { |
36 | Ruled, | 36 | Ruled, |
37 | SolidColor, | 37 | SolidColor, |
38 | Image | 38 | Image |
39 | }; | 39 | }; |
40 | 40 | ||
41 | ViewMode m_view; | 41 | ViewMode m_view; |
42 | BackgroundType m_bg_type; | 42 | BackgroundType m_bg_type; |
43 | QString m_bg_image; | 43 | QString m_bg_image; |
44 | QString m_bg_color; | 44 | QString m_bg_color; |
45 | QString m_text_color; | 45 | QString m_text_color; |
46 | QString m_font_family; | 46 | QString m_font_family; |
47 | int m_font_size; | 47 | int m_font_size; |
48 | int m_font_weight; | 48 | int m_font_weight; |
49 | bool m_font_italic; | 49 | bool m_font_italic; |
50 | bool m_changed; | 50 | bool m_changed; |
51 | |||
52 | bool operator == ( const TabConfig &tc ) | ||
53 | { | ||
54 | return ( m_view == tc. m_view ) && | ||
55 | ( m_bg_type == tc. m_bg_type ) && | ||
56 | ( m_bg_image == tc. m_bg_image ) && | ||
57 | ( m_bg_color == tc. m_bg_color ) && | ||
58 | ( m_text_color == tc. m_text_color ) && | ||
59 | ( m_font_family == tc. m_font_family ) && | ||
60 | ( m_font_size == tc. m_font_size ) && | ||
61 | ( m_font_weight == tc. m_font_weight ) && | ||
62 | ( m_font_italic == tc. m_font_italic ); | ||
63 | } | ||
51 | }; | 64 | }; |
52 | 65 | ||
53 | #endif | 66 | #endif |
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index 6288f5f..a90ba7d 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp | |||
@@ -9,64 +9,65 @@ | |||
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%`+i> _;_. | 11 | .%`+i> _;_. |
12 | .i_,=:_. -<s. This file is distributed in the hope that | 12 | .i_,=:_. -<s. This file is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
17 | ..}^=.= = ; Public License for more details. | 17 | ..}^=.= = ; Public License for more details. |
18 | ++= -. .` .: | 18 | ++= -. .` .: |
19 | : = ...= . :.=- You should have received a copy of the GNU | 19 | : = ...= . :.=- You should have received a copy of the GNU |
20 | -. .:....=;==+<; General Public License along with this file; | 20 | -. .:....=;==+<; General Public License along with this file; |
21 | -_. . . )=. = see the file COPYING. If not, write to the | 21 | -_. . . )=. = see the file COPYING. If not, write to the |
22 | -- :-=` Free Software Foundation, Inc., | 22 | -- :-=` Free Software Foundation, Inc., |
23 | 59 Temple Place - Suite 330, | 23 | 59 Temple Place - Suite 330, |
24 | Boston, MA 02111-1307, USA. | 24 | Boston, MA 02111-1307, USA. |
25 | 25 | ||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <qpe/resource.h> | 28 | #include <qpe/resource.h> |
29 | #include <qpe/config.h> | 29 | #include <qpe/config.h> |
30 | #include <qpe/applnk.h> | 30 | #include <qpe/applnk.h> |
31 | 31 | ||
32 | #include <qlayout.h> | 32 | #include <qlayout.h> |
33 | #include <qvbox.h> | 33 | #include <qvbox.h> |
34 | #include <qtabbar.h> | 34 | #include <qtabbar.h> |
35 | #include <qiconview.h> | 35 | #include <qiconview.h> |
36 | #include <qapplication.h> | 36 | #include <qapplication.h> |
37 | #include <qlabel.h> | 37 | #include <qlabel.h> |
38 | #include <qradiobutton.h> | 38 | #include <qradiobutton.h> |
39 | #include <qbuttongroup.h> | 39 | #include <qbuttongroup.h> |
40 | #include <qpushbutton.h> | 40 | #include <qpushbutton.h> |
41 | #include <qwhatsthis.h> | ||
41 | 42 | ||
42 | #include <opie/ofontselector.h> | 43 | #include <opie/ofontselector.h> |
43 | #include <opie/otabwidget.h> | 44 | #include <opie/otabwidget.h> |
44 | #include <opie/ocolorbutton.h> | 45 | #include <opie/ocolorbutton.h> |
45 | #include <opie/ofiledialog.h> | 46 | #include <opie/ofiledialog.h> |
46 | 47 | ||
47 | #include "tabdialog.h" | 48 | #include "tabdialog.h" |
48 | 49 | ||
49 | 50 | ||
50 | class SampleItem : public QIconViewItem { | 51 | class SampleItem : public QIconViewItem { |
51 | public: | 52 | public: |
52 | SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text ) | 53 | SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text ) |
53 | { | 54 | { |
54 | m_large = pix; | 55 | m_large = pix; |
55 | m_small. convertFromImage ( pix. convertToImage ( ). smoothScale ( pix. width ( ) / 2, pix. height ( ) / 2 )); | 56 | m_small. convertFromImage ( pix. convertToImage ( ). smoothScale ( pix. width ( ) / 2, pix. height ( ) / 2 )); |
56 | } | 57 | } |
57 | 58 | ||
58 | void sizeChange ( ) | 59 | void sizeChange ( ) |
59 | { | 60 | { |
60 | calcRect ( ); | 61 | calcRect ( ); |
61 | repaint ( ); | 62 | repaint ( ); |
62 | } | 63 | } |
63 | 64 | ||
64 | QPixmap *pixmap ( ) const | 65 | QPixmap *pixmap ( ) const |
65 | { | 66 | { |
66 | if ( iconView ( )-> itemTextPos ( ) == QIconView::Right ) | 67 | if ( iconView ( )-> itemTextPos ( ) == QIconView::Right ) |
67 | return (QPixmap *) &m_small; | 68 | return (QPixmap *) &m_small; |
68 | else | 69 | else |
69 | return (QPixmap *) &m_large; | 70 | return (QPixmap *) &m_large; |
70 | } | 71 | } |
71 | 72 | ||
72 | private: | 73 | private: |
@@ -233,100 +234,102 @@ public: | |||
233 | } | 234 | } |
234 | 235 | ||
235 | void setBackgroundPixmap ( const QPixmap &pm ) | 236 | void setBackgroundPixmap ( const QPixmap &pm ) |
236 | { | 237 | { |
237 | m_bgpix = pm; | 238 | m_bgpix = pm; |
238 | } | 239 | } |
239 | 240 | ||
240 | void setBackgroundColor ( const QColor &c ) | 241 | void setBackgroundColor ( const QColor &c ) |
241 | { | 242 | { |
242 | m_bgcolor = c; | 243 | m_bgcolor = c; |
243 | } | 244 | } |
244 | 245 | ||
245 | void drawBackground ( QPainter *p, const QRect &r ) | 246 | void drawBackground ( QPainter *p, const QRect &r ) |
246 | { | 247 | { |
247 | if ( !m_bgpix. isNull ( )) { | 248 | if ( !m_bgpix. isNull ( )) { |
248 | p-> drawTiledPixmap ( r, m_bgpix, QPoint (( r. x ( ) + contentsX ( )) % m_bgpix. width ( ), | 249 | p-> drawTiledPixmap ( r, m_bgpix, QPoint (( r. x ( ) + contentsX ( )) % m_bgpix. width ( ), |
249 | ( r. y ( ) + contentsY ( )) % m_bgpix. height ( ))); | 250 | ( r. y ( ) + contentsY ( )) % m_bgpix. height ( ))); |
250 | } | 251 | } |
251 | else | 252 | else |
252 | p-> fillRect ( r, m_bgcolor ); | 253 | p-> fillRect ( r, m_bgcolor ); |
253 | } | 254 | } |
254 | 255 | ||
255 | private: | 256 | private: |
256 | QColor m_textcolor; | 257 | QColor m_textcolor; |
257 | QColor m_bgcolor; | 258 | QColor m_bgcolor; |
258 | QPixmap m_bgpix; | 259 | QPixmap m_bgpix; |
259 | TabConfig::BackgroundType m_bgtype; | 260 | TabConfig::BackgroundType m_bgtype; |
260 | }; | 261 | }; |
261 | 262 | ||
262 | 263 | ||
263 | 264 | ||
264 | TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *name, bool modal, WFlags fl ) | 265 | TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *name, bool modal, WFlags fl ) |
265 | : QDialog ( parent, name, modal, fl ), m_tc ( tc ) | 266 | : QDialog ( parent, name, modal, fl | WStyle_ContextHelp ), m_tc ( tc ) |
266 | { | 267 | { |
267 | setCaption ( tr( "Edit Tab" )); | 268 | setCaption ( tr( "Edit Tab" )); |
268 | 269 | ||
269 | QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); | 270 | QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); |
270 | 271 | ||
271 | OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); | 272 | OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); |
272 | QWidget *bgtab; | 273 | QWidget *bgtab; |
273 | 274 | ||
274 | tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/backgroundtabicon.png", tr( "Background" )); | 275 | tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/backgroundtabicon.png", tr( "Background" )); |
275 | tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" )); | 276 | tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" )); |
276 | tw-> addTab ( createIconTab ( tw ), "appearance/colorstabicon.png", tr( "Icons" ) ); | 277 | tw-> addTab ( createIconTab ( tw ), "appearance/colorstabicon.png", tr( "Icons" ) ); |
277 | 278 | ||
278 | tw-> setCurrentTab ( bgtab ); | 279 | tw-> setCurrentTab ( bgtab ); |
279 | 280 | ||
280 | QWidget *sample = new QVBox ( this ); | 281 | QWidget *sample = new QVBox ( this ); |
281 | QTabBar *tb = new QTabBar ( sample ); | 282 | QTabBar *tb = new QTabBar ( sample ); |
282 | QString name ( tr( "Previewing %1" ). arg ( tabname )); | 283 | QString name ( tr( "Previewing %1" ). arg ( tabname )); |
283 | 284 | ||
284 | tb-> addTab ( tabicon ? new QTab ( *tabicon, name ) : new QTab ( name )); | 285 | tb-> addTab ( tabicon ? new QTab ( *tabicon, name ) : new QTab ( name )); |
285 | 286 | ||
286 | m_sample = new SampleView ( sample ); | 287 | m_sample = new SampleView ( sample ); |
287 | 288 | ||
288 | lay-> addWidget ( tw, 10 ); | 289 | lay-> addWidget ( tw, 10 ); |
289 | lay-> addWidget ( sample, 1 ); | 290 | lay-> addWidget ( sample, 1 ); |
290 | 291 | ||
291 | m_iconsize-> setButton ( tc. m_view ); | 292 | m_iconsize-> setButton ( tc. m_view ); |
292 | iconSizeClicked ( tc. m_view ); | 293 | iconSizeClicked ( tc. m_view ); |
293 | m_iconcolor-> setColor ( QColor ( m_tc. m_text_color )); | 294 | m_iconcolor-> setColor ( QColor ( m_tc. m_text_color )); |
294 | iconColorClicked ( m_iconcolor-> color ( )); | 295 | iconColorClicked ( m_iconcolor-> color ( )); |
295 | m_bgtype-> setButton ( tc. m_bg_type ); | 296 | m_bgtype-> setButton ( tc. m_bg_type ); |
296 | m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); | 297 | m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); |
297 | m_bgimage = tc. m_bg_image; | 298 | m_bgimage = tc. m_bg_image; |
298 | bgTypeClicked ( tc. m_bg_type ); | 299 | bgTypeClicked ( tc. m_bg_type ); |
299 | m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic )); | 300 | m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic )); |
300 | fontClicked ( m_fontselect-> selectedFont ( )); | 301 | fontClicked ( m_fontselect-> selectedFont ( )); |
302 | |||
303 | QWhatsThis::add ( sample, tr( "This is a rough preview of what the currently selected Tab will look like." )); | ||
301 | } | 304 | } |
302 | 305 | ||
303 | 306 | ||
304 | TabDialog::~TabDialog ( ) | 307 | TabDialog::~TabDialog ( ) |
305 | { | 308 | { |
306 | } | 309 | } |
307 | 310 | ||
308 | QWidget *TabDialog::createFontTab ( QWidget *parent ) | 311 | QWidget *TabDialog::createFontTab ( QWidget *parent ) |
309 | { | 312 | { |
310 | m_fontselect = new OFontSelector ( false, parent, "FontTab" ); | 313 | m_fontselect = new OFontSelector ( false, parent, "FontTab" ); |
311 | 314 | ||
312 | connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), | 315 | connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), |
313 | this, SLOT( fontClicked ( const QFont & ))); | 316 | this, SLOT( fontClicked ( const QFont & ))); |
314 | 317 | ||
315 | return m_fontselect; | 318 | return m_fontselect; |
316 | } | 319 | } |
317 | 320 | ||
318 | QWidget *TabDialog::createBgTab ( QWidget *parent ) | 321 | QWidget *TabDialog::createBgTab ( QWidget *parent ) |
319 | { | 322 | { |
320 | QWidget *tab = new QWidget( parent, "AdvancedTab" ); | 323 | QWidget *tab = new QWidget( parent, "AdvancedTab" ); |
321 | QVBoxLayout *vertLayout = new QVBoxLayout( tab, 4, 4 ); | 324 | QVBoxLayout *vertLayout = new QVBoxLayout( tab, 4, 4 ); |
322 | 325 | ||
323 | QGridLayout* gridLayout = new QGridLayout ( vertLayout ); | 326 | QGridLayout* gridLayout = new QGridLayout ( vertLayout ); |
324 | gridLayout-> setColStretch ( 1, 10 ); | 327 | gridLayout-> setColStretch ( 1, 10 ); |
325 | 328 | ||
326 | QLabel* label = new QLabel( tr( "Type:" ), tab ); | 329 | QLabel* label = new QLabel( tr( "Type:" ), tab ); |
327 | gridLayout-> addWidget ( label, 0, 0 ); | 330 | gridLayout-> addWidget ( label, 0, 0 ); |
328 | m_bgtype = new QButtonGroup( tab, "buttongroup" ); | 331 | m_bgtype = new QButtonGroup( tab, "buttongroup" ); |
329 | m_bgtype-> hide ( ); | 332 | m_bgtype-> hide ( ); |
330 | m_bgtype-> setExclusive ( true ); | 333 | m_bgtype-> setExclusive ( true ); |
331 | 334 | ||
332 | QRadioButton *rb; | 335 | QRadioButton *rb; |
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp index 6cc69c0..a5afaf2 100644 --- a/core/settings/launcher/tabssettings.cpp +++ b/core/settings/launcher/tabssettings.cpp | |||
@@ -18,178 +18,212 @@ | |||
18 | ++= -. .` .: | 18 | ++= -. .` .: |
19 | : = ...= . :.=- You should have received a copy of the GNU | 19 | : = ...= . :.=- You should have received a copy of the GNU |
20 | -. .:....=;==+<; General Public License along with this file; | 20 | -. .:....=;==+<; General Public License along with this file; |
21 | -_. . . )=. = see the file COPYING. If not, write to the | 21 | -_. . . )=. = see the file COPYING. If not, write to the |
22 | -- :-=` Free Software Foundation, Inc., | 22 | -- :-=` Free Software Foundation, Inc., |
23 | 59 Temple Place - Suite 330, | 23 | 59 Temple Place - Suite 330, |
24 | Boston, MA 02111-1307, USA. | 24 | Boston, MA 02111-1307, USA. |
25 | 25 | ||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "tabssettings.h" | 28 | #include "tabssettings.h" |
29 | 29 | ||
30 | #include <qpe/qpeapplication.h> | 30 | #include <qpe/qpeapplication.h> |
31 | #include <qpe/resource.h> | 31 | #include <qpe/resource.h> |
32 | #include <qpe/applnk.h> | 32 | #include <qpe/applnk.h> |
33 | #include <qpe/mimetype.h> | 33 | #include <qpe/mimetype.h> |
34 | #include <qpe/qcopenvelope_qws.h> | 34 | #include <qpe/qcopenvelope_qws.h> |
35 | #include <qpe/config.h> | 35 | #include <qpe/config.h> |
36 | 36 | ||
37 | #include <qlistbox.h> | 37 | #include <qlistbox.h> |
38 | #include <qpushbutton.h> | 38 | #include <qpushbutton.h> |
39 | #include <qlayout.h> | 39 | #include <qlayout.h> |
40 | #include <qlabel.h> | 40 | #include <qlabel.h> |
41 | #include <qwhatsthis.h> | 41 | #include <qwhatsthis.h> |
42 | #include <qcheckbox.h> | 42 | #include <qcheckbox.h> |
43 | 43 | ||
44 | #include "tabdialog.h" | 44 | #include "tabdialog.h" |
45 | 45 | ||
46 | #include <stdlib.h> | 46 | #include <stdlib.h> |
47 | #include <qmessagebox.h> | 47 | #include <qmessagebox.h> |
48 | 48 | ||
49 | 49 | ||
50 | #define GLOBALID "_launchersettings_global_dummy_" | ||
51 | |||
50 | 52 | ||
51 | TabsSettings::TabsSettings ( QWidget *parent, const char *name ) | 53 | TabsSettings::TabsSettings ( QWidget *parent, const char *name ) |
52 | : QWidget ( parent, name ) | 54 | : QWidget ( parent, name ) |
53 | { | 55 | { |
54 | QGridLayout *lay = new QGridLayout ( this, 0, 0, 4, 4 ); | 56 | QGridLayout *lay = new QGridLayout ( this, 0, 0, 4, 4 ); |
55 | 57 | ||
56 | QLabel *l = new QLabel ( tr( "Launcher Tabs:" ), this ); | 58 | QLabel *l = new QLabel ( tr( "Launcher Tabs:" ), this ); |
57 | lay-> addMultiCellWidget ( l, 0, 0, 0, 1 ); | 59 | lay-> addMultiCellWidget ( l, 0, 0, 0, 1 ); |
58 | 60 | ||
59 | m_list = new QListBox ( this ); | 61 | m_list = new QListBox ( this ); |
60 | lay-> addMultiCellWidget ( m_list, 1, 4, 0, 0 ); | 62 | lay-> addMultiCellWidget ( m_list, 1, 4, 0, 0 ); |
61 | 63 | ||
62 | QWhatsThis::add ( m_list, tr( "foobar" )); | 64 | QWhatsThis::add ( m_list, tr( "foobar" )); |
63 | 65 | ||
64 | QPushButton *p; | 66 | QPushButton *p1, *p2, *p3; |
65 | p = new QPushButton ( tr( "New" ), this ); | 67 | p1 = new QPushButton ( tr( "New" ), this ); |
66 | lay-> addWidget ( p, 1, 1 ); | 68 | lay-> addWidget ( p1, 1, 1 ); |
67 | connect ( p, SIGNAL( clicked ( )), this, SLOT( newClicked ( ))); | 69 | connect ( p1, SIGNAL( clicked ( )), this, SLOT( newClicked ( ))); |
68 | 70 | ||
69 | p = new QPushButton ( tr( "Edit" ), this ); | 71 | p2 = new QPushButton ( tr( "Edit" ), this ); |
70 | lay-> addWidget ( p, 2, 1 ); | 72 | lay-> addWidget ( p2, 2, 1 ); |
71 | connect ( p, SIGNAL( clicked ( )), this, SLOT( editClicked ( ))); | 73 | connect ( p2, SIGNAL( clicked ( )), this, SLOT( editClicked ( ))); |
72 | 74 | ||
73 | p = new QPushButton ( tr( "Delete" ), this ); | 75 | p3 = new QPushButton ( tr( "Delete" ), this ); |
74 | lay-> addWidget ( p, 3, 1 ); | 76 | lay-> addWidget ( p3, 3, 1 ); |
75 | connect ( p, SIGNAL( clicked ( )), this, SLOT( deleteClicked ( ))); | 77 | connect ( p3, SIGNAL( clicked ( )), this, SLOT( deleteClicked ( ))); |
76 | 78 | ||
77 | lay-> setRowStretch ( 4, 10 ); | 79 | lay-> setRowStretch ( 4, 10 ); |
78 | 80 | ||
79 | m_busyblink = new QCheckBox ( tr( "Enable blinking busy indicator" ), this ); | 81 | m_busyblink = new QCheckBox ( tr( "Enable blinking busy indicator" ), this ); |
80 | lay-> addMultiCellWidget ( m_busyblink, 5, 5, 0, 1 ); | 82 | lay-> addMultiCellWidget ( m_busyblink, 5, 5, 0, 1 ); |
81 | 83 | ||
84 | p1-> setEnabled ( false ); | ||
85 | p3-> setEnabled ( false ); | ||
86 | |||
82 | init ( ); | 87 | init ( ); |
88 | |||
89 | QWhatsThis::add ( m_list, tr( "Select the Launcher Tab you want to edit or delete." )); | ||
90 | 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>." )); | ||
91 | QWhatsThis::add ( p2, tr( "Opens a new dialog to customize the select Tab." )); | ||
92 | QWhatsThis::add ( p3, tr( "Deletes a Tab from the Launcher." ) + QString ( "<center><br><i>not yet implemented</i><br>Please use the tabmanager</center>." )); | ||
93 | QWhatsThis::add ( m_busyblink, tr( "Activate this, if you want a blinking busy indicator for starting applications in the Launcher." )); | ||
83 | } | 94 | } |
84 | 95 | ||
85 | void TabsSettings::init ( ) | 96 | void TabsSettings::init ( ) |
86 | { | 97 | { |
87 | AppLnkSet rootFolder( MimeType::appsFolderName ( )); | 98 | AppLnkSet rootFolder( MimeType::appsFolderName ( )); |
88 | QStringList types = rootFolder. types ( ); | 99 | QStringList types = rootFolder. types ( ); |
100 | |||
101 | m_list-> insertItem ( tr( "All Tabs" )); | ||
102 | m_ids << GLOBALID; | ||
89 | 103 | ||
90 | for ( QStringList::Iterator it = types. begin ( ); it != types. end ( ); ++it ) { | 104 | for ( QStringList::Iterator it = types. begin ( ); it != types. end ( ); ++it ) { |
91 | m_list-> insertItem ( rootFolder. typePixmap ( *it ), rootFolder. typeName ( *it )); | 105 | m_list-> insertItem ( rootFolder. typePixmap ( *it ), rootFolder. typeName ( *it )); |
92 | m_ids << *it; | 106 | m_ids << *it; |
93 | } | 107 | } |
94 | QImage img ( Resource::loadImage ( "DocsIcon" )); | 108 | QImage img ( Resource::loadImage ( "DocsIcon" )); |
95 | QPixmap pix; | 109 | QPixmap pix; |
96 | pix = img. smoothScale ( AppLnk::smallIconSize ( ), AppLnk::smallIconSize ( )); | 110 | pix = img. smoothScale ( AppLnk::smallIconSize ( ), AppLnk::smallIconSize ( )); |
97 | m_list-> insertItem ( pix, tr( "Documents" )); | 111 | m_list-> insertItem ( pix, tr( "Documents" )); |
98 | m_ids += "Documents"; // No tr | 112 | m_ids += "Documents"; // No tr |
99 | 113 | ||
100 | Config cfg ( "Launcher" ); | 114 | Config cfg ( "Launcher" ); |
101 | 115 | ||
102 | readTabSettings ( cfg ); | 116 | readTabSettings ( cfg ); |
103 | 117 | ||
104 | cfg. setGroup ( "GUI" ); | 118 | cfg. setGroup ( "GUI" ); |
105 | m_busyblink-> setChecked ( cfg. readEntry ( "BusyType" ). lower ( ) == "blink" ); | 119 | m_busyblink-> setChecked ( cfg. readEntry ( "BusyType" ). lower ( ) == "blink" ); |
106 | } | 120 | } |
107 | 121 | ||
108 | void TabsSettings::readTabSettings ( Config &cfg ) | 122 | void TabsSettings::readTabSettings ( Config &cfg ) |
109 | { | 123 | { |
110 | QString grp ( "Tab %1" ); // No tr | 124 | QString grp ( "Tab %1" ); // No tr |
111 | m_tabs. clear ( ); | 125 | m_tabs. clear ( ); |
112 | 126 | ||
113 | for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { | 127 | for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { |
114 | TabConfig tc; | 128 | TabConfig tc; |
115 | tc. m_view = TabConfig::Icon; | 129 | tc. m_view = TabConfig::Icon; |
116 | tc. m_bg_type = TabConfig::Ruled; | 130 | tc. m_bg_type = TabConfig::Ruled; |
117 | tc. m_changed = false; | 131 | tc. m_changed = false; |
118 | 132 | ||
119 | cfg. setGroup ( grp. arg ( *it )); | 133 | cfg. setGroup ( grp. arg ( *it )); |
134 | if ( *it == GLOBALID ) | ||
135 | cfg. clearGroup ( ); | ||
120 | 136 | ||
121 | QString view = cfg. readEntry ( "View", "Icon" ); | 137 | QString view = cfg. readEntry ( "View", "Icon" ); |
122 | if ( view == "List" ) // No tr | 138 | if ( view == "List" ) // No tr |
123 | tc. m_view = TabConfig::List; | 139 | tc. m_view = TabConfig::List; |
124 | 140 | ||
125 | QString bgType = cfg. readEntry ( "BackgroundType", "Image" ); | 141 | QString bgType = cfg. readEntry ( "BackgroundType", "Image" ); |
126 | if ( bgType == "SolidColor" ) | 142 | if ( bgType == "SolidColor" ) |
127 | tc. m_bg_type = TabConfig::SolidColor; | 143 | tc. m_bg_type = TabConfig::SolidColor; |
128 | else if ( bgType == "Image" ) // No tr | 144 | else if ( bgType == "Image" ) // No tr |
129 | tc. m_bg_type = TabConfig::Image; | 145 | tc. m_bg_type = TabConfig::Image; |
130 | 146 | ||
131 | tc. m_bg_image = cfg. readEntry ( "BackgroundImage", "launcher/opie-background" ); | 147 | tc. m_bg_image = cfg. readEntry ( "BackgroundImage", "launcher/opie-background" ); |
132 | tc. m_bg_color = cfg. readEntry ( "BackgroundColor", colorGroup ( ). color ( QColorGroup::Base ). name ( )); | 148 | tc. m_bg_color = cfg. readEntry ( "BackgroundColor", colorGroup ( ). color ( QColorGroup::Base ). name ( )); |
133 | tc. m_text_color = cfg. readEntry ( "TextColor", colorGroup ( ). color ( QColorGroup::Text ). name ( )); | 149 | tc. m_text_color = cfg. readEntry ( "TextColor", colorGroup ( ). color ( QColorGroup::Text ). name ( )); |
134 | QStringList f = cfg. readListEntry ( "Font", ',' ); | 150 | QStringList f = cfg. readListEntry ( "Font", ',' ); |
135 | if ( f. count ( ) == 4 ) { | 151 | if ( f. count ( ) == 4 ) { |
136 | tc. m_font_family = f [0]; | 152 | tc. m_font_family = f [0]; |
137 | tc. m_font_size = f [1]. toInt ( ); | 153 | tc. m_font_size = f [1]. toInt ( ); |
138 | tc. m_font_weight = f [2]. toInt ( ); | 154 | tc. m_font_weight = f [2]. toInt ( ); |
139 | tc. m_font_italic = ( f [3]. toInt ( )); | 155 | tc. m_font_italic = ( f [3]. toInt ( )); |
140 | } else { | 156 | } else { |
141 | tc. m_font_family = font ( ). family ( ); | 157 | tc. m_font_family = font ( ). family ( ); |
142 | tc. m_font_size = font ( ). pointSize ( ); | 158 | tc. m_font_size = font ( ). pointSize ( ); |
143 | tc. m_font_weight = 50; | 159 | tc. m_font_weight = 50; |
144 | tc. m_font_italic = false; | 160 | tc. m_font_italic = false; |
145 | } | 161 | } |
162 | |||
146 | m_tabs [*it] = tc; | 163 | m_tabs [*it] = tc; |
147 | } | 164 | } |
165 | |||
166 | // if all tabs have the same config, then initialize the GLOBALID tab to these values | ||
167 | |||
168 | TabConfig *first = 0; | ||
169 | bool same = true; | ||
170 | |||
171 | for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { | ||
172 | if ( *it == GLOBALID ) | ||
173 | continue; | ||
174 | else if ( !first ) | ||
175 | first = &m_tabs [*it]; | ||
176 | else | ||
177 | same &= ( *first == m_tabs [*it] ); | ||
178 | } | ||
179 | if ( same ) | ||
180 | m_tabs [GLOBALID] = *first; | ||
148 | } | 181 | } |
149 | 182 | ||
150 | 183 | ||
151 | void TabsSettings::accept ( ) | 184 | void TabsSettings::accept ( ) |
152 | { | 185 | { |
153 | Config cfg ( "Launcher" ); | 186 | Config cfg ( "Launcher" ); |
154 | 187 | ||
155 | // Launcher Tab | 188 | // Launcher Tab |
156 | QString grp ( "Tab %1" ); // No tr | 189 | QString grp ( "Tab %1" ); // No tr |
157 | 190 | ||
158 | for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { | 191 | for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { |
159 | TabConfig &tc = m_tabs [*it]; | 192 | TabConfig &tc = m_tabs [*it]; |
160 | 193 | ||
161 | cfg. setGroup ( grp. arg ( *it )); | 194 | if ( !tc. m_changed || ( *it == GLOBALID )) |
162 | if ( !tc. m_changed ) | ||
163 | continue; | 195 | continue; |
196 | |||
197 | cfg. setGroup ( grp. arg ( *it )); | ||
164 | switch ( tc. m_view ) { | 198 | switch ( tc. m_view ) { |
165 | case TabConfig::Icon: | 199 | case TabConfig::Icon: |
166 | cfg.writeEntry ( "View", "Icon" ); | 200 | cfg.writeEntry ( "View", "Icon" ); |
167 | break; | 201 | break; |
168 | case TabConfig::List: | 202 | case TabConfig::List: |
169 | cfg.writeEntry ( "View", "List" ); | 203 | cfg.writeEntry ( "View", "List" ); |
170 | break; | 204 | break; |
171 | } | 205 | } |
172 | 206 | ||
173 | QCopEnvelope e ( "QPE/Launcher", "setTabView(QString,int)" ); | 207 | QCopEnvelope e ( "QPE/Launcher", "setTabView(QString,int)" ); |
174 | e << *it << tc. m_view; | 208 | e << *it << tc. m_view; |
175 | 209 | ||
176 | cfg. writeEntry ( "BackgroundImage", tc. m_bg_image ); | 210 | cfg. writeEntry ( "BackgroundImage", tc. m_bg_image ); |
177 | cfg. writeEntry ( "BackgroundColor", tc. m_bg_color ); | 211 | cfg. writeEntry ( "BackgroundColor", tc. m_bg_color ); |
178 | cfg. writeEntry ( "TextColor", tc. m_text_color ); | 212 | cfg. writeEntry ( "TextColor", tc. m_text_color ); |
179 | 213 | ||
180 | QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + QString::number ( tc. m_font_weight ) + "," + ( tc. m_font_italic ? "1" : "0" ); | 214 | QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + QString::number ( tc. m_font_weight ) + "," + ( tc. m_font_italic ? "1" : "0" ); |
181 | cfg. writeEntry ( "Font", f ); | 215 | cfg. writeEntry ( "Font", f ); |
182 | QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" ); | 216 | QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" ); |
183 | 217 | ||
184 | switch ( tc. m_bg_type ) { | 218 | switch ( tc. m_bg_type ) { |
185 | case TabConfig::Ruled: | 219 | case TabConfig::Ruled: |
186 | cfg.writeEntry( "BackgroundType", "Ruled" ); | 220 | cfg.writeEntry( "BackgroundType", "Ruled" ); |
187 | be << *it << tc. m_bg_type << QString(""); | 221 | be << *it << tc. m_bg_type << QString(""); |
188 | break; | 222 | break; |
189 | case TabConfig::SolidColor: | 223 | case TabConfig::SolidColor: |
190 | cfg.writeEntry( "BackgroundType", "SolidColor" ); | 224 | cfg.writeEntry( "BackgroundType", "SolidColor" ); |
191 | be << *it << tc. m_bg_type << tc. m_bg_color; | 225 | be << *it << tc. m_bg_type << tc. m_bg_color; |
192 | break; | 226 | break; |
193 | case TabConfig::Image: | 227 | case TabConfig::Image: |
194 | cfg.writeEntry( "BackgroundType", "Image" ); | 228 | cfg.writeEntry( "BackgroundType", "Image" ); |
195 | be << *it << tc. m_bg_type << tc. m_bg_image; | 229 | be << *it << tc. m_bg_type << tc. m_bg_image; |
@@ -217,36 +251,43 @@ void TabsSettings::accept ( ) | |||
217 | } | 251 | } |
218 | 252 | ||
219 | void TabsSettings::newClicked ( ) | 253 | void TabsSettings::newClicked ( ) |
220 | { | 254 | { |
221 | QMessageBox::information ( this, tr( "Error" ), tr( "Not implemented yet" )); | 255 | QMessageBox::information ( this, tr( "Error" ), tr( "Not implemented yet" )); |
222 | } | 256 | } |
223 | 257 | ||
224 | void TabsSettings::deleteClicked ( ) | 258 | void TabsSettings::deleteClicked ( ) |
225 | { | 259 | { |
226 | int ind = m_list-> currentItem ( ); | 260 | int ind = m_list-> currentItem ( ); |
227 | 261 | ||
228 | if ( ind < 0 ) | 262 | if ( ind < 0 ) |
229 | return; | 263 | return; |
230 | 264 | ||
231 | QMessageBox::information ( this, tr( "Error" ), tr( "Not implemented yet" )); | 265 | QMessageBox::information ( this, tr( "Error" ), tr( "Not implemented yet" )); |
232 | } | 266 | } |
233 | 267 | ||
234 | void TabsSettings::editClicked ( ) | 268 | void TabsSettings::editClicked ( ) |
235 | { | 269 | { |
236 | int ind = m_list-> currentItem ( ); | 270 | int ind = m_list-> currentItem ( ); |
237 | 271 | ||
238 | if ( ind < 0 ) | 272 | if ( ind < 0 ) |
239 | return; | 273 | return; |
240 | 274 | ||
241 | TabConfig tc = m_tabs [m_ids [ind]]; | 275 | TabConfig tc = m_tabs [m_ids [ind]]; |
242 | 276 | ||
243 | TabDialog *d = new TabDialog ( m_list-> pixmap ( ind ), m_list-> text ( ind ), tc, this, "TabDialog", true ); | 277 | TabDialog *d = new TabDialog ( m_list-> pixmap ( ind ), m_list-> text ( ind ), tc, this, "TabDialog", true ); |
244 | 278 | ||
245 | d-> showMaximized ( ); | 279 | d-> showMaximized ( ); |
246 | if ( d-> exec ( ) == QDialog::Accepted ) { | 280 | if ( d-> exec ( ) == QDialog::Accepted ) { |
247 | tc. m_changed = true; | 281 | tc. m_changed = true; |
248 | m_tabs [m_ids [ind]] = tc; | 282 | m_tabs [m_ids [ind]] = tc; |
283 | |||
284 | if ( m_ids [ind] == GLOBALID ) { | ||
285 | for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { | ||
286 | if ( *it != GLOBALID ) | ||
287 | m_tabs [*it] = tc; | ||
288 | } | ||
289 | } | ||
249 | } | 290 | } |
250 | 291 | ||
251 | delete d; | 292 | delete d; |
252 | } | 293 | } |