[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/workspace/plasma/shells/desktop
From: Marco Martin <notmart () gmail ! com>
Date: 2008-08-24 20:25:41
Message-ID: 1219609541.415137.1549.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 851880 by mart:
better alignment of the interface elements to conform the hig
M +157 -152 BackgroundDialog.ui
M +5 -5 backgrounddialog.cpp
--- trunk/KDE/kdebase/workspace/plasma/shells/desktop/BackgroundDialog.ui #851879:851880
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>644</width>
- <height>424</height>
+ <width>530</width>
+ <height>325</height>
</rect>
</property>
<property name="sizePolicy" >
@@ -21,96 +21,101 @@
<height>700</height>
</size>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2" >
- <item>
- <widget class="QGroupBox" name="m_wallpaperGroupBox" >
+ <layout class="QGridLayout" name="gridLayout" >
+ <item row="0" column="0" colspan="4" >
+ <widget class="QLabel" name="label" >
<property name="sizePolicy" >
- <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
- <verstretch>10</verstretch>
+ <verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title" >
+ <property name="font" >
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text" >
<string>Wallpaper</string>
</property>
- <property name="flat" >
- <bool>true</bool>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_2" >
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="3" >
+ <widget class="QWidget" native="1" name="m_wallpaperGroup" >
+ <layout class="QVBoxLayout" name="verticalLayout" >
+ <property name="spacing" >
+ <number>4</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout" >
- <item>
- <layout class="QVBoxLayout" name="m_wallpaperLayout" >
- <item>
- <widget class="QComboBox" name="m_mode" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>350</width>
- <height>0</height>
- </size>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QWidget" native="1" name="m_wallpaperConfig" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout" >
- <item>
- <widget class="QLabel" name="m_monitor" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Monitor</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>156</width>
- <height>58</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
+ <widget class="QComboBox" name="m_mode" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>350</width>
+ <height>0</height>
+ </size>
+ </property>
+ </widget>
</item>
+ <item>
+ <widget class="QWidget" native="1" name="m_wallpaperConfig" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
- <item>
+ <item rowspan="6" row="1" column="3" >
+ <layout class="QVBoxLayout" name="verticalLayout_2" >
+ <item>
+ <widget class="QLabel" name="m_monitor" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Monitor</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_2" >
+ <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>
+ </item>
+ <item row="2" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
@@ -120,94 +125,94 @@
</property>
<property name="sizeHint" stdset="0" >
<size>
- <width>636</width>
+ <width>10</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
- <item>
- <widget class="QGroupBox" name="desktopGroupBox" >
- <property name="title" >
+ <item row="3" column="0" >
+ <widget class="QLabel" name="label_2" >
+ <property name="font" >
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text" >
<string>Desktop Theme</string>
</property>
- <property name="flat" >
- <bool>true</bool>
+ </widget>
+ </item>
+ <item row="4" column="0" >
+ <widget class="QLabel" name="label_3" >
+ <property name="text" >
+ <string>Theme:</string>
</property>
- <property name="checkable" >
- <bool>false</bool>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <layout class="QHBoxLayout" >
- <item>
- <widget class="QLabel" name="label_3" >
- <property name="text" >
- <string>Theme:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="m_theme" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="m_newThemeButton" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="text" >
- <string>New Theme...</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
+ <property name="buddy" >
+ <cstring>m_theme</cstring>
+ </property>
</widget>
</item>
- <item>
- <widget class="QGroupBox" name="containmentGroupBox" >
- <property name="title" >
- <string>Desktop Containment</string>
+ <item row="4" column="1" >
+ <widget class="QComboBox" name="m_theme" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="flat" >
+ </widget>
+ </item>
+ <item row="4" column="2" >
+ <widget class="QPushButton" name="m_newThemeButton" >
+ <property name="enabled" >
<bool>true</bool>
</property>
- <property name="checkable" >
- <bool>false</bool>
+ <property name="text" >
+ <string>New Theme...</string>
</property>
- <layout class="QGridLayout" name="_2" >
- <item row="0" column="0" >
- <layout class="QHBoxLayout" name="_3" >
- <item>
- <widget class="QLabel" name="label_4" >
- <property name="text" >
- <string>Containment:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="m_containmentComboBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
</widget>
</item>
+ <item row="5" column="0" colspan="3" >
+ <widget class="QLabel" name="label_5" >
+ <property name="font" >
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text" >
+ <string>Desktop activity</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0" >
+ <widget class="QLabel" name="label_4" >
+ <property name="text" >
+ <string>Activity:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy" >
+ <cstring>m_containmentComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1" colspan="2" >
+ <widget class="QComboBox" name="m_containmentComboBox" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<resources/>
--- trunk/KDE/kdebase/workspace/plasma/shells/desktop/backgrounddialog.cpp #851879:851880
@@ -501,8 +501,8 @@
QWidget* w = 0;
WallpaperInfo wallpaperInfo = m_mode->itemData(mode).value<WallpaperInfo>();
- if (m_wallpaperLayout->count() > 1) {
- delete dynamic_cast<QWidgetItem*>(m_wallpaperLayout->takeAt(1))->widget();
+ if (m_wallpaperGroup->layout()->count() > 1) {
+ delete dynamic_cast<QWidgetItem*>(m_wallpaperGroup->layout()->takeAt(1))->widget();
}
if (m_wallpaper && m_wallpaper->pluginName() != wallpaperInfo.first) {
delete m_wallpaper;
@@ -516,12 +516,12 @@
KConfigGroup cfg = m_containment->config();
kDebug() << "making a" << wallpaperInfo.first << "in modD" << wallpaperInfo.second;
m_wallpaper->restore(KConfigGroup(&cfg, "Wallpaper"), wallpaperInfo.second);
- w = m_wallpaper->createConfigurationInterface(m_wallpaperGroupBox);
+ w = m_wallpaper->createConfigurationInterface(m_wallpaperGroup);
}
if (!w) {
- w = new QWidget(m_wallpaperGroupBox);
+ w = new QWidget(m_wallpaperGroup);
}
- m_wallpaperLayout->addWidget(w);
+ m_wallpaperGroup->layout()->addWidget(w);
}
void BackgroundDialog::saveConfig()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic