mirrors
/
OpenLiveWriter
mirror of https://github.com/OpenLiveWriter/OpenLiveWriter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'softwarenerd-master'

This commit is contained in:
Martin Woodward 2015-12-10 19:07:06 +00:00
parent 488d6e8e62 c80bee8119
commit 6e4d928109
5 changed files with 826 additions and 826 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1634
src/managed/OpenLiveWriter.ApplicationFramework/ApplicationWorkspaceColumnLightweightControl.cs
View File

File diff suppressed because it is too large Load Diff

8
src/managed/OpenLiveWriter.ApplicationFramework/CommandContextManager.cs
View File

@ -240,7 +240,7 @@ namespace OpenLiveWriter.ApplicationFramework
/// </summary>
public void Activate()
{
Debug.Assert(!activated, "CommandContextManager already activated. Call Brian.");
Debug.Assert(!activated, "CommandContextManager already activated.");
if (!activated)
{
commandManager.Add(activatedCommandCollection);
@ -253,7 +253,7 @@ namespace OpenLiveWriter.ApplicationFramework
/// </summary>
public void Deactivate()
{
Debug.Assert(activated, "CommandContextManager not activated. Call Brian.");
Debug.Assert(activated, "CommandContextManager not activated.");
if (activated)
{
commandManager.Remove(activatedCommandCollection);
@ -274,7 +274,7 @@ namespace OpenLiveWriter.ApplicationFramework
/// </summary>
public void Enter()
{
//Debug.Assert(!entered, "CommandContextManager already entered. Call Brian.");
//Debug.Assert(!entered, "CommandContextManager already entered.");
if (!entered)
{
commandManager.Add(enteredCommandCollection);
@ -287,7 +287,7 @@ namespace OpenLiveWriter.ApplicationFramework
/// </summary>
public void Leave()
{
//Debug.Assert(entered, "CommandContextManager not entered. Call Brian.");
//Debug.Assert(entered, "CommandContextManager not entered.");
if (entered)
{
commandManager.Remove(enteredCommandCollection);

2
src/managed/OpenLiveWriter.ApplicationFramework/CommandContextMenu.cs
View File

@ -365,7 +365,7 @@ namespace OpenLiveWriter.ApplicationFramework
// Return the command that the user selected.
CommandOwnerDrawMenuItem commandOwnerDrawMenuItem = LocateCommandOwnerDrawMenuItem(MenuItems, menuID);
Debug.Assert(commandOwnerDrawMenuItem != null, "CommandContextMenu.ShowModal was not able to locate the CommandOwnerDrawMenuItem corresponding to the user's selection. Call Brian.");
Debug.Assert(commandOwnerDrawMenuItem != null, "CommandContextMenu.ShowModal was not able to locate the CommandOwnerDrawMenuItem corresponding to the user's selection.");
return commandOwnerDrawMenuItem.Command;
}

4
src/managed/OpenLiveWriter.ApplicationFramework/TabLightweightControl.cs
View File

@ -1058,7 +1058,7 @@ namespace OpenLiveWriter.ApplicationFramework
return;
// Ensure that the sender is who we think it is.
Debug.Assert(sender is TabSelectorLightweightControl, "Doh!", "Bad event wiring is the leading cause of code decay. Call Brian.");
Debug.Assert(sender is TabSelectorLightweightControl, "Doh!", "Bad event wiring is the leading cause of code decay.");
if (sender is TabSelectorLightweightControl)
{
@ -1077,7 +1077,7 @@ namespace OpenLiveWriter.ApplicationFramework
private void TabSelectorLightweightControl_Selected(object sender, EventArgs e)
{
// Ensure that the sender is who we think it is.
Debug.Assert(sender is TabSelectorLightweightControl, "Doh!", "Bad event wiring is the leading cause of code decay. Call Brian.");
Debug.Assert(sender is TabSelectorLightweightControl, "Doh!", "Bad event wiring is the leading cause of code decay.");
if (sender is TabSelectorLightweightControl)
{
// Set the selected tab entry.

4
src/managed/OpenLiveWriter.ApplicationFramework/WorkspaceColumnLightweightControl.cs
View File

@ -863,7 +863,7 @@ namespace OpenLiveWriter.ApplicationFramework
{
get
{
Debug.Assert(VirtualWidth <= MaximumColumnWidth, "The column is wider than it's maximum width. Call Brian.");
Debug.Assert(VirtualWidth <= MaximumColumnWidth, "The column is wider than it's maximum width.");
return Math.Max(0, MaximumColumnWidth - VirtualWidth);
}
}
@ -875,7 +875,7 @@ namespace OpenLiveWriter.ApplicationFramework
{
get
{
Debug.Assert(VirtualWidth >= MinimumColumnWidth, "The column is narrower than it's minimum width. Call Brian.");
Debug.Assert(VirtualWidth >= MinimumColumnWidth, "The column is narrower than it's minimum width.");
return Math.Max(0, VirtualWidth - MinimumColumnWidth);
}
}