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

renaming bouquet fix [losing custom names](#33)

Browse Source
This commit is contained in:
DYefremov
2020-09-08 12:21:10 +03:00
parent 17ee189db8
commit ee462b24f7
3 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/ui/main_app_window.py
View File

@@ -2556,7 +2556,7 @@ class Application(Gtk.Application):
dialog.show() dialog.show()
def on_bouquets_edit(self, view): def on_bouquets_edit(self, view):
""" Rename bouquets """ """ Renaming bouquets. """
if not self._bq_selected: if not self._bq_selected:
self.show_error_dialog("This item is not allowed to edit!") self.show_error_dialog("This item is not allowed to edit!")
return return
@@ -2576,10 +2576,15 @@ class Application(Gtk.Application):
return return
model.set_value(itr, 0, response) model.set_value(itr, 0, response)
self._bouquets[bq] = self._bouquets.pop("{}:{}".format(bq_name, bq_type)) old_bq_name = "{}:{}".format(bq_name, bq_type)
self._bouquets[bq] = self._bouquets.pop(old_bq_name)
self._current_bq_name = response self._current_bq_name = response
self._bq_name_label.set_text(self._current_bq_name) self._bq_name_label.set_text(self._current_bq_name)
self._bq_selected = "{}:{}".format(response, bq_type) self._bq_selected = bq
# services with extra names for the bouquet
ext_bq = self._extra_bouquets.get(old_bq_name, None)
if ext_bq:
self._extra_bouquets[bq] = ext_bq
def on_rename(self, view): def on_rename(self, view):
name, model = get_model_data(view) name, model = get_model_data(view)

3
app/ui/main_helper.py
View File

@@ -161,7 +161,8 @@ def rename(view, parent_window, target, fav_view=None, service_view=None, servic
return return
srv_name = response srv_name = response
model.set_value(itr, Column.FAV_SERVICE, response) if not model.get_value(itr, Column.FAV_BACKGROUND):
model.set_value(itr, Column.FAV_SERVICE, response)
if service_view is not None: if service_view is not None:
for row in get_base_model(service_view.get_model()): for row in get_base_model(service_view.get_model()):

30
app/ui/service_details_dialog.py
View File

@@ -1,15 +1,16 @@
import re
import os import os
import re
from app.commons import run_idle from app.commons import run_idle
from app.eparser import Service from app.eparser import Service
from app.eparser.ecommons import MODULATION, Inversion, ROLL_OFF, Pilot, Flag, Pids, POLARIZATION, \ from app.eparser.ecommons import (MODULATION, Inversion, ROLL_OFF, Pilot, Flag, Pids, POLARIZATION, get_key_by_value,
get_key_by_value, get_value_by_name, FEC_DEFAULT, PLS_MODE, SERVICE_TYPE, T_MODULATION, C_MODULATION, TrType, \ get_value_by_name, FEC_DEFAULT, PLS_MODE, SERVICE_TYPE, T_MODULATION, C_MODULATION,
SystemCable, T_SYSTEM, BANDWIDTH, TRANSMISSION_MODE, GUARD_INTERVAL, HIERARCHY, T_FEC TrType, SystemCable, T_SYSTEM, BANDWIDTH, TRANSMISSION_MODE, GUARD_INTERVAL, T_FEC,
HIERARCHY)
from app.settings import SettingsType from app.settings import SettingsType
from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, HIDE_ICON, TEXT_DOMAIN, CODED_ICON, Column, IS_GNOME_SESSION
from .dialogs import show_dialog, DialogType, Action, get_dialogs_string from .dialogs import show_dialog, DialogType, Action, get_dialogs_string
from .main_helper import get_base_model from .main_helper import get_base_model
from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, HIDE_ICON, TEXT_DOMAIN, CODED_ICON, Column, IS_GNOME_SESSION
_UI_PATH = UI_RESOURCES_PATH + "service_details_dialog.glade" _UI_PATH = UI_RESOURCES_PATH + "service_details_dialog.glade"
@@ -438,14 +439,17 @@ class ServiceDetailsDialog:
def update_fav_view(self, old_service, new_service): def update_fav_view(self, old_service, new_service):
model = self._fav_view.get_model() model = self._fav_view.get_model()
for row in filter(lambda r: old_service.fav_id == r[7], model): for row in filter(lambda r: old_service.fav_id == r[7], model):
model.set(row.iter, {1: new_service.coded, itr = row.iter
2: new_service.service, if not model.get_value(itr, Column.FAV_BACKGROUND):
3: new_service.locked, model.set_value(itr, Column.FAV_SERVICE, new_service.service)
4: new_service.hide,
5: new_service.service_type, model.set(itr, {Column.FAV_CODED: new_service.coded,
6: new_service.pos, Column.FAV_LOCKED: new_service.locked,
7: new_service.fav_id, Column.FAV_HIDE: new_service.hide,
8: new_service.picon}) Column.FAV_TYPE: new_service.service_type,
Column.FAV_POS: new_service.pos,
Column.FAV_ID: new_service.fav_id,
Column.FAV_PICON: new_service.picon})
def update_picon_name(self, old_name, new_name): def update_picon_name(self, old_name, new_name):
if not os.path.isdir(self._picons_dir_path): if not os.path.isdir(self._picons_dir_path):