commit 3bab44608cb455f37ca5c800ab11d9e4c1b47079
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Jun 26 12:44:02 2020 +0200
Created export session (to database) button (inactive)
glade/app1.glade | 180 ++++++++++++++++++++++++++++++++++++--------------
src/gui/app1/icons.cs | 1 +
src/gui/app1/menu.cs | 1 +
3 files changed, 133 insertions(+), 49 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 0e6705d2..60920009 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -24265,6 +24265,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -27109,6 +27112,18 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
+ <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tests
will be filmed</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox"
id="hbox_video_encoder_capturing">
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -27145,18 +27160,6 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Tests
will be filmed</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox"
id="hbox_video_encoder_no_capturing">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -35083,6 +35086,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -35578,6 +35584,7 @@ then click this button.</property>
<widget class="GtkHBox" id="hbox21_session_more">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">16</property>
<child>
<widget class="GtkVBox" id="vbox56">
<property name="visible">True</property>
@@ -35688,8 +35695,8 @@ then click this button.</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -35742,7 +35749,7 @@ then click this button.</property>
</child>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
@@ -35758,11 +35765,12 @@ then click this button.</property>
<widget class="GtkVBox" id="vbox78">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">16</property>
<child>
<widget class="GtkVBox" id="vbox219">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
+ <property name="spacing">4</property>
<child>
<widget class="GtkButton"
id="button_session_export">
<property name="visible">True</property>
@@ -35770,7 +35778,6 @@ then click this button.</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Import / Export</property>
<property name="relief">half</property>
<signal name="clicked"
handler="on_export_session_accepted" swapped="no"/>
<child>
@@ -35783,7 +35790,7 @@ then click this button.</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkImage"
id="image_session_export">
+ <widget class="GtkImage"
id="image_session_export_csv">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-open</property>
@@ -35836,6 +35843,82 @@ then click this button.</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <widget class="GtkVBox" id="vbox196">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkButton"
id="button_menu_session_import1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="relief">half</property>
+ <child>
+ <widget class="GtkEventBox"
id="eventbox_button_menu_session_import1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox117">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_session_export">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-open</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="label_session_export">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Export
session</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label544">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Export
to another database</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -35898,14 +35981,29 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox397">
+ <widget class="GtkFrame" id="frame21">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">1</property>
+ <property name="shadow_type">in</property>
<child>
- <widget class="GtkVBox" id="vbox196">
+ <widget class="GtkAlignment" id="alignment56">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">16</property>
+ <property name="bottom_padding">16</property>
+ <property name="left_padding">16</property>
+ <property name="right_padding">16</property>
+ <child>
+ <widget class="GtkVBox" id="vbox188">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">16</property>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">40</property>
<child>
<widget class="GtkButton"
id="button_menu_session_import">
<property name="visible">True</property>
@@ -35913,7 +36011,6 @@ then click this button.</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Import / Export</property>
<property name="relief">half</property>
<signal name="clicked"
handler="on_button_import_chronojump_session" swapped="no"/>
<child>
@@ -35938,7 +36035,7 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_session_overview3">
+ <widget class="GtkLabel"
id="label_session_import">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Import
a session from another database</property>
@@ -35963,37 +36060,15 @@ then click this button.</property>
</widget>
<packing>
<property name="expand">True</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame21">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">1</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkAlignment" id="alignment56">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">16</property>
- <property name="bottom_padding">16</property>
- <property name="left_padding">16</property>
- <property name="right_padding">16</property>
<child>
- <widget class="GtkHBox" id="hbox421">
+ <widget class="GtkHButtonBox" id="hbuttonbox16">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">20</property>
+ <property name="layout_style">spread</property>
<child>
<widget class="GtkButton"
id="button_db_backup_pre">
<property name="label" translatable="yes">Backup
all data</property>
@@ -36027,6 +36102,13 @@ then click this button.</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
</child>
@@ -36046,7 +36128,7 @@ then click this button.</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index bd0715b8..354574e6 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -590,6 +590,7 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameExport);
image_export_encoder_signal.Pixbuf = pixbuf;
image_session_export.Pixbuf = pixbuf;
+ image_session_export_csv.Pixbuf = pixbuf;
//reaction times changes
//UtilGtk.ColorsTestLabel(viewport_chronopics, label_extra_window_radio_reaction_time);
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index 7cb6011d..e69beb79 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -69,6 +69,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_session_import;
[Widget] Gtk.Image image_session_export;
+ [Widget] Gtk.Image image_session_export_csv;
//menu icons
[Widget] Gtk.Image image_radio_show_menu;