Touch-up cube, sphere and cylinder panel GUIs.

Fixed direct rendering label.

svn path=/trunk/KDE/kdebase/workspace/; revision=873233
icc-effect-5.14.5
Lucas Murray 2008-10-19 05:55:36 +00:00
parent 6152c37c77
commit e604a5214c
5 changed files with 584 additions and 527 deletions

View File

@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>568</width>
<height>595</height>
<width>546</width>
<height>566</height>
</rect>
</property>
<layout class="QVBoxLayout" >
@ -16,14 +16,6 @@
<number>0</number>
</property>
<widget class="QWidget" name="tab" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>546</width>
<height>552</height>
</rect>
</property>
<attribute name="title" >
<string>Tab 1</string>
</attribute>
@ -39,26 +31,46 @@
<property name="text" >
<string>Background Color:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>backgroundColorButton</cstring>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="KColorButton" name="backgroundColorButton" />
<widget class="KColorButton" name="backgroundColorButton" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Wallpaper:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>wallpaperRequester</cstring>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2" >
<widget class="KUrlRequester" name="wallpaperRequester" />
<item row="1" column="1" >
<widget class="KUrlRequester" name="wallpaperRequester" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
@ -74,13 +86,23 @@
<property name="text" >
<string>Screen edge:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>screenEdgeCombo</cstring>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QComboBox" name="screenEdgeCombo" />
<widget class="QComboBox" name="screenEdgeCombo" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2" >
<widget class="KWin::GlobalShortcutsEditor" native="1" name="editor" >
@ -120,6 +142,9 @@
<property name="text" >
<string>Rotation duration:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>rotationDurationSpin</cstring>
</property>
@ -127,6 +152,12 @@
</item>
<item row="2" column="1" >
<widget class="QSpinBox" name="rotationDurationSpin" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>100</width>
@ -155,7 +186,7 @@
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
<height>0</height>
</size>
</property>
</spacer>
@ -168,71 +199,36 @@
<property name="title" >
<string>Opacity</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3" >
<item>
<layout class="QVBoxLayout" name="verticalLayout_5" >
<item>
<widget class="QSlider" name="cubeOpacitySlider" >
<property name="minimumSize" >
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximum" >
<number>100</number>
</property>
<property name="singleStep" >
<number>1</number>
</property>
<property name="value" >
<number>100</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition" >
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval" >
<number>10</number>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6" >
<item>
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Transparent</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>Opaque</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
<layout class="QGridLayout" name="gridLayout_6" >
<item row="1" column="0" colspan="2" >
<widget class="QSlider" name="cubeOpacitySlider" >
<property name="minimumSize" >
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximum" >
<number>100</number>
</property>
<property name="singleStep" >
<number>1</number>
</property>
<property name="value" >
<number>100</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition" >
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval" >
<number>10</number>
</property>
</widget>
</item>
<item>
<item row="1" column="2" >
<widget class="QSpinBox" name="cubeOpacitySpin" >
<property name="minimumSize" >
<size>
@ -251,31 +247,53 @@
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Transparent</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>Opaque</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="4" column="0" colspan="2" >
<spacer name="verticalSpacer_3" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>545</width>
<height>553</height>
</rect>
</property>
<attribute name="title" >
<string>Tab 2</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3" >
<item>
<layout class="QGridLayout" name="gridLayout_7" >
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBox_3" >
<property name="title" >
<string>Caps</string>
</property>
<layout class="QGridLayout" name="gridLayout_4" >
<item row="0" column="0" >
<item row="0" column="0" colspan="2" >
<widget class="QCheckBox" name="cubeCapsBox" >
<property name="text" >
<string>Show caps</string>
@ -287,15 +305,25 @@
<property name="text" >
<string>Cap Color:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>capColorButton</cstring>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="KColorButton" name="capColorButton" />
<widget class="KColorButton" name="capColorButton" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="0" >
<item row="2" column="0" colspan="2" >
<widget class="QCheckBox" name="capsImageBox" >
<property name="text" >
<string>Display image on caps</string>
@ -305,13 +333,30 @@
</layout>
</widget>
</item>
<item>
<item row="1" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox_2" >
<property name="title" >
<string>Zoom</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2" >
<item>
<layout class="QGridLayout" name="gridLayout_8" >
<item row="1" column="0" >
<widget class="QLabel" name="label_8" >
<property name="text" >
<string>Near</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLabel" name="label_9" >
<property name="text" >
<string>Far</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2" >
<widget class="QSlider" name="zPositionSlider" >
<property name="toolTip" >
<string>Define how far away the object should appear</string>
@ -336,41 +381,23 @@
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2" >
<item>
<widget class="QLabel" name="label_8" >
<property name="text" >
<string>Near</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_9" >
<property name="text" >
<string>Far</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<item row="3" column="0" colspan="2" >
<spacer name="verticalSpacer" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1" >
<widget class="QGroupBox" name="groupBox_9" >
<property name="title" >
<string>Additional options</string>
@ -382,15 +409,15 @@
<string/>
</property>
<property name="text" >
<string>Show cube when desktop changed</string>
<string>Display the cube when switching desktops</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="bigCubeBox" >
<property name="toolTip" >
<string>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.</string>
<string>If enabled span the cube across all screens on a multiscreen setup, otherwise
the cube will only be displayed on a single screen</string>
</property>
<property name="text" >
<string>Span cube on all screens in multi screen setup</string>
@ -400,8 +427,8 @@ If not set cube will appear on only one screen and scaled so that all screens fi
<item>
<widget class="QCheckBox" name="closeOnMouseReleaseBox" >
<property name="toolTip" >
<string>Cube is deactivated after rotating the cube with the mouse.
Otherwise cube will stay in the position.</string>
<string>If enabled the effect will be deactivated after rotating the cube with the mouse,
otherwise it will remain active</string>
</property>
<property name="text" >
<string>Close after mouse dragging</string>
@ -411,26 +438,13 @@ Otherwise cube will stay in the position.</string>
<item>
<widget class="QCheckBox" name="walkThroughDesktopBox" >
<property name="text" >
<string>Use for walk through desktop list</string>
<string>Use this effect for walking through the desktops</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
@ -469,10 +483,11 @@ Otherwise cube will stay in the position.</string>
<tabstop>cubeCapsBox</tabstop>
<tabstop>capColorButton</tabstop>
<tabstop>capsImageBox</tabstop>
<tabstop>zPositionSlider</tabstop>
<tabstop>animateDesktopChangeBox</tabstop>
<tabstop>bigCubeBox</tabstop>
<tabstop>closeOnMouseReleaseBox</tabstop>
<tabstop>walkThroughDesktopBox</tabstop>
<tabstop>zPositionSlider</tabstop>
</tabstops>
<resources/>
<connections>

