changed size-grip options to have a 'always/when needed/never' behavior, rather than 'yes/no'. The default is 'when needed'. Also set option 'name' to 'extra size grip display'
svn path=/trunk/KDE/kdebase/workspace/; revision=1018652
This commit is contained in:
Hugo Pereira Da Costa
parent
8bc71b5b3c
commit
88a559c23b
4 changed files with 51 additions and 34 deletions
|
|
@ -47,9 +47,9 @@ namespace Nitrogen
|
|||
buttonType(0),
|
||||
frameBorder(0),
|
||||
blendColor(0),
|
||||
sizeGripMode(0),
|
||||
drawSeparator(0),
|
||||
showStripes(0),
|
||||
drawSizeGrip(0)
|
||||
showStripes(0)
|
||||
{ setupUI(); }
|
||||
|
||||
//_________________________________________________________
|
||||
|
|
@ -187,7 +187,24 @@ namespace Nitrogen
|
|||
|
||||
label->setAlignment( Qt::AlignRight|Qt::AlignVCenter );
|
||||
label->setBuddy( blendColor );
|
||||
|
||||
|
||||
// draw size grip
|
||||
gridLayout->addWidget( label = new QLabel( i18n("Extra Size grip display:"), advancedWidget ), 2, 0, 1, 1 );
|
||||
gridLayout->addWidget( sizeGripMode = new QComboBox(advancedWidget), 2, 1, 1, 1 );
|
||||
sizeGripMode->setObjectName(QString::fromUtf8("sizeGripMode"));
|
||||
sizeGripMode->setWhatsThis(i18n(
|
||||
"Size grip is a small triangular widget drawn in bottom-right corner of a window \n"
|
||||
"which allows to resize the window. This option controls in which case the size grip \n"
|
||||
"must be drawn."));
|
||||
sizeGripMode->insertItems(0, QStringList()
|
||||
<< NitrogenConfiguration::sizeGripModeName( NitrogenConfiguration::SizeGripNever, true )
|
||||
<< NitrogenConfiguration::sizeGripModeName( NitrogenConfiguration::SizeGripWhenNeeded, true )
|
||||
<< NitrogenConfiguration::sizeGripModeName( NitrogenConfiguration::SizeGripAlways, true )
|
||||
);
|
||||
|
||||
label->setAlignment( Qt::AlignRight|Qt::AlignVCenter );
|
||||
label->setBuddy( sizeGripMode );
|
||||
|
||||
// oxygen shadow
|
||||
vboxLayout->addWidget( useOxygenShadows = new QCheckBox( i18n("Glow active window" ), advancedWidget ) );
|
||||
useOxygenShadows->setObjectName(QString::fromUtf8("useOxygenShadows"));
|
||||
|
|
@ -199,13 +216,6 @@ namespace Nitrogen
|
|||
overwriteColors->setObjectName(QString::fromUtf8("overwriteColors"));
|
||||
overwriteColors->setWhatsThis(i18n(
|
||||
"When enabled, window colors are used in place of default title bar colors to draw the decoration"));
|
||||
|
||||
// draw size grip
|
||||
vboxLayout->addWidget( drawSizeGrip = new QCheckBox( i18n("Draw size grip widget in bottom-right corner of windows"), advancedWidget ) );
|
||||
drawSizeGrip->setObjectName(QString::fromUtf8("drawSizeGrip"));
|
||||
drawSizeGrip->setWhatsThis(i18n(
|
||||
"When this option is enabled, a small triangular widget is drawn in bottom-right corner of every window \n"
|
||||
"which allow to resize the window."));
|
||||
}
|
||||
|
||||
// exceptions
|
||||
|
|
|
|||
|
|
@ -65,6 +65,9 @@ namespace Nitrogen
|
|||
//! blend color
|
||||
QComboBox *blendColor;
|
||||
|
||||
//! size grip
|
||||
QComboBox *sizeGripMode;
|
||||
|
||||
//! draw separator
|
||||
QCheckBox *drawSeparator;
|
||||
|
||||
|
|
@ -74,9 +77,6 @@ namespace Nitrogen
|
|||
//! overwrite colors
|
||||
QCheckBox *overwriteColors;
|
||||
|
||||
//! size grip
|
||||
QCheckBox *drawSizeGrip;
|
||||
|
||||
//! nitrogen shadow
|
||||
QCheckBox *useOxygenShadows;
|
||||
|
||||
|
|
|
|||
|
|
@ -121,34 +121,39 @@ namespace Nitrogen
|
|||
checkbox->setToolTip( i18n("If checked, specified blending color is used in title bar in place of default value.") );
|
||||
connect( checkbox, SIGNAL( toggled( bool ) ), blend_combobox_, SLOT( setEnabled( bool ) ) );
|
||||
|
||||
// size grip
|
||||
gridLayout->addWidget( checkbox = new QCheckBox( i18n("Size grip display:" ), box ), 4, 0, 1, 1 );
|
||||
gridLayout->addWidget( sizeGripModeComboBox_ = new QComboBox( box ), 4, 1, 1, 1 );
|
||||
sizeGripModeComboBox_->insertItems(0, QStringList()
|
||||
<< NitrogenConfiguration::sizeGripModeName( NitrogenConfiguration::SizeGripNever, true )
|
||||
<< NitrogenConfiguration::sizeGripModeName( NitrogenConfiguration::SizeGripWhenNeeded, true )
|
||||
<< NitrogenConfiguration::sizeGripModeName( NitrogenConfiguration::SizeGripAlways, true )
|
||||
);
|
||||
sizeGripModeComboBox_->setEnabled( false );
|
||||
checkboxes_.insert( std::make_pair( NitrogenException::SizeGripMode, checkbox ) );
|
||||
connect( checkbox, SIGNAL( toggled( bool ) ), sizeGripModeComboBox_, SLOT( setEnabled( bool ) ) );
|
||||
|
||||
// separator
|
||||
gridLayout->addWidget( checkbox = new QCheckBox( i18n("Draw separator between title bar and window contents:" ), box ), 4, 0, 1, 1 );
|
||||
gridLayout->addWidget( draw_separator_combobox_ = new ComboBox( box ), 4, 1, 1, 1 );
|
||||
gridLayout->addWidget( checkbox = new QCheckBox( i18n("Draw separator between title bar and window contents:" ), box ), 5, 0, 1, 1 );
|
||||
gridLayout->addWidget( draw_separator_combobox_ = new ComboBox( box ), 5, 1, 1, 1 );
|
||||
draw_separator_combobox_->setEnabled( false );
|
||||
checkboxes_.insert( std::make_pair( NitrogenException::DrawSeparator, checkbox ) );
|
||||
connect( checkbox, SIGNAL( toggled( bool ) ), draw_separator_combobox_, SLOT( setEnabled( bool ) ) );
|
||||
|
||||
// stripes
|
||||
gridLayout->addWidget( checkbox = new QCheckBox( i18n("Show stripes next to the title:" ), box ), 5, 0, 1, 1 );
|
||||
gridLayout->addWidget( show_stripes_combobox_ = new ComboBox( box ), 5, 1, 1, 1 );
|
||||
gridLayout->addWidget( checkbox = new QCheckBox( i18n("Show stripes next to the title:" ), box ), 6, 0, 1, 1 );
|
||||
gridLayout->addWidget( show_stripes_combobox_ = new ComboBox( box ), 6, 1, 1, 1 );
|
||||
show_stripes_combobox_->setEnabled( false );
|
||||
checkboxes_.insert( std::make_pair( NitrogenException::ShowStripes, checkbox ) );
|
||||
connect( checkbox, SIGNAL( toggled( bool ) ), show_stripes_combobox_, SLOT( setEnabled( bool ) ) );
|
||||
|
||||
// overwrite colors
|
||||
gridLayout->addWidget( checkbox = new QCheckBox( i18n("Blend title bar colors with window content:" ), box ), 6, 0, 1, 1 );
|
||||
gridLayout->addWidget( overwrite_colors_combobox_ = new ComboBox( box ), 6, 1, 1, 1 );
|
||||
gridLayout->addWidget( checkbox = new QCheckBox( i18n("Blend title bar colors with window content:" ), box ), 7, 0, 1, 1 );
|
||||
gridLayout->addWidget( overwrite_colors_combobox_ = new ComboBox( box ), 7, 1, 1, 1 );
|
||||
overwrite_colors_combobox_->setEnabled( false );
|
||||
checkboxes_.insert( std::make_pair( NitrogenException::OverwriteColors, checkbox ) );
|
||||
checkboxes_.insert( std::make_pair( NitrogenException::BlendColor, checkbox ) );
|
||||
connect( checkbox, SIGNAL( toggled( bool ) ), overwrite_colors_combobox_, SLOT( setEnabled( bool ) ) );
|
||||
|
||||
// size grip
|
||||
gridLayout->addWidget( checkbox = new QCheckBox( i18n("Draw size grip in bottom-right corner of windows:" ), box ), 7, 0, 1, 1 );
|
||||
gridLayout->addWidget( draw_size_grip_combobox_ = new ComboBox( box ), 7, 1, 1, 1 );
|
||||
draw_size_grip_combobox_->setEnabled( false );
|
||||
checkboxes_.insert( std::make_pair( NitrogenException::DrawSizeGrip, checkbox ) );
|
||||
connect( checkbox, SIGNAL( toggled( bool ) ), draw_size_grip_combobox_, SLOT( setEnabled( bool ) ) );
|
||||
|
||||
|
||||
}
|
||||
|
||||
//___________________________________________
|
||||
|
|
@ -170,11 +175,13 @@ namespace Nitrogen
|
|||
// blend color
|
||||
blend_combobox_->setCurrentIndex( blend_combobox_->findText( exception.blendColorName( true ) ) );
|
||||
|
||||
// size grip
|
||||
sizeGripModeComboBox_->setCurrentIndex( sizeGripModeComboBox_->findText( exception.sizeGripModeName( true ) ) );
|
||||
|
||||
// flags
|
||||
draw_separator_combobox_->setValue( exception.drawSeparator() );
|
||||
show_stripes_combobox_->setValue( exception.showStripes() );
|
||||
overwrite_colors_combobox_->setValue( exception.overwriteColors() );
|
||||
draw_size_grip_combobox_->setValue( exception.drawSizeGrip() );
|
||||
|
||||
// mask
|
||||
for( CheckBoxMap::iterator iter = checkboxes_.begin(); iter != checkboxes_.end(); iter++ )
|
||||
|
|
@ -190,12 +197,12 @@ namespace Nitrogen
|
|||
exception.regExp().setPattern( editor_->text() );
|
||||
exception.setFrameBorder( NitrogenException::frameBorder( frame_border_combobox_->currentText(), true ) );
|
||||
exception.setBlendColor( NitrogenException::blendColor( blend_combobox_->currentText(), true ) );
|
||||
exception.setSizeGripMode( NitrogenException::sizeGripMode( sizeGripModeComboBox_->currentText(), true ) );
|
||||
|
||||
// flags
|
||||
exception.setDrawSeparator( draw_separator_combobox_->isChecked() );
|
||||
exception.setShowStripes( show_stripes_combobox_->isChecked() );
|
||||
exception.setOverwriteColors( overwrite_colors_combobox_->isChecked() );
|
||||
exception.setDrawSizeGrip( draw_size_grip_combobox_->isChecked() );
|
||||
|
||||
// mask
|
||||
unsigned int mask = NitrogenException::None;
|
||||
|
|
|
|||
|
|
@ -65,6 +65,9 @@ namespace Nitrogen
|
|||
|
||||
//! blend combobox
|
||||
QComboBox* blend_combobox_;
|
||||
|
||||
//! size grip
|
||||
QComboBox* sizeGripModeComboBox_;
|
||||
|
||||
//! map mask and checkbox
|
||||
typedef std::map< NitrogenException::AttributesMask, QCheckBox*> CheckBoxMap;
|
||||
|
|
@ -103,10 +106,7 @@ namespace Nitrogen
|
|||
|
||||
//! overwrite colors
|
||||
ComboBox* overwrite_colors_combobox_;
|
||||
|
||||
//! size grip
|
||||
ComboBox* draw_size_grip_combobox_;
|
||||
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue