appearance: more work on icon sizes

- added default values for (Small|Big)IconSize (drw)
- set useBigPixmaps on HiRes devices (hrw)

1 files changed, 7 insertions, 7 deletions

diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 054b645..e2c639f 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -308,218 +308,218 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
     f-> setFrameStyle ( QFrame::HLine | QFrame::Sunken );
     vertLayout-> addWidget ( f );
     vertLayout-> addSpacing ( 3 );
 
 
     QGridLayout* gridLayout = new QGridLayout ( vertLayout, 0, 0, 3, 0 );
 
     int style = cfg. readNumEntry ( "TabStyle", 2 ) - 1;
     bool tabtop = ( cfg. readEntry ( "TabPosition", "Top" ) == "Top" );
 
     QLabel* label = new QLabel( tr( "Tab style:" ), tab );
     gridLayout-> addWidget ( label, 0, 0 );
     QWhatsThis::add( label, tr( "Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:\n\n1. Tabs - normal tabs with text labels only\n2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab\n3. Drop down list - a vertical listing of tabs\n4. Drop down list w/icons - a vertical listing of tabs with icons" ) );
 
     QButtonGroup* btngrp = new QButtonGroup( tab, "buttongroup" );
     btngrp-> hide ( );
     btngrp-> setExclusive ( true );
 
     m_tabstyle_list = new QComboBox ( false, tab, "tabstyle" );
     m_tabstyle_list-> insertItem ( tr( "Tabs" ));
     m_tabstyle_list-> insertItem ( tr( "Tabs w/icons" ));
     m_tabstyle_list-> insertItem ( tr( "Drop down list" ));
     m_tabstyle_list-> insertItem ( tr( "Drop down list w/icons" ));
     m_tabstyle_list-> setCurrentItem ( style );
     gridLayout-> addMultiCellWidget ( m_tabstyle_list, 0, 0, 1, 2 );
     QWhatsThis::add( m_tabstyle_list, tr( "Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:\n\n1. Tabs - normal tabs with text labels only\n2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab\n3. Drop down list - a vertical listing of tabs\n4. Drop down list w/icons - a vertical listing of tabs with icons" ) );
 
     m_tabstyle_top = new QRadioButton( tr( "Top" ), tab, "tabpostop" );
     btngrp-> insert ( m_tabstyle_top );
     gridLayout-> addWidget( m_tabstyle_top, 1, 1 );
     QWhatsThis::add( m_tabstyle_top, tr( "Click here so that tabs appear at the top of the window." ) );
 
     m_tabstyle_bottom = new QRadioButton( tr( "Bottom" ), tab, "tabposbottom" );
     btngrp-> insert ( m_tabstyle_bottom );
     gridLayout-> addWidget( m_tabstyle_bottom, 1, 2 );
     QWhatsThis::add( m_tabstyle_bottom, tr( "Click here so that tabs appear at the bottom of the window." ) );
 
     m_tabstyle_top-> setChecked ( tabtop );
     m_tabstyle_bottom-> setChecked ( !tabtop );
 
     m_original_tabstyle = style;
     m_original_tabpos = tabtop;
 
     vertLayout-> addSpacing ( 3 );
     QHBoxLayout *rotLay = new QHBoxLayout ( vertLayout, 3 );
 
     QLabel* rotlabel = new QLabel( tr( "Rotation direction:" ), tab );
     m_rotdir_cw = new QRadioButton( tab, "rotdir_cw" );
     m_rotdir_ccw = new QRadioButton( tab, "rotdir_ccw" );
     m_rotdir_flip = new QRadioButton( tab, "rotdir_flip" );
     QButtonGroup* rotbtngrp = new QButtonGroup( tab, "rotbuttongroup" );
 
     rotbtngrp-> hide ( );
     rotbtngrp-> setExclusive ( true );
     rotbtngrp-> insert ( m_rotdir_cw );
     rotbtngrp-> insert ( m_rotdir_ccw );
     rotbtngrp-> insert ( m_rotdir_flip );
 
     QImage ccwImage = Opie::Core::OResource::loadImage( "redo", Opie::Core::OResource::SmallIcon );
     QPixmap cw, ccw, flip;
     cw.convertFromImage( ccwImage );
     ccw.convertFromImage( ccwImage.mirror( 1, 0 ) );
     flip.convertFromImage( Opie::Core::OResource::loadImage( "pass", Opie::Core::OResource::SmallIcon ) );
 
     m_rotdir_cw-> setPixmap( cw );
     m_rotdir_ccw-> setPixmap( ccw );
     m_rotdir_flip-> setPixmap( flip );
 
     rotLay-> addWidget ( rotlabel, 0 );
     rotLay-> addWidget ( m_rotdir_cw, 0 );
     rotLay-> addWidget ( m_rotdir_ccw, 0 );
     rotLay-> addWidget ( m_rotdir_flip, 0 );
 
     int rotDirection = cfg.readNumEntry( "rotatedir" );
     ODirection rot = CW;
 
     if (rotDirection == -1)
     {
         rot = ODevice::inst ( )-> direction ( );
     }
     else
     {
         rot = (ODirection)rotDirection;
     }
 
     m_rotdir_cw-> setChecked ( rot == CW );
     m_rotdir_ccw-> setChecked ( rot == CCW );
     m_rotdir_flip-> setChecked ( rot == Flip );
 
     QFrame *f2 = new QFrame ( tab );
     f2-> setFrameStyle ( QFrame::HLine | QFrame::Sunken );
     vertLayout-> addWidget ( f2 );
     vertLayout-> addSpacing ( 3 );
 
     QHBoxLayout *bigIconlay = new QHBoxLayout ( vertLayout, 3 );
 
