diff --git a/ProfileInterface.cpp b/ProfileInterface.cpp index 5bc268b..e944dd5 100755 --- a/ProfileInterface.cpp +++ b/ProfileInterface.cpp @@ -34,7 +34,7 @@ ProfileInterface::ProfileInterface(ProfileDatabase *profileDB, CrewDatabase *cre { ui->setupUi(this); ui->saProfile->setVisible(false); - contentStr = ui->labProfileContent->text(); + loadingStr = ui->labProfileLoading->text(); profileFolder = ""; } @@ -77,7 +77,7 @@ void ProfileInterface::on_loadingProgress(int value, int maximum) { ui->pbPictureLoading->setMaximum(maximum); ui->pbPictureLoading->setValue(value); - ui->labProfileContent->setText(contentStr.arg(QString::number(value), QString::number(maximum))); + ui->labProfileLoading->setText(loadingStr.arg(QString::number(value), QString::number(maximum))); } void ProfileInterface::on_profileLoaded() diff --git a/ProfileInterface.h b/ProfileInterface.h index b851882..68b1ee4 100755 --- a/ProfileInterface.h +++ b/ProfileInterface.h @@ -51,7 +51,7 @@ private: Ui::ProfileInterface *ui; QString profileFolder; QString profileName; - QString contentStr; + QString loadingStr; }; #endif // PROFILEINTERFACE_H diff --git a/ProfileInterface.ui b/ProfileInterface.ui index 489c01c..1ee8dd1 100755 --- a/ProfileInterface.ui +++ b/ProfileInterface.ui @@ -58,9 +58,9 @@ - + - Loading %1 files of %2 files + Loading file %1 of %2 files Qt::AlignCenter diff --git a/ProfileLoader.cpp b/ProfileLoader.cpp index 92cf0df..43dbdc7 100755 --- a/ProfileLoader.cpp +++ b/ProfileLoader.cpp @@ -32,12 +32,12 @@ ProfileLoader::ProfileLoader(QString profileFolder, CrewDatabase *crewDB, QObjec void ProfileLoader::run() { - int loadedV = 0; + int curFile = 1; QDir profileDir; + QList crewList; profileDir.setPath(profileFolder); - QList crewList; - + // Seek pictures and savegames profileDir.setNameFilters(QStringList("SGTA*")); QStringList SavegameFiles = profileDir.entryList(QDir::Files | QDir::NoDot, QDir::NoSort); QStringList BackupFiles = SavegameFiles.filter(".bak", Qt::CaseInsensitive); @@ -53,6 +53,8 @@ void ProfileLoader::run() int maximumV = SavegameFiles.length() + SnapmaticPics.length(); + // Loading pictures and savegames + emit loadingProgress(curFile, maximumV); foreach(const QString &SavegameFile, SavegameFiles) { QString sgdPath = profileFolder + "/" + SavegameFile; @@ -61,8 +63,8 @@ void ProfileLoader::run() { emit savegameLoaded(savegame, sgdPath); } - loadedV++; - emit loadingProgress(loadedV, maximumV); + curFile++; + emit loadingProgress(curFile, maximumV); } foreach(const QString &SnapmaticPic, SnapmaticPics) { @@ -77,8 +79,8 @@ void ProfileLoader::run() crewList.append(crewNumber); } } - loadedV++; - emit loadingProgress(loadedV, maximumV); + curFile++; + emit loadingProgress(curFile, maximumV); } // adding found crews diff --git a/UserInterface.ui b/UserInterface.ui index ba61eda..7f03a70 100755 --- a/UserInterface.ui +++ b/UserInterface.ui @@ -17,7 +17,7 @@ - GTA V Sync + gta5sync - %1 diff --git a/gta5sync_de.qm b/gta5sync_de.qm index 5ed0b3a..09e4b19 100755 Binary files a/gta5sync_de.qm and b/gta5sync_de.qm differ diff --git a/gta5sync_de.ts b/gta5sync_de.ts index 41c182c..e517783 100755 --- a/gta5sync_de.ts +++ b/gta5sync_de.ts @@ -82,7 +82,12 @@ Profil Interface - + + Loading file %1 of %2 files + Loading %1 files of %2 files + Lade Datei %1 von %2 Dateien + + Content of Profile %1 Inhalt vom Profil %1 @@ -91,7 +96,7 @@ Ansehen - + Close Profile Profil schließen @@ -128,17 +133,17 @@ Spielstand Widget - + The Third Way (100%) - 00/00/00 00:00:00 The Third Way (100%) - 00/00/00 00:00:00 - + Copy Kopieren - + Delete Löschen @@ -151,17 +156,17 @@ Snapmatic Widget - + PHOTO - 00/00/00 00:00:00 FOTO - 00/00/00 00:00:00 - + View Ansehen - + Delete Löschen @@ -173,11 +178,15 @@ Grand Theft Auto V Sync - GTA V Sync GTA V Sync + + + gta5sync - %1 + gta5sync - %1 + File