From b302465322ef4569469326bc86b2a9a13ca75b8d Mon Sep 17 00:00:00 2001
From: itdominator <1itdominator@gmail.com>
Date: Sun, 14 Nov 2021 02:12:09 -0600
Subject: [PATCH] Fixed toggle button ui updates
---
.../PyFM/new/pyfm/resources/Main_Window.glade | 9 ++++----
.../PyFM/new/pyfm/resources/stylesheet.css | 23 ++++++++++---------
.../PyFM/new/pyfm/signal_classes/Signals.py | 1 +
.../pyfm/signal_classes/mixins/PaneMixin.py | 5 ++++
.../PyFM/new/pyfm/utils/Settings.py | 2 +-
5 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/Main_Window.glade b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/Main_Window.glade
index 70e7df0..dfbac8d 100644
--- a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/Main_Window.glade
+++ b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/Main_Window.glade
@@ -30,7 +30,6 @@
800
600
False
- PyFM
center
1200
720
@@ -211,7 +210,7 @@
5
start
-
-
+
tggl_notebook_2
True
True
@@ -243,7 +242,7 @@
-
+
tggl_notebook_3
True
True
@@ -259,7 +258,7 @@
-
+
tggl_notebook_4
True
True
diff --git a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/stylesheet.css b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/stylesheet.css
index f8bb0fa..66a625c 100644
--- a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/stylesheet.css
+++ b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/stylesheet.css
@@ -1,34 +1,35 @@
/* Set fm to have transparent window */
-* {
+/* * {
background: rgba(0, 0, 0, 0.14);
+ color: rgba(255, 255, 255, 1);
}
* selection {
- background-color: rgba(116, 0, 0, 0.65);
- color: rgba(255, 255, 255, 0.5);
+ background-color: rgba(116, 0, 0, 0.65);
+ color: rgba(255, 255, 255, 0.5);
}
.view:selected,
.view:selected:hover {
- box-shadow: inset 0 0 0 9999px rgba(15, 134, 13, 0.49);
- color: rgba(255, 255, 255, 0.5);;
-}
+ box-shadow: inset 0 0 0 9999px rgba(15, 134, 13, 0.49);
+ color: rgba(255, 255, 255, 0.5);;
+} */
/* Rubberband coloring */
-.rubberband,
+/* .rubberband,
rubberband,
flowbox rubberband,
treeview.view rubberband,
.content-view rubberband,
.content-view .rubberband,
XfdesktopIconView.view .rubberband {
- border: 1px solid #6c6c6c;
- background-color: rgba(21, 158, 167, 0.57);
+ border: 1px solid #6c6c6c;
+ background-color: rgba(21, 158, 167, 0.57);
}
XfdesktopIconView.view:active {
- background-color: rgba(172, 102, 21, 1);
-}
+ background-color: rgba(172, 102, 21, 1);
+} */
diff --git a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/Signals.py b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/Signals.py
index 2f5cee8..d39a768 100644
--- a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/Signals.py
+++ b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/Signals.py
@@ -69,6 +69,7 @@ class Signals(WindowMixin, PaneMixin):
object = self.builder.get_object(f"tggl_notebook_{i}")
views = value[0]["window"]["views"]
self.window_controller.create_window()
+ object.set_active(True)
for view in views:
self.create_new_view_notebook(None, view, i)
diff --git a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/PaneMixin.py b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/PaneMixin.py
index cad970e..0f9c316 100644
--- a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/PaneMixin.py
+++ b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/PaneMixin.py
@@ -12,17 +12,22 @@ class PaneMixin:
child.show()
def run_flag_toggle(self, pane_index):
+ tggl_button = self.builder.get_object(f"tggl_notebook_{pane_index}")
if pane_index == 1:
self.is_pane1_hidden = not self.is_pane1_hidden
+ tggl_button.set_active(not self.is_pane1_hidden)
return self.is_pane1_hidden
elif pane_index == 2:
self.is_pane2_hidden = not self.is_pane2_hidden
+ tggl_button.set_active(not self.is_pane2_hidden)
return self.is_pane2_hidden
elif pane_index == 3:
self.is_pane3_hidden = not self.is_pane3_hidden
+ tggl_button.set_active(not self.is_pane3_hidden)
return self.is_pane3_hidden
elif pane_index == 4:
self.is_pane4_hidden = not self.is_pane4_hidden
+ tggl_button.set_active(not self.is_pane4_hidden)
return self.is_pane4_hidden
def toggle_notebook_pane(self, widget, eve=None):
diff --git a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/utils/Settings.py b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/utils/Settings.py
index 85a38cf..a067bbd 100644
--- a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/utils/Settings.py
+++ b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/utils/Settings.py
@@ -26,7 +26,7 @@ class Settings:
# Get window and connect signals
window = self.builder.get_object("Main_Window")
window.connect("delete-event", gtk.main_quit)
- self.setWindowData(window, False)
+ self.setWindowData(window, True)
return window
def setWindowData(self, window, paintable):