diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py index 0c5073c2..2884c9ef 100644 --- a/app/ui/main_app_window.py +++ b/app/ui/main_app_window.py @@ -211,7 +211,6 @@ class Application(Gtk.Application): self._bq_name_label = builder.get_object("bq_name_label") # App info self._app_info_box = builder.get_object("app_info_box") - self._app_info_box.bind_property("visible", self._status_bar_box, "visible", 4) self._app_info_box.bind_property("visible", builder.get_object("main_paned"), "visible", 4) self._app_info_box.bind_property("visible", builder.get_object("right_header_box"), "visible", 4) self._app_info_box.bind_property("visible", builder.get_object("left_header_box"), "visible", 4) @@ -852,9 +851,9 @@ class Application(Gtk.Application): def on_view_drag_begin(self, view, context): """ Selects a row under the cursor in the view at the dragging beginning. """ - selection = view.get_selection() - if selection.count_selected_rows() > 1: - view.do_toggle_cursor_row(view) + path, column = view.get_cursor() + if path: + view.get_selection().select_path(path) def on_view_drag_data_get(self, view, drag_context, data, info, time): selection = self.get_selection(view) @@ -938,12 +937,12 @@ class Application(Gtk.Application): return model = get_base_model(view.get_model()) - dest_index = 0 + dest_index = len(model) + if drop_info: path, position = drop_info - dest_iter = model.get_iter(path) - if dest_iter: - dest_index = model.get_value(dest_iter, 0) + dest_index = path.get_indices()[0] + fav_bouquet = self._bouquets[bq_selected] itrs = itr_str.split(",") @@ -965,6 +964,7 @@ class Application(Gtk.Application): for row in in_rows: model.insert(dest_index, row) fav_bouquet.insert(dest_index, row[Column.FAV_ID]) + dest_index += 1 for in_itr in in_itrs: del fav_bouquet[int(model.get_path(in_itr)[0])] model.remove(in_itr) @@ -1976,7 +1976,7 @@ class Application(Gtk.Application): full = not state & Gdk.WindowState.FULLSCREEN self._main_data_box.set_visible(full) self._player_tool_bar.set_visible(full) - self._status_bar_box.set_visible(full and not self._app_info_box.get_visible()) + self._status_bar_box.set_visible(full) if not state & Gdk.WindowState.ICONIFIED and self._links_transmitter: self._links_transmitter.hide() diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade index 538212b9..10ea4af3 100644 --- a/app/ui/main_window.glade +++ b/app/ui/main_window.glade @@ -1856,7 +1856,6 @@ Author: Dmitriy Yefremov Service True 0.5 - True 3 @@ -1904,7 +1903,6 @@ Author: Dmitriy Yefremov Package True 0.5 - True 6 @@ -1925,7 +1923,6 @@ Author: Dmitriy Yefremov Type True 0.5 - True 7 @@ -1944,7 +1941,6 @@ Author: Dmitriy Yefremov 25 Picon 0.5 - True 9 @@ -1976,7 +1972,6 @@ Author: Dmitriy Yefremov SID True 0.5 - True 10 @@ -1996,7 +1991,6 @@ Author: Dmitriy Yefremov Freq True 0.5 - True 11 @@ -2016,7 +2010,6 @@ Author: Dmitriy Yefremov Rate True 0.5 - True 12 @@ -2036,7 +2029,6 @@ Author: Dmitriy Yefremov Pol True 0.5 - True 13 @@ -2056,7 +2048,6 @@ Author: Dmitriy Yefremov FEC True 0.5 - True 14 @@ -2076,7 +2067,6 @@ Author: Dmitriy Yefremov System True 0.5 - True 15 @@ -2855,6 +2845,7 @@ Author: Dmitriy Yefremov 28 + True False 1 1 @@ -2892,6 +2883,21 @@ Author: Dmitriy Yefremov 1 + + + True + False + Current IP: + + + + + + False + True + 2 + + True @@ -2899,21 +2905,6 @@ Author: Dmitriy Yefremov 0 - - - True - False - Current IP: - - - - - - False - True - 3 - - False