From 62ae77efdf2269515b24dec4512833f9df4a2646 Mon Sep 17 00:00:00 2001 From: seba Date: Fri, 28 Jun 2024 10:35:33 -0400 Subject: [PATCH] Change buttons title bar install flatpak without --user --- deepinesStore/install_thread.py | 2 +- deepinesStore/maing.py | 48 ++++++++++--- deepinesStore/resources/cerrar.svg | 100 ++++++++++++++++++++++++++ deepinesStore/resources/maximizar.svg | 97 +++++++++++++++++++++++++ deepinesStore/resources/minimizar.svg | 95 ++++++++++++++++++++++++ 5 files changed, 333 insertions(+), 9 deletions(-) create mode 100644 deepinesStore/resources/cerrar.svg create mode 100644 deepinesStore/resources/maximizar.svg create mode 100644 deepinesStore/resources/minimizar.svg diff --git a/deepinesStore/install_thread.py b/deepinesStore/install_thread.py index 82c41cb..3e99dbd 100644 --- a/deepinesStore/install_thread.py +++ b/deepinesStore/install_thread.py @@ -94,7 +94,7 @@ def install_debian_app(self, app_name: str): break def install_flatpak_app(self, app_id: str): - flatpak_install = demoted.run_cmd(demoted.DEF, cmd=["flatpak", "--user", "install", "flathub", "-y", app_id]) + flatpak_install = demoted.run_cmd(demoted.DEF, cmd=["flatpak", "install", "flathub", "-y", app_id]) while not flatpak_install.poll(): line = flatpak_install.stdout.readline() if line: diff --git a/deepinesStore/maing.py b/deepinesStore/maing.py index a22209f..b856cf9 100755 --- a/deepinesStore/maing.py +++ b/deepinesStore/maing.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from PyQt5 import QtGui, QtWidgets -from PyQt5.QtCore import QMetaObject, QRect, QSize, Qt, pyqtSignal +from PyQt5.QtCore import QMetaObject, QRect, QSize, Qt from deepinesStore.core import get_res, tr, get_text_link, STORE_VERSION from deepinesStore.widgets import ClickableLabel, ClickableList @@ -82,6 +82,9 @@ def setupUi(self, MainWindow): svg_pamela = get_res('pamela') svg_search = get_res('magnifying-glass') svg_car = get_res('carDisable') + svg_minimizar = get_res('minimizar') + svg_maximizar = get_res('maximizar') + svg_cerrar = get_res('cerrar') MainWindow.setObjectName("MainWindow") MainWindow.setMinimumSize(QSize(self.width_screen, self.height_screen)) @@ -404,6 +407,22 @@ def setupUi(self, MainWindow): #label_3{ background-color: transparent; } + #btn_close{ + margin-right: 10px; + } + #btn_zoom{ + margin-right: 3px; + margin-left: 3px; + } + QPushButton{ + min-width: 36px; + min-height: 36px; + border-radius: 10px; + background-color: transparent; + } + QPushButton:hover{ + background-color: rgba(50, 50, 50, 100); + } """) self.horizontalLayout_4 = QtWidgets.QHBoxLayout(self.widget_1) self.horizontalLayout_4.setObjectName("horizontalLayout_4") @@ -429,7 +448,7 @@ def setupUi(self, MainWindow): self.horizontalLayout_4.addWidget(self.btn_app_deb) spacerItem1 = QtWidgets.QSpacerItem( - 40, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) + 40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_4.addItem(spacerItem1) self.label_3 = QtWidgets.QLabel(self.widget_1) @@ -437,6 +456,7 @@ def setupUi(self, MainWindow): font = QtGui.QFont() font.setPointSize(20) self.label_3.setFont(font) + self.label_3.setAlignment(Qt.AlignmentFlag.AlignCenter) self.horizontalLayout_4.addWidget(self.label_3) @@ -444,19 +464,31 @@ def setupUi(self, MainWindow): 40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_4.addItem(spacerItem2) - self.btn_minimize = QtWidgets.QRadioButton(self.widget_1) + self.btn_minimize = QtWidgets.QPushButton(self.widget_1) self.btn_minimize.setObjectName("btn_minimize") - self.btn_minimize.setStyleSheet(TitleBarButtonStylesheet) + self.btn_minimize.setText("") + icon12 = QtGui.QIcon() + icon12.addPixmap(QtGui.QPixmap(svg_minimizar), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.btn_minimize.setIcon(icon12) + self.btn_minimize.setIconSize(QSize(13, 13)) self.horizontalLayout_4.addWidget(self.btn_minimize) - self.btn_zoom = QtWidgets.QRadioButton(self.widget_1) + self.btn_zoom = QtWidgets.QPushButton(self.widget_1) self.btn_zoom.setObjectName("btn_zoom") - self.btn_zoom.setStyleSheet(TitleBarButtonStylesheet) + self.btn_zoom.setText("") + icon13 = QtGui.QIcon() + icon13.addPixmap(QtGui.QPixmap(svg_maximizar), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.btn_zoom.setIcon(icon13) self.horizontalLayout_4.addWidget(self.btn_zoom) - self.btn_close = QtWidgets.QRadioButton(self.widget_1) + self.btn_close = QtWidgets.QPushButton(self.widget_1) self.btn_close.setObjectName("btn_close") - self.btn_close.setStyleSheet(TitleBarButtonStylesheet) + self.btn_close.setText("") + icon14 = QtGui.QIcon() + icon14.addPixmap(QtGui.QPixmap(svg_cerrar), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.btn_close.setIcon(icon14) + self.btn_close.setIconSize(QSize(20, 20)) + self.horizontalLayout_4.addWidget(self.btn_close) self.gridLayout_2.addWidget(self.widget_1, 0, 1, 1, 1) diff --git a/deepinesStore/resources/cerrar.svg b/deepinesStore/resources/cerrar.svg new file mode 100644 index 0000000..a8f5cb9 --- /dev/null +++ b/deepinesStore/resources/cerrar.svg @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/deepinesStore/resources/maximizar.svg b/deepinesStore/resources/maximizar.svg new file mode 100644 index 0000000..b6b8c4f --- /dev/null +++ b/deepinesStore/resources/maximizar.svg @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/deepinesStore/resources/minimizar.svg b/deepinesStore/resources/minimizar.svg new file mode 100644 index 0000000..5a67ba0 --- /dev/null +++ b/deepinesStore/resources/minimizar.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + +