From 0633489db60773e6e61914d978d9f64bae0fbf13 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Tue, 20 Apr 2010 17:09:35 -0400
Subject: [PATCH] Added decorations to "new label" dialog

Added new images to decorate each page of the "new label" dialog/wizard.
---
 data/pixmaps/Makefile.am     |   3 +
 data/pixmaps/new-confirm.png | Bin 0 -> 4152 bytes
 data/pixmaps/new-rotate.png  | Bin 0 -> 2790 bytes
 data/pixmaps/new-select.png  | Bin 0 -> 9231 bytes
 src/new-label-dialog.c       | 148 ++++++++++++++++++-----------------
 5 files changed, 81 insertions(+), 70 deletions(-)
 create mode 100644 data/pixmaps/new-confirm.png
 create mode 100644 data/pixmaps/new-rotate.png
 create mode 100644 data/pixmaps/new-select.png

diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am
index 1e370f45..2cc5495c 100644
--- a/data/pixmaps/Makefile.am
+++ b/data/pixmaps/Makefile.am
@@ -5,6 +5,9 @@ glabels_pixmapsdir = $(datadir)/$(GLABELS_BRANCH)/pixmaps
 glabels_pixmaps_DATA = \
 	glabels-splash.png	\
 	glabels-about-logo.png	\
+	new-select.png		\
+	new-rotate.png		\
+	new-confirm.png		\
 	ex-rect-size.png	\
 	ex-round-size.png	\
 	ex-cd-size.png		\
diff --git a/data/pixmaps/new-confirm.png b/data/pixmaps/new-confirm.png
new file mode 100644
index 0000000000000000000000000000000000000000..9361eb021e3eb6be3c7639cbdced7c0f6639b819
GIT binary patch
literal 4152
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
CoD5I^

literal 0
HcmV?d00001

