Author: mhutch
Date: 2007-12-06 20:27:41 -0500 (Thu, 06 Dec 2007)
New Revision: 90882
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.BrowserDisplayBinding/BrowserDisplayBinding.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.BrowserDisplayBinding/HtmlViewPane.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/TextEditorProperties.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DisplayBindingService.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
Log:
2007-12-06 Geoff Norton <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Gui/DisplayBindingService.cs:
* MonoDevelop.Ide.Gui/IdeStartup.cs:
* MonoDevelop.Ide.Gui/Workbench.cs:
* MonoDevelop.Ide.Gui.BrowserDisplayBinding/HtmlViewPane.cs:
* MonoDevelop.Ide.Gui.Content/TextEditorProperties.cs:
* MonoDevelop.Ide.Templates/FileTemplate.cs: Access Font/Vfs/Mime
information
from the PlatformService instead of Gnome directly.
* MonoDevelop.Ide.Gui/IdeStartup.cs: Call Gtk.Application.Init so we can
remove the dependency on Gnome.Program.
Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog 2007-12-07
01:26:52 UTC (rev 90881)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog 2007-12-07
01:27:41 UTC (rev 90882)
@@ -1,3 +1,15 @@
+2007-12-06 Geoff Norton <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Gui/DisplayBindingService.cs:
+ * MonoDevelop.Ide.Gui/IdeStartup.cs:
+ * MonoDevelop.Ide.Gui/Workbench.cs:
+ * MonoDevelop.Ide.Gui.BrowserDisplayBinding/HtmlViewPane.cs:
+ * MonoDevelop.Ide.Gui.Content/TextEditorProperties.cs:
+ * MonoDevelop.Ide.Templates/FileTemplate.cs: Access Font/Vfs/Mime
information
+ from the PlatformService instead of Gnome directly.
+ * MonoDevelop.Ide.Gui/IdeStartup.cs: Call Gtk.Application.Init so we can
+ remove the dependency on Gnome.Program.
+
2007-12-04 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Ide.mdp, Makefile.am: Directory reorganization.
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DisplayBindingService.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DisplayBindingService.cs
2007-12-07 01:26:52 UTC (rev 90881)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DisplayBindingService.cs
2007-12-07 01:27:41 UTC (rev 90882)
@@ -89,7 +89,7 @@
vfsname = vfsname.Replace ("%", "%25");
vfsname = vfsname.Replace ("#", "%23");
vfsname = vfsname.Replace ("?", "%3F");
- string mimetype = Gnome.Vfs.MimeType.GetMimeTypeForUri
(vfsname);
+ string mimetype =
Runtime.PlatformService.GetMimeTypeForUri (vfsname);
foreach (DisplayBindingCodon binding in bindings) {
if (binding.DisplayBinding != null &&
binding.DisplayBinding.CanCreateContentForFile(filename)) {
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs
2007-12-07 01:26:52 UTC (rev 90881)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs
2007-12-07 01:27:41 UTC (rev 90882)
@@ -63,7 +63,8 @@
{
SetupExceptionManager ();
- Gnome.Vfs.Vfs.Initialize ();
+ //OSXFIXME
+ Gtk.Application.Init ();
InternalLog.Initialize ();
MonoDevelopOptions options = new MonoDevelopOptions ();
options.ProcessArgs (args);
@@ -100,7 +101,7 @@
version += "." + Assembly.GetEntryAssembly
().GetName ().Version.Revision;
try {
- new Gnome.Program (name, version,
Gnome.Modules.UI, remainingArgs);
+ // When we loose Gnome.Program what should we
do here?
} catch (Exception ex) {
string msg = GettextCatalog.GetString
("MonoDevelop failed to start.\nIf you installed MonoDevelop using a binary
installer, take a look at \nhttp://www.mono-project.com/InstallerInstructions
for more info about possible\ncauses of this error.");
Console.WriteLine (new string ('#',70));
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
2007-12-07 01:26:52 UTC (rev 90881)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs
2007-12-07 01:27:41 UTC (rev 90882)
@@ -286,7 +286,7 @@
{
List<FileViewer> list = new List<FileViewer> ();
- string mimeType = Gnome.Vfs.MimeType.GetMimeTypeForUri
(fileName);
+ string mimeType =
Runtime.PlatformService.GetMimeTypeForUri (fileName);
IDisplayBinding[] bindings =
DisplayBindings.GetBindingsForMimeType (mimeType);
foreach (IDisplayBinding bin in bindings)
@@ -662,7 +662,7 @@
//if (mimetype != null) {
//
mimetype.DefaultAction.Launch ();
//} else {
- Gnome.Url.Show
("file://" + fileName);
+
Runtime.PlatformService.ShowUrl ("file://" + fileName);
//}
} catch {
LoadFileWrapper fw = new
LoadFileWrapper (workbench, DisplayBindings.LastBinding, null, oFileInfo);
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.BrowserDisplayBinding/BrowserDisplayBinding.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.BrowserDisplayBinding/BrowserDisplayBinding.cs
2007-12-07 01:26:52 UTC (rev 90881)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.BrowserDisplayBinding/BrowserDisplayBinding.cs
2007-12-07 01:27:41 UTC (rev 90882)
@@ -67,7 +67,7 @@
if (filename == null)
return false;
- string mimetype = Gnome.Vfs.MimeType.GetMimeTypeForUri
(filename);
+ string mimetype =
Runtime.PlatformService.GetMimeTypeForUri (filename);
if (mimetype == "text/html" || mimetype ==
"application/x-mozilla-bookmarks")
return parent.GetContent
(typeof(MonoDevelop.Ide.Gui.Content.ITextBuffer)) != null;
return false;
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.BrowserDisplayBinding/HtmlViewPane.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.BrowserDisplayBinding/HtmlViewPane.cs
2007-12-07 01:26:52 UTC (rev 90881)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.BrowserDisplayBinding/HtmlViewPane.cs
2007-12-07 01:27:41 UTC (rev 90882)
@@ -114,7 +114,7 @@
void CatchUri (object sender, LocationChangingEventArgs e)
{
e.SuppressChange = true;
- Gnome.Url.Show (e.NextLocation);
+ Runtime.PlatformService.ShowUrl (e.NextLocation);
}
public BrowserPane () : this (true)
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/TextEditorProperties.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/TextEditorProperties.cs
2007-12-07 01:26:52 UTC (rev 90881)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/TextEditorProperties.cs
2007-12-07 01:27:41 UTC (rev 90882)
@@ -370,8 +370,11 @@
switch (s) {
case "__default_monospace":
try {
- return
FontDescription.FromString ((string) new GConf.Client ().Get
("/desktop/gnome/interface/monospace_font_name"));
- } catch {
+ string fontName =
Runtime.PlatformService.DefaultMonospaceFont;
+ System.Console.WriteLine
(fontName);
+ return
FontDescription.FromString (fontName);
+ } catch (Exception ex) {
+ LoggingService.LogWarning
("Could not load platform's default monospace font.", ex);
goto case "__default_sans";
}
case "__default_sans":
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
2007-12-07 01:26:52 UTC (rev 90881)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
2007-12-07 01:27:41 UTC (rev 90882)
@@ -346,7 +346,7 @@
while (File.Exists (fn + n + ext))
n++;
FileService.MoveFile (fn, fn + n + ext);
- string mimeType =
Gnome.Vfs.MimeType.GetMimeTypeForUri (fn + n + ext);
+ string mimeType =
Runtime.PlatformService.GetMimeTypeForUri (fn + n + ext);
FileService.DeleteFile (fn + n + ext);
if (mimeType == null || mimeType == "")
mimeType = "text";
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
