Nemcio/DemonEditor
1
0
Fork 0
mirror of https://github.com/DYefremov/DemonEditor.git synced 2025-12-21 07:59:40 +01:00
Code Issues Packages Projects Releases Activity

changing header bar elements

Browse Source
This commit is contained in:
DYefremov
2019-05-29 14:31:44 +03:00
parent 0686c91a5d
commit 0f30d74edc
2 changed files with 152 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/ui/main_app_window.py
View File

@@ -50,18 +50,19 @@ class Application(Gtk.Application):
_FAV_ELEMENTS = ("fav_cut_popup_item", "fav_paste_popup_item", "fav_locate_popup_item", "fav_iptv_popup_item", _FAV_ELEMENTS = ("fav_cut_popup_item", "fav_paste_popup_item", "fav_locate_popup_item", "fav_iptv_popup_item",
"fav_insert_marker_popup_item", "fav_edit_sub_menu_popup_item", "fav_edit_popup_item", "fav_insert_marker_popup_item", "fav_edit_sub_menu_popup_item", "fav_edit_popup_item",
"fav_picon_popup_item", "fav_copy_popup_item") "fav_picon_popup_item", "fav_copy_popup_item", "fav_epg_configuration_popup_item")
_BOUQUET_ELEMENTS = ("bouquets_new_popup_item", "bouquets_edit_popup_item", "bouquets_cut_popup_item", _BOUQUET_ELEMENTS = ("bouquets_new_popup_item", "bouquets_edit_popup_item", "bouquets_cut_popup_item",
"bouquets_copy_popup_item", "bouquets_paste_popup_item", "edit_header_button", "bouquets_copy_popup_item", "bouquets_paste_popup_item", "new_header_button",
"new_header_button", "bouquet_import_popup_item") "bouquet_import_popup_item")
_COMMONS_ELEMENTS = ("edit_header_button", "bouquets_remove_popup_item", _COMMONS_ELEMENTS = ("bouquets_remove_popup_item", "fav_remove_popup_item", "import_bq_menu_button")
"fav_remove_popup_item", "import_bq_menu_button")
_FAV_ENIGMA_ELEMENTS = ("fav_insert_marker_popup_item",) _FAV_ENIGMA_ELEMENTS = ("fav_insert_marker_popup_item", "fav_epg_configuration_popup_item",
"epg_configuration_header_button")
_FAV_IPTV_ELEMENTS = ("fav_iptv_popup_item",) _FAV_IPTV_ELEMENTS = ("fav_iptv_popup_item", "import_m3u_header_button", "export_to_m3u_header_button",
"epg_configuration_header_button")
_LOCK_HIDE_ELEMENTS = ("locked_tool_button", "hide_tool_button") _LOCK_HIDE_ELEMENTS = ("locked_tool_button", "hide_tool_button")
@@ -258,6 +259,7 @@ class Application(Gtk.Application):
self.init_drag_and_drop() self.init_drag_and_drop()
self.init_colors() self.init_colors()
self.init_http_api() self.init_http_api()
self._services_view.grab_focus()
def do_activate(self): def do_activate(self):
self._main_window.set_application(self) self._main_window.set_application(self)
@@ -419,7 +421,7 @@ class Application(Gtk.Application):
self.fav_paste(selection) self.fav_paste(selection)
elif target is ViewTarget.BOUQUET: elif target is ViewTarget.BOUQUET:
self.bouquet_paste(selection) self.bouquet_paste(selection)
self.on_view_focus(view, None) self.on_view_focus(view)
def fav_paste(self, selection): def fav_paste(self, selection):
dest_index = 0 dest_index = 0
@@ -483,7 +485,7 @@ class Application(Gtk.Application):
elif model_name == self._SERVICE_LIST_NAME: elif model_name == self._SERVICE_LIST_NAME:
next(self.delete_services(itrs, model, rows), False) next(self.delete_services(itrs, model, rows), False)
self.on_view_focus(view, None) self.on_view_focus(view)
return rows return rows
@@ -754,13 +756,13 @@ class Application(Gtk.Application):
name = Gtk.Buildable.get_name(menu) name = Gtk.Buildable.get_name(menu)
if name == "services_popup_menu": if name == "services_popup_menu":
self.delete_selection(self._fav_view, self._bouquets_view) self.delete_selection(self._fav_view, self._bouquets_view)
self.on_view_focus(self._services_view, None) self.on_view_focus(self._services_view)
elif name == "fav_popup_menu": elif name == "fav_popup_menu":
self.delete_selection(self._services_view, self._bouquets_view) self.delete_selection(self._services_view, self._bouquets_view)
self.on_view_focus(self._fav_view, None) self.on_view_focus(self._fav_view)
elif name == "bouquets_popup_menu": elif name == "bouquets_popup_menu":
self.delete_selection(self._services_view, self._fav_view) self.delete_selection(self._services_view, self._fav_view)
self.on_view_focus(self._bouquets_view, None) self.on_view_focus(self._bouquets_view)
menu.popup(None, None, None, None, event.button, event.time) menu.popup(None, None, None, None, event.button, event.time)
return True return True
@@ -1037,6 +1039,8 @@ class Application(Gtk.Application):
if len(path) > 1: if len(path) > 1:
next(self.update_bouquet_services(model, path), False) next(self.update_bouquet_services(model, path), False)
self.on_view_focus(self._bouquets_view)
def update_bouquet_services(self, model, path, bq_key=None): def update_bouquet_services(self, model, path, bq_key=None):
""" Updates list of bouquet services """ """ Updates list of bouquet services """
tree_iter = None tree_iter = None
@@ -1195,10 +1199,11 @@ class Application(Gtk.Application):
self.update_fav_num_column(model) self.update_fav_num_column(model)
self.update_bouquet_list() self.update_bouquet_list()
def on_view_focus(self, view, focus_event): def on_view_focus(self, view, focus_event=None):
profile = Profile(self._profile) profile = Profile(self._profile)
model_name, model = get_model_data(view) model_name, model = get_model_data(view)
not_empty = len(model) > 0 # if > 0 model has items not_empty = len(model) > 0 # if > 0 model has items
is_service = model_name == self._SERVICE_LIST_NAME
if model_name == self._BOUQUETS_LIST_NAME: if model_name == self._BOUQUETS_LIST_NAME:
for elem in self._tool_elements: for elem in self._tool_elements:
@@ -1211,15 +1216,10 @@ class Application(Gtk.Application):
for elem in self._LOCK_HIDE_ELEMENTS: for elem in self._LOCK_HIDE_ELEMENTS:
self._tool_elements[elem].set_sensitive(not_empty) self._tool_elements[elem].set_sensitive(not_empty)
else: else:
is_service = model_name == self._SERVICE_LIST_NAME
for elem in self._FAV_ELEMENTS: for elem in self._FAV_ELEMENTS:
if elem in ("paste_tool_button", "fav_paste_popup_item"): if elem in ("paste_tool_button", "fav_paste_popup_item"):
self._tool_elements[elem].set_sensitive(not is_service and self._rows_buffer) self._tool_elements[elem].set_sensitive(not is_service and self._rows_buffer)
elif elem in self._FAV_ENIGMA_ELEMENTS: elif elem in self._FAV_ENIGMA_ELEMENTS:
if profile is Profile.ENIGMA_2:
self._tool_elements[elem].set_sensitive(self._bq_selected and not is_service)
elif elem in self._FAV_IPTV_ELEMENTS:
self._tool_elements[elem].set_sensitive(self._bq_selected and not is_service) self._tool_elements[elem].set_sensitive(self._bq_selected and not is_service)
else: else:
self._tool_elements[elem].set_sensitive(not_empty and not is_service) self._tool_elements[elem].set_sensitive(not_empty and not is_service)
@@ -1230,9 +1230,15 @@ class Application(Gtk.Application):
for elem in self._LOCK_HIDE_ELEMENTS: for elem in self._LOCK_HIDE_ELEMENTS:
self._tool_elements[elem].set_sensitive(not_empty and profile is Profile.ENIGMA_2) self._tool_elements[elem].set_sensitive(not_empty and profile is Profile.ENIGMA_2)
for elem in self._FAV_IPTV_ELEMENTS:
self._tool_elements[elem].set_sensitive(self._bq_selected and not is_service)
for elem in self._COMMONS_ELEMENTS: for elem in self._COMMONS_ELEMENTS:
self._tool_elements[elem].set_sensitive(not_empty) self._tool_elements[elem].set_sensitive(not_empty)
if profile is not Profile.ENIGMA_2:
for elem in self._FAV_ENIGMA_ELEMENTS:
self._tool_elements[elem].set_sensitive(False)
def on_hide(self, item): def on_hide(self, item):
self.set_service_flags(Flag.HIDE) self.set_service_flags(Flag.HIDE)

