diff options
| -rw-r--r-- | lib/qmmp/Input/mad/id3tag.cpp | 8 | ||||
| -rw-r--r-- | lib/qmmp/Input/mad/settingsdialog.cpp | 6 | ||||
| -rw-r--r-- | lib/qmmp/Input/mad/settingsdialog.ui | 19 |
3 files changed, 12 insertions, 21 deletions
diff --git a/lib/qmmp/Input/mad/id3tag.cpp b/lib/qmmp/Input/mad/id3tag.cpp index 1fddb3958..473afd997 100644 --- a/lib/qmmp/Input/mad/id3tag.cpp +++ b/lib/qmmp/Input/mad/id3tag.cpp @@ -44,19 +44,19 @@ ID3Tag::ID3Tag(const QString &source): FileTag(), m_tag(0) QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); settings.beginGroup("MAD"); QTextCodec *codec_v1 = - QTextCodec::codecForName(settings.value("ID3v1_encoding","" ) + QTextCodec::codecForName(settings.value("ID3v1_encoding","UTF-8" ) .toByteArray ()); QTextCodec *codec_v2 = - QTextCodec::codecForName(settings.value("ID3v2_encoding","" ) + QTextCodec::codecForName(settings.value("ID3v2_encoding","UTF-8" ) .toByteArray ()); if(!codec_v1) - codec_v1 = QTextCodec::codecForLocale (); + codec_v1 = QTextCodec::codecForName ("UTF-8"); if(!codec_v2) codec_v2 = QTextCodec::codecForName ("UTF-8"); QTextCodec *codec = 0; - int ver = settings.value("ID3_version", 1).toInt(); + int ver = settings.value("ID3_version", 2).toInt(); if (ver == 1 && settings.value("ID3v1_enable", TRUE).toBool() && fileRef.ID3v1Tag()) { diff --git a/lib/qmmp/Input/mad/settingsdialog.cpp b/lib/qmmp/Input/mad/settingsdialog.cpp index 72a746de6..862c91d9b 100644 --- a/lib/qmmp/Input/mad/settingsdialog.cpp +++ b/lib/qmmp/Input/mad/settingsdialog.cpp @@ -37,17 +37,17 @@ SettingsDialog::SettingsDialog(QWidget *parent) QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); settings.beginGroup("MAD"); int pos = ui.id3v1EncComboBox->findText - (settings.value("ID3v1_encoding",ui.id3v1EncComboBox->itemText(0)).toString()); + (settings.value("ID3v1_encoding","UTF-8").toString()); ui.id3v1EncComboBox->setCurrentIndex(pos); pos = ui.id3v2EncComboBox->findText - (settings.value("ID3v2_encoding",ui.id3v2EncComboBox->itemText(0)).toString()); + (settings.value("ID3v2_encoding","UTF-8").toString()); ui.id3v2EncComboBox->setCurrentIndex(pos); ui.id3v1CheckBox->setChecked(settings.value("ID3v1_enable", TRUE).toBool()); ui.id3v2CheckBox->setChecked(settings.value("ID3v2_enable", TRUE).toBool()); ui.id3v1EncComboBox->setEnabled(ui.id3v1CheckBox->isChecked()); ui.id3v2EncComboBox->setEnabled(ui.id3v2CheckBox->isChecked()); - ui.defTagComboBox->setCurrentIndex(settings.value("ID3_version", 1).toInt() - 1); + ui.defTagComboBox->setCurrentIndex(settings.value("ID3_version", 2).toInt() - 1); settings.endGroup(); connect(ui.okButton, SIGNAL(clicked()), SLOT(writeSettings())); diff --git a/lib/qmmp/Input/mad/settingsdialog.ui b/lib/qmmp/Input/mad/settingsdialog.ui index 634ee920e..08f42642d 100644 --- a/lib/qmmp/Input/mad/settingsdialog.ui +++ b/lib/qmmp/Input/mad/settingsdialog.ui @@ -57,6 +57,9 @@ <height>16777215</height> </size> </property> + <property name="currentIndex" > + <number>1</number> + </property> <item> <property name="text" > <string>ID3v1</string> @@ -117,13 +120,7 @@ </widget> </item> <item> - <widget class="QComboBox" name="id3v1EncComboBox" > - <item> - <property name="text" > - <string>Default</string> - </property> - </item> - </widget> + <widget class="QComboBox" name="id3v1EncComboBox" /> </item> <item> <spacer> @@ -159,13 +156,7 @@ </widget> </item> <item> - <widget class="QComboBox" name="id3v2EncComboBox" > - <item> - <property name="text" > - <string>Default</string> - </property> - </item> - </widget> + <widget class="QComboBox" name="id3v2EncComboBox" /> </item> <item> <spacer> |