evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix return tuple in import_file_dict, fix text from autoimport to actually show up in autoimport window

Browse Source
This commit is contained in:
Eric Blade 2009-11-30 08:14:03 -05:00
parent fc20330f2b
commit 284b0c1f38
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pyfpdb/fpdb.py
View File

@ -115,7 +115,7 @@ class fpdb:
self.pages.append(new_page) self.pages.append(new_page)
self.tabs.append(event_box) self.tabs.append(event_box)
self.tab_names.append(new_tab_name) self.tab_names.append(new_tab_name)
#self.nb.append_page(new_page, gtk.Label(new_tab_name)) #self.nb.append_page(new_page, gtk.Label(new_tab_name))
self.nb.append_page(page, event_box) self.nb.append_page(page, event_box)
self.nb_tabs.append(new_tab_name) self.nb_tabs.append(new_tab_name)
@ -135,12 +135,12 @@ class fpdb:
self.nb.set_current_page(tab_no) self.nb.set_current_page(tab_no)
def create_custom_tab(self, text, nb): def create_custom_tab(self, text, nb):
#create a custom tab for notebook containing a #create a custom tab for notebook containing a
#label and a button with STOCK_ICON #label and a button with STOCK_ICON
eventBox = gtk.EventBox() eventBox = gtk.EventBox()
tabBox = gtk.HBox(False, 2) tabBox = gtk.HBox(False, 2)
tabLabel = gtk.Label(text) tabLabel = gtk.Label(text)
tabBox.pack_start(tabLabel, False) tabBox.pack_start(tabLabel, False)
eventBox.add(tabBox) eventBox.add(tabBox)
if nb.get_n_pages() > 0: if nb.get_n_pages() > 0:
@ -157,7 +157,7 @@ class fpdb:
return eventBox return eventBox
def add_icon_to_button(self, button): def add_icon_to_button(self, button):
iconBox = gtk.HBox(False, 0) iconBox = gtk.HBox(False, 0)
image = gtk.Image() image = gtk.Image()
image.set_from_stock(gtk.STOCK_CLOSE, gtk.ICON_SIZE_SMALL_TOOLBAR) image.set_from_stock(gtk.STOCK_CLOSE, gtk.ICON_SIZE_SMALL_TOOLBAR)
gtk.Button.set_relief(button, gtk.RELIEF_NONE) gtk.Button.set_relief(button, gtk.RELIEF_NONE)
@ -168,8 +168,8 @@ class fpdb:
iconBox.pack_start(image, True, False, 0) iconBox.pack_start(image, True, False, 0)
button.add(iconBox) button.add(iconBox)
iconBox.show() iconBox.show()
return return
# Remove a page from the notebook # Remove a page from the notebook
def remove_tab(self, button, data): def remove_tab(self, button, data):
(nb, text) = data (nb, text) = data
@ -183,7 +183,7 @@ class fpdb:
#print " removing page", page #print " removing page", page
del self.nb_tabs[page] del self.nb_tabs[page]
nb.remove_page(page) nb.remove_page(page)
# Need to refresh the widget -- # Need to refresh the widget --
# This forces the widget to redraw itself. # This forces the widget to redraw itself.
#nb.queue_draw_area(0,0,-1,-1) needed or not?? #nb.queue_draw_area(0,0,-1,-1) needed or not??
@ -752,7 +752,6 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
sys.stderr.write("fpdb starting ...") sys.stderr.write("fpdb starting ...")
def window_state_event_cb(self, window, event): def window_state_event_cb(self, window, event):
print "window_state_event", event
if event.changed_mask & gtk.gdk.WINDOW_STATE_ICONIFIED: if event.changed_mask & gtk.gdk.WINDOW_STATE_ICONIFIED:
# -20 = GWL_EXSTYLE can't find it in the pywin32 libs # -20 = GWL_EXSTYLE can't find it in the pywin32 libs
#bits = win32api.GetWindowLong(self.window.window.handle, -20) #bits = win32api.GetWindowLong(self.window.window.handle, -20)

11
pyfpdb/fpdb_import.py
View File

@ -359,10 +359,15 @@ class Importer:
# print "file",counter," updated", os.path.basename(file), stat_info.st_size, self.updatedsize[file], stat_info.st_mtime, self.updatedtime[file] # print "file",counter," updated", os.path.basename(file), stat_info.st_size, self.updatedsize[file], stat_info.st_mtime, self.updatedtime[file]
try: try:
if not os.path.isdir(file): if not os.path.isdir(file):
self.caller.addText("\n"+file) self.caller.addText("\n"+os.path.basename(file))
except KeyError: # TODO: What error happens here? except KeyError: # TODO: What error happens here?
pass pass
self.import_file_dict(self.database, file, self.filelist[file][0], self.filelist[file][1], None) (stored, duplicates, partial, errors, ttime) = self.import_file_dict(self.database, file, self.filelist[file][0], self.filelist[file][1], None)
try:
if not os.path.isdir(file):
self.caller.addText(" %d stored, %d duplicates, %d partial, %d errors (time = %d)" % (stored, duplicates, partial, errors, ttime))
except KeyError: # TODO: Again, what error happens here? fix when we find out ..
pass
self.updatedsize[file] = stat_info.st_size self.updatedsize[file] = stat_info.st_size
self.updatedtime[file] = time() self.updatedtime[file] = time()
else: else:
@ -393,7 +398,7 @@ class Importer:
if os.path.isdir(file): if os.path.isdir(file):
self.addToDirList[file] = [site] + [filter] self.addToDirList[file] = [site] + [filter]
return return (0,0,0,0,0)
conv = None conv = None
(stored, duplicates, partial, errors, ttime) = (0, 0, 0, 0, 0) (stored, duplicates, partial, errors, ttime) = (0, 0, 0, 0, 0)