diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index c3571853..632fdffb 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -149,7 +149,6 @@ class Application(Gtk.Application):
"on_full_screen": self.on_full_screen,
"on_drawing_area_realize": self.on_drawing_area_realize,
"on_player_drawing_area_draw": self.on_player_drawing_area_draw,
- "on_main_window_state": self.on_main_window_state,
"on_record": self.on_record,
"on_remove_all_unavailable": self.on_remove_all_unavailable,
"on_new_bouquet": self.on_new_bouquet,
@@ -960,7 +959,7 @@ class Application(Gtk.Application):
top_iter = model.get_iter(path)
parent_itr = model.iter_parent(top_iter) # parent
to_del = []
- is_darwin = self._settings.is_darwin #
+ is_darwin = self._settings.is_darwin
if parent_itr:
p_path = model.get_path(parent_itr)[0]
@@ -2056,21 +2055,9 @@ class Application(Gtk.Application):
def on_full_screen(self, item=None):
self._full_screen = not self._full_screen
- if self._settings.is_darwin:
- self.update_state_on_full_screen(not self._full_screen)
+ self.update_state_on_full_screen(not self._full_screen)
self._main_window.fullscreen() if self._full_screen else self._main_window.unfullscreen()
- def on_main_window_state(self, window, event):
- if self._settings.is_darwin:
- return
-
- state = event.new_window_state
- full = not state & Gdk.WindowState.FULLSCREEN
- window.set_show_menubar(full)
- self.update_state_on_full_screen(full)
- if not state & Gdk.WindowState.ICONIFIED and self._links_transmitter:
- self._links_transmitter.hide()
-
@run_idle
def update_state_on_full_screen(self, visible):
self._main_data_box.set_visible(visible)
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index ce1ee997..78eb201b 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -297,6 +297,15 @@ Author: Dmitriy Yefremov
+
+
+
+
False
diff --git a/app/ui/picons_manager.py b/app/ui/picons_manager.py
index f0cd6dcf..00e2c67f 100644
--- a/app/ui/picons_manager.py
+++ b/app/ui/picons_manager.py
@@ -102,8 +102,6 @@ class PiconsDialog:
self._picons_entry = builder.get_object("picons_entry")
self._url_entry = builder.get_object("url_entry")
self._picons_dir_entry = builder.get_object("picons_dir_entry")
- self._info_bar = builder.get_object("info_bar")
- self._info_bar = builder.get_object("info_bar")
self._message_label = builder.get_object("info_bar_message_label")
self._info_check_button = builder.get_object("info_check_button")
self._picon_info_image = builder.get_object("picon_info_image")
@@ -138,7 +136,9 @@ class PiconsDialog:
self._filter_button.bind_property("active", builder.get_object("src_title_grid"), "visible")
self._filter_button.bind_property("active", builder.get_object("dst_title_grid"), "visible")
self._filter_button.bind_property("visible", self._info_check_button, "visible")
- self._info_check_button.bind_property("active", builder.get_object("explorer_info_bar"), "visible")
+ explorer_info_bar = builder.get_object("explorer_info_bar")
+ explorer_info_bar.bind_property("visible", builder.get_object("explorer_info_bar_frame"), "visible")
+ self._info_check_button.bind_property("active", explorer_info_bar, "visible")
# Init drag-and-drop
self.init_drag_and_drop()
# Style
diff --git a/app/ui/settings_dialog.glade b/app/ui/settings_dialog.glade
index 60a74bcd..46b0705b 100644
--- a/app/ui/settings_dialog.glade
+++ b/app/ui/settings_dialog.glade
@@ -28,7 +28,6 @@ Author: Dmitriy Yefremov
-->
-
@@ -88,7 +87,7 @@ Author: Dmitriy Yefremov
set_default_image
False
-
+
@@ -2931,44 +2930,129 @@ Author: Dmitriy Yefremov