[chronojump] Chronojump logo drawingarea and viewport in a notebook (maybe better for mac)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Chronojump logo drawingarea and viewport in a notebook (maybe better for mac)
- Date: Wed, 30 Jun 2021 16:25:11 +0000 (UTC)
commit f5d6496157f21c87ba1c3fcea60a254b7ca32df6
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Jun 30 18:24:39 2021 +0200
Chronojump logo drawingarea and viewport in a notebook (maybe better for mac)
glade/app1.glade | 85 +++++++++++++++++++++++++++---------------
src/gui/app1/chronojump.cs | 5 ++-
src/gui/app1/chronojumpLogo.cs | 30 +++++++++------
src/gui/sendLogAndPoll.cs | 2 +-
4 files changed, 77 insertions(+), 45 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index e619905e3..f4a3c83ce 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -2710,9 +2710,38 @@
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkVBox" id="vbox182">
+ <widget class="GtkNotebook" id="notebook_chronojump_logo">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">4</property>
+ <property name="left_padding">2</property>
+ <property name="right_padding">4</property>
+ <child>
+ <widget class="GtkDrawingArea"
id="drawingarea_chronojump_logo">
+ <property name="height_request">100</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label645">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">drawingarea (animation)</property>
+ </widget>
+ <packing>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
<child>
<widget class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
@@ -2723,6 +2752,7 @@
<child>
<widget class="GtkViewport" id="viewport_chronojump_logo">
<property name="height_request">100</property>
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<widget class="GtkAlignment" id="alignment15">
@@ -2798,30 +2828,19 @@
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment16">
+ <widget class="GtkLabel" id="label649">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">4</property>
- <property name="left_padding">2</property>
- <property name="right_padding">4</property>
- <child>
- <widget class="GtkDrawingArea"
id="drawingarea_chronojump_logo">
- <property name="height_request">100</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </widget>
- </child>
+ <property name="label">logo (static)</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
</widget>
@@ -25731,6 +25750,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -32007,18 +32029,6 @@ 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>
@@ -32055,6 +32065,18 @@ 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>
@@ -41149,6 +41171,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/chronojump.cs b/src/gui/app1/chronojump.cs
index 7ded55e9c..4f024f852 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -47,6 +47,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.ComboBox combo_gui_tests;
[Widget] Gtk.Button button_carles;
+ [Widget] Gtk.Notebook notebook_chronojump_logo;
[Widget] Gtk.Viewport viewport_chronojump_logo;
[Widget] Gtk.Image image_chronojump_logo;
[Widget] Gtk.DrawingArea drawingarea_chronojump_logo;
@@ -818,7 +819,7 @@ public partial class ChronoJumpWindow
}
if(! showSendLog && ! showSocialNetworkPoll && notebook_sup.CurrentPage ==
Convert.ToInt32(notebook_sup_pages.START))
- new ChronojumpLogo (drawingarea_chronojump_logo, viewport_chronojump_logo,
preferences.logoAnimatedShow, preferences.fontType.ToString());
+ new ChronojumpLogo (notebook_chronojump_logo, drawingarea_chronojump_logo,
viewport_chronojump_logo, preferences.logoAnimatedShow, preferences.fontType.ToString());
//done at the end to ensure main window is shown
if(splashWin != null) {
@@ -3045,7 +3046,7 @@ public partial class ChronoJumpWindow
tempSessionName = currentSession.Name;
setApp1Title(tempSessionName, Constants.Menuitem_modes.UNDEFINED);
- new ChronojumpLogo (drawingarea_chronojump_logo, viewport_chronojump_logo,
preferences.logoAnimatedShow, preferences.fontType.ToString());
+ new ChronojumpLogo (notebook_chronojump_logo, drawingarea_chronojump_logo,
viewport_chronojump_logo, preferences.logoAnimatedShow, preferences.fontType.ToString());
}
private void on_button_start_selector_show_more_clicked (object o, EventArgs args)
diff --git a/src/gui/app1/chronojumpLogo.cs b/src/gui/app1/chronojumpLogo.cs
index a108aa9e2..b620ce69e 100644
--- a/src/gui/app1/chronojumpLogo.cs
+++ b/src/gui/app1/chronojumpLogo.cs
@@ -38,27 +38,32 @@ public class ChronojumpLogo
private Stopwatch stopwatch2;
private Stopwatch stopwatch3;
+ private Gtk.Notebook notebook;
private Gtk.DrawingArea drawingarea; //contains the animation
private Gtk.Viewport viewport; //contains the logo and version number
private string font;
//constructor
- public ChronojumpLogo (Gtk.DrawingArea drawingarea, Gtk.Viewport viewport, bool showAnimated, string
font)
+ public ChronojumpLogo (Gtk.Notebook notebook, Gtk.DrawingArea drawingarea, Gtk.Viewport viewport,
bool showAnimated, string font)
{
- if(! showAnimated)
- {
- viewport.Visible = true;
- drawingarea.Visible = false;
- return;
- }
-
LogB.Information("Chronojump logo constructor start");
+
+ this.notebook = notebook;
this.drawingarea = drawingarea;
this.viewport = viewport;
this.font = font;
- viewport.Visible = false;
- drawingarea.Visible = true;
+ if(! showAnimated)
+ {
+ notebook.CurrentPage = 1;
+ //viewport.Visible = true;
+ //drawingarea.Visible = false;
+ return;
+ }
+
+ //viewport.Visible = false;
+ //drawingarea.Visible = true;
+ notebook.CurrentPage = 0;
timer = true;
alpha = 1.0;
@@ -80,8 +85,9 @@ public class ChronojumpLogo
{
if (! timer)
{
- drawingarea.Visible = false;
- viewport.Visible = true;
+ //drawingarea.Visible = false;
+ //viewport.Visible = true;
+ notebook.CurrentPage = 1;
return false;
}
diff --git a/src/gui/sendLogAndPoll.cs b/src/gui/sendLogAndPoll.cs
index f594ddad4..ac5ad0547 100644
--- a/src/gui/sendLogAndPoll.cs
+++ b/src/gui/sendLogAndPoll.cs
@@ -281,7 +281,7 @@ public partial class ChronoJumpWindow
SqlitePreferences.Update(SqlitePreferences.LoadLastModeAtStart, true, false);
} else {
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.START);
- new ChronojumpLogo (drawingarea_chronojump_logo, viewport_chronojump_logo,
preferences.logoAnimatedShow, preferences.fontType.ToString());
+ new ChronojumpLogo (notebook_chronojump_logo, drawingarea_chronojump_logo,
viewport_chronojump_logo, preferences.logoAnimatedShow, preferences.fontType.ToString());
}
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
