From 48f570eda8454b994fcee55841f4ca4b585dc460 Mon Sep 17 00:00:00 2001 From: Mavridis Philippe Date: Fri, 23 Apr 2021 15:01:18 +0300 Subject: [PATCH] Temporarily disabled "Show empty desktops minimized" option. This commit was not squashed so that it can be easily undone when issue #10 is solved. Signed-off-by: Mavridis Philippe --- src/komposelayout.cpp | 4 ++++ src/komposepreferences.cpp | 6 ++++-- src/komposesettings.cpp | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/komposelayout.cpp b/src/komposelayout.cpp index 4eeacf0..0c76598 100644 --- a/src/komposelayout.cpp +++ b/src/komposelayout.cpp @@ -47,10 +47,14 @@ KomposeLayout::~KomposeLayout() void KomposeLayout::setType( int t ) { + /* if ( t == TLAYOUT_TASKCONTAINERS && !KomposeSettings::instance()->getDynamicVirtDeskLayout() ) t = TLAYOUT_GENERIC; + layoutType = t; + */ + layoutType = TLAYOUT_GENERIC; } diff --git a/src/komposepreferences.cpp b/src/komposepreferences.cpp index 91bae6f..a66156c 100644 --- a/src/komposepreferences.cpp +++ b/src/komposepreferences.cpp @@ -258,10 +258,12 @@ KomposePreferences::KomposePreferences() TQVBoxLayout *page3Layout = new TQVBoxLayout( page3, 0, KDialog::spacingHint() ); TQVGroupBox *virtDesksLayoutGroupBox = new TQVGroupBox( i18n("Grouped by Virtual Desktops"), page3 ); + /* dynamicVirtDeskLayout = new TQCheckBox(i18n("Layout empty virtual desktops minimized"), virtDesksLayoutGroupBox ); TQString dynamicVirtDeskLayoutHelp = i18n("Check this if you want empty virtual desktops to take less space on the screen.\nUncheck it if you want them to be arranged statically, each of the same size."); TQWhatsThis::add( dynamicVirtDeskLayout, dynamicVirtDeskLayoutHelp ); TQToolTip::add( dynamicVirtDeskLayout, dynamicVirtDeskLayoutHelp ); + */ TQGrid *desktopColorsGroupBox = new TQGrid( 2, virtDesksLayoutGroupBox ); desktopColorsGroupBox->setSpacing( 4 ); @@ -337,7 +339,7 @@ void KomposePreferences::fillPages() passiveScreenshots->setChecked( KomposeSettings::instance()->getPassiveScreenshots() ); screenshotGrabDelay->setValue( KomposeSettings::instance()->getScreenshotGrabDelay() / 1000000 ); cacheScaledPixmaps->setChecked( KomposeSettings::instance()->getCacheScaledPixmaps() ); - dynamicVirtDeskLayout->setChecked( KomposeSettings::instance()->getDynamicVirtDeskLayout() ); + // dynamicVirtDeskLayout->setChecked( KomposeSettings::instance()->getDynamicVirtDeskLayout() ); imageEffects->setChecked( KomposeSettings::instance()->getImageEffects() ); blurBackground->setChecked( KomposeSettings::instance()->getBlurBackground() ); @@ -407,7 +409,7 @@ void KomposePreferences::slotApply() KomposeSettings::instance()->setPassiveScreenshots( passiveScreenshots->isChecked() ); KomposeSettings::instance()->setScreenshotGrabDelay( screenshotGrabDelay->value() * 1000000 ); KomposeSettings::instance()->setCacheScaledPixmaps( cacheScaledPixmaps->isChecked() ); - KomposeSettings::instance()->setDynamicVirtDeskLayout( dynamicVirtDeskLayout->isChecked() ); + // KomposeSettings::instance()->setDynamicVirtDeskLayout( dynamicVirtDeskLayout->isChecked() ); KomposeSettings::instance()->setImageEffects( imageEffects->isChecked() ); KomposeSettings::instance()->setBlurBackground( blurBackground->isChecked() ); KomposeSettings::instance()->setShowDesktopNum( showDesktopNum->isChecked() ); diff --git a/src/komposesettings.cpp b/src/komposesettings.cpp index 202c8f2..8aebaac 100644 --- a/src/komposesettings.cpp +++ b/src/komposesettings.cpp @@ -96,7 +96,7 @@ void KomposeSettings::readConfig() passiveScreenshots = kapp->config()->readBoolEntry("passiveScreenshots", true); screenshotGrabDelay = kapp->config()->readNumEntry("screenshotGrabDelay", 400000000); - dynamicVirtDeskLayout = kapp->config()->readBoolEntry("dynamicVirtDeskLayout", true); + // dynamicVirtDeskLayout = kapp->config()->readBoolEntry("dynamicVirtDeskLayout", true); imageEffects = kapp->config()->readBoolEntry("imageEffects", true); blurBackground = kapp->config()->readBoolEntry("blurBackground", true); @@ -160,7 +160,7 @@ void KomposeSettings::writeConfig() kapp->config()->writeEntry("passiveScreenshots", passiveScreenshots ); kapp->config()->writeEntry("screenshotGrabDelay", screenshotGrabDelay); - kapp->config()->writeEntry("dynamicVirtDeskLayout", dynamicVirtDeskLayout); + // kapp->config()->writeEntry("dynamicVirtDeskLayout", dynamicVirtDeskLayout); kapp->config()->writeEntry("imageEffects", imageEffects); kapp->config()->writeEntry("blurBackground", blurBackground);