]> git.sur5r.net Git - glabels/blobdiff - glabels2/src/ui-commands.c
2009-09-01 Jim Evins <evins@snaught.com>
[glabels] / glabels2 / src / ui-commands.c
index b2f416ef817ae5843db329a7742c0adab7b18e9d..bc01a65b0b9c4ece145599a0c20424cf173f256a 100644 (file)
@@ -1,11 +1,11 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
 
 /*
  *  (GLABELS) Label and Business Card Creation program for GNOME
  *
  *  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 "ui-commands.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkaboutdialog.h>
-#include <libgnome/gnome-help.h>
-#include <libgnome/gnome-url.h>
-#include "recent-files/egg-recent-view.h"
-#include "recent-files/egg-recent-view-uimanager.h"
+#include <gtk/gtk.h>
 
 #include "view.h"
 #include "file.h"
 #include "template-designer.h"
-#include "print-dialog.h"
+#include "print-op.h"
 #include "prefs.h"
 #include "prefs-dialog.h"
 #include "recent.h"
 #include "debug.h"
 
-#define LOGO_PIXMAP gnome_program_locate_file (NULL,\
-                                        GNOME_FILE_DOMAIN_APP_PIXMAP,\
-                                        "glabels/glabels-about-logo.png",\
-                                        FALSE, NULL)
 
 \f
 /****************************************************************************/
