9 files changed, 181 insertions, 99 deletions
diff --git a/noncore/styles/theme/opie-theme.control b/noncore/styles/theme/opie-theme.control
index 02739fb..adb4f4b 100644
--- a/noncore/styles/theme/opie-theme.control
+++ b/noncore/styles/theme/opie-theme.control
@@ -1,4 +1,4 @@
-Files: plugins/styles/libtheme.so* bin/theme-settings apps/Settings/Theme.desktop pics/theme/Theme.png
+Files: plugins/styles/libtheme.so*
 Priority: optional
 Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
diff --git a/noncore/styles/theme/plugin.cpp b/noncore/styles/theme/plugin.cpp
index b334357..4383693 100644
--- a/noncore/styles/theme/plugin.cpp
+++ b/noncore/styles/theme/plugin.cpp
@@ -1,19 +1,111 @@
-//#include <klocale.h>
 #include "othemestyle.h"
+#include "themeset.h"
+#include "plugin.h"
-extern "C"
+ThemeInterface::ThemeInterface ( ) :  ref ( 0 )
 {
-        QStyle * allocate() {
+}
-                return new OThemeStyle ( "" );
+    
-        }
+ThemeInterface::~ThemeInterface ( )
-        int minor_version() {
+{
-                return 0;
+}
-        }
+        
-        int major_version() {
+QStyle *ThemeInterface::create ( )
-                return 1;
+{
-        }
+        return new OThemeStyle ( "" );
-        const char * description() {
+}
-                return ( "Theme Style" );
+QString ThemeInterface::name ( )
+{
+        return QObject::tr( "Themed style", "name" );
+}
+QString ThemeInterface::description ( )
+{
+        return QObject::tr( "KDE2 theme compatible style engine", "description" );
+}
+QCString ThemeInterface::key ( )
+{
+        return QCString ( "theme" );
+}
+unsigned int ThemeInterface::version ( )
+{
+        return 100; // 1.0.0 (\d+.\d.\d)
+}
+QRESULT ThemeInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
+{
+        static ThemeSettingsInterface *setiface = 0;
+        *iface = 0;
+        
+        if ( uuid == IID_QUnknown )
+                *iface = this;
+        else if ( uuid == IID_Style )
+                *iface = this;
+        else if ( uuid == IID_StyleSettings ) {
+                if ( !setiface )
+                        setiface = new ThemeSettingsInterface ( );
+                *iface = setiface;
        }
+        
+        if ( *iface )
+                (*iface)-> addRef ( );
+                
+        return QS_OK;
+}
+Q_EXPORT_INTERFACE()
+{
+        Q_CREATE_INSTANCE( ThemeInterface )
+}
+ThemeSettingsInterface::ThemeSettingsInterface ( ) :  ref ( 0 )
+{
+        m_widget = 0;
+}
+    
+ThemeSettingsInterface::~ThemeSettingsInterface ( )
+{
+}
+        
+QWidget *ThemeSettingsInterface::create ( QWidget *parent, const char *name )
+{
+        m_widget = new ThemeSettings ( parent, name ? name : "THEME-SETTINGS" );
+                
+        return m_widget;
+}
+bool ThemeSettingsInterface::accept ( )
+{
+        if ( !m_widget )
+                return false;
+        return m_widget-> writeConfig ( );
+}
+void ThemeSettingsInterface::reject ( )
+{
+}
+QRESULT ThemeSettingsInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
+{
+        *iface = 0;
+        
+        
+        if ( uuid == IID_QUnknown )
+                *iface = this;
+        else if ( uuid == IID_StyleSettings )
+                *iface = this;
+        
+        if ( *iface )
+                (*iface)-> addRef ( );
+                
+        return QS_OK;
 }
diff --git a/noncore/styles/theme/plugin.h b/noncore/styles/theme/plugin.h
new file mode 100644
index 0000000..d13fc5d
--- a/dev/null
+++ b/noncore/styles/theme/plugin.h
@@ -0,0 +1,46 @@
+#ifndef __OPIE_THEME_PLUGIN_H__
+#define __OPIE_THEME_PLUGIN_H__
+#include <qpe/styleinterface.h>
+class ThemeSettings;
+class ThemeInterface : public StyleInterface {
+public:
+        ThemeInterface ( );
+        virtual ~ThemeInterface ( );
+        
+        QRESULT queryInterface ( const QUuid &, QUnknownInterface ** );
+        Q_REFCOUNT
+                
+        virtual QStyle *create ( );
+        
+        virtual QString description ( );
+        virtual QString name ( );
+        virtual QCString key ( );
+        
+        virtual unsigned int version ( );
+        
+private:
+        ulong ref;
+};
+class ThemeSettingsInterface : public StyleSettingsInterface {
+public:
+        ThemeSettingsInterface ( );
+        virtual ~ThemeSettingsInterface ( );
+        QRESULT queryInterface ( const QUuid &, QUnknownInterface ** );
+        Q_REFCOUNT
+       
+        virtual QWidget *create ( QWidget *parent, const char *name = 0 );
+    
+        virtual bool accept ( );            
+        virtual void reject ( );
+        
+private:
+        ThemeSettings *m_widget;
+        ulong ref;
+};
+#endif
diff --git a/noncore/styles/theme/settings/main.cpp b/noncore/styles/theme/settings/main.cpp
deleted file mode 100644
index 94d40f3..0000000
--- a/noncore/styles/theme/settings/main.cpp
+++ b/dev/null
@@ -1,34 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#include "themeset.h"
-#include <qpe/qpeapplication.h>
-int main ( int argc, char** argv )
-{
-        QPEApplication a ( argc, argv );
-        ThemeSet dlg;
-        a. showMainWidget ( &dlg );
-        return a. exec ( );
-}
diff --git a/noncore/styles/theme/settings/settings.pro b/noncore/styles/theme/settings/settings.pro
deleted file mode 100644
index 85d1f7a..0000000
--- a/noncore/styles/theme/settings/settings.pro
+++ b/dev/null
@@ -1,24 +0,0 @@
-        TEMPLATE= app
-        CONFIG  += qt warn_on release
-        DESTDIR         = $(OPIEDIR)/bin
-        HEADERS         = themeset.h
-        SOURCES         = themeset.cpp main.cpp
-INCLUDEPATH += $(OPIEDIR)/include
-        DEPENDPATH+= ../$(OPIEDIR)/include
-LIBS            += -lqpe
-        TARGET  = theme-settings
-TRANSLATIONS = ../../../../i18n/de/theme-settings.ts \
-         ../../../../i18n/en/theme-settings.ts \
-         ../../../../i18n/es/theme-settings.ts \
-         ../../../../i18n/fr/theme-settings.ts \
-         ../../../../i18n/hu/theme-settings.ts \
-         ../../../../i18n/ja/theme-settings.ts \
-         ../../../../i18n/ko/theme-settings.ts \
-         ../../../../i18n/no/theme-settings.ts \
-         ../../../../i18n/pl/theme-settings.ts \
-         ../../../../i18n/pt/theme-settings.ts \
-         ../../../../i18n/pt_BR/theme-settings.ts \
-         ../../../../i18n/sl/theme-settings.ts \
-         ../../../../i18n/zh_CN/theme-settings.ts \
-         ../../../../i18n/zh_TW/theme-settings.ts
diff --git a/noncore/styles/theme/settings/themeset.h b/noncore/styles/theme/settings/themeset.h
deleted file mode 100644
index 24804ce..0000000
--- a/noncore/styles/theme/settings/themeset.h
+++ b/dev/null
@@ -1,20 +0,0 @@
-#ifndef __OPIE_THEME_SET_H__
-#define __OPIE_THEME_SET_H__
-#include <qdialog.h>
-class QListView;
-class ThemeSet : public QDialog {
-        Q_OBJECT
-        
-public:
-        ThemeSet ( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
-protected:
-        virtual void accept ( );
-        
-private:
-        QListView *m_list;
-};
-#endif
diff --git a/noncore/styles/theme/theme.pro b/noncore/styles/theme/theme.pro
index fdcd20e..49c4103 100644
--- a/noncore/styles/theme/theme.pro
+++ b/noncore/styles/theme/theme.pro
@@ -3,11 +3,14 @@ CONFIG       = qt embedded debug warn_on
 SOURCES     =  ogfxeffect.cpp \
               othemestyle.cpp \
               othemebase.cpp \
+               themeset.cpp \
               plugin.cpp
 HEADERS     = ogfxeffect.h \
              othemebase.h \
-              othemestyle.h
+              othemestyle.h \
+              themeset.h \
+              plugin.h
               
 LIBS       += -lqpe
diff --git a/noncore/styles/theme/settings/themeset.cpp b/noncore/styles/theme/themeset.cpp
index 046618e..4a4efcb 100644
--- a/noncore/styles/theme/settings/themeset.cpp
+++ b/noncore/styles/theme/themeset.cpp
@@ -59,8 +59,8 @@ public:
 };
-ThemeSet::ThemeSet ( QWidget* parent, const char *name, WFlags fl )
+ThemeSettings::ThemeSettings ( QWidget* parent, const char *name, WFlags fl )
-                : QDialog ( parent, name, fl )
+                : QWidget ( parent, name, fl )
 {
        setCaption ( tr( "Theme Style" ) );
        
@@ -109,16 +109,15 @@ ThemeSet::ThemeSet ( QWidget* parent, const char *name, WFlags fl )
        }
 }