diff --git a/data/pixmaps/new-rotate.png b/data/pixmaps/new-rotate.png
new file mode 100644
index 0000000000000000000000000000000000000000..22fc27d2af26973aff889e5c1bfba4565c45ead3
GIT binary patch
literal 2790
zcmV<C3K{i@P)<h;3K|Lk000e1NJLTq005Q%001xu1^@s6^F)IY00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FWS01FWTe`H^g00007bV*G`2igP_
z6bKdTp_Z-y019SFL_t(|+U=cvj1=V^$3HW(^Rhd$doLb)d))242zV%=Q~{BK+E`yI
z{&A=wP1B@l8iS^3qcNtf4Yq1hYqVe+Q)5$Oqy59!Hc_tCGikA6DHW-J+LpHh^5V&H
z9Cyd<F1z#EKW1jx1CDse9qTc_<jHJiZ*TL=eCGH2J>Tc|JPVOUHUTDF1bq`Gu%BMg
zs5nM8MNI@&0dG{?`19FDfGxnUfO;Sf$P)~3WL02~07Ko~-9>ML?Df}Q4<UOIXb0*5
zH3DmDhrhQc5~@?++68<Sm=nMyM{rHe97_O3JkN^<A#q~AOb{&K`@oK%^#R2w-<pJr
ze*wVKC$V2L&;+Cb1BgW)YwChE*_H@k)`II9fi(rex)2rv6hMlgioiPGUQ&qUhSQ(6
z$O7{`FHFkuJP$z-&iFTBs{ku{KqIiuI?5aKz0z<$hyL~geVe;+^FuV<d=H`ku7?zW
z73Eh^C>+~d*FEjriGf}=K6owOp1-i*Yxl9>o+nAz$9Qy!NRVGC!9yCs6@fLz1rfz^
z7_@Dh!ay$@AG(3Iv_NaiC3u^j##^_FX&s&1cJo)5Zj`5Wv`B7<z&g!r+a8riIgZ1~
zk%Mepbpst4k?GB8oLz6=_V0ib$MBBrrE$(8zMQ2kkQ>4|!^mqzV2w`7UDw5N99-8W
zKQzFmhi~E1Y@Ft76YjxH;0Ew1I%3m2_O1UtZy#bf@K#z762)kQ7$xszs3b|kbzNN7
zrEq+ZEl+)e&RMlIx1@3Yx88?JQb0{1U;iLS-(N@1rd=Ew!45o?QgL)Rb7cfvB-1@p
z?WvLgyFv>1ROUENSwa{*(#zJ>UuRaUM7A}9vu^`lZV1n^5R44+Est|-&o;KawAyz~
z0*FGOIS6=;$065ahwHGt=(2r(o=x|zV|M_X8#M1c09MtoMqmXV%d#wr`5f!+U&y=#
z?X-3@<L=*xn;XU}<nUrilv|%ftZfBR0wHMOYf%J2#5r*sbEuEv(E}8EchdLISNYxM
zKA!sk3ifC2Ujf(#{2h1<Faf*5Lq=d#o5wnOxR>{zS;>rMhxXYWxCh_C%MIfe@;+FW
zg&-$D)<H@5uN6Hwm+;RiNrbvK#F{K5n-KH{JXz=PUw=*S+b@&qdX&2PUBu&YR8>Wi
zBt%g>tA2K>8q(d}ZFhBbnZWbFYT$SPoK;P5MPLEBT#h$?d>fZYhgp2ba@^i`@Qx4Q
z6>{SP>kQ|_+IGa|t1t%-v-kP$Qf#<_h80g>7zXip99fpf3m0qGuC<mgU%nl905}L7
z26ENpxuQ`aplKRQfAmLk>P+@+-HK2*+YfQ)V_=X!g7eV^WKE;<2d|;^|C_#dUuAG`
zkbFLmWm#twWzS|^U0pKp1)vjX0aDdA5Q|2I_@ZcBH<)|Rvuya`67U?_I_BXOHdgpT
z1?h_05i@gfkM0CXg_wpAQ~lSniXbT<h~;45Ii)a(!#lPIL6YfM`5QiXyo>(Exj-wT
zD3(2zD31F%ZvqB^Uf@`eb9oV1)shbcH#M#sbl&#|Hm|u8ER)vOE1|F<NW@H>J?ju>
z-o#MfVK%?G8ZjIZ3cl-)$ug--7NfC^`k7Z!+j%vZ1qed3H*^rSWdW@>-No*=e#zji
ztB_@RR5%<@NCc9Bw~A9`Wjj%h6^sgP+on`1k<aJZw|hGWp1X_rSJacu`Z|_ZI^pL|
zMicUl4>Pc93oktVb6&BoA(P24bLLE%)AiJO!>GAl>JGg{wxy97%kM>s$q0CU-j!@Z
zsA=Ip4_(8NYabyqdm-s`nq)GGq9~u*YXty4i(eA`4zLq{1(6fwSXJb)VzC&is**?~
z$ac)4edTX?@BLm5?)@0C<!TTE=UzIFwf<)`eDOxETR4YQ%tDrB48x$lv6<AYMa1Xd
zNp9I{K5{ecS^G4CR(mo;mX0F;)2{m_)`9mJ9v&v2&tsY<uIn<+haxQ5sXC=U0;@uD
zkR%CJRY@k3G`C&KWe@y`Z94}zxc?Kx?4px!nR(paZDg0+!DZSoilR_cQ$r?`A)C$8
z+S*EMTRZxV_j9!WC_}s71w}vkWp;^p%Upzky^M^El)(yx+NoesjupnxU`i(zi=k;+
z`38#*{F#sT?_%4__cF7wmiDDx#4o>vz8(MK7mq*2hl!=k2w-ezXds<VBg-<jZBr~3
z8NBT$e7yb%>Mmb`SIYUJw>X4x*%Fe6ze8W4K%r15gC)yy1lCjwhoJ&5NfMf-l@n@7
zl90ds0{h=v%bvBbAiUN?K7AF>Y<2k3^)VDhAs&xo7zW8?5>-`kT^G|dk!LUB<CpiG
z^mYJN5ve|jS{$HMDp4#J&ovZAV0~V^R+!AkVzKflEew%H&9@kye>)>1BWR|{3Hzlo
zRH2%#C`#Gu`2Qor0ke4OaG{(MnWl+pnpl=KYR+<;qr(WS&qESlS^FM>Rq2&-xg4fx
z0+2`~%1u!eVzJn$k)5I_XBCzl$HBJka=A|Au`YtJ7=k8>;wZRMsT7uF0T7SJNhA_z
znuaXPqqL~-bCO<<?Fl#zxTXWHiFl%j71PTeYP{-u1lH#muJX`1P{$=nLY8IX@i>m-
z%SEcHBFl0az*9q*APC6yS!_?jbVMx2!L@9JT%M9zKj!Bmur4CVLcl7+r6ft^HWnQ6
zC9T+=M9~o_IUX(!UZH>$pH>c^XZw5v)<ptXB>-oeh6&%(8d`A#1q+#y=i)dnluW#2
zhD0KPs;X1Yb46fH0*p#S8=fTNNh+>wVdH`0Al5dMNF+v;&zuTw1Xg5Ynl`N+Vwyi!
z=$HtiizkRE>2{Q4@|^3kBCsac3Y^^er7Ap@I;{;+jw7lTF-l<Bc(Q_?o`L!q3jV6u
zrs7=Thuz)X_C$Y4Pfriir%x}J+>DiL34%a8-GQVgQ1lc^B86(yqG}qcmd<h|X;|41
zfmOZskFKt+k)EEO359CKiWL}!fh^1Ak=<BOC`KJIMMI4nB#aaZBZ;mXBpaI0bsbI9
zP7_w6P*`2&0Y3$1EnBv1A^xt$%6ZS3G>xXFCYCN;imvMzhJmW8W9nF;L{X{ihXQP<
z?4QHJiU_Pp2I~ayJz#dwrsMCrcP{%X2*Ap_@4ox=3m1!_>pGcCrd+5ume&g536H?2
z`M}C>8hNbhH4A@9)S)2M4>5Xw(DB?o5umfP^E6OGuo@d1$!4>pQmHXZUP8|lf>Svk
zcqVOZ9Q_O*rs|VfrlNEdgg+gq!LJKH*R32y{C(r+ty!~X+Tz8F%WqT`1=iHmpzAt{
zqD;8g>FMcV*|KHemn6R#95>-_4PG^+$x{`q&>M&CT+4UG0MMuKms-uaz<smvSLF-@
zF!clf#s8&@y+9s+34a9EB=qgG)PoE7npjhiug${WdRyn@j|EJ2DDncp3i$iV?*z63
zpHM}6%ui+I{d{bgApj-(HG6x5yrw_M*^~<)*Mu8^n1Ofd$6pCO6u=hcSf9h3ErGv=
s&)~xD-WPhT68^IK;{jw<vse}2|0cDIN%Am6A^-pY07*qoM6N<$f~Ht4K>z>%

literal 0
HcmV?d00001

diff --git a/data/pixmaps/new-select.png b/data/pixmaps/new-select.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9e4a5b02ef076f6cee1e570bcf533ae1e0ffa0f
GIT binary patch
literal 9231
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
R1Abcv2cf8`@LAqG=zmJ?6CnTq

literal 0
HcmV?d00001

diff --git a/src/new-label-dialog.c b/src/new-label-dialog.c
index b6a92596..fb9894c5 100644
--- a/src/new-label-dialog.c
+++ b/src/new-label-dialog.c
@@ -50,20 +50,20 @@ struct _glNewLabelDialogPrivate {
 
         GtkBuilder *builder;
 
-	GtkWidget  *template_page_vbox;
+        GtkWidget  *template_page_vbox;
         GtkWidget  *combo_hbox;
         GtkWidget  *combo;
 
-	GtkWidget  *rotate_page_vbox;
+        GtkWidget  *rotate_page_vbox;
         GtkWidget  *normal_radio;
-	GtkWidget  *rotated_radio;
+        GtkWidget  *rotated_radio;
         GtkWidget  *normal_preview_hbox;
-	GtkWidget  *rotated_preview_hbox;
+        GtkWidget  *rotated_preview_hbox;
         GtkWidget  *normal_preview;
-	GtkWidget  *rotated_preview;
+        GtkWidget  *rotated_preview;
 
-	GtkWidget  *confirm_page_vbox;
-	GtkWidget  *preview_vbox;
+        GtkWidget  *confirm_page_vbox;
+        GtkWidget  *preview_vbox;
         GtkWidget  *preview;
         GtkWidget  *desc_label;
         GtkWidget  *page_size_label;
@@ -128,13 +128,13 @@ G_DEFINE_TYPE (glNewLabelDialog, gl_new_label_dialog, GTK_TYPE_ASSISTANT);
 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);
+        gl_debug (DEBUG_FILE, "");
 
-  	object_class->finalize = gl_new_label_dialog_finalize;
+        gl_new_label_dialog_parent_class = g_type_class_peek_parent (class);
+
+        object_class->finalize = gl_new_label_dialog_finalize;
 
         signals[COMPLETE] =
             g_signal_new ("complete",
@@ -154,7 +154,7 @@ gl_new_label_dialog_class_init (glNewLabelDialogClass *class)
 static void
 gl_new_label_dialog_init (glNewLabelDialog *this)
 {
-	GtkWidget    *vbox;
+        GtkWidget    *vbox;
         gchar        *logo_filename;
         GdkPixbuf    *logo;
         GtkBuilder   *builder;
@@ -166,25 +166,21 @@ gl_new_label_dialog_init (glNewLabelDialog *this)
         GError       *error = NULL;
         GtkWidget    *new_label_dialog_hbox;
 
-	gl_debug (DEBUG_FILE, "START");
-
-	g_return_if_fail (GL_IS_NEW_LABEL_DIALOG (this));
+        gl_debug (DEBUG_FILE, "START");
 
-	this->priv = g_new0 (glNewLabelDialogPrivate, 1);
+        g_return_if_fail (GL_IS_NEW_LABEL_DIALOG (this));
 
-        logo_filename = g_build_filename (GLABELS_ICON_DIR, GLABELS_ICON, NULL);
-	logo = gdk_pixbuf_new_from_file (logo_filename, NULL);
-        g_free (logo_filename);
+        this->priv = g_new0 (glNewLabelDialogPrivate, 1);
 
         builder = gtk_builder_new ();
         builder_filename = g_build_filename (GLABELS_DATA_DIR, "builder", "new-label-dialog.builder", 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,
                                      "template_page_vbox",     &this->priv->template_page_vbox,
@@ -209,16 +205,24 @@ gl_new_label_dialog_init (glNewLabelDialog *this)
 
         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, _("Select Product"));
-        gtk_assistant_set_page_header_image (GTK_ASSISTANT (this), this->priv->template_page_vbox, logo);
         gtk_assistant_set_page_type (GTK_ASSISTANT (this), this->priv->template_page_vbox, GTK_ASSISTANT_PAGE_INTRO);
+        logo_filename = g_build_filename (GLABELS_DATA_DIR, "pixmaps", "new-select.png", NULL);
+        logo = gdk_pixbuf_new_from_file (logo_filename, NULL);
+        gtk_assistant_set_page_header_image (GTK_ASSISTANT (this), this->priv->template_page_vbox, 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_header_image (GTK_ASSISTANT (this), this->priv->rotate_page_vbox, logo);
         gtk_assistant_set_page_complete (GTK_ASSISTANT (this), this->priv->rotate_page_vbox, TRUE);
+        logo_filename = g_build_filename (GLABELS_DATA_DIR, "pixmaps", "new-rotate.png", NULL);
+        logo = gdk_pixbuf_new_from_file (logo_filename, NULL);
+        gtk_assistant_set_page_header_image (GTK_ASSISTANT (this), this->priv->rotate_page_vbox, 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);
@@ -227,9 +231,13 @@ gl_new_label_dialog_init (glNewLabelDialog *this)
 
         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_header_image (GTK_ASSISTANT (this), this->priv->confirm_page_vbox, logo);
         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);
+        logo_filename = g_build_filename (GLABELS_DATA_DIR, "pixmaps", "new-confirm.png", NULL);
+        logo = gdk_pixbuf_new_from_file (logo_filename, NULL);
+        gtk_assistant_set_page_header_image (GTK_ASSISTANT (this), this->priv->confirm_page_vbox, 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);
@@ -238,17 +246,17 @@ gl_new_label_dialog_init (glNewLabelDialog *this)
 
         gtk_assistant_set_forward_page_func (GTK_ASSISTANT (this), (GtkAssistantPageFunc)forward_page_function, this, NULL);
 
-	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), "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->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);
+        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);
 
         combo_changed_cb (this);
 
-	gl_debug (DEBUG_FILE, "END");
+        gl_debug (DEBUG_FILE, "END");
 }
 
 
@@ -258,20 +266,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");
 
 }
 
@@ -282,15 +290,15 @@ 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;
 }
 
 
@@ -343,7 +351,7 @@ static void
 cancel_cb (glNewLabelDialog *this)
 {
                                                                                
-	gtk_widget_destroy (GTK_WIDGET(this));
+        gtk_widget_destroy (GTK_WIDGET(this));
 
 }
 
@@ -367,7 +375,7 @@ static void
 close_cb (glNewLabelDialog *this)
 {
                                                                                
-	gtk_widget_destroy (GTK_WIDGET(this));
+        gtk_widget_destroy (GTK_WIDGET(this));
 
 }
 
@@ -378,24 +386,24 @@ close_cb (glNewLabelDialog *this)
 static void
 combo_changed_cb (glNewLabelDialog  *this)
 {
-	gchar             *name;
+        gchar             *name;
 
-	gl_debug (DEBUG_FILE, "START");
+        gl_debug (DEBUG_FILE, "START");
 
-	name = gl_media_select_get_name (GL_MEDIA_SELECT (this->priv->combo));
+        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);
+        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));
 
-	g_free (name);
+        g_free (name);
 
-	gl_debug (DEBUG_FILE, "END");
+        gl_debug (DEBUG_FILE, "END");
 }
 
 
@@ -407,12 +415,12 @@ rotate_toggled_cb (glNewLabelDialog  *this)
 {
         gboolean state;
 
-	gl_debug (DEBUG_FILE, "START");
+        gl_debug (DEBUG_FILE, "START");
 
         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);
 
-	gl_debug (DEBUG_FILE, "END");
+        gl_debug (DEBUG_FILE, "END");
 }
 
 
@@ -509,11 +517,11 @@ set_info (glNewLabelDialog  *this,
 gchar *
 gl_new_label_dialog_get_template_name (glNewLabelDialog *this)
 {
-	gchar *name;
+        gchar *name;
 
-	name = gl_media_select_get_name (GL_MEDIA_SELECT (this->priv->combo));
+        name = gl_media_select_get_name (GL_MEDIA_SELECT (this->priv->combo));
 
-	return name;
+        return name;
 }
 
 
@@ -522,10 +530,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_select_set_name (GL_MEDIA_SELECT (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);
 }
 
@@ -535,8 +543,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)
 {
 }
 
@@ -546,8 +554,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)
 {
 }
 
@@ -558,7 +566,7 @@ gl_new_label_dialog_set_filter_parameters (glNewLabelDialog *this,
 gboolean
 gl_new_label_dialog_get_rotate_state (glNewLabelDialog *this)
 {
-	return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (this->priv->rotated_radio));
+        return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (this->priv->rotated_radio));
 }
 
 
@@ -567,7 +575,7 @@ gl_new_label_dialog_get_rotate_state (glNewLabelDialog *this)
 /*****************************************************************************/
 void
 gl_new_label_dialog_set_rotate_state (glNewLabelDialog *this,
-				      gboolean          state)
+                                      gboolean          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);
-- 
2.39.5