[glom] CSV Import Dialog adjustments.

[Daniel Borgmann <dborg src gnome org>]

commit 4de2a2d9050a86383dbc294be54b4a38bafc488b
Author: Daniel Borgmann <danielb openismus com>
Date:   Tue Apr 6 16:57:54 2010 +0100

    CSV Import Dialog adjustments.
    
    * glom/glom.glade: Import dialog tweaks.
    * glom/import_csv/dialog_import_csv.cc: Add window icon, change title
    order.

 ChangeLog                            |    8 ++++++++
 glom/glom.glade                      |   14 ++++++++------
 glom/import_csv/dialog_import_csv.cc |    4 +++-
 3 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 24c4fbb..851e213 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-04-06  Daniel Borgmann  <danielb openismus com>
 
+	CSV Import Dialog adjustments.
+
+	* glom/glom.glade: Import dialog tweaks.
+	* glom/import_csv/dialog_import_csv.cc: Add window icon, change title
+	order.
+
+2010-04-06  Daniel Borgmann  <danielb openismus com>
+
 	Dialog fixes.
 
 	* glom/frame_glom.cc: Add window icons and fix capitalisation of
diff --git a/glom/glom.glade b/glom/glom.glade
index e778da7..06049a8 100644
--- a/glom/glom.glade
+++ b/glom/glom.glade
@@ -747,7 +747,7 @@
     </child>
   </object>
   <object class="GtkDialog" id="dialog_import_csv">
-    <property name="border_width">5</property>
+    <property name="border_width">6</property>
     <property name="title" translatable="yes">bla.blub - Import from CSV</property>
     <property name="window_position">center-on-parent</property>
     <property name="default_width">550</property>
@@ -762,6 +762,7 @@
         <child>
           <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
+            <property name="border_width">6</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
@@ -782,7 +783,7 @@
                             <property name="visible">True</property>
                             <property name="n_rows">3</property>
                             <property name="n_columns">2</property>
-                            <property name="column_spacing">6</property>
+                            <property name="column_spacing">12</property>
                             <property name="row_spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="import_csv_target_table">
@@ -816,14 +817,14 @@
                             <child>
                               <object class="GtkLabel" id="label4">
                                 <property name="visible">True</property>
-                                <property name="xalign">1</property>
+                                <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Encoding:</property>
                                 <property name="use_underline">True</property>
                               </object>
                               <packing>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="x_options"></property>
+                                <property name="x_options">GTK_FILL</property>
                                 <property name="y_options"></property>
                               </packing>
                             </child>
@@ -925,7 +926,8 @@
                             <child>
                               <object class="GtkLabel" id="label6">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">Number of sample rows:</property>
+                                <property name="label" translatable="yes">_Number of sample rows:</property>
+                                <property name="use_underline">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1052,7 +1054,7 @@
                     <child>
                       <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Import</property>
+                        <property name="label" translatable="yes">I_mport</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
diff --git a/glom/import_csv/dialog_import_csv.cc b/glom/import_csv/dialog_import_csv.cc
index e04481f..a943e4e 100644
--- a/glom/import_csv/dialog_import_csv.cc
+++ b/glom/import_csv/dialog_import_csv.cc
@@ -78,6 +78,8 @@ Dialog_Import_CSV::Dialog_Import_CSV(BaseObjectType* cobject, const Glib::RefPtr
     throw std::runtime_error("Missing widgets from glade file for Dialog_Import_CSV");
 #endif
 
+  set_icon_name("glom");
+
   //Fill the list of encodings:
   m_encoding_model = Gtk::ListStore::create(m_encoding_columns);
 
@@ -750,7 +752,7 @@ void Dialog_Import_CSV::on_parser_file_read_error(const Glib::ustring& error_mes
 
 void Dialog_Import_CSV::on_parser_have_display_name(const Glib::ustring& display_name)
 {
-  set_title(display_name + _(" - Import From CSV File"));
+  set_title(_("Import From CSV File: ") + display_name);
 }
 
 void Dialog_Import_CSV::on_parser_state_changed()