[chronojump] On load persons from CSV expected column delimiter is shown
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] On load persons from CSV expected column delimiter is shown
- Date: Tue, 18 Sep 2018 11:11:58 +0000 (UTC)
commit a5abb50a086c14cc75c59b72908840030debdd07
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Sep 18 13:10:58 2018 +0200
On load persons from CSV expected column delimiter is shown
glade/person_multiple_infinite.glade | 80 +++++++++++++++++++++++++++---------
src/gui/person.cs | 9 +++-
2 files changed, 69 insertions(+), 20 deletions(-)
---
diff --git a/glade/person_multiple_infinite.glade b/glade/person_multiple_infinite.glade
index f37f0514..578454bb 100644
--- a/glade/person_multiple_infinite.glade
+++ b/glade/person_multiple_infinite.glade
@@ -219,6 +219,24 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -275,6 +293,9 @@
<property name="n_columns">2</property>
<property name="column_spacing">8</property>
<property name="row_spacing">8</property>
+ <child>
+ <placeholder/>
+ </child>
<child>
<widget class="GtkLabel" id="label_csv">
<property name="visible">True</property>
@@ -399,9 +420,6 @@
<property name="x_options"/>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
<child>
<widget class="GtkLabel" id="label_csv_help">
<property name="visible">True</property>
@@ -971,12 +989,48 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_csv_help_2">
+ <widget class="GtkVBox" id="vbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">To differentiate between male and
female,
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkLabel" id="label_csv_help_2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">To differentiate between male and
female,
use the values 1/0, or m/f, or M/F on the genre column.</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label11">
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Save the spreadsheet as CSV (Comma
Separated Values).</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_column_separator">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -984,18 +1038,6 @@ use the values 1/0, or m/f, or M/F on the genre column.</property>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Save the spreadsheet as CSV (Comma
Separated Values).</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
@@ -1050,7 +1092,7 @@ use the values 1/0, or m/f, or M/F on the genre column.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
diff --git a/src/gui/person.cs b/src/gui/person.cs
index 69bf1d79..321b59b2 100644
--- a/src/gui/person.cs
+++ b/src/gui/person.cs
@@ -2029,7 +2029,9 @@ public class PersonAddMultipleWindow {
[Widget] Gtk.CheckButton check_headers;
[Widget] Gtk.CheckButton check_name_1_column;
-
+
+ [Widget] Gtk.Label label_column_separator;
+
//use this to read/write table
ArrayList entries;
ArrayList radiosM;
@@ -2114,6 +2116,11 @@ public class PersonAddMultipleWindow {
label_csv.Text = Catalog.GetString("CSV file has headers");
label_name.Text = Catalog.GetString("Full name in one column");
+ label_column_separator.Text = string.Format(Catalog.GetString(
+ "Expected column separator character is '<b>{0}</b>'"),
columnDelimiter) +
+ "\n" + Catalog.GetString("You can change this on Preferences / Language.");
+ label_column_separator.UseMarkup = true;
+
//label_csv_help.Text =
//"<b>" + Catalog.GetString("Import persons from an spreadsheet. Eg. Excel,
LibreOffice, Google Drive.") + "</b>\n\n" +
//Catalog.GetString("Open the spreadsheet with the persons data to be added.") + "\n"
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
