-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 4 | ||||
-rw-r--r-- | core/settings/launcher/tabdialog.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index d20412a..5981d0b 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp | |||
@@ -254,26 +254,26 @@ public: | |||
254 | p-> fillRect ( r, m_bgcolor ); | 254 | p-> fillRect ( r, m_bgcolor ); |
255 | } | 255 | } |
256 | 256 | ||
257 | private: | 257 | private: |
258 | QColor m_textcolor; | 258 | QColor m_textcolor; |
259 | QColor m_bgcolor; | 259 | QColor m_bgcolor; |
260 | QPixmap m_bgpix; | 260 | QPixmap m_bgpix; |
261 | TabConfig::BackgroundType m_bgtype; | 261 | TabConfig::BackgroundType m_bgtype; |
262 | }; | 262 | }; |
263 | 263 | ||
264 | 264 | ||
265 | 265 | ||
266 | TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *name, bool modal, WFlags fl ) | 266 | TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *dname, bool modal, WFlags fl ) |
267 | : QDialog ( parent, name, modal, fl | WStyle_ContextHelp ), m_tc ( tc ) | 267 | : QDialog ( parent, dname, modal, fl | WStyle_ContextHelp ), m_tc ( tc ) |
268 | { | 268 | { |
269 | setCaption ( tr( "Edit Tab" )); | 269 | setCaption ( tr( "Edit Tab" )); |
270 | 270 | ||
271 | QVBoxLayout *lay = new QVBoxLayout ( this, 3, 3 ); | 271 | QVBoxLayout *lay = new QVBoxLayout ( this, 3, 3 ); |
272 | 272 | ||
273 | OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); | 273 | OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); |
274 | QWidget *bgtab; | 274 | QWidget *bgtab; |
275 | 275 | ||
276 | tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/backgroundtabicon.png", tr( "Background" )); | 276 | tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/backgroundtabicon.png", tr( "Background" )); |
277 | tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" )); | 277 | tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" )); |
278 | tw-> addTab ( createIconTab ( tw ), "appearance/colorstabicon.png", tr( "Icons" ) ); | 278 | tw-> addTab ( createIconTab ( tw ), "appearance/colorstabicon.png", tr( "Icons" ) ); |
279 | 279 | ||
diff --git a/core/settings/launcher/tabdialog.h b/core/settings/launcher/tabdialog.h index 892a3ad..4f99d5d 100644 --- a/core/settings/launcher/tabdialog.h +++ b/core/settings/launcher/tabdialog.h | |||
@@ -33,25 +33,25 @@ | |||
33 | 33 | ||
34 | class QButtonGroup; | 34 | class QButtonGroup; |
35 | class OFontSelector; | 35 | class OFontSelector; |
36 | class SampleView; | 36 | class SampleView; |
37 | class OColorButton; | 37 | class OColorButton; |
38 | class QPushButton; | 38 | class QPushButton; |
39 | class QCheckBox; | 39 | class QCheckBox; |
40 | 40 | ||
41 | 41 | ||
42 | class TabDialog : public QDialog { | 42 | class TabDialog : public QDialog { |
43 | Q_OBJECT | 43 | Q_OBJECT |
44 | public: | 44 | public: |
45 | TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &cfg, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags = 0 ); | 45 | TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &cfg, QWidget *parent = 0, const char *dname = 0, bool modal = false, WFlags = 0 ); |
46 | virtual ~TabDialog ( ); | 46 | virtual ~TabDialog ( ); |
47 | 47 | ||
48 | public slots: | 48 | public slots: |
49 | virtual void accept ( ); | 49 | virtual void accept ( ); |
50 | 50 | ||
51 | protected slots: | 51 | protected slots: |
52 | void iconSizeClicked ( int ); | 52 | void iconSizeClicked ( int ); |
53 | void fontClicked ( const QFont & ); | 53 | void fontClicked ( const QFont & ); |
54 | void bgTypeClicked ( int ); | 54 | void bgTypeClicked ( int ); |
55 | void bgColorClicked ( const QColor & ); | 55 | void bgColorClicked ( const QColor & ); |
56 | void iconColorClicked ( const QColor & ); | 56 | void iconColorClicked ( const QColor & ); |
57 | void bgImageClicked ( ); | 57 | void bgImageClicked ( ); |