Author: lluis
Date: 2008-01-23 14:05:58 -0500 (Wed, 23 Jan 2008)
New Revision: 93691
Modified:
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/ChangeLog
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Ide.cs
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml
Log:
2008-01-23 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Gui/Ide.cs: Initialize the resource service before
initializing the workbench.
2008-01-22 Zach Lute <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Gui/IdeStartup.cs: Added --newwindow option to force
MD to
open a new instance instead of passing to a running one. This option
is
forced if opening a combine from the commandline. (Bug #350361)
2008-01-22 Michael Hutchinson <[EMAIL PROTECTED]>
* MonoDevelop.Ide.addin.xml: Use GTK fullscreen icon (was added in 2.8).
2008-01-22 Michael Hutchinson <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Gui/Ide.cs: Force resource service to load so that it
registers GTK stock icons before the IDE loads. Fixes "Bug 353157 -
Many
toolbar icons aren't showing up".
2008-01-22 Michael Hutchinson <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs: Grammar
fix.
Modified: branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/ChangeLog
===================================================================
--- branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/ChangeLog
2008-01-23 18:58:42 UTC (rev 93690)
+++ branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/ChangeLog
2008-01-23 19:05:58 UTC (rev 93691)
@@ -1,3 +1,28 @@
+2008-01-23 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Gui/Ide.cs: Initialize the resource service before
+ initializing the workbench.
+
+2008-01-22 Zach Lute <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Gui/IdeStartup.cs: Added --newwindow option to force
MD to
+ open a new instance instead of passing to a running one. This option
is
+ forced if opening a combine from the commandline. (Bug #350361)
+
+2008-01-22 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.addin.xml: Use GTK fullscreen icon (was added in 2.8).
+
+2008-01-22 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Gui/Ide.cs: Force resource service to load so that it
+ registers GTK stock icons before the IDE loads. Fixes "Bug 353157 -
Many
+ toolbar icons aren't showing up".
+
+2008-01-22 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs: Grammar
fix.
+
2008-01-22 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs: If a project is
selected in
Modified:
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Ide.cs
===================================================================
---
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Ide.cs
2008-01-23 18:58:42 UTC (rev 93690)
+++
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Ide.cs
2008-01-23 19:05:58 UTC (rev 93691)
@@ -96,6 +96,9 @@
public static void Initialize (IProgressMonitor monitor)
{
+ //force the ResourceService to load so that it
registers stock icons
+ MonoDevelop.Core.Gui.Services.Resources.ToString ();
+
workbench = new Workbench ();
projectOperations = new ProjectOperations ();
helpOperations = new HelpOperations ();
Modified:
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs
===================================================================
---
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs
2008-01-23 18:58:42 UTC (rev 93690)
+++
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IdeStartup.cs
2008-01-23 19:05:58 UTC (rev 93691)
@@ -75,16 +75,29 @@
AddinManager.AddinLoadError += OnAddinError;
+ StartupInfo.SetCommandLineArgs (remainingArgs);
+
+ // If a combine was specified, force --newwindow.
+ if(!options.newwindow) {
+ foreach (string file in
StartupInfo.GetRequestedFileList ()) {
+ if
(MonoDevelop.Projects.Services.ProjectService.IsCombineEntryFile (file))
+ {
+ options.newwindow = true;
+ break;
+ }
+ }
+ }
+
if(!options.ipc_tcp){
socket_filename = "/tmp/md-" +
Environment.GetEnvironmentVariable ("USER") + "-socket";
listen_socket = new Socket (AddressFamily.Unix,
SocketType.Stream, ProtocolType.IP);
ep = new UnixEndPoint (socket_filename);
- // Connect to existing monodevelop and pass
filename(s) and exit
- if (remainingArgs.Length > 0 && File.Exists
(socket_filename)) {
+ // If not opening a combine, connect to
existing monodevelop and pass filename(s) and exit
+ if (!options.newwindow &&
StartupInfo.GetRequestedFileList ().Length > 0 && File.Exists
(socket_filename)) {
try {
listen_socket.Connect (ep);
- listen_socket.Send
(Encoding.UTF8.GetBytes (String.Join ("\n", remainingArgs)));
+ listen_socket.Send
(Encoding.UTF8.GetBytes (String.Join ("\n", StartupInfo.GetRequestedFileList
())));
return 0;
} catch {
// Reset the socket
@@ -120,9 +133,7 @@
return 1;
}
}
-
- StartupInfo.SetCommandLineArgs (remainingArgs);
-
+
IProgressMonitor monitor =
SplashScreenForm.SplashScreen;
if (!options.nologo) {
@@ -377,6 +388,9 @@
[Option ("Use the Tcp channel for inter-process comunication.",
"ipc-tcp")]
public bool ipc_tcp;
+
+ [Option ("Do not open in an existing instance of MonoDevelop")]
+ public bool newwindow;
}
public class AddinError
Modified:
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
===================================================================
---
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
2008-01-23 18:58:42 UTC (rev 93690)
+++
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
2008-01-23 19:05:58 UTC (rev 93691)
@@ -120,7 +120,7 @@
if (File.Exists (file)) {
if (!Services.MessageService.AskQuestion
(GettextCatalog.GetString (
- "File {0} already exists, do you want
to overwrite\nthe existing file?", file),
+ "File {0} already exists. Do you want
to overwrite\nthe existing file?", file),
GettextCatalog.GetString ("File already
exists"))) {
return null;
}
Modified:
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml
===================================================================
---
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml
2008-01-23 18:58:42 UTC (rev 93690)
+++
branches/monodevelop/main/1.0/src/core/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml
2008-01-23 19:05:58 UTC (rev 93691)
@@ -582,7 +582,7 @@
<Command id = "MonoDevelop.Ide.Commands.ViewCommands.FullScreen"
defaultHandler =
"MonoDevelop.Ide.Commands.FullScreenHandler"
_label = "_Full Screen"
- icon = "md-fullscreen"
+ icon = "gtk-fullscreen"
_description = "Full Screen" />
<Command id = "MonoDevelop.Ide.Commands.ViewCommands.Open"
_label = "Open" />
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
