mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-08-04 08:22:32 +00:00
Merge remote-tracking branch 'upstream/main'
This commit is contained in:
commit
b75b9f4bc8
@ -451,7 +451,7 @@ private:
|
||||
pShellLink->SetWorkingDirectory((LPCWSTR)QFileInfo(exePath).absolutePath().utf16());
|
||||
|
||||
// Set arguments, eboot.bin file location
|
||||
QString arguments = QString("\"%1\"").arg(targetPath);
|
||||
QString arguments = QString("-g \"%1\"").arg(targetPath);
|
||||
pShellLink->SetArguments((LPCWSTR)arguments.utf16());
|
||||
|
||||
// Set the icon for the shortcut
|
||||
|
@ -102,6 +102,7 @@ void MainWindow::CreateActions() {
|
||||
m_list_mode_act_group = new QActionGroup(this);
|
||||
m_list_mode_act_group->addAction(ui->setlistModeListAct);
|
||||
m_list_mode_act_group->addAction(ui->setlistModeGridAct);
|
||||
m_list_mode_act_group->addAction(ui->setlistElfAct);
|
||||
|
||||
// create action group for themes
|
||||
m_theme_act_group = new QActionGroup(this);
|
||||
@ -362,7 +363,7 @@ void MainWindow::CreateConnects() {
|
||||
ui->sizeSlider->setEnabled(true);
|
||||
ui->sizeSlider->setSliderPosition(slider_pos_grid);
|
||||
});
|
||||
// Elf
|
||||
// Elf Viewer
|
||||
connect(ui->setlistElfAct, &QAction::triggered, m_dock_widget.data(), [this]() {
|
||||
BackgroundMusicPlayer::getInstance().stopMusic();
|
||||
m_dock_widget->setWidget(m_elf_viewer.data());
|
||||
@ -622,10 +623,12 @@ void MainWindow::ConfigureGuiFromSettings() {
|
||||
Config::getMainWindowGeometryW(), Config::getMainWindowGeometryH());
|
||||
|
||||
ui->showGameListAct->setChecked(true);
|
||||
if (isTableList) {
|
||||
if (Config::getTableMode() == 0) {
|
||||
ui->setlistModeListAct->setChecked(true);
|
||||
} else {
|
||||
} else if (Config::getTableMode() == 1) {
|
||||
ui->setlistModeGridAct->setChecked(true);
|
||||
} else if (Config::getTableMode() == 2) {
|
||||
ui->setlistElfAct->setChecked(true);
|
||||
}
|
||||
BackgroundMusicPlayer::getInstance().setVolume(Config::getBGMvolume());
|
||||
}
|
||||
|
@ -110,15 +110,14 @@ public:
|
||||
setIconSizeLargeAct->setCheckable(true);
|
||||
setlistModeListAct = new QAction(MainWindow);
|
||||
setlistModeListAct->setObjectName("setlistModeListAct");
|
||||
setlistModeListAct->setCheckable(true);
|
||||
setlistModeListAct->setChecked(true);
|
||||
setlistModeListAct->setIcon(QIcon(":images/list_icon.png"));
|
||||
setlistModeListAct->setCheckable(true);
|
||||
setlistModeGridAct = new QAction(MainWindow);
|
||||
setlistModeGridAct->setObjectName("setlistModeGridAct");
|
||||
setlistModeGridAct->setCheckable(true);
|
||||
setlistModeGridAct->setIcon(QIcon(":images/grid_icon.png"));
|
||||
setlistModeGridAct->setCheckable(true);
|
||||
setlistElfAct = new QAction(MainWindow);
|
||||
setlistElfAct->setObjectName("setlistModeGridAct");
|
||||
setlistElfAct->setObjectName("setlistElfAct");
|
||||
setlistElfAct->setCheckable(true);
|
||||
gameInstallPathAct = new QAction(MainWindow);
|
||||
gameInstallPathAct->setObjectName("gameInstallPathAct");
|
||||
|
@ -118,22 +118,22 @@
|
||||
<message>
|
||||
<location filename="../gui_context_menus.h" line="49"/>
|
||||
<source>Open Folder...</source>
|
||||
<translation>Hapni Dosjen...</translation>
|
||||
<translation>Hap Dosjen...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui_context_menus.h" line="50"/>
|
||||
<source>Open Game Folder</source>
|
||||
<translation>Hapni Dosjen e Lojës</translation>
|
||||
<translation>Hap Dosjen e Lojës</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui_context_menus.h" line="51"/>
|
||||
<source>Open Save Data Folder</source>
|
||||
<translation>Hapni Dosjen e të Dhënave të Ruajtura</translation>
|
||||
<translation>Hap Dosjen e të Dhënave të Ruajtura</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui_context_menus.h" line="52"/>
|
||||
<source>Open Log Folder</source>
|
||||
<translation>Hapni Dosjen e Regjistrimeve</translation>
|
||||
<translation>Hap Dosjen e Ditarit</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../gui_context_menus.h" line="59"/>
|
||||
|
Loading…
Reference in New Issue
Block a user