[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/traverso ExportWidget.cpp ExportWi...
|
From: |
Ben Levitt |
|
Subject: |
[Traverso-commit] traverso/src/traverso ExportWidget.cpp ExportWi... |
|
Date: |
Wed, 23 May 2007 17:51:46 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Ben Levitt <benjie> 07/05/23 17:51:46
Modified files:
src/traverso : ExportWidget.cpp ExportWidget.h
src/traverso/ui: ExportWidget.ui
Log message:
Slight Export dialog ui changes
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.cpp?cvsroot=traverso&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.h?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ExportWidget.ui?cvsroot=traverso&r1=1.13&r2=1.14
Patches:
Index: ExportWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- ExportWidget.cpp 23 May 2007 16:32:30 -0000 1.37
+++ ExportWidget.cpp 23 May 2007 17:51:45 -0000 1.38
@@ -135,6 +135,7 @@
connect(startButton, SIGNAL(clicked()), this,
SLOT(start_burn_process()));
connect(stopButton, SIGNAL(clicked()), this, SLOT(stop_burn_process()));
connect(refreshButton, SIGNAL(clicked()), this, SLOT(query_devices()));
+ connect(cdDiskExportOnlyCheckBox, SIGNAL(stateChanged(int)), this,
SLOT(export_only_changed(int)));
query_devices();
}
@@ -770,11 +771,21 @@
}
}
+void ExportWidget::export_only_changed(int state)
+{
+ if (state == Qt::Checked) {
+ burnGroupBox->setEnabled(false);
+ } else {
+ burnGroupBox->setEnabled(true);
+ }
+}
+
void ExportWidget::disable_ui_interaction()
{
closeButton->setEnabled(false);
exportWidget->setEnabled(false);
optionsGroupBox->setEnabled(false);
+ burnGroupBox->setEnabled(false);
startButton->hide();
stopButton->show();
}
@@ -784,6 +795,7 @@
m_writingState = NO_STATE;
exportWidget->setEnabled(true);
optionsGroupBox->setEnabled(true);
+ burnGroupBox->setEnabled(true);
closeButton->setEnabled(true);
startButton->show();
stopButton->hide();
Index: ExportWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ExportWidget.h 15 May 2007 14:28:12 -0000 1.10
+++ ExportWidget.h 23 May 2007 17:51:45 -0000 1.11
@@ -86,6 +86,7 @@
void on_exportStartButton_clicked();
void on_exportStopButton_clicked();
void on_cancelButton_clicked();
+ void export_only_changed(int state);
void start_burn_process();
void stop_burn_process();
Index: ui/ExportWidget.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ExportWidget.ui,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ui/ExportWidget.ui 22 May 2007 21:56:29 -0000 1.13
+++ ui/ExportWidget.ui 23 May 2007 17:51:45 -0000 1.14
@@ -9,7 +9,7 @@
<x>0</x>
<y>0</y>
<width>410</width>
- <height>419</height>
+ <height>387</height>
</rect>
</property>
<property name="minimumSize" >
@@ -72,7 +72,7 @@
<item>
<widget class="QGroupBox" name="generalOptionsGroupBox" >
<property name="title" >
- <string>General options</string>
+ <string>General Options</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
@@ -82,13 +82,6 @@
<number>6</number>
</property>
<item>
- <widget class="QLabel" name="label" >
- <property name="text" >
- <string>Export directory</string>
- </property>
- </widget>
- </item>
- <item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
@@ -97,30 +90,38 @@
<number>6</number>
</property>
<item>
- <widget class="QLineEdit" name="exportDirName" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>5</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <widget class="QLabel" name="label_6" >
+ <property name="text" >
+ <string>Song(s) to render</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="fileSelectButton" >
+ <widget class="QRadioButton" name="currentSongButton" >
<property name="text" >
- <string/>
+ <string>Current</string>
+ </property>
+ <property name="checked" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="allSongsButton" >
+ <property name="text" >
+ <string>All</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
- <widget class="QLabel" name="label_6" >
+ <widget class="QLabel" name="label" >
<property name="text" >
- <string>Song(s) to render</string>
+ <string>Export directory</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
</property>
</widget>
</item>
@@ -133,35 +134,42 @@
<number>6</number>
</property>
<item>
- <widget class="QRadioButton" name="currentSongButton" >
- <property name="text" >
- <string>Current</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
+ <widget class="QLineEdit" name="exportDirName" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>5</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
</widget>
</item>
<item>
- <widget class="QRadioButton" name="allSongsButton" >
+ <widget class="QPushButton" name="fileSelectButton" >
<property name="text" >
- <string>All</string>
+ <string/>
</property>
</widget>
</item>
+ </layout>
+ </item>
<item>
- <widget class="QRadioButton" name="selectionSongButton" >
- <property name="enabled" >
- <bool>false</bool>
+ <widget class="QCheckBox" name="normalizeCheckBox" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
<property name="text" >
- <string>Selection</string>
+ <string>Calculate and apply normalization</string>
</property>
</widget>
</item>
</layout>
- </item>
- </layout>
</widget>
</item>
<item>
@@ -175,7 +183,7 @@
</sizepolicy>
</property>
<property name="title" >
- <string>Export specifications</string>
+ <string>Format Options</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
@@ -213,6 +221,9 @@
<property name="text" >
<string>Audio type</string>
</property>
+ <property name="alignment" >
+ <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ </property>
</widget>
</item>
<item>
@@ -223,6 +234,9 @@
<property name="text" >
<string>Channels</string>
</property>
+ <property name="alignment" >
+ <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ </property>
</widget>
</item>
<item>
@@ -251,6 +265,9 @@
<property name="text" >
<string>Bitdepth</string>
</property>
+ <property name="alignment" >
+ <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ </property>
</widget>
</item>
<item>
@@ -261,6 +278,9 @@
<property name="text" >
<string>Sample rate</string>
</property>
+ <property name="alignment" >
+ <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ </property>
</widget>
</item>
<item>
@@ -270,13 +290,6 @@
</item>
</layout>
</item>
- <item>
- <widget class="QCheckBox" name="normalizeCheckBox" >
- <property name="text" >
- <string>Calculate and apply normalization</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
@@ -438,7 +451,7 @@
<item>
<widget class="QGroupBox" name="optionsGroupBox" >
<property name="title" >
- <string>Options</string>
+ <string>General Options</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
@@ -491,14 +504,7 @@
<item>
<widget class="QCheckBox" name="cdDiskExportOnlyCheckBox" >
<property name="text" >
- <string>Export to disk only</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="simulateCheckBox" >
- <property name="text" >
- <string>Simulate</string>
+ <string>Export to disk only (don't burn)</string>
</property>
</widget>
</item>
@@ -506,11 +512,11 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox" >
+ <widget class="QGroupBox" name="burnGroupBox" >
<property name="title" >
<string>Burning Device</string>
</property>
- <layout class="QHBoxLayout" >
+ <layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
@@ -518,6 +524,14 @@
<number>6</number>
</property>
<item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
<widget class="QComboBox" name="cdDeviceComboBox" >
<property name="sizePolicy" >
<sizepolicy>
@@ -536,11 +550,31 @@
</property>
</widget>
</item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QCheckBox" name="simulateCheckBox" >
+ <property name="text" >
+ <string>Simulate</string>
+ </property>
+ </widget>
+ </item>
<item>
<widget class="QLabel" name="label_9" >
<property name="text" >
<string>Speed</string>
</property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
</widget>
</item>
<item>
@@ -623,6 +657,8 @@
</widget>
</item>
</layout>
+ </item>
+ </layout>
</widget>
</item>
<item>