Merge from BRANCH_1_0

3 files changed, 13 insertions, 10 deletions

diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index c376ec7..00128d3 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -84,7 +84,7 @@ public:
     QString name() const {
 	return "Default";
     }
-    QPixmap icon() const {
+QPixmap icon() const {
 	return QPixmap();
     }
     QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
@@ -175,7 +175,7 @@ QWidget *Appearance::createDecoTab ( QWidget *parent, Config &cfg )
     vertLayout->addWidget( m_deco_list );
 	QWhatsThis::add( m_deco_list, tr( "Window decorations control the way the application title bar and its buttons appear.\n\nClick here to select an available decoration." ) );
 
-    QString s = cfg. readEntry ( "Decoration" );
+    QString s = cfg. readEntry ( "Decoration", "libflat.so" );
 
     m_deco_list-> insertItem ( new DecoListItem ( "QPE" ));
 
@@ -402,7 +402,7 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
 
 	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" );
 	QPixmap cw1 = Resource::loadIconSet("redo"). pixmap( );
@@ -421,8 +421,8 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
 
 	ccw1. convertFromImage( ccwImage );
 	m_rotdir_cw-> setPixmap( cw1 );
-	m_rotdir_ccw-> setPixmap( ccw1 ); 
-	m_rotdir_flip-> setPixmap( flip1 ); 
+	m_rotdir_ccw-> setPixmap( ccw1 );
+	m_rotdir_flip-> setPixmap( flip1 );
 
 	rotLay-> addWidget ( rotlabel, 0 );
 	rotLay-> addWidget ( m_rotdir_cw, 0 );
@@ -457,7 +457,8 @@ Appearance::Appearance( QWidget* parent,  const char* name, WFlags )
     QVBoxLayout *top = new QVBoxLayout ( this, 3, 3 );
 
 	m_sample = new SampleWindow ( this );
-	m_sample-> setDecoration ( new DefaultWindowDecoration ( ));
+
+	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 );
diff --git a/noncore/settings/appearance2/colorlistitem.h b/noncore/settings/appearance2/colorlistitem.h
index 10e4468..f8d5c45 100644
--- a/noncore/settings/appearance2/colorlistitem.h
+++ b/noncore/settings/appearance2/colorlistitem.h
@@ -124,12 +124,13 @@ private:
 	}
 };
 
+// from etc/colors/Liquid.scheme
 const ColorListItem::colorlut ColorListItem::s_colorlut [] = {
 	{ QColorGroup::Base,            "Base",            "#FFFFFF", QT_TRANSLATE_NOOP( "Appearance", "Base" )             },
-	{ QColorGroup::Background,      "Background",      "#E5E1D5", QT_TRANSLATE_NOOP( "Appearance", "Background" )       },
-	{ QColorGroup::Button,          "Button",          "#D6CDBB", QT_TRANSLATE_NOOP( "Appearance", "Button" )           },
+	{ QColorGroup::Background,      "Background",      "#E0E0E0", QT_TRANSLATE_NOOP( "Appearance", "Background" )       },
+	{ QColorGroup::Button,          "Button",          "#96c8fa", QT_TRANSLATE_NOOP( "Appearance", "Button" )           },
 	{ QColorGroup::ButtonText,      "ButtonText",      "#000000", QT_TRANSLATE_NOOP( "Appearance", "Button Text" )      }, 
-	{ QColorGroup::Highlight,       "Highlight",       "#800000", QT_TRANSLATE_NOOP( "Appearance", "Highlight" )        },
+	{ QColorGroup::Highlight,       "Highlight",       "#73adef", QT_TRANSLATE_NOOP( "Appearance", "Highlight" )        },
 	{ QColorGroup::HighlightedText, "HighlightedText", "#FFFFFF", QT_TRANSLATE_NOOP( "Appearance", "Highlighted Text" ) },
 	{ QColorGroup::Text,            "Text",            "#000000", QT_TRANSLATE_NOOP( "Appearance", "Text" )             }
 };
diff --git a/noncore/settings/appearance2/decolistitem.h b/noncore/settings/appearance2/decolistitem.h
index d190ceb..da7924c 100644
--- a/noncore/settings/appearance2/decolistitem.h
+++ b/noncore/settings/appearance2/decolistitem.h
@@ -103,4 +103,5 @@ private:
 
 };
 
-#endif
\ No newline at end of file
+#endif
+