Merge pull request #819 from meganz/release/v4.3.4

Release/v4.3.4

Author: vtmateos

.gitignore

@@ -52,8 +52,13 @@ Makefile
 
 #build stuff
 /src/MEGAShellExtDolphin/megasync-plugin-overlay.moc
-build-MEGA-*
+build-MEGA*
+build-cmake*
 
+.vs
+
+CMakeLists.txt.user*
+CMakeSettings.json
 CMakeFiles
 CMakeCache.txt
 CMakeTmp

build/MEGAsync/MEGAShellExtDolphin/debian.changelog

@@ -1,3 +1,10 @@
+dolphin-megasync (5.0.0) stable; urgency=low
+
+  * Change in version numbering
+  * Compute the correct path to the MEGASync client sockets.
+
+ -- MEGA Team <linux@mega.co.nz>  Wed, 20 May 2020 13:05:10 +0200
+
 dolphin-megasync (3.0.1-2.1) beta; urgency=low
 
   * Included support for overlay icons for distros with KF5 >= 5.16

build/MEGAsync/MEGAShellExtNautilus/debian.changelog

@@ -1,3 +1,12 @@
+nautilus-megasync (5.0.0) stable; urgency=low
+
+  * Change in version numbering
+  * Warnings were silenced for the Nautilus extension.
+  * Nautilus extension no longer renders stale overlays for disabled syncs.
+  * Compute the correct path to the MEGASync client sockets.
+
+ -- MEGA Team <linux@mega.co.nz>  Wed, 20 May 2020 13:05:10 +0200
+
 nautilus-megasync (1.1.0) stable; urgency=low
 
   * Changed path in order to avoid the inclusion of the current path during the package creation.

build/MEGAsync/MEGAShellExtNemo/debian.changelog

@@ -1,3 +1,10 @@
+nemo-megasync (5.0.0) stable; urgency=low
+
+  * Change in version numbering
+  * Compute the correct path to the MEGASync client sockets.
+
+ -- MEGA Team <linux@mega.co.nz>  Wed, 20 May 2020 13:05:10 +0200
+
 nemo-megasync (1.0.29) beta; urgency=low
 
   * First Public Beta

build/MEGAsync/MEGAShellExtThunar/debian.changelog

@@ -1,3 +1,10 @@
+thunar-megasync (5.0.0) stable; urgency=low
+
+  * Change in version numbering
+  * Compute the correct path to the MEGASync client sockets.
+
+ -- MEGA Team <linux@mega.co.nz>  Wed, 20 May 2020 13:05:10 +0200
+
 thunar-megasync (3.0.1) beta; urgency=low
 
   * First public version

build/create_tarball.sh

@@ -155,8 +155,8 @@ cd ../src/MEGAShellExtNautilus/
 make distclean 2> /dev/null || true
 cd ../../build
 
-# extension uses the same version number as MEGASync app
-export EXT_VERSION=$MEGASYNC_VERSION
+#Get current version
+export EXT_VERSION=`cat MEGAsync/MEGAShellExtNautilus/debian.changelog | head -1 | sed -e 's#[^(]*(\([^)]*\))[^)]*#\1#g'`
 export EXT_NAME=nautilus-megasync-$EXT_VERSION
 rm -rf $EXT_NAME.tar.gz
 rm -rf $EXT_NAME
@@ -208,8 +208,8 @@ cd ../src/MEGAShellExtNemo/
 make distclean 2> /dev/null || true
 cd ../../build
 
-# extension uses the same version number as MEGASync app
-export EXT_VERSION=$MEGASYNC_VERSION
+#Get current version
+export EXT_VERSION=`cat MEGAsync/MEGAShellExtNemo/debian.changelog | head -1 | sed -e 's#[^(]*(\([^)]*\))[^)]*#\1#g'`
 export EXT_NAME=nemo-megasync-$EXT_VERSION
 rm -rf $EXT_NAME.tar.gz
 rm -rf $EXT_NAME
@@ -260,8 +260,8 @@ cd ../src/MEGAShellExtThunar/
 make distclean 2> /dev/null || true
 cd ../../build
 
-# extension uses the same version number as MEGASync app
-export EXT_VERSION=$MEGASYNC_VERSION
+#Get current version
+export EXT_VERSION=`cat MEGAsync/MEGAShellExtThunar/debian.changelog | head -1 | sed -e 's#[^(]*(\([^)]*\))[^)]*#\1#g'`
 export EXT_NAME=thunar-megasync-$EXT_VERSION
 rm -rf $EXT_NAME.tar.gz
 rm -rf $EXT_NAME
@@ -311,8 +311,8 @@ cd ../src/MEGAShellExtDolphin/
 make distclean 2> /dev/null || true
 cd ../../build
 
-# extension uses the same version number as MEGASync app
-export EXT_VERSION=$MEGASYNC_VERSION
+#Get current version
+export EXT_VERSION=`cat MEGAsync/MEGAShellExtDolphin/debian.changelog | head -1 | sed -e 's#[^(]*(\([^)]*\))[^)]*#\1#g'`
 export EXT_NAME=dolphin-megasync-$EXT_VERSION
 rm -rf $EXT_NAME.tar.gz
 rm -rf $EXT_NAME
@@ -324,11 +324,11 @@ rm -fr MEGAsync/MEGAShellExtDolphin/dolphin-megasync_*.dsc
 sed -e "s/EXT_VERSION/$EXT_VERSION/g" templates/MEGAShellExtDolphin/dolphin-megasync.spec > MEGAsync/MEGAShellExtDolphin/dolphin-megasync.spec
 #sed -e "s/EXT_VERSION/$EXT_VERSION/g" templates/MEGAShellExtDolphin/dolphin-megasync.dsc > MEGAsync/MEGAShellExtDolphin/dolphin-megasync_$EXT_VERSION.dsc
 
-for dist in xUbuntu_1{2,3,4,5,6,7,8,9}.{04,10} Debian_{7,8,9,10}.0; do
+for dist in xUbuntu_{1,2}{0,1,2,3,4,5,6,7,8,9}.{04,10} Debian_{7,8,9,10}.0; do
 if [ -f templates/MEGAShellExtDolphin/dolphin-megasync-$dist.dsc ]; then
-	sed -e "s/EXT_VERSION/$EXT_VERSION/g" templates/MEGAShellExtDolphin/dolphin-megasync-$dist.dsc > MEGAsync/MEGAShellExtDolphin/MEGAShellExtDolphin-$dist.dsc
+	sed -e "s/EXT_VERSION/$EXT_VERSION/g" templates/MEGAShellExtDolphin/dolphin-megasync-$dist.dsc > MEGAsync/MEGAShellExtDolphin/dolphin-megasync-$dist.dsc
 else
-	sed -e "s/EXT_VERSION/$EXT_VERSION/g" templates/MEGAShellExtDolphin/dolphin-megasync.dsc > MEGAsync/MEGAShellExtDolphin/MEGAShellExtDolphin-$dist.dsc
+	sed -e "s/EXT_VERSION/$EXT_VERSION/g" templates/MEGAShellExtDolphin/dolphin-megasync.dsc > MEGAsync/MEGAShellExtDolphin/dolphin-megasync-$dist.dsc
 fi
 done
 

build/templates/MEGAShellExtThunar/thunar-megasync.dsc

@@ -7,7 +7,6 @@ DEBTRANSFORM-RELEASE: 1
 Maintainer: MEGA Linux Team <linux@mega.co.nz>
 Homepage: https://mega.nz/#sync
 Build-Depends: debhelper, cdbs, libqt4-dev | qt5-qmake-bin, intltool, libthunarx-2-dev | libthunarx-3-dev, libgtk2.0-bin
-
 Depends: megasync (>= 3.5.0), thunar, libthunarx-2-0 | libthunarx-3-0
 Package-List:
   thunar-megasync deb gnome optional

contrib/cmake/CMakeLists.txt

