Syping/gta5view
1
0
Fork 0
Code Issues Pull requests Releases 12 Wiki Activity

Small Flatpak fixes, Qt6 beta build fix
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Syping 2020-10-21 19:14:20 +02:00
parent f8049c8178
commit fcbe264d63
5 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PictureWidget.cpp
View file

@ -47,7 +47,9 @@ PictureWidget::PictureWidget(QWidget *parent) : QDialog(parent)
QObject::connect(pictureLabel, SIGNAL(mouseDoubleClicked(Qt::MouseButton)), this, SLOT(pictureDoubleClicked(Qt::MouseButton))); QObject::connect(pictureLabel, SIGNAL(mouseDoubleClicked(Qt::MouseButton)), this, SLOT(pictureDoubleClicked(Qt::MouseButton)));
QObject::connect(pictureLabel, SIGNAL(customContextMenuRequested(QPoint)), parent, SLOT(exportCustomContextMenuRequested(QPoint))); QObject::connect(pictureLabel, SIGNAL(customContextMenuRequested(QPoint)), parent, SLOT(exportCustomContextMenuRequested(QPoint)));
#if QT_VERSION < 0x060000
QObject::connect(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(updateWindowSize(int))); QObject::connect(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(updateWindowSize(int)));
#endif
setLayout(widgetLayout); setLayout(widgetLayout);
} }

5
UserInterface.cpp
View file

@ -179,7 +179,7 @@ UserInterface::UserInterface(ProfileDatabase *profileDB, CrewDatabase *crewDB, D
ui->vlUserInterface->setContentsMargins(9 * screenRatio, 9 * screenRatio, 9 * screenRatio, 9 * screenRatio); ui->vlUserInterface->setContentsMargins(9 * screenRatio, 9 * screenRatio, 9 * screenRatio, 9 * screenRatio);
} }
void UserInterface::setupDirEnv() void UserInterface::setupDirEnv(bool showFolderDialog)
{ {
// settings init // settings init
QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR); QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
@ -191,6 +191,8 @@ void UserInterface::setupDirEnv()
QDir::setCurrent(GTAV_Folder); QDir::setCurrent(GTAV_Folder);
} }
else else
{
if (showFolderDialog)
{ {
GTAV_Folder = QFileDialog::getExistingDirectory(this, tr("Select GTA V Folder..."), StandardPaths::documentsLocation(), QFileDialog::ShowDirsOnly); GTAV_Folder = QFileDialog::getExistingDirectory(this, tr("Select GTA V Folder..."), StandardPaths::documentsLocation(), QFileDialog::ShowDirsOnly);
if (QFileInfo(GTAV_Folder).exists()) if (QFileInfo(GTAV_Folder).exists())
@ -208,6 +210,7 @@ void UserInterface::setupDirEnv()
settings.endGroup(); settings.endGroup();
} }
} }
}
// profiles init // profiles init
settings.beginGroup("Profile"); settings.beginGroup("Profile");

2
UserInterface.h
View file

@ -48,7 +48,7 @@ public:
#else #else
explicit UserInterface(ProfileDatabase *profileDB, CrewDatabase *crewDB, DatabaseThread *threadDB, QWidget *parent = 0); explicit UserInterface(ProfileDatabase *profileDB, CrewDatabase *crewDB, DatabaseThread *threadDB, QWidget *parent = 0);
#endif #endif
void setupDirEnv(); void setupDirEnv(bool showFolderDialog = true);
~UserInterface(); ~UserInterface();
private slots: private slots:

6
main.cpp
View file

@ -133,7 +133,7 @@ int main(int argc, char *argv[])
{ {
if (isFirstStart) if (isFirstStart)
{ {
QMessageBox::StandardButton button = QMessageBox::information(a.desktop(), QString("%1 %2").arg(GTA5SYNC_APPSTR, GTA5SYNC_APPVER), QApplication::tr("<h4>Welcome to %1!</h4>You want to configure %1 before you start using it?").arg(GTA5SYNC_APPSTR), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); QMessageBox::StandardButton button = QMessageBox::information(nullptr, QString("%1 %2").arg(GTA5SYNC_APPSTR, GTA5SYNC_APPVER), QApplication::tr("<h4>Welcome to %1!</h4>You want to configure %1 before you start using it?").arg(GTA5SYNC_APPSTR), QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
if (button == QMessageBox::Yes) if (button == QMessageBox::Yes)
{ {
ProfileDatabase profileDB; ProfileDatabase profileDB;
@ -320,7 +320,11 @@ int main(int argc, char *argv[])
UserInterface uiWindow(&profileDB, &crewDB, &threadDB); UserInterface uiWindow(&profileDB, &crewDB, &threadDB);
#endif #endif
uiWindow.setWindowIcon(IconLoader::loadingAppIcon()); uiWindow.setWindowIcon(IconLoader::loadingAppIcon());
#ifdef GTA5SYNC_FLATPAK
uiWindow.setupDirEnv(false);
#else
uiWindow.setupDirEnv(); uiWindow.setupDirEnv();
#endif
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
uiWindow.showMaximized(); uiWindow.showMaximized();
#else #else

8
res/de.syping.gta5view.metainfo.xml
View file

@ -17,13 +17,17 @@
<p>Open Source Snapmatic picture and Savegame viewer/editor for GTA V</p> <p>Open Source Snapmatic picture and Savegame viewer/editor for GTA V</p>
<p>Features</p> <p>Features</p>
<ul> <ul>
<li>View Snapmatics with the ability to disable them in-game*</li> <li>View Snapmatics with the ability to disable them in-game</li>
<li>Edit Snapmatic pictures and properties in multiple ways</li> <li>Edit Snapmatic pictures and properties in multiple ways</li>
<li>Import**/Export Snapmatics, Savegames and pictures</li> <li>Import/Export Snapmatics, Savegames and pictures</li>
<li>Choose between multiple Social Club accounts as GTA V profiles IDs</li> <li>Choose between multiple Social Club accounts as GTA V profiles IDs</li>
</ul> </ul>
</description> </description>
<categories>
<category>Utility</category>
</categories>
<developer_name>Syping</developer_name> <developer_name>Syping</developer_name>
<releases> <releases>