Changeset 911


Ignore:
Timestamp:
4/28/2009 2:08:17 PM (4 years ago)
Author:
lowjoel
Message:

Removed the Guid parameter from the RegistrySettings? manager.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/eraser6/Eraser/Program.cs

    r905 r911  
    156156            System.Threading.Thread.CurrentThread.CurrentUICulture = 
    157157                new CultureInfo(settings.Language); 
    158             GUIProgram.SafeTopLevelCaptionFormat = S._("Eraser"); 
     158            Application.SafeTopLevelCaptionFormat = S._("Eraser"); 
    159159 
    160160            //Load the task list 
    … …  
    203203        /// </summary> 
    204204        /// <param name="sender">The sender of the event.</param> 
    205         private static void OnGUINextInstance(object sender) 
     205        /// <param name="message">The message from the source application.</param> 
     206        private static void OnGUINextInstance(object sender, string message) 
    206207        { 
    207208            //Another instance of the GUI Program has been started: show the main window 
    … …  
    213214            { 
    214215                program.MainForm.Invoke(new GUIProgram.NextInstanceFunction( 
    215                     OnGUINextInstance), new object[] { sender }); 
     216                    OnGUINextInstance), new object[] { sender, message }); 
    216217                return; 
    217218            } 
    … …  
    337338                    StringBuilder commandLineStr = new StringBuilder(commandLine.Length * 64); 
    338339                    foreach (string param in commandLine) 
    339                         commandLineStr.Append(string.Format("{0}\0", param)); 
     340                        commandLineStr.Append(string.Format( 
     341                            CultureInfo.InvariantCulture, "{0}\0", param)); 
    340342 
    341343                    byte[] buffer = new byte[commandLineStr.Length]; 
    … …  
    437439 
    438440        /// <summary> 
    439         /// Gets or sets the format string to apply to top-level window captions when 
    440         /// they are displayed with a warning banner. 
    441         /// </summary> 
    442         public static string SafeTopLevelCaptionFormat 
    443         { 
    444             get 
    445             { 
    446                 return Application.SafeTopLevelCaptionFormat; 
    447             } 
    448             set 
    449             { 
    450                 Application.SafeTopLevelCaptionFormat = value; 
    451             } 
    452         } 
    453  
    454         /// <summary> 
    455441        /// Gets the command line arguments this instance was started with. 
    456442        /// </summary> 
    … …  
    522508        /// </summary> 
    523509        /// <param name="sender">The sender of the event</param> 
    524         public delegate void NextInstanceFunction(object sender); 
     510        public delegate void NextInstanceFunction(object sender, string message); 
    525511 
    526512        /// <summary> 
    … …  
    538524        { 
    539525            if (NextInstance != null) 
    540                 NextInstance(sender); 
     526                NextInstance(sender, message); 
    541527        } 
    542528 
    … …  
    11761162            /// </summary> 
    11771163            /// <param name="key">The registry key to look for the settings in.</param> 
    1178             public RegistrySettings(Guid guid, RegistryKey key) 
     1164            public RegistrySettings(RegistryKey key) 
    11791165            { 
    11801166                this.key = key; 
    … …  
    12471233 
    12481234            //Return the Settings object. 
    1249             return new RegistrySettings(guid, pluginsKey); 
     1235            return new RegistrySettings(pluginsKey); 
    12501236        } 
    12511237    } 
Note: See TracChangeset for help on using the changeset viewer.