Re-arange layouts so that note labels are in correct place if make OSX

pref dialog not do its resize thingy...
This commit is contained in:
Craig Drummond
2015-07-23 21:01:01 +01:00
parent 2a3a7cf969
commit ea4cd5ce04
3 changed files with 58 additions and 48 deletions

View File

@@ -6,11 +6,14 @@
<rect>
<x>0</x>
<y>0</y>
<width>569</width>
<height>379</height>
<width>1413</width>
<height>462</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<property name="leftMargin">
<number>0</number>
</property>
@@ -23,49 +26,46 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="storeCoversInMpdDir">
<property name="text">
<string>Save downloaded covers, artist, and composer images, in music folder</string>
</property>
</widget>
</item>
<item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="storeLyricsInMpdDir">
<property name="text">
<string>Save downloaded lyrics in music folder</string>
</property>
</widget>
</item>
<item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="storeBackdropsInMpdDir">
<property name="text">
<string>Save downloaded backdrops in music folder</string>
</property>
</widget>
</item>
<item>
<item row="3" column="0" colspan="2">
<widget class="NoteLabel" name="label_2">
<property name="text">
<string>If you elect to have Cantata store covers, lyrics, or backdrops, within the music folder, and you do not have write access to this folder, then Cantata will revert to saving the files in your personal cache folder.</string>
</property>
</widget>
</item>
<item>
<item row="4" column="0" colspan="2">
<widget class="NoteLabel" name="persNote_2">
<property name="text">
<string>Cantata can only save backdrops, artist, and composer images within the music folder hierarchy if this is 2 levels deep. i.e. 'Artist/Album/Tracks'.</string>
</property>
</widget>
</item>
<item>
<item row="5" column="0" colspan="2">
<spacer name="expandingSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>

View File

@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>698</width>
<width>1487</width>
<height>495</height>
</rect>
</property>
@@ -35,7 +35,7 @@
<item row="0" column="0">
<widget class="BuddyLabel" name="label_6b">
<property name="text">
<string>Fadeout on stop:</string>
<string>Fa&amp;deout on stop:</string>
</property>
<property name="buddy">
<cstring>stopFadeDuration</cstring>
@@ -44,12 +44,12 @@
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="stopFadeDuration">
<property name="suffix">
<string> ms</string>
</property>
<property name="specialValueText">
<string>None</string>
</property>
<property name="suffix">
<string> ms</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
@@ -78,6 +78,12 @@
</item>
<item>
<widget class="QGroupBox" name="outputBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Output</string>
</property>
@@ -103,7 +109,7 @@
<item row="0" column="0">
<widget class="BuddyLabel" name="crossfadingLabel">
<property name="text">
<string>Crossfade between tracks:</string>
<string>&amp;Crossfade between tracks:</string>
</property>
<property name="buddy">
<cstring>crossfading</cstring>
@@ -112,21 +118,21 @@
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="crossfading">
<property name="specialValueText">
<string>None</string>
</property>
<property name="suffix">
<string> s</string>
</property>
<property name="maximum">
<number>20</number>
</property>
<property name="specialValueText">
<string>None</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="BuddyLabel" name="replayGainLabel">
<property name="text">
<string>Replay gain:</string>
<string>Replay &amp;gain:</string>
</property>
<property name="buddy">
<cstring>replayGain</cstring>

View File

@@ -6,49 +6,54 @@
<rect>
<x>0</x>
<y>0</y>
<width>416</width>
<height>345</height>
<width>1406</width>
<height>274</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<item>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="BuddyLabel" name="label_5">
<property name="text">
<string>Network &amp;interface:</string>
</property>
<item row="1" column="0">
<widget class="BuddyLabel" name="label_5">
<property name="text">
<string>Network interface:</string>
</property>
<property name="buddy">
<cstring>httpInterface</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="httpInterface"/>
</item>
</layout>
<property name="buddy">
<cstring>httpInterface</cstring>
</property>
</widget>
</item>
<item>
<item row="0" column="1">
<widget class="QComboBox" name="httpInterface"/>
</item>
<item row="1" column="0" colspan="2">
<widget class="NoteLabel" name="label_4">
<property name="text">
<string>MPD usually only plays songs that are stored within its folders. Cantata contains a minimal HTTP server that can be used to serve other files to MPD. This, however, will only work whilst Cantata is running.</string>
</property>
</widget>
</item>
<item>
<item row="2" column="0" colspan="2">
<widget class="NoteLabel" name="label_4b">
<property name="text">
<string>If you choose 'Local loopback' for 'Network interface', then MPD &lt;b&gt;must&lt;/b&gt; also be on this computer.</string>
</property>
</widget>
</item>
<item>
<item row="3" column="0" colspan="2">
<spacer name="expandingSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -75,7 +80,6 @@
<header>widgets/notelabel.h</header>
</customwidget>
</customwidgets>
<tabstops/>
<resources/>
<connections/>
</ui>