Nemcio/DemonEditor
1
0
Fork 0
mirror of https://github.com/DYefremov/DemonEditor.git synced 2026-06-25 01:40:49 +02:00
Code Issues Packages Projects Releases Activity

lock/hide fix

Browse Source
This commit is contained in:
DYefremov
2018-07-08 14:58:41 +03:00
parent f84e77cbce
commit abd803a58c
3 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/ui/main_app_window.py
View File

@@ -852,18 +852,16 @@ class MainAppWindow:
def set_service_flags(self, flag):
profile = Profile(self._profile)
bq_selected = self.get_selected_bouquet()
if not bq_selected:
return
if profile is Profile.ENIGMA_2:
if set_flags(flag, self._services_view, self._fav_view, self._services, self._blacklist):
if set_flags(flag, self._services_view, self._fav_view, self._services, self._blacklist) and bq_selected:
self._fav_model.clear()
self.update_bouquet_services(self._fav_model, None, bq_selected)
elif profile is Profile.NEUTRINO_MP:
model, path = self._bouquets_view.get_selection().get_selected()
value = model.get_value(path, 1 if flag is Flag.LOCK else 2)
elif profile is Profile.NEUTRINO_MP and bq_selected:
model, paths = self._bouquets_view.get_selection().get_selected_rows()
itr = model.get_iter(paths[0])
value = model.get_value(itr, 1 if flag is Flag.LOCK else 2)
value = None if value else LOCKED_ICON if flag is Flag.LOCK else HIDE_ICON
model.set_value(path, 1 if flag is Flag.LOCK else 2, value)
model.set_value(itr, 1 if flag is Flag.LOCK else 2, value)
@run_idle
def on_model_changed(self, model, path, itr=None):

68
app/ui/main_window.glade
View File

@@ -27,7 +27,7 @@ Author: Dmitriy Yefremov
-->
<interface>
<requires lib="gtk+" version="3.18"/>
<requires lib="gtk+" version="3.16"/>
<!-- interface-license-type mit -->
<!-- interface-name DemonEditor -->
<!-- interface-description Enigma2 channel and satellites list editor for GNU/Linux. -->
@@ -683,7 +683,7 @@ Author: Dmitriy Yefremov
<child>
<object class="GtkMenuButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="popover">left_header_popover_menu</property>
<child>
@@ -715,7 +715,7 @@ Author: Dmitriy Yefremov
<child>
<object class="GtkButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">FTP-transfer</property>
<signal name="clicked" handler="on_download" swapped="no"/>
@@ -736,7 +736,7 @@ Author: Dmitriy Yefremov
<child>
<object class="GtkButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Save</property>
<signal name="clicked" handler="on_data_save" swapped="no"/>
@@ -769,7 +769,7 @@ Author: Dmitriy Yefremov
<child>
<object class="GtkToggleButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<signal name="toggled" handler="on_filter_toggled" swapped="no"/>
<child>
@@ -789,7 +789,7 @@ Author: Dmitriy Yefremov
<child>
<object class="GtkToggleButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<signal name="toggled" handler="on_search_toggled" swapped="no"/>
<child>
@@ -821,7 +821,8 @@ Author: Dmitriy Yefremov
<child>
<object class="GtkButton" id="locked_tool_button">
<property name="visible">True</property>
<property name="can_focus">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">Parent lock On/Off Ctrl + L</property>
<signal name="clicked" handler="on_locked" swapped="no"/>
@@ -829,7 +830,7 @@ Author: Dmitriy Yefremov
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">dialog-password-symbolic</property>
<property name="icon_name">changes-prevent-symbolic</property>
</object>
</child>
</object>
@@ -842,7 +843,8 @@ Author: Dmitriy Yefremov
<child>
<object class="GtkButton" id="hide_tool_button">
<property name="visible">True</property>
<property name="can_focus">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">Hide/Skip On/Off Ctrl + H</property>
<signal name="clicked" handler="on_hide" swapped="no"/>
@@ -933,39 +935,55 @@ Author: Dmitriy Yefremov
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkToolButton" id="new_tool_button">
<object class="GtkButton" id="new_tool_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>
<property name="label" translatable="yes">New</property>
<property name="use_underline">True</property>
<property name="stock_id">gtk-new</property>
<signal name="clicked" handler="on_new_bouquet" object="bouquets_tree_view" swapped="no"/>
<child>
<object class="GtkImage">
<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">2</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="edit_tool_button">
<object class="GtkButton" id="edit_tool_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>
<property name="label" translatable="yes">Edit </property>
<property name="use_underline">True</property>
<property name="stock_id">gtk-edit</property>
<signal name="clicked" handler="on_tool_edit" swapped="no"/>
<child>
<object class="GtkImage">
<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">3</property>
<property name="position">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
@@ -981,7 +999,7 @@ Author: Dmitriy Yefremov
<child>
<object class="GtkButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Satellites editor</property>
<signal name="clicked" handler="on_satellite_editor_show" swapped="no"/>
@@ -1002,7 +1020,7 @@ Author: Dmitriy Yefremov
<child>
<object class="GtkButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Picons downloader</property>
<signal name="clicked" handler="on_picons_loader_show" swapped="no"/>
@@ -1023,7 +1041,7 @@ Author: Dmitriy Yefremov
<child>
<object class="GtkButton">
<property name="visible">True</property>
<property name="can_focus">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"/>
@@ -1044,7 +1062,7 @@ Author: Dmitriy Yefremov
<child>
<object class="GtkMenuButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="direction">none</property>
<property name="use_popover">False</property>
@@ -1100,7 +1118,7 @@ Author: Dmitriy Yefremov
<object class="GtkButton" id="search_down_button">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="relief">half</property>
<signal name="clicked" handler="on_search_down" swapped="no"/>
@@ -1123,7 +1141,7 @@ Author: Dmitriy Yefremov
<object class="GtkButton" id="search_up_button">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="relief">half</property>
<signal name="clicked" handler="on_search_up" swapped="no"/>

2
app/ui/uicommons.py
View File

@@ -20,7 +20,7 @@ theme = Gtk.IconTheme.get_default()
_IMAGE_MISSING = theme.load_icon("image-missing", 16, 0) if theme.lookup_icon("image-missing", 16, 0) else None
CODED_ICON = theme.load_icon("emblem-readonly", 16, 0) if theme.lookup_icon(
"emblem-readonly", 16, 0) else _IMAGE_MISSING
LOCKED_ICON = theme.load_icon("dialog-password-symbolic", 16, 0) if theme.lookup_icon(
LOCKED_ICON = theme.load_icon("changes-prevent-symbolic", 16, 0) if theme.lookup_icon(
"system-lock-screen", 16, 0) else _IMAGE_MISSING
HIDE_ICON = theme.load_icon("go-jump", 16, 0) if theme.lookup_icon("go-jump", 16, 0) else _IMAGE_MISSING
TV_ICON = theme.load_icon("tv-symbolic", 16, 0) if theme.lookup_icon("tv-symbolic", 16, 0) else _IMAGE_MISSING