| -rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 7 | ||||
| -rw-r--r-- | noncore/settings/appearance2/appearance.h | 38 | ||||
| -rw-r--r-- | noncore/settings/appearance2/appearance2.pro | 6 | ||||
| -rw-r--r-- | noncore/settings/appearance2/editScheme.cpp | 22 | ||||
| -rw-r--r-- | noncore/settings/appearance2/editScheme.h | 20 |
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 @@ -38,6 +38,5 @@ /* OPIE */ -#include <opie/ofontselector.h> -#include <opie/odevice.h> -#include <opie/ofiledialog.h> -#include <opie/otabwidget.h> +#include <opie2/odevice.h> +#include <opie2/ofiledialog.h> +#include <opie2/otabwidget.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 @@ -18,3 +18,3 @@ ..}^=.= = ; Public License for more details. -++= -. .` .: +++= -. .` .: : = ...= . :.=- You should have received a copy of the GNU @@ -31,2 +31,4 @@ +#include <opie2/ofontselector.h> + #include <qpe/fontdatabase.h> @@ -35,2 +37,4 @@ +using Opie::OFontSelector; + class QCheckBox; @@ -60,5 +64,5 @@ public: protected: - virtual void accept ( ); - virtual void done ( int r ); - + virtual void accept ( ); + virtual void done ( int r ); + protected slots: @@ -73,5 +77,5 @@ protected slots: void deleteSchemeClicked(); - + void tabChanged ( QWidget * ); - + void addExcept ( ); @@ -84,8 +88,8 @@ private: void changeText(); - - QWidget *createStyleTab ( QWidget *parent, Config &cfg ); - QWidget *createDecoTab ( QWidget *parent, Config &cfg ); - QWidget *createFontTab ( QWidget *parent, Config &cfg ); - QWidget *createColorTab ( QWidget *parent, Config &cfg ); - QWidget *createAdvancedTab ( QWidget *parent, Config &cfg ); + + QWidget *createStyleTab ( QWidget *parent, Config &cfg ); + QWidget *createDecoTab ( QWidget *parent, Config &cfg ); + QWidget *createFontTab ( QWidget *parent, Config &cfg ); + QWidget *createColorTab ( QWidget *parent, Config &cfg ); + QWidget *createAdvancedTab ( QWidget *parent, Config &cfg ); @@ -102,3 +106,3 @@ private: bool m_original_tabpos; - + QListBox * m_style_list; @@ -110,6 +114,6 @@ private: - OFontSelector *m_fontselect; + OFontSelector *m_fontselect; + + SampleWindow *m_sample; - SampleWindow *m_sample; - QComboBox * m_tabstyle_list; @@ -122,3 +126,3 @@ private: - QWidget * m_advtab; + QWidget * m_advtab; QListView * m_except; 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 @@ -4,8 +4,6 @@ SOURCES = appearance.cpp editScheme.cpp main.cpp sample.cpp INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include -LIBS += -lqpe -lopie -INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include +LIBS += -lqpe -lopiecore2 -lopieui2 -lqtaux2 -TARGET = appearance +TARGET = appearance 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 @@ -30,4 +30,2 @@ -#include <opie/ocolorbutton.h> - #include <qaction.h> @@ -41,6 +39,6 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent, const char* name, bool modal, WFlags ) - : QDialog ( parent, name, modal, WStyle_ContextHelp ) + : QDialog ( parent, name, modal, WStyle_ContextHelp ) { - setCaption ( tr( "Edit scheme" ) ); - QGridLayout *layout = new QGridLayout ( this, 0, 0, 4, 4 ); + setCaption ( tr( "Edit scheme" ) ); + QGridLayout *layout = new QGridLayout ( this, 0, 0, 4, 4 ); @@ -54,3 +52,3 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget layout-> addWidget ( l, i, 0 ); - QWhatsThis::add( l, tr( "Click here to select a color for: " ).arg( labels [i] ) ); + QWhatsThis::add( l, tr( "Click here to select a color for: " ).arg( labels [i] ) ); @@ -58,3 +56,3 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget layout-> addWidget ( m_buttons [i], i, 1 ); - QWhatsThis::add( m_buttons [i], tr( "Click here to select a color for: " ).arg( labels [i] ) ); + QWhatsThis::add( m_buttons [i], tr( "Click here to select a color for: " ).arg( labels [i] ) ); } @@ -64,3 +62,3 @@ EditScheme::~EditScheme ( ) { - delete [] m_buttons; + delete [] m_buttons; } @@ -69,6 +67,6 @@ void EditScheme::accept ( ) { - for ( int i = 0; i < m_count; i++ ) - m_colors [i] = m_buttons [i]-> color ( ); - - QDialog::accept ( ); + for ( int i = 0; i < m_count; i++ ) + m_colors [i] = m_buttons [i]-> color ( ); + + QDialog::accept ( ); } 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 @@ -18,3 +18,3 @@ ..}^=.= = ; Public License for more details. -++= -. .` .: +++= -. .` .: : = ...= . :.=- You should have received a copy of the GNU @@ -31,4 +31,8 @@ +#include <opie2/ocolorbutton.h> + #include <qdialog.h> +using Opie::OColorButton; + class QColor; @@ -37,15 +41,15 @@ class OColorButton; class EditScheme : public QDialog { - Q_OBJECT + Q_OBJECT public: - EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); - virtual ~EditScheme ( ); + EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + virtual ~EditScheme ( ); protected slots: - virtual void accept ( ); + virtual void accept ( ); private: - int m_count; - QColor *m_colors; - OColorButton **m_buttons; + int m_count; + QColor *m_colors; + OColorButton **m_buttons; }; |