-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 @@ config LAUNCHER-SETTINGS boolean "opie-launcher-settings (Opie taskbar settings)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + 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 @@ -16,13 +16,13 @@ SOURCES = main.cpp \ inputmethodsettings.cpp \ doctabsettings.cpp \ tabdialog.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 -lopieui2 -lqtaux2 TARGET = launchersettings include ( $(OPIEDIR)/include.pro ) 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 @@ -25,21 +25,22 @@ Boston, MA 02111-1307, USA. */ #include <qlayout.h> -#include <opie/otabwidget.h> +#include <opie2/otabwidget.h> #include "launchersettings.h" #include "tabssettings.h" #include "menusettings.h" #include "taskbarsettings.h" #include "inputmethodsettings.h" #include "doctabsettings.h" +using namespace Opie::Ui; LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags) : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) { setCaption ( tr( "Launcher Settings" )); QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); 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 @@ -24,11 +24,12 @@ Boston, MA 02111-1307, USA. */ #include "launchersettings.h" -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> +using namespace Opie::Core; OPIE_EXPORT_APP( OApplicationFactory<LauncherSettings> ) 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 @@ -35,20 +35,21 @@ #include <qlabel.h> #include <qradiobutton.h> #include <qbuttongroup.h> #include <qwhatsthis.h> #include <qcheckbox.h> -#include <opie/ofontselector.h> -#include <opie/otabwidget.h> -#include <opie/ocolorbutton.h> -#include <opie/ofiledialog.h> +#include <opie2/ofontselector.h> +#include <opie2/otabwidget.h> +#include <opie2/ocolorbutton.h> +#include <opie2/ofiledialog.h> #include "tabdialog.h" +using namespace Opie::Ui; class SampleItem : public QIconViewItem { public: SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text ) { m_large = pix; m_small. convertFromImage ( pix. convertToImage ( ). smoothScale ( pix. width ( ) / 2, pix. height ( ) / 2 )); @@ -350,13 +351,13 @@ QWidget *TabDialog::createBgTab ( QWidget *parent ) rb = new QRadioButton( tr( "Solid color" ), tab, "solid" ); m_bgtype-> insert ( rb, TabConfig::SolidColor ); hb-> addWidget ( rb ); hb-> addSpacing ( 10 ); - m_solidcolor = new OColorButton ( tab, QColor ( m_tc. m_bg_color ) ); + m_solidcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_bg_color ) ); connect ( m_solidcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( bgColorClicked(const QColor&))); hb-> addWidget ( m_solidcolor ); hb-> addStretch ( 10 ); gridLayout-> addLayout ( hb, 1, 1 ); @@ -416,13 +417,13 @@ QWidget *TabDialog::createIconTab ( QWidget *parent ) // gridLayout = new QGridLayout ( vertLayout ); gridLayout-> addRowSpacing ( 2, 8 ); label = new QLabel ( tr( "Color:" ), tab ); gridLayout-> addWidget ( label, 3, 0 ); - m_iconcolor = new OColorButton ( tab, QColor ( m_tc. m_text_color ) ); + m_iconcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_text_color ) ); connect ( m_iconcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( iconColorClicked(const QColor&))); gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft ); vertLayout-> addStretch ( 10 ); return tab; 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 @@ -29,15 +29,15 @@ #define __TABDIALOG_H__ #include <qdialog.h> #include "tabconfig.h" class QButtonGroup; -class OFontSelector; +namespace Opie {namespace Ui {class OFontSelector;}} class SampleView; -class OColorButton; +namespace Opie {class OColorButton;} class QPushButton; class QCheckBox; class TabDialog : public QDialog { Q_OBJECT @@ -63,15 +63,15 @@ private: QWidget *createIconTab ( QWidget *parent ); private: SampleView *m_sample; QButtonGroup *m_iconsize; - OFontSelector *m_fontselect; - OColorButton *m_solidcolor; - OColorButton *m_iconcolor; + Opie::Ui::OFontSelector *m_fontselect; + Opie::OColorButton *m_solidcolor; + Opie::OColorButton *m_iconcolor; QPushButton *m_imagebrowse; QString m_bgimage; QButtonGroup *m_bgtype; QCheckBox *m_fontuse; TabConfig &m_tc; |