[chronojump] Logo on top right on personsAtLeft. Icon on bottom left on personsOnTop
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Logo on top right on personsAtLeft. Icon on bottom left on personsOnTop
- Date: Thu, 9 Apr 2020 16:04:52 +0000 (UTC)
commit 05285e3b08c78e7ec3a94a5cad4afd5fe23738f4
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Apr 9 18:04:16 2020 +0200
Logo on top right on personsAtLeft. Icon on bottom left on personsOnTop
glade/app1.glade | 108 +++++++++++++++++++++++++++++++++++++++++
src/gui/app1/icons.cs | 15 ++++++
src/gui/app1/menu_tiny.cs | 4 ++
src/gui/app1/session/delete.cs | 1 +
src/utilGtk.cs | 2 +-
5 files changed, 129 insertions(+), 1 deletion(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index b428767e..26a3ad39 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -657,6 +657,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">4</property>
+ <property name="bottom_padding">4</property>
<property name="left_padding">2</property>
<property name="right_padding">2</property>
<child>
@@ -1148,6 +1149,43 @@
<property name="position">4</property>
</packing>
</child>
+ <child>
+ <widget class="GtkFrame" id="frame17">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">1</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkViewport" id="viewport_image_logo_icon">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage" id="image_logo_icon">
+ <property name="width_request">48</property>
+ <property name="height_request">48</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <placeholder/>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -6783,6 +6821,41 @@ EncoderInertialCapture</property>
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <widget class="GtkFrame" id="frame18">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">1</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkViewport"
id="viewport_image_logo_contacts">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage" id="image_logo_contacts">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <placeholder/>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -25840,6 +25913,41 @@ Concentric</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkFrame" id="frame19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">1</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkViewport"
id="viewport_image_logo_encoder">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkImage" id="image_logo_encoder">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <placeholder/>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 998489ce..c79447b8 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -27,6 +27,7 @@ using Glade;
public partial class ChronoJumpWindow
{
[Widget] Gtk.Image image_mode_main_menu;
+ [Widget] Gtk.Image image_logo_icon;
//[Widget] Gtk.Image image_home;
//[Widget] Gtk.Image image_home1;
[Widget] Gtk.Image image_settings2;
@@ -83,6 +84,10 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_add_test5;
[Widget] Gtk.Image image_test_inspect;
[Widget] Gtk.Image image_test_inspect1;
+ [Widget] Gtk.Image image_logo_contacts;
+ [Widget] Gtk.Image image_logo_encoder;
+ [Widget] Gtk.Viewport viewport_image_logo_contacts;
+ [Widget] Gtk.Viewport viewport_image_logo_encoder;
[Widget] Gtk.Image image_selector_start_jumps;
[Widget] Gtk.Image image_selector_start_runs;
@@ -508,6 +513,16 @@ public partial class ChronoJumpWindow
* <------ end of material design icons
*/
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameLogo);
+ image_logo_contacts.Pixbuf = pixbuf;
+ image_logo_encoder.Pixbuf = pixbuf;
+
+ UtilGtk.ViewportColor(viewport_image_logo_contacts, UtilGtk.BLUE_CHRONOJUMP);
+ UtilGtk.ViewportColor(viewport_image_logo_encoder, UtilGtk.BLUE_CHRONOJUMP);
+
+ pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameIcon);
+ image_logo_icon.Pixbuf = pixbuf;
+
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "selector-jumps.png");
image_selector_start_jumps.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "selector-runs.png");
diff --git a/src/gui/app1/menu_tiny.cs b/src/gui/app1/menu_tiny.cs
index f85691c3..dc71365e 100644
--- a/src/gui/app1/menu_tiny.cs
+++ b/src/gui/app1/menu_tiny.cs
@@ -64,6 +64,9 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_menu_help_about1;
[Widget] Gtk.Image image_menu_quit1;
+ [Widget] Gtk.Viewport viewport_image_logo_icon;
+
+
private void menuTinyInitialize ()
{
menuTinySetColors();
@@ -81,6 +84,7 @@ public partial class ChronoJumpWindow
UtilGtk.ViewportColor(viewport_hpaned_contacts_main, color);
UtilGtk.ViewportColor(viewport_rest_time_contacts, color);
UtilGtk.ViewportColor(viewport_rest_time_encoder, color);
+ UtilGtk.ViewportColor(viewport_image_logo_icon, UtilGtk.BLUE_CHRONOJUMP);
UtilGtk.EventBoxColorBackgroundActive (eventbox_button_show_modes1, UtilGtk.YELLOW);
UtilGtk.EventBoxColorBackgroundActive (eventbox_check_menu_session1, UtilGtk.YELLOW);
diff --git a/src/gui/app1/session/delete.cs b/src/gui/app1/session/delete.cs
index 51d9cd13..06378aa2 100644
--- a/src/gui/app1/session/delete.cs
+++ b/src/gui/app1/session/delete.cs
@@ -33,6 +33,7 @@ public partial class ChronoJumpWindow
private void on_app1s_delete_session_confirm_start (object o, EventArgs args)
{
+ //first show notebook tab in order to ensure the .Visible = true will work
app1s_notebook.CurrentPage = app1s_PAGE_DELETE_CONFIRM;
app1s_vbox_delete_question.Visible = false;
diff --git a/src/utilGtk.cs b/src/utilGtk.cs
index d389686b..a7a3b1fd 100644
--- a/src/utilGtk.cs
+++ b/src/utilGtk.cs
@@ -476,7 +476,7 @@ public class UtilGtk
public static Gdk.Color RED_PLOTS = new Gdk.Color(200,0,0);
public static Gdk.Color LIGHT_BLUE_PLOTS = new Gdk.Color(178,223,238);
public static Gdk.Color BLUE_PLOTS = new Gdk.Color(0,0,200);
- public static Gdk.Color BLUE_CHRONOJUMP = new Gdk.Color(14,30,70); //so dark, can be used only for
background
+ public static Gdk.Color BLUE_CHRONOJUMP = new Gdk.Color(14,30,70); //so dark, can be used only for
background (is the 0e1e46)
//used on encoder capture
public static Gdk.Color RED_DARK = new Gdk.Color(140,0,0);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
