Autogenerating the dialog is annoying, let's just put it as a class i…

…n lubuntu-about to save time.
lubuntu-team · Jan 31, 2018 · 814e23f · 814e23f
1 parent 751b8fe
commit 814e23f
Show file tree

Hide file tree

Showing 2 changed files with 217 additions and 6 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -1,9 +1,7 @@
 #!/usr/bin/make -f
 
 all:
-	pyuic5 main.ui -o aboutlubuntu_autowidgets.py
 	pyrcc5 main.qrc -o aboutlubuntu_autoresources.py
-	sed -i "s/main_rc/aboutlubuntu_autoresources/g" aboutlubuntu_autowidgets.py
 
 clean:
-	rm -rvf aboutlubuntu_auto*.py __pycache__
+	rm -rvf aboutlubuntu_autoresources.py __pycache__
diff --git a/src/lubuntu-about b/src/lubuntu-about
@@ -29,14 +29,227 @@ from subprocess import run, PIPE
 from psutil import virtual_memory
 from platform import system, uname
 from lsb_release import get_distro_information
+from PyQt5 import QtCore, QtGui, QtWidgets
 from PyQt5.QtWidgets import QWidget, QApplication, QMainWindow
 
-from aboutlubuntu_autowidgets import Ui_Dialog
+import aboutlubuntu_autoresources
 
