diff --git a/clients/plastik/config/config.cpp b/clients/plastik/config/config.cpp
index c5c947ad95..9d10a4319c 100644
--- a/clients/plastik/config/config.cpp
+++ b/clients/plastik/config/config.cpp
@@ -57,8 +57,6 @@ PlastikConfig::PlastikConfig(KConfig* config, QWidget* parent)
this, SIGNAL(changed()));
connect(m_dialog->titleShadow, SIGNAL(toggled(bool)),
this, SIGNAL(changed()));
- connect(m_dialog->titlebarHeight, SIGNAL(valueChanged(int)),
- this, SIGNAL(changed()));
}
@@ -82,31 +80,6 @@ void PlastikConfig::load(KConfig*)
m_dialog->menuClose->setChecked(menuClose);
bool titleShadow = m_config->readBoolEntry("TitleShadow", true);
m_dialog->titleShadow->setChecked(titleShadow);
- int titlebarHeight = m_config->readNumEntry("TitleHeightMin", 19);
- if(titlebarHeight <= 16)
- {
- m_dialog->titlebarHeight->setValue(1);
- }
- else if(titlebarHeight <= 19)
- {
- m_dialog->titlebarHeight->setValue(2);
- }
- else if(titlebarHeight <= 23)
- {
- m_dialog->titlebarHeight->setValue(3);
- }
- else if(titlebarHeight <= 27)
- {
- m_dialog->titlebarHeight->setValue(4);
- }
- else if(titlebarHeight <= 31)
- {
- m_dialog->titlebarHeight->setValue(5);
- }
- else
- {
- m_dialog->titlebarHeight->setValue(6);
- }
}
void PlastikConfig::save(KConfig*)
@@ -118,27 +91,6 @@ void PlastikConfig::save(KConfig*)
m_config->writeEntry("AnimateButtons", m_dialog->animateButtons->isChecked() );
m_config->writeEntry("CloseOnMenuDoubleClick", m_dialog->menuClose->isChecked() );
m_config->writeEntry("TitleShadow", m_dialog->titleShadow->isChecked() );
- switch(m_dialog->titlebarHeight->value())
- {
- case 2:
- m_config->writeEntry("TitleHeightMin", 19 );
- break;
- case 3:
- m_config->writeEntry("TitleHeightMin", 23 );
- break;
- case 4:
- m_config->writeEntry("TitleHeightMin", 27 );
- break;
- case 5:
- m_config->writeEntry("TitleHeightMin", 31 );
- break;
- case 6:
- m_config->writeEntry("TitleHeightMin", 35 );
- break;
- case 1:
- default:
- m_config->writeEntry("TitleHeightMin", 16 );
- }
m_config->sync();
}
@@ -150,7 +102,6 @@ void PlastikConfig::defaults()
m_dialog->animateButtons->setChecked(true);
m_dialog->menuClose->setChecked(false);
m_dialog->titleShadow->setChecked(true);
- m_dialog->titlebarHeight->setValue(2);
}
//////////////////////////////////////////////////////////////////////////////
diff --git a/clients/plastik/config/configdialog.ui b/clients/plastik/config/configdialog.ui
index e0ec399d45..6bd4de627e 100644
--- a/clients/plastik/config/configdialog.ui
+++ b/clients/plastik/config/configdialog.ui
@@ -9,7 +9,7 @@
0
0
541
- 214
+ 167
@@ -59,95 +59,6 @@
-
-
- spacer5_2
-
-
- Horizontal
-
-
- Expanding
-
-
-
- 270
- 20
-
-
-
-
-
- titlebarHeight
-
-
- 1
-
-
- 6
-
-
- 1
-
-
- Horizontal
-
-
- NoMarks
-
-
- By adjusting this slider, you can modify the height of the title bar.
-Note: This setting gets overwritten if the caption font is bigger than the title bar.
-
-
-
-
- textLabel2
-
-
- Small
-
-
-
-
- textLabel1_2
-
-
- Tit&le bar height:
-
-
- titlebarHeight
-
-
- By adjusting this slider, you can modify the height of the title bar.
-Note: This setting gets overwritten if the caption font is bigger than the title bar.
-
-
-
-
- spacer7
-
-
- Horizontal
-
-
- Expanding
-
-
-
- 161
- 20
-
-
-
-
-
- textLabel4
-
-
- Large
-
-
titleShadow
@@ -192,7 +103,6 @@ Note: This setting gets overwritten if the caption font is bigger than the title
AlignRight
animateButtons
titleShadow
- titlebarHeight
diff --git a/clients/plastik/plastik.cpp b/clients/plastik/plastik.cpp
index 866b31f1f3..11aa43a57f 100644
--- a/clients/plastik/plastik.cpp
+++ b/clients/plastik/plastik.cpp
@@ -126,12 +126,12 @@ void PlastikHandler::readConfig()
m_titleShadow = config.readBoolEntry("TitleShadow", true);
QFontMetrics fm(m_titleFont); // active font = inactive font
- int titleHeightMin = config.readNumEntry("TitleHeightMin", 19);
+ int titleHeightMin = 16;
// The title should strech with bigger font sizes!
m_titleHeight = QMAX(titleHeightMin, fm.height() + 4); // 4 px for the shadow etc.
fm = QFontMetrics(m_titleFontTool); // active font = inactive font
- int titleHeightToolMin = config.readNumEntry("TitleHeightToolMin", 13);
+ int titleHeightToolMin = 13;
// The title should strech with bigger font sizes!
m_titleHeightTool = QMAX(titleHeightToolMin, fm.height() ); // don't care about the shadow etc.
@@ -179,12 +179,12 @@ QColor PlastikHandler::getColor(KWinPlastik::ColorType type, const bool active)
}
}
-QValueList< PlastikHandler::BorderSize >
+QValueList< PlastikHandler::BorderSize >
PlastikHandler::borderSizes() const
-{
+{
// the list must be sorted
- return QValueList< BorderSize >() << BorderTiny << BorderNormal <<
- BorderLarge << BorderVeryLarge << BorderHuge <<
+ return QValueList< BorderSize >() << BorderTiny << BorderNormal <<
+ BorderLarge << BorderVeryLarge << BorderHuge <<
BorderVeryHuge << BorderOversized;
}