The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-02-09 13:08:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor refactor of tray menu

Browse Source 
Related to issue #947
This commit is contained in:
ryochan7@protonmail.com 2019-12-29 16:48:03 -06:00
parent 34d2d74415
commit 1ce2f50cba
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
DS4Windows/DS4Forms/ViewModels/TrayIconViewModel.cs
View File

@ -18,6 +18,11 @@ namespace DS4WinWPF.DS4Forms.ViewModels
public static string trayTitle = $"DS4Windows v{Global.exeversion}"; public static string trayTitle = $"DS4Windows v{Global.exeversion}";
private ContextMenu contextMenu; private ContextMenu contextMenu;
private MenuItem changeServiceItem; private MenuItem changeServiceItem;
private MenuItem openItem;
private MenuItem minimizeItem;
private MenuItem openProgramItem;
private MenuItem closeItem;
public string TooltipText { get => tooltipText; public string TooltipText { get => tooltipText;
set set
@ -69,6 +74,15 @@ namespace DS4WinWPF.DS4Forms.ViewModels
changeServiceItem.Click += ChangeControlServiceItem_Click; changeServiceItem.Click += ChangeControlServiceItem_Click;
changeServiceItem.IsEnabled = false; changeServiceItem.IsEnabled = false;
openItem = new MenuItem() { Header = "Open" };
openItem.Click += OpenMenuItem_Click;
minimizeItem = new MenuItem() { Header = "Minimize" };
minimizeItem.Click += MinimizeMenuItem_Click;
openProgramItem = new MenuItem() { Header = "Open Program Folder" };
openProgramItem.Click += OpenProgramFolderItem_Click;
closeItem = new MenuItem() { Header = "Exit (Middle Mouse)" }; ;
closeItem.Click += ExitMenuItem_Click;
PopulateControllerList(); PopulateControllerList();
PopulateToolText(); PopulateToolText();
PopulateContextMenu(); PopulateContextMenu();
@ -187,25 +201,16 @@ namespace DS4WinWPF.DS4Forms.ViewModels
idx++; idx++;
} }
if (idx == 0)
{
item.IsEnabled = false;
}
_colLocker.ExitReadLock(); _colLocker.ExitReadLock();
items.Add(item); items.Add(item);
items.Add(new Separator()); items.Add(new Separator());
item = changeServiceItem; PopulateStaticItems();
items.Add(item);
item = new MenuItem() { Header = "Open" };
item.Click += OpenMenuItem_Click;
items.Add(item);
item = new MenuItem() { Header = "Minimize" };
item.Click += MinimizeMenuItem_Click;
items.Add(item);
item = new MenuItem() { Header = "Open Program Folder" };
item.Click += OpenProgramFolderItem_Click;
items.Add(item);
items.Add(new Separator());
item = new MenuItem() { Header = "Exit (Middle Mouse)" };
item.Click += ExitMenuItem_Click;
items.Add(item);
} }
private void ChangeControlServiceItem_Click(object sender, System.Windows.RoutedEventArgs e) private void ChangeControlServiceItem_Click(object sender, System.Windows.RoutedEventArgs e)
@ -370,23 +375,21 @@ namespace DS4WinWPF.DS4Forms.ViewModels
//contextMenu.Items.Clear(); //contextMenu.Items.Clear();
} }
private void PopulateStaticItems()
{
ItemCollection items = contextMenu.Items;
items.Add(changeServiceItem);
items.Add(openItem);
items.Add(minimizeItem);
items.Add(openProgramItem);
items.Add(new Separator());
items.Add(closeItem);
}
public void ClearContextMenu() public void ClearContextMenu()
{ {
contextMenu.Items.Clear(); contextMenu.Items.Clear();
ItemCollection items = contextMenu.Items; PopulateStaticItems();
MenuItem item;
item = changeServiceItem;
items.Add(item);
item = new MenuItem() { Header = "Open" };
item.Click += OpenMenuItem_Click;
items.Add(item);
item = new MenuItem() { Header = "Minimize" };
item.Click += MinimizeMenuItem_Click;
items.Add(item);
items.Add(new Separator());
item = new MenuItem() { Header = "Exit (Middle Mouse)" };
item.Click += ExitMenuItem_Click;
items.Add(item);
} }
private void ExitMenuItem_Click(object sender, System.Windows.RoutedEventArgs e) private void ExitMenuItem_Click(object sender, System.Windows.RoutedEventArgs e)