YouHaveTrouble/Kyty
1
0
Fork 0
mirror of https://github.com/InoriRus/Kyty.git synced 2026-08-28 05:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

PS5 graphics (#42)

Browse Source
This commit is contained in:
InoriRus
2022-08-16 13:38:38 +03:00
parent e110bd0f63
commit 90acd3d364
46 changed files with 12642 additions and 3962 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/launcher/forms/configuration_edit_dialog.ui
+1 -36
View File
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>837</width>
<height>822</height>
<height>818</height>
</rect>
</property>
<property name="windowTitle">
@@ -492,41 +492,6 @@
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="frame_3">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="1" column="0">
<widget class="QListWidget" name="listWidget_libs">
<property name="toolTip">
<string>Select libraries to load</string>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Load library:</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout>
source/launcher/include/Configuration.h
+12 -12
View File
@@ -17,12 +17,12 @@
#define KYTY_CFG_GET(n) n = s->value(#n).value<decltype(n)>();
#define KYTY_CFG_GETL(n) n = s->value(#n).toStringList();
#define KYTY_LIBS \
{ \
"libc_internal_1", "libkernel_1", "libVideoOut_1", "libSysmodule_1", "libDiscMap_1", "libDebug_1", "libGraphicsDriver_1", \
"libUserService_1", "libSystemService_1", "libPad_1", "libNet_1", "libDialog_1", "libAudio_1", "libPlayGo_1", "libSaveData_1", \
"libAppContent_1" \
}
//#define KYTY_LIBS \
// { \
// "libc_internal_1", "libkernel_1", "libVideoOut_1", "libSysmodule_1", "libDiscMap_1", "libDebug_1", "libGraphicsDriver_1", \
// "libUserService_1", "libSystemService_1", "libPad_1", "libNet_1", "libDialog_1", "libAudio_1", "libPlayGo_1", "libSaveData_1", \
// "libAppContent_1" \
// }
template <class T>
inline QStringList EnumToList()
@@ -122,8 +122,8 @@ public:
QStringList elfs;
QStringList elfs_selected;
QStringList libs = KYTY_LIBS;
QStringList libs_selected = KYTY_LIBS;
// QStringList libs = KYTY_LIBS;
// QStringList libs_selected = KYTY_LIBS;
void WriteSettings(QSettings* s) const
{
@@ -145,8 +145,8 @@ public:
KYTY_CFG_SET(profiler_output_file);
KYTY_CFG_SETL(elfs);
KYTY_CFG_SETL(elfs_selected);
KYTY_CFG_SETL(libs);
KYTY_CFG_SETL(libs_selected);
// KYTY_CFG_SETL(libs);
// KYTY_CFG_SETL(libs_selected);
}
void ReadSettings(QSettings* s)
@@ -169,8 +169,8 @@ public:
KYTY_CFG_GET(profiler_output_file);
KYTY_CFG_GETL(elfs);
KYTY_CFG_GETL(elfs_selected);
KYTY_CFG_GETL(libs);
KYTY_CFG_GETL(libs_selected);
// KYTY_CFG_GETL(libs);
// KYTY_CFG_GETL(libs_selected);
}
};
source/launcher/include/ConfigurationEditDialog.h
+1 -1
View File
@@ -55,7 +55,7 @@ protected:
void browse_base_path();
void browse_param_file();
void scan_elfs();
void scan_libs();
// void scan_libs();
void load_param_sfo();
void clear();
void test();
source/launcher/src/ConfigurationEditDialog.cpp
+44 -44
View File
@@ -80,7 +80,7 @@ ConfigurationEditDialog::ConfigurationEditDialog(Kyty::Configuration* info, Conf
connect(m_ui->base_directory_lineedit, &QLineEdit::textChanged, this, &ConfigurationEditDialog::scan_elfs);
connect(m_ui->param_file_lineedit, &QLineEdit::textChanged, this, &ConfigurationEditDialog::load_param_sfo);
connect(m_ui->listWidget_elfs, &QListWidget::itemChanged, this, &ChangeColor);
connect(m_ui->listWidget_libs, &QListWidget::itemChanged, this, &ChangeColor);
// connect(m_ui->listWidget_libs, &QListWidget::itemChanged, this, &ChangeColor);
connect(&m_process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
[=](int /*exitCode*/, QProcess::ExitStatus /*exitStatus*/) { m_ui->test_button->setEnabled(true); });
@@ -96,7 +96,7 @@ ConfigurationEditDialog::ConfigurationEditDialog(Kyty::Configuration* info, Conf
Init();
scan_libs();
// scan_libs();
scan_elfs();
load_param_sfo();
}
@@ -231,7 +231,7 @@ static void UpdateInfo(Kyty::Configuration* info, Ui::ConfigurationEditDialog* u
}
UpdateList(&info->elfs, &info->elfs_selected, ui->listWidget_elfs);
UpdateList(&info->libs, &info->libs_selected, ui->listWidget_libs);
// UpdateList(&info->libs, &info->libs_selected, ui->listWidget_libs);
}
void ConfigurationEditDialog::update_info()
@@ -344,46 +344,46 @@ void ConfigurationEditDialog::scan_elfs()
m_ui->test_button->setEnabled(m_process.state() == QProcess::NotRunning && dir_exists);
}
void ConfigurationEditDialog::scan_libs()
{
QStringList libs = KYTY_LIBS;
m_ui->listWidget_libs->clear();
// int selected_num = 0;
for (const auto& lib: m_info->libs)
{
bool not_enabled = !libs.contains(lib);
bool selected = m_info->libs_selected.contains(lib);
auto* item = new QListWidgetItem(lib, m_ui->listWidget_libs);
item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
if (not_enabled)
{
item->setCheckState(Qt::Unchecked);
item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
} else
{
item->setCheckState(selected ? Qt::Checked : Qt::Unchecked);
}
// selected_num += (selected ? 1 : 0);
}
for (const auto& lib: libs)
{
if (!m_info->libs.contains(lib))
{
auto* item = new QListWidgetItem(lib, m_ui->listWidget_libs);
item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
item->setCheckState(Qt::Unchecked);
}
}
m_ui->listWidget_libs->sortItems();
}
// void ConfigurationEditDialog::scan_libs()
//{
// QStringList libs = KYTY_LIBS;
//
// m_ui->listWidget_libs->clear();
//
// // int selected_num = 0;
//
// for (const auto& lib: m_info->libs)
// {
// bool not_enabled = !libs.contains(lib);
// bool selected = m_info->libs_selected.contains(lib);
//
// auto* item = new QListWidgetItem(lib, m_ui->listWidget_libs);
// item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
//
// if (not_enabled)
// {
// item->setCheckState(Qt::Unchecked);
// item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
// } else
// {
// item->setCheckState(selected ? Qt::Checked : Qt::Unchecked);
// }
//
// // selected_num += (selected ? 1 : 0);
// }
//
// for (const auto& lib: libs)
// {
// if (!m_info->libs.contains(lib))
// {
// auto* item = new QListWidgetItem(lib, m_ui->listWidget_libs);
// item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
// item->setCheckState(Qt::Unchecked);
// }
// }
//
// m_ui->listWidget_libs->sortItems();
// }
void ConfigurationEditDialog::load_param_sfo()
{
@@ -452,7 +452,7 @@ void ConfigurationEditDialog::clear()
m_info = old_info;
scan_elfs();
scan_libs();
// scan_libs();
load_param_sfo();
}
source/launcher/src/MainDialog.cpp
+15 -12
View File
@@ -35,13 +35,14 @@
class QWidget;
constexpr char SCRIPT_EXE[] = "fc_script.exe";
constexpr char CMD_EXE[] = "cmd.exe";
constexpr char CONEMU_EXE[] = "C:/Program Files/ConEmu/ConEmu64.exe";
constexpr char KYTY_MOUNT[] = "kyty_mount";
constexpr char KYTY_EXECUTE[] = "kyty_execute";
constexpr char KYTY_LOAD_ELF[] = "kyty_load_elf";
constexpr char KYTY_LOAD_SYMBOLS[] = "kyty_load_symbols";
constexpr char SCRIPT_EXE[] = "fc_script.exe";
constexpr char CMD_EXE[] = "cmd.exe";
constexpr char CONEMU_EXE[] = "C:/Program Files/ConEmu/ConEmu64.exe";
constexpr char KYTY_MOUNT[] = "kyty_mount";
constexpr char KYTY_EXECUTE[] = "kyty_execute";
constexpr char KYTY_LOAD_ELF[] = "kyty_load_elf";
// constexpr char KYTY_LOAD_SYMBOLS[] = "kyty_load_symbols";
constexpr char KYTY_LOAD_SYMBOLS_ALL[] = "kyty_load_symbols_all";
constexpr char KYTY_LOAD_PARAM_SFO[] = "kyty_load_param_sfo";
constexpr char KYTY_INIT[] = "kyty_init";
constexpr char KYTY_LUA_FILE[] = "kyty_run.lua";
@@ -183,7 +184,7 @@ void MainDialogPrivate::FindInterpreter()
found = found && lines.contains(QString("Lua function: ") + KYTY_MOUNT);
found = found && lines.contains(QString("Lua function: ") + KYTY_EXECUTE);
found = found && lines.contains(QString("Lua function: ") + KYTY_LOAD_ELF);
found = found && lines.contains(QString("Lua function: ") + KYTY_LOAD_SYMBOLS);
found = found && lines.contains(QString("Lua function: ") + KYTY_LOAD_SYMBOLS_ALL);
found = found && lines.contains(QString("Lua function: ") + KYTY_LOAD_PARAM_SFO);
found = found && lines.contains(QString("Lua function: ") + KYTY_INIT);
}
@@ -249,10 +250,12 @@ static bool CreateLuaScript(Kyty::Configuration* info, const QString& file_name)
s << KYTY_LOAD_ELF << "('/app0/" << elf << "');\n";
}
for (const auto& lib: info->libs_selected)
{
s << KYTY_LOAD_SYMBOLS << "('" << lib << "');\n";
}
// for (const auto& lib: info->libs_selected)
// {
// s << KYTY_LOAD_SYMBOLS << "('" << lib << "');\n";
// }
s << KYTY_LOAD_SYMBOLS_ALL << "();\n";
s << KYTY_EXECUTE << "();\n";
source/launcher/ts/launcher_ru_RU.ts
+11 -21
View File
@@ -185,32 +185,22 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/configuration_edit_dialog.ui" line="513"/>
<source>Select libraries to load</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/configuration_edit_dialog.ui" line="523"/>
<source>Load library:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/configuration_edit_dialog.ui" line="550"/>
<location filename="../forms/configuration_edit_dialog.ui" line="515"/>
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/configuration_edit_dialog.ui" line="566"/>
<location filename="../forms/configuration_edit_dialog.ui" line="531"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/configuration_edit_dialog.ui" line="586"/>
<location filename="../forms/configuration_edit_dialog.ui" line="551"/>
<source>Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../forms/configuration_edit_dialog.ui" line="602"/>
<location filename="../forms/configuration_edit_dialog.ui" line="567"/>
<source>Test</source>
<translation type="unfinished"></translation>
</message>
@@ -338,12 +328,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/MainDialog.cpp" line="276"/>
<location filename="../src/MainDialog.cpp" line="279"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/MainDialog.cpp" line="276"/>
<location filename="../src/MainDialog.cpp" line="279"/>
<source>Can&apos;t create file:
</source>
<translation type="unfinished"></translation>
@@ -352,27 +342,27 @@
<context>
<name>MainDialogPrivate</name>
<message>
<location filename="../src/MainDialog.cpp" line="139"/>
<location filename="../src/MainDialog.cpp" line="140"/>
<source>Settings file: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/MainDialog.cpp" line="165"/>
<location filename="../src/MainDialog.cpp" line="166"/>
<source>Emulator: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/MainDialog.cpp" line="177"/>
<location filename="../src/MainDialog.cpp" line="178"/>
<source>Version: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/MainDialog.cpp" line="193"/>
<location filename="../src/MainDialog.cpp" line="194"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/MainDialog.cpp" line="193"/>
<location filename="../src/MainDialog.cpp" line="194"/>
<source>Can&apos;t find emulator</source>
<translation type="unfinished"></translation>
</message>