From 5d2b90f5d4bc76c3ac057fa916aba866c44faa6f Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Sat, 31 Oct 2009 03:16:51 +0000 Subject: [PATCH] use UI file for shadowConfiguration svn path=/trunk/KDE/kdebase/workspace/; revision=1042919 --- clients/oxygen/config/CMakeLists.txt | 1 + clients/oxygen/config/config.cpp | 22 +++-- .../config/oxygenshadowconfigurationui.cpp | 79 +++------------- .../config/oxygenshadowconfigurationui.h | 27 +----- .../config/oxygenshadowconfigurationui.ui | 89 +++++++++++++++++++ 5 files changed, 117 insertions(+), 101 deletions(-) create mode 100644 clients/oxygen/config/oxygenshadowconfigurationui.ui diff --git a/clients/oxygen/config/CMakeLists.txt b/clients/oxygen/config/CMakeLists.txt index be75577c07..99cda1df7c 100644 --- a/clients/oxygen/config/CMakeLists.txt +++ b/clients/oxygen/config/CMakeLists.txt @@ -19,6 +19,7 @@ set(kwin_oxygen_config_PART_SRCS kde4_add_ui_files(kwin_oxygen_config_PART_SRCS oxygendetectwidget.ui oxygenexceptiondialog.ui + oxygenshadowconfigurationui.ui ) kde4_add_plugin(kwin_oxygen_config ${kwin_oxygen_config_PART_SRCS}) diff --git a/clients/oxygen/config/config.cpp b/clients/oxygen/config/config.cpp index c3a9f88b21..cc7c0c9477 100644 --- a/clients/oxygen/config/config.cpp +++ b/clients/oxygen/config/config.cpp @@ -151,12 +151,11 @@ namespace Oxygen // save shadow configuration KConfigGroup configurationGroup( configuration_, ( (colorGroup == QPalette::Active) ? "ActiveShadow":"InactiveShadow" ) ); - configurationGroup.writeEntry( OxygenConfig::SHADOW_SIZE, ui.shadowSize->value() ); - configurationGroup.writeEntry( OxygenConfig::SHADOW_HOFFSET, 0.1*ui.horizontalOffset->value() ); - configurationGroup.writeEntry( OxygenConfig::SHADOW_VOFFSET, 0.1*ui.verticalOffset->value() ); - configurationGroup.writeEntry( OxygenConfig::SHADOW_INNER_COLOR, ui.innerColor->color() ); - configurationGroup.writeEntry( OxygenConfig::SHADOW_OUTER_COLOR, ui.outerColor->color() ); - configurationGroup.writeEntry( OxygenConfig::SHADOW_USE_OUTER_COLOR, ui.useOuterColor->isChecked() ); + configurationGroup.writeEntry( OxygenConfig::SHADOW_SIZE, ui.ui.shadowSize->value() ); + configurationGroup.writeEntry( OxygenConfig::SHADOW_VOFFSET, 0.1*ui.ui.verticalOffset->value() ); + configurationGroup.writeEntry( OxygenConfig::SHADOW_INNER_COLOR, ui.ui.innerColor->color() ); + configurationGroup.writeEntry( OxygenConfig::SHADOW_OUTER_COLOR, ui.ui.outerColor->color() ); + configurationGroup.writeEntry( OxygenConfig::SHADOW_USE_OUTER_COLOR, ui.ui.useOuterColor->isChecked() ); } @@ -200,12 +199,11 @@ namespace Oxygen { assert( colorGroup == QPalette::Active || colorGroup == QPalette::Inactive ); OxygenShadowConfigurationUI* ui = userInterface_->shadowConfigurations[ (colorGroup == QPalette::Active) ? 0:1 ]; - ui->shadowSize->setValue( configuration.shadowSize() ); - ui->horizontalOffset->setValue( 10*configuration.horizontalOffset() ); - ui->verticalOffset->setValue( 10*configuration.verticalOffset() ); - ui->innerColor->setColor( configuration.innerColor() ); - ui->outerColor->setColor( configuration.outerColor() ); - ui->useOuterColor->setChecked( configuration.useOuterColor() ); + ui->ui.shadowSize->setValue( configuration.shadowSize() ); + ui->ui.verticalOffset->setValue( 10*configuration.verticalOffset() ); + ui->ui.innerColor->setColor( configuration.innerColor() ); + ui->ui.outerColor->setColor( configuration.outerColor() ); + ui->ui.useOuterColor->setChecked( configuration.useOuterColor() ); } //_______________________________________________________________________ void Config::aboutOxygen( void ) diff --git a/clients/oxygen/config/oxygenshadowconfigurationui.cpp b/clients/oxygen/config/oxygenshadowconfigurationui.cpp index 5caffbb9fc..a5a82d1f96 100644 --- a/clients/oxygen/config/oxygenshadowconfigurationui.cpp +++ b/clients/oxygen/config/oxygenshadowconfigurationui.cpp @@ -34,74 +34,23 @@ namespace Oxygen //_________________________________________________________ OxygenShadowConfigurationUI::OxygenShadowConfigurationUI( const QString& name, QWidget* parent ): - QGroupBox( name, parent ), - shadowSize(0), - horizontalOffset(0), - verticalOffset(0), - innerColor(0), - outerColor(0) - { setupUI(); } - - //_________________________________________________________ - void OxygenShadowConfigurationUI::setupUI( void ) + QGroupBox( name, 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 ); - QGridLayout* mainLayout = new QGridLayout(); - setLayout( mainLayout ); - - // shadow size - QLabel* label; - mainLayout->addWidget( label = new QLabel( i18n( "Size:" ), this ), 0, 0, 1, 1 ); - mainLayout->addWidget( shadowSize = new KIntSpinBox( 0, 50, 1, 1, this ), 0, 1, 1, 1 ); - shadowSize->setObjectName(QString::fromUtf8("shadowSize")); - label->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); - label->setBuddy( shadowSize ); - - // horizontal offset - // horizontal offset is foreseen in the configuration but is hidden for now - // it might be removed in future releases - //mainLayout->addWidget( label = new QLabel( i18n( "Horizontal Offset:" ), this ), 1, 0, 1, 1 ); - mainLayout->addWidget( horizontalOffset = new KIntSpinBox( -50, 50, 1, 1, this ), 1, 1, 1, 1 ); - horizontalOffset->setObjectName(QString::fromUtf8("horizontalOffset")); - //label->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); - //label->setBuddy( horizontalOffset ); - horizontalOffset->hide(); - - // vertical offset - mainLayout->addWidget( label = new QLabel( i18n( "Vertical Offset:" ), this ), 2, 0, 1, 1 ); - mainLayout->addWidget( verticalOffset = new KIntSpinBox( -50, 50, 1, 1, this ), 2, 1, 1, 1 ); - verticalOffset->setObjectName(QString::fromUtf8("verticalOffset")); - label->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); - label->setBuddy( verticalOffset ); - - // first color - mainLayout->addWidget( label = new QLabel( i18n( "Inner Color:" ), this ), 3, 0, 1, 1 ); - mainLayout->addWidget( innerColor = new KColorButton( Qt::white, this ), 3, 1, 1, 1 ); - innerColor->setObjectName(QString::fromUtf8( "innerColor")); - label->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); - label->setBuddy( innerColor ); - - // second color - mainLayout->addWidget( label = new QLabel( i18n( "Outer Color:" ), this ), 4, 0, 1, 1 ); - mainLayout->addWidget( outerColor = new KColorButton( Qt::black, this ), 4, 1, 1, 1 ); - outerColor->setObjectName(QString::fromUtf8("outerColor")); - label->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); - label->setBuddy( outerColor ); - - // second color selection - mainLayout->addWidget( useOuterColor = new QCheckBox( this ), 4, 2, 1, 1 ); - useOuterColor->setObjectName(QString::fromUtf8("useOuterColor")); - connect( useOuterColor, SIGNAL( toggled( bool ) ), outerColor, SLOT( setEnabled( bool ) ) ); - outerColor->setEnabled( false ); - - QMetaObject::connectSlotsByName(this); - connect( shadowSize, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); - connect( horizontalOffset, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); - connect( verticalOffset, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); - connect( innerColor, SIGNAL( changed( const QColor& ) ), SIGNAL( changed() ) ); - connect( outerColor, SIGNAL( changed( const QColor& ) ), SIGNAL( changed() ) ); - connect( useOuterColor, SIGNAL( toggled( bool ) ), SIGNAL( changed() ) ); + // connections + ui.outerColor->setEnabled( false ); + connect( ui.useOuterColor, SIGNAL( toggled( bool ) ), ui.outerColor, SLOT( setEnabled( bool ) ) ); + connect( ui.shadowSize, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); + connect( ui.verticalOffset, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); + connect( ui.innerColor, SIGNAL( changed( const QColor& ) ), SIGNAL( changed() ) ); + connect( ui.outerColor, SIGNAL( changed( const QColor& ) ), SIGNAL( changed() ) ); + connect( ui.useOuterColor, SIGNAL( toggled( bool ) ), SIGNAL( changed() ) ); } } diff --git a/clients/oxygen/config/oxygenshadowconfigurationui.h b/clients/oxygen/config/oxygenshadowconfigurationui.h index 06e1c6824a..74895c0e62 100644 --- a/clients/oxygen/config/oxygenshadowconfigurationui.h +++ b/clients/oxygen/config/oxygenshadowconfigurationui.h @@ -27,9 +27,7 @@ #include #include -#include -#include - +#include namespace Oxygen { @@ -43,33 +41,14 @@ namespace Oxygen //! constructor OxygenShadowConfigurationUI( const QString&, QWidget* ); - - //! ui - void setupUI( void ); - - //! size spinbox - KIntSpinBox *shadowSize; - - //! horizontal offset - KIntSpinBox *horizontalOffset; - - //! vertical offset - KIntSpinBox *verticalOffset; - - //! first color - KColorButton *innerColor; - - //! second color - KColorButton *outerColor; - - //! second color checkbox - QCheckBox *useOuterColor; + Ui_ShadowConfiguraionUI ui; signals: //! emmitted when configuration is changed void changed( void ); + }; } diff --git a/clients/oxygen/config/oxygenshadowconfigurationui.ui b/clients/oxygen/config/oxygenshadowconfigurationui.ui new file mode 100644 index 0000000000..baf533e12d --- /dev/null +++ b/clients/oxygen/config/oxygenshadowconfigurationui.ui @@ -0,0 +1,89 @@ + + + ShadowConfiguraionUI + + + + 0 + 0 + 200 + 118 + + + + + + + Inner Color: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + Outer Color: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + + + + + Vertical Offset: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Size: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + + KIntSpinBox + QSpinBox +
knuminput.h
+ + + KColorButton + QPushButton +
kcolorbutton.h
+ + + + +