@@ -107,8 +107,6 @@ set (TS_FILES
     ${MEGAsyncDir}/gui/translations/MEGASyncStrings_ro.ts
     ${MEGAsyncDir}/gui/translations/MEGASyncStrings_ru.ts
     ${MEGAsyncDir}/gui/translations/MEGASyncStrings_th.ts
-    ${MEGAsyncDir}/gui/translations/MEGASyncStrings_tl.ts
-    ${MEGAsyncDir}/gui/translations/MEGASyncStrings_uk.ts
     ${MEGAsyncDir}/gui/translations/MEGASyncStrings_vi.ts
     ${MEGAsyncDir}/gui/translations/MEGASyncStrings_zh_CN.ts
     ${MEGAsyncDir}/gui/translations/MEGASyncStrings_zh_TW.ts )
@@ -138,7 +136,6 @@ set (FORMS
     ${MEGAsyncDir}/gui/${UiDir}/AccountDetailsDialog.ui
     ${MEGAsyncDir}/gui/${UiDir}/DownloadFromMegaDialog.ui
     ${MEGAsyncDir}/gui/${UiDir}/SizeLimitDialog.ui
-    ${MEGAsyncDir}/gui/${UiDir}/MessageBox.ui
     ${MEGAsyncDir}/gui/${UiDir}/ChangeLogDialog.ui
     ${MEGAsyncDir}/gui/${UiDir}/GuestWidget.ui
     ${MEGAsyncDir}/gui/${UiDir}/StreamingFromMegaDialog.ui
@@ -165,6 +162,8 @@ set (FORMS
     ${MEGAsyncDir}/gui/${UiDir}/LockedPopOver.ui
     ${MEGAsyncDir}/gui/${UiDir}/VerifyLockMessage.ui
     ${MEGAsyncDir}/gui/${UiDir}/MegaInfoMessage.ui
+    ${MEGAsyncDir}/gui/${UiDir}/DynamicTransferQuotaPopOver.ui
+    ${MEGAsyncDir}/gui/${UiDir}/OverQuotaDialog.ui
     )
 
 
@@ -184,6 +183,7 @@ endif()
 
 set (MOC_INPUT
     ${MEGAsyncDir}/MegaApplication.h
+    ${MEGAsyncDir}/TransferQuota.h
     ${MEGAsyncDir}/control/ConnectivityChecker.h
     ${MEGAsyncDir}/control/CrashHandler.h
     ${MEGAsyncDir}/control/EncryptedSettings.h
@@ -233,7 +233,6 @@ set (MOC_INPUT
     ${MEGAsyncDir}/gui/MegaSpeedGraph.h
     ${MEGAsyncDir}/gui/MegaTransferDelegate.h
     ${MEGAsyncDir}/gui/MegaTransferView.h
-    ${MEGAsyncDir}/gui/MessageBox.h
     ${MEGAsyncDir}/gui/MultiQFileDialog.h
     ${MEGAsyncDir}/gui/NodeSelector.h
     ${MEGAsyncDir}/gui/PasteMegaLinksDialog.h
@@ -262,6 +261,8 @@ set (MOC_INPUT
     ${MEGAsyncDir}/gui/UsageWidget.h
     ${MEGAsyncDir}/gui/VerifyLockMessage.h
     ${MEGAsyncDir}/gui/MegaInfoMessage.h
+    ${MEGAsyncDir}/gui/DynamicTransferQuotaPopOver.h
+    ${MEGAsyncDir}/gui/OverQuotaDialog.h
     ${MEGAsyncDir}/platform/notificator.h
     ${MEGAsyncDir}/mega/bindings/qt/QTMegaGlobalListener.h
     ${MEGAsyncDir}/mega/bindings/qt/QTMegaListener.h
@@ -323,6 +324,8 @@ set (SRCS
     ${MOC_INPUT}
     ${MEGAsyncDir}/gui/Resources_${UiDir}.qrc
 
+    ${MEGAsyncDir}/TransferQuota.cpp
+
     ${MEGAsyncDir}/gui/AlertItem.cpp
     ${MEGAsyncDir}/gui/AlertFilterType.cpp
     ${MEGAsyncDir}/gui/BugReportDialog.cpp
@@ -350,7 +353,6 @@ set (SRCS
     ${MEGAsyncDir}/gui/DownloadFromMegaDialog.cpp
     ${MEGAsyncDir}/gui/SizeLimitDialog.cpp
     ${MEGAsyncDir}/gui/UsageWidget.cpp
-    ${MEGAsyncDir}/gui/MessageBox.cpp
     ${MEGAsyncDir}/gui/QMegaModel.cpp
     ${MEGAsyncDir}/gui/MegaItem.cpp
     ${MEGAsyncDir}/gui/ChangeLogDialog.cpp
@@ -391,6 +393,8 @@ set (SRCS
     ${MEGAsyncDir}/gui/TransfersStatusWidget.cpp
     ${MEGAsyncDir}/gui/VerifyLockMessage.cpp
     ${MEGAsyncDir}/gui/MegaInfoMessage.cpp
+    ${MEGAsyncDir}/gui/DynamicTransferQuotaPopOver.cpp
+    ${MEGAsyncDir}/gui/OverQuotaDialog.cpp
 
     ${MEGAsyncDir}/mega/bindings/qt/QTMegaRequestListener.cpp
     ${MEGAsyncDir}/mega/bindings/qt/QTMegaTransferListener.cpp

doc/Installer_win.md

@@ -42,11 +42,11 @@ Create the installer
 --------------
 
  - In the HM NIS Edit, click on **Compile** under the menu NSIS to create the Uninstaller generator.
- - The "MEGAsyncSETUP.exe" file should be in your <project_folder> now.
+ - The "MEGAsyncSetup.exe" file should be in your <project_folder> now.
+ - Note that "MEGAsyncSetup.exe" support silent installation passing `/S` as parameter. Although using it requires admin rights.
 
 Final comments
 --------------
 
- - MEGASync is released exclusively in x86. Versions for 64 bits are generated exclusively on demand.
  - If the new installer is intended to be a public version (instead of a debug version for customers or internal usage), the file must be signed by using the MEGA certificate.
 

gather_built_products.cmd

@@ -0,0 +1,21 @@
+mkdir built32
+mkdir built64
+
+copy build-MEGA-Desktop_Qt_5_12_8_MSVC2017_64bit-Release\MegaShellExt\release\*.dll built64
+copy build-MEGA-Desktop_Qt_5_12_8_MSVC2017_64bit-Release\MegaShellExt\release\*.pdb built64
+copy build-MEGA-Desktop_Qt_5_12_8_MSVC2017_64bit-Release\MegaUpdater\release\*.exe built64
+copy build-MEGA-Desktop_Qt_5_12_8_MSVC2017_64bit-Release\MegaUpdater\release\*.pdb built64
+copy build-MEGA-Desktop_Qt_5_12_8_MSVC2017_64bit-Release\MegaSync\release\*.exe built64
+copy build-MEGA-Desktop_Qt_5_12_8_MSVC2017_64bit-Release\MegaSync\release\*.pdb built64
+
+copy build-MEGA-Desktop_Qt_5_12_8_MSVC2017_32bit-Release\MegaShellExt\release\*.dll built32
+copy build-MEGA-Desktop_Qt_5_12_8_MSVC2017_32bit-Release\MegaShellExt\release\*.pdb built32
+copy build-MEGA-Desktop_Qt_5_12_8_MSVC2017_32bit-Release\MegaUpdater\release\*.exe built32
+copy build-MEGA-Desktop_Qt_5_12_8_MSVC2017_32bit-Release\MegaUpdater\release\*.pdb built32
+copy build-MEGA-Desktop_Qt_5_12_8_MSVC2017_32bit-Release\MegaSync\release\*.exe built32
+copy build-MEGA-Desktop_Qt_5_12_8_MSVC2017_32bit-Release\MegaSync\release\*.pdb built32
+
+copy C:\Users\build\MEGA\build-MEGAsync\3rdParty_MSVC2017_20200529\vcpkg\installed\x64-windows-mega\bin_dlls_signed\*.* built64
+
+copy C:\Users\build\MEGA\build-MEGAsync\3rdParty_MSVC2017_20200529\vcpkg\installed\x86-windows-mega\bin\*.* built32
+