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

little refactoring for delete and copy functions

Browse Source
This commit is contained in:
DYefremov
2018-10-09 13:16:49 +03:00
parent 8307f153cd
commit 6eb112eb38
2 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/ui/main_app_window.py
View File

@@ -298,19 +298,15 @@ class MainAppWindow:
def on_copy(self, view, target): def on_copy(self, view, target):
model, paths = view.get_selection().get_selected_rows() model, paths = view.get_selection().get_selected_rows()
rows = None
if target is ViewTarget.FAV: if target is ViewTarget.FAV:
rows = [(0, *model.get(model.get_iter(path), 2, 3, 4, 5, 7, 16, 18, 8)) for path in paths] self._rows_buffer.extend((0, *model.get(model.get_iter(path), 2, 3, 4, 5, 7, 16, 18, 8)) for path in paths)
elif target is ViewTarget.SERVICES: elif target is ViewTarget.SERVICES:
rows = [model[path][:] for path in paths] self._rows_buffer.extend(model[path][:] for path in paths)
elif target is ViewTarget.BOUQUET: elif target is ViewTarget.BOUQUET:
to_copy = list(map(model.get_iter, filter(lambda p: p.get_depth() == 2, paths))) to_copy = list(map(model.get_iter, filter(lambda p: p.get_depth() == 2, paths)))
if to_copy: if to_copy:
self._bouquets_buffer.extend([model[i][:] for i in to_copy]) self._bouquets_buffer.extend([model[i][:] for i in to_copy])
return
self._rows_buffer.extend(rows)
def on_fav_cut(self, view): def on_fav_cut(self, view):
self.on_cut(view, ViewTarget.FAV) self.on_cut(view, ViewTarget.FAV)
@@ -388,13 +384,11 @@ class MainAppWindow:
# ***************** Deletion *********************# # ***************** Deletion *********************#
def on_delete(self, item): def on_delete(self, view):
""" Delete selected items from views """ Delete selected items from view
returns deleted rows list! returns deleted rows list!
""" """
for view in [self._services_view, self._fav_view, self._bouquets_view]:
if view.is_focus():
selection = view.get_selection() selection = view.get_selection()
model, paths = selection.get_selected_rows() model, paths = selection.get_selected_rows()
model_name = get_base_model(model).get_name() model_name = get_base_model(model).get_name()

6
app/ui/main_window.glade
View File

@@ -117,7 +117,7 @@ Author: Dmitriy Yefremov
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<signal name="activate" handler="on_delete" swapped="no"/> <signal name="activate" handler="on_delete" object="bouquets_tree_view" swapped="no"/>
</object> </object>
</child> </child>
</object> </object>
@@ -682,7 +682,7 @@ Author: Dmitriy Yefremov
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<signal name="activate" handler="on_delete" swapped="no"/> <signal name="activate" handler="on_delete" object="fav_tree_view" swapped="no"/>
</object> </object>
</child> </child>
</object> </object>
@@ -2751,7 +2751,7 @@ Author: Dmitriy Yefremov
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<signal name="activate" handler="on_delete" swapped="no"/> <signal name="activate" handler="on_delete" object="services_tree_view" swapped="no"/>
</object> </object>
</child> </child>
</object> </object>