From 144b3238dfa990ab2993ed8f029a6e933a9757ae Mon Sep 17 00:00:00 2001 From: Rafael Date: Sun, 22 Jan 2017 19:52:39 +0100 Subject: [PATCH] latest commits from gta5sync --- AboutDialog.cpp | 4 +- PictureDialog.cpp | 3 +- SnapmaticEditor.ui | 230 +++++++++++++++++++++++++++------------------ 3 files changed, 140 insertions(+), 97 deletions(-) diff --git a/AboutDialog.cpp b/AboutDialog.cpp index 71af2ca..ca64d22 100755 --- a/AboutDialog.cpp +++ b/AboutDialog.cpp @@ -34,11 +34,11 @@ AboutDialog::AboutDialog(QWidget *parent) : QString projectBuild = QString("%1, %2").arg(__DATE__, __TIME__); QString buildStr = QString("%1, %2").arg(QT_VERSION_STR, GTA5SYNC_COMPILER); QString projectDes = tr(GTA5SYNC_APPDES); - if (GTA5SYNC_APPSTR == "gta5view") + if (QString(GTA5SYNC_APPSTR) == "gta5view") { projectDes = tr("A project for viewing Grand Theft Auto V Snapmatic
\nPictures and Savegames"); } - else if (GTA5SYNC_APPSTR == "gta5sync") + else if (QString(GTA5SYNC_APPSTR) == "gta5sync") { projectDes = tr("A project for viewing and sync Grand Theft Auto V Snapmatic
\nPictures and Savegames"); } diff --git a/PictureDialog.cpp b/PictureDialog.cpp index 7b2af66..1432f62 100755 --- a/PictureDialog.cpp +++ b/PictureDialog.cpp @@ -137,9 +137,10 @@ void PictureDialog::adaptNewDialogSize(QSize newLabelSize) if (navienabled) newDialogHeight = newDialogHeight + layout()->menuBar()->height(); setMinimumSize(width(), newDialogHeight); setMaximumSize(width(), newDialogHeight); - resize(width(), newDialogHeight); + setFixedHeight(newDialogHeight); ui->labPicture->updateGeometry(); ui->jsonFrame->updateGeometry(); + updateGeometry(); } void PictureDialog::stylizeDialog() diff --git a/SnapmaticEditor.ui b/SnapmaticEditor.ui index 72a7c41..61830e6 100644 --- a/SnapmaticEditor.ui +++ b/SnapmaticEditor.ui @@ -7,7 +7,7 @@ 0 0 375 - 306 + 305 @@ -15,107 +15,137 @@ - - - Snapmatic Type + + + + 0 + 0 + - - - - - Editor - - - - - - - Selfie - - - - - - - Regular - - - - - - - Mugshot - - - - - - - - - - Snapmatic Properties - - - - - - Editor - - - - - - - Meme - - - - - - - Director - - - - - - - Selfie - - - - - - - Mugshot - - - - - - - - - - Extras - - + + + 0 + + + 0 + + + 0 + + + 0 + - - - Qualify as Avatar automatically at apply + + + Snapmatic Type + + + + + Editor + + + + + + + Selfie + + + + + + + Regular + + + + + + + Mugshot + + + + - - - Qualify as Avatar allows you to use this Snapmatic as a Social Club profile picture + + + Snapmatic Properties - - true + + + + + Editor + + + + + + + Meme + + + + + + + Director + + + + + + + Selfie + + + + + + + Mugshot + + + + + + + + + + Extras + + + + + Qualify as Avatar automatically at apply + + + + + + + + 0 + 0 + + + + Qualify as Avatar allows you to use this Snapmatic as a Social Club profile picture + + + true + + + + @@ -151,6 +181,12 @@ + + + 0 + 0 + + &Apply @@ -161,6 +197,12 @@ + + + 0 + 0 + + &Cancel