Skip to content

Commit d6d1d66

Browse files
CodectoryCodectory
committed
1.2.1
Disabled Autostart as current method is not working when started as administrator
1 parent 14a6df5 commit d6d1d66

File tree

11 files changed

+28
-27
lines changed

11 files changed

+28
-27
lines changed

‎Source/Debug_x64/HDRProfile.exe‎

512 Bytes
Binary file not shown.

‎Source/Debug_x64/HDRProfile_Settings.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<HDRProfileSettings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33
<AutoStart>false</AutoStart>
4-
<StartMinimizedToTray>false</StartMinimizedToTray>
5-
<CloseToTray>false</CloseToTray>
6-
<HDRMode>Running</HDRMode>
4+
<Logging>false</Logging>
5+
<StartMinimizedToTray>true</StartMinimizedToTray>
6+
<CloseToTray>true</CloseToTray>
7+
<HDRMode>Focused</HDRMode>
78
<ApplicationItems>
89
<ApplicationItem>
910
<DisplayName>notepad</DisplayName>

‎Source/Debug_x64/de/HDRProfile.resources.dll‎

0 Bytes
Binary file not shown.

‎Source/HDRProfile/App.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<system:String x:Key="DonateLink">https://paypal.me/pools/c/8vksshrMln</system:String>
1414
<system:String x:Key="InfoLink">https://sourceforge.net/projects/hdr-profile</system:String>
15-
<system:String x:Key="Version">1.2.0</system:String>
15+
<system:String x:Key="Version">1.2.1</system:String>
1616
<SolidColorBrush x:Key="ButtonBackground" Color="#FF0086F5"/>
1717
<SolidColorBrush x:Key="AccentColor" Color="#FFFF581A"/>
1818
<SolidColorBrush x:Key="AccentColor2" Color="#4C87B3"/>

‎Source/HDRProfile/HDRController.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@
1010

