diff options
author | Karel Klic <kklic@redhat.com> | 2010-02-15 15:09:34 +0100 |
---|---|---|
committer | Karel Klic <kklic@redhat.com> | 2010-02-15 15:09:34 +0100 |
commit | 3a0729e697b24d4d30e3a1a008f83ca605aaad5d (patch) | |
tree | 95b903e1fa5ae7f5bc61b50efc270d90e690a1b9 | |
parent | ba32bbb864eec78e0d17f5a75fc3a58d5762d04a (diff) | |
parent | c1dc31dbc13f592f2936622d9e15f791b6dfdca3 (diff) | |
download | abrt-3a0729e697b24d4d30e3a1a008f83ca605aaad5d.tar.gz abrt-3a0729e697b24d4d30e3a1a008f83ca605aaad5d.tar.xz abrt-3a0729e697b24d4d30e3a1a008f83ca605aaad5d.zip |
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
-rw-r--r-- | abrt.spec | 3 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/Gui/CCMainWindow.py | 38 | ||||
-rw-r--r-- | src/Gui/ccgui.glade | 2 |
4 files changed, 29 insertions, 16 deletions
@@ -3,7 +3,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.0.7 +Version: 1.0.8 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -409,6 +409,7 @@ fi %changelog * Fri Feb 12 2010 Jiri Moskovcak <jmoskovc@redhat.com> 1.0.7-1 +- enabled column sorting rhbz#541853 - Load plugin settings also from ~/.abrt/*.conf (kklic@redhat.com) - fix bz#541088 "abrt should not catch python excp EPIPE" (vda.linux@googlemail.com) - fix bz#554242 "Cannot tab between input areas in report dialog" (vda.linux@googlemail.com) diff --git a/configure.ac b/configure.ac index 425c5ac5..a635ddc8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([abrt], [1.0.7], [crash-catcher@fedorahosted.org]) +AC_INIT([abrt], [1.0.8], [crash-catcher@fedorahosted.org]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) diff --git a/src/Gui/CCMainWindow.py b/src/Gui/CCMainWindow.py index c0666f07..dfcfaf15 100644 --- a/src/Gui/CCMainWindow.py +++ b/src/Gui/CCMainWindow.py @@ -65,12 +65,18 @@ class MainWindow(): #init the dumps treeview self.dlist = self.wTree.get_widget("tvDumps") #rows of items with: - #icon, package_name, application, date, crash_rate, user, is_reported, ?object? - self.dumpsListStore = gtk.ListStore(gtk.gdk.Pixbuf, str,str,str,str,str,bool, object) - # set filter - modelfilter = self.dumpsListStore.filter_new() - modelfilter.set_visible_func(self.filter_dumps, None) - self.dlist.set_model(modelfilter) + ICON_COL = 0 + PACKAGE_COL = 1 + APPLICATION_COL = 2 + TIME_STR_COL = 3 + CRASH_RATE_COL = 4 + USER_COL = 5 + IS_REPORTED_COL = 6 + UNIX_TIME_COL = 7 + DUMP_OBJECT_COL = 8 + #icon, package_name, application, date, crash_rate, user, is_reported, time_in_sec ?object? + self.dumpsListStore = gtk.ListStore(gtk.gdk.Pixbuf, str,str,str,str,str,bool, int, object) + self.dlist.set_model(self.dumpsListStore) # add pixbuff separatelly icon_column = gtk.TreeViewColumn(_("Icon")) icon_column.cell = gtk.CellRendererPixbuf() @@ -79,13 +85,17 @@ class MainWindow(): icon_column.pack_start(icon_column.cell, False) icon_column.set_attributes(icon_column.cell, pixbuf=(n-1), cell_background_set=6) # =============================================== - columns = [None]*4 - columns[0] = gtk.TreeViewColumn(_("Package")) - columns[1] = gtk.TreeViewColumn(_("Application")) - columns[2] = gtk.TreeViewColumn(_("Date")) - columns[3] = gtk.TreeViewColumn(_("Crash count")) - column = gtk.TreeViewColumn(_("User")) - columns.append(column) + columns = [] + columns.append(gtk.TreeViewColumn(_("Package"))) + columns[-1].set_sort_column_id(PACKAGE_COL) + columns.append(gtk.TreeViewColumn(_("Application"))) + columns[-1].set_sort_column_id(APPLICATION_COL) + columns.append(gtk.TreeViewColumn(_("Date"))) + columns[-1].set_sort_column_id(UNIX_TIME_COL) + columns.append(gtk.TreeViewColumn(_("Crash count"))) + columns[-1].set_sort_column_id(CRASH_RATE_COL) + columns.append(gtk.TreeViewColumn(_("User"))) + columns[-1].set_sort_column_id(USER_COL) # create list for column in columns: n = self.dlist.append_column(column) @@ -205,7 +215,7 @@ class MainWindow(): except Exception, ex: user = "UID: %s" % entry.getUID() n = self.dumpsListStore.append([icon, entry.getPackage(), entry.getExecutable(), - entry.getTime("%c"), entry.getCount(), user, entry.isReported(), entry]) + entry.getTime("%c"), entry.getCount(), user, entry.isReported(), entry.getTime(""), entry]) # activate the first row if any.. if n: # we can use (0,) as path for the first row, but what if API changes? diff --git a/src/Gui/ccgui.glade b/src/Gui/ccgui.glade index 652e6ff5..3050d656 100644 --- a/src/Gui/ccgui.glade +++ b/src/Gui/ccgui.glade @@ -265,6 +265,8 @@ Patrick Connelly <pcon@fedoraproject.org></property> <widget class="GtkTreeView" id="tvDumps"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="reorderable">True</property> + <property name="search_column">1</property> </widget> </child> </widget> |