Commit d77e60ce authored by Ignat Semenov's avatar Ignat Semenov
Browse files

add a "Folders first" checkbox to the Display config page

Allow the user to set the "Folders first" option using the Settings dialog.

BUG:306537
parent 7e2883af
......@@ -549,6 +549,10 @@ void FolderView::configChanged()
if (m_sortColumn != -1) {
m_model->invalidate();
}
if (QAction *action = m_actionCollection.action("dirs_first")) {
action->setChecked(m_sortDirsFirst);
}
}
const int sortColumn = cg.readEntry("sortColumn", m_sortColumn);
......@@ -755,6 +759,7 @@ void FolderView::createConfigurationInterface(KConfigDialog *parent)
uiDisplay.drawShadows->setChecked(m_drawShadows);
uiDisplay.showPreviews->setChecked(m_showPreviews);
uiDisplay.previewsAdvanced->setEnabled(m_showPreviews);
uiDisplay.foldersFirst->setChecked(m_sortDirsFirst);
uiDisplay.numLinesEdit->setValue(m_numTextLines);
uiDisplay.colorButton->setColor(textColor());
......@@ -831,6 +836,7 @@ void FolderView::createConfigurationInterface(KConfigDialog *parent)
connect(uiDisplay.lockInPlace, SIGNAL(toggled(bool)), parent, SLOT(settingsModified()));
connect(uiDisplay.alignToGrid, SIGNAL(toggled(bool)), parent, SLOT(settingsModified()));
connect(uiDisplay.clickToView, SIGNAL(toggled(bool)), parent, SLOT(settingsModified()));
connect(uiDisplay.foldersFirst, SIGNAL(toggled(bool)), parent, SLOT(settingsModified()));
connect(uiDisplay.numLinesEdit, SIGNAL(valueChanged(int)), parent, SLOT(settingsModified()));
connect(uiDisplay.colorButton, SIGNAL(changed(QColor)), parent, SLOT(settingsModified()));
connect(uiDisplay.drawShadows, SIGNAL(toggled(bool)), parent, SLOT(settingsModified()));
......@@ -900,6 +906,9 @@ void FolderView::configAccepted()
const Qt::SortOrder order = uiDisplay.directionCombo->itemData(uiDisplay.directionCombo->currentIndex()).value<Qt::SortOrder>();
cg.writeEntry("sortOrder", sortOrderEnumToString(order));
const bool dirsFirst = uiDisplay.foldersFirst->isChecked();
cg.writeEntry("sortDirsFirst", dirsFirst);
const IconView::Flow flow = uiDisplay.flowCombo->itemData(uiDisplay.flowCombo->currentIndex()).value<IconView::Flow>();
cg.writeEntry("flow", static_cast<int>(flow));
......@@ -1651,6 +1660,7 @@ void FolderView::createActions()
m_actionCollection.addAction("lock_icons", lockIcons);
m_actionCollection.addAction("auto_align", alignToGrid);
m_actionCollection.addAction("dirs_first", dirsFirst);
m_actionCollection.addAction("icons_menu", iconsMenuAction);
m_actionCollection.addAction("arrange_hor_ltr", arrangeHorLeftToRight);
m_actionCollection.addAction("arrange_hor_rtl", arrangeHorRightToLeft);
......
......@@ -6,12 +6,12 @@
<rect>
<x>0</x>
<y>0</y>
<width>442</width>
<height>430</height>
<width>451</width>
<height>455</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2">
<item row="0" column="0">
<widget class="QLabel" name="iconsTitle">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
......@@ -132,7 +132,7 @@
</property>
</spacer>
</item>
<item row="4" column="1">
<item row="4" column="2">
<widget class="QLabel" name="sizeSliderLabel">
<property name="text">
<string>Size:</string>
......@@ -188,7 +188,7 @@
</item>
</layout>
</item>
<item row="5" column="1" colspan="2">
<item row="5" column="2">
<widget class="QLabel" name="previewsAdvancedLabel">
<property name="text">
<string>Previews:</string>
......@@ -235,7 +235,7 @@
</item>
</layout>
</item>
<item row="6" column="1" colspan="2">
<item row="6" column="2">
<widget class="QLabel" name="lockInPlaceLabel">
<property name="text">
<string>Lock in place:</string>
......@@ -257,7 +257,7 @@ This option is useful if you want to avoid accidentally moving the icons while i
</property>
</widget>
</item>
<item row="7" column="1" colspan="2">
<item row="7" column="2">
<widget class="QLabel" name="alignToGridLabel">
<property name="text">
<string>Align to grid:</string>
......@@ -299,7 +299,27 @@ When this option is checked, icons will automatically snap to the nearest grid c
</property>
</widget>
</item>
<item row="9" column="0" colspan="3">
<item row="9" column="2">
<widget class="QLabel" name="foldersFirstLabel">
<property name="text">
<string>Folders first:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="9" column="3">
<widget class="QCheckBox" name="foldersFirst">
<property name="whatsThis">
<string>Check this option if you want folder previews to appear only when clicked. When this option is turned off, folder previews will appear automatically when the mouse hovers over a folder.</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="10" column="0" colspan="2">
<widget class="QLabel" name="iconTextTitle">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
......@@ -318,7 +338,7 @@ When this option is checked, icons will automatically snap to the nearest grid c
</property>
</widget>
</item>
<item row="10" column="1">
<item row="11" column="2">
<widget class="QLabel" name="numLinesEditLabel">
<property name="text">
<string>Lines:</string>
......@@ -331,7 +351,7 @@ When this option is checked, icons will automatically snap to the nearest grid c
</property>
</widget>
</item>
<item row="10" column="3">
<item row="11" column="3">
<widget class="KIntSpinBox" name="numLinesEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
......@@ -356,7 +376,7 @@ When this option is checked, icons will automatically snap to the nearest grid c
</property>
</widget>
</item>
<item row="11" column="0">
<item row="12" column="0">
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
......@@ -372,7 +392,7 @@ When this option is checked, icons will automatically snap to the nearest grid c
</property>
</spacer>
</item>
<item row="11" column="1">
<item row="12" column="2">
<widget class="QLabel" name="colorButtonLabel">
<property name="text">
<string>Color:</string>
......@@ -385,7 +405,7 @@ When this option is checked, icons will automatically snap to the nearest grid c
</property>
</widget>
</item>
<item row="11" column="3">
<item row="12" column="3">
<widget class="KColorButton" name="colorButton">
<property name="whatsThis">
<string>Click this button to choose the color which is used for the text labels in the view.</string>
......@@ -395,7 +415,7 @@ When this option is checked, icons will automatically snap to the nearest grid c
</property>
</widget>
</item>
<item row="12" column="1" colspan="2">
<item row="13" column="2">
<widget class="QLabel" name="drawShadowsLabel">
<property name="text">
<string>Shadows:</string>
......@@ -408,7 +428,7 @@ When this option is checked, icons will automatically snap to the nearest grid c
</property>
</widget>
</item>
<item row="12" column="3">
<item row="13" column="3">
<widget class="QCheckBox" name="drawShadows">
<property name="whatsThis">
<string>&lt;html&gt;&lt;body&gt;&lt;p&gt;Check this option if you want the text labels to cast a shadow on the background.&lt;/p&gt;
......@@ -422,7 +442,7 @@ When this option is checked, icons will automatically snap to the nearest grid c
</property>
</widget>
</item>
<item row="13" column="5">
<item row="14" column="5">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
......@@ -464,6 +484,7 @@ When this option is checked, icons will automatically snap to the nearest grid c
<tabstop>lockInPlace</tabstop>
<tabstop>alignToGrid</tabstop>
<tabstop>clickToView</tabstop>
<tabstop>foldersFirst</tabstop>
<tabstop>numLinesEdit</tabstop>
<tabstop>colorButton</tabstop>
<tabstop>drawShadows</tabstop>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment