Compare commits
2 commits
38f05e7082
...
f14f6cbe0f
Author | SHA1 | Date | |
---|---|---|---|
f14f6cbe0f | |||
6be4b03050 |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
BIN
dist/qt_themes/colorful/icons/48x48/download.png
vendored
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.6 KiB |
BIN
dist/qt_themes/colorful/icons/48x48/upload.png
vendored
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.6 KiB |
BIN
dist/qt_themes/default/icons/256x256/eden.png
vendored
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.9 KiB |
BIN
dist/qt_themes/default/icons/48x48/user-trash.png
vendored
Before Width: | Height: | Size: 584 B After Width: | Height: | Size: 598 B |
BIN
dist/qt_themes/qdarkstyle/icons/48x48/user-trash.png
vendored
Before Width: | Height: | Size: 584 B After Width: | Height: | Size: 612 B |
56
quazip.patch
Normal file
|
@ -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 <memory>
|
||||
|
||||
+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_ */
|
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 244 KiB After Width: | Height: | Size: 438 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 112 KiB After Width: | Height: | Size: 112 KiB |
1
src/qt_common/externals/CMakeLists.txt
vendored
|
@ -16,4 +16,5 @@ set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON)
|
|||
AddJsonPackage(quazip)
|
||||
|
||||
# frozen
|
||||
# TODO(crueter): Qt String Lookup
|
||||
AddJsonPackage(frozen)
|
||||
|
|