Move FileSystem::defaultFileSystem to GUI.

This commit is contained in:
Andrius Štikonas 2015-06-30 22:22:13 +03:00
parent a58a041e6a
commit 618468742c
5 changed files with 16 additions and 3 deletions

View File

@ -28,6 +28,7 @@
#include <kpmcore/fs/filesystemfactory.h>
#include <kpmcore/util/helpers.h>
#include "util/guihelpers.h"
#include "ui_configurepagefilesystemcolors.h"
@ -143,7 +144,7 @@ bool ConfigureOptionsDialog::isDefault()
void ConfigureOptionsDialog::updateWidgetsDefault()
{
bool useDefaults = Config::self()->useDefaults(true);
generalPageWidget().setDefaultFileSystem(FileSystem::defaultFileSystem());
generalPageWidget().setDefaultFileSystem(GuiHelpers::defaultFileSystem());
generalPageWidget().radioButton->setChecked(true);
if (advancedPageWidget().isVisible())

View File

@ -55,7 +55,7 @@ void GeneralPageWidget::setupDialog()
foreach (const QString& fsName, fsNames)
comboDefaultFileSystem().addItem(createFileSystemColor(FileSystem::typeForName(fsName), 8), fsName);
setDefaultFileSystem(FileSystem::defaultFileSystem());
setDefaultFileSystem(GuiHelpers::defaultFileSystem());
kcfg_shredSource->setId(radioButton, 0);
kcfg_shredSource->setId(radioButton_2, 1);

View File

@ -73,7 +73,7 @@ void NewDialog::setupDialog()
foreach (const QString& fsName, fsNames)
dialogWidget().comboFileSystem().addItem(createFileSystemColor(FileSystem::typeForName(fsName), 8), fsName);
QString selected = FileSystem::nameForType(FileSystem::defaultFileSystem());
QString selected = FileSystem::nameForType(GuiHelpers::defaultFileSystem());
const int idx = dialogWidget().comboFileSystem().findText(selected);
dialogWidget().comboFileSystem().setCurrentIndex(idx != -1 ? idx : 0);

View File

@ -134,3 +134,12 @@ Capacity::Unit preferredUnit()
{
return static_cast<Capacity::Unit>(Config::preferredUnit());
}
namespace GuiHelpers {
FileSystem::Type defaultFileSystem()
{
return static_cast<FileSystem::Type>(Config::defaultFileSystem());
}
}

View File

@ -31,6 +31,9 @@ LIBKPMGUI_EXPORT bool checkPermissions();
LIBKPMGUI_EXPORT bool loadBackend();
QIcon createFileSystemColor(FileSystem::Type type, quint32 size);
Capacity::Unit preferredUnit();
namespace GuiHelpers {
FileSystem::Type defaultFileSystem();
}
QString suCommand();