[26403] in Source-Commits

home help back first fref pref prev next nref lref last post

Re: /svn/athena r25550 - in trunk/athena/bin/bugme: . debian

daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Sun Jun 3 12:59:27 2012

Date: Sun, 3 Jun 2012 12:59:24 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201206031520.q53FKrKB018496@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1206031255050.18441@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed

On Sun, 3 Jun 2012, Jonathan D Reed wrote:

> 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>

I'll assume you've looked at the results and prefer the "full 
justification".

>
> 	  <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>

Is there really no version of the symbolic constant GTK_RESPONSE_CLOSE 
that is in scope here?  The hardcoded value makes things harder to read...


But, it should still work, so ACK.
-Ben


> +	    </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">&lt;span font_desc=&quot;13&quot;&gt;Athena Quickstation&lt;/span&gt;</property>
> +	      <property name="label" translatable="yes">&lt;span font_desc=&quot;13&quot;&gt;Login Session&lt;/span&gt;</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
>
>
>

home help back first fref pref prev next nref lref last post