From: Jordi Polo Date: Wed, 12 Nov 2008 15:15:14 +0000 (+0000) Subject: Changed a bunch of QCombobox to KCombobox and other similar classes as X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/6705ce53811c6f4ab7abe208337d02054afaa57a Changed a bunch of QCombobox to KCombobox and other similar classes as suggested by Krazy. But I didn't see any improvement in the style or funcionality... svn path=/trunk/KDE/kdebase/apps/; revision=883286 --- diff --git a/src/columnviewsettingspage.cpp b/src/columnviewsettingspage.cpp index cecc5f14e..27774cd33 100644 --- a/src/columnviewsettingspage.cpp +++ b/src/columnviewsettingspage.cpp @@ -27,10 +27,10 @@ #include #include +#include #include #include -#include #include #include #include @@ -73,7 +73,7 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(QWidget* parent) : connect(m_fontRequester, SIGNAL(changed()), this, SIGNAL(changed())); QLabel* textWidthLabel = new QLabel(i18nc("@label:listbox", "Text width:"), textGroup); - m_textWidthBox = new QComboBox(textGroup); + m_textWidthBox = new KComboBox(textGroup); m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Small")); m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Medium")); m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Large")); diff --git a/src/columnviewsettingspage.h b/src/columnviewsettingspage.h index a797a5705..5e16dc67b 100644 --- a/src/columnviewsettingspage.h +++ b/src/columnviewsettingspage.h @@ -25,7 +25,7 @@ class DolphinMainWindow; class DolphinFontRequester; class IconSizeGroupBox; -class QComboBox; +class KComboBox; /** * @brief Represents the page from the Dolphin Settings which allows @@ -55,7 +55,7 @@ private: private: IconSizeGroupBox* m_iconSizeGroupBox; DolphinFontRequester* m_fontRequester; - QComboBox* m_textWidthBox; + KComboBox* m_textWidthBox; }; #endif diff --git a/src/dolphinfontrequester.cpp b/src/dolphinfontrequester.cpp index e2cbad0d5..2fc444029 100644 --- a/src/dolphinfontrequester.cpp +++ b/src/dolphinfontrequester.cpp @@ -22,8 +22,8 @@ #include #include #include +#include -#include #include #include @@ -36,7 +36,7 @@ DolphinFontRequester::DolphinFontRequester(QWidget* parent) : { setSpacing(KDialog::spacingHint()); - m_modeCombo = new QComboBox(this); + m_modeCombo = new KComboBox(this); m_modeCombo->addItem(i18nc("@item:inlistbox Font", "System Font")); m_modeCombo->addItem(i18nc("@item:inlistbox Font", "Custom Font")); connect(m_modeCombo, SIGNAL(activated(int)), diff --git a/src/dolphinfontrequester.h b/src/dolphinfontrequester.h index 34d69ad61..03a062b2e 100644 --- a/src/dolphinfontrequester.h +++ b/src/dolphinfontrequester.h @@ -24,7 +24,7 @@ #include -class QComboBox; +class KComboBox; class QPushButton; /** @@ -69,7 +69,7 @@ private slots: void changeMode(int index); private: - QComboBox* m_modeCombo; + KComboBox* m_modeCombo; QPushButton* m_chooseFontButton; Mode m_mode; diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp index 328bdb94b..8273234eb 100644 --- a/src/iconsviewsettingspage.cpp +++ b/src/iconsviewsettingspage.cpp @@ -30,9 +30,9 @@ #include #include #include +#include #include -#include #include #include #include @@ -87,7 +87,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(QWidget* parent) : connect(m_textlinesCountBox, SIGNAL(valueChanged(int)), this, SIGNAL(changed())); QLabel* textWidthLabel = new QLabel(i18nc("@label:listbox", "Text width:"), textGroup); - m_textWidthBox = new QComboBox(textGroup); + m_textWidthBox = new KComboBox(textGroup); m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Small")); m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Medium")); m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Large")); @@ -107,13 +107,13 @@ IconsViewSettingsPage::IconsViewSettingsPage(QWidget* parent) : gridGroup->setSizePolicy(sizePolicy); QLabel* arrangementLabel = new QLabel(i18nc("@label:listbox", "Arrangement:"), gridGroup); - m_arrangementBox = new QComboBox(gridGroup); + m_arrangementBox = new KComboBox(gridGroup); m_arrangementBox->addItem(i18nc("@item:inlistbox Arrangement", "Columns")); m_arrangementBox->addItem(i18nc("@item:inlistbox Arrangement", "Rows")); connect(m_arrangementBox, SIGNAL(activated(int)), this, SIGNAL(changed())); QLabel* gridSpacingLabel = new QLabel(i18nc("@label:listbox", "Grid spacing:"), gridGroup); - m_gridSpacingBox = new QComboBox(gridGroup); + m_gridSpacingBox = new KComboBox(gridGroup); m_gridSpacingBox->addItem(i18nc("@item:inlistbox Grid spacing", "None")); m_gridSpacingBox->addItem(i18nc("@item:inlistbox Grid spacing", "Small")); m_gridSpacingBox->addItem(i18nc("@item:inlistbox Grid spacing", "Medium")); diff --git a/src/iconsviewsettingspage.h b/src/iconsviewsettingspage.h index a24cc9591..75db81e53 100644 --- a/src/iconsviewsettingspage.h +++ b/src/iconsviewsettingspage.h @@ -26,7 +26,7 @@ class DolphinFontRequester; class IconSizeGroupBox; class QCheckBox; -class QComboBox; +class KComboBox; class QSpinBox; /** @@ -77,12 +77,12 @@ private: }; IconSizeGroupBox* m_iconSizeGroupBox; - QComboBox* m_textWidthBox; + KComboBox* m_textWidthBox; DolphinFontRequester* m_fontRequester; QSpinBox* m_textlinesCountBox; - QComboBox* m_arrangementBox; - QComboBox* m_gridSpacingBox; + KComboBox* m_arrangementBox; + KComboBox* m_gridSpacingBox; }; #endif diff --git a/src/kcmdolphin.cpp b/src/kcmdolphin.cpp index 076144a8b..f980fa502 100644 --- a/src/kcmdolphin.cpp +++ b/src/kcmdolphin.cpp @@ -24,6 +24,7 @@ #include "generalviewsettingspage.h" #include "iconsviewsettingspage.h" +#include #include #include #include @@ -52,7 +53,7 @@ DolphinConfigModule::DolphinConfigModule(QWidget* parent, const QVariantList& ar topLayout->setMargin(0); topLayout->setSpacing(KDialog::spacingHint()); - QTabWidget* tabWidget = new QTabWidget(this); + KTabWidget* tabWidget = new KTabWidget(this); // initialize 'General' tab GeneralViewSettingsPage* generalPage = new GeneralViewSettingsPage(QDir::homePath(), tabWidget); diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index b71732e56..9302ba138 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -41,11 +41,11 @@ #include #include #include +#include #include #include #include -#include #include #include #include @@ -93,7 +93,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : QWidget* propsGrid = new QWidget(); QLabel* viewModeLabel = new QLabel(i18nc("@label:listbox", "View mode:"), propsGrid); - m_viewMode = new QComboBox(propsGrid); + m_viewMode = new KComboBox(propsGrid); m_viewMode->addItem(KIcon("view-list-icons"), i18nc("@item:inlistbox", "Icons")); m_viewMode->addItem(KIcon("view-list-details"), i18nc("@item:inlistbox", "Details")); m_viewMode->addItem(KIcon("view-file-columns"), i18nc("@item:inlistbox", "Column")); @@ -101,11 +101,11 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : QLabel* sortingLabel = new QLabel(i18nc("@label:listbox", "Sorting:"), propsGrid); QWidget* sortingBox = new QWidget(propsGrid); - m_sortOrder = new QComboBox(sortingBox); + m_sortOrder = new KComboBox(sortingBox); m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Ascending")); m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Descending")); - m_sorting = new QComboBox(sortingBox); + m_sorting = new KComboBox(sortingBox); m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Name")); m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Size")); m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Date")); diff --git a/src/viewpropertiesdialog.h b/src/viewpropertiesdialog.h index 6d0be52fc..320f8f115 100644 --- a/src/viewpropertiesdialog.h +++ b/src/viewpropertiesdialog.h @@ -26,7 +26,7 @@ #include class QCheckBox; -class QComboBox; +class KComboBox; class QPushButton; class QRadioButton; class ViewProperties; @@ -68,9 +68,9 @@ private: DolphinView* m_dolphinView; ViewProperties* m_viewProps; - QComboBox* m_viewMode; - QComboBox* m_sortOrder; - QComboBox* m_sorting; + KComboBox* m_viewMode; + KComboBox* m_sortOrder; + KComboBox* m_sorting; QCheckBox* m_showPreview; QCheckBox* m_showInGroups; QCheckBox* m_showHiddenFiles; diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp index 32b893c90..bef05f58f 100644 --- a/src/viewsettingspage.cpp +++ b/src/viewsettingspage.cpp @@ -28,13 +28,14 @@ #include "iconsviewsettingspage.h" #include -#include #include #include #include #include #include +#include + ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow, QWidget* parent) : @@ -45,7 +46,7 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow, topLayout->setMargin(0); topLayout->setSpacing(KDialog::spacingHint()); - QTabWidget* tabWidget = new QTabWidget(this); + KTabWidget* tabWidget = new KTabWidget(this); // initialize 'General' tab const KUrl& url = mainWindow->activeViewContainer()->url();