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

svnrevertlast, hmmm... 

svn path=/trunk/KDE/kdebase/workspace/; revision=707435
icc-effect-5.14.5
Pino Toscano 2007-09-01 21:20:46 +00:00
parent 2bbe834a5b
commit 2250012850
2 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
kcmkwin/kwinoptions/windows.cpp
View File

@ -33,6 +33,7 @@
#include <QLabel> #include <QLabel>
#include <QComboBox> #include <QComboBox>
#include <qdesktopwidget.h> #include <qdesktopwidget.h>
//Added by qt3to4:
#include <QGridLayout> #include <QGridLayout>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QBoxLayout> #include <QBoxLayout>
@ -126,10 +127,12 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, const KComponent
//lay->addWidget(plcBox); //lay->addWidget(plcBox);
// focus policy // focus policy
fcsBox = new QGroupBox(i18n("Focus"),this); fcsBox = new Q3ButtonGroup(i18n("Focus"),this);
fcsBox->setColumnLayout( 0, Qt::Horizontal );
QBoxLayout *fLay = new QVBoxLayout(fcsBox); QBoxLayout *fLay = new QVBoxLayout();
fLay->setSpacing(KDialog::spacingHint()); fLay->setSpacing(KDialog::spacingHint());
fcsBox->layout()->addItem( fLay );
QBoxLayout *cLay = new QHBoxLayout(); QBoxLayout *cLay = new QHBoxLayout();
fLay->addLayout( cLay ); fLay->addLayout( cLay );
@ -240,9 +243,11 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, const KComponent
lay->addWidget(fcsBox); lay->addWidget(fcsBox);
kbdBox = new QGroupBox(i18n("Navigation"), this); kbdBox = new Q3ButtonGroup(i18n("Navigation"), this);
QVBoxLayout *kLay = new QVBoxLayout(kbdBox); kbdBox->setColumnLayout( 0, Qt::Horizontal );
QVBoxLayout *kLay = new QVBoxLayout();
kLay->setSpacing(KDialog::spacingHint()); kLay->setSpacing(KDialog::spacingHint());
kbdBox->layout()->addItem( kLay );
altTabPopup = new QCheckBox( i18n("Show window list while switching windows"), kbdBox ); altTabPopup = new QCheckBox( i18n("Show window list while switching windows"), kbdBox );
kLay->addWidget( altTabPopup ); kLay->addWidget( altTabPopup );
@ -585,21 +590,17 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, const KCom
//lay->addWidget(plcBox); //lay->addWidget(plcBox);
shBox = new QGroupBox(i18n("Shading"), this); shBox = new Q3VButtonGroup(i18n("Shading"), this);
QVBoxLayout *shBoxLayout = new QVBoxLayout(shBox);
animateShade = new QCheckBox(i18n("Anima&te"), shBox); animateShade = new QCheckBox(i18n("Anima&te"), shBox);
shBoxLayout->addWidget(animateShade);
animateShade->setWhatsThis( i18n("Animate the action of reducing the window to its titlebar (shading)" animateShade->setWhatsThis( 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") );
shadeHoverOn = new QCheckBox(i18n("&Enable hover"), shBox); shadeHoverOn = new QCheckBox(i18n("&Enable hover"), shBox);
shBoxLayout->addWidget(shadeHoverOn);
connect(shadeHoverOn, SIGNAL(toggled(bool)), this, SLOT(shadeHoverChanged(bool))); connect(shadeHoverOn, SIGNAL(toggled(bool)), this, SLOT(shadeHoverChanged(bool)));
shadeHover = new KIntNumInput(500, shBox); shadeHover = new KIntNumInput(500, shBox);
shBoxLayout->addWidget(shadeHover);
shadeHover->setLabel(i18n("Dela&y:"), Qt::AlignVCenter|Qt::AlignLeft); 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);
@ -840,32 +841,37 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, const KCompone
lay->setMargin(0); lay->setMargin(0);
lay->setSpacing(KDialog::spacingHint()); lay->setSpacing(KDialog::spacingHint());
windowsBox = new QGroupBox(i18n("Windows"), this); windowsBox = new Q3ButtonGroup(i18n("Windows"), this);
windowsBox->setColumnLayout( 0, Qt::Horizontal );
QBoxLayout *wLay = new QVBoxLayout(windowsBox); QBoxLayout *wLay = new QVBoxLayout ();
wLay->setSpacing(KDialog::spacingHint()); wLay->setSpacing(KDialog::spacingHint());
windowsBox->layout()->addItem( wLay );
QBoxLayout *bLay = new QVBoxLayout;
wLay->addLayout(bLay);
opaque = new QCheckBox(i18n("Di&splay content in moving windows"), windowsBox); opaque = new QCheckBox(i18n("Di&splay content in moving windows"), windowsBox);
wLay->addWidget(opaque); bLay->addWidget(opaque);
opaque->setWhatsThis( i18n("Enable this option if you want a window's content to be fully shown" opaque->setWhatsThis( 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);
wLay->addWidget(resizeOpaqueOn); bLay->addWidget(resizeOpaqueOn);
resizeOpaqueOn->setWhatsThis( i18n("Enable this option if you want a window's content to be shown" resizeOpaqueOn->setWhatsThis( 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"
" on slow machines.") ); " on slow machines.") );
geometryTipOn = new QCheckBox(i18n("Display window &geometry when moving or resizing"), windowsBox); geometryTipOn = new QCheckBox(i18n("Display window &geometry when moving or resizing"), windowsBox);
wLay->addWidget(geometryTipOn); bLay->addWidget(geometryTipOn);
geometryTipOn->setWhatsThis( i18n("Enable this option if you want a window's geometry to be displayed" geometryTipOn->setWhatsThis( i18n("Enable this option if you want a window's geometry to be displayed"
" while it is being moved or resized. The window position relative" " while it is being moved or resized. The window position relative"
" to the top-left corner of the screen is displayed together with" " to the top-left corner of the screen is displayed together with"
" its size.")); " its size."));
QGridLayout *rLay = new QGridLayout(); QGridLayout *rLay = new QGridLayout();
wLay->addLayout(rLay); bLay->addLayout(rLay);
rLay->setColumnStretch(0,0); rLay->setColumnStretch(0,0);
rLay->setColumnStretch(1,1); rLay->setColumnStretch(1,1);
@ -902,13 +908,13 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, const KCompone
minimizeAnimFastLabel->setWhatsThis( wtstr ); minimizeAnimFastLabel->setWhatsThis( wtstr );
moveResizeMaximized = new QCheckBox( i18n("Allow moving and resizing o&f maximized windows"), windowsBox); moveResizeMaximized = new QCheckBox( i18n("Allow moving and resizing o&f maximized windows"), windowsBox);
wLay->addWidget(moveResizeMaximized); bLay->addWidget(moveResizeMaximized);
moveResizeMaximized->setWhatsThis( i18n("When enabled, this feature activates the border of maximized windows" moveResizeMaximized->setWhatsThis( 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"));
QBoxLayout *vLay = new QHBoxLayout(); QBoxLayout *vLay = new QHBoxLayout();
wLay->addLayout( vLay ); bLay->addLayout( vLay );
QLabel *plcLabel = new QLabel(i18n("&Placement:"),windowsBox); QLabel *plcLabel = new QLabel(i18n("&Placement:"),windowsBox);
@ -946,7 +952,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, const KCompone
vLay->addWidget(plcLabel, 0); vLay->addWidget(plcLabel, 0);
vLay->addWidget(placementCombo, 1, Qt::AlignLeft); vLay->addWidget(placementCombo, 1, Qt::AlignLeft);
wLay->addSpacing(10); bLay->addSpacing(10);
lay->addWidget(windowsBox); lay->addWidget(windowsBox);
@ -965,12 +971,10 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, const KCompone
//CT 15mar98 - add EdgeResistance, BorderAttractor, WindowsAttractor config //CT 15mar98 - add EdgeResistance, BorderAttractor, WindowsAttractor config
MagicBox = new QGroupBox(i18n("Snap Zones"), this); MagicBox = new Q3VButtonGroup(i18n("Snap Zones"), this);
QVBoxLayout *MagicBoxLayout = new QVBoxLayout(MagicBox); MagicBox->layout()->setMargin(15);
MagicBoxLayout->setMargin(15);
BrdrSnap = new KIntNumInput(10, MagicBox); BrdrSnap = new KIntNumInput(10, MagicBox);
MagicBoxLayout->addWidget(BrdrSnap);
BrdrSnap->setSpecialValueText( i18n("none") ); BrdrSnap->setSpecialValueText( i18n("none") );
BrdrSnap->setRange( 0, MAX_BRDR_SNAP); BrdrSnap->setRange( 0, MAX_BRDR_SNAP);
BrdrSnap->setLabel(i18n("&Border snap zone:")); BrdrSnap->setLabel(i18n("&Border snap zone:"));
@ -980,7 +984,6 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, const KCompone
" moved near it.") ); " moved near it.") );
WndwSnap = new KIntNumInput(10, MagicBox); WndwSnap = new KIntNumInput(10, MagicBox);
MagicBoxLayout->addWidget(WndwSnap);
WndwSnap->setSpecialValueText( i18n("none") ); WndwSnap->setSpecialValueText( i18n("none") );
WndwSnap->setRange( 0, MAX_WNDW_SNAP); WndwSnap->setRange( 0, MAX_WNDW_SNAP);
WndwSnap->setLabel(i18n("&Window snap zone:")); WndwSnap->setLabel(i18n("&Window snap zone:"));
@ -990,7 +993,6 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, const KCompone
" they are moved near another window.") ); " they are moved near another window.") );
OverlapSnap=new QCheckBox(i18n("Snap windows onl&y when overlapping"),MagicBox); OverlapSnap=new QCheckBox(i18n("Snap windows onl&y when overlapping"),MagicBox);
MagicBoxLayout->addWidget(OverlapSnap);
OverlapSnap->setWhatsThis( i18n("Here you can set that windows will be only" OverlapSnap->setWhatsThis( i18n("Here you can set that windows will be only"
" snapped if you try to overlap them, i.e. they will not be snapped if the windows" " snapped if you try to overlap them, i.e. they will not be snapped if the windows"
" comes only near another window or border.") ); " comes only near another window or border.") );

