Browse Source

Fixed AltGr-shortcut bug. (AltGr+E now inserts the '€' sign instead of showing the exceptions pad).

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@934 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
db23c1d711
  1. 35
      data/templates/project/CSharp/SharpDevelopAddin.xpt
  2. 28
      data/templates/project/CSharp/SharpDevelopMacro.xpt
  3. 2
      src/AddIns/Misc/PInvokeAddIn/Project/Configuration/AssemblyInfo.cs
  4. 3
      src/Main/Base/Project/Src/Gui/FormLocationHelper.cs
  5. 28
      src/Main/Base/Project/Src/Gui/Workbench/DefaultWorkbench.cs
  6. 2
      src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/ClassDoozer.cs
  7. 5
      src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/IncludeDoozer.cs
  8. 2
      src/Main/Core/Project/Src/Services/PropertyService/PropertyService.cs

35
data/templates/project/CSharp/SharpDevelopAddin.xpt

@ -36,7 +36,6 @@ @@ -36,7 +36,6 @@
<Files>
<File name="${ProjectName}.addin" copyToOutputDirectory="Always"><![CDATA[<AddIn name = "${ProjectName}"
author = "${USER}"
copyright = "GNU General Public License"
url = ""
description = "TODO: Put description here">
@ -82,21 +81,7 @@ @@ -82,21 +81,7 @@
</Components>
]]></File>
<File name="Src/MyUserControl.cs">
<![CDATA[// Copyright (C) yyyy name of author
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<![CDATA[${StandardHeader.C#}
using System;
using System.Windows.Forms;
@ -120,21 +105,7 @@ namespace ${ProjectName} @@ -120,21 +105,7 @@ namespace ${ProjectName}
}
]]></File>
<File name="Src/TestPad.cs">
<![CDATA[// Copyright (C) yyyy name of author
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<![CDATA[${StandardHeader.C#}
using System;
using System.Windows.Forms;
@ -201,7 +172,7 @@ using System.Runtime.CompilerServices; @@ -201,7 +172,7 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SharpDevelop")]
[assembly: AssemblyCopyright("GNU General Public Licence")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

28
data/templates/project/CSharp/SharpDevelopMacro.xpt

@ -36,7 +36,6 @@ @@ -36,7 +36,6 @@
<Files>
<File name="${ProjectName}.addin" copyToOutputDirectory="Always"><![CDATA[<AddIn name = "${ProjectName}"
author = "${USER}"
copyright = "GNU General Public License"
url = ""
description = "TODO: Put description here">
@ -54,21 +53,7 @@ @@ -54,21 +53,7 @@
</AddIn>
]]></File>
<File name="Src/Command.cs">
<![CDATA[// Copyright (C) yyyy name of author
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<![CDATA[${StandardHeader.C#}
using System;
using System.Text;
@ -110,21 +95,14 @@ namespace Macro1 @@ -110,21 +95,14 @@ namespace Macro1
}
]]></File>
<File name="Configuration/AssemblyInfo.cs">
<![CDATA[using System.Reflection;
using System.Runtime.CompilerServices;
// Information about this assembly is defined by the following
// attributes.
//
// change them to the information which is associated with the assembly
// you compile.
<![CDATA[${StandardHeader.C#}
[assembly: AssemblyTitle("${ProjectName}")]
[assembly: AssemblyDescription("Macro AddIn for SharpDevelop 2.0")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SharpDevelop")]
[assembly: AssemblyCopyright("GNU General Public Licence")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

2
src/AddIns/Misc/PInvokeAddIn/Project/Configuration/AssemblyInfo.cs

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
// <file>
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>

3
src/Main/Base/Project/Src/Gui/FormLocationHelper.cs

@ -13,7 +13,8 @@ using ICSharpCode.Core; @@ -13,7 +13,8 @@ using ICSharpCode.Core;
namespace ICSharpCode.SharpDevelop.Gui
{
/// <summary>
/// Description of FormLocationHelper.
/// Static helper class that loads and stores the position and size of a Form in the
/// PropertyService.
/// </summary>
public static class FormLocationHelper
{

28
src/Main/Base/Project/Src/Gui/Workbench/DefaultWorkbench.cs

@ -140,6 +140,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -140,6 +140,7 @@ namespace ICSharpCode.SharpDevelop.Gui
UpdateRenderer();
MenuComplete += new EventHandler(SetStandardStatusBar);
SetStandardStatusBar(null, null);
ProjectService.CurrentProjectChanged += new ProjectEventHandler(SetProjectTitle);
@ -513,15 +514,24 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -513,15 +514,24 @@ namespace ICSharpCode.SharpDevelop.Gui
}
}
// // Handle keyboard shortcuts
// protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
// {
// if (this.ToolStripManager.PreProcessMessage(ref msg)) {
// return true;
// }
//
// return base.ProcessCmdKey(ref msg, keyData);
// }
const int VK_RMENU = 0xA5; // right alt key
[System.Runtime.InteropServices.DllImport("user32.dll", ExactSpelling=true)]
static extern short GetAsyncKeyState(int vKey);
public bool IsAltGRPressed {
get {
return GetAsyncKeyState(VK_RMENU) < 0 && (Control.ModifierKeys & Keys.Control) == Keys.Control;
}
}
// Handle keyboard shortcuts
protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
{
if (IsAltGRPressed)
return false;
return base.ProcessCmdKey(ref msg, keyData);
}
protected override void OnDragEnter(DragEventArgs e)
{

2
src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/ClassDoozer.cs

@ -11,7 +11,7 @@ using System.Collections; @@ -11,7 +11,7 @@ using System.Collections;
namespace ICSharpCode.Core
{
/// <summary>
/// Creates object instances by invocing a type's parameterless constructor
/// Creates object instances by invocating a type's parameterless constructor
/// via System.Reflection.
/// </summary>
/// <attribute name="class" use="required">

5
src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/IncludeDoozer.cs

@ -11,8 +11,9 @@ using System.Collections; @@ -11,8 +11,9 @@ using System.Collections;
namespace ICSharpCode.Core
{
/// <summary>
/// Builds one or multiple items from another location in the addin tree.
/// This doozer can use the "item" OR the "path" attribute.
/// Includes one or multiple items from another location in the addin tree.
/// You can use the attribute "item" (to include a single item) OR the
/// attribute "path" (to include all items from the target path).
/// </summary>
/// <attribute name="item">
/// When this attribute is used, the include doozer builds the item that is at the

2
src/Main/Core/Project/Src/Services/PropertyService/PropertyService.cs

@ -106,7 +106,6 @@ namespace ICSharpCode.Core @@ -106,7 +106,6 @@ namespace ICSharpCode.Core
properties.WriteProperties(writer);
writer.WriteEndElement();
}
}
static void PropertiesPropertyChanged(object sender, PropertyChangedEventArgs e)
@ -116,7 +115,6 @@ namespace ICSharpCode.Core @@ -116,7 +115,6 @@ namespace ICSharpCode.Core
}
}
public static event PropertyChangedEventHandler PropertyChanged;
}
}

Loading…
Cancel
Save