X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d6f4e13fbdb286b63a7eea5b72a37a69c18c2b48..5b5a7b8da8cb3ee6bbb9f7450c87fca5de41dc05:/src/viewpropertiesdialog.cpp diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index 41e9cfac5..9a721e2bc 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -44,19 +44,19 @@ #include 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(); @@ -91,7 +91,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_sortOrder = new QComboBox(sortingBox); m_sortOrder->addItem(i18n("Ascending")); m_sortOrder->addItem(i18n("Descending")); - const int sortOrderIdx = (m_viewProps->sortOrder() == Qt::Ascending) ? 0 : 1; + const int sortOrderIdx = (m_viewProps->sortOrder() == Qt::AscendingOrder) ? 0 : 1; m_sortOrder->setCurrentIndex(sortOrderIdx); m_sorting = new QComboBox(sortingBox); @@ -156,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); @@ -228,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; } @@ -237,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; @@ -277,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(); }