[longomatch] Expand tagging buttons in the fake capture
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Expand tagging buttons in the fake capture
- Date: Sun, 6 Oct 2013 16:57:41 +0000 (UTC)
commit d251862defac918070cb71c1543b1ce21422b6e1
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Sun Oct 6 18:57:18 2013 +0200
Expand tagging buttons in the fake capture
LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs | 3 ++-
.../gtk-gui/LongoMatch.Gui.CapturerBin.cs | 3 +--
LongoMatch.GUI.Multimedia/gtk-gui/gui.stetic | 5 ++---
LongoMatch.GUI/Gui/MainWindow.cs | 11 ++++++++++-
4 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs b/LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs
index de6f970..498c751 100644
--- a/LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/CapturerBin.cs
@@ -297,7 +297,8 @@ namespace LongoMatch.Gui
}
protected virtual void OnTick(int ellapsedTime) {
- timelabel.Text = "Time: " + TimeString.MSecondsToSecondsString(CurrentTime);
+ timelabel.Markup = String.Format("<span font=\"20px bold\">Time --> {0}</span> ",
+ TimeString.MSecondsToSecondsString(CurrentTime));
}
protected virtual void OnError(object o, ErrorArgs args)
diff --git a/LongoMatch.GUI.Multimedia/gtk-gui/LongoMatch.Gui.CapturerBin.cs
b/LongoMatch.GUI.Multimedia/gtk-gui/LongoMatch.Gui.CapturerBin.cs
index b51b92b..e4b3fe5 100644
--- a/LongoMatch.GUI.Multimedia/gtk-gui/LongoMatch.Gui.CapturerBin.cs
+++ b/LongoMatch.GUI.Multimedia/gtk-gui/LongoMatch.Gui.CapturerBin.cs
@@ -125,13 +125,12 @@ namespace LongoMatch.Gui
// Container child hbox2.Gtk.Box+BoxChild
this.timelabel = new global::Gtk.Label ();
this.timelabel.Name = "timelabel";
- this.timelabel.Xalign = 1F;
this.timelabel.LabelProp = "Time: 0:00:00";
+ this.timelabel.UseMarkup = true;
this.hbox2.Add (this.timelabel);
global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(this.hbox2
[this.timelabel]));
w31.PackType = ((global::Gtk.PackType)(1));
w31.Position = 1;
- w31.Expand = false;
this.vbox1.Add (this.hbox2);
global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox2]));
w32.Position = 2;
diff --git a/LongoMatch.GUI.Multimedia/gtk-gui/gui.stetic b/LongoMatch.GUI.Multimedia/gtk-gui/gui.stetic
index 8ec6f9e..5e8830d 100644
--- a/LongoMatch.GUI.Multimedia/gtk-gui/gui.stetic
+++ b/LongoMatch.GUI.Multimedia/gtk-gui/gui.stetic
@@ -399,7 +399,7 @@
</widget>
</child>
</widget>
- <widget class="Gtk.Bin" id="LongoMatch.Gui.CapturerBin" design-size="356 295">
+ <widget class="Gtk.Bin" id="LongoMatch.Gui.CapturerBin" design-size="474 295">
<property name="MemberName" />
<child>
<widget class="Gtk.VBox" id="vbox1">
@@ -500,14 +500,13 @@
<child>
<widget class="Gtk.Label" id="timelabel">
<property name="MemberName" />
- <property name="Xalign">1</property>
<property name="LabelProp">Time: 0:00:00</property>
+ <property name="UseMarkup">True</property>
</widget>
<packing>
<property name="PackType">End</property>
<property name="Position">1</property>
<property name="AutoSize">False</property>
- <property name="Expand">False</property>
</packing>
</child>
</widget>
diff --git a/LongoMatch.GUI/Gui/MainWindow.cs b/LongoMatch.GUI/Gui/MainWindow.cs
index 44b231e..c73557e 100644
--- a/LongoMatch.GUI/Gui/MainWindow.cs
+++ b/LongoMatch.GUI/Gui/MainWindow.cs
@@ -409,6 +409,11 @@ namespace LongoMatch.Gui
}
}
+ if(projectType == ProjectType.FakeCaptureProject) {
+ (downbox[videowidgetsbox] as Box.BoxChild).Expand = false;
+ (downbox[buttonswidget] as Box.BoxChild).Expand = true;
+ }
+
openedProject = project;
this.projectType = projectType;
@@ -535,14 +540,18 @@ namespace LongoMatch.Gui
dialog.TransientFor = (Gtk.Window)this.Toplevel;
res = dialog.Run();
dialog.Destroy();
-
+
/* Close project wihtout saving */
if(res == (int)EndCaptureResponse.Quit) {
EmitCloseOpenedProject(false);
+ (downbox[videowidgetsbox] as Box.BoxChild).Expand = true;
+ (downbox[buttonswidget] as Box.BoxChild).Expand = false;
return true;
} else if(res == (int)EndCaptureResponse.Save) {
/* Close and save project */
EmitCloseOpenedProject(true);
+ (downbox[videowidgetsbox] as Box.BoxChild).Expand = true;
+ (downbox[buttonswidget] as Box.BoxChild).Expand = false;
return true;
} else
/* Continue with the current project */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]