author | sandman <sandman> | 2002-10-04 01:42:57 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-04 01:42:57 (UTC) |
commit | 4a6ccb87f45065bc37f801adb61c3462f870cb92 (patch) (unidiff) | |
tree | 86b6819ee7a13b8df82b14b2bdcf46741b5935a0 /noncore/styles/theme | |
parent | b7ec6d0674f0f7835da7f114683dcfa74e6bc546 (diff) | |
download | opie-4a6ccb87f45065bc37f801adb61c3462f870cb92.zip opie-4a6ccb87f45065bc37f801adb61c3462f870cb92.tar.gz opie-4a6ccb87f45065bc37f801adb61c3462f870cb92.tar.bz2 |
- ported all OPIE styles to the new Qtopia compatible style interface
- some cleanup in liquid (unused code)
-rw-r--r-- | noncore/styles/theme/plugin.cpp | 80 | ||||
-rw-r--r-- | noncore/styles/theme/plugin.h | 23 |
2 files changed, 30 insertions, 73 deletions
diff --git a/noncore/styles/theme/plugin.cpp b/noncore/styles/theme/plugin.cpp index 4383693..2560720 100644 --- a/noncore/styles/theme/plugin.cpp +++ b/noncore/styles/theme/plugin.cpp | |||
@@ -1,3 +1,5 @@ | |||
1 | #include <qapplication.h> | ||
2 | |||
1 | #include "othemestyle.h" | 3 | #include "othemestyle.h" |
2 | #include "themeset.h" | 4 | #include "themeset.h" |
3 | #include "plugin.h" | 5 | #include "plugin.h" |
@@ -6,82 +8,41 @@ | |||
6 | 8 | ||
7 | ThemeInterface::ThemeInterface ( ) : ref ( 0 ) | 9 | ThemeInterface::ThemeInterface ( ) : ref ( 0 ) |
8 | { | 10 | { |
11 | m_widget = 0; | ||
9 | } | 12 | } |
10 | 13 | ||
11 | ThemeInterface::~ThemeInterface ( ) | 14 | ThemeInterface::~ThemeInterface ( ) |
12 | { | 15 | { |
13 | } | 16 | } |
14 | 17 | ||
15 | QStyle *ThemeInterface::create ( ) | 18 | QStyle *ThemeInterface::style ( ) |
16 | { | 19 | { |
17 | return new OThemeStyle ( "" ); | 20 | return new OThemeStyle ( "" ); |
18 | } | 21 | } |
19 | 22 | ||
20 | QString ThemeInterface::name ( ) | 23 | QString ThemeInterface::name ( ) const |
21 | { | ||
22 | return QObject::tr( "Themed style", "name" ); | ||
23 | } | ||
24 | |||
25 | QString ThemeInterface::description ( ) | ||
26 | { | ||
27 | return QObject::tr( "KDE2 theme compatible style engine", "description" ); | ||
28 | } | ||
29 | |||
30 | QCString ThemeInterface::key ( ) | ||
31 | { | ||
32 | return QCString ( "theme" ); | ||
33 | } | ||
34 | |||
35 | unsigned int ThemeInterface::version ( ) | ||
36 | { | 24 | { |
37 | return 100; // 1.0.0 (\d+.\d.\d) | 25 | return qApp-> translate ( "Styles", "Themed style" ); |
38 | } | 26 | } |
39 | 27 | ||
40 | QRESULT ThemeInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) | 28 | QString ThemeInterface::description ( ) const |
41 | { | 29 | { |
42 | static ThemeSettingsInterface *setiface = 0; | 30 | return qApp-> translate ( "Styles", "KDE2 theme compatible style engine" ); |
43 | |||
44 | *iface = 0; | ||
45 | |||
46 | if ( uuid == IID_QUnknown ) | ||
47 | *iface = this; | ||
48 | else if ( uuid == IID_Style ) | ||
49 | *iface = this; | ||
50 | else if ( uuid == IID_StyleSettings ) { | ||
51 | if ( !setiface ) | ||
52 | setiface = new ThemeSettingsInterface ( ); | ||
53 | *iface = setiface; | ||
54 | } | ||
55 | |||
56 | if ( *iface ) | ||
57 | (*iface)-> addRef ( ); | ||
58 | |||
59 | return QS_OK; | ||
60 | } | 31 | } |
61 | 32 | ||
62 | Q_EXPORT_INTERFACE() | 33 | bool ThemeInterface::hasSettings ( ) const |
63 | { | 34 | { |
64 | Q_CREATE_INSTANCE( ThemeInterface ) | 35 | return true; |
65 | } | 36 | } |
66 | 37 | ||
67 | 38 | QWidget *ThemeInterface::create ( QWidget *parent, const char *name ) | |
68 | ThemeSettingsInterface::ThemeSettingsInterface ( ) : ref ( 0 ) | ||
69 | { | ||
70 | m_widget = 0; | ||
71 | } | ||
72 | |||
73 | ThemeSettingsInterface::~ThemeSettingsInterface ( ) | ||
74 | { | ||
75 | } | ||
76 | |||
77 | QWidget *ThemeSettingsInterface::create ( QWidget *parent, const char *name ) | ||
78 | { | 39 | { |
79 | m_widget = new ThemeSettings ( parent, name ? name : "THEME-SETTINGS" ); | 40 | m_widget = new ThemeSettings ( parent, name ? name : "THEME-SETTINGS" ); |
80 | 41 | ||
81 | return m_widget; | 42 | return m_widget; |
82 | } | 43 | } |
83 | 44 | ||
84 | bool ThemeSettingsInterface::accept ( ) | 45 | bool ThemeInterface::accept ( ) |
85 | { | 46 | { |
86 | if ( !m_widget ) | 47 | if ( !m_widget ) |
87 | return false; | 48 | return false; |
@@ -89,18 +50,20 @@ bool ThemeSettingsInterface::accept ( ) | |||
89 | return m_widget-> writeConfig ( ); | 50 | return m_widget-> writeConfig ( ); |
90 | } | 51 | } |
91 | 52 | ||
92 | void ThemeSettingsInterface::reject ( ) | 53 | void ThemeInterface::reject ( ) |
93 | { | 54 | { |
94 | } | 55 | } |
95 | 56 | ||
96 | QRESULT ThemeSettingsInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) | 57 | |
58 | QRESULT ThemeInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) | ||
97 | { | 59 | { |
98 | *iface = 0; | 60 | *iface = 0; |
99 | 61 | ||
100 | |||
101 | if ( uuid == IID_QUnknown ) | 62 | if ( uuid == IID_QUnknown ) |
102 | *iface = this; | 63 | *iface = this; |
103 | else if ( uuid == IID_StyleSettings ) | 64 | else if ( uuid == IID_Style ) |
65 | *iface = this; | ||
66 | else if ( uuid == IID_StyleExtended ) | ||
104 | *iface = this; | 67 | *iface = this; |
105 | 68 | ||
106 | if ( *iface ) | 69 | if ( *iface ) |
@@ -109,3 +72,10 @@ QRESULT ThemeSettingsInterface::queryInterface ( const QUuid &uuid, QUnknownInte | |||
109 | return QS_OK; | 72 | return QS_OK; |
110 | } | 73 | } |
111 | 74 | ||
75 | Q_EXPORT_INTERFACE() | ||
76 | { | ||
77 | Q_CREATE_INSTANCE( ThemeInterface ) | ||
78 | } | ||
79 | |||
80 | |||
81 | |||
diff --git a/noncore/styles/theme/plugin.h b/noncore/styles/theme/plugin.h index d13fc5d..60cae97 100644 --- a/noncore/styles/theme/plugin.h +++ b/noncore/styles/theme/plugin.h | |||
@@ -5,7 +5,7 @@ | |||
5 | 5 | ||
6 | class ThemeSettings; | 6 | class ThemeSettings; |
7 | 7 | ||
8 | class ThemeInterface : public StyleInterface { | 8 | class ThemeInterface : public StyleExtendedInterface { |
9 | public: | 9 | public: |
10 | ThemeInterface ( ); | 10 | ThemeInterface ( ); |
11 | virtual ~ThemeInterface ( ); | 11 | virtual ~ThemeInterface ( ); |
@@ -13,26 +13,13 @@ public: | |||
13 | QRESULT queryInterface ( const QUuid &, QUnknownInterface ** ); | 13 | QRESULT queryInterface ( const QUuid &, QUnknownInterface ** ); |
14 | Q_REFCOUNT | 14 | Q_REFCOUNT |
15 | 15 | ||
16 | virtual QStyle *create ( ); | 16 | virtual QStyle *style ( ); |
17 | virtual QString name ( ) const; | ||
17 | 18 | ||
18 | virtual QString description ( ); | 19 | virtual QString description ( ) const; |
19 | virtual QString name ( ); | ||
20 | virtual QCString key ( ); | ||
21 | 20 | ||
22 | virtual unsigned int version ( ); | 21 | virtual bool hasSettings ( ) const; |
23 | 22 | ||
24 | private: | ||
25 | ulong ref; | ||
26 | }; | ||
27 | |||
28 | class ThemeSettingsInterface : public StyleSettingsInterface { | ||
29 | public: | ||
30 | ThemeSettingsInterface ( ); | ||
31 | virtual ~ThemeSettingsInterface ( ); | ||
32 | |||
33 | QRESULT queryInterface ( const QUuid &, QUnknownInterface ** ); | ||
34 | Q_REFCOUNT | ||
35 | |||
36 | virtual QWidget *create ( QWidget *parent, const char *name = 0 ); | 23 | virtual QWidget *create ( QWidget *parent, const char *name = 0 ); |
37 | 24 | ||
38 | virtual bool accept ( ); | 25 | virtual bool accept ( ); |