test/pdf-inspector.cc | 6 ++---- test/pdf-inspector.ui | 40 +++++++++++++++------------------------- 2 files changed, 17 insertions(+), 29 deletions(-)
New commits: commit 0d31edfa5617f4fecb04d5476de54a63b6146686 Author: Ross Lagerwall <[email protected]> Date: Fri Nov 30 09:23:55 2012 +0000 pdf-inspector Change from the deprecated GtkTable to GtkGrid This fixes the problem of the description_label height changing after its text changes which was introduced since the port to Gtk3. https://bugs.freedesktop.org/show_bug.cgi?id=57727 diff --git a/test/pdf-inspector.ui b/test/pdf-inspector.ui index 177dbe3..0956aa9 100644 --- a/test/pdf-inspector.ui +++ b/test/pdf-inspector.ui @@ -217,11 +217,10 @@ </packing> </child> <child> - <object class="GtkTable" id="table2"> + <object class="GtkGrid" id="grid"> <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">3</property> - <property name="homogeneous">False</property> + <property name="row-homogeneous">False</property> + <property name="column-homogeneous">False</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> @@ -243,12 +242,10 @@ <property name="angle">0</property> </object> <packing> + <property name="height">1</property> <property name="left_attach">0</property> - <property name="right_attach">1</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"/> + <property name="width">1</property> </packing> </child> <child> @@ -270,12 +267,10 @@ <property name="angle">0</property> </object> <packing> + <property name="height">1</property> <property name="left_attach">1</property> - <property name="right_attach">3</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"/> + <property name="width">2</property> </packing> </child> <child> @@ -297,12 +292,10 @@ <property name="angle">0</property> </object> <packing> + <property name="height">1</property> <property name="left_attach">0</property> - <property name="right_attach">1</property> <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="width">1</property> </packing> </child> <child> @@ -324,17 +317,16 @@ <property name="angle">0</property> </object> <packing> + <property name="height">1</property> <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="y_options">fill</property> + <property name="width">1</property> </packing> </child> <child> <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> - <property name="xalign">0.5</property> + <property name="xalign">1</property> <property name="yalign">0</property> <property name="xscale">0.0</property> <property name="yscale">0.0</property> @@ -342,6 +334,7 @@ <property name="bottom_padding">0</property> <property name="left_padding">0</property> <property name="right_padding">0</property> + <property name="hexpand">True</property> <child> <object class="GtkButton" id="analyze_button"> <property name="visible">True</property> @@ -354,12 +347,10 @@ </child> </object> <packing> + <property name="height">1</property> <property name="left_attach">2</property> - <property name="right_attach">3</property> <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="width">1</property> </packing> </child> </object> commit 9977a4f26b5698b0b85ca911e7392013941944e0 Author: Ross Lagerwall <[email protected]> Date: Tue Nov 13 15:49:44 2012 +0000 pdf-inspector: Remove deprectated has-separator property https://bugs.freedesktop.org/show_bug.cgi?id=57727 diff --git a/test/pdf-inspector.ui b/test/pdf-inspector.ui index 8e20b2f..177dbe3 100644 --- a/test/pdf-inspector.ui +++ b/test/pdf-inspector.ui @@ -26,7 +26,6 @@ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> commit 806d116a38c2a6552c9bcee2c6f753d7059c17aa Author: Ross Lagerwall <[email protected]> Date: Tue Nov 13 15:44:15 2012 +0000 pdf-inspector: Add correct title and copyright https://bugs.freedesktop.org/show_bug.cgi?id=57727 diff --git a/test/pdf-inspector.cc b/test/pdf-inspector.cc index b50683d..4775bc9 100644 --- a/test/pdf-inspector.cc +++ b/test/pdf-inspector.cc @@ -1,9 +1,8 @@ //======================================================================== // -// GDKSplashOutputDev.cc +// pdf-inspector.cc // -// Copyright 2003 Glyph & Cog, LLC -// Copyright 2004 Red Hat, Inc. (GDK port) +// Copyright 2005 Jonathan Blandford <[email protected]> // //======================================================================== commit 7d5bf74c19768fa3447819a4debff06d5d83900a Author: Ross Lagerwall <[email protected]> Date: Tue Nov 13 15:23:36 2012 +0000 pdf-inspector: Fix crash by not freeing filename_g It is not necessary because PDFDoc takes over filename_g and destroys it in its deconstructor. https://bugs.freedesktop.org/show_bug.cgi?id=57727 diff --git a/test/pdf-inspector.cc b/test/pdf-inspector.cc index 5598db6..b50683d 100644 --- a/test/pdf-inspector.cc +++ b/test/pdf-inspector.cc @@ -287,7 +287,6 @@ PdfInspector::load(const char *file_name) filename_g = new GooString (file_name); doc = new PDFDoc(filename_g, 0, 0); - delete filename_g; } if (doc && !doc->isOk()) _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