-    QLabel* label2 = new QLabel( tr( "&Big Icon size:" ), tab );
+    QLabel* label2 = new QLabel( tr( "Big Icon size:" ), tab );
     bigIconlay-> addWidget ( label2, 0, 0 );
 
     m_bigIconSize = new QSpinBox(0, 128, 1, tab);
-    m_bigIconSize->setValue(cfg.readNumEntry( "BigIconSize" ));
+    m_bigIconSize->setValue(cfg.readNumEntry( "BigIconSize", AppLnk::bigIconSize() ));
     bigIconlay->addWidget( m_bigIconSize );
     label2->setBuddy( m_bigIconSize );
     QWhatsThis::add( label2, tr( "Big Icon Size determines the size of the application icons in Launcher" ) );
     QWhatsThis::add( m_bigIconSize, tr( "Big Icon Size determines the size of the application icons in Launcher" ) );
 
     QHBoxLayout *smallIconlay = new QHBoxLayout ( vertLayout, 3 );
 
-    QLabel* label3 = new QLabel( tr( "&Small Icon size:" ), tab );
+    QLabel* label3 = new QLabel( tr( "Small Icon size:" ), tab );
     smallIconlay-> addWidget ( label3, 0, 0 );
 
     m_smallIconSize = new QSpinBox(0, 128, 1, tab);
-    m_smallIconSize->setValue(cfg.readNumEntry( "SmallIconSize" ));
+    m_smallIconSize->setValue(cfg.readNumEntry( "SmallIconSize", AppLnk::smallIconSize() ));
     smallIconlay->addWidget( m_smallIconSize );
     label3->setBuddy( m_smallIconSize );
     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." ) );
     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." ) );
 
-    m_useBigPixmaps = new QCheckBox( tr("use Big &Pixmaps"), tab);
-    m_useBigPixmaps->setChecked(cfg.readBoolEntry( "useBigPixmaps" ));
+    m_useBigPixmaps = new QCheckBox( tr("use Big Pixmaps"), tab);
+    m_useBigPixmaps->setChecked(cfg.readBoolEntry( "useBigPixmaps", qApp->desktop()->width() > 320 ));
     vertLayout->addWidget( m_useBigPixmaps );
