author | zecke <zecke> | 2004-03-14 15:25:30 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 15:25:30 (UTC) |
commit | 13aeeabab5f2a6262b33de83cc9559a49365e325 (patch) (unidiff) | |
tree | b82e8e4c4da0f867c9d4b4970226891087a52273 /noncore/styles | |
parent | cf2499b03c783851e56049182c5e872d6dda3b63 (diff) | |
download | opie-13aeeabab5f2a6262b33de83cc9559a49365e325.zip opie-13aeeabab5f2a6262b33de83cc9559a49365e325.tar.gz opie-13aeeabab5f2a6262b33de83cc9559a49365e325.tar.bz2 |
ODP changes for the Styles
-rw-r--r-- | noncore/styles/flat/config.in | 2 | ||||
-rw-r--r-- | noncore/styles/fresh/config.in | 2 | ||||
-rw-r--r-- | noncore/styles/liquid/config.in | 2 | ||||
-rw-r--r-- | noncore/styles/liquid/liquid.pro | 2 | ||||
-rw-r--r-- | noncore/styles/liquid/liquidset.cpp | 3 | ||||
-rw-r--r-- | noncore/styles/liquid/liquidset.h | 6 | ||||
-rw-r--r-- | noncore/styles/metal/config.in | 2 | ||||
-rw-r--r-- | noncore/styles/theme/config.in | 2 |
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 | |||
@@ -5,15 +5,15 @@ SOURCES = liquid.cpp \ | |||
5 | liquidset.cpp \ | 5 | liquidset.cpp \ |
6 | plugin.cpp | 6 | plugin.cpp |
7 | 7 | ||
8 | HEADERS = liquid.h \ | 8 | HEADERS = liquid.h \ |
9 | effects.h \ | 9 | effects.h \ |
10 | liquidset.h \ | 10 | liquidset.h \ |
11 | plugin.h | 11 | plugin.h |
12 | 12 | ||
13 | LIBS += -lqpe -lopie | 13 | LIBS += -lqpe -lqtaux2 |
14 | INCLUDEPATH += $(OPIEDIR)/include | 14 | INCLUDEPATH += $(OPIEDIR)/include |
15 | DESTDIR = $(OPIEDIR)/plugins/styles | 15 | DESTDIR = $(OPIEDIR)/plugins/styles |
16 | TARGET = liquid | 16 | TARGET = liquid |
17 | VERSION = 1.0.0 | 17 | VERSION = 1.0.0 |
18 | 18 | ||
19 | include ( $(OPIEDIR)/include.pro ) | 19 | include ( $(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 | |||
@@ -30,19 +30,20 @@ | |||
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 | ||
41 | using namespace Opie; | ||
41 | LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl ) | 42 | LiquidSettings::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 | ||
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,16 +1,16 @@ | |||
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 | ||
7 | class QLabel; | 7 | class QLabel; |
8 | class OColorButton; | 8 | namespace Opie {class OColorButton;} |
9 | class QSlider; | 9 | class QSlider; |
10 | 10 | ||
11 | class LiquidSettings : public QWidget { | 11 | class LiquidSettings : public QWidget { |
12 | Q_OBJECT | 12 | Q_OBJECT |
13 | 13 | ||
14 | public: | 14 | public: |
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 | ||
@@ -26,12 +26,12 @@ private: | |||
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 ) |