Browse Source

fix text in scope ComboBox

pull/59/merge
Siegfried Pammer 12 years ago
parent
commit
71c7f52105
  1. 2
      src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs
  2. 4
      src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs
  3. 3
      src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPadCommands.cs

2
src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs

@ -103,7 +103,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -103,7 +103,7 @@ namespace ICSharpCode.SharpDevelop.Gui
errorView.ItemsSource = errors;
errorView.MouseDoubleClick += ErrorViewMouseDoubleClick;
errorView.Style = (Style)new TaskViewResources()["TaskListView"];
errorView.ContextMenu = MenuService.CreateContextMenu(errorView, DefaultContextMenuAddInTreeEntry);
errorView.ContextMenu = MenuService.CreateContextMenu(this, DefaultContextMenuAddInTreeEntry);
errors.CollectionChanged += delegate { MenuService.UpdateText(toolBar.Items); };

4
src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs

@ -200,10 +200,10 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -200,10 +200,10 @@ namespace ICSharpCode.SharpDevelop.Gui
// Project
return ProjectService.CurrentProject != null && ProjectService.CurrentProject.FindFile(item.FileName) != null;
case 2:
// All open documents
// All open files
return SD.Workbench.ViewContentCollection.Select(vc => vc.GetService<ITextEditor>()).Any(editor => editor != null && item.FileName == editor.FileName);
case 3:
// Document
// File
return SD.Workbench.ActiveViewContent != null && SD.Workbench.ActiveViewContent.PrimaryFileName == item.FileName;
case 4:
// Namespace

3
src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPadCommands.cs

@ -10,7 +10,8 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -10,7 +10,8 @@ namespace ICSharpCode.SharpDevelop.Gui
{
public class SelectScopeComboBox : ComboBox
{
static readonly string[] viewTypes = new string[] {"Solution", "Project", "All open documents", "Document", "Namespace", "Class/Module"};
// TODO Translate!
static readonly string[] viewTypes = new string[] {"Solution", "Project", "All open files", "File", "Namespace", "Class/Module"};
public SelectScopeComboBox()
{

Loading…
Cancel
Save