yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added Option to enable window close on menu double click.

Browse source 
CCBUG: 305738
This commit is contained in:
Hugo Pereira Da Costa 2012-08-27 23:00:44 +02:00
parent 6efd6bc702
commit f28d4ef91a
2 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/oxygen/config/oxygenconfig.cpp
View file

@ -157,6 +157,7 @@ namespace Oxygen
configuration.setUseDropShadows( ui->shadowConfigurations[1]->isChecked() ); configuration.setUseDropShadows( ui->shadowConfigurations[1]->isChecked() );
configuration.setUseOxygenShadows( ui->shadowConfigurations[0]->isChecked() ); configuration.setUseOxygenShadows( ui->shadowConfigurations[0]->isChecked() );
configuration.setUseNarrowButtonSpacing( ui->ui.narrowButtonSpacing->isChecked() ); configuration.setUseNarrowButtonSpacing( ui->ui.narrowButtonSpacing->isChecked() );
configuration.setCloseFromMenuButton( ui->ui.closeFromMenuButton->isChecked() );
if( ui->expertMode() ) if( ui->expertMode() )
{ {
@ -246,6 +247,7 @@ namespace Oxygen
ui->shadowConfigurations[1]->setChecked( configuration.useDropShadows() ); ui->shadowConfigurations[1]->setChecked( configuration.useDropShadows() );
ui->ui.animationsEnabled->setChecked( configuration.animationsEnabled() ); ui->ui.animationsEnabled->setChecked( configuration.animationsEnabled() );
ui->ui.narrowButtonSpacing->setChecked( configuration.useNarrowButtonSpacing() ); ui->ui.narrowButtonSpacing->setChecked( configuration.useNarrowButtonSpacing() );
ui->ui.closeFromMenuButton->setChecked( configuration.closeFromMenuButton() );
ui->animationConfigWidget()->setConfiguration( configuration ); ui->animationConfigWidget()->setConfiguration( configuration );
ui->animationConfigWidget()->load(); ui->animationConfigWidget()->load();

46
clients/oxygen/config/ui/oxygenconfigurationui.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>500</width> <width>538</width>
<height>378</height> <height>388</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -124,6 +124,19 @@
<property name="margin"> <property name="margin">
<number>4</number> <number>4</number>
</property> </property>
<item row="2" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Separator display:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>separatorMode</cstring>
</property>
</widget>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
@ -160,14 +173,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="3"> <item row="7" column="0">
<widget class="QCheckBox" name="narrowButtonSpacing">
<property name="text">
<string>Use narrow space between decoration buttons</string>
</property>
</widget>
</item>
<item row="6" column="0">
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -180,6 +186,13 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="6" column="0" colspan="3">
<widget class="QCheckBox" name="narrowButtonSpacing">
<property name="text">
<string>Use narrow space between decoration buttons</string>
</property>
</widget>
</item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="KComboBox" name="sizeGripMode"/> <widget class="KComboBox" name="sizeGripMode"/>
</item> </item>
@ -215,16 +228,10 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="5" column="0" colspan="3">
<widget class="QLabel" name="label_5"> <widget class="QCheckBox" name="closeFromMenuButton">
<property name="text"> <property name="text">
<string>Separator display:</string> <string>Close windows by double clicking the menu button</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>separatorMode</cstring>
</property> </property>
</widget> </widget>
</item> </item>
@ -347,6 +354,7 @@
<tabstop>sizeGripMode</tabstop> <tabstop>sizeGripMode</tabstop>
<tabstop>separatorMode</tabstop> <tabstop>separatorMode</tabstop>
<tabstop>titleOutline</tabstop> <tabstop>titleOutline</tabstop>
<tabstop>closeFromMenuButton</tabstop>
<tabstop>narrowButtonSpacing</tabstop> <tabstop>narrowButtonSpacing</tabstop>
<tabstop>inactiveShadowConfiguration</tabstop> <tabstop>inactiveShadowConfiguration</tabstop>
<tabstop>activeShadowConfiguration</tabstop> <tabstop>activeShadowConfiguration</tabstop>