[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/traverso dialogs/ExportDialog.cpp ...
|
From: |
Ben Levitt |
|
Subject: |
[Traverso-commit] traverso/src/traverso dialogs/ExportDialog.cpp ... |
|
Date: |
Wed, 17 Oct 2007 19:12:29 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Ben Levitt <benjie> 07/10/17 19:12:29
Modified files:
src/traverso/dialogs: ExportDialog.cpp
src/traverso/ui: CDWritingDialog.ui
Log message:
UI Tweaks on CDWritingDialog
Add Kbps to ExportDialog
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/ExportDialog.cpp?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/CDWritingDialog.ui?cvsroot=traverso&r1=1.1&r2=1.2
Patches:
Index: dialogs/ExportDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/ExportDialog.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- dialogs/ExportDialog.cpp 17 Oct 2007 18:28:15 -0000 1.4
+++ dialogs/ExportDialog.cpp 17 Oct 2007 19:12:29 -0000 1.5
@@ -112,23 +112,23 @@
mp3MethodComboBox->addItem("Average Bitrate", "abr");
mp3MethodComboBox->addItem("Variable Bitrate", "vbr-new");
- mp3MinBitrateComboBox->addItem("32 - recommended", "32");
- mp3MinBitrateComboBox->addItem("64", "64");
- mp3MinBitrateComboBox->addItem("96", "96");
- mp3MinBitrateComboBox->addItem("128", "128");
- mp3MinBitrateComboBox->addItem("160", "160");
- mp3MinBitrateComboBox->addItem("192", "192");
- mp3MinBitrateComboBox->addItem("256", "256");
- mp3MinBitrateComboBox->addItem("320", "320");
-
- mp3MaxBitrateComboBox->addItem("32", "32");
- mp3MaxBitrateComboBox->addItem("64", "64");
- mp3MaxBitrateComboBox->addItem("96", "96");
- mp3MaxBitrateComboBox->addItem("128", "128");
- mp3MaxBitrateComboBox->addItem("160", "160");
- mp3MaxBitrateComboBox->addItem("192", "192");
- mp3MaxBitrateComboBox->addItem("256", "256");
- mp3MaxBitrateComboBox->addItem("320", "320");
+ mp3MinBitrateComboBox->addItem("32 Kbps - recommended", "32");
+ mp3MinBitrateComboBox->addItem("64 Kbps", "64");
+ mp3MinBitrateComboBox->addItem("96 Kbps", "96");
+ mp3MinBitrateComboBox->addItem("128 Kbps", "128");
+ mp3MinBitrateComboBox->addItem("160 Kbps", "160");
+ mp3MinBitrateComboBox->addItem("192 Kbps", "192");
+ mp3MinBitrateComboBox->addItem("256 Kbps", "256");
+ mp3MinBitrateComboBox->addItem("320 Kbps", "320");
+
+ mp3MaxBitrateComboBox->addItem("32 Kbps", "32");
+ mp3MaxBitrateComboBox->addItem("64 Kbps", "64");
+ mp3MaxBitrateComboBox->addItem("96 Kbps", "96");
+ mp3MaxBitrateComboBox->addItem("128 Kbps", "128");
+ mp3MaxBitrateComboBox->addItem("160 Kbps", "160");
+ mp3MaxBitrateComboBox->addItem("192 Kbps", "192");
+ mp3MaxBitrateComboBox->addItem("256 Kbps", "256");
+ mp3MaxBitrateComboBox->addItem("320 Kbps", "320");
// First set to VBR, so that if we default to something else, it will
trigger mp3_method_changed()
index = mp3MethodComboBox->findData("vbr-new");
@@ -152,17 +152,17 @@
oggMethodComboBox->addItem("Constant Bitrate", "manual");
oggMethodComboBox->addItem("Variable Bitrate", "vbr");
- oggBitrateComboBox->addItem("45", "45");
- oggBitrateComboBox->addItem("64", "64");
- oggBitrateComboBox->addItem("96", "96");
- oggBitrateComboBox->addItem("112", "112");
- oggBitrateComboBox->addItem("128", "128");
- oggBitrateComboBox->addItem("160", "160");
- oggBitrateComboBox->addItem("192", "192");
- oggBitrateComboBox->addItem("224", "224");
- oggBitrateComboBox->addItem("256", "256");
- oggBitrateComboBox->addItem("320", "320");
- oggBitrateComboBox->addItem("400", "400");
+ oggBitrateComboBox->addItem("45 Kbps", "45");
+ oggBitrateComboBox->addItem("64 Kbps", "64");
+ oggBitrateComboBox->addItem("96 Kbps", "96");
+ oggBitrateComboBox->addItem("112 Kbps", "112");
+ oggBitrateComboBox->addItem("128 Kbps", "128");
+ oggBitrateComboBox->addItem("160 Kbps", "160");
+ oggBitrateComboBox->addItem("192 Kbps", "192");
+ oggBitrateComboBox->addItem("224 Kbps", "224");
+ oggBitrateComboBox->addItem("256 Kbps", "256");
+ oggBitrateComboBox->addItem("320 Kbps", "320");
+ oggBitrateComboBox->addItem("400 Kbps", "400");
// First set to VBR, so that if we default to something else, it will
trigger ogg_method_changed()
index = oggMethodComboBox->findData("vbr");
Index: ui/CDWritingDialog.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/CDWritingDialog.ui,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ui/CDWritingDialog.ui 15 Oct 2007 11:29:17 -0000 1.1
+++ ui/CDWritingDialog.ui 17 Oct 2007 19:12:29 -0000 1.2
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>381</width>
- <height>403</height>
+ <width>357</width>
+ <height>416</height>
</rect>
</property>
<property name="windowTitle" >
@@ -42,7 +42,7 @@
<item>
<widget class="QRadioButton" name="cdCurrentSongButton" >
<property name="text" >
- <string>Render current Sheet</string>
+ <string>Write current Sheet</string>
</property>
<property name="checked" >
<bool>true</bool>
@@ -52,7 +52,7 @@
<item>
<widget class="QRadioButton" name="cdAllSongsButton" >
<property name="text" >
- <string>Render whole Project</string>
+ <string>Write all Sheets</string>
</property>
</widget>
</item>
@@ -68,37 +68,10 @@
<item>
<widget class="QCheckBox" name="cdDiskExportOnlyCheckBox" >
<property name="text" >
- <string>Export to disk only (don't burn)</string>
+ <string>Export wav and toc files only (don't write CD)</string>
</property>
</widget>
</item>
- <item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QLabel" name="label_10" >
- <property name="text" >
- <string>Number of copies</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="spinBoxNumCopies" >
- <property name="minimum" >
- <number>1</number>
- </property>
- <property name="value" >
- <number>1</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
</layout>
</widget>
</item>
@@ -152,6 +125,33 @@
<number>6</number>
</property>
<item>
+ <widget class="QLabel" name="label_10" >
+ <property name="text" >
+ <string>Number of copies</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="spinBoxNumCopies" >
+ <property name="minimum" >
+ <number>1</number>
+ </property>
+ <property name="value" >
+ <number>1</number>
+ </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>
@@ -307,8 +307,16 @@
</item>
<item>
<widget class="QPushButton" name="startButton" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text" >
- <string>Start</string>
+ <string>Start Writing</string>
</property>
</widget>
</item>