+2009-02-21 JimEvins <evins@snaught.com>
+
+ * 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 <evins@snaught.com>
* src/critical-error-handler.c: (critical_error_handler):
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
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)
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 \
)
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
--DGNOME_DISABLE_DEPRECATED \
"
AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
fi
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 1 100 1 10 10</property>
+ <property name="adjustment">1 1 100 1 10 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 0 5 0.01 0.1 0.1</property>
+ <property name="adjustment">1 0 5 0.00999999977648 0.10000000149 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 0.25 4 0.25 1 1</property>
+ <property name="adjustment">1 0.25 4 0.25 1 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 1 100 1 10 10</property>
+ <property name="adjustment">1 1 100 1 10 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">True</property>
<property name="wrap">False</property>
- <property name="adjustment">1 0 100 0.01 10 10</property>
+ <property name="adjustment">1 0 100 0.00999999977648 10 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">True</property>
<property name="wrap">False</property>
- <property name="adjustment">1 0 100 0.01 10 10</property>
+ <property name="adjustment">1 0 100 0.00999999977648 10 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">True</property>
<property name="wrap">False</property>
- <property name="adjustment">1 0 100 0.01 10 10</property>
+ <property name="adjustment">1 0 100 0.00999999977648 10 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">True</property>
<property name="wrap">False</property>
- <property name="adjustment">0 -180 180 0.1 5 5</property>
+ <property name="adjustment">0 -180 180 0.10000000149 5 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">True</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 0.01 10 10</property>
+ <property name="adjustment">0 0 100 0.00999999977648 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">True</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 0.01 10 10</property>
+ <property name="adjustment">0 0 100 0.00999999977648 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">True</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 0.00999999977648 10 10</property>
+ <property name="adjustment">0 0 100 0.00999999977648 10 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">True</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 0.00999999977648 10 10</property>
+ <property name="adjustment">0 0 100 0.00999999977648 10 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 0 100 1 10 10</property>
+ <property name="adjustment">1 0 100 1 10 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 1 100 1 10 10</property>
+ <property name="adjustment">1 1 100 1 10 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 0 5 0.01 0.1 0.1</property>
+ <property name="adjustment">1 0 5 0.00999999977648 0.10000000149 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 0.25 4 0.25 1 1</property>
+ <property name="adjustment">1 0.25 4 0.25 1 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 1 250 1 10 10</property>
+ <property name="adjustment">1 1 250 1 10 0</property>
</widget>
</child>
</widget>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 0.25 4 0.25 1 1</property>
+ <property name="adjustment">1 0.25 4 0.25 1 0</property>
</widget>
</child>
</widget>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 0 100 1 10 10</property>
+ <property name="adjustment">1 0 100 1 10 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 0 100 1 10 10</property>
+ <property name="adjustment">1 0 100 1 10 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 1 2 1 1 1</property>
+ <property name="adjustment">1 1 2 1 1 0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 1 100 1 10 10</property>
+ <property name="adjustment">1 1 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 1 100 1 10 10</property>
+ <property name="adjustment">1 1 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 1 100 1 10 10</property>
+ <property name="adjustment">1 1 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 1 100 1 10 10</property>
+ <property name="adjustment">1 1 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">2</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">0 0 100 1 10 10</property>
+ <property name="adjustment">0 0 100 1 10 0</property>
</widget>
<packing>
<property name="left_attach">2</property>
####################################
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
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 \
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
-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
#include <gtk/gtklabel.h>
#include <gtk/gtkimage.h>
#include "color.h"
+#include "util.h"
/*===========================================*/
#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;
#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;
#include <config.h>
#include <glib/gi18n.h>
-#include <libgnome/libgnome.h>
#include "merge-init.h"
#include "xml-label.h"
main (int argc, char **argv)
{
GOptionContext *option_context;
- GnomeProgram *program;
GList *p, *file_list = NULL;
gchar *abs_fn;
glLabel *label = NULL;
glXMLLabelStatus status;
glPrintOp *print_op;
gchar *utf8_filename;
+ GError *error = NULL;
bindtextdomain (GETTEXT_PACKAGE, GLABELS_LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
/* 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) {
#include <config.h>
#include <glib/gi18n.h>
-#include <libgnome/libgnome.h>
-#include <libgnomeui/libgnomeui.h>
-#include <libgnomeui/gnome-window-icon.h>
#include "warning-handler.h"
#include "critical-error-handler.h"
#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 */
};
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");
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();
}
else
{
- gnome_window_icon_set_default_from_file (icon_file);
+ gtk_window_set_default_icon_from_file (icon_file, NULL);
}
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;
/* 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 ();
-}
-
-
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;
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;
/* 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 */
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 */
} 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;
-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,
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;
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;
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;
*
* ui-commands.c: GLabels UI commands module
*
- * Copyright (C) 2001-2003 Jim Evins <evins@snaught.com>.
+ * Copyright (C) 2001-2009 Jim Evins <evins@snaught.com>.
*
* 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
#include <glib/gi18n.h>
#include <gtk/gtkwindow.h>
#include <gtk/gtkaboutdialog.h>
-#include <libgnome/gnome-help.h>
#include "view.h"
#include "file.h"
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");
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)
{
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");
}
-/****************************************************************************/
-/** 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. */
/*---------------------------------------------------------------------------*/
#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;
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
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);
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));
}
#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;
} 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;
#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;
#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;
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;
#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;
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);
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);
#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;
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);
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);
#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;
#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;
#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;
projects / glabels / commitdiff