vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed the 'glow active window' checkbox and move it to the active window glow 'groupbox'. This allows one to reduce the size of the configuration dialog, leaving more space to the preview. No string change 

svn path=/trunk/KDE/kdebase/workspace/; revision=1060053
icc-effect-5.14.5
Hugo Pereira Da Costa 2009-12-07 23:32:24 +00:00
parent 0c10757427
commit abda43c9c9
5 changed files with 64 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clients/oxygen/config/config.cpp
View File

@ -128,7 +128,7 @@ namespace Oxygen
configurationGroup.writeEntry( OxygenConfig::DRAW_SEPARATOR, userInterface_->ui.drawSeparator->isChecked() );
configurationGroup.writeEntry( OxygenConfig::DRAW_TITLE_OUTLINE, userInterface_->ui.titleOutline->isChecked() );
configurationGroup.writeEntry( OxygenConfig::USE_OXYGEN_SHADOWS, userInterface_->ui.useOxygenShadows->isChecked() );
configurationGroup.writeEntry( OxygenConfig::USE_OXYGEN_SHADOWS, userInterface_->shadowConfigurations[0]->isChecked() );
configurationGroup.writeEntry( OxygenConfig::TABS_ENABLED, userInterface_->ui.tabsEnabled->isChecked() );
// write exceptions
@ -191,7 +191,7 @@ namespace Oxygen
userInterface_->ui.drawSeparator->setChecked( configuration.drawSeparator() );
userInterface_->ui.titleOutline->setChecked( configuration.drawTitleOutline() );
userInterface_->ui.useOxygenShadows->setChecked( configuration.useOxygenShadows() );
userInterface_->shadowConfigurations[0]->setChecked( configuration.useOxygenShadows() );
userInterface_->ui.tabsEnabled->setChecked( configuration.tabsEnabled() );
}

3
clients/oxygen/config/oxygenconfigurationui.cpp
View File

@ -95,11 +95,9 @@ namespace Oxygen
// shadows
shadowConfigurations.push_back( ui.activeShadowConfiguration );
shadowConfigurations.push_back( ui.inactiveShadowConfiguration );
ui.activeShadowConfiguration->setEnabled( false );
// connections
connect( ui.titleOutline, SIGNAL(toggled( bool )), ui.drawSeparator, SLOT( setDisabled( bool ) ) );
connect( ui.useOxygenShadows, SIGNAL(toggled( bool )), shadowConfigurations[0], SLOT( setEnabled( bool ) ) );
connect( shadowConfigurations[0], SIGNAL( changed() ), SIGNAL( changed() ) );
connect( shadowConfigurations[1], SIGNAL( changed() ), SIGNAL( changed() ) );
@ -112,7 +110,6 @@ namespace Oxygen
connect( ui.tabsEnabled, SIGNAL(clicked()), SIGNAL(changed()) );
connect( ui.drawSeparator, SIGNAL(clicked()), SIGNAL(changed()) );
connect( ui.titleOutline, SIGNAL(clicked()), SIGNAL(changed()) );
connect( ui.useOxygenShadows, SIGNAL(clicked()), SIGNAL(changed()) );
connect( ui.exceptions, SIGNAL(changed()), SIGNAL(changed()) );
}

62
clients/oxygen/config/oxygenconfigurationui.ui
View File

@ -7,9 +7,15 @@
<x>0</x>
<y>0</y>
<width>500</width>
<height>292</height>
<height>231</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="KTabWidget" name="ktabwidget">
@ -76,7 +82,14 @@
</property>
</spacer>
</item>
<item row="4" column="1">
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="tabsEnabled">
<property name="text">
<string>Enable window grouping</string>
</property>
</widget>
</item>
<item row="4" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@ -89,13 +102,6 @@
</property>
</spacer>
</item>
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="tabsEnabled">
<property name="text">
<string>Enable window grouping</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
@ -139,19 +145,6 @@
</property>
</spacer>
</item>
<item row="6" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="titleOutline">
<property name="text">
@ -166,6 +159,19 @@
</property>
</widget>
</item>
<item row="6" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_3">
@ -174,24 +180,20 @@
</attribute>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QCheckBox" name="useOxygenShadows">
<property name="text">
<string>Glow active window</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="Oxygen::OxygenShadowConfigurationUI" name="inactiveShadowConfiguration">
<property name="title">
<string>Window Drop-Down Shadow</string>
</property>
</widget>
</item>
<item row="1" column="1">
<item row="0" column="1">
<widget class="Oxygen::OxygenShadowConfigurationUI" name="activeShadowConfiguration">
<property name="title">
<string>Active Window Glow</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
</layout>

36
clients/oxygen/config/oxygenexceptionlistwidget.ui
View File

@ -7,9 +7,21 @@
<x>0</x>
<y>0</y>
<width>473</width>
<height>247</height>
<height>100</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="1">
<widget class="KPushButton" name="moveUpButton">
@ -46,21 +58,21 @@
</property>
</widget>
</item>
<item row="5" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<item row="0" column="0" rowspan="6">
<widget class="QTreeView" name="exceptionListView">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeHint" stdset="0">
<property name="minimumSize">
<size>
<width>20</width>
<height>40</height>
<width>100</width>
<height>100</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0" rowspan="6">
<widget class="QTreeView" name="exceptionListView"/>
</widget>
</item>
</layout>
</widget>

6
clients/oxygen/config/oxygenshadowconfigurationui.ui
View File

@ -10,6 +10,12 @@
<height>118</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<widget class="QLabel" name="label_3">