class Bottombar(gtk.HBox):
__gsignals__ = {
- 'changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,(gobject.TYPE_STRING,gobject.TYPE_STRING)),
- #'changedCategory': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,(gobject.TYPE_STRING,gobject.TYPE_STRING))
+ 'changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_STRING, gobject.TYPE_STRING)),
+ #'changedCategory': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_STRING, gobject.TYPE_STRING))
}
- 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))
+ 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)
- entryKlasse=gtk.Entry()
+ entryKlasse = gtk.Entry()
entryKlasse.set_text("")
dialog.vbox.pack_start(entryKlasse, True, True, 0)
dialog.vbox.show_all()
- #dialog.set_size_request(400,300)
+ #dialog.set_size_request(400, 300)
if dialog.run() == gtk.RESPONSE_ACCEPT:
#_moduleLogger.info("new category name "+entryKlasse.get_text())
self.view.liststorehandler.add_row(entryKlasse.get_text())
dialog.destroy()
- def del_item(self,widget=None,data1=None,data2=None):
+ def del_item(self, widget = None, data1 = None, data2 = None):
path, col = self.view.treeview.get_cursor()
- if path!=None:
- mbox=gtk.MessageDialog(None,gtk.DIALOG_MODAL,gtk.MESSAGE_QUESTION,gtk.BUTTONS_YES_NO,_("Delete current item?"))
- response=mbox.run()
+ 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:
+ if response == gtk.RESPONSE_YES:
self.view.del_active_row()
else:
- mbox=gtk.MessageDialog(None,gtk.DIALOG_MODAL,gtk.MESSAGE_ERROR,gtk.BUTTONS_OK,_("No item selected!"))
- response=mbox.run()
+ mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("No item selected!"))
+ response = mbox.run()
mbox.hide()
mbox.destroy()
- def checkout_items(self,widget=None,data1=None,data2=None):
+ def checkout_items(self, widget = None, data1 = None, data2 = None):
#self.view.del_active_row()
- mbox=gtk.MessageDialog(None,gtk.DIALOG_MODAL,gtk.MESSAGE_QUESTION,gtk.BUTTONS_YES_NO,(_("Really checkout all items?")))
- response=mbox.run()
+ mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO, (_("Really checkout all items?")))
+ response = mbox.run()
mbox.hide()
mbox.destroy()
- if response==gtk.RESPONSE_YES:
+ if response == gtk.RESPONSE_YES:
self.view.liststorehandler.checkout_rows()
- #n=len(self.view.liststorehandler.get_liststore())
+ #n = len(self.view.liststorehandler.get_liststore())
#for i in range(n):
# self.view.liststorehandler.checkout_rows()
# #print i
- def search_list(self,widget=None,data1=None,data2=None):
+ def search_list(self, widget = None, data1 = None, data2 = None):
self.view.liststorehandler.get_liststore(widget.get_text())
- 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))
+ 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.set_position(gtk.WIN_POS_CENTER)
- entryKlasse=gtk.Entry()
+ entryKlasse = gtk.Entry()
entryKlasse.set_text(self.view.liststorehandler.selection.get_category())
dialog.vbox.pack_start(entryKlasse, True, True, 0)
dialog.vbox.show_all()
- #dialog.set_size_request(400,300)
+ #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())
else:
- #print "Cancel",res
+ #print "Cancel", res
pass
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))
+ 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.set_position(gtk.WIN_POS_CENTER)
- entryKlasse=gtk.Entry()
+ entryKlasse = gtk.Entry()
entryKlasse.set_text(self.view.liststorehandler.selection.get_list())
dialog.vbox.pack_start(entryKlasse, True, True, 0)
dialog.vbox.show_all()
- #dialog.set_size_request(400,300)
+ #dialog.set_size_request(400, 300)
if dialog.run() == gtk.RESPONSE_ACCEPT:
_moduleLogger.info("new list name "+entryKlasse.get_text())
self.view.liststorehandler.rename_list(entryKlasse.get_text())
else:
- #print "Cancel",res
+ #print "Cancel", res
pass
dialog.destroy()
- def __init__(self,db,view,isHildon):
- gtk.HBox.__init__(self,homogeneous=False, spacing=3)
+ def __init__(self, db, view, isHildon):
+ gtk.HBox.__init__(self, homogeneous = False, spacing = 3)
- self.db=db
- self.isHildon=isHildon
- self.view=view
+ self.db = db
+ self.isHildon = isHildon
+ self.view = view
_moduleLogger.info("libBottomBar, init")
- button=gtk.Button(_("New item"))
- button.connect("clicked",self.new_item)
- self.pack_start(button, expand=False, fill=True, padding=0)
+ button = gtk.Button(_("New item"))
+ button.connect("clicked", self.new_item)
+ self.pack_start(button, expand = False, fill = True, padding = 0)
- label=gtk.Label(" ")
- self.pack_start(label, expand=True, fill=True, padding=0)
+ label = gtk.Label(" ")
+ self.pack_start(label, expand = True, fill = True, padding = 0)
- label=gtk.Label(_("Search:"))
- self.pack_start(label, expand=False, fill=True, padding=0)
- searchEntry=gtk.Entry()
- searchEntry.connect("changed",self.search_list)
- self.pack_start(searchEntry, expand=True, fill=True, padding=0)
+ label = gtk.Label(_("Search:"))
+ self.pack_start(label, expand = False, fill = True, padding = 0)
+ searchEntry = gtk.Entry()
+ searchEntry.connect("changed", self.search_list)
+ self.pack_start(searchEntry, expand = True, fill = True, padding = 0)
- label=gtk.Label(" ")
- self.pack_start(label, expand=True, fill=True, padding=0)
+ label = gtk.Label(" ")
+ self.pack_start(label, expand = True, fill = True, padding = 0)
- button=gtk.Button(_("Checkout all items"))
- button.connect("clicked",self.checkout_items)
- self.pack_start(button, expand=False, fill=True, padding=0)
+ button = gtk.Button(_("Checkout all items"))
+ button.connect("clicked", self.checkout_items)
+ self.pack_start(button, expand = False, fill = True, padding = 0)
- button=gtk.Button(_("Del item"))
- button.connect("clicked",self.del_item)
- self.pack_start(button, expand=False, fill=True, padding=0)
+ button = gtk.Button(_("Del item"))
+ button.connect("clicked", self.del_item)
+ self.pack_start(button, expand = False, fill = True, padding = 0)
class Liststorehandler(object):
def get_unitsstore(self):
- if (self.unitsstore==None):
- self.unitsstore=gtk.ListStore(str, str, str,str,str, str,str, str, str,str, str, str,str)
+ if (self.unitsstore == None):
+ self.unitsstore = gtk.ListStore(str, str, str, str, str, str, str, str, str, str, str, str, str)
self.unitsstore.clear()
#row(3) quantities
#row 4 units
#row 6 priority
- self.unitsstore.append(["-1","-1","","","","","","","","","","",""])
- self.unitsstore.append(["-1","-1","","1","g","","0","","","","","",""])
- self.unitsstore.append(["-1","-1","","2","kg","","1","","","","","",""])
- self.unitsstore.append(["-1","-1","","3","liter","","2","","","","","",""])
- self.unitsstore.append(["-1","-1","","4","packs","","3","","","","","",""])
- self.unitsstore.append(["-1","-1","","5","","","4","","","","","",""])
- self.unitsstore.append(["-1","-1","","6","","","5","","","","","",""])
- self.unitsstore.append(["-1","-1","","7","","","6","","","","","",""])
- self.unitsstore.append(["-1","-1","","8","","","7","","","","","",""])
- self.unitsstore.append(["-1","-1","","9","","","8","","","","","",""])
- self.unitsstore.append(["-1","-1","","","","","9","","","","","",""])
+ self.unitsstore.append(["-1", "-1", "", "", "", "", "", "", "", "", "", "", ""])
+ self.unitsstore.append(["-1", "-1", "", "1", "g", "", "0", "", "", "", "", "", ""])
+ self.unitsstore.append(["-1", "-1", "", "2", "kg", "", "1", "", "", "", "", "", ""])
+ self.unitsstore.append(["-1", "-1", "", "3", "liter", "", "2", "", "", "", "", "", ""])
+ self.unitsstore.append(["-1", "-1", "", "4", "packs", "", "3", "", "", "", "", "", ""])
+ self.unitsstore.append(["-1", "-1", "", "5", "", "", "4", "", "", "", "", "", ""])
+ self.unitsstore.append(["-1", "-1", "", "6", "", "", "5", "", "", "", "", "", ""])
+ self.unitsstore.append(["-1", "-1", "", "7", "", "", "6", "", "", "", "", "", ""])
+ self.unitsstore.append(["-1", "-1", "", "8", "", "", "7", "", "", "", "", "", ""])
+ self.unitsstore.append(["-1", "-1", "", "9", "", "", "8", "", "", "", "", "", ""])
+ self.unitsstore.append(["-1", "-1", "", "", "", "", "9", "", "", "", "", "", ""])
return self.unitsstore
- def get_liststore(self,titlesearch=""):
- if (self.liststore==None):
- self.liststore=gtk.ListStore(str, str, str,str,str, str,str, str, str,str, str, str,str)
+ def get_liststore(self, titlesearch = ""):
+ if (self.liststore == None):
+ self.liststore = gtk.ListStore(str, str, str, str, str, str, str, str, str, str, str, str, str)
self.liststore.clear()
- titlesearch=titlesearch+"%"
+ titlesearch = titlesearch+"%"
- if (self.selection.get_status()=="0"): #only 0 and 1 (active items)
- sql="SELECT uid,status,title,quantitiy,unit,price,priority,date,private,stores,note,custom1,custom2 FROM items WHERE list=? AND category LIKE ? AND status>=? AND title like ? ORDER BY category, status, title"
- rows=self.db.ladeSQL(sql,(self.selection.get_list(),self.selection.get_category(True),self.selection.get_status(),titlesearch))
+ if (self.selection.get_status() == "0"): #only 0 and 1 (active items)
+ sql = "SELECT uid, status, title, quantitiy, unit, price, priority, date, private, stores, note, custom1, custom2 FROM items WHERE list = ? AND category LIKE ? AND status> = ? AND title like ? ORDER BY category, status, title"
+ rows = self.db.ladeSQL(sql, (self.selection.get_list(), self.selection.get_category(True), self.selection.get_status(), titlesearch))
else:
- sql="SELECT uid,status,title,quantitiy,unit,price,priority,date,private,stores,note,custom1,custom2 FROM items WHERE list=? AND category LIKE ? AND title LIKE ? ORDER BY category, title ASC"
- rows=self.db.ladeSQL(sql,(self.selection.get_list(),self.selection.get_category(True),titlesearch))
+ sql = "SELECT uid, status, title, quantitiy, unit, price, priority, date, private, stores, note, custom1, custom2 FROM items WHERE list = ? AND category LIKE ? AND title LIKE ? ORDER BY category, title ASC"
+ rows = self.db.ladeSQL(sql, (self.selection.get_list(), self.selection.get_category(True), titlesearch))
#print rows
- if ((rows!=None)and(len(rows)>0)):
+ if ((rows is not None) and (len(rows) > 0)):
for row in rows:
- uid,status,title,quantitiy,unit,price,priority,date,private,stores,note,custom1,custom2 = row
- if unit==None:
+ uid, status, title, quantitiy, unit, price, priority, date, private, stores, note, custom1, custom2 = row
+ if unit == None:
pass
- #unit=""
- self.liststore.append([uid,status,title,quantitiy,unit,price,priority,date,private,stores,note,custom1,custom2])
+ #unit = ""
+ self.liststore.append([uid, status, title, quantitiy, unit, price, priority, date, private, stores, note, custom1, custom2])
#else:
- #self.liststore.append(["-1","-1",""," ","","","","","","","","",""])
+ #self.liststore.append(["-1", "-1", "", " ", "", "", "", "", "", "", "", "", ""])
#import uuid
- #self.liststore.append(["-1","-1","","","","","","","","","","",""])
+ #self.liststore.append(["-1", "-1", "", "", "", "", "", "", "", "", "", "", ""])
return self.liststore
def emptyValueExists(self):
for child in self.liststore:
- if child[2]=="":
+ if child[2] == "":
return True
return False
- def update_row(self,irow,icol,new_text):
+ def update_row(self, irow, icol, new_text):
#print "liststore 1"
#for x in self.liststore:
- # print x[0],x[2]
+ # print x[0], x[2]
- if (irow>-1)and(self.liststore[irow][0]!="-1")and(self.liststore[irow][0]!=None):
- sql = "UPDATE items SET "+self.collist[icol]+"=? WHERE uid=?"
- self.db.speichereSQL(sql,(new_text,self.liststore[irow][0]),rowid=self.liststore[irow][0])
+ if -1 < irow and self.liststore[irow][0] != "-1" and self.liststore[irow][0] is not None:
+ sql = "UPDATE items SET "+self.collist[icol]+" = ? WHERE uid = ?"
+ self.db.speichereSQL(sql, (new_text, self.liststore[irow][0]), rowid = self.liststore[irow][0])
_moduleLogger.info("Updated row: "+self.collist[icol]+" new text "+new_text+" Titel: "+str(self.liststore[irow][2])+" with uid "+str(self.liststore[irow][0]))
- self.liststore[irow][icol]=new_text
+ self.liststore[irow][icol] = new_text
else:
_moduleLogger.warning("update_row: row does not exist")
return
- #if (self.emptyValueExists()==True)and(icol<2):
+ #if (self.emptyValueExists() == True)and(icol<2):
# #print "letzter Eintrag ohne inhalt"
# return
#print "liststore 2"
#for x in self.liststore:
- # print x[0],x[2]
+ # print x[0], x[2]
def checkout_rows(self):
- sql = "UPDATE items SET status=? WHERE list=? AND category LIKE ? AND status=?"
- self.db.speichereSQL(sql,("-1",self.selection.get_list(),self.selection.get_category(True),"1"))
+ sql = "UPDATE items SET status = ? WHERE list = ? AND category LIKE ? AND status = ?"
+ self.db.speichereSQL(sql, ("-1", self.selection.get_list(), self.selection.get_category(True), "1"))
for i in range(len(self.liststore)):
- if self.liststore[i][1]=="1":
- self.liststore[i][1]="-1"
+ if self.liststore[i][1] == "1":
+ self.liststore[i][1] = "-1"
- def add_row(self,title=""):
- #self.update_row(-1,1,"-1")
+ def add_row(self, title = ""):
+ #self.update_row(-1, 1, "-1")
#for x in self.liststore:
- # print x[0],x[2]
- status=self.selection.get_status()
+ # print x[0], x[2]
+ status = self.selection.get_status()
import uuid
- uid=str(uuid.uuid4())
- sql = "INSERT INTO items (uid,list,category,status, title) VALUES (?,?,?,?,?)"
- self.db.speichereSQL(sql,(uid,self.selection.get_list(),self.selection.get_category(),status,title),rowid=uid)
+ uid = str(uuid.uuid4())
+ sql = "INSERT INTO items (uid, list, category, status, title) VALUES (?, ?, ?, ?, ?)"
+ self.db.speichereSQL(sql, (uid, self.selection.get_list(), self.selection.get_category(), status, title), rowid = uid)
_moduleLogger.info("Insertet row: status = "+status+" with uid "+str(uid))
- #self.liststore[irow][0]=str(uuid.uuid4())
+ #self.liststore[irow][0] = str(uuid.uuid4())
- self.liststore.append([uid,status,title," ","","","","","","","","",""])
+ self.liststore.append([uid, status, title, " ", "", "", "", "", "", "", "", "", ""])
self.selection.comboLists_check_for_update()
# if (irow>-1):
- # self.liststore[irow][icol]=new_text
- # self.liststore[irow][0]=uid
+ # self.liststore[irow][icol] = new_text
+ # self.liststore[irow][0] = uid
# else:
- # self.liststore.append([uid,"-1",""," ","","","","","","","","",""])
- #print "xy",self.liststore[len(self.liststore)-1][0]
+ # self.liststore.append([uid, "-1", "", " ", "", "", "", "", "", "", "", "", ""])
+ #print "xy", self.liststore[len(self.liststore)-1][0]
#Check if a new list/category is opened
# self.selection.comboLists_check_for_update()
- def del_row(self,irow,row_iter):
- uid=self.liststore[irow][0]
+ def del_row(self, irow, row_iter):
+ uid = self.liststore[irow][0]
self.liststore.remove(row_iter)
- sql = "DELETE FROM items WHERE uid=?"
- self.db.speichereSQL(sql,(uid,))
+ sql = "DELETE FROM items WHERE uid = ?"
+ self.db.speichereSQL(sql, (uid, ))
- def get_colname(self,i):
- if i<len(self.collist):
+ def get_colname(self, i):
+ if i < len(self.collist):
return self.collist[i]
else:
return None
def get_colcount(self):
return len(self.collist)
- def rename_category(self,new_name):
- sql = "UPDATE items SET category=? WHERE list=? AND category=?"
- self.db.speichereSQL(sql,(new_name,self.selection.get_list(),self.selection.get_category()))
+ def rename_category(self, new_name):
+ sql = "UPDATE items SET category = ? WHERE list = ? AND category = ?"
+ self.db.speichereSQL(sql, (new_name, self.selection.get_list(), self.selection.get_category()))
self.selection.comboList_changed()
self.selection.set_category(new_name)
- def rename_list(self,new_name):
- sql = "UPDATE items SET list=? WHERE list=?"
- self.db.speichereSQL(sql,(new_name,self.selection.get_list(),))
+ def rename_list(self, new_name):
+ sql = "UPDATE items SET list = ? WHERE list = ?"
+ self.db.speichereSQL(sql, (new_name, self.selection.get_list(), ))
self.selection.load()
self.selection.set_list(new_name)
- #def update_category(self,widget=None,data=None,data2=None,data3=None):
+ #def update_category(self, widget = None, data = None, data2 = None, data3 = None):
# self.get_liststore()
- def update_list(self,widget=None,data=None,data2=None,data3=None):
+ def update_list(self, widget = None, data = None, data2 = None, data3 = None):
self.get_liststore()
- def __init__(self,db,selection):
- self.db=db
- self.liststore=None
- self.unitsstore=None
- self.selection=selection
- self.collist=("uid","status","title","quantitiy","unit","price","priority","date","private","stores","note","custom1","custom2")
+ def __init__(self, db, selection):
+ self.db = db
+ self.liststore = None
+ self.unitsstore = None
+ self.selection = selection
+ self.collist = ("uid", "status", "title", "quantitiy", "unit", "price", "priority", "date", "private", "stores", "note", "custom1", "custom2")
- #sql="DROP TABLE items"
+ #sql = "DROP TABLE items"
#self.db.speichereSQL(sql)
sql = "CREATE TABLE items (uid TEXT, list TEXT, category TEXT, status TEXT, title TEXT, quantitiy TEXT, unit TEXT, price TEXT, priority TEXT, date TEXT, pcdate TEXT, private TEXT, stores TEXT, note TEXT, custom1 TEXT, custom2 TEXT)"
self.db.speichereSQL(sql)
self.selection.load()
- self.selection.connect("changed",self.update_list)
- #self.selection.connect("changedCategory",self.update_category)
+ self.selection.connect("changed", self.update_list)
+ #self.selection.connect("changedCategory", self.update_category)
"""
- sql = "INSERT INTO items (uid,list,category,title) VALUES (?,?,?,?)"
+ sql = "INSERT INTO items (uid, list, category, title) VALUES (?, ?, ?, ?)"
import uuid
- self.db.speichereSQL(sql,(str(uuid.uuid4()),"default","default","atitel1"))
- self.db.speichereSQL(sql,(str(uuid.uuid4()),"default","default","btitel2"))
- self.db.speichereSQL(sql,(str(uuid.uuid4()),"default","default","ctitel3"))
+ self.db.speichereSQL(sql, (str(uuid.uuid4()), "default", "default", "atitel1"))
+ self.db.speichereSQL(sql, (str(uuid.uuid4()), "default", "default", "btitel2"))
+ self.db.speichereSQL(sql, (str(uuid.uuid4()), "default", "default", "ctitel3"))
print "inserted"
"""
class Selection(gtk.HBox):
__gsignals__ = {
- 'changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,(gobject.TYPE_STRING,gobject.TYPE_STRING)),
- #'changedCategory': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,(gobject.TYPE_STRING,gobject.TYPE_STRING))
+ 'changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_STRING, gobject.TYPE_STRING)),
+ #'changedCategory': (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_STRING, gobject.TYPE_STRING))
}
def load(self):
- model=self.comboList.get_model()
+ model = self.comboList.get_model()
model.clear()
#self.comboList.remove(0)
- sql="SELECT DISTINCT list FROM items ORDER BY list"
- rows=self.db.ladeSQL(sql)
- if ((rows!=None)and(len(rows)>0)):
+ sql = "SELECT DISTINCT list FROM items ORDER BY list"
+ rows = self.db.ladeSQL(sql)
+ if ((rows is not None)and(len(rows)>0)):
for row in rows:
self.comboList.append_text(row[0])
else:
self.comboList.append_text("default")
- s=self.db.ladeDirekt("comboListText")
- if s!="":
+ s = self.db.ladeDirekt("comboListText")
+ if s != "":
self.comboList.get_child().set_text(s)
else:
self.comboList.set_active(0)
- def comboList_changed(self, widget=None, data=None):
+ def comboList_changed(self, widget = None, data = None):
#self.comboCategory.set_model(None)
#print "reload categories"
while len(self.comboCategory.get_model())>0:
self.comboCategory.remove_text(0)
- sql="SELECT DISTINCT category FROM items WHERE list=? ORDER BY category"
- rows=self.db.ladeSQL(sql,(self.get_list(),))
+ sql = "SELECT DISTINCT category FROM items WHERE list = ? ORDER BY category"
+ rows = self.db.ladeSQL(sql, (self.get_list(), ))
self.comboCategory.append_text(_("all"))
- if ((rows!=None)and(len(rows)>0)):
+ if ((rows is not None)and(len(rows)>0)):
for row in rows:
- if (row[0]!=_("all")):
+ if (row[0] != _("all")):
self.comboCategory.append_text(row[0])
- s=self.db.ladeDirekt("comboCategoryText"+self.comboList.get_child().get_text())
+ s = self.db.ladeDirekt("comboCategoryText"+self.comboList.get_child().get_text())
if len(s)>0:
self.comboCategory.get_child().set_text(s)
else:
self.comboCategory.set_active(0)
- self.emit("changed","list","")
- self.db.speichereDirekt("comboListText",self.comboList.get_child().get_text())
+ self.emit("changed", "list", "")
+ self.db.speichereDirekt("comboListText", self.comboList.get_child().get_text())
- def comboCategory_changed(self, widget=None, data=None):
+ def comboCategory_changed(self, widget = None, data = None):
#_moduleLogger.info("Klasse geaendert zu ")
#self.hauptRegister.set_current_page(0)
- self.emit("changed","category","")
+ self.emit("changed", "category", "")
if self.comboCategory.get_active()>-1:
- self.db.speichereDirekt("comboCategoryText"+self.comboList.get_child().get_text(),self.comboCategory.get_child().get_text())
+ self.db.speichereDirekt("comboCategoryText"+self.comboList.get_child().get_text(), self.comboCategory.get_child().get_text())
- def radioActive_changed(self, widget, data=None):
- self.emit("changed","radio","")
+ def radioActive_changed(self, widget, data = None):
+ self.emit("changed", "radio", "")
def comboLists_check_for_update(self):
- if self.comboCategory.get_active()==-1:
- model=self.comboCategory.get_model()
- found=False
- cat=self.get_category()
+ if self.comboCategory.get_active() == -1:
+ model = self.comboCategory.get_model()
+ found = False
+ cat = self.get_category()
for x in model:
- if x[0]==cat:
- found=True
- if found==False:
+ if x[0] == cat:
+ found = True
+ if found == False:
self.comboCategory.append_text(self.get_category())
self.comboCategory.set_active(len(self.comboCategory.get_model())-1)
- if self.comboList.get_active()==-1:
- model=self.comboList.get_model()
- found=False
- list=self.get_list()
+ if self.comboList.get_active() == -1:
+ model = self.comboList.get_model()
+ found = False
+ list = self.get_list()
for x in model:
- if x[0]==list:
- found=True
- if found==False:
+ if x[0] == list:
+ found = True
+ if found == False:
self.comboList.append_text(self.get_list())
self.comboList.set_active(len(self.comboList.get_model())-1)
def getIsHildon(self):
return self.isHildon
- def get_category(self,select=False):
- s=self.comboCategory.get_child().get_text()
- if s==_("all"):
- if (select==False):
+ def get_category(self, select = False):
+ s = self.comboCategory.get_child().get_text()
+ if s == _("all"):
+ if (select == False):
return "undefined"
else:
return "%"
else:
return s
- def set_category(self,category):
+ def set_category(self, category):
self.comboCategory.get_child().set_text(category)
- def set_list(self,listname):
+ def set_list(self, listname):
self.comboList.get_child().set_text(listname)
def get_list(self):
def get_status(self):
#return self.comboCategory.get_child().get_text()
- if self.radio_all.get_active()==True:
+ if self.radio_all.get_active() == True:
return "-1"
else:
return "0"
- def __init__(self,db,isHildon):
- gtk.HBox.__init__(self,homogeneous=False, spacing=3)
+ def __init__(self, db, isHildon):
+ gtk.HBox.__init__(self, homogeneous = False, spacing = 3)
- self.db=db
- self.isHildon=isHildon
+ self.db = db
+ self.isHildon = isHildon
_moduleLogger.info("libSelection, init")
- label=gtk.Label(_("List:"))
- self.pack_start(label, expand=False, fill=True, padding=0)
+ label = gtk.Label(_("List:"))
+ self.pack_start(label, expand = False, fill = True, padding = 0)
self.comboList = gtk.combo_box_entry_new_text()
- self.comboList.set_size_request(180,-1)
- self.pack_start(self.comboList, expand=False, fill=True, padding=0)
+ self.comboList.set_size_request(180, -1)
+ self.pack_start(self.comboList, expand = False, fill = True, padding = 0)
- label=gtk.Label(_(" Category:"))
- self.pack_start(label, expand=False, fill=True, padding=0)
+ label = gtk.Label(_(" Category:"))
+ self.pack_start(label, expand = False, fill = True, padding = 0)
self.comboCategory = gtk.combo_box_entry_new_text()
- self.comboCategory.set_size_request(180,-1)
- self.pack_start(self.comboCategory, expand=False, fill=True, padding=0)
+ self.comboCategory.set_size_request(180, -1)
+ self.pack_start(self.comboCategory, expand = False, fill = True, padding = 0)
self.comboList.connect("changed", self.comboList_changed, None)
self.comboCategory.connect("changed", self.comboCategory_changed, None)
- label=gtk.Label(_(" View:"))
- self.pack_start(label, expand=False, fill=True, padding=0)
+ label = gtk.Label(_(" View:"))
+ self.pack_start(label, expand = False, fill = True, padding = 0)
- self.radio_all=gtk.RadioButton(group=None, label=_("All"), use_underline=True)
- self.pack_start(self.radio_all, expand=False, fill=True, padding=0)
- self.radio_active=gtk.RadioButton(group=self.radio_all, label=_("Active"), use_underline=True)
- self.pack_start(self.radio_active, expand=False, fill=True, padding=0)
- self.radio_all.connect("toggled",self.radioActive_changed, None)
+ self.radio_all = gtk.RadioButton(group = None, label = _("All"), use_underline = True)
+ self.pack_start(self.radio_all, expand = False, fill = True, padding = 0)
+ self.radio_active = gtk.RadioButton(group = self.radio_all, label = _("Active"), use_underline = True)
+ self.pack_start(self.radio_active, expand = False, fill = True, padding = 0)
+ self.radio_all.connect("toggled", self.radioActive_changed, None)
def __init__(self):
home_dir = os.path.expanduser('~')
- filename=os.path.join(home_dir, ".multilist.dat")
+ filename = os.path.join(home_dir, ".multilist.dat")
self.d = shelve.open(filename)
self.openDB()
def __del__(self):
self.close()
- def speichereDirekt(self,schluessel,daten):
- self.d[schluessel]=daten
+ def speichereDirekt(self, schluessel, daten):
+ self.d[schluessel] = daten
_moduleLogger.info("speichereDirekt "+str(schluessel)+" "+str(daten)+" lesen: "+str(self.d[schluessel]))
- def ladeDirekt(self,schluessel,default=""):
- #print "ladeDirekt",schluessel, "Schluessel vorhanden",self.d.has_key(schluessel)
- if (self.d.has_key(schluessel)==True):
- data=self.d[schluessel]
+ def ladeDirekt(self, schluessel, default = ""):
+ #print "ladeDirekt", schluessel, "Schluessel vorhanden", self.d.has_key(schluessel)
+ if (self.d.has_key(schluessel) == True):
+ data = self.d[schluessel]
#print data
return data
else:
return default
- def speichereSQL(self,sql,tupel=None,commit=True,host="self",log=True,pcdatum=None,rowid=""):
- #print "speichereSQL:",sql,tupel
+ 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):
+ programSQLError = True
+ if (tupel == None):
self.cur.execute(sql)
else:
- self.cur.execute(sql,tupel)
- programSQLError=False
+ self.cur.execute(sql, tupel)
+ programSQLError = False
#print int(time.time()), sql, pickle.dumps(tupel), host
- if (log==True):
- strtupel=[]
- if (tupel!=None):
+ if (log == True):
+ strtupel = []
+ if (tupel is not None):
for t in tupel:
strtupel.append(str(t))
- if pcdatum==None: pcdatum=int(time.time())
- self.cur.execute("INSERT INTO logtable ( pcdatum,sql,param,host,rowid ) VALUES (?,?,?,?,?)",(pcdatum, sql, string.join(strtupel," <<Tren-ner>> "), host,str(rowid) ))
- if (commit==True):
+ if pcdatum == None:
+ pcdatum = int(time.time())
+ self.cur.execute("INSERT INTO logtable ( pcdatum, sql, param, host, rowid ) VALUES (?, ?, ?, ?, ?)", (pcdatum, sql, string.join(strtupel, " <<Tren-ner>> "), host, str(rowid) ))
+ if commit:
self.conn.commit()
return True
except:
- s=str(sys.exc_info())
- if (s.find(" already exists")==-1):
+ s = str(sys.exc_info())
+ if (s.find(" already exists") == -1):
#if len(s)>0:
- if (programSQLError==True):
+ if (programSQLError == True):
_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))
def commitSQL(self):
self.conn.commit()
- def ladeSQL(self,sql,tupel=None):
- #print sql,tupel
+ def ladeSQL(self, sql, tupel = None):
+ #print sql, tupel
try:
- if (tupel==None):
+ if (tupel == None):
self.cur.execute(sql)
else:
- self.cur.execute(sql,tupel)
+ self.cur.execute(sql, tupel)
return self.cur.fetchall()
except:
_moduleLogger.error("ladeSQL-Exception "+str(sys.exc_info())+" "+str(sql)+" "+str(tupel))
return ()
- def ladeHistory(self,sql_condition,param_condition):
- sql="SELECT * FROM logtable WHERE sql LIKE '%"+str(sql_condition)+"%' AND param LIKE '%"+str(param_condition)+"%'"
- rows=self.ladeSQL(sql)
- #print rows
- i=0
- erg=[]
- while i<len(rows):
- datum=time.strftime("%d.%m.%y %H:%M:%S", (time.localtime(rows[i][1])))
- erg.append([rows[i][1],datum,rows[i][2],rows[i][3],rows[i][3].split(" <<Tren-ner>> ")])
- #pcdatum #datum #sql # Param_org #param
+ def ladeHistory(self, sql_condition, param_condition):
+ sql = "SELECT * FROM logtable WHERE sql LIKE '%"+str(sql_condition)+"%' AND param LIKE '%"+str(param_condition)+"%'"
+ rows = self.ladeSQL(sql)
- i+=1
+ erg = []
+ for row in rows:
+ datum = time.strftime("%d.%m.%y %H:%M:%S", (time.localtime(row[1])))
+ erg.append([row[1], datum, row[2], row[3], row[3].split(" <<Tren-ner>> ")])
return erg
- def delHistory(self,sql_condition,param_condition,exceptTheLastXSeconds=0):
- pcdatum=int(time.time())-exceptTheLastXSeconds
- sql="DELETE FROM logtable WHERE sql LIKE '%"+str(sql_condition)+"%' AND param LIKE '%"+str(param_condition)+"%' AND pcdatum<?"
- self.speichereSQL(sql,(pcdatum,))
+ def delHistory(self, sql_condition, param_condition, exceptTheLastXSeconds = 0):
+ pcdatum = int(time.time())-exceptTheLastXSeconds
+ sql = "DELETE FROM logtable WHERE sql LIKE '%"+str(sql_condition)+"%' AND param LIKE '%"+str(param_condition)+"%' AND pcdatum<?"
+ self.speichereSQL(sql, (pcdatum, ))
- def delHistoryWithRowID(self,rowid,sql_condition=" ",exceptTheLastXSeconds=0):
- pcdatum=int(time.time())-exceptTheLastXSeconds
- sql="DELETE FROM logtable WHERE rowid=? AND pcdatum<? AND sql LIKE '%"+str(sql_condition)+"%'"
- self.speichereSQL(sql,(rowid,pcdatum,))
+ def delHistoryWithRowID(self, rowid, sql_condition = " ", exceptTheLastXSeconds = 0):
+ pcdatum = int(time.time())-exceptTheLastXSeconds
+ sql = "DELETE FROM logtable WHERE rowid = ? AND pcdatum<? AND sql LIKE '%"+str(sql_condition)+"%'"
+ self.speichereSQL(sql, (rowid, pcdatum, ))
def openDB(self):
try:
except:
pass
- db=self.ladeDirekt("datenbank")
- if db=="":
+ db = self.ladeDirekt("datenbank")
+ if db == "":
home_dir = os.path.expanduser('~')
- db=os.path.join(home_dir, "multilist.s3db")
+ db = os.path.join(home_dir, "multilist.s3db")
- datum=time.strftime("%Y-%m-%d--", (time.localtime(time.time())))+str(int(time.time()))+"--"
+ 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/")):
try:
- shutil.copyfile(db,str(os.path.dirname(db))+os.sep+"backup"+os.sep+datum+os.path.basename(db))
+ 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)
+ #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()
try:
- sql="CREATE TABLE logtable (id INTEGER PRIMARY KEY AUTOINCREMENT, pcdatum INTEGER ,sql TEXT, param TEXT, host TEXT, rowid TEXT)"
+ sql = "CREATE TABLE logtable (id INTEGER PRIMARY KEY AUTOINCREMENT, pcdatum INTEGER , sql TEXT, param TEXT, host TEXT, rowid TEXT)"
self.cur.execute(sql)
self.conn.commit()
except:
#Add rowid line (not in old versions included)
try:
- sql="ALTER TABLE logtable ADD rowid TEXT"
+ sql = "ALTER TABLE logtable ADD rowid TEXT"
self.cur.execute(sql)
self.conn.commit()
except:
class ProgressDialog(gtk.Dialog):
- def __init__(self,title=_("Sync process"), parent=None):
- gtk.Dialog.__init__(self,title,parent,gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,())
+ def __init__(self, title = _("Sync process"), parent = None):
+ gtk.Dialog.__init__(self, title, parent, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, ())
_moduleLogger.info("ProgressDialog, init")
- label=gtk.Label(_("Sync process running...please wait"))
+ label = gtk.Label(_("Sync process running...please wait"))
self.vbox.pack_start(label, True, True, 0)
- label=gtk.Label(_("(this can take some minutes)"))
+ label = gtk.Label(_("(this can take some minutes)"))
self.vbox.pack_start(label, True, True, 0)
- #self.progressbar=gtk.ProgressBar()
+ #self.progressbar = gtk.ProgressBar()
#self.vbox.pack_start(self.progressbar, True, True, 0)
#self.set_keep_above(True)
class Sync(gtk.VBox):
__gsignals__ = {
- 'syncFinished' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,(gobject.TYPE_STRING,)),
- 'syncBeforeStart' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,(gobject.TYPE_STRING,)),
+ 'syncFinished' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_STRING, )),
+ 'syncBeforeStart' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_STRING, )),
}
- def __init__(self,db,parentwindow,port):
- gtk.VBox.__init__(self,homogeneous=False, spacing=0)
+ def __init__(self, db, parentwindow, port):
+ gtk.VBox.__init__(self, homogeneous = False, spacing = 0)
_moduleLogger.info("Sync, init")
- self.db=db
- self.progress=None
- self.server=None
- self.port=int(port)
- self.parentwindow=parentwindow
- self.concernedRows=None
+ self.db = db
+ self.progress = None
+ self.server = None
+ self.port = int(port)
+ self.parentwindow = parentwindow
+ self.concernedRows = None
#print "Sync, 2"
#sql = "DROP TABLE sync"
- #self.db.speichereSQL(sql,log=False)
+ #self.db.speichereSQL(sql, log = False)
sql = "CREATE TABLE sync (id INTEGER PRIMARY KEY, syncpartner TEXT, uuid TEXT, pcdatum INTEGER)"
- self.db.speichereSQL(sql,log=False)
+ self.db.speichereSQL(sql, log = False)
#print "Sync, 3"
- sql="SELECT uuid,pcdatum FROM sync WHERE syncpartner=?"
- rows=self.db.ladeSQL(sql,("self",)) #Eigene Id feststellen
+ sql = "SELECT uuid, pcdatum FROM sync WHERE syncpartner = ?"
+ rows = self.db.ladeSQL(sql, ("self", )) #Eigene Id feststellen
#print "Sync, 3a"
- if (rows==None)or(len(rows)!=1):
- sql="DELETE FROM sync WHERE syncpartner=?"
- self.db.speichereSQL(sql,("self",),log=False)
+ if (rows == None)or(len(rows) != 1):
+ sql = "DELETE FROM sync WHERE syncpartner = ?"
+ self.db.speichereSQL(sql, ("self", ), log = False)
- #uuid1=uuid()
+ #uuid1 = uuid()
#print "Sync, 3b"
#print "Sync, 3bb"
- self.sync_uuid=str(uuid.uuid4())
- sql="INSERT INTO sync (syncpartner,uuid,pcdatum) VALUES (?,?,?)"
- self.db.speichereSQL(sql,("self",str(self.sync_uuid),int(time.time())),log=False)
+ self.sync_uuid = str(uuid.uuid4())
+ sql = "INSERT INTO sync (syncpartner, uuid, pcdatum) VALUES (?, ?, ?)"
+ self.db.speichereSQL(sql, ("self", str(self.sync_uuid), int(time.time())), log = False)
#print "Sync, 3c"
else:
- sync_uuid,pcdatum = rows[0]
- self.sync_uuid=sync_uuid
+ sync_uuid, pcdatum = rows[0]
+ self.sync_uuid = sync_uuid
#print "x1"
#print "Sync, 4"
- frame=gtk.Frame(_("Local SyncServer (port ")+str(self.port)+")")
- self.comboIP=gtk.combo_box_entry_new_text()
+ frame = gtk.Frame(_("Local SyncServer (port ")+str(self.port)+")")
+ self.comboIP = gtk.combo_box_entry_new_text()
self.comboIP.append_text("") #self.get_ip_address("eth0"))
#self.comboIP.append_text(self.get_ip_address("eth1")) #fixme
#self.comboIP.append_text(self.get_ip_address("eth2"))
#print "Sync, 4e"
frame.add(self.comboIP)
- serverbutton=gtk.ToggleButton(_("Start SyncServer"))
- serverbutton.connect("clicked",self.startServer,(None,))
- self.pack_start(frame, expand=False, fill=True, padding=1)
- self.pack_start(serverbutton, expand=False, fill=True, padding=1)
- self.syncServerStatusLabel=gtk.Label(_("Syncserver not running"))
- self.pack_start(self.syncServerStatusLabel, expand=False, fill=True, padding=1)
-
- frame=gtk.Frame(_("RemoteSync-Server (Port ")+str(self.port)+")")
- self.comboRemoteIP=gtk.combo_box_entry_new_text()
+ serverbutton = gtk.ToggleButton(_("Start SyncServer"))
+ serverbutton.connect("clicked", self.startServer, (None, ))
+ self.pack_start(frame, expand = False, fill = True, padding = 1)
+ self.pack_start(serverbutton, expand = False, fill = True, padding = 1)
+ self.syncServerStatusLabel = gtk.Label(_("Syncserver not running"))
+ self.pack_start(self.syncServerStatusLabel, expand = False, fill = True, padding = 1)
+
+ frame = gtk.Frame(_("RemoteSync-Server (Port ")+str(self.port)+")")
+ self.comboRemoteIP = gtk.combo_box_entry_new_text()
self.comboRemoteIP.append_text("192.168.0.?")
self.comboRemoteIP.append_text("192.168.1.?")
self.comboRemoteIP.append_text("192.168.176.?")
frame.add(self.comboRemoteIP)
- syncbutton=gtk.Button(_("Connect to remote SyncServer"))
- syncbutton.connect("clicked",self.syncButton,(None,))
- self.pack_start(frame, expand=False, fill=True, padding=1)
- self.pack_start(syncbutton, expand=False, fill=True, padding=1)
- self.syncStatusLabel=gtk.Label(_("no sync process (at the moment)"))
- self.pack_start(self.syncStatusLabel, expand=False, fill=True, padding=1)
+ syncbutton = gtk.Button(_("Connect to remote SyncServer"))
+ syncbutton.connect("clicked", self.syncButton, (None, ))
+ self.pack_start(frame, expand = False, fill = True, padding = 1)
+ self.pack_start(syncbutton, expand = False, fill = True, padding = 1)
+ self.syncStatusLabel = gtk.Label(_("no sync process (at the moment)"))
+ self.pack_start(self.syncStatusLabel, expand = False, fill = True, padding = 1)
#self.comboRemoteIP.set_text_column("Test")
self.comboRemoteIP.get_child().set_text(self.db.ladeDirekt("syncRemoteIP"))
self.comboIP.get_child().set_text(self.db.ladeDirekt("syncServerIP"))
#load
- if (self.db.ladeDirekt("startSyncServer",False)==True):
+ if (self.db.ladeDirekt("startSyncServer", False) == True):
serverbutton.set_active(True)
- def changeSyncStatus(self,active,title):
+ def changeSyncStatus(self, active, title):
self.syncStatusLabel.set_text(title)
- if active==True:
- if self.progress==None:
- self.progress=ProgressDialog(parent=self.parentwindow)
- self.emit("syncBeforeStart","syncBeforeStart")
+ if active == True:
+ if self.progress == None:
+ self.progress = ProgressDialog(parent = self.parentwindow)
+ self.emit("syncBeforeStart", "syncBeforeStart")
else:
- if self.progress!=None:
+ if self.progress is not None:
self.progress.hide()
self.progress.destroy()
- self.progress=None
- self.emit("syncFinished","syncFinished")
+ self.progress = None
+ self.emit("syncFinished", "syncFinished")
def pulse(self):
- if self.progress!=None:
+ if self.progress is not None:
self.progress.pulse()
- #if self.server!=None:
+ #if self.server is not None:
# self.server.pulse()
def getUeberblickBox(self):
- frame=gtk.Frame(_("Query"))
+ frame = gtk.Frame(_("Query"))
return frame
def handleRPC(self):
try:
- if (self.rpcserver==None): return False
+ if self.rpcserver is None:
+ return False
except:
return False
- while (len(self.poll.poll(0))>0):
- self.rpcserver.handle_request()
+ while 0 < len(self.poll.poll(0)):
+ self.rpcserver.hande_request()
return True
- def get_ip_address(self,ifname):
+ def get_ip_address(self, ifname):
return socket.gethostbyname(socket.gethostname())
#try:
# s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
- # ip=socket.inet_ntoa(fcntl.ioctl(s.fileno(),0x8915,struct.pack('256s', ifname[:15]))[20:24])
+ # ip = socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, struct.pack('256s', ifname[:15]))[20:24])
# s.close()
#except:
- # ip=socket.gethostbyname(socket.gethostname())
+ # ip = socket.gethostbyname(socket.gethostname())
# s.close()
#return ip FixME
- def getLastSyncDate(self,sync_uuid):
- sql="SELECT syncpartner,pcdatum FROM sync WHERE uuid=?"
- rows=self.db.ladeSQL(sql,(sync_uuid,))
- if (rows!=None)and(len(rows)==1):
- syncpartner,pcdatum = rows[0]
+ def getLastSyncDate(self, sync_uuid):
+ sql = "SELECT syncpartner, pcdatum FROM sync WHERE uuid = ?"
+ rows = self.db.ladeSQL(sql, (sync_uuid, ))
+ if (rows is not None)and(len(rows) == 1):
+ syncpartner, pcdatum = rows[0]
else:
- pcdatum=-1
+ pcdatum = -1
_moduleLogger.info("LastSyncDatum: "+str(pcdatum)+" Jetzt "+str(int(time.time())))
return pcdatum
- def check4commit(self,newSQL,lastdate):
+ def check4commit(self, newSQL, lastdate):
_moduleLogger.info("check4commit 1")
- if self.concernedRows==None:
+ if self.concernedRows == None:
_moduleLogger.info("check4commit Updatung concernedRows")
- sql="SELECT pcdatum,rowid FROM logtable WHERE pcdatum>? ORDER BY pcdatum DESC"
- self.concernedRows=self.db.ladeSQL(sql,(lastdate,))
+ sql = "SELECT pcdatum, rowid FROM logtable WHERE pcdatum>? ORDER BY pcdatum DESC"
+ self.concernedRows = self.db.ladeSQL(sql, (lastdate, ))
- if (self.concernedRows!=None)and(len(self.concernedRows)>0):
+ if (self.concernedRows is not None)and(len(self.concernedRows)>0):
#_moduleLogger.info("check4commit 2")
- id1, pcdatum,sql, param, host, rowid = newSQL
+ id1, pcdatum, sql, param, host, rowid = newSQL
if len(rowid)>0:
for x in self.concernedRows:
#_moduleLogger.info("check4commit 3")
- if (x[1]==rowid):
+ if (x[1] == rowid):
if (x[0]>pcdatum):
_moduleLogger.info("newer sync entry, ignoring old one")
#_moduleLogger.info("check4commit 9.1")
#_moduleLogger.info("check4commit 9.3")
return True
- def writeSQLTupel(self,newSQLs,lastdate):
- if (newSQLs==None):
- return
+ def writeSQLTupel(self, newSQLs, lastdate):
+ if newSQLs is None:
+ return
- self.concernedRows=None
- pausenzaehler=0
+ self.concernedRows = None
+ pausenzaehler = 0
_moduleLogger.info("writeSQLTupel got "+str(len(newSQLs))+" sql tupels")
for newSQL in newSQLs:
#print ""
- #print "SQL1: ",newSQL[1]
- #print "SQL2: ",newSQL[2]
- #print "SQL3: ",newSQL[3]
- #print "Param:",string.split(newSQL[3]," <<Tren-ner>> ")
+ #print "SQL1: ", newSQL[1]
+ #print "SQL2: ", newSQL[2]
+ #print "SQL3: ", newSQL[3]
+ #print "Param:", string.split(newSQL[3], " <<Tren-ner>> ")
#print ""
- if (newSQL[3]!=""):
- param=string.split(newSQL[3]," <<Tren-ner>> ")
+ if (newSQL[3] != ""):
+ param = string.split(newSQL[3], " <<Tren-ner>> ")
else:
- param=None
+ param = None
if (len(newSQL)>2):
- commitSQL=True
+ commitSQL = True
- if (newSQL[5]!=None)and(len(newSQL[5])>0):
- commitSQL=self.check4commit(newSQL,lastdate)
+ if (newSQL[5] is not None)and(len(newSQL[5])>0):
+ commitSQL = self.check4commit(newSQL, lastdate)
- if (commitSQL==True):
- self.db.speichereSQL(newSQL[2],param,commit=False,pcdatum=newSQL[1],rowid=newSQL[5])
+ if commitSQL:
+ self.db.speichereSQL(newSQL[2], param, commit = False, pcdatum = newSQL[1], rowid = newSQL[5])
else:
_moduleLogger.error("writeSQLTupel: Error")
- pausenzaehler+=1
- if (pausenzaehler % 10)==0:
+ pausenzaehler += 1
+ if (pausenzaehler % 10) == 0:
self.pulse()
- while (gtk.events_pending()):
- gtk.main_iteration();
+ while gtk.events_pending():
+ gtk.main_iteration()
_moduleLogger.info("Alle SQLs an sqlite geschickt, commiting now")
self.db.commitSQL()
_moduleLogger.info("Alle SQLs commited")
- def doSync(self,sync_uuid,pcdatum,newSQLs,pcdatumjetzt):
- #print uuid,pcdatum,newSQLs
+ def doSync(self, sync_uuid, pcdatum, newSQLs, pcdatumjetzt):
+ #print uuid, pcdatum, newSQLs
#_moduleLogger.info("doSync 0")
- self.changeSyncStatus(True,_("sync process running"))
+ self.changeSyncStatus(True, _("sync process running"))
self.pulse()
#_moduleLogger.info("doSync 1")
- while (gtk.events_pending()):
+ while gtk.events_pending():
gtk.main_iteration();
- diff=time.time()-pcdatumjetzt
- if diff<0:
- diff=diff*(-1)
- if diff>30:
+ diff = abs(time.time() - pcdatumjetzt)
+ if 30 < diff:
return -1
_moduleLogger.info("doSync read sqls")
- sql="SELECT * FROM logtable WHERE pcdatum>?"
- rows=self.db.ladeSQL(sql,(pcdatum,))
+ sql = "SELECT * FROM logtable WHERE pcdatum>?"
+ rows = self.db.ladeSQL(sql, (pcdatum, ))
_moduleLogger.info("doSync read sqls")
- self.writeSQLTupel(newSQLs,pcdatum)
+ self.writeSQLTupel(newSQLs, pcdatum)
_moduleLogger.info("doSync wrote "+str(len(newSQLs))+" sqls")
_moduleLogger.info("doSync sending "+str(len(rows))+" sqls")
- i=0
return rows
def getRemoteSyncUUID(self):
return self.sync_uuid
- def startServer(self, widget, data=None):
+ def startServer(self, widget, data = None):
#Starte RPCServer
- self.db.speichereDirekt("syncServerIP",self.comboIP.get_child().get_text())
+ self.db.speichereDirekt("syncServerIP", self.comboIP.get_child().get_text())
- if (widget.get_active()==True):
+ if (widget.get_active() == True):
_moduleLogger.info("Starting Server")
try:
- ip=self.comboIP.get_child().get_text()
- self.rpcserver = SimpleXMLRPCServer((ip, self.port),allow_none=True)
+ ip = self.comboIP.get_child().get_text()
+ self.rpcserver = SimpleXMLRPCServer((ip, self.port), allow_none = True)
self.rpcserver.register_function(pow)
self.rpcserver.register_function(self.getLastSyncDate)
self.rpcserver.register_function(self.doSync)
self.rpcserver.register_function(self.getRemoteSyncUUID)
self.rpcserver.register_function(self.doSaveFinalTime)
self.rpcserver.register_function(self.pulse)
- self.poll=select.poll()
+ self.poll = select.poll()
self.poll.register(self.rpcserver.fileno())
gobject.timeout_add(1000, self.handleRPC)
self.syncServerStatusLabel.set_text(_("Syncserver running..."))
#save
- self.db.speichereDirekt("startSyncServer",True)
+ self.db.speichereDirekt("startSyncServer", True)
except:
- s=str(sys.exc_info())
+ s = str(sys.exc_info())
_moduleLogger.error("libsync: could not start server. Error: "+s)
- mbox=gtk.MessageDialog(None,gtk.DIALOG_MODAL,gtk.MESSAGE_ERROR,gtk.BUTTONS_OK,_("Sync server could not start. Please check IP and port.")) #gtk.DIALOG_MODAL
+ mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("Sync server could not start. Please check IP and port.")) #gtk.DIALOG_MODAL
mbox.set_modal(False)
- response=mbox.run()
+ response = mbox.run()
mbox.hide()
mbox.destroy()
widget.set_active(False)
pass
self.syncServerStatusLabel.set_text(_("Syncserver not running..."))
#save
- self.db.speichereDirekt("startSyncServer",False)
+ self.db.speichereDirekt("startSyncServer", False)
- def doSaveFinalTime(self,sync_uuid,pcdatum=None):
- if (pcdatum==None): pcdatum=int(time.time())
+ def doSaveFinalTime(self, sync_uuid, pcdatum = None):
+ if pcdatum is None:
+ pcdatum = int(time.time())
if (time.time()>pcdatum):
- pcdatum=int(time.time()) #größere Zeit nehmen
+ pcdatum = int(time.time()) #größere Zeit nehmen
self.pulse()
#fime save time+uuid
- sql="DELETE FROM sync WHERE uuid=?"
- self.db.speichereSQL(sql,(sync_uuid,),log=False)
- sql="INSERT INTO sync (syncpartner,uuid,pcdatum) VALUES (?,?,?)"
- self.db.speichereSQL(sql,("x",str(sync_uuid),pcdatum),log=False)
+ sql = "DELETE FROM sync WHERE uuid = ?"
+ self.db.speichereSQL(sql, (sync_uuid, ), log = False)
+ sql = "INSERT INTO sync (syncpartner, uuid, pcdatum) VALUES (?, ?, ?)"
+ self.db.speichereSQL(sql, ("x", str(sync_uuid), pcdatum), log = False)
self.pulse()
- self.changeSyncStatus(False,_("no sync process (at the moment)"))
- return (self.sync_uuid,pcdatum)
+ self.changeSyncStatus(False, _("no sync process (at the moment)"))
+ return (self.sync_uuid, pcdatum)
- def syncButton(self, widget, data=None):
+ def syncButton(self, widget, data = None):
_moduleLogger.info("Syncing")
- #sql="DELETE FROM logtable WHERE sql LIKE externeStundenplanung"
+ #sql = "DELETE FROM logtable WHERE sql LIKE externeStundenplanung"
#self.db.speichereSQL(sql)
- self.changeSyncStatus(True,_("sync process running"))
+ self.changeSyncStatus(True, _("sync process running"))
while (gtk.events_pending()):
- gtk.main_iteration();
+ gtk.main_iteration()
- self.db.speichereDirekt("syncRemoteIP",self.comboRemoteIP.get_child().get_text())
+ self.db.speichereDirekt("syncRemoteIP", self.comboRemoteIP.get_child().get_text())
try:
- self.server = xmlrpclib.ServerProxy("http://"+self.comboRemoteIP.get_child().get_text()+":"+str(self.port),allow_none=True)
- #lastDate=server.getLastSyncDate(str(self.sync_uuid))
- server_sync_uuid=self.server.getRemoteSyncUUID()
- lastDate=self.getLastSyncDate(str(server_sync_uuid))
+ self.server = xmlrpclib.ServerProxy("http://"+self.comboRemoteIP.get_child().get_text()+":"+str(self.port), allow_none = True)
+ #lastDate = server.getLastSyncDate(str(self.sync_uuid))
+ server_sync_uuid = self.server.getRemoteSyncUUID()
+ lastDate = self.getLastSyncDate(str(server_sync_uuid))
#print ("LastSyncDate: "+str(lastDate)+" Now: "+str(int(time.time())))
- sql="SELECT * FROM logtable WHERE pcdatum>?"
- rows=self.db.ladeSQL(sql,(lastDate,))
+ sql = "SELECT * FROM logtable WHERE pcdatum>?"
+ rows = self.db.ladeSQL(sql, (lastDate, ))
_moduleLogger.info("loaded concerned rows")
- newSQLs=self.server.doSync(self.sync_uuid,lastDate,rows,time.time())
+ newSQLs = self.server.doSync(self.sync_uuid, lastDate, rows, time.time())
_moduleLogger.info("did do sync, processing sqls now")
- if newSQLs!=-1:
- self.writeSQLTupel(newSQLs,lastDate)
+ if newSQLs != -1:
+ self.writeSQLTupel(newSQLs, lastDate)
- sync_uuid, finalpcdatum=self.server.doSaveFinalTime(self.sync_uuid)
+ sync_uuid, finalpcdatum = self.server.doSaveFinalTime(self.sync_uuid)
self.doSaveFinalTime(sync_uuid, finalpcdatum)
- self.changeSyncStatus(False,_("no sync process (at the moment)"))
+ self.changeSyncStatus(False, _("no sync process (at the moment)"))
- mbox = gtk.MessageDialog(None,gtk.DIALOG_MODAL,gtk.MESSAGE_INFO,gtk.BUTTONS_OK,_("Synchronization successfully completed"))
+ mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, _("Synchronization successfully completed"))
response = mbox.run()
mbox.hide()
mbox.destroy()
else:
_moduleLogger.warning("Zeitdiff zu groß/oder anderer db-Fehler")
- self.changeSyncStatus(False,_("no sync process (at the moment)"))
- mbox = gtk.MessageDialog(None,gtk.DIALOG_MODAL,gtk.MESSAGE_INFO,gtk.BUTTONS_OK,_("The clocks are not synchronized between stations"))
+ self.changeSyncStatus(False, _("no sync process (at the moment)"))
+ mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, _("The clocks are not synchronized between stations"))
response = mbox.run()
mbox.hide()
mbox.destroy()
except:
- _moduleLogger.warning("Sync connect failed")
- self.changeSyncStatus(False,_("no sync process (at the moment)"))
- mbox = gtk.MessageDialog(None,gtk.DIALOG_MODAL,gtk.MESSAGE_INFO,gtk.BUTTONS_OK,_("Sync failed, reason: ")+unicode(sys.exc_info()[1][1]))
- response = mbox.run()
- mbox.hide()
- mbox.destroy()
- self.server=None
- self.server=None
+ _moduleLogger.warning("Sync connect failed")
+ self.changeSyncStatus(False, _("no sync process (at the moment)"))
+ mbox = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, _("Sync failed, reason: ")+unicode(sys.exc_info()[1][1]))
+ response = mbox.run()
+ mbox.hide()
+ mbox.destroy()
+ self.server = None
+ self.server = None
class Columns_dialog(gtk.VBox):
- def __init__(self,db,liststorehandler):
- gtk.VBox.__init__(self,homogeneous=False, spacing=0)
+ def __init__(self, db, liststorehandler):
+ gtk.VBox.__init__(self, homogeneous = False, spacing = 0)
- self.db=db
- self.liststorehandler=liststorehandler
+ self.db = db
+ self.liststorehandler = liststorehandler
- #serverbutton=gtk.ToggleButton("SyncServer starten")
- #serverbutton.connect("clicked",self.startServer,(None,))
- #self.pack_start(serverbutton, expand=False, fill=True, padding=1)
+ #serverbutton = gtk.ToggleButton("SyncServer starten")
+ #serverbutton.connect("clicked", self.startServer, (None, ))
+ #self.pack_start(serverbutton, expand = False, fill = True, padding = 1)
#print "x1"
- frame=gtk.Frame(_("Columns"))
- self.framebox=gtk.VBox(homogeneous=False, spacing=0)
+ frame = gtk.Frame(_("Columns"))
+ self.framebox = gtk.VBox(homogeneous = False, spacing = 0)
self.scrolled_window = gtk.ScrolledWindow()
- self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,gtk.POLICY_AUTOMATIC)
+ self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
self.scrolled_window.add_with_viewport(self.framebox)
- i=1 #uid can not be shown
- while self.liststorehandler.get_colname(i)!=None:
- name=str(self.liststorehandler.get_colname(i))
- checkbutton=gtk.CheckButton(name)
- if self.db.ladeDirekt("showcol_"+name)=="1":
+ i = 1 #uid can not be shown
+ while self.liststorehandler.get_colname(i) is not None:
+ name = str(self.liststorehandler.get_colname(i))
+ checkbutton = gtk.CheckButton(name)
+ if self.db.ladeDirekt("showcol_"+name) == "1":
checkbutton.set_active(True)
self.framebox.pack_start(checkbutton)
- i=i+1
+ i = i+1
frame.add(self.scrolled_window)
- self.pack_start(frame, expand=True, fill=True, padding=1)
+ self.pack_start(frame, expand = True, fill = True, padding = 1)
def is_col_selected(self, icol):
- children=self.framebox.get_children()
- if icol<len(children):
+ children = self.framebox.get_children()
+ if icol < len(children):
return children[icol].get_active()
else:
return None
def save_column_setting(self):
- i=1 #uid can not be shown
- while self.liststorehandler.get_colname(i)!=None:
- name=str(self.liststorehandler.get_colname(i))
- if self.is_col_selected(i-1)==True:
- self.db.speichereDirekt("showcol_"+name,"1")
+ i = 1 #uid can not be shown
+ while self.liststorehandler.get_colname(i) is not None:
+ name = str(self.liststorehandler.get_colname(i))
+ if self.is_col_selected(i-1) == True:
+ self.db.speichereDirekt("showcol_"+name, "1")
else:
- self.db.speichereDirekt("showcol_"+name,"0")
- i=i+1
+ self.db.speichereDirekt("showcol_"+name, "0")
+ i += 1
class CellRendererTriple(gtk.GenericCellRenderer):
}
__gsignals__ = {
- 'status_changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,(gobject.TYPE_INT,gobject.TYPE_STRING)),
+ 'status_changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_INT, gobject.TYPE_STRING)),
}
def __init__(self):
#self.__gobject_init__()
- #gtk.GenericCellRenderer.__init__(self,*args,**kwargs)
+ #gtk.GenericCellRenderer.__init__(self, *args, **kwargs)
gtk.GenericCellRenderer.__init__(self)
#self.__gobject_init__()
- self.status=-1
+ self.status = -1
self.xpad = 2
self.ypad = 2
self.mode = gtk.CELL_RENDERER_MODE_ACTIVATABLE
- self.xpad = -2; self.ypad = -2
- self.xalign = 0.5; self.yalign = 0.5
+ self.xpad = -2
+ self.ypad = -2
+ self.xalign = 0.5
+ self.yalign = 0.5
self.active = 0
- self.widget=None
- self.last_cell=None
+ self.widget = None
+ self.last_cell = None
self.connect('editing-started', self.on_clicked)
- def do_set_property(self,property,value):
+ def do_set_property(self, property, value):
setattr(self, property.name, value)
def do_get_property(self, property):
return layout
- def on_get_size(self, widget, cell_area=None):
+ def on_get_size(self, widget, cell_area = None):
xpad = 2
ypad = 2
return x_offset, y_offset, width, height
def on_clicked(self, widget, data):
- print widget,data
+ print widget, data
- def clicked(self, widget, data1=None):
- x,y=widget.get_pointer()
+ def clicked(self, widget, data1 = None):
+ x, y = widget.get_pointer()
widget.realize()
- path=widget.get_path_at_pos(x,y)
+ path = widget.get_path_at_pos(x, y)
- #print "a",widget.get_cursor()
+ #print "a", widget.get_cursor()
#print path
- path=widget.get_cursor()[0]
+ path = widget.get_cursor()[0]
- if path!=None:
- irow=path[0] #path[0][0]-1
- rect=widget.get_cell_area(irow, widget.get_column(0)) #FixME 0 is hardcoded
- if x<rect.x+rect.width:
- self.emit("status_changed",irow,self.status)
+ if path is not None:
+ irow = path[0] #path[0][0]-1
+ rect = widget.get_cell_area(irow, widget.get_column(0)) #FixME 0 is hardcoded
+ if x < rect.x+rect.width:
+ self.emit("status_changed", irow, self.status)
else:
return
#workarround -1 means last item, because bug in treeview?!
#print "not in list"
- rect=widget.get_visible_rect() #widget.get_cell_area(-1, widget.get_column(0))
- #print rect.x,rect.y,rect.width,rect.height,x,y
- irow=-1
- rect=widget.get_cell_area(0, widget.get_column(0)) #FixME 0 is hardcoded
- if x<rect.x+rect.width:
- self.emit("status_changed",irow,"-1")
+ rect = widget.get_visible_rect() #widget.get_cell_area(-1, widget.get_column(0))
+ #print rect.x, rect.y, rect.width, rect.height, x, y
+ irow = -1
+ rect = widget.get_cell_area(0, widget.get_column(0)) #FixME 0 is hardcoded
+ if x < rect.x+rect.width:
+ self.emit("status_changed", irow, "-1")
def on_render(self, window, widget, background_area, cell_area, expose_area, flags ):
- if (self.widget==None):
+ if (self.widget == None):
#print widget
- self.widget=widget
- self.widget.connect("cursor-changed",self.clicked) #button-press-event
+ self.widget = widget
+ self.widget.connect("cursor-changed", self.clicked) #button-press-event
- self.last_cell=cell_area
+ self.last_cell = cell_area
- x=int(cell_area.x+(cell_area.width-2)/2-(cell_area.height-2)/2)
- y=int(cell_area.y+1)
- height=int(cell_area.height-2)
- width=int(height)
+ x = int(cell_area.x+(cell_area.width-2)/2-(cell_area.height-2)/2)
+ y = int(cell_area.y+1)
+ height = int(cell_area.height-2)
+ width = int(height)
- if (self.status=="1"):
- widget.style.paint_check(window,gtk.STATE_NORMAL, gtk.SHADOW_IN,cell_area, widget, "cellradio",x,y,width,height)
- elif (self.status=="0"):
- #width=height
- height=height-3
- width=height
+ if (self.status == "1"):
+ widget.style.paint_check(window, gtk.STATE_NORMAL, gtk.SHADOW_IN, cell_area, widget, "cellradio", x, y, width, height)
+ elif (self.status == "0"):
+ #width = height
+ height = height-3
+ width = height
- widget.style.paint_flat_box(window, gtk.STATE_NORMAL, gtk.SHADOW_NONE, cell_area, widget, "cellunselected",x,y,width,height)
+ widget.style.paint_flat_box(window, gtk.STATE_NORMAL, gtk.SHADOW_NONE, cell_area, widget, "cellunselected", x, y, width, height)
- widget.style.paint_hline(window, gtk.STATE_NORMAL,cell_area, widget, "cellunselected",x,x+width,y)
- widget.style.paint_hline(window, gtk.STATE_NORMAL,cell_area, widget, "cellunselected",x,x+width,y+height)
- widget.style.paint_vline(window, gtk.STATE_NORMAL,cell_area, widget, "cellunselected",y,y+height,x)
- widget.style.paint_vline(window, gtk.STATE_NORMAL,cell_area, widget, "cellunselected",y,y+height,x+width)
+ widget.style.paint_hline(window, gtk.STATE_NORMAL, cell_area, widget, "cellunselected", x, x+width, y)
+ widget.style.paint_hline(window, gtk.STATE_NORMAL, cell_area, widget, "cellunselected", x, x+width, y+height)
+ widget.style.paint_vline(window, gtk.STATE_NORMAL, cell_area, widget, "cellunselected", y, y+height, x)
+ widget.style.paint_vline(window, gtk.STATE_NORMAL, cell_area, widget, "cellunselected", y, y+height, x+width)
else:
- widget.style.paint_diamond(window, gtk.STATE_NORMAL, gtk.SHADOW_IN, cell_area, widget, "cellunselected",x,y,width,height)
+ widget.style.paint_diamond(window, gtk.STATE_NORMAL, gtk.SHADOW_IN, cell_area, widget, "cellunselected", x, y, width, height)
#widget.show_all()
#print "render"
pass
def on_start_editing(self, event, widget, path, background_area, cell_area, flags):
- print "on_start_editing",path
+ print "on_start_editing", path
return None
def on_activate(self, event, widget, path, background_area, cell_area, flags):
- print "activate",path
+ print "activate", path
return False
}
__gsignals__ = {
- 'status_changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,(gobject.TYPE_INT,gobject.TYPE_STRING)),
+ 'status_changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_INT, gobject.TYPE_STRING)),
}
def __init__(self):
#self.__gobject_init__()
- #gtk.GenericCellRenderer.__init__(self,*args,**kwargs)
+ #gtk.GenericCellRenderer.__init__(self, *args, **kwargs)
gtk.GenericCellRenderer.__init__(self)
#self.__gobject_init__()
- self.status=-1
+ self.status = -1
self.xpad = 2
self.ypad = 2
self.mode = gtk.CELL_RENDERER_MODE_ACTIVATABLE
self.xalign = 0.5
self.yalign = 0.5
self.active = 0
- self.widget=None
- self.last_cell=None
- self.text="(none)"
+ self.widget = None
+ self.last_cell = None
+ self.text = "(none)"
self.connect('editing-started', self.on_clicked)
- def do_set_property(self,property,value):
- #print property,value
+ def do_set_property(self, property, value):
+ #print property, value
setattr(self, property.name, value)
def do_get_property(self, property):
return layout
- def on_get_size(self, widget, cell_area=None):
+ def on_get_size(self, widget, cell_area = None):
xpad = 2
ypad = 2
return x_offset, y_offset, width, height
def on_clicked(self, widget, data):
- print widget,data
+ print widget, data
- def clicked(self, widget, data1=None):
+ def clicked(self, widget, data1 = None):
return
- x,y=widget.get_pointer()
+ x, y = widget.get_pointer()
widget.realize()
- #path=widget.get_path_at_pos(x,y)
+ #path = widget.get_path_at_pos(x, y)
- path=widget.get_cursor()[0]
+ path = widget.get_cursor()[0]
- if path!=None:
- irow=path[0] #path[0][0]-1
- rect=widget.get_cell_area(irow, widget.get_column(0)) #FixME 0 is hardcoded
- if x<rect.x+rect.width:
- self.emit("status_changed",irow,self.status)
+ if path is not None:
+ irow = path[0] #path[0][0]-1
+ rect = widget.get_cell_area(irow, widget.get_column(0)) #FixME 0 is hardcoded
+ if x < rect.x+rect.width:
+ self.emit("status_changed", irow, self.status)
else:
return
#workarround -1 means last item, because bug in treeview?!
#print "not in list"
- rect=widget.get_visible_rect() #widget.get_cell_area(-1, widget.get_column(0))
- #print rect.x,rect.y,rect.width,rect.height,x,y
- irow=-1
- rect=widget.get_cell_area(0, widget.get_column(0)) #FixME 0 is hardcoded
- if x<rect.x+rect.width:
- self.emit("status_changed",irow,"-1")
+ rect = widget.get_visible_rect() #widget.get_cell_area(-1, widget.get_column(0))
+ #print rect.x, rect.y, rect.width, rect.height, x, y
+ irow = -1
+ rect = widget.get_cell_area(0, widget.get_column(0)) #FixME 0 is hardcoded
+ if x < rect.x+rect.width:
+ self.emit("status_changed", irow, "-1")
def on_render(self, window, widget, background_area, cell_area, expose_area, flags ):
- if (self.widget==None):
- self.widget=widget
- self.widget.connect("cursor-changed",self.clicked) #button-press-event
+ if (self.widget == None):
+ self.widget = widget
+ self.widget.connect("cursor-changed", self.clicked) #button-press-event
- self.last_cell=cell_area
+ self.last_cell = cell_area
- x=int(cell_area.x+(cell_area.width-2)/2-(cell_area.height-2)/2)
- y=int(cell_area.y+1)
- height=int(cell_area.height-2)
- width=int(height)
+ x = int(cell_area.x+(cell_area.width-2)/2-(cell_area.height-2)/2)
+ y = int(cell_area.y+1)
+ height = int(cell_area.height-2)
+ width = int(height)
- widget.style.paint_layout(window,gtk.STATE_NORMAL, True, cell_area, widget, "cellradio",x,y,self.get_layout(widget))
+ widget.style.paint_layout(window, gtk.STATE_NORMAL, True, cell_area, widget, "cellradio", x, y, self.get_layout(widget))
#widget.show_all()
def on_start_editing(self, event, widget, path, background_area, cell_area, flags):
- print "on_start_editing",path
+ print "on_start_editing", path
return None
def on_activate(self, event, widget, path, background_area, cell_area, flags):
- print "activate",path
+ print "activate", path
return False
class View(gtk.VBox):
- def __init__(self,db,liststorehandler,parent_window):
- self.db=db
- self.parent_window=parent_window
+ def __init__(self, db, liststorehandler, parent_window):
+ self.db = db
+ self.parent_window = parent_window
self.liststorehandler = liststorehandler
- gtk.VBox.__init__(self,homogeneous=False, spacing=0)
+ gtk.VBox.__init__(self, homogeneous = False, spacing = 0)
logging.info("libview, init")
self.reload_view()
"""
- bearbeitenFrame=gtk.Frame("Verteilung kopieren nach")
- bearbeitenvBox=gtk.VBox(homogeneous=False, spacing=0)
+ bearbeitenFrame = gtk.Frame("Verteilung kopieren nach")
+ bearbeitenvBox = gtk.VBox(homogeneous = False, spacing = 0)
- bearbeitenhBox=gtk.HBox(homogeneous=False, spacing=0)
+ bearbeitenhBox = gtk.HBox(homogeneous = False, spacing = 0)
self.comboKlassen = gtk.combo_box_new_text()
- bearbeitenhBox.pack_start(self.comboKlassen, expand=False, fill=True, padding=0)
- button=gtk.Button("Kopieren")
+ bearbeitenhBox.pack_start(self.comboKlassen, expand = False, fill = True, padding = 0)
+ button = gtk.Button("Kopieren")
button.connect("clicked", self.kopiereStoffverteilung, None)
- bearbeitenhBox.pack_start(button, expand=False, fill=True, padding=0)
+ bearbeitenhBox.pack_start(button, expand = False, fill = True, padding = 0)
- label=gtk.Label(" ")
- bearbeitenhBox.pack_start(label, expand=False, fill=True, padding=0)
+ label = gtk.Label(" ")
+ bearbeitenhBox.pack_start(label, expand = False, fill = True, padding = 0)
- button=gtk.Button("Export in CSV-Datei")
+ button = gtk.Button("Export in CSV-Datei")
button.connect("clicked", self.exportStoffverteilung, None)
- bearbeitenhBox.pack_start(button, expand=False, fill=True, padding=0)
+ bearbeitenhBox.pack_start(button, expand = False, fill = True, padding = 0)
- bearbeitenvBox.pack_start(bearbeitenhBox, expand=False, fill=True, padding=0)
+ bearbeitenvBox.pack_start(bearbeitenhBox, expand = False, fill = True, padding = 0)
bearbeitenFrame.add(bearbeitenvBox)
- self.pack_start(bearbeitenFrame, expand=False, fill=True, padding=0)
+ self.pack_start(bearbeitenFrame, expand = False, fill = True, padding = 0)
"""
#self.connect("unmap", self.speichere)
#self.show_all()
- #print "libstoffverteilung 9: ",time.clock()
+ #print "libstoffverteilung 9: ", time.clock()
def loadList(self):
- ls=self.liststorehandler.get_liststore()
+ ls = self.liststorehandler.get_liststore()
self.treeview.set_model(ls)
#self.tvcolumn[i].add_attribute( self.cell[i], "active", 1)
- #print "setup",ls
+ #print "setup", ls
- def col_edited(self,cell, irow, new_text,icol=None):
- if (irow!=4):
- self.liststorehandler.update_row(irow,icol,new_text)
+ def col_edited(self, cell, irow, new_text, icol = None):
+ if (irow != 4):
+ self.liststorehandler.update_row(irow, icol, new_text)
else:
- print cell, irow, new_text,icol
+ print cell, irow, new_text, icol
- def col_toggled(self,widget,irow, status ):
- #print irow,ls[irow][1],status
- ls=self.treeview.get_model()
+ def col_toggled(self, widget, irow, status ):
+ #print irow, ls[irow][1], status
+ ls = self.treeview.get_model()
- if self.liststorehandler.selection.get_status()=="0":
- if ls[irow][1]=="0":
- self.liststorehandler.update_row(irow,1,"1")
+ if self.liststorehandler.selection.get_status() == "0":
+ if ls[irow][1] == "0":
+ self.liststorehandler.update_row(irow, 1, "1")
else:
- self.liststorehandler.update_row(irow,1,"0")
+ self.liststorehandler.update_row(irow, 1, "0")
else:
- if ls[irow][1]=="1":
- self.liststorehandler.update_row(irow,1,"-1")
- elif ls[irow][1]=="0":
- self.liststorehandler.update_row(irow,1,"1")
+ if ls[irow][1] == "1":
+ self.liststorehandler.update_row(irow, 1, "-1")
+ elif ls[irow][1] == "0":
+ self.liststorehandler.update_row(irow, 1, "1")
else:
- self.liststorehandler.update_row(irow,1,"0")
+ self.liststorehandler.update_row(irow, 1, "0")
- #self.tvcolumn[i].set_attributes( self.cell[i], active=i)
+ #self.tvcolumn[i].set_attributes( self.cell[i], active = i)
- def convert(self,s):
+ def convert(self, s):
#print s
- if (s=="1"):
+ if (s == "1"):
return 1
else:
return 0
def del_active_row(self):
path, col = self.treeview.get_cursor()
#print path, col
- if path!=None:
- irow=path[0]
- row_iter=self.treeview.get_model().get_iter(path)
- self.liststorehandler.del_row(irow,row_iter)
+ if path is not None:
+ irow = path[0]
+ row_iter = self.treeview.get_model().get_iter(path)
+ self.liststorehandler.del_row(irow, row_iter)
#treemodel.get_iter()
- def sort_func_function(self,model, iter1, iter2, data=None):
+ def sort_func_function(self, model, iter1, iter2, data = None):
print "sorting"
def reload_view(self):
self.treeview = gtk.TreeView(self.modelsort)
self.treeview.set_headers_visible(True)
- self.cell=range(self.liststorehandler.get_colcount())
- self.tvcolumn=range(self.liststorehandler.get_colcount())
+ self.cell = range(self.liststorehandler.get_colcount())
+ self.tvcolumn = range(self.liststorehandler.get_colcount())
m = self.liststorehandler.get_unitsstore()
for i in range(self.liststorehandler.get_colcount()):
- if i>5:
- default="0"
+ if 5 < i:
+ default = "0"
else:
- default="1"
- if self.db.ladeDirekt("showcol_"+str(self.liststorehandler.get_colname(i)),default)=="1":
+ default = "1"
+ if self.db.ladeDirekt("showcol_"+str(self.liststorehandler.get_colname(i)), default) == "1":
- if (i==1):
+ if (i == 1):
self.cell[i] = CellRendererTriple()
- self.tvcolumn[i] = gtk.TreeViewColumn(self.liststorehandler.get_colname(i),self.cell[i])
+ self.tvcolumn[i] = gtk.TreeViewColumn(self.liststorehandler.get_colname(i), self.cell[i])
self.cell[i].connect( 'status_changed', self.col_toggled)
- self.tvcolumn[i].set_attributes( self.cell[i], status=i)
- elif (i==3)or(i==4)or(i==6):
+ self.tvcolumn[i].set_attributes( self.cell[i], status = i)
+ elif (i == 3)or(i == 4)or(i == 6):
self.cell[i] = gtk.CellRendererCombo()
- self.tvcolumn[i] = gtk.TreeViewColumn(self.liststorehandler.get_colname(i),self.cell[i])
- self.cell[i].set_property("model",m)
+ self.tvcolumn[i] = gtk.TreeViewColumn(self.liststorehandler.get_colname(i), self.cell[i])
+ self.cell[i].set_property("model", m)
self.cell[i].set_property('text-column', i)
- self.cell[i].set_property('editable',True)
- self.cell[i].connect("edited", self.col_edited,i)
- self.tvcolumn[i].set_attributes( self.cell[i], text=i)
+ self.cell[i].set_property('editable', True)
+ self.cell[i].connect("edited", self.col_edited, i)
+ self.tvcolumn[i].set_attributes( self.cell[i], text = i)
else:
self.cell[i] = gtk.CellRendererText()
- self.tvcolumn[i] = gtk.TreeViewColumn(self.liststorehandler.get_colname(i),self.cell[i])
- self.cell[i].set_property('editable',True)
- self.cell[i].set_property('editable-set',True)
- self.cell[i].connect("edited", self.col_edited,i)
- #self.cell[i].connect("editing-canceled", self.col_edited2,i)
- self.tvcolumn[i].set_attributes(self.cell[i], text=i)
+ self.tvcolumn[i] = gtk.TreeViewColumn(self.liststorehandler.get_colname(i), self.cell[i])
+ self.cell[i].set_property('editable', True)
+ self.cell[i].set_property('editable-set', True)
+ self.cell[i].connect("edited", self.col_edited, i)
+ #self.cell[i].connect("editing-canceled", self.col_edited2, i)
+ self.tvcolumn[i].set_attributes(self.cell[i], text = i)
self.cell[i].set_property('cell-background', 'lightgray')
self.tvcolumn[i].set_sort_column_id(i)
# Allow NOT drag and drop reordering of rows
self.treeview.set_reorderable(False)
- if self.scrolled_window != None:
+ if self.scrolled_window is not None:
self.scrolled_window.destroy()
self.scrolled_window = gtk.ScrolledWindow()
- self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,gtk.POLICY_AUTOMATIC)
+ self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
self.scrolled_window.add(self.treeview)
- self.pack_start(self.scrolled_window, expand=True, fill=True, padding=0)
+ self.pack_start(self.scrolled_window, expand = True, fill = True, padding = 0)
self.loadList()
self.show_all()
if e.errno != 17:
raise
- logging.basicConfig(level=logging.DEBUG, filename=constants._user_logpath_)
+ logging.basicConfig(level = logging.DEBUG, filename = constants._user_logpath_)
_moduleLogger.info("multilist %s-%s" % (constants.__version__, constants.__build__))
_moduleLogger.info("OS: %s" % (os.uname()[0], ))
_moduleLogger.info("Kernel: %s (%s) for %s" % os.uname()[2:])
"""
import os
-import sys
import logging
import gtk
try:
import hildon
- isHildon=True
+ isHildon = True
except:
- isHildon=False
- class hildon():
- def __init__(self):
- print "PseudoClass hildon"
- class Program():
- def __init__(self):
- print "PseudoClass hildon.Program"
+ isHildon = False
try:
import osso
#Haupt vbox für alle Elemente
self.window = gtk.Window()
- self.vbox = gtk.VBox(homogeneous=False, spacing=0)
+ self.vbox = gtk.VBox(homogeneous = False, spacing = 0)
self.selection = libselection.Selection(self.db, isHildon)
self.liststorehandler = libliststorehandler.Liststorehandler(self.db, self.selection)
self.vbox.pack_start(menuBar, False, False, 0)
#add to vbox below (to get it on top)
- self.vbox.pack_end(self.bottombar, expand=False, fill=True, padding=0)
- self.vbox.pack_end(self.view, expand=True, fill=True, padding=0)
- self.vbox.pack_end(self.selection, expand=False, fill=True, padding=0)
+ self.vbox.pack_end(self.bottombar, expand = False, fill = True, padding = 0)
+ self.vbox.pack_end(self.view, expand = True, fill = True, padding = 0)
+ self.vbox.pack_end(self.selection, expand = False, fill = True, padding = 0)
#Get the Main Window, and connect the "destroy" event
self.window.add(self.vbox)
event.keyval in (gtk.keysyms.w, gtk.keysyms.q) and
event.get_state() & gtk.gdk.CONTROL_MASK
):
- self._window.destroy()
+ self.window.destroy()
elif event.keyval == gtk.keysyms.l and event.get_state() & gtk.gdk.CONTROL_MASK:
with open(constants._user_logpath_, "r") as f:
logLines = f.xreadlines()
else:
self.window_in_fullscreen = False
- def speichereAlles(self, data=None, data2=None):
+ def speichereAlles(self, data = None, data2 = None):
logging.info("Speichere alles")
- def ladeAlles(self, data=None, data2=None):
+ def ladeAlles(self, data = None, data2 = None):
logging.info("Lade alles")
- def beforeSync(self, data=None, data2=None):
+ def beforeSync(self, data = None, data2 = None):
logging.info("Lade alles")
- def sync_finished(self, data=None, data2=None):
+ def sync_finished(self, data = None, data2 = None):
self.selection.comboList_changed()
self.selection.comboCategory_changed()
self.liststorehandler.update_list()
self.sync_dialog = gtk.Dialog(_("Sync"), None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
self.sync_dialog.set_position(gtk.WIN_POS_CENTER)
- sync=libsync.Sync(self.db, self.window, 50503)
+ sync = libsync.Sync(self.db, self.window, 50503)
sync.connect("syncFinished", self.sync_finished)
self.sync_dialog.vbox.pack_start(sync, True, True, 0)
self.sync_dialog.set_size_request(500, 350)
self.sync_dialog.vbox.show_all()
sync.connect("syncFinished", self.sync_finished)
- def sync_notes(self, widget=None, data=None):
- if self.sync_dialog==None:
+ def sync_notes(self, widget = None, data = None):
+ if self.sync_dialog == None:
self.prepare_sync_dialog()
self.sync_dialog.run()
self.sync_dialog.hide()
- def show_columns_dialog(self, widget=None, data=None):
+ def show_columns_dialog(self, widget = None, data = None):
col_dialog = gtk.Dialog(_("Choose columns"), self.window, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
col_dialog.set_position(gtk.WIN_POS_CENTER)
- cols=libview.Columns_dialog(self.db, self.liststorehandler)
+ cols = libview.Columns_dialog(self.db, self.liststorehandler)
col_dialog.vbox.pack_start(cols, True, True, 0)
col_dialog.set_size_request(500, 350)
col_dialog.vbox.show_all()
- resp=col_dialog.run()
+ resp = col_dialog.run()
col_dialog.hide()
- if resp==gtk.RESPONSE_ACCEPT:
+ if resp == gtk.RESPONSE_ACCEPT:
logging.info("changing columns")
cols.save_column_setting()
self.view.reload_view()
- #children=self.vbox.get_children()
+ #children = self.vbox.get_children()
#while len(children)>1:
# self.vbox.remove(children[1])
- #self.vbox.pack_end(self.bottombar, expand=True, fill=True, padding=0)
- #self.vbox.pack_end(view, expand=True, fill=True, padding=0)
- #self.vbox.pack_end(self.selection, expand=False, fill=True, padding=0)
+ #self.vbox.pack_end(self.bottombar, expand = True, fill = True, padding = 0)
+ #self.vbox.pack_end(view, expand = True, fill = True, padding = 0)
+ #self.vbox.pack_end(self.selection, expand = False, fill = True, padding = 0)
col_dialog.destroy()
- def destroy(self, widget=None, data=None):
+ def destroy(self, widget = None, data = None):
try:
self.speichereAlles()
self.db.close()
finally:
gtk.main_quit()
- def delete_event(self, widget, event, data=None):
+ def delete_event(self, widget, event, data = None):
#print "delete event occurred"
return False
- def dlg_delete(self, widget, event, data=None):
+ def dlg_delete(self, widget, event, data = None):
return False
- def show_about(self, widget=None, data=None):
+ def show_about(self, widget = None, data = None):
dialog = gtk.AboutDialog()
dialog.set_position(gtk.WIN_POS_CENTER)
dialog.set_name(constants.__pretty_app_name__)
dialog.set_version(constants.__version__)
dialog.set_copyright("")
- dialog.set_website("http://axique.de/f=Multilist")
+ dialog.set_website("http://axique.de/f = Multilist")
comments = "%s is a program to handle multiple lists." % constants.__pretty_app_name__
dialog.set_comments(comments)
dialog.set_authors(["Christoph Wurstle <n800@axique.net>", "Ed Page <eopage@byu.net> (Blame him for the most recent bugs)"])
def on_info1_activate(self, menuitem):
self.show_about(menuitem)
- def view_sql_history(self, widget=None, data=None, data2=None):
+ def view_sql_history(self, widget = None, data = None, data2 = None):
sqldiag = sqldialog.SqlDialog(self.db)
res = sqldiag.run()
sqldiag.hide()
finally:
sqldiag.destroy()
- def optimizeSQL(self, widget=None, data=None, data2=None):
+ def optimizeSQL(self, widget = None, data = None, data2 = None):
#optimiere sql
- self.db.speichereSQL("VACUUM", log=False)
+ self.db.speichereSQL("VACUUM", log = False)
- def select_db_dialog(self, widget=None, data=None, data2=None):
- if (isHildon==False):
+ def select_db_dialog(self, widget = None, data = None, data2 = None):
+ if (isHildon == False):
dlg = gtk.FileChooserDialog(parent = self.window, action = gtk.FILE_CHOOSER_ACTION_SAVE)
dlg.add_button( gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
dlg.add_button( gtk.STOCK_OK, gtk.RESPONSE_OK)
else:
#dlg = hildon.FileChooserDialog(parent = self.window, action = gtk.FILE_CHOOSER_ACTION_SAVE)
- dlg=hildon.FileChooserDialog(self.window, gtk.FILE_CHOOSER_ACTION_SAVE)
+ dlg = hildon.FileChooserDialog(self.window, gtk.FILE_CHOOSER_ACTION_SAVE)
if self.db.ladeDirekt('datenbank'):
dlg.set_filename(self.db.ladeDirekt('datenbank'))
if __name__ == "__main__":
- logging.basicConfig(level=logging.DEBUG)
+ logging.basicConfig(level = logging.DEBUG)
run_multilist()
self.tvcolumn2.pack_start(self.cell2, True)
self.tvcolumn3.pack_start(self.cell3, True)
- self.tvcolumn1.set_attributes(self.cell1, text=0) #Spalten setzten hier!!!!
- self.tvcolumn2.set_attributes(self.cell2, text=1)
- self.tvcolumn3.set_attributes(self.cell3, text=2)
+ self.tvcolumn1.set_attributes(self.cell1, text = 0) #Spalten setzten hier!!!!
+ self.tvcolumn2.set_attributes(self.cell2, text = 1)
+ self.tvcolumn3.set_attributes(self.cell3, text = 2)
# make treeview searchable
#self.treeview.set_search_column(0)
scrolled_window = gtk.ScrolledWindow()
scrolled_window.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
scrolled_window.add(self.treeview)
- #self.pack_start(scrolled_window, expand=True, fill=True, padding=0)
+ #self.pack_start(scrolled_window, expand = True, fill = True, padding = 0)
self.vbox.pack_start(scrolled_window, True, True, 0)
self.vbox.show_all()
- msgstring=""
- sql="SELECT pcdatum,sql,param FROM logtable WHERE pcdatum>? ORDER BY pcdatum DESC"
- rows=db.ladeSQL(sql, (time.time()-3*24*3600, ))
+ msgstring = ""
+ sql = "SELECT pcdatum, sql, param FROM logtable WHERE pcdatum>? ORDER BY pcdatum DESC"
+ rows = db.ladeSQL(sql, (time.time()-3*24*3600, ))
for i, row in enumerate(rows):
if (i>50):
break
pcdatum, sql, param = row
datum = str(time.strftime("%d.%m.%y %H:%M:%S ", (time.localtime(pcdatum))))
if 100 < len(param):
- param=param[:20]+_(" (Reduced parameter) ")+param[20:]
- self.liststore.append([datum, sql,param])
+ param = param[:20]+_(" (Reduced parameter) ")+param[20:]
+ self.liststore.append([datum, sql, param])
- self.set_size_request(500,400)
+ self.set_size_request(500, 400)
- def exportSQL(self,filename):
+ def exportSQL(self, filename):
with open(filename, 'w') as f:
- msgstring=""
- sql="SELECT pcdatum,sql,param FROM logtable WHERE pcdatum>? ORDER BY pcdatum DESC"
- rows=self.db.ladeSQL(sql,(time.time()-2*24*3600,))
+ msgstring = ""
+ sql = "SELECT pcdatum, sql, param FROM logtable WHERE pcdatum>? ORDER BY pcdatum DESC"
+ rows = self.db.ladeSQL(sql, (time.time()-2*24*3600, ))
for row in rows:
- pcdatum,sql,param = row
- datum=str(time.strftime("%d.%m.%y %H:%M:%S ", (time.localtime(pcdatum))))
+ pcdatum, sql, param = row
+ datum = str(time.strftime("%d.%m.%y %H:%M:%S ", (time.localtime(pcdatum))))
f.write( datum +"\t" + sql + "\t\t" + param+ "\n")
projects / multilist / commitdiff