[longomatch] Handle zooming in editing game periods
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Handle zooming in editing game periods
- Date: Mon, 7 Jul 2014 11:31:04 +0000 (UTC)
commit 4a1e3aa22d1226e9c46e814b19bd30d045aa7c55
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Fri Jun 20 16:21:38 2014 +0200
Handle zooming in editing game periods
LongoMatch.GUI/Gui/Component/ProjectPeriods.cs | 30 +++++-
.../LongoMatch.Gui.Component.ProjectPeriods.cs | 102 +++++++++++++++++---
LongoMatch.GUI/gtk-gui/gui.stetic | 103 +++++++++++++++----
3 files changed, 195 insertions(+), 40 deletions(-)
---
diff --git a/LongoMatch.GUI/Gui/Component/ProjectPeriods.cs b/LongoMatch.GUI/Gui/Component/ProjectPeriods.cs
index 1a60801..a0d0254 100644
--- a/LongoMatch.GUI/Gui/Component/ProjectPeriods.cs
+++ b/LongoMatch.GUI/Gui/Component/ProjectPeriods.cs
@@ -29,11 +29,13 @@ namespace LongoMatch.Gui.Component
{
TimersTimeline timersTimenline;
Timerule timerule;
-
+ Time duration;
public ProjectPeriods ()
{
this.Build ();
+ zoominbutton.Clicked += HandleZooomActivated;
+ zoomoutbutton.Clicked += HandleZooomActivated;
playerbin2.Tick += HandleTick;
playerbin2.ShowControls = false;
timerule = new Timerule (new WidgetWrapper (drawingarea1));
@@ -49,7 +51,7 @@ namespace LongoMatch.Gui.Component
public Project Project {
set {
- Time start, duration, pDuration;
+ Time start, pDuration;
List<string> gamePeriods;
playerbin2.ShowControls = false;
@@ -63,6 +65,7 @@ namespace LongoMatch.Gui.Component
gamePeriods = value.Categories.GamePeriods;
timerule.Duration = duration;
+ SetZoom ();
playerbin2.Open (value.Description.File.FilePath);
foreach (string s in gamePeriods) {
@@ -76,6 +79,15 @@ namespace LongoMatch.Gui.Component
}
}
+ void SetZoom () {
+ if (duration != null) {
+ double spp = (double) duration.Seconds / drawingarea1.Allocation.Width;
+ int secondsPerPixel = (int) Math.Ceiling (spp);
+ timerule.SecondsPerPixel = secondsPerPixel;
+ timersTimenline.SecondsPerPixel = secondsPerPixel;
+ }
+ }
+
void HandleTick (Time currentTime, Time streamLength, double currentPosition)
{
timerule.CurrentTime = currentTime;
@@ -96,7 +108,19 @@ namespace LongoMatch.Gui.Component
timerule.Scroll = scrolledwindow2.Hadjustment.Value;
drawingarea1.QueueDraw ();
}
-
+
+ void HandleZooomActivated (object sender, EventArgs e)
+ {
+ if (sender == zoomoutbutton) {
+ timerule.SecondsPerPixel ++;
+ timersTimenline.SecondsPerPixel ++;
+ } else {
+ timerule.SecondsPerPixel = Math.Max (1, timerule.SecondsPerPixel - 1);
+ timersTimenline.SecondsPerPixel = Math.Max (1,
timersTimenline.SecondsPerPixel - 1);
+ }
+ drawingarea1.QueueDraw();
+ drawingarea2.QueueDraw();
+ }
}
}
diff --git a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.ProjectPeriods.cs
b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.ProjectPeriods.cs
index 1113cf5..b3fc01d 100644
--- a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.ProjectPeriods.cs
+++ b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Component.ProjectPeriods.cs
@@ -7,6 +7,11 @@ namespace LongoMatch.Gui.Component
private global::Gtk.VBox vbox2;
private global::LongoMatch.Gui.PlayerBin playerbin2;
private global::Gtk.Label synclabel;
+ private global::Gtk.HBox hbox3;
+ private global::Gtk.VBox vbox6;
+ private global::Gtk.Button zoomoutbutton;
+ private global::Gtk.Button zoominbutton;
+ private global::Gtk.VBox vbox7;
private global::Gtk.DrawingArea drawingarea1;
private global::Gtk.ScrolledWindow scrolledwindow2;
private global::Gtk.DrawingArea drawingarea2;
@@ -39,32 +44,99 @@ namespace LongoMatch.Gui.Component
w2.Fill = false;
w2.Padding = ((uint)(10));
// Container child vbox2.Gtk.Box+BoxChild
+ this.hbox3 = new global::Gtk.HBox ();
+ this.hbox3.Name = "hbox3";
+ this.hbox3.Spacing = 6;
+ // Container child hbox3.Gtk.Box+BoxChild
+ this.vbox6 = new global::Gtk.VBox ();
+ this.vbox6.Name = "vbox6";
+ this.vbox6.Spacing = 6;
+ // Container child vbox6.Gtk.Box+BoxChild
+ this.zoomoutbutton = new global::Gtk.Button ();
+ this.zoomoutbutton.CanFocus = true;
+ this.zoomoutbutton.Name = "zoomoutbutton";
+ this.zoomoutbutton.UseUnderline = true;
+ // Container child zoomoutbutton.Gtk.Container+ContainerChild
+ global::Gtk.Alignment w3 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+ // Container child GtkAlignment.Gtk.Container+ContainerChild
+ global::Gtk.HBox w4 = new global::Gtk.HBox ();
+ w4.Spacing = 2;
+ // Container child GtkHBox.Gtk.Container+ContainerChild
+ global::Gtk.Image w5 = new global::Gtk.Image ();
+ w5.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-zoom-out",
global::Gtk.IconSize.Menu);
+ w4.Add (w5);
+ // Container child GtkHBox.Gtk.Container+ContainerChild
+ global::Gtk.Label w7 = new global::Gtk.Label ();
+ w4.Add (w7);
+ w3.Add (w4);
+ this.zoomoutbutton.Add (w3);
+ this.vbox6.Add (this.zoomoutbutton);
+ global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox6
[this.zoomoutbutton]));
+ w11.Position = 0;
+ w11.Expand = false;
+ w11.Fill = false;
+ // Container child vbox6.Gtk.Box+BoxChild
+ this.zoominbutton = new global::Gtk.Button ();
+ this.zoominbutton.CanFocus = true;
+ this.zoominbutton.Name = "zoominbutton";
+ this.zoominbutton.UseUnderline = true;
+ // Container child zoominbutton.Gtk.Container+ContainerChild
+ global::Gtk.Alignment w12 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+ // Container child GtkAlignment.Gtk.Container+ContainerChild
+ global::Gtk.HBox w13 = new global::Gtk.HBox ();
+ w13.Spacing = 2;
+ // Container child GtkHBox.Gtk.Container+ContainerChild
+ global::Gtk.Image w14 = new global::Gtk.Image ();
+ w14.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-zoom-in",
global::Gtk.IconSize.Menu);
+ w13.Add (w14);
+ // Container child GtkHBox.Gtk.Container+ContainerChild
+ global::Gtk.Label w16 = new global::Gtk.Label ();
+ w13.Add (w16);
+ w12.Add (w13);
+ this.zoominbutton.Add (w12);
+ this.vbox6.Add (this.zoominbutton);
+ global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox6
[this.zoominbutton]));
+ w20.Position = 1;
+ w20.Expand = false;
+ w20.Fill = false;
+ this.hbox3.Add (this.vbox6);
+ global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.vbox6]));
+ w21.Position = 0;
+ w21.Expand = false;
+ // Container child hbox3.Gtk.Box+BoxChild
+ this.vbox7 = new global::Gtk.VBox ();
+ this.vbox7.Name = "vbox7";
+ this.vbox7.Spacing = 6;
+ // Container child vbox7.Gtk.Box+BoxChild
this.drawingarea1 = new global::Gtk.DrawingArea ();
this.drawingarea1.Name = "drawingarea1";
- this.vbox2.Add (this.drawingarea1);
- global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox2
[this.drawingarea1]));
- w3.Position = 2;
- w3.Expand = false;
- w3.Fill = false;
- // Container child vbox2.Gtk.Box+BoxChild
+ this.vbox7.Add (this.drawingarea1);
+ global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox7
[this.drawingarea1]));
+ w22.Position = 0;
+ // Container child vbox7.Gtk.Box+BoxChild
this.scrolledwindow2 = new global::Gtk.ScrolledWindow ();
this.scrolledwindow2.HeightRequest = 50;
this.scrolledwindow2.CanFocus = true;
this.scrolledwindow2.Name = "scrolledwindow2";
this.scrolledwindow2.ShadowType = ((global::Gtk.ShadowType)(1));
// Container child scrolledwindow2.Gtk.Container+ContainerChild
- global::Gtk.Viewport w4 = new global::Gtk.Viewport ();
- w4.ShadowType = ((global::Gtk.ShadowType)(0));
+ global::Gtk.Viewport w23 = new global::Gtk.Viewport ();
+ w23.ShadowType = ((global::Gtk.ShadowType)(0));
// Container child GtkViewport.Gtk.Container+ContainerChild
this.drawingarea2 = new global::Gtk.DrawingArea ();
this.drawingarea2.Name = "drawingarea2";
- w4.Add (this.drawingarea2);
- this.scrolledwindow2.Add (w4);
- this.vbox2.Add (this.scrolledwindow2);
- global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox2
[this.scrolledwindow2]));
- w7.Position = 3;
- w7.Expand = false;
- w7.Fill = false;
+ w23.Add (this.drawingarea2);
+ this.scrolledwindow2.Add (w23);
+ this.vbox7.Add (this.scrolledwindow2);
+ global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox7
[this.scrolledwindow2]));
+ w26.Position = 1;
+ this.hbox3.Add (this.vbox7);
+ global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.vbox7]));
+ w27.Position = 1;
+ this.vbox2.Add (this.hbox3);
+ global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox3]));
+ w28.Position = 2;
+ w28.Expand = false;
this.Add (this.vbox2);
if ((this.Child != null)) {
this.Child.ShowAll ();
diff --git a/LongoMatch.GUI/gtk-gui/gui.stetic b/LongoMatch.GUI/gtk-gui/gui.stetic
index ed0d0dc..0c58c88 100644
--- a/LongoMatch.GUI/gtk-gui/gui.stetic
+++ b/LongoMatch.GUI/gtk-gui/gui.stetic
@@ -6052,7 +6052,6 @@ You can continue with the current capture, cancel it or save your project.
<property name="MemberName" />
<property name="CanFocus">True</property>
<property name="Label" translatable="yes">New project using a video
file</property>
- <property name="Active">True</property>
<property name="DrawIndicator">True</property>
<property name="HasLabel">True</property>
<property name="UseUnderline">True</property>
@@ -9399,7 +9398,7 @@ Click 2 players to swap them</property>
</widget>
</child>
</widget>
- <widget class="Gtk.Bin" id="LongoMatch.Gui.Component.ProjectPeriods" design-size="821 496">
+ <widget class="Gtk.Bin" id="LongoMatch.Gui.Component.ProjectPeriods" design-size="878 475">
<property name="MemberName" />
<property name="Visible">False</property>
<child>
@@ -9430,39 +9429,99 @@ Click 2 players to swap them</property>
</packing>
</child>
<child>
- <widget class="Gtk.DrawingArea" id="drawingarea1">
- <property name="MemberName" />
- </widget>
- <packing>
- <property name="Position">2</property>
- <property name="AutoSize">False</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.ScrolledWindow" id="scrolledwindow2">
+ <widget class="Gtk.HBox" id="hbox3">
<property name="MemberName" />
- <property name="HeightRequest">50</property>
- <property name="CanFocus">True</property>
- <property name="ShadowType">In</property>
+ <property name="Spacing">6</property>
<child>
- <widget class="Gtk.Viewport" id="GtkViewport">
+ <widget class="Gtk.VBox" id="vbox6">
<property name="MemberName" />
- <property name="ShadowType">None</property>
+ <property name="Spacing">6</property>
+ <child>
+ <widget class="Gtk.Button" id="zoomoutbutton">
+ <property name="MemberName" />
+ <property name="CanFocus">True</property>
+ <property name="Type">TextAndIcon</property>
+ <property name="Icon">stock:gtk-zoom-out Menu</property>
+ <property name="Label" translatable="yes" />
+ <property name="UseUnderline">True</property>
+ </widget>
+ <packing>
+ <property name="Position">0</property>
+ <property name="AutoSize">True</property>
+ <property name="Expand">False</property>
+ <property name="Fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.Button" id="zoominbutton">
+ <property name="MemberName" />
+ <property name="CanFocus">True</property>
+ <property name="Type">TextAndIcon</property>
+ <property name="Icon">stock:gtk-zoom-in Menu</property>
+ <property name="Label" translatable="yes" />
+ <property name="UseUnderline">True</property>
+ </widget>
+ <packing>
+ <property name="Position">1</property>
+ <property name="AutoSize">True</property>
+ <property name="Expand">False</property>
+ <property name="Fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="Position">0</property>
+ <property name="AutoSize">False</property>
+ <property name="Expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.VBox" id="vbox7">
+ <property name="MemberName" />
+ <property name="Spacing">6</property>
<child>
- <widget class="Gtk.DrawingArea" id="drawingarea2">
+ <widget class="Gtk.DrawingArea" id="drawingarea1">
<property name="MemberName" />
</widget>
+ <packing>
+ <property name="Position">0</property>
+ <property name="AutoSize">True</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.ScrolledWindow" id="scrolledwindow2">
+ <property name="MemberName" />
+ <property name="HeightRequest">50</property>
+ <property name="CanFocus">True</property>
+ <property name="ShadowType">In</property>
+ <child>
+ <widget class="Gtk.Viewport" id="GtkViewport">
+ <property name="MemberName" />
+ <property name="ShadowType">None</property>
+ <child>
+ <widget class="Gtk.DrawingArea" id="drawingarea2">
+ <property name="MemberName" />
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="Position">1</property>
+ <property name="AutoSize">True</property>
+ </packing>
</child>
</widget>
+ <packing>
+ <property name="Position">1</property>
+ <property name="AutoSize">False</property>
+ </packing>
</child>
</widget>
<packing>
- <property name="Position">3</property>
+ <property name="Position">2</property>
<property name="AutoSize">False</property>
<property name="Expand">False</property>
- <property name="Fill">False</property>
</packing>
</child>
</widget>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
