From: Jim Evins Date: Sat, 21 Feb 2009 07:43:03 +0000 (+0000) Subject: 2009-02-21 JimEvins X-Git-Tag: glabels-2_3_0~232 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e66208f5c1f1573ab4aa75e0fb734d01ab2688bf;p=glabels 2009-02-21 JimEvins * README: * configure.in: * data/builder/object-editor.glade: * data/builder/prefs-dialog.glade: * data/builder/property-bar.glade: * data/builder/template-designer.glade: * gtk-doc.make: * src/color-combo-color-menu-item.c: * src/color-combo-color-menu-item.h: * src/color-combo-menu.h: * src/glabels-batch.c: (main): * src/glabels.c: (main): * src/merge-properties-dialog.h: * src/new-label-dialog.h: * src/object-editor-lsize-page.c: (gl_object_editor_prepare_lsize_page), (lsize_prefs_changed_cb): * src/object-editor.h: * src/prefs-dialog.h: * src/print-op.h: * src/template-designer.h: * src/ui-commands.c: (gl_ui_cmd_view_property_bar_tips_toggle), (gl_ui_cmd_help_contents), (gl_ui_cmd_help_about): * src/ui-property-bar.c: * src/ui-property-bar.h: * src/ui-sidebar.c: (gl_ui_sidebar_construct), (selection_changed_cb): * src/ui-sidebar.h: * src/view.h: * src/wdgt-media-select.h: * src/wdgt-merge-menu.h: * src/wdgt-mini-preview.c: (gl_wdgt_mini_preview_class_init): * src/wdgt-mini-preview.h: * src/wdgt-print-copies.c: (gl_wdgt_print_copies_construct): * src/wdgt-print-copies.h: * src/wdgt-print-merge.c: (gl_wdgt_print_merge_construct): * src/wdgt-print-merge.h: * src/wdgt-rotate-label.h: * src/window.h: Removed final dependencies on libgnome and libgnomeui. Removed all currently deprecated symbols as of GTK 2.14. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@825 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index 5c8b6029..3c18ab99 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,46 @@ +2009-02-21 JimEvins + + * README: + * configure.in: + * data/builder/object-editor.glade: + * data/builder/prefs-dialog.glade: + * data/builder/property-bar.glade: + * data/builder/template-designer.glade: + * gtk-doc.make: + * src/color-combo-color-menu-item.c: + * src/color-combo-color-menu-item.h: + * src/color-combo-menu.h: + * src/glabels-batch.c: (main): + * src/glabels.c: (main): + * src/merge-properties-dialog.h: + * src/new-label-dialog.h: + * src/object-editor-lsize-page.c: + (gl_object_editor_prepare_lsize_page), (lsize_prefs_changed_cb): + * src/object-editor.h: + * src/prefs-dialog.h: + * src/print-op.h: + * src/template-designer.h: + * src/ui-commands.c: (gl_ui_cmd_view_property_bar_tips_toggle), + (gl_ui_cmd_help_contents), (gl_ui_cmd_help_about): + * src/ui-property-bar.c: + * src/ui-property-bar.h: + * src/ui-sidebar.c: (gl_ui_sidebar_construct), + (selection_changed_cb): + * src/ui-sidebar.h: + * src/view.h: + * src/wdgt-media-select.h: + * src/wdgt-merge-menu.h: + * src/wdgt-mini-preview.c: (gl_wdgt_mini_preview_class_init): + * src/wdgt-mini-preview.h: + * src/wdgt-print-copies.c: (gl_wdgt_print_copies_construct): + * src/wdgt-print-copies.h: + * src/wdgt-print-merge.c: (gl_wdgt_print_merge_construct): + * src/wdgt-print-merge.h: + * src/wdgt-rotate-label.h: + * src/window.h: + Removed final dependencies on libgnome and libgnomeui. + Removed all currently deprecated symbols as of GTK 2.14. + 2009-01-07 Jim Evins * src/critical-error-handler.c: (critical_error_handler): diff --git a/glabels2/README b/glabels2/README index a8c42416..abbd9c92 100644 --- a/glabels2/README +++ b/glabels2/README @@ -21,10 +21,9 @@ cards using a laser or ink-jet printer. System Requirements =================== -GTK+-2.10.x -LIBGNOME[UI]-2.16.x -LIBXML-2.6.x -LIBGLADE-2.6.x +GLIB+-2.18.x +GTK+-2.14.x +LIBXML-2.7.x All of these libraries are available as part of Gnome 2.16 diff --git a/glabels2/configure.in b/glabels2/configure.in index 416f6b88..b37fb1b9 100644 --- a/glabels2/configure.in +++ b/glabels2/configure.in @@ -52,18 +52,14 @@ AC_SUBST(LIBGLABELS_VERSION_INFO) dnl --------------------------------------------------------------------------- dnl - Library dependencies dnl --------------------------------------------------------------------------- -GLIB_REQUIRED=2.16.0 -GTK_REQUIRED=2.12.0 -LIBGNOME_REQUIRED=2.22.0 -LIBGNOMEUI_REQUIRED=2.22.0 +GLIB_REQUIRED=2.18.0 +GTK_REQUIRED=2.14.0 LIBXML_REQUIRED=2.7.0 -LIBEBOOK_REQUIRED=2.22.0 +LIBEBOOK_REQUIRED=2.24.0 dnl Make above strings available for packaging files (e.g. rpm spec files) AC_SUBST(GLIB_REQUIRED) AC_SUBST(GTK_REQUIRED) -AC_SUBST(LIBGNOME_REQUIRED) -AC_SUBST(LIBGNOMEUI_REQUIRED) AC_SUBST(LIBXML_REQUIRED) AC_SUBST(LIBEBOOK_REQUIRED) @@ -92,8 +88,6 @@ dnl --------------------------------------------------------------------------- PKG_CHECK_MODULES(GLABELS, \ glib-2.0 >= $GLIB_REQUIRED \ gtk+-2.0 >= $GTK_REQUIRED \ -libgnome-2.0 >= $LIBGNOME_REQUIRED \ -libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ libxml-2.0 >= $LIBXML_REQUIRED \ $OPTIONAL_MODULES \ ) @@ -128,7 +122,6 @@ if test "x$enable_deprecations" = "xyes"; then -DGDK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ --DGNOME_DISABLE_DEPRECATED \ " AC_SUBST(DISABLE_DEPRECATED_CFLAGS) fi diff --git a/glabels2/data/builder/object-editor.glade b/glabels2/data/builder/object-editor.glade index 52d30696..ddf4fd68 100644 --- a/glabels2/data/builder/object-editor.glade +++ b/glabels2/data/builder/object-editor.glade @@ -344,7 +344,7 @@ GTK_UPDATE_ALWAYS False False - 1 1 100 1 10 10 + 1 1 100 1 10 0 0 @@ -815,7 +815,7 @@ GTK_UPDATE_ALWAYS False False - 1 0 5 0.01 0.1 0.1 + 1 0 5 0.00999999977648 0.10000000149 0 0 @@ -940,7 +940,7 @@ GTK_UPDATE_ALWAYS False False - 1 0.25 4 0.25 1 1 + 1 0.25 4 0.25 1 0 0 @@ -1743,7 +1743,7 @@ GTK_UPDATE_ALWAYS False False - 1 1 100 1 10 10 + 1 1 100 1 10 0 0 @@ -2177,7 +2177,7 @@ GTK_UPDATE_ALWAYS True False - 1 0 100 0.01 10 10 + 1 0 100 0.00999999977648 10 0 0 @@ -2269,7 +2269,7 @@ GTK_UPDATE_ALWAYS True False - 1 0 100 0.01 10 10 + 1 0 100 0.00999999977648 10 0 0 @@ -2457,7 +2457,7 @@ GTK_UPDATE_ALWAYS True False - 1 0 100 0.01 10 10 + 1 0 100 0.00999999977648 10 0 0 @@ -2516,7 +2516,7 @@ GTK_UPDATE_ALWAYS True False - 0 -180 180 0.1 5 5 + 0 -180 180 0.10000000149 5 0 0 @@ -2735,7 +2735,7 @@ GTK_UPDATE_ALWAYS True False - 0 0 100 0.01 10 10 + 0 0 100 0.00999999977648 10 0 1 @@ -2757,7 +2757,7 @@ GTK_UPDATE_ALWAYS True False - 0 0 100 0.01 10 10 + 0 0 100 0.00999999977648 10 0 1 @@ -2884,7 +2884,7 @@ GTK_UPDATE_ALWAYS True False - 0 0 100 0.00999999977648 10 10 + 0 0 100 0.00999999977648 10 0 0 @@ -2979,7 +2979,7 @@ GTK_UPDATE_ALWAYS True False - 0 0 100 0.00999999977648 10 10 + 0 0 100 0.00999999977648 10 0 0 @@ -3233,7 +3233,7 @@ GTK_UPDATE_ALWAYS False False - 1 0 100 1 10 10 + 1 0 100 1 10 0 0 diff --git a/glabels2/data/builder/prefs-dialog.glade b/glabels2/data/builder/prefs-dialog.glade index cf050a6c..872b2cd1 100644 --- a/glabels2/data/builder/prefs-dialog.glade +++ b/glabels2/data/builder/prefs-dialog.glade @@ -610,7 +610,7 @@ GTK_UPDATE_ALWAYS False False - 1 1 100 1 10 10 + 1 1 100 1 10 0 0 @@ -820,7 +820,7 @@ GTK_UPDATE_ALWAYS False False - 1 0 5 0.01 0.1 0.1 + 1 0 5 0.00999999977648 0.10000000149 0 0 @@ -998,7 +998,7 @@ GTK_UPDATE_ALWAYS False False - 1 0.25 4 0.25 1 1 + 1 0.25 4 0.25 1 0 0 diff --git a/glabels2/data/builder/property-bar.glade b/glabels2/data/builder/property-bar.glade index 356ade7b..53956cec 100644 --- a/glabels2/data/builder/property-bar.glade +++ b/glabels2/data/builder/property-bar.glade @@ -87,7 +87,7 @@ GTK_UPDATE_ALWAYS False False - 1 1 250 1 10 10 + 1 1 250 1 10 0 @@ -339,7 +339,7 @@ GTK_UPDATE_ALWAYS False False - 1 0.25 4 0.25 1 1 + 1 0.25 4 0.25 1 0 diff --git a/glabels2/data/builder/template-designer.glade b/glabels2/data/builder/template-designer.glade index 4fc2b655..1e85f373 100644 --- a/glabels2/data/builder/template-designer.glade +++ b/glabels2/data/builder/template-designer.glade @@ -639,7 +639,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 1 0 100 1 10 10 + 1 0 100 1 10 0 0 @@ -699,7 +699,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 1 0 100 1 10 10 + 1 0 100 1 10 0 0 @@ -1193,7 +1193,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1214,7 +1214,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1235,7 +1235,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1256,7 +1256,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1305,7 +1305,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1354,7 +1354,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1592,7 +1592,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1613,7 +1613,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1746,7 +1746,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -2012,7 +2012,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -2033,7 +2033,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -2054,7 +2054,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -2075,7 +2075,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -2096,7 +2096,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -2313,7 +2313,7 @@ This dialog will assist you in the creation of a custom gLabels template.GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -2580,7 +2580,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 1 1 2 1 1 1 + 1 1 2 1 1 0 0 @@ -3018,7 +3018,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 1 1 100 1 10 10 + 1 1 100 1 10 0 1 @@ -3039,7 +3039,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 1 1 100 1 10 10 + 1 1 100 1 10 0 1 @@ -3060,7 +3060,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 1 1 100 1 10 10 + 1 1 100 1 10 0 2 @@ -3081,7 +3081,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 1 1 100 1 10 10 + 1 1 100 1 10 0 2 @@ -3102,7 +3102,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -3123,7 +3123,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 2 @@ -3144,7 +3144,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -3165,7 +3165,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 2 @@ -3186,7 +3186,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -3207,7 +3207,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 2 @@ -3228,7 +3228,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -3249,7 +3249,7 @@ two layouts. GTK_UPDATE_ALWAYS False False - 0 0 100 1 10 10 + 0 0 100 1 10 0 2 diff --git a/glabels2/gtk-doc.make b/glabels2/gtk-doc.make index 6a30ea1d..354ffb7c 100644 --- a/glabels2/gtk-doc.make +++ b/glabels2/gtk-doc.make @@ -5,11 +5,11 @@ #################################### if GTK_DOC_USE_LIBTOOL -GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) else -GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) endif # We set GPATH here; this gives us semantics for GNU make @@ -128,7 +128,7 @@ maintainer-clean-local: clean cd $(srcdir) && rm -rf xml html install-data-local: - installfiles=`echo $(srcdir)/html/*`; \ + -installfiles=`echo $(srcdir)/html/*`; \ if test "$$installfiles" = '$(srcdir)/html/*'; \ then echo '-- Nothing to install' ; \ else \ @@ -139,8 +139,8 @@ install-data-local: done; \ echo '-- Installing $(srcdir)/html/index.sgml' ; \ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ - (which gtkdoc-rebase >& /dev/null && \ - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || : ; \ + which gtkdoc-rebase >/dev/null && \ + gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ fi @@ -165,8 +165,8 @@ dist-hook: dist-check-gtkdoc dist-hook-local -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -cp $(srcdir)/xml/*.xml $(distdir)/xml cp $(srcdir)/html/* $(distdir)/html - cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ cd $(distdir) && rm -f $(DISTCLEANFILES) -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html diff --git a/glabels2/src/color-combo-color-menu-item.c b/glabels2/src/color-combo-color-menu-item.c index a98748b3..45c25381 100644 --- a/glabels2/src/color-combo-color-menu-item.c +++ b/glabels2/src/color-combo-color-menu-item.c @@ -29,6 +29,7 @@ #include #include #include "color.h" +#include "util.h" /*===========================================*/ diff --git a/glabels2/src/color-combo-color-menu-item.h b/glabels2/src/color-combo-color-menu-item.h index cb5daa46..1fc70f27 100644 --- a/glabels2/src/color-combo-color-menu-item.h +++ b/glabels2/src/color-combo-color-menu-item.h @@ -29,13 +29,13 @@ G_BEGIN_DECLS #define GL_TYPE_COLOR_COMBO_COLOR_MENU_ITEM (gl_color_combo_color_menu_item_get_type ()) #define GL_COLOR_COMBO_COLOR_MENU_ITEM(obj) \ - (GTK_CHECK_CAST((obj), GL_TYPE_COLOR_COMBO_COLOR_MENU_ITEM, glColorComboColorMenuItem )) + (G_TYPE_CHECK_INSTANCE_CAST((obj), GL_TYPE_COLOR_COMBO_COLOR_MENU_ITEM, glColorComboColorMenuItem )) #define GL_COLOR_COMBO_COLOR_MENU_ITEM_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_COLOR_COMBO_COLOR_MENU_ITEM, glColorComboColorMenuItemClass)) + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_COLOR_COMBO_COLOR_MENU_ITEM, glColorComboColorMenuItemClass)) #define GL_IS_COLOR_COMBO_COLOR_MENU_ITEM(obj) \ - (GTK_CHECK_TYPE ((obj), GL_TYPE_COLOR_COMBO_COLOR_MENU_ITEM)) + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_COLOR_COMBO_COLOR_MENU_ITEM)) #define GL_IS_COLOR_COMBO_COLOR_MENU_ITEM_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_COLOR_COMBO_COLOR_MENU_ITEM)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_COLOR_COMBO_COLOR_MENU_ITEM)) typedef struct _glColorComboColorMenuItem glColorComboColorMenuItem; typedef struct _glColorComboColorMenuItemPrivate glColorComboColorMenuItemPrivate; diff --git a/glabels2/src/color-combo-menu.h b/glabels2/src/color-combo-menu.h index e89a3017..78908bad 100644 --- a/glabels2/src/color-combo-menu.h +++ b/glabels2/src/color-combo-menu.h @@ -28,13 +28,13 @@ G_BEGIN_DECLS #define GL_TYPE_COLOR_COMBO_MENU (gl_color_combo_menu_get_type ()) #define GL_COLOR_COMBO_MENU(obj) \ - (GTK_CHECK_CAST((obj), GL_TYPE_COLOR_COMBO_MENU, glColorComboMenu )) + (G_TYPE_CHECK_INSTANCE_CAST((obj), GL_TYPE_COLOR_COMBO_MENU, glColorComboMenu )) #define GL_COLOR_COMBO_MENU_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_COLOR_COMBO_MENU, glColorComboMenuClass)) + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_COLOR_COMBO_MENU, glColorComboMenuClass)) #define GL_IS_COLOR_COMBO_MENU(obj) \ - (GTK_CHECK_TYPE ((obj), GL_TYPE_COLOR_COMBO_MENU)) + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_COLOR_COMBO_MENU)) #define GL_IS_COLOR_COMBO_MENU_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_COLOR_COMBO_MENU)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_COLOR_COMBO_MENU)) typedef struct _glColorComboMenu glColorComboMenu; typedef struct _glColorComboMenuPrivate glColorComboMenuPrivate; diff --git a/glabels2/src/glabels-batch.c b/glabels2/src/glabels-batch.c index 41ebf9d6..59408122 100644 --- a/glabels2/src/glabels-batch.c +++ b/glabels2/src/glabels-batch.c @@ -25,7 +25,6 @@ #include #include -#include #include "merge-init.h" #include "xml-label.h" @@ -80,7 +79,6 @@ int main (int argc, char **argv) { GOptionContext *option_context; - GnomeProgram *program; GList *p, *file_list = NULL; gchar *abs_fn; glLabel *label = NULL; @@ -88,6 +86,7 @@ main (int argc, char **argv) glXMLLabelStatus status; glPrintOp *print_op; gchar *utf8_filename; + GError *error = NULL; bindtextdomain (GETTEXT_PACKAGE, GLABELS_LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); @@ -98,11 +97,15 @@ main (int argc, char **argv) /* Initialize minimal gnome program */ - program = gnome_program_init ("glabels-batch", VERSION, - LIBGNOME_MODULE, argc, argv, - GNOME_PARAM_GOPTION_CONTEXT, option_context, - GNOME_PROGRAM_STANDARD_PROPERTIES, - NULL); + gtk_init (&argc, &argv); + if (!g_option_context_parse (option_context, &argc, &argv, &error)) + { + g_print(_("%s\nRun '%s --help' to see a full list of available command line options.\n"), + error->message, argv[0]); + g_error_free (error); + return 1; + } + /* create file list */ if (remaining_args != NULL) { diff --git a/glabels2/src/glabels.c b/glabels2/src/glabels.c index 832b0821..7da1ec31 100644 --- a/glabels2/src/glabels.c +++ b/glabels2/src/glabels.c @@ -25,9 +25,6 @@ #include #include -#include -#include -#include #include "warning-handler.h" #include "critical-error-handler.h" @@ -41,27 +38,21 @@ #include "window.h" #include "file.h" + /*========================================================*/ /* Private macros and constants. */ /*========================================================*/ + /*========================================================*/ /* Private globals */ /*========================================================*/ + /*========================================================*/ /* Local function prototypes */ /*========================================================*/ -gboolean save_session_cb (GnomeClient *client, - gint phase, - GnomeRestartStyle save_style, - gint shutdown, - GnomeInteractStyle interact_style, - gint fast, - gpointer client_data); -void client_die_cb (GnomeClient *client, - gpointer client_data); /****************************************************************************/ /* main program */ @@ -77,12 +68,11 @@ main (int argc, char **argv) }; GOptionContext *option_context; - GnomeProgram *program; gchar *icon_file; - GnomeClient *client; GList *file_list = NULL, *p; GtkWidget *win; gchar *utf8_filename; + GError *error = NULL; bindtextdomain (GETTEXT_PACKAGE, GLABELS_LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); @@ -92,12 +82,16 @@ main (int argc, char **argv) g_option_context_add_main_entries (option_context, option_entries, GETTEXT_PACKAGE); - /* Initialize gnome program */ - program = gnome_program_init ("glabels", VERSION, - LIBGNOMEUI_MODULE, argc, argv, - GNOME_PARAM_GOPTION_CONTEXT, option_context, - GNOME_PROGRAM_STANDARD_PROPERTIES, - NULL); + /* Initialize program */ + gtk_init( &argc, &argv ); + if (!g_option_context_parse (option_context, &argc, &argv, &error)) + { + g_print(_("%s\nRun '%s --help' to see a full list of available command line options.\n"), + error->message, argv[0]); + g_error_free (error); + return 1; + } + /* Install GUI handlers for critical error and warning messages */ gl_critical_error_handler_init(); @@ -111,7 +105,7 @@ main (int argc, char **argv) } else { - gnome_window_icon_set_default_from_file (icon_file); + gtk_window_set_default_icon_from_file (icon_file, NULL); } @@ -125,16 +119,6 @@ main (int argc, char **argv) gl_recent_init (); - client = gnome_master_client(); - - g_signal_connect (G_OBJECT (client), "save_yourself", - G_CALLBACK (save_session_cb), - (gpointer)argv[0]); - - g_signal_connect (G_OBJECT (client), "die", - G_CALLBACK (client_die_cb), NULL); - - /* Parse args and build the list of files to be loaded at startup */ if (remaining_args != NULL) { gint i, num_args; @@ -166,53 +150,6 @@ main (int argc, char **argv) /* Begin main loop */ gtk_main(); - g_object_unref (G_OBJECT (program)); - return 0; } -/*---------------------------------------------------------------------------*/ -/* PRIVATE. "Save session" callback. */ -/*---------------------------------------------------------------------------*/ -gboolean save_session_cb (GnomeClient *client, - gint phase, - GnomeRestartStyle save_style, - gint shutdown, - GnomeInteractStyle interact_style, - gint fast, - gpointer client_data) -{ - gchar *argv[128]; - gint argc; - const GList *window_list; - GList *p; - glWindow *window; - glLabel *label; - - argv[0] = (gchar *)client_data; - argc = 1; - - window_list = gl_window_get_window_list(); - for ( p=(GList *)window_list; p != NULL; p=p->next ) { - window = GL_WINDOW(p->data); - if ( !gl_window_is_empty (window) ) { - label = GL_VIEW(window->view)->label; - argv[argc++] = gl_label_get_filename (label); - } - } - gnome_client_set_clone_command(client, argc, argv); - gnome_client_set_restart_command(client, argc, argv); - - return TRUE; -} - -/*---------------------------------------------------------------------------*/ -/* PRIVATE. "Die" callback. */ -/*---------------------------------------------------------------------------*/ -void client_die_cb (GnomeClient *client, - gpointer client_data) -{ - gl_file_exit (); -} - - diff --git a/glabels2/src/merge-properties-dialog.h b/glabels2/src/merge-properties-dialog.h index f98ea7bf..218ee580 100644 --- a/glabels2/src/merge-properties-dialog.h +++ b/glabels2/src/merge-properties-dialog.h @@ -31,11 +31,16 @@ G_BEGIN_DECLS #define GL_TYPE_MERGE_PROPERTIES_DIALOG (gl_merge_properties_dialog_get_type ()) -#define GL_MERGE_PROPERTIES_DIALOG(obj) (GTK_CHECK_CAST ((obj), GL_TYPE_MERGE_PROPERTIES_DIALOG, glMergePropertiesDialog)) -#define GL_MERGE_PROPERTIES_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_MERGE_PROPERTIES_DIALOG, glMergePropertiesDialogClass)) -#define GL_IS_MERGE_PROPERTIES_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GL_TYPE_MERGE_PROPERTIES_DIALOG)) -#define GL_IS_MERGE_PROPERTIES_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_MERGE_PROPERTIES_DIALOG)) -#define GL_MERGE_PROPERTIES_DIALOG_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GL_TYPE_MERGE_PROPERTIES_DIALOG, glMergePropertiesDialogClass)) +#define GL_MERGE_PROPERTIES_DIALOG(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), GL_TYPE_MERGE_PROPERTIES_DIALOG, glMergePropertiesDialog)) +#define GL_MERGE_PROPERTIES_DIALOG_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_MERGE_PROPERTIES_DIALOG, glMergePropertiesDialogClass)) +#define GL_IS_MERGE_PROPERTIES_DIALOG(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_MERGE_PROPERTIES_DIALOG)) +#define GL_IS_MERGE_PROPERTIES_DIALOG_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_MERGE_PROPERTIES_DIALOG)) +#define GL_MERGE_PROPERTIES_DIALOG_GET_CLASS(obj) \ + (G_TYPE_CHECK_GET_CLASS ((obj), GL_TYPE_MERGE_PROPERTIES_DIALOG, glMergePropertiesDialogClass)) typedef struct _glMergePropertiesDialog glMergePropertiesDialog; diff --git a/glabels2/src/new-label-dialog.h b/glabels2/src/new-label-dialog.h index a38a48d9..15e2530b 100644 --- a/glabels2/src/new-label-dialog.h +++ b/glabels2/src/new-label-dialog.h @@ -30,11 +30,16 @@ G_BEGIN_DECLS #define GL_TYPE_NEW_LABEL_DIALOG (gl_new_label_dialog_get_type ()) -#define GL_NEW_LABEL_DIALOG(obj) (GTK_CHECK_CAST ((obj), GL_TYPE_NEW_LABEL_DIALOG, glNewLabelDialog)) -#define GL_NEW_LABEL_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_NEW_LABEL_DIALOG, glNewLabelDialogClass)) -#define GL_IS_NEW_LABEL_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GL_TYPE_NEW_LABEL_DIALOG)) -#define GL_IS_NEW_LABEL_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_NEW_LABEL_DIALOG)) -#define GL_NEW_LABEL_DIALOG_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GL_TYPE_NEW_LABEL_DIALOG, glNewLabelDialogClass)) +#define GL_NEW_LABEL_DIALOG(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), GL_TYPE_NEW_LABEL_DIALOG, glNewLabelDialog)) +#define GL_NEW_LABEL_DIALOG_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_NEW_LABEL_DIALOG, glNewLabelDialogClass)) +#define GL_IS_NEW_LABEL_DIALOG(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_NEW_LABEL_DIALOG)) +#define GL_IS_NEW_LABEL_DIALOG_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_NEW_LABEL_DIALOG)) +#define GL_NEW_LABEL_DIALOG_GET_CLASS(obj) \ + (G_TYPE_CHECK_GET_CLASS ((obj), GL_TYPE_NEW_LABEL_DIALOG, glNewLabelDialogClass)) typedef struct _glNewLabelDialog glNewLabelDialog; diff --git a/glabels2/src/object-editor-lsize-page.c b/glabels2/src/object-editor-lsize-page.c index 2fb29ac1..cbc18f74 100644 --- a/glabels2/src/object-editor-lsize-page.c +++ b/glabels2/src/object-editor-lsize-page.c @@ -89,7 +89,7 @@ gl_object_editor_prepare_lsize_page (glObjectEditor *editor) /* Modify widgets based on configuration */ gtk_spin_button_set_digits (GTK_SPIN_BUTTON(editor->priv->lsize_r_spin), digits); gtk_spin_button_set_increments (GTK_SPIN_BUTTON(editor->priv->lsize_r_spin), - climb_rate, 10.0*climb_rate); + climb_rate, 0); gtk_label_set_text (GTK_LABEL(editor->priv->lsize_r_units_label), units_string); /* Un-hide */ @@ -237,7 +237,7 @@ lsize_prefs_changed_cb (glObjectEditor *editor) gtk_spin_button_set_digits (GTK_SPIN_BUTTON(editor->priv->lsize_r_spin), digits); gtk_spin_button_set_increments (GTK_SPIN_BUTTON(editor->priv->lsize_r_spin), - climb_rate, 10.0*climb_rate); + climb_rate, 0); editor->priv->stop_signals = FALSE; /* Update r_units_label */ diff --git a/glabels2/src/object-editor.h b/glabels2/src/object-editor.h index fe3bbe56..54f86a4d 100644 --- a/glabels2/src/object-editor.h +++ b/glabels2/src/object-editor.h @@ -52,11 +52,16 @@ typedef enum { } glObjectEditorOption; #define GL_TYPE_OBJECT_EDITOR (gl_object_editor_get_type ()) -#define GL_OBJECT_EDITOR(obj) (GTK_CHECK_CAST ((obj), GL_TYPE_OBJECT_EDITOR, glObjectEditor)) -#define GL_OBJECT_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_OBJECT_EDITOR, glObjectEditorClass)) -#define GL_IS_OBJECT_EDITOR(obj) (GTK_CHECK_TYPE ((obj), GL_TYPE_OBJECT_EDITOR)) -#define GL_IS_OBJECT_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_OBJECT_EDITOR)) -#define GL_OBJECT_EDITOR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GL_TYPE_OBJECT_EDITOR, glObjectEditorClass)) +#define GL_OBJECT_EDITOR(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), GL_TYPE_OBJECT_EDITOR, glObjectEditor)) +#define GL_OBJECT_EDITOR_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_OBJECT_EDITOR, glObjectEditorClass)) +#define GL_IS_OBJECT_EDITOR(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_OBJECT_EDITOR)) +#define GL_IS_OBJECT_EDITOR_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_OBJECT_EDITOR)) +#define GL_OBJECT_EDITOR_GET_CLASS(obj) \ + (G_TYPE_CHECK_GET_CLASS ((obj), GL_TYPE_OBJECT_EDITOR, glObjectEditorClass)) typedef struct _glObjectEditor glObjectEditor; @@ -83,7 +88,7 @@ struct _glObjectEditorClass -GtkType gl_object_editor_get_type (void) G_GNUC_CONST; +GType gl_object_editor_get_type (void) G_GNUC_CONST; GtkWidget *gl_object_editor_new (gchar *image, gchar *title, diff --git a/glabels2/src/prefs-dialog.h b/glabels2/src/prefs-dialog.h index 8ec8e929..4ed84ec3 100644 --- a/glabels2/src/prefs-dialog.h +++ b/glabels2/src/prefs-dialog.h @@ -31,11 +31,16 @@ G_BEGIN_DECLS #define GL_TYPE_PREFS_DIALOG (gl_prefs_dialog_get_type ()) -#define GL_PREFS_DIALOG(obj) (GTK_CHECK_CAST ((obj), GL_TYPE_PREFS_DIALOG, glPrefsDialog)) -#define GL_PREFS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_PREFS_DIALOG, glPrefsDialogClass)) -#define GL_IS_PREFS_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GL_TYPE_PREFS_DIALOG)) -#define GL_IS_PREFS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_PREFS_DIALOG)) -#define GL_PREFS_DIALOG_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GL_TYPE_PREFS_DIALOG, glPrefsDialogClass)) +#define GL_PREFS_DIALOG(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), GL_TYPE_PREFS_DIALOG, glPrefsDialog)) +#define GL_PREFS_DIALOG_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_PREFS_DIALOG, glPrefsDialogClass)) +#define GL_IS_PREFS_DIALOG(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_PREFS_DIALOG)) +#define GL_IS_PREFS_DIALOG_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_PREFS_DIALOG)) +#define GL_PREFS_DIALOG_GET_CLASS(obj) \ + (G_TYPE_CHECK_GET_CLASS ((obj), GL_TYPE_PREFS_DIALOG, glPrefsDialogClass)) typedef struct _glPrefsDialog glPrefsDialog; diff --git a/glabels2/src/print-op.h b/glabels2/src/print-op.h index 75c893c5..78ffdbd2 100644 --- a/glabels2/src/print-op.h +++ b/glabels2/src/print-op.h @@ -30,11 +30,16 @@ G_BEGIN_DECLS #define GL_TYPE_PRINT_OP (gl_print_op_get_type ()) -#define GL_PRINT_OP(obj) (GTK_CHECK_CAST ((obj), GL_TYPE_PRINT_OP, glPrintOp)) -#define GL_PRINT_OP_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_PRINT_OP, glPrintOpClass)) -#define GL_IS_PRINT_OP(obj) (GTK_CHECK_TYPE ((obj), GL_TYPE_PRINT_OP)) -#define GL_IS_PRINT_OP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_PRINT_OP)) -#define GL_PRINT_OP_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GL_TYPE_PRINT_OP, glPrintOpClass)) +#define GL_PRINT_OP(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), GL_TYPE_PRINT_OP, glPrintOp)) +#define GL_PRINT_OP_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_PRINT_OP, glPrintOpClass)) +#define GL_IS_PRINT_OP(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_PRINT_OP)) +#define GL_IS_PRINT_OP_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_PRINT_OP)) +#define GL_PRINT_OP_GET_CLASS(obj) \ + (G_TYPE_CHECK_GET_CLASS ((obj), GL_TYPE_PRINT_OP, glPrintOpClass)) typedef struct _glPrintOp glPrintOp; diff --git a/glabels2/src/template-designer.h b/glabels2/src/template-designer.h index 889b52a7..c8c90462 100644 --- a/glabels2/src/template-designer.h +++ b/glabels2/src/template-designer.h @@ -30,12 +30,17 @@ G_BEGIN_DECLS -#define GL_TYPE_TEMPLATE_DESIGNER (gl_template_designer_get_type ()) -#define GL_TEMPLATE_DESIGNER(obj) (GTK_CHECK_CAST ((obj), GL_TYPE_TEMPLATE_DESIGNER, glTemplateDesigner)) -#define GL_TEMPLATE_DESIGNER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_TEMPLATE_DESIGNER, glTemplateDesignerClass)) -#define GL_IS_TEMPLATE_DESIGNER(obj) (GTK_CHECK_TYPE ((obj), GL_TYPE_TEMPLATE_DESIGNER)) -#define GL_IS_TEMPLATE_DESIGNER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_TEMPLATE_DESIGNER)) -#define GL_TEMPLATE_DESIGNER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GL_TYPE_TEMPLATE_DESIGNER, glTemplateDesignerClass)) +#define GL_TYPE_TEMPLATE_DESIGNER (gl_template_designer_get_type ()) +#define GL_TEMPLATE_DESIGNER(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), GL_TYPE_TEMPLATE_DESIGNER, glTemplateDesigner)) +#define GL_TEMPLATE_DESIGNER_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_TEMPLATE_DESIGNER, glTemplateDesignerClass)) +#define GL_IS_TEMPLATE_DESIGNER(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_TEMPLATE_DESIGNER)) +#define GL_IS_TEMPLATE_DESIGNER_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_TEMPLATE_DESIGNER)) +#define GL_TEMPLATE_DESIGNER_GET_CLASS(obj) \ + (G_TYPE_CHECK_GET_CLASS ((obj), GL_TYPE_TEMPLATE_DESIGNER, glTemplateDesignerClass)) typedef struct _glTemplateDesigner glTemplateDesigner; diff --git a/glabels2/src/ui-commands.c b/glabels2/src/ui-commands.c index eb3b342c..2be9a248 100644 --- a/glabels2/src/ui-commands.c +++ b/glabels2/src/ui-commands.c @@ -5,7 +5,7 @@ * * ui-commands.c: GLabels UI commands module * - * Copyright (C) 2001-2003 Jim Evins . + * Copyright (C) 2001-2009 Jim Evins . * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,7 +29,6 @@ #include #include #include -#include #include "view.h" #include "file.h" @@ -430,7 +429,7 @@ gl_ui_cmd_view_property_bar_tips_toggle (GtkToggleAction *action, state = gtk_toggle_action_get_active (action); gl_prefs->property_toolbar_view_tooltips = state; - gl_ui_property_bar_set_tooltips (window->property_bar, state); + gtk_widget_set_has_tooltip (GTK_WIDGET (window->property_bar), state); gl_prefs_model_save_settings (gl_prefs); gl_debug (DEBUG_COMMANDS, "END"); @@ -1054,7 +1053,10 @@ gl_ui_cmd_help_contents (GtkAction *action, g_return_if_fail (action && GTK_IS_ACTION(action)); g_return_if_fail (window && GL_IS_WINDOW(window)); - gnome_help_display_with_doc_id (NULL, NULL, "glabels.xml", NULL, &error); + gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)), + "ghelp:glabels", + GDK_CURRENT_TIME, + &error); if (error != NULL) { @@ -1098,7 +1100,7 @@ gl_ui_cmd_help_about (GtkAction *action, NULL }; - const gchar *copy_text = "Copyright \xc2\xa9 2001-2007 Jim Evins"; + const gchar *copy_text = "Copyright \xc2\xa9 2001-2009 Jim Evins"; const gchar *about_text = _("A label and business card creation program.\n"); diff --git a/glabels2/src/ui-property-bar.c b/glabels2/src/ui-property-bar.c index 2cfca42f..4e60561a 100644 --- a/glabels2/src/ui-property-bar.c +++ b/glabels2/src/ui-property-bar.c @@ -492,36 +492,6 @@ gl_ui_property_bar_set_view (glUIPropertyBar *this, } -/****************************************************************************/ -/** Set visiblity of property bar's tooltips. */ -/****************************************************************************/ -void -gl_ui_property_bar_set_tooltips (glUIPropertyBar *this, - gboolean state) -{ - GtkTooltipsData *data; - - gl_debug (DEBUG_PROPERTY_BAR, "START"); - - g_return_if_fail (this && GL_IS_UI_PROPERTY_BAR(this)); - - /* HACK: peek into one of our widgets to get the tooltips group created by builder. */ - data = gtk_tooltips_data_get (this->priv->font_size_spin); - g_return_if_fail (data); - - if (state) - { - gtk_tooltips_enable (data->tooltips); - } - else - { - gtk_tooltips_disable (data->tooltips); - } - - gl_debug (DEBUG_PROPERTY_BAR, "END"); -} - - /*---------------------------------------------------------------------------*/ /* PRIVATE. View "selection state changed" callback. */ /*---------------------------------------------------------------------------*/ diff --git a/glabels2/src/ui-property-bar.h b/glabels2/src/ui-property-bar.h index add154f7..37985ef7 100644 --- a/glabels2/src/ui-property-bar.h +++ b/glabels2/src/ui-property-bar.h @@ -33,13 +33,13 @@ G_BEGIN_DECLS #define GL_TYPE_UI_PROPERTY_BAR (gl_ui_property_bar_get_type ()) #define GL_UI_PROPERTY_BAR(obj) \ - (GTK_CHECK_CAST((obj), GL_TYPE_UI_PROPERTY_BAR, glUIPropertyBar )) + (G_TYPE_CHECK_INSTANCE_CAST((obj), GL_TYPE_UI_PROPERTY_BAR, glUIPropertyBar )) #define GL_UI_PROPERTY_BAR_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_UI_PROPERTY_BAR, glUIPropertyBarClass)) + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_UI_PROPERTY_BAR, glUIPropertyBarClass)) #define GL_IS_UI_PROPERTY_BAR(obj) \ - (GTK_CHECK_TYPE ((obj), GL_TYPE_UI_PROPERTY_BAR)) + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_UI_PROPERTY_BAR)) #define GL_IS_UI_PROPERTY_BAR_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_UI_PROPERTY_BAR)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_UI_PROPERTY_BAR)) typedef struct _glUIPropertyBar glUIPropertyBar; typedef struct _glUIPropertyBarClass glUIPropertyBarClass; @@ -64,10 +64,6 @@ GtkWidget *gl_ui_property_bar_new (void); void gl_ui_property_bar_set_view (glUIPropertyBar *this, glView *view); -void gl_ui_property_bar_set_tooltips (glUIPropertyBar *this, - gboolean state); - - G_END_DECLS diff --git a/glabels2/src/ui-sidebar.c b/glabels2/src/ui-sidebar.c index f8c398f4..0475616a 100644 --- a/glabels2/src/ui-sidebar.c +++ b/glabels2/src/ui-sidebar.c @@ -154,7 +154,7 @@ gl_ui_sidebar_construct (glUISidebar *sidebar) GL_OBJECT_EDITOR_EMPTY, NULL); - sidebar->priv->child = gtk_widget_ref (sidebar->priv->empty_child); + sidebar->priv->child = g_object_ref (sidebar->priv->empty_child); gtk_widget_show (sidebar->priv->child); gtk_container_add (GTK_CONTAINER(sidebar), sidebar->priv->child); @@ -200,11 +200,11 @@ selection_changed_cb (glView *view, if (gl_view_is_selection_empty (view) || !gl_view_is_selection_atomic (view)) { - sidebar->priv->child = gtk_widget_ref (sidebar->priv->empty_child); + sidebar->priv->child = g_object_ref (sidebar->priv->empty_child); } else { - sidebar->priv->child = gtk_widget_ref (gl_view_get_editor (view)); + sidebar->priv->child = g_object_ref (gl_view_get_editor (view)); } diff --git a/glabels2/src/ui-sidebar.h b/glabels2/src/ui-sidebar.h index 9ec1264d..870c69f8 100644 --- a/glabels2/src/ui-sidebar.h +++ b/glabels2/src/ui-sidebar.h @@ -33,13 +33,13 @@ G_BEGIN_DECLS #define GL_TYPE_UI_SIDEBAR (gl_ui_sidebar_get_type ()) #define GL_UI_SIDEBAR(obj) \ - (GTK_CHECK_CAST((obj), GL_TYPE_UI_SIDEBAR, glUISidebar )) + (G_TYPE_CHECK_INSTANCE_CAST((obj), GL_TYPE_UI_SIDEBAR, glUISidebar )) #define GL_UI_SIDEBAR_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_UI_SIDEBAR, glUISidebarClass)) + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_UI_SIDEBAR, glUISidebarClass)) #define GL_IS_UI_SIDEBAR(obj) \ - (GTK_CHECK_TYPE ((obj), GL_TYPE_UI_SIDEBAR)) + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_UI_SIDEBAR)) #define GL_IS_UI_SIDEBAR_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_UI_SIDEBAR)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_UI_SIDEBAR)) typedef struct _glUISidebar glUISidebar; typedef struct _glUISidebarClass glUISidebarClass; diff --git a/glabels2/src/view.h b/glabels2/src/view.h index 38c3ed80..4bf4141e 100644 --- a/glabels2/src/view.h +++ b/glabels2/src/view.h @@ -43,10 +43,14 @@ typedef enum { } glViewState; #define GL_TYPE_VIEW (gl_view_get_type ()) -#define GL_VIEW(obj) (GTK_CHECK_CAST((obj), GL_TYPE_VIEW, glView )) -#define GL_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_VIEW, glViewClass)) -#define GL_IS_VIEW(obj) (GTK_CHECK_TYPE ((obj), GL_TYPE_VIEW)) -#define GL_IS_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_VIEW)) +#define GL_VIEW(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), GL_TYPE_VIEW, glView )) +#define GL_VIEW_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_VIEW, glViewClass)) +#define GL_IS_VIEW(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_VIEW)) +#define GL_IS_VIEW_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_VIEW)) typedef struct _glView glView; typedef struct _glViewClass glViewClass; diff --git a/glabels2/src/wdgt-media-select.h b/glabels2/src/wdgt-media-select.h index c8e95fce..9a548133 100644 --- a/glabels2/src/wdgt-media-select.h +++ b/glabels2/src/wdgt-media-select.h @@ -31,13 +31,13 @@ G_BEGIN_DECLS #define GL_TYPE_WDGT_MEDIA_SELECT (gl_wdgt_media_select_get_type ()) #define GL_WDGT_MEDIA_SELECT(obj) \ - (GTK_CHECK_CAST((obj), GL_TYPE_WDGT_MEDIA_SELECT, glWdgtMediaSelect )) + (G_TYPE_CHECK_INSTANCE_CAST((obj), GL_TYPE_WDGT_MEDIA_SELECT, glWdgtMediaSelect )) #define GL_WDGT_MEDIA_SELECT_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_WDGT_MEDIA_SELECT, glWdgtMediaSelectClass)) + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_WDGT_MEDIA_SELECT, glWdgtMediaSelectClass)) #define GL_IS_WDGT_MEDIA_SELECT(obj) \ - (GTK_CHECK_TYPE ((obj), GL_TYPE_WDGT_MEDIA_SELECT)) + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_WDGT_MEDIA_SELECT)) #define GL_IS_WDGT_MEDIA_SELECT_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_WDGT_MEDIA_SELECT)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_WDGT_MEDIA_SELECT)) typedef struct _glWdgtMediaSelect glWdgtMediaSelect; typedef struct _glWdgtMediaSelectClass glWdgtMediaSelectClass; diff --git a/glabels2/src/wdgt-merge-menu.h b/glabels2/src/wdgt-merge-menu.h index 943709d9..60d4ac50 100644 --- a/glabels2/src/wdgt-merge-menu.h +++ b/glabels2/src/wdgt-merge-menu.h @@ -31,13 +31,13 @@ G_BEGIN_DECLS #define GL_TYPE_WDGT_MERGE_MENU (gl_wdgt_merge_menu_get_type ()) #define GL_WDGT_MERGE_MENU(obj) \ - (GTK_CHECK_CAST((obj), GL_TYPE_WDGT_MERGE_MENU, glWdgtMergeMenu )) + (G_TYPE_CHECK_INSTANCE_CAST((obj), GL_TYPE_WDGT_MERGE_MENU, glWdgtMergeMenu )) #define GL_WDGT_MERGE_MENU_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_WDGT_MERGE_MENU, glWdgtMergeMenuClass)) + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_WDGT_MERGE_MENU, glWdgtMergeMenuClass)) #define GL_IS_WDGT_MERGE_MENU(obj) \ - (GTK_CHECK_TYPE ((obj), GL_TYPE_WDGT_MERGE_MENU)) + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_WDGT_MERGE_MENU)) #define GL_IS_WDGT_MERGE_MENU_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_WDGT_MERGE_MENU)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_WDGT_MERGE_MENU)) typedef struct _glWdgtMergeMenu glWdgtMergeMenu; diff --git a/glabels2/src/wdgt-mini-preview.c b/glabels2/src/wdgt-mini-preview.c index c539e6bf..13c03b33 100644 --- a/glabels2/src/wdgt-mini-preview.c +++ b/glabels2/src/wdgt-mini-preview.c @@ -150,7 +150,7 @@ gl_wdgt_mini_preview_class_init (glWdgtMiniPreviewClass *class) gl_debug (DEBUG_MINI_PREVIEW, "START"); - gl_wdgt_mini_preview_parent_class = gtk_type_class (gtk_hbox_get_type ()); + gl_wdgt_mini_preview_parent_class = g_type_class_peek_parent (class); object_class->finalize = gl_wdgt_mini_preview_finalize; diff --git a/glabels2/src/wdgt-mini-preview.h b/glabels2/src/wdgt-mini-preview.h index 8754b857..67968793 100644 --- a/glabels2/src/wdgt-mini-preview.h +++ b/glabels2/src/wdgt-mini-preview.h @@ -32,13 +32,13 @@ G_BEGIN_DECLS #define GL_TYPE_WDGT_MINI_PREVIEW (gl_wdgt_mini_preview_get_type ()) #define GL_WDGT_MINI_PREVIEW(obj) \ - (GTK_CHECK_CAST((obj), GL_TYPE_WDGT_MINI_PREVIEW, glWdgtMiniPreview )) + (G_TYPE_CHECK_INSTANCE_CAST((obj), GL_TYPE_WDGT_MINI_PREVIEW, glWdgtMiniPreview )) #define GL_WDGT_MINI_PREVIEW_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_WDGT_MINI_PREVIEW, glWdgtMiniPreviewClass)) + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_WDGT_MINI_PREVIEW, glWdgtMiniPreviewClass)) #define GL_IS_WDGT_MINI_PREVIEW(obj) \ - (GTK_CHECK_TYPE ((obj), GL_TYPE_WDGT_MINI_PREVIEW)) + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_WDGT_MINI_PREVIEW)) #define GL_IS_WDGT_MINI_PREVIEW_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_WDGT_MINI_PREVIEW)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_WDGT_MINI_PREVIEW)) typedef struct _glWdgtMiniPreview glWdgtMiniPreview; typedef struct _glWdgtMiniPreviewPrivate glWdgtMiniPreviewPrivate; diff --git a/glabels2/src/wdgt-print-copies.c b/glabels2/src/wdgt-print-copies.c index f09522a0..023d7126 100644 --- a/glabels2/src/wdgt-print-copies.c +++ b/glabels2/src/wdgt-print-copies.c @@ -152,7 +152,7 @@ gl_wdgt_print_copies_construct (glWdgtPrintCopies *copies, copies->sheets_radio = gtk_radio_button_new_with_label (radio_group, _("Sheets:")); gtk_box_pack_start (GTK_BOX(whbox1), copies->sheets_radio, FALSE, FALSE, 0); - adjust = gtk_adjustment_new (1, 1.0, 10.0, 1.0, 10.0, 10.0); + adjust = gtk_adjustment_new (1, 1.0, 10.0, 1.0, 10.0, 0.0); copies->sheets_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjust), 1.0, 0); gtk_box_pack_start (GTK_BOX(whbox1), copies->sheets_spin, FALSE, FALSE, 0); @@ -172,14 +172,14 @@ gl_wdgt_print_copies_construct (glWdgtPrintCopies *copies, gtk_box_pack_start (GTK_BOX(whbox1), copies->labels_radio, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(whbox1), gtk_label_new (_("from:")), FALSE, FALSE, 0); adjust = gtk_adjustment_new (1, 1.0, copies->labels_per_sheet, - 1.0, 10.0, 10.0); + 1.0, 10.0, 0.0); copies->first_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjust), 1.0, 0); gtk_box_pack_start (GTK_BOX(whbox1), copies->first_spin, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(whbox1), gtk_label_new (_("to:")), FALSE, FALSE, 0); adjust = gtk_adjustment_new (copies->labels_per_sheet, 1.0, copies->labels_per_sheet, - 1.0, 10.0, 10.0); + 1.0, 10.0, 0.0); copies->last_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjust), 1.0, 0); gtk_box_pack_start (GTK_BOX(whbox1), copies->last_spin, FALSE, FALSE, 0); diff --git a/glabels2/src/wdgt-print-copies.h b/glabels2/src/wdgt-print-copies.h index 7e24dee3..ffae2f11 100644 --- a/glabels2/src/wdgt-print-copies.h +++ b/glabels2/src/wdgt-print-copies.h @@ -32,13 +32,13 @@ G_BEGIN_DECLS #define GL_TYPE_WDGT_PRINT_COPIES (gl_wdgt_print_copies_get_type ()) #define GL_WDGT_PRINT_COPIES(obj) \ - (GTK_CHECK_CAST((obj), GL_TYPE_WDGT_PRINT_COPIES, glWdgtPrintCopies )) + (G_TYPE_CHECK_INSTANCE_CAST((obj), GL_TYPE_WDGT_PRINT_COPIES, glWdgtPrintCopies )) #define GL_WDGT_PRINT_COPIES_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_WDGT_PRINT_COPIES, glWdgtPrintCopiesClass)) + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_WDGT_PRINT_COPIES, glWdgtPrintCopiesClass)) #define GL_IS_WDGT_PRINT_COPIES(obj) \ - (GTK_CHECK_TYPE ((obj), GL_TYPE_WDGT_PRINT_COPIES)) + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_WDGT_PRINT_COPIES)) #define GL_IS_WDGT_PRINT_COPIES_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_WDGT_PRINT_COPIES)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_WDGT_PRINT_COPIES)) typedef struct _glWdgtPrintCopies glWdgtPrintCopies; typedef struct _glWdgtPrintCopiesClass glWdgtPrintCopiesClass; diff --git a/glabels2/src/wdgt-print-merge.c b/glabels2/src/wdgt-print-merge.c index bc1fe6fd..da093f27 100644 --- a/glabels2/src/wdgt-print-merge.c +++ b/glabels2/src/wdgt-print-merge.c @@ -153,8 +153,7 @@ gl_wdgt_print_merge_construct (glWdgtPrintMerge * merge, gtk_box_pack_start (GTK_BOX(whbox1), gtk_label_new (_("Start on label")), FALSE, FALSE, 0); adjust = - gtk_adjustment_new (1, 1.0, merge->labels_per_sheet, 1.0, 10.0, - 10.0); + gtk_adjustment_new (1, 1.0, merge->labels_per_sheet, 1.0, 10.0, 0.0); merge->first_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjust), 1.0, 0); gtk_box_pack_start (GTK_BOX(whbox1), merge->first_spin, FALSE, FALSE, 0); @@ -169,7 +168,7 @@ gl_wdgt_print_merge_construct (glWdgtPrintMerge * merge, gtk_box_pack_start (GTK_BOX(wvbox), whbox1, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(whbox1), gtk_label_new (_("Copies:")), FALSE, FALSE, 0); - adjust = gtk_adjustment_new (1, 1.0, 10.0, 1.0, 10.0, 10.0); + adjust = gtk_adjustment_new (1, 1.0, 10.0, 1.0, 10.0, 0.0); merge->copies_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjust), 1.0, 0); gtk_box_pack_start (GTK_BOX(whbox1), merge->copies_spin, FALSE, FALSE, 0); diff --git a/glabels2/src/wdgt-print-merge.h b/glabels2/src/wdgt-print-merge.h index 9e3a24da..1b16bf89 100644 --- a/glabels2/src/wdgt-print-merge.h +++ b/glabels2/src/wdgt-print-merge.h @@ -32,13 +32,13 @@ G_BEGIN_DECLS #define GL_TYPE_WDGT_PRINT_MERGE (gl_wdgt_print_merge_get_type ()) #define GL_WDGT_PRINT_MERGE(obj) \ - (GTK_CHECK_CAST((obj), GL_TYPE_WDGT_PRINT_MERGE, glWdgtPrintMerge )) + (G_TYPE_CHECK_INSTANCE_CAST((obj), GL_TYPE_WDGT_PRINT_MERGE, glWdgtPrintMerge )) #define GL_WDGT_PRINT_MERGE_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_WDGT_PRINT_MERGE, glWdgtPrintMergeClass)) + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_WDGT_PRINT_MERGE, glWdgtPrintMergeClass)) #define GL_IS_WDGT_PRINT_MERGE(obj) \ - (GTK_CHECK_TYPE ((obj), GL_TYPE_WDGT_PRINT_MERGE)) + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_WDGT_PRINT_MERGE)) #define GL_IS_WDGT_PRINT_MERGE_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_WDGT_PRINT_MERGE)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_WDGT_PRINT_MERGE)) typedef struct _glWdgtPrintMerge glWdgtPrintMerge; typedef struct _glWdgtPrintMergeClass glWdgtPrintMergeClass; diff --git a/glabels2/src/wdgt-rotate-label.h b/glabels2/src/wdgt-rotate-label.h index d3a0daca..c2bc1912 100644 --- a/glabels2/src/wdgt-rotate-label.h +++ b/glabels2/src/wdgt-rotate-label.h @@ -31,13 +31,13 @@ G_BEGIN_DECLS #define GL_TYPE_WDGT_ROTATE_LABEL (gl_wdgt_rotate_label_get_type ()) #define GL_WDGT_ROTATE_LABEL(obj) \ - (GTK_CHECK_CAST((obj), GL_TYPE_WDGT_ROTATE_LABEL, glWdgtRotateLabel )) + (G_TYPE_CHECK_INSTANCE_CAST((obj), GL_TYPE_WDGT_ROTATE_LABEL, glWdgtRotateLabel )) #define GL_WDGT_ROTATE_LABEL_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_WDGT_ROTATE_LABEL, glWdgtRotateLabelClass)) + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_WDGT_ROTATE_LABEL, glWdgtRotateLabelClass)) #define GL_IS_WDGT_ROTATE_LABEL(obj) \ - (GTK_CHECK_TYPE ((obj), GL_TYPE_WDGT_ROTATE_LABEL)) + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_WDGT_ROTATE_LABEL)) #define GL_IS_WDGT_ROTATE_LABEL_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_WDGT_ROTATE_LABEL)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_WDGT_ROTATE_LABEL)) typedef struct _glWdgtRotateLabel glWdgtRotateLabel; typedef struct _glWdgtRotateLabelClass glWdgtRotateLabelClass; diff --git a/glabels2/src/window.h b/glabels2/src/window.h index e5a63ab1..19be8257 100644 --- a/glabels2/src/window.h +++ b/glabels2/src/window.h @@ -40,13 +40,13 @@ G_BEGIN_DECLS #define GL_TYPE_WINDOW (gl_window_get_type ()) #define GL_WINDOW(obj) \ - (GTK_CHECK_CAST((obj), GL_TYPE_WINDOW, glWindow )) + (G_TYPE_CHECK_INSTANCE_CAST((obj), GL_TYPE_WINDOW, glWindow )) #define GL_WINDOW_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_WINDOW, glWindowClass)) + (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_WINDOW, glWindowClass)) #define GL_IS_WINDOW(obj) \ - (GTK_CHECK_TYPE ((obj), GL_TYPE_WINDOW)) + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GL_TYPE_WINDOW)) #define GL_IS_WINDOW_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_WINDOW)) + (G_TYPE_CHECK_CLASS_TYPE ((klass), GL_TYPE_WINDOW)) typedef struct _glWindow glWindow; typedef struct _glWindowClass glWindowClass;