commit 188e14ea8772d1b69d6128fdea3796d586e5e82a
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Jun 26 13:26:55 2020 +0200
Better session more buttons and frame spacing
glade/app1.glade | 158 +++++++++++++++++++++++++++++++-------
images/md/folders_backup_blue.png | Bin 0 -> 3207 bytes
src/Makefile.am | 1 +
src/gui/app1/icons.cs | 7 ++
src/gui/app1/menu.cs | 2 +
5 files changed, 142 insertions(+), 26 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 60920009..8f6b4154 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -35597,8 +35597,8 @@ then click this button.</property>
<property name="spacing">25</property>
<child>
<widget class="GtkFrame" id="frame11">
- <property name="width_request">500</property>
- <property name="height_request">400</property>
+ <property name="width_request">550</property>
+ <property name="height_request">425</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
@@ -35613,7 +35613,7 @@ then click this button.</property>
<widget class="GtkVBox" id="vbox191">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">20</property>
+ <property name="border_width">16</property>
<property name="spacing">6</property>
<child>
<widget class="GtkFrame"
id="frame_session_more_this_session">
@@ -35790,12 +35790,36 @@ then click this button.</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
+ <widget class="GtkHBox" id="hbox392">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
<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>
</widget>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage"
id="image_session_export_csv1">
+ <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">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
@@ -35866,12 +35890,36 @@ then click this button.</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
+ <widget class="GtkHBox" id="hbox393">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</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">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage"
id="image_session_export1">
+ <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">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
@@ -36068,16 +36116,47 @@ then click this button.</property>
<widget class="GtkHButtonBox" id="hbuttonbox16">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">16</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>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="tooltip" translatable="yes">Make
a copy of all the data</property>
<property name="use_underline">True</property>
<signal name="clicked"
handler="on_button_db_backup_pre_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox397">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage" id="image_db_backup">
+ <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="label545">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Backup
all data</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -36087,12 +36166,42 @@ then click this button.</property>
</child>
<child>
<widget class="GtkButton"
id="button_data_folder_open">
- <property name="label" translatable="yes">View
data folder</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="use_underline">True</property>
<signal name="clicked"
handler="on_button_data_folder_open_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox403">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage" id="image_db_view">
+ <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="label546">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">View
data folder</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -36272,8 +36381,8 @@ then click this button.</property>
<property name="spacing">25</property>
<child>
<widget class="GtkFrame" id="frame13">
- <property name="width_request">500</property>
- <property name="height_request">400</property>
+ <property name="width_request">550</property>
+ <property name="height_request">425</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
@@ -36288,7 +36397,7 @@ then click this button.</property>
<widget class="GtkVBox" id="vbox175">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">20</property>
+ <property name="border_width">16</property>
<property name="spacing">30</property>
<child>
<widget class="GtkLabel" id="label471">
@@ -37145,8 +37254,8 @@ then click this button.</property>
<property name="spacing">30</property>
<child>
<widget class="GtkFrame" id="frame15">
- <property name="width_request">500</property>
- <property name="height_request">400</property>
+ <property name="width_request">550</property>
+ <property name="height_request">425</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
@@ -37161,7 +37270,7 @@ then click this button.</property>
<widget class="GtkVBox" id="vbox179">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">20</property>
+ <property name="border_width">16</property>
<property name="spacing">30</property>
<child>
<widget class="GtkLabel" id="label450">
@@ -37493,8 +37602,8 @@ then click this button.</property>
<property name="spacing">25</property>
<child>
<widget class="GtkFrame" id="frame14">
- <property name="width_request">500</property>
- <property name="height_request">400</property>
+ <property name="width_request">550</property>
+ <property name="height_request">425</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
@@ -37509,7 +37618,7 @@ then click this button.</property>
<widget class="GtkVBox" id="vbox178">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">20</property>
+ <property name="border_width">16</property>
<property name="spacing">30</property>
<child>
<widget class="GtkProgressBar"
id="app1s_progressbarImport">
@@ -37830,8 +37939,8 @@ then click this button.</property>
<property name="spacing">30</property>
<child>
<widget class="GtkFrame" id="frame16">
- <property name="width_request">500</property>
- <property name="height_request">400</property>
+ <property name="width_request">550</property>
+ <property name="height_request">425</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
@@ -37846,7 +37955,7 @@ then click this button.</property>
<widget class="GtkVBox" id="vbox198">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">20</property>
+ <property name="border_width">16</property>
<child>
<widget class="GtkVBox"
id="app1s_vbox_delete_question">
<property name="visible">True</property>
@@ -37861,7 +37970,6 @@ then click this button.</property>
<widget class="GtkLabel" id="label487">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Are
you sure you want to delete the current session</property>
</widget>
<packing>
@@ -37879,7 +37987,6 @@ then click this button.</property>
<widget class="GtkLabel"
id="app1s_label_delete_session_confirm_name">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="wrap">True</property>
</widget>
</child>
@@ -37906,7 +38013,6 @@ then click this button.</property>
<widget class="GtkLabel" id="label493">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">and
all the session tests?</property>
</widget>
<packing>
@@ -38202,8 +38308,8 @@ then click this button.</property>
<property name="spacing">30</property>
<child>
<widget class="GtkFrame" id="frame18">
- <property name="width_request">500</property>
- <property name="height_request">450</property>
+ <property name="width_request">550</property>
+ <property name="height_request">425</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
@@ -38218,7 +38324,7 @@ then click this button.</property>
<widget class="GtkVBox" id="vbox206">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">20</property>
+ <property name="border_width">16</property>
<property name="spacing">30</property>
<child>
<widget class="GtkNotebook" id="notebook3">
@@ -39000,8 +39106,8 @@ then click this button.</property>
<property name="spacing">25</property>
<child>
<widget class="GtkFrame" id="frame22">
- <property name="width_request">500</property>
- <property name="height_request">400</property>
+ <property name="width_request">550</property>
+ <property name="height_request">425</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
@@ -39016,7 +39122,7 @@ then click this button.</property>
<widget class="GtkVBox" id="vbox220">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">20</property>
+ <property name="border_width">16</property>
<property name="spacing">20</property>
<child>
<widget class="GtkLabel" id="label539">
diff --git a/images/md/folders_backup_blue.png b/images/md/folders_backup_blue.png
new file mode 100644
index 00000000..2a622236
Binary files /dev/null and b/images/md/folders_backup_blue.png differ
diff --git a/src/Makefile.am b/src/Makefile.am
index 090e584f..905ce9d8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -552,6 +552,7 @@ RESOURCES = \
../images/md/baseline_more_horiz_blue_24dp.png,image_more_horiz.png \
../images/md/about.png,image_about.png \
../images/md/folders_blue.png,image_folders.png \
+ ../images/md/folders_backup_blue.png,image_db_backup.png \
../images/md/baseline_help_blue_24dp.png,image_help.png \
../images/chronojump_icon.png,chronojump_icon.png \
../images/chronojump_icon_transp.png,chronojump_icon_transp.png \
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 354574e6..460eada4 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -34,6 +34,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_minimize;
//[Widget] Gtk.Image image_minimize1;
[Widget] Gtk.Image image_session_delete;
+ [Widget] Gtk.Image image_db_backup;
+ [Widget] Gtk.Image image_db_view;
[Widget] Gtk.Image image_mode_encoder_capture;
[Widget] Gtk.Image image_current_person_zoom;
[Widget] Gtk.Image image_current_person_zoom_h;
@@ -252,6 +254,9 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_folders.png");
image_menu_folders.Pixbuf = pixbuf;
image_menu_folders1.Pixbuf = pixbuf;
+ image_session_export1.Pixbuf = pixbuf;
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_db_backup.png");
+ image_db_backup.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_more_horiz.png");
image_session_more.Pixbuf = pixbuf;
image_session_more1.Pixbuf = pixbuf;
@@ -465,6 +470,7 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "folder_check.png");
image_all_persons_events.Pixbuf = pixbuf;
image_all_persons_events_h.Pixbuf = pixbuf;
+ image_db_view.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "inertial_rolled.png");
image_inertial_rolled.Pixbuf = pixbuf;
@@ -686,6 +692,7 @@ public partial class ChronoJumpWindow
image_contacts_session_overview.Pixbuf = pixbuf;
image_encoder_session_overview.Pixbuf = pixbuf;
image_encoder_analyze_table_save.Pixbuf = pixbuf;
+ image_session_export_csv1.Pixbuf = pixbuf;
//encoder
UtilGtk.ColorsRadio(viewport_chronopics, radiobutton_encoder_analyze_powerbars);
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index e69beb79..a395d1b9 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -69,7 +69,9 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_session_import;
[Widget] Gtk.Image image_session_export;
+ [Widget] Gtk.Image image_session_export1;
[Widget] Gtk.Image image_session_export_csv;
+ [Widget] Gtk.Image image_session_export_csv1;
//menu icons
[Widget] Gtk.Image image_radio_show_menu;