1111
namespace HDRProfile
1212
{
13-
public class HDRController
13+
public static class HDRController
1414
{
1515
[DllImport("HDRController.dll")]
16-
public static extern IntPtr SetHDR(bool enabled);
17-
readonly object _dllLock = new object();
16+
private static extern IntPtr SetHDR(bool enabled);
17+
readonly static object _dllLock = new object();
1818

19-
public void ActivateHDR()
19+
public static void ActivateHDR()
2020
{
2121
lock (_dllLock)
2222
SetHDR(true);
2323

2424
}
2525

26-
public void DeactivateHDR()
26+
public static void DeactivateHDR()
2727
{
2828
lock (_dllLock)
2929
SetHDR(false);

‎Source/HDRProfile/HDRProfileHandler.cs‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ public class HDRProfileHandler : BaseViewModel
3636
private bool started = false;
3737
public bool Started { get => started; private set { started = value; OnPropertyChanged(); } }
3838
ProcessWatcher ProcessWatcher;
39-
HDRController HDRSwitcherHandler;
4039
private bool _showView = false;
4140
private HDRProfileSettings settings;
4241

@@ -83,7 +82,6 @@ private void Initialize()
8382
return;
8483
Logs.Add("Initializing...", false);
8584
ProcessWatcher = new ProcessWatcher();
86-
HDRSwitcherHandler = new HDRController();
8785
LoadSettings();
8886
InitializeTrayMenu();
8987
CreateRelayCommands();
@@ -150,13 +148,13 @@ private void InitializeTrayMenu()
150148
{
151149
Header = Locale_Texts.ActivateHDR
152150
};
153-
activateHDR.Click += (o,e) => HDRController.SetHDR(true);
151+
activateHDR.Click += (o, e) => HDRController.ActivateHDR();
154152

155153
MenuItem deactivateHDR = new MenuItem()
156154
{
157155
Header = Locale_Texts.DeactivateHDR
158156
};
159-
deactivateHDR.Click += (o, e) => HDRController.SetHDR(false);
157+
deactivateHDR.Click += (o, e) => HDRController.DeactivateHDR();
160158

161159
contextMenu.Items.Add(open);
162160
contextMenu.Items.Add(activateHDR);
@@ -177,8 +175,8 @@ private void InitializeTrayMenu()
177175

178176
private void CreateRelayCommands()
179177
{
180-
ActivateHDRCommand = new RelayCommand(HDRSwitcherHandler.ActivateHDR);
181-
DeactivateHDRCommand = new RelayCommand(HDRSwitcherHandler.DeactivateHDR);
178+
ActivateHDRCommand = new RelayCommand(HDRController.ActivateHDR);
179+
DeactivateHDRCommand = new RelayCommand(HDRController.DeactivateHDR);
182180
AddApplicationCommand = new RelayCommand(AddAplication);
183181
RemoveApplicationCommand = new RelayCommand<ApplicationItem>(RemoveApplication);
184182
LoadingCommand = new RelayCommand(Starting);
@@ -217,7 +215,7 @@ private void StartApplication(ApplicationItem application)
217215
Logs.Add($"Start application {application.ApplicationName}", false);
218216
try
219217
{
220-
HDRController.SetHDR(true);
218+
HDRController.ActivateHDR();
221219
System.Threading.Thread.Sleep(3000);
222220
Process process = new Process();
223221
process.StartInfo = new ProcessStartInfo(application.ApplicationFilePath);
@@ -287,7 +285,7 @@ public void Stop()
287285
ProcessWatcher.OneProcessIsFocusedChanged -= ProcessWatcher_RunningOrFocusedChanged;
288286

289287
ProcessWatcher.Stop();
290-
HDRSwitcherHandler.DeactivateHDR();
288+
HDRController.DeactivateHDR();
291289
Started = false;
292290
Logs.Add($"Process watcher stopped", false);
293291

@@ -388,11 +386,11 @@ private void UpdateHDRMode()
388386

389387
if ((Settings.HDRMode == HDRMode.Running && ProcessWatcher.OneProcessIsRunning) || Settings.HDRMode == HDRMode.Focused && ProcessWatcher.OneProcessIsFocused)
390388
{
391-
HDRSwitcherHandler.ActivateHDR();
389+
HDRController.ActivateHDR();
392390
CheckIfRestartIsNecessary((IDictionary<ApplicationItem, bool>)ProcessWatcher.Applications);
393391
}
394392
else if (Settings.HDRMode != HDRMode.None)
395-
HDRSwitcherHandler.DeactivateHDR();
393+
HDRController.DeactivateHDR();
396394
Logs.Add($"HDR mode updated to {Settings.HDRMode}", false);
397395

398396
}

‎Source/HDRProfile/HDRProfileSettings.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class HDRProfileSettings : BaseViewModel
2727

2828

2929
[DataMember]
30-
public bool AutoStart { get => autoStart; set { autoStart = value; OnPropertyChanged(); } }
30+
public bool AutoStart { get => false/*autoStart*/; set { autoStart = value; OnPropertyChanged(); } }
3131

3232
[DataMember]
3333
public bool Logging { get => logging; set { logging = value; OnPropertyChanged(); } }

‎Source/HDRProfile/HDRProfileSettingsView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
<ColumnDefinition Width="Auto"/>
3838
<ColumnDefinition/>
3939
</Grid.ColumnDefinitions>
40-
<TextBlock Text="{x:Static local:Locale_Texts.AutoStart}" Grid.Column="0" Grid.Row="0" Margin="10,4,10,2"/>
40+
<TextBlock Text="{x:Static local:Locale_Texts.AutoStart}" Grid.Column="0" Grid.Row="0" Margin="10,4,10,2"/>
4141
<TextBlock Text="{x:Static local:Locale_Texts.StartToTray}" Grid.Column="0" Grid.Row="1" Margin="10,3,2,3"/>
4242
<TextBlock Text="{x:Static local:Locale_Texts.MinimizeToTray}" Grid.Column="0" Grid.Row="2" Margin="10,3,2,3"/>
4343
<TextBlock Text="{x:Static local:Locale_Texts.Logging}" Grid.Column="0" Grid.Row="3" Margin="10,3,2,3"/>
4444
<TextBlock Text="{x:Static local:Locale_Texts.HDRMode}" Grid.Column="0" Grid.Row="4" Margin="10,5,0,1" HorizontalAlignment="Left" Width="82"/>
45-
<CheckBox IsChecked="{Binding AutoStart}" Grid.Column="1" HorizontalAlignment="Left" Margin="10,3,0,0" VerticalAlignment="Top" Height="15" Width="71"/>
45+
<CheckBox IsChecked="{Binding AutoStart}" Grid.Column="1" HorizontalAlignment="Left" Margin="10,3,0,0" VerticalAlignment="Top" Height="15" Width="71" IsEnabled="False"/>
4646
<CheckBox IsChecked="{Binding StartMinimizedToTray}" Grid.Column="1" HorizontalAlignment="Left" Margin="10,5,0,0" VerticalAlignment="Top" Grid.Row="1" Height="15" Width="71"/>
4747
<CheckBox IsChecked="{Binding CloseToTray}" Grid.Column="1" HorizontalAlignment="Left" Margin="10,5,0,0" VerticalAlignment="Top" Grid.Row="2" Height="15" Width="71"/>
4848
<CheckBox IsChecked="{Binding Logging}" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Left" Margin="10,3,0,0" VerticalAlignment="Top" Height="15" Width="71"/>

‎Source/HDRProfile/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@
5252
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
5353
// indem Sie "*" wie unten gezeigt eingeben:
5454
// [assembly: AssemblyVersion("1.0.*")]
55-
[assembly: AssemblyVersion("1.2.0.0")]
56-
[assembly: AssemblyFileVersion("1.2.0.0")]
55+
[assembly: AssemblyVersion("1.2.1.0")]
56+
[assembly: AssemblyFileVersion("1.2.1.0")]

‎Source/Release_x64/HDRProfile_Settings.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<HDRProfileSettings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33
<AutoStart>false</AutoStart>
4-
<StartMinimizedToTray>false</StartMinimizedToTray>
5-
<CloseToTray>false</CloseToTray>
6-
<HDRMode>Running</HDRMode>
4+
<Logging>false</Logging>
5+
<StartMinimizedToTray>true</StartMinimizedToTray>
6+
<CloseToTray>true</CloseToTray>
7+
<HDRMode>Focused</HDRMode>
78
<ApplicationItems>
89
<ApplicationItem>
910
<DisplayName>Notepad</DisplayName>
1011
<ApplicationName>notepad</ApplicationName>
1112
<ApplicationFilePath>C:\Windows\System32\notepad.exe</ApplicationFilePath>
13+
<RestartProcess>false</RestartProcess>
1214
</ApplicationItem>
1315
</ApplicationItems>
1416
</HDRProfileSettings>

0 commit comments

Comments
 (0)