Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-23 10:22:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: adjust to Katie changes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-08-07 01:33:45 +03:00
parent edbd78acd5
commit 2b8f0ec06e
3 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gwenview/lib/thumbnailview/previewitemdelegate.cpp
View file

@ -221,14 +221,14 @@ struct PreviewItemDelegatePrivate
int bgH, bgS, bgV;
int borderH, borderS, borderV, borderMargin;
#ifdef FINETUNE_SELECTION_BACKGROUND
QSettings settings(QDir::homePath() + "/colors.ini", QSettings::IniFormat);
bgH = settings.value("bg/h").toInt();
bgS = settings.value("bg/s").toInt();
bgV = settings.value("bg/v").toInt();
borderH = settings.value("border/h").toInt();
borderS = settings.value("border/s").toInt();
borderV = settings.value("border/v").toInt();
borderMargin = settings.value("border/margin").toInt();
QSettings settings(QDir::homePath() + "/colors.ini");
bgH = settings.integer("bg/h");
bgS = settings.integer("bg/s");
bgV = settings.integer("bg/v");
borderH = settings.integer("border/h");
borderS = settings.integer("border/s");
borderV = settings.integer("border/v");
borderMargin = settings.integer("border/margin");
#else
bgH = 0;
bgS = -20;

24
kemu/kded/kded_kemu.cpp
View file

