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

deprecated-- 

svn path=/trunk/KDE/kdebase/workspace/; revision=516301
icc-effect-5.14.5
Laurent Montel 2006-03-06 15:51:12 +00:00
parent d9d93b5443
commit e138e585dc
5 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/b2/config/config.cpp
View File

@ -151,7 +151,7 @@ void B2Config::save(KConfig * /*conf*/)
b2Config->writeEntry("UseTitleBarBorderColors", cbColorBorder->isChecked());
b2Config->writeEntry("DrawGrabHandle", showGrabHandleCb->isChecked());
b2Config->writeEntry("MenuButtonDoubleClickOperation",
opToString(menuDblClickOp->currentItem()));
opToString(menuDblClickOp->currentIndex()));
// Ensure others trying to read this config get updated
b2Config->sync();
}

34
kcmkwin/kwinoptions/mouse.cpp
View File

@ -550,18 +550,18 @@ void KTitleBarActionsConfig::load()
void KTitleBarActionsConfig::save()
{
config->setGroup("Windows");
config->writeEntry("TitlebarDoubleClickCommand", functionTiDbl( coTiDbl->currentItem() ) );
config->writeEntry("TitlebarDoubleClickCommand", functionTiDbl( coTiDbl->currentIndex() ) );
for (int t = 0; t < 3; ++t)
config->writeEntry(cnf_Max[t], functionMax(coMax[t]->currentItem()));
config->writeEntry(cnf_Max[t], functionMax(coMax[t]->currentIndex()));
config->setGroup("MouseBindings");
config->writeEntry("CommandActiveTitlebar1", functionTiAc(coTiAct1->currentItem()));
config->writeEntry("CommandActiveTitlebar2", functionTiAc(coTiAct2->currentItem()));
config->writeEntry("CommandActiveTitlebar3", functionTiAc(coTiAct3->currentItem()));
config->writeEntry("CommandInactiveTitlebar1", functionTiInAc(coTiInAct1->currentItem()));
config->writeEntry("CommandTitlebarWheel", functionTiWAc(coTiAct4->currentItem()));
config->writeEntry("CommandInactiveTitlebar2", functionTiInAc(coTiInAct2->currentItem()));
config->writeEntry("CommandInactiveTitlebar3", functionTiInAc(coTiInAct3->currentItem()));
config->writeEntry("CommandActiveTitlebar1", functionTiAc(coTiAct1->currentIndex()));
config->writeEntry("CommandActiveTitlebar2", functionTiAc(coTiAct2->currentIndex()));
config->writeEntry("CommandActiveTitlebar3", functionTiAc(coTiAct3->currentIndex()));
config->writeEntry("CommandInactiveTitlebar1", functionTiInAc(coTiInAct1->currentIndex()));
config->writeEntry("CommandTitlebarWheel", functionTiWAc(coTiAct4->currentIndex()));
config->writeEntry("CommandInactiveTitlebar2", functionTiInAc(coTiInAct2->currentIndex()));
config->writeEntry("CommandInactiveTitlebar3", functionTiInAc(coTiInAct3->currentIndex()));
if (standAlone)
{
@ -828,14 +828,14 @@ void KWindowActionsConfig::load()
void KWindowActionsConfig::save()
{
config->setGroup("MouseBindings");
config->writeEntry("CommandWindow1", functionWin(coWin1->currentItem()));
config->writeEntry("CommandWindow2", functionWin(coWin2->currentItem()));
config->writeEntry("CommandWindow3", functionWin(coWin3->currentItem()));
config->writeEntry("CommandAllKey", functionAllKey(coAllKey->currentItem()));
config->writeEntry("CommandAll1", functionAll(coAll1->currentItem()));
config->writeEntry("CommandAll2", functionAll(coAll2->currentItem()));
config->writeEntry("CommandAll3", functionAll(coAll3->currentItem()));
config->writeEntry("CommandAllWheel", functionAllW(coAllW->currentItem()));
config->writeEntry("CommandWindow1", functionWin(coWin1->currentIndex()));
config->writeEntry("CommandWindow2", functionWin(coWin2->currentIndex()));
config->writeEntry("CommandWindow3", functionWin(coWin3->currentIndex()));
config->writeEntry("CommandAllKey", functionAllKey(coAllKey->currentIndex()));
config->writeEntry("CommandAll1", functionAll(coAll1->currentIndex()));
config->writeEntry("CommandAll2", functionAll(coAll2->currentIndex()));
config->writeEntry("CommandAll3", functionAll(coAll3->currentIndex()));
config->writeEntry("CommandAllWheel", functionAllW(coAllW->currentIndex()));
if (standAlone)
{

2
kcmkwin/kwinoptions/mouse.h
View File

@ -40,7 +40,7 @@ public:
, toolTips(toolTips_) {}
public slots:
void changed() {this->setToolTip( i18n(toolTips[currentItem()]) );}
void changed() {this->setToolTip( i18n(toolTips[currentIndex()]) );}
protected:
char const * const * toolTips;

10
kcmkwin/kwinoptions/windows.cpp
View File

@ -275,7 +275,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, KInstance *inst,
int KFocusConfig::getFocus()
{
return focusCombo->currentItem();
return focusCombo->currentIndex();
}
void KFocusConfig::setFocus(int foc)
@ -324,7 +324,7 @@ void KFocusConfig::setClickRaise(bool on)
void KFocusConfig::setAutoRaiseEnabled()
{
// the auto raise related widgets are: autoRaise
if ( focusCombo->currentItem() != CLICK_TO_FOCUS )
if ( focusCombo->currentIndex() != CLICK_TO_FOCUS )
{
autoRaiseOn->setEnabled(true);
autoRaiseOnTog(autoRaiseOn->isChecked());
@ -339,7 +339,7 @@ void KFocusConfig::setAutoRaiseEnabled()
void KFocusConfig::setDelayFocusEnabled()
{
// the delayed focus related widgets are: delayFocus
if ( focusCombo->currentItem() != CLICK_TO_FOCUS )
if ( focusCombo->currentIndex() != CLICK_TO_FOCUS )
{
delayFocusOn->setEnabled(true);
delayFocusOnTog(delayFocusOn->isChecked());
@ -700,7 +700,7 @@ void KAdvancedConfig::save( void )
config->writeEntry(KWM_ELECTRIC_BORDER, getElectricBorders());
config->writeEntry(KWM_ELECTRIC_BORDER_DELAY,getElectricBorderDelay());
config->writeEntry(KWIN_FOCUS_STEALING, focusStealing->currentItem());
config->writeEntry(KWIN_FOCUS_STEALING, focusStealing->currentIndex());
config->writeEntry(KWIN_HIDE_UTILITY, hideUtilityWindowsForInactive->isChecked());
if (standAlone)
@ -965,7 +965,7 @@ bool KMovingConfig::getGeometryTip()
// placement policy --- CT 31jan98 ---
int KMovingConfig::getPlacement()
{
return placementCombo->currentItem();
return placementCombo->currentIndex();
}
void KMovingConfig::setPlacement(int plac)

26
kcmkwin/kwinrules/ruleswidget.cpp
View File

@ -122,8 +122,8 @@ RulesWidget::RulesWidget( QWidget* parent )
#define UPDATE_ENABLE_SLOT( var ) \
void RulesWidget::updateEnable##var() \
{ \
/* leave the label readable label_##var->setEnabled( enable_##var->isChecked() && rule_##var->currentItem() != 0 );*/ \
Ui_RulesWidgetBase::var->setEnabled( enable_##var->isChecked() && rule_##var->currentItem() != 0 ); \
/* leave the label readable label_##var->setEnabled( enable_##var->isChecked() && rule_##var->currentIndex() != 0 );*/ \
Ui_RulesWidgetBase::var->setEnabled( enable_##var->isChecked() && rule_##var->currentIndex() != 0 ); \
}
// geometry tab
@ -148,8 +148,8 @@ UPDATE_ENABLE_SLOT( opacityactive )
UPDATE_ENABLE_SLOT( opacityinactive )
void RulesWidget::updateEnableshortcut()
{
shortcut->setEnabled( enable_shortcut->isChecked() && rule_shortcut->currentItem() != 0 );
shortcut_edit->setEnabled( enable_shortcut->isChecked() && rule_shortcut->currentItem() != 0 );
shortcut->setEnabled( enable_shortcut->isChecked() && rule_shortcut->currentIndex() != 0 );
shortcut_edit->setEnabled( enable_shortcut->isChecked() && rule_shortcut->currentIndex() != 0 );
}
// workarounds tab
UPDATE_ENABLE_SLOT( fsplevel )
@ -443,7 +443,7 @@ void RulesWidget::setRules( Rules* rules )
#define GENERIC_RULE( var, func, Type, type, uimethod ) \
if( enable_##var->isChecked()) \
{ \
rules->var##rule = combo_to_##type##_rule[ rule_##var->currentItem() ]; \
rules->var##rule = combo_to_##type##_rule[ rule_##var->currentIndex() ]; \
rules->var = func( Ui_RulesWidgetBase::var->uimethod()); \
} \
else \
@ -462,9 +462,9 @@ Rules* RulesWidget::rules() const
rules->description = description->text();
rules->wmclass = wmclass->text().toUtf8();
rules->wmclasscomplete = whole_wmclass->isChecked();
rules->wmclassmatch = static_cast< Rules::StringMatch >( wmclass_match->currentItem());
rules->wmclassmatch = static_cast< Rules::StringMatch >( wmclass_match->currentIndex());
rules->windowrole = role->text().toUtf8();
rules->windowrolematch = static_cast< Rules::StringMatch >( role_match->currentItem());
rules->windowrolematch = static_cast< Rules::StringMatch >( role_match->currentIndex());
rules->types = 0;
bool all_types = true;
for( unsigned int i = 0;
@ -488,11 +488,11 @@ Rules* RulesWidget::rules() const
rules->types |= types->isSelected( 9 ) ? NET::TopMenuMask : 0;
}
rules->title = title->text();
rules->titlematch = static_cast< Rules::StringMatch >( title_match->currentItem());
rules->titlematch = static_cast< Rules::StringMatch >( title_match->currentIndex());
rules->extrarole = extra->text().toUtf8();
rules->extrarolematch = static_cast< Rules::StringMatch >( extra_match->currentItem());
rules->extrarolematch = static_cast< Rules::StringMatch >( extra_match->currentIndex());
rules->clientmachine = machine->text().toUtf8();
rules->clientmachinematch = static_cast< Rules::StringMatch >( machine_match->currentItem());
rules->clientmachinematch = static_cast< Rules::StringMatch >( machine_match->currentIndex());
LINEEDIT_SET_RULE( position, strToPosition );
LINEEDIT_SET_RULE( size, strToSize );
COMBOBOX_SET_RULE( desktop, comboToDesktop );
@ -534,8 +534,8 @@ Rules* RulesWidget::rules() const
#define STRING_MATCH_COMBO( type ) \
void RulesWidget::type##MatchChanged() \
{ \
edit_reg_##type->setEnabled( type##_match->currentItem() == Rules::RegExpMatch ); \
type->setEnabled( type##_match->currentItem() != Rules::UnimportantMatch ); \
edit_reg_##type->setEnabled( type##_match->currentIndex() == Rules::RegExpMatch ); \
type->setEnabled( type##_match->currentIndex() != Rules::UnimportantMatch ); \
}
STRING_MATCH_COMBO( wmclass )
@ -659,7 +659,7 @@ bool RulesWidget::finalCheck()
++i )
if( !types->isSelected( i ))
all_types = false;
if( wmclass_match->currentItem() == Rules::UnimportantMatch && all_types )
if( wmclass_match->currentIndex() == Rules::UnimportantMatch && all_types )
{
if( KMessageBox::warningContinueCancel( topLevelWidget(),
i18n( "You have specified the window class as unimportant.\n"