commit 9731fd23f7eb9b62eb28569acc43fd563fe88689
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Apr 22 09:32:52 2020 +0200
eventboxes for session buttons
glade/app1.glade | 179 +++++++++++++++++++++++++++++++++++--------
src/gui/app1/chronojump.cs | 3 +-
src/gui/app1/session/main.cs | 30 ++++++++
3 files changed, 180 insertions(+), 32 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 548a58ef..4bda7847 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -24949,6 +24949,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -27247,6 +27250,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>
@@ -27283,18 +27298,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>
@@ -35067,6 +35070,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -35939,14 +35945,25 @@ then click this button.</property>
<property name="can_focus">False</property>
<child>
<widget class="GtkButton"
id="app1s_button_close0">
- <property name="label">gtk-close</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="use_stock">True</property>
<signal name="clicked"
handler="app1s_on_button_close0_clicked" swapped="no"/>
<accelerator key="Escape" signal="clicked"/>
+ <child>
+ <widget class="GtkEventBox"
id="app1s_eventbox_button_close0">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel" id="label434">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Close</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -36269,14 +36286,25 @@ then click this button.</property>
<property name="can_focus">False</property>
<child>
<widget class="GtkButton"
id="app1s_button_cancel1">
- <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="use_stock">True</property>
<signal name="clicked"
handler="app1s_on_button_cancel1_clicked" swapped="no"/>
<accelerator key="Escape" signal="clicked"/>
+ <child>
+ <widget class="GtkEventBox"
id="app1s_eventbox_button_cancel1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <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>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -36530,14 +36558,25 @@ then click this button.</property>
<property name="layout_style">spread</property>
<child>
<widget class="GtkButton" id="app1s_button_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="use_stock">True</property>
<signal name="clicked"
handler="app1s_on_button_cancel2_clicked" swapped="no"/>
<accelerator key="Escape" signal="clicked"/>
+ <child>
+ <widget class="GtkEventBox"
id="app1s_eventbox_button_cancel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel" id="label511">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Cancel</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -36547,14 +36586,25 @@ then click this button.</property>
</child>
<child>
<widget class="GtkButton" id="app1s_button_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="has_default">True</property>
<property
name="receives_default">False</property>
- <property name="use_stock">True</property>
<signal name="clicked"
handler="app1s_on_button_accept_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="app1s_eventbox_button_accept">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel" id="label512">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Accept</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -36611,14 +36661,25 @@ then click this button.</property>
<property name="layout_style">spread</property>
<child>
<widget class="GtkButton" id="app1s_button_back">
- <property name="label">gtk-go-back</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="use_stock">True</property>
<signal name="clicked"
handler="app1s_on_button_back_clicked" swapped="no"/>
<accelerator key="Escape" signal="clicked"/>
+ <child>
+ <widget class="GtkEventBox"
id="app1s_eventbox_button_back">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <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>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -36635,7 +36696,11 @@ then click this button.</property>
<property name="receives_default">False</property>
<signal name="clicked"
handler="app1s_on_button_import_clicked" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox387">
+ <widget class="GtkEventBox"
id="app1s_eventbox_button_import">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox387">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -36663,6 +36728,8 @@ then click this button.</property>
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ </child>
</widget>
</child>
</widget>
@@ -36952,14 +37019,25 @@ then click this button.</property>
<property name="layout_style">spread</property>
<child>
<widget class="GtkButton"
id="app1s_button_import_confirm_back">
- <property name="label">gtk-go-back</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="use_stock">True</property>
<signal name="clicked"
handler="app1s_on_button_import_confirm_back_clicked" swapped="no"/>
<accelerator key="Escape" signal="clicked"/>
+ <child>
+ <widget class="GtkEventBox"
id="app1s_eventbox_button_import_confirm_back">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel" id="label514">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Back</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -36969,14 +37047,25 @@ then click this button.</property>
</child>
<child>
<widget class="GtkButton"
id="app1s_button_import_confirm_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="has_default">True</property>
<property
name="receives_default">False</property>
- <property name="use_stock">True</property>
<signal name="clicked"
handler="app1s_on_button_import_confirm_accept_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkEventBox"
id="app1s_eventbox_button_import_confirm_accept">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel" id="label515">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Accept</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -37246,13 +37335,24 @@ then click this button.</property>
<property name="layout_style">spread</property>
<child>
<widget class="GtkButton"
id="app1s_button_import_close">
- <property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
<signal name="clicked"
handler="app1s_on_button_import_close_clicked" swapped="no"/>
<accelerator key="Escape" signal="clicked"/>
+ <child>
+ <widget class="GtkEventBox"
id="app1s_eventbox_button_import_close">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkLabel" id="label516">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Close</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -37267,6 +37367,10 @@ then click this button.</property>
<property name="receives_default">True</property>
<signal name="clicked"
handler="app1s_on_button_import_again_clicked" swapped="no"/>
<child>
+ <widget class="GtkEventBox"
id="app1s_eventbox_button_import_again">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
<widget class="GtkHBox" id="hbox391">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -37298,6 +37402,8 @@ then click this button.</property>
</widget>
</child>
</widget>
+ </child>
+ </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -37651,13 +37757,24 @@ then click this button.</property>
<property name="layout_style">spread</property>
<child>
<widget class="GtkButton"
id="app1s_button_delete_close">
- <property name="label">gtk-close</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property
name="receives_default">False</property>
- <property name="use_stock">True</property>
<signal name="clicked"
handler="on_app1s_button_delete_close_clicked" swapped="no"/>
<accelerator key="Escape" signal="clicked"/>
+ <child>
+ <widget class="GtkEventBox"
id="app1s_eventbox_button_delete_close">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <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>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 30667748..6a4404eb 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -22,7 +22,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Copyright (C) 2004-2017 Xavier de Blas <xaviblas gmail com>
+ * Copyright (C) 2004-2020 Xavier de Blas <xaviblas gmail com>
*/
@@ -599,6 +599,7 @@ public partial class ChronoJumpWindow
UtilGtk.EventBoxColorBackgroundActive (eventbox_radio_mode_contacts_analyze, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_radio_mode_encoder_capture_small,
UtilGtk.YELLOW, UtilGtk.YELLOW_LIGHT);
UtilGtk.EventBoxColorBackgroundActive (eventbox_radio_mode_encoder_analyze_small,
UtilGtk.YELLOW, UtilGtk.YELLOW_LIGHT);
+ app1s_eventboxes_paint();
createComboSelectJumps(true);
createComboSelectJumpsDjOptimalFall(true);
diff --git a/src/gui/app1/session/main.cs b/src/gui/app1/session/main.cs
index fa71cc1c..61ff6947 100644
--- a/src/gui/app1/session/main.cs
+++ b/src/gui/app1/session/main.cs
@@ -30,6 +30,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Notebook app1s_notebook;
//notebook tab 0
+ [Widget] Gtk.EventBox app1s_eventbox_button_close0;
+
//notebook tab 1
[Widget] Gtk.HBox hbox_session_more;
[Widget] Gtk.VBox vbox_session_overview;
@@ -38,6 +40,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image app1s_image_open_database;
[Widget] Gtk.Label app1s_label_open_database_file;
[Widget] Gtk.Button app1s_button_select_file_import_same_database;
+ [Widget] Gtk.EventBox app1s_eventbox_button_cancel1;
//notebook tab 2
[Widget] Gtk.TreeView app1s_treeview_session_load;
@@ -51,11 +54,17 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label app1s_file_path_import;
[Widget] Gtk.Notebook app1s_notebook_load_button_animation;
[Widget] Gtk.HButtonBox app1s_hbuttonbox_page2_import;
+ [Widget] Gtk.EventBox app1s_eventbox_button_cancel;
+ [Widget] Gtk.EventBox app1s_eventbox_button_accept;
+ [Widget] Gtk.EventBox app1s_eventbox_button_back;
+ [Widget] Gtk.EventBox app1s_eventbox_button_import;
//notebook tab 3
[Widget] Gtk.Label app1s_label_import_session_name;
[Widget] Gtk.Label app1s_label_import_file;
[Widget] Gtk.Button app1s_button_import_confirm_accept;
+ [Widget] Gtk.EventBox app1s_eventbox_button_import_confirm_back;
+ [Widget] Gtk.EventBox app1s_eventbox_button_import_confirm_accept;
//notebook tab 4
[Widget] Gtk.ProgressBar app1s_progressbarImport;
@@ -65,6 +74,12 @@ public partial class ChronoJumpWindow
[Widget] Gtk.TextView app1s_textview_import_error;
[Widget] Gtk.Image app1s_image_import1;
[Widget] Gtk.HButtonBox app1s_hbuttonbox_page4;
+ [Widget] Gtk.EventBox app1s_eventbox_button_import_close;
+ [Widget] Gtk.EventBox app1s_eventbox_button_import_again;
+
+ //notebook tab 5
+ [Widget] Gtk.EventBox app1s_eventbox_button_delete_close;
+
const int app1s_PAGE_MODES = 0;
const int app1s_PAGE_IMPORT_START = 1;
@@ -92,4 +107,19 @@ public partial class ChronoJumpWindow
notebook_mode_selector.CurrentPage = 0;
}
+ private void app1s_eventboxes_paint()
+ {
+ UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_close0, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_cancel1, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_cancel, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_accept, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_back, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_import_confirm_back,
UtilGtk.YELLOW, UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_import_confirm_accept,
UtilGtk.YELLOW, UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_import, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_import_close, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_import_again, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
+ UtilGtk.EventBoxColorBackgroundActive (app1s_eventbox_button_delete_close, UtilGtk.YELLOW,
UtilGtk.YELLOW_LIGHT);
+ }
+
}