@@ -36,7 +36,7 @@ namespace GitCommands } } - #region Colors + #region Colors private static Color otherTagColor = Color.Gray; public static Color OtherTagColor @@ -155,7 +155,7 @@ namespace GitCommands } } - #endregion + #endregion private static Encoding encoding = Encoding.UTF8; public static Encoding Encoding { @@ -337,12 +337,12 @@ namespace GitCommands private static string gitDir = ""; - public static string GitDir + public static string GitDir { get { return gitDir; -} + } set { gitDir = value; @@ -515,17 +515,23 @@ namespace GitCommands Application.UserAppDataRegistry.SetValue("dir" + n.ToString(), RepositoryHistory.MostRecentRepositories[n]); } - if (Settings.Encoding.GetType() == typeof(UTF7Encoding)) - Application.UserAppDataRegistry.SetValue("encoding", "UTF7"); + if (Settings.Encoding.GetType() == typeof(ASCIIEncoding)) + Application.UserAppDataRegistry.SetValue("encoding", "ASCII"); else - if (Settings.Encoding.GetType() == typeof(UTF8Encoding)) - Application.UserAppDataRegistry.SetValue("encoding", "UTF8"); + if (Settings.Encoding.GetType() == typeof(UnicodeEncoding)) + Application.UserAppDataRegistry.SetValue("encoding", "Unicode"); else - if (Settings.Encoding.GetType() == typeof(UTF32Encoding)) - Application.UserAppDataRegistry.SetValue("encoding", "UTF32"); + if (Settings.Encoding.GetType() == typeof(UTF7Encoding)) + Application.UserAppDataRegistry.SetValue("encoding", "UTF7"); else - if (Settings.Encoding == System.Text.Encoding.Default) - Application.UserAppDataRegistry.SetValue("encoding", "Default"); + if (Settings.Encoding.GetType() == typeof(UTF8Encoding)) + Application.UserAppDataRegistry.SetValue("encoding", "UTF8"); + else + if (Settings.Encoding.GetType() == typeof(UTF32Encoding)) + Application.UserAppDataRegistry.SetValue("encoding", "UTF32"); + else + if (Settings.Encoding == System.Text.Encoding.Default) + Application.UserAppDataRegistry.SetValue("encoding", "Default"); Application.UserAppDataRegistry.SetValue("diffaddedcolor", System.Drawing.ColorTranslator.ToHtml(Settings.DiffAddedColor)); Application.UserAppDataRegistry.SetValue("diffremovedcolor", System.Drawing.ColorTranslator.ToHtml(Settings.DiffRemovedColor)); @@ -590,13 +596,19 @@ namespace GitCommands if (encoding.Equals("Default", StringComparison.CurrentCultureIgnoreCase)) Settings.Encoding = System.Text.Encoding.Default; else - if (encoding.Equals("UTF7", StringComparison.CurrentCultureIgnoreCase)) - Settings.Encoding = new UTF7Encoding(); + if (encoding.Equals("Unicode", StringComparison.CurrentCultureIgnoreCase)) + Settings.Encoding = new UnicodeEncoding(); else - if (encoding.Equals("UTF32", StringComparison.CurrentCultureIgnoreCase)) - Settings.Encoding = new UTF32Encoding(true, false); + if (encoding.Equals("ASCII", StringComparison.CurrentCultureIgnoreCase)) + Settings.Encoding = new ASCIIEncoding(); else - Settings.Encoding = new UTF8Encoding(false); + if (encoding.Equals("UTF7", StringComparison.CurrentCultureIgnoreCase)) + Settings.Encoding = new UTF7Encoding(); + else + if (encoding.Equals("UTF32", StringComparison.CurrentCultureIgnoreCase)) + Settings.Encoding = new UTF32Encoding(true, false); + else + Settings.Encoding = new UTF8Encoding(false); try { GitCommands/GitCommands/Settings.cs @@ -30,6 +30,7 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormSettings)); this.LocalSettings = new System.Windows.Forms.TabPage(); + this.label30 = new System.Windows.Forms.Label(); this.lblLocalAutoCRLF = new System.Windows.Forms.Label(); this.LocalAutoCRLF = new System.Windows.Forms.ComboBox(); this.InvalidGitPathLocal = new System.Windows.Forms.Panel(); @@ -61,6 +62,11 @@ this.ShellExtensionsRegistered = new System.Windows.Forms.Button(); this.GitExtensionsInstall = new System.Windows.Forms.Button(); this.TabPageGitExtensions = new System.Windows.Forms.TabPage(); + this.label39 = new System.Windows.Forms.Label(); + this.label38 = new System.Windows.Forms.Label(); + this.label37 = new System.Windows.Forms.Label(); + this.label35 = new System.Windows.Forms.Label(); + this.label34 = new System.Windows.Forms.Label(); this.EncodingLabel = new System.Windows.Forms.Label(); this.Encoding = new System.Windows.Forms.ComboBox(); this.Dictionary = new System.Windows.Forms.ComboBox(); @@ -100,6 +106,7 @@ this.label29 = new System.Windows.Forms.Label(); this.ColorAddedLineLabel = new System.Windows.Forms.Label(); this.GlobalSettingsPage = new System.Windows.Forms.TabPage(); + this.label28 = new System.Windows.Forms.Label(); this.lblGlobalAutoCRLF = new System.Windows.Forms.Label(); this.GlobalAutoCRLF = new System.Windows.Forms.ComboBox(); this.InvalidGitPathGlobal = new System.Windows.Forms.Panel(); @@ -145,13 +152,6 @@ this.directorySearcher2 = new System.DirectoryServices.DirectorySearcher(); this.label10 = new System.Windows.Forms.Label(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.label28 = new System.Windows.Forms.Label(); - this.label30 = new System.Windows.Forms.Label(); - this.label34 = new System.Windows.Forms.Label(); - this.label35 = new System.Windows.Forms.Label(); - this.label37 = new System.Windows.Forms.Label(); - this.label38 = new System.Windows.Forms.Label(); - this.label39 = new System.Windows.Forms.Label(); this.LocalSettings.SuspendLayout(); this.InvalidGitPathLocal.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); @@ -199,6 +199,15 @@ this.LocalSettings.Text = "Local settings"; this.LocalSettings.UseVisualStyleBackColor = true; // + // label30 + // + this.label30.AutoSize = true; + this.label30.Location = new System.Drawing.Point(8, 127); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(156, 13); + this.label30.TabIndex = 23; + this.label30.Text = "Keep backup (.orig) after merge"; + // // lblLocalAutoCRLF // this.lblLocalAutoCRLF.AutoSize = true; @@ -576,6 +585,51 @@ this.TabPageGitExtensions.UseVisualStyleBackColor = true; this.TabPageGitExtensions.Click += new System.EventHandler(this.TabPageGitExtensions_Click); // + // label39 + // + this.label39.AutoSize = true; + this.label39.Location = new System.Drawing.Point(8, 263); + this.label39.Name = "label39"; + this.label39.Size = new System.Drawing.Size(184, 13); + this.label39.TabIndex = 25; + this.label39.Text = "Show relative date instead of full date"; + // + // label38 + // + this.label38.AutoSize = true; + this.label38.Location = new System.Drawing.Point(8, 240); + this.label38.Name = "label38"; + this.label38.Size = new System.Drawing.Size(256, 13); + this.label38.TabIndex = 24; + this.label38.Text = "Use FileSystemWatcher to check if index is changed"; + // + // label37 + // + this.label37.AutoSize = true; + this.label37.Location = new System.Drawing.Point(8, 218); + this.label37.Name = "label37"; + this.label37.Size = new System.Drawing.Size(167, 13); + this.label37.TabIndex = 23; + this.label37.Text = "Show revision graph in commit log"; + // + // label35 + // + this.label35.AutoSize = true; + this.label35.Location = new System.Drawing.Point(8, 197); + this.label35.Name = "label35"; + this.label35.Size = new System.Drawing.Size(264, 13); + this.label35.TabIndex = 22; + this.label35.Text = "Show Git commandline dialog when executing process"; + // + // label34 + // + this.label34.AutoSize = true; + this.label34.Location = new System.Drawing.Point(8, 175); + this.label34.Name = "label34"; + this.label34.Size = new System.Drawing.Size(295, 13); + this.label34.TabIndex = 21; + this.label34.Text = "Close process dialog automaticly when process is succeeded"; + // // EncodingLabel // this.EncodingLabel.AutoSize = true; @@ -591,6 +645,7 @@ this.Encoding.Items.AddRange(new object[] { "Default", "ASCII", + "Unicode", "UTF7", "UTF8", "UTF32"}); @@ -1029,6 +1084,15 @@ this.GlobalSettingsPage.Text = "Global settings"; this.GlobalSettingsPage.UseVisualStyleBackColor = true; // + // label28 + // + this.label28.AutoSize = true; + this.label28.Location = new System.Drawing.Point(10, 179); + this.label28.Name = "label28"; + this.label28.Size = new System.Drawing.Size(156, 13); + this.label28.TabIndex = 22; + this.label28.Text = "Keep backup (.orig) after merge"; + // // lblGlobalAutoCRLF // this.lblGlobalAutoCRLF.AutoSize = true; @@ -1489,69 +1553,6 @@ this.pictureBox2.TabIndex = 18; this.pictureBox2.TabStop = false; // - // label28 - // - this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(10, 179); - this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(156, 13); - this.label28.TabIndex = 22; - this.label28.Text = "Keep backup (.orig) after merge"; - // - // label30 - // - this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(8, 127); - this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(156, 13); - this.label30.TabIndex = 23; - this.label30.Text = "Keep backup (.orig) after merge"; - // - // label34 - // - this.label34.AutoSize = true; - this.label34.Location = new System.Drawing.Point(8, 175); - this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(295, 13); - this.label34.TabIndex = 21; - this.label34.Text = "Close process dialog automaticly when process is succeeded"; - // - // label35 - // - this.label35.AutoSize = true; - this.label35.Location = new System.Drawing.Point(8, 197); - this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(264, 13); - this.label35.TabIndex = 22; - this.label35.Text = "Show Git commandline dialog when executing process"; - // - // label37 - // - this.label37.AutoSize = true; - this.label37.Location = new System.Drawing.Point(8, 218); - this.label37.Name = "label37"; - this.label37.Size = new System.Drawing.Size(167, 13); - this.label37.TabIndex = 23; - this.label37.Text = "Show revision graph in commit log"; - // - // label38 - // - this.label38.AutoSize = true; - this.label38.Location = new System.Drawing.Point(8, 240); - this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(256, 13); - this.label38.TabIndex = 24; - this.label38.Text = "Use FileSystemWatcher to check if index is changed"; - // - // label39 - // - this.label39.AutoSize = true; - this.label39.Location = new System.Drawing.Point(8, 263); - this.label39.Name = "label39"; - this.label39.Size = new System.Drawing.Size(184, 13); - this.label39.TabIndex = 25; - this.label39.Text = "Show relative date instead of full date"; - // // FormSettings // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); GitUI/FormSettings.Designer.cs @@ -24,7 +24,7 @@ namespace GitUI public static bool AutoSolveAllSettings() { - return SolveGitCmdDir() && + return SolveGitCmdDir() && SolveGitBinDir() && SolveKDiff() && SolveGitExtensionsDir(); @@ -37,51 +37,57 @@ namespace GitUI if (str == "true") checkBox.CheckState = CheckState.Checked; else - if (str == "false") - checkBox.CheckState = CheckState.Unchecked; - else - checkBox.CheckState = CheckState.Indeterminate; + if (str == "false") + checkBox.CheckState = CheckState.Unchecked; + else + checkBox.CheckState = CheckState.Indeterminate; } - private static void SetComboBoxFromString(ComboBox comboBox, string option) - { - option = option.Trim().ToLower(); + private static void SetComboBoxFromString(ComboBox comboBox, string option) + { + option = option.Trim().ToLower(); - switch (option) - { - case "true": - comboBox.SelectedItem = option; - break; - - case "false": - comboBox.SelectedItem = option; - break; + switch (option) + { + case "true": + comboBox.SelectedItem = option; + break; - case "input": - comboBox.SelectedItem = option; - break; + case "false": + comboBox.SelectedItem = option; + break; + + case "input": + comboBox.SelectedItem = option; + break; - default: + default: comboBox.SelectedItem = ""; break; - } - } + } + } private void LoadSettings() { try { - if (GitCommands.Settings.Encoding.GetType() == typeof(UTF7Encoding)) - Encoding.Text = "UTF7"; + if (GitCommands.Settings.Encoding.GetType() == typeof(ASCIIEncoding)) + Encoding.Text = "ASCII"; + else + if (GitCommands.Settings.Encoding.GetType() == typeof(UnicodeEncoding)) + Encoding.Text = "Unicode"; else - if (GitCommands.Settings.Encoding.GetType() == typeof(UTF8Encoding)) - Encoding.Text = "UTF8"; + if (GitCommands.Settings.Encoding.GetType() == typeof(UTF7Encoding)) + Encoding.Text = "UTF7"; else - if (GitCommands.Settings.Encoding.GetType() == typeof(UTF32Encoding)) - Encoding.Text = "UTF32"; - else - if (GitCommands.Settings.Encoding == System.Text.Encoding.Default) - Encoding.Text = "Default"; + if (GitCommands.Settings.Encoding.GetType() == typeof(UTF8Encoding)) + Encoding.Text = "UTF8"; + else + if (GitCommands.Settings.Encoding.GetType() == typeof(UTF32Encoding)) + Encoding.Text = "UTF32"; + else + if (GitCommands.Settings.Encoding == System.Text.Encoding.Default) + Encoding.Text = "Default"; RevisionGraphColorLabel.BackColor = Settings.RevisionGraphColor; RevisionGraphColorLabel.Text = Settings.RevisionGraphColor.Name; @@ -215,16 +221,22 @@ namespace GitUI if (string.IsNullOrEmpty(Encoding.Text) || Encoding.Text.Equals("Default", StringComparison.CurrentCultureIgnoreCase)) GitCommands.Settings.Encoding = System.Text.Encoding.Default; else - if (Encoding.Text.Equals("UTF7", StringComparison.CurrentCultureIgnoreCase)) - GitCommands.Settings.Encoding = new UTF7Encoding(); - else - if (Encoding.Text.Equals("UTF8", StringComparison.CurrentCultureIgnoreCase)) - GitCommands.Settings.Encoding = new UTF8Encoding(false); - else - if (Encoding.Text.Equals("UTF32", StringComparison.CurrentCultureIgnoreCase)) - GitCommands.Settings.Encoding = new UTF32Encoding(true, false); - else - GitCommands.Settings.Encoding = System.Text.Encoding.Default; + if (Encoding.Text.Equals("ASCII", StringComparison.CurrentCultureIgnoreCase)) + GitCommands.Settings.Encoding = new ASCIIEncoding(); + else + if (Encoding.Text.Equals("Unicode", StringComparison.CurrentCultureIgnoreCase)) + GitCommands.Settings.Encoding = new UnicodeEncoding(); + else + if (Encoding.Text.Equals("UTF7", StringComparison.CurrentCultureIgnoreCase)) + GitCommands.Settings.Encoding = new UTF7Encoding(); + else + if (Encoding.Text.Equals("UTF8", StringComparison.CurrentCultureIgnoreCase)) + GitCommands.Settings.Encoding = new UTF8Encoding(false); + else + if (Encoding.Text.Equals("UTF32", StringComparison.CurrentCultureIgnoreCase)) + GitCommands.Settings.Encoding = new UTF32Encoding(true, false); + else + GitCommands.Settings.Encoding = System.Text.Encoding.Default; Settings.RevisionGraphColor = RevisionGraphColorLabel.BackColor; Settings.RevisionGraphColorSelected = RevisionGraphColorSelected.BackColor; @@ -236,7 +248,7 @@ namespace GitUI Settings.DiffAddedColor = ColorAddedLineLabel.BackColor; Settings.DiffRemovedColor = ColorRemovedLine.BackColor; Settings.DiffSectionColor = ColorSectionLabel.BackColor; - + EnableSettings(); if (!CanFindGitCmd()) @@ -262,7 +274,7 @@ namespace GitUI if (KeepMergeBackup.CheckState == CheckState.Unchecked) GitCommands.GitCommands.SetSetting("mergetool.keepBackup", "false"); - GitCommands.GitCommands.SetSetting("core.autocrlf", LocalAutoCRLF.SelectedItem as string); + GitCommands.GitCommands.SetSetting("core.autocrlf", LocalAutoCRLF.SelectedItem as string); if (string.IsNullOrEmpty(GlobalUserName.Text) || !GlobalUserName.Text.Equals(gitCommands.GetGlobalSetting("user.name"))) gitCommands.SetGlobalSetting("user.name", GlobalUserName.Text); @@ -282,15 +294,15 @@ namespace GitUI if (GlobalKeepMergeBackup.CheckState == CheckState.Unchecked) gitCommands.SetGlobalSetting("mergetool.keepBackup", "false"); - gitCommands.SetGlobalSetting("core.autocrlf", GlobalAutoCRLF.SelectedItem as string); + gitCommands.SetGlobalSetting("core.autocrlf", GlobalAutoCRLF.SelectedItem as string); } if (OpenSSH.Checked) GitCommands.GitCommands.UnSetSsh(); - + if (Putty.Checked) GitCommands.GitCommands.SetSsh(PlinkPath.Text); - + if (Other.Checked) GitCommands.GitCommands.SetSsh(OtherSsh.Text); @@ -341,14 +353,14 @@ namespace GitUI { string reg; value = value.Replace("\\", "\\\\"); - reg = "Windows Registry Editor Version 5.00"+ Environment.NewLine+Environment.NewLine+"[" + root.ToString() + "\\" + subkey + "]" + Environment.NewLine + "\"" + key + "\"=\"" + value + "\""; + reg = "Windows Registry Editor Version 5.00" + Environment.NewLine + Environment.NewLine + "[" + root.ToString() + "\\" + subkey + "]" + Environment.NewLine + "\"" + key + "\"=\"" + value + "\""; TextWriter tw = new StreamWriter(System.IO.Path.GetTempPath() + "GitExtensions.reg", false); tw.Write(reg); tw.Close(); GitCommands.GitCommands.RunCmd("regedit", "\"" + System.IO.Path.GetTempPath() + "GitExtensions.reg" + "\""); } - catch(UnauthorizedAccessException ex) + catch (UnauthorizedAccessException ex) { MessageBox.Show("GitExtensions has insufficient permisions to modify the registry." + Environment.NewLine + "Please add this key to the registry manually." + Environment.NewLine + "Path: " + root.ToString() + "\\" + subkey + Environment.NewLine + "Value: " + key + " = " + value); } @@ -553,13 +565,13 @@ namespace GitUI if (File.Exists(GitCommands.Settings.GetInstallDir() + "\\GitExtensionsShellEx.dll")) GitCommands.GitCommands.RunCmd("regsvr32", "\"" + GitCommands.Settings.GetInstallDir() + "\\GitExtensionsShellEx.dll\""); else - { - string fileName = Assembly.GetAssembly(GetType()).Location; - fileName = fileName.Substring(0, fileName.LastIndexOfAny(new char[] { '\\', '/' })) + "\\GitExtensionsShellEx.dll"; + { + string fileName = Assembly.GetAssembly(GetType()).Location; + fileName = fileName.Substring(0, fileName.LastIndexOfAny(new char[] { '\\', '/' })) + "\\GitExtensionsShellEx.dll"; - if (File.Exists(fileName)) - GitCommands.GitCommands.RunCmd("regsvr32", "\"" + fileName + "\""); - } + if (File.Exists(fileName)) + GitCommands.GitCommands.RunCmd("regsvr32", "\"" + fileName + "\""); + } CheckSettings(); } @@ -590,13 +602,14 @@ namespace GitUI if (gitCommands.GetGlobalSetting("merge.tool").Equals("kdiff3", StringComparison.CurrentCultureIgnoreCase)) { SolveKDiffPath(gitCommands); - } else - if (gitCommands.GetGlobalSetting("merge.tool").Equals("p4merge", StringComparison.CurrentCultureIgnoreCase) || - gitCommands.GetGlobalSetting("merge.tool").Equals("TortoiseMerge", StringComparison.CurrentCultureIgnoreCase)) - { - AutoConfigMergeToolcmd(); - gitCommands.SetGlobalSetting("mergetool." + gitCommands.GetGlobalSetting("merge.tool") + ".cmd", MergeToolCmd.Text); } + else + if (gitCommands.GetGlobalSetting("merge.tool").Equals("p4merge", StringComparison.CurrentCultureIgnoreCase) || + gitCommands.GetGlobalSetting("merge.tool").Equals("TortoiseMerge", StringComparison.CurrentCultureIgnoreCase)) + { + AutoConfigMergeToolcmd(); + gitCommands.SetGlobalSetting("mergetool." + gitCommands.GetGlobalSetting("merge.tool") + ".cmd", MergeToolCmd.Text); + } if (gitCommands.GetGlobalSetting("merge.tool").Equals("kdiff3", StringComparison.CurrentCultureIgnoreCase) && string.IsNullOrEmpty(gitCommands.GetGlobalSetting("mergetool.kdiff3.path"))) @@ -605,7 +618,7 @@ namespace GitUI tabControl1.SelectTab("GlobalSettingsPage"); return; } - + Rescan_Click(null, null); } @@ -717,7 +730,7 @@ namespace GitUI Editor.Enabled = valid; MergeTool.Enabled = valid; KeepMergeBackup.Enabled = valid; - LocalAutoCRLF.Enabled = valid; + LocalAutoCRLF.Enabled = valid; NoGitRepo.Visible = !valid; } @@ -855,7 +868,7 @@ namespace GitUI File.Exists(PuttygenPath.Text) && File.Exists(PlinkPath.Text)) return true; - else + else return false; } @@ -1030,7 +1043,7 @@ namespace GitUI MergetoolPath.Text = ""; if (string.IsNullOrEmpty(MergetoolPath.Text) || !File.Exists(MergetoolPath.Text)) { - MergetoolPath.Text = FindFileInFolders("Compare.exe", + MergetoolPath.Text = FindFileInFolders("Compare.exe", @"C:\Program Files (x86)\Araxis\Araxis Merge\", @"C:\Program Files\Araxis\Araxis Merge\"); @@ -1091,7 +1104,7 @@ namespace GitUI ///m /r=%merged /t1=%yname /t2=%bname /t3=%tname /c=%mname %mine %base %theirs MergeToolCmd.Text = "\"" + MergetoolPath.Text + "\" /m /r=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\""; return; - } + } } private void GlobalMergeTool_SelectedIndexChanged(object sender, EventArgs e) GitUI/FormSettings.cs @@ -14,6 +14,7 @@ Version 1.79 Delete commit message after succesful commit. Added waitcursor to FormResolveConflicts. Set width to submodules submenu and recent repositories submenu. + Added F3 and Shift+F3 to code dialog. Version 1.78 Fixed bug causing the commitmessage to contain encoding marker bytes GitUI/Resources/ChangeLog.txt d59cade8161731334545a2f0d7e38e1d3799a130 Henk Westhuis Henk_Westhuis@hotmail.com http://github.com/spdr870/gitextensions/commit/db82226b02c192aa9dbb2d0d8a59d2a8b41bb951 db82226b02c192aa9dbb2d0d8a59d2a8b41bb951 2009-11-03T10:32:47-08:00 2009-11-03T10:32:47-08:00 Added Unicode and ASCII encodings 04593ff3a2b75058b36382525676d236c4f5ad83 Henk Westhuis Henk_Westhuis@hotmail.com