392
app/ui/main_window.glade
View File

@@ -427,6 +427,45 @@ Author: Dmitriy Yefremov
<property name="position">7</property> <property name="position">7</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkModelButton" id="settings_menu_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="text" translatable="yes">Settings</property>
<signal name="clicked" handler="on_preferences" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">8</property>
</packing>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">9</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="about_menu_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="text" translatable="yes">About</property>
<signal name="clicked" handler="on_about_app" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">10</property>
</packing>
</child>
<child> <child>
<object class="GtkModelButton" id="exit_munu_button"> <object class="GtkModelButton" id="exit_munu_button">
<property name="visible">True</property> <property name="visible">True</property>
@@ -438,7 +477,7 @@ Author: Dmitriy Yefremov
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">8</property> <property name="position">11</property>
</packing> </packing>
</child> </child>
</object> </object>
@@ -885,186 +924,6 @@ Author: Dmitriy Yefremov
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="stock">gtk-remove</property> <property name="stock">gtk-remove</property>
</object> </object>
<object class="GtkPopoverMenu" id="right_header_popover_menu">
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="right_popover_munu_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">10</property>
<property name="margin_right">10</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkModelButton" id="tools_menu_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="text" translatable="yes">Tools</property>
<property name="menu_name">submenu1</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkSeparator" id="popover_menu_separator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="settings_menu_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="text" translatable="yes">Settings</property>
<signal name="clicked" handler="on_preferences" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkSeparator" id="popover_menu_separator2">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="about_menu_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="text" translatable="yes">About</property>
<signal name="clicked" handler="on_about_app" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">6</property>
</packing>
</child>
</object>
<packing>
<property name="submenu">main</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="tools_popover_grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="right_popover_munu_tools_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_right">10</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkModelButton" id="sat_editor_menu_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="text" translatable="yes">Satellites editor</property>
<signal name="clicked" handler="on_satellite_editor_show" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="picons_downloader_menu_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="text" translatable="yes">Picons downloader</property>
<signal name="clicked" handler="on_picons_loader_show" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="import_m3u_menu_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="text" translatable="yes">Import m3u file</property>
<signal name="clicked" handler="on_import_m3u" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="backup_menu_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="text" translatable="yes">Backup</property>
<signal name="clicked" handler="on_backup_tool_show" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="back_to_main_menu_tools_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">start</property>
<property name="valign">start</property>
<property name="margin_left">5</property>
<property name="margin_top">5</property>
<property name="menu_name">main</property>
<property name="inverted">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
<packing>
<property name="submenu">submenu1</property>
<property name="position">2</property>
</packing>
</child>
</object>
<object class="GtkImage" id="save_as_image"> <object class="GtkImage" id="save_as_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
@@ -1602,61 +1461,6 @@ Author: Dmitriy Yefremov
<object class="GtkBox" id="right_header_box"> <object class="GtkBox" id="right_header_box">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child>
<object class="GtkButton" id="edit_header_button">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Edit</property>
<signal name="clicked" handler="on_tool_edit" swapped="no"/>
<child>
<object class="GtkImage" id="edit_header_button_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-edit</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="new_header_button">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">New bouquet</property>
<signal name="clicked" handler="on_new_bouquet" object="bouquets_tree_view" swapped="no"/>
<child>
<object class="GtkImage" id="new_header_button_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-new</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkSeparator" id="right_header_box_separator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="sat_editor_header_button"> <object class="GtkButton" id="sat_editor_header_button">
<property name="visible">True</property> <property name="visible">True</property>
@@ -1675,7 +1479,7 @@ Author: Dmitriy Yefremov
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">3</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
@@ -1696,28 +1500,7 @@ Author: Dmitriy Yefremov
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">4</property> <property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="import_m3u_header_button">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Import m3u file</property>
<signal name="clicked" handler="on_import_m3u" swapped="no"/>
<child>
<object class="GtkImage" id="import_m3u_header_button_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">insert-link</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing> </packing>
</child> </child>
<child> <child>
@@ -1735,6 +1518,61 @@ Author: Dmitriy Yefremov
</object> </object>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkSeparator" id="right_header_box_separator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkButton" id="import_m3u_header_button">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Import m3u file</property>
<signal name="clicked" handler="on_import_m3u" swapped="no"/>
<child>
<object class="GtkImage" id="import_m3u_header_button_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">insert-link</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkButton" id="export_to_m3u_header_button">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Export to m3u</property>
<signal name="clicked" handler="on_export_to_m3u" swapped="no"/>
<child>
<object class="GtkImage" id="export_to_m3u_header_button_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-save-as</property>
</object>
</child>
</object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
@@ -1742,15 +1580,41 @@ Author: Dmitriy Yefremov
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkMenuButton" id="right_menu_header_button"> <object class="GtkButton" id="epg_configuration_header_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="direction">none</property> <property name="tooltip_text" translatable="yes">EPG configuration</property>
<property name="use_popover">False</property> <signal name="clicked" handler="on_epg_list_configuration" swapped="no"/>
<property name="popover">right_header_popover_menu</property>
<child> <child>
<placeholder/> <object class="GtkImage" id="epg_configuration_header_button_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-index</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">7</property>
</packing>
</child>
<child>
<object class="GtkButton" id="new_header_button">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">New bouquet</property>
<signal name="clicked" handler="on_new_bouquet" object="bouquets_tree_view" swapped="no"/>
<child>
<object class="GtkImage" id="new_header_button_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-new</property>
</object>
</child> </child>
</object> </object>
<packing> <packing>