Author: reinhard
Date: 2009-10-28 09:59:53 -0500 (Wed, 28 Oct 2009)
New Revision: 10017
Modified:
trunk/gnue-forms/src/uidrivers/curses/widgets/form.py
trunk/gnue-forms/src/uidrivers/qt3/widgets/form.py
trunk/gnue-forms/src/uidrivers/qt4/widgets/form.py
trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
Log:
Fixed record counter for resultsets with no records.
Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/form.py 2009-10-28
14:41:59 UTC (rev 10016)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/form.py 2009-10-28
14:59:53 UTC (rev 10017)
@@ -379,9 +379,16 @@
tip = ('%-' + str(x - 25) + 's') % self.__tip
- recstr = '%d/%d' % (self.__cur_rec, self.__max_rec)
- pagestr = '%d/%d' % (self.__cur_page, self.__max_page)
+ if self.__cur_rec == 0 or self.__max_rec == 0:
+ recstr = ''
+ else:
+ recstr = '%d/%d' % (self.__cur_rec, self.__max_rec)
+ if self.__cur_page == 0 or self.__max_page == 0:
+ pagestr = ''
+ else:
+ pagestr = '%d/%d' % (self.__cur_page, self.__max_page)
+
self.__window.addstr(y - 2, 0, '%s' % o(tip))
self.__window.addstr(y - 2, x - 24, '%-4s' % o(self.__status))
self.__window.addstr(y - 2, x - 19, '%-3s' % o(self.__insert))
Modified: trunk/gnue-forms/src/uidrivers/qt3/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/widgets/form.py 2009-10-28 14:41:59 UTC
(rev 10016)
+++ trunk/gnue-forms/src/uidrivers/qt3/widgets/form.py 2009-10-28 14:59:53 UTC
(rev 10017)
@@ -259,13 +259,19 @@
if insert_status is not None:
self.__status_fields[2].setText(insert_status)
- if record_number and record_count:
- self.__status_fields[3].setText(
- "%s/%s" % (record_number, record_count))
+ if record_number is not None and record_count is not None:
+ if record_number == 0 or record_count == 0:
+ self.__status_fields[3].setText("")
+ else:
+ self.__status_fields[3].setText(
+ "%s/%s" % (record_number, record_count))
- if page_number and page_count:
- self.__status_fields[4].setText(
- "%s/%s" % (page_number, page_count))
+ if page_number is not None and page_count is not None:
+ if page_number == 0 or page_count == 0:
+ self.__status_fields[4].setText("")
+ else:
+ self.__status_fields[4].setText(
+ "%s/%s" % (page_number, page_count))
# -------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/qt4/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt4/widgets/form.py 2009-10-28 14:41:59 UTC
(rev 10016)
+++ trunk/gnue-forms/src/uidrivers/qt4/widgets/form.py 2009-10-28 14:59:53 UTC
(rev 10017)
@@ -265,13 +265,19 @@
if insert_status is not None:
self.__status_fields[2].setText(insert_status)
- if record_number and record_count:
- self.__status_fields[3].setText(
- "%s/%s" % (record_number, record_count))
+ if record_number is not None and record_count is not None:
+ if record_number == 0 or record_count == 0:
+ self.__status_fields[3].setText("")
+ else:
+ self.__status_fields[3].setText(
+ "%s/%s" % (record_number, record_count))
- if page_number and page_count:
- self.__status_fields[4].setText(
- "%s/%s" % (page_number, page_count))
+ if page_number is not None and page_count is not None:
+ if page_number == 0 or page_count == 0:
+ self.__status_fields[4].setText("")
+ else:
+ self.__status_fields[4].setText(
+ "%s/%s" % (page_number, page_count))
# -------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2009-10-28 14:41:59 UTC
(rev 10016)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2009-10-28 14:59:53 UTC
(rev 10017)
@@ -397,13 +397,19 @@
if insert_status is not None:
self.__status_bar.SetStatusText(insert_status, 2)
- if record_number and record_count:
- self.__status_bar.SetStatusText(
- "%s/%s" % (record_number, record_count), 3)
+ if record_number is not None and record_count is not None:
+ if record_number == 0 or record_count == 0:
+ self.__status_bar.SetStatusText("", 3)
+ else:
+ self.__status_bar.SetStatusText(
+ "%s/%s" % (record_number, record_count), 3)
- if page_number and page_count:
- self.__status_bar.SetStatusText(
- "%s/%s" % (page_number, page_count), 4)
+ if page_number is not None and page_count is not None:
+ if page_number == 0 or page_count == 0:
+ self.__status_bar.SetStatusText("", 4)
+ else:
+ self.__status_bar.SetStatusText(
+ "%s/%s" % (page_number, page_count), 4)
# -------------------------------------------------------------------------
_______________________________________________
commit-gnue mailing list
commit-gnue@gnu.org
http://lists.gnu.org/mailman/listinfo/commit-gnue
