diff --git a/dist/qt_themes/colorful/icons/256x256/plus_folder.png b/dist/qt_themes/colorful/icons/256x256/plus_folder.png index 92539549ee..31471e3a2a 100644 Binary files a/dist/qt_themes/colorful/icons/256x256/plus_folder.png and b/dist/qt_themes/colorful/icons/256x256/plus_folder.png differ diff --git a/dist/qt_themes/colorful/icons/48x48/download.png b/dist/qt_themes/colorful/icons/48x48/download.png index baceb7ae99..a24a434ce7 100644 Binary files a/dist/qt_themes/colorful/icons/48x48/download.png and b/dist/qt_themes/colorful/icons/48x48/download.png differ diff --git a/dist/qt_themes/colorful/icons/48x48/upload.png b/dist/qt_themes/colorful/icons/48x48/upload.png index 053b8c3fea..8604dd06c0 100644 Binary files a/dist/qt_themes/colorful/icons/48x48/upload.png and b/dist/qt_themes/colorful/icons/48x48/upload.png differ diff --git a/dist/qt_themes/default/icons/256x256/eden.png b/dist/qt_themes/default/icons/256x256/eden.png index dee7b91dc7..c0d7d8e37c 100644 Binary files a/dist/qt_themes/default/icons/256x256/eden.png and b/dist/qt_themes/default/icons/256x256/eden.png differ diff --git a/dist/qt_themes/default/icons/48x48/user-trash.png b/dist/qt_themes/default/icons/48x48/user-trash.png index ef360a4775..547b821de9 100644 Binary files a/dist/qt_themes/default/icons/48x48/user-trash.png and b/dist/qt_themes/default/icons/48x48/user-trash.png differ diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/user-trash.png b/dist/qt_themes/qdarkstyle/icons/48x48/user-trash.png index e273528101..e59fe85c03 100644 Binary files a/dist/qt_themes/qdarkstyle/icons/48x48/user-trash.png and b/dist/qt_themes/qdarkstyle/icons/48x48/user-trash.png differ diff --git a/quazip.patch b/quazip.patch new file mode 100644 index 0000000000..4954fbde75 --- /dev/null +++ b/quazip.patch @@ -0,0 +1,56 @@ +diff --git a/quazip/JlCompress.cpp b/quazip/JlCompress.cpp +index 5394b2c..c189e8b 100644 +--- a/quazip/JlCompress.cpp ++++ b/quazip/JlCompress.cpp +@@ -26,6 +26,8 @@ see quazip/(un)zip.h files for details. Basically it's the zlib license. + #include "JlCompress.h" + #include + ++bool JlCompress::m_cancelled = false; ++ + bool JlCompress::copyData(QIODevice &inFile, QIODevice &outFile) + { + while (!inFile.atEnd()) { +@@ -474,6 +476,11 @@ QStringList JlCompress::getFileList(QIODevice *ioDevice) + return getFileList(zip); + } + ++void JlCompress::cancel() ++{ ++ m_cancelled = true; ++} ++ + QString JlCompress::extractFile(QIODevice *ioDevice, QString fileName, QString fileDest) + { + QuaZip zip(ioDevice); +@@ -484,4 +491,4 @@ QStringList JlCompress::extractFiles(QIODevice *ioDevice, QStringList files, QSt + { + QuaZip zip(ioDevice); + return extractFiles(zip, files, dir); +-} ++} +diff --git a/quazip/JlCompress.h b/quazip/JlCompress.h +index 1b009f2..28b4aba 100644 +--- a/quazip/JlCompress.h ++++ b/quazip/JlCompress.h +@@ -77,7 +77,7 @@ public: + }; + + public: +- explicit Options(const CompressionStrategy& strategy) ++ explicit Options(const CompressionStrategy& strategy) + : m_compressionStrategy(strategy) {} + + explicit Options(const QDateTime& dateTime = QDateTime(), const CompressionStrategy& strategy = Default) +@@ -323,6 +323,11 @@ public: + are present separately. + */ + static QStringList getFileList(QIODevice *ioDevice); ++ ++ static void cancel(); ++ ++private: ++ static bool m_cancelled; + }; + + #endif /* JLCOMPRESSFOLDER_H_ */ diff --git a/src/android/app/src/main/legacy/drawable/ic_icon_bg.png b/src/android/app/src/main/legacy/drawable/ic_icon_bg.png index f3d4c55dea..3327014f8f 100644 Binary files a/src/android/app/src/main/legacy/drawable/ic_icon_bg.png and b/src/android/app/src/main/legacy/drawable/ic_icon_bg.png differ diff --git a/src/android/app/src/main/legacy/drawable/ic_icon_bg_orig.png b/src/android/app/src/main/legacy/drawable/ic_icon_bg_orig.png index 5859c43f86..a9fc55a4f5 100644 Binary files a/src/android/app/src/main/legacy/drawable/ic_icon_bg_orig.png and b/src/android/app/src/main/legacy/drawable/ic_icon_bg_orig.png differ diff --git a/src/android/app/src/main/res/drawable/ic_icon_bg.png b/src/android/app/src/main/res/drawable/ic_icon_bg.png index db7e53410d..7da2c6a1a3 100644 Binary files a/src/android/app/src/main/res/drawable/ic_icon_bg.png and b/src/android/app/src/main/res/drawable/ic_icon_bg.png differ diff --git a/src/android/app/src/main/res/drawable/ic_icon_bg_orig.png b/src/android/app/src/main/res/drawable/ic_icon_bg_orig.png index ddb43b349c..18325c031a 100644 Binary files a/src/android/app/src/main/res/drawable/ic_icon_bg_orig.png and b/src/android/app/src/main/res/drawable/ic_icon_bg_orig.png differ diff --git a/src/qt_common/externals/CMakeLists.txt b/src/qt_common/externals/CMakeLists.txt index b998090d90..189a52c0a6 100644 --- a/src/qt_common/externals/CMakeLists.txt +++ b/src/qt_common/externals/CMakeLists.txt @@ -16,4 +16,5 @@ set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON) AddJsonPackage(quazip) # frozen +# TODO(crueter): Qt String Lookup AddJsonPackage(frozen)