commit 48aa5b2393dbd0eb2b0d0382442dae763721e5c2
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Jul 26 16:49:36 2021 +0200
Icons for cancel,back,accept button on session tabs
glade/app1.glade | 239 ++++++++++++++++++++++++++++++++++++++++---
src/gui/app1/icons.cs | 8 ++
src/gui/app1/session/main.cs | 8 ++
3 files changed, 239 insertions(+), 16 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 766b83fd6..e43317406 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -25790,6 +25790,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -32101,6 +32104,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>
@@ -32137,18 +32152,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>
@@ -41389,6 +41392,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -43025,11 +43031,35 @@ then click this button.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <widget class="GtkHBox" id="hbox544">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_app1s_button_cancel1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkLabel" id="label510">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Cancel</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
</child>
@@ -43937,11 +43967,35 @@ then click this button.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <widget class="GtkHBox" id="hbox545">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_app1s_button_back">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</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="label513">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Back</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
</child>
@@ -44919,15 +44973,44 @@ then click this button.</property>
<property name="spacing">20</property>
<child>
<widget class="GtkButton"
id="app1s_button_delete_cancel">
- <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property
name="receives_default">False</property>
<property name="relief">half</property>
- <property name="use_stock">True</property>
<signal name="clicked"
handler="on_app1s_button_delete_cancel_clicked" swapped="no"/>
<accelerator key="Escape" signal="clicked"/>
+ <child>
+ <widget class="GtkHBox" id="hbox370">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_app1s_button_delete_cancel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</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="label158">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Cancel</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>
@@ -44937,14 +45020,43 @@ then click this button.</property>
</child>
<child>
<widget class="GtkButton"
id="app1s_button_delete_accept">
- <property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property
name="receives_default">False</property>
<property name="relief">half</property>
- <property name="use_stock">True</property>
<signal name="clicked"
handler="on_app1s_button_delete_accept_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox452">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_app1s_button_delete_accept">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</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="label159">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Accept</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>
@@ -45063,11 +45175,34 @@ then click this button.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <widget class="GtkHBox" id="hbox540">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage"
id="image_app1s_button_delete_close">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</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="label517">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Close</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
</child>
@@ -46508,11 +46643,35 @@ then click this button.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <widget class="GtkHBox" id="hbox543">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_app1s_button_backup_cancel_close">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkLabel"
id="app1s_label_backup_cancel_close">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Cancel</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
</child>
@@ -46877,11 +47036,35 @@ then click this button.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <widget class="GtkHBox" id="hbox541">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_app1s_button_export_cancel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkLabel"
id="app1s_label_export_cancel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Cancel</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
</child>
@@ -46905,11 +47088,35 @@ then click this button.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+ <widget class="GtkHBox" id="hbox542">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkImage"
id="image_app1s_button_export_close">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkLabel"
id="app1s_label_export_close">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Close</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
</child>
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 6797d18fd..255cc3b5d 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -406,6 +406,7 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "arrow_back.png");
image_selector_start_back.Pixbuf = pixbuf;
image_button_force_sensor_analyze_back_to_signal.Pixbuf = pixbuf;
+ image_app1s_button_back.Pixbuf = pixbuf;
//pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_person_pin.png");
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_person.png");
@@ -763,10 +764,17 @@ public partial class ChronoJumpWindow
image_run_encoder_export_cancel.Pixbuf = pixbuf;
app1s_image_cancel.Pixbuf = pixbuf;
image_app1sae_button_cancel.Pixbuf = pixbuf;
+ image_app1s_button_delete_cancel.Pixbuf = pixbuf;
+ image_app1s_button_delete_close.Pixbuf = pixbuf;
+ image_app1s_button_export_cancel.Pixbuf = pixbuf;
+ image_app1s_button_export_close.Pixbuf = pixbuf;
+ image_app1s_button_backup_cancel_close.Pixbuf = pixbuf;
+ image_app1s_button_cancel1.Pixbuf = pixbuf;
//accept
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_done_blue.png");
image_app1sae_button_accept.Pixbuf = pixbuf;
+ image_app1s_button_delete_accept.Pixbuf = pixbuf;
//zoom icons, done like this because there's one zoom icon created ad-hoc,
//and is not nice that the other are different for an user theme change
diff --git a/src/gui/app1/session/main.cs b/src/gui/app1/session/main.cs
index 0b9320109..4d5d2ce1f 100644
--- a/src/gui/app1/session/main.cs
+++ b/src/gui/app1/session/main.cs
@@ -87,6 +87,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.EventBox app1s_eventbox_button_load;
[Widget] Gtk.EventBox app1s_eventbox_button_back;
[Widget] Gtk.EventBox app1s_eventbox_button_import;
+ [Widget] Gtk.Image image_app1s_button_cancel1;
+ [Widget] Gtk.Image image_app1s_button_back;
//notebook tab 3
[Widget] Gtk.Label app1s_label_import_session_name;
@@ -108,6 +110,9 @@ public partial class ChronoJumpWindow
//notebook tab 5
[Widget] Gtk.EventBox app1s_eventbox_button_delete_close;
+ [Widget] Gtk.Image image_app1s_button_delete_cancel;
+ [Widget] Gtk.Image image_app1s_button_delete_accept;
+ [Widget] Gtk.Image image_app1s_button_delete_close;
//notebook tab 6 (add/edit)
[Widget] Gtk.Notebook app1sae_notebook_add_edit;
@@ -153,6 +158,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button app1s_button_backup_cancel_close;
[Widget] Gtk.Label app1s_label_backup_cancel_close;
[Widget] Gtk.EventBox app1s_eventbox_button_backup_cancel_close;
+ [Widget] Gtk.Image image_app1s_button_backup_cancel_close;
[Widget] Gtk.Image app1s_image_button_backup_select;
[Widget] Gtk.Label app1s_label_backup_destination;
[Widget] Gtk.HBox app1s_hbox_backup_doing;
@@ -171,6 +177,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image app1s_image_button_export_select;
[Widget] Gtk.Label app1s_label_export_destination;
[Widget] Gtk.Label app1s_label_export_progress;
+ [Widget] Gtk.Image image_app1s_button_export_cancel;
+ [Widget] Gtk.Image image_app1s_button_export_close;
[Widget] Gtk.ProgressBar app1s_pulsebarExportActivity;
const int app1s_PAGE_MODES = 0;