Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Group the input options in the rip cd dialog. Disable input and output groups when there is a ripping in progress.

This commit is contained in:
Mattias Andersson 2014-01-26 21:14:42 +01:00
parent 76a91ded88
commit a31223e45c
2 changed files with 262 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/ripcd.cpp
View File

@ -414,6 +414,8 @@ void RipCD::SetWorking(bool working) {
rip_button_->setVisible(!working); rip_button_->setVisible(!working);
cancel_button_->setVisible(working); cancel_button_->setVisible(working);
close_button_->setVisible(!working); close_button_->setVisible(!working);
ui_->input_group->setEnabled(!working);
ui_->output_group->setEnabled(!working);
ui_->progress_group->setVisible(true); ui_->progress_group->setVisible(true);
} }

550
src/ui/ripcd.ui
View File

@ -9,8 +9,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>601</width> <width>522</width>
<height>575</height> <height>563</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -20,294 +20,264 @@
<iconset> <iconset>
<normaloff>:/icon.png</normaloff>:/icon.png</iconset> <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
</property> </property>
<widget class="QDialogButtonBox" name="button_box"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="geometry"> <item>
<rect> <widget class="QGroupBox" name="input_group">
<x>240</x> <property name="title">
<y>530</y> <string>Input options</string>
<width>341</width> </property>
<height>32</height> <layout class="QVBoxLayout" name="verticalLayout">
</rect> <item>
</property> <layout class="QGridLayout" name="gridLayout_3">
<property name="orientation"> <item row="1" column="0">
<enum>Qt::Horizontal</enum> <widget class="QTableWidget" name="tableWidget">
</property> <property name="sizePolicy">
<property name="standardButtons"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
</widget> </sizepolicy>
<widget class="QWidget" name="gridLayoutWidget"> </property>
<property name="geometry"> <property name="columnCount">
<rect> <number>4</number>
<x>10</x> </property>
<y>210</y> <attribute name="horizontalHeaderVisible">
<width>571</width> <bool>true</bool>
<height>101</height> </attribute>
</rect> <attribute name="horizontalHeaderMinimumSectionSize">
</property> <number>10</number>
<layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0,0"> </attribute>
<property name="bottomMargin"> <attribute name="verticalHeaderVisible">
<number>0</number> <bool>false</bool>
</property> </attribute>
<item row="2" column="3" alignment="Qt::AlignLeft"> <attribute name="verticalHeaderShowSortIndicator" stdset="0">
<widget class="QLabel" name="year_label"> <bool>false</bool>
<property name="text"> </attribute>
<string>Year</string> <column>
</property> <property name="text">
</widget> <string>Rip</string>
</item> </property>
<item row="2" column="5"> </column>
<widget class="QLabel" name="disc_label"> <column>
<property name="text"> <property name="text">
<string>Disc</string> <string>Track</string>
</property> </property>
</widget> </column>
</item> <column>
<item row="0" column="0"> <property name="text">
<widget class="QLabel" name="album_label"> <string>Title</string>
<property name="text"> </property>
<string>Album</string> </column>
</property> <column>
</widget> <property name="text">
</item> <string>Duration</string>
<item row="0" column="1" colspan="6"> </property>
<widget class="QLineEdit" name="albumLineEdit"/> </column>
</item> </widget>
<item row="2" column="6"> </item>
<widget class="QLineEdit" name="discLineEdit"> <item row="2" column="0">
<property name="sizePolicy"> <layout class="QHBoxLayout" name="horizontalLayout">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <item>
<horstretch>0</horstretch> <widget class="QPushButton" name="select_all_button">
<verstretch>0</verstretch> <property name="text">
</sizepolicy> <string>Select All</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="4" alignment="Qt::AlignLeft"> <item>
<widget class="QLineEdit" name="yearLineEdit"/> <widget class="QPushButton" name="select_none_button">
</item> <property name="text">
<item row="1" column="0"> <string>Select None</string>
<widget class="QLabel" name="artist_label"> </property>
<property name="text"> </widget>
<string>Artist</string> </item>
</property> <item>
</widget> <widget class="QPushButton" name="invert_selection_button">
</item> <property name="text">
<item row="2" column="1" colspan="2"> <string>Invert Selection</string>
<widget class="QLineEdit" name="genreLineEdit"/> </property>
</item> </widget>
<item row="2" column="0" alignment="Qt::AlignLeft"> </item>
<widget class="QLabel" name="genre_label"> <item>
<property name="text"> <spacer name="horizontalSpacer">
<string>Genre</string> <property name="orientation">
</property> <enum>Qt::Horizontal</enum>
</widget> </property>
</item> <property name="sizeHint" stdset="0">
<item row="1" column="1" colspan="6"> <size>
<widget class="QLineEdit" name="artistLineEdit"/> <width>40</width>
</item> <height>20</height>
</layout> </size>
</widget> </property>
<widget class="QWidget" name="gridLayoutWidget_2"> </spacer>
<property name="geometry"> </item>
<rect> </layout>
<x>10</x> </item>
<y>10</y> </layout>
<width>571</width> </item>
<height>171</height> <item>
</rect> <layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0,0">
</property> <property name="bottomMargin">
<layout class="QGridLayout" name="gridLayout_3"> <number>0</number>
<item row="0" column="0"> </property>
<widget class="QTableWidget" name="tableWidget"> <item row="2" column="3" alignment="Qt::AlignLeft">
<property name="columnCount"> <widget class="QLabel" name="year_label">
<number>4</number> <property name="text">
</property> <string>Year</string>
<attribute name="horizontalHeaderVisible"> </property>
<bool>true</bool> </widget>
</attribute> </item>
<attribute name="horizontalHeaderMinimumSectionSize"> <item row="2" column="5">
<number>10</number> <widget class="QLabel" name="disc_label">
</attribute> <property name="text">
<attribute name="verticalHeaderVisible"> <string>Disc</string>
<bool>false</bool> </property>
</attribute> </widget>
<attribute name="verticalHeaderShowSortIndicator" stdset="0"> </item>
<bool>false</bool> <item row="0" column="0">
</attribute> <widget class="QLabel" name="album_label">
<column> <property name="text">
<property name="text"> <string>Album</string>
<string>Rip</string> </property>
</property> </widget>
</column> </item>
<column> <item row="0" column="1" colspan="6">
<property name="text"> <widget class="QLineEdit" name="albumLineEdit"/>
<string>Track</string> </item>
</property> <item row="2" column="6">
</column> <widget class="QLineEdit" name="discLineEdit">
<column> <property name="sizePolicy">
<property name="text"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<string>Title</string> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
</column> </sizepolicy>
<column> </property>
<property name="text"> </widget>
<string>Duration</string> </item>
</property> <item row="2" column="4" alignment="Qt::AlignLeft">
</column> <widget class="QLineEdit" name="yearLineEdit"/>
</widget> </item>
</item> <item row="1" column="0">
</layout> <widget class="QLabel" name="artist_label">
</widget> <property name="text">
<widget class="QGroupBox" name="output_group"> <string>Artist</string>
<property name="geometry"> </property>
<rect> </widget>
<x>10</x> </item>
<y>320</y> <item row="2" column="1" colspan="2">
<width>571</width> <widget class="QLineEdit" name="genreLineEdit"/>
<height>131</height> </item>
</rect> <item row="2" column="0" alignment="Qt::AlignLeft">
</property> <widget class="QLabel" name="genre_label">
<property name="title"> <property name="text">
<string>Output options</string> <string>Genre</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> </widget>
<item row="2" column="2"> </item>
<widget class="QPushButton" name="select"> <item row="1" column="1" colspan="6">
<property name="text"> <widget class="QLineEdit" name="artistLineEdit"/>
<string>Select...</string> </item>
</property> </layout>
</widget> </item>
</item> </layout>
<item row="0" column="0"> </widget>
<widget class="QLabel" name="label_3"> </item>
<property name="text"> <item>
<string>File Format</string> <widget class="QGroupBox" name="output_group">
</property> <property name="title">
</widget> <string>Output options</string>
</item> </property>
<item row="0" column="1" colspan="2"> <layout class="QGridLayout" name="gridLayout">
<widget class="QLineEdit" name="format_filename"> <item row="2" column="2">
<property name="text"> <widget class="QPushButton" name="select">
<string notr="true">%tracknum% - %artist% - %track%</string> <property name="text">
</property> <string>Select...</string>
</widget> </property>
</item> </widget>
<item row="2" column="0"> </item>
<widget class="QLabel" name="label_2"> <item row="0" column="0">
<property name="text"> <widget class="QLabel" name="label_3">
<string>Destination</string> <property name="text">
</property> <string>File Format</string>
</widget> </property>
</item> </widget>
<item row="1" column="1"> </item>
<widget class="QComboBox" name="format"> <item row="0" column="1" colspan="2">
<property name="sizePolicy"> <widget class="QLineEdit" name="format_filename">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <property name="text">
<horstretch>0</horstretch> <string notr="true">%tracknum% - %artist% - %track%</string>
<verstretch>0</verstretch> </property>
</sizepolicy> </widget>
</property> </item>
</widget> <item row="2" column="0">
</item> <widget class="QLabel" name="label_2">
<item row="2" column="1"> <property name="text">
<widget class="QComboBox" name="destination"> <string>Destination</string>
<property name="enabled"> </property>
<bool>true</bool> </widget>
</property> </item>
<property name="sizePolicy"> <item row="1" column="1">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <widget class="QComboBox" name="format">
<horstretch>0</horstretch> <property name="sizePolicy">
<verstretch>0</verstretch> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
</sizepolicy> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
</widget> </sizepolicy>
</item> </property>
<item row="1" column="2"> </widget>
<widget class="QPushButton" name="options"> </item>
<property name="text"> <item row="2" column="1">
<string>Options...</string> <widget class="QComboBox" name="destination">
</property> <property name="enabled">
</widget> <bool>true</bool>
</item> </property>
<item row="1" column="0"> <property name="sizePolicy">
<widget class="QLabel" name="label"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<property name="text"> <horstretch>0</horstretch>
<string>Audio format</string> <verstretch>0</verstretch>
</property> </sizepolicy>
</widget> </property>
</item> </widget>
</layout> </item>
</widget> <item row="1" column="2">
<widget class="QGroupBox" name="progress_group"> <widget class="QPushButton" name="options">
<property name="geometry"> <property name="text">
<rect> <string>Options...</string>
<x>10</x> </property>
<y>450</y> </widget>
<width>571</width> </item>
<height>41</height> <item row="1" column="0">
</rect> <widget class="QLabel" name="label">
</property> <property name="text">
<property name="title"> <string>Audio format</string>
<string>Progress</string> </property>
</property> </widget>
<widget class="QProgressBar" name="progress_bar"> </item>
<property name="geometry"> </layout>
<rect> </widget>
<x>10</x> </item>
<y>20</y> <item>
<width>551</width> <widget class="QGroupBox" name="progress_group">
<height>23</height> <property name="title">
</rect> <string>Progress</string>
</property> </property>
</widget> <layout class="QVBoxLayout" name="verticalLayout_3">
</widget> <item>
<widget class="QWidget" name="horizontalLayoutWidget"> <widget class="QProgressBar" name="progress_bar"/>
<property name="geometry"> </item>
<rect> </layout>
<x>10</x> </widget>
<y>180</y> </item>
<width>571</width> <item>
<height>31</height> <widget class="QDialogButtonBox" name="button_box">
</rect> <property name="orientation">
</property> <enum>Qt::Horizontal</enum>
<layout class="QHBoxLayout" name="horizontalLayout"> </property>
<item> <property name="standardButtons">
<widget class="QPushButton" name="select_all_button"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set>
<property name="text"> </property>
<string>Select All</string> </widget>
</property> </item>
</widget> </layout>
</item>
<item>
<widget class="QPushButton" name="select_none_button">
<property name="text">
<string>Select None</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="invert_selection_button">
<property name="text">
<string>Invert Selection</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>
</layout>
</widget>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>tableWidget</tabstop> <tabstop>tableWidget</tabstop>