From fd72615a6316994bb52d6321be8edf2d911546eb Mon Sep 17 00:00:00 2001 From: DYefremov Date: Sat, 28 Nov 2020 08:24:51 +0300 Subject: [PATCH] minor changes in control panel gui --- app/ui/control.glade | 610 +++++++++++++++++++++---------------------- app/ui/control.py | 2 +- app/ui/style.css | 4 - 3 files changed, 292 insertions(+), 324 deletions(-) diff --git a/app/ui/control.glade b/app/ui/control.glade index 7cfda504..6a8e3118 100644 --- a/app/ui/control.glade +++ b/app/ui/control.glade @@ -362,50 +362,53 @@ Author: Dmitriy Yefremov document-revert 1 - - 320 + True False - 2 - 2 - vertical + 1 + 1 + 1 + 1 + 0 + in - - True - False - center - center - 10 - 10 - 5 - stack - - - False - True - 0 - - - - + + 320 True False + 5 + 5 5 5 - crossfade - + vertical - + True False - 0 - out + center + center + 10 + 10 + 5 + 10 + stack + + + False + True + 0 + + + + + True + False + crossfade + True False - 5 - 5 vertical 5 @@ -414,7 +417,6 @@ Author: Dmitriy Yefremov False 25 25 - 5 5 vertical 5 @@ -422,7 +424,6 @@ Author: Dmitriy Yefremov True False - 5 0.5 none @@ -919,65 +920,37 @@ audio-volume-medium-symbolic - - - - - - - control - Control - - - - - True - False - vertical - 5 - - - True - True - in - - - True - False - - - True - False - multiple - False - - - - - - - True - True - 0 + control + Control - + True False + vertical 5 - + True True - Filter - gtk-spell-check - tools-check-spelling - False - False - Filter - + in + + + True + False + + + True + False + multiple + False + + + + + True @@ -986,82 +959,85 @@ audio-volume-medium-symbolic - + True - True - True - Add timer - app.on_timer_add_from_event - add_timer_image - True + False + 5 + + + True + True + Filter + gtk-spell-check + tools-check-spelling + False + False + Filter + + + + True + True + 0 + + + + + True + True + True + Add timer + app.on_timer_add_from_event + add_timer_image + True + + + False + True + 1 + + False - True + False 1 - False - False + epg + EPG 1 - - - epg - EPG - 1 - - - - - True - False - vertical - 5 - - True - True - in - - - True - False - - - True - False - multiple - False - - - - - - - - - True - True - 0 - - - - + True False - end - True - expand + vertical + 5 - - Add + + True True - True - app.on_timer_add + in + + + True + False + + + True + False + multiple + False + + + + + + True @@ -1070,59 +1046,69 @@ audio-volume-medium-symbolic - - Remove - True - True - app.on_timer_remove + + True + False + end + True + expand + + + Add + True + True + app.on_timer_add + + + True + True + 0 + + + + + Remove + True + True + app.on_timer_remove + + + True + True + 2 + + + + + Edit + True + True + app.on_timer_edit + + + True + True + 2 + + - True - True - 2 - - - - - Edit - True - True - app.on_timer_edit - - - True - True + False + False 2 - False - False + timers + Timers 2 - - - timers - Timers - 2 - - - - - True - False - 0.5 - in True False - 5 - 5 - 5 - 5 vertical 5 @@ -1500,7 +1486,7 @@ audio-volume-medium-symbolic True True False - gtk-edit + gtk-edit diff --git a/app/ui/control.py b/app/ui/control.py index 7d33a3cd..08bfa61f 100644 --- a/app/ui/control.py +++ b/app/ui/control.py @@ -133,7 +133,7 @@ class ControlBox(Gtk.HBox): builder.add_from_file(UI_RESOURCES_PATH + "control.glade") builder.connect_signals(handlers) - self.add(builder.get_object("main_box")) + self.add(builder.get_object("main_box_frame")) self._stack = builder.get_object("stack") self._screenshot_image = builder.get_object("screenshot_image") self._screenshot_button_box = builder.get_object("screenshot_button_box") diff --git a/app/ui/style.css b/app/ui/style.css index 7f389633..abc4996f 100644 --- a/app/ui/style.css +++ b/app/ui/style.css @@ -13,10 +13,6 @@ paned > separator { background-size: 2px 24px; } -.control-box { - padding: 5px; -} - .red-button { background-image: none; background-color: red;