commit 180302a1f922750622c5f707863a47535ec5cadf
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Mar 21 18:16:55 2020 +0100
Removed quit button on maximized. added preferences/help icons
glade/app1.glade | 112 +++++++++++++++++++++++++++++++--------------
src/gui/app1/chronojump.cs | 1 -
src/gui/app1/icons.cs | 4 +-
src/gui/app1/menu.cs | 4 ++
src/gui/networks.cs | 2 -
5 files changed, 83 insertions(+), 40 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index b1896893..1f18bd76 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1578,11 +1578,34 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkLabel" id="label23">
+ <widget class="GtkHBox" id="hbox331">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage"
id="image_menu_preferences">
+ <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">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label_menu_preferences">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Preferences</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
</child>
@@ -1881,11 +1904,34 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkLabel" id="label24">
+ <widget class="GtkHBox" id="hbox364">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage" id="image_menu_quit">
+ <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_quit">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"
translatable="yes">Exit</property>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
</child>
</widget>
</child>
@@ -3691,47 +3737,19 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox84">
+ <widget class="GtkAlignment" id="alignment32">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">4</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkButton" id="button_start_quit">
- <property name="width_request">50</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="tooltip"
translatable="yes">Quit</property>
- <property name="relief">half</property>
- <signal name="clicked"
handler="on_quit1_activate" swapped="no"/>
- <accelerator key="q" signal="activate"
modifiers="GDK_CONTROL_MASK"/>
- <child>
- <widget class="GtkImage" id="image_quit2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="top_padding">4</property>
+ <property name="bottom_padding">4</property>
+ <property name="left_padding">4</property>
+ <property name="right_padding">4</property>
<child>
<widget class="GtkLabel" id="label_version">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
</widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</widget>
<packing>
@@ -24357,6 +24375,18 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -34152,6 +34182,18 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index eb4201d2..f14354c1 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -54,7 +54,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.SpinButton spin_gui_tests;
[Widget] Gtk.ComboBox combo_gui_tests;
[Widget] Gtk.Button button_carles;
- [Widget] Gtk.Button button_start_quit;
[Widget] Gtk.Viewport viewport_chronojump_logo;
[Widget] Gtk.Image image_chronojump_logo;
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 6a58644b..b47ae4c5 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -36,7 +36,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_minimize1;
[Widget] Gtk.Image image_quit;
[Widget] Gtk.Image image_quit1;
- [Widget] Gtk.Image image_quit2;
[Widget] Gtk.Image image_quit3;
[Widget] Gtk.Image image_quit_from_app1;
[Widget] Gtk.Image image_session_new2;
@@ -260,6 +259,7 @@ public partial class ChronoJumpWindow
image_settings1.Pixbuf = pixbuf;
image_settings2.Pixbuf = pixbuf;
image_session_preferences.Pixbuf = pixbuf;
+ image_menu_preferences.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_minimize.png");
image_minimize.Pixbuf = pixbuf;
@@ -268,9 +268,9 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_quit.png");
image_quit.Pixbuf = pixbuf;
image_quit1.Pixbuf = pixbuf;
- image_quit2.Pixbuf = pixbuf;
image_quit3.Pixbuf = pixbuf;
image_quit_from_app1.Pixbuf = pixbuf;
+ image_menu_quit.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_warning_red.png");
image_message_permissions_at_boot.Pixbuf = pixbuf;
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index bbc36c15..5e7bd55c 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -55,6 +55,10 @@ public partial class ChronoJumpWindow
[Widget] Gtk.CheckButton check_menu_session;
[Widget] Gtk.CheckButton check_menu_encoder;
[Widget] Gtk.CheckButton check_menu_help;
+ [Widget] Gtk.Image image_menu_preferences;
+ [Widget] Gtk.Label label_menu_preferences;
+ [Widget] Gtk.Image image_menu_quit;
+ [Widget] Gtk.Label label_menu_quit;
[Widget] Gtk.Alignment alignment_menu_session_options;
[Widget] Gtk.Alignment alignment_menu_person_options;
[Widget] Gtk.Alignment alignment_menu_encoder_options;
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index ae22f36f..661da1ab 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -332,11 +332,9 @@ public partial class ChronoJumpWindow
{
app1.Unmaximize();
app1.Decorated = true;
- button_start_quit.Visible = false;
} else {
app1.Decorated = (configChronojump.Maximized !=
Preferences.MaximizedTypes.YESUNDECORATED);
app1.Maximize();
- button_start_quit.Visible = ! app1.Decorated;
}
maximizeWindowAtStartDone = true;
}