View File

@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>568</width>
<height>595</height>
<width>546</width>
<height>526</height>
</rect>
</property>
<layout class="QVBoxLayout" >
@ -16,14 +16,6 @@
<number>0</number>
</property>
<widget class="QWidget" name="tab" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>546</width>
<height>552</height>
</rect>
</property>
<attribute name="title" >
<string>Tab 1</string>
</attribute>
@ -39,26 +31,46 @@
<property name="text" >
<string>Background Color:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>backgroundColorButton</cstring>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="KColorButton" name="backgroundColorButton" />
<widget class="KColorButton" name="backgroundColorButton" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Wallpaper:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>wallpaperRequester</cstring>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2" >
<widget class="KUrlRequester" name="wallpaperRequester" />
<item row="1" column="1" >
<widget class="KUrlRequester" name="wallpaperRequester" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
@ -74,13 +86,23 @@
<property name="text" >
<string>Screen edge:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>screenEdgeCombo</cstring>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QComboBox" name="screenEdgeCombo" />
<widget class="QComboBox" name="screenEdgeCombo" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2" >
<widget class="KWin::GlobalShortcutsEditor" native="1" name="editor" >
@ -120,6 +142,9 @@
<property name="text" >
<string>Rotation duration:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>rotationDurationSpin</cstring>
</property>
@ -127,6 +152,12 @@
</item>
<item row="2" column="1" >
<widget class="QSpinBox" name="rotationDurationSpin" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>100</width>
@ -155,7 +186,7 @@
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
<height>0</height>
</size>
</property>
</spacer>
@ -168,71 +199,36 @@
<property name="title" >
<string>Opacity</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3" >
<item>
<layout class="QVBoxLayout" name="verticalLayout_5" >
<item>
<widget class="QSlider" name="cubeOpacitySlider" >
<property name="minimumSize" >
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximum" >
<number>100</number>
</property>
<property name="singleStep" >
<number>1</number>
</property>
<property name="value" >
<number>100</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition" >
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval" >
<number>10</number>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6" >
<item>
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Transparent</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>Opaque</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
<layout class="QGridLayout" name="gridLayout_6" >
<item row="1" column="0" colspan="2" >
<widget class="QSlider" name="cubeOpacitySlider" >
<property name="minimumSize" >
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximum" >
<number>100</number>
</property>
<property name="singleStep" >
<number>1</number>
</property>
<property name="value" >
<number>100</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition" >
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval" >
<number>10</number>
</property>
</widget>
</item>
<item>
<item row="1" column="2" >
<widget class="QSpinBox" name="cubeOpacitySpin" >
<property name="minimumSize" >
<size>
@ -251,31 +247,53 @@
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Transparent</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>Opaque</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="4" column="0" colspan="2" >
<spacer name="verticalSpacer_3" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>545</width>
<height>553</height>
</rect>
</property>
<attribute name="title" >
<string>Tab 2</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3" >
<item>
<layout class="QGridLayout" name="gridLayout_7" >
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBox_3" >
<property name="title" >
<string>Caps</string>
</property>
<layout class="QGridLayout" name="gridLayout_4" >
<item row="0" column="0" >
<item row="0" column="0" colspan="2" >
<widget class="QCheckBox" name="cubeCapsBox" >
<property name="text" >
<string>Show caps</string>
@ -287,15 +305,25 @@
<property name="text" >
<string>Cap Color:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>capColorButton</cstring>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="KColorButton" name="capColorButton" />
<widget class="KColorButton" name="capColorButton" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="0" >
<item row="2" column="0" colspan="2" >
<widget class="QCheckBox" name="capsImageBox" >
<property name="text" >
<string>Display image on caps</string>
@ -305,13 +333,30 @@
</layout>
</widget>
</item>
<item>
<item row="1" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox_2" >
<property name="title" >
<string>Zoom</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2" >
<item>
<layout class="QGridLayout" name="gridLayout_8" >
<item row="1" column="0" >
<widget class="QLabel" name="label_8" >
<property name="text" >
<string>Near</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLabel" name="label_9" >
<property name="text" >
<string>Far</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2" >
<widget class="QSlider" name="zPositionSlider" >
<property name="toolTip" >
<string>Define how far away the object should appear</string>
@ -336,41 +381,23 @@
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2" >
<item>
<widget class="QLabel" name="label_8" >
<property name="text" >
<string>Near</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_9" >
<property name="text" >
<string>Far</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<item row="3" column="0" colspan="2" >
<spacer name="verticalSpacer" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1" >
<widget class="QGroupBox" name="groupBox_9" >
<property name="title" >
<string>Additional options</string>
@ -379,8 +406,8 @@
<item>
<widget class="QCheckBox" name="closeOnMouseReleaseBox" >
<property name="toolTip" >
<string>Cylinder is deactivated after rotating the cylinder with the mouse.
Otherwise cylinder will stay in the position.</string>
<string>If enabled the effect will be deactivated after rotating the cylinder with the mouse,
otherwise it will remain active.</string>
</property>
<property name="text" >
<string>Close after mouse dragging</string>
@ -390,26 +417,29 @@ Otherwise cylinder will stay in the position.</string>
<item>
<widget class="QCheckBox" name="walkThroughDesktopBox" >
<property name="text" >
<string>Use for walk through desktop list</string>
<string>Use this effect for walking through the desktops</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_4" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
@ -448,8 +478,9 @@ Otherwise cylinder will stay in the position.</string>
<tabstop>cubeCapsBox</tabstop>
<tabstop>capColorButton</tabstop>
<tabstop>capsImageBox</tabstop>
<tabstop>zPositionSlider</tabstop>
<tabstop>closeOnMouseReleaseBox</tabstop>
<tabstop>walkThroughDesktopBox</tabstop>
<tabstop>zPositionSlider</tabstop>
</tabstops>
<resources/>
<connections>
@ -460,12 +491,12 @@ Otherwise cylinder will stay in the position.</string>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel" >
<x>386</x>
<y>175</y>
<x>524</x>
<y>96</y>
</hint>
<hint type="destinationlabel" >
<x>235</x>
<y>162</y>
<x>433</x>
<y>97</y>
</hint>
</hints>
</connection>
@ -476,12 +507,12 @@ Otherwise cylinder will stay in the position.</string>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel" >
<x>133</x>
<y>162</y>
<x>331</x>
<y>97</y>
</hint>
<hint type="destinationlabel" >
<x>386</x>
<y>175</y>
<x>524</x>
<y>96</y>
</hint>
</hints>
</connection>

