From 780667f5c382216f0c9242501c2e17f7324158d6 Mon Sep 17 00:00:00 2001
From: Vinicius Moreira <vinicius_fmoreira@hotmail.com>
Date: Wed, 29 Apr 2020 16:58:39 -0300
Subject: [PATCH] [ui] removed more unnecessary 'x' buttons from some dialogs

---
 CHANGELOG.md                                 |  1 +
 bauh/api/abstract/handler.py                 |  2 +-
 bauh/gems/appimage/resources/img/upgrade.svg | 10 +++++-----
 bauh/view/qt/dialog.py                       |  6 ++++--
 bauh/view/qt/thread.py                       |  2 +-
 bauh/view/qt/window.py                       |  2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a41513aa..2c94e502 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
     - new option to disable the reboot dialog after a successful upgrade (`updates.ask_for_reboot`)
 ### UI
     - icons, buttons and colors changes
+    - removed more unnecessary **x** buttons from some dialogs
     
 ### i18n contributors
     - Turkish (tr): [tuliana](https://github.com/tulliana)
diff --git a/bauh/api/abstract/handler.py b/bauh/api/abstract/handler.py
index 3fe9a9d1..b1249191 100644
--- a/bauh/api/abstract/handler.py
+++ b/bauh/api/abstract/handler.py
@@ -18,7 +18,7 @@ class ProcessWatcher:
         pass
 
     def request_confirmation(self, title: str, body: str, components: List[ViewComponent] = None, confirmation_label: str = None,
-                             deny_label: str = None, deny_button: bool = True, window_cancel: bool = True) -> bool:
+                             deny_label: str = None, deny_button: bool = True, window_cancel: bool = False) -> bool:
         """
         request a user confirmation. In the current GUI implementation, it shows a popup to the user.
         :param title: popup title
diff --git a/bauh/gems/appimage/resources/img/upgrade.svg b/bauh/gems/appimage/resources/img/upgrade.svg
index 72d53637..b4f5a482 100644
--- a/bauh/gems/appimage/resources/img/upgrade.svg
+++ b/bauh/gems/appimage/resources/img/upgrade.svg
@@ -23,7 +23,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -44,7 +44,7 @@
      showgrid="false"
      showborder="false"
      inkscape:zoom="3.2091769"
-     inkscape:cx="-43.249858"
+     inkscape:cx="-13.285588"
      inkscape:cy="-0.030460959"
      inkscape:window-x="0"
      inkscape:window-y="0"
@@ -57,17 +57,17 @@
   <g
      id="g6"
      transform="matrix(1.7476186,0,0,1.8929335,1.1861681,-0.60813528)"
-     style="fill:none;fill-opacity:1;stroke:#44aa00;stroke-width:1.35746789;stroke-miterlimit:4;stroke-dasharray:none">
+     style="fill:none;fill-opacity:1;stroke:#91a069;stroke-width:1.35746789;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
     <path
        d="m 25,17 h -2 c -0.6,0 -1,0.4 -1,1 v 2.5 C 22,20.8 21.8,21 21.5,21 H 4.5 C 4.2,21 4,20.8 4,20.5 V 18 C 4,17.4 3.6,17 3,17 H 1 c -0.6,0 -1,0.4 -1,1 v 6 c 0,0.6 0.4,1 1,1 h 24 c 0.6,0 1,-0.4 1,-1 v -6 c 0,-0.6 -0.4,-1 -1,-1 z"
        id="path2"
        inkscape:connector-curvature="0"
-       style="fill:none;fill-opacity:1;stroke:#44aa00;stroke-width:1.35746789;stroke-miterlimit:4;stroke-dasharray:none" />
+       style="fill:none;fill-opacity:1;stroke:#91a069;stroke-width:1.35746789;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
        d="m 12.3,16.7 c 0.2,0.2 0.5,0.3 0.7,0.3 0.2,0 0.5,-0.1 0.7,-0.3 l 6,-6 C 19.9,10.5 20,10.3 20,10 20,9.7 19.9,9.5 19.7,9.3 L 18.3,7.9 C 18.1,7.7 17.9,7.6 17.6,7.6 c -0.3,0 -0.5,0.1 -0.7,0.3 l -1,1 C 15.6,9.2 15,9 15,8.5 V 2 C 15,1.4 14.6,1 14,1 H 12 C 11.4,1 11,1.4 11,2 V 8.6 C 11,9 10.5,9.3 10.1,9 L 9.1,8 C 8.9,7.8 8.7,7.7 8.4,7.7 8.1,7.7 7.9,7.8 7.7,8 L 6.3,9.4 C 6.1,9.6 6,9.8 6,10.1 c 0,0.3 0.1,0.5 0.3,0.7 z"
        id="path4"
        inkscape:connector-curvature="0"
-       style="fill:none;fill-opacity:1;stroke:#44aa00;stroke-width:1.35746789;stroke-miterlimit:4;stroke-dasharray:none" />
+       style="fill:none;fill-opacity:1;stroke:#91a069;stroke-width:1.35746789;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
   <g
      transform="matrix(3.7795276,0,0,3.7795276,669.63626,-482.15866)"
diff --git a/bauh/view/qt/dialog.py b/bauh/view/qt/dialog.py
index bbe0338e..62cad49a 100644
--- a/bauh/view/qt/dialog.py
+++ b/bauh/view/qt/dialog.py
@@ -1,11 +1,12 @@
 from typing import List
 
+from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QIcon
 from PyQt5.QtWidgets import QMessageBox, QLabel, QWidget, QHBoxLayout
-from bauh.api.abstract.view import MessageType
 
-from bauh.view.util import resource
+from bauh.api.abstract.view import MessageType
 from bauh.view.qt import css
+from bauh.view.util import resource
 from bauh.view.util.translation import I18n
 
 MSG_TYPE_MAP = {
@@ -32,6 +33,7 @@ def ask_confirmation(title: str, body: str, i18n: I18n, icon: QIcon = QIcon(reso
     diag.setIcon(QMessageBox.Question)
     diag.setWindowTitle(title)
     diag.setStyleSheet('QLabel { margin-right: 25px; }')
+    diag.setWindowFlags(Qt.CustomizeWindowHint | Qt.WindowTitleHint)
 
     wbody = QWidget()
     wbody.setLayout(QHBoxLayout())
diff --git a/bauh/view/qt/thread.py b/bauh/view/qt/thread.py
index 14b021cc..88943252 100644
--- a/bauh/view/qt/thread.py
+++ b/bauh/view/qt/thread.py
@@ -50,7 +50,7 @@ class AsyncAction(QThread, ProcessWatcher):
         self.stop = False
 
     def request_confirmation(self, title: str, body: str, components: List[ViewComponent] = None,
-                             confirmation_label: str = None, deny_label: str = None, deny_button: bool = True, window_cancel: bool = True) -> bool:
+                             confirmation_label: str = None, deny_label: str = None, deny_button: bool = True, window_cancel: bool = False) -> bool:
         self.wait_confirmation = True
         self.signal_confirmation.emit({'title': title, 'body': body, 'components': components, 'confirmation_label': confirmation_label, 'deny_label': deny_label, 'deny_button': deny_button, 'window_cancel': window_cancel})
         self.wait_user()
diff --git a/bauh/view/qt/window.py b/bauh/view/qt/window.py
index b16f9fa5..4765ff46 100755
--- a/bauh/view/qt/window.py
+++ b/bauh/view/qt/window.py
@@ -1193,7 +1193,7 @@ class ManageWindow(QWidget):
     def execute_custom_action(self, pkg: PackageView, action: CustomSoftwareAction):
 
         if pkg is None and not dialog.ask_confirmation(title=self.i18n['confirmation'].capitalize(),
-                                                       body=self.i18n['custom_action.proceed_with'].capitalize().format('"{}"'.format(self.i18n[action.i18_label_key].capitalize())),
+                                                       body=self.i18n['custom_action.proceed_with'].capitalize().format('"{}"'.format(self.i18n[action.i18_label_key])),
                                                        icon=QIcon(action.icon_path) if action.icon_path else QIcon(resource.get_path('img/logo.svg')),
                                                        i18n=self.i18n):
             return False