-class LubuntuAbout(QMainWindow, Ui_Dialog):
+class LubuntuAboutDialog(object):
+    def setupUi(self, Dialog):
+        Dialog.setObjectName("Dialog")
+        Dialog.resize(630, 425)
+        Dialog.setMinimumSize(QtCore.QSize(625, 425))
+        Dialog.setMaximumSize(QtCore.QSize(630, 430))
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(":/images/Lubuntu.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        Dialog.setWindowIcon(icon)
+        self.verticalLayout = QtWidgets.QVBoxLayout(Dialog)
+        self.verticalLayout.setObjectName("verticalLayout")
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout.addItem(spacerItem)
+        self.mainform = QtWidgets.QWidget(Dialog)
+        self.mainform.setMinimumSize(QtCore.QSize(600, 400))
+        self.mainform.setMaximumSize(QtCore.QSize(600, 400))
+        self.mainform.setObjectName("mainform")
+        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.mainform)
+        self.verticalLayout_2.setObjectName("verticalLayout_2")
+        spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_2.addItem(spacerItem1)
+        self.itemcontainer = QtWidgets.QGridLayout()
+        self.itemcontainer.setObjectName("itemcontainer")
+        self.logoandtextlayout = QtWidgets.QHBoxLayout()
+        self.logoandtextlayout.setObjectName("logoandtextlayout")
+        self.label = QtWidgets.QLabel(self.mainform)
+        self.label.setMinimumSize(QtCore.QSize(64, 64))
+        self.label.setMaximumSize(QtCore.QSize(64, 64))
+        self.label.setObjectName("label")
+        self.logoandtextlayout.addWidget(self.label)
+        self.Lubuntudetails = QtWidgets.QVBoxLayout()
+        self.Lubuntudetails.setObjectName("Lubuntudetails")
+        self.versiondetails = QtWidgets.QLabel(self.mainform)
+        self.versiondetails.setMinimumSize(QtCore.QSize(0, 0))
+        font = QtGui.QFont()
+        font.setPointSize(26)
+        self.versiondetails.setFont(font)
+        self.versiondetails.setObjectName("versiondetails")
+        self.Lubuntudetails.addWidget(self.versiondetails)
+        self.smalldetails = QtWidgets.QLabel(self.mainform)
+        self.smalldetails.setObjectName("smalldetails")
+        self.Lubuntudetails.addWidget(self.smalldetails)
+        self.logoandtextlayout.addLayout(self.Lubuntudetails)
+        self.itemcontainer.addLayout(self.logoandtextlayout, 0, 0, 1, 1)
+        self.links = QtWidgets.QLabel(self.mainform)
+        self.links.setOpenExternalLinks(True)
+        self.links.setObjectName("links")
+        self.itemcontainer.addWidget(self.links, 0, 1, 1, 1)
+        self.verticalLayout_2.addLayout(self.itemcontainer)
+        spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_2.addItem(spacerItem2)
+        self.specs = QtWidgets.QVBoxLayout()
+        self.specs.setObjectName("specs")
+        self.hostname = QtWidgets.QHBoxLayout()
+        self.hostname.setObjectName("hostname")
+        self.hostnameicon = QtWidgets.QPushButton(self.mainform)
+        self.hostnameicon.setEnabled(False)
+        palette = QtGui.QPalette()
+        brush = QtGui.QBrush(QtGui.QColor(61, 174, 233))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Active, QtGui.QPalette.Highlight, brush)
+        brush = QtGui.QBrush(QtGui.QColor(194, 224, 245))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Inactive, QtGui.QPalette.Highlight, brush)
+        brush = QtGui.QBrush(QtGui.QColor(61, 174, 233))
+        brush.setStyle(QtCore.Qt.SolidPattern)
+        palette.setBrush(QtGui.QPalette.Disabled, QtGui.QPalette.Highlight, brush)
+        self.hostnameicon.setPalette(palette)
+        self.hostnameicon.setAutoFillBackground(False)
+        self.hostnameicon.setText("")
+        icon = QtGui.QIcon.fromTheme("computer")
+        self.hostnameicon.setIcon(icon)
+        self.hostnameicon.setIconSize(QtCore.QSize(32, 32))
+        self.hostnameicon.setCheckable(False)
+        self.hostnameicon.setAutoExclusive(False)
+        self.hostnameicon.setAutoDefault(False)
+        self.hostnameicon.setFlat(True)
+        self.hostnameicon.setObjectName("hostnameicon")
+        self.hostname.addWidget(self.hostnameicon)
+        self.hostnamedetails = QtWidgets.QLabel(self.mainform)
+        font = QtGui.QFont()
+        font.setFamily("Oxygen-Sans")
+        font.setPointSize(12)
+        self.hostnamedetails.setFont(font)
+        self.hostnamedetails.setObjectName("hostnamedetails")
+        self.hostname.addWidget(self.hostnamedetails)
+        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.hostname.addItem(spacerItem3)
+        self.specs.addLayout(self.hostname)
+        self.cpu = QtWidgets.QHBoxLayout()
+        self.cpu.setObjectName("cpu")
+        self.cpuicon = QtWidgets.QPushButton(self.mainform)
+        self.cpuicon.setEnabled(False)
+        self.cpuicon.setText("")
+        icon = QtGui.QIcon.fromTheme("cpu")
+        self.cpuicon.setIcon(icon)
+        self.cpuicon.setIconSize(QtCore.QSize(32, 32))
+        self.cpuicon.setFlat(True)
+        self.cpuicon.setObjectName("cpuicon")
+        self.cpu.addWidget(self.cpuicon)
+        self.cpudetails = QtWidgets.QLabel(self.mainform)
+        font = QtGui.QFont()
+        font.setFamily("Oxygen-Sans")
+        font.setPointSize(12)
+        self.cpudetails.setFont(font)
+        self.cpudetails.setObjectName("cpudetails")
+        self.cpu.addWidget(self.cpudetails)
+        spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.cpu.addItem(spacerItem4)
+        self.specs.addLayout(self.cpu)
+        self.memory = QtWidgets.QHBoxLayout()
+        self.memory.setObjectName("memory")
+        self.pushButton_2 = QtWidgets.QPushButton(self.mainform)
+        self.pushButton_2.setEnabled(False)
+        self.pushButton_2.setText("")
+        icon = QtGui.QIcon.fromTheme("media-flash")
+        self.pushButton_2.setIcon(icon)
+        self.pushButton_2.setIconSize(QtCore.QSize(32, 32))
+        self.pushButton_2.setFlat(True)
+        self.pushButton_2.setObjectName("pushButton_2")
+        self.memory.addWidget(self.pushButton_2)
+        self.memorydetails = QtWidgets.QLabel(self.mainform)
+        font = QtGui.QFont()
+        font.setFamily("Oxygen-Sans")
+        font.setPointSize(12)
+        self.memorydetails.setFont(font)
+        self.memorydetails.setObjectName("memorydetails")
+        self.memory.addWidget(self.memorydetails)
+        spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.memory.addItem(spacerItem5)
+        self.specs.addLayout(self.memory)
+        self.graphics = QtWidgets.QHBoxLayout()
+        self.graphics.setObjectName("graphics")
+        self.pushButton = QtWidgets.QPushButton(self.mainform)
+        self.pushButton.setEnabled(False)
+        self.pushButton.setText("")
+        icon = QtGui.QIcon.fromTheme("video-display")
+        self.pushButton.setIcon(icon)
+        self.pushButton.setIconSize(QtCore.QSize(32, 32))
+        self.pushButton.setAutoDefault(False)
+        self.pushButton.setFlat(True)
+        self.pushButton.setObjectName("pushButton")
+        self.graphics.addWidget(self.pushButton)
+        self.graphicsdetails = QtWidgets.QLabel(self.mainform)
+        font = QtGui.QFont()
+        font.setFamily("Oxygen-Sans")
+        font.setPointSize(12)
+        self.graphicsdetails.setFont(font)
+        self.graphicsdetails.setObjectName("graphicsdetails")
+        self.graphics.addWidget(self.graphicsdetails)
+        spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.graphics.addItem(spacerItem6)
+        self.specs.addLayout(self.graphics)
+        self.verticalLayout_2.addLayout(self.specs)
+        spacerItem7 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_2.addItem(spacerItem7)
+        self.line = QtWidgets.QFrame(self.mainform)
+        self.line.setMinimumSize(QtCore.QSize(800, 0))
+        self.line.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line.setObjectName("line")
+        self.verticalLayout_2.addWidget(self.line)
+        self.buttonslayout = QtWidgets.QHBoxLayout()
+        self.buttonslayout.setObjectName("buttonslayout")
+        self.translation = QtWidgets.QPushButton(self.mainform)
+        self.translation.setMinimumSize(QtCore.QSize(100, 30))
+        self.translation.setMaximumSize(QtCore.QSize(100, 30))
+        self.translation.setAutoDefault(False)
+        self.translation.setObjectName("translation")
+        self.buttonslayout.addWidget(self.translation)
+        self.license = QtWidgets.QPushButton(self.mainform)
+        self.license.setMinimumSize(QtCore.QSize(100, 30))
+        self.license.setMaximumSize(QtCore.QSize(100, 30))
+        self.license.setAutoDefault(False)
+        self.license.setObjectName("license")
+        self.buttonslayout.addWidget(self.license)
+        spacerItem8 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.buttonslayout.addItem(spacerItem8)
+        self.close = QtWidgets.QPushButton(self.mainform)
+        self.close.setMinimumSize(QtCore.QSize(100, 30))
+        self.close.setMaximumSize(QtCore.QSize(100, 30))
+        self.close.setObjectName("close")
+        self.buttonslayout.addWidget(self.close)
+        self.verticalLayout_2.addLayout(self.buttonslayout)
+        self.verticalLayout.addWidget(self.mainform)
+        spacerItem9 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout.addItem(spacerItem9)
+
+        self.retranslateUi(Dialog)
+        self.close.clicked.connect(Dialog.close)
+        QtCore.QMetaObject.connectSlotsByName(Dialog)
+
+    def retranslateUi(self, Dialog):
+        _translate = QtCore.QCoreApplication.translate
+        Dialog.setWindowTitle(_translate("Dialog", "About Lubuntu"))
+        self.label.setText(_translate("Dialog", "<img src=\":/images/Lubuntu.png\" height=\"64\" width=\"64\" />"))
+        self.versiondetails.setText(_translate("Dialog", "Lubuntu VERSION"))
+        self.smalldetails.setText(_translate("Dialog", "OS KERNEL, ARCH"))
+        self.links.setText(_translate("Dialog", "<span style=\"text-decoration: underline; color:#0000ff;\" align=\"right\">\n"
+"    <p><a href=\"https://lubuntu.me/\">Website</a></p>\n"
+"    <p><a href=\"https://lubuntu.me/links/\">Contact us</a></p>\n"
+"    <p><a href=\"https://phab.lubuntu.me/w/contributor-guide/\">Contribute</a></p>\n"
+"</span>"))
+        self.hostnamedetails.setText(_translate("Dialog", "hostname"))
+        self.cpudetails.setText(_translate("Dialog", "cpu"))
+        self.memorydetails.setText(_translate("Dialog", "memory"))
+        self.graphicsdetails.setText(_translate("Dialog", "graphics"))
+        self.translation.setText(_translate("Dialog", "Translation"))
+        self.license.setText(_translate("Dialog", "License"))
+        self.close.setText(_translate("Dialog", "Close"))
+
+
+class LubuntuAbout(QMainWindow, LubuntuAboutDialog):
     def __init__(self):
         super().__init__()
-        self.ui = Ui_Dialog()
+        self.ui = LubuntuAboutDialog()
         self.ui.setupUi(self)
         self.ui.versiondetails.setText("Lubuntu %s" % version)
         self.ui.smalldetails.setText("%s %s, %s" % (os, kernel, arch))