gryf/pygtktalog
1
0
Fork 0
mirror of https://github.com/gryf/pygtktalog.git synced 2025-12-17 11:30:19 +01:00
Code Issues Projects Releases Wiki Activity

* Changed version to 1.0 RC2.

Browse Source 
* Bugfix in files removal. Controller should collect all file ids,
   otherwise it'll starts to remove wrong files, because in the meantime
   model removing items from liststore.
This commit is contained in:
gryf
2008-05-14 08:40:33 +00:00
parent 6709576aec
commit ea667cf03e
3 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@@ -1,4 +1,4 @@
pyGTKtalog 1.0 RC1 pyGTKtalog 1.0 RC2
================== ==================
pyGTKtalog is Linux/FreeBSD program for indexing CD/DVD or directories on pyGTKtalog is Linux/FreeBSD program for indexing CD/DVD or directories on

27
src/ctrls/c_main.py
View File

@@ -22,7 +22,7 @@
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
__version__ = "1.0 RC1" __version__ = "1.0 RC2"
LICENCE = \ LICENCE = \
""" """
GPL v2 GPL v2
@@ -749,18 +749,21 @@ class MainController(Controller):
return return
model = self.view['images'].get_model() model = self.view['images'].get_model()
ids = []
for path in list_of_paths: for path in list_of_paths:
iter = model.get_iter(path) iterator = model.get_iter(path)
id = model.get_value(iter, 0) ids.append(model.get_value(iterator, 0))
self.model.delete_image(id)
for fid in ids:
self.model.delete_image(fid)
# refresh files tree # refresh files tree
try: try:
path, column = self.view['files'].get_cursor() path, column = self.view['files'].get_cursor()
model = self.view['files'].get_model() model = self.view['files'].get_model()
iter = model.get_iter(path) iterator = model.get_iter(path)
id = model.get_value(iter, 0) fid = model.get_value(iterator, 0)
self.__get_item_info(id) self.__get_item_info(fid)
except: except:
pass pass
@@ -1137,7 +1140,7 @@ class MainController(Controller):
# remove from model # remove from model
path = model.get_path(selected_iter) path = model.get_path(selected_iter)
id = self.model.discs_tree.get_value(selected_iter, 0) fid = self.model.discs_tree.get_value(selected_iter, 0)
model.remove(selected_iter) model.remove(selected_iter)
selection.select_path(path) selection.select_path(path)
@@ -1148,7 +1151,7 @@ class MainController(Controller):
path = (row, ) path = (row, )
# delete from db # delete from db
self.model.delete(id) self.model.delete(fid)
# refresh files treeview # refresh files treeview
try: try:
@@ -1190,10 +1193,14 @@ class MainController(Controller):
d[1].append(zpath) d[1].append(zpath)
return False return False
ids = []
for p in list_of_paths: for p in list_of_paths:
val = model.get_value(model.get_iter(p), 0) val = model.get_value(model.get_iter(p), 0)
ids.append(val)
for fid in ids:
# delete from db # delete from db
self.model.delete(val) self.model.delete(fid)
try: try:
# try to select something # try to select something

14
src/ctrls/c_search.py
View File

@@ -307,17 +307,13 @@ class SearchController(Controller):
d[1].append(zpath) d[1].append(zpath)
return False return False
ids = []
for p in list_of_paths: for p in list_of_paths:
val = model.get_value(model.get_iter(p), 0) ids.append(model.get_value(model.get_iter(p), 0))
if model.get_value(model.get_iter(p), 4) == self.model.DIR:
# remove from disctree model aswell for fid in ids:
dpath = []
dmodel.foreach(foreach_searchtree, (val, dpath))
for dp in dpath:
dmodel.remove(dmodel.get_iter(dp))
# delete from db # delete from db
self.model.delete(val) self.model.delete(fid)
self.model.unsaved_project = True self.model.unsaved_project = True
found = self.model.search(self.search_string) found = self.model.search(self.search_string)