[26400] in Source-Commits
/svn/athena r25550 - in trunk/athena/bin/bugme: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sun Jun 3 11:20:55 2012
Date: Sun, 3 Jun 2012 11:20:53 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201206031520.q53FKrKB018496@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-06-03 11:20:53 -0400 (Sun, 03 Jun 2012)
New Revision: 25550
Modified:
trunk/athena/bin/bugme/bugme
trunk/athena/bin/bugme/bugme.glade
trunk/athena/bin/bugme/debian/changelog
Log:
In bugme:
* Minor UI tweaks; this won't always be used on a "Quickstation"
* Add a "Log out" button to the warning dialog, in case the user somehow
minimized the kiosk browser and can't get it back
Modified: trunk/athena/bin/bugme/bugme
===================================================================
--- trunk/athena/bin/bugme/bugme 2012-06-01 17:28:03 UTC (rev 25549)
+++ trunk/athena/bin/bugme/bugme 2012-06-03 15:20:53 UTC (rev 25550)
@@ -106,7 +106,10 @@
self.nagDialog.show()
def on_dialog_response(self, dialog, response_id):
- self.nagDialog.hide()
+ if response_id == gtk.RESPONSE_CLOSE:
+ sys.exit(0)
+ elif response_id == gtk.RESPONSE_OK:
+ self.nagDialog.hide()
def visibility_event_handler(self, widget, event):
if event.state != gtk.gdk.VISIBILITY_UNOBSCURED:
Modified: trunk/athena/bin/bugme/bugme.glade
===================================================================
--- trunk/athena/bin/bugme/bugme.glade 2012-06-01 17:28:03 UTC (rev 25549)
+++ trunk/athena/bin/bugme/bugme.glade 2012-06-03 15:20:53 UTC (rev 25550)
@@ -71,9 +71,20 @@
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
<child>
+ <widget class="GtkButton" id="exitbutton1">
+ <property name="visible">True</property>
+ <property name="can_default">False</property>
+ <property name="can_focus">True</property>
+ <property name="label">Log Out</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="response_id">-7</property>
+ </widget>
+ </child>
+ <child>
<widget class="GtkButton" id="okbutton1">
<property name="visible">True</property>
<property name="can_default">True</property>
@@ -139,7 +150,7 @@
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span font_desc="13">Athena Quickstation</span></property>
+ <property name="label" translatable="yes"><span font_desc="13">Login Session</span></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
Modified: trunk/athena/bin/bugme/debian/changelog
===================================================================
--- trunk/athena/bin/bugme/debian/changelog 2012-06-01 17:28:03 UTC (rev 25549)
+++ trunk/athena/bin/bugme/debian/changelog 2012-06-03 15:20:53 UTC (rev 25550)
@@ -8,9 +8,11 @@
* Add a feature which forces a logout after a 1.5x the "allowed"
duration (Trac: #830 and #831). Patch from Luke Faraone.
* Allow speciyfing Glade file on command line for debugging
- * Minor UI tweaks
+ * Minor UI tweaks; this won't always be used on a "Quickstation"
+ * Add a "Log out" button to the warning dialog, in case the user somehow
+ minimized the kiosk browser and can't get it back
- -- Jonathan Reed <jdreed@mit.edu> Tue, 29 May 2012 21:20:01 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Sun, 03 Jun 2012 11:20:32 -0400
debathena-bugme (10.0.3-0debathena1) unstable; urgency=low
