summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMavridis Philippe <mavridisf@gmail.com>2021-05-02 14:20:39 +0300
committerMavridis Philippe <mavridisf@gmail.com>2021-07-18 21:33:25 +0300
commit08ec3e383e3e77668542fb2ebd7a0dfbaf4d6abb (patch)
tree37b8dd82a886e7f950ed76b3cddc86ac36bdf122
parent6f154b4ba40b9f241d19d1d05ff2a9d81cbd0a15 (diff)
downloadkompose-08ec3e383e3e77668542fb2ebd7a0dfbaf4d6abb.tar.gz
kompose-08ec3e383e3e77668542fb2ebd7a0dfbaf4d6abb.zip
Revert "Temporarily disabled "Show empty desktops minimized" option."
This reverts commit 48f570eda8454b994fcee55841f4ca4b585dc460.
-rw-r--r--src/komposelayout.cpp4
-rw-r--r--src/komposepreferences.cpp6
-rw-r--r--src/komposesettings.cpp4
3 files changed, 4 insertions, 10 deletions
diff --git a/src/komposelayout.cpp b/src/komposelayout.cpp
index 0c76598..4eeacf0 100644
--- a/src/komposelayout.cpp
+++ b/src/komposelayout.cpp
@@ -47,14 +47,10 @@ 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 a66156c..91bae6f 100644
--- a/src/komposepreferences.cpp
+++ b/src/komposepreferences.cpp
@@ -258,12 +258,10 @@ 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 );
@@ -339,7 +337,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() );
@@ -409,7 +407,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 8aebaac..202c8f2 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);