copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

less columns in history. TODO: fill name for not groupchat

Browse source
This commit is contained in:
Nikos Kouremenos 2005-11-30 17:30:58 +00:00
parent 40f3316bbb
commit 28fe6a06d3
2 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/logger.py
View file

@ -336,7 +336,7 @@ class Logger:
else: # user just typed something, we search in message column else: # user just typed something, we search in message column
like_sql = '%' + query + '%' like_sql = '%' + query + '%'
cur.execute(''' cur.execute('''
SELECT contact_name, time, kind, show, message FROM logs SELECT contact_name, time, kind, show, message, subject FROM logs
WHERE jid_id = ? AND message LIKE ? WHERE jid_id = ? AND message LIKE ?
ORDER BY time ORDER BY time
''', (jid_id,like_sql)) ''', (jid_id,like_sql))

28
src/history_window.py
View file

@ -45,10 +45,8 @@ GTKGUI_GLADE = 'gtkgui.glade'
( (
C_CONTACT_NAME, C_CONTACT_NAME,
C_TIME, C_TIME,
C_KIND,
C_SHOW,
C_MESSAGE C_MESSAGE
) = range(5) ) = range(3)
class HistoryWindow: class HistoryWindow:
'''Class for browsing logs of conversations with contacts''' '''Class for browsing logs of conversations with contacts'''
@ -66,8 +64,8 @@ class HistoryWindow:
self.query_entry = xml.get_widget('query_entry') self.query_entry = xml.get_widget('query_entry')
self.expander_vbox = xml.get_widget('expander_vbox') self.expander_vbox = xml.get_widget('expander_vbox')
self.results_treeview = xml.get_widget('results_treeview') self.results_treeview = xml.get_widget('results_treeview')
# contact_name, time, kind, show, message # contact_name, time, message
model = gtk.ListStore(str, str, str, str, str) model = gtk.ListStore(str, str, str)
self.results_treeview.set_model(model) self.results_treeview.set_model(model)
col = gtk.TreeViewColumn(_('Name')) col = gtk.TreeViewColumn(_('Name'))
@ -82,18 +80,6 @@ class HistoryWindow:
col.pack_start(renderer) col.pack_start(renderer)
col.set_attributes(renderer, text = C_TIME) col.set_attributes(renderer, text = C_TIME)
col = gtk.TreeViewColumn(_('Kind'))
self.results_treeview.append_column(col)
renderer = gtk.CellRendererText()
col.pack_start(renderer)
col.set_attributes(renderer, text = C_KIND)
col = gtk.TreeViewColumn(_('Status'))
self.results_treeview.append_column(col)
renderer = gtk.CellRendererText()
col.pack_start(renderer)
col.set_attributes(renderer, text = C_SHOW)
col = gtk.TreeViewColumn(_('Message')) col = gtk.TreeViewColumn(_('Message'))
self.results_treeview.append_column(col) self.results_treeview.append_column(col)
renderer = gtk.CellRendererText() renderer = gtk.CellRendererText()
@ -303,12 +289,16 @@ class HistoryWindow:
model.clear() model.clear()
if text == '': if text == '':
return return
# contact_name, time, kind, show, message # contact_name, time, kind, show, message, subject
results = gajim.logger.get_search_results_for_query(self.jid, text) results = gajim.logger.get_search_results_for_query(self.jid, text)
#FIXME: investigate on kind and put name for normal chatting
#and add "subject: | message: " in message column is kind is
# single*
# also do we need show at all?
for row in results: for row in results:
local_time = time.localtime(row[1]) local_time = time.localtime(row[1])
tim = time.strftime('%x', local_time) tim = time.strftime('%x', local_time)
iter = model.append((row[0], tim, row[2], row[3], row[4])) iter = model.append((row[0], tim, row[4]))
def on_results_treeview_row_activated(self, widget, path, column): def on_results_treeview_row_activated(self, widget, path, column):
'''a row was double clicked, get date from row, and select it in calendar '''a row was double clicked, get date from row, and select it in calendar