From ac54a1ce7e8f831f2f735d3a1234782dafcc5804 Mon Sep 17 00:00:00 2001 From: VFX - Visual Effects Date: Wed, 26 May 2021 11:39:25 -0300 Subject: [PATCH] 26/05/2021 --- gui/themes/default.json | 2 +- gui/uis/windows/main_window/ui_main.py | 43 +++++++++++++++++++-- gui/widgets/py_title_bar/py_title_bar.py | 2 +- gui/widgets/py_title_bar/py_title_button.py | 2 +- settings.json | 8 +++- 5 files changed, 48 insertions(+), 9 deletions(-) diff --git a/gui/themes/default.json b/gui/themes/default.json index a66ab70..fdd17d9 100644 --- a/gui/themes/default.json +++ b/gui/themes/default.json @@ -10,7 +10,7 @@ "bg_three" : "#3c4454", "icon_color" : "#c3ccdf", "icon_hover" : "#dce1ec", - "icon_pressed" : "#edf0f5", + "icon_pressed" : "#6c99f4", "icon_active" : "#f5f6f9", "context_color" : "#568af2", "context_hover" : "#6c99f4", diff --git a/gui/uis/windows/main_window/ui_main.py b/gui/uis/windows/main_window/ui_main.py index 076363e..0b43ad9 100644 --- a/gui/uis/windows/main_window/ui_main.py +++ b/gui/uis/windows/main_window/ui_main.py @@ -60,7 +60,8 @@ class UI_MainWindow(object): self.themes = themes.items # SET INITIAL PARAMETERS - parent.setMinimumSize(self.settings["startup_size"][0], self.settings["startup_size"][1]) + parent.resize(self.settings["startup_size"][0], self.settings["startup_size"][1]) + parent.setMinimumSize(self.settings["minimum_size"][0], self.settings["minimum_size"][1]) # SET CENTRAL WIDGET # Add central widget to app @@ -85,7 +86,6 @@ class UI_MainWindow(object): border_color = self.themes["app_color"]["bg_two"], text_color = self.themes["app_color"]["text_foreground"] ) - # If disable custom title bar if not self.settings["custom_title_bar"]: @@ -135,7 +135,7 @@ class UI_MainWindow(object): # ADD LEFT COLUMN # Add here the left column with Stacked Widgets # /////////////////////////////////////////////////////////////// - left_column_minimum = self.settings["lef_column_size"]["minimum"] + left_column_minimum = self.settings["left_column_size"]["minimum"] self.left_column_frame = QFrame() self.left_column_frame.setMaximumSize(left_column_minimum, 17280) self.left_column_frame.setMinimumSize(left_column_minimum, 0) @@ -187,9 +187,44 @@ class UI_MainWindow(object): # /////////////////////////////////////////////////////////////// self.content_area_frame = QFrame() + # CREATE LAYOUT + self.content_area_layout = QHBoxLayout(self.content_area_frame) + self.content_area_layout.setContentsMargins(0,0,0,0) + self.content_area_layout.setSpacing(0) + + # LEFT CONTENT + self.content_area_left_frame = QFrame() + # IMPORT MAIN PAGES TO CONTENT AREA self.load_pages = Ui_MainPages() - self.load_pages.setupUi(self.content_area_frame) + self.load_pages.setupUi(self.content_area_left_frame) + + # RIGHT BAR + self.content_area_right_frame = QFrame() + self.content_area_right_frame.setMinimumWidth(self.settings["right_column_size"]["minimum"]) + self.content_area_right_frame.setMaximumWidth(self.settings["right_column_size"]["maximum"]) + + # IMPORT RIGHT COLUMN + self.content_area_right_layout = QVBoxLayout(self.content_area_right_frame) + self.content_area_right_layout.setContentsMargins(5,5,5,5) + self.content_area_right_layout.setSpacing(0) + + # RIGHT BG + self.content_area_right_bg_frame = QFrame() + self.content_area_right_bg_frame.setObjectName("content_area_right_bg_frame") + self.content_area_right_bg_frame.setStyleSheet(f''' + #content_area_right_bg_frame {{ + border-radius: 8px; + background-color: {self.themes["app_color"]["bg_two"]}; + }} + ''') + + # ADD BG + self.content_area_right_layout.addWidget(self.content_area_right_bg_frame) + + # ADD TO LAYOUTS + self.content_area_layout.addWidget(self.content_area_left_frame) + self.content_area_layout.addWidget(self.content_area_right_frame) # CREDITS / BOTTOM APP FRAME # /////////////////////////////////////////////////////////////// diff --git a/gui/widgets/py_title_bar/py_title_bar.py b/gui/widgets/py_title_bar/py_title_bar.py index 251355b..53ec5c0 100644 --- a/gui/widgets/py_title_bar/py_title_bar.py +++ b/gui/widgets/py_title_bar/py_title_bar.py @@ -328,7 +328,7 @@ class PyTitleBar(QWidget): bg_color_pressed = self._context_color, icon_color = self._icon_color, icon_color_hover = self._icon_color_hover, - icon_color_pressed = self._icon_color_pressed, + icon_color_pressed = self._icon_color_active, icon_color_active = self._icon_color_active, context_color = self._context_color, text_foreground = self._text_foreground, diff --git a/gui/widgets/py_title_bar/py_title_button.py b/gui/widgets/py_title_bar/py_title_button.py index 9d4202c..76ca722 100644 --- a/gui/widgets/py_title_bar/py_title_button.py +++ b/gui/widgets/py_title_bar/py_title_button.py @@ -138,7 +138,7 @@ class PyTitleButton(QPushButton): self.repaint() elif event == QEvent.MouseButtonPress: self._set_bg_color = self._bg_color_pressed - self._set_icon_color = self._context_color + self._set_icon_color = self._icon_color_pressed self.repaint() elif event == QEvent.MouseButtonRelease: self._set_bg_color = self._bg_color_hover diff --git a/settings.json b/settings.json index 7c36c41..3454bd0 100644 --- a/settings.json +++ b/settings.json @@ -3,6 +3,7 @@ "version" : "v1.0.0", "copyright" : "By: Wanderson M. Pimenta", "year" : 2021, + "theme_name" : "default", "custom_title_bar": true, "startup_size": [ 1200, @@ -17,11 +18,14 @@ "maximum" : 240 }, "left_menu_content_margins" : 3, - "lef_column_size" : { + "left_column_size" : { + "minimum" : 240, + "maximum" : 240 + }, + "right_column_size" : { "minimum" : 240, "maximum" : 240 }, - "theme_name" : "default", "font" : { "family" : "Segoe UI", "title_size" : 10,