Merge pull request #4 from namecheap/feature/RND-451-Remove-delete-button-on-form-upload-to-s3

Feature/rnd 451 remove delete button on form upload to s3

.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.1
+      - VERSION=0.7.2
       - 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.1.{build}
+version: 0.7.2.{build}
 # Major_Version_Number.Minor_Version_Number.Patch_Number.Build_Number
 
 skip_branch_with_pr: true

flameshot.pro

@@ -6,12 +6,15 @@
 
 win32:LIBS += -luser32 -lshell32
 
-BASE_VERSION = 0.7.1
-TAG_VERSION = $$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags)
+BASE_VERSION = 0.7.2
+TAG_VERSION = "$$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags)"
 isEmpty(TAG_VERSION){
     TAG_VERSION = $$BASE_VERSION
+    DEFINES += APP_VERSION=\\\"$$BASE_VERSION\\\"
+}
+else {
+    DEFINES += APP_VERSION=\\\"$$BASE_VERSION-$$TAG_VERSION\\\"
 }
-DEFINES += APP_VERSION=\\\"$$TAG_VERSION\\\"
 
 QT  += core gui widgets network svg
 

src/tools/imgs3/imgs3uploader.cpp

@@ -245,19 +245,15 @@ void ImgS3Uploader::onUploadOk() {
 
     m_copyUrlButton = new QPushButton(tr("Copy URL"));
     m_openUrlButton = new QPushButton(tr("Open URL"));
-    m_openDeleteUrlButton = new QPushButton(tr("Delete image"));
     m_toClipboardButton = new QPushButton(tr("Image to Clipboard."));
     m_hLayout->addWidget(m_copyUrlButton);
     m_hLayout->addWidget(m_openUrlButton);
-    m_hLayout->addWidget(m_openDeleteUrlButton);
     m_hLayout->addWidget(m_toClipboardButton);
 
     connect(m_copyUrlButton, &QPushButton::clicked,
             this, &ImgS3Uploader::copyURL);
     connect(m_openUrlButton, &QPushButton::clicked,
             this, &ImgS3Uploader::openURL);
-    connect(m_openDeleteUrlButton, &QPushButton::clicked,
-            this, &ImgS3Uploader::openDeleteURL);
     connect(m_toClipboardButton, &QPushButton::clicked,
             this, &ImgS3Uploader::copyImage);
 }
@@ -274,14 +270,6 @@ void ImgS3Uploader::copyURL() {
     m_notification->showMessage(tr("URL copied to clipboard."));
 }
 
-void ImgS3Uploader::openDeleteURL()
-{
-    bool successful = QDesktopServices::openUrl(m_deleteImageURL);
-    if (!successful) {
-        m_notification->showMessage(tr("Unable to open the URL."));
-    }
-}
-
 void ImgS3Uploader::copyImage() {
     QApplication::clipboard()->setPixmap(m_pixmap);
     m_notification->showMessage(tr("Screenshot copied to clipboard."));

src/tools/imgs3/imgs3uploader.h

@@ -46,7 +46,6 @@ private slots:
 
     void openURL();
     void copyURL();
-    void openDeleteURL();
     void copyImage();
 
 private:
@@ -68,11 +67,9 @@ private:
     LoadSpinner *m_spinner;
     // uploaded
     QPushButton *m_openUrlButton;
-    QPushButton *m_openDeleteUrlButton;
     QPushButton *m_copyUrlButton;
     QPushButton *m_toClipboardButton;
     QUrl m_imageURL;
-    QUrl m_deleteImageURL;
     NotificationWidget *m_notification;
 
     void upload();

update_version_everywhere.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+BASE_VERSION_OLD=0.7.1
+BASE_VERSION_NEW=0.7.2
+
+sed -i "s/BASE_VERSION = ${BASE_VERSION_OLD}/BASE_VERSION = ${BASE_VERSION_NEW}/g" flameshot.pro
+
+sed -i "s/AppVersion=${BASE_VERSION_OLD}/AppVersion=${BASE_VERSION_NEW}/g" ./win_setup/flameshot.iss
+sed -i "s/VersionInfoVersion=${BASE_VERSION_OLD}/VersionInfoVersion=${BASE_VERSION_NEW}/g" ./win_setup/flameshot.iss
+
+sed -i "s/version: ${BASE_VERSION_OLD}/version: ${BASE_VERSION_NEW}/g" appveyor.yml
+
+sed -i "s/VERSION=${BASE_VERSION_OLD}/VERSION=${BASE_VERSION_NEW}/g" .travis.yml
+
+qmake

win_setup/flameshot.iss

@@ -6,9 +6,9 @@
 
 [Setup]
 AppName=FlameShot
-AppVersion=1.0.0.1
+AppVersion=0.7.2
 AppCopyright=NameCheap inc.
-VersionInfoVersion=1.0.0.1
+VersionInfoVersion=0.7.2
 WizardStyle=modern
 DefaultDirName={autopf}\FlameShot
 DefaultGroupName=FlameShot
@@ -34,7 +34,8 @@ Source: "flameshot\platforms\*"; DestDir: "{app}\platforms"
 Source: "flameshot\translations\*"; DestDir: "{app}\translations"
 
 [Icons]
-Name: "{group}\FlameShot"; Filename: "{app}\flameshot.exe"
+Name: "{group}\FlameShot"; Filename: "{app}\flameshot.exe"; WorkingDir: "{app}"
+Name: "{commondesktop}\FlameShot"; Filename: "{app}\flameshot.exe"; WorkingDir: "{app}"
 
 ; NOTE: Most apps do not need registry entries to be pre-created. If you
 ; don't know what the registry is or if you need to use it, then chances are