mirror of
https://github.com/Rosalie241/RMG.git
synced 2026-11-17 03:04:03 +01:00
SettingsDialog: add Statusbar Message Duration
This commit is contained in:
1 parent
9d9819bd47
commit
2c545d6901
6 files changed
+44
-14
No files matched your search
@@ -99,7 +99,7 @@ void SettingsDialog::restoreDefaults(int stackedWidgetIndex)
|
||||
loadDefaultHotkeySettings();
|
||||
break;
|
||||
case 7:
|
||||
loadDefaultBehaviorSettings();
|
||||
loadDefaultInterfaceSettings();
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -131,7 +131,7 @@ void SettingsDialog::reloadSettings(int stackedWidgetIndex)
|
||||
loadHotkeySettings();
|
||||
break;
|
||||
case 7:
|
||||
loadBehaviorSettings();
|
||||
loadInterfaceSettings();
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -280,10 +280,11 @@ void SettingsDialog::loadHotkeySettings(void)
|
||||
this->commonHotkeySettings(0);
|
||||
}
|
||||
|
||||
void SettingsDialog::loadBehaviorSettings(void)
|
||||
void SettingsDialog::loadInterfaceSettings(void)
|
||||
{
|
||||
this->manualResizingCheckBox->setChecked(g_Settings.GetBoolValue(SettingsID::GUI_AllowManualResizing));
|
||||
this->hideCursorCheckBox->setChecked(g_Settings.GetBoolValue(SettingsID::GUI_HideCursorInEmulation));
|
||||
this->statusBarMessageDurationSpinBox->setValue(g_Settings.GetIntValue(SettingsID::GUI_StatusbarMessageDuration));
|
||||
}
|
||||
|
||||
void SettingsDialog::loadDefaultCoreSettings(void)
|
||||
@@ -372,10 +373,11 @@ void SettingsDialog::loadDefaultHotkeySettings(void)
|
||||
this->commonHotkeySettings(1);
|
||||
}
|
||||
|
||||
void SettingsDialog::loadDefaultBehaviorSettings(void)
|
||||
void SettingsDialog::loadDefaultInterfaceSettings(void)
|
||||
{
|
||||
this->manualResizingCheckBox->setChecked(g_Settings.GetDefaultBoolValue(SettingsID::GUI_AllowManualResizing));
|
||||
this->hideCursorCheckBox->setChecked(g_Settings.GetDefaultBoolValue(SettingsID::GUI_HideCursorInEmulation));
|
||||
this->statusBarMessageDurationSpinBox->setValue(g_Settings.GetDefaultIntValue(SettingsID::GUI_StatusbarMessageDuration));
|
||||
}
|
||||
|
||||
void SettingsDialog::saveSettings(void)
|
||||
@@ -392,7 +394,7 @@ void SettingsDialog::saveSettings(void)
|
||||
this->savePluginSettings();
|
||||
this->saveDirectorySettings();
|
||||
this->saveHotkeySettings();
|
||||
this->saveBehaviorSettings();
|
||||
this->saveInterfaceSettings();
|
||||
}
|
||||
|
||||
void SettingsDialog::saveCoreSettings(void)
|
||||
@@ -524,10 +526,11 @@ void SettingsDialog::saveHotkeySettings(void)
|
||||
this->commonHotkeySettings(2);
|
||||
}
|
||||
|
||||
void SettingsDialog::saveBehaviorSettings(void)
|
||||
void SettingsDialog::saveInterfaceSettings(void)
|
||||
{
|
||||
g_Settings.SetValue(SettingsID::GUI_AllowManualResizing, this->manualResizingCheckBox->isChecked());
|
||||
g_Settings.SetValue(SettingsID::GUI_HideCursorInEmulation, this->hideCursorCheckBox->isChecked());
|
||||
g_Settings.SetValue(SettingsID::GUI_StatusbarMessageDuration, this->statusBarMessageDurationSpinBox->value());
|
||||
}
|
||||
|
||||
void SettingsDialog::commonHotkeySettings(int action)
|
||||
|
||||
@@ -52,7 +52,7 @@ class SettingsDialog : public QDialog, private Ui::SettingsDialog
|
||||
void loadPluginSettings(void);
|
||||
void loadDirectorySettings(void);
|
||||
void loadHotkeySettings(void);
|
||||
void loadBehaviorSettings(void);
|
||||
void loadInterfaceSettings(void);
|
||||
|
||||
void loadDefaultCoreSettings(void);
|
||||
void loadDefaultGameSettings(void);
|
||||
@@ -60,7 +60,7 @@ class SettingsDialog : public QDialog, private Ui::SettingsDialog
|
||||
void loadDefaultGamePluginSettings(void);
|
||||
void loadDefaultDirectorySettings(void);
|
||||
void loadDefaultHotkeySettings(void);
|
||||
void loadDefaultBehaviorSettings(void);
|
||||
void loadDefaultInterfaceSettings(void);
|
||||
|
||||
void saveSettings(void);
|
||||
void saveCoreSettings(void);
|
||||
@@ -70,7 +70,7 @@ class SettingsDialog : public QDialog, private Ui::SettingsDialog
|
||||
void savePluginSettings(void);
|
||||
void saveDirectorySettings(void);
|
||||
void saveHotkeySettings(void);
|
||||
void saveBehaviorSettings(void);
|
||||
void saveInterfaceSettings(void);
|
||||
|
||||
void commonHotkeySettings(int);
|
||||
|
||||
|
||||
@@ -1588,6 +1588,30 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Statusbar Message Duration</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QSpinBox" name="statusBarMessageDurationSpinBox">
|
||||
<property name="suffix">
|
||||
<string> seconds</string>
|
||||
</property>
|
||||
<property name="prefix">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<number>1</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@@ -146,7 +146,7 @@ void MainWindow::ui_Setup(void)
|
||||
|
||||
this->statusBar()->setHidden(false);
|
||||
this->statusBar()->addPermanentWidget(this->ui_StatusBar_Label, 1);
|
||||
this->ui_TimerTimeout = g_Settings.GetIntValue(SettingsID::GUI_LabelDeletionTimeout);
|
||||
this->ui_TimerTimeout = g_Settings.GetIntValue(SettingsID::GUI_StatusbarMessageDuration);
|
||||
|
||||
this->ui_Widgets->addWidget(this->ui_Widget_RomBrowser);
|
||||
this->ui_Widgets->addWidget(this->ui_Widget_OpenGL->GetWidget());
|
||||
@@ -213,6 +213,9 @@ void MainWindow::ui_InEmulation(bool inEmulation, bool isPaused)
|
||||
{
|
||||
this->ui_NoSwitchToRomBrowser = false;
|
||||
}
|
||||
|
||||
// update timer timeout
|
||||
this->ui_TimerTimeout = g_Settings.GetIntValue(SettingsID::GUI_StatusbarMessageDuration);
|
||||
}
|
||||
|
||||
void MainWindow::ui_SaveGeometry(void)
|
||||
@@ -1254,5 +1257,5 @@ void MainWindow::on_Core_DebugCallback(MessageType type, QString message)
|
||||
{
|
||||
this->killTimer(this->ui_TimerId);
|
||||
}
|
||||
this->ui_TimerId = this->startTimer(this->ui_TimerTimeout);
|
||||
this->ui_TimerId = this->startTimer(this->ui_TimerTimeout * 1000);
|
||||
}
|
||||
@@ -279,8 +279,8 @@ Setting_t Settings::getSetting(SettingsID id)
|
||||
case SettingsID::GUI_HideCursorInEmulation:
|
||||
setting = {GUI_SECTION, "HideCursorInEmulation", false, "", false};
|
||||
break;
|
||||
case SettingsID::GUI_LabelDeletionTimeout:
|
||||
setting = {GUI_SECTION, "LabelDeletionTimeout", 3000, "", false};
|
||||
case SettingsID::GUI_StatusbarMessageDuration:
|
||||
setting = {GUI_SECTION, "StatusbarMessageDuration", 3, "", false};
|
||||
break;
|
||||
/*
|
||||
case SettingsID::GUI_PauseEmulationOnFocusLoss:
|
||||
|
||||
@@ -33,7 +33,7 @@ enum class SettingsID
|
||||
GUI_SettingsDialogHeight,
|
||||
GUI_AllowManualResizing,
|
||||
GUI_HideCursorInEmulation,
|
||||
GUI_LabelDeletionTimeout,
|
||||
GUI_StatusbarMessageDuration,
|
||||
/*
|
||||
GUI_PauseEmulationOnFocusLoss,
|
||||
GUI_ResumeEmulationOnFocus,
|
||||
|
||||
Reference in new issue
Block a user