fixed few minor bugs in gui

2 files changed, 22 insertions, 14 deletions

diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade
index e017976b..6371a93d 100644
--- a/plugins/gtkui/deadbeef.glade
+++ b/plugins/gtkui/deadbeef.glade
@@ -2622,7 +2622,7 @@ SOCKS5_HOSTNAME</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">Column Format</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">True</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
@@ -2636,6 +2636,7 @@ SOCKS5_HOSTNAME</property>
 
   <child>
     <widget class="GtkVBox" id="vbox8">
+      <property name="border_width">4</property>
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
@@ -2678,10 +2679,10 @@ SOCKS5_HOSTNAME</property>
 	      <property name="editable">True</property>
 	      <property name="visibility">True</property>
 	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes">Custom</property>
+	      <property name="text" translatable="yes">Enter new column title here</property>
 	      <property name="has_frame">True</property>
 	      <property name="invisible_char">●</property>
-	      <property name="activates_default">False</property>
+	      <property name="activates_default">True</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -2757,18 +2758,20 @@ SOCKS5_HOSTNAME</property>
       <child>
 	<widget class="GtkLabel" id="label25">
 	  <property name="visible">True</property>
+	  <property name="can_focus">True</property>
 	  <property name="label" translatable="yes">Format fields:
-%a - artist
-%t - title
-%b - album
-%n - track
-%l - duration</property>
+ %a - artist
+ %t - title
+ %b - album
+ %n - track
+ %l - duration
+Example: %a - %t [%l]</property>
 	  <property name="use_underline">False</property>
-	  <property name="use_markup">False</property>
+	  <property name="use_markup">True</property>
 	  <property name="justify">GTK_JUSTIFY_LEFT</property>
 	  <property name="wrap">False</property>
-	  <property name="selectable">False</property>
-	  <property name="xalign">0.5</property>
+	  <property name="selectable">True</property>
+	  <property name="xalign">0.10000000149</property>
 	  <property name="yalign">0.5</property>
 	  <property name="xpad">0</property>
 	  <property name="ypad">0</property>
diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c
index cfd805a4..c7d4b14f 100644
--- a/plugins/gtkui/interface.c
+++ b/plugins/gtkui/interface.c
@@ -1843,13 +1843,13 @@ create_inputformat (void)
 
   inputformat = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (inputformat), "Column Format");
-  gtk_window_set_position (GTK_WINDOW (inputformat), GTK_WIN_POS_CENTER_ALWAYS);
   gtk_window_set_modal (GTK_WINDOW (inputformat), TRUE);
   gtk_window_set_type_hint (GTK_WINDOW (inputformat), GDK_WINDOW_TYPE_HINT_DIALOG);
 
   vbox8 = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (vbox8);
   gtk_container_add (GTK_CONTAINER (inputformat), vbox8);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox8), 4);
 
   hbox10 = gtk_hbox_new (FALSE, 0);
   gtk_widget_show (hbox10);
@@ -1862,8 +1862,9 @@ create_inputformat (void)
   titleentry = gtk_entry_new ();
   gtk_widget_show (titleentry);
   gtk_box_pack_start (GTK_BOX (hbox10), titleentry, TRUE, TRUE, 0);
-  gtk_entry_set_text (GTK_ENTRY (titleentry), "Custom");
+  gtk_entry_set_text (GTK_ENTRY (titleentry), "Enter new column title here");
   gtk_entry_set_invisible_char (GTK_ENTRY (titleentry), 9679);
+  gtk_entry_set_activates_default (GTK_ENTRY (titleentry), TRUE);
 
   hbox9 = gtk_hbox_new (FALSE, 0);
   gtk_widget_show (hbox9);
@@ -1878,9 +1879,13 @@ create_inputformat (void)
   gtk_box_pack_start (GTK_BOX (hbox9), formatentry, TRUE, TRUE, 0);
   gtk_entry_set_invisible_char (GTK_ENTRY (formatentry), 9679);
 
-  label25 = gtk_label_new ("Format fields:\n%a - artist\n%t - title\n%b - album\n%n - track\n%l - duration");
+  label25 = gtk_label_new ("Format fields:\n %a - artist\n %t - title\n %b - album\n %n - track\n %l - duration\nExample: %a - %t [%l]");
   gtk_widget_show (label25);
   gtk_box_pack_start (GTK_BOX (vbox8), label25, TRUE, TRUE, 0);
+  GTK_WIDGET_SET_FLAGS (label25, GTK_CAN_FOCUS);
+  gtk_label_set_use_markup (GTK_LABEL (label25), TRUE);
+  gtk_label_set_selectable (GTK_LABEL (label25), TRUE);
+  gtk_misc_set_alignment (GTK_MISC (label25), 0.1, 0.5);
 
   hbuttonbox1 = gtk_hbutton_box_new ();
   gtk_widget_show (hbuttonbox1);