-    QWhatsThis::add( m_useBigPixmaps, tr( "Enlarge toolbar pixmaps" ) );
+    QWhatsThis::add( m_useBigPixmaps, tr( "Enlarge toolbar pixmaps, you probably want to enable this option for devices with screen resolution greater than 240x320" ) );
 
     /*
      * add a spacing
      */
     vertLayout->addItem( new QSpacerItem( 1, 1, QSizePolicy::MinimumExpanding,  QSizePolicy::MinimumExpanding ) );
     return tab;
 }
 
 
 Appearance::Appearance( QWidget* parent,  const char* name, WFlags )
         : QDialog ( parent, name, true, WStyle_ContextHelp )
 {
     setCaption( tr( "Appearance Settings" ) );
 
     Config config( "qpe" );
     config.setGroup( "Appearance" );
 
     QVBoxLayout *top = new QVBoxLayout ( this, 3, 3 );
 
     m_sample = new SampleWindow ( this );
 
     m_sample-> setDecoration ( new DefaultWindowDecoration ( ) );
     QWhatsThis::add( m_sample, tr( "This is a preview window.  Look here to see your new appearance as options are changed." ) );
 
     OTabWidget* tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
     QWidget *styletab;
 
     m_color_list = 0;
 
     tw-> addTab ( styletab = createStyleTab ( tw, config ), "appearance", tr( "Style" ));
     tw-> addTab ( createFontTab ( tw, config ), "font", tr( "Font" ));
     tw-> addTab ( createColorTab ( tw, config ), "appearance/color", tr( "Colors" ) );
     tw-> addTab ( createDecoTab ( tw, config ), "appearance/deco", tr( "Windows" ) );
     tw-> addTab ( m_advtab = createAdvancedTab ( tw, config ), "SettingsIcon", tr( "Advanced" ) );
 
     top-> addWidget ( tw, 10 );
     top-> addWidget ( m_sample, 1 );
 
     tw-> setCurrentTab ( styletab );
     connect ( tw, SIGNAL( currentChanged(QWidget*)), this, SLOT( tabChanged(QWidget*)));
 
     m_style_changed = m_font_changed = m_color_changed = m_deco_changed = false;
 }
 
 Appearance::~Appearance()
 {}
 
 void Appearance::tabChanged ( QWidget *w )
 {
     if ( w == m_advtab )
     {
         m_sample-> hide ( );
         updateGeometry ( ); // shouldn't be necessary ...
     }
     else
         m_sample-> show ( );
 }
 
 void Appearance::accept ( )
 {
     bool newtabpos = m_tabstyle_top-> isChecked ( );
     int newtabstyle = m_tabstyle_list-> currentItem ( );
 
     Config config ( "qpe" );
     config. setGroup ( "Appearance" );
 
     if ( m_style_changed )
     {
         StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( ));
         if ( item )
             config.writeEntry( "Style", item-> key ( ));
     }
 
     if ( m_deco_changed )
     {
         DecoListItem *item = (DecoListItem *) m_deco_list-> item ( m_deco_list-> currentItem ( ));
         if ( item )
             config.writeEntry( "Decoration", item-> key ( ));
     }
 
     if (( newtabstyle != m_original_tabstyle ) || ( newtabpos != m_original_tabpos ))
     {
         config. writeEntry ( "TabStyle", newtabstyle + 1 );
         config. writeEntry ( "TabPosition", newtabpos ? "Top" : "Bottom" );
     }
 
     if ( m_font_changed )
     {
         config. writeEntry ( "FontFamily", m_fontselect-> fontFamily ( ));
         config. writeEntry ( "FontStyle", m_fontselect-> fontStyle ( ));
         config. writeEntry ( "FontSize", m_fontselect-> fontSize ( ));
     }
 
 
     if ( m_color_changed )
     {