[gtk+/resolution-independence: 84/86] Merge branch 'master' into resolution-independence
- From: Davyd Madeley <davyd src gnome org>
- To: svn-commits-list gnome org
- Subject: [gtk+/resolution-independence: 84/86] Merge branch 'master' into resolution-independence
- Date: Mon, 15 Jun 2009 23:50:45 -0400 (EDT)
commit 48d73e164e7e1034e80a793250aa6e7f423b36e7
Merge: b1277f3... 09f41f5...
Author: Davyd Madeley <davyd madeley id au>
Date: Tue Jun 16 11:20:09 2009 +0800
Merge branch 'master' into resolution-independence
Conflicts:
demos/gtk-demo/appwindow.c
gtk/gtk.symbols
gtk/gtkfilechooserdefault.c
gtk/gtkhbbox.c
gtk/gtkprintunixdialog.c
gtk/gtkvbbox.c
Makefile.am | 2 +-
NEWS | 120 ++-
README.in | 8 +
configure.in | 132 +-
demos/gtk-demo/appwindow.c | 199 ++-
docs/reference/gtk/gtk-docs.sgml | 1 +
docs/reference/gtk/gtk-sections.txt | 40 +
docs/reference/gtk/gtk.types | 1 +
docs/reference/gtk/migrating-GtkBuilder.sgml | 2 +-
docs/reference/gtk/tmpl/filesystem.sgml | 36 +-
docs/reference/gtk/tmpl/gtkactivatable.sgml | 32 +-
docs/reference/gtk/tmpl/gtkenums.sgml | 8 +-
docs/reference/gtk/tmpl/gtkimcontext.sgml | 110 +-
docs/reference/gtk/tmpl/gtklabel.sgml | 27 +-
docs/reference/gtk/tmpl/gtkmenu.sgml | 2 +
docs/reference/gtk/tmpl/gtkprintoperation.sgml | 46 +
docs/reference/gtk/tmpl/gtkprintsettings.sgml | 1 +
docs/reference/gtk/tmpl/gtkprintunixdialog.sgml | 60 +
docs/reference/gtk/tmpl/gtksettings.sgml | 28 +
docs/reference/gtk/tmpl/gtktoolshell.sgml | 30 +-
gdk-pixbuf/gdk-pixbuf-io.c | 2 +-
gdk-pixbuf/gdk-pixdata.c | 7 +-
gdk/x11/gdkapplaunchcontext-x11.c | 8 +-
gdk/x11/gdkdisplay-x11.c | 7 +-
gdk/x11/gdkdnd-x11.c | 7 +-
gdk/x11/gdkproperty-x11.c | 29 +-
gdk/x11/gdkscreen-x11.c | 5 +-
gdk/x11/gdkwindow-x11.c | 30 +-
gtk/Makefile.am | 2 +
gtk/gtk.h | 1 +
gtk/gtk.symbols | 31 +
gtk/gtkaboutdialog.c | 2 +-
gtk/gtkassistant.c | 34 +-
gtk/gtkbbox.c | 349 ++++
gtk/gtkbuilderparser.c | 36 +-
gtk/gtkcellrendererpixbuf.c | 155 ++-
gtk/gtkcellview.c | 4 +-
gtk/gtkcellview.h | 2 +
gtk/gtkcombobox.c | 3 +-
gtk/gtkdnd.c | 146 ++-
gtk/gtkentry.c | 5 +
gtk/gtkentrycompletion.c | 6 +-
gtk/gtkenums.h | 12 +-
gtk/gtkfilechooserdefault.c | 301 ++-
gtk/gtkfilechooserprivate.h | 6 +
gtk/gtkfilechoosersettings.c | 125 ++
gtk/gtkfilechoosersettings.h | 19 +
gtk/gtkfilesystemmodel.c | 3 +-
gtk/gtkfontsel.c | 2 +-
gtk/gtkhbbox.c | 197 +--
gtk/gtkinfobar.c | 1263 ++++++++++++
gtk/gtkinfobar.h | 116 ++
gtk/gtkmessagedialog.h | 10 +-
gtk/gtknotebook.c | 35 +-
gtk/gtkpathbar.c | 106 +-
gtk/gtkprintoperation-private.h | 2 +
gtk/gtkprintoperation-unix.c | 6 +
gtk/gtkprintoperation.c | 173 ++-
gtk/gtkprintoperation.h | 6 +
gtk/gtkprintsettings.c | 6 +
gtk/gtkprintunixdialog.c | 241 +++-
gtk/gtkprintunixdialog.h | 7 +
gtk/gtkrecentmanager.c | 7 +-
gtk/gtkrecentmanager.h | 2 +-
gtk/gtkstatusicon.c | 3 +
gtk/gtkstock.c | 2 +-
gtk/gtktooltip.c | 8 +-
gtk/gtktreeprivate.h | 2 +
gtk/gtktreeview.c | 43 +-
gtk/gtktreeviewcolumn.c | 2 +
gtk/gtktreeviewcolumn.h | 2 +
gtk/gtkvbbox.c | 197 +--
gtk/tests/builder.c | 51 +
gtk/updateiconcache.c | 2 +-
modules/printbackends/Makefile.am | 2 +-
modules/printbackends/cups/gtkcupsutils.c | 2 +-
modules/printbackends/cups/gtkprintbackendcups.c | 33 +
modules/printbackends/papi/Makefile.am | 2 +
po-properties/af.po | 200 ++-
po-properties/am.po | 198 ++-
po-properties/ang.po | 196 ++-
po-properties/ar.po | 200 ++-
po-properties/as.po | 201 ++-
po-properties/ast.po | 196 ++-
po-properties/az.po | 200 ++-
po-properties/az_IR.po | 196 ++-
po-properties/be.po | 200 ++-
po-properties/be latin po | 200 ++-
po-properties/bg.po | 200 ++-
po-properties/bn.po | 202 ++-
po-properties/bn_IN.po | 202 ++-
po-properties/br.po | 196 ++-
po-properties/bs.po | 200 ++-
po-properties/ca.po | 200 ++-
po-properties/ca valencia po | 200 ++-
po-properties/crh.po | 203 ++-
po-properties/cs.po | 200 ++-
po-properties/cy.po | 205 ++-
po-properties/da.po | 206 ++-
po-properties/de.po | 201 ++-
po-properties/dz.po | 207 ++-
po-properties/el.po | 200 ++-
po-properties/en_CA.po | 200 ++-
po-properties/en_GB.po | 200 ++-
po-properties/eo.po | 196 ++-
po-properties/es.po | 198 ++-
po-properties/et.po | 200 ++-
po-properties/eu.po | 201 ++-
po-properties/fa.po | 199 ++-
po-properties/fi.po | 200 ++-
po-properties/fr.po | 200 ++-
po-properties/ga.po | 198 ++-
po-properties/gl.po | 200 ++-
po-properties/gu.po | 200 ++-
po-properties/he.po | 200 ++-
po-properties/hi.po | 200 ++-
po-properties/hr.po | 200 ++-
po-properties/hu.po | 200 ++-
po-properties/hy.po | 198 ++-
po-properties/ia.po | 198 ++-
po-properties/id.po | 204 ++-
po-properties/io.po | 196 ++-
po-properties/is.po | 200 ++-
po-properties/it.po | 203 ++-
po-properties/ja.po | 200 ++-
po-properties/ka.po | 200 ++-
po-properties/kn.po | 200 ++-
po-properties/ko.po | 200 ++-
po-properties/ku.po | 196 ++-
po-properties/li.po | 200 ++-
po-properties/lt.po | 200 ++-
po-properties/lv.po | 200 ++-
po-properties/mai.po | 200 ++-
po-properties/mi.po | 198 ++-
po-properties/mk.po | 200 ++-
po-properties/ml.po | 200 ++-
po-properties/mn.po | 204 ++-
po-properties/mr.po | 200 ++-
po-properties/ms.po | 200 ++-
po-properties/nb.po | 200 ++-
po-properties/ne.po | 200 ++-
po-properties/nl.po | 201 ++-
po-properties/nn.po | 200 ++-
po-properties/nso.po | 200 ++-
po-properties/oc.po | 198 ++-
po-properties/or.po | 406 ++--
po-properties/pa.po | 200 ++-
po-properties/pl.po | 200 ++-
po-properties/ps.po | 199 ++-
po-properties/pt.po | 200 ++-
po-properties/pt_BR.po | 200 ++-
po-properties/ro.po | 200 ++-
po-properties/ru.po | 200 ++-
po-properties/rw.po | 200 ++-
po-properties/si.po | 200 ++-
po-properties/sk.po | 200 ++-
po-properties/sl.po | 200 ++-
po-properties/sq.po | 200 ++-
po-properties/sr.po | 200 ++-
po-properties/sr ije po | 200 ++-
po-properties/sr latin po | 200 ++-
po-properties/sv.po | 200 ++-
po-properties/ta.po | 200 ++-
po-properties/te.po | 200 ++-
po-properties/th.po | 198 ++-
po-properties/tk.po | 198 ++-
po-properties/tr.po | 203 ++-
po-properties/tt.po | 199 ++-
po-properties/uk.po | 200 ++-
po-properties/ur.po | 196 ++-
po-properties/uz.po | 199 ++-
po-properties/uz cyrillic po | 199 ++-
po-properties/vi.po | 200 ++-
po-properties/wa.po | 208 ++-
po-properties/xh.po | 200 ++-
po-properties/yi.po | 200 ++-
po-properties/zh_CN.po | 200 ++-
po-properties/zh_HK.po | 200 ++-
po-properties/zh_TW.po | 200 ++-
po/ChangeLog | 4 +
po/Makefile.in.in | 2 +
po/af.po | 441 +++--
po/am.po | 438 +++--
po/ang.po | 434 +++--
po/ar.po | 440 +++--
po/as.po | 440 +++--
po/ast.po | 440 +++--
po/az.po | 437 +++--
po/az_IR.po | 432 +++--
po/be.po | 441 +++--
po/be latin po | 440 +++--
po/bg.po | 452 +++--
po/bn.po | 434 +++--
po/bn_IN.po | 484 +++---
po/br.po | 434 +++--
po/bs.po | 437 +++--
po/ca.po | 443 +++--
po/ca valencia po | 439 +++--
po/crh.po | 441 +++--
po/cs.po | 440 +++--
po/cy.po | 439 +++--
po/da.po | 2147 +++++++++++-----------
po/de.po | 2214 +++++++++++-----------
po/dz.po | 437 +++--
po/el.po | 2209 +++++++++++-----------
po/en_CA.po | 436 +++--
po/en_GB.po | 443 +++--
po/eo.po | 437 +++--
po/es.po | 2157 +++++++++++-----------
po/et.po | 943 +++-------
po/eu.po | 440 +++--
po/fa.po | 437 +++--
po/fi.po | 440 +++--
po/fr.po | 473 +++---
po/ga.po | 1626 +++++------------
po/gl.po | 443 +++--
po/gu.po | 440 +++--
po/he.po | 440 +++--
po/hi.po | 464 +++--
po/hr.po | 436 +++--
po/hu.po | 440 +++--
po/hy.po | 437 +++--
po/ia.po | 434 +++--
po/id.po | 437 +++--
po/io.po | 435 +++--
po/is.po | 434 +++--
po/it.po | 459 +++--
po/ja.po | 440 +++--
po/ka.po | 440 +++--
po/kn.po | 440 +++--
po/ko.po | 440 +++--
po/ku.po | 436 +++--
po/li.po | 438 +++--
po/lt.po | 440 +++--
po/lv.po | 440 +++--
po/mai.po | 440 +++--
po/mi.po | 434 +++--
po/mk.po | 436 +++--
po/ml.po | 453 +++--
po/mn.po | 438 +++--
po/mr.po | 440 +++--
po/ms.po | 437 +++--
po/nb.po | 490 +++---
po/ne.po | 437 +++--
po/nl.po | 451 +++--
po/nn.po | 444 +++--
po/nso.po | 437 +++--
po/oc.po | 435 +++--
po/or.po | 440 +++--
po/pa.po | 440 +++--
po/pl.po | 440 +++--
po/ps.po | 436 +++--
po/pt.po | 446 +++--
po/pt_BR.po | 452 +++--
po/ro.po | 440 +++--
po/ru.po | 490 +++---
po/rw.po | 443 +++--
po/si.po | 436 +++--
po/sk.po | 440 +++--
po/sl.po | 440 +++--
po/sq.po | 441 +++--
po/sr.po | 446 +++--
po/sr ije po | 441 +++--
po/sr latin po | 446 +++--
po/sv.po | 443 +++--
po/ta.po | 440 +++--
po/te.po | 440 +++--
po/th.po | 446 +++--
po/tk.po | 434 +++--
po/tr.po | 442 +++--
po/tt.po | 437 +++--
po/uk.po | 440 +++--
po/ur.po | 433 +++--
po/uz.po | 438 +++--
po/uz cyrillic po | 438 +++--
po/vi.po | 440 +++--
po/wa.po | 434 +++--
po/xh.po | 437 +++--
po/yi.po | 438 +++--
po/zh_CN.po | 440 +++--
po/zh_HK.po | 443 +++--
po/zh_TW.po | 443 +++--
tests/Makefile.am | 3 +
tests/testfilechooser.c | 18 +
tests/testorientable.c | 111 ++
285 files changed, 43767 insertions(+), 34798 deletions(-)
---
diff --cc demos/gtk-demo/appwindow.c
index b7e4fec,8ff9065..3a0c817
--- a/demos/gtk-demo/appwindow.c
+++ b/demos/gtk-demo/appwindow.c
@@@ -537,11 -553,11 +553,12 @@@ do_appwindow (GtkWidget *do_widget
0, 0);
gtk_window_set_default_size (GTK_WINDOW (window),
- GTK_SIZE_ONE_TWELFTH_EM (200), GTK_SIZE_ONE_TWELFTH_EM (200));
-
- 200, 200);
++ GTK_SIZE_ONE_TWELFTH_EM (200),
++ GTK_SIZE_ONE_TWELFTH_EM (200));
+
contents = gtk_text_view_new ();
gtk_widget_grab_focus (contents);
-
+
gtk_container_add (GTK_CONTAINER (sw),
contents);
diff --cc gtk/gtk.symbols
index 7b253e4,ac4fa2c..43126fe
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@@ -5201,30 -5168,24 +5214,48 @@@ gtk_win32_embed_widget_get_type G_GNUC_
#endif
#endif
+#if IN_HEADER(__GTK_SIZE_H__)
+#if IN_FILE(__GTK_SIZE_C__)
+gtk_enable_resolution_independence
+gtk_size_em
+gtk_size_mm
+gtk_size_get_unit
+gtk_size_get_em
+gtk_size_get_mm
+gtk_size_to_pixel
+gtk_size_to_pixel_double
+gtk_size_to_string
+gtk_param_size_get_type G_GNUC_CONST
+gtk_param_spec_size
+gtk_value_set_size
+gtk_value_get_size
+gtk_value_size_skip_conversion
+gtk_param_usize_get_type G_GNUC_CONST
+gtk_param_spec_usize
+gtk_value_set_usize
+gtk_value_get_usize
+gtk_value_usize_skip_conversion
+#endif
+#endif
+
+ #if IN_HEADER(__GTK_INFO_BAR_H__)
+ #if IN_FILE(__GTK_INFO_BAR_C__)
+ gtk_info_bar_get_type G_GNUC_CONST
+ gtk_info_bar_new
+ gtk_info_bar_new_with_buttons
+ gtk_info_bar_get_action_area
+ gtk_info_bar_get_content_area
+ gtk_info_bar_add_action_widget
+ gtk_info_bar_add_button
+ gtk_info_bar_add_buttons
+ gtk_info_bar_set_response_sensitive
+ gtk_info_bar_set_default_response
+ gtk_info_bar_response
+ gtk_info_bar_set_message_type
+ gtk_info_bar_get_message_type
+ #endif
+ #endif
+
#ifdef INCLUDE_VARIABLES
gtk_binary_age
gtk_interface_age
diff --cc gtk/gtkfilechooserdefault.c
index 8333770,22836c1..4a8b8b2
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@@ -806,9 -798,11 +800,11 @@@ _gtk_file_chooser_default_init (GtkFile
impl->pending_select_files = NULL;
impl->location_mode = LOCATION_MODE_PATH_BAR;
impl->operation_mode = OPERATION_MODE_BROWSE;
+ impl->sort_column = FILE_LIST_COL_NAME;
+ impl->sort_order = GTK_SORT_ASCENDING;
impl->recent_manager = gtk_recent_manager_get_default ();
- gtk_box_set_spacing (GTK_BOX (impl), 12);
+ gtk_box_set_spacing (GTK_BOX (impl), GTK_SIZE_ONE_TWELFTH_EM (12));
set_file_system_backend (impl);
@@@ -5225,16 -5259,21 +5261,20 @@@ browse_widgets_create (GtkFileChooserDe
/* size group is used by the [+][-] buttons and the filter combo */
size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
- vbox = gtk_vbox_new (FALSE, 12);
+ vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (12));
/* Location widgets */
- hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (12));
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
- gtk_widget_show (hbox);
- impl->browse_path_bar_hbox = hbox;
- impl->browse_path_bar_hbox = gtk_hbox_new (FALSE, 12);
++ impl->browse_path_bar_hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (12));
+ gtk_box_pack_start (GTK_BOX (vbox), impl->browse_path_bar_hbox, FALSE, FALSE, 0);
+ gtk_widget_show (impl->browse_path_bar_hbox);
+ /* Size group that allows the path bar to be the same size between modes */
+ impl->browse_path_bar_size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
+ gtk_size_group_set_ignore_hidden (impl->browse_path_bar_size_group, FALSE);
+
+ /* Location button */
-
location_button_create (impl);
- gtk_box_pack_start (GTK_BOX (hbox), impl->location_button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->location_button, FALSE, FALSE, 0);
/* Path bar */
@@@ -9400,12 -9483,20 +9489,20 @@@ static voi
search_setup_widgets (GtkFileChooserDefault *impl)
{
GtkWidget *label;
+ GtkWidget *image;
- impl->search_hbox = gtk_hbox_new (FALSE, 12);
-
+ impl->search_hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (12));
+
+ /* Image */
+
+ image = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_BUTTON);
+ gtk_size_group_add_widget (GTK_SIZE_GROUP (impl->browse_path_bar_size_group), image);
- gtk_box_pack_start (GTK_BOX (impl->search_hbox), image, FALSE, FALSE, 5);
++ gtk_box_pack_start (GTK_BOX (impl->search_hbox), image, FALSE, FALSE, GTK_SIZE_ONE_TWELFTH_EM (5));
+
/* Label */
- label = gtk_label_new_with_mnemonic (_("_Search:"));
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), _("<b>_Search:</b>"));
gtk_box_pack_start (GTK_BOX (impl->search_hbox), label, FALSE, FALSE, 0);
/* Entry */
diff --cc gtk/gtkhbbox.c
index 160db1e,d852daf..0a6d443
--- a/gtk/gtkhbbox.c
+++ b/gtk/gtkhbbox.c
@@@ -29,32 -30,10 +30,26 @@@
#include "gtkintl.h"
#include "gtkalias.h"
-
- static void gtk_hbutton_box_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
- static void gtk_hbutton_box_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-
+static gint override_default_spacing = -1;
+static gint get_default_spacing (void);
+static void set_default_spacing (gint size);
-static gint default_spacing = 30;
static gint default_layout_style = GTK_BUTTONBOX_EDGE;
+static gint
+get_default_spacing (void)
+{
+ if (override_default_spacing != -1)
+ return override_default_spacing;
+ return GTK_SIZE_ONE_TWELFTH_EM(30);
+}
+
+static void
+set_default_spacing (gint size)
+{
+ override_default_spacing = size;
+}
+
G_DEFINE_TYPE (GtkHButtonBox, gtk_hbutton_box, GTK_TYPE_BUTTON_BOX)
static void
diff --cc gtk/gtkprintunixdialog.c
index 0d247d1,85fa6ea..8a1b523
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@@ -1805,9 -1857,10 +1859,10 @@@ create_main_page (GtkPrintUnixDialog *d
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
- table = gtk_table_new (3, 2, FALSE);
+ table = gtk_table_new (4, 2, FALSE);
+ priv->range_table = table;
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+ gtk_table_set_row_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (6));
+ gtk_table_set_col_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (12));
frame = wrap_in_frame (_("Range"), table);
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_widget_show (table);
diff --cc gtk/gtkvbbox.c
index 2a32bd8,5198e46..5b4bea8
--- a/gtk/gtkvbbox.c
+++ b/gtk/gtkvbbox.c
@@@ -30,30 -31,9 +31,25 @@@
#include "gtkalias.h"
- static void gtk_vbutton_box_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
- static void gtk_vbutton_box_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-
-static gint default_spacing = 10;
+static gint override_default_spacing = -1;
+static gint get_default_spacing (void);
+static void set_default_spacing (gint size);
static GtkButtonBoxStyle default_layout_style = GTK_BUTTONBOX_EDGE;
+static gint
+get_default_spacing (void)
+{
+ if (override_default_spacing != -1)
+ return override_default_spacing;
- return GTK_SIZE_ONE_TWELFTH_EM(30);
++ return GTK_SIZE_ONE_TWELFTH_EM(10);
+}
+
+static void
+set_default_spacing (gint size)
+{
+ override_default_spacing = size;
+}
+
G_DEFINE_TYPE (GtkVButtonBox, gtk_vbutton_box, GTK_TYPE_BUTTON_BOX)
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
