[longomatch] Remove references to Gtk Widgets in Core and fix atk deps
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Remove references to Gtk Widgets in Core and fix atk deps
- Date: Mon, 7 Jul 2014 11:22:25 +0000 (UTC)
commit efb912807760667384c8f3cd72f4b676e8293399
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Wed May 21 18:13:34 2014 +0200
Remove references to Gtk Widgets in Core and fix atk deps
LongoMatch.Core/Interfaces/GUI/IGUIToolkit.cs | 8 ++++----
LongoMatch.Core/LongoMatch.Core.mdp | 17 ++++++++---------
LongoMatch.Core/Utils.cs | 6 +++---
.../LongoMatch.Drawing.Cairo.mdp | 9 +++++----
LongoMatch.GUI.Helpers/LongoMatch.GUI.Helpers.mdp | 11 ++++++-----
.../LongoMatch.GUI.Multimedia.mdp | 13 +++++++------
LongoMatch.GUI/Gui/GUIToolkit.cs | 16 ++++++++--------
LongoMatch.Services/LongoMatch.Services.mdp | 13 ++++++-------
LongoMatch/LongoMatchGtk.mdp | 7 ++++---
9 files changed, 51 insertions(+), 49 deletions(-)
---
diff --git a/LongoMatch.Core/Interfaces/GUI/IGUIToolkit.cs b/LongoMatch.Core/Interfaces/GUI/IGUIToolkit.cs
index a8474a1..2c9e263 100644
--- a/LongoMatch.Core/Interfaces/GUI/IGUIToolkit.cs
+++ b/LongoMatch.Core/Interfaces/GUI/IGUIToolkit.cs
@@ -38,10 +38,10 @@ namespace LongoMatch.Interfaces.GUI
void Quit ();
/* Messages */
- void InfoMessage(string message, Widget parent=null);
- void WarningMessage(string message, Widget parent=null);
- void ErrorMessage(string message, Widget parent=null);
- bool QuestionMessage(string message, string title, Widget parent=null);
+ void InfoMessage(string message, object parent=null);
+ void WarningMessage(string message, object parent=null);
+ void ErrorMessage(string message, object parent=null);
+ bool QuestionMessage(string message, string title, object parent=null);
/* Files/Folders IO */
string SaveFile(string title, string defaultName, string defaultFolder,
diff --git a/LongoMatch.Core/LongoMatch.Core.mdp b/LongoMatch.Core/LongoMatch.Core.mdp
index bcd125f..28832ce 100644
--- a/LongoMatch.Core/LongoMatch.Core.mdp
+++ b/LongoMatch.Core/LongoMatch.Core.mdp
@@ -138,14 +138,13 @@
<File subtype="Code" buildaction="Compile" name="Interfaces/Drawing/ICanvasObject.cs" />
</Contents>
<References>
- <ProjectReference type="Gac" localcopy="True" refto="System, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
- <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
- <ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
- <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=0738eb9f132ed756" />
- <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a" />
- <ProjectReference type="Gac" localcopy="False" refto="Newtonsoft.Json, Version=5.0.0.0, Culture=neutral,
PublicKeyToken=b9a188c8922137c6" />
- <ProjectReference type="Gac" localcopy="True" refto="nunit.framework" />
+ <ProjectReference type="Package" localcopy="True" refto="System, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
+ <ProjectReference type="Package" localcopy="True" refto="System.Core, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
+ <ProjectReference type="Package" localcopy="True" refto="System.Xml, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
+ <ProjectReference type="Package" localcopy="True" refto="Mono.Posix, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=0738eb9f132ed756" />
+ <ProjectReference type="Package" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Package" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Package" localcopy="True" refto="System.Drawing, Version=4.0.0.0,
Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <ProjectReference type="Package" localcopy="False" refto="Newtonsoft.Json, Version=5.0.0.0,
Culture=neutral, PublicKeyToken=b9a188c8922137c6" />
</References>
</Project>
\ No newline at end of file
diff --git a/LongoMatch.Core/Utils.cs b/LongoMatch.Core/Utils.cs
index f57fe74..5186ecd 100644
--- a/LongoMatch.Core/Utils.cs
+++ b/LongoMatch.Core/Utils.cs
@@ -26,7 +26,7 @@ namespace LongoMatch.Utils
public class Open
{
public static MediaFile OpenFile (object parent) {
- IBusyDialog busy;
+ IBusyDialog busy = null;
MediaFile mediaFile = null;
IGUIToolkit gui = Config.GUIToolkit;
IMultimediaToolkit multimedia = Config.MultimediaToolkit;
@@ -53,7 +53,7 @@ namespace LongoMatch.Utils
string q = Catalog.GetString("The file you are trying to load is not
properly supported. " +
"Would you like to convert it
into a more suitable format?");
if (gui.QuestionMessage (q, Catalog.GetString ("Convert"), null)) {
- string newFilename = multimedia.RemuxFile (mediaFile, parent
as Gtk.Window);
+ string newFilename = multimedia.RemuxFile (mediaFile, parent);
if (newFilename != null)
mediaFile = multimedia.DiscoverFile (newFilename);
}
@@ -61,7 +61,7 @@ namespace LongoMatch.Utils
}
catch(Exception ex) {
busy.Destroy ();
- gui.ErrorMessage (ex.Message, parent as Gtk.Window);
+ gui.ErrorMessage (ex.Message, parent);
return null;
}
diff --git a/LongoMatch.Drawing.Cairo/LongoMatch.Drawing.Cairo.mdp
b/LongoMatch.Drawing.Cairo/LongoMatch.Drawing.Cairo.mdp
index 225d372..590517e 100644
--- a/LongoMatch.Drawing.Cairo/LongoMatch.Drawing.Cairo.mdp
+++ b/LongoMatch.Drawing.Cairo/LongoMatch.Drawing.Cairo.mdp
@@ -18,10 +18,11 @@
<File subtype="Code" buildaction="Compile" name="WidgetWrapper.cs" />
</Contents>
<References>
- <ProjectReference type="Gac" localcopy="True" refto="System, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
- <ProjectReference specificVersion="False" type="Gac" localcopy="False" refto="Mono.Cairo,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+ <ProjectReference type="Package" localcopy="True" refto="System, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
+ <ProjectReference type="Package" specificVersion="False" localcopy="False" refto="Mono.Cairo,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<ProjectReference type="Project" localcopy="True" refto="LongoMatch.Core" />
- <ProjectReference type="Gac" localcopy="False" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="False" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Package" localcopy="False" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Package" localcopy="False" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Package" localcopy="False" refto="atk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
</References>
</Project>
\ No newline at end of file
diff --git a/LongoMatch.GUI.Helpers/LongoMatch.GUI.Helpers.mdp
b/LongoMatch.GUI.Helpers/LongoMatch.GUI.Helpers.mdp
index 9318b1f..b125c02 100644
--- a/LongoMatch.GUI.Helpers/LongoMatch.GUI.Helpers.mdp
+++ b/LongoMatch.GUI.Helpers/LongoMatch.GUI.Helpers.mdp
@@ -19,11 +19,12 @@
<File subtype="Code" buildaction="Compile" name="Misc.cs" />
</Contents>
<References>
- <ProjectReference type="Gac" localcopy="True" refto="System, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
- <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference specificVersion="False" type="Gac" localcopy="False" refto="Mono.Posix,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
- <ProjectReference type="Gac" localcopy="False" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Package" localcopy="True" refto="System, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
+ <ProjectReference type="Package" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Package" specificVersion="False" localcopy="False" refto="Mono.Posix,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+ <ProjectReference type="Package" localcopy="False" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Project" localcopy="True" refto="LongoMatch.Core" />
- <ProjectReference specificVersion="False" type="Gac" localcopy="False" refto="System.Drawing,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <ProjectReference type="Package" specificVersion="False" localcopy="False" refto="System.Drawing,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <ProjectReference type="Package" localcopy="False" refto="atk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
</References>
</Project>
\ No newline at end of file
diff --git a/LongoMatch.GUI.Multimedia/LongoMatch.GUI.Multimedia.mdp
b/LongoMatch.GUI.Multimedia/LongoMatch.GUI.Multimedia.mdp
index 958170a..814f60d 100644
--- a/LongoMatch.GUI.Multimedia/LongoMatch.GUI.Multimedia.mdp
+++ b/LongoMatch.GUI.Multimedia/LongoMatch.GUI.Multimedia.mdp
@@ -42,15 +42,16 @@
<ProjectRefVar Name="REFERENCES" />
</MonoDevelop.Autotools.MakefileInfo>
<References>
- <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Package" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Package" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Package" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Project" localcopy="True" refto="LongoMatch.Multimedia" />
<ProjectReference type="Project" localcopy="True" refto="LongoMatch.Core" />
- <ProjectReference type="Gac" localcopy="True" refto="System, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
- <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=0738eb9f132ed756" />
- <ProjectReference type="Gac" localcopy="True" refto="System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a" />
+ <ProjectReference type="Package" localcopy="True" refto="System, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
+ <ProjectReference type="Package" localcopy="True" refto="Mono.Posix, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=0738eb9f132ed756" />
+ <ProjectReference type="Package" localcopy="True" refto="System.Drawing, Version=4.0.0.0,
Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ProjectReference type="Project" localcopy="True" refto="LongoMatch.GUI.Helpers" />
+ <ProjectReference type="Package" localcopy="False" refto="atk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
</References>
<LanguageParameters ApplicationIcon="." CodePage="65001" ctype="CSharpProjectParameters" />
</Project>
\ No newline at end of file
diff --git a/LongoMatch.GUI/Gui/GUIToolkit.cs b/LongoMatch.GUI/Gui/GUIToolkit.cs
index 1e0963a..246ba2e 100644
--- a/LongoMatch.GUI/Gui/GUIToolkit.cs
+++ b/LongoMatch.GUI/Gui/GUIToolkit.cs
@@ -75,28 +75,28 @@ namespace LongoMatch.Gui
set;
}
- public void InfoMessage(string message, Widget parent=null) {
+ public void InfoMessage(string message, object parent=null) {
if (parent == null)
parent = mainWindow as Widget;
- MessagesHelpers.InfoMessage(parent, message);
+ MessagesHelpers.InfoMessage(parent as Widget, message);
}
- public void ErrorMessage(string message, Widget parent=null) {
+ public void ErrorMessage(string message, object parent=null) {
if (parent == null)
parent = mainWindow as Widget;
- MessagesHelpers.ErrorMessage (parent, message);
+ MessagesHelpers.ErrorMessage (parent as Widget, message);
}
- public void WarningMessage(string message, Widget parent=null) {
+ public void WarningMessage(string message, object parent=null) {
if (parent == null)
parent = mainWindow as Widget;
- MessagesHelpers.WarningMessage (parent, message);
+ MessagesHelpers.WarningMessage (parent as Widget, message);
}
- public bool QuestionMessage(string question, string title, Widget parent=null) {
+ public bool QuestionMessage(string question, string title, object parent=null) {
if (parent == null)
parent = mainWindow as Widget;
- return MessagesHelpers.QuestionMessage (parent, question, title);
+ return MessagesHelpers.QuestionMessage (parent as Widget, question, title);
}
public string SaveFile(string title, string defaultName, string defaultFolder,
diff --git a/LongoMatch.Services/LongoMatch.Services.mdp b/LongoMatch.Services/LongoMatch.Services.mdp
index 62e14af..89ae27f 100644
--- a/LongoMatch.Services/LongoMatch.Services.mdp
+++ b/LongoMatch.Services/LongoMatch.Services.mdp
@@ -33,12 +33,11 @@
<File subtype="Code" buildaction="Compile" name="Services/FileDB.cs" />
</Contents>
<References>
- <ProjectReference type="Gac" localcopy="True" refto="System, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
- <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=0738eb9f132ed756" />
+ <ProjectReference type="Package" localcopy="True" refto="System, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
+ <ProjectReference type="Package" localcopy="True" refto="Mono.Posix, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=0738eb9f132ed756" />
<ProjectReference type="Project" localcopy="True" refto="LongoMatch.Core" />
- <ProjectReference type="Gac" localcopy="True" refto="Db4objects.Db4o, Version=8.0.184.15484,
Culture=neutral, PublicKeyToken=6199cd4f203aa8eb" />
- <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference specificVersion="False" type="Gac" localcopy="False" refto="System.Core,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <ProjectReference type="Package" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Package" specificVersion="False" localcopy="False" refto="System.Core,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <ProjectReference type="Package" localcopy="False" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
</References>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/LongoMatch/LongoMatchGtk.mdp b/LongoMatch/LongoMatchGtk.mdp
index bd7cded..e9b4985 100644
--- a/LongoMatch/LongoMatchGtk.mdp
+++ b/LongoMatch/LongoMatchGtk.mdp
@@ -24,16 +24,17 @@
<File subtype="Code" buildaction="Compile" name="AssemblyInfo.cs" />
</Contents>
<References>
- <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Package" localcopy="True" refto="glib-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Package" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Project" localcopy="True" refto="LongoMatch.Services" />
<ProjectReference type="Project" localcopy="True" refto="LongoMatch.GUI" />
<ProjectReference type="Project" localcopy="True" refto="LongoMatch.Multimedia" />
- <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=0738eb9f132ed756" />
+ <ProjectReference type="Package" localcopy="True" refto="Mono.Posix, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=0738eb9f132ed756" />
<ProjectReference type="Project" localcopy="True" refto="LongoMatch.Core" />
<ProjectReference type="Project" localcopy="True" refto="LongoMatch.Addins" />
<ProjectReference type="Project" localcopy="True" refto="LongoMatch.GUI.Multimedia" />
<ProjectReference type="Project" localcopy="True" refto="LongoMatch.GUI.Helpers" />
<ProjectReference type="Project" localcopy="True" refto="LongoMatch.Drawing.Cairo" />
+ <ProjectReference type="Package" localcopy="False" refto="atk-sharp, Version=2.12.0.0, Culture=neutral,
PublicKeyToken=35e10195dab3c99f" />
</References>
</Project>
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
