diff options
| author | Jeffrey Stedfast <jeff@xamarin.com> | 2012-01-11 23:36:16 +0400 |
|---|---|---|
| committer | Jeffrey Stedfast <jeff@xamarin.com> | 2012-01-14 01:13:12 +0400 |
| commit | 7dd62abe013b45a5e58e362096fc83b0bddb0d43 (patch) | |
| tree | 90c742c526857debcd3a5f5f940e149265714a0a | |
| parent | 515eb63a55032795a30d07cdf0369b9c7463a48a (diff) | |
[Ide] Fixed default viewer selection in FileSelectorDialog.
| -rw-r--r-- | main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs | 12 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs index c5296fa5b9..76d793c2ca 100644 --- a/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs +++ b/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs @@ -218,7 +218,7 @@ namespace MonoDevelop.MacIntegration if (System.IO.Directory.Exists (filename)) return; - int selected = 0; + int selected = -1; int i = 0; if (IdeApp.Services.ProjectService.IsWorkspaceItemFile (filename) || IdeApp.Services.ProjectService.IsSolutionItemFile (filename)) { @@ -228,6 +228,7 @@ namespace MonoDevelop.MacIntegration if (closeSolutionButton != null) closeSolutionButton.State = NSCellStateValue.On; + selected = 0; i++; } @@ -236,17 +237,16 @@ namespace MonoDevelop.MacIntegration button.Menu.AddItem (new NSMenuItem () { Title = vw.Title }); currentViewers.Add (vw); - if (vw.CanUseAsDefault) { - if (closeSolutionButton != null) - closeSolutionButton.State = NSCellStateValue.Off; - + if (vw.CanUseAsDefault && selected == -1) selected = i; - } i++; } } + if (selected == -1) + selected = 0; + button.Enabled = currentViewers.Count > 1; button.SelectItem (selected); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs index 24a598d76b..6862db91f6 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/FileSelectorDialog.cs @@ -209,7 +209,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs if (Filenames.Length == 0 || Filename.Length == 0 || System.IO.Directory.Exists (Filename)) return; - int selected = 0; + int selected = -1; int i = 0; if (IdeApp.Services.ProjectService.IsWorkspaceItemFile (Filename) || IdeApp.Services.ProjectService.IsSolutionItemFile (Filename)) { @@ -219,6 +219,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs if (closeWorkspaceCheck.Visible) closeWorkspaceCheck.Active = true; + selected = 0; i++; } @@ -227,17 +228,16 @@ namespace MonoDevelop.Ide.Gui.Dialogs viewerSelector.AppendText (vw.Title); currentViewers.Add (vw); - if (vw.CanUseAsDefault) { - if (closeWorkspaceCheck.Visible) - closeWorkspaceCheck.Active = false; - + if (vw.CanUseAsDefault && selected == -1) selected = i; - } i++; } } + if (selected == -1) + selected = 0; + viewerSelector.Active = selected; viewerLabel.Sensitive = viewerSelector.Sensitive = currentViewers.Count > 1; } |