adapt Dolphin to kdelibs coding style (http://techbase.kde.org/Policies/Kdelibs_Codin...

[dolphin.git] / src / viewpropertiesdialog.cpp

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 58b388893520a359ae92b35e8661b3a6389366d8..9a721e2bc2c15dabea5deec0b495594d87fb89a6 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -44,19 +44,19 @@
 #include <QVBoxLayout>
 
 ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
-    KDialog(dolphinView),
-    m_isDirty(false),
-    m_dolphinView(dolphinView),
-    m_viewProps(0),
-    m_viewMode(0),
-    m_sorting(0),
-    m_sortOrder(0),
-    m_additionalInfo(0),
-    m_showPreview(0),
-    m_showHiddenFiles(0),
-    m_applyToCurrentFolder(0),
-    m_applyToSubFolders(0),
-    m_useAsDefault(0)
+        KDialog(dolphinView),
+        m_isDirty(false),
+        m_dolphinView(dolphinView),
+        m_viewProps(0),
+        m_viewMode(0),
+        m_sorting(0),
+        m_sortOrder(0),
+        m_additionalInfo(0),
+        m_showPreview(0),
+        m_showHiddenFiles(0),
+        m_applyToCurrentFolder(0),
+        m_applyToSubFolders(0),
+        m_useAsDefault(0)
 {
     Q_ASSERT(dolphinView != 0);
     const bool useGlobalViewProps = DolphinSettings::instance().generalSettings()->globalViewProps();
@@ -81,11 +81,20 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_viewMode = new QComboBox(propsBox);
     m_viewMode->addItem(KIcon("view-icon"), i18n("Icons"));
     m_viewMode->addItem(KIcon("fileview-text"), i18n("Details"));
+    m_viewMode->addItem(KIcon("view-tree"), i18n("Column"));
     const int index = static_cast<int>(m_viewProps->viewMode());
     m_viewMode->setCurrentIndex(index);
 
     QLabel* sortingLabel = new QLabel(i18n("Sorting:"), propsBox);
-    m_sorting = new QComboBox(propsBox);
+    QWidget* sortingBox = new QWidget(propsBox);
+
+    m_sortOrder = new QComboBox(sortingBox);
+    m_sortOrder->addItem(i18n("Ascending"));
+    m_sortOrder->addItem(i18n("Descending"));
+    const int sortOrderIdx = (m_viewProps->sortOrder() == Qt::AscendingOrder) ? 0 : 1;
+    m_sortOrder->setCurrentIndex(sortOrderIdx);
+
+    m_sorting = new QComboBox(sortingBox);
     m_sorting->addItem("By Name");
     m_sorting->addItem("By Size");
     m_sorting->addItem("By Date");
@@ -94,12 +103,11 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_sorting->addItem("By Group");
     m_sorting->setCurrentIndex(m_viewProps->sorting());
 
-    QLabel* sortOrderLabel = new QLabel(i18n("Sort order:"), propsBox);
-    m_sortOrder = new QComboBox(propsBox);
-    m_sortOrder->addItem(i18n("Ascending"));
-    m_sortOrder->addItem(i18n("Descending"));
-    const int sortOrderIdx = (m_viewProps->sortOrder() == Qt::Ascending) ? 0 : 1;
-    m_sortOrder->setCurrentIndex(sortOrderIdx);
+    QHBoxLayout* sortingLayout = new QHBoxLayout();
+    sortingLayout->setMargin(0);
+    sortingLayout->addWidget(m_sortOrder);
+    sortingLayout->addWidget(m_sorting);
+    sortingBox->setLayout(sortingLayout);
 
     QLabel* additionalInfoLabel = new QLabel(i18n("Additional information:"), propsBox);
     m_additionalInfo = new QComboBox(propsBox);
@@ -120,15 +128,12 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     QGridLayout* propsBoxLayout = new QGridLayout(propsBox);
     propsBoxLayout->addWidget(viewModeLabel, 0, 0);
     propsBoxLayout->addWidget(m_viewMode, 0, 1);
-    propsBoxLayout->addWidget(m_sorting, 1, 1);
     propsBoxLayout->addWidget(sortingLabel, 1, 0);
-    propsBoxLayout->addWidget(m_sorting, 1, 1);
-    propsBoxLayout->addWidget(sortOrderLabel, 2, 0);
-    propsBoxLayout->addWidget(m_sortOrder, 2, 1);
-    propsBoxLayout->addWidget(additionalInfoLabel, 3, 0);
-    propsBoxLayout->addWidget(m_additionalInfo, 3, 1);
-    propsBoxLayout->addWidget(m_showPreview, 4, 0);
-    propsBoxLayout->addWidget(m_showHiddenFiles, 5, 0);
+    propsBoxLayout->addWidget(sortingBox, 1, 1);
+    propsBoxLayout->addWidget(additionalInfoLabel, 2, 0);
+    propsBoxLayout->addWidget(m_additionalInfo, 2, 1);
+    propsBoxLayout->addWidget(m_showPreview, 3, 0);
+    propsBoxLayout->addWidget(m_showHiddenFiles, 4, 0);
 
     topLayout->addWidget(propsBox);
 
@@ -151,13 +156,13 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     // Only show the following settings if the view properties are remembered
     // for each directory:
     if (!useGlobalViewProps) {
-        // create 'Apply view properties to:' group
-        QGroupBox* applyBox = new QGroupBox(i18n("Apply view properties to:"), main);
+        // create 'Apply View Properties To' group
+        QGroupBox* applyBox = new QGroupBox(i18n("Apply View Properties To"), main);
 
         m_applyToCurrentFolder = new QRadioButton(i18n("Current folder"), applyBox);
         m_applyToCurrentFolder->setChecked(true);
         m_applyToSubFolders = new QRadioButton(i18n("Current folder including all sub folders"), applyBox);
-        m_applyToAllFolders = new QRadioButton(i18n("All folders"),applyBox);
+        m_applyToAllFolders = new QRadioButton(i18n("All folders"), applyBox);
 
         QButtonGroup* applyGroup = new QButtonGroup(this);
         applyGroup->addButton(m_applyToCurrentFolder);
@@ -208,7 +213,6 @@ void ViewPropertiesDialog::slotApply()
 
 void ViewPropertiesDialog::slotViewModeChanged(int index)
 {
-    Q_ASSERT((index >= 0) && (index <= 1));
     m_viewProps->setViewMode(static_cast<DolphinView::Mode>(index));
     m_isDirty = true;
 
@@ -224,7 +228,7 @@ void ViewPropertiesDialog::slotSortingChanged(int index)
 
 void ViewPropertiesDialog::slotSortOrderChanged(int index)
 {
-    Qt::SortOrder sortOrder = (index == 0) ? Qt::Ascending : Qt::Descending;
+    Qt::SortOrder sortOrder = (index == 0) ? Qt::AscendingOrder : Qt::DescendingOrder;
     m_viewProps->setSortOrder(sortOrder);
     m_isDirty = true;
 }
@@ -233,10 +237,10 @@ void ViewPropertiesDialog::slotAdditionalInfoChanged(int index)
 {
     KFileItemDelegate::AdditionalInformation info = KFileItemDelegate::NoInformation;
     switch (index) {
-        case 1:  info = KFileItemDelegate::FriendlyMimeType; break;
-        case 2:  info = KFileItemDelegate::Size; break;
-        case 3:  info = KFileItemDelegate::ModificationTime; break;
-        default: break;
+    case 1:  info = KFileItemDelegate::FriendlyMimeType; break;
+    case 2:  info = KFileItemDelegate::Size; break;
+    case 3:  info = KFileItemDelegate::ModificationTime; break;
+    default: break;
     }
     m_viewProps->setAdditionalInfo(info);
     m_isDirty = true;
@@ -273,8 +277,8 @@ void ViewPropertiesDialog::applyViewProperties()
         }
 
         ViewPropsProgressInfo* info = new ViewPropsProgressInfo(m_dolphinView,
-                                                                m_dolphinView->url(),
-                                                                *m_viewProps);
+                                      m_dolphinView->url(),
+                                      *m_viewProps);
         info->setWindowModality(Qt::NonModal);
         info->show();
     }