]> git.sur5r.net Git - glabels/blobdiff - src/new-label-dialog.c
Added translation context for "Select Product" (Bug #763003).
[glabels] / src / new-label-dialog.c
index ffea6dc06ac33500dac4a7355e71650498987d94..07807ae6a417a4f636c84cb316f57e7b89188c1a 100644 (file)
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "hig.h"
+#include "marshal.h"
 #include "builder-util.h"
 #include "prefs.h"
-#include "template-history.h"
+#include "media-select.h"
+#include "mini-label-preview.h"
 #include "mini-preview.h"
-#include "media-combo.h"
-#include "rotate-label-button.h"
 
 #include "debug.h"
 
 
-#define MINI_PREVIEW_MIN_HEIGHT 300
-#define MINI_PREVIEW_MIN_WIDTH  256
+#define LABEL_PREVIEW_WIDTH  96
+#define LABEL_PREVIEW_HEIGHT 96
+
+#define MINI_PREVIEW_MIN_WIDTH  300
+#define MINI_PREVIEW_MIN_HEIGHT 360
 
 
 /*===========================================*/
@@ -48,10 +50,21 @@ struct _glNewLabelDialogPrivate {
 
         GtkBuilder *builder;
 
-       GtkWidget  *preview_vbox;
+        GtkWidget  *template_page_vbox;
         GtkWidget  *combo_hbox;
-       GtkWidget  *rotate_hbox;
+        GtkWidget  *combo;
+
+        GtkWidget  *rotate_page_vbox;
+        GtkWidget  *normal_radio;
+        GtkWidget  *rotated_radio;
+        GtkWidget  *normal_preview_hbox;
+        GtkWidget  *rotated_preview_hbox;
+        GtkWidget  *normal_preview;
+        GtkWidget  *rotated_preview;
 
+        GtkWidget  *confirm_page_vbox;
+        GtkWidget  *preview_vbox;
+        GtkWidget  *preview;
         GtkWidget  *desc_label;
         GtkWidget  *page_size_label;
         GtkWidget  *label_size_label;
@@ -59,10 +72,18 @@ struct _glNewLabelDialogPrivate {
         GtkWidget  *vendor_label;
         GtkWidget  *part_label;
         GtkWidget  *similar_label;
+};
 
-        GtkWidget  *preview;
-        GtkWidget  *combo;
-        GtkWidget  *rotate_button;
+/* Page numbers for traversing GtkAssistant */
+enum {
+        TEMPLATE_PAGE_NUM = 0,
+        ROTATE_PAGE_NUM,
+        CONFIRM_PAGE_NUM
+};
+
+enum {
+        COMPLETE,
+        LAST_SIGNAL
 };
 
 
@@ -70,6 +91,8 @@ struct _glNewLabelDialogPrivate {
 /* Private globals                           */
 /*===========================================*/
 
+static gint signals[LAST_SIGNAL] = { 0 };
+
 
 /*===========================================*/
 /* Local function prototypes                 */
@@ -77,11 +100,16 @@ struct _glNewLabelDialogPrivate {
 
 static void       gl_new_label_dialog_finalize        (GObject           *object);
 
+static void       cancel_cb                           (glNewLabelDialog  *this);
+static void       apply_cb                            (glNewLabelDialog  *this);
+static void       close_cb                            (glNewLabelDialog  *this);
+
+static gint       forward_page_function               (gint               current_page,
+                                                       glNewLabelDialog  *this);
+
 static void       combo_changed_cb                    (glNewLabelDialog  *this);
 static void       rotate_toggled_cb                   (glNewLabelDialog  *this);
 
-static gchar     *get_default_name                    (void);
-
 static void       set_info                            (glNewLabelDialog  *this,
                                                        const gchar       *name);
 
@@ -89,7 +117,7 @@ static void       set_info                            (glNewLabelDialog  *this,
 /*****************************************************************************/
 /* Boilerplate object stuff.                                                 */
 /*****************************************************************************/
-G_DEFINE_TYPE (glNewLabelDialog, gl_new_label_dialog, GTK_TYPE_DIALOG);
+G_DEFINE_TYPE (glNewLabelDialog, gl_new_label_dialog, GTK_TYPE_ASSISTANT)
 
 
 /*****************************************************************************/
@@ -98,13 +126,23 @@ G_DEFINE_TYPE (glNewLabelDialog, gl_new_label_dialog, GTK_TYPE_DIALOG);
 static void
 gl_new_label_dialog_class_init (glNewLabelDialogClass *class)
 {
-       GObjectClass *object_class = G_OBJECT_CLASS (class);
+        GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+        gl_debug (DEBUG_FILE, "");
+
+        gl_new_label_dialog_parent_class = g_type_class_peek_parent (class);
+
+        object_class->finalize = gl_new_label_dialog_finalize;
 
-       gl_debug (DEBUG_FILE, "");
-       
-       gl_new_label_dialog_parent_class = g_type_class_peek_parent (class);
+        signals[COMPLETE] =
+            g_signal_new ("complete",
+                          G_OBJECT_CLASS_TYPE(object_class),
+                          G_SIGNAL_RUN_LAST,
+                          G_STRUCT_OFFSET (glNewLabelDialogClass, complete),
+                          NULL, NULL,
+                          gl_marshal_VOID__VOID,
+                          G_TYPE_NONE, 0);
 
-       object_class->finalize = gl_new_label_dialog_finalize;
 }
 
 
@@ -114,49 +152,51 @@ gl_new_label_dialog_class_init (glNewLabelDialogClass *class)
 static void
 gl_new_label_dialog_init (glNewLabelDialog *this)
 {
-       GtkWidget    *vbox;
+        GdkRGBA       banner_color = { 0, 0.5, 1.0, 1.0 };
+        GtkWidget    *page_1_banner_eventbox, *page_2_banner_eventbox, *page_3_banner_eventbox;
+        GtkWidget    *page_1_image, *page_2_image, *page_3_image;
+        gchar        *logo_filename;
+        GdkPixbuf    *logo;
         GtkBuilder   *builder;
         gchar        *builder_filename;
-        static gchar *object_ids[] = { "new_label_dialog_hbox", NULL };
+        static gchar *object_ids[] = { "template_page_vbox",
+                                       "rotate_page_vbox",
+                                       "confirm_page_vbox",
+                                       NULL };
         GError       *error = NULL;
-        GtkWidget    *new_label_dialog_hbox;
-        gchar        *name;
 
-       gl_debug (DEBUG_FILE, "START");
+        gl_debug (DEBUG_FILE, "START");
 
-       g_return_if_fail (GL_IS_NEW_LABEL_DIALOG (this));
-
-       this->priv = g_new0 (glNewLabelDialogPrivate, 1);
-
-       gtk_container_set_border_width (GTK_CONTAINER (this), GL_HIG_PAD1);
-
-       gtk_dialog_set_has_separator (GTK_DIALOG (this), FALSE);
-       gtk_dialog_add_buttons (GTK_DIALOG (this),
-                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                GTK_STOCK_OK, GTK_RESPONSE_OK,
-                                NULL);
-        gtk_dialog_set_default_response (GTK_DIALOG (this), GTK_RESPONSE_OK);
-       gtk_window_set_destroy_with_parent (GTK_WINDOW (this), TRUE);
-       gtk_window_set_modal (GTK_WINDOW (this), TRUE);
-
-        vbox = gtk_dialog_get_content_area (GTK_DIALOG (this));
+        g_return_if_fail (GL_IS_NEW_LABEL_DIALOG (this));
 
+        this->priv = g_new0 (glNewLabelDialogPrivate, 1);
 
         builder = gtk_builder_new ();
-        builder_filename = g_build_filename (GLABELS_DATA_DIR, "builder", "new-label-dialog.builder", NULL);
+        builder_filename = g_build_filename (GLABELS_DATA_DIR, "ui", "new-label-dialog.ui", NULL);
         gtk_builder_add_objects_from_file (builder, builder_filename, object_ids, &error);
         g_free (builder_filename);
-       if (error) {
-               g_critical ("%s\n\ngLabels may not be installed correctly!", error->message);
+        if (error) {
+                g_critical ("%s\n\ngLabels may not be installed correctly!", error->message);
                 g_error_free (error);
-               return;
-       }
+                return;
+        }
 
         gl_builder_util_get_widgets (builder,
-                                     "new_label_dialog_hbox",  &new_label_dialog_hbox,
-                                     "preview_vbox",           &this->priv->preview_vbox,
+                                     "page_1_banner_eventbox", &page_1_banner_eventbox,
+                                     "page_2_banner_eventbox", &page_2_banner_eventbox,
+                                     "page_3_banner_eventbox", &page_3_banner_eventbox,
+                                     "page_1_image",           &page_1_image,
+                                     "page_2_image",           &page_2_image,
+                                     "page_3_image",           &page_3_image,
+                                     "template_page_vbox",     &this->priv->template_page_vbox,
                                      "combo_hbox",             &this->priv->combo_hbox,
-                                     "rotate_hbox",            &this->priv->rotate_hbox,
+                                     "rotate_page_vbox",       &this->priv->rotate_page_vbox,
+                                     "normal_radio",           &this->priv->normal_radio,
+                                     "rotated_radio",          &this->priv->rotated_radio,
+                                     "normal_preview_hbox",    &this->priv->normal_preview_hbox,
+                                     "rotated_preview_hbox",   &this->priv->rotated_preview_hbox,
+                                     "confirm_page_vbox",      &this->priv->confirm_page_vbox,
+                                     "preview_vbox",           &this->priv->preview_vbox,
                                      "desc_label",             &this->priv->desc_label,
                                      "page_size_label",        &this->priv->page_size_label,
                                      "label_size_label",       &this->priv->label_size_label,
@@ -166,32 +206,67 @@ gl_new_label_dialog_init (glNewLabelDialog *this)
                                      "similar_label",          &this->priv->similar_label,
                                      NULL);
 
-        gtk_container_add (GTK_CONTAINER (vbox), new_label_dialog_hbox);
         this->priv->builder = builder;
 
+        gtk_assistant_append_page (GTK_ASSISTANT (this), this->priv->template_page_vbox);
+        gtk_assistant_set_page_title (GTK_ASSISTANT (this), this->priv->template_page_vbox,
+                                      C_("Title of dialog page to select a stationary product",
+                                         "Select Product"));
+        gtk_assistant_set_page_type (GTK_ASSISTANT (this), this->priv->template_page_vbox, GTK_ASSISTANT_PAGE_INTRO);
+        gtk_widget_override_background_color (page_1_banner_eventbox, GTK_STATE_NORMAL, &banner_color);
+        logo_filename = g_build_filename (GLABELS_DATA_DIR, "pixmaps", "new-select.png", NULL);
+        logo = gdk_pixbuf_new_from_file (logo_filename, NULL);
+        gtk_image_set_from_pixbuf (GTK_IMAGE (page_1_image), logo);
+        g_free (logo_filename);
+        g_object_unref (logo);
+
+        this->priv->combo = gl_media_select_new ();
+        gtk_container_add (GTK_CONTAINER (this->priv->combo_hbox), this->priv->combo);
+
+        gtk_assistant_append_page (GTK_ASSISTANT (this), this->priv->rotate_page_vbox);
+        gtk_assistant_set_page_title (GTK_ASSISTANT (this), this->priv->rotate_page_vbox, _("Choose Orientation"));
+        gtk_assistant_set_page_complete (GTK_ASSISTANT (this), this->priv->rotate_page_vbox, TRUE);
+        gtk_widget_override_background_color (page_2_banner_eventbox, GTK_STATE_NORMAL, &banner_color);
+        logo_filename = g_build_filename (GLABELS_DATA_DIR, "pixmaps", "new-rotate.png", NULL);
+        logo = gdk_pixbuf_new_from_file (logo_filename, NULL);
+        gtk_image_set_from_pixbuf (GTK_IMAGE (page_2_image), logo);
+        g_free (logo_filename);
+        g_object_unref (logo);
+
+        this->priv->normal_preview = gl_mini_label_preview_new (LABEL_PREVIEW_WIDTH, LABEL_PREVIEW_HEIGHT);
+        gtk_container_add (GTK_CONTAINER (this->priv->normal_preview_hbox), this->priv->normal_preview);
+        this->priv->rotated_preview = gl_mini_label_preview_new (LABEL_PREVIEW_WIDTH, LABEL_PREVIEW_HEIGHT);
+        gtk_container_add (GTK_CONTAINER (this->priv->rotated_preview_hbox), this->priv->rotated_preview);
+
+        gtk_assistant_append_page (GTK_ASSISTANT (this), this->priv->confirm_page_vbox);
+        gtk_assistant_set_page_title (GTK_ASSISTANT (this), this->priv->confirm_page_vbox, _("Review"));
+        gtk_assistant_set_page_type (GTK_ASSISTANT (this), this->priv->confirm_page_vbox, GTK_ASSISTANT_PAGE_CONFIRM);
+        gtk_assistant_set_page_complete (GTK_ASSISTANT (this), this->priv->confirm_page_vbox, TRUE);
+        gtk_widget_override_background_color (page_3_banner_eventbox, GTK_STATE_NORMAL, &banner_color);
+        logo_filename = g_build_filename (GLABELS_DATA_DIR, "pixmaps", "new-confirm.png", NULL);
+        logo = gdk_pixbuf_new_from_file (logo_filename, NULL);
+        gtk_image_set_from_pixbuf (GTK_IMAGE (page_3_image), logo);
+        g_free (logo_filename);
+        g_object_unref (logo);
+
         this->priv->preview = gl_mini_preview_new (MINI_PREVIEW_MIN_HEIGHT, MINI_PREVIEW_MIN_WIDTH);
         gl_mini_preview_set_draw_arrow (GL_MINI_PREVIEW (this->priv->preview), TRUE);
         gl_mini_preview_set_rotate (GL_MINI_PREVIEW (this->priv->preview), FALSE);
         gtk_container_add (GTK_CONTAINER (this->priv->preview_vbox), this->priv->preview);
 
-        this->priv->combo = gl_media_combo_new ();
-        gtk_container_add (GTK_CONTAINER (this->priv->combo_hbox), this->priv->combo);
+        gtk_assistant_set_forward_page_func (GTK_ASSISTANT (this), (GtkAssistantPageFunc)forward_page_function, this, NULL);
 
-        this->priv->rotate_button = gl_rotate_label_button_new ();
-        gtk_container_add (GTK_CONTAINER (this->priv->rotate_hbox), this->priv->rotate_button);
+        g_signal_connect_swapped (G_OBJECT(this), "cancel", G_CALLBACK(cancel_cb), this);
+        g_signal_connect_swapped (G_OBJECT(this), "apply",  G_CALLBACK(apply_cb),  this);
+        g_signal_connect_swapped (G_OBJECT(this), "close",  G_CALLBACK(close_cb),  this);
 
-       g_signal_connect_swapped (G_OBJECT (this->priv->combo), "changed",
-                         G_CALLBACK (combo_changed_cb), this);
-       g_signal_connect_swapped (G_OBJECT (this->priv->rotate_button), "changed",
-                         G_CALLBACK (rotate_toggled_cb), this);
+        g_signal_connect_swapped (G_OBJECT (this->priv->combo),         "changed", G_CALLBACK (combo_changed_cb),  this);
+        g_signal_connect_swapped (G_OBJECT (this->priv->normal_radio),  "toggled", G_CALLBACK (rotate_toggled_cb), this);
+        g_signal_connect_swapped (G_OBJECT (this->priv->rotated_radio), "toggled", G_CALLBACK (rotate_toggled_cb), this);
 
-        name = get_default_name ();
-        gl_media_combo_set_name (GL_MEDIA_COMBO (this->priv->combo), name);
-        gl_rotate_label_button_set_template_name (GL_ROTATE_LABEL_BUTTON (this->priv->rotate_button), name);
-        g_free (name);
         combo_changed_cb (this);
 
-       gl_debug (DEBUG_FILE, "END");
+        gl_debug (DEBUG_FILE, "END");
 }
 
 
@@ -201,20 +276,20 @@ gl_new_label_dialog_init (glNewLabelDialog *this)
 static void 
 gl_new_label_dialog_finalize (GObject *object)
 {
-       glNewLabelDialog* this = GL_NEW_LABEL_DIALOG (object);;
-       
-       gl_debug (DEBUG_FILE, "START");
+        glNewLabelDialog* this = GL_NEW_LABEL_DIALOG (object);;
+
+        gl_debug (DEBUG_FILE, "START");
 
-       g_return_if_fail (object != NULL);
-       g_return_if_fail (GL_IS_NEW_LABEL_DIALOG (this));
-       g_return_if_fail (this->priv != NULL);
+        g_return_if_fail (object != NULL);
+        g_return_if_fail (GL_IS_NEW_LABEL_DIALOG (this));
+        g_return_if_fail (this->priv != NULL);
 
         g_object_unref (G_OBJECT (this->priv->builder));
-       g_free (this->priv);
+        g_free (this->priv);
 
-       G_OBJECT_CLASS (gl_new_label_dialog_parent_class)->finalize (object);
+        G_OBJECT_CLASS (gl_new_label_dialog_parent_class)->finalize (object);
 
-       gl_debug (DEBUG_FILE, "END");
+        gl_debug (DEBUG_FILE, "END");
 
 }
 
@@ -225,89 +300,137 @@ gl_new_label_dialog_finalize (GObject *object)
 GtkWidget *
 gl_new_label_dialog_new (GtkWindow    *win)
 {
-       GtkWidget *this;
+        GtkWidget *this;
 
-       gl_debug (DEBUG_FILE, "");
+        gl_debug (DEBUG_FILE, "");
 
-       this = GTK_WIDGET (g_object_new (GL_TYPE_NEW_LABEL_DIALOG, NULL));
+        this = GTK_WIDGET (g_object_new (GL_TYPE_NEW_LABEL_DIALOG, NULL));
 
-       gtk_window_set_transient_for (GTK_WINDOW (this), win);
+        gtk_window_set_transient_for (GTK_WINDOW (this), win);
 
-       return this;
+        return this;
 }
 
 
-/*---------------------------------------------------------------------------*/
-/* PRIVATE.  Template changed callback.                                      */
-/*---------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*/
+/* PRIVATE.  Handle non-linear forward traversal.                           */
+/*--------------------------------------------------------------------------*/
+static gint
+forward_page_function (gint              current_page,
+                       glNewLabelDialog *this)
+{
+        gchar                     *name;
+        lglTemplate               *template;
+        const lglTemplateFrame    *frame;
+        gdouble                    w, h;
+
+        switch (current_page)
+        {
+        case TEMPLATE_PAGE_NUM:
+                name = gl_media_select_get_name (GL_MEDIA_SELECT (this->priv->combo));
+                if ( name != NULL )
+                {
+                        template = lgl_db_lookup_template_from_name (name);
+                        frame    = (lglTemplateFrame *)template->frames->data;
+                        lgl_template_frame_get_size (frame, &w, &h);
+
+                        if ( w == h )
+                        {
+                                /* Skip rotate page for square and circular labels. */
+                                return CONFIRM_PAGE_NUM;
+                        }
+                }
+                return ROTATE_PAGE_NUM;
+
+        case ROTATE_PAGE_NUM:
+                return CONFIRM_PAGE_NUM;
+
+        case CONFIRM_PAGE_NUM:
+        default:
+                return -1;
+        }
+
+        return -1;
+}
+
+
+/*--------------------------------------------------------------------------*/
+/* PRIVATE.  cancel callback.                                               */
+/*--------------------------------------------------------------------------*/
 static void
-combo_changed_cb (glNewLabelDialog  *this)
+cancel_cb (glNewLabelDialog *this)
 {
-       gchar             *name;
+                                                                               
+        gtk_widget_destroy (GTK_WIDGET(this));
 
-       gl_debug (DEBUG_FILE, "START");
+}
 
-       name = gl_media_combo_get_name (GL_MEDIA_COMBO (this->priv->combo));
 
-       gl_mini_preview_set_by_name (GL_MINI_PREVIEW (this->priv->preview), name);
-        gl_rotate_label_button_set_template_name (GL_ROTATE_LABEL_BUTTON (this->priv->rotate_button), name);
-        set_info (this, name);
+/*--------------------------------------------------------------------------*/
+/* PRIVATE.  apply callback                                                 */
+/*--------------------------------------------------------------------------*/
+static void
+apply_cb (glNewLabelDialog *this)
+{
 
-       g_free (name);
+        g_signal_emit (G_OBJECT (this), signals[COMPLETE], 0);
 
-       gl_debug (DEBUG_FILE, "END");
 }
 
+                         
+/*--------------------------------------------------------------------------*/
+/* PRIVATE.  close callback                                                 */
+/*--------------------------------------------------------------------------*/
+static void
+close_cb (glNewLabelDialog *this)
+{
+                                                                               
+        gtk_widget_destroy (GTK_WIDGET(this));
+
+}
 
+                         
 /*---------------------------------------------------------------------------*/
-/* PRIVATE.  Rotate toggled callback.                                        */
+/* PRIVATE.  Template changed callback.                                      */
 /*---------------------------------------------------------------------------*/
 static void
-rotate_toggled_cb (glNewLabelDialog  *this)
+combo_changed_cb (glNewLabelDialog  *this)
 {
-        gboolean state;
+        gchar             *name;
 
-       gl_debug (DEBUG_FILE, "START");
+        gl_debug (DEBUG_FILE, "START");
 
-        state = gl_rotate_label_button_get_state (GL_ROTATE_LABEL_BUTTON (this->priv->rotate_button));
-        gl_mini_preview_set_rotate (GL_MINI_PREVIEW (this->priv->preview), state);
+        name = gl_media_select_get_name (GL_MEDIA_SELECT (this->priv->combo));
+
+        gl_mini_label_preview_set_by_name (GL_MINI_LABEL_PREVIEW (this->priv->normal_preview),  name, FALSE);
+        gl_mini_label_preview_set_by_name (GL_MINI_LABEL_PREVIEW (this->priv->rotated_preview), name, TRUE);
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (this->priv->normal_radio), TRUE);
+
+        gl_mini_preview_set_by_name (GL_MINI_PREVIEW (this->priv->preview), name);
+        set_info (this, name);
+
+        gtk_assistant_set_page_complete (GTK_ASSISTANT (this), this->priv->template_page_vbox, (name != NULL));
 
-       gl_debug (DEBUG_FILE, "END");
+        g_free (name);
+
+        gl_debug (DEBUG_FILE, "END");
 }
 
 
 /*---------------------------------------------------------------------------*/
-/* PRIVATE.  Get default template name.                                      */
+/* PRIVATE.  Rotate toggled callback.                                        */
 /*---------------------------------------------------------------------------*/
-static gchar *
-get_default_name (void)
+static void
+rotate_toggled_cb (glNewLabelDialog  *this)
 {
-        gchar *name = NULL;
-        GList *list;
-
-        list = gl_template_history_model_get_name_list (gl_template_history);
-
-        if ( list )
-        {
-                name = g_strdup (list->data);
-                gl_template_history_model_free_name_list (list);
-        }
-        else
-        {
-                gchar *page_size;
+        gboolean state;
 
-                page_size = gl_prefs_model_get_default_page_size (gl_prefs);
-                list = lgl_db_get_template_name_list_all (NULL, page_size, NULL);
-                g_free (page_size);
+        gl_debug (DEBUG_FILE, "START");
 
-                if ( list )
-                {
-                        name = g_strdup (list->data);
-                        lgl_db_free_template_name_list (list);
-                }
-        }
+        state = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (this->priv->rotated_radio));
+        gl_mini_preview_set_rotate (GL_MINI_PREVIEW (this->priv->preview), state);
 
-        return name;
+        gl_debug (DEBUG_FILE, "END");
 }
 
 
@@ -345,37 +468,51 @@ set_info (glNewLabelDialog  *this,
 
         if ( vendor && vendor->url )
         {
+                gchar *escaped_url;
                 gchar *markup;
 
-                markup = g_strdup_printf ("<a href='%s'>%s</a>", vendor->url, vendor->name);
+                escaped_url = g_markup_escape_text (vendor->url, -1);
+                markup = g_strdup_printf ("<a href='%s'>%s</a>", escaped_url, vendor->name);
                 gtk_label_set_markup (GTK_LABEL (this->priv->vendor_label), markup);
+                gtk_widget_set_tooltip_text (this->priv->vendor_label, escaped_url);
+                g_free (escaped_url);
                 g_free (markup);
         }
         else
         {
                 /* FIXME: Using set_markup instead of set_text to clear out previous link. */
                 gtk_label_set_markup (GTK_LABEL (this->priv->vendor_label), template->brand);
+                gtk_widget_set_has_tooltip (this->priv->vendor_label, FALSE);
         }
 
         if ( template->product_url )
         {
+                gchar *escaped_url;
                 gchar *markup;
 
-                markup = g_strdup_printf ("<a href='%s'>%s</a>", template->product_url, template->part);
+                escaped_url = g_markup_escape_text (template->product_url, -1);
+                markup = g_strdup_printf ("<a href='%s'>%s</a>", escaped_url, template->part);
                 gtk_label_set_markup (GTK_LABEL (this->priv->part_label), markup);
+                gtk_widget_set_tooltip_text (this->priv->part_label, escaped_url);
+                g_free (escaped_url);
                 g_free (markup);
         }
         else
         {
                 /* FIXME: Using set_markup instead of set_text to clear out previous link. */
                 gtk_label_set_markup (GTK_LABEL (this->priv->part_label), template->part);
+                gtk_widget_set_has_tooltip (this->priv->part_label, FALSE);
         }
 
         list = lgl_db_get_similar_template_name_list (name);
         list_string = g_string_new ("");
         for ( p = list; p; p = p->next )
         {
-                g_string_append_printf (list_string, "%s\n", (char *)p->data);
+                g_string_append (list_string, (char *)p->data);
+                if ( p->next )
+                {
+                        g_string_append (list_string, "\n");
+                }
         }
         gtk_label_set_text (GTK_LABEL (this->priv->similar_label), list_string->str);
 
@@ -394,11 +531,11 @@ set_info (glNewLabelDialog  *this,
 gchar *
 gl_new_label_dialog_get_template_name (glNewLabelDialog *this)
 {
-       gchar *name;
+        gchar *name;
 
-       name = gl_media_combo_get_name (GL_MEDIA_COMBO (this->priv->combo));
+        name = gl_media_select_get_name (GL_MEDIA_SELECT (this->priv->combo));
 
-       return name;
+        return name;
 }
 
 
@@ -407,10 +544,10 @@ gl_new_label_dialog_get_template_name (glNewLabelDialog *this)
 /*****************************************************************************/
 void
 gl_new_label_dialog_set_template_name (glNewLabelDialog *this,
-                                      gchar            *name)
+                                       gchar            *name)
 {
-       gl_mini_preview_set_by_name (GL_MINI_PREVIEW (this->priv->preview), name);
-       gl_media_combo_set_name (GL_MEDIA_COMBO (this->priv->combo), name);
+        gl_mini_preview_set_by_name (GL_MINI_PREVIEW (this->priv->preview), name);
+        gl_media_select_set_name (GL_MEDIA_SELECT (this->priv->combo), name);
         set_info (this, name);
 }
 
@@ -420,8 +557,8 @@ gl_new_label_dialog_set_template_name (glNewLabelDialog *this,
 /*****************************************************************************/
 void
 gl_new_label_dialog_get_filter_parameters (glNewLabelDialog  *this,
-                                          gchar            **page_size_id,
-                                          gchar            **category_id)
+                                           gchar            **page_size_id,
+                                           gchar            **category_id)
 {
 }
 
@@ -431,8 +568,8 @@ gl_new_label_dialog_get_filter_parameters (glNewLabelDialog  *this,
 /*****************************************************************************/
 void
 gl_new_label_dialog_set_filter_parameters (glNewLabelDialog *this,
-                                          const gchar      *page_size_id,
-                                          const gchar      *category_id)
+                                           const gchar      *page_size_id,
+                                           const gchar      *category_id)
 {
 }
 
@@ -443,7 +580,7 @@ gl_new_label_dialog_set_filter_parameters (glNewLabelDialog *this,
 gboolean
 gl_new_label_dialog_get_rotate_state (glNewLabelDialog *this)
 {
-       return gl_rotate_label_button_get_state (GL_ROTATE_LABEL_BUTTON (this->priv->rotate_button));
+        return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (this->priv->rotated_radio));
 }
 
 
@@ -452,9 +589,9 @@ gl_new_label_dialog_get_rotate_state (glNewLabelDialog *this)
 /*****************************************************************************/
 void
 gl_new_label_dialog_set_rotate_state (glNewLabelDialog *this,
-                                     gboolean          state)
+                                      gboolean          state)
 {
-        gl_rotate_label_button_set_state (GL_ROTATE_LABEL_BUTTON (this->priv->rotate_button), state);
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (this->priv->rotated_radio), state);
         gl_mini_preview_set_rotate (GL_MINI_PREVIEW (this->priv->preview), state);
 }