added change folder, Reloading profiles added
This commit is contained in:
parent
a7a6d5a1a0
commit
aa890b432a
4 changed files with 144 additions and 42 deletions
|
|
@ -21,7 +21,9 @@
|
|||
#include "ProfileInterface.h"
|
||||
#include "StandardPaths.h"
|
||||
#include "AboutDialog.h"
|
||||
#include "IconLoader.h"
|
||||
#include "AppEnv.h"
|
||||
#include <QFileDialog>
|
||||
#include <QHBoxLayout>
|
||||
#include <QSpacerItem>
|
||||
#include <QPushButton>
|
||||
|
|
@ -45,7 +47,10 @@ UserInterface::UserInterface(ProfileDatabase *profileDB, CrewDatabase *crewDB, D
|
|||
defaultWindowTitle = this->windowTitle();
|
||||
|
||||
this->setWindowTitle(defaultWindowTitle.arg(tr("Select Profile")));
|
||||
}
|
||||
|
||||
void UserInterface::setupDirEnv()
|
||||
{
|
||||
bool folderExists;
|
||||
GTAV_Folder = AppEnv::getGameFolder(&folderExists);
|
||||
if (folderExists)
|
||||
|
|
@ -54,13 +59,22 @@ UserInterface::UserInterface(ProfileDatabase *profileDB, CrewDatabase *crewDB, D
|
|||
}
|
||||
else
|
||||
{
|
||||
QMessageBox::warning(this, tr("gta5sync"), tr("Grand Theft Auto V Folder not found!"));
|
||||
GTAV_Folder = QFileDialog::getExistingDirectory(this, tr("Select GTA V Folder..."), StandardPaths::documentsLocation(), QFileDialog::ShowDirsOnly);
|
||||
if (QFileInfo(GTAV_Folder).exists())
|
||||
{
|
||||
folderExists = true;
|
||||
QDir::setCurrent(GTAV_Folder);
|
||||
AppEnv::setGameFolder(GTAV_Folder);
|
||||
}
|
||||
}
|
||||
|
||||
// profiles init
|
||||
QSettings SyncSettings("Syping", "gta5sync");
|
||||
SyncSettings.beginGroup("Profile");
|
||||
QString defaultProfile = SyncSettings.value("Default", "").toString();
|
||||
|
||||
if (folderExists)
|
||||
{
|
||||
QDir GTAV_ProfilesDir;
|
||||
GTAV_ProfilesFolder = GTAV_Folder + QDir::separator() + "Profiles";
|
||||
GTAV_ProfilesDir.setPath(GTAV_ProfilesFolder);
|
||||
|
|
@ -76,18 +90,36 @@ UserInterface::UserInterface(ProfileDatabase *profileDB, CrewDatabase *crewDB, D
|
|||
{
|
||||
openProfile(defaultProfile);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
setupProfileUi(QStringList());
|
||||
}
|
||||
}
|
||||
|
||||
void UserInterface::setupProfileUi(QStringList GTAV_Profiles)
|
||||
{
|
||||
bool profilesFound = true;
|
||||
if (GTAV_Profiles.length() == 0)
|
||||
{
|
||||
profilesFound = false;
|
||||
|
||||
QPushButton *reloadBtn = new QPushButton(tr("&Reload"), ui->swSelection);
|
||||
reloadBtn->setObjectName("Reload");
|
||||
reloadBtn->setObjectName("cmdReload");
|
||||
reloadBtn->setMinimumSize(0, 40);
|
||||
reloadBtn->setAutoDefault(true);
|
||||
ui->swSelection->layout()->addWidget(reloadBtn);
|
||||
ui->vlButtons->addWidget(reloadBtn);
|
||||
profileBtns.append(reloadBtn);
|
||||
|
||||
QPushButton *changeDirBtn = new QPushButton(tr("Change GTA V &Folder"), ui->swSelection);
|
||||
changeDirBtn->setObjectName("cmdChangeDir");
|
||||
changeDirBtn->setMinimumSize(0, 40);
|
||||
changeDirBtn->setAutoDefault(true);
|
||||
ui->vlButtons->addWidget(changeDirBtn);
|
||||
profileBtns.append(changeDirBtn);
|
||||
|
||||
QObject::connect(reloadBtn, SIGNAL(clicked(bool)), this, SLOT(reloadProfiles_clicked()));
|
||||
QObject::connect(changeDirBtn, SIGNAL(clicked(bool)), this, SLOT(changeFolder_clicked()));
|
||||
}
|
||||
else foreach(const QString >AV_Profile, GTAV_Profiles)
|
||||
{
|
||||
|
|
@ -95,43 +127,45 @@ void UserInterface::setupProfileUi(QStringList GTAV_Profiles)
|
|||
profileBtn->setObjectName(GTAV_Profile);
|
||||
profileBtn->setMinimumSize(0, 40);
|
||||
profileBtn->setAutoDefault(true);
|
||||
ui->swSelection->layout()->addWidget(profileBtn);
|
||||
ui->vlButtons->addWidget(profileBtn);
|
||||
profileBtns.append(profileBtn);
|
||||
|
||||
QObject::connect(profileBtn, SIGNAL(clicked(bool)), this, SLOT(profileButton_clicked()));
|
||||
}
|
||||
QSpacerItem *buttomSpacerItem = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
|
||||
ui->swSelection->layout()->addItem(buttomSpacerItem);
|
||||
if (profilesFound)
|
||||
{
|
||||
QPushButton *reloadBtn = new QPushButton(tr("&Reload"), ui->swSelection);
|
||||
reloadBtn->setObjectName("cmdReload");
|
||||
reloadBtn->setMinimumSize(0, 40);
|
||||
reloadBtn->setAutoDefault(true);
|
||||
ui->vlButtons->addWidget(reloadBtn);
|
||||
profileBtns.append(reloadBtn);
|
||||
|
||||
QHBoxLayout *footerLayout = new QHBoxLayout();
|
||||
footerLayout->setObjectName("footerLayout");
|
||||
ui->swSelection->layout()->addItem(footerLayout);
|
||||
QObject::connect(reloadBtn, SIGNAL(clicked(bool)), this, SLOT(reloadProfiles_clicked()));
|
||||
}
|
||||
profileBtns.at(0)->setFocus();
|
||||
}
|
||||
|
||||
QSpacerItem *closeButtonSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
|
||||
footerLayout->addSpacerItem(closeButtonSpacer);
|
||||
|
||||
QPushButton *cmdClose = new QPushButton(tr("&Close"), ui->swSelection);
|
||||
cmdClose->setObjectName("cmdClose");
|
||||
cmdClose->setAutoDefault(true);
|
||||
footerLayout->addWidget(cmdClose);
|
||||
|
||||
QObject::connect(cmdClose, SIGNAL(clicked(bool)), this, SLOT(close()));
|
||||
void UserInterface::changeFolder_clicked()
|
||||
{
|
||||
GTAV_Folder = QFileDialog::getExistingDirectory(this, tr("Select GTA V Folder..."), StandardPaths::documentsLocation(), QFileDialog::ShowDirsOnly);
|
||||
if (QFileInfo(GTAV_Folder).exists())
|
||||
{
|
||||
QDir::setCurrent(GTAV_Folder);
|
||||
AppEnv::setGameFolder(GTAV_Folder);
|
||||
reloadProfiles_clicked();
|
||||
}
|
||||
}
|
||||
|
||||
void UserInterface::reloadProfiles_clicked()
|
||||
{
|
||||
QStringList gta5sync_a = qApp->arguments();
|
||||
if (gta5sync_a.length() >= 1)
|
||||
foreach(QPushButton *profileBtn, profileBtns)
|
||||
{
|
||||
QProcess gta5sync_p;
|
||||
QString gta5sync_exe = gta5sync_a.at(0);
|
||||
gta5sync_a.removeAt(0);
|
||||
gta5sync_p.startDetached(gta5sync_exe, gta5sync_a);
|
||||
qApp->exit(0);
|
||||
}
|
||||
else
|
||||
{
|
||||
QMessageBox::warning(this, tr("Reload profiles"), tr("Not able to reload profiles"));
|
||||
ui->vlButtons->removeWidget(profileBtn);
|
||||
profileBtns.removeAll(profileBtn);
|
||||
delete profileBtn;
|
||||
}
|
||||
setupDirEnv();
|
||||
}
|
||||
|
||||
void UserInterface::profileButton_clicked()
|
||||
|
|
@ -168,6 +202,10 @@ void UserInterface::closeProfile()
|
|||
|
||||
UserInterface::~UserInterface()
|
||||
{
|
||||
foreach (QPushButton *profileBtn, profileBtns)
|
||||
{
|
||||
delete profileBtn;
|
||||
}
|
||||
delete ui;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -36,11 +36,13 @@ class UserInterface : public QMainWindow
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit UserInterface(ProfileDatabase *profileDB, CrewDatabase *crewDB, DatabaseThread *threadDB, QWidget *parent = 0);
|
||||
void setupDirEnv();
|
||||
~UserInterface();
|
||||
|
||||
private slots:
|
||||
void closeProfile();
|
||||
void profileLoaded();
|
||||
void changeFolder_clicked();
|
||||
void profileButton_clicked();
|
||||
void reloadProfiles_clicked();
|
||||
void on_actionExit_triggered();
|
||||
|
|
@ -57,6 +59,7 @@ private:
|
|||
DatabaseThread *threadDB;
|
||||
Ui::UserInterface *ui;
|
||||
ProfileInterface *profileUI;
|
||||
QList<QPushButton*> profileBtns;
|
||||
bool profileOpen;
|
||||
QString defaultWindowTitle;
|
||||
QString GTAV_Folder;
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<number>0</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="swSelection">
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<layout class="QVBoxLayout" name="vlUserInterface">
|
||||
<item>
|
||||
<spacer name="vsUpper">
|
||||
<property name="orientation">
|
||||
|
|
@ -66,6 +66,49 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="vlButtons"/>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="vsFooter">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="hlButtons">
|
||||
<item>
|
||||
<spacer name="hsButtons">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="cmdClose">
|
||||
<property name="text">
|
||||
<string>Close</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
|
|
@ -78,7 +121,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>625</width>
|
||||
<height>21</height>
|
||||
<height>25</height>
|
||||
</rect>
|
||||
</property>
|
||||
<widget class="QMenu" name="menuFile">
|
||||
|
|
@ -182,5 +225,22 @@
|
|||
</action>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>cmdClose</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>UserInterface</receiver>
|
||||
<slot>close()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>572</x>
|
||||
<y>476</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>312</x>
|
||||
<y>249</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
||||
|
|
|
|||
1
main.cpp
1
main.cpp
|
|
@ -452,6 +452,7 @@ int main(int argc, char *argv[])
|
|||
|
||||
UserInterface *uiWindow = new UserInterface(profileDB, crewDB, threadDB);
|
||||
uiWindow->setWindowIcon(IconLoader::loadingAppIcon());
|
||||
uiWindow->setupDirEnv();
|
||||
uiWindow->show();
|
||||
|
||||
return a.exec();
|
||||
|
|
|
|||
Loading…
Reference in a new issue