use stock and glade fixes from John

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9013 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index 9deab6c40d0b512311f02c5c984284bc59d7926b..da09431f411403705fd746ab2c1c7c8864569e50 100644 (file)
--- 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 cb3e882837232b89e9b2c61842cad934e3195d7a..a987ff9ba5042a34c2b5b48f7fd0b25f7512a179 100644 (file)
--- 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 7233c38e76a22da753642515fe2cbf8152a61157..b453d1cf019cd1320c61f96381968e93cbef7e55 100644 (file)
--- 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 c966986efac2c9a205d7c36832cd7cf1c44484c7..d38a7916cff2b41370eb463847f7713770256e48 100644 (file)
--- 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 c65deca4ff43a5dc72a3a5eb6004ff3809085376..2d6a3676f5e71345ccdfcbe2e5e55ac42e2c5001 100644 (file)
--- 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 7b18423641615548d7b6830793ac6afe7a8b4e26..182403c6bb835c0b96dbaea96cfd59f667c968b3 100644 (file)
--- 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 e1eea0502910f08a57720478facd905da4b45ec0..583f6204ea91bbc9b608d0c95263c86439784412 100644 (file)
--- 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 eb2f7c7a0ca6f806f9db48c2e037543eab00eda4..d051697a9be411ba7675ee562789aee3871d8a47 100644 (file)
--- 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 86fc0dc43228587f1cf40418172b839a5371bd1c..45c68c47f042310175c9e178b47c402c197280c1 100644 (file)
--- 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 ecc1661ad8c354ece49ff1f03b18325bcfd980c9..1189d04d35c3680e436a895e4634a51fad23503e 100644 (file)
--- 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 2c74ac6db3200ca43f06c8617f105d62844804ba..d6c61d140fba3da5529124c59b4c998d77ce3940 100644 (file)
--- 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>