From 31d30c2174c1546f047be14ef162a5ecda422fe1 Mon Sep 17 00:00:00 2001
From: IndrekV <indzuliin@gmail.com>
Date: Fri, 11 May 2018 21:34:57 +0100
Subject: [PATCH] Updated feedback from design and added filesize check and
 error notices (linux), #2444

---
 src/ui/linux/TogglDesktop/feedbackdialog.cpp |  8 +++
 src/ui/linux/TogglDesktop/feedbackdialog.ui  | 74 ++++++++++++++++----
 2 files changed, 69 insertions(+), 13 deletions(-)

diff --git a/src/ui/linux/TogglDesktop/feedbackdialog.cpp b/src/ui/linux/TogglDesktop/feedbackdialog.cpp
index 50141c3225..a9115857c6 100644
--- a/src/ui/linux/TogglDesktop/feedbackdialog.cpp
+++ b/src/ui/linux/TogglDesktop/feedbackdialog.cpp
@@ -32,12 +32,20 @@ void FeedbackDialog::on_uploadImageButton_clicked() {
 void FeedbackDialog::on_sendButton_clicked() {
     QString content = ui->content->toPlainText();
     if (content.isEmpty()) {
+        QMessageBox(QMessageBox::Information,
+                    "Feedback not sent!",
+                    "Please type in your feedback before sending.",
+                    QMessageBox::Ok).exec();
         ui->content->setFocus();
         return;
     }
     if (!TogglApi::instance->sendFeedback(ui->topic->currentText(),
                                           ui->content->toPlainText(),
                                           path)) {
+        QMessageBox(QMessageBox::Information,
+                    "Feedback not sent!",
+                    "Please check that file you are sending is not larger than 5MB.",
+                    QMessageBox::Ok).exec();
         return;
     }
     ui->topic->setCurrentIndex(0);
diff --git a/src/ui/linux/TogglDesktop/feedbackdialog.ui b/src/ui/linux/TogglDesktop/feedbackdialog.ui
index d49f70eb46..64ca405332 100644
--- a/src/ui/linux/TogglDesktop/feedbackdialog.ui
+++ b/src/ui/linux/TogglDesktop/feedbackdialog.ui
@@ -35,22 +35,30 @@
     <widget class="QTextEdit" name="content"/>
    </item>
    <item>
-    <widget class="QLabel" name="selectedImageFilename">
-     <property name="text">
-      <string>(no image selected)</string>
+    <widget class="QWidget" name="fileRow" native="true">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
      </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="widget" native="true">
-     <layout class="QHBoxLayout" name="horizontalLayout">
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>6</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>6</number>
+      </property>
       <item>
-       <widget class="QPushButton" name="uploadImageButton">
+       <widget class="QLabel" name="selectedImageFilename">
         <property name="text">
-         <string>Upload image</string>
-        </property>
-        <property name="autoDefault">
-         <bool>false</bool>
+         <string>(maximum image size 5MB)</string>
         </property>
        </widget>
       </item>
@@ -68,7 +76,47 @@
        </spacer>
       </item>
       <item>
+       <widget class="QPushButton" name="uploadImageButton">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>100</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Upload image</string>
+        </property>
+        <property name="autoDefault">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="widget" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item alignment="Qt::AlignRight">
        <widget class="QPushButton" name="sendButton">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
         <property name="text">
          <string>Send</string>
         </property>