View File

@ -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 );
}

View File

@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>568</width>
<height>595</height>
<width>546</width>
<height>526</height>
</rect>
</property>
<layout class="QVBoxLayout" >
@ -16,14 +16,6 @@
<number>0</number>
</property>
<widget class="QWidget" name="tab" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>546</width>
<height>552</height>
</rect>
</property>
<attribute name="title" >
<string>Tab 1</string>
</attribute>
@ -39,26 +31,46 @@
<property name="text" >
<string>Background Color:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>backgroundColorButton</cstring>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="KColorButton" name="backgroundColorButton" />
<widget class="KColorButton" name="backgroundColorButton" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Wallpaper:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>wallpaperRequester</cstring>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2" >
<widget class="KUrlRequester" name="wallpaperRequester" />
<item row="1" column="1" >
<widget class="KUrlRequester" name="wallpaperRequester" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
@ -74,13 +86,23 @@
<property name="text" >
<string>Screen edge:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>screenEdgeCombo</cstring>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QComboBox" name="screenEdgeCombo" />
<widget class="QComboBox" name="screenEdgeCombo" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2" >
<widget class="KWin::GlobalShortcutsEditor" native="1" name="editor" >
@ -108,18 +130,34 @@
</property>
</widget>
</item>
<item row="1" column="0" >
<item row="1" column="0" colspan="2" >
<widget class="QCheckBox" name="reflectionBox" >
<property name="text" >
<string>Reflection</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Rotation duration:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>rotationDurationSpin</cstring>
</property>
</widget>
</item>
<item row="1" column="1" >
<item row="2" column="1" >
<widget class="QSpinBox" name="rotationDurationSpin" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>100</width>
@ -140,7 +178,7 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2" >
<item row="3" column="0" colspan="2" >
<spacer name="verticalSpacer_2" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
@ -148,7 +186,7 @@
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
<height>0</height>
</size>
</property>
</spacer>
@ -161,71 +199,36 @@
<property name="title" >
<string>Opacity</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3" >
<item>
<layout class="QVBoxLayout" name="verticalLayout_5" >
<item>
<widget class="QSlider" name="cubeOpacitySlider" >
<property name="minimumSize" >
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximum" >
<number>100</number>
</property>
<property name="singleStep" >
<number>1</number>
</property>
<property name="value" >
<number>100</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition" >
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval" >
<number>10</number>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6" >
<item>
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Transparent</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>Opaque</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
<layout class="QGridLayout" name="gridLayout_6" >
<item row="1" column="0" colspan="2" >
<widget class="QSlider" name="cubeOpacitySlider" >
<property name="minimumSize" >
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximum" >
<number>100</number>
</property>
<property name="singleStep" >
<number>1</number>
</property>
<property name="value" >
<number>100</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition" >
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval" >
<number>10</number>
</property>
</widget>
</item>
<item>
<item row="1" column="2" >
<widget class="QSpinBox" name="cubeOpacitySpin" >
<property name="minimumSize" >
<size>
@ -244,31 +247,53 @@
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Transparent</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>Opaque</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="4" column="0" colspan="2" >
<spacer name="verticalSpacer_3" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>545</width>
<height>553</height>
</rect>
</property>
<attribute name="title" >
<string>Tab 2</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3" >
<item>
<layout class="QGridLayout" name="gridLayout_7" >
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBox_3" >
<property name="title" >
<string>Caps</string>
</property>
<layout class="QGridLayout" name="gridLayout_4" >
<item row="0" column="0" >
<item row="0" column="0" colspan="2" >
<widget class="QCheckBox" name="cubeCapsBox" >
<property name="text" >
<string>Show caps</string>
@ -280,101 +305,58 @@
<property name="text" >
<string>Cap Color:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>capColorButton</cstring>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="KColorButton" name="capColorButton" />
<widget class="KColorButton" name="capColorButton" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="0" >
<item row="2" column="0" colspan="2" >
<widget class="QCheckBox" name="capsImageBox" >
<property name="text" >
<string>Display image on caps</string>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="capDeformationLabel" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>Cap deformation:</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="buddy" >
<cstring>capDeformationSlider</cstring>
</property>
</widget>
</item>
<item row="3" column="1" >
<layout class="QVBoxLayout" name="verticalLayout_4" >
<item>
<widget class="QSlider" name="capDeformationSlider" >
<property name="maximum" >
<number>100</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition" >
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval" >
<number>25</number>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout" >
<item>
<widget class="QLabel" name="capDeformationSphereLabel" >
<property name="text" >
<string>Sphere</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="capDeformationPlaneLabel" >
<property name="text" >
<string>Plane</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<item row="4" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox_2" >
<property name="title" >
<string>Zoom</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2" >
<item>
<layout class="QGridLayout" name="gridLayout_8" >
<item row="1" column="0" >
<widget class="QLabel" name="label_8" >
<property name="text" >
<string>Near</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLabel" name="label_9" >
<property name="text" >
<string>Far</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2" >
<widget class="QSlider" name="zPositionSlider" >
<property name="toolTip" >
<string>Define how far away the object should appear</string>
@ -399,41 +381,23 @@
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2" >
<item>
<widget class="QLabel" name="label_8" >
<property name="text" >
<string>Near</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_9" >
<property name="text" >
<string>Far</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<item row="6" column="0" colspan="2" >
<spacer name="verticalSpacer" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1" >
<widget class="QGroupBox" name="groupBox_9" >
<property name="title" >
<string>Additional options</string>
@ -442,8 +406,8 @@
<item>
<widget class="QCheckBox" name="closeOnMouseReleaseBox" >
<property name="toolTip" >
<string>Sphere is deactivated after rotating the sphere with the mouse.
Otherwise sphere will stay in the position.</string>
<string>If enabled the effect will be deactivated after rotating the sphere with the mouse,
otherwise it will remain active</string>
</property>
<property name="text" >
<string>Close after mouse dragging</string>
@ -453,26 +417,71 @@ Otherwise sphere will stay in the position.</string>
<item>
<widget class="QCheckBox" name="walkThroughDesktopBox" >
<property name="text" >
<string>Use for walk through desktop list</string>
<string>Use this effect for walking through the desktops</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_4" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" colspan="2" >
<widget class="QGroupBox" name="capDeformationGroupBox" >
<property name="title" >
<string>Cap deformation</string>
</property>
<layout class="QGridLayout" name="gridLayout_9" >
<item row="0" column="0" colspan="2" >
<widget class="QSlider" name="capDeformationSlider" >
<property name="maximum" >
<number>100</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition" >
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval" >
<number>25</number>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="capDeformationSphereLabel" >
<property name="text" >
<string>Sphere</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLabel" name="capDeformationPlaneLabel" >
<property name="text" >
<string>Plane</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
@ -501,6 +510,7 @@ Otherwise sphere will stay in the position.</string>
<tabstops>
<tabstop>tabWidget</tabstop>
<tabstop>displayDesktopNameBox</tabstop>
<tabstop>reflectionBox</tabstop>
<tabstop>rotationDurationSpin</tabstop>
<tabstop>cubeOpacitySlider</tabstop>
<tabstop>cubeOpacitySpin</tabstop>
@ -510,9 +520,10 @@ Otherwise sphere will stay in the position.</string>
<tabstop>cubeCapsBox</tabstop>
<tabstop>capColorButton</tabstop>
<tabstop>capsImageBox</tabstop>
<tabstop>closeOnMouseReleaseBox</tabstop>
<tabstop>walkThroughDesktopBox</tabstop>
<tabstop>capDeformationSlider</tabstop>
<tabstop>zPositionSlider</tabstop>
<tabstop>closeOnMouseReleaseBox</tabstop>
</tabstops>
<resources/>
<connections>
@ -523,12 +534,12 @@ Otherwise sphere will stay in the position.</string>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel" >
<x>386</x>
<y>175</y>
<x>524</x>
<y>96</y>
</hint>
<hint type="destinationlabel" >
<x>235</x>
<y>162</y>
<x>433</x>
<y>97</y>
</hint>
</hints>
</connection>
@ -539,12 +550,12 @@ Otherwise sphere will stay in the position.</string>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel" >
<x>133</x>
<y>162</y>
<x>331</x>
<y>97</y>
</hint>
<hint type="destinationlabel" >
<x>386</x>
<y>175</y>
<x>524</x>
<y>96</y>
</hint>
</hints>
</connection>

View File

@ -107,7 +107,7 @@
<item row="2" column="0" colspan="2" >
<widget class="QCheckBox" name="glDirect" >
<property name="text" >
<string>Direct rendering</string>
<string>Enable direct rendering</string>
</property>
</widget>
</item>