From 8dfd0011bb063f38e044645d44e886f75773fb79 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 22 Mar 2010 21:59:01 -0500 Subject: [PATCH] Random code cleanup --- src/libbottombar.py | 51 ++++++++++++++++++++++++++++----------------------- src/libspeichern.py | 22 ++++++++-------------- src/libview.py | 3 --- 3 files changed, 36 insertions(+), 40 deletions(-) diff --git a/src/libbottombar.py b/src/libbottombar.py index c19139b..f5698a8 100644 --- a/src/libbottombar.py +++ b/src/libbottombar.py @@ -21,7 +21,6 @@ Copyright (C) 2008 Christoph Würstle """ -import gobject import logging import gtk @@ -64,49 +63,52 @@ class Bottombar(gtk.VBox): @gtk_toolbox.log_exception(_moduleLogger) def new_item(self, widget = None, data1 = None, data2 = None): - dialog = gtk.Dialog(_("New item name:"), None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT)) - dialog.set_position(gtk.WIN_POS_CENTER) + dialog = gtk.Dialog( + _("New item name:"), + None, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT) + ) + entryKlasse = gtk.Entry() entryKlasse.set_text("") - dialog.vbox.pack_start(entryKlasse, True, True, 0) dialog.vbox.show_all() - #dialog.set_size_request(400, 300) - if dialog.run() == gtk.RESPONSE_ACCEPT: - #_moduleLogger.info("new category name "+entryKlasse.get_text()) - #self.view.liststorehandler.rename_category(entryKlasse.get_text()) self.view.liststorehandler.add_row(entryKlasse.get_text()) dialog.destroy() @gtk_toolbox.log_exception(_moduleLogger) def del_item(self, widget = None, data1 = None, data2 = None): path, col = self.view.treeview.get_cursor() - if path is not None: - mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, _("Delete current item?")) - response = mbox.run() - mbox.hide() - mbox.destroy() - if response == gtk.RESPONSE_YES: - self.view.del_active_row() - else: + if path is None: mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("No item selected!")) response = mbox.run() mbox.hide() mbox.destroy() + return + + mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, _("Delete current item?")) + response = mbox.run() + mbox.hide() + mbox.destroy() + if response == gtk.RESPONSE_YES: + self.view.del_active_row() def rename_category(self, widget = None, data1 = None, data2 = None): - dialog = gtk.Dialog(_("New category name:"), None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT)) + dialog = gtk.Dialog( + _("New category name:"), + None, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT) + ) - dialog.set_position(gtk.WIN_POS_CENTER) entryKlasse = gtk.Entry() entryKlasse.set_text(self.view.liststorehandler.selection.get_category()) - dialog.vbox.pack_start(entryKlasse, True, True, 0) dialog.vbox.show_all() - if dialog.run() == gtk.RESPONSE_ACCEPT: _moduleLogger.info("new category name "+entryKlasse.get_text()) self.view.liststorehandler.rename_category(entryKlasse.get_text()) @@ -115,16 +117,19 @@ class Bottombar(gtk.VBox): dialog.destroy() def rename_list(self, widget = None, data1 = None, data2 = None): - dialog = gtk.Dialog(_("New list name:"), None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT)) + dialog = gtk.Dialog( + _("New list name:"), + None, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT) + ) dialog.set_position(gtk.WIN_POS_CENTER) entryKlasse = gtk.Entry() entryKlasse.set_text(self.view.liststorehandler.selection.get_list()) - dialog.vbox.pack_start(entryKlasse, True, True, 0) dialog.vbox.show_all() - if dialog.run() == gtk.RESPONSE_ACCEPT: _moduleLogger.info("new list name "+entryKlasse.get_text()) self.view.liststorehandler.rename_list(entryKlasse.get_text()) diff --git a/src/libspeichern.py b/src/libspeichern.py index 4bb3c86..ebe815b 100644 --- a/src/libspeichern.py +++ b/src/libspeichern.py @@ -62,13 +62,11 @@ class Speichern(object): db = os.path.join(home_dir, "multilist.s3db") datum = time.strftime("%Y-%m-%d--", (time.localtime(time.time())))+str(int(time.time()))+"--" - if (os.path.exists(db))and(os.path.exists(os.path.dirname(db)+os.sep+"backup/")): + if os.path.exists(db) and os.path.exists(os.path.dirname(db)+os.sep+"backup"): try: shutil.copyfile(db, str(os.path.dirname(db))+os.sep+"backup"+os.sep+datum+os.path.basename(db)) - #_moduleLogger.debug(str(os.path.dirname(db))+os.sep+"backup"+os.sep+datum+os.path.basename(db)) except: _moduleLogger.info("Achtung Backup-Datei NICHT (!!!) angelegt!") - #print db, str(os.path.dirname(db))+os.sep+"backup"+os.sep+datum+os.path.basename(db) self.conn = sqlite3.connect(db) self.cur = self.conn.cursor() @@ -117,23 +115,21 @@ class Speichern(object): return default def speichereSQL(self, sql, tupel = None, commit = True, host = "self", log = True, pcdatum = None, rowid = ""): - #print "speichereSQL:", sql, tupel try: programSQLError = True - if (tupel == None): + if tupel is None: self.cur.execute(sql) else: self.cur.execute(sql, tupel) programSQLError = False - #print int(time.time()), sql, pickle.dumps(tupel), host - if (log == True): + if log: strtupel = [] - if (tupel is not None): + if tupel is not None: for t in tupel: strtupel.append(str(t)) - if pcdatum == None: + if pcdatum is None: pcdatum = int(time.time()) self.cur.execute("INSERT INTO logtable ( pcdatum, sql, param, host, rowid ) VALUES (?, ?, ?, ?, ?)", (pcdatum, sql, string.join(strtupel, " <> "), host, str(rowid) )) if commit: @@ -141,9 +137,8 @@ class Speichern(object): return True except: s = str(sys.exc_info()) - if (s.find(" already exists") == -1): - #if len(s)>0: - if (programSQLError == True): + if s.find(" already exists") == -1: + if programSQLError: _moduleLogger.error("speichereSQL-Exception "+str(sys.exc_info())+" "+str(sql)+" "+str(tupel)) else: _moduleLogger.error("speichereSQL-Exception in Logging!!!! :"+str(sys.exc_info())+" "+str(sql)+" "+str(tupel)) @@ -153,9 +148,8 @@ class Speichern(object): self.conn.commit() def ladeSQL(self, sql, tupel = None): - #print sql, tupel try: - if (tupel == None): + if tupel is None: self.cur.execute(sql) else: self.cur.execute(sql, tupel) diff --git a/src/libview.py b/src/libview.py index dea6bd3..afd5bc4 100644 --- a/src/libview.py +++ b/src/libview.py @@ -107,9 +107,6 @@ class View(gtk.VBox): row_iter = self.treeview.get_model().get_iter(path) self.liststorehandler.del_row(irow, row_iter) - def sort_func_function(self, model, iter1, iter2, data = None): - print "sorting" - def reload_view(self): # create the TreeView using liststore self.modelsort = gtk.TreeModelSort(self.liststorehandler.get_liststore()) -- 1.7.9.5