11
kcmkwin/kwinoptions/windows.h
View File

@ -33,6 +33,7 @@ class QComboBox;
class QGroupBox; class QGroupBox;
class QLabel; class QLabel;
class QSlider; class QSlider;
class Q3ButtonGroup;
class QSpinBox; class QSpinBox;
class Q3VButtonGroup; class Q3VButtonGroup;
@ -108,7 +109,7 @@ private:
void setRollOverDesktops(bool); void setRollOverDesktops(bool);
void setShowPopupinfo(bool); void setShowPopupinfo(bool);
QGroupBox *fcsBox; Q3ButtonGroup *fcsBox;
QComboBox *focusCombo; QComboBox *focusCombo;
QCheckBox *autoRaiseOn; QCheckBox *autoRaiseOn;
QCheckBox *delayFocusOn; QCheckBox *delayFocusOn;
@ -118,7 +119,7 @@ private:
QCheckBox *separateScreenFocus; QCheckBox *separateScreenFocus;
QCheckBox *activeMouseScreen; QCheckBox *activeMouseScreen;
QGroupBox *kbdBox; Q3ButtonGroup *kbdBox;
QCheckBox *altTabPopup; QCheckBox *altTabPopup;
QCheckBox *traverseAll; QCheckBox *traverseAll;
QCheckBox *rollOverDesktops; QCheckBox *rollOverDesktops;
@ -160,7 +161,7 @@ private:
void setPlacement(int); //CT void setPlacement(int); //CT
void setMoveResizeMaximized(bool); void setMoveResizeMaximized(bool);
QGroupBox *windowsBox; Q3ButtonGroup *windowsBox;
QCheckBox *opaque; QCheckBox *opaque;
QCheckBox *resizeOpaqueOn; QCheckBox *resizeOpaqueOn;
QCheckBox *geometryTipOn; QCheckBox *geometryTipOn;
@ -179,7 +180,7 @@ private:
int getWindowSnapZone(); int getWindowSnapZone();
void setWindowSnapZone( int ); void setWindowSnapZone( int );
QGroupBox *MagicBox; Q3VButtonGroup *MagicBox;
KIntNumInput *BrdrSnap, *WndwSnap; KIntNumInput *BrdrSnap, *WndwSnap;
QCheckBox *OverlapSnap; QCheckBox *OverlapSnap;
@ -212,7 +213,7 @@ private:
void setShadeHoverInterval(int); void setShadeHoverInterval(int);
QCheckBox *animateShade; QCheckBox *animateShade;
QGroupBox *shBox; Q3ButtonGroup *shBox;
QCheckBox *shadeHoverOn; QCheckBox *shadeHoverOn;
KIntNumInput *shadeHover; KIntNumInput *shadeHover;