mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-08-16 14:22:55 -06:00
Merge branch 'master' of https://github.com/ultimatepp/ultimatepp
This commit is contained in:
commit
fb248397c4
1 changed files with 14 additions and 5 deletions
|
|
@ -45,7 +45,9 @@ public:
|
|||
|
||||
public:
|
||||
UppHubSettingsDlg();
|
||||
~UppHubSettingsDlg();
|
||||
|
||||
void LoadGlobalSettings();
|
||||
void SaveGlobalSettings();
|
||||
|
||||
private:
|
||||
void RefreshCtrls();
|
||||
|
|
@ -58,12 +60,15 @@ UppHubSettingsDlg::UppHubSettingsDlg()
|
|||
seturl.WhenAction = [=] {
|
||||
RefreshCtrls();
|
||||
};
|
||||
RefreshCtrls();
|
||||
|
||||
LoadFromGlobal(*this, GLOBAL_CONFIG_NAME);
|
||||
}
|
||||
|
||||
UppHubSettingsDlg::~UppHubSettingsDlg()
|
||||
void UppHubSettingsDlg::LoadGlobalSettings()
|
||||
{
|
||||
LoadFromGlobal(*this, GLOBAL_CONFIG_NAME);
|
||||
RefreshCtrls();
|
||||
}
|
||||
|
||||
void UppHubSettingsDlg::SaveGlobalSettings()
|
||||
{
|
||||
StoreToGlobal(*this, GLOBAL_CONFIG_NAME);
|
||||
}
|
||||
|
|
@ -186,6 +191,8 @@ UppHubDlg::UppHubDlg()
|
|||
broken <<= false;
|
||||
|
||||
category ^= experimental ^= broken ^= [=] { SyncList(); };
|
||||
|
||||
settings.LoadGlobalSettings();
|
||||
}
|
||||
|
||||
INITBLOCK
|
||||
|
|
@ -359,10 +366,12 @@ void UppHubDlg::Sync()
|
|||
|
||||
void UppHubDlg::Settings()
|
||||
{
|
||||
settings.LoadGlobalSettings();
|
||||
if(settings.Execute() != IDOK) {
|
||||
return;
|
||||
}
|
||||
|
||||
settings.SaveGlobalSettings();
|
||||
Load();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue