diff --git a/Source/GUI/Qt/GUI_Main_xxxx_Bext.cpp b/Source/GUI/Qt/GUI_Main_xxxx_Bext.cpp index acf952f..d6c932c 100644 --- a/Source/GUI/Qt/GUI_Main_xxxx_Bext.cpp +++ b/Source/GUI/Qt/GUI_Main_xxxx_Bext.cpp @@ -91,9 +91,10 @@ GUI_Main_xxxx_Bext::GUI_Main_xxxx_Bext(Core* _C, int Value, int Maximum, QWidget //Extra - Bext Version=new QDoubleSpinBox(this); + Version->setSpecialValueText("None"); Version->setMaximum(Maximum); Version->setDecimals(0); - Version->setMinimum(0); + Version->setMinimum(-1); QLabel* Version_Label=new QLabel("bext version:"); @@ -116,6 +117,9 @@ GUI_Main_xxxx_Bext::GUI_Main_xxxx_Bext(Core* _C, int Value, int Maximum, QWidget //--------------------------------------------------------------------------- QString GUI_Main_xxxx_Bext::Value() const { + if (Version->value()==Version->minimum()) + return QString(); + return QString::number(Version->value()); } diff --git a/Source/GUI/Qt/GUI_Main_xxxx_Loudness.cpp b/Source/GUI/Qt/GUI_Main_xxxx_Loudness.cpp index 2387013..8e5af85 100644 --- a/Source/GUI/Qt/GUI_Main_xxxx_Loudness.cpp +++ b/Source/GUI/Qt/GUI_Main_xxxx_Loudness.cpp @@ -110,6 +110,9 @@ GUI_Main_xxxx_Loudness::GUI_Main_xxxx_Loudness(Core* _C, const std::string &File //--------------------------------------------------------------------------- QString GUI_Main_xxxx_Loudness::Value() const { + if (Loudness->value()==Loudness->minimum()) + return QString(); + return QString::number(Loudness->value()); } diff --git a/Source/GUI/Qt/GUI_Preferences.cpp b/Source/GUI/Qt/GUI_Preferences.cpp index cff4e9b..ba6cdca 100644 --- a/Source/GUI/Qt/GUI_Preferences.cpp +++ b/Source/GUI/Qt/GUI_Preferences.cpp @@ -695,10 +695,7 @@ void GUI_Preferences::OnRejected() void GUI_Preferences::OnDialogClicked(QAbstractButton* Button) { if (Dialog->buttonRole(Button)==QDialogButtonBox::ResetRole) - { LoadOriginalConfig(); - OnClicked(); - } } //*************************************************************************** @@ -927,12 +924,10 @@ void GUI_Preferences::CreateCoreDefaults(QVBoxLayout* Columns) { QLabel* DescriptionLabel=new QLabel(Groups[Group_Core].Option[Option].Description, this); Grid->addWidget(DescriptionLabel, Option+1, 0); - //Grid->addWidget(new QLabel("Display: ", this), Option, 1); CheckBoxes[Group_Core*options::MaxCount+Option]=new QCheckBox(); Grid->addWidget(CheckBoxes[Group_Core*options::MaxCount+Option], Option+1, 1, Qt::AlignHCenter); - //Grid->addWidget(new QLabel("Default: ", this), Option, 3); DefaultCoreValueComboBoxes[Option]=new QComboBox(); DefaultCoreValueComboBoxes[Option]->setEditable(false); DefaultCoreValueComboBoxes[Option]->addItem("", QString("VALUE")); @@ -945,7 +940,6 @@ void GUI_Preferences::CreateCoreDefaults(QVBoxLayout* Columns) !strcmp(Groups[Group_Core].Option[Option].UniqueName, "Core_Description")) DefaultCoreValueComboBoxes[Option]->addItem("Use file name", QString("FILENAME")); Grid->addWidget(DefaultCoreValueComboBoxes[Option], Option+1, 2); - //Grid->addWidget(new QLabel("Overwrite: ", this), Option, 5); DefaultCoreOverwriteCheckBoxes[Option]=new QCheckBox(); Grid->addWidget(DefaultCoreOverwriteCheckBoxes[Option], Option+1, 3, Qt::AlignHCenter); @@ -1157,11 +1151,37 @@ void GUI_Preferences::Create() void GUI_Preferences::LoadOriginalConfig() { for (size_t Kind=0; KindsetChecked(Groups[Kind].Option[Content_Pos].DefaultConfigValue); break; - case Type_RadioButton : RadioButtons[Kind*options::MaxCount+Content_Pos]->setChecked(Groups[Kind].Option[Content_Pos].DefaultConfigValue); break; + case Type_CheckBox : CheckBoxes [Kind*options::MaxCount+Content_Pos]->setChecked(Groups[Kind].Option[Content_Pos].DefaultConfigValue); OnClicked(); break; + case Type_RadioButton : RadioButtons[Kind*options::MaxCount+Content_Pos]->setChecked(Groups[Kind].Option[Content_Pos].DefaultConfigValue); OnClicked(); break; default : ; } + + // Reset defaults + if (Kind==Group_Core) + { + DefaultCoreValueComboBoxes[Content_Pos]->setItemText(0, QString()); + DefaultCoreValueComboBoxes[Content_Pos]->setCurrentIndex(0); + DefaultCoreOverwriteCheckBoxes[Content_Pos]->setChecked(false); + } + } + } + + // Reset extra + Extra_OpenSaveDirectory_Default->setChecked(true); + OnExtra_OpenSaveDirectory_Specific_RadioToggled(false); + + Extra_BackupDirectory_Default->setChecked(true); + OnExtra_BackupDirectory_Specific_RadioToggled(false); + + Extra_LogFile_Deactivated->setChecked(true); + OnExtra_LogFile_Activated_RadioToggled(false); + + Extra_Bext_DefaultVersion->setValue(0); + Extra_Bext_MaxVersion->setValue(2); + Extra_Bext_Toggle->setChecked(false); }