@ -52,23 +52,23 @@ bool KEmuModule::start(const QString &machine)
}
KSettings settings("kemu", KSettings::SimpleConfig);
const bool enable = settings.value(machine + "/enable").toBool();
const bool enable = settings.boolean(machine + "/enable");
if (!enable) {
emit error(i18n("Machine is not enabled: %1", machine));
return false;
}
kDebug() << "loading machine settings" << machine;
const QUrl cdrom = settings.value(machine + "/cdrom").toUrl();
const QUrl harddisk = settings.value(machine + "/harddisk").toUrl();
const QString system = settings.value(machine + "/system").toString();
const QString video = settings.value(machine + "/video", "virtio").toString();
const QString audio = settings.value(machine + "/audio", "alsa").toString();
const int ram = settings.value(machine + "/ram", 512).toInt();
const int cpu = settings.value(machine + "/cpu", 1).toInt();
const bool kvm = settings.value(machine + "/kvm", false).toBool();
const bool acpi = settings.value(machine + "/acpi", false).toBool();
const QString args = settings.value(machine + "/args").toString();
const QUrl cdrom = QUrl(settings.string(machine + "/cdrom"));
const QUrl harddisk = QUrl(settings.string(machine + "/harddisk"));
const QString system = settings.string(machine + "/system");
const QString video = settings.string(machine + "/video", "virtio");
const QString audio = settings.string(machine + "/audio", "alsa");
const int ram = settings.integer(machine + "/ram", 512);
const int cpu = settings.integer(machine + "/cpu", 1);
const bool kvm = settings.boolean(machine + "/kvm", false);
const bool acpi = settings.boolean(machine + "/acpi", false);
const QString args = settings.string(machine + "/args");
if (cdrom.isEmpty() && harddisk.isEmpty()) {
emit error(i18n("Either CD-ROM or Hard Disk image must be set"));
@ -148,7 +148,7 @@ QStringList KEmuModule::machines() const
if (addedMachines.contains(machine)) {
continue;
}
if (settings.value(machine + "/enable").toBool() == true) {
if (settings.boolean(machine + "/enable") == true) {
addedMachines.append(machine);
} else {
kDebug() << "garbage machine" << machine;

50
kemu/kemumainwindow.cpp
View file

@ -95,14 +95,14 @@ KEmuMainWindow::KEmuMainWindow(QWidget *parent, Qt::WindowFlags flags)
continue;
}
addedMachines.append(machine);
if (m_settings->value(machine + "/enable").toBool() == true) {
if (m_settings->boolean(machine + "/enable") == true) {
m_kemuui->machinesList->insertItem(machine);
machineLoad(machine);
} else {
kDebug() << "garbage machine" << machine;
}
}
const QString lastSelected = m_settings->value("lastselected").toString();
const QString lastSelected = m_settings->string("lastselected");
if (!lastSelected.isEmpty()) {
m_kemuui->machinesList->listView()->keyboardSearch(lastSelected);
}
@ -151,7 +151,7 @@ KEmuMainWindow::~KEmuMainWindow()
saveAutoSaveSettings();
const QString lastSelected = m_kemuui->machinesList->currentText();
if (!lastSelected.isEmpty()) {
m_settings->setValue("lastselected", lastSelected);
m_settings->setString("lastselected", lastSelected);
m_settings->sync();
}
delete m_settings;
@ -234,16 +234,16 @@ void KEmuMainWindow::machineSave(const QString ignored)
}
const QString machine = m_kemuui->machinesList->currentText();
kDebug() << "saving machine" << machine;
m_settings->setValue(machine + "/cdrom", m_kemuui->CDROMInput->url().prettyUrl());
m_settings->setValue(machine + "/harddisk", m_kemuui->HardDiskInput->url().prettyUrl());
m_settings->setValue(machine + "/system", m_kemuui->systemComboBox->currentText());
m_settings->setValue(machine + "/video", m_kemuui->videoComboBox->currentText());
m_settings->setValue(machine + "/audio", m_kemuui->audioComboBox->currentText());
m_settings->setValue(machine + "/ram", m_kemuui->RAMInput->value());
m_settings->setValue(machine + "/cpu", m_kemuui->CPUInput->value());
m_settings->setValue(machine + "/kvm", m_kemuui->KVMCheckBox->isChecked());
m_settings->setValue(machine + "/acpi", m_kemuui->ACPICheckBox->isChecked());
m_settings->setValue(machine + "/args", m_kemuui->argumentsLineEdit->text());
m_settings->setString(machine + "/cdrom", m_kemuui->CDROMInput->url().prettyUrl());
m_settings->setString(machine + "/harddisk", m_kemuui->HardDiskInput->url().prettyUrl());
m_settings->setString(machine + "/system", m_kemuui->systemComboBox->currentText());
m_settings->setString(machine + "/video", m_kemuui->videoComboBox->currentText());
m_settings->setString(machine + "/audio", m_kemuui->audioComboBox->currentText());
m_settings->setInteger(machine + "/ram", m_kemuui->RAMInput->value());
m_settings->setInteger(machine + "/cpu", m_kemuui->CPUInput->value());
m_settings->setBoolean(machine + "/kvm", m_kemuui->KVMCheckBox->isChecked());
m_settings->setBoolean(machine + "/acpi", m_kemuui->ACPICheckBox->isChecked());
m_settings->setString(machine + "/args", m_kemuui->argumentsLineEdit->text());
m_settings->sync();
}
@ -257,22 +257,22 @@ void KEmuMainWindow::machineLoad(const QString machine)
{
m_loading = true;
kDebug() << "loading machine" << machine;
m_kemuui->CDROMInput->setUrl(m_settings->value(machine + "/cdrom").toUrl());
m_kemuui->HardDiskInput->setUrl(m_settings->value(machine + "/harddisk").toUrl());
const QString system = m_settings->value(machine + "/system").toString();
m_kemuui->CDROMInput->setUrl(QUrl(m_settings->string(machine + "/cdrom")));
m_kemuui->HardDiskInput->setUrl(QUrl(m_settings->string(machine + "/harddisk")));
const QString system = m_settings->string(machine + "/system");
const int systemIndex = m_kemuui->systemComboBox->findText(system);
m_kemuui->systemComboBox->setCurrentIndex(systemIndex);
const QString video = m_settings->value(machine + "/video", "virtio").toString();
const QString video = m_settings->string(machine + "/video", "virtio");
const int videoIndex = m_kemuui->videoComboBox->findText(video);
m_kemuui->videoComboBox->setCurrentIndex(videoIndex);
const QString audio = m_settings->value(machine + "/audio", "alsa").toString();
const QString audio = m_settings->string(machine + "/audio", "alsa");
const int audioIndex = m_kemuui->audioComboBox->findText(audio);
m_kemuui->audioComboBox->setCurrentIndex(audioIndex);
m_kemuui->RAMInput->setValue(m_settings->value(machine + "/ram", 512).toInt());
m_kemuui->CPUInput->setValue(m_settings->value(machine + "/cpu", 1).toInt());
m_kemuui->KVMCheckBox->setChecked(m_settings->value(machine + "/kvm", false).toBool());
m_kemuui->ACPICheckBox->setChecked(m_settings->value(machine + "/acpi", false).toBool());
m_kemuui->argumentsLineEdit->setText(m_settings->value(machine + "/args").toString());
m_kemuui->RAMInput->setValue(m_settings->integer(machine + "/ram", 512));
m_kemuui->CPUInput->setValue(m_settings->integer(machine + "/cpu", 1));
m_kemuui->KVMCheckBox->setChecked(m_settings->boolean(machine + "/kvm", false));
m_kemuui->ACPICheckBox->setChecked(m_settings->boolean(machine + "/acpi", false));
m_kemuui->argumentsLineEdit->setText(m_settings->string(machine + "/args"));
m_loading = false;
updateStatus();
@ -320,7 +320,7 @@ void KEmuMainWindow::machineError(const QString error)
void KEmuMainWindow::addMachine(const QString machine)
{
m_settings->setValue(machine + "/enable", true);
m_settings->setBoolean(machine + "/enable", true);
// TODO: set defaults?
m_settings->sync();
}
@ -348,7 +348,7 @@ void KEmuMainWindow::removeMachine(const QString machine)
m_interface->call("stop", machine);
}
kDebug() << "removing machine" << machine;
m_settings->setValue(machine + "/enable", false);
m_settings->setBoolean(machine + "/enable", false);
m_settings->sync();
updateStatus();