-void ThemeSet::accept ( )
+bool ThemeSettings::writeConfig ( )
 {
        Config config ( "qpe" );
    config. setGroup ( "Appearance" );
        MyItem *it = (MyItem *) m_list-> selectedItem ( );
        config. writeEntry ( "Theme", it ? it-> m_theme : QString ( "" ));
+        config. write ( );
-        Global::applyStyle ( );
+        return true;
-        QDialog::accept ( );
 }
diff --git a/noncore/styles/theme/themeset.h b/noncore/styles/theme/themeset.h
new file mode 100644
index 0000000..c337cfa
--- a/dev/null
+++ b/noncore/styles/theme/themeset.h
@@ -0,0 +1,20 @@
+#ifndef __OPIE_THEME_SETTINGS_H__
+#define __OPIE_THEME_SETTINGS_H__
+#include <qdialog.h>
+class QListView;
+class ThemeSettings : public QWidget {
+        Q_OBJECT
+        
+public:
+        ThemeSettings ( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
+public:
+        virtual bool writeConfig ( );
+        
+private:
+        QListView *m_list;
+};
+#endif

diff --git a/noncore/styles/theme/opie-theme.control b/noncore/styles/theme/opie-theme.control index 02739fb..adb4f4b 100644 --- a/noncore/styles/theme/opie-theme.control +++ b/noncore/styles/theme/opie-theme.control
@@ -1,4 +1,4 @@
1	Files: plugins/styles/libtheme.so* bin/theme-settings apps/Settings/Theme.desktop pics/theme/Theme.png	1	Files: plugins/styles/libtheme.so*
2	Priority: optional	2	Priority: optional
3	Section: opie/system	3	Section: opie/system
4	Maintainer: Robert Griebl <sandman@handhelds.org>	4	Maintainer: Robert Griebl <sandman@handhelds.org>


diff --git a/noncore/styles/theme/plugin.cpp b/noncore/styles/theme/plugin.cpp index b334357..4383693 100644 --- a/noncore/styles/theme/plugin.cpp +++ b/noncore/styles/theme/plugin.cpp
@@ -1,19 +1,111 @@
1	//#include <klocale.h>
2	#include "othemestyle.h"	1	#include "othemestyle.h"
		2	#include "themeset.h"
		3	#include "plugin.h"
3		4
4	extern "C"	5
		6
		7	ThemeInterface::ThemeInterface ( ) : ref ( 0 )
5	{	8	{
6	QStyle * allocate() {	9	}
7	return new OThemeStyle ( "" );	10
8	}	11	ThemeInterface::~ThemeInterface ( )
9	int minor_version() {	12	{
10	return 0;	13	}
11	}	14
12	int major_version() {	15	QStyle *ThemeInterface::create ( )
13	return 1;	16	{
14	}	17	return new OThemeStyle ( "" );
15	const char * description() {	18	}
16	return ( "Theme Style" );	19
		20	QString ThemeInterface::name ( )
		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	{
		37	return 100; // 1.0.0 (\d+.\d.\d)
		38	}
		39
		40	QRESULT ThemeInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
		41	{
		42	static ThemeSettingsInterface *setiface = 0;
		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;
17	}	54	}
		55
		56	if ( *iface )
		57	(*iface)-> addRef ( );
		58
		59	return QS_OK;
		60	}
		61
		62	Q_EXPORT_INTERFACE()
		63	{
		64	Q_CREATE_INSTANCE( ThemeInterface )
		65	}
		66
		67
		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	{
		79	m_widget = new ThemeSettings ( parent, name ? name : "THEME-SETTINGS" );
		80
		81	return m_widget;
		82	}
		83
		84	bool ThemeSettingsInterface::accept ( )
		85	{
		86	if ( !m_widget )
		87	return false;
		88
		89	return m_widget-> writeConfig ( );
		90	}
		91
		92	void ThemeSettingsInterface::reject ( )
		93	{
		94	}
		95
		96	QRESULT ThemeSettingsInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
		97	{
		98	*iface = 0;
		99
		100
		101	if ( uuid == IID_QUnknown )
		102	*iface = this;
		103	else if ( uuid == IID_StyleSettings )
		104	*iface = this;
		105
		106	if ( *iface )
		107	(*iface)-> addRef ( );
		108
		109	return QS_OK;
18	}	110	}
19		111


