-rw-r--r-- | core/settings/launcher/config.in | 2 | ||||
-rw-r--r-- | core/settings/launcher/launcher.pro | 2 | ||||
-rw-r--r-- | core/settings/launcher/launchersettings.cpp | 3 | ||||
-rw-r--r-- | core/settings/launcher/main.cpp | 3 | ||||
-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 13 | ||||
-rw-r--r-- | core/settings/launcher/tabdialog.h | 10 |
6 files changed, 18 insertions, 15 deletions
diff --git a/core/settings/launcher/config.in b/core/settings/launcher/config.in index e167313..226da3c 100644 --- a/core/settings/launcher/config.in +++ b/core/settings/launcher/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config LAUNCHER-SETTINGS | 1 | config LAUNCHER-SETTINGS |
2 | boolean "opie-launcher-settings (Opie taskbar settings)" | 2 | boolean "opie-launcher-settings (Opie taskbar settings)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 && LIBQTAUX |
diff --git a/core/settings/launcher/launcher.pro b/core/settings/launcher/launcher.pro index 3261ee8..e3f1060 100644 --- a/core/settings/launcher/launcher.pro +++ b/core/settings/launcher/launcher.pro | |||
@@ -19,7 +19,7 @@ SOURCES = main.cpp \ | |||
19 | 19 | ||
20 | INCLUDEPATH += $(OPIEDIR)/include | 20 | INCLUDEPATH += $(OPIEDIR)/include |
21 | DEPENDPATH += $(OPIEDIR)/include | 21 | DEPENDPATH += $(OPIEDIR)/include |
22 | LIBS += -lqpe -lopie | 22 | LIBS += -lqpe -lopiecore2 -lopieui2 -lqtaux2 |
23 | TARGET = launchersettings | 23 | TARGET = launchersettings |
24 | 24 | ||
25 | 25 | ||
diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp index 5c11cc8..5efd297 100644 --- a/core/settings/launcher/launchersettings.cpp +++ b/core/settings/launcher/launchersettings.cpp | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | #include <qlayout.h> | 29 | #include <qlayout.h> |
30 | 30 | ||
31 | #include <opie/otabwidget.h> | 31 | #include <opie2/otabwidget.h> |
32 | 32 | ||
33 | #include "launchersettings.h" | 33 | #include "launchersettings.h" |
34 | #include "tabssettings.h" | 34 | #include "tabssettings.h" |
@@ -37,6 +37,7 @@ | |||
37 | #include "inputmethodsettings.h" | 37 | #include "inputmethodsettings.h" |
38 | #include "doctabsettings.h" | 38 | #include "doctabsettings.h" |
39 | 39 | ||
40 | using namespace Opie::Ui; | ||
40 | LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags) | 41 | LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags) |
41 | : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) | 42 | : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) |
42 | { | 43 | { |
diff --git a/core/settings/launcher/main.cpp b/core/settings/launcher/main.cpp index bcfdcf6..b27381a 100644 --- a/core/settings/launcher/main.cpp +++ b/core/settings/launcher/main.cpp | |||
@@ -27,8 +27,9 @@ | |||
27 | 27 | ||
28 | #include "launchersettings.h" | 28 | #include "launchersettings.h" |
29 | 29 | ||
30 | #include <opie/oapplicationfactory.h> | 30 | #include <opie2/oapplicationfactory.h> |
31 | 31 | ||
32 | using namespace Opie::Core; | ||
32 | OPIE_EXPORT_APP( OApplicationFactory<LauncherSettings> ) | 33 | OPIE_EXPORT_APP( OApplicationFactory<LauncherSettings> ) |
33 | 34 | ||
34 | 35 | ||
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index c0d1cf2..763b360 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp | |||
@@ -38,14 +38,15 @@ | |||
38 | #include <qwhatsthis.h> | 38 | #include <qwhatsthis.h> |
39 | #include <qcheckbox.h> | 39 | #include <qcheckbox.h> |
40 | 40 | ||
41 | #include <opie/ofontselector.h> | 41 | #include <opie2/ofontselector.h> |
42 | #include <opie/otabwidget.h> | 42 | #include <opie2/otabwidget.h> |
43 | #include <opie/ocolorbutton.h> | 43 | #include <opie2/ocolorbutton.h> |
44 | #include <opie/ofiledialog.h> | 44 | #include <opie2/ofiledialog.h> |
45 | 45 | ||
46 | #include "tabdialog.h" | 46 | #include "tabdialog.h" |
47 | 47 | ||
48 | 48 | ||
49 | using namespace Opie::Ui; | ||
49 | class SampleItem : public QIconViewItem { | 50 | class SampleItem : public QIconViewItem { |
50 | public: | 51 | public: |
51 | SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text ) | 52 | SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text ) |
@@ -353,7 +354,7 @@ QWidget *TabDialog::createBgTab ( QWidget *parent ) | |||
353 | hb-> addWidget ( rb ); | 354 | hb-> addWidget ( rb ); |
354 | hb-> addSpacing ( 10 ); | 355 | hb-> addSpacing ( 10 ); |
355 | 356 | ||
356 | m_solidcolor = new OColorButton ( tab, QColor ( m_tc. m_bg_color ) ); | 357 | m_solidcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_bg_color ) ); |
357 | connect ( m_solidcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( bgColorClicked(const QColor&))); | 358 | connect ( m_solidcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( bgColorClicked(const QColor&))); |
358 | hb-> addWidget ( m_solidcolor ); | 359 | hb-> addWidget ( m_solidcolor ); |
359 | hb-> addStretch ( 10 ); | 360 | hb-> addStretch ( 10 ); |
@@ -419,7 +420,7 @@ QWidget *TabDialog::createIconTab ( QWidget *parent ) | |||
419 | label = new QLabel ( tr( "Color:" ), tab ); | 420 | label = new QLabel ( tr( "Color:" ), tab ); |
420 | gridLayout-> addWidget ( label, 3, 0 ); | 421 | gridLayout-> addWidget ( label, 3, 0 ); |
421 | 422 | ||
422 | m_iconcolor = new OColorButton ( tab, QColor ( m_tc. m_text_color ) ); | 423 | m_iconcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_text_color ) ); |
423 | connect ( m_iconcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( iconColorClicked(const QColor&))); | 424 | connect ( m_iconcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( iconColorClicked(const QColor&))); |
424 | gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft ); | 425 | gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft ); |
425 | 426 | ||
diff --git a/core/settings/launcher/tabdialog.h b/core/settings/launcher/tabdialog.h index 4f99d5d..46b7ae9 100644 --- a/core/settings/launcher/tabdialog.h +++ b/core/settings/launcher/tabdialog.h | |||
@@ -32,9 +32,9 @@ | |||
32 | #include "tabconfig.h" | 32 | #include "tabconfig.h" |
33 | 33 | ||
34 | class QButtonGroup; | 34 | class QButtonGroup; |
35 | class OFontSelector; | 35 | namespace Opie {namespace Ui {class OFontSelector;}} |
36 | class SampleView; | 36 | class SampleView; |
37 | class OColorButton; | 37 | namespace Opie {class OColorButton;} |
38 | class QPushButton; | 38 | class QPushButton; |
39 | class QCheckBox; | 39 | class QCheckBox; |
40 | 40 | ||
@@ -66,9 +66,9 @@ private: | |||
66 | private: | 66 | private: |
67 | SampleView *m_sample; | 67 | SampleView *m_sample; |
68 | QButtonGroup *m_iconsize; | 68 | QButtonGroup *m_iconsize; |
69 | OFontSelector *m_fontselect; | 69 | Opie::Ui::OFontSelector *m_fontselect; |
70 | OColorButton *m_solidcolor; | 70 | Opie::OColorButton *m_solidcolor; |
71 | OColorButton *m_iconcolor; | 71 | Opie::OColorButton *m_iconcolor; |
72 | QPushButton *m_imagebrowse; | 72 | QPushButton *m_imagebrowse; |
73 | QString m_bgimage; | 73 | QString m_bgimage; |
74 | QButtonGroup *m_bgtype; | 74 | QButtonGroup *m_bgtype; |