From e604a5214c69198e180cf5f1d5f3e8130154fcfe Mon Sep 17 00:00:00 2001 From: Lucas Murray Date: Sun, 19 Oct 2008 05:55:36 +0000 Subject: [PATCH] Touch-up cube, sphere and cylinder panel GUIs. Fixed direct rendering label. svn path=/trunk/KDE/kdebase/workspace/; revision=873233 --- effects/cube_config.ui | 309 ++++++++++--------- effects/cylinder_config.ui | 335 +++++++++++--------- effects/sphere_config.cpp | 4 +- effects/sphere_config.ui | 461 ++++++++++++++-------------- kcmkwin/kwincompositing/advanced.ui | 2 +- 5 files changed, 584 insertions(+), 527 deletions(-) diff --git a/effects/cube_config.ui b/effects/cube_config.ui index 11e0157cbe..45d1a283c6 100644 --- a/effects/cube_config.ui +++ b/effects/cube_config.ui @@ -5,8 +5,8 @@ 0 0 - 568 - 595 + 546 + 566 @@ -16,14 +16,6 @@ 0 - - - 0 - 0 - 546 - 552 - - Tab 1 @@ -39,26 +31,46 @@ Background Color: + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + backgroundColorButton - + + + + 0 + 0 + + + Wallpaper: + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + wallpaperRequester - - + + + + + 0 + 0 + + + @@ -74,13 +86,23 @@ Screen edge: + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + screenEdgeCombo - + + + + 0 + 0 + + + @@ -120,6 +142,9 @@ Rotation duration: + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + rotationDurationSpin @@ -127,6 +152,12 @@ + + + 0 + 0 + + 100 @@ -155,7 +186,7 @@ 20 - 40 + 0 @@ -168,71 +199,36 @@ Opacity - - - - - - - - 200 - 0 - - - - 100 - - - 1 - - - 100 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 10 - - - - - - - - - Transparent - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Opaque - - - - - - + + + + + + 200 + 0 + + + + 100 + + + 1 + + + 100 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 10 + + - + @@ -251,31 +247,53 @@ + + + + Transparent + + + + + + + Opaque + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - - - 0 - 0 - 545 - 553 - - Tab 2 - - + + Caps - + Show caps @@ -287,15 +305,25 @@ Cap Color: + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + capColorButton - + + + + 0 + 0 + + + - + Display image on caps @@ -305,13 +333,30 @@ - + Zoom - - + + + + + Near + + + + + + + Far + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + Define how far away the object should appear @@ -336,41 +381,23 @@ - - - - - - Near - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Far - - - - - - + + + + Qt::Vertical + + + + 20 + 0 + + + + + Additional options @@ -382,15 +409,15 @@ - Show cube when desktop changed + Display the cube when switching desktops - Cube appears on all screens in a multi screen setup. -If not set cube will appear on only one screen and scaled so that all screens fit on that screen. + If enabled span the cube across all screens on a multiscreen setup, otherwise +the cube will only be displayed on a single screen Span cube on all screens in multi screen setup @@ -400,8 +427,8 @@ If not set cube will appear on only one screen and scaled so that all screens fi - Cube is deactivated after rotating the cube with the mouse. -Otherwise cube will stay in the position. + If enabled the effect will be deactivated after rotating the cube with the mouse, +otherwise it will remain active Close after mouse dragging @@ -411,26 +438,13 @@ Otherwise cube will stay in the position. - Use for walk through desktop list + Use this effect for walking through the desktops - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -469,10 +483,11 @@ Otherwise cube will stay in the position. cubeCapsBox capColorButton capsImageBox - zPositionSlider animateDesktopChangeBox bigCubeBox closeOnMouseReleaseBox + walkThroughDesktopBox + zPositionSlider diff --git a/effects/cylinder_config.ui b/effects/cylinder_config.ui index 08353f2338..603a225177 100644 --- a/effects/cylinder_config.ui +++ b/effects/cylinder_config.ui @@ -5,8 +5,8 @@ 0 0 - 568 - 595 + 546 + 526 @@ -16,14 +16,6 @@ 0 - - - 0 - 0 - 546 - 552 - - Tab 1 @@ -39,26 +31,46 @@ Background Color: + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + backgroundColorButton - + + + + 0 + 0 + + + Wallpaper: + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + wallpaperRequester - - + + + + + 0 + 0 + + + @@ -74,13 +86,23 @@ Screen edge: + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + screenEdgeCombo - + + + + 0 + 0 + + + @@ -120,6 +142,9 @@ Rotation duration: + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + rotationDurationSpin @@ -127,6 +152,12 @@ + + + 0 + 0 + + 100 @@ -155,7 +186,7 @@ 20 - 40 + 0 @@ -168,71 +199,36 @@ Opacity - - - - - - - - 200 - 0 - - - - 100 - - - 1 - - - 100 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 10 - - - - - - - - - Transparent - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Opaque - - - - - - + + + + + + 200 + 0 + + + + 100 + + + 1 + + + 100 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 10 + + - + @@ -251,31 +247,53 @@ + + + + Transparent + + + + + + + Opaque + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - - - 0 - 0 - 545 - 553 - - Tab 2 - - + + Caps - + Show caps @@ -287,15 +305,25 @@ Cap Color: + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + capColorButton - + + + + 0 + 0 + + + - + Display image on caps @@ -305,13 +333,30 @@ - + Zoom - - + + + + + Near + + + + + + + Far + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + Define how far away the object should appear @@ -336,41 +381,23 @@ - - - - - - Near - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Far - - - - - - + + + + Qt::Vertical + + + + 20 + 0 + + + + + Additional options @@ -379,8 +406,8 @@ - Cylinder is deactivated after rotating the cylinder with the mouse. -Otherwise cylinder will stay in the position. + If enabled the effect will be deactivated after rotating the cylinder with the mouse, +otherwise it will remain active. Close after mouse dragging @@ -390,26 +417,29 @@ Otherwise cylinder will stay in the position. - Use for walk through desktop list + Use this effect for walking through the desktops + + + + Qt::Vertical + + + QSizePolicy::Preferred + + + + 20 + 0 + + + + - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -448,8 +478,9 @@ Otherwise cylinder will stay in the position. cubeCapsBox capColorButton capsImageBox - zPositionSlider closeOnMouseReleaseBox + walkThroughDesktopBox + zPositionSlider @@ -460,12 +491,12 @@ Otherwise cylinder will stay in the position. setValue(int) - 386 - 175 + 524 + 96 - 235 - 162 + 433 + 97 @@ -476,12 +507,12 @@ Otherwise cylinder will stay in the position. setValue(int) - 133 - 162 + 331 + 97 - 386 - 175 + 524 + 96 diff --git a/effects/sphere_config.cpp b/effects/sphere_config.cpp index cb33aee23b..645a2a4782 100644 --- a/effects/sphere_config.cpp +++ b/effects/sphere_config.cpp @@ -224,8 +224,8 @@ void SphereEffectConfig::capsSelectionChanged() m_ui->capColorButton->setEnabled( true ); m_ui->capColorLabel->setEnabled( true ); m_ui->capsImageBox->setEnabled( true ); + m_ui->capDeformationGroupBox->setEnabled( true ); m_ui->capDeformationSlider->setEnabled( true ); - m_ui->capDeformationLabel->setEnabled( true ); m_ui->capDeformationSphereLabel->setEnabled( true ); m_ui->capDeformationPlaneLabel->setEnabled( true ); } @@ -235,8 +235,8 @@ void SphereEffectConfig::capsSelectionChanged() m_ui->capColorButton->setEnabled( false ); m_ui->capColorLabel->setEnabled( false ); m_ui->capsImageBox->setEnabled( false ); + m_ui->capDeformationGroupBox->setEnabled( false ); m_ui->capDeformationSlider->setEnabled( false ); - m_ui->capDeformationLabel->setEnabled( false ); m_ui->capDeformationSphereLabel->setEnabled( false ); m_ui->capDeformationPlaneLabel->setEnabled( false ); } diff --git a/effects/sphere_config.ui b/effects/sphere_config.ui index 9fcc65777c..dfbaf8989d 100644 --- a/effects/sphere_config.ui +++ b/effects/sphere_config.ui @@ -5,8 +5,8 @@ 0 0 - 568 - 595 + 546 + 526 @@ -16,14 +16,6 @@ 0 - - - 0 - 0 - 546 - 552 - - Tab 1 @@ -39,26 +31,46 @@ Background Color: + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + backgroundColorButton - + + + + 0 + 0 + + + Wallpaper: + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + wallpaperRequester - - + + + + + 0 + 0 + + + @@ -74,13 +86,23 @@ Screen edge: + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + screenEdgeCombo - + + + + 0 + 0 + + + @@ -108,18 +130,34 @@ - + + + + Reflection + + + + Rotation duration: + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + rotationDurationSpin - + + + + 0 + 0 + + 100 @@ -140,7 +178,7 @@ - + Qt::Vertical @@ -148,7 +186,7 @@ 20 - 40 + 0 @@ -161,71 +199,36 @@ Opacity - - - - - - - - 200 - 0 - - - - 100 - - - 1 - - - 100 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 10 - - - - - - - - - Transparent - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Opaque - - - - - - + + + + + + 200 + 0 + + + + 100 + + + 1 + + + 100 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 10 + + - + @@ -244,31 +247,53 @@ + + + + Transparent + + + + + + + Opaque + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - - - 0 - 0 - 545 - 553 - - Tab 2 - - + + Caps - + Show caps @@ -280,101 +305,58 @@ Cap Color: + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + capColorButton - + + + + 0 + 0 + + + - + Display image on caps - - - - - 0 - 0 - - - - Cap deformation: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - capDeformationSlider - - - - - - - - - 100 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 25 - - - - - - - - - Sphere - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Plane - - - - - - - - + Zoom - - + + + + + Near + + + + + + + Far + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + Define how far away the object should appear @@ -399,41 +381,23 @@ - - - - - - Near - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Far - - - - - - + + + + Qt::Vertical + + + + 20 + 0 + + + + + Additional options @@ -442,8 +406,8 @@ - Sphere is deactivated after rotating the sphere with the mouse. -Otherwise sphere will stay in the position. + If enabled the effect will be deactivated after rotating the sphere with the mouse, +otherwise it will remain active Close after mouse dragging @@ -453,26 +417,71 @@ Otherwise sphere will stay in the position. - Use for walk through desktop list + Use this effect for walking through the desktops + + + + + + + Qt::Vertical + + + QSizePolicy::Preferred + + + + 20 + 0 + + + + + + + + + + + Cap deformation + + + + + + 100 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + 25 + + + + + + + Sphere + + + + + + + Plane + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -501,6 +510,7 @@ Otherwise sphere will stay in the position. tabWidget displayDesktopNameBox + reflectionBox rotationDurationSpin cubeOpacitySlider cubeOpacitySpin @@ -510,9 +520,10 @@ Otherwise sphere will stay in the position. cubeCapsBox capColorButton capsImageBox + closeOnMouseReleaseBox + walkThroughDesktopBox capDeformationSlider zPositionSlider - closeOnMouseReleaseBox @@ -523,12 +534,12 @@ Otherwise sphere will stay in the position. setValue(int) - 386 - 175 + 524 + 96 - 235 - 162 + 433 + 97 @@ -539,12 +550,12 @@ Otherwise sphere will stay in the position. setValue(int) - 133 - 162 + 331 + 97 - 386 - 175 + 524 + 96 diff --git a/kcmkwin/kwincompositing/advanced.ui b/kcmkwin/kwincompositing/advanced.ui index 4800a79450..e50744568f 100644 --- a/kcmkwin/kwincompositing/advanced.ui +++ b/kcmkwin/kwincompositing/advanced.ui @@ -107,7 +107,7 @@ - Direct rendering + Enable direct rendering