Merge pull request #7 from namecheap/feature/RND-459-Copy-URL-after-upload-by-default

Set 'Copy URL after upload' turned on by default

.travis.yml

@@ -17,7 +17,7 @@ env:
       # Environment variables for packaging
       - PRODUCT=flameshot
       #TODO: we should take version from the last tag in git history + build number
-      - VERSION=0.7.2
+      - VERSION=0.7.3
       - RELEASE=1
       - ARCH=x86_64
       # Dockerfile from https://github.com/flameshotapp/flameshot-docker-images

appveyor.yml

@@ -1,7 +1,7 @@
 image: Visual Studio 2015
 
 #TODO: we should take version from the last tag in git history + build number
-version: 0.7.2.{build}
+version: 0.7.3.{build}
 # Major_Version_Number.Minor_Version_Number.Patch_Number.Build_Number
 
 skip_branch_with_pr: true

flameshot.pro

@@ -6,7 +6,7 @@
 
 win32:LIBS += -luser32 -lshell32
 
-BASE_VERSION = 0.7.2
+BASE_VERSION = 0.7.3
 TAG_VERSION = "$$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags)"
 isEmpty(TAG_VERSION){
     TAG_VERSION = $$BASE_VERSION

src/utils/confighandler.cpp

@@ -326,7 +326,11 @@ void ConfigHandler::setCloseAfterScreenshot(const bool close) {
 }
 
 bool ConfigHandler::copyAndCloseAfterUploadEnabled() {
-    return m_settings.value(QStringLiteral("copyAndCloseAfterUpload")).toBool();
+    bool res = true;
+    if (m_settings.contains(QStringLiteral("copyAndCloseAfterUpload"))) {
+        res = m_settings.value(QStringLiteral("copyAndCloseAfterUpload")).toBool();
+    }
+    return res;
 }
 
 void ConfigHandler::setCopyAndCloseAfterUploadEnabled(const bool value) {

update_version_everywhere.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-BASE_VERSION_OLD=0.7.1
-BASE_VERSION_NEW=0.7.2
+BASE_VERSION_OLD=0.7.2
+BASE_VERSION_NEW=0.7.3
 
 sed -i "s/BASE_VERSION = ${BASE_VERSION_OLD}/BASE_VERSION = ${BASE_VERSION_NEW}/g" flameshot.pro
 

win_setup/flameshot.iss

@@ -6,9 +6,9 @@
 
 [Setup]
 AppName=FlameShot
-AppVersion=0.7.2
+AppVersion=0.7.3
 AppCopyright=NameCheap inc.
-VersionInfoVersion=0.7.2
+VersionInfoVersion=0.7.3
 WizardStyle=modern
 DefaultDirName={autopf}\FlameShot
 DefaultGroupName=FlameShot