-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | core/settings/launcher/tabconfig.h | 1 | ||||
-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 14 | ||||
-rw-r--r-- | core/settings/launcher/tabdialog.h | 16 | ||||
-rw-r--r-- | core/settings/launcher/tabssettings.cpp | 3 |
5 files changed, 26 insertions, 9 deletions
@@ -4,4 +4,5 @@ | |||
4 | ------------ | 4 | ------------ |
5 | * Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl) | 5 | * Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl) |
6 | * Number of icon columns in Launcher is customizable through LauncherSettings (mickeyl) | ||
6 | 7 | ||
7 | Fixed Bugs | 8 | Fixed Bugs |
diff --git a/core/settings/launcher/tabconfig.h b/core/settings/launcher/tabconfig.h index 84ba073..7844673 100644 --- a/core/settings/launcher/tabconfig.h +++ b/core/settings/launcher/tabconfig.h | |||
@@ -44,4 +44,5 @@ struct TabConfig { | |||
44 | QString m_bg_image; | 44 | QString m_bg_image; |
45 | QString m_bg_color; | 45 | QString m_bg_color; |
46 | int m_iconcolumns; | ||
46 | QString m_text_color; | 47 | QString m_text_color; |
47 | bool m_font_use; | 48 | bool m_font_use; |
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index cef92d9..abe310f 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp | |||
@@ -52,4 +52,5 @@ | |||
52 | #include <qwhatsthis.h> | 52 | #include <qwhatsthis.h> |
53 | #include <qcheckbox.h> | 53 | #include <qcheckbox.h> |
54 | #include <qspinbox.h> | ||
54 | 55 | ||
55 | 56 | ||
@@ -81,4 +82,6 @@ private: | |||
81 | }; | 82 | }; |
82 | 83 | ||
84 | //FIXME: Why not derive SampleView from LauncherView ??? | ||
85 | |||
83 | class SampleView : public QIconView { | 86 | class SampleView : public QIconView { |
84 | public: | 87 | public: |
@@ -195,4 +198,5 @@ public: | |||
195 | } | 198 | } |
196 | 199 | ||
200 | //FIXME: Add per-tab column handling from launcherview.cpp | ||
197 | void calculateGrid ( ItemTextPos pos ) | 201 | void calculateGrid ( ItemTextPos pos ) |
198 | { | 202 | { |
@@ -417,11 +421,10 @@ QWidget *TabDialog::createIconTab ( QWidget *parent ) | |||
417 | m_iconsize-> insert ( rb, TabConfig::Icon ); | 421 | m_iconsize-> insert ( rb, TabConfig::Icon ); |
418 | gridLayout-> addWidget( rb, 1, 1 ); | 422 | gridLayout-> addWidget( rb, 1, 1 ); |
419 | |||
420 | connect ( m_iconsize, SIGNAL( clicked(int)), this, SLOT( iconSizeClicked(int))); | 423 | connect ( m_iconsize, SIGNAL( clicked(int)), this, SLOT( iconSizeClicked(int))); |
421 | |||
422 | gridLayout-> addRowSpacing ( 2, 8 ); | 424 | gridLayout-> addRowSpacing ( 2, 8 ); |
423 | 425 | ||
424 | label = new QLabel ( tr( "Color:" ), tab ); | 426 | label = new QLabel ( tr( "Color:" ), tab ); |
425 | gridLayout-> addWidget ( label, 3, 0 ); | 427 | gridLayout-> addWidget ( label, 3, 0 ); |
428 | gridLayout-> addRowSpacing ( 3, 8 ); | ||
426 | 429 | ||
427 | m_iconcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_text_color ) ); | 430 | m_iconcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_text_color ) ); |
@@ -429,4 +432,10 @@ QWidget *TabDialog::createIconTab ( QWidget *parent ) | |||
429 | gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft ); | 432 | gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft ); |
430 | 433 | ||
434 | label = new QLabel( tr( "Columns:" ), tab ); | ||
435 | gridLayout->addWidget( label, 4, 0 ); | ||
436 | m_iconcolumns = new QSpinBox( 0, 10, 1, tab, "iconspinbox" ); | ||
437 | m_iconcolumns->setSpecialValueText( tr( "Automatic" ) ); | ||
438 | gridLayout->addWidget( m_iconcolumns, 4, 1, AlignLeft ); | ||
439 | |||
431 | vertLayout-> addStretch ( 10 ); | 440 | vertLayout-> addStretch ( 10 ); |
432 | 441 | ||
@@ -507,4 +516,5 @@ void TabDialog::accept ( ) | |||
507 | m_tc. m_bg_type = (TabConfig::BackgroundType) m_bgtype-> id ( m_bgtype-> selected ( )); | 516 | m_tc. m_bg_type = (TabConfig::BackgroundType) m_bgtype-> id ( m_bgtype-> selected ( )); |
508 | m_tc. m_bg_color = m_solidcolor-> color ( ). name ( ); | 517 | m_tc. m_bg_color = m_solidcolor-> color ( ). name ( ); |
518 | m_tc. m_iconcolumns = m_iconcolumns-> value( ); | ||
509 | m_tc. m_bg_image = m_bgimage; | 519 | m_tc. m_bg_image = m_bgimage; |
510 | m_tc. m_text_color = m_iconcolor-> color ( ). name ( ); | 520 | m_tc. m_text_color = m_iconcolor-> color ( ). name ( ); |
diff --git a/core/settings/launcher/tabdialog.h b/core/settings/launcher/tabdialog.h index 46b7ae9..9381237 100644 --- a/core/settings/launcher/tabdialog.h +++ b/core/settings/launcher/tabdialog.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | =. This file is part of the OPIE Project | 2 | =. This file is part of the OPIE Project |
3 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> | 3 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> |
4 | .>+-= | 4 | .>+-= |
5 | _;:, .> :=|. This file is free software; you can | 5 | _;:, .> :=|. This file is free software; you can |
@@ -16,5 +16,5 @@ | |||
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; |
@@ -38,4 +38,5 @@ namespace Opie {class OColorButton;} | |||
38 | class QPushButton; | 38 | class QPushButton; |
39 | class QCheckBox; | 39 | class QCheckBox; |
40 | class QSpinBox; | ||
40 | 41 | ||
41 | 42 | ||
@@ -44,5 +45,5 @@ class TabDialog : public QDialog { | |||
44 | public: | 45 | public: |
45 | TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &cfg, QWidget *parent = 0, const char *dname = 0, bool modal = false, WFlags = 0 ); | 46 | TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &cfg, QWidget *parent = 0, const char *dname = 0, bool modal = false, WFlags = 0 ); |
46 | virtual ~TabDialog ( ); | 47 | virtual ~TabDialog ( ); |
47 | 48 | ||
48 | public slots: | 49 | public slots: |
@@ -62,6 +63,6 @@ private: | |||
62 | QWidget *createFontTab ( QWidget *parent ); | 63 | QWidget *createFontTab ( QWidget *parent ); |
63 | QWidget *createIconTab ( QWidget *parent ); | 64 | QWidget *createIconTab ( QWidget *parent ); |
64 | 65 | ||
65 | 66 | ||
66 | private: | 67 | private: |
67 | SampleView *m_sample; | 68 | SampleView *m_sample; |
@@ -70,9 +71,10 @@ private: | |||
70 | Opie::OColorButton *m_solidcolor; | 71 | Opie::OColorButton *m_solidcolor; |
71 | Opie::OColorButton *m_iconcolor; | 72 | Opie::OColorButton *m_iconcolor; |
73 | QSpinBox *m_iconcolumns; | ||
72 | QPushButton *m_imagebrowse; | 74 | QPushButton *m_imagebrowse; |
73 | QString m_bgimage; | 75 | QString m_bgimage; |
74 | QButtonGroup *m_bgtype; | 76 | QButtonGroup *m_bgtype; |
75 | QCheckBox *m_fontuse; | 77 | QCheckBox *m_fontuse; |
76 | 78 | ||
77 | TabConfig &m_tc; | 79 | TabConfig &m_tc; |
78 | }; | 80 | }; |
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp index 5ac625b..ab64331 100644 --- a/core/settings/launcher/tabssettings.cpp +++ b/core/settings/launcher/tabssettings.cpp | |||
@@ -136,4 +136,5 @@ void TabsSettings::readTabSettings ( Config &cfg ) | |||
136 | global_def. m_bg_image = "launcher/opie-background"; | 136 | global_def. m_bg_image = "launcher/opie-background"; |
137 | global_def. m_bg_color = colorGroup ( ). color ( QColorGroup::Base ). name ( ); | 137 | global_def. m_bg_color = colorGroup ( ). color ( QColorGroup::Base ). name ( ); |
138 | global_def. m_iconcolumns = 0; // automatic | ||
138 | global_def. m_text_color = colorGroup ( ). color ( QColorGroup::Text ). name ( ); | 139 | global_def. m_text_color = colorGroup ( ). color ( QColorGroup::Text ). name ( ); |
139 | global_def. m_font_use = false; | 140 | global_def. m_font_use = false; |
@@ -169,4 +170,5 @@ void TabsSettings::readTabSettings ( Config &cfg ) | |||
169 | tc. m_last_directory = cfg2.readEntry( "DefaultDir", "" ); | 170 | tc. m_last_directory = cfg2.readEntry( "DefaultDir", "" ); |
170 | tc. m_bg_color = cfg. readEntry ( "BackgroundColor", tc. m_bg_color ); | 171 | tc. m_bg_color = cfg. readEntry ( "BackgroundColor", tc. m_bg_color ); |
172 | tc. m_iconcolumns = cfg. readNumEntry ( "Columns", tc. m_iconcolumns ); | ||
171 | tc. m_text_color = cfg. readEntry ( "TextColor", tc. m_text_color ); | 173 | tc. m_text_color = cfg. readEntry ( "TextColor", tc. m_text_color ); |
172 | QStringList f = cfg. readListEntry ( "Font", ',' ); | 174 | QStringList f = cfg. readListEntry ( "Font", ',' ); |
@@ -231,4 +233,5 @@ void TabsSettings::accept ( ) | |||
231 | cfg. writeEntry ( "BackgroundImage", tc. m_bg_image ); | 233 | cfg. writeEntry ( "BackgroundImage", tc. m_bg_image ); |
232 | cfg. writeEntry ( "BackgroundColor", tc. m_bg_color ); | 234 | cfg. writeEntry ( "BackgroundColor", tc. m_bg_color ); |
235 | cfg. writeEntry ( "Columns", tc. m_iconcolumns ); | ||
233 | cfg. writeEntry ( "TextColor", tc. m_text_color ); | 236 | cfg. writeEntry ( "TextColor", tc. m_text_color ); |
234 | cfg2. writeEntry ( "DefaultDir", tc.m_last_directory ); | 237 | cfg2. writeEntry ( "DefaultDir", tc.m_last_directory ); |