Little UI improvements

- make label colour black
- move the mounted warning message down

2 files changed, 23 insertions, 37 deletions

diff --git a/TODO b/TODO
index 78f5c3d..08b3dc7 100644
--- a/TODO
+++ b/TODO
@@ -11,7 +11,7 @@ Short-term:
   OK - check label length before formatting (should be done automatically) -- DK returning wrong values for FAT and NTFS
 
 
-- handle LUKS encrypted volumes
+- handle LUKS encrypted volumes -- creating new encrypted media works fine, but reverting back to non-encrypted doesn't (device /dev/sdb1 vs. /dev/dm-0)
 DONE, NEEDS_TESTING - monitor device/presentable events like eject, umount etc. (try to pull the USB key out and window should disappear)
 - show custom icon if user has set it in Nautilus
 - is firmware needed for some devices?
diff --git a/src/nautilus-gdu-window.c b/src/nautilus-gdu-window.c
index c0f395b..a65ca4f 100644
--- a/src/nautilus-gdu-window.c
+++ b/src/nautilus-gdu-window.c
@@ -300,8 +300,6 @@ update_ui (FormatDialogPrivate *priv)
   char *details2;
   char *details3;
   char *s;
-  char *s2;
-  char *s3;
   char *name;
   char *icon_name;
   GdkPixbuf *pixbuf;
@@ -530,21 +528,9 @@ update_ui (FormatDialogPrivate *priv)
   g_free (name);
   g_free (strsize);
 
-  s = NULL;
-  s2 = NULL;
-  s3 = NULL;
-  if (details1 != NULL)
-    s = g_strdup_printf ("<span foreground='darkgrey'>%s</span>", details1);
-  if (details2 != NULL)
-    s2 = g_strdup_printf ("<span foreground='darkgrey'>%s</span>", details2);
-  if (details3 != NULL)
-    s3 = g_strdup_printf ("<span foreground='darkgrey'>%s</span>", details3);
-  gtk_label_set_markup (GTK_LABEL (priv->details1_label), s);
-  gtk_label_set_markup (GTK_LABEL (priv->details2_label), s2);
-  gtk_label_set_markup (GTK_LABEL (priv->details3_label), s3);
-  g_free (s);
-  g_free (s2);
-  g_free (s3);
+  gtk_label_set_markup (GTK_LABEL (priv->details1_label), details1);
+  gtk_label_set_markup (GTK_LABEL (priv->details2_label), details2);
+  gtk_label_set_markup (GTK_LABEL (priv->details3_label), details3);
   g_free (details1);
   g_free (details2);
   g_free (details3);
@@ -1124,24 +1110,6 @@ nautilus_gdu_spawn_dialog (GduPresentable *presentable)
 
 
 
-  /*  warning box  */
-  hbox = gtk_hbox_new (FALSE, 7);
-  align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (align), 15, 15, 20, 20);
-  gtk_container_add (GTK_CONTAINER (align), hbox);
-  gtk_box_pack_start (GTK_BOX (content_area), align, FALSE, TRUE, 0);
-  priv->mount_warning = align;
-
-  image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_LARGE_TOOLBAR);
-  gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0);
-
-  label = gtk_label_new (_("The volume is currently mounted. Please make sure to close all open files before formatting."));
-  gtk_label_set_width_chars (GTK_LABEL (label), 50);
-  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
-
-
   /*  partition  */
   vbox3 = gtk_vbox_new (FALSE, 2);
   align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
@@ -1150,7 +1118,7 @@ nautilus_gdu_spawn_dialog (GduPresentable *presentable)
   gtk_box_pack_start (GTK_BOX (content_area), align, FALSE, TRUE, 0);
 
   label = gtk_label_new (NULL);
-  gtk_label_set_markup (GTK_LABEL (label), _("<b>Partition</b>"));
+  gtk_label_set_markup (GTK_LABEL (label), _("<b>Format</b>"));
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_box_pack_start (GTK_BOX (vbox3), label, FALSE, FALSE, 0);
   priv->partition_label = label;
@@ -1261,6 +1229,24 @@ nautilus_gdu_spawn_dialog (GduPresentable *presentable)
   gtk_box_pack_start (GTK_BOX (vbox3), align, TRUE, TRUE, 0);
 
 
+  /*  mounted warning box  */
+  hbox = gtk_hbox_new (FALSE, 7);
+  align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
+  gtk_alignment_set_padding (GTK_ALIGNMENT (align), 15, 15, 20, 0);
+  gtk_container_add (GTK_CONTAINER (align), hbox);
+  gtk_box_pack_start (GTK_BOX (content_area), align, FALSE, TRUE, 0);
+  priv->mount_warning = align;
+
+  image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_LARGE_TOOLBAR);
+  gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0);
+
+  label = gtk_label_new (_("The volume is currently mounted. Please make sure to close all open files before formatting."));
+//  gtk_label_set_width_chars (GTK_LABEL (label), 50);
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
+
+
 
   //  gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_OK, FALSE);