Skip to content

Commit af08db3

Browse files
author
N3xoX1
committed
make sciter Ui the default ui
1 parent bf26a72 commit af08db3

9 files changed

Lines changed: 12 additions & 564 deletions

File tree

‎src/nxemu/main.cpp‎

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "settings/ui_settings.h"
2-
#include "user_interface/main_window.h"
32
#include "user_interface/notification.h"
43
#include "user_interface/sciter_main_window.h"
54
#include <common/std_string.h>
@@ -19,31 +18,21 @@ int WINAPI WinMain(_In_ HINSTANCE /*hInstance*/, _In_opt_ HINSTANCE /*hPrevInsta
1918
{
2019
bool Res = AppInit(&Notification::GetInstance());
2120

22-
if (uiSettings.sciterUI && Res)
21+
ISciterUI * sciterUI = nullptr;
22+
if (Res && !SciterUIInit(uiSettings.languageDir, uiSettings.languageBase.c_str(), uiSettings.languageCurrent.c_str(), uiSettings.sciterConsole, sciterUI))
2323
{
24-
ISciterUI * sciterUI = nullptr;
25-
if (Res && !SciterUIInit(uiSettings.languageDir, uiSettings.languageBase.c_str(), uiSettings.languageCurrent.c_str(), uiSettings.sciterConsole, sciterUI))
26-
{
27-
Res = false;
28-
}
29-
if (Res)
30-
{
31-
RegisterWidgets(*sciterUI);
32-
SciterMainWindow window(*sciterUI, stdstr_f("NXEmu %s", VER_FILE_VERSION_STR).c_str());
33-
window.Show();
34-
sciterUI->Run();
35-
}
36-
if (sciterUI != nullptr)
37-
{
38-
sciterUI->Shutdown();
39-
}
24+
Res = false;
4025
}
41-
else if (Res)
26+
if (Res)
4227
{
43-
std::unique_ptr<MainWindow> mainWindow = std::make_unique<MainWindow>(stdstr_f("NXEmu %s", VER_FILE_VERSION_STR).ToUTF16().c_str());
44-
mainWindow->ShowWindow(true);
45-
mainWindow->ProcessAllMessages();
46-
mainWindow.reset(nullptr);
28+
RegisterWidgets(*sciterUI);
29+
SciterMainWindow window(*sciterUI, stdstr_f("NXEmu %s", VER_FILE_VERSION_STR).c_str());
30+
window.Show();
31+
sciterUI->Run();
32+
}
33+
if (sciterUI != nullptr)
34+
{
35+
sciterUI->Shutdown();
4736
}
4837
AppCleanup();
4938
Notification::CleanUp();

‎src/nxemu/nxemu.vcxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
<ItemGroup>
3838
<ClCompile Include="main.cpp" />
3939
<ClCompile Include="settings\ui_settings.cpp" />
40-
<ClCompile Include="user_interface\main_menu.cpp" />
41-
<ClCompile Include="user_interface\main_window.cpp" />
4240
<ClCompile Include="user_interface\menu_item.cpp" />
4341
<ClCompile Include="user_interface\notification.cpp" />
4442
<ClCompile Include="user_interface\sciter_main_window.cpp" />
@@ -51,8 +49,6 @@
5149
</ItemGroup>
5250
<ItemGroup>
5351
<ClInclude Include="settings\ui_settings.h" />
54-
<ClInclude Include="user_interface\main_menu.h" />
55-
<ClInclude Include="user_interface\main_window.h" />
5652
<ClInclude Include="user_interface\menu_item.h" />
5753
<ClInclude Include="user_interface\notification.h" />
5854
<ClInclude Include="user_interface\resource.h" />

‎src/nxemu/nxemu.vcxproj.filters‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@
4242
<ClCompile Include="main.cpp">
4343
<Filter>Source Files</Filter>
4444
</ClCompile>
45-
<ClCompile Include="user_interface\main_window.cpp">
46-
<Filter>Source Files\user_interface</Filter>
47-
</ClCompile>
48-
<ClCompile Include="user_interface\main_menu.cpp">
49-
<Filter>Source Files\user_interface</Filter>
50-
</ClCompile>
5145
<ClCompile Include="user_interface\menu_item.cpp">
5246
<Filter>Source Files\user_interface</Filter>
5347
</ClCompile>
@@ -80,15 +74,9 @@
8074
</ClCompile>
8175
</ItemGroup>
8276
<ItemGroup>
83-
<ClInclude Include="user_interface\main_window.h">
84-
<Filter>Header Files\user_interface</Filter>
85-
</ClInclude>
8677
<ClInclude Include="user_interface\resource.h">
8778
<Filter>Header Files\user_interface</Filter>
8879
</ClInclude>
89-
<ClInclude Include="user_interface\main_menu.h">
90-
<Filter>Header Files\user_interface</Filter>
91-
</ClInclude>
9280
<ClInclude Include="user_interface\menu_item.h">
9381
<Filter>Header Files\user_interface</Filter>
9482
</ClInclude>

‎src/nxemu/settings/ui_settings.cpp‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ namespace
88
struct UISettingsDefaults
99
{
1010
static constexpr bool enableModuleConfiguration = false;
11-
static constexpr bool sciterUI = false;
1211
static constexpr const char * defaultLanguageDirValue = "./lang";
1312
static constexpr const char * defaultLanguageBaseValue = "english";
1413
static constexpr const char * defaultLanguageCurrentValue = "english";
@@ -24,7 +23,6 @@ void LoadUISetting(void)
2423
{
2524
uiSettings = {};
2625
uiSettings.enableModuleConfiguration = UISettingsDefaults::enableModuleConfiguration;
27-
uiSettings.sciterUI = UISettingsDefaults::sciterUI;
2826
uiSettings.languageDir = UISettingsDefaults::GetDefaultLanguageDir();
2927
uiSettings.languageDirValue = UISettingsDefaults::defaultLanguageDirValue;
3028
uiSettings.languageBase = UISettingsDefaults::defaultLanguageBaseValue;
@@ -39,12 +37,6 @@ void LoadUISetting(void)
3937
uiSettings.enableModuleConfiguration = node->asBool();
4038
}
4139

42-
node = jsonSettings.Find("SciterUI");
43-
if (node != nullptr && node->isBool())
44-
{
45-
uiSettings.sciterUI = node->asBool();
46-
}
47-
4840
node = jsonSettings.Find("LanguageDirectory");
4941
if (node != nullptr && node->isString())
5042
{
@@ -93,10 +85,6 @@ void SaveUISetting(void)
9385
{
9486
json["EnableModuleConfiguration"] = JsonValue(uiSettings.enableModuleConfiguration);
9587
}
96-
if (uiSettings.sciterUI != UISettingsDefaults::sciterUI)
97-
{
98-
json["SciterUI"] = JsonValue(uiSettings.sciterUI);
99-
}
10088
if (uiSettings.languageDirValue != UISettingsDefaults::defaultLanguageDirValue)
10189
{
10290
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
@@ -9,7 +9,6 @@ struct UISettings
99
{
1010
Stringlist recentFiles;
1111
bool enableModuleConfiguration;
12-
bool sciterUI;
1312
Path languageDir;
1413
std::string languageDirValue;
1514
std::string languageBase;

‎src/nxemu/user_interface/main_menu.cpp‎

Lines changed: 0 additions & 100 deletions
This file was deleted.

‎src/nxemu/user_interface/main_menu.h‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)