diff --git a/noncore/styles/theme/plugin.h b/noncore/styles/theme/plugin.h new file mode 100644 index 0000000..d13fc5d --- a/dev/null +++ b/noncore/styles/theme/plugin.h
@@ -0,0 +1,46 @@
		1	#ifndef __OPIE_THEME_PLUGIN_H__
		2	#define __OPIE_THEME_PLUGIN_H__
		3
		4	#include <qpe/styleinterface.h>
		5
		6	class ThemeSettings;
		7
		8	class ThemeInterface : public StyleInterface {
		9	public:
		10	ThemeInterface ( );
		11	virtual ~ThemeInterface ( );
		12
		13	QRESULT queryInterface ( const QUuid &, QUnknownInterface ** );
		14	Q_REFCOUNT
		15
		16	virtual QStyle *create ( );
		17
		18	virtual QString description ( );
		19	virtual QString name ( );
		20	virtual QCString key ( );
		21
		22	virtual unsigned int version ( );
		23
		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 );
		37
		38	virtual bool accept ( );
		39	virtual void reject ( );
		40
		41	private:
		42	ThemeSettings *m_widget;
		43	ulong ref;
		44	};
		45
		46	#endif


diff --git a/noncore/styles/theme/settings/main.cpp b/noncore/styles/theme/settings/main.cpp deleted file mode 100644 index 94d40f3..0000000 --- a/noncore/styles/theme/settings/main.cpp +++ b/dev/null
@@ -1,34 +0,0 @@
1	/**********************************************************************
2	** Copyright (C) 2000 Trolltech AS. All rights reserved.
3	**
4	** This file is part of Qtopia Environment.
5	**
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
8	** Foundation and appearing in the file LICENSE.GPL included in the
9	** packaging of this file.
10	**
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.
13	**
14	** See http://www.trolltech.com/gpl/ for GPL licensing information.
15	**
16	** Contact info@trolltech.com if any conditions of this licensing are
17	** not clear to you.
18	**
19	**********************************************************************/
20
21	#include "themeset.h"
22
23	#include <qpe/qpeapplication.h>
24
25
26	int main ( int argc, char** argv )
27	{
28	QPEApplication a ( argc, argv );
29
30	ThemeSet dlg;
31	a. showMainWidget ( &dlg );
32
33	return a. exec ( );
34	}


diff --git a/noncore/styles/theme/settings/settings.pro b/noncore/styles/theme/settings/settings.pro deleted file mode 100644 index 85d1f7a..0000000 --- a/noncore/styles/theme/settings/settings.pro +++ b/dev/null
@@ -1,24 +0,0 @@
1	TEMPLATE= app
2	CONFIG += qt warn_on release
3	DESTDIR = $(OPIEDIR)/bin
4	HEADERS = themeset.h
5	SOURCES = themeset.cpp main.cpp
6	INCLUDEPATH += $(OPIEDIR)/include
7	DEPENDPATH+= ../$(OPIEDIR)/include
8	LIBS += -lqpe
9	TARGET = theme-settings
10
11	TRANSLATIONS = ../../../../i18n/de/theme-settings.ts \
12	../../../../i18n/en/theme-settings.ts \
13	../../../../i18n/es/theme-settings.ts \
14	../../../../i18n/fr/theme-settings.ts \
15	../../../../i18n/hu/theme-settings.ts \
16	../../../../i18n/ja/theme-settings.ts \
17	../../../../i18n/ko/theme-settings.ts \
18	../../../../i18n/no/theme-settings.ts \
19	../../../../i18n/pl/theme-settings.ts \
20	../../../../i18n/pt/theme-settings.ts \
21	../../../../i18n/pt_BR/theme-settings.ts \
22	../../../../i18n/sl/theme-settings.ts \
23	../../../../i18n/zh_CN/theme-settings.ts \
24	../../../../i18n/zh_TW/theme-settings.ts


