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

GUI:

Browse source 
CT: cosmetics, code simplification, proper use of KNumInput, proper accelerators.
	Sorry to the translators for the number of strings touched.

svn path=/trunk/kdebase/kwin/; revision=151959
This commit is contained in:
Cristian Tibirna 2002-04-26 01:39:18 +00:00
parent 2896179100
commit 825a0372bc
3 changed files with 48 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwinoptions/main.cpp
View file

@ -59,7 +59,7 @@ KWinOptions::KWinOptions(QWidget *parent, const char *name, const QStringList &)
connect(mFocus, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool))); connect(mFocus, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
mActions = new KActionsConfig(mConfig, this, "KWin Actions"); mActions = new KActionsConfig(mConfig, this, "KWin Actions");
tab->addTab(mActions, i18n("Actions")); tab->addTab(mActions, i18n("Actio&ns"));
connect(mActions, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool))); connect(mActions, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
mMoving = new KMovingConfig(mConfig, this, "KWin Moving"); mMoving = new KMovingConfig(mConfig, this, "KWin Moving");

123
kcmkwin/kwinoptions/windows.cpp
View file

@ -94,8 +94,7 @@ KFocusConfig::KFocusConfig (KConfig *_config, QWidget * parent, const char *name
: QWidget (parent, name), config(_config) : QWidget (parent, name), config(_config)
{ {
QString wtstr; QString wtstr;
QBoxLayout *lay = new QVBoxLayout (this, KDialog::marginHint(), QBoxLayout *lay = new QVBoxLayout (this, KDialog::marginHint(),KDialog::spacingHint());
KDialog::spacingHint());
//iTLabel = new QLabel(i18n(" Allowed overlap:\n" //iTLabel = new QLabel(i18n(" Allowed overlap:\n"
// "(% of desktop space)"), // "(% of desktop space)"),
@ -111,26 +110,24 @@ KFocusConfig::KFocusConfig (KConfig *_config, QWidget * parent, const char *name
//lay->addWidget(plcBox); //lay->addWidget(plcBox);
// focus policy // focus policy
fcsBox = new QButtonGroup(i18n("Focus Policy"),this); fcsBox = new QButtonGroup(i18n("Focus"),this);
QGridLayout *fLay = new QGridLayout(fcsBox,5,3,
KDialog::marginHint(),
KDialog::spacingHint());
fLay->addRowSpacing(0,fontMetrics().lineSpacing());
fLay->setColStretch(0,0);
fLay->setColStretch(1,1);
fLay->setColStretch(2,1);
QBoxLayout *fLay = new QVBoxLayout(fcsBox, KDialog::marginHint(), KDialog::spacingHint());
fLay->addSpacing(fontMetrics().lineSpacing());
QBoxLayout *cLay = new QHBoxLayout(fLay);
QLabel *fLabel = new QLabel(i18n("&Policy:"), fcsBox);
cLay->addWidget(fLabel, 0);
focusCombo = new QComboBox(false, fcsBox); focusCombo = new QComboBox(false, fcsBox);
focusCombo->insertItem(i18n("Click to Focus"), CLICK_TO_FOCUS); focusCombo->insertItem(i18n("Click to Focus"), CLICK_TO_FOCUS);
focusCombo->insertItem(i18n("Focus Follows Mouse"), FOCUS_FOLLOWS_MOUSE); focusCombo->insertItem(i18n("Focus Follows Mouse"), FOCUS_FOLLOWS_MOUSE);
focusCombo->insertItem(i18n("Focus Under Mouse"), FOCUS_UNDER_MOUSE); focusCombo->insertItem(i18n("Focus Under Mouse"), FOCUS_UNDER_MOUSE);
focusCombo->insertItem(i18n("Focus Strictly Under Mouse"), FOCUS_STRICTLY_UNDER_MOUSE); focusCombo->insertItem(i18n("Focus Strictly Under Mouse"), FOCUS_STRICTLY_UNDER_MOUSE);
fLay->addMultiCellWidget(focusCombo,1,1,0,1); cLay->addWidget(focusCombo,1 ,Qt::AlignLeft);
fLabel->setBuddy(focusCombo);
// FIXME, when more policies have been added to KWin // FIXME, when more policies have been added to KWin
QWhatsThis::add( focusCombo, i18n("The focus policy is used to determine the active window, i.e." wtstr = i18n("The focus policy is used to determine the active window, i.e."
" the window you can work in. <ul>" " the window you can work in. <ul>"
" <li><em>Click to focus:</em> A window becomes active when you click into it. This is the behavior" " <li><em>Click to focus:</em> A window becomes active when you click into it. This is the behavior"
" you might know from other operating systems.</li>" " you might know from other operating systems.</li>"
@ -146,42 +143,36 @@ KFocusConfig::KFocusConfig (KConfig *_config, QWidget * parent, const char *name
" Note that 'Focus under mouse' and 'Focus strictly under mouse' are not" " Note that 'Focus under mouse' and 'Focus strictly under mouse' are not"
" particularly useful. They are only provided for old-fashioned" " particularly useful. They are only provided for old-fashioned"
" die-hard UNIX people ;-)" " die-hard UNIX people ;-)"
) ); );
QWhatsThis::add( focusCombo, wtstr);
QWhatsThis::add(fLabel, wtstr);
connect(focusCombo, SIGNAL(activated(int)),this, connect(focusCombo, SIGNAL(activated(int)), this, SLOT(setAutoRaiseEnabled()) );
SLOT(setAutoRaiseEnabled()) );
// autoraise delay // autoraise delay
autoRaiseOn = new QCheckBox(i18n("Auto &raise"), fcsBox);
autoRaiseOn = new QCheckBox(i18n("Auto raise"), fcsBox); fLay->addWidget(autoRaiseOn);
fLay->addWidget(autoRaiseOn,2,0);
connect(autoRaiseOn,SIGNAL(toggled(bool)), this, SLOT(autoRaiseOnTog(bool))); connect(autoRaiseOn,SIGNAL(toggled(bool)), this, SLOT(autoRaiseOnTog(bool)));
clickRaiseOn = new QCheckBox(i18n("Click raise"), fcsBox);
fLay->addWidget(clickRaiseOn,4,0);
connect(clickRaiseOn,SIGNAL(toggled(bool)), this, SLOT(clickRaiseOnTog(bool)));
alabel = new QLabel(i18n("Delay:"), fcsBox);
alabel->setAlignment(AlignVCenter|AlignHCenter);
fLay->addWidget(alabel,3,0,AlignLeft);
autoRaise = new KIntNumInput(500, fcsBox); autoRaise = new KIntNumInput(500, fcsBox);
autoRaise->setLabel(i18n("Dela&y:"), Qt::AlignVCenter|Qt::AlignLeft);
autoRaise->setRange(0, 3000, 100, true); autoRaise->setRange(0, 3000, 100, true);
autoRaise->setSteps(100,100); autoRaise->setSteps(100,100);
autoRaise->setSuffix(i18n(" msec")); autoRaise->setSuffix(i18n(" msec"));
fLay->addMultiCellWidget(autoRaise,3,3,1,2); fLay->addWidget(autoRaise);
fLay->addColSpacing(0,QMAX(autoRaiseOn->sizeHint().width(), clickRaiseOn = new QCheckBox(i18n("C&lick raise"), fcsBox);
clickRaiseOn->sizeHint().width()) + 15); connect(clickRaiseOn,SIGNAL(toggled(bool)), this, SLOT(clickRaiseOnTog(bool)));
fLay->addWidget(clickRaiseOn);
// fLay->addColSpacing(0,QMAX(autoRaiseOn->sizeHint().width(),
// clickRaiseOn->sizeHint().width()) + 15);
QWhatsThis::add( autoRaiseOn, i18n("When this option is enabled, a window in the background will automatically" QWhatsThis::add( autoRaiseOn, i18n("When this option is enabled, a window in the background will automatically"
" come to the front when the mouse pointer has been over it for some time.") ); " come to the front when the mouse pointer has been over it for some time.") );
wtstr = i18n("This is the delay after which the window that the mouse pointer is over will automatically" wtstr = i18n("This is the delay after which the window that the mouse pointer is over will automatically"
" come to the front."); " come to the front.");
QWhatsThis::add( autoRaise, wtstr ); QWhatsThis::add( autoRaise, wtstr );
// QWhatsThis::add( s, wtstr );
QWhatsThis::add( alabel, wtstr );
QWhatsThis::add( clickRaiseOn, i18n("When this option is enabled, your windows will be brought to the" QWhatsThis::add( clickRaiseOn, i18n("When this option is enabled, your windows will be brought to the"
" front when you click somewhere into the window contents.") ); " front when you click somewhere into the window contents.") );
@ -195,9 +186,9 @@ KFocusConfig::KFocusConfig (KConfig *_config, QWidget * parent, const char *name
kLay->addRowSpacing(0,fontMetrics().lineSpacing()); kLay->addRowSpacing(0,fontMetrics().lineSpacing());
QLabel *altTabLabel = new QLabel( i18n("Walk through windows mode:"), kbdBox); QLabel *altTabLabel = new QLabel( i18n("Walk through windows mode:"), kbdBox);
kLay->addWidget(altTabLabel, 1, 0); kLay->addWidget(altTabLabel, 1, 0);
kdeMode = new QRadioButton(i18n("KDE"), kbdBox); kdeMode = new QRadioButton(i18n("&KDE"), kbdBox);
kLay->addWidget(kdeMode, 1, 1); kLay->addWidget(kdeMode, 1, 1);
cdeMode = new QRadioButton(i18n("CDE"), kbdBox); cdeMode = new QRadioButton(i18n("CD&E"), kbdBox);
kLay->addWidget(cdeMode, 1, 2); kLay->addWidget(cdeMode, 1, 2);
wtstr = i18n("Keep the Alt key pressed and hit the Tab key repeatedly to walk" wtstr = i18n("Keep the Alt key pressed and hit the Tab key repeatedly to walk"
@ -211,7 +202,7 @@ KFocusConfig::KFocusConfig (KConfig *_config, QWidget * parent, const char *name
QWhatsThis::add( kdeMode, wtstr ); QWhatsThis::add( kdeMode, wtstr );
QWhatsThis::add( cdeMode, wtstr ); QWhatsThis::add( cdeMode, wtstr );
traverseAll = new QCheckBox( i18n( "Traverse windows on all desktops" ), kbdBox ); traverseAll = new QCheckBox( i18n( "&Traverse windows on all desktops" ), kbdBox );
kLay->addMultiCellWidget( traverseAll, 2, 2, 0, 2 ); kLay->addMultiCellWidget( traverseAll, 2, 2, 0, 2 );
connect( cdeMode, SIGNAL( toggled( bool )), traverseAll, SLOT( setDisabled( bool ))); connect( cdeMode, SIGNAL( toggled( bool )), traverseAll, SLOT( setDisabled( bool )));
@ -219,14 +210,14 @@ KFocusConfig::KFocusConfig (KConfig *_config, QWidget * parent, const char *name
" windows to the current desktop." ); " windows to the current desktop." );
QWhatsThis::add( traverseAll, wtstr ); QWhatsThis::add( traverseAll, wtstr );
rollOverDesktops = new QCheckBox( i18n("Desktop navigation wraps around"), kbdBox ); rollOverDesktops = new QCheckBox( i18n("Desktop navi&gation wraps around"), kbdBox );
kLay->addMultiCellWidget(rollOverDesktops, 3, 3, 0, 2); kLay->addMultiCellWidget(rollOverDesktops, 3, 3, 0, 2);
wtstr = i18n( "Enable this option if you want keyboard or electric border navigation beyond" wtstr = i18n( "Enable this option if you want keyboard or electric border navigation beyond"
" an edge desktop to bring you to the desktop at the opposite edge." ); " an edge desktop to bring you to the desktop at the opposite edge." );
QWhatsThis::add( rollOverDesktops, wtstr ); QWhatsThis::add( rollOverDesktops, wtstr );
showPopupinfo = new QCheckBox( i18n("Popup desktop name on desktop switch"), kbdBox ); showPopupinfo = new QCheckBox( i18n("Popup desktop name on desktop &switch"), kbdBox );
kLay->addMultiCellWidget(showPopupinfo, 4, 4, 0, 2); kLay->addMultiCellWidget(showPopupinfo, 4, 4, 0, 2);
wtstr = i18n( "Enable this option if you wish to see the current desktop" wtstr = i18n( "Enable this option if you wish to see the current desktop"
@ -291,7 +282,7 @@ void KFocusConfig::setClickRaise(bool on)
void KFocusConfig::setAutoRaiseEnabled() void KFocusConfig::setAutoRaiseEnabled()
{ {
// the auto raise related widgets are: autoRaise, alabel, s, sec // the auto raise related widgets are: autoRaise
if ( focusCombo->currentItem() != CLICK_TO_FOCUS ) if ( focusCombo->currentItem() != CLICK_TO_FOCUS )
{ {
clickRaiseOn->setEnabled(true); clickRaiseOn->setEnabled(true);
@ -312,7 +303,6 @@ void KFocusConfig::setAutoRaiseEnabled()
//CT 23Oct1998 make AutoRaise toggling much clear //CT 23Oct1998 make AutoRaise toggling much clear
void KFocusConfig::autoRaiseOnTog(bool a) { void KFocusConfig::autoRaiseOnTog(bool a) {
autoRaise->setEnabled(a); autoRaise->setEnabled(a);
alabel->setEnabled(a);
clickRaiseOn->setEnabled( !a ); clickRaiseOn->setEnabled( !a );
if ( a ) if ( a )
clickRaiseOn->setChecked( TRUE ); clickRaiseOn->setChecked( TRUE );
@ -460,33 +450,21 @@ KAdvancedConfig::KAdvancedConfig (KConfig *_config, QWidget *parent, const char
//lay->addWidget(plcBox); //lay->addWidget(plcBox);
shBox = new QButtonGroup(i18n("Shading"), this); shBox = new QVButtonGroup(i18n("Shading"), this);
QGridLayout *shLay = new QGridLayout(shBox, 3, 2,
KDialog::marginHint(),
KDialog::spacingHint());
shLay->setColStretch(1, 1);
shLay->addRowSpacing(0,fontMetrics().lineSpacing()); animateShade = new QCheckBox(i18n("Anima&te"), shBox);
animateShade = new QCheckBox(i18n("A&nimate"), shBox);
QWhatsThis::add(animateShade, i18n("Animate the action of reducing the window to its titlebar (shading)" QWhatsThis::add(animateShade, i18n("Animate the action of reducing the window to its titlebar (shading)"
" as well as the expansion of a shaded window") ); " as well as the expansion of a shaded window") );
shLay->addWidget(animateShade, 1, 0);
shadeHoverOn = new QCheckBox(i18n("&Enable hover"), shBox); shadeHoverOn = new QCheckBox(i18n("&Enable hover"), shBox);
shLay->addWidget(shadeHoverOn, 2, 0);
connect(shadeHoverOn, SIGNAL(toggled(bool)), this, SLOT(shadeHoverChanged(bool))); connect(shadeHoverOn, SIGNAL(toggled(bool)), this, SLOT(shadeHoverChanged(bool)));
shlabel = new QLabel(i18n("Dela&y:"), shBox);
shlabel->setAlignment(AlignVCenter | AlignHCenter);
shLay->addWidget(shlabel, 3, 0, AlignLeft);
shadeHover = new KIntNumInput(500, shBox); shadeHover = new KIntNumInput(500, shBox);
shadeHover->setLabel(i18n("Dela&y:"), Qt::AlignVCenter|Qt::AlignLeft);
shadeHover->setRange(0, 3000, 100, true); shadeHover->setRange(0, 3000, 100, true);
shadeHover->setSteps(100, 100); shadeHover->setSteps(100, 100);
shadeHover->setSuffix(i18n(" msec")); shadeHover->setSuffix(i18n(" msec"));
shLay->addWidget(shadeHover, 3, 1);
shlabel->setBuddy(shadeHover);
QWhatsThis::add(shadeHoverOn, i18n("If Shade Hover is enabled, a shaded window will un-shade automatically " QWhatsThis::add(shadeHoverOn, i18n("If Shade Hover is enabled, a shaded window will un-shade automatically "
"when the mouse pointer has been over the title bar for some time.")); "when the mouse pointer has been over the title bar for some time."));
@ -494,7 +472,6 @@ KAdvancedConfig::KAdvancedConfig (KConfig *_config, QWidget *parent, const char
wtstr = i18n("Sets the time in milliseconds before the window unshades " wtstr = i18n("Sets the time in milliseconds before the window unshades "
"when the mouse pointer goes over the shaded window."); "when the mouse pointer goes over the shaded window.");
QWhatsThis::add(shadeHover, wtstr); QWhatsThis::add(shadeHover, wtstr);
QWhatsThis::add(shlabel, wtstr);
lay->addWidget(shBox); lay->addWidget(shBox);
@ -526,7 +503,7 @@ KAdvancedConfig::KAdvancedConfig (KConfig *_config, QWidget *parent, const char
" will change your desktop. This is e.g. useful if you want to drag windows from one desktop" " will change your desktop. This is e.g. useful if you want to drag windows from one desktop"
" to the other.") ); " to the other.") );
active_disable = new QRadioButton(i18n("D&isabled"), electricBox); active_disable = new QRadioButton(i18n("D&isabled"), electricBox);
active_move = new QRadioButton(i18n("Only when &moving windows"), electricBox); active_move = new QRadioButton(i18n("Only &when moving windows"), electricBox);
active_always = new QRadioButton(i18n("A&lways enabled"), electricBox); active_always = new QRadioButton(i18n("A&lways enabled"), electricBox);
delays = new KIntNumInput(10, electricBox); delays = new KIntNumInput(10, electricBox);
@ -567,7 +544,6 @@ void KAdvancedConfig::slotChanged()
void KAdvancedConfig::setShadeHover(bool on) { void KAdvancedConfig::setShadeHover(bool on) {
shadeHoverOn->setChecked(on); shadeHoverOn->setChecked(on);
shadeHover->setEnabled(on); shadeHover->setEnabled(on);
shlabel->setEnabled(on);
} }
void KAdvancedConfig::setShadeHoverInterval(int k) { void KAdvancedConfig::setShadeHoverInterval(int k) {
@ -581,7 +557,6 @@ int KAdvancedConfig::getShadeHoverInterval() {
void KAdvancedConfig::shadeHoverChanged(bool a) { void KAdvancedConfig::shadeHoverChanged(bool a) {
shadeHover->setEnabled(a); shadeHover->setEnabled(a);
shlabel->setEnabled(a);
} }
void KAdvancedConfig::setXinerama(bool on) { void KAdvancedConfig::setXinerama(bool on) {
@ -711,13 +686,13 @@ KMovingConfig::KMovingConfig (KConfig *_config, QWidget *parent, const char *nam
QBoxLayout *bLay = new QVBoxLayout; QBoxLayout *bLay = new QVBoxLayout;
wLay->addLayout(bLay); wLay->addLayout(bLay);
opaque = new QCheckBox(i18n("Display content in moving windows"), windowsBox); opaque = new QCheckBox(i18n("Di&splay content in moving windows"), windowsBox);
bLay->addWidget(opaque); bLay->addWidget(opaque);
QWhatsThis::add( opaque, i18n("Enable this option if you want a window's content to be fully shown" QWhatsThis::add( opaque, i18n("Enable this option if you want a window's content to be fully shown"
" while moving it, instead of just showing a window 'skeleton'. The result may not be satisfying" " while moving it, instead of just showing a window 'skeleton'. The result may not be satisfying"
" on slow machines without graphic acceleration.") ); " on slow machines without graphic acceleration.") );
resizeOpaqueOn = new QCheckBox(i18n("Display content in resizing windows"), windowsBox); resizeOpaqueOn = new QCheckBox(i18n("Display content in &resizing windows"), windowsBox);
bLay->addWidget(resizeOpaqueOn); bLay->addWidget(resizeOpaqueOn);
QWhatsThis::add( resizeOpaqueOn, i18n("Enable this option if you want a window's content to be shown" QWhatsThis::add( resizeOpaqueOn, i18n("Enable this option if you want a window's content to be shown"
" while resizing it, instead of just showing a window 'skeleton'. The result may not be satisfying" " while resizing it, instead of just showing a window 'skeleton'. The result may not be satisfying"
@ -728,7 +703,7 @@ KMovingConfig::KMovingConfig (KConfig *_config, QWidget *parent, const char *nam
rLay->setColStretch(0,0); rLay->setColStretch(0,0);
rLay->setColStretch(1,1); rLay->setColStretch(1,1);
minimizeAnimOn = new QCheckBox(i18n("Animate minimize and restore"), minimizeAnimOn = new QCheckBox(i18n("Animate minimi&ze and restore"),
windowsBox); windowsBox);
QWhatsThis::add( minimizeAnimOn, i18n("Enable this option if you want an animation shown when" QWhatsThis::add( minimizeAnimOn, i18n("Enable this option if you want an animation shown when"
" windows are minimized or restored." ) ); " windows are minimized or restored." ) );
@ -745,11 +720,11 @@ KMovingConfig::KMovingConfig (KConfig *_config, QWidget *parent, const char *nam
connect(minimizeAnimSlider, SIGNAL(valueChanged(int)), this, SLOT(setMinimizeAnimSpeed(int))); connect(minimizeAnimSlider, SIGNAL(valueChanged(int)), this, SLOT(setMinimizeAnimSpeed(int)));
minimizeAnimSlowLabel= new QLabel(i18n("Slow"),windowsBox); minimizeAnimSlowLabel= new QLabel(i18n("Slow"),windowsBox);
minimizeAnimSlowLabel->setAlignment(AlignTop|AlignLeft); minimizeAnimSlowLabel->setAlignment(Qt::AlignTop|Qt::AlignLeft);
rLay->addWidget(minimizeAnimSlowLabel,1,1); rLay->addWidget(minimizeAnimSlowLabel,1,1);
minimizeAnimFastLabel= new QLabel(i18n("Fast"),windowsBox); minimizeAnimFastLabel= new QLabel(i18n("Fast"),windowsBox);
minimizeAnimFastLabel->setAlignment(AlignTop|AlignRight); minimizeAnimFastLabel->setAlignment(Qt::AlignTop|Qt::AlignRight);
rLay->addWidget(minimizeAnimFastLabel,1,2); rLay->addWidget(minimizeAnimFastLabel,1,2);
wtstr = i18n("Here you can set the speed of the animation shown when windows are" wtstr = i18n("Here you can set the speed of the animation shown when windows are"
@ -758,19 +733,15 @@ KMovingConfig::KMovingConfig (KConfig *_config, QWidget *parent, const char *nam
QWhatsThis::add( minimizeAnimSlowLabel, wtstr ); QWhatsThis::add( minimizeAnimSlowLabel, wtstr );
QWhatsThis::add( minimizeAnimFastLabel, wtstr ); QWhatsThis::add( minimizeAnimFastLabel, wtstr );
moveResizeMaximized = new QCheckBox( i18n("Allow moving and resizing of maximized windows"), windowsBox); moveResizeMaximized = new QCheckBox( i18n("Allow moving and resizing o&f maximized windows"), windowsBox);
bLay->addWidget(moveResizeMaximized); bLay->addWidget(moveResizeMaximized);
QWhatsThis::add(moveResizeMaximized, i18n("When enabled, this feature activates the border of maximized windows" QWhatsThis::add(moveResizeMaximized, i18n("When enabled, this feature activates the border of maximized windows"
" and allows you to move or resize them," " and allows you to move or resize them,"
" just like for normal windows")); " just like for normal windows"));
rLay = new QGridLayout(1,3); QBoxLayout *vLay = new QHBoxLayout(bLay);
bLay->addLayout(rLay);
rLay->setColStretch(0,1);
rLay->setColStretch(1,3);
rLay->setColStretch(2,2);
QLabel *plcLabel = new QLabel(i18n("Placement:"),windowsBox); QLabel *plcLabel = new QLabel(i18n("&Placement:"),windowsBox);
placementCombo = new QComboBox(false, windowsBox); placementCombo = new QComboBox(false, windowsBox);
placementCombo->insertItem(i18n("Smart"), SMART_PLACEMENT); placementCombo->insertItem(i18n("Smart"), SMART_PLACEMENT);
@ -792,8 +763,8 @@ KMovingConfig::KMovingConfig (KConfig *_config, QWidget *parent, const char *nam
QWhatsThis::add( placementCombo, wtstr); QWhatsThis::add( placementCombo, wtstr);
plcLabel->setBuddy(placementCombo); plcLabel->setBuddy(placementCombo);
rLay->addWidget(plcLabel, 0, 0); vLay->addWidget(plcLabel, 0);
rLay->addWidget(placementCombo, 0, 1); vLay->addWidget(placementCombo, 1, Qt::AlignLeft);
bLay->addSpacing(10); bLay->addSpacing(10);
@ -822,7 +793,7 @@ KMovingConfig::KMovingConfig (KConfig *_config, QWidget *parent, const char *nam
BrdrSnap->setRange( 0, MAX_BRDR_SNAP); BrdrSnap->setRange( 0, MAX_BRDR_SNAP);
BrdrSnap->setLabel(i18n("&Border snap zone:")); BrdrSnap->setLabel(i18n("&Border snap zone:"));
BrdrSnap->setSuffix(i18n(" pixels")); BrdrSnap->setSuffix(i18n(" pixels"));
BrdrSnap->setSteps(1,1); BrdrSnap->setSteps(1,10);
QWhatsThis::add( BrdrSnap, i18n("Here you can set the snap zone for screen borders, i.e." QWhatsThis::add( BrdrSnap, i18n("Here you can set the snap zone for screen borders, i.e."
" the 'strength' of the magnetic field which will make windows snap to the border when" " the 'strength' of the magnetic field which will make windows snap to the border when"
" moved near it.") ); " moved near it.") );
@ -832,12 +803,12 @@ KMovingConfig::KMovingConfig (KConfig *_config, QWidget *parent, const char *nam
WndwSnap->setRange( 0, MAX_WNDW_SNAP); WndwSnap->setRange( 0, MAX_WNDW_SNAP);
WndwSnap->setLabel(i18n("&Window snap zone:")); WndwSnap->setLabel(i18n("&Window snap zone:"));
WndwSnap->setSuffix( i18n(" pixels")); WndwSnap->setSuffix( i18n(" pixels"));
BrdrSnap->setSteps(1,1); BrdrSnap->setSteps(1,10);
QWhatsThis::add( WndwSnap, i18n("Here you can set the snap zone for windows, i.e." QWhatsThis::add( WndwSnap, i18n("Here you can set the snap zone for windows, i.e."
" the 'strength' of the magnetic field which will make windows snap to each other when" " the 'strength' of the magnetic field which will make windows snap to each other when"
" they're moved near another window.") ); " they're moved near another window.") );
OverlapSnap=new QCheckBox(i18n("Snap windows only when &overlapping"),MagicBox); OverlapSnap=new QCheckBox(i18n("Snap windows onl&y when overlapping"),MagicBox);
QWhatsThis::add( OverlapSnap, i18n("Here you can set that windows will be only" QWhatsThis::add( OverlapSnap, i18n("Here you can set that windows will be only"
" snapped if you try to overlap them, i.e. they won't be snapped if the windows" " snapped if you try to overlap them, i.e. they won't be snapped if the windows"
" comes only near another window or border.") ); " comes only near another window or border.") );

3
kcmkwin/kwinoptions/windows.h
View file

@ -101,8 +101,6 @@ private:
QCheckBox *autoRaiseOn; QCheckBox *autoRaiseOn;
QCheckBox *clickRaiseOn; QCheckBox *clickRaiseOn;
KIntNumInput *autoRaise; KIntNumInput *autoRaise;
QLabel *alabel;
//CT QLabel *sec;
QButtonGroup *kbdBox; QButtonGroup *kbdBox;
QRadioButton *kdeMode; QRadioButton *kdeMode;
@ -203,7 +201,6 @@ private:
QButtonGroup *shBox; QButtonGroup *shBox;
QCheckBox *shadeHoverOn; QCheckBox *shadeHoverOn;
KIntNumInput *shadeHover; KIntNumInput *shadeHover;
QLabel *shlabel;
#ifdef HAVE_XINERAMA #ifdef HAVE_XINERAMA
QButtonGroup *xineramaBox; QButtonGroup *xineramaBox;