commit 1c7c244486b0123fe7f9196574c2ff9b7a4f307a
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed May 11 14:10:47 2022 +0200
Discover button cancel/close with changing label and icon
glade/app1.glade | 79 ++++++++++++----------------------------------
src/gui/app1/chronojump.cs | 11 +++++++
src/gui/app1/icons.cs | 3 +-
3 files changed, 33 insertions(+), 60 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 466474b5c..a0feccaef 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -26557,6 +26557,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -32965,6 +32968,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>
@@ -33001,18 +33016,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>
@@ -42329,6 +42332,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -50302,49 +50308,6 @@ Since Chronojump 2.1.3, backups contain the complete data.</property>
<property name="position">2</property>
</packing>
</child>
- <child>
- <widget class="GtkButton"
id="button_menu_discover_ports_accept_selected_or_cancel">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkHBox" id="hbox225">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkImage"
id="image_menu_help_about1">
- <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="label_menu_help_about1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">accept
selected or 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">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -50388,7 +50351,7 @@ Since Chronojump 2.1.3, backups contain the complete data.</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkImage"
id="image_button_micro_discover_close">
+ <widget class="GtkImage"
id="image_button_micro_discover_cancel_close">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -50400,10 +50363,10 @@ Since Chronojump 2.1.3, backups contain the complete data.</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_button_micro_discover_close">
+ <widget class="GtkLabel"
id="label_button_micro_discover_cancel_close">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Close</property>
+ <property name="label"
translatable="yes">Cancel</property>
</widget>
<packing>
<property name="expand">True</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index dc5e00de9..03424cdc5 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -304,6 +304,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.ProgressBar progressbar_micro_discover_ports;
[Widget] Gtk.ProgressBar progressbar_micro_discover_status;
[Widget] Gtk.EventBox eventbox_button_micro_discover_close;
+ [Widget] Gtk.Image image_button_micro_discover_cancel_close;
+ [Widget] Gtk.Label label_button_micro_discover_cancel_close;
[Widget] Gtk.Label label_threshold;
@@ -4579,6 +4581,10 @@ public partial class ChronoJumpWindow
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.MICRODISCOVER);
menus_and_mode_sensitive (false);
+ image_button_micro_discover_cancel_close.Pixbuf =
+ new Pixbuf (null, Util.GetImagePath(false) + "image_cancel.png");
+ label_button_micro_discover_cancel_close.Text = Catalog.GetString("Cancel");
+
if(list_discover_ports != null && list_discover_ports.Count > 0)
{
microDiscover = new MicroDiscover (list_discover_ports); //all ports
@@ -4615,6 +4621,11 @@ public partial class ChronoJumpWindow
LogB.ThreadEnded();
progressbar_micro_discover_status.Fraction = 1;
+
+ image_button_micro_discover_cancel_close.Pixbuf =
+ new Pixbuf (null, Util.GetImagePath(false) + "image_close.png");
+ label_button_micro_discover_cancel_close.Text = Catalog.GetString("Close");
+
return false;
}
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 049fd6212..df5823698 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -113,7 +113,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label label_start_selector_encoder;
[Widget] Gtk.Image image_button_help_close;
- [Widget] Gtk.Image image_button_micro_discover_close;
[Widget] Gtk.Image image_edit_selected_jump;
[Widget] Gtk.Image image_edit_selected_jump_rj;
@@ -794,7 +793,7 @@ public partial class ChronoJumpWindow
image_app1s_button_view_data_folder_close.Pixbuf = pixbuf;
image_app1s_button_cancel1.Pixbuf = pixbuf;
image_button_help_close.Pixbuf = pixbuf;
- image_button_micro_discover_close.Pixbuf = pixbuf;
+ image_button_micro_discover_cancel_close.Pixbuf = pixbuf;
//accept
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_done_blue.png");