[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 18:28:15 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Ben Levitt <benjie> 07/10/17 18:28:15
Modified files:
src/traverso/dialogs: ExportDialog.cpp
src/traverso/ui: ExportDialog.ui
Log message:
UI Tweaks and Fixes for Export Dialog
- rename render radio buttons to export
- fix mp3 and ogg so that correct options are shown when defaulting to
non-vbr
- use linear instead of zero-hold as the Fast src resampler (slightly
better quality?)
- align-right and v-align-center comboBox labels
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/ExportDialog.cpp?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ExportDialog.ui?cvsroot=traverso&r1=1.4&r2=1.5
Patches:
Index: dialogs/ExportDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/ExportDialog.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- dialogs/ExportDialog.cpp 16 Oct 2007 12:49:04 -0000 1.3
+++ dialogs/ExportDialog.cpp 17 Oct 2007 18:28:15 -0000 1.4
@@ -74,6 +74,11 @@
sampleRateComboBox->addItem("88.200 Hz", 88200);
sampleRateComboBox->addItem("96.000 Hz", 96000);
+ resampleQualityComboBox->addItem("Best", 0); // Best
+ resampleQualityComboBox->addItem("High", 1); // Medium
+ resampleQualityComboBox->addItem("Medium", 2); // Fastest
+ resampleQualityComboBox->addItem("Fast", 4); // Linear (Should we use
ZERO_HOLD(3) instead?)
+
audioTypeComboBox->addItem("WAV", "wav");
audioTypeComboBox->addItem("AIFF", "aiff");
if (libFLAC_is_present) {
@@ -98,6 +103,9 @@
connect(&pm(), SIGNAL(projectLoaded(Project*)), this,
SLOT(set_project(Project*)));
connect(audioTypeComboBox, SIGNAL(currentIndexChanged(int)), this,
SLOT(audio_type_changed(int)));
+ QString option;
+ int index;
+ bool checked;
// Mp3 Options Setup
mp3MethodComboBox->addItem("Constant Bitrate", "cbr");
@@ -122,8 +130,13 @@
mp3MaxBitrateComboBox->addItem("256", "256");
mp3MaxBitrateComboBox->addItem("320", "320");
- QString option = config().get_property("ExportDialog",
"mp3MethodComboBox", "vbr-new").toString();
- int index = mp3MethodComboBox->findData(option);
+ // First set to VBR, so that if we default to something else, it will
trigger mp3_method_changed()
+ index = mp3MethodComboBox->findData("vbr-new");
+ mp3MethodComboBox->setCurrentIndex(index >=0 ? index : 0);
+ connect(mp3MethodComboBox, SIGNAL(currentIndexChanged(int)), this,
SLOT(mp3_method_changed(int)));
+
+ option = config().get_property("ExportDialog", "mp3MethodComboBox",
"vbr-new").toString();
+ index = mp3MethodComboBox->findData(option);
mp3MethodComboBox->setCurrentIndex(index >=0 ? index : 0);
option = config().get_property("ExportDialog", "mp3MinBitrateComboBox",
"32").toString();
index = mp3MinBitrateComboBox->findData(option);
@@ -133,7 +146,6 @@
mp3MaxBitrateComboBox->setCurrentIndex(index >=0 ? index : 0);
mp3OptionsGroupBox->hide();
- connect(mp3MethodComboBox, SIGNAL(currentIndexChanged(int)), this,
SLOT(mp3_method_changed(int)));
// Ogg Options Setup
@@ -152,6 +164,11 @@
oggBitrateComboBox->addItem("320", "320");
oggBitrateComboBox->addItem("400", "400");
+ // First set to VBR, so that if we default to something else, it will
trigger ogg_method_changed()
+ index = oggMethodComboBox->findData("vbr");
+ oggMethodComboBox->setCurrentIndex(index >=0 ? index : 0);
+ connect(oggMethodComboBox, SIGNAL(currentIndexChanged(int)), this,
SLOT(ogg_method_changed(int)));
+
option = config().get_property("ExportDialog", "oggMethodComboBox",
"vbr").toString();
index = oggMethodComboBox->findData(option);
oggMethodComboBox->setCurrentIndex(index >=0 ? index : 0);
@@ -161,7 +178,6 @@
oggBitrateComboBox->setCurrentIndex(index >= 0 ? index : 0);
oggOptionsGroupBox->hide();
- connect(oggMethodComboBox, SIGNAL(currentIndexChanged(int)), this,
SLOT(ogg_method_changed(int)));
// WavPack option
@@ -170,10 +186,10 @@
wavpackCompressionComboBox->addItem("High", "high");
wavpackCompressionComboBox->addItem("Fast", "fast");
- option = config().get_property("ExportDialog",
"wavpackCompressionComboBox", "high").toString();
+ option = config().get_property("ExportDialog",
"wavpackCompressionComboBox", "very_high").toString();
index = wavpackCompressionComboBox->findData(option);
wavpackCompressionComboBox->setCurrentIndex(index >= 0 ? index : 0);
- bool checked = config().get_property("ExportDialog", "skipWVXCheckBox",
"false").toBool();
+ checked = config().get_property("ExportDialog", "skipWVXCheckBox",
"false").toBool();
skipWVXCheckBox->setChecked(checked);
@@ -185,6 +201,7 @@
normalizeCheckBox->setChecked(checked);
index = config().get_property("ExportDialog",
"resampleQualityComboBox", "1").toInt();
+ index = resampleQualityComboBox->findData(index);
resampleQualityComboBox->setCurrentIndex(index >= 0 ? index : 1);
option = config().get_property("ExportDialog", "bitdepthComboBox",
"16").toString();
@@ -193,6 +210,7 @@
setMaximumSize(400, 250);
}
+
ExportDialog::~ ExportDialog( )
{
config().set_property("ExportDialog", "mp3MethodComboBox",
mp3MethodComboBox->itemData(mp3MethodComboBox->currentIndex()).toString());
@@ -204,7 +222,7 @@
config().set_property("ExportDialog", "audioTypeComboBox",
audioTypeComboBox->itemData(audioTypeComboBox->currentIndex()).toString());
config().set_property("ExportDialog", "normalizeCheckBox",
normalizeCheckBox->isChecked());
config().set_property("ExportDialog", "skipWVXCheckBox",
skipWVXCheckBox->isChecked());
- config().set_property("ExportDialog", "resampleQualityComboBox",
resampleQualityComboBox->currentIndex());
+ config().set_property("ExportDialog", "resampleQualityComboBox",
resampleQualityComboBox->itemData(resampleQualityComboBox->currentIndex()).toString());
config().set_property("ExportDialog", "bitdepthComboBox",
bitdepthComboBox->itemData(bitdepthComboBox->currentIndex()).toString());
}
@@ -236,19 +254,19 @@
QString newType = audioTypeComboBox->itemData(index).toString();
if (newType == "mp3") {
- mp3OptionsGroupBox->show();
oggOptionsGroupBox->hide();
wacpackGroupBox->hide();
+ mp3OptionsGroupBox->show();
}
else if (newType == "ogg") {
- oggOptionsGroupBox->show();
mp3OptionsGroupBox->hide();
wacpackGroupBox->hide();
+ oggOptionsGroupBox->show();
}
else if (newType == "wavpack") {
- wacpackGroupBox->show();
mp3OptionsGroupBox->hide();
oggOptionsGroupBox->hide();
+ wacpackGroupBox->show();
}
else {
mp3OptionsGroupBox->hide();
@@ -294,17 +312,17 @@
QString method = oggMethodComboBox->itemData(index).toString();
if (method == "manual") {
- oggBitrateComboBox->show();
- oggBitrateLabel->show();
oggQualitySlider->hide();
oggQualityLabel->hide();
+ oggBitrateComboBox->show();
+ oggBitrateLabel->show();
}
else {
// VBR
- oggQualitySlider->show();
- oggQualityLabel->show();
oggBitrateComboBox->hide();
oggBitrateLabel->hide();
+ oggQualitySlider->show();
+ oggQualityLabel->show();
}
}
@@ -358,7 +376,7 @@
m_exportSpec->data_width =
bitdepthComboBox->itemData(bitdepthComboBox->currentIndex()).toInt();
m_exportSpec->channels =
channelComboBox->itemData(channelComboBox->currentIndex()).toInt();
m_exportSpec->sample_rate =
sampleRateComboBox->itemData(sampleRateComboBox->currentIndex()).toInt();
- m_exportSpec->src_quality = resampleQualityComboBox->currentIndex();
+ m_exportSpec->src_quality =
resampleQualityComboBox->itemData(resampleQualityComboBox->currentIndex()).toInt();
//TODO Make a ComboBox for this one too!
m_exportSpec->dither_type = GDitherTri;
Index: ui/ExportDialog.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ExportDialog.ui,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ui/ExportDialog.ui 16 Oct 2007 12:45:17 -0000 1.4
+++ ui/ExportDialog.ui 17 Oct 2007 18:28:15 -0000 1.5
@@ -64,7 +64,7 @@
<item>
<widget class="QRadioButton" name="currentSongButton" >
<property name="text" >
- <string>Render current Sheet</string>
+ <string>Export current Sheet</string>
</property>
<property name="checked" >
<bool>true</bool>
@@ -74,7 +74,7 @@
<item>
<widget class="QRadioButton" name="allSongsButton" >
<property name="text" >
- <string>Render whole Project</string>
+ <string>Export all Sheets</string>
</property>
</widget>
</item>
@@ -85,7 +85,7 @@
</property>
<property name="sizeHint" >
<size>
- <width>40</width>
+ <width>0</width>
<height>20</height>
</size>
</property>
@@ -107,7 +107,7 @@
<string>Export directory</string>
</property>
<property name="alignment" >
- <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
@@ -186,7 +186,10 @@
<item>
<widget class="QLabel" name="label_2" >
<property name="text" >
- <string>Encoding</string>
+ <string>File Type</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
@@ -196,7 +199,7 @@
<string>Channels</string>
</property>
<property name="alignment" >
- <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
@@ -272,7 +275,7 @@
<string>Bitdepth</string>
</property>
<property name="alignment" >
- <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
@@ -290,7 +293,7 @@
</property>
<property name="sizeHint" >
<size>
- <width>40</width>
+ <width>0</width>
<height>20</height>
</size>
</property>
@@ -400,7 +403,7 @@
<string>Bitrate</string>
</property>
<property name="alignment" >
- <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
@@ -482,7 +485,7 @@
<string>Quality (Smallest <-> Best)</string>
</property>
<property name="alignment" >
- <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ <set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set>
</property>
</widget>
</item>
@@ -500,7 +503,7 @@
<string>Encoding Method</string>
</property>
<property name="alignment" >
- <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
@@ -541,7 +544,7 @@
<string>Encoding Method</string>
</property>
<property name="alignment" >
- <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
@@ -559,7 +562,7 @@
<string>Maximum Bitrate</string>
</property>
<property name="alignment" >
- <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
@@ -577,7 +580,7 @@
<string>Minimum Bitrate</string>
</property>
<property name="alignment" >
- <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
@@ -595,7 +598,7 @@
<string>Quality (Fastest <-> Best)</string>
</property>
<property name="alignment" >
- <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ <set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set>
</property>
</widget>
</item>
@@ -736,6 +739,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="sizeAdjustPolicy" >
+ <enum>QComboBox::AdjustToContents</enum>
+ </property>
</widget>
</item>
<item>
@@ -763,26 +769,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <item>
- <property name="text" >
- <string>Best</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>High</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Medium</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Fast</string>
- </property>
- </item>
</widget>
</item>
<item>
@@ -792,8 +778,8 @@
</property>
<property name="sizeHint" >
<size>
- <width>40</width>
- <height>20</height>
+ <width>0</width>
+ <height>40</height>
</size>
</property>
</spacer>