From a3952dad0693f9d6a87862feb0bcc610adb48636 Mon Sep 17 00:00:00 2001 From: VFX - Visual Effects Date: Wed, 16 Jun 2021 11:40:19 -0300 Subject: [PATCH] 16/06/2021 --- gui/themes/bright_theme.json | 28 ++++++ gui/uis/columns/right_column.ui | 90 +------------------ .../windows/main_window/setup_main_window.py | 10 +++ gui/widgets/py_toggle/py_toggle.py | 1 - main.py | 1 - settings.json | 2 +- 6 files changed, 40 insertions(+), 92 deletions(-) create mode 100644 gui/themes/bright_theme.json diff --git a/gui/themes/bright_theme.json b/gui/themes/bright_theme.json new file mode 100644 index 0000000..1c13669 --- /dev/null +++ b/gui/themes/bright_theme.json @@ -0,0 +1,28 @@ +{ + "theme_name" : "Default", + "app_color" : { + "dark_one" : "#1b1e23", + "dark_two" : "#1e2229", + "dark_three" : "#21252d", + "dark_four" : "#272c36", + "bg_one" : "#D3E0F7", + "bg_two" : "#E2E9F7", + "bg_three" : "#EFF1F7", + "icon_color" : "#6C7C96", + "icon_hover" : "#8CB8FF", + "icon_pressed" : "#6c99f4", + "icon_active" : "#8CB8FF", + "context_color" : "#568af2", + "context_hover" : "#6c99f4", + "context_pressed" : "#4B5469", + "text_title" : "#606C85", + "text_foreground" : "#6B7894", + "text_description" : "#7887A6", + "text_active" : "#8797BA", + "white" : "#f5f6f9", + "pink" : "#ff007f", + "green" : "#00ff7f", + "red" : "#ff5555", + "yellow" : "#f1fa8c" + } +} \ No newline at end of file diff --git a/gui/uis/columns/right_column.ui b/gui/uis/columns/right_column.ui index 8ce2983..c25d04d 100644 --- a/gui/uis/columns/right_column.ui +++ b/gui/uis/columns/right_column.ui @@ -32,7 +32,7 @@ - 1 + 0 @@ -51,39 +51,6 @@ 5 - - - - - 0 - 40 - - - - - 16777215 - 40 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - @@ -121,39 +88,6 @@ 5 - - - - - 0 - 40 - - - - - 16777215 - 40 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - @@ -172,28 +106,6 @@ - - - - - 9 - - - - font-size: 9pt - - - This is just an example menu. -Add Qt Widgets or your custom widgets here. - - - Qt::AlignCenter - - - true - - - diff --git a/gui/uis/windows/main_window/setup_main_window.py b/gui/uis/windows/main_window/setup_main_window.py index 2d0908a..dadb415 100644 --- a/gui/uis/windows/main_window/setup_main_window.py +++ b/gui/uis/windows/main_window/setup_main_window.py @@ -224,6 +224,16 @@ class SetupMainWindow: # were created using Qt Designer. # This is just an example and should be deleted when creating # your application. + # + # OBJECTS FOR LOAD PAGES, LEFT AND RIGHT COLUMNS + # You can access objects inside Qt Designer projects using + # the objects below: + # + # + # LEFT COLUMN: self.ui.left_column.menus + # RIGHT COLUMN: self.ui.right_column + # LOAD PAGES: self.ui.load_pages + # # /////////////////////////////////////////////////////////////// # LOAD SETTINGS diff --git a/gui/widgets/py_toggle/py_toggle.py b/gui/widgets/py_toggle/py_toggle.py index b9bead5..49d2215 100644 --- a/gui/widgets/py_toggle/py_toggle.py +++ b/gui/widgets/py_toggle/py_toggle.py @@ -59,7 +59,6 @@ class PyToggle(QCheckBox): else: self.animation.setEndValue(4) self.animation.start() - print(f"Status: {self.isChecked()}") def hitButton(self, pos: QPoint): return self.contentsRect().contains(pos) diff --git a/main.py b/main.py index 9863d46..e527ea0 100644 --- a/main.py +++ b/main.py @@ -102,7 +102,6 @@ class MainWindow(QMainWindow): # Load Page 2 MainFunctions.set_page(self, self.ui.load_pages.page_2) - MainFunctions.set_right_column_menu(self, self.ui.right_column.menu_1) # LOAD USER PAGE if btn.objectName() == "btn_add_user": diff --git a/settings.json b/settings.json index e401e91..eaa0827 100644 --- a/settings.json +++ b/settings.json @@ -6,7 +6,7 @@ "theme_name" : "default", "custom_title_bar": true, "startup_size": [ - 1200, + 1400, 720 ], "minimum_size": [