Skip to content

Commit ddcd08e

Browse files
author
N3xoX1
committed
UI: Remove old module configuration
1 parent f34be49 commit ddcd08e

16 files changed

Lines changed: 3 additions & 849 deletions

‎config/NxEmu.config.development‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"ModuleDirectory-x64" : "..\\..\\..\\modules\\x64"
55
},
66
"UI" : {
7-
"EnableModuleConfiguration" : true,
87
"LanguageDirectory" : "..\\..\\..\\lang"
98
}
109
}

‎src/nxemu/nxemu.vcxproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@
4242
<ClCompile Include="user_interface\sciter_main_window.cpp" />
4343
<ClCompile Include="user_interface\settings\config_setting_section.cpp" />
4444
<ClCompile Include="user_interface\settings\input_config.cpp" />
45-
<ClCompile Include="user_interface\settings\settings_config.cpp" />
46-
<ClCompile Include="user_interface\settings\settings_page.cpp" />
47-
<ClCompile Include="user_interface\settings\settings_page_modules.cpp" />
48-
<ClCompile Include="user_interface\wtl_controls\modified_combo_box.cpp" />
4945
</ItemGroup>
5046
<ItemGroup>
5147
<ClInclude Include="settings\ui_settings.h" />
@@ -55,10 +51,6 @@
5551
<ClInclude Include="user_interface\sciter_main_window.h" />
5652
<ClInclude Include="user_interface\settings\config_setting_section.h" />
5753
<ClInclude Include="user_interface\settings\input_config.h" />
58-
<ClInclude Include="user_interface\settings\settings_config.h" />
59-
<ClInclude Include="user_interface\settings\settings_page.h" />
60-
<ClInclude Include="user_interface\settings\settings_page_modules.h" />
61-
<ClInclude Include="user_interface\wtl_controls\modified_combo_box.h" />
6254
</ItemGroup>
6355
<ItemGroup>
6456
<ProjectReference Include="..\..\external\sciterui\src\sciterui\sciterui.vcxproj">

‎src/nxemu/nxemu.vcxproj.filters‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@
3131
<Filter Include="Source Files\user_interface\settings">
3232
<UniqueIdentifier>{5e88d65d-0802-45fd-84d0-1edd8e3305fd}</UniqueIdentifier>
3333
</Filter>
34-
<Filter Include="Source Files\user_interface\wtl_controls">
35-
<UniqueIdentifier>{b31e47b1-4362-4ca3-a0b3-18ee2edc5af5}</UniqueIdentifier>
36-
</Filter>
37-
<Filter Include="Header Files\user_interface\wtl_controls">
38-
<UniqueIdentifier>{25988eeb-c797-49b2-ac27-b7f2b36aeef5}</UniqueIdentifier>
39-
</Filter>
4034
</ItemGroup>
4135
<ItemGroup>
4236
<ClCompile Include="main.cpp">
@@ -51,21 +45,9 @@
5145
<ClCompile Include="user_interface\notification.cpp">
5246
<Filter>Source Files\user_interface</Filter>
5347
</ClCompile>
54-
<ClCompile Include="user_interface\settings\settings_config.cpp">
55-
<Filter>Source Files\user_interface\settings</Filter>
56-
</ClCompile>
5748
<ClCompile Include="user_interface\settings\config_setting_section.cpp">
5849
<Filter>Source Files\user_interface\settings</Filter>
5950
</ClCompile>
60-
<ClCompile Include="user_interface\settings\settings_page_modules.cpp">
61-
<Filter>Source Files\user_interface\settings</Filter>
62-
</ClCompile>
63-
<ClCompile Include="user_interface\settings\settings_page.cpp">
64-
<Filter>Source Files\user_interface\settings</Filter>
65-
</ClCompile>
66-
<ClCompile Include="user_interface\wtl_controls\modified_combo_box.cpp">
67-
<Filter>Source Files\user_interface\wtl_controls</Filter>
68-
</ClCompile>
6951
<ClCompile Include="user_interface\sciter_main_window.cpp">
7052
<Filter>Source Files\user_interface</Filter>
7153
</ClCompile>
@@ -86,21 +68,9 @@
8668
<ClInclude Include="user_interface\notification.h">
8769
<Filter>Header Files\user_interface</Filter>
8870
</ClInclude>
89-
<ClInclude Include="user_interface\settings\settings_config.h">
90-
<Filter>Header Files\user_interface\settings</Filter>
91-
</ClInclude>
9271
<ClInclude Include="user_interface\settings\config_setting_section.h">
9372
<Filter>Header Files\user_interface\settings</Filter>
9473
</ClInclude>
95-
<ClInclude Include="user_interface\settings\settings_page_modules.h">
96-
<Filter>Header Files\user_interface\settings</Filter>
97-
</ClInclude>
98-
<ClInclude Include="user_interface\settings\settings_page.h">
99-
<Filter>Header Files\user_interface\settings</Filter>
100-
</ClInclude>
101-
<ClInclude Include="user_interface\wtl_controls\modified_combo_box.h">
102-
<Filter>Header Files\user_interface\wtl_controls</Filter>
103-
</ClInclude>
10474
<ClInclude Include="user_interface\sciter_main_window.h">
10575
<Filter>Header Files\user_interface</Filter>
10676
</ClInclude>

‎src/nxemu/settings/ui_settings.cpp‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ namespace
77
{
88
struct UISettingsDefaults
99
{
10-
static constexpr bool enableModuleConfiguration = false;
1110
static constexpr const char * defaultLanguageDirValue = "./lang";
1211
static constexpr const char * defaultLanguageBaseValue = "english";
1312
static constexpr const char * defaultLanguageCurrentValue = "english";
@@ -22,7 +21,6 @@ UISettings uiSettings = {};
2221
void LoadUISetting(void)
2322
{
2423
uiSettings = {};
25-
uiSettings.enableModuleConfiguration = UISettingsDefaults::enableModuleConfiguration;
2624
uiSettings.languageDir = UISettingsDefaults::GetDefaultLanguageDir();
2725
uiSettings.languageDirValue = UISettingsDefaults::defaultLanguageDirValue;
2826
uiSettings.languageBase = UISettingsDefaults::defaultLanguageBaseValue;
@@ -31,13 +29,7 @@ void LoadUISetting(void)
3129

3230
JsonValue jsonSettings = Settings::GetInstance().GetSettings("UI");
3331

34-
const JsonValue * node = jsonSettings.Find("EnableModuleConfiguration");
35-
if (node != nullptr && node->isBool())
36-
{
37-
uiSettings.enableModuleConfiguration = node->asBool();
38-
}
39-
40-
node = jsonSettings.Find("LanguageDirectory");
32+
const JsonValue * node = jsonSettings.Find("LanguageDirectory");
4133
if (node != nullptr && node->isString())
4234
{
4335
std::string dirValue = node->asString();
@@ -81,10 +73,6 @@ void SaveUISetting(void)
8173
json["RecentFiles"] = std::move(recentFiles);
8274
}
8375

84-
if (uiSettings.enableModuleConfiguration != UISettingsDefaults::enableModuleConfiguration)
85-
{
86-
json["EnableModuleConfiguration"] = JsonValue(uiSettings.enableModuleConfiguration);
87-
}
8876
if (uiSettings.languageDirValue != UISettingsDefaults::defaultLanguageDirValue)
8977
{
9078
json["LanguageDirectory"] = JsonValue(uiSettings.languageDirValue);

‎src/nxemu/settings/ui_settings.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ typedef std::vector<std::string> Stringlist;
88
struct UISettings
99
{
1010
Stringlist recentFiles;
11-
bool enableModuleConfiguration;
1211
Path languageDir;
1312
std::string languageDirValue;
1413
std::string languageBase;

‎src/nxemu/user_interface/sciter_main_window.cpp‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "sciter_main_window.h"
22
#include "settings/input_config.h"
3-
#include "settings/settings_config.h"
43
#include "settings/ui_settings.h"
54
#include <Windows.h>
65
#include <common/std_string.h>
@@ -52,14 +51,11 @@ void SciterMainWindow::ResetMenu()
5251

5352
MenuBarItemList OptionsMenu;
5453
OptionsMenu.push_back(MenuBarItem(ID_OPTIONS_INPUT, "Configure Input..."));
55-
OptionsMenu.push_back(MenuBarItem(ID_OPTIONS_SETTINGS, "Settings..."));
5654

5755
MenuBarItemList mainTitleMenu;
5856
mainTitleMenu.push_back(MenuBarItem(MenuBarItem::SUB_MENU, "File", &fileMenu));
59-
if (uiSettings.enableModuleConfiguration)
60-
{
61-
mainTitleMenu.push_back(MenuBarItem(MenuBarItem::SUB_MENU, "Options", &OptionsMenu));
62-
}
57+
mainTitleMenu.push_back(MenuBarItem(MenuBarItem::SUB_MENU, "Options", &OptionsMenu));
58+
6359
m_menuBar->AddSink(this);
6460
m_menuBar->SetMenuContent(mainTitleMenu);
6561
}
@@ -366,11 +362,6 @@ void SciterMainWindow::OnFileExit(void)
366362
m_sciterUI.Stop();
367363
}
368364

369-
void SciterMainWindow::OnSettings(void)
370-
{
371-
SettingConfig().Display((HWND)m_window->GetHandle());
372-
}
373-
374365
void SciterMainWindow::OnInputConfig(void)
375366
{
376367
InputConfig(m_sciterUI).Display((void *)m_window->GetHandle());
@@ -397,7 +388,6 @@ void SciterMainWindow::OnMenuItem(int32_t id, SCITER_ELEMENT /*item*/)
397388
{
398389
case ID_FILE_OPEN_GAME: OnOpenGame(); break;
399390
case ID_FILE_EXIT: OnFileExit(); break;
400-
case ID_OPTIONS_SETTINGS: OnSettings(); break;
401391
case ID_OPTIONS_INPUT: OnInputConfig(); break;
402392
default:
403393
if (id >= ID_RECENT_FILE_START && id <= ID_RECENT_FILE_END)

‎src/nxemu/user_interface/sciter_main_window.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ class SciterMainWindow :
1919

2020
// Options Menu
2121
ID_OPTIONS_INPUT,
22-
ID_OPTIONS_SETTINGS,
2322

2423
// Recent files
2524
ID_RECENT_FILE_START,
@@ -48,7 +47,6 @@ class SciterMainWindow :
4847

4948
void OnOpenGame(void);
5049
void OnFileExit(void);
51-
void OnSettings(void);
5250
void OnInputConfig(void);
5351
void OnRecetGame(uint32_t fileIndex);
5452

0 commit comments

Comments
 (0)