Update version

theCheeseboard · Jun 9, 2023 · b1196d6 · b1196d6
1 parent 20d8360
commit b1196d6
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 41 deletions.
diff --git a/application/main.cpp b/application/main.cpp
@@ -38,11 +38,11 @@ int main(int argc, char* argv[]) {
     a.addLibraryTranslator(LIBTHEFRISBEE_TRANSLATOR);
     a.addLibraryTranslator(LIBTHEFILE_TRANSLATOR);
 
-    a.setApplicationVersion("4.0.1");
+    a.setApplicationVersion("5.0");
     a.setGenericName(QApplication::translate("main", "File Manager"));
     a.setApplicationLicense(tApplication::Gpl3OrLater);
     a.setCopyrightHolder("Victor Tran");
-    a.setCopyrightYear("2022");
+    a.setCopyrightYear("2023");
     a.setOrganizationName("theSuite");
     a.setApplicationUrl(tApplication::HelpContents, QUrl("https://help.vicr123.com/docs/thefile/intro"));
     a.setApplicationUrl(tApplication::Sources, QUrl("http://github.com/vicr123/theFile"));

diff --git a/application/mainwindow.cpp b/application/mainwindow.cpp
@@ -46,6 +46,7 @@
 struct MainWindowPrivate {
         tCsdTools csd;
         tSettings settings;
+        tSettings theFileSettings{"theCheeseboard", "theFile"};
 };
 
 MainWindow::MainWindow(QWidget* parent) :
@@ -98,10 +99,10 @@ MainWindow::MainWindow(QWidget* parent) :
 
     ui->jobButtonLayout->addWidget(tJobManager::makeJobButton());
 
-    connect(&d->settings, &tSettings::settingChanged, this, [this](QString key, QVariant value) {
+    connect(&d->theFileSettings, &tSettings::settingChanged, this, [this](QString key, QVariant value) {
         if (key == "View/HiddenFiles") ui->actionShowHiddenFiles->setChecked(value.toBool());
     });
-    ui->actionShowHiddenFiles->setChecked(d->settings.value("View/HiddenFiles").toBool());
+    ui->actionShowHiddenFiles->setChecked(d->theFileSettings.value("View/HiddenFiles").toBool());
 
     updateMenuActions();
 
@@ -215,7 +216,7 @@ void MainWindow::on_actionCloseTab_triggered() {
 }
 
 void MainWindow::on_actionShowHiddenFiles_triggered(bool checked) {
-    d->settings.setValue("View/HiddenFiles", checked);
+    d->theFileSettings.setValue("View/HiddenFiles", checked);
 }
 
 void MainWindow::on_actionGo_triggered() {

diff --git a/application/translations/de.ts b/application/translations/de.ts
@@ -586,7 +586,7 @@ Total progress: %4 of %5</source>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="181"/>
-        <location filename="../mainwindow.cpp" line="231"/>
+        <location filename="../mainwindow.cpp" line="232"/>
         <location filename="../../../build-thefile-Chroot_6-Debug/application/thefile_autogen/include/ui_mainwindow.h" line="291"/>
         <source>Go</source>
         <translation type="unfinished"></translation>
@@ -671,7 +671,7 @@ Total progress: %4 of %5</source>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="265"/>
-        <location filename="../mainwindow.cpp" line="189"/>
+        <location filename="../mainwindow.cpp" line="190"/>
         <location filename="../../../build-thefile-Chroot_6-Debug/application/thefile_autogen/include/ui_mainwindow.h" line="319"/>
         <source>New Folder</source>
         <translation type="unfinished"></translation>
@@ -695,17 +695,17 @@ Total progress: %4 of %5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="181"/>
+        <location filename="../mainwindow.cpp" line="182"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="231"/>
+        <location filename="../mainwindow.cpp" line="232"/>
         <source>Enter a location to go to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="300"/>
+        <location filename="../mainwindow.cpp" line="301"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/application/translations/en_US.ts b/application/translations/en_US.ts
@@ -577,7 +577,7 @@ Total progress: %4 of %5</source>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="181"/>
-        <location filename="../mainwindow.cpp" line="231"/>
+        <location filename="../mainwindow.cpp" line="232"/>
         <location filename="../../../build-thefile-Chroot_6-Debug/application/thefile_autogen/include/ui_mainwindow.h" line="291"/>
         <source>Go</source>
         <translation type="unfinished"></translation>
@@ -662,7 +662,7 @@ Total progress: %4 of %5</source>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="265"/>
-        <location filename="../mainwindow.cpp" line="189"/>
+        <location filename="../mainwindow.cpp" line="190"/>
         <location filename="../../../build-thefile-Chroot_6-Debug/application/thefile_autogen/include/ui_mainwindow.h" line="319"/>
         <source>New Folder</source>
         <translation type="unfinished"></translation>
@@ -686,17 +686,17 @@ Total progress: %4 of %5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="181"/>
+        <location filename="../mainwindow.cpp" line="182"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="231"/>
+        <location filename="../mainwindow.cpp" line="232"/>
         <source>Enter a location to go to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="300"/>
+        <location filename="../mainwindow.cpp" line="301"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/application/translations/he_IL.ts b/application/translations/he_IL.ts
@@ -592,7 +592,7 @@ Total progress: %4 of %5</source>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="181"/>
-        <location filename="../mainwindow.cpp" line="231"/>
+        <location filename="../mainwindow.cpp" line="232"/>
         <location filename="../../../build-thefile-Chroot_6-Debug/application/thefile_autogen/include/ui_mainwindow.h" line="291"/>
         <source>Go</source>
         <translation>לך ל-</translation>
@@ -677,7 +677,7 @@ Total progress: %4 of %5</source>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="265"/>
-        <location filename="../mainwindow.cpp" line="189"/>
+        <location filename="../mainwindow.cpp" line="190"/>
         <location filename="../../../build-thefile-Chroot_6-Debug/application/thefile_autogen/include/ui_mainwindow.h" line="319"/>
         <source>New Folder</source>
         <translation>תיקייה חדשה</translation>
@@ -701,17 +701,17 @@ Total progress: %4 of %5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="181"/>
+        <location filename="../mainwindow.cpp" line="182"/>
         <source>Open</source>
         <translation>פתח</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="231"/>
+        <location filename="../mainwindow.cpp" line="232"/>
         <source>Enter a location to go to</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="300"/>
+        <location filename="../mainwindow.cpp" line="301"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/application/translations/tr.ts b/application/translations/tr.ts
@@ -595,7 +595,7 @@ Toplam ilerleme: %4 / %5</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="181"/>
-        <location filename="../mainwindow.cpp" line="231"/>
+        <location filename="../mainwindow.cpp" line="232"/>
         <location filename="../../../build-thefile-Chroot_6-Debug/application/thefile_autogen/include/ui_mainwindow.h" line="291"/>
         <source>Go</source>
         <translation>Git</translation>
@@ -680,7 +680,7 @@ Toplam ilerleme: %4 / %5</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="265"/>
-        <location filename="../mainwindow.cpp" line="189"/>
+        <location filename="../mainwindow.cpp" line="190"/>
         <location filename="../../../build-thefile-Chroot_6-Debug/application/thefile_autogen/include/ui_mainwindow.h" line="319"/>
         <source>New Folder</source>
         <translation>Yeni Klasör</translation>
@@ -704,17 +704,17 @@ Toplam ilerleme: %4 / %5</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="181"/>
+        <location filename="../mainwindow.cpp" line="182"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="231"/>
+        <location filename="../mainwindow.cpp" line="232"/>
         <source>Enter a location to go to</source>
         <translation>Gitmek için bir konum girin</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="300"/>
+        <location filename="../mainwindow.cpp" line="301"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/application/translations/vi.ts b/application/translations/vi.ts
@@ -595,7 +595,7 @@ Tổng cộng: %4 tren %5</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="181"/>
-        <location filename="../mainwindow.cpp" line="231"/>
+        <location filename="../mainwindow.cpp" line="232"/>
         <location filename="../../../build-thefile-Chroot_6-Debug/application/thefile_autogen/include/ui_mainwindow.h" line="291"/>
         <source>Go</source>
         <translation>Đi</translation>
@@ -680,7 +680,7 @@ Tổng cộng: %4 tren %5</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="265"/>
-        <location filename="../mainwindow.cpp" line="189"/>
+        <location filename="../mainwindow.cpp" line="190"/>
         <location filename="../../../build-thefile-Chroot_6-Debug/application/thefile_autogen/include/ui_mainwindow.h" line="319"/>
         <source>New Folder</source>
         <translation>Thư mục mới</translation>
@@ -704,17 +704,17 @@ Tổng cộng: %4 tren %5</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="181"/>
+        <location filename="../mainwindow.cpp" line="182"/>
         <source>Open</source>
         <translation>Mở</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="231"/>
+        <location filename="../mainwindow.cpp" line="232"/>
         <source>Enter a location to go to</source>
         <translation>Điền một vị trí để đi đến</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="300"/>
+        <location filename="../mainwindow.cpp" line="301"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/application/translations/vi_VN.ts b/application/translations/vi_VN.ts
@@ -595,7 +595,7 @@ Tổng tiến độ: %4 trên %5</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="181"/>
-        <location filename="../mainwindow.cpp" line="231"/>
+        <location filename="../mainwindow.cpp" line="232"/>
         <location filename="../../../build-thefile-Chroot_6-Debug/application/thefile_autogen/include/ui_mainwindow.h" line="291"/>
         <source>Go</source>
         <translation>Đi</translation>
@@ -680,7 +680,7 @@ Tổng tiến độ: %4 trên %5</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="265"/>
-        <location filename="../mainwindow.cpp" line="189"/>
+        <location filename="../mainwindow.cpp" line="190"/>
         <location filename="../../../build-thefile-Chroot_6-Debug/application/thefile_autogen/include/ui_mainwindow.h" line="319"/>
         <source>New Folder</source>
         <translation>Thư mục mới</translation>
@@ -704,17 +704,17 @@ Tổng tiến độ: %4 trên %5</translation>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="181"/>
+        <location filename="../mainwindow.cpp" line="182"/>
         <source>Open</source>
         <translation>Mở</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="231"/>
+        <location filename="../mainwindow.cpp" line="232"/>
         <source>Enter a location to go to</source>
         <translation>Điền vào vị trí để đi đến</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="300"/>
+        <location filename="../mainwindow.cpp" line="301"/>
         <source>General</source>
         <translation>Chung</translation>
     </message>

diff --git a/libthefile/hiddenfilesproxymodel.cpp b/libthefile/hiddenfilesproxymodel.cpp
@@ -23,12 +23,13 @@
 #include <tsettings.h>
 
 struct HiddenFilesProxyModelPrivate {
-    tSettings settings;
+        tSettings settings{"theCheeseboard", "theFile"};
 };
 
-HiddenFilesProxyModel::HiddenFilesProxyModel(QObject* parent) : QSortFilterProxyModel(parent) {
+HiddenFilesProxyModel::HiddenFilesProxyModel(QObject* parent) :
+    QSortFilterProxyModel(parent) {
     d = new HiddenFilesProxyModelPrivate();
-    connect(&d->settings, &tSettings::settingChanged, this, [ = ](QString key, QVariant value) {
+    connect(&d->settings, &tSettings::settingChanged, this, [=](QString key, QVariant value) {
         if (key == "View/HiddenFiles") invalidateFilter();
     });
 }

diff --git a/plugins/idevice/idevice.cpp b/plugins/idevice/idevice.cpp
@@ -1,6 +1,5 @@
 #include "idevice.h"
 
-#include <libimobiledevice-glue/utils.h>
 #include <libimobiledevice/libimobiledevice.h>
 #include <libimobiledevice/lockdown.h>
 #include <plist/plist++.h>

diff --git a/plugins/idevice/isoftwareupdatefile.cpp b/plugins/idevice/isoftwareupdatefile.cpp
@@ -20,8 +20,9 @@ ISoftwareUpdateFile::ISoftwareUpdateFile(QString path, QObject* parent) :
     auto plistData = file.readAll();
     file.close();
 
+    plist_format_t plistFormat;
     plist_t plistHandle;
-    if (plist_from_memory(plistData.data(), plistData.length(), &plistHandle) != PLIST_ERR_SUCCESS) return;
+    if (plist_from_memory(plistData.data(), plistData.length(), &plistHandle, &plistFormat) != PLIST_ERR_SUCCESS) return;
 
     auto node = PList::Dictionary(plistHandle);
     auto productVersionIterator = node.Find("ProductVersion");

diff --git a/plugins/idevice/translations/en_US.ts b/plugins/idevice/translations/en_US.ts
@@ -4,7 +4,7 @@
 <context>
     <name>IDevice</name>
     <message>
-        <location filename="../idevice.cpp" line="32"/>
+        <location filename="../idevice.cpp" line="31"/>
         <source>Unknown Device</source>
         <translation type="unfinished"></translation>
     </message>