author | drw <drw> | 2004-02-21 22:55:22 (UTC) |
---|---|---|
committer | drw <drw> | 2004-02-21 22:55:22 (UTC) |
commit | c2a2f38b9b7af1f9a4d885c2527a4501425fb9a2 (patch) (unidiff) | |
tree | 7b8b464a300481cd76ca8610c8443c66cc5ecf95 /noncore | |
parent | f36efd3490299fb9402a2dc2a6bd2a029fcd93cb (diff) | |
download | opie-c2a2f38b9b7af1f9a4d885c2527a4501425fb9a2.zip opie-c2a2f38b9b7af1f9a4d885c2527a4501425fb9a2.tar.gz opie-c2a2f38b9b7af1f9a4d885c2527a4501425fb9a2.tar.bz2 |
Appearance: libopie->libopie2/libqtaux
-rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 7 | ||||
-rw-r--r-- | noncore/settings/appearance2/appearance.h | 4 | ||||
-rw-r--r-- | noncore/settings/appearance2/appearance2.pro | 4 | ||||
-rw-r--r-- | noncore/settings/appearance2/editScheme.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/appearance2/editScheme.h | 4 |
5 files changed, 12 insertions, 9 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 | |||
@@ -27,28 +27,27 @@ | |||
27 | 27 | ||
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "appearance.h" | 30 | #include "appearance.h" |
31 | #include "editScheme.h" | 31 | #include "editScheme.h" |
32 | #include "stylelistitem.h" | 32 | #include "stylelistitem.h" |
33 | #include "decolistitem.h" | 33 | #include "decolistitem.h" |
34 | #include "colorlistitem.h" | 34 | #include "colorlistitem.h" |
35 | #include "exceptlistitem.h" | 35 | #include "exceptlistitem.h" |
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> |
46 | #include <qpe/qpeapplication.h> | 45 | #include <qpe/qpeapplication.h> |
47 | #include <qpe/qpemessagebox.h> | 46 | #include <qpe/qpemessagebox.h> |
48 | #include <qpe/qcopenvelope_qws.h> | 47 | #include <qpe/qcopenvelope_qws.h> |
49 | #include <qpe/qpestyle.h> | 48 | #include <qpe/qpestyle.h> |
50 | #include <qpe/lightstyle.h> | 49 | #include <qpe/lightstyle.h> |
51 | #include <qpe/styleinterface.h> | 50 | #include <qpe/styleinterface.h> |
52 | 51 | ||
53 | /* QT */ | 52 | /* QT */ |
54 | #include <qbuttongroup.h> | 53 | #include <qbuttongroup.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 | |||
@@ -20,28 +20,32 @@ | |||
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 |
23 | -- :-=` Free Software Foundation, Inc., | 23 | -- :-=` Free Software Foundation, Inc., |
24 | 59 Temple Place - Suite 330, | 24 | 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
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 | ||
38 | using Opie::OFontSelector; | ||
39 | |||
36 | class QCheckBox; | 40 | class QCheckBox; |
37 | class QComboBox; | 41 | class QComboBox; |
38 | class QLabel; | 42 | class QLabel; |
39 | class QLineEdit; | 43 | class QLineEdit; |
40 | class QListBox; | 44 | class QListBox; |
41 | class QMultiLineEdit; | 45 | class QMultiLineEdit; |
42 | class QPushButton; | 46 | class QPushButton; |
43 | class QRadioButton; | 47 | class QRadioButton; |
44 | class QToolButton; | 48 | class QToolButton; |
45 | class SampleWindow; | 49 | class SampleWindow; |
46 | class OFontSelector; | 50 | class OFontSelector; |
47 | class QListView; | 51 | class QListView; |
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 | |||
@@ -1,12 +1,10 @@ | |||
1 | CONFIG = qt warn_on release quick-app | 1 | CONFIG = qt warn_on release quick-app |
2 | HEADERS = appearance.h editScheme.h sample.h | 2 | HEADERS = appearance.h editScheme.h sample.h |
3 | SOURCES = appearance.cpp editScheme.cpp main.cpp sample.cpp | 3 | SOURCES = appearance.cpp editScheme.cpp main.cpp sample.cpp |
4 | INCLUDEPATH += $(OPIEDIR)/include | 4 | INCLUDEPATH += $(OPIEDIR)/include |
5 | DEPENDPATH += ../$(OPIEDIR)/include | ||
6 | LIBS += -lqpe -lopie | ||
7 | INCLUDEPATH += $(OPIEDIR)/include | ||
8 | DEPENDPATH += $(OPIEDIR)/include | 5 | DEPENDPATH += $(OPIEDIR)/include |
6 | LIBS += -lqpe -lopiecore2 -lopieui2 -lqtaux2 | ||
9 | 7 | ||
10 | TARGET = appearance | 8 | TARGET = appearance |
11 | 9 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 10 | include ( $(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 | |||
@@ -19,26 +19,24 @@ | |||
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 |
23 | -- :-=` Free Software Foundation, Inc., | 23 | -- :-=` Free Software Foundation, Inc., |
24 | 59 Temple Place - Suite 330, | 24 | 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
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> |
36 | #include <qpopupmenu.h> | 34 | #include <qpopupmenu.h> |
37 | #include <qscrollview.h> | 35 | #include <qscrollview.h> |
38 | #include <qtoolbutton.h> | 36 | #include <qtoolbutton.h> |
39 | #include <qwhatsthis.h> | 37 | #include <qwhatsthis.h> |
40 | 38 | ||
41 | EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent, const char* name, bool modal, WFlags ) | 39 | EditScheme::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" ) ); |
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 | |||
@@ -20,26 +20,30 @@ | |||
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 |
23 | -- :-=` Free Software Foundation, Inc., | 23 | -- :-=` Free Software Foundation, Inc., |
24 | 59 Temple Place - Suite 330, | 24 | 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
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 | ||
36 | using Opie::OColorButton; | ||
37 | |||
34 | class QColor; | 38 | class QColor; |
35 | class OColorButton; | 39 | class OColorButton; |
36 | 40 | ||
37 | class EditScheme : public QDialog { | 41 | class EditScheme : public QDialog { |
38 | Q_OBJECT | 42 | Q_OBJECT |
39 | 43 | ||
40 | public: | 44 | public: |
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 | ||
44 | protected slots: | 48 | protected slots: |
45 | virtual void accept ( ); | 49 | virtual void accept ( ); |