From 786046ce6fa501a3cf495a5ac3d29d9cd71cc6ff Mon Sep 17 00:00:00 2001
From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= <larsbj@gullik.org>
Date: Sun, 26 Sep 2004 23:47:07 +0000
Subject: [PATCH] use stock and glade fixes from John

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9013 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/gtk/ChangeLog               |  7 ++++
 src/frontends/gtk/GBC.C                   |  4 +-
 src/frontends/gtk/GMathPanel.C            |  5 ++-
 src/frontends/gtk/glade/aboutlyx.glade    |  7 ++++
 src/frontends/gtk/glade/mathDelim.glade   | 24 +++++++++---
 src/frontends/gtk/glade/mathPanel.glade   | 46 +++++++++--------------
 src/frontends/gtk/glade/print.glade       |  1 +
 src/frontends/gtk/glade/search.glade      |  3 +-
 src/frontends/gtk/glade/tableCreate.glade | 28 +++++++++-----
 src/frontends/gtk/glade/text.glade        | 15 ++++++++
 src/frontends/gtk/glade/url.glade         | 34 ++++++++++++-----
 11 files changed, 117 insertions(+), 57 deletions(-)

diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index 9deab6c40d..da09431f41 100644
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-27  John Spray  <spray_john@users.sourceforge.net>
+
+	* GBC.C: Don't let the button controller set the label on GTK+
+	stock icons
+	* GMathPanel.C: resize-friendly packing
+	* glade/*.glade: misc tweaks
+
 2004-09-26  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
 	* Reordered and a lot of includes in a lot of files.
diff --git a/src/frontends/gtk/GBC.C b/src/frontends/gtk/GBC.C
index cb3e882837..a987ff9ba5 100644
--- a/src/frontends/gtk/GBC.C
+++ b/src/frontends/gtk/GBC.C
@@ -38,7 +38,9 @@ void GBC::setWidgetEnabled(Gtk::Widget * widget, bool enabled) const
 
 void GBC::setButtonLabel(Gtk::Button * btn, string const & label) const
 {
-	btn->set_label(Glib::locale_to_utf8(label));
+	//GTK+ Stock buttons take precedence
+	if (!btn->get_use_stock())
+		btn->set_label(Glib::locale_to_utf8(label));
 }
 
 } // namespace frontend
diff --git a/src/frontends/gtk/GMathPanel.C b/src/frontends/gtk/GMathPanel.C
index 7233c38e76..b453d1cf01 100644
--- a/src/frontends/gtk/GMathPanel.C
+++ b/src/frontends/gtk/GMathPanel.C
@@ -120,8 +120,8 @@ void GMathPanel::doBuild()
 	tableDown_.show();
 
 	xml_->get_widget("Vbox", vbox);
-	vbox->children().push_back(Gtk::Box_Helpers::Element(tableUp_));
-	vbox->children().push_back(Gtk::Box_Helpers::Element(tableDown_));
+	vbox->pack_start(tableUp_, false, false, 0);
+	vbox->pack_start(tableDown_, false, false, 0);
 
 	// Functions ListView
 	xml_->get_widget("Functions", functions_);
@@ -129,6 +129,7 @@ void GMathPanel::doBuild()
 	listStore_ = Gtk::ListStore::create(listCols_);
 	functions_->set_model(listStore_);
 	functions_->append_column("Functions", listCol_);
+		
 	listSel_ = functions_->get_selection();
 	listSel_->signal_changed().connect(
 		sigc::mem_fun(*this, &GMathPanel::onFunctionSelected));
diff --git a/src/frontends/gtk/glade/aboutlyx.glade b/src/frontends/gtk/glade/aboutlyx.glade
index c966986efa..d38a7916cf 100644
--- a/src/frontends/gtk/glade/aboutlyx.glade
+++ b/src/frontends/gtk/glade/aboutlyx.glade
@@ -12,6 +12,11 @@
   <property name="default_height">200</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -33,7 +38,9 @@
 	      <property name="label">gtk-close</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">-7</property>
+	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
 	    </widget>
 	  </child>
 	</widget>
diff --git a/src/frontends/gtk/glade/mathDelim.glade b/src/frontends/gtk/glade/mathDelim.glade
index c65deca4ff..2d6a3676f5 100644
--- a/src/frontends/gtk/glade/mathDelim.glade
+++ b/src/frontends/gtk/glade/mathDelim.glade
@@ -12,6 +12,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
 
   <child>
     <widget class="GtkVBox" id="vbox1">
@@ -33,6 +38,7 @@
 	      <property name="label" translatable="yes">(_Left</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="active">False</property>
 	      <property name="inconsistent">False</property>
 	      <property name="draw_indicator">True</property>
@@ -51,6 +57,7 @@
 	      <property name="label" translatable="yes">()_Both</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="active">False</property>
 	      <property name="inconsistent">False</property>
 	      <property name="draw_indicator">True</property>
@@ -70,6 +77,7 @@
 	      <property name="label" translatable="yes">)_Right</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="active">False</property>
 	      <property name="inconsistent">False</property>
 	      <property name="draw_indicator">True</property>
@@ -100,6 +108,7 @@
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 
 	      <child>
 		<placeholder/>
@@ -149,9 +158,10 @@
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="has_focus">True</property>
-	      <property name="label" translatable="yes"> _OK </property>
-	      <property name="use_underline">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>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -164,9 +174,10 @@
 	    <widget class="GtkButton" id="Apply">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">_Apply</property>
-	      <property name="use_underline">True</property>
+	      <property name="label">gtk-apply</property>
+	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -179,9 +190,10 @@
 	    <widget class="GtkButton" id="Close">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">_Close</property>
-	      <property name="use_underline">True</property>
+	      <property name="label">gtk-close</property>
+	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
diff --git a/src/frontends/gtk/glade/mathPanel.glade b/src/frontends/gtk/glade/mathPanel.glade
index 7b18423641..182403c6bb 100644
--- a/src/frontends/gtk/glade/mathPanel.glade
+++ b/src/frontends/gtk/glade/mathPanel.glade
@@ -9,8 +9,15 @@
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
-  <property name="resizable">False</property>
+  <property name="default_width">300</property>
+  <property name="default_height">260</property>
+  <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
 
   <child>
     <widget class="GtkHBox" id="hbox1">
@@ -26,17 +33,17 @@
 	  <property name="spacing">20</property>
 
 	  <child>
-		    <placeholder/>
-		  </child>
+	    <placeholder/>
+	  </child>
 
-		  <child>
-		    <placeholder/>
+	  <child>
+	    <placeholder/>
 	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
 	</packing>
       </child>
 
@@ -46,27 +53,6 @@
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">3</property>
 
-	  <child>
-	    <widget class="GtkLabel" id="label1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Functions:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
 	  <child>
 	    <widget class="GtkScrolledWindow" id="scrolledwindow1">
 	      <property name="border_width">3</property>
@@ -81,7 +67,7 @@
 		<widget class="GtkTreeView" id="Functions">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="headers_visible">False</property>
+		  <property name="headers_visible">True</property>
 		  <property name="rules_hint">False</property>
 		  <property name="reorderable">False</property>
 		  <property name="enable_search">True</property>
@@ -104,6 +90,8 @@
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
diff --git a/src/frontends/gtk/glade/print.glade b/src/frontends/gtk/glade/print.glade
index e1eea05029..583f6204ea 100644
--- a/src/frontends/gtk/glade/print.glade
+++ b/src/frontends/gtk/glade/print.glade
@@ -39,6 +39,7 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-6</property>
+	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
 	    </widget>
 	  </child>
 
diff --git a/src/frontends/gtk/glade/search.glade b/src/frontends/gtk/glade/search.glade
index eb2f7c7a0c..d051697a9b 100644
--- a/src/frontends/gtk/glade/search.glade
+++ b/src/frontends/gtk/glade/search.glade
@@ -80,6 +80,7 @@
 	<widget class="GtkEntry" id="FindEntry">
 	  <property name="visible">True</property>
 	  <property name="can_focus">True</property>
+	  <property name="has_focus">True</property>
 	  <property name="editable">True</property>
 	  <property name="visibility">True</property>
 	  <property name="max_length">0</property>
@@ -190,7 +191,7 @@
 	    <widget class="GtkCheckButton" id="CaseSensitive">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">_Case sensitive</property>
+	      <property name="label" translatable="yes">Case s_ensitive</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
diff --git a/src/frontends/gtk/glade/tableCreate.glade b/src/frontends/gtk/glade/tableCreate.glade
index 86fc0dc432..45c68c47f0 100644
--- a/src/frontends/gtk/glade/tableCreate.glade
+++ b/src/frontends/gtk/glade/tableCreate.glade
@@ -11,6 +11,11 @@
   <property name="modal">False</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -25,39 +30,44 @@
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
 	  <child>
-	    <widget class="GtkButton" id="Ok">
+	    <widget class="GtkButton" id="Apply">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
+	      <property name="label">gtk-apply</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-5</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-10</property>
 	    </widget>
 	  </child>
 
 	  <child>
-	    <widget class="GtkButton" id="Apply">
+	    <widget class="GtkButton" id="Cancel">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">gtk-apply</property>
+	      <property name="label">gtk-cancel</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-10</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-6</property>
+	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
 	    </widget>
 	  </child>
 
 	  <child>
-	    <widget class="GtkButton" id="Cancel">
+	    <widget class="GtkButton" id="Ok">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
+	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
+	      <property name="label">gtk-ok</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-6</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-5</property>
 	    </widget>
 	  </child>
 	</widget>
diff --git a/src/frontends/gtk/glade/text.glade b/src/frontends/gtk/glade/text.glade
index ecc1661ad8..1189d04d35 100644
--- a/src/frontends/gtk/glade/text.glade
+++ b/src/frontends/gtk/glade/text.glade
@@ -11,6 +11,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -30,6 +35,7 @@
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">0</property>
 
 	      <child>
@@ -39,6 +45,10 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xscale">0</property>
 		  <property name="yscale">0</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">0</property>
+		  <property name="right_padding">0</property>
 
 		  <child>
 		    <widget class="GtkHBox" id="hbox1">
@@ -98,7 +108,9 @@
 	      <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>
+	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
 	    </widget>
 	  </child>
 
@@ -110,6 +122,7 @@
 	      <property name="label">gtk-apply</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">-10</property>
 	    </widget>
 	  </child>
@@ -118,10 +131,12 @@
 	    <widget class="GtkButton" id="OK">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
+	      <property name="has_default">True</property>
 	      <property name="can_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>
diff --git a/src/frontends/gtk/glade/url.glade b/src/frontends/gtk/glade/url.glade
index 2c74ac6db3..d6c61d140f 100644
--- a/src/frontends/gtk/glade/url.glade
+++ b/src/frontends/gtk/glade/url.glade
@@ -11,6 +11,11 @@
   <property name="modal">False</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -30,6 +35,7 @@
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">0</property>
 
 	      <child>
@@ -39,6 +45,10 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xscale">0</property>
 		  <property name="yscale">0</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">0</property>
+		  <property name="right_padding">0</property>
 
 		  <child>
 		    <widget class="GtkHBox" id="hbox1">
@@ -91,38 +101,43 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkButton" id="Ok">
+	    <widget class="GtkButton" id="Apply">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
+	      <property name="label">gtk-apply</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-5</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-10</property>
 	    </widget>
 	  </child>
 
 	  <child>
-	    <widget class="GtkButton" id="Apply">
+	    <widget class="GtkButton" id="Cancel">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">gtk-apply</property>
+	      <property name="label">gtk-cancel</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-10</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-6</property>
+	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
 	    </widget>
 	  </child>
 
 	  <child>
-	    <widget class="GtkButton" id="Cancel">
+	    <widget class="GtkButton" id="Ok">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
+	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
+	      <property name="label">gtk-ok</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-6</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-5</property>
 	    </widget>
 	  </child>
 	</widget>
@@ -151,6 +166,7 @@
 	      <property name="label" translatable="yes">_HTML type</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="active">False</property>
 	      <property name="inconsistent">False</property>
 	      <property name="draw_indicator">True</property>
-- 
2.39.2