summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog2
-rw-r--r--noncore/settings/appearance2/appearance.cpp37
-rw-r--r--noncore/settings/appearance2/appearance.h5
3 files changed, 43 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 85a26bd..2922afd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,18 @@
1 2005-??-??Opie 1.2.2 1 2005-??-??Opie 1.2.2
2 2
3 3
4 New Features 4 New Features
5 ------------ 5 ------------
6 6 * Appearance: Added configuration options to set smallIconSize, bigIconSize, useBigPixmaps (hrw)
7 7
8 Fixed Bugs 8 Fixed Bugs
9 ---------- 9 ----------
10 * #1695 - Date selector use too small fontsize on VGA screen (hrw) 10 * #1695 - Date selector use too small fontsize on VGA screen (hrw)
11 * #1686 - opie-console lack UI setting for switching scrollbar (hrw) 11 * #1686 - opie-console lack UI setting for switching scrollbar (hrw)
12 * #1624 - Button settngs changes are applied only after restart (hrw) 12 * #1624 - Button settngs changes are applied only after restart (hrw)
13 * #1492 - Backup and Restore does not show list of backups to restore on start (hrw) 13 * #1492 - Backup and Restore does not show list of backups to restore on start (hrw)
14 * n.a. - remove hardcoded font size from wellenreiter (hrw) 14 * n.a. - remove hardcoded font size from wellenreiter (hrw)
15 * n.a. - added patch to build QT/E 2.3.10 with gc 4.x.x (hrw) 15 * n.a. - added patch to build QT/E 2.3.10 with gc 4.x.x (hrw)
16 16
17 2005-09-11Opie 1.2.1 17 2005-09-11Opie 1.2.1
18 18
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index eea1a19..054b645 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -385,24 +385,57 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
385 { 385 {
386 rot = ODevice::inst ( )-> direction ( ); 386 rot = ODevice::inst ( )-> direction ( );
387 } 387 }
388 else 388 else
389 { 389 {
390 rot = (ODirection)rotDirection; 390 rot = (ODirection)rotDirection;
391 } 391 }
392 392
393 m_rotdir_cw-> setChecked ( rot == CW ); 393 m_rotdir_cw-> setChecked ( rot == CW );
394 m_rotdir_ccw-> setChecked ( rot == CCW ); 394 m_rotdir_ccw-> setChecked ( rot == CCW );
395 m_rotdir_flip-> setChecked ( rot == Flip ); 395 m_rotdir_flip-> setChecked ( rot == Flip );
396 396
397 QFrame *f2 = new QFrame ( tab );
398 f2-> setFrameStyle ( QFrame::HLine | QFrame::Sunken );
399 vertLayout-> addWidget ( f2 );
400 vertLayout-> addSpacing ( 3 );
401
402 QHBoxLayout *bigIconlay = new QHBoxLayout ( vertLayout, 3 );
403
404 QLabel* label2 = new QLabel( tr( "&Big Icon size:" ), tab );
405 bigIconlay-> addWidget ( label2, 0, 0 );
406
407 m_bigIconSize = new QSpinBox(0, 128, 1, tab);
408 m_bigIconSize->setValue(cfg.readNumEntry( "BigIconSize" ));
409 bigIconlay->addWidget( m_bigIconSize );
410 label2->setBuddy( m_bigIconSize );
411 QWhatsThis::add( label2, tr( "Big Icon Size determines the size of the application icons in Launcher" ) );
412 QWhatsThis::add( m_bigIconSize, tr( "Big Icon Size determines the size of the application icons in Launcher" ) );
413
414 QHBoxLayout *smallIconlay = new QHBoxLayout ( vertLayout, 3 );
415
416 QLabel* label3 = new QLabel( tr( "&Small Icon size:" ), tab );
417 smallIconlay-> addWidget ( label3, 0, 0 );
418
419 m_smallIconSize = new QSpinBox(0, 128, 1, tab);
420 m_smallIconSize->setValue(cfg.readNumEntry( "SmallIconSize" ));
421 smallIconlay->addWidget( m_smallIconSize );
422 label3->setBuddy( m_smallIconSize );
423 QWhatsThis::add( label3, tr( "Small Icon Size determines the size of many of the icons seen in applications (in menus, tab bars, tool bars, etc.), as well as the size of taskbar." ) );
424 QWhatsThis::add( m_smallIconSize, tr( "Small Icon Size determines the size of many of the icons seen in applications (in menus, tab bars, tool bars, etc.), as well as the size of taskbar." ) );
425
426 m_useBigPixmaps = new QCheckBox( tr("use Big &Pixmaps"), tab);
427 m_useBigPixmaps->setChecked(cfg.readBoolEntry( "useBigPixmaps" ));
428 vertLayout->addWidget( m_useBigPixmaps );
429 QWhatsThis::add( m_useBigPixmaps, tr( "Enlarge toolbar pixmaps" ) );
397 430
398 /* 431 /*
399 * add a spacing 432 * add a spacing
400 */ 433 */
401 vertLayout->addItem( new QSpacerItem( 1, 1, QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding ) ); 434 vertLayout->addItem( new QSpacerItem( 1, 1, QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding ) );
402 return tab; 435 return tab;
403} 436}
404 437
405 438
406Appearance::Appearance( QWidget* parent, const char* name, WFlags ) 439Appearance::Appearance( QWidget* parent, const char* name, WFlags )
407 : QDialog ( parent, name, true, WStyle_ContextHelp ) 440 : QDialog ( parent, name, true, WStyle_ContextHelp )
408{ 441{
@@ -504,24 +537,28 @@ void Appearance::accept ( )
504 else if (m_rotdir_cw-> isChecked ( )) 537 else if (m_rotdir_cw-> isChecked ( ))
505 { 538 {
506 rot = CW; 539 rot = CW;
507 } 540 }
508 else 541 else
509 { 542 {
510 rot = Flip; 543 rot = Flip;
511 } 544 }
512 config. writeEntry ( "rotatedir", (int)rot ); 545 config. writeEntry ( "rotatedir", (int)rot );
513 546
514 config. writeEntry( "LeftHand", m_leftHand->isChecked() ); 547 config. writeEntry( "LeftHand", m_leftHand->isChecked() );
515 548
549 config. writeEntry( "useBigPixmaps", m_useBigPixmaps->isChecked() );
550 config. writeEntry( "BigIconSize", m_bigIconSize->value() );
551 config. writeEntry( "SmallIconSize", m_smallIconSize->value() );
552
516 config. write ( ); // need to flush the config info first 553 config. write ( ); // need to flush the config info first
517 Global::applyStyle ( ); 554 Global::applyStyle ( );
518 555
519 QDialog::accept ( ); 556 QDialog::accept ( );
520} 557}
521 558
522void Appearance::done ( int r ) 559void Appearance::done ( int r )
523{ 560{
524 QDialog::done ( r ); 561 QDialog::done ( r );
525 close ( ); 562 close ( );
526} 563}
527 564
diff --git a/noncore/settings/appearance2/appearance.h b/noncore/settings/appearance2/appearance.h
index ef7e874..79e71eb 100644
--- a/noncore/settings/appearance2/appearance.h
+++ b/noncore/settings/appearance2/appearance.h
@@ -28,24 +28,25 @@
28 Inc., 59 Temple Place - Suite 330, 28 Inc., 59 Temple Place - Suite 330,
29 Boston, MA 02111-1307, USA. 29 Boston, MA 02111-1307, USA.
30*/ 30*/
31 31
32#ifndef APPEARANCESETTINGS_H 32#ifndef APPEARANCESETTINGS_H
33#define APPEARANCESETTINGS_H 33#define APPEARANCESETTINGS_H
34 34
35#include <opie2/ofontselector.h> 35#include <opie2/ofontselector.h>
36 36
37#include <qpe/fontdatabase.h> 37#include <qpe/fontdatabase.h>
38 38
39#include <qdialog.h> 39#include <qdialog.h>
40#include <qspinbox.h>
40 41
41using Opie::Ui::OFontSelector; 42using Opie::Ui::OFontSelector;
42 43
43class QCheckBox; 44class QCheckBox;
44class QComboBox; 45class QComboBox;
45class QLabel; 46class QLabel;
46class QLineEdit; 47class QLineEdit;
47class QListBox; 48class QListBox;
48class QMultiLineEdit; 49class QMultiLineEdit;
49class QPushButton; 50class QPushButton;
50class QRadioButton; 51class QRadioButton;
51class QToolButton; 52class QToolButton;
@@ -114,15 +115,19 @@ private:
114 SampleWindow *m_sample; 115 SampleWindow *m_sample;
115 116
116 QComboBox * m_tabstyle_list; 117 QComboBox * m_tabstyle_list;
117 QRadioButton *m_tabstyle_top; 118 QRadioButton *m_tabstyle_top;
118 QRadioButton *m_tabstyle_bottom; 119 QRadioButton *m_tabstyle_bottom;
119 120
120 QRadioButton *m_rotdir_cw; 121 QRadioButton *m_rotdir_cw;
121 QRadioButton *m_rotdir_ccw; 122 QRadioButton *m_rotdir_ccw;
122 QRadioButton *m_rotdir_flip; 123 QRadioButton *m_rotdir_flip;
123 124
124 QWidget * m_advtab; 125 QWidget * m_advtab;
125 QCheckBox *m_leftHand; 126 QCheckBox *m_leftHand;
127
128 QSpinBox*m_bigIconSize;
129 QSpinBox*m_smallIconSize;
130 QCheckBox*m_useBigPixmaps;
126}; 131};
127 132
128#endif 133#endif