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

Remove the duration spin box in the present windows config as this setting is unused in present windows.

Browse source 
BUG: 220281

svn path=/trunk/KDE/kdebase/workspace/; revision=1066692
This commit is contained in:
Martin Gräßlin 2009-12-27 18:51:57 +00:00
parent 32b64df71b
commit 235c01e6a7
2 changed files with 83 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
effects/presentwindows/presentwindows_config.cpp
View file

@ -71,7 +71,6 @@ PresentWindowsEffectConfig::PresentWindowsEffectConfig(QWidget* parent, const QV
m_ui->shortcutEditor->addCollection( m_actionCollection );
connect( m_ui->layoutCombo, SIGNAL( currentIndexChanged( int )), this, SLOT( changed() ));
connect( m_ui->rearrangeDurationSpin, SIGNAL( valueChanged( int )), this, SLOT( changed() ));
connect( m_ui->displayTitleBox, SIGNAL( stateChanged( int )), this, SLOT( changed() ));
connect( m_ui->displayIconBox, SIGNAL( stateChanged( int )), this, SLOT( changed() ));
connect( m_ui->switchingBox, SIGNAL( stateChanged( int )), this, SLOT( changed() ));
@ -105,9 +104,6 @@ void PresentWindowsEffectConfig::load()
int layoutMode = conf.readEntry( "LayoutMode", int( PresentWindowsEffect::LayoutNatural ));
m_ui->layoutCombo->setCurrentIndex( layoutMode );
m_ui->rearrangeDurationSpin->setValue( conf.readEntry( "RearrangeDuration", 0 ));
m_ui->rearrangeDurationSpin->setSuffix(ki18np(" millisecond", " milliseconds"));
bool displayTitle = conf.readEntry( "DrawWindowCaptions", true );
m_ui->displayTitleBox->setChecked( displayTitle );
@ -155,8 +151,6 @@ void PresentWindowsEffectConfig::save()
int layoutMode = m_ui->layoutCombo->currentIndex();
conf.writeEntry( "LayoutMode", layoutMode );
conf.writeEntry( "RearrangeDuration", m_ui->rearrangeDurationSpin->value() );
conf.writeEntry( "DrawWindowCaptions", m_ui->displayTitleBox->isChecked() );
conf.writeEntry( "DrawWindowIcons", m_ui->displayIconBox->isChecked() );
conf.writeEntry( "TabBox", m_ui->switchingBox->isChecked() );
@ -193,7 +187,6 @@ void PresentWindowsEffectConfig::save()
void PresentWindowsEffectConfig::defaults()
{
m_ui->layoutCombo->setCurrentIndex( int( PresentWindowsEffect::LayoutNatural ));
m_ui->rearrangeDurationSpin->setValue( 0 );
m_ui->displayTitleBox->setChecked( true );
m_ui->displayIconBox->setChecked( true );
m_ui->switchingBox->setChecked( false );

207
effects/presentwindows/presentwindows_config.ui
View file

@ -6,128 +6,11 @@
<rect>
<x>0</x>
<y>0</y>
<width>542</width>
<width>595</width>
<height>441</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Appearance</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Rearrange &amp;duration:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>rearrangeDurationSpin</cstring>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="KIntSpinBox" name="rearrangeDurationSpin" >
<property name="sizePolicy" >
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="specialValueText">
<string comment="Duration of rearrangement">Default</string>
</property>
<property name="maximum">
<number>5000</number>
</property>
<property name="singleStep">
<number>10</number>
</property>
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Layout mode:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>layoutCombo</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="layoutCombo">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Natural</string>
</property>
</item>
<item>
<property name="text">
<string>Regular Grid</string>
</property>
</item>
<item>
<property name="text">
<string>Flexible Grid</string>
</property>
</item>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="displayTitleBox">
<property name="text">
<string>Display window &amp;titles</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="displayIconBox">
<property name="text">
<string>Display window &amp;icons</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="switchingBox">
<property name="text">
<string>Use for window &amp;switching</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="ignoreMinimizedBox">
<property name="text">
<string>Ignore &amp;minimized windows</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QCheckBox" name="showPanelBox">
<property name="text">
<string>Show &amp;panels</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
@ -500,14 +383,91 @@
</layout>
</widget>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Appearance</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Layout mode:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>layoutCombo</cstring>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="displayTitleBox">
<property name="text">
<string>Display window &amp;titles</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="displayIconBox">
<property name="text">
<string>Display window &amp;icons</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="switchingBox">
<property name="text">
<string>Use for window &amp;switching</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="ignoreMinimizedBox">
<property name="text">
<string>Ignore &amp;minimized windows</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="showPanelBox">
<property name="text">
<string>Show &amp;panels</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="layoutCombo">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Natural</string>
</property>
</item>
<item>
<property name="text">
<string>Regular Grid</string>
</property>
</item>
<item>
<property name="text">
<string>Flexible Grid</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KIntSpinBox</class>
<extends>QSpinBox</extends>
<header>knuminput.h</header>
</customwidget>
<customwidget>
<class>KWin::GlobalShortcutsEditor</class>
<extends>QWidget</extends>
@ -516,7 +476,6 @@
</customwidget>
</customwidgets>
<tabstops>
<tabstop>rearrangeDurationSpin</tabstop>
<tabstop>layoutCombo</tabstop>
<tabstop>displayTitleBox</tabstop>
<tabstop>displayIconBox</tabstop>