summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/launcher/launchersettings.cpp9
-rw-r--r--core/settings/launcher/tabdialog.cpp82
2 files changed, 46 insertions, 45 deletions
diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp
index 7b85602..cb6e98a 100644
--- a/core/settings/launcher/launchersettings.cpp
+++ b/core/settings/launcher/launchersettings.cpp
@@ -1,72 +1,73 @@
1
1/* 2/*
2               =. This file is part of the OPIE Project 3               =. This file is part of the OPIE Project
3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 4             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
4           .>+-= 5           .>+-=
5 _;:,     .>    :=|. This file is free software; you can 6 _;:,     .>    :=|. This file is free software; you can
6.> <`_,   >  .   <= redistribute it and/or modify it under 7.> <`_,   >  .   <= redistribute it and/or modify it under
7:`=1 )Y*s>-.--   : the terms of the GNU General Public 8:`=1 )Y*s>-.--   : the terms of the GNU General Public
8.="- .-=="i,     .._ License as published by the Free Software 9.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 10 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 11     ._= =}       : or (at your option) any later version.
11    .%`+i>       _;_. 12    .%`+i>       _;_.
12    .i_,=:_.      -<s. This file is distributed in the hope that 13    .i_,=:_.      -<s. This file is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 15    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
16  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 17  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
17..}^=.=       =       ; Public License for more details. 18..}^=.=       =       ; Public License for more details.
18++=   -.     .`     .: 19++=   -.     .`     .:
19 :     =  ...= . :.=- You should have received a copy of the GNU 20 :     =  ...= . :.=- You should have received a copy of the GNU
20 -.   .:....=;==+<; General Public License along with this file; 21 -.   .:....=;==+<; General Public License along with this file;
21  -_. . .   )=.  = see the file COPYING. If not, write to the 22  -_. . .   )=.  = see the file COPYING. If not, write to the
22    --        :-=` Free Software Foundation, Inc., 23    --        :-=` Free Software Foundation, Inc.,
23 59 Temple Place - Suite 330, 24 59 Temple Place - Suite 330,
24 Boston, MA 02111-1307, USA. 25 Boston, MA 02111-1307, USA.
25 26
26*/ 27*/
27 28
28#include <qlayout.h> 29#include <qlayout.h>
29#include <qapplication.h> 30#include <qapplication.h>
30 31
31#include <opie/otabwidget.h> 32#include <opie/otabwidget.h>
32 33
33#include "launchersettings.h" 34#include "launchersettings.h"
34#include "tabssettings.h" 35#include "tabssettings.h"
35#include "menusettings.h" 36#include "menusettings.h"
36#include "taskbarsettings.h" 37#include "taskbarsettings.h"
37 38
38 39
39LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) 40LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp )
40{ 41{
41 setCaption ( tr( "Launcher Settings" )); 42 setCaption ( tr( "Launcher Settings" ));
42 43
43 QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); 44 QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 );
44 45
45 OTabWidget *tw = new OTabWidget ( this, "otab" ); 46 OTabWidget *tw = new OTabWidget ( this, "otab" );
46 lay-> addWidget ( tw ); 47 lay-> addWidget ( tw );
47 48
48 m_tabs = new TabsSettings ( tw ); 49 m_tabs = new TabsSettings ( tw );
49 m_taskbar = new TaskbarSettings ( tw ); 50 m_taskbar = new TaskbarSettings ( tw );
50 m_menu = new MenuSettings ( tw ); 51 m_menu = new MenuSettings ( tw );
51 52
52 tw-> addTab ( m_taskbar, "launchersettings/taskbartab.png", tr( "Taskbar" )); 53 tw-> addTab ( m_taskbar, "wait", tr( "Taskbar" ));
53 tw-> addTab ( m_menu, "launchersettings/menutab.png", tr( "O-Menu" )); 54 tw-> addTab ( m_menu, "go", tr( "O-Menu" ));
54 tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" )); 55 tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" ));
55 56
56 tw-> setCurrentTab ( m_taskbar ); 57 tw-> setCurrentTab ( m_taskbar );
57} 58}
58 59
59void LauncherSettings::accept ( ) 60void LauncherSettings::accept ( )
60{ 61{
61 m_taskbar-> accept ( ); 62 m_taskbar-> accept ( );
62 m_menu-> accept ( ); 63 m_menu-> accept ( );
63 m_tabs-> accept ( ); 64 m_tabs-> accept ( );
64 65
65 QDialog::accept ( ); 66 QDialog::accept ( );
66} 67}
67 68
68void LauncherSettings::done ( int r ) 69void LauncherSettings::done ( int r )
69{ 70{
70 QDialog::done ( r ); 71 QDialog::done ( r );
71 close ( ); 72 close ( );
72} 73}
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index 4c9942f..5f68010 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -1,516 +1,516 @@
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
6.> <`_,   >  .   <= redistribute it and/or modify it under 6.> <`_,   >  .   <= redistribute it and/or modify it under
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 <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#include <qwhatsthis.h>
42#include <qcheckbox.h> 42#include <qcheckbox.h>
43 43
44#include <opie/ofontselector.h> 44#include <opie/ofontselector.h>
45#include <opie/otabwidget.h> 45#include <opie/otabwidget.h>
46#include <opie/ocolorbutton.h> 46#include <opie/ocolorbutton.h>
47#include <opie/ofiledialog.h> 47#include <opie/ofiledialog.h>
48 48
49#include "tabdialog.h" 49#include "tabdialog.h"
50 50
51 51
52class SampleItem : public QIconViewItem { 52class SampleItem : public QIconViewItem {
53public: 53public:
54 SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text ) 54 SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text )
55 { 55 {
56 m_large = pix; 56 m_large = pix;
57 m_small. convertFromImage ( pix. convertToImage ( ). smoothScale ( pix. width ( ) / 2, pix. height ( ) / 2 )); 57 m_small. convertFromImage ( pix. convertToImage ( ). smoothScale ( pix. width ( ) / 2, pix. height ( ) / 2 ));
58 } 58 }
59 59
60 void sizeChange ( ) 60 void sizeChange ( )
61 { 61 {
62 calcRect ( ); 62 calcRect ( );
63 repaint ( ); 63 repaint ( );
64 } 64 }
65 65
66 QPixmap *pixmap ( ) const 66 QPixmap *pixmap ( ) const
67 { 67 {
68 if ( iconView ( )-> itemTextPos ( ) == QIconView::Right ) 68 if ( iconView ( )-> itemTextPos ( ) == QIconView::Right )
69 return (QPixmap *) &m_small; 69 return (QPixmap *) &m_small;
70 else 70 else
71 return (QPixmap *) &m_large; 71 return (QPixmap *) &m_large;
72 } 72 }
73 73
74private: 74private:
75 QPixmap m_large, m_small; 75 QPixmap m_large, m_small;
76}; 76};
77 77
78class SampleView : public QIconView { 78class SampleView : public QIconView {
79public: 79public:
80 SampleView ( QWidget *parent = 0, const char *name = 0 ) : QIconView ( parent, name ) 80 SampleView ( QWidget *parent = 0, const char *name = 0 ) : QIconView ( parent, name )
81 { 81 {
82 setItemsMovable ( false ); 82 setItemsMovable ( false );
83 setAutoArrange ( true ); 83 setAutoArrange ( true );
84 setSorting ( true ); 84 setSorting ( true );
85 setFrameStyle ( QFrame::NoFrame ); 85 setFrameStyle ( QFrame::NoFrame );
86 setSpacing ( 4 ); 86 setSpacing ( 4 );
87 setMargin ( 0 ); 87 setMargin ( 0 );
88 setSelectionMode ( QIconView::NoSelection ); 88 setSelectionMode ( QIconView::NoSelection );
89 setBackgroundMode ( PaletteBase ); 89 setBackgroundMode ( PaletteBase );
90 setViewMode ( TabConfig::Icon ); 90 setViewMode ( TabConfig::Icon );
91 calculateGrid ( Bottom ); 91 calculateGrid ( Bottom );
92 92
93 93
94 new SampleItem ( this, tr( "Sample 1" ), Resource::loadPixmap ( "DateBook" )); 94 new SampleItem ( this, tr( "Sample 1" ), Resource::loadPixmap ( "datebook/DateBook" ));
95 new SampleItem ( this, tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" )); 95 new SampleItem ( this, tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" ));
96 new SampleItem ( this, tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" )); 96 new SampleItem ( this, tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" ));
97 97
98 setBackgroundType ( TabConfig::Ruled, QString::null ); 98 setBackgroundType ( TabConfig::Ruled, QString::null );
99 99
100 setMaximumHeight ( firstItem ( )-> height ( ) + 16 ); 100 setMaximumHeight ( firstItem ( )-> height ( ) + 16 );
101 } 101 }
102 102
103 void setViewMode ( TabConfig::ViewMode m ) 103 void setViewMode ( TabConfig::ViewMode m )
104 { 104 {
105 viewport ( )-> setUpdatesEnabled ( false ); 105 viewport ( )-> setUpdatesEnabled ( false );
106 106
107 switch ( m ) { 107 switch ( m ) {
108 case TabConfig::List: 108 case TabConfig::List:
109 setItemTextPos( QIconView::Right ); 109 setItemTextPos( QIconView::Right );
110 break; 110 break;
111 case TabConfig::Icon: 111 case TabConfig::Icon:
112 setItemTextPos( QIconView::Bottom ); 112 setItemTextPos( QIconView::Bottom );
113 break; 113 break;
114 } 114 }
115 // hideOrShowItems ( false ); 115 // hideOrShowItems ( false );
116 116
117 for ( QIconViewItem *it = firstItem ( ); it; it = it-> nextItem ( )) 117 for ( QIconViewItem *it = firstItem ( ); it; it = it-> nextItem ( ))
118 ((SampleItem *) it )-> sizeChange ( ); 118 ((SampleItem *) it )-> sizeChange ( );
119 arrangeItemsInGrid ( true ); 119 arrangeItemsInGrid ( true );
120 viewport ( )-> setUpdatesEnabled ( true ); 120 viewport ( )-> setUpdatesEnabled ( true );
121 update ( ); 121 update ( );
122 } 122 }
123 123
124 124
125 void setBackgroundType( TabConfig::BackgroundType t, const QString &val ) 125 void setBackgroundType( TabConfig::BackgroundType t, const QString &val )
126 { 126 {
127 switch ( t ) { 127 switch ( t ) {
128 case TabConfig::Ruled: { 128 case TabConfig::Ruled: {
129 QPixmap bg ( width ( ), 9 ); 129 QPixmap bg ( width ( ), 9 );
130 QPainter painter ( &bg ); 130 QPainter painter ( &bg );
131 for ( int i = 0; i < 3; i++ ) { 131 for ( int i = 0; i < 3; i++ ) {
132 painter. setPen ( white ); 132 painter. setPen ( white );
133 painter. drawLine ( 0, i*3, width()-1, i*3 ); 133 painter. drawLine ( 0, i*3, width()-1, i*3 );
134 painter. drawLine ( 0, i*3+1, width()-1, i*3+1 ); 134 painter. drawLine ( 0, i*3+1, width()-1, i*3+1 );
135 painter. setPen ( colorGroup().background().light(105) ); 135 painter. setPen ( colorGroup().background().light(105) );
136 painter. drawLine ( 0, i*3+2, width()-1, i*3+2 ); 136 painter. drawLine ( 0, i*3+2, width()-1, i*3+2 );
137 } 137 }
138 painter.end ( ); 138 painter.end ( );
139 setBackgroundPixmap ( bg ); 139 setBackgroundPixmap ( bg );
140 break; 140 break;
141 } 141 }
142 142
143 case TabConfig::SolidColor: { 143 case TabConfig::SolidColor: {
144 setBackgroundPixmap ( QPixmap ( )); 144 setBackgroundPixmap ( QPixmap ( ));
145 if ( val. isEmpty ( )) 145 if ( val. isEmpty ( ))
146 setBackgroundColor ( colorGroup ( ). base ( )); 146 setBackgroundColor ( colorGroup ( ). base ( ));
147 else 147 else
148 setBackgroundColor ( val ); 148 setBackgroundColor ( val );
149 break; 149 break;
150 } 150 }
151 151
152 case TabConfig::Image: { 152 case TabConfig::Image: {
153 qDebug( "Loading image: %s", val.latin1() ); 153 qDebug( "Loading image: %s", val.latin1() );
154 QPixmap bg ( Resource::loadPixmap ( "wallpaper/" + val )); 154 QPixmap bg ( Resource::loadPixmap ( "wallpaper/" + val ));
155 if ( bg. isNull ( )) { 155 if ( bg. isNull ( )) {
156 QImageIO imgio; 156 QImageIO imgio;
157 imgio. setFileName ( val ); 157 imgio. setFileName ( val );
158 QSize ds = qApp-> desktop ( )-> size ( ); 158 QSize ds = qApp-> desktop ( )-> size ( );
159 QString param ( "Scale( %1, %2, ScaleMin )" ); // No tr 159 QString param ( "Scale( %1, %2, ScaleMin )" ); // No tr
160 imgio. setParameters ( param. arg ( ds. width ( )). arg ( ds. height ( )). latin1 ( )); 160 imgio. setParameters ( param. arg ( ds. width ( )). arg ( ds. height ( )). latin1 ( ));
161 imgio. read ( ); 161 imgio. read ( );
162 bg = imgio. image ( ); 162 bg = imgio. image ( );
163 } 163 }
164 setBackgroundPixmap ( bg ); 164 setBackgroundPixmap ( bg );
165 break; 165 break;
166 } 166 }
167 } 167 }
168 m_bgtype = t; 168 m_bgtype = t;
169 viewport ( )-> update ( ); 169 viewport ( )-> update ( );
170 } 170 }
171 171
172 void setTextColor ( const QColor &tc ) 172 void setTextColor ( const QColor &tc )
173 { 173 {
174 m_textcolor = tc; 174 m_textcolor = tc;
175 QColorGroup cg = colorGroup ( ); 175 QColorGroup cg = colorGroup ( );
176 cg. setColor ( QColorGroup::Text, tc ); 176 cg. setColor ( QColorGroup::Text, tc );
177 setPalette ( QPalette ( cg, cg, cg )); 177 setPalette ( QPalette ( cg, cg, cg ));
178 viewport ( )-> update ( ); 178 viewport ( )-> update ( );
179 } 179 }
180 180
181 void setViewFont ( const QFont &f ) 181 void setViewFont ( const QFont &f )
182 { 182 {
183 setFont ( f ); 183 setFont ( f );
184 } 184 }
185 185
186 void setItemTextPos ( ItemTextPos pos ) 186 void setItemTextPos ( ItemTextPos pos )
187 { 187 {
188 calculateGrid ( pos ); 188 calculateGrid ( pos );
189 QIconView::setItemTextPos( pos ); 189 QIconView::setItemTextPos( pos );
190 } 190 }
191 191
192 void calculateGrid ( ItemTextPos pos ) 192 void calculateGrid ( ItemTextPos pos )
193 { 193 {
194 int dw = QApplication::desktop ( )-> width ( ); 194 int dw = QApplication::desktop ( )-> width ( );
195 int viewerWidth = dw - style ( ).scrollBarExtent ( ). width ( ); 195 int viewerWidth = dw - style ( ).scrollBarExtent ( ). width ( );
196 if ( pos == Bottom ) { 196 if ( pos == Bottom ) {
197 int cols = 3; 197 int cols = 3;
198 if ( viewerWidth <= 200 ) 198 if ( viewerWidth <= 200 )
199 cols = 2; 199 cols = 2;
200 else if ( viewerWidth >= 400 ) 200 else if ( viewerWidth >= 400 )
201 cols = viewerWidth/96; 201 cols = viewerWidth/96;
202 setSpacing ( 4 ); 202 setSpacing ( 4 );
203 setGridX (( viewerWidth - ( cols + 1 ) * spacing ( )) / cols ); 203 setGridX (( viewerWidth - ( cols + 1 ) * spacing ( )) / cols );
204 setGridY ( fontMetrics ( ). height ( ) * 2 + 24 ); 204 setGridY ( fontMetrics ( ). height ( ) * 2 + 24 );
205 } 205 }
206 else { 206 else {
207 int cols = 2; 207 int cols = 2;
208 if ( viewerWidth < 150 ) 208 if ( viewerWidth < 150 )
209 cols = 1; 209 cols = 1;
210 else if ( viewerWidth >= 400 ) 210 else if ( viewerWidth >= 400 )
211 cols = viewerWidth / 150; 211 cols = viewerWidth / 150;
212 setSpacing ( 2 ); 212 setSpacing ( 2 );
213 setGridX (( viewerWidth - ( cols + 1 ) * spacing ( )) / cols ); 213 setGridX (( viewerWidth - ( cols + 1 ) * spacing ( )) / cols );
214 setGridY ( fontMetrics ( ). height ( ) + 2 ); 214 setGridY ( fontMetrics ( ). height ( ) + 2 );
215 } 215 }
216 } 216 }
217 217
218 void paletteChange( const QPalette &p ) 218 void paletteChange( const QPalette &p )
219 { 219 {
220 static bool excllock = false; 220 static bool excllock = false;
221 221
222 if ( excllock ) 222 if ( excllock )
223 return; 223 return;
224 excllock = true; 224 excllock = true;
225 225
226 unsetPalette ( ); 226 unsetPalette ( );
227 QIconView::paletteChange ( p ); 227 QIconView::paletteChange ( p );
228 if ( m_bgtype == TabConfig::Ruled ) 228 if ( m_bgtype == TabConfig::Ruled )
229 setBackgroundType ( TabConfig::Ruled, QString::null ); 229 setBackgroundType ( TabConfig::Ruled, QString::null );
230 QColorGroup cg = colorGroup ( ); 230 QColorGroup cg = colorGroup ( );
231 cg.setColor ( QColorGroup::Text, m_textcolor ); 231 cg.setColor ( QColorGroup::Text, m_textcolor );
232 setPalette ( QPalette ( cg, cg, cg )); 232 setPalette ( QPalette ( cg, cg, cg ));
233 233
234 excllock = false; 234 excllock = false;
235 } 235 }
236 236
237 void setBackgroundPixmap ( const QPixmap &pm ) 237 void setBackgroundPixmap ( const QPixmap &pm )
238 { 238 {
239 m_bgpix = pm; 239 m_bgpix = pm;
240 } 240 }
241 241
242 void setBackgroundColor ( const QColor &c ) 242 void setBackgroundColor ( const QColor &c )
243 { 243 {
244 m_bgcolor = c; 244 m_bgcolor = c;
245 } 245 }
246 246
247 void drawBackground ( QPainter *p, const QRect &r ) 247 void drawBackground ( QPainter *p, const QRect &r )
248 { 248 {
249 if ( !m_bgpix. isNull ( )) { 249 if ( !m_bgpix. isNull ( )) {
250 p-> drawTiledPixmap ( r, m_bgpix, QPoint (( r. x ( ) + contentsX ( )) % m_bgpix. width ( ), 250 p-> drawTiledPixmap ( r, m_bgpix, QPoint (( r. x ( ) + contentsX ( )) % m_bgpix. width ( ),
251 ( r. y ( ) + contentsY ( )) % m_bgpix. height ( ))); 251 ( r. y ( ) + contentsY ( )) % m_bgpix. height ( )));
252 } 252 }
253 else 253 else
254 p-> fillRect ( r, m_bgcolor ); 254 p-> fillRect ( r, m_bgcolor );
255 } 255 }
256 256
257private: 257private:
258 QColor m_textcolor; 258 QColor m_textcolor;
259 QColor m_bgcolor; 259 QColor m_bgcolor;
260 QPixmap m_bgpix; 260 QPixmap m_bgpix;
261 TabConfig::BackgroundType m_bgtype; 261 TabConfig::BackgroundType m_bgtype;
262}; 262};
263 263
264 264
265 265
266TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *dname, bool modal, WFlags fl ) 266TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *dname, bool modal, WFlags fl )
267 : QDialog ( parent, dname, modal, fl | WStyle_ContextHelp ), m_tc ( tc ) 267 : QDialog ( parent, dname, modal, fl | WStyle_ContextHelp ), m_tc ( tc )
268{ 268{
269 setCaption ( tr( "Edit Tab" )); 269 setCaption ( tr( "Edit Tab" ));
270 270
271 QVBoxLayout *lay = new QVBoxLayout ( this, 3, 3 ); 271 QVBoxLayout *lay = new QVBoxLayout ( this, 3, 3 );
272 272
273 OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); 273 OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
274 QWidget *bgtab; 274 QWidget *bgtab;
275 275
276 tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/backgroundtabicon.png", tr( "Background" )); 276 tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/color", tr( "Background" ));
277 tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" )); 277 tw-> addTab ( createFontTab ( tw ), "font", tr( "Font" ));
278 tw-> addTab ( createIconTab ( tw ), "appearance/colorstabicon.png", tr( "Icons" ) ); 278 tw-> addTab ( createIconTab ( tw ), "pixmap", tr( "Icons" ) );
279 279
280 tw-> setCurrentTab ( bgtab ); 280 tw-> setCurrentTab ( bgtab );
281 281
282 QWidget *sample = new QVBox ( this ); 282 QWidget *sample = new QVBox ( this );
283 QTabBar *tb = new QTabBar ( sample ); 283 QTabBar *tb = new QTabBar ( sample );
284 QString name ( tr( "Previewing %1" ). arg ( tabname )); 284 QString name ( tr( "Previewing %1" ). arg ( tabname ));
285 285
286 tb-> addTab ( tabicon ? new QTab ( *tabicon, name ) : new QTab ( name )); 286 tb-> addTab ( tabicon ? new QTab ( *tabicon, name ) : new QTab ( name ));
287 287
288 m_sample = new SampleView ( sample ); 288 m_sample = new SampleView ( sample );
289 289
290 lay-> addWidget ( tw, 10 ); 290 lay-> addWidget ( tw, 10 );
291 lay-> addWidget ( sample, 1 ); 291 lay-> addWidget ( sample, 1 );
292 292
293 m_iconsize-> setButton ( tc. m_view ); 293 m_iconsize-> setButton ( tc. m_view );
294 iconSizeClicked ( tc. m_view ); 294 iconSizeClicked ( tc. m_view );
295 //m_iconcolor-> setColor ( QColor ( m_tc. m_text_color )); 295 //m_iconcolor-> setColor ( QColor ( m_tc. m_text_color ));
296 iconColorClicked ( m_iconcolor-> color ( )); 296 iconColorClicked ( m_iconcolor-> color ( ));
297 m_bgtype-> setButton ( tc. m_bg_type ); 297 m_bgtype-> setButton ( tc. m_bg_type );
298 //m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); 298 //m_solidcolor-> setColor ( QColor ( tc. m_bg_color ));
299 m_bgimage = tc. m_bg_image; 299 m_bgimage = tc. m_bg_image;
300 bgTypeClicked ( tc. m_bg_type ); 300 bgTypeClicked ( tc. m_bg_type );
301 m_fontuse-> setChecked ( tc. m_font_use ); 301 m_fontuse-> setChecked ( tc. m_font_use );
302 m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic )); 302 m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic ));
303 m_fontselect-> setEnabled ( m_fontuse-> isChecked ( )); 303 m_fontselect-> setEnabled ( m_fontuse-> isChecked ( ));
304 fontClicked ( m_fontselect-> selectedFont ( )); 304 fontClicked ( m_fontselect-> selectedFont ( ));
305 305
306 QWhatsThis::add ( sample, tr( "This is a rough preview of what the currently selected Tab will look like." )); 306 QWhatsThis::add ( sample, tr( "This is a rough preview of what the currently selected Tab will look like." ));
307} 307}
308 308
309 309
310TabDialog::~TabDialog ( ) 310TabDialog::~TabDialog ( )
311{ 311{
312} 312}
313 313
314QWidget *TabDialog::createFontTab ( QWidget *parent ) 314QWidget *TabDialog::createFontTab ( QWidget *parent )
315{ 315{
316 QWidget *tab = new QWidget ( parent, "FontTab" ); 316 QWidget *tab = new QWidget ( parent, "FontTab" );
317 QVBoxLayout *vertLayout = new QVBoxLayout ( tab, 3, 3 ); 317 QVBoxLayout *vertLayout = new QVBoxLayout ( tab, 3, 3 );
318 318
319 m_fontuse = new QCheckBox ( tr( "Use a custom font" ), tab ); 319 m_fontuse = new QCheckBox ( tr( "Use a custom font" ), tab );
320 vertLayout-> addWidget ( m_fontuse ); 320 vertLayout-> addWidget ( m_fontuse );
321 321
322 m_fontselect = new OFontSelector ( false, tab, "fontsel" ); 322 m_fontselect = new OFontSelector ( false, tab, "fontsel" );
323 vertLayout-> addWidget ( m_fontselect ); 323 vertLayout-> addWidget ( m_fontselect );
324 324
325 connect ( m_fontuse, SIGNAL( toggled ( bool )), m_fontselect, SLOT( setEnabled ( bool ))); 325 connect ( m_fontuse, SIGNAL( toggled ( bool )), m_fontselect, SLOT( setEnabled ( bool )));
326 connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), 326 connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )),
327 this, SLOT( fontClicked ( const QFont & ))); 327 this, SLOT( fontClicked ( const QFont & )));
328 328
329 return tab; 329 return tab;
330} 330}
331 331
332QWidget *TabDialog::createBgTab ( QWidget *parent ) 332QWidget *TabDialog::createBgTab ( QWidget *parent )
333{ 333{
334 QWidget *tab = new QWidget( parent, "BgTab" ); 334 QWidget *tab = new QWidget( parent, "BgTab" );
335 QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 ); 335 QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
336 336
337 QGridLayout* gridLayout = new QGridLayout ( vertLayout ); 337 QGridLayout* gridLayout = new QGridLayout ( vertLayout );
338 gridLayout-> setColStretch ( 1, 10 ); 338 gridLayout-> setColStretch ( 1, 10 );
339 339
340 QLabel* label = new QLabel( tr( "Type:" ), tab ); 340 QLabel* label = new QLabel( tr( "Type:" ), tab );
341 gridLayout-> addWidget ( label, 0, 0 ); 341 gridLayout-> addWidget ( label, 0, 0 );
342 m_bgtype = new QButtonGroup( tab, "buttongroup" ); 342 m_bgtype = new QButtonGroup( tab, "buttongroup" );
343 m_bgtype-> hide ( ); 343 m_bgtype-> hide ( );
344 m_bgtype-> setExclusive ( true ); 344 m_bgtype-> setExclusive ( true );
345 345
346 QRadioButton *rb; 346 QRadioButton *rb;
347 rb = new QRadioButton( tr( "Ruled" ), tab, "ruled" ); 347 rb = new QRadioButton( tr( "Ruled" ), tab, "ruled" );
348 m_bgtype-> insert ( rb, TabConfig::Ruled ); 348 m_bgtype-> insert ( rb, TabConfig::Ruled );
349 gridLayout-> addWidget( rb, 0, 1 ); 349 gridLayout-> addWidget( rb, 0, 1 );
350 350
351 QHBoxLayout *hb = new QHBoxLayout ( ); 351 QHBoxLayout *hb = new QHBoxLayout ( );
352 hb-> setSpacing ( 3 ); 352 hb-> setSpacing ( 3 );
353 353
354 rb = new QRadioButton( tr( "Solid color" ), tab, "solid" ); 354 rb = new QRadioButton( tr( "Solid color" ), tab, "solid" );
355 m_bgtype-> insert ( rb, TabConfig::SolidColor ); 355 m_bgtype-> insert ( rb, TabConfig::SolidColor );
356 hb-> addWidget ( rb ); 356 hb-> addWidget ( rb );
357 hb-> addSpacing ( 10 ); 357 hb-> addSpacing ( 10 );
358 358
359 m_solidcolor = new OColorButton ( tab, QColor ( m_tc. m_bg_color ) ); 359 m_solidcolor = new OColorButton ( tab, QColor ( m_tc. m_bg_color ) );
360 connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( bgColorClicked ( const QColor & ))); 360 connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( bgColorClicked ( const QColor & )));
361 hb-> addWidget ( m_solidcolor ); 361 hb-> addWidget ( m_solidcolor );
362 hb-> addStretch ( 10 ); 362 hb-> addStretch ( 10 );
363 363
364 gridLayout-> addLayout ( hb, 1, 1 ); 364 gridLayout-> addLayout ( hb, 1, 1 );
365 365
366 hb = new QHBoxLayout ( ); 366 hb = new QHBoxLayout ( );
367 hb-> setSpacing ( 3 ); 367 hb-> setSpacing ( 3 );
368 368
369 rb = new QRadioButton( tr( "Image" ), tab, "image" ); 369 rb = new QRadioButton( tr( "Image" ), tab, "image" );
370 m_bgtype-> insert ( rb, TabConfig::Image ); 370 m_bgtype-> insert ( rb, TabConfig::Image );
371 hb-> addWidget( rb ); 371 hb-> addWidget( rb );
372 hb-> addSpacing ( 10 ); 372 hb-> addSpacing ( 10 );
373 373
374 m_imagebrowse = new QPushButton ( tr( "Select..." ), tab ); 374 m_imagebrowse = new QPushButton ( tr( "Select..." ), tab );
375 connect ( m_imagebrowse, SIGNAL( clicked ( )), this, SLOT( bgImageClicked ( ))); 375 connect ( m_imagebrowse, SIGNAL( clicked ( )), this, SLOT( bgImageClicked ( )));
376 hb-> addWidget ( m_imagebrowse ); 376 hb-> addWidget ( m_imagebrowse );
377 hb-> addStretch ( 10 ); 377 hb-> addStretch ( 10 );
378 378
379 gridLayout-> addLayout ( hb, 2, 1 ); 379 gridLayout-> addLayout ( hb, 2, 1 );
380 380
381 QPushButton *p = new QPushButton ( tr( "Default" ), tab ); 381 QPushButton *p = new QPushButton ( tr( "Default" ), tab );
382 connect ( p, SIGNAL( clicked ( )), this, SLOT( bgDefaultClicked ( ))); 382 connect ( p, SIGNAL( clicked ( )), this, SLOT( bgDefaultClicked ( )));
383 gridLayout-> addWidget ( p, 3, 1 ); 383 gridLayout-> addWidget ( p, 3, 1 );
384 384
385 connect ( m_bgtype, SIGNAL( clicked ( int )), this, SLOT( bgTypeClicked ( int ))); 385 connect ( m_bgtype, SIGNAL( clicked ( int )), this, SLOT( bgTypeClicked ( int )));
386 386
387 vertLayout-> addStretch ( 10 ); 387 vertLayout-> addStretch ( 10 );
388 388
389 return tab; 389 return tab;
390} 390}
391 391
392QWidget *TabDialog::createIconTab ( QWidget *parent ) 392QWidget *TabDialog::createIconTab ( QWidget *parent )
393{ 393{
394 QWidget *tab = new QWidget( parent, "IconTab" ); 394 QWidget *tab = new QWidget( parent, "IconTab" );
395 QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 ); 395 QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
396 396
397 QGridLayout* gridLayout = new QGridLayout ( vertLayout ); 397 QGridLayout* gridLayout = new QGridLayout ( vertLayout );
398 gridLayout-> setColStretch ( 1, 10 ); 398 gridLayout-> setColStretch ( 1, 10 );
399 399
400 QLabel* label = new QLabel( tr( "Size:" ), tab ); 400 QLabel* label = new QLabel( tr( "Size:" ), tab );
401 gridLayout-> addWidget ( label, 0, 0 ); 401 gridLayout-> addWidget ( label, 0, 0 );
402 m_iconsize = new QButtonGroup( tab, "buttongroup" ); 402 m_iconsize = new QButtonGroup( tab, "buttongroup" );
403 m_iconsize-> hide ( ); 403 m_iconsize-> hide ( );
404 m_iconsize-> setExclusive ( true ); 404 m_iconsize-> setExclusive ( true );
405 405
406 QRadioButton *rb; 406 QRadioButton *rb;
407 rb = new QRadioButton( tr( "Small" ), tab, "iconsmall" ); 407 rb = new QRadioButton( tr( "Small" ), tab, "iconsmall" );
408 m_iconsize-> insert ( rb, TabConfig::List ); 408 m_iconsize-> insert ( rb, TabConfig::List );
409 gridLayout-> addWidget( rb, 0, 1 ); 409 gridLayout-> addWidget( rb, 0, 1 );
410 410
411 rb = new QRadioButton( tr( "Large" ), tab, "iconlarge" ); 411 rb = new QRadioButton( tr( "Large" ), tab, "iconlarge" );
412 m_iconsize-> insert ( rb, TabConfig::Icon ); 412 m_iconsize-> insert ( rb, TabConfig::Icon );
413 gridLayout-> addWidget( rb, 1, 1 ); 413 gridLayout-> addWidget( rb, 1, 1 );
414 414
415 connect ( m_iconsize, SIGNAL( clicked ( int )), this, SLOT( iconSizeClicked ( int ))); 415 connect ( m_iconsize, SIGNAL( clicked ( int )), this, SLOT( iconSizeClicked ( int )));
416 416
417 //vertLayout-> addSpacing ( 8 ); 417 //vertLayout-> addSpacing ( 8 );
418 418
419 //gridLayout = new QGridLayout ( vertLayout ); 419 //gridLayout = new QGridLayout ( vertLayout );
420 gridLayout-> addRowSpacing ( 2, 8 ); 420 gridLayout-> addRowSpacing ( 2, 8 );
421 421
422 label = new QLabel ( tr( "Color:" ), tab ); 422 label = new QLabel ( tr( "Color:" ), tab );
423 gridLayout-> addWidget ( label, 3, 0 ); 423 gridLayout-> addWidget ( label, 3, 0 );
424 424
425 m_iconcolor = new OColorButton ( tab, QColor ( m_tc. m_text_color ) ); 425 m_iconcolor = new OColorButton ( tab, QColor ( m_tc. m_text_color ) );
426 connect ( m_iconcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( iconColorClicked ( const QColor & ))); 426 connect ( m_iconcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( iconColorClicked ( const QColor & )));
427 gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft ); 427 gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft );
428 428
429 vertLayout-> addStretch ( 10 ); 429 vertLayout-> addStretch ( 10 );
430 430
431 return tab; 431 return tab;
432} 432}
433 433
434 434
435void TabDialog::iconSizeClicked ( int s ) 435void TabDialog::iconSizeClicked ( int s )
436{ 436{
437 m_sample-> setViewMode ((TabConfig::ViewMode) s ); 437 m_sample-> setViewMode ((TabConfig::ViewMode) s );
438} 438}
439 439
440void TabDialog::fontClicked ( const QFont &f ) 440void TabDialog::fontClicked ( const QFont &f )
441{ 441{
442 m_sample-> setViewFont ( f ); 442 m_sample-> setViewFont ( f );
443} 443}
444 444
445void TabDialog::bgTypeClicked ( int t ) 445void TabDialog::bgTypeClicked ( int t )
446{ 446{
447 QString s; 447 QString s;
448 448
449 if ( m_bgtype-> id ( m_bgtype-> selected ( )) != t ) 449 if ( m_bgtype-> id ( m_bgtype-> selected ( )) != t )
450 m_bgtype-> setButton ( t ); 450 m_bgtype-> setButton ( t );
451 451
452 m_solidcolor-> setEnabled ( t == TabConfig::SolidColor ); 452 m_solidcolor-> setEnabled ( t == TabConfig::SolidColor );
453 m_imagebrowse-> setEnabled ( t == TabConfig::Image ); 453 m_imagebrowse-> setEnabled ( t == TabConfig::Image );
454 454
455 if ( t == TabConfig::SolidColor ) 455 if ( t == TabConfig::SolidColor )
456 s = m_solidcolor-> color ( ). name ( ); 456 s = m_solidcolor-> color ( ). name ( );
457 else if ( t == TabConfig::Image ) 457 else if ( t == TabConfig::Image )
458 s = Resource::findPixmap ( m_bgimage ); 458 s = Resource::findPixmap ( m_bgimage );
459 459
460 m_sample-> setBackgroundType ((TabConfig::BackgroundType) t, s ); 460 m_sample-> setBackgroundType ((TabConfig::BackgroundType) t, s );
461} 461}
462 462
463void TabDialog::bgColorClicked ( const QColor & ) 463void TabDialog::bgColorClicked ( const QColor & )
464{ 464{
465 bgTypeClicked ( TabConfig::SolidColor ); 465 bgTypeClicked ( TabConfig::SolidColor );
466} 466}
467 467
468void TabDialog::iconColorClicked ( const QColor &col ) 468void TabDialog::iconColorClicked ( const QColor &col )
469{ 469{
470 m_sample-> setTextColor ( col ); 470 m_sample-> setTextColor ( col );
471} 471}
472 472
473void TabDialog::bgImageClicked ( ) 473void TabDialog::bgImageClicked ( )
474{ 474{
475 // ### use OFileSelector here ### 475 // ### use OFileSelector here ###
476 // this is just a quick c&p from the old appearance app 476 // this is just a quick c&p from the old appearance app
477 477
478 MimeTypes types; 478 MimeTypes types;
479 QStringList list; 479 QStringList list;
480 list << "image/*"; 480 list << "image/*";
481 types. insert ( "Images", list ); 481 types. insert ( "Images", list );
482 482
483 QString file = OFileDialog::getOpenFileName ( 1, "/", QString::null, types ); 483 QString file = OFileDialog::getOpenFileName ( 1, "/", QString::null, types );
484 if ( !file. isEmpty ( )) { 484 if ( !file. isEmpty ( )) {
485 m_bgimage = DocLnk ( file ). file ( ); 485 m_bgimage = DocLnk ( file ). file ( );
486 bgTypeClicked ( TabConfig::Image ); 486 bgTypeClicked ( TabConfig::Image );
487 } 487 }
488} 488}
489 489
490void TabDialog::bgDefaultClicked ( ) 490void TabDialog::bgDefaultClicked ( )
491{ 491{
492 m_bgimage = "launcher/opie-background"; 492 m_bgimage = "launcher/opie-background";
493 bgTypeClicked ( TabConfig::Image ); 493 bgTypeClicked ( TabConfig::Image );
494} 494}
495 495
496void TabDialog::accept ( ) 496void TabDialog::accept ( )
497{ 497{
498 m_tc. m_view = (TabConfig::ViewMode) m_iconsize-> id ( m_iconsize-> selected ( )); 498 m_tc. m_view = (TabConfig::ViewMode) m_iconsize-> id ( m_iconsize-> selected ( ));
499 m_tc. m_bg_type = (TabConfig::BackgroundType) m_bgtype-> id ( m_bgtype-> selected ( )); 499 m_tc. m_bg_type = (TabConfig::BackgroundType) m_bgtype-> id ( m_bgtype-> selected ( ));
500 m_tc. m_bg_color = m_solidcolor-> color ( ). name ( ); 500 m_tc. m_bg_color = m_solidcolor-> color ( ). name ( );
501 m_tc. m_bg_image = m_bgimage; 501 m_tc. m_bg_image = m_bgimage;
502 m_tc. m_text_color = m_iconcolor-> color ( ). name ( ); 502 m_tc. m_text_color = m_iconcolor-> color ( ). name ( );
503 503
504 m_tc. m_font_use = m_fontuse-> isChecked ( ); 504 m_tc. m_font_use = m_fontuse-> isChecked ( );
505 505
506 if ( m_tc. m_font_use ) { 506 if ( m_tc. m_font_use ) {
507 QFont f = m_fontselect-> selectedFont ( ); 507 QFont f = m_fontselect-> selectedFont ( );
508 508
509 m_tc. m_font_family = f. family ( ); 509 m_tc. m_font_family = f. family ( );
510 m_tc. m_font_size = f. pointSize ( ); 510 m_tc. m_font_size = f. pointSize ( );
511 m_tc. m_font_weight = f. weight ( ); 511 m_tc. m_font_weight = f. weight ( );
512 m_tc. m_font_italic = f. italic ( ); 512 m_tc. m_font_italic = f. italic ( );
513 } 513 }
514 514
515 QDialog::accept ( ); 515 QDialog::accept ( );
516} 516}