From cea3cb022931a9e615935d3ce861f6869a23f9b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hans=20P=2E=20M=C3=B6ller?= <hmollercl@lubuntu.me>
Date: Sun, 13 Sep 2020 11:04:11 -0300
Subject: [PATCH] change QPushButton to QDialogButtonBox so Qt can do the text
 translations

---
 lubuntu-notifier.py | 70 ++++++++++++++++++++++-----------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/lubuntu-notifier.py b/lubuntu-notifier.py
index 060b4ab..7acc0da 100755
--- a/lubuntu-notifier.py
+++ b/lubuntu-notifier.py
@@ -25,7 +25,7 @@ import apt_pkg
 from argparse import ArgumentParser
 import gettext
 
-from PyQt5.QtWidgets import (QWidget, QApplication, QLabel, QPushButton,
+from PyQt5.QtWidgets import (QWidget, QApplication, QLabel, QDialogButtonBox,
                              QHBoxLayout, QVBoxLayout, QTreeWidget,
                              QTreeWidgetItem)
 from PyQt5.QtCore import Qt
@@ -51,8 +51,8 @@ class Dialog(QWidget):
         self.depcache = apt_pkg.DepCache(self.cache)
 
         self.initUI()
-        self.upgradeBtn.clicked.connect(self.call_upgrade)
-        self.closeBtn.clicked.connect(self.call_reject)
+        self.buttonBox.rejected.connect(self.call_reject)
+        self.buttonBox.clicked.connect(self.call_upgrade)
 
     def initUI(self):
         ''' UI initialization '''
@@ -64,14 +64,13 @@ class Dialog(QWidget):
         self.tw.setHeaderLabels([_('Affected Packages')])
         self.tw.setHeaderHidden(True)
 
-        self.upgradeBtn = QPushButton("Upgrade")
-        self.closeBtn = QPushButton("Close")
+        self.buttonBox = QDialogButtonBox(QDialogButtonBox.Cancel |
+                                          QDialogButtonBox.Apply)
         text = ""
 
         hbox = QHBoxLayout()
         hbox.addStretch(1)
-        hbox.addWidget(self.upgradeBtn)
-        hbox.addWidget(self.closeBtn)
+        hbox.addWidget(self.buttonBox)
         hbox.addStretch(1)
 
         vbox = QVBoxLayout()
@@ -150,34 +149,35 @@ class Dialog(QWidget):
         ''' when close button is pressed, quit '''
         app.quit()
 
-    def call_upgrade(self):
-        ''' starts upgrade process '''
-        self.label.setText(_("Upgrading..."))
-        # TODO maybe open another thread so notifier won't freeze
-        if self.upg_path == "terminal":
-            # cmd = ['qterminal', '-e', 'sudo', 'apt', 'dist-upgrade']
-            cmd = ['qterminal', '-e', './upg.sh']
-        else:
-            cmd = ['lxqt-sudo', self.upg_path, '--full-upgrade']
-        # process = subprocess.Popen(self.upg_path)
-        # process = subprocess.Popen(cmd, shell=True)
-        self.upgradeBtn.setVisible(False)
-        self.upgradeBtn.setEnabled(False)
-        process = subprocess.Popen(cmd)
-        process.wait()
-
-        if self.upg_path == "terminal":
-            text = _("Upgrade finished")
-
-            reboot_required_path = Path("/var/run/reboot-required")
-            if reboot_required_path.exists():
-                text += "\n" + _("Reboot required")
-            self.label.setText(text)
-            self.closeBtn.setVisible(True)
-            self.closeBtn.setEnabled(True)
-
-        else:
-            app.quit()
+    def call_upgrade(self, btnClicked):
+        if(self.buttonBox.buttonRole(btnClicked) == QDialogButtonBox.ApplyRole):
+            ''' starts upgrade process '''
+            self.label.setText(_("Upgrading..."))
+            # TODO maybe open another thread so notifier won't freeze
+            if self.upg_path == "terminal":
+                # cmd = ['qterminal', '-e', 'sudo', 'apt', 'dist-upgrade']
+                cmd = ['qterminal', '-e', './upg.sh']
+            else:
+                cmd = ['lxqt-sudo', self.upg_path, '--full-upgrade']
+            # process = subprocess.Popen(self.upg_path)
+            # process = subprocess.Popen(cmd, shell=True)
+            self.upgradeBtn.setVisible(False)
+            self.upgradeBtn.setEnabled(False)
+            process = subprocess.Popen(cmd)
+            process.wait()
+
+            if self.upg_path == "terminal":
+                text = _("Upgrade finished")
+
+                reboot_required_path = Path("/var/run/reboot-required")
+                if reboot_required_path.exists():
+                    text += "\n" + _("Reboot required")
+                self.label.setText(text)
+                self.closeBtn.setVisible(True)
+                self.closeBtn.setEnabled(True)
+
+            else:
+                app.quit()
 
 
 class App(QApplication):