aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Input')
-rw-r--r--src/plugins/Input/cue/settingsdialog.cpp5
-rw-r--r--src/plugins/Input/cue/settingsdialog.h4
-rw-r--r--src/plugins/Input/cue/settingsdialog.ui82
-rw-r--r--src/plugins/Input/mad/settingsdialog.cpp2
-rw-r--r--src/plugins/Input/mad/settingsdialog.ui100
-rw-r--r--src/plugins/Input/modplug/settingsdialog.cpp26
-rw-r--r--src/plugins/Input/modplug/settingsdialog.h4
-rw-r--r--src/plugins/Input/modplug/settingsdialog.ui94
8 files changed, 125 insertions, 192 deletions
diff --git a/src/plugins/Input/cue/settingsdialog.cpp b/src/plugins/Input/cue/settingsdialog.cpp
index d0bb845ca..ad6731179 100644
--- a/src/plugins/Input/cue/settingsdialog.cpp
+++ b/src/plugins/Input/cue/settingsdialog.cpp
@@ -38,20 +38,19 @@ SettingsDialog::SettingsDialog(QWidget *parent)
int pos = ui.cueEncComboBox->findText(settings.value("encoding","ISO-8859-1").toString());
ui.cueEncComboBox->setCurrentIndex(pos);
settings.endGroup();
- connect(ui.okButton, SIGNAL(clicked()), SLOT(writeSettings()));
}
SettingsDialog::~SettingsDialog()
{}
-void SettingsDialog::writeSettings()
+void SettingsDialog::accept()
{
QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
settings.beginGroup("CUE");
settings.setValue("encoding", ui.cueEncComboBox->currentText());
settings.endGroup();
- accept();
+ QDialog::accept();
}
void SettingsDialog::findCodecs()
diff --git a/src/plugins/Input/cue/settingsdialog.h b/src/plugins/Input/cue/settingsdialog.h
index 3c3d7a563..0f5535905 100644
--- a/src/plugins/Input/cue/settingsdialog.h
+++ b/src/plugins/Input/cue/settingsdialog.h
@@ -37,8 +37,8 @@ public:
~SettingsDialog();
-private slots:
- void writeSettings();
+public slots:
+ virtual void accept();
private:
void findCodecs();
diff --git a/src/plugins/Input/cue/settingsdialog.ui b/src/plugins/Input/cue/settingsdialog.ui
index 8f4eb1ab7..978971033 100644
--- a/src/plugins/Input/cue/settingsdialog.ui
+++ b/src/plugins/Input/cue/settingsdialog.ui
@@ -6,16 +6,13 @@
<x>0</x>
<y>0</y>
<width>261</width>
- <height>72</height>
+ <height>78</height>
</rect>
</property>
<property name="windowTitle" >
<string>CUE Plugin Settings</string>
</property>
<layout class="QGridLayout" name="gridLayout" >
- <property name="margin" >
- <number>5</number>
- </property>
<item row="0" column="0" >
<widget class="QLabel" name="label_17_2_2" >
<property name="focusPolicy" >
@@ -32,57 +29,62 @@
</property>
</widget>
</item>
- <item row="0" column="1" >
+ <item row="0" column="1" colspan="2" >
<widget class="QComboBox" name="cueEncComboBox" />
</item>
<item row="1" column="0" colspan="2" >
- <layout class="QHBoxLayout" name="horizontalLayout" >
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>131</width>
- <height>31</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="okButton" >
- <property name="text" >
- <string>OK</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="cancelButton" >
- <property name="text" >
- <string>Cancel</string>
- </property>
- </widget>
- </item>
- </layout>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>144</width>
+ <height>30</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="2" >
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
- <sender>cancelButton</sender>
- <signal>clicked()</signal>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>SettingsDialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>172</x>
+ <y>53</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>95</x>
+ <y>53</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
<receiver>SettingsDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
- <x>336</x>
- <y>210</y>
+ <x>238</x>
+ <y>51</y>
</hint>
<hint type="destinationlabel" >
- <x>179</x>
- <y>224</y>
+ <x>130</x>
+ <y>63</y>
</hint>
</hints>
</connection>
diff --git a/src/plugins/Input/mad/settingsdialog.cpp b/src/plugins/Input/mad/settingsdialog.cpp
index ce3ff63cc..8f1746b95 100644
--- a/src/plugins/Input/mad/settingsdialog.cpp
+++ b/src/plugins/Input/mad/settingsdialog.cpp
@@ -48,7 +48,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
ui.thirdTagComboBox->setCurrentIndex(settings.value("tag_3", Disabled).toInt());
settings.endGroup();
- connect(ui.okButton, SIGNAL(clicked()), SLOT(writeSettings()));
+ connect(ui.buttonBox, SIGNAL(accepted()), SLOT(writeSettings()));
}
diff --git a/src/plugins/Input/mad/settingsdialog.ui b/src/plugins/Input/mad/settingsdialog.ui
index 3ace8fcec..22edeeb43 100644
--- a/src/plugins/Input/mad/settingsdialog.ui
+++ b/src/plugins/Input/mad/settingsdialog.ui
@@ -6,14 +6,14 @@
<x>0</x>
<y>0</y>
<width>242</width>
- <height>303</height>
+ <height>264</height>
</rect>
</property>
<property name="windowTitle" >
<string>MPEG Plugin Settings</string>
</property>
- <layout class="QVBoxLayout" >
- <item>
+ <layout class="QGridLayout" name="gridLayout" >
+ <item row="0" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox_2" >
<property name="title" >
<string>Tag Priority</string>
@@ -163,7 +163,7 @@
</layout>
</widget>
</item>
- <item>
+ <item row="1" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Encodings</string>
@@ -174,16 +174,7 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
+ <property name="margin" >
<number>0</number>
</property>
<item>
@@ -206,16 +197,7 @@
<property name="spacing" >
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
+ <property name="margin" >
<number>0</number>
</property>
<item>
@@ -236,69 +218,43 @@
</layout>
</widget>
</item>
- <item>
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>6</number>
+ <item row="2" column="0" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="leftMargin" >
- <number>0</number>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>125</width>
+ <height>18</height>
+ </size>
</property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
+ </spacer>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>131</width>
- <height>31</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="okButton" >
- <property name="text" >
- <string>OK</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="cancelButton" >
- <property name="text" >
- <string>Cancel</string>
- </property>
- </widget>
- </item>
- </layout>
+ </widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
- <sender>cancelButton</sender>
- <signal>clicked()</signal>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
<receiver>SettingsDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
- <x>336</x>
- <y>210</y>
+ <x>162</x>
+ <y>245</y>
</hint>
<hint type="destinationlabel" >
- <x>179</x>
- <y>224</y>
+ <x>70</x>
+ <y>244</y>
</hint>
</hints>
</connection>
diff --git a/src/plugins/Input/modplug/settingsdialog.cpp b/src/plugins/Input/modplug/settingsdialog.cpp
index e655e9df5..0bb8c192d 100644
--- a/src/plugins/Input/modplug/settingsdialog.cpp
+++ b/src/plugins/Input/modplug/settingsdialog.cpp
@@ -101,7 +101,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
ui.loopSpinBox->setValue(l);
}
settings.endGroup();
- connect(ui.applyButton, SIGNAL(clicked()), SLOT(writeSettings()));
+ connect(ui.buttonBox, SIGNAL(clicked (QAbstractButton *)), SLOT(exec(QAbstractButton *)));
}
@@ -124,11 +124,11 @@ void SettingsDialog::writeSettings()
//bits number
settings.setValue("Bits", ui.bit8RadioButton->isChecked() ? 8 : 16 );
//resampling frequency
- if(ui.khz48RadioButton->isChecked())
+ if (ui.khz48RadioButton->isChecked())
settings.setValue("Frequency", 48000);
- else if(ui.khz44RadioButton->isChecked())
+ else if (ui.khz44RadioButton->isChecked())
settings.setValue("Frequency", 44100);
- else if(ui.khz22RadioButton->isChecked())
+ else if (ui.khz22RadioButton->isChecked())
settings.setValue("Frequency", 22050);
else
settings.setValue("Frequency", 11025);
@@ -160,13 +160,13 @@ void SettingsDialog::writeSettings()
//looping
if (ui.dontLoopRadioButton->isChecked())
settings.setValue("LoopCount", 0);
- else if(ui.loopForeverRadioButton->isChecked())
+ else if (ui.loopForeverRadioButton->isChecked())
settings.setValue("LoopCount", -1);
else
settings.setValue("LoopCount", ui.loopSpinBox->value());
settings.endGroup();
//apply settings for the created decoder
- if(DecoderModPlug::instance())
+ if (DecoderModPlug::instance())
{
DecoderModPlug::instance()->mutex()->lock();
DecoderModPlug::instance()->readSettings();
@@ -179,8 +179,16 @@ void SettingsDialog::setPreamp(int preamp)
ui.preampLabel->setText(QString("%1").arg((double) preamp/10));
}
-void SettingsDialog::accept()
+void SettingsDialog::exec(QAbstractButton *button)
{
- writeSettings();
- QDialog::accept();
+ switch ((int) ui.buttonBox->buttonRole(button))
+ {
+ case QDialogButtonBox::AcceptRole:
+ writeSettings();
+ accept();
+ break;
+ case QDialogButtonBox::ApplyRole:
+ writeSettings();
+ break;
+ }
}
diff --git a/src/plugins/Input/modplug/settingsdialog.h b/src/plugins/Input/modplug/settingsdialog.h
index c25b881e7..5bbf2f445 100644
--- a/src/plugins/Input/modplug/settingsdialog.h
+++ b/src/plugins/Input/modplug/settingsdialog.h
@@ -36,12 +36,10 @@ public:
~SettingsDialog();
-public slots:
- virtual void accept();
-
private slots:
void writeSettings();
void setPreamp(int);
+ void exec(QAbstractButton *);
private:
Ui::SettingsDialog ui;
diff --git a/src/plugins/Input/modplug/settingsdialog.ui b/src/plugins/Input/modplug/settingsdialog.ui
index 2db79d3c4..63b517f8d 100644
--- a/src/plugins/Input/modplug/settingsdialog.ui
+++ b/src/plugins/Input/modplug/settingsdialog.ui
@@ -6,14 +6,14 @@
<x>0</x>
<y>0</y>
<width>465</width>
- <height>388</height>
+ <height>380</height>
</rect>
</property>
<property name="windowTitle" >
<string>ModPlug Plugin Settings</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" colspan="4" >
+ <layout class="QGridLayout" name="gridLayout" >
+ <item row="0" column="0" colspan="2" >
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
<number>0</number>
@@ -198,7 +198,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>10</width>
<height>20</height>
@@ -256,7 +256,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>10</width>
<height>20</height>
@@ -332,7 +332,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>10</width>
<height>20</height>
@@ -390,7 +390,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>10</width>
<height>20</height>
@@ -463,7 +463,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>10</width>
<height>20</height>
@@ -515,7 +515,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>10</width>
<height>20</height>
@@ -582,7 +582,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>10</width>
<height>20</height>
@@ -746,7 +746,7 @@ too high may cause clipping!</string>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>10</width>
<height>20</height>
@@ -769,7 +769,7 @@ too high may cause clipping!</string>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -786,7 +786,7 @@ too high may cause clipping!</string>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>211</width>
<height>20</height>
@@ -795,23 +795,9 @@ too high may cause clipping!</string>
</spacer>
</item>
<item row="1" column="1" >
- <widget class="QPushButton" name="okButton" >
- <property name="text" >
- <string>OK</string>
- </property>
- </widget>
- </item>
- <item row="1" column="2" >
- <widget class="QPushButton" name="applyButton" >
- <property name="text" >
- <string>Apply</string>
- </property>
- </widget>
- </item>
- <item row="1" column="3" >
- <widget class="QPushButton" name="cancelButton" >
- <property name="text" >
- <string>Cancel</string>
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
@@ -826,8 +812,8 @@ too high may cause clipping!</string>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel" >
- <x>198</x>
- <y>101</y>
+ <x>219</x>
+ <y>118</y>
</hint>
<hint type="destinationlabel" >
<x>199</x>
@@ -842,12 +828,12 @@ too high may cause clipping!</string>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel" >
- <x>170</x>
- <y>153</y>
+ <x>191</x>
+ <y>172</y>
</hint>
<hint type="destinationlabel" >
- <x>179</x>
- <y>126</y>
+ <x>219</x>
+ <y>150</y>
</hint>
</hints>
</connection>
@@ -874,8 +860,8 @@ too high may cause clipping!</string>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel" >
- <x>172</x>
- <y>298</y>
+ <x>193</x>
+ <y>316</y>
</hint>
<hint type="destinationlabel" >
<x>187</x>
@@ -890,8 +876,8 @@ too high may cause clipping!</string>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel" >
- <x>421</x>
- <y>102</y>
+ <x>408</x>
+ <y>118</y>
</hint>
<hint type="destinationlabel" >
<x>420</x>
@@ -916,34 +902,18 @@ too high may cause clipping!</string>
</hints>
</connection>
<connection>
- <sender>cancelButton</sender>
- <signal>clicked()</signal>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
<receiver>SettingsDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
- <x>430</x>
- <y>356</y>
+ <x>294</x>
+ <y>362</y>
</hint>
<hint type="destinationlabel" >
- <x>130</x>
- <y>365</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>okButton</sender>
- <signal>clicked()</signal>
- <receiver>SettingsDialog</receiver>
- <slot>accept()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>237</x>
- <y>364</y>
- </hint>
- <hint type="destinationlabel" >
- <x>33</x>
- <y>352</y>
+ <x>170</x>
+ <y>371</y>
</hint>
</hints>
</connection>
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-16 17:10:59 +0000