mirror of
https://github.com/Hofknecht/SystemTrayMenu.git
synced 2024-06-29 11:30:28 +12:00
[Bug] Show name of the ink #16
https://github.com/Hofknecht/SystemTrayMenu/issues/16
This commit is contained in:
parent
2d301eb454
commit
957c01a057
|
@ -148,7 +148,7 @@ namespace SystemTrayMenu.Controls
|
|||
TargetFilePath = resolvedLnkPath;
|
||||
}
|
||||
|
||||
SetText($"{FileInfo.Name.Substring(0, FileInfo.Name.Length - 4)}");
|
||||
SetText(Path.GetFileNameWithoutExtension(TargetFilePathOrig));
|
||||
|
||||
return handled;
|
||||
}
|
||||
|
|
|
@ -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")]
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue