diff --git a/UserInterface.cpp b/UserInterface.cpp index 44a771b..b0f61cb 100755 --- a/UserInterface.cpp +++ b/UserInterface.cpp @@ -99,26 +99,15 @@ void UserInterface::setupDirEnv() 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("cmdReload"); - reloadBtn->setMinimumSize(0, 40); - reloadBtn->setAutoDefault(true); - ui->vlButtons->addWidget(reloadBtn); - profileBtns.append(reloadBtn); - - QPushButton *changeDirBtn = new QPushButton(tr("Change GTA V &Folder"), ui->swSelection); + QPushButton *changeDirBtn = new QPushButton(tr("Select 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) @@ -132,16 +121,6 @@ void UserInterface::setupProfileUi(QStringList GTAV_Profiles) QObject::connect(profileBtn, SIGNAL(clicked(bool)), this, SLOT(profileButton_clicked())); } - if (profilesFound) - { - QPushButton *reloadBtn = new QPushButton(tr("&Reload"), ui->swSelection); - reloadBtn->setObjectName("cmdReload"); - reloadBtn->setAutoDefault(true); - ui->hlButtons->insertWidget(1, reloadBtn); - profileBtns.append(reloadBtn); - - QObject::connect(reloadBtn, SIGNAL(clicked(bool)), this, SLOT(reloadProfiles_clicked())); - } profileBtns.at(0)->setFocus(); } @@ -152,11 +131,11 @@ void UserInterface::changeFolder_clicked() { QDir::setCurrent(GTAV_Folder); AppEnv::setGameFolder(GTAV_Folder); - reloadProfiles_clicked(); + on_cmdReload_clicked(); } } -void UserInterface::reloadProfiles_clicked() +void UserInterface::on_cmdReload_clicked() { foreach(QPushButton *profileBtn, profileBtns) { diff --git a/UserInterface.h b/UserInterface.h index c73f3f7..da661e0 100755 --- a/UserInterface.h +++ b/UserInterface.h @@ -44,7 +44,7 @@ private slots: void profileLoaded(); void changeFolder_clicked(); void profileButton_clicked(); - void reloadProfiles_clicked(); + void on_cmdReload_clicked(); void on_actionExit_triggered(); void on_actionSelect_profile_triggered(); void on_actionAbout_gta5sync_triggered(); diff --git a/UserInterface.ui b/UserInterface.ui index ceef22f..c7c8542 100755 --- a/UserInterface.ui +++ b/UserInterface.ui @@ -97,6 +97,13 @@ + + + + &Reload + + + diff --git a/lang/gta5sync_ru.ts b/lang/gta5sync_ru.ts index e302ac0..a7197f1 100755 --- a/lang/gta5sync_ru.ts +++ b/lang/gta5sync_ru.ts @@ -723,63 +723,63 @@ Export as: Выбор профиля - + &File - + &Help - + &Edit - + &Profile - + &About gta5sync - - + + &Close - + &Options - + Select &All - + &Deselect All - + &Export selected... - + &Remove selected - + Ctrl+R @@ -796,7 +796,7 @@ Export as: О программе gta5sync - + Ctrl+A Ctrl+A @@ -805,55 +805,55 @@ Export as: Закрыть - + Ctrl+Q Ctrl+Q - + Select &Profile - + Ctrl+P Ctrl+P - + Ctrl+O - + Ctrl+S - + Ctrl+E - + Ctrl+D - + Select Profile - + Select GTA V Folder... - - Change GTA V &Folder + + Select GTA V &Folder... @@ -861,8 +861,7 @@ Export as: gta5sync - - + &Reload diff --git a/res/gta5sync_de.qm b/res/gta5sync_de.qm index 1a442b0..65276d7 100755 Binary files a/res/gta5sync_de.qm and b/res/gta5sync_de.qm differ diff --git a/res/gta5sync_de.ts b/res/gta5sync_de.ts index 0e0538e..4065839 100755 --- a/res/gta5sync_de.ts +++ b/res/gta5sync_de.ts @@ -914,7 +914,7 @@ Exportieren als: Über gta5sync - + Ctrl+A Strg+A @@ -927,7 +927,7 @@ Exportieren als: Optionen - + Ctrl+O Strg+O @@ -936,7 +936,7 @@ Exportieren als: Alles auswählen - + Ctrl+S Strg+S @@ -953,7 +953,7 @@ Exportieren als: Auswahl exportieren - + Ctrl+E Strg+E @@ -962,7 +962,7 @@ Exportieren als: Auswahl löschen - + Ctrl+D Strg+D @@ -971,7 +971,7 @@ Exportieren als: Schließen - + Ctrl+Q Strg+Q @@ -981,73 +981,73 @@ Exportieren als: Profil auswählen - + &File &Datei - + &Help &Hilfe - + &Edit Bearb&eiten - + &Profile &Profil - + &About gta5sync &Über gta5sync - - + + &Close &Schließen - + Select &Profile &Profil auswählen - + Ctrl+P Strg+P - + &Options &Optionen - + Select &All &Alles auswählen - + &Deselect All Alles a&bwählen - + &Export selected... Auswahl &exportieren... - + &Remove selected Auswahl entfe&rnen - + Ctrl+R Strg+R @@ -1057,20 +1057,24 @@ Exportieren als: - + Select Profile Profil auswählen - + Select GTA V Folder... Wähle GTA V Ordner... - + + Select GTA V &Folder... + Wähle GTA V &Ordner... + + Change GTA V &Folder - GTA V &Ordner ändern + GTA V &Ordner ändern gta5sync @@ -1081,8 +1085,7 @@ Exportieren als: Grand Theft Auto V Ordner wurde nicht gefunden! - - + &Reload &Neuladen