diff --git a/cmake/modules/FindGTK.cmake b/cmake/modules/FindGTK.cmake index b934cf0..b152c21 100644 --- a/cmake/modules/FindGTK.cmake +++ b/cmake/modules/FindGTK.cmake @@ -48,7 +48,6 @@ if (NOT WIN32) pkgconfig(gtk+-2.0 _LibGTK2IncDir _LibGTK2LinkDir GTK2LinkFlags GTK2Cflags) pkgconfig(gdk-pixbuf-2.0 _LibGDK2PixbufIncDir _LibGDK2PixbufLinkDir GDK2PixbufLinkFlags GDK2PixbufCflags) - pkgconfig(libglade-2.0 _LibGLADE2IncDir _LibGLADE2LinkDir GLADE2LinkFlags GLADE2Cflags) pkgconfig(gthread-2.0 _LibGThread2IncDir _LibGThread2LinkDir GThread2LinkFlags GThread2Cflags) if (_LibGTK2IncDir AND _LibGDK2PixbufIncDir AND _LibGLADE2IncDir AND _LibGThread2IncDir) diff --git a/configure.ac b/configure.ac index 0bebbf9..e7db018 100644 --- a/configure.ac +++ b/configure.ac @@ -420,9 +420,9 @@ AC_ARG_ENABLE(gtk-test, enable_gtk_test=$enableval, enable_gtk_test="try") if test x$enable_gtk_test = xyes; then - PKG_CHECK_MODULES(GTK_TEST, gtk+-2.0 >= 2.8.0 gdk-pixbuf-2.0 libglade-2.0 gthread-2.0) + PKG_CHECK_MODULES(GTK_TEST, gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0) elif test x$enable_gtk_test = xtry; then - PKG_CHECK_MODULES(GTK_TEST, gtk+-2.0 >= 2.8.0 gdk-pixbuf-2.0 libglade-2.0 gthread-2.0, + PKG_CHECK_MODULES(GTK_TEST, gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0, [enable_gtk_test="yes"], [enable_gtk_test="no"]) fi diff --git a/test/Makefile.am b/test/Makefile.am index 8c873d3..38bf72d 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -94,4 +94,4 @@ pdf_fullrewrite_LDADD = \ EXTRA_DIST = \ pdf-operators.c \ - pdf-inspector.glade + pdf-inspector.ui diff --git a/test/pdf-inspector.cc b/test/pdf-inspector.cc index ce09757..8a2f242 100644 --- a/test/pdf-inspector.cc +++ b/test/pdf-inspector.cc @@ -29,7 +29,6 @@ #include "GlobalParams.h" #include "ErrorCodes.h" #include -#include // Mapping @@ -60,7 +59,7 @@ private: static void on_selection_changed (GtkTreeSelection *selection, PdfInspector *inspector); static void on_analyze_clicked (GtkWidget *widget, PdfInspector *inspector); - GladeXML *xml; + GtkBuilder* builder; GtkTreeModel *model; PDFDoc *doc; CairoOutputDev *output; @@ -71,17 +70,24 @@ private: PdfInspector::PdfInspector(void) { GtkWidget *widget; + GError* error = NULL; + + builder = gtk_builder_new (); - xml = glade_xml_new ("./pdf-inspector.glade", NULL, NULL); + if (!gtk_builder_add_from_file (builder, "./pdf-inspector.ui", &error)) + { + g_warning ("Couldn't load builder file: s", error->message); + g_error_free (error); + } - widget = glade_xml_get_widget (xml, "pdf_file_chooser_button"); + widget = GTK_WIDGET (gtk_builder_get_object (builder, "pdf_file_chooser_button")); g_signal_connect (widget, "selection-changed", G_CALLBACK (on_file_activated), this); - widget = glade_xml_get_widget (xml, "analyze_button"); + widget = GTK_WIDGET (gtk_builder_get_object (builder, "analyze_button")); g_signal_connect (widget, "clicked", G_CALLBACK (on_analyze_clicked), this); // setup the TreeView - widget = glade_xml_get_widget (xml, "pdf_tree_view"); + widget = GTK_WIDGET (gtk_builder_get_object (builder, "pdf_tree_view")); g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)), "changed", G_CALLBACK (on_selection_changed), this); model = (GtkTreeModel *)gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_INT, @@ -136,7 +142,7 @@ PdfInspector::set_file_name(const char *file_name) { GtkWidget *widget; - widget = glade_xml_get_widget (xml, "pdf_file_chooser_button"); + widget = GTK_WIDGET (gtk_builder_get_object (builder, "pdf_file_chooser_button")); gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), file_name); } @@ -161,7 +167,7 @@ PdfInspector::on_selection_changed (GtkTreeSelection *selection, PdfInspector *i GtkTreeIter iter; gchar *op = NULL; - label = glade_xml_get_widget (inspector->xml, "description_label"); + label = GTK_WIDGET (gtk_builder_get_object (inspector->builder, "description_label")); gtk_label_set_markup (GTK_LABEL (label), "No Description"); if (gtk_tree_selection_get_selected (selection, &model, &iter)) @@ -197,7 +203,7 @@ PdfInspector::on_analyze_clicked (GtkWidget *widget, PdfInspector *inspector) GtkWidget *spin; int page; - spin = glade_xml_get_widget (inspector->xml, "pdf_spin"); + spin = GTK_WIDGET (gtk_builder_get_object (inspector->builder, "pdf_spin")); page = (int) gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin)); @@ -217,7 +223,7 @@ PdfInspector::analyze_page (int page) cairo_t *cr; cairo_surface_t *surface; - label = glade_xml_get_widget (xml, "pdf_total_label"); + label = GTK_WIDGET (gtk_builder_get_object (builder, "pdf_total_label")); output->startProfile (); gtk_list_store_clear (GTK_LIST_STORE (model)); @@ -290,9 +296,9 @@ PdfInspector::load(const char *file_name) doc = NULL; } - spin = glade_xml_get_widget (xml, "pdf_spin"); - button = glade_xml_get_widget (xml, "analyze_button"); - label = glade_xml_get_widget (xml, "pdf_total_label"); + spin = GTK_WIDGET (gtk_builder_get_object (builder, "pdf_spin")); + button = GTK_WIDGET (gtk_builder_get_object (builder, "analyze_button")); + label = GTK_WIDGET (gtk_builder_get_object (builder, "pdf_total_label")); gtk_label_set_text (GTK_LABEL (label), ""); if (doc) @@ -324,7 +330,7 @@ PdfInspector::run() { GtkWidget *dialog; - dialog = glade_xml_get_widget (xml, "pdf_dialog"); + dialog = GTK_WIDGET (gtk_builder_get_object (builder, "pdf_dialog")); gtk_dialog_run (GTK_DIALOG (dialog)); } diff --git a/test/pdf-inspector.glade b/test/pdf-inspector.glade deleted file mode 100644 index 6a756b0..0000000 --- a/test/pdf-inspector.glade +++ /dev/null @@ -1,434 +0,0 @@ - - - - - - - 6 - True - PDF Inspector - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 600 - 400 - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 12 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - -7 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 6 - True - False - 12 - - - - True - 2 - 2 - False - 6 - 12 - - - - True - _File: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Page Number - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Select A File - GTK_FILE_CHOOSER_ACTION_OPEN - True - False - -1 - - - 1 - 2 - 0 - 1 - fill - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 1 - 2 - 1 - 2 - - - - - - 0 - False - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - 0 - True - True - - - - - - True - 2 - 3 - False - 6 - 12 - - - - True - Total time elapsed: - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 3 - 1 - 2 - fill - - - - - - - True - Description: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - fill - - - - - - True - <i>No Description</i> - False - True - GTK_JUSTIFY_LEFT - True - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 0 - 1 - fill - - - - - - True - 0.5 - 0 - 0.0 - 0.0 - 0 - 0 - 0 - 0 - - - - True - True - _Analyze - True - GTK_RELIEF_NORMAL - True - - - - - 2 - 3 - 0 - 1 - fill - fill - - - - - 0 - False - True - - - - - - - - - - True - <b>PDF Instructions</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - -