[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdemultimedia/kioslave/audiocd
From: Jonathan Marten <jjm () keelhaul ! me ! uk>
Date: 2009-07-18 14:11:51
Message-ID: 1247926311.666293.5848.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 998761 by marten:
Remove explicit setting of margins and spacing, to get the style/platform
standard. Corrects spacing in the 4 tabs in KCM module "Advanced User
Settings - Audio CDs".
M +0 -24 kcmaudiocd/audiocdconfig.ui
M +1 -4 kcmaudiocd/kcmaudiocd.cpp
M +47 -14 plugins/lame/encoderlameconfig.ui
M +1 -22 plugins/vorbis/encodervorbisconfig.ui
--- trunk/KDE/kdemultimedia/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui #998760:998761
@@ -25,9 +25,6 @@
<string>&General</string>
</attribute>
<layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<item row="4" column="2" >
<spacer name="Spacer5" >
<property name="sizeHint" >
@@ -50,9 +47,6 @@
<string>Encoder Priority</string>
</property>
<layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<item rowspan="1" row="0" column="0" colspan="3" >
<widget class="QSlider" name="niceLevel" >
<property name="minimum" >
@@ -180,18 +174,12 @@
<string>&Names</string>
</attribute>
<layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<item row="0" column="0" >
<widget class="QGroupBox" name="fileNameGroupBox" >
<property name="title" >
<string>File Name (without extension)</string>
</property>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<item>
<widget class="QLabel" name="textLabel1_2" >
<property name="text" >
@@ -204,9 +192,6 @@
</item>
<item>
<layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<item row="6" column="1" >
<widget class="QLabel" name="textLabel13" >
<property name="text" >
@@ -361,9 +346,6 @@
<string>Name Regular Expression Replacement</string>
</property>
<layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<item row="1" column="0" >
<widget class="QLabel" name="textLabel2_2" >
<property name="text" >
@@ -486,9 +468,6 @@
<string>Album Name</string>
</property>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<item>
<widget class="QLabel" name="fileNameLabel_2" >
<property name="text" >
@@ -501,9 +480,6 @@
</item>
<item>
<layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<item rowspan="2" row="2" column="1" colspan="1" >
<widget class="QLabel" name="textLabel20" >
<property name="text" >
--- trunk/KDE/kdemultimedia/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp #998760:998761
@@ -48,12 +48,9 @@
KAudiocdModule::KAudiocdModule(QWidget *parent, const QVariantList &lst)
: KCModule(KAudiocdFactory::componentData(), parent, lst), configChanged(false)
{
- QVBoxLayout *box=new QVBoxLayout(this);
- box->setSpacing(KDialog::spacingHint());
- box->setMargin(0);
+ QVBoxLayout *box = new QVBoxLayout(this);
audioConfig = new AudiocdConfig(this);
- QString foo = i18n("Report errors found on the cd.");
box->addWidget(audioConfig);
setButtons(Default|Apply);
--- trunk/KDE/kdemultimedia/kioslave/audiocd/plugins/lame/encoderlameconfig.ui #998760:998761
@@ -87,26 +87,30 @@
</property>
</widget>
</item>
+ <item>
+ <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>
</layout>
</widget>
</item>
<item row="0" column="0" >
- <widget class="Q3ButtonGroup" name="buttonGroup1" >
+ <widget class="QGroupBox" name="buttonGroup1" >
<property name="title" >
<string>Encoding Method</string>
</property>
<layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <item rowspan="1" row="3" column="0" colspan="3" >
+ <item rowspan="1" row="4" column="0" colspan="3" >
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QLabel" name="TextLabel3_2" >
<property name="text" >
@@ -151,7 +155,7 @@
</item>
</layout>
</item>
- <item rowspan="1" row="2" column="0" colspan="3" >
+ <item rowspan="1" row="3" column="0" colspan="3" >
<widget class="QLabel" name="TextLabel1_2" >
<property name="text" >
<string>&Quality:</string>
@@ -211,6 +215,35 @@
</property>
</widget>
</item>
+ <item row="2" column="0">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>6</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="5" column="0">
+ <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>
</layout>
</widget>
</item>
@@ -248,10 +281,10 @@
<item row="3" column="0" >
<widget class="QCheckBox" name="kcfg_vbr_average_br" >
<property name="text" >
- <string>Specify avera&ge bitrate:</string>
+ <string>Avera&ge bitrate:</string>
</property>
<property name="whatsThis" stdset="0" >
- <string>This selects the maximal bitrate used for encoding.</string>
+ <string>This selects the average bitrate used for encoding.</string>
</property>
</widget>
</item>
--- trunk/KDE/kdemultimedia/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui \
#998760:998761 @@ -11,14 +11,11 @@
</property>
<layout class="QVBoxLayout" >
<item>
- <widget class="Q3ButtonGroup" name="kcfg_vorbis_enc_method" >
+ <widget class="QGroupBox" name="kcfg_vorbis_enc_method" >
<property name="title" >
<string>&Encoding Method</string>
</property>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<item>
<widget class="QRadioButton" name="vorbis_enc_quality" >
<property name="text" >
@@ -48,12 +45,6 @@
<string>Vorbis Bitrate Settings</string>
</property>
<layout class="QGridLayout" >
- <property name="margin" >
- <number>11</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item row="0" column="1" >
<widget class="QComboBox" name="kcfg_vorbis_min_br" >
<property name="enabled" >
@@ -288,12 +279,6 @@
<string>You can set the quality of the encoded stream here. A higher value implies \
a higher quality but encodes slower.</string> </property>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>11</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="KDoubleNumInput" name="kcfg_vorbis_quality" >
<property name="value" >
@@ -322,12 +307,6 @@
<string>Options</string>
</property>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>11</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QCheckBox" name="kcfg_vorbis_comments" >
<property name="enabled" >
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic