summaryrefslogtreecommitdiff
authordrw <drw>2004-02-21 22:55:22 (UTC)
committer drw <drw>2004-02-21 22:55:22 (UTC)
commitc2a2f38b9b7af1f9a4d885c2527a4501425fb9a2 (patch) (unidiff)
tree7b8b464a300481cd76ca8610c8443c66cc5ecf95
parentf36efd3490299fb9402a2dc2a6bd2a029fcd93cb (diff)
downloadopie-c2a2f38b9b7af1f9a4d885c2527a4501425fb9a2.zip
opie-c2a2f38b9b7af1f9a4d885c2527a4501425fb9a2.tar.gz
opie-c2a2f38b9b7af1f9a4d885c2527a4501425fb9a2.tar.bz2
Appearance: libopie->libopie2/libqtaux
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/appearance2/appearance.cpp7
-rw-r--r--noncore/settings/appearance2/appearance.h38
-rw-r--r--noncore/settings/appearance2/appearance2.pro6
-rw-r--r--noncore/settings/appearance2/editScheme.cpp22
-rw-r--r--noncore/settings/appearance2/editScheme.h20
5 files changed, 48 insertions, 45 deletions
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index ba12e55..b39203b 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -36,10 +36,9 @@
36#include "sample.h" 36#include "sample.h"
37 37
38/* OPIE */ 38/* OPIE */
39#include <opie/ofontselector.h> 39#include <opie2/odevice.h>
40#include <opie/odevice.h> 40#include <opie2/ofiledialog.h>
41#include <opie/ofiledialog.h> 41#include <opie2/otabwidget.h>
42#include <opie/otabwidget.h>
43 42
44#include <qpe/config.h> 43#include <qpe/config.h>
45#include <qpe/global.h> 44#include <qpe/global.h>
diff --git a/noncore/settings/appearance2/appearance.h b/noncore/settings/appearance2/appearance.h
index 51e9636..f45f549 100644
--- a/noncore/settings/appearance2/appearance.h
+++ b/noncore/settings/appearance2/appearance.h
@@ -16,7 +16,7 @@
16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
17  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 17  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
18..}^=.=       =       ; Public License for more details. 18..}^=.=       =       ; Public License for more details.
19++=   -.     .`     .: 19++=   -.     .`     .:
20 :     =  ...= . :.=- You should have received a copy of the GNU 20 :     =  ...= . :.=- You should have received a copy of the GNU
21 -.   .:....=;==+<; General Public License along with this file; 21 -.   .:....=;==+<; General Public License along with this file;
22  -_. . .   )=.  = see the file COPYING. If not, write to the 22  -_. . .   )=.  = see the file COPYING. If not, write to the
@@ -29,10 +29,14 @@
29#ifndef APPEARANCESETTINGS_H 29#ifndef APPEARANCESETTINGS_H
30#define APPEARANCESETTINGS_H 30#define APPEARANCESETTINGS_H
31 31
32#include <opie2/ofontselector.h>
33
32#include <qpe/fontdatabase.h> 34#include <qpe/fontdatabase.h>
33 35
34#include <qdialog.h> 36#include <qdialog.h>
35 37
38using Opie::OFontSelector;
39
36class QCheckBox; 40class QCheckBox;
37class QComboBox; 41class QComboBox;
38class QLabel; 42class QLabel;
@@ -58,9 +62,9 @@ public:
58 static QString appName() { return QString::fromLatin1("appearance"); } 62 static QString appName() { return QString::fromLatin1("appearance"); }
59 63
60protected: 64protected:
61 virtual void accept ( ); 65 virtual void accept ( );
62 virtual void done ( int r ); 66 virtual void done ( int r );
63 67
64protected slots: 68protected slots:
65 void styleClicked ( int ); 69 void styleClicked ( int );
66 void styleSettingsClicked ( ); 70 void styleSettingsClicked ( );
@@ -71,9 +75,9 @@ protected slots:
71 void editSchemeClicked(); 75 void editSchemeClicked();
72 void saveSchemeClicked(); 76 void saveSchemeClicked();
73 void deleteSchemeClicked(); 77 void deleteSchemeClicked();
74 78
75 void tabChanged ( QWidget * ); 79 void tabChanged ( QWidget * );
76 80
77 void addExcept ( ); 81 void addExcept ( );
78 void delExcept ( ); 82 void delExcept ( );
79 void upExcept ( ); 83 void upExcept ( );
@@ -82,12 +86,12 @@ protected slots:
82 86
83private: 87private:
84 void changeText(); 88 void changeText();
85 89
86 QWidget *createStyleTab ( QWidget *parent, Config &cfg ); 90 QWidget *createStyleTab ( QWidget *parent, Config &cfg );
87 QWidget *createDecoTab ( QWidget *parent, Config &cfg ); 91 QWidget *createDecoTab ( QWidget *parent, Config &cfg );
88 QWidget *createFontTab ( QWidget *parent, Config &cfg ); 92 QWidget *createFontTab ( QWidget *parent, Config &cfg );
89 QWidget *createColorTab ( QWidget *parent, Config &cfg ); 93 QWidget *createColorTab ( QWidget *parent, Config &cfg );
90 QWidget *createAdvancedTab ( QWidget *parent, Config &cfg ); 94 QWidget *createAdvancedTab ( QWidget *parent, Config &cfg );
91 95
92private: 96private:
93 bool m_style_changed; 97 bool m_style_changed;
@@ -100,7 +104,7 @@ private:
100 int m_original_deco; 104 int m_original_deco;
101 int m_original_tabstyle; 105 int m_original_tabstyle;
102 bool m_original_tabpos; 106 bool m_original_tabpos;
103 107
104 QListBox * m_style_list; 108 QListBox * m_style_list;
105 QPushButton * m_style_settings; 109 QPushButton * m_style_settings;
106 110
@@ -108,10 +112,10 @@ private:
108 112
109 QListBox * m_color_list; 113 QListBox * m_color_list;
110 114
111 OFontSelector *m_fontselect; 115 OFontSelector *m_fontselect;
116
117 SampleWindow *m_sample;
112 118
113 SampleWindow *m_sample;
114
115 QComboBox * m_tabstyle_list; 119 QComboBox * m_tabstyle_list;
116 QRadioButton *m_tabstyle_top; 120 QRadioButton *m_tabstyle_top;
117 QRadioButton *m_tabstyle_bottom; 121 QRadioButton *m_tabstyle_bottom;
@@ -120,7 +124,7 @@ private:
120 QRadioButton *m_rotdir_ccw; 124 QRadioButton *m_rotdir_ccw;
121 QRadioButton *m_rotdir_flip; 125 QRadioButton *m_rotdir_flip;
122 126
123 QWidget * m_advtab; 127 QWidget * m_advtab;
124 QListView * m_except; 128 QListView * m_except;
125 QCheckBox * m_force; 129 QCheckBox * m_force;
126}; 130};
diff --git a/noncore/settings/appearance2/appearance2.pro b/noncore/settings/appearance2/appearance2.pro
index ca5a4ec..e2d73c2 100644
--- a/noncore/settings/appearance2/appearance2.pro
+++ b/noncore/settings/appearance2/appearance2.pro
@@ -2,11 +2,9 @@ CONFIG = qt warn_on release quick-app
2HEADERS = appearance.h editScheme.h sample.h 2HEADERS = appearance.h editScheme.h sample.h
3SOURCES = appearance.cpp editScheme.cpp main.cpp sample.cpp 3SOURCES = appearance.cpp editScheme.cpp main.cpp sample.cpp
4INCLUDEPATH += $(OPIEDIR)/include 4INCLUDEPATH += $(OPIEDIR)/include
5DEPENDPATH += ../$(OPIEDIR)/include
6LIBS += -lqpe -lopie
7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += $(OPIEDIR)/include 5DEPENDPATH += $(OPIEDIR)/include
6LIBS += -lqpe -lopiecore2 -lopieui2 -lqtaux2
9 7
10 TARGET = appearance 8TARGET = appearance
11 9
12include ( $(OPIEDIR)/include.pro ) 10include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/appearance2/editScheme.cpp b/noncore/settings/appearance2/editScheme.cpp
index 7e5225f..0f3702f 100644
--- a/noncore/settings/appearance2/editScheme.cpp
+++ b/noncore/settings/appearance2/editScheme.cpp
@@ -28,8 +28,6 @@
28 28
29#include "editScheme.h" 29#include "editScheme.h"
30 30
31#include <opie/ocolorbutton.h>
32
33#include <qaction.h> 31#include <qaction.h>
34#include <qlabel.h> 32#include <qlabel.h>
35#include <qlayout.h> 33#include <qlayout.h>
@@ -39,10 +37,10 @@
39#include <qwhatsthis.h> 37#include <qwhatsthis.h>
40 38
41EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent, const char* name, bool modal, WFlags ) 39EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent, const char* name, bool modal, WFlags )
42 : QDialog ( parent, name, modal, WStyle_ContextHelp ) 40 : QDialog ( parent, name, modal, WStyle_ContextHelp )
43{ 41{
44 setCaption ( tr( "Edit scheme" ) ); 42 setCaption ( tr( "Edit scheme" ) );
45 QGridLayout *layout = new QGridLayout ( this, 0, 0, 4, 4 ); 43 QGridLayout *layout = new QGridLayout ( this, 0, 0, 4, 4 );
46 44
47 m_count = cnt; 45 m_count = cnt;
48 m_buttons = new OColorButton * [cnt]; 46 m_buttons = new OColorButton * [cnt];
@@ -52,24 +50,24 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget
52 { 50 {
53 QLabel *l = new QLabel ( labels [i], this ); 51 QLabel *l = new QLabel ( labels [i], this );
54 layout-> addWidget ( l, i, 0 ); 52 layout-> addWidget ( l, i, 0 );
55 QWhatsThis::add( l, tr( "Click here to select a color for: " ).arg( labels [i] ) ); 53 QWhatsThis::add( l, tr( "Click here to select a color for: " ).arg( labels [i] ) );
56 54
57 m_buttons [i] = new OColorButton ( this, colors [i] ); 55 m_buttons [i] = new OColorButton ( this, colors [i] );
58 layout-> addWidget ( m_buttons [i], i, 1 ); 56 layout-> addWidget ( m_buttons [i], i, 1 );
59 QWhatsThis::add( m_buttons [i], tr( "Click here to select a color for: " ).arg( labels [i] ) ); 57 QWhatsThis::add( m_buttons [i], tr( "Click here to select a color for: " ).arg( labels [i] ) );
60 } 58 }
61} 59}
62 60
63EditScheme::~EditScheme ( ) 61EditScheme::~EditScheme ( )
64{ 62{
65 delete [] m_buttons; 63 delete [] m_buttons;
66} 64}
67 65
68void EditScheme::accept ( ) 66void EditScheme::accept ( )
69{ 67{
70 for ( int i = 0; i < m_count; i++ ) 68 for ( int i = 0; i < m_count; i++ )
71 m_colors [i] = m_buttons [i]-> color ( ); 69 m_colors [i] = m_buttons [i]-> color ( );
72 70
73 QDialog::accept ( ); 71 QDialog::accept ( );
74} 72}
75 73
diff --git a/noncore/settings/appearance2/editScheme.h b/noncore/settings/appearance2/editScheme.h
index 93dc50d..c7539cb 100644
--- a/noncore/settings/appearance2/editScheme.h
+++ b/noncore/settings/appearance2/editScheme.h
@@ -16,7 +16,7 @@
16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
17  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 17  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
18..}^=.=       =       ; Public License for more details. 18..}^=.=       =       ; Public License for more details.
19++=   -.     .`     .: 19++=   -.     .`     .:
20 :     =  ...= . :.=- You should have received a copy of the GNU 20 :     =  ...= . :.=- You should have received a copy of the GNU
21 -.   .:....=;==+<; General Public License along with this file; 21 -.   .:....=;==+<; General Public License along with this file;
22  -_. . .   )=.  = see the file COPYING. If not, write to the 22  -_. . .   )=.  = see the file COPYING. If not, write to the
@@ -29,25 +29,29 @@
29#ifndef EDITSCHEME_H 29#ifndef EDITSCHEME_H
30#define EDITSCHEME_H 30#define EDITSCHEME_H
31 31
32#include <opie2/ocolorbutton.h>
33
32#include <qdialog.h> 34#include <qdialog.h>
33 35
36using Opie::OColorButton;
37
34class QColor; 38class QColor;
35class OColorButton; 39class OColorButton;
36 40
37class EditScheme : public QDialog { 41class EditScheme : public QDialog {
38 Q_OBJECT 42 Q_OBJECT
39 43
40public: 44public:
41 EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); 45 EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
42 virtual ~EditScheme ( ); 46 virtual ~EditScheme ( );
43 47
44protected slots: 48protected slots:
45 virtual void accept ( ); 49 virtual void accept ( );
46 50
47private: 51private:
48 int m_count; 52 int m_count;
49 QColor *m_colors; 53 QColor *m_colors;
50 OColorButton **m_buttons; 54 OColorButton **m_buttons;
51}; 55};
52 56
53#endif 57#endif