diff --git a/noncore/styles/theme/settings/themeset.h b/noncore/styles/theme/settings/themeset.h deleted file mode 100644 index 24804ce..0000000 --- a/noncore/styles/theme/settings/themeset.h +++ b/dev/null
@@ -1,20 +0,0 @@
1	#ifndef __OPIE_THEME_SET_H__
2	#define __OPIE_THEME_SET_H__
3
4	#include <qdialog.h>
5
6	class QListView;
7
8	class ThemeSet : public QDialog {
9	Q_OBJECT
10
11	public:
12	ThemeSet ( QWidget parent = 0, const char name = 0, WFlags fl = 0 );
13
14	protected:
15	virtual void accept ( );
16
17	private:
18	QListView *m_list;
19	};
20	#endif


diff --git a/noncore/styles/theme/theme.pro b/noncore/styles/theme/theme.pro index fdcd20e..49c4103 100644 --- a/noncore/styles/theme/theme.pro +++ b/noncore/styles/theme/theme.pro
@@ -3,11 +3,14 @@ CONFIG = qt embedded debug warn_on
3	SOURCES = ogfxeffect.cpp \	3	SOURCES = ogfxeffect.cpp \
4	othemestyle.cpp \	4	othemestyle.cpp \
5	othemebase.cpp \	5	othemebase.cpp \
		6	themeset.cpp \
6	plugin.cpp	7	plugin.cpp
7		8
8	HEADERS = ogfxeffect.h \	9	HEADERS = ogfxeffect.h \
9	othemebase.h \	10	othemebase.h \
10	othemestyle.h	11	othemestyle.h \
		12	themeset.h \
		13	plugin.h
11		14
12		15
13	LIBS += -lqpe	16	LIBS += -lqpe


diff --git a/noncore/styles/theme/settings/themeset.cpp b/noncore/styles/theme/themeset.cpp index 046618e..4a4efcb 100644 --- a/noncore/styles/theme/settings/themeset.cpp +++ b/noncore/styles/theme/themeset.cpp
@@ -59,8 +59,8 @@ public:
59	};	59	};
60		60
61		61
62	ThemeSet::ThemeSet ( QWidget* parent, const char *name, WFlags fl )	62	ThemeSettings::ThemeSettings ( QWidget* parent, const char *name, WFlags fl )
63	: QDialog ( parent, name, fl )	63	: QWidget ( parent, name, fl )
64	{	64	{
65	setCaption ( tr( "Theme Style" ) );	65	setCaption ( tr( "Theme Style" ) );
66		66
@@ -109,16 +109,15 @@ ThemeSet::ThemeSet ( QWidget* parent, const char *name, WFlags fl )
109	}	109	}
110	}	110	}
111		111
112	void ThemeSet::accept ( )	112	bool ThemeSettings::writeConfig ( )
113	{	113	{
114	Config config ( "qpe" );	114	Config config ( "qpe" );
115	config. setGroup ( "Appearance" );	115	config. setGroup ( "Appearance" );
116		116
117	MyItem it = (MyItem ) m_list-> selectedItem ( );	117	MyItem it = (MyItem ) m_list-> selectedItem ( );
118	config. writeEntry ( "Theme", it ? it-> m_theme : QString ( "" ));	118	config. writeEntry ( "Theme", it ? it-> m_theme : QString ( "" ));
		119	config. write ( );
119		120
120	Global::applyStyle ( );	121	return true;
121
122	QDialog::accept ( );
123	}	122	}
124		123


diff --git a/noncore/styles/theme/themeset.h b/noncore/styles/theme/themeset.h new file mode 100644 index 0000000..c337cfa --- a/dev/null +++ b/noncore/styles/theme/themeset.h
@@ -0,0 +1,20 @@
		1	#ifndef __OPIE_THEME_SETTINGS_H__
		2	#define __OPIE_THEME_SETTINGS_H__
		3
		4	#include <qdialog.h>
		5
		6	class QListView;
		7
		8	class ThemeSettings : public QWidget {
		9	Q_OBJECT
		10
		11	public:
		12	ThemeSettings ( QWidget parent = 0, const char name = 0, WFlags fl = 0 );
		13
		14	public:
		15	virtual bool writeConfig ( );
		16
		17	private:
		18	QListView *m_list;
		19	};
		20	#endif