@@ -57,13 +48,13 @@ gl_ui_cmd_file_new (GtkAction *action,
                     glWindow  *window)
 {
         gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       gl_file_new (window);
+        gl_file_new (window);
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /****************************************************************************/
@@ -71,16 +62,16 @@ gl_ui_cmd_file_new (GtkAction *action,
 /****************************************************************************/
 void 
 gl_ui_cmd_file_properties (GtkAction *action,
-                          glWindow  *window)
+                           glWindow  *window)
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       gl_file_properties (GL_VIEW(window->view)->label, window);
+        gl_file_properties (GL_VIEW(window->view)->label, window);
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /****************************************************************************/
@@ -88,20 +79,20 @@ gl_ui_cmd_file_properties (GtkAction *action,
 /****************************************************************************/
 void
 gl_ui_cmd_file_template_designer (GtkAction *action,
-                                 glWindow  *window)
+                                  glWindow  *window)
 {
-       GtkWidget *dialog;
+        GtkWidget *dialog;
 
-       gl_debug (DEBUG_COMMANDS, "START");
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       dialog = gl_template_designer_new (GTK_WINDOW(window));
+        dialog = gl_template_designer_new (GTK_WINDOW(window));
 
-       gtk_widget_show (dialog);
+        gtk_widget_show (dialog);
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /****************************************************************************/
@@ -109,43 +100,45 @@ gl_ui_cmd_file_template_designer (GtkAction *action,
 /****************************************************************************/
 void 
 gl_ui_cmd_file_open (GtkAction *action,
-                    glWindow  *window)
+                     glWindow  *window)
 {
-       gl_debug (DEBUG_COMMANDS, "START");
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       gl_file_open (window);
+        gl_file_open (window);
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /****************************************************************************/
 /** File/Open-Recent command.                                               */
 /****************************************************************************/
 void 
-gl_ui_cmd_file_open_recent (GtkAction *action,
-                           glWindow  *window)
+gl_ui_cmd_file_open_recent (GtkRecentChooser *chooser,
+                            glWindow         *window)
 {
-       EggRecentViewUIManager *recent_view;
-       EggRecentItem          *item;
-       gchar                  *utf8_filename;
+        GtkRecentInfo *item;
+        gchar         *utf8_filename;
 
-       gl_debug (DEBUG_COMMANDS, "START");
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        g_return_if_fail (chooser && GTK_IS_RECENT_CHOOSER(chooser));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       recent_view = g_object_get_data (G_OBJECT(window->ui), "recent-view");
-       g_return_if_fail (recent_view && EGG_IS_RECENT_VIEW_UIMANAGER (recent_view));
+        item = gtk_recent_chooser_get_current_item (chooser);
+        if (!item)
+                return;
 
-       item = egg_recent_view_uimanager_get_item (recent_view, action);
-       utf8_filename = gl_recent_get_filename (item);
+        utf8_filename = gl_recent_get_utf8_filename (item);
 
-       gl_file_open_recent (utf8_filename, window);
+        gl_debug (DEBUG_COMMANDS, "Selected %s\n", utf8_filename);
+        gl_file_open_recent (utf8_filename, window);
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gtk_recent_info_unref (item);
+        
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /****************************************************************************/
@@ -153,16 +146,16 @@ gl_ui_cmd_file_open_recent (GtkAction *action,
 /****************************************************************************/
 void 
 gl_ui_cmd_file_save (GtkAction *action,
-                    glWindow  *window)
+                     glWindow  *window)
 {
-       gl_debug (DEBUG_COMMANDS, "START");
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       gl_file_save (GL_VIEW(window->view)->label, window);
+        gl_file_save (GL_VIEW(window->view)->label, window);
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /****************************************************************************/
@@ -170,16 +163,16 @@ gl_ui_cmd_file_save (GtkAction *action,
 /****************************************************************************/
 void 
 gl_ui_cmd_file_save_as (GtkAction *action,
-                       glWindow  *window)
+                        glWindow  *window)
 {
-       gl_debug (DEBUG_COMMANDS, "START");
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       gl_file_save_as (GL_VIEW(window->view)->label, window);
+        gl_file_save_as (GL_VIEW(window->view)->label, window);
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /****************************************************************************/
@@ -187,34 +180,35 @@ gl_ui_cmd_file_save_as (GtkAction *action,
 /****************************************************************************/
 void
 gl_ui_cmd_file_print (GtkAction *action,
-                     glWindow  *window)
+                      glWindow  *window)
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        glPrintOp               *op;
+        GtkPrintOperationResult  result;
 
-       if (window->print_dialog) {
+        gl_debug (DEBUG_COMMANDS, "START");
 
-               gtk_window_present (GTK_WINDOW(window->print_dialog));
-               gtk_window_set_transient_for (GTK_WINDOW (window->print_dialog),
-                                             GTK_WINDOW (window));
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       } else {
+        op = gl_print_op_new (GL_VIEW(window->view)->label);
 
-               window->print_dialog =
-                       g_object_ref (
-                               gl_print_dialog_new (GL_VIEW(window->view)->label,
-                                                    GTK_WINDOW(window)) );
+        if (window->print_settings)
+        {
+                gl_print_op_set_settings (op, window->print_settings);
+        }
 
-               g_signal_connect (G_OBJECT(window->print_dialog), "destroy",
-                                 G_CALLBACK (gtk_widget_destroyed),
-                                 &window->print_dialog);
+        result = gtk_print_operation_run (GTK_PRINT_OPERATION (op),
+                                          GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
+                                          GTK_WINDOW (window),
+                                          NULL);
 
-               gtk_widget_show (GTK_WIDGET (window->print_dialog));
-       }
+        if ( result == GTK_PRINT_OPERATION_RESULT_APPLY )
+        {
+                gl_print_op_free_settings (window->print_settings);
+                window->print_settings = gl_print_op_get_settings (op);
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /****************************************************************************/
@@ -222,16 +216,16 @@ gl_ui_cmd_file_print (GtkAction *action,
 /****************************************************************************/
 void 
 gl_ui_cmd_file_close (GtkAction *action,
-                     glWindow  *window)
+                      glWindow  *window)
 {
-       gl_debug (DEBUG_COMMANDS, "START");
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       gl_file_close (window);
+        gl_file_close (window);
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /****************************************************************************/
@@ -239,16 +233,16 @@ gl_ui_cmd_file_close (GtkAction *action,
 /****************************************************************************/
 void 
 gl_ui_cmd_file_quit (GtkAction *action,
-                    glWindow  *window)
+                     glWindow  *window)
 {
-       gl_debug (DEBUG_COMMANDS, "START");
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       gl_file_exit ();
+        gl_file_exit ();
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 
@@ -257,16 +251,16 @@ gl_ui_cmd_file_quit (GtkAction *action,
 /****************************************************************************/
 void 
 gl_ui_cmd_edit_cut (GtkAction *action,
-                   glWindow  *window)
+                    glWindow  *window)
 {
-       gl_debug (DEBUG_COMMANDS, "START");
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       gl_view_cut (GL_VIEW(window->view)); 
+        gl_view_cut (GL_VIEW(window->view)); 
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /****************************************************************************/
@@ -274,16 +268,16 @@ gl_ui_cmd_edit_cut (GtkAction *action,
 /****************************************************************************/
 void 
 gl_ui_cmd_edit_copy (GtkAction *action,
-                    glWindow  *window)
+                     glWindow  *window)
 {
-       gl_debug (DEBUG_COMMANDS, "START");
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       gl_view_copy (GL_VIEW(window->view)); 
+        gl_view_copy (GL_VIEW(window->view)); 
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /****************************************************************************/
@@ -291,16 +285,16 @@ gl_ui_cmd_edit_copy (GtkAction *action,
 /****************************************************************************/
 void 
 gl_ui_cmd_edit_paste (GtkAction *action,
-                     glWindow  *window)
+                      glWindow  *window)
 {
-       gl_debug (DEBUG_COMMANDS, "START");
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       gl_view_paste (GL_VIEW(window->view)); 
+        gl_view_paste (GL_VIEW(window->view)); 
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 
@@ -309,16 +303,16 @@ gl_ui_cmd_edit_paste (GtkAction *action,
 /****************************************************************************/
 void 
 gl_ui_cmd_edit_delete (GtkAction *action,
-                      glWindow  *window)
+                       glWindow  *window)
 {
-       gl_debug (DEBUG_COMMANDS, "START");
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       gl_view_delete_selection (GL_VIEW(window->view)); 
+        gl_view_delete_selection (GL_VIEW(window->view)); 
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 
@@ -327,16 +321,16 @@ gl_ui_cmd_edit_delete (GtkAction *action,
 /****************************************************************************/
 void
 gl_ui_cmd_edit_select_all (GtkAction *action,
-                          glWindow  *window)
+                           glWindow  *window)
 {
-       gl_debug (DEBUG_COMMANDS, "START");
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       gl_view_select_all (GL_VIEW(window->view)); 
+        gl_view_select_all (GL_VIEW(window->view)); 
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /****************************************************************************/
@@ -344,16 +338,16 @@ gl_ui_cmd_edit_select_all (GtkAction *action,
 /****************************************************************************/
 void
 gl_ui_cmd_edit_unselect_all (GtkAction *action,
-                            glWindow  *window)
+                             glWindow  *window)
 {
-       gl_debug (DEBUG_COMMANDS, "START");
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       gl_view_unselect_all (GL_VIEW(window->view)); 
+        gl_view_unselect_all (GL_VIEW(window->view)); 
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /****************************************************************************/
@@ -361,33 +355,33 @@ gl_ui_cmd_edit_unselect_all (GtkAction *action,
 /****************************************************************************/
 void
 gl_ui_cmd_edit_preferences (GtkAction *action,
-                           glWindow  *window)
+                            glWindow  *window)
 {
-       static GtkWidget *dlg = NULL;
+        static GtkWidget *dialog = NULL;
 
-       gl_debug (DEBUG_COMMANDS, "START");
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (dlg != NULL)
-       {
-               gtk_window_present (GTK_WINDOW (dlg));
-               gtk_window_set_transient_for (GTK_WINDOW (dlg), 
-                                             GTK_WINDOW(window));
+        if (dialog != NULL)
+        {
+                gtk_window_present (GTK_WINDOW (dialog));
+                gtk_window_set_transient_for (GTK_WINDOW (dialog),        
+                                              GTK_WINDOW(window));
 
-       } else {
-               
-               dlg = gl_prefs_dialog_new (GTK_WINDOW(window));
+        } else {
+                
+                dialog = gl_prefs_dialog_new (GTK_WINDOW(window));
 
-               g_signal_connect (G_OBJECT (dlg), "destroy",
-                                 G_CALLBACK (gtk_widget_destroyed), &dlg);
-       
-               gtk_widget_show (dlg);
+                g_signal_connect (G_OBJECT (dialog), "destroy",
+                                  G_CALLBACK (gtk_widget_destroyed), &dialog);
+        
+                gtk_widget_show (dialog);
 
-       }
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -395,76 +389,58 @@ gl_ui_cmd_edit_preferences (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_view_property_bar_toggle (GtkToggleAction *action,
-                                   glWindow        *window)
+                                    glWindow        *window)
 {
-       gboolean     state;
+        gboolean     state;
 
-       gl_debug (DEBUG_COMMANDS, "START");
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       g_return_if_fail (action && GTK_IS_TOGGLE_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        g_return_if_fail (action && GTK_IS_TOGGLE_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       state =  gtk_toggle_action_get_active (action);
+        state =  gtk_toggle_action_get_active (action);
 
-       gl_prefs->property_toolbar_visible = state;
-       if (state) {
-               gtk_widget_show (GTK_WIDGET (window->property_bar));
-       } else {
-               gtk_widget_hide (GTK_WIDGET (window->property_bar));
-       }
-       gl_prefs_model_save_settings (gl_prefs);
+        gl_prefs->property_toolbar_visible = state;
+        if (state) {
+                gtk_widget_show (GTK_WIDGET (window->property_bar));
+        } else {
+                gtk_widget_hide (GTK_WIDGET (window->property_bar));
+        }
+        gl_prefs_model_save_settings (gl_prefs);
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
-/*****************************************************************************/
-/** View/Property-bar-tooltips-toggle command.                               */
-/*****************************************************************************/
-void
-gl_ui_cmd_view_property_bar_tips_toggle (GtkToggleAction *action,
-                                        glWindow        *window)
-{
-       gboolean     state;
-
-       gl_debug (DEBUG_COMMANDS, "START");
-
-       g_return_if_fail (action && GTK_IS_TOGGLE_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
-
-       state =  gtk_toggle_action_get_active (action);
-
-       gl_prefs->property_toolbar_view_tooltips = state;
-       gl_ui_property_bar_set_tooltips (window->property_bar, state);
-       gl_prefs_model_save_settings (gl_prefs);
-
-       gl_debug (DEBUG_COMMANDS, "END");
-}
 
 /*****************************************************************************/
 /** View/Grid-toggle command.                                                */
 /*****************************************************************************/
 void
 gl_ui_cmd_view_grid_toggle (GtkToggleAction *action,
-                           glWindow        *window)
+                            glWindow        *window)
 {
-       gboolean     state;
+        gboolean     state;
 
-       gl_debug (DEBUG_COMMANDS, "START");
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       g_return_if_fail (action && GTK_IS_TOGGLE_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        g_return_if_fail (action && GTK_IS_TOGGLE_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       state =  gtk_toggle_action_get_active (action);
+        state =  gtk_toggle_action_get_active (action);
 
-       gl_prefs->grid_visible = state;
-       if (state) {
-               gl_view_show_grid (GL_VIEW(window->view));
-       } else {
-               gl_view_hide_grid (GL_VIEW(window->view));
-       }
-       gl_prefs_model_save_settings (gl_prefs);
+        if (window->view != NULL)
+        {
+                if (state) {
+                        gl_view_show_grid (GL_VIEW(window->view));
+                } else {
+                        gl_view_hide_grid (GL_VIEW(window->view));
+                }
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_prefs->grid_visible = state;
+        gl_prefs_model_save_settings (gl_prefs);
+
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -472,26 +448,30 @@ gl_ui_cmd_view_grid_toggle (GtkToggleAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_view_markup_toggle (GtkToggleAction *action,
-                             glWindow        *window)
+                              glWindow        *window)
 {
-       gboolean     state;
+        gboolean     state;
+
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       gl_debug (DEBUG_COMMANDS, "START");
+        g_return_if_fail (action && GTK_IS_TOGGLE_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       g_return_if_fail (action && GTK_IS_TOGGLE_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        state =  gtk_toggle_action_get_active (action);
 
-       state =  gtk_toggle_action_get_active (action);
+        if (window->view != NULL)
+        {
+                if (state) {
+                        gl_view_show_markup (GL_VIEW(window->view));
+                } else {
+                        gl_view_hide_markup (GL_VIEW(window->view));
+                }
+        }
 
-       gl_prefs->markup_visible = state;
-       if (state) {
-               gl_view_show_markup (GL_VIEW(window->view));
-       } else {
-               gl_view_hide_markup (GL_VIEW(window->view));
-       }
-       gl_prefs_model_save_settings (gl_prefs);
+        gl_prefs->markup_visible = state;
+        gl_prefs_model_save_settings (gl_prefs);
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -499,19 +479,19 @@ gl_ui_cmd_view_markup_toggle (GtkToggleAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_view_zoomin (GtkAction *action,
-                      glWindow  *window)
+                       glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_zoom_in (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_zoom_in (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -519,19 +499,19 @@ gl_ui_cmd_view_zoomin (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_view_zoomout (GtkAction *action,
-                       glWindow  *window)
+                        glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_zoom_out (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_zoom_out (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -539,19 +519,19 @@ gl_ui_cmd_view_zoomout (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_view_zoom1to1 (GtkAction *action,
-                        glWindow  *window)
+                         glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_set_zoom (GL_VIEW(window->view), 1.0);
-       }
+        if (window->view != NULL) {
+                gl_view_set_zoom (GL_VIEW(window->view), 1.0);
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -559,19 +539,19 @@ gl_ui_cmd_view_zoom1to1 (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_view_zoom_to_fit (GtkAction *action,
-                           glWindow  *window)
+                            glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_zoom_to_fit (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_zoom_to_fit (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -579,18 +559,18 @@ gl_ui_cmd_view_zoom_to_fit (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_arrow_mode (GtkAction *action,
-                             glWindow  *window)
+                              glWindow  *window)
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_arrow_mode (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_arrow_mode (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -598,20 +578,20 @@ gl_ui_cmd_objects_arrow_mode (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_create_text (GtkAction *action,
-                              glWindow  *window)
+                               glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_object_create_mode (GL_VIEW(window->view),
-                                           GL_LABEL_OBJECT_TEXT);
-       }
+        if (window->view != NULL) {
+                gl_view_object_create_mode (GL_VIEW(window->view),
+                                            GL_LABEL_OBJECT_TEXT);
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -619,20 +599,20 @@ gl_ui_cmd_objects_create_text (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_create_box (GtkAction *action,
-                             glWindow  *window)
+                              glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_object_create_mode (GL_VIEW(window->view),
-                                           GL_LABEL_OBJECT_BOX);
-       }
+        if (window->view != NULL) {
+                gl_view_object_create_mode (GL_VIEW(window->view),
+                                            GL_LABEL_OBJECT_BOX);
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -640,20 +620,20 @@ gl_ui_cmd_objects_create_box (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_create_line (GtkAction *action,
-                              glWindow  *window)
+                               glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_object_create_mode (GL_VIEW(window->view),
-                                           GL_LABEL_OBJECT_LINE);
-       }
+        if (window->view != NULL) {
+                gl_view_object_create_mode (GL_VIEW(window->view),
+                                            GL_LABEL_OBJECT_LINE);
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -661,20 +641,20 @@ gl_ui_cmd_objects_create_line (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_create_ellipse (GtkAction *action,
-                                 glWindow  *window)
+                                  glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_object_create_mode (GL_VIEW(window->view),
-                                           GL_LABEL_OBJECT_ELLIPSE);
-       }
+        if (window->view != NULL) {
+                gl_view_object_create_mode (GL_VIEW(window->view),
+                                            GL_LABEL_OBJECT_ELLIPSE);
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -682,20 +662,20 @@ gl_ui_cmd_objects_create_ellipse (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_create_image (GtkAction *action,
-                               glWindow  *window)
+                                glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_object_create_mode (GL_VIEW(window->view),
-                                           GL_LABEL_OBJECT_IMAGE);
-       }
+        if (window->view != NULL) {
+                gl_view_object_create_mode (GL_VIEW(window->view),
+                                            GL_LABEL_OBJECT_IMAGE);
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -703,20 +683,20 @@ gl_ui_cmd_objects_create_image (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_create_barcode (GtkAction *action,
-                                 glWindow  *window)
+                                  glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_object_create_mode (GL_VIEW(window->view),
-                                           GL_LABEL_OBJECT_BARCODE);
-       }
+        if (window->view != NULL) {
+                gl_view_object_create_mode (GL_VIEW(window->view),
+                                            GL_LABEL_OBJECT_BARCODE);
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -724,19 +704,19 @@ gl_ui_cmd_objects_create_barcode (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_raise (GtkAction *action,
-                        glWindow  *window)
+                         glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_raise_selection (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_raise_selection (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -744,19 +724,19 @@ gl_ui_cmd_objects_raise (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_lower (GtkAction *action,
-                        glWindow  *window)
+                         glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_lower_selection (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_lower_selection (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -764,19 +744,19 @@ gl_ui_cmd_objects_lower (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_rotate_left (GtkAction *action,
-                              glWindow  *window)
+                               glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_rotate_selection_left (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_rotate_selection_left (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -784,19 +764,19 @@ gl_ui_cmd_objects_rotate_left (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_rotate_right (GtkAction *action,
-                               glWindow  *window)
+                                glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_rotate_selection_right (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_rotate_selection_right (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -804,19 +784,19 @@ gl_ui_cmd_objects_rotate_right (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_flip_horiz (GtkAction *action,
-                             glWindow  *window)
+                              glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_flip_selection_horiz (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_flip_selection_horiz (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -824,19 +804,19 @@ gl_ui_cmd_objects_flip_horiz (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_flip_vert (GtkAction *action,
-                            glWindow  *window)
+                             glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_flip_selection_vert (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_flip_selection_vert (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -844,19 +824,19 @@ gl_ui_cmd_objects_flip_vert (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_align_left (GtkAction *action,
-                             glWindow  *window)
+                              glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_align_selection_left (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_align_selection_left (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -864,19 +844,19 @@ gl_ui_cmd_objects_align_left (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_align_right (GtkAction *action,
-                              glWindow  *window)
+                               glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_align_selection_right (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_align_selection_right (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -884,19 +864,19 @@ gl_ui_cmd_objects_align_right (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_align_hcenter (GtkAction *action,
-                                glWindow  *window)
+                                 glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_align_selection_hcenter (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_align_selection_hcenter (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -904,19 +884,19 @@ gl_ui_cmd_objects_align_hcenter (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_align_top (GtkAction *action,
-                            glWindow  *window)
+                             glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_align_selection_top (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_align_selection_top (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -924,19 +904,19 @@ gl_ui_cmd_objects_align_top (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_align_bottom (GtkAction *action,
-                               glWindow  *window)
+                                glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_align_selection_bottom (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_align_selection_bottom (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -944,19 +924,19 @@ gl_ui_cmd_objects_align_bottom (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_align_vcenter (GtkAction *action,
-                                glWindow  *window)
+                                 glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_align_selection_vcenter (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_align_selection_vcenter (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -964,19 +944,19 @@ gl_ui_cmd_objects_align_vcenter (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_center_horiz (GtkAction *action,
-                               glWindow  *window)
+                                glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_center_selection_horiz (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_center_selection_horiz (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -984,19 +964,19 @@ gl_ui_cmd_objects_center_horiz (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_center_vert (GtkAction *action,
-                              glWindow  *window)
+                               glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->view != NULL) {
-               gl_view_center_selection_vert (GL_VIEW(window->view));
-       }
+        if (window->view != NULL) {
+                gl_view_center_selection_vert (GL_VIEW(window->view));
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /*****************************************************************************/
@@ -1004,36 +984,36 @@ gl_ui_cmd_objects_center_vert (GtkAction *action,
 /*****************************************************************************/
 void
 gl_ui_cmd_objects_merge_properties (GtkAction *action,
-                                   glWindow  *window)
+                                    glWindow  *window)
 
 {
-       gl_debug (DEBUG_COMMANDS, "START");
-       
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
+        gl_debug (DEBUG_COMMANDS, "START");
+        
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-       if (window->merge_dialog) {
+        if (window->merge_dialog) {
 
-               gtk_window_present (GTK_WINDOW(window->merge_dialog));
-               gtk_window_set_transient_for (GTK_WINDOW (window->merge_dialog),
-                                             GTK_WINDOW (window));
+                gtk_window_present (GTK_WINDOW(window->merge_dialog));
+                gtk_window_set_transient_for (GTK_WINDOW (window->merge_dialog),
+                                              GTK_WINDOW (window));
 
-       } else {
+        } else {
 
-               window->merge_dialog =
-                       g_object_ref (
-                               gl_merge_properties_dialog_new (GL_VIEW(window->view)->label,
-                                                               GTK_WINDOW(window)) );
+                window->merge_dialog =
+                        g_object_ref (
+                                gl_merge_properties_dialog_new (GL_VIEW(window->view)->label,
+                                                                GTK_WINDOW(window)) );
 
-               g_signal_connect (G_OBJECT(window->merge_dialog), "destroy",
-                                 G_CALLBACK (gtk_widget_destroyed),
-                                 &window->merge_dialog);
+                g_signal_connect (G_OBJECT(window->merge_dialog), "destroy",
+                                  G_CALLBACK (gtk_widget_destroyed),
+                                  &window->merge_dialog);
 
-               gtk_widget_show (GTK_WIDGET (window->merge_dialog));
+                gtk_widget_show (GTK_WIDGET (window->merge_dialog));
 
-       }
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 /****************************************************************************/
@@ -1041,40 +1021,28 @@ gl_ui_cmd_objects_merge_properties (GtkAction *action,
 /****************************************************************************/
 void 
 gl_ui_cmd_help_contents (GtkAction *action,
-                        glWindow  *window)
+                         glWindow  *window)
 {
-       GError *error = NULL;
+        GError *error = NULL;
 
-       gl_debug (DEBUG_COMMANDS, "START");
-
-       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);
-       
-       if (error != NULL)
-       {
-               g_message (error->message);
-
-               g_error_free (error);
-       }
+        gl_debug (DEBUG_COMMANDS, "START");
 
-       gl_debug (DEBUG_COMMANDS, "END");
-}
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
 
-/*--------------------------------------------------------------------------*/
-/** Private: URL handler.                                                   */
-/*--------------------------------------------------------------------------*/
-static void
-activate_url (GtkAboutDialog *about,
-             const gchar    *url,
-             gpointer        data)
-{
-       gl_debug (DEBUG_COMMANDS, "START");
+        gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)),
+                      "ghelp:glabels",
+                      GDK_CURRENT_TIME, 
+                      &error);
+        
+        if (error != NULL)
+        {
+                g_message ("%s", error->message);
 
-       gnome_url_show (url, NULL);
+                g_error_free (error);
+        }
 
-       gl_debug (DEBUG_COMMANDS, "END");
+        gl_debug (DEBUG_COMMANDS, "END");
 }
 
 
@@ -1083,99 +1051,97 @@ activate_url (GtkAboutDialog *about,
 /****************************************************************************/
 void 
 gl_ui_cmd_help_about (GtkAction *action,
-                     glWindow  *window)
+                      glWindow  *window)
 {
-       static GtkWidget *about = NULL;
-
-       GdkPixbuf        *pixbuf = NULL;
-       
-       const gchar *authors[] = {
-               "Jim Evins",
-               " ",
-               _("Glabels includes contributions from:"),
-               "Frederic Ruaudel",
-               "Wayne Schuller",
-               "Emmanuel Pacaud",
-               "Austin Henry",
-               " ",
-               _("See the file AUTHORS for additional credits,"),
-               _("or visit http://glabels.sourceforge.net/"),
-               NULL
-       };
-       
-       const gchar *artists[] = {
-               "Nestor Di",
-               "Jim Evins",
-               NULL
-       };
-       
-       const gchar *copy_text = "Copyright \xc2\xa9 2001-2005 Jim Evins";
-
-       const gchar *about_text = _("A label and business card creation program.\n");
-
-       const gchar *url = "http://glabels.sourceforge.net";
-
-       const gchar *translator_credits = _("translator-credits");
-
-       const gchar *license = _(
-             "Glabels is free software; you can redistribute it and/or modify it\n"
-             "under the terms of the GNU General Public License as published by\n"
-             "the Free Software Foundation; either version 2 of the License, or\n"
-             "(at your option) any later version.\n" "\n"
-             "This program is distributed in the hope that it will be useful, but\n"
-             "WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-             "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See\n"
-             "the GNU General Public License for more details.\n");
-
-       gl_debug (DEBUG_COMMANDS, "START");
-
-       g_return_if_fail (action && GTK_IS_ACTION(action));
-       g_return_if_fail (window && GL_IS_WINDOW(window));
-
-       if (about != NULL)
-       {
-
-               gtk_window_present (GTK_WINDOW (about));
-               gtk_window_set_transient_for (GTK_WINDOW (about),
-                                             GTK_WINDOW (window));
-
-       } else {
-       
-               pixbuf = gdk_pixbuf_new_from_file ( LOGO_PIXMAP, NULL);
-
-               gtk_about_dialog_set_url_hook (activate_url, NULL, NULL);
-
-               about = gtk_about_dialog_new ();
-               gtk_about_dialog_set_name      (GTK_ABOUT_DIALOG(about), _("glabels"));
-               gtk_about_dialog_set_version   (GTK_ABOUT_DIALOG(about), VERSION);
-               gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG(about), copy_text);
-               gtk_about_dialog_set_comments  (GTK_ABOUT_DIALOG(about), about_text);
-               gtk_about_dialog_set_website   (GTK_ABOUT_DIALOG(about), url);
-               gtk_about_dialog_set_logo      (GTK_ABOUT_DIALOG(about), pixbuf);
-
-               gtk_about_dialog_set_authors   (GTK_ABOUT_DIALOG(about), authors);
-               gtk_about_dialog_set_artists   (GTK_ABOUT_DIALOG(about), artists);
-               gtk_about_dialog_set_translator_credits (GTK_ABOUT_DIALOG(about),
-                                                        translator_credits);
-               gtk_about_dialog_set_license   (GTK_ABOUT_DIALOG(about), license);
-       
-               gtk_window_set_destroy_with_parent (GTK_WINDOW (about), TRUE);
-
-               g_signal_connect (G_OBJECT (about), "response",
-                                 G_CALLBACK (gtk_widget_destroy), NULL);
-               g_signal_connect (G_OBJECT (about), "destroy",
-                                 G_CALLBACK (gtk_widget_destroyed), &about);
-
-               gtk_window_set_transient_for (GTK_WINDOW (about),
-                                             GTK_WINDOW (window));
-
-               gtk_window_present (GTK_WINDOW (about));
-
-               if (pixbuf != NULL)
-                       g_object_unref (pixbuf);
-
-       }
-       
-       gl_debug (DEBUG_COMMANDS, "END");
+        static GtkWidget *about = NULL;
+
+        GdkPixbuf        *pixbuf = NULL;
+        
+        const gchar *authors[] = {
+                "Jim Evins",
+                " ",
+                _("Glabels includes contributions from:"),
+                "Frederic Ruaudel",
+                "Wayne Schuller",
+                "Emmanuel Pacaud",
+                "Austin Henry",
+                " ",
+                _("See the file AUTHORS for additional credits,"),
+                _("or visit http://glabels.sourceforge.net/"),
+                NULL
+        };
+        
+        const gchar *artists[] = {
+                "Nestor Di",
+                "Jim Evins",
+                NULL
+        };
+        
+        const gchar *copy_text = "Copyright \xc2\xa9 2001-2009 Jim Evins";
+
+        const gchar *about_text = _("A label and business card creation program.\n");
+
+        const gchar *url = "http://glabels.sourceforge.net";
+
+        const gchar *translator_credits = _("translator-credits");
+
+        const gchar *license = _(
+              "Glabels is free software; you can redistribute it and/or modify it\n"
+              "under the terms of the GNU General Public License as published by\n"
+              "the Free Software Foundation; either version 2 of the License, or\n"
+              "(at your option) any later version.\n" "\n"
+              "This program is distributed in the hope that it will be useful, but\n"
+              "WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+              "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See\n"
+              "the GNU General Public License for more details.\n");
+
+        gl_debug (DEBUG_COMMANDS, "START");
+
+        g_return_if_fail (action && GTK_IS_ACTION(action));
+        g_return_if_fail (window && GL_IS_WINDOW(window));
+
+        if (about != NULL)
+        {
+
+                gtk_window_present (GTK_WINDOW (about));
+                gtk_window_set_transient_for (GTK_WINDOW (about),
+                                              GTK_WINDOW (window));
+
+        } else {
+        
+                pixbuf = gdk_pixbuf_new_from_file (GLABELS_PIXMAP_DIR "glabels-splash.png", NULL);
+
+                about = gtk_about_dialog_new ();
+                gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG(about), _("glabels"));
+                gtk_about_dialog_set_version      (GTK_ABOUT_DIALOG(about), VERSION);
+                gtk_about_dialog_set_copyright    (GTK_ABOUT_DIALOG(about), copy_text);
+                gtk_about_dialog_set_comments     (GTK_ABOUT_DIALOG(about), about_text);
+                gtk_about_dialog_set_website      (GTK_ABOUT_DIALOG(about), url);
+                gtk_about_dialog_set_logo         (GTK_ABOUT_DIALOG(about), pixbuf);
+
+                gtk_about_dialog_set_authors      (GTK_ABOUT_DIALOG(about), authors);
+                gtk_about_dialog_set_artists      (GTK_ABOUT_DIALOG(about), artists);
+                gtk_about_dialog_set_translator_credits (GTK_ABOUT_DIALOG(about),
+                                                         translator_credits);
+                gtk_about_dialog_set_license   (GTK_ABOUT_DIALOG(about), license);
+        
+                gtk_window_set_destroy_with_parent (GTK_WINDOW (about), TRUE);
+
+                g_signal_connect (G_OBJECT (about), "response",
+                                  G_CALLBACK (gtk_widget_destroy), NULL);
+                g_signal_connect (G_OBJECT (about), "destroy",
+                                  G_CALLBACK (gtk_widget_destroyed), &about);
+
+                gtk_window_set_transient_for (GTK_WINDOW (about),
+                                              GTK_WINDOW (window));
+
+                gtk_window_present (GTK_WINDOW (about));
+
+                if (pixbuf != NULL)
+                        g_object_unref (pixbuf);
+
+        }
+        
+        gl_debug (DEBUG_COMMANDS, "END");
 }