Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4841] trunk/plugins/ShortCuter&SkinEditor/Source
|
From: <nic...@us...> - 2014-06-16 17:53:19
|
Revision: 4841
http://sourceforge.net/p/mp-plugins/code/4841
Author: nicsergio
Date: 2014-06-16 17:53:10 +0000 (Mon, 16 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LockKeys.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2014-06-16 17:28:20 UTC (rev 4840)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2014-06-16 17:53:10 UTC (rev 4841)
@@ -95,7 +95,7 @@
}
internal static class EnumHelper //Classe per gestione enumerativi con descrizione
{
- public static string GetEnumDescription(Enum enumValue) //Ottenimento descrizione enumerativo
+ public static string GetEnumDescription(object enumValue) //Ottenimento descrizione enumerativo
{
FieldInfo fi = enumValue.GetType().GetField(enumValue.ToString());
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs 2014-06-16 17:28:20 UTC (rev 4840)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs 2014-06-16 17:53:10 UTC (rev 4841)
@@ -32,8 +32,11 @@
skinItems.Populate(mySkin.SkinFiles, mySkin.SkinLinks, false, true);
FormatShortCutsGrid();
- capsLockComboBox.DataSource = Enum.GetNames(typeof(LockKeys.LockKeyActions));
- capsLockComboBox.SelectedItem = Enum.GetName(typeof(LockKeys.LockKeyActions), myShortCuts.General.ForcingCapsLock);
+ capsLockComboBox.DataSource = EnumHelper.GetEnumDescriptions(typeof(LockKeys.LockKeyActions));
+ capsLockComboBox.SelectedItem = EnumHelper.GetEnumDescription(myShortCuts.General.ForcingCapsLock);
+
+ // capsLockComboBox.DataSource = Enum.GetNames(typeof(LockKeys.LockKeyActions));
+ // capsLockComboBox.SelectedItem = Enum.GetName(typeof(LockKeys.LockKeyActions), myShortCuts.General.ForcingCapsLock);
numLockComboBox.DataSource = Enum.GetNames(typeof(LockKeys.LockKeyActions));
numLockComboBox.SelectedItem = Enum.GetName(typeof(LockKeys.LockKeyActions), myShortCuts.General.ForcingNumLock);
@@ -230,7 +233,9 @@
}
private bool Save() //Salvataggio configurazione plugin
{
- myShortCuts.General.ForcingCapsLock = (LockKeys.LockKeyActions)Enum.Parse(typeof(LockKeys.LockKeyActions), capsLockComboBox.SelectedItem.ToString());
+ myShortCuts.General.ForcingCapsLock = (LockKeys.LockKeyActions)EnumHelper.GetEnumFromDescription<LockKeys.LockKeyActions>(capsLockComboBox.SelectedItem.ToString());
+
+ //myShortCuts.General.ForcingCapsLock = (LockKeys.LockKeyActions)Enum.Parse(typeof(LockKeys.LockKeyActions), capsLockComboBox.SelectedItem.ToString());
myShortCuts.General.ForcingNumLock = (LockKeys.LockKeyActions)Enum.Parse(typeof(LockKeys.LockKeyActions), numLockComboBox.SelectedItem.ToString());
return myShortCuts.SaveConfig();
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LockKeys.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LockKeys.cs 2014-06-16 17:28:20 UTC (rev 4840)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LockKeys.cs 2014-06-16 17:53:10 UTC (rev 4841)
@@ -1,6 +1,7 @@
using System;
using System.Runtime.InteropServices;
using System.Windows.Forms;
+using System.ComponentModel;
namespace ShortCuter
{
@@ -16,9 +17,9 @@
public enum LockKeyActions //Tipologie di azioni di modica stato
{
- Off = 0, //--> reset blocco
- On = 1, //--> forzatura blocco
- None = 2 //--> nessuna modifica (stato invariato)
+ [Description("Forcing Off")] Off = 0, //--> reset blocco
+ [Description("Forcing On")] On = 1, //--> forzatura blocco
+ [Description("No Forcing")] None = 2 //--> nessuna modifica (stato invariato)
}
#endregion
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-06-16 17:28:20 UTC (rev 4840)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-06-16 17:53:10 UTC (rev 4841)
@@ -6,7 +6,7 @@
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}</ProjectGuid>
- <OutputType>Library</OutputType>
+ <OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ShortCuter</RootNamespace>
<AssemblyName>ShortCuter</AssemblyName>
@@ -167,6 +167,7 @@
</EmbeddedResource>
<EmbeddedResource Include="Configuration\ShortCuterConfig.resx">
<DependentUpon>ShortCuterConfig.cs</DependentUpon>
+ <SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Configuration\ShortCuterKeyConfig.resx">
<DependentUpon>ShortCuterKeyConfig.cs</DependentUpon>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
