From 2141cb9184c20be91e469b2bd4e4bb22e57faba3 Mon Sep 17 00:00:00 2001
From: Lucas Rocha <lucasr@gnome.org>
Date: Sat, 29 Mar 2008 22:13:50 +0000
Subject: Allow question dialogs to use custom button label text (Fixes bug

2008-03-30  Lucas Rocha  <lucasr@gnome.org>

	Allow question dialogs to use custom button label text (Fixes
	bug #335763). Patch from Cosimo Cecchi <anarki@lilik.it> and
	Thomas Thurman <tthurman@gnome.org>.

	* src/msg.c (zenity_msg_construct_question_dialog), (zenity_msg):
	dynamically add dialog buttons with provided labels.
	* src/option.c (zenity_option_free): free input labels.
	(zenity_question_post_callback): set button labels provided by the
	respective command line options.
	* src/zenity.glade: remove pre-defined dialog button from question
	dialog.
	* src/zenity.h: added ok_label and cancel_label to ZenityMsgData.

svn path=/trunk/; revision=1346
---
 src/zenity.glade | 33 +++++----------------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

(limited to 'src/zenity.glade')

diff --git a/src/zenity.glade b/src/zenity.glade
index c496dcc..ffda0e8 100644
--- a/src/zenity.glade
+++ b/src/zenity.glade
@@ -242,6 +242,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="zenity_warning_text">
 	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
 	      <property name="label" translatable="yes">Are you sure you want to proceed?</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">True</property>
@@ -339,36 +340,9 @@
       <property name="spacing">14</property>
 
       <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area3">
+	<widget class="GtkHButtonBox" id="zenity_question_button_box">
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="zenity_question_cancel_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="zenity_question_ok_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="has_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-5</property>
-	    </widget>
-	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
@@ -405,6 +379,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="zenity_question_text">
 	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
 	      <property name="label" translatable="yes">Are you sure you want to proceed?</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">True</property>
@@ -872,6 +847,7 @@
 	      <child>
 		<widget class="GtkLabel" id="zenity_error_text">
 		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
 		  <property name="label" translatable="yes">An error has occurred.</property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">True</property>
@@ -1126,6 +1102,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="zenity_info_text">
 	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
 	      <property name="label" translatable="yes">All updates are complete.</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">True</property>
-- 
cgit v1.2.3-54-g00ecf