[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [artikulate] src/ui: Make dialog prettier.
From: Andreas Cord-Landwehr <cordlandwehr () kde ! org>
Date: 2013-05-25 11:52:24
Message-ID: 20130525115224.A7128A6081 () git ! kde ! org
[Download RAW message or body]
Git commit 18bfbfed9df17f20adc44f9bf138954446f3487b by Andreas Cord-Landwehr.
Committed on 25/05/2013 at 00:18.
Pushed by cordlandwehr into branch 'master'.
Make dialog prettier.
M +5 -0 src/ui/sounddevicedialogpage.cpp
M +160 -98 src/ui/sounddevicedialogpage.ui
http://commits.kde.org/artikulate/18bfbfed9df17f20adc44f9bf138954446f3487b
diff --git a/src/ui/sounddevicedialogpage.cpp b/src/ui/sounddevicedialogpage.cpp
index 6f8930b..366a7e6 100644
--- a/src/ui/sounddevicedialogpage.cpp
+++ b/src/ui/sounddevicedialogpage.cpp
@@ -31,6 +31,11 @@ SoundDeviceDialogPage::SoundDeviceDialogPage()
ui = new Ui::SoundDeviceDialogPage;
ui->setupUi(this);
+ // set buttons
+ ui->buttonPlayTestSound->setIcon(KIcon("media-playback-start"));
+ ui->buttonPlayRecordedTestSound->setIcon(KIcon("media-playback-start"));
+ ui->buttonRecordTestSound->setIcon(KIcon("media-record"));
+
// set input volume slider
ui->kcfg_AudioInputVolume->setTickInterval(1);
ui->kcfg_AudioInputVolume->setMinimum(1);
diff --git a/src/ui/sounddevicedialogpage.ui b/src/ui/sounddevicedialogpage.ui
index 67db9ff..ec0f473 100644
--- a/src/ui/sounddevicedialogpage.ui
+++ b/src/ui/sounddevicedialogpage.ui
@@ -6,11 +6,55 @@
<rect>
<x>0</x>
<y>0</y>
- <width>325</width>
- <height>281</height>
+ <width>367</width>
+ <height>254</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="boxSpeakers">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Speakers</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="1">
+ <widget class="QLabel" name="labelOutputVolume">
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Volume</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QSlider" name="kcfg_AudioOutputVolume">
+ <property name="maximumSize">
+ <size>
+ <width>200</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
<item row="0" column="0">
<widget class="QGroupBox" name="boxMicrophone">
<property name="sizePolicy">
@@ -22,14 +66,17 @@
<property name="title">
<string>Microphone</string>
</property>
- <layout class="QFormLayout" name="formLayout">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::ExpandingFieldsGrow</enum>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="labelInputDevice">
- <property name="text">
- <string>Input Device</string>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="1" column="1">
+ <widget class="QSlider" name="kcfg_AudioInputVolume">
+ <property name="maximumSize">
+ <size>
+ <width>200</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
@@ -41,119 +88,134 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>200</width>
+ <height>16777215</height>
+ </size>
+ </property>
</widget>
</item>
- <item row="2" column="0">
+ <item row="1" column="0">
<widget class="QLabel" name="labelVolume">
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
<property name="text">
<string>Volume</string>
</property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QSlider" name="kcfg_AudioInputVolume">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item row="0" column="0">
+ <widget class="QLabel" name="labelInputDevice">
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="text">
+ <string>Input Device</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
- <item row="2" column="0">
+ <item row="3" column="0">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
- <item row="4" column="0">
- <layout class="QGridLayout" name="gridLayout">
- <item row="1" column="3">
- <widget class="QToolButton" name="buttonPlayRecordedTestSound">
- <property name="toolTip">
- <string>Play recorded test sound.</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QToolButton" name="buttonRecordTestSound">
- <property name="toolTip">
- <string>Record test sound.</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="labelPlayTestSound">
- <property name="text">
- <string>Play Test Sound</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QToolButton" name="buttonPlayTestSound">
- <property name="toolTip">
- <string>Play test sound.</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="labelRecordTestSound">
- <property name="text">
- <string>Record Test Sound</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="labelTestSoundSettings">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Test Sound Settings</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QGroupBox" name="boxSpeakers">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>Speakers</string>
- </property>
- <layout class="QFormLayout" name="formLayout_2">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::ExpandingFieldsGrow</enum>
+ <item row="5" column="0">
+ <widget class="QWidget" name="" native="true">
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
</property>
- <item row="1" column="0">
- <widget class="QLabel" name="labelOutputVolume">
+ <item row="1" column="1">
+ <widget class="QLabel" name="labelPlayTestSound">
<property name="text">
- <string>Volume</string>
+ <string>Play Test Sound</string>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QSlider" name="kcfg_AudioOutputVolume">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item row="1" column="2">
+ <widget class="QToolButton" name="buttonPlayTestSound">
+ <property name="toolTip">
+ <string>Play test sound.</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLabel" name="labelRecordTestSound">
+ <property name="text">
+ <string>Record Test Sound</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="3">
+ <widget class="QToolButton" name="buttonPlayRecordedTestSound">
+ <property name="toolTip">
+ <string>Play recorded test sound.</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <widget class="QToolButton" name="buttonRecordTestSound">
+ <property name="toolTip">
+ <string>Record test sound.</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLabel" name="labelTestSoundSettings">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Test Sound Settings</string>
</property>
</widget>
</item>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic