summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-14 15:25:30 (UTC)
committer zecke <zecke>2004-03-14 15:25:30 (UTC)
commit13aeeabab5f2a6262b33de83cc9559a49365e325 (patch) (unidiff)
treeb82e8e4c4da0f867c9d4b4970226891087a52273
parentcf2499b03c783851e56049182c5e872d6dda3b63 (diff)
downloadopie-13aeeabab5f2a6262b33de83cc9559a49365e325.zip
opie-13aeeabab5f2a6262b33de83cc9559a49365e325.tar.gz
opie-13aeeabab5f2a6262b33de83cc9559a49365e325.tar.bz2
ODP changes for the Styles
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/flat/config.in2
-rw-r--r--noncore/styles/fresh/config.in2
-rw-r--r--noncore/styles/liquid/config.in2
-rw-r--r--noncore/styles/liquid/liquid.pro2
-rw-r--r--noncore/styles/liquid/liquidset.cpp3
-rw-r--r--noncore/styles/liquid/liquidset.h6
-rw-r--r--noncore/styles/metal/config.in2
-rw-r--r--noncore/styles/theme/config.in2
8 files changed, 11 insertions, 10 deletions
diff --git a/noncore/styles/flat/config.in b/noncore/styles/flat/config.in
index a577320..63ef72c 100644
--- a/noncore/styles/flat/config.in
+++ b/noncore/styles/flat/config.in
@@ -1,4 +1,4 @@
1 config FLAT 1 config FLAT
2 boolean "opie-style-flat (Simple, flat widget style)" 2 boolean "opie-style-flat (Simple, flat widget style)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 )
diff --git a/noncore/styles/fresh/config.in b/noncore/styles/fresh/config.in
index f8f5318..456a63f 100644
--- a/noncore/styles/fresh/config.in
+++ b/noncore/styles/fresh/config.in
@@ -1,4 +1,4 @@
1 config FRESH 1 config FRESH
2 boolean "opie-style-fresh (Simple widget style)" 2 boolean "opie-style-fresh (Simple widget style)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 )
diff --git a/noncore/styles/liquid/config.in b/noncore/styles/liquid/config.in
index c0ad4cd..23f8637 100644
--- a/noncore/styles/liquid/config.in
+++ b/noncore/styles/liquid/config.in
@@ -1,4 +1,4 @@
1 config LIQUID 1 config LIQUID
2 boolean "opie-liquid (Mosfet's well known Liquid GUI style from KDE)" 2 boolean "opie-liquid (Mosfet's well known Liquid GUI style from KDE)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBQTAUX
diff --git a/noncore/styles/liquid/liquid.pro b/noncore/styles/liquid/liquid.pro
index 4c4aaf4..c7d785d 100644
--- a/noncore/styles/liquid/liquid.pro
+++ b/noncore/styles/liquid/liquid.pro
@@ -1,19 +1,19 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG = qt plugin embedded release warn_on 2CONFIG = qt plugin embedded release warn_on
3SOURCES = liquid.cpp \ 3SOURCES = liquid.cpp \
4 effects.cpp \ 4 effects.cpp \
5 liquidset.cpp \ 5 liquidset.cpp \
6 plugin.cpp 6 plugin.cpp
7 7
8HEADERS = liquid.h \ 8HEADERS = liquid.h \
9 effects.h \ 9 effects.h \
10 liquidset.h \ 10 liquidset.h \
11 plugin.h 11 plugin.h
12 12
13LIBS += -lqpe -lopie 13LIBS += -lqpe -lqtaux2
14INCLUDEPATH += $(OPIEDIR)/include 14INCLUDEPATH += $(OPIEDIR)/include
15DESTDIR = $(OPIEDIR)/plugins/styles 15DESTDIR = $(OPIEDIR)/plugins/styles
16TARGET = liquid 16TARGET = liquid
17VERSION = 1.0.0 17VERSION = 1.0.0
18 18
19include ( $(OPIEDIR)/include.pro ) 19include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/styles/liquid/liquidset.cpp b/noncore/styles/liquid/liquidset.cpp
index a7cfccc..1bf60de 100644
--- a/noncore/styles/liquid/liquidset.cpp
+++ b/noncore/styles/liquid/liquidset.cpp
@@ -1,88 +1,89 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21 21
22 22
23#include "liquidset.h" 23#include "liquidset.h"
24#include "liquid.h" 24#include "liquid.h"
25 25
26#include <qpe/qpeapplication.h> 26#include <qpe/qpeapplication.h>
27#include <qpe/global.h> 27#include <qpe/global.h>
28 28
29#include <qslider.h> 29#include <qslider.h>
30#include <qcombobox.h> 30#include <qcombobox.h>
31#include <qradiobutton.h> 31#include <qradiobutton.h>
32#include <qcheckbox.h> 32#include <qcheckbox.h>
33#include <qlabel.h> 33#include <qlabel.h>
34#include <qlayout.h> 34#include <qlayout.h>
35 35
36#include <qpe/config.h> 36#include <qpe/config.h>
37 37
38#include <opie/ocolorbutton.h> 38#include <opie2/ocolorbutton.h>
39 39
40 40
41using namespace Opie;
41LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl ) 42LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
42 : QWidget ( parent, name, fl ) 43 : QWidget ( parent, name, fl )
43{ 44{
44 setCaption ( tr( "Liquid Style" ) ); 45 setCaption ( tr( "Liquid Style" ) );
45 46
46 Config config ( "qpe" ); 47 Config config ( "qpe" );
47 config. setGroup ( "Liquid-Style" ); 48 config. setGroup ( "Liquid-Style" );
48 49
49 m_type = config. readNumEntry ( "Type", TransStippleBg ); 50 m_type = config. readNumEntry ( "Type", TransStippleBg );
50 QColor mcol = QColor ( config. readEntry ( "Color", QApplication::palette ( ). active ( ). button ( ). name ( ))); 51 QColor mcol = QColor ( config. readEntry ( "Color", QApplication::palette ( ). active ( ). button ( ). name ( )));
51 QColor tcol = QColor ( config. readEntry ( "TextColor", QApplication::palette ( ). active ( ). text ( ). name ( ))); 52 QColor tcol = QColor ( config. readEntry ( "TextColor", QApplication::palette ( ). active ( ). text ( ). name ( )));
52 int opacity = config. readNumEntry ( "Opacity", 10 ); 53 int opacity = config. readNumEntry ( "Opacity", 10 );
53 m_shadow = config. readBoolEntry ( "ShadowText", true ); 54 m_shadow = config. readBoolEntry ( "ShadowText", true );
54 int contrast = config. readNumEntry ( "StippleContrast", 5 ); 55 int contrast = config. readNumEntry ( "StippleContrast", 5 );
55 m_flat = config. readBoolEntry ( "FlatToolButtons", false ); 56 m_flat = config. readBoolEntry ( "FlatToolButtons", false );
56 57
57 QVBoxLayout *vbox = new QVBoxLayout ( this ); 58 QVBoxLayout *vbox = new QVBoxLayout ( this );
58 vbox-> setSpacing ( 3 ); 59 vbox-> setSpacing ( 3 );
59 vbox-> setMargin ( 4 ); 60 vbox-> setMargin ( 4 );
60 61
61 QComboBox *cb = new QComboBox ( this ); 62 QComboBox *cb = new QComboBox ( this );
62 cb-> insertItem ( tr( "No translucency" ), None ); 63 cb-> insertItem ( tr( "No translucency" ), None );
63 cb-> insertItem ( tr( "Stippled, background color" ), StippledBg ); 64 cb-> insertItem ( tr( "Stippled, background color" ), StippledBg );
64 cb-> insertItem ( tr( "Stippled, button color" ), StippledBtn ); 65 cb-> insertItem ( tr( "Stippled, button color" ), StippledBtn );
65 cb-> insertItem ( tr( "Translucent stippled, background color" ), TransStippleBg ); 66 cb-> insertItem ( tr( "Translucent stippled, background color" ), TransStippleBg );
66 cb-> insertItem ( tr( "Translucent stippled, button color" ), TransStippleBtn ); 67 cb-> insertItem ( tr( "Translucent stippled, button color" ), TransStippleBtn );
67 cb-> insertItem ( tr( "Custom translucency" ), Custom ); 68 cb-> insertItem ( tr( "Custom translucency" ), Custom );
68 69
69 cb-> setCurrentItem ( m_type ); 70 cb-> setCurrentItem ( m_type );
70 vbox-> addWidget ( cb ); 71 vbox-> addWidget ( cb );
71 72
72 73
73 QGridLayout *grid = new QGridLayout ( vbox ); 74 QGridLayout *grid = new QGridLayout ( vbox );
74 grid-> addColSpacing ( 0, 16 ); 75 grid-> addColSpacing ( 0, 16 );
75 grid-> addColSpacing ( 3, 8 ); 76 grid-> addColSpacing ( 3, 8 );
76 77
77 grid-> addWidget ( m_menulbl = new QLabel ( tr( "Menu color" ), this ), 0, 1 ); 78 grid-> addWidget ( m_menulbl = new QLabel ( tr( "Menu color" ), this ), 0, 1 );
78 grid-> addWidget ( m_textlbl = new QLabel ( tr( "Text color" ), this ), 0, 4 ); 79 grid-> addWidget ( m_textlbl = new QLabel ( tr( "Text color" ), this ), 0, 4 );
79 grid-> addWidget ( m_opaclbl = new QLabel ( tr( "Opacity" ), this ), 1, 1 ); 80 grid-> addWidget ( m_opaclbl = new QLabel ( tr( "Opacity" ), this ), 1, 1 );
80 81
81 m_menubtn = new OColorButton ( this, mcol ); 82 m_menubtn = new OColorButton ( this, mcol );
82 grid-> addWidget ( m_menubtn, 0, 2 ); 83 grid-> addWidget ( m_menubtn, 0, 2 );
83 84
84 m_textbtn = new OColorButton ( this, tcol ); 85 m_textbtn = new OColorButton ( this, tcol );
85 grid-> addWidget ( m_textbtn, 0, 5 ); 86 grid-> addWidget ( m_textbtn, 0, 5 );
86 87
87 m_opacsld = new QSlider ( Horizontal, this ); 88 m_opacsld = new QSlider ( Horizontal, this );
88 m_opacsld-> setRange ( -20, 20 ); 89 m_opacsld-> setRange ( -20, 20 );
diff --git a/noncore/styles/liquid/liquidset.h b/noncore/styles/liquid/liquidset.h
index 6d9555a..a54cc13 100644
--- a/noncore/styles/liquid/liquidset.h
+++ b/noncore/styles/liquid/liquidset.h
@@ -1,37 +1,37 @@
1#ifndef __OPIE_LIQUID_SET_H__ 1#ifndef __OPIE_LIQUID_SET_H__
2#define __OPIE_LIQUID_SET_H__ 2#define __OPIE_LIQUID_SET_H__
3 3
4#include <qdialog.h> 4#include <qdialog.h>
5#include <qcolor.h> 5#include <qcolor.h>
6 6
7class QLabel; 7class QLabel;
8class OColorButton; 8namespace Opie {class OColorButton;}
9class QSlider; 9class QSlider;
10 10
11class LiquidSettings : public QWidget { 11class LiquidSettings : public QWidget {
12 Q_OBJECT 12 Q_OBJECT
13 13
14public: 14public:
15 LiquidSettings ( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 ); 15 LiquidSettings ( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
16 16
17public slots: 17public slots:
18 void changeType ( int t ); 18 void changeType ( int t );
19 void changeShadow ( bool b ); 19 void changeShadow ( bool b );
20 void changeFlat ( bool b ); 20 void changeFlat ( bool b );
21 21
22 virtual bool writeConfig ( ); 22 virtual bool writeConfig ( );
23 23
24private: 24private:
25 int m_type; 25 int m_type;
26 bool m_shadow; 26 bool m_shadow;
27 bool m_flat; 27 bool m_flat;
28 28
29 QSlider * m_opacsld; 29 QSlider * m_opacsld;
30 QSlider * m_contsld; 30 QSlider * m_contsld;
31 QLabel * m_menulbl; 31 QLabel * m_menulbl;
32 QLabel * m_textlbl; 32 QLabel * m_textlbl;
33 QLabel * m_opaclbl; 33 QLabel * m_opaclbl;
34 OColorButton *m_menubtn; 34 Opie::OColorButton *m_menubtn;
35 OColorButton *m_textbtn; 35 Opie::OColorButton *m_textbtn;
36}; 36};
37#endif 37#endif
diff --git a/noncore/styles/metal/config.in b/noncore/styles/metal/config.in
index 413902b..800ca38 100644
--- a/noncore/styles/metal/config.in
+++ b/noncore/styles/metal/config.in
@@ -1,4 +1,4 @@
1 config METAL 1 config METAL
2 boolean "opie-metal (Metal style)" 2 boolean "opie-metal (Metal style)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 )
diff --git a/noncore/styles/theme/config.in b/noncore/styles/theme/config.in
index 37fa5b6..68452c8 100644
--- a/noncore/styles/theme/config.in
+++ b/noncore/styles/theme/config.in
@@ -1,4 +1,4 @@
1 config THEME 1 config THEME
2 boolean "opie-theme (theme support including opie-theme-luna)" 2 boolean "opie-theme (theme support including opie-theme-luna)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 )