mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-05 16:19:10 +00:00
Port away from KGlobalSettings::naturalSorting() by moving it to Dolphin's GeneralSettings
REVIEW: 122310
This commit is contained in:
parent
6d0f2554cb
commit
fdb5c0d33e
|
@ -81,7 +81,7 @@ if(HAVE_BALOO)
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
kconfig_add_kcfg_files(dolphinprivate_LIB_SRCS
|
kconfig_add_kcfg_files(dolphinprivate_LIB_SRCS GENERATE_MOC
|
||||||
settings/dolphin_compactmodesettings.kcfgc
|
settings/dolphin_compactmodesettings.kcfgc
|
||||||
settings/dolphin_directoryviewpropertysettings.kcfgc
|
settings/dolphin_directoryviewpropertysettings.kcfgc
|
||||||
settings/dolphin_detailsmodesettings.kcfgc
|
settings/dolphin_detailsmodesettings.kcfgc
|
||||||
|
@ -204,7 +204,7 @@ set(dolphin_SRCS
|
||||||
views/zoomlevelinfo.cpp
|
views/zoomlevelinfo.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
kconfig_add_kcfg_files(dolphin_SRCS
|
kconfig_add_kcfg_files(dolphin_SRCS GENERATE_MOC
|
||||||
panels/folders/dolphin_folderspanelsettings.kcfgc
|
panels/folders/dolphin_folderspanelsettings.kcfgc
|
||||||
panels/information/dolphin_informationpanelsettings.kcfgc
|
panels/information/dolphin_informationpanelsettings.kcfgc
|
||||||
panels/places/dolphin_placespanelsettings.kcfgc
|
panels/places/dolphin_placespanelsettings.kcfgc
|
||||||
|
|
|
@ -21,7 +21,8 @@
|
||||||
|
|
||||||
#include "kfileitemmodel.h"
|
#include "kfileitemmodel.h"
|
||||||
|
|
||||||
#include <KGlobalSettings>
|
#include "dolphin_generalsettings.h"
|
||||||
|
|
||||||
#include <KLocalizedString>
|
#include <KLocalizedString>
|
||||||
#include <KStringHandler>
|
#include <KStringHandler>
|
||||||
#include <KDebug>
|
#include <KDebug>
|
||||||
|
@ -41,7 +42,7 @@
|
||||||
KFileItemModel::KFileItemModel(QObject* parent) :
|
KFileItemModel::KFileItemModel(QObject* parent) :
|
||||||
KItemModelBase("text", parent),
|
KItemModelBase("text", parent),
|
||||||
m_dirLister(0),
|
m_dirLister(0),
|
||||||
m_naturalSorting(KGlobalSettings::naturalSorting()),
|
m_naturalSorting(GeneralSettings::naturalSorting()),
|
||||||
m_sortDirsFirst(true),
|
m_sortDirsFirst(true),
|
||||||
m_sortRole(NameRole),
|
m_sortRole(NameRole),
|
||||||
m_sortingProgressPercent(-1),
|
m_sortingProgressPercent(-1),
|
||||||
|
@ -106,7 +107,7 @@ KFileItemModel::KFileItemModel(QObject* parent) :
|
||||||
m_resortAllItemsTimer->setSingleShot(true);
|
m_resortAllItemsTimer->setSingleShot(true);
|
||||||
connect(m_resortAllItemsTimer, &QTimer::timeout, this, &KFileItemModel::resortAllItems);
|
connect(m_resortAllItemsTimer, &QTimer::timeout, this, &KFileItemModel::resortAllItems);
|
||||||
|
|
||||||
connect(KGlobalSettings::self(), &KGlobalSettings::naturalSortingChanged,
|
connect(GeneralSettings::self(), &GeneralSettings::naturalSortingChanged,
|
||||||
this, &KFileItemModel::slotNaturalSortingChanged);
|
this, &KFileItemModel::slotNaturalSortingChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1105,7 +1106,7 @@ void KFileItemModel::slotClear()
|
||||||
|
|
||||||
void KFileItemModel::slotNaturalSortingChanged()
|
void KFileItemModel::slotNaturalSortingChanged()
|
||||||
{
|
{
|
||||||
m_naturalSorting = KGlobalSettings::naturalSorting();
|
m_naturalSorting = GeneralSettings::naturalSorting();
|
||||||
resortAllItems();
|
resortAllItems();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
<include>QUrl</include>
|
<include>QUrl</include>
|
||||||
<include>kglobalsettings.h</include>
|
<include>kglobalsettings.h</include>
|
||||||
<kcfgfile name="dolphinrc"/>
|
<kcfgfile name="dolphinrc"/>
|
||||||
|
<signal name="naturalSortingChanged" />
|
||||||
<group name="General">
|
<group name="General">
|
||||||
<entry name="EditableUrl" type="Bool">
|
<entry name="EditableUrl" type="Bool">
|
||||||
<label>Should the URL be editable for the user</label>
|
<label>Should the URL be editable for the user</label>
|
||||||
|
@ -92,5 +93,10 @@
|
||||||
<label>Enlarge Small Previews</label>
|
<label>Enlarge Small Previews</label>
|
||||||
<default>true</default>
|
<default>true</default>
|
||||||
</entry>
|
</entry>
|
||||||
|
<entry name="NaturalSorting" type="Bool">
|
||||||
|
<label>Natural sorting of items</label>
|
||||||
|
<default>true</default>
|
||||||
|
<emit signal="naturalSortingChanged" />
|
||||||
|
</entry>
|
||||||
</group>
|
</group>
|
||||||
</kcfg>
|
</kcfg>
|
||||||
|
|
|
@ -97,6 +97,7 @@ void BehaviorSettingsPage::applySettings()
|
||||||
|
|
||||||
settings->setShowToolTips(m_showToolTips->isChecked());
|
settings->setShowToolTips(m_showToolTips->isChecked());
|
||||||
settings->setShowSelectionToggle(m_showSelectionToggle->isChecked());
|
settings->setShowSelectionToggle(m_showSelectionToggle->isChecked());
|
||||||
|
settings->setNaturalSorting(m_naturalSorting->isChecked());
|
||||||
settings->setRenameInline(m_renameInline->isChecked());
|
settings->setRenameInline(m_renameInline->isChecked());
|
||||||
settings->save();
|
settings->save();
|
||||||
|
|
||||||
|
@ -108,13 +109,6 @@ void BehaviorSettingsPage::applySettings()
|
||||||
ViewProperties globalProps(m_url);
|
ViewProperties globalProps(m_url);
|
||||||
globalProps.setDirProperties(props);
|
globalProps.setDirProperties(props);
|
||||||
}
|
}
|
||||||
|
|
||||||
const bool naturalSorting = m_naturalSorting->isChecked();
|
|
||||||
if (KGlobalSettings::naturalSorting() != naturalSorting) {
|
|
||||||
KConfigGroup group(KSharedConfig::openConfig(), "KDE");
|
|
||||||
group.writeEntry("NaturalSorting", naturalSorting, KConfig::Persistent | KConfig::Global);
|
|
||||||
KGlobalSettings::emitChange(KGlobalSettings::NaturalSortingChanged);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void BehaviorSettingsPage::restoreDefaults()
|
void BehaviorSettingsPage::restoreDefaults()
|
||||||
|
@ -133,7 +127,7 @@ void BehaviorSettingsPage::loadSettings()
|
||||||
|
|
||||||
m_showToolTips->setChecked(GeneralSettings::showToolTips());
|
m_showToolTips->setChecked(GeneralSettings::showToolTips());
|
||||||
m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle());
|
m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle());
|
||||||
m_naturalSorting->setChecked(KGlobalSettings::naturalSorting());
|
m_naturalSorting->setChecked(GeneralSettings::naturalSorting());
|
||||||
m_renameInline->setChecked(GeneralSettings::renameInline());
|
m_renameInline->setChecked(GeneralSettings::renameInline());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -58,6 +58,10 @@ set(kitemlistcontrollertest_SRCS
|
||||||
../kitemviews/kstandarditemlistwidget.cpp
|
../kitemviews/kstandarditemlistwidget.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
kconfig_add_kcfg_files(kitemlistcontrollertest_SRCS GENERATE_MOC
|
||||||
|
../settings/dolphin_generalsettings.kcfgc
|
||||||
|
)
|
||||||
|
|
||||||
add_executable(kitemlistcontrollertest ${kitemlistcontrollertest_SRCS})
|
add_executable(kitemlistcontrollertest ${kitemlistcontrollertest_SRCS})
|
||||||
add_test(kitemlistcontrollertest kitemlistcontrollertest)
|
add_test(kitemlistcontrollertest kitemlistcontrollertest)
|
||||||
ecm_mark_as_test(kitemlistcontrollertest)
|
ecm_mark_as_test(kitemlistcontrollertest)
|
||||||
|
@ -79,6 +83,10 @@ set(kfileitemlistviewtest_SRCS
|
||||||
../kitemviews/kstandarditemlistwidget.cpp
|
../kitemviews/kstandarditemlistwidget.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
kconfig_add_kcfg_files(kfileitemlistviewtest_SRCS GENERATE_MOC
|
||||||
|
../settings/dolphin_generalsettings.kcfgc
|
||||||
|
)
|
||||||
|
|
||||||
add_executable(kfileitemlistviewtest ${kfileitemlistviewtest_SRCS})
|
add_executable(kfileitemlistviewtest ${kfileitemlistviewtest_SRCS})
|
||||||
add_test(kfileitemlistviewtest kfileitemlistviewtest)
|
add_test(kfileitemlistviewtest kfileitemlistviewtest)
|
||||||
ecm_mark_as_test(kfileitemlistviewtest)
|
ecm_mark_as_test(kfileitemlistviewtest)
|
||||||
|
@ -93,6 +101,10 @@ set(kfileitemmodeltest_SRCS
|
||||||
../kitemviews/kitemset.cpp
|
../kitemviews/kitemset.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
kconfig_add_kcfg_files(kfileitemmodeltest_SRCS GENERATE_MOC
|
||||||
|
../settings/dolphin_generalsettings.kcfgc
|
||||||
|
)
|
||||||
|
|
||||||
add_executable(kfileitemmodeltest ${kfileitemmodeltest_SRCS})
|
add_executable(kfileitemmodeltest ${kfileitemmodeltest_SRCS})
|
||||||
add_test(kfileitemmodeltest kfileitemmodeltest)
|
add_test(kfileitemmodeltest kfileitemmodeltest)
|
||||||
ecm_mark_as_test(kfileitemmodeltest)
|
ecm_mark_as_test(kfileitemmodeltest)
|
||||||
|
@ -106,6 +118,10 @@ set(kfileitemmodelbenchmark_SRCS
|
||||||
../kitemviews/kitemmodelbase.cpp
|
../kitemviews/kitemmodelbase.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
kconfig_add_kcfg_files(kfileitemmodelbenchmark_SRCS GENERATE_MOC
|
||||||
|
../settings/dolphin_generalsettings.kcfgc
|
||||||
|
)
|
||||||
|
|
||||||
add_executable(kfileitemmodelbenchmark ${kfileitemmodelbenchmark_SRCS})
|
add_executable(kfileitemmodelbenchmark ${kfileitemmodelbenchmark_SRCS})
|
||||||
ecm_mark_as_test(kfileitemmodelbenchmark)
|
ecm_mark_as_test(kfileitemmodelbenchmark)
|
||||||
target_link_libraries(kfileitemmodelbenchmark dolphinprivate Qt5::Test)
|
target_link_libraries(kfileitemmodelbenchmark dolphinprivate Qt5::Test)
|
||||||
|
@ -157,7 +173,7 @@ set(viewpropertiestest_SRCS
|
||||||
testdir.cpp
|
testdir.cpp
|
||||||
../views/viewproperties.cpp
|
../views/viewproperties.cpp
|
||||||
)
|
)
|
||||||
kconfig_add_kcfg_files(viewpropertiestest_SRCS
|
kconfig_add_kcfg_files(viewpropertiestest_SRCS GENERATE_MOC
|
||||||
../settings/dolphin_generalsettings.kcfgc
|
../settings/dolphin_generalsettings.kcfgc
|
||||||
../settings/dolphin_directoryviewpropertysettings.kcfgc
|
../settings/dolphin_directoryviewpropertysettings.kcfgc
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue