author | harlekin <harlekin> | 2003-03-08 21:40:57 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-03-08 21:40:57 (UTC) |
commit | a6bf0a8b50265dd667f31fed18a6dcad15ef10b5 (patch) (unidiff) | |
tree | b960cf65353e5b67992c86a8bfa5349c73034e06 /core/settings | |
parent | 006850e5841fe3d509845a10bb8a6391c556c1c0 (diff) | |
download | opie-a6bf0a8b50265dd667f31fed18a6dcad15ef10b5.zip opie-a6bf0a8b50265dd667f31fed18a6dcad15ef10b5.tar.gz opie-a6bf0a8b50265dd667f31fed18a6dcad15ef10b5.tar.bz2 |
icon changes
-rw-r--r-- | core/settings/launcher/launchersettings.cpp | 9 | ||||
-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 82 |
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,3 +1,4 @@ | |||
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> |
@@ -15,7 +16,7 @@ | |||
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 |
@@ -49,10 +50,10 @@ LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false, | |||
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 | ||
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 | |||
@@ -15,7 +15,7 @@ | |||
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 |
@@ -52,25 +52,25 @@ | |||
52 | class SampleItem : public QIconViewItem { | 52 | class SampleItem : public QIconViewItem { |
53 | public: | 53 | public: |
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 | ||
74 | private: | 74 | private: |
75 | QPixmap m_large, m_small; | 75 | QPixmap m_large, m_small; |
76 | }; | 76 | }; |
@@ -91,21 +91,21 @@ public: | |||
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: |
@@ -119,7 +119,7 @@ public: | |||
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 ) |
@@ -188,7 +188,7 @@ public: | |||
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 ( ); |
@@ -202,7 +202,7 @@ public: | |||
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 ) |
@@ -214,15 +214,15 @@ public: | |||
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 ) |
@@ -230,16 +230,16 @@ public: | |||
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 | } |
@@ -247,13 +247,13 @@ public: | |||
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 | ||
257 | private: | 257 | private: |
258 | QColor m_textcolor; | 258 | QColor m_textcolor; |
259 | QColor m_bgcolor; | 259 | QColor m_bgcolor; |
@@ -273,9 +273,9 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig | |||
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 | ||
@@ -375,10 +375,10 @@ QWidget *TabDialog::createBgTab ( QWidget *parent ) | |||
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 | ||
@@ -393,7 +393,7 @@ QWidget *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 | ||
@@ -448,7 +448,7 @@ void TabDialog::bgTypeClicked ( int t ) | |||
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 | ||
@@ -456,7 +456,7 @@ void TabDialog::bgTypeClicked ( int t ) | |||
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 | ||
@@ -477,14 +477,14 @@ void TabDialog::bgImageClicked ( ) | |||
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 | ||
490 | void TabDialog::bgDefaultClicked ( ) | 490 | void TabDialog::bgDefaultClicked ( ) |
@@ -500,17 +500,17 @@ void TabDialog::accept ( ) | |||
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 | } |