CodeMirror/SystemTrayMenu
1
0
Fork 0
mirror of https://github.com/Hofknecht/SystemTrayMenu.git synced 2024-06-26 10:00:49 +12:00
Code Issues Projects Releases Wiki Activity

[Bug] Show name of the ink #16

Browse source 
https://github.com/Hofknecht/SystemTrayMenu/issues/16
This commit is contained in:
Markus Hofknecht 2019-07-06 17:44:24 +02:00
parent 2d301eb454
commit 957c01a057
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Controls/RowData.cs
View file

@ -148,7 +148,7 @@ namespace SystemTrayMenu.Controls
TargetFilePath = resolvedLnkPath;
}
SetText($"{FileInfo.Name.Substring(0, FileInfo.Name.Length - 4)}");
SetText(Path.GetFileNameWithoutExtension(TargetFilePathOrig));
return handled;
}

4
Properties/AssemblyInfo.cs
View file

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.1.237")]
[assembly: AssemblyFileVersion("0.9.1.237")]
[assembly: AssemblyVersion("0.9.1.238")]
[assembly: AssemblyFileVersion("0.9.1.238")]

19
SystemTrayMenuHandler.cs
View file

@ -462,7 +462,7 @@ namespace SystemTrayMenu
if (menuButtonData.ReadIcon(false,
false, ref resolvedLnkPath))
{
menuButtonData = ReadMenuButtonData(resolvedLnkPath, true, file);
menuButtonData = ReadMenuButtonData(resolvedLnkPath, true, menuButtonData);
menuButtonData.ContainsMenu = true;
menuButtonData.ReadIcon(true, true, ref resolvedLnkPath);
}
@ -481,23 +481,22 @@ namespace SystemTrayMenu
}
RowData ReadMenuButtonData(string fileName,
bool isResolvedLnk, string fileUnresolved = null)
bool isResolvedLnk, RowData menuButtonData = null)
{
RowData menuButtonData = new RowData();
if (menuButtonData == null)
{
menuButtonData = new RowData();
}
menuButtonData.IsResolvedLnk = isResolvedLnk;
try
{
menuButtonData.FileInfo = new FileInfo(fileName);
menuButtonData.TargetFilePath = menuButtonData.FileInfo.FullName;
menuButtonData.SetText($"{menuButtonData.FileInfo.Name}");
if(string.IsNullOrEmpty(fileUnresolved))
if (!isResolvedLnk)
{
menuButtonData.TargetFilePathOrig = menuButtonData.TargetFilePath;
}
else
{
menuButtonData.TargetFilePathOrig = fileUnresolved;
menuButtonData.SetText(menuButtonData.FileInfo.Name);
menuButtonData.TargetFilePathOrig = menuButtonData.FileInfo.FullName;
}
}
catch (Exception ex)