[chronojump] topright logo (contacts, encoder) withou frame, viewport
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] topright logo (contacts, encoder) withou frame, viewport
- Date: Thu, 20 Aug 2020 03:00:50 +0000 (UTC)
commit 40afc441d411066680cb48a48bc56aff6514d6d4
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Aug 20 04:00:22 2020 +0100
topright logo (contacts, encoder) withou frame, viewport
glade/app1.glade | 86 ++++++++++++++---------------------------------
src/gui/app1/icons.cs | 7 ----
src/gui/app1/menu.cs | 10 +++---
src/gui/app1/menu_tiny.cs | 4 +--
4 files changed, 33 insertions(+), 74 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index d115f4b0..84771244 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -5690,31 +5690,11 @@ EncoderInertialCapture</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame_logo_contacts">
+ <widget class="GtkImage" id="image_logo_contacts">
+ <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>
+ <property name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -24876,6 +24856,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -26462,31 +26445,11 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame_logo_encoder">
+ <widget class="GtkImage" id="image_logo_encoder">
+ <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>
+ <property name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -27741,6 +27704,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>
@@ -27777,18 +27752,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>
@@ -35811,6 +35774,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index 3acd39a7..9f5bf75b 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -88,10 +88,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_logo_contacts_transp;
[Widget] Gtk.Image image_logo_encoder;
[Widget] Gtk.Image image_logo_encoder_transp;
- [Widget] Gtk.Frame frame_logo_contacts;
- [Widget] Gtk.Frame frame_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;
@@ -518,9 +514,6 @@ public partial class ChronoJumpWindow
image_logo_contacts_transp.Pixbuf = pixbuf;
image_logo_encoder_transp.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) + Constants.FileNameIconTransp);
diff --git a/src/gui/app1/menu.cs b/src/gui/app1/menu.cs
index f2e076e7..a63137a8 100644
--- a/src/gui/app1/menu.cs
+++ b/src/gui/app1/menu.cs
@@ -178,15 +178,15 @@ public partial class ChronoJumpWindow
if(UtilGtk.ColorIsOkWithLogoTransparent
(UtilGtk.ColorParse(preferences.colorBackgroundString)))
{
- frame_logo_contacts.Visible = false;
+ image_logo_contacts.Visible = false;
image_logo_contacts_transp.Visible = true;
- frame_logo_encoder.Visible = false;
+ image_logo_encoder.Visible = false;
image_logo_encoder_transp.Visible = true;
radio_show_menu_and_persons_adjust_height(true);
} else {
- frame_logo_contacts.Visible = true;
+ image_logo_contacts.Visible = true;
image_logo_contacts_transp.Visible = false;
- frame_logo_encoder.Visible = true;
+ image_logo_encoder.Visible = true;
image_logo_encoder_transp.Visible = false;
radio_show_menu_and_persons_adjust_height(false);
}
@@ -199,7 +199,7 @@ public partial class ChronoJumpWindow
(-1, image_logo_contacts_transp.SizeRequest().Height);
else
hbox_radio_show_menu_and_persons.SetSizeRequest
- (-1, frame_logo_contacts.SizeRequest().Height);
+ (-1, image_logo_contacts.SizeRequest().Height);
}
private void menuSetTextAndIcons ()
diff --git a/src/gui/app1/menu_tiny.cs b/src/gui/app1/menu_tiny.cs
index ea1f1c25..c307a5d2 100644
--- a/src/gui/app1/menu_tiny.cs
+++ b/src/gui/app1/menu_tiny.cs
@@ -72,9 +72,9 @@ public partial class ChronoJumpWindow
alignment_menu_tiny.TopPadding = (uint) scrolled_rest_time_contacts.SizeRequest().Height + 4
+ 4;
image_logo_contacts_transp.Visible = false;
- frame_logo_contacts.Visible = false;
+ image_logo_contacts.Visible = false;
image_logo_encoder_transp.Visible = false;
- frame_logo_encoder.Visible = false;
+ image_logo_encoder.Visible = false;
if(UtilGtk.ColorIsOkWithLogoTransparent
(UtilGtk.ColorParse(preferences.colorBackgroundString)))
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
