diff options
author | Lluis Sanchez <lluis@novell.com> | 2009-08-18 17:03:46 +0400 |
---|---|---|
committer | Lluis Sanchez <lluis@novell.com> | 2009-08-18 17:03:46 +0400 |
commit | f75a22451998c0ee3e71b112b3db1760f6216420 (patch) | |
tree | 9b91b2640682585387b1cc71cd90bd91ba0b80d1 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting | |
parent | ae08b764e016cb481918c0600495938ec862e466 (diff) |
* MonoDevelop.Ide.Gui/Document.cs:
* MonoDevelop.Ide.Gui/RootWorkspace.cs:
* MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs:
* MonoDevelop.Ide.Gui.Dialogs/GoToDialog.cs:
* MonoDevelop.Ide.FindInFiles/FileProvider.cs:
* MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs:
* MonoDevelop.Ide.Gui/TextFileNavigationPoint.cs:
* MonoDevelop.Ide.FindInFiles/SearchResultPad.cs:
* MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:
* MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs:
* MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs:
* MonoDevelop.Ide.Gui.Dialogs/CustomExecutionModeDialog.cs:
* MonoDevelop.Ide.Gui.Dialogs/CustomExecutionModeWidget.cs:
* MonoDevelop.Ide.Gui.Dialogs/ConfirmProjectDeleteDialog.cs:
* MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionNodeBuilder.cs:
* MonoDevelop.Ide.Gui.Pads.ProjectPad/SolutionFolderNodeBuilder.cs:
* MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs:
Fix warnings.
* MonoDevelop.Ide.Templates/SolutionDescriptor.cs: Properly initialize
the startup item.
svn path=/trunk/monodevelop/; revision=140158
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting')
-rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs index f3cbbc4fb8..4b6f2a950c 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs @@ -91,13 +91,8 @@ namespace MonoDevelop.Ide.CodeFormatting cellRendererCombo.EditingStarted += delegate(object o, EditingStartedArgs args) { CodeFormatType type = description.GetCodeFormatType (settings, option); comboBoxStore.Clear (); - int active = 0, i = 0; - KeyValuePair<string, string> curValue = description.GetValue (settings, option); foreach (KeyValuePair<string, string> v in type.Values) { - if (v.Key == curValue.Key) - active = i; comboBoxStore.AppendValues (v.Key, GettextCatalog.GetString (v.Value)); - i++; } }; @@ -193,7 +188,7 @@ namespace MonoDevelop.Ide.CodeFormatting const int toggleVisibleColumn = 6; const int comboVisibleColumn = 7; - public T Settings { + public new T Settings { get { return settings; } @@ -249,25 +244,15 @@ namespace MonoDevelop.Ide.CodeFormatting this.store = model as TreeStore; if (option == null) { texteditor1.Document.Text = ""; -// comboboxentryValue.Sensitive = false; return; } -// ComboboxValue.Changed -= HandleChanged; -// comboboxentryValue.Sensitive = true; CodeFormatType type = description.GetCodeFormatType (settings, option); texteditor1.Document.Text = option.Example; comboBoxStore.Clear (); - int active = 0, i = 0; - KeyValuePair<string, string> curValue = description.GetValue (settings, option); foreach (KeyValuePair<string, string> v in type.Values) { - if (v.Key == curValue.Key) - active = i; comboBoxStore.AppendValues (v.Key, GettextCatalog.GetString (v.Value)); - i++; } - // ComboboxValue.Active = active; - // ComboboxValue.Changed += HandleChanged; UpdateExample (); } } |