From 786046ce6fa501a3cf495a5ac3d29d9cd71cc6ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= 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 | 36 +++++++++++------- src/frontends/gtk/glade/text.glade | 15 ++++++++ src/frontends/gtk/glade/url.glade | 40 ++++++++++++++------ 11 files changed, 124 insertions(+), 64 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 + + * 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 * 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 @@ 200 True False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST True @@ -33,7 +38,9 @@ gtk-close True GTK_RELIEF_NORMAL + True -7 + 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 @@ False True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST @@ -33,6 +38,7 @@ (_Left True GTK_RELIEF_NORMAL + True False False True @@ -51,6 +57,7 @@ ()_Both True GTK_RELIEF_NORMAL + True False False True @@ -70,6 +77,7 @@ )_Right True GTK_RELIEF_NORMAL + True False False True @@ -100,6 +108,7 @@ True True GTK_RELIEF_NORMAL + True @@ -149,9 +158,10 @@ True True True - _OK - True + gtk-ok + True GTK_RELIEF_NORMAL + True 0 @@ -164,9 +174,10 @@ True True - _Apply - True + gtk-apply + True GTK_RELIEF_NORMAL + True 0 @@ -179,9 +190,10 @@ True True - _Close - True + gtk-close + True GTK_RELIEF_NORMAL + True 0 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 @@ GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False - False + 300 + 260 + True False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST @@ -26,17 +33,17 @@ 20 - - + + - - + + 0 - True - True + False + False @@ -46,27 +53,6 @@ False 3 - - - True - Functions: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - 3 @@ -81,7 +67,7 @@ True True - False + True False False True @@ -104,6 +90,8 @@ gtk-close True GTK_RELIEF_NORMAL + True + 0 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 @@ GTK_RELIEF_NORMAL True -6 + 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 @@ True True + True True True 0 @@ -190,7 +191,7 @@ True True - _Case sensitive + Case s_ensitive True GTK_RELIEF_NORMAL True 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 @@ False False False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST True @@ -25,26 +30,15 @@ GTK_BUTTONBOX_END - + True True True True - gtk-ok - True - GTK_RELIEF_NORMAL - -5 - - - - - - True - True - True gtk-apply True GTK_RELIEF_NORMAL + True -10 @@ -57,7 +51,23 @@ gtk-cancel True GTK_RELIEF_NORMAL + True -6 + + + + + + + True + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + -5 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 @@ False True False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST True @@ -30,6 +35,7 @@ True True GTK_RELIEF_NORMAL + True 0 @@ -39,6 +45,10 @@ 0.5 0 0 + 0 + 0 + 0 + 0 @@ -98,7 +108,9 @@ gtk-cancel True GTK_RELIEF_NORMAL + True -6 + @@ -110,6 +122,7 @@ gtk-apply True GTK_RELIEF_NORMAL + True -10 @@ -118,10 +131,12 @@ True True + True True gtk-ok True GTK_RELIEF_NORMAL + True -5 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 @@ False False False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST True @@ -30,6 +35,7 @@ True True GTK_RELIEF_NORMAL + True 0 @@ -39,6 +45,10 @@ 0.5 0 0 + 0 + 0 + 0 + 0 @@ -90,18 +100,6 @@ - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - -5 - - - True @@ -110,6 +108,7 @@ gtk-apply True GTK_RELIEF_NORMAL + True -10 @@ -122,7 +121,23 @@ gtk-cancel True GTK_RELIEF_NORMAL + True -6 + + + + + + + True + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + -5 @@ -151,6 +166,7 @@ _HTML type True GTK_RELIEF_NORMAL + True False False True