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

moved buddy calls to ui files

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1130079
This commit is contained in:
Hugo Pereira Da Costa 2010-05-24 11:53:17 +00:00
parent e2083ed8fc
commit f688c338fc
6 changed files with 47 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
clients/oxygen/config/oxygenconfigurationui.cpp
View file

@ -58,16 +58,12 @@ namespace Oxygen
<< Configuration::frameBorderName( Configuration::BorderOversized, true )
);
ui.label->setBuddy( ui.frameBorder );
ui.titleAlignment->insertItems(0, QStringList()
<< Configuration::titleAlignmentName( Qt::AlignLeft, true )
<< Configuration::titleAlignmentName( Qt::AlignHCenter, true )
<< Configuration::titleAlignmentName( Qt::AlignRight, true )
);
ui.label_2->setBuddy( ui.titleAlignment );
ui.buttonSize->insertItems(0, QStringList()
<< Configuration::buttonSizeName( Configuration::ButtonSmall, true )
<< Configuration::buttonSizeName( Configuration::ButtonDefault, true )
@ -76,39 +72,29 @@ namespace Oxygen
<< Configuration::buttonSizeName( Configuration::ButtonHuge, true )
);
ui.label_3->setBuddy( ui.buttonSize );
// advanced configuration
ui.blendColor->insertItems(0, QStringList()
<< Configuration::blendColorName( Configuration::NoBlending, true )
<< Configuration::blendColorName( Configuration::RadialBlending, true )
);
ui.label_4->setBuddy( ui.blendColor );
// draw size grip
ui.sizeGripMode->insertItems(0, QStringList()
<< Configuration::sizeGripModeName( Configuration::SizeGripNever, true )
<< Configuration::sizeGripModeName( Configuration::SizeGripWhenNeeded, true )
);
ui.label_5->setBuddy( ui.sizeGripMode );
// shadows
ui.shadowMode->insertItems(0, QStringList()
<< Configuration::shadowModeName( Configuration::OxygenShadows, true )
<< Configuration::shadowModeName( Configuration::KWinShadows, true )
<< Configuration::shadowModeName( Configuration::NoShadows, true ) );
ui.label_6->setBuddy( ui.shadowMode );
ui.shadowCacheMode->insertItems(0, QStringList()
<< Configuration::shadowCacheModeName( Configuration::CacheDisabled, true )
<< Configuration::shadowCacheModeName( Configuration::CacheVariable, true )
<< Configuration::shadowCacheModeName( Configuration::CacheMaximum, true ) );
ui.shadowCacheModeLabel->setBuddy( ui.shadowCacheMode );
shadowConfigurations.push_back( ui.activeShadowConfiguration );
shadowConfigurations.push_back( ui.inactiveShadowConfiguration );

4
clients/oxygen/config/oxygenexceptiondialog.cpp
View file

@ -47,7 +47,6 @@ namespace Oxygen
setMainWidget( local );
// exception type
ui.label->setBuddy( ui.exceptionType );
ui.exceptionType->insertItems( 0, QStringList()
<< Exception::typeName( Exception::WindowClassName, true )
<< Exception::typeName( Exception::WindowTitle, true )
@ -55,9 +54,6 @@ namespace Oxygen
connect( ui.detectDialogButton, SIGNAL( clicked( void ) ), SLOT( selectWindowProperties() ) );
// regular expression
ui.label_2->setBuddy( ui.exceptionEditor );
// border size
ui.frameBorderComboBox->insertItems(0, QStringList()
<< Configuration::frameBorderName( Configuration::BorderNone, true )

4
clients/oxygen/config/oxygenshadowconfigurationui.cpp
View file

@ -37,10 +37,6 @@ namespace Oxygen
QGroupBox( parent )
{
ui.setupUi( this );
ui.label->setBuddy( ui.shadowSize );
ui.label_2->setBuddy( ui.verticalOffset );
ui.label_3->setBuddy( ui.innerColor );
ui.label_4->setBuddy( ui.outerColor );
// connections
ui.outerColor->setEnabled( false );

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

@ -41,6 +41,9 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>frameBorder</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
@ -54,6 +57,9 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>titleAlignment</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
@ -67,6 +73,9 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>buttonSize</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
@ -140,6 +149,9 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>blendColor</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
@ -153,6 +165,9 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>sizeGripMode</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
@ -220,6 +235,9 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>shadowMode</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
@ -246,6 +264,9 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>shadowCacheMode</cstring>
</property>
</widget>
</item>
<item row="1" column="1">

6
clients/oxygen/config/ui/oxygenexceptiondialog.ui
View file

@ -25,6 +25,9 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>exceptionType</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
@ -35,6 +38,9 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>exceptionEditor</cstring>
</property>
</widget>
</item>
<item row="2" column="2">

21
clients/oxygen/config/ui/oxygenshadowconfigurationui.ui
View file

@ -25,6 +25,9 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>innerColor</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
@ -32,16 +35,26 @@
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Outer Color:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>outerColor</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="KColorButton" name="outerColor"/>
<widget class="KColorButton" name="outerColor">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QCheckBox" name="useOuterColor">
@ -58,6 +71,9 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>verticalOffset</cstring>
</property>
</widget>
</item>
<item row="0" column="0">
@ -68,6 +84,9 @@
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>shadowSize</cstring>
</property>
</widget>
</item>
<item row="0" column="1">