fixed controller shortcuts when controller is not p1, fixed gpu clock…

… not displaying the sliding value, fixed slider thumb sizes not adjusting when hidden
project-sbc · Oct 18, 2022 · 8079cee · 8079cee
1 parent efa2127
commit 8079cee
Show file tree

Hide file tree

Showing 16 changed files with 844 additions and 838 deletions.
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -353,6 +353,10 @@ private void timerTick(object sender, EventArgs e)
                     getController();
                 }
             }
+            else if (!controller.IsConnected)
+            {
+                getController();
+            }
 
 
             if (controller != null)
@@ -374,9 +378,17 @@ private void timerTick(object sender, EventArgs e)
                     {
                         PowerControlPanel.Classes.EnableFSR.EnableFSR.enableDisableFSR();
                     }
-                    if (ButtonComboPress(currentGamepad, Properties.Settings.Default.playniteButtonCombo))
+                    if (ButtonComboPress(currentGamepad, Properties.Settings.Default.gameLauncherButtonCombo))
                     {
-                        PowerControlPanel.Classes.Playnite.Playnite.playniteToggle();
+                        if (Properties.Settings.Default.gameLauncher == "Steam")
+                        {
+                            PowerControlPanel.Classes.Steam.Steam.openSteamBigPicture();
+                        }
+                        if (Properties.Settings.Default.gameLauncher == "PlayNite")
+                        {
+                            PowerControlPanel.Classes.Playnite.Playnite.playniteToggle();
+                        }
+
                     }
 
                     //set currentgamepad snapshot to global gamepad for comparison
@@ -581,7 +593,7 @@ void initializeNavigationFrame()
             // Navigate to the home page.
 
 
-                this.Loaded += (sender, args) => this.navigationServiceEx.Navigate(new Uri("PowerControlPanel/Pages/QAMHomePage.xaml", UriKind.RelativeOrAbsolute));
+                this.Loaded += (sender, args) => this.navigationServiceEx.Navigate(new Uri("PowerControlPanel/Pages/HomePage.xaml", UriKind.RelativeOrAbsolute));
 
         }
 

diff --git a/Power Control Panel.csproj b/Power Control Panel.csproj
@@ -10,7 +10,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationIcon>Resources\Pictures\PCP.ico</ApplicationIcon>
-    <Version>0.1.13.0</Version>
+    <Version>0.2.2.0</Version>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
   </PropertyGroup>
 

diff --git a/PowerControlPanel/Classes/Playnite/Playnite.cs b/PowerControlPanel/Classes/Playnite/Playnite.cs
@@ -13,14 +13,19 @@ public static class Playnite
     {
         public static void playniteToggle()
         {
-            if (playniteRunning() && Properties.Settings.Default.directoryPlaynite != "")
+            if (Properties.Settings.Default.directoryPlaynite != "")
             {
-                RunCLI.RunCommand(" --shutdown", false, Properties.Settings.Default.directoryPlaynite + "\\Playnite.FullscreenApp.exe",6000,false);
-            }
-            else
-            {
-                RunCLI.RunCommand(" --startfullscreen", false, Properties.Settings.Default.directoryPlaynite + "\\Playnite.FullscreenApp.exe",6000,false);
+                if (playniteRunning())
+                {
+                    RunCLI.RunCommand(" --shutdown", false, Properties.Settings.Default.directoryPlaynite + "\\Playnite.FullscreenApp.exe", 6000, false);
+                }
+                else
+                {
+                    RunCLI.RunCommand(" --startfullscreen", false, Properties.Settings.Default.directoryPlaynite + "\\Playnite.FullscreenApp.exe", 6000, false);
+                }
             }
+
+
         }
         public static void setPlayniteDirectory()
         {

diff --git a/PowerControlPanel/Classes/StartUp/Resources/StringResources.xaml b/PowerControlPanel/Classes/StartUp/Resources/StringResources.xaml
@@ -61,6 +61,7 @@
     <system:String x:Key="TileHomePage_Brightness">Brightness</system:String>
     <system:String x:Key="TileHomePage_Volume">Volume</system:String>
     <system:String x:Key="TileHomePage_GPUCLK">GPU Clock</system:String>
+    <system:String x:Key="TileHomePage_Display">Display</system:String>   
     <system:String x:Key="TileHomePage_Resolution">Display Resolution</system:String>
     <system:String x:Key="TileHomePage_Scaling">Display Scaling</system:String>
     <system:String x:Key="TileHomePage_Refresh">Display Refresh</system:String>
@@ -71,7 +72,9 @@
     <system:String x:Key="TileHomePage_Intel">Intel</system:String>
     <system:String x:Key="TileHomePage_PlayNite">PlayNite</system:String>
     <system:String x:Key="TileHomePage_Steam">Steam</system:String>
+    <system:String x:Key="TileHomePage_ChangeView">Change View Style</system:String>
 
+
     <system:String x:Key="HomePage_TDPSettings">TDP Settings</system:String>
     <system:String x:Key="HomePage_CPUSettings">CPU Settings</system:String>
     <system:String x:Key="HomePage_DisplaySettings">Display Settings</system:String>
@@ -97,13 +100,17 @@
     <system:String x:Key="Settings_MainWindowStyle">Main Window Home Page Style (Restart App)</system:String>
     <system:String x:Key="Settings_QAMStyle">Quick Access Menu Home Page Style</system:String>
     <system:String x:Key="Settings_Language">Language/语言</system:String>
+
+    <system:String x:Key="Settings_SteamDirectory">Steam Directory</system:String>
+    <system:String x:Key="Settings_PlayNiteDirectory">PlayNite Directory</system:String>
+
     <system:String x:Key="Settings_IntelTDPType">TDP Set Type</system:String>
     <system:String x:Key="Settings_AMDMaxGPUClk">Set Max GPU Clock (MHz)</system:String>
     <system:String x:Key="Settings_ControllerShortCuts">Controller Short Cuts</system:String>
     <system:String x:Key="Settings_ShortCutQAM">Quick Access Menu</system:String>
     <system:String x:Key="Settings_ShortCutOSK">OSK</system:String>
     <system:String x:Key="Settings_ShortCutFSR">FSR</system:String>
-
+    <system:String x:Key="Settings_ShortCutGameLauncher">Game Launcher</system:String>
     <!-- AppSettings  -->
     <system:String x:Key="AppSettings_Applications">Applications</system:String>
     <system:String x:Key="AppSettings_AddProfile">ADD PROFILE</system:String>

diff --git a/PowerControlPanel/Classes/StartUp/Resources/StringResources.zh-Hans.xaml b/PowerControlPanel/Classes/StartUp/Resources/StringResources.zh-Hans.xaml
@@ -62,6 +62,7 @@
     <system:String x:Key="TileHomePage_Brightness">亮度</system:String>
     <system:String x:Key="TileHomePage_Volume">音量</system:String>
     <system:String x:Key="TileHomePage_GPUCLK">GPU Clock</system:String>
+    <system:String x:Key="TileHomePage_Display">显示</system:String>
     <system:String x:Key="TileHomePage_Resolution">显示分辨率</system:String>
     <system:String x:Key="TileHomePage_Scaling">显示比例</system:String>
     <system:String x:Key="TileHomePage_Refresh">屏幕刷新率</system:String>
@@ -72,15 +73,16 @@
     <system:String x:Key="TileHomePage_Intel">Intel</system:String>
     <system:String x:Key="TileHomePage_PlayNite">PlayNite</system:String>
     <system:String x:Key="TileHomePage_Steam">Steam</system:String>
-
-    <system:String x:Key="HomePage_TDPSettings">TDP Settings</system:String>
-    <system:String x:Key="HomePage_CPUSettings">CPU Settings</system:String>
-    <system:String x:Key="HomePage_DisplaySettings">Display Settings</system:String>
-    <system:String x:Key="HomePage_AMDSettings">AMD Settings</system:String>
-    <system:String x:Key="HomePage_ProfileSettings">Profile Settings</system:String>
-    <system:String x:Key="HomePage_VolumeSettings">Volume Settings</system:String>
-    <system:String x:Key="HomePage_BrightnessSettings">Brightness Settings</system:String>
-    <system:String x:Key="HomePage_FPSSettings">FPS Limit Settings</system:String>
+    <system:String x:Key="TileHomePage_ChangeView">切换人机界面</system:String>
+
+    <system:String x:Key="HomePage_TDPSettings">TDP设定</system:String>
+    <system:String x:Key="HomePage_CPUSettings">CPU设定</system:String>
+    <system:String x:Key="HomePage_DisplaySettings">显示设定</system:String>
+    <system:String x:Key="HomePage_AMDSettings">AMD设定</system:String>
+    <system:String x:Key="HomePage_ProfileSettings">Profile设定</system:String>
+    <system:String x:Key="HomePage_VolumeSettings">音量设定</system:String>
+    <system:String x:Key="HomePage_BrightnessSettings">亮度设定</system:String>
+    <system:String x:Key="HomePage_FPSSettings">FPS Limit设定</system:String>
 
     <!-- Settings {DynamicResource HomePage_Brightness} -->
     <system:String x:Key="Settings_UpdateSettings">Check For Updates</system:String>
@@ -97,12 +99,17 @@
     <system:String x:Key="Settings_MainWindowStyle">Main Window Home Page Style (Restart App)</system:String>
     <system:String x:Key="Settings_QAMStyle">Quick Acces Mneu Home Page Style</system:String>
     <system:String x:Key="Settings_Language">Language/语言</system:String>
+
+    <system:String x:Key="Settings_SteamDirectory">Steam Directory</system:String>
+    <system:String x:Key="Settings_PlayNiteDirectory">PlayNite Directory</system:String>
+
     <system:String x:Key="Settings_IntelTDPType">TDP Set Type</system:String>
     <system:String x:Key="Settings_AMDMaxGPUClk">Set Max GPU Clock (MHz)</system:String>
     <system:String x:Key="Settings_ControllerShortCuts">Conroller Short Cuts</system:String>
     <system:String x:Key="Settings_ShortCutQAM">Quick Access Menu</system:String>
     <system:String x:Key="Settings_ShortCutOSK">OSK</system:String>
     <system:String x:Key="Settings_ShortCutFSR">FSR</system:String>
+    <system:String x:Key="Settings_ShortCutGameLauncher">Game Launcher</system:String>
     <!-- AppSettings  -->
     <system:String x:Key="AppSettings_Applications">应用程序</system:String>
     <system:String x:Key="AppSettings_AddProfile">加剖面</system:String>

diff --git a/PowerControlPanel/Classes/Steam/Steam.cs b/PowerControlPanel/Classes/Steam/Steam.cs
@@ -25,15 +25,20 @@ public static bool steamRunning()
         }
         public static void openSteamBigPicture()
         {
-            if (steamRunning())
+            if (Properties.Settings.Default.directorySteam != "")
             {
-                RunCLI.RunCommand(" \"steam://open/bigpicture\"",false, Properties.Settings.Default.directorySteam + "\\Steam.exe", 6000, false);
+                if (steamRunning())
+                {
+                    RunCLI.RunCommand(" \"steam://open/bigpicture\"", false, Properties.Settings.Default.directorySteam + "\\Steam.exe", 6000, false);
 
+                }
+                else
+                {
+                    RunCLI.RunCommand(" -bigpicture", false, Properties.Settings.Default.directorySteam + "\\Steam.exe", 6000, false);
+                }
             }
-            else 
-            {
-                RunCLI.RunCommand(" -bigpicture", false, Properties.Settings.Default.directorySteam + "\\Steam.exe", 6000, false);
-            }
+
+
 
         }
         public static void setSteamDirectory()