latest commits from gta5sync

This commit is contained in:
Rafael 2017-01-22 19:52:39 +01:00
parent de9d15529b
commit 144b3238df
3 changed files with 140 additions and 97 deletions

View file

@ -34,11 +34,11 @@ AboutDialog::AboutDialog(QWidget *parent) :
QString projectBuild = QString("%1, %2").arg(__DATE__, __TIME__); QString projectBuild = QString("%1, %2").arg(__DATE__, __TIME__);
QString buildStr = QString("%1, %2").arg(QT_VERSION_STR, GTA5SYNC_COMPILER); QString buildStr = QString("%1, %2").arg(QT_VERSION_STR, GTA5SYNC_COMPILER);
QString projectDes = tr(GTA5SYNC_APPDES); 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<br/>\nPictures and Savegames"); projectDes = tr("A project for viewing Grand Theft Auto V Snapmatic<br/>\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<br/>\nPictures and Savegames"); projectDes = tr("A project for viewing and sync Grand Theft Auto V Snapmatic<br/>\nPictures and Savegames");
} }

View file

@ -137,9 +137,10 @@ void PictureDialog::adaptNewDialogSize(QSize newLabelSize)
if (navienabled) newDialogHeight = newDialogHeight + layout()->menuBar()->height(); if (navienabled) newDialogHeight = newDialogHeight + layout()->menuBar()->height();
setMinimumSize(width(), newDialogHeight); setMinimumSize(width(), newDialogHeight);
setMaximumSize(width(), newDialogHeight); setMaximumSize(width(), newDialogHeight);
resize(width(), newDialogHeight); setFixedHeight(newDialogHeight);
ui->labPicture->updateGeometry(); ui->labPicture->updateGeometry();
ui->jsonFrame->updateGeometry(); ui->jsonFrame->updateGeometry();
updateGeometry();
} }
void PictureDialog::stylizeDialog() void PictureDialog::stylizeDialog()

View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>375</width> <width>375</width>
<height>306</height> <height>305</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -15,107 +15,137 @@
</property> </property>
<layout class="QVBoxLayout" name="vlEditor"> <layout class="QVBoxLayout" name="vlEditor">
<item> <item>
<widget class="QGroupBox" name="gbMode"> <widget class="QWidget" name="frameWidget" native="true">
<property name="title"> <property name="sizePolicy">
<string>Snapmatic Type</string> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<layout class="QGridLayout" name="gdType"> <layout class="QVBoxLayout" name="vlFrame">
<item row="2" column="1"> <property name="leftMargin">
<widget class="QRadioButton" name="rbEditor"> <number>0</number>
<property name="text"> </property>
<string>Editor</string> <property name="topMargin">
</property> <number>0</number>
</widget> </property>
</item> <property name="rightMargin">
<item row="0" column="1"> <number>0</number>
<widget class="QRadioButton" name="rbSelfie"> </property>
<property name="text"> <property name="bottomMargin">
<string>Selfie</string> <number>0</number>
</property> </property>
</widget>
</item>
<item row="0" column="0">
<widget class="QRadioButton" name="rbCustom">
<property name="text">
<string>Regular</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QRadioButton" name="rbMugshot">
<property name="text">
<string>Mugshot</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="gbProperties">
<property name="title">
<string>Snapmatic Properties</string>
</property>
<layout class="QGridLayout" name="gdProperties">
<item row="5" column="1">
<widget class="QCheckBox" name="cbEditor">
<property name="text">
<string>Editor</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="cbMeme">
<property name="text">
<string>Meme</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QCheckBox" name="cbDirector">
<property name="text">
<string>Director</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="cbSelfie">
<property name="text">
<string>Selfie</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QCheckBox" name="cbMugshot">
<property name="text">
<string>Mugshot</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="gbExtras">
<property name="title">
<string>Extras</string>
</property>
<layout class="QVBoxLayout" name="vlExtras">
<item> <item>
<widget class="QCheckBox" name="cbQualify"> <widget class="QGroupBox" name="gbMode">
<property name="text"> <property name="title">
<string>Qualify as Avatar automatically at apply</string> <string>Snapmatic Type</string>
</property> </property>
<layout class="QGridLayout" name="gdType">
<item row="2" column="1">
<widget class="QRadioButton" name="rbEditor">
<property name="text">
<string>Editor</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QRadioButton" name="rbSelfie">
<property name="text">
<string>Selfie</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QRadioButton" name="rbCustom">
<property name="text">
<string>Regular</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QRadioButton" name="rbMugshot">
<property name="text">
<string>Mugshot</string>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="labQualify"> <widget class="QGroupBox" name="gbProperties">
<property name="text"> <property name="title">
<string>Qualify as Avatar allows you to use this Snapmatic as a Social Club profile picture</string> <string>Snapmatic Properties</string>
</property> </property>
<property name="wordWrap"> <layout class="QGridLayout" name="gdProperties">
<bool>true</bool> <item row="5" column="1">
<widget class="QCheckBox" name="cbEditor">
<property name="text">
<string>Editor</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="cbMeme">
<property name="text">
<string>Meme</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QCheckBox" name="cbDirector">
<property name="text">
<string>Director</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="cbSelfie">
<property name="text">
<string>Selfie</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QCheckBox" name="cbMugshot">
<property name="text">
<string>Mugshot</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="gbExtras">
<property name="title">
<string>Extras</string>
</property> </property>
<layout class="QVBoxLayout" name="vlExtras">
<item>
<widget class="QCheckBox" name="cbQualify">
<property name="text">
<string>Qualify as Avatar automatically at apply</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="labQualify">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Qualify as Avatar allows you to use this Snapmatic as a Social Club profile picture</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -151,6 +181,12 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="cmdApply"> <widget class="QPushButton" name="cmdApply">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>&amp;Apply</string> <string>&amp;Apply</string>
</property> </property>
@ -161,6 +197,12 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="cmdCancel"> <widget class="QPushButton" name="cmdCancel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>&amp;Cancel</string> <string>&amp;Cancel</string>
</property> </property>