Skip to content
This repository has been archived by the owner on Oct 16, 2020. It is now read-only.

Commit

Permalink
Bug fixes, naming, comments
Browse files Browse the repository at this point in the history 
git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/shortcuts@4706 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
  • Loading branch information
@sandrejev
sandrejev committed Aug 17, 2009
1 parent 1fea46f commit 70a53b3
Show file tree
Hide file tree
Showing 30 changed files with 297 additions and 199 deletions.
1 change: 0 additions & 1 deletion src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs
View file
Expand Up @@ -30,7 +30,6 @@
using ICSharpCode.SharpDevelop.Bookmarks;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Editor;
using SDCommandManager=ICSharpCode.Core.Presentation.CommandManager;
using ICSharpCode.SharpDevelop.Editor.CodeCompletion;

namespace ICSharpCode.AvalonEdit.AddIn
Expand Down
4 changes: 1 addition & 3 deletions src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplaceDialog.cs
View file
Expand Up @@ -11,13 +11,11 @@
using System.Windows.Input;

using ICSharpCode.Core;
using ICSharpCode.Core.Presentation;
using ICSharpCode.Core.WinForms;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Gui;

using ICSharpCode.Core.Presentation;
using SDCommandManager = ICSharpCode.Core.Presentation.CommandManager;

namespace SearchAndReplace
{
public enum SearchAndReplaceMode {
Expand Down
8 changes: 5 additions & 3 deletions ...ortcutsManagement/ShortcutsManagement/Src/Dialogs/ShortcutsManagementOptionsPanel.xaml.cs
View file
Expand Up @@ -13,7 +13,7 @@
using ICSharpCode.ShortcutsManagement.Data;
using Microsoft.Win32;
using ShortcutManagement=ICSharpCode.ShortcutsManagement.Data;
using SDCommandManager = ICSharpCode.Core.Presentation.CommandManager;
using ICSharpCode.Core.Presentation;
using MessageBox=System.Windows.MessageBox;
using Shortcut=ICSharpCode.ShortcutsManagement.Data.Shortcut;
using UserControl=System.Windows.Controls.UserControl;
Expand Down Expand Up @@ -193,7 +193,7 @@ private void BindShortcuts()

var shortcut = new Shortcut(shortcutText, inputBindingInfo.ActiveGestures, inputBindingInfo.DefaultGestures.InputGesturesCollection);
shortcutsMap.Add(shortcut, inputBindingInfo);

// Assign shortcut to all categories it is registered in
var isAnyCategoriesResolved = true;
if (inputBindingInfo.Categories != null && inputBindingInfo.Categories.Count > 0) {
Expand All @@ -205,7 +205,9 @@ private void BindShortcuts()
isAnyCategoriesResolved = true;
}
}
}
} else {
isAnyCategoriesResolved = false;
}

if(!isAnyCategoriesResolved) {
rootEntries.Add(shortcut);
Expand Down
4 changes: 1 addition & 3 deletions src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/CaretNavigationCommandHandler.cs
View file
Expand Up @@ -12,13 +12,11 @@
using System.Windows.Input;
using System.Windows.Media.TextFormatting;

using ICSharpCode.Core.Presentation;
using ICSharpCode.AvalonEdit.Document;
using ICSharpCode.AvalonEdit.Rendering;
using ICSharpCode.AvalonEdit.Utils;

using ICSharpCode.Core.Presentation;
using SDCommandManager=ICSharpCode.Core.Presentation.CommandManager;

namespace ICSharpCode.AvalonEdit.Editing
{
static class CaretNavigationCommandHandler
Expand Down
2 changes: 0 additions & 2 deletions src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/EditingCommandHandler.cs
View file
Expand Up @@ -19,9 +19,7 @@
using ICSharpCode.AvalonEdit.Document;
using ICSharpCode.AvalonEdit.Highlighting;
using ICSharpCode.AvalonEdit.Utils;

using ICSharpCode.Core.Presentation;
using SDCommandManager=ICSharpCode.Core.Presentation.CommandManager;

namespace ICSharpCode.AvalonEdit.Editing
{
Expand Down
4 changes: 1 addition & 3 deletions src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextArea.cs
View file
Expand Up @@ -19,14 +19,12 @@
using System.Windows.Shapes;
using System.Windows.Threading;

using ICSharpCode.Core.Presentation;
using ICSharpCode.AvalonEdit.Document;
using ICSharpCode.AvalonEdit.Indentation;
using ICSharpCode.AvalonEdit.Rendering;
using ICSharpCode.AvalonEdit.Utils;

using ICSharpCode.Core.Presentation;
using SDCommandManager = ICSharpCode.Core.Presentation.CommandManager;
using CommandManager = System.Windows.Input.CommandManager;

namespace ICSharpCode.AvalonEdit.Editing
{
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextAreaDefaultInputHandlers.cs
View file
Expand Up @@ -9,7 +9,7 @@
using System.Windows.Input;
using ICSharpCode.AvalonEdit.Document;
using ICSharpCode.Core.Presentation;
using SDCommandManager=ICSharpCode.Core.Presentation.CommandManager;
using SDCommandManager=ICSharpCode.Core.Presentation.SDCommandManager;

namespace ICSharpCode.AvalonEdit.Editing
{
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextAreaInputHandler.cs
View file
Expand Up @@ -7,7 +7,7 @@

using ICSharpCode.AvalonEdit.Utils;
using ICSharpCode.Core.Presentation;
using SDCommandManager = ICSharpCode.Core.Presentation.CommandManager;
using SDCommandManager = ICSharpCode.Core.Presentation.SDCommandManager;

using System;
using System.Collections.Generic;
Expand Down
8 changes: 3 additions & 5 deletions src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs
View file
Expand Up @@ -22,8 +22,6 @@
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Util;

using SDCommandManager=ICSharpCode.Core.Presentation.CommandManager;

namespace ICSharpCode.SharpDevelop.Commands
{
public class NavigationHistoryMenuBuilder : IMenuItemBuilder
Expand Down Expand Up @@ -208,7 +206,7 @@ static ToolMenuBuilder()
{
var categoryName = StringParser.Parse("External tools");
externalToolsCategory = new InputBindingCategory("/MainMenu/Tools/ExternalTools", categoryName);
ICSharpCode.Core.Presentation.CommandManager.RegisterInputBindingCategory(externalToolsCategory);
ICSharpCode.Core.Presentation.SDCommandManager.RegisterInputBindingCategory(externalToolsCategory);
}

private bool bindingsAssigned = false;
Expand Down Expand Up @@ -540,10 +538,10 @@ public ICollection BuildItems(Codon codon, object owner)
inputBindingInfo.DefaultGestures.AddRange(gestures);

var categoryPath = "/MainMenu/View" + (Category == padContent.Category && padContent.Category != "Main" ? "/" + padContent.Category : "");
var category = ICSharpCode.Core.Presentation.CommandManager.GetInputBindingCategory(categoryPath, false);
var category = ICSharpCode.Core.Presentation.SDCommandManager.GetInputBindingCategory(categoryPath, false);
if(category == null) {
category = new InputBindingCategory(categoryPath, padContent.Category);
ICSharpCode.Core.Presentation.CommandManager.RegisterInputBindingCategory(category);
ICSharpCode.Core.Presentation.SDCommandManager.RegisterInputBindingCategory(category);
}

inputBindingInfo.Categories.Add(category);
Expand Down
3 changes: 1 addition & 2 deletions src/Main/Base/Project/Src/Commands/ToolsCommands.cs
View file
Expand Up @@ -11,7 +11,6 @@
using ICSharpCode.Core.Presentation;
using ICSharpCode.SharpDevelop.Gui;
using System.Windows.Input;
using CommandManager=ICSharpCode.Core.Presentation.CommandManager;

namespace ICSharpCode.SharpDevelop.Commands
{
Expand All @@ -25,7 +24,7 @@ public class TestCommand : System.Windows.Input.ICommand

public void Execute(object parameter)
{
CommandManager.GetRoutedUICommand("SDBuildCommands.BuildSolution").Execute(parameter, WorkbenchSingleton.MainWindow);
SDCommandManager.GetRoutedUICommand("SDBuildCommands.BuildSolution").Execute(parameter, WorkbenchSingleton.MainWindow);

System.Windows.MessageBox.Show("test");
}
Expand Down
4 changes: 2 additions & 2 deletions src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonPadContent.cs
View file
Expand Up @@ -13,7 +13,7 @@
using System.Windows.Input;
using AvalonDock;
using ICSharpCode.Core;
using CommandManager=ICSharpCode.Core.Presentation.CommandManager;
using ICSharpCode.Core.Presentation;

namespace ICSharpCode.SharpDevelop.Gui
{
Expand Down Expand Up @@ -89,7 +89,7 @@ internal void LoadPadContentIfRequired()
placeholder = null;

var contextName = padInstance.GetType().FullName;
CommandManager.RegisterNamedUIElement(contextName, (UIElement)Content);
SDCommandManager.RegisterNamedUIElement(contextName, (UIElement)Content);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs
View file
Expand Up @@ -19,7 +19,7 @@
using AvalonDock;
using ICSharpCode.Core;
using ICSharpCode.Core.Presentation;
using CommandManager=ICSharpCode.Core.Presentation.CommandManager;
using SDCommandManager=ICSharpCode.Core.Presentation.SDCommandManager;

namespace ICSharpCode.SharpDevelop.Gui
{
Expand Down Expand Up @@ -108,8 +108,8 @@ void UpdateActiveViewContent()
System.Windows.Input.CommandManager.InvalidateRequerySuggested();

if (newActiveViewContent != null) {
string ownerName = newActiveViewContent.GetType().FullName;
CommandManager.RegisterNamedUIElement(ownerName, (UIElement)Content);
string ownerName = SDCommandManager.GetShortAssemblyQualifiedName(newActiveViewContent.GetType());
SDCommandManager.RegisterNamedUIElement(ownerName, (UIElement)Content);
}
}

Expand Down
3 changes: 1 addition & 2 deletions src/Main/Base/Project/Src/Gui/Workbench/WpfWorkbench.cs
View file
Expand Up @@ -20,7 +20,6 @@

using ICSharpCode.Core;
using ICSharpCode.Core.Presentation;
using SDCommandManager=ICSharpCode.Core.Presentation.CommandManager;

namespace ICSharpCode.SharpDevelop.Gui
{
Expand Down Expand Up @@ -87,9 +86,9 @@ public void Initialize()
// Load all commands and and key bindings from addin tree
CommandsService.RegisterInputBindingCategories(this, "/SharpDevelop/CommandManager/InputBindingCategories");
CommandsService.RegisterRoutedUICommands(this, "/SharpDevelop/CommandManager/RoutedUICommands");
CommandsService.RegisterMenuBindings(this, "/SharpDevelop/CommandManager/MenuLocations");
CommandsService.RegisterCommandBindings(this, "/SharpDevelop/CommandManager/CommandBindings");
CommandsService.RegisterInputBindings(this, "/SharpDevelop/CommandManager/InputBindings");
CommandsService.RegisterMenuBindings(this, "/SharpDevelop/CommandManager/MenuLocations");

// Register context and load all commands from addin
SDCommandManager.LoadAddinCommands(AddInTree.AddIns.FirstOrDefault(a => a.Name == "SharpDevelop"));
Expand Down

0 comments on commit 70a53b3

Please sign in to comment.