gnome-subtitles r1093 - in trunk: . src/GnomeSubtitles/Core src/GnomeSubtitles/Execution
- From: pcastro svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-subtitles r1093 - in trunk: . src/GnomeSubtitles/Core src/GnomeSubtitles/Execution
- Date: Wed, 3 Dec 2008 19:36:22 +0000 (UTC)
Author: pcastro
Date: Wed Dec 3 19:36:22 2008
New Revision: 1093
URL: http://svn.gnome.org/viewvc/gnome-subtitles?rev=1093&view=rev
Log:
No longer uses/depends on gnome-sharp.
Modified:
trunk/configure.ac
trunk/gnome-subtitles.mdp
trunk/src/GnomeSubtitles/Core/Base.cs
trunk/src/GnomeSubtitles/Core/Util.cs
trunk/src/GnomeSubtitles/Execution/ (props changed)
trunk/src/GnomeSubtitles/Execution/BugReporter.cs
trunk/src/GnomeSubtitles/Execution/ExecutionContext.cs
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Dec 3 19:36:22 2008
@@ -68,7 +68,7 @@
AC_SUBST(gstreamer_LIBS)
PKG_CHECK_MODULES(MONO, mono >= $MONO_REQUIRED_VERSION)
-PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 glade-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
+PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
dnl Check gtk-sharp version
@@ -98,5 +98,6 @@
src/Makefile
src/GnomeSubtitles/Execution/AssemblyInfo.cs
src/GnomeSubtitles/Execution/gnome-subtitles
+src/GnomeSubtitles/Execution/ConfigureDefines.cs
help/Makefile
po/Makefile.in])
Modified: trunk/gnome-subtitles.mdp
==============================================================================
--- trunk/gnome-subtitles.mdp (original)
+++ trunk/gnome-subtitles.mdp Wed Dec 3 19:36:22 2008
@@ -138,11 +138,11 @@
<File name="src/External/GStreamerPlaybin/Events.cs" subtype="Code" buildaction="Compile" />
<File name="src/GnomeSubtitles/Ui/VideoPreview/Exceptions/PlayerEngineException.cs" subtype="Code" buildaction="Compile" />
<File name="src/GnomeSubtitles/Ui/VideoPreview/Exceptions/PlayerCouldNotInitiateEngineException.cs" subtype="Code" buildaction="Compile" />
+ <File name="src/GnomeSubtitles/Execution/ConfigureDefines.cs" subtype="Code" buildaction="Compile" />
</Contents>
<References>
<ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="glade-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="gnome-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
Modified: trunk/src/GnomeSubtitles/Core/Base.cs
==============================================================================
--- trunk/src/GnomeSubtitles/Core/Base.cs (original)
+++ trunk/src/GnomeSubtitles/Core/Base.cs Wed Dec 3 19:36:22 2008
@@ -115,18 +115,18 @@
throw new Exception("The Base environment was already initialized.");
ui.Start();
- executionContext.RunProgram();
+ executionContext.RunApplication();
}
/// <summary>Quits the program.</summary>
public static void Quit () {
- executionContext.QuitProgram();
+ executionContext.QuitApplication();
}
public static void Kill () {
clipboards.WatchPrimaryChanges = false;
- executionContext.QuitProgram();
ui.Kill();
+ executionContext.QuitApplication();
}
public static void CreateDocumentNew (string path) {
@@ -163,7 +163,7 @@
return false;
executionContext = newExecutionContext;
- executionContext.Init();
+ executionContext.InitApplication();
/* Initialize Command manager */
commandManager = new CommandManager();
@@ -180,7 +180,7 @@
/* Initialize the GUI */
ui = new MainUi(handlers, out glade);
clipboards.WatchPrimaryChanges = true;
- Catalog.Init(ExecutionContext.TranslationDomain, ExecutionContext.SystemShareLocaleDir);
+ Catalog.Init(ExecutionContext.TranslationDomain, ConfigureDefines.LocaleDir);
return true;
}
Modified: trunk/src/GnomeSubtitles/Core/Util.cs
==============================================================================
--- trunk/src/GnomeSubtitles/Core/Util.cs (original)
+++ trunk/src/GnomeSubtitles/Core/Util.cs Wed Dec 3 19:36:22 2008
@@ -19,7 +19,9 @@
using Gtk;
using System;
+using System.Diagnostics;
using System.Globalization;
+using System.Threading;
using SubLib.Core.Domain;
namespace GnomeSubtitles.Core {
@@ -114,15 +116,17 @@
return false;
try {
- Gnome.Url.Show(url);
+ Process process = Process.Start(url);
+ Thread.Sleep(250);
+ return (!process.HasExited);
}
- catch (Exception) { //Exceptions for Url.Show are not documented in the gtk-sharp api
+ catch (Exception) {
return false;
}
-
- return true;
}
+
+
public static bool OpenSendEmail (string email) {
return OpenUrl("mailto:" + email);
}
Modified: trunk/src/GnomeSubtitles/Execution/BugReporter.cs
==============================================================================
--- trunk/src/GnomeSubtitles/Execution/BugReporter.cs (original)
+++ trunk/src/GnomeSubtitles/Execution/BugReporter.cs Wed Dec 3 19:36:22 2008
@@ -65,7 +65,6 @@
return "Gnome Subtitles version: " + Base.ExecutionContext.Version + "\n"
+ "SubLib version: " + Base.ExecutionContext.SubLibVersion + "\n"
+ "GtkSharp version: " + Base.ExecutionContext.GtkSharpVersion + "\n"
- + "GnomeSharp version: " + Base.ExecutionContext.GnomeSharpVersion + "\n"
+ "GladeSharp version: " + Base.ExecutionContext.GladeSharpVersion + "\n"
+ "GConfSharp version: " + Base.ExecutionContext.GConfSharpVersion + "\n\n"
+ "Stack trace:" + "\n"
Modified: trunk/src/GnomeSubtitles/Execution/ExecutionContext.cs
==============================================================================
--- trunk/src/GnomeSubtitles/Execution/ExecutionContext.cs (original)
+++ trunk/src/GnomeSubtitles/Execution/ExecutionContext.cs Wed Dec 3 19:36:22 2008
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-using Gnome;
+using Gtk;
using System;
using System.IO;
using System.Reflection;
@@ -25,8 +25,8 @@
namespace GnomeSubtitles.Execution {
public class ExecutionContext {
- private Program program = null;
private bool initialized = false;
+ private bool running = false;
#region Constant strings
private const string applicationName = "Gnome Subtitles";
@@ -69,10 +69,6 @@
public string GtkSharpVersion {
get { return RemoveTrailingZeros(Assembly.Load("gtk-sharp").GetName().Version.ToString()); }
}
-
- public string GnomeSharpVersion {
- get { return RemoveTrailingZeros(Assembly.Load("gnome-sharp").GetName().Version.ToString()); }
- }
public string GladeSharpVersion {
get { return RemoveTrailingZeros(Assembly.Load("glade-sharp").GetName().Version.ToString()); }
@@ -87,33 +83,6 @@
set { args = value; }
}
- public string SystemShareDir {
- get {
- string path = program.LocateFile(FileDomain.Datadir, String.Empty, true, null);
- if ((path != null) && (path != String.Empty))
- return path;
- else
- return program.GnomeDatadir;
- }
- }
-
- public string SystemShareLocaleDir {
- get { return Path.Combine(SystemShareDir, "locale"); }
- }
-
- public string SystemHelpDir {
- get {
- string path = program.LocateFile(FileDomain.Help, applicationID, true, null);
- if ((path != null) && (path != String.Empty))
- return path;
- else {
- return Path.Combine(SystemShareDir,
- Path.Combine("gnome",
- Path.Combine("help", applicationID)));
- }
- }
- }
-
public string TranslationDomain {
get { return applicationID; }
}
@@ -122,17 +91,24 @@
#region Public methods
- public void Init () {
- program = new Program(applicationID, Version, Gnome.Modules.UI, args);
- initialized = true;
+ public void InitApplication () {
+ if (!initialized) {
+ initialized = true;
+ Application.Init();
+ }
}
- public void RunProgram () {
- program.Run();
+ public void RunApplication () {
+ if (initialized && (!running)) {
+ running = true;
+ Application.Run();
+ }
}
- public void QuitProgram () {
- program.Quit();
+ public void QuitApplication () {
+ initialized = false;
+ running = false;
+ Application.Quit();
}
#endregion
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]