[longomatch] Split review window based on the new config
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Split review window based on the new config
- Date: Thu, 27 Jun 2013 20:30:46 +0000 (UTC)
commit a44716fda4e362bc9c70bb06844b43ea716fbacf
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Thu Jun 27 17:04:59 2013 +0200
Split review window based on the new config
LongoMatch.GUI.Multimedia/Gui/PlayerCapturerBin.cs | 5 +-
.../gtk-gui/LongoMatch.Gui.PlayerCapturerBin.cs | 60 +++++++++++---------
LongoMatch.GUI.Multimedia/gtk-gui/gui.stetic | 42 +++++++++-----
3 files changed, 64 insertions(+), 43 deletions(-)
---
diff --git a/LongoMatch.GUI.Multimedia/Gui/PlayerCapturerBin.cs
b/LongoMatch.GUI.Multimedia/Gui/PlayerCapturerBin.cs
index 56aa05a..95ff009 100644
--- a/LongoMatch.GUI.Multimedia/Gui/PlayerCapturerBin.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/PlayerCapturerBin.cs
@@ -76,7 +76,10 @@ namespace LongoMatch.Gui
public void ShowPlayer () {
playerbin.Visible = true;
- capturerbin.Visible = false;
+ if (mode == PlayerOperationMode.PreviewCapturer && Config.ReviewPlaysInSameWindow)
+ capturerbin.Visible = true;
+ else
+ capturerbin.Visible = false;
}
public void ShowCapturer () {
diff --git a/LongoMatch.GUI.Multimedia/gtk-gui/LongoMatch.Gui.PlayerCapturerBin.cs
b/LongoMatch.GUI.Multimedia/gtk-gui/LongoMatch.Gui.PlayerCapturerBin.cs
index a72f04a..df32a8c 100644
--- a/LongoMatch.GUI.Multimedia/gtk-gui/LongoMatch.Gui.PlayerCapturerBin.cs
+++ b/LongoMatch.GUI.Multimedia/gtk-gui/LongoMatch.Gui.PlayerCapturerBin.cs
@@ -5,8 +5,9 @@ namespace LongoMatch.Gui
public partial class PlayerCapturerBin
{
private global::Gtk.VBox vbox2;
- private global::LongoMatch.Gui.CapturerBin capturerbin;
+ private global::Gtk.HBox hbox4;
private global::LongoMatch.Gui.PlayerBin playerbin;
+ private global::LongoMatch.Gui.CapturerBin capturerbin;
private global::Gtk.Button backtolivebutton;
protected virtual void Build ()
@@ -20,48 +21,55 @@ namespace LongoMatch.Gui
this.vbox2.Name = "vbox2";
this.vbox2.Spacing = 6;
// Container child vbox2.Gtk.Box+BoxChild
- this.capturerbin = new global::LongoMatch.Gui.CapturerBin ();
- this.capturerbin.Events = ((global::Gdk.EventMask)(256));
- this.capturerbin.Name = "capturerbin";
- this.vbox2.Add (this.capturerbin);
- global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox2
[this.capturerbin]));
- w1.Position = 0;
- // Container child vbox2.Gtk.Box+BoxChild
+ this.hbox4 = new global::Gtk.HBox ();
+ this.hbox4.Name = "hbox4";
+ this.hbox4.Spacing = 6;
+ // Container child hbox4.Gtk.Box+BoxChild
this.playerbin = new global::LongoMatch.Gui.PlayerBin ();
this.playerbin.Events = ((global::Gdk.EventMask)(256));
this.playerbin.Name = "playerbin";
this.playerbin.Rate = 0F;
this.playerbin.ExpandLogo = false;
this.playerbin.Detached = false;
- this.vbox2.Add (this.playerbin);
- global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox2
[this.playerbin]));
+ this.hbox4.Add (this.playerbin);
+ global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox4
[this.playerbin]));
+ w1.Position = 0;
+ // Container child hbox4.Gtk.Box+BoxChild
+ this.capturerbin = new global::LongoMatch.Gui.CapturerBin ();
+ this.capturerbin.Events = ((global::Gdk.EventMask)(256));
+ this.capturerbin.Name = "capturerbin";
+ this.hbox4.Add (this.capturerbin);
+ global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox4
[this.capturerbin]));
w2.Position = 1;
+ this.vbox2.Add (this.hbox4);
+ global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox4]));
+ w3.Position = 0;
// Container child vbox2.Gtk.Box+BoxChild
this.backtolivebutton = new global::Gtk.Button ();
this.backtolivebutton.CanFocus = true;
this.backtolivebutton.Name = "backtolivebutton";
this.backtolivebutton.UseUnderline = true;
// Container child backtolivebutton.Gtk.Container+ContainerChild
- global::Gtk.Alignment w3 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+ global::Gtk.Alignment w4 = 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;
+ global::Gtk.HBox w5 = new global::Gtk.HBox ();
+ w5.Spacing = 2;
// Container child GtkHBox.Gtk.Container+ContainerChild
- global::Gtk.Image w5 = new global::Gtk.Image ();
- w5.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-goto-last",
global::Gtk.IconSize.Menu);
- w4.Add (w5);
+ global::Gtk.Image w6 = new global::Gtk.Image ();
+ w6.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-goto-last",
global::Gtk.IconSize.Menu);
+ w5.Add (w6);
// Container child GtkHBox.Gtk.Container+ContainerChild
- global::Gtk.Label w7 = new global::Gtk.Label ();
- w7.LabelProp = global::Mono.Unix.Catalog.GetString ("Back To Live");
- w7.UseUnderline = true;
- w4.Add (w7);
- w3.Add (w4);
- this.backtolivebutton.Add (w3);
+ global::Gtk.Label w8 = new global::Gtk.Label ();
+ w8.LabelProp = global::Mono.Unix.Catalog.GetString ("Back To Live");
+ w8.UseUnderline = true;
+ w5.Add (w8);
+ w4.Add (w5);
+ this.backtolivebutton.Add (w4);
this.vbox2.Add (this.backtolivebutton);
- global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox2
[this.backtolivebutton]));
- w11.Position = 2;
- w11.Expand = false;
- w11.Fill = false;
+ global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox2
[this.backtolivebutton]));
+ w12.Position = 1;
+ w12.Expand = false;
+ w12.Fill = false;
this.Add (this.vbox2);
if ((this.Child != null)) {
this.Child.ShowAll ();
diff --git a/LongoMatch.GUI.Multimedia/gtk-gui/gui.stetic b/LongoMatch.GUI.Multimedia/gtk-gui/gui.stetic
index 42c6384..8ec6f9e 100644
--- a/LongoMatch.GUI.Multimedia/gtk-gui/gui.stetic
+++ b/LongoMatch.GUI.Multimedia/gtk-gui/gui.stetic
@@ -529,9 +529,32 @@
<property name="MemberName" />
<property name="Spacing">6</property>
<child>
- <widget class="LongoMatch.Gui.CapturerBin" id="capturerbin">
+ <widget class="Gtk.HBox" id="hbox4">
<property name="MemberName" />
- <property name="Events">ButtonPressMask</property>
+ <property name="Spacing">6</property>
+ <child>
+ <widget class="LongoMatch.Gui.PlayerBin" id="playerbin">
+ <property name="MemberName" />
+ <property name="Events">ButtonPressMask</property>
+ <property name="Rate">0</property>
+ <property name="ExpandLogo">False</property>
+ <property name="Detached">False</property>
+ </widget>
+ <packing>
+ <property name="Position">0</property>
+ <property name="AutoSize">True</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="LongoMatch.Gui.CapturerBin" id="capturerbin">
+ <property name="MemberName" />
+ <property name="Events">ButtonPressMask</property>
+ </widget>
+ <packing>
+ <property name="Position">1</property>
+ <property name="AutoSize">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="Position">0</property>
@@ -539,19 +562,6 @@
</packing>
</child>
<child>
- <widget class="LongoMatch.Gui.PlayerBin" id="playerbin">
- <property name="MemberName" />
- <property name="Events">ButtonPressMask</property>
- <property name="Rate">0</property>
- <property name="ExpandLogo">False</property>
- <property name="Detached">False</property>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">True</property>
- </packing>
- </child>
- <child>
<widget class="Gtk.Button" id="backtolivebutton">
<property name="MemberName" />
<property name="Visible">False</property>
@@ -563,7 +573,7 @@
<signal name="Clicked" handler="OnBacktolivebuttonClicked" />
</widget>
<packing>
- <property name="Position">2</property>
+ <property name="Position">1</property>
<property name="AutoSize">True</property>
<property name="Expand">False</property>
<property name="Fill">False</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]