[longomatch] Start integrating the synchronisation UI in the project manager.
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Start integrating the synchronisation UI in the project manager.
- Date: Wed, 18 Mar 2015 14:45:04 +0000 (UTC)
commit 3d8e9c8afb510b4117e36fdd14badaa6bad136b2
Author: Julien Moutte <julien fluendo com>
Date: Mon Mar 16 15:13:22 2015 +0100
Start integrating the synchronisation UI in the project manager.
LongoMatch.GUI/Gui/Panel/ProjectsManagerPanel.cs | 11 ++
.../LongoMatch.Gui.Panel.ProjectsManagerPanel.cs | 110 ++++++++++++--------
LongoMatch.GUI/gtk-gui/gui.stetic | 85 ++++++++++------
3 files changed, 132 insertions(+), 74 deletions(-)
---
diff --git a/LongoMatch.GUI/Gui/Panel/ProjectsManagerPanel.cs
b/LongoMatch.GUI/Gui/Panel/ProjectsManagerPanel.cs
index 337b96c..3aa975d 100644
--- a/LongoMatch.GUI/Gui/Panel/ProjectsManagerPanel.cs
+++ b/LongoMatch.GUI/Gui/Panel/ProjectsManagerPanel.cs
@@ -54,6 +54,7 @@ namespace LongoMatch.Gui.Panel
savebuttonimage.Pixbuf = Misc.LoadIcon ("longomatch-project-save", 34);
exportbuttonimage.Pixbuf = Misc.LoadIcon ("longomatch-project-export", 34);
+ resyncbuttonimage.Pixbuf = Misc.LoadIcon ("longomatch-project-export", 34);
deletebuttonimage.Pixbuf = Misc.LoadIcon ("longomatch-project-delete", 34);
openbuttonimage.Pixbuf = Misc.LoadIcon ("longomatch-project-open", 34);
@@ -74,6 +75,7 @@ namespace LongoMatch.Gui.Panel
competitionentry.Changed += HandleChanged;
savebutton.Clicked += HandleSaveClicked;
exportbutton.Clicked += HandleExportClicked;
+ resyncbutton.Clicked += HandleResyncClicked;
deletebutton.Clicked += HandleDeleteClicked;
openbutton.Clicked += HandleOpenClicked;
datepicker.ValueChanged += HandleDateChanged;
@@ -192,6 +194,7 @@ namespace LongoMatch.Gui.Panel
openbutton.Sensitive = projects.Count == 1;
deletebutton.Sensitive = projects.Count != 0;
projectbox.Sensitive = projects.Count == 1;
+ resyncbutton.Sensitive = projects.Count == 1;
selectedProjects = projects;
if (projects.Count == 1) {
@@ -204,6 +207,14 @@ namespace LongoMatch.Gui.Panel
}
}
+ void HandleResyncClicked (object sender, EventArgs e)
+ {
+ notebook1.Page = 1;
+
+ // Load data in the project periods widget.
+ projectperiods1.Project = loadedProject;
+ }
+
void HandleSaveClicked (object sender, EventArgs e)
{
SaveLoadedProject (true);
diff --git a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.ProjectsManagerPanel.cs
b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.ProjectsManagerPanel.cs
index 50e041d..604ab87 100644
--- a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.ProjectsManagerPanel.cs
+++ b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.ProjectsManagerPanel.cs
@@ -8,11 +8,11 @@ namespace LongoMatch.Gui.Panel
private global::LongoMatch.Gui.Panel.PanelHeader panelheader1;
- private global::Gtk.Alignment contentalignment;
-
private global::Gtk.Notebook notebook1;
- private global::Gtk.HBox hbox4;
+ private global::Gtk.Alignment pm_content_alignment;
+
+ private global::Gtk.HBox pm_hbox;
private global::LongoMatch.Gui.Component.ProjectListWidget projectlistwidget1;
@@ -72,6 +72,10 @@ namespace LongoMatch.Gui.Panel
private global::Gtk.Image openbuttonimage;
+ private global::Gtk.Button resyncbutton;
+
+ private global::Gtk.Image resyncbuttonimage;
+
private global::Gtk.Button exportbutton;
private global::Gtk.Image exportbuttonimage;
@@ -82,6 +86,8 @@ namespace LongoMatch.Gui.Panel
private global::Gtk.Label label1;
+ private global::LongoMatch.Gui.Component.ProjectPeriods projectperiods1;
+
private global::Gtk.Label label3;
protected virtual void Build ()
@@ -93,7 +99,6 @@ namespace LongoMatch.Gui.Panel
// Container child
LongoMatch.Gui.Panel.ProjectsManagerPanel.Gtk.Container+ContainerChild
this.vbox3 = new global::Gtk.VBox ();
this.vbox3.Name = "vbox3";
- this.vbox3.Spacing = 6;
// Container child vbox3.Gtk.Box+BoxChild
this.panelheader1 = new global::LongoMatch.Gui.Panel.PanelHeader ();
this.panelheader1.Events = ((global::Gdk.EventMask)(256));
@@ -104,29 +109,29 @@ namespace LongoMatch.Gui.Panel
w1.Expand = false;
w1.Fill = false;
// Container child vbox3.Gtk.Box+BoxChild
- this.contentalignment = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
- this.contentalignment.Name = "contentalignment";
- this.contentalignment.LeftPadding = ((uint)(12));
- this.contentalignment.RightPadding = ((uint)(12));
- // Container child contentalignment.Gtk.Container+ContainerChild
this.notebook1 = new global::Gtk.Notebook ();
this.notebook1.CanFocus = true;
this.notebook1.Name = "notebook1";
- this.notebook1.CurrentPage = 0;
+ this.notebook1.CurrentPage = 1;
// Container child notebook1.Gtk.Notebook+NotebookChild
- this.hbox4 = new global::Gtk.HBox ();
- this.hbox4.Name = "hbox4";
- this.hbox4.Spacing = 6;
- // Container child hbox4.Gtk.Box+BoxChild
+ this.pm_content_alignment = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+ this.pm_content_alignment.Name = "pm_content_alignment";
+ this.pm_content_alignment.LeftPadding = ((uint)(12));
+ this.pm_content_alignment.RightPadding = ((uint)(12));
+ // Container child pm_content_alignment.Gtk.Container+ContainerChild
+ this.pm_hbox = new global::Gtk.HBox ();
+ this.pm_hbox.Name = "pm_hbox";
+ this.pm_hbox.Spacing = 6;
+ // Container child pm_hbox.Gtk.Box+BoxChild
this.projectlistwidget1 = new global::LongoMatch.Gui.Component.ProjectListWidget ();
this.projectlistwidget1.Events = ((global::Gdk.EventMask)(256));
this.projectlistwidget1.Name = "projectlistwidget1";
- this.hbox4.Add (this.projectlistwidget1);
- global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox4
[this.projectlistwidget1]));
+ this.pm_hbox.Add (this.projectlistwidget1);
+ global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.pm_hbox
[this.projectlistwidget1]));
w2.Position = 0;
w2.Expand = false;
w2.Fill = false;
- // Container child hbox4.Gtk.Box+BoxChild
+ // Container child pm_hbox.Gtk.Box+BoxChild
this.projectpropertiesalignment = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
this.projectpropertiesalignment.Name = "projectpropertiesalignment";
this.projectpropertiesalignment.BottomPadding = ((uint)(12));
@@ -142,7 +147,7 @@ namespace LongoMatch.Gui.Panel
// Container child scrolledwindow3.Gtk.Container+ContainerChild
global::Gtk.Viewport w3 = new global::Gtk.Viewport ();
w3.ShadowType = ((global::Gtk.ShadowType)(0));
- // Container child GtkViewport.Gtk.Container+ContainerChild
+ // Container child GtkViewport1.Gtk.Container+ContainerChild
this.projectbox = new global::Gtk.VBox ();
this.projectbox.Name = "projectbox";
// Container child projectbox.Gtk.Box+BoxChild
@@ -361,6 +366,21 @@ namespace LongoMatch.Gui.Panel
w29.Expand = false;
w29.Fill = false;
// Container child hbuttonbox1.Gtk.ButtonBox+ButtonBoxChild
+ this.resyncbutton = new global::Gtk.Button ();
+ this.resyncbutton.TooltipMarkup = "Adjust periods and secondary videos
synchronisation";
+ this.resyncbutton.Sensitive = false;
+ this.resyncbutton.CanFocus = true;
+ this.resyncbutton.Name = "resyncbutton";
+ // Container child resyncbutton.Gtk.Container+ContainerChild
+ this.resyncbuttonimage = new global::Gtk.Image ();
+ this.resyncbuttonimage.Name = "resyncbuttonimage";
+ this.resyncbutton.Add (this.resyncbuttonimage);
+ this.hbuttonbox1.Add (this.resyncbutton);
+ global::Gtk.ButtonBox.ButtonBoxChild w31 =
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox1 [this.resyncbutton]));
+ w31.Position = 2;
+ w31.Expand = false;
+ w31.Fill = false;
+ // Container child hbuttonbox1.Gtk.ButtonBox+ButtonBoxChild
this.exportbutton = new global::Gtk.Button ();
this.exportbutton.TooltipMarkup = "Export";
this.exportbutton.Sensitive = false;
@@ -371,10 +391,10 @@ namespace LongoMatch.Gui.Panel
this.exportbuttonimage.Name = "exportbuttonimage";
this.exportbutton.Add (this.exportbuttonimage);
this.hbuttonbox1.Add (this.exportbutton);
- global::Gtk.ButtonBox.ButtonBoxChild w31 =
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox1 [this.exportbutton]));
- w31.Position = 2;
- w31.Expand = false;
- w31.Fill = false;
+ global::Gtk.ButtonBox.ButtonBoxChild w33 =
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox1 [this.exportbutton]));
+ w33.Position = 3;
+ w33.Expand = false;
+ w33.Fill = false;
// Container child hbuttonbox1.Gtk.ButtonBox+ButtonBoxChild
this.deletebutton = new global::Gtk.Button ();
this.deletebutton.TooltipMarkup = "Delete";
@@ -386,37 +406,41 @@ namespace LongoMatch.Gui.Panel
this.deletebuttonimage.Name = "deletebuttonimage";
this.deletebutton.Add (this.deletebuttonimage);
this.hbuttonbox1.Add (this.deletebutton);
- global::Gtk.ButtonBox.ButtonBoxChild w33 =
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox1 [this.deletebutton]));
- w33.Position = 3;
- w33.Expand = false;
- w33.Fill = false;
+ global::Gtk.ButtonBox.ButtonBoxChild w35 =
((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox1 [this.deletebutton]));
+ w35.Position = 4;
+ w35.Expand = false;
+ w35.Fill = false;
this.rbox.Add (this.hbuttonbox1);
- global::Gtk.Box.BoxChild w34 = ((global::Gtk.Box.BoxChild)(this.rbox
[this.hbuttonbox1]));
- w34.Position = 1;
- w34.Expand = false;
- w34.Fill = false;
- this.projectpropertiesalignment.Add (this.rbox);
- this.hbox4.Add (this.projectpropertiesalignment);
- global::Gtk.Box.BoxChild w36 = ((global::Gtk.Box.BoxChild)(this.hbox4
[this.projectpropertiesalignment]));
+ global::Gtk.Box.BoxChild w36 = ((global::Gtk.Box.BoxChild)(this.rbox
[this.hbuttonbox1]));
w36.Position = 1;
- this.notebook1.Add (this.hbox4);
+ w36.Expand = false;
+ w36.Fill = false;
+ this.projectpropertiesalignment.Add (this.rbox);
+ this.pm_hbox.Add (this.projectpropertiesalignment);
+ global::Gtk.Box.BoxChild w38 = ((global::Gtk.Box.BoxChild)(this.pm_hbox
[this.projectpropertiesalignment]));
+ w38.Position = 1;
+ this.pm_content_alignment.Add (this.pm_hbox);
+ this.notebook1.Add (this.pm_content_alignment);
// Notebook tab
this.label1 = new global::Gtk.Label ();
this.label1.Name = "label1";
- this.notebook1.SetTabLabel (this.hbox4, this.label1);
+ this.notebook1.SetTabLabel (this.pm_content_alignment, this.label1);
this.label1.ShowAll ();
+ // Container child notebook1.Gtk.Notebook+NotebookChild
+ this.projectperiods1 = new global::LongoMatch.Gui.Component.ProjectPeriods ();
+ this.projectperiods1.Events = ((global::Gdk.EventMask)(256));
+ this.projectperiods1.Name = "projectperiods1";
+ this.notebook1.Add (this.projectperiods1);
+ global::Gtk.Notebook.NotebookChild w41 =
((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.projectperiods1]));
+ w41.Position = 1;
// Notebook tab
- global::Gtk.Label w38 = new global::Gtk.Label ();
- w38.Visible = true;
- this.notebook1.Add (w38);
this.label3 = new global::Gtk.Label ();
this.label3.Name = "label3";
- this.notebook1.SetTabLabel (w38, this.label3);
+ this.notebook1.SetTabLabel (this.projectperiods1, this.label3);
this.label3.ShowAll ();
- this.contentalignment.Add (this.notebook1);
- this.vbox3.Add (this.contentalignment);
- global::Gtk.Box.BoxChild w40 = ((global::Gtk.Box.BoxChild)(this.vbox3
[this.contentalignment]));
- w40.Position = 1;
+ this.vbox3.Add (this.notebook1);
+ global::Gtk.Box.BoxChild w42 = ((global::Gtk.Box.BoxChild)(this.vbox3
[this.notebook1]));
+ w42.Position = 1;
this.Add (this.vbox3);
if ((this.Child != null)) {
this.Child.ShowAll ();
diff --git a/LongoMatch.GUI/gtk-gui/gui.stetic b/LongoMatch.GUI/gtk-gui/gui.stetic
index 0e168cf..4efda4b 100644
--- a/LongoMatch.GUI/gtk-gui/gui.stetic
+++ b/LongoMatch.GUI/gtk-gui/gui.stetic
@@ -8388,7 +8388,6 @@ You can continue with the current capture, cancel it or save your project.
<child>
<widget class="Gtk.VBox" id="vbox3">
<property name="MemberName" />
- <property name="Spacing">6</property>
<child>
<widget class="LongoMatch.Gui.Panel.PanelHeader" id="panelheader1">
<property name="MemberName" />
@@ -8402,17 +8401,16 @@ You can continue with the current capture, cancel it or save your project.
</packing>
</child>
<child>
- <widget class="Gtk.Alignment" id="contentalignment">
+ <widget class="Gtk.Notebook" id="notebook1">
<property name="MemberName" />
- <property name="LeftPadding">12</property>
- <property name="RightPadding">12</property>
+ <property name="CanFocus">True</property>
+ <property name="CurrentPage">0</property>
<child>
- <widget class="Gtk.Notebook" id="notebook1">
+ <widget class="Gtk.Alignment" id="pm_content_alignment">
<property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="CurrentPage">0</property>
+ <property name="BorderWidth">12</property>
<child>
- <widget class="Gtk.HBox" id="hbox4">
+ <widget class="Gtk.HBox" id="pm_hbox">
<property name="MemberName" />
<property name="Spacing">6</property>
<child>
@@ -8442,7 +8440,7 @@ You can continue with the current capture, cancel it or save your project.
<property name="CanFocus">True</property>
<property name="HscrollbarPolicy">Never</property>
<child>
- <widget class="Gtk.Viewport" id="GtkViewport">
+ <widget class="Gtk.Viewport" id="GtkViewport1">
<property name="MemberName" />
<property name="ShadowType">None</property>
<child>
@@ -8766,7 +8764,7 @@ You can continue with the current capture, cancel it or save your project.
<child>
<widget class="Gtk.HButtonBox" id="hbuttonbox1">
<property name="MemberName" />
- <property name="Size">4</property>
+ <property name="Size">5</property>
<child>
<widget class="Gtk.Button" id="savebutton">
<property name="MemberName" />
@@ -8805,6 +8803,25 @@ You can continue with the current capture, cancel it or save your project.
</packing>
</child>
<child>
+ <widget class="Gtk.Button" id="resyncbutton">
+ <property name="MemberName" />
+ <property name="Sensitive">False</property>
+ <property name="Tooltip" translatable="yes">Adjust periods and secondary
videos synchronisation</property>
+ <property name="CanFocus">True</property>
+ <property name="Type">Custom</property>
+ <child>
+ <widget class="Gtk.Image" id="resyncbuttonimage">
+ <property name="MemberName" />
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="Position">2</property>
+ <property name="Expand">False</property>
+ <property name="Fill">False</property>
+ </packing>
+ </child>
+ <child>
<widget class="Gtk.Button" id="exportbutton">
<property name="MemberName" />
<property name="Sensitive">False</property>
@@ -8818,7 +8835,7 @@ You can continue with the current capture, cancel it or save your project.
</child>
</widget>
<packing>
- <property name="Position">2</property>
+ <property name="Position">3</property>
<property name="Expand">False</property>
<property name="Fill">False</property>
</packing>
@@ -8838,7 +8855,7 @@ You can continue with the current capture, cancel it or save your project.
</child>
</widget>
<packing>
- <property name="Position">3</property>
+ <property name="Position">4</property>
<property name="Expand">False</property>
<property name="Fill">False</property>
</packing>
@@ -8861,27 +8878,33 @@ You can continue with the current capture, cancel it or save your project.
</child>
</widget>
</child>
- <child>
- <widget class="Gtk.Label" id="label1">
- <property name="MemberName" />
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <placeholder />
- </child>
- <child>
- <widget class="Gtk.Label" id="label3">
- <property name="MemberName" />
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
</widget>
</child>
+ <child>
+ <widget class="Gtk.Label" id="label1">
+ <property name="MemberName" />
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="LongoMatch.Gui.Component.ProjectPeriods" id="projectperiods1">
+ <property name="MemberName" />
+ <property name="Events">ButtonPressMask</property>
+ </widget>
+ <packing>
+ <property name="Position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.Label" id="label3">
+ <property name="MemberName" />
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="Position">1</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
