Skip to content

Commit 8e3aca2

Browse files
CodectoryCodectory
committed
1.9.16
[Bug fixes] - AutoActions no longer flashes on startup, when started minimized.
1 parent 0a0c95c commit 8e3aca2

File tree

8 files changed

+70
-58
lines changed

8 files changed

+70
-58
lines changed

‎Source/AutoActions/App.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
xmlns:system="clr-namespace:System;assembly=mscorlib"
1313
xmlns:pres="clr-namespace:AutoActions.ProjectResources;assembly=AutoActions.ProjectResources"
1414

15-
xmlns:corewpf="clr-namespace:CodectoryCore.UI.Wpf;assembly=CodectoryCore.UI.Wpf"
16-
StartupUri="Views\AutoActionsMainView.xaml">
15+
xmlns:corewpf="clr-namespace:CodectoryCore.UI.Wpf;assembly=CodectoryCore.UI.Wpf">
16+
<!--StartupUri="Views\AutoActionsMainView.xaml">-->
1717

1818
<Application.Resources>
1919
<ResourceDictionary>

‎Source/AutoActions/App.xaml.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.Configuration;
44
using System.Data;
5+
using System.Diagnostics;
56
using System.Linq;
67
using System.Threading;
78
using System.Threading.Tasks;
@@ -17,7 +18,6 @@ namespace AutoActions
1718
///
1819
public partial class App : Application
1920
{
20-
2121
public static Theme Theme { get; set; } = Theme.Light;
2222

2323
static Mutex mutex;
@@ -31,6 +31,7 @@ public static void Main()
3131
{
3232
var application = new App();
3333
application.InitializeComponent();
34+
Globals.Instance.LoadSettings();
3435
application.Run();
3536
}
3637
else
@@ -39,6 +40,14 @@ public static void Main()
3940
}
4041
}
4142

43+
protected override void OnStartup(StartupEventArgs e)
44+
{
45+
base.OnStartup(e);
46+
Views.AutoActionsMainView mainView = new Views.AutoActionsMainView();
47+
if (!Globals.Instance.Settings.StartMinimizedToTray)
48+
mainView.Show();
49+
}
50+
4251
protected override void OnExit(ExitEventArgs e)
4352
{
4453
if (mutex.WaitOne(TimeSpan.Zero, true))

‎Source/AutoActions/AutoActions.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</PropertyGroup>
6161
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
6262
<DebugSymbols>true</DebugSymbols>
63-
<OutputPath>bin\x86\Debug\</OutputPath>
63+
<OutputPath>..\Debug_x86\</OutputPath>
6464
<DefineConstants>DEBUG;TRACE</DefineConstants>
6565
<DebugType>full</DebugType>
6666
<PlatformTarget>x86</PlatformTarget>
@@ -440,8 +440,9 @@ del "$(TargetName).exe.config"
440440

441441
if $(ConfigurationName) == Release (
442442
rd "$(TargetDir)" /s /q
443-
copy /Y "$(SolutionDir)Externals\$(PlatformName)\HDRController.dll" "$(OutDir)HDRController.dll"
444443
)
444+
copy /Y "$(SolutionDir)Externals\$(PlatformName)\HDRController.dll" "$(OutDir)HDRController.dll"
445+
445446
</PreBuildEvent>
446447
</PropertyGroup>
447448
</Project>

‎Source/AutoActions/AutoActionsDaemon.cs‎

Lines changed: 17 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ namespace AutoActions
2727
{
2828
public class AutoActionsDaemon : BaseViewModel
2929
{
30+
CodectoryCore.UI.Wpf.SplashScreen _splashScreen = new CodectoryCore.UI.Wpf.SplashScreen();
31+
3032
readonly object _accessLock = new object();
3133
private bool _showView = false;
3234
private ApplicationItem _currentApplication = null;
@@ -80,7 +82,7 @@ public class AutoActionsDaemon : BaseViewModel
8082

8183

8284
public bool Initialized { get; private set; } = false;
83-
public bool ShowView { get => _showView; set { _showView = value; OnPropertyChanged(); } }
85+
public bool ShowView { get => _showView; set { _showView = value; OnPropertyChanged(); } }
8486

8587
public ApplicationItem CurrentApplication { get => _currentApplication; set { _currentApplication = value; OnPropertyChanged(); } }
8688

@@ -97,6 +99,12 @@ public Version Version
9799
public AutoActionsDaemon()
98100
{
99101
//ChangeLanguage( new System.Globalization.CultureInfo("en-US"));
102+
_splashScreen.SetImageFromBitmap(ProjectLocales.SplashScreen);
103+
if (!Settings.HideSplashScreenOnStartup)
104+
{
105+
_splashScreen.Show();
106+
System.Threading.Thread.Sleep(1000);
107+
}
100108
Initialize();
101109
}
102110

@@ -115,7 +123,7 @@ private void Initialize()
115123

116124
lock (_accessLock)
117125
{
118-
CodectoryCore.UI.Wpf.SplashScreen splashScreen = new CodectoryCore.UI.Wpf.SplashScreen();
126+
119127
try
120128
{
121129
if (Initialized)
@@ -125,24 +133,19 @@ private void Initialize()
125133
_logsStorage = new LogsStorage();
126134
_lastActions = new ObservableCollection<IProfileAction>();
127135
InitializeApplicationWatcher();
128-
LoadSettings();
129-
splashScreen.SetImageFromBitmap(ProjectLocales.SplashScreen);
130-
if (!Settings.HideSplashScreenOnStartup)
131-
{
132-
splashScreen.Show();
133-
System.Threading.Thread.Sleep(1000);
134-
}
136+
InitializeSettings();
137+
135138
Globals.Logs.Add("Initializing...", false);
136139
if (Settings.CheckForNewVersion)
137140
Task.Run(() =>
138141
{
139142
CheckUpdateResult result = Globals.Instance.CheckUpdate();
140143
if (result.UpdateAvailable && Settings.AutoUpdate)
141144
{
142-
splashScreen.Text = ProjectLocales.Updating;
145+
_splashScreen.Text = ProjectLocales.Updating;
143146
if (!Settings.HideSplashScreenOnAutoUpdate)
144147
{
145-
splashScreen.Show();
148+
_splashScreen.Show();
146149
System.Threading.Thread.Sleep(1000);
147150
}
148151
Globals.Instance.AutoUpdate(result.GitHubData);
@@ -157,7 +160,7 @@ private void Initialize()
157160
Initialized = true;
158161
Globals.Logs.Add("Initialized", false);
159162
Start();
160-
splashScreen.Close();
163+
_splashScreen.Close();
161164

162165
}
163166
catch (Exception ex)
@@ -167,7 +170,7 @@ private void Initialize()
167170
}
168171
finally
169172
{
170-
splashScreen.Close();
173+
_splashScreen.Close();
171174
}
172175
}
173176
}
@@ -339,12 +342,8 @@ private void TrayMenuHelper_CloseApplicationRequested(object sender, EventArgs e
339342
Shutdown();
340343
}
341344

342-
private void LoadSettings()
345+
private void InitializeSettings()
343346
{
344-
Globals.Instance.LoadSettings();
345-
FixAssignments();
346-
Globals.Instance.SaveSettings();
347-
348347
Settings.ApplicationProfileAssignments.Sort(a => a.Position, ListSortDirection.Ascending);
349348
Settings.ApplicationProfileAssignments.CollectionChanged += ApplicationProfileAssigments_CollectionChanged;
350349
Settings.ApplicationProfiles.CollectionChanged += ApplicationProfiles_CollectionChanged;
@@ -366,36 +365,6 @@ private void LoadSettings()
366365
}
367366

368367

369-
private void FixAssignments()
370-
{
371-
int count = Settings.ApplicationProfileAssignments.Count;
372-
for (int i = 0; i < count; i++)
373-
{
374-
int positionCount = Settings.ApplicationProfileAssignments.Count(a => a.Position == i);
375-
if (positionCount == 0)
376-
{
377-
int u = i;
378-
while (Settings.ApplicationProfileAssignments.Count(a => a.Position == i) == 0)
379-
{
380-
var assignemnt = Settings.ApplicationProfileAssignments.FirstOrDefault(a => a.Position == u);
381-
if (assignemnt != null)
382-
assignemnt.Position = i;
383-
u++;
384-
}
385-
}
386-
if (positionCount > 1)
387-
Settings.ApplicationProfileAssignments.First(a => a.Position == i).Position = i + 1;
388-
}
389-
while (Settings.ApplicationProfileAssignments.Any(a => a.Position >= count))
390-
{
391-
foreach (var assignment in Settings.ApplicationProfileAssignments)
392-
if (assignment.Position >= count)
393-
do
394-
{
395-
assignment.Position = assignment.Position - 1;
396-
} while (Settings.ApplicationProfileAssignments.Count(a => a.Position == assignment.Position) > 1);
397-
}
398-
}
399368

400369

401370
private void TrayMenu_TrayLeftMouseDown(object sender, RoutedEventArgs e)

‎Source/AutoActions/Globals.cs‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public void LoadSettings()
7474
Settings.ApplicationProfiles.Add(Profile.DefaultProfile());
7575
SettingsLoadedOnce = true;
7676
}
77+
FixAssignments();
7778
SaveSettings();
7879
SettingsLoaded?.Invoke(this, EventArgs.Empty);
7980
}
@@ -96,6 +97,38 @@ public void LoadSettings()
9697
Globals.Logs.Add("Settings loaded", false);
9798
}
9899

100+
private void FixAssignments()
101+
{
102+
int count = Settings.ApplicationProfileAssignments.Count;
103+
for (int i = 0; i < count; i++)
104+
{
105+
int positionCount = Settings.ApplicationProfileAssignments.Count(a => a.Position == i);
106+
if (positionCount == 0)
107+
{
108+
int u = i;
109+
while (Settings.ApplicationProfileAssignments.Count(a => a.Position == i) == 0)
110+
{
111+
var assignemnt = Settings.ApplicationProfileAssignments.FirstOrDefault(a => a.Position == u);
112+
if (assignemnt != null)
113+
assignemnt.Position = i;
114+
u++;
115+
}
116+
}
117+
if (positionCount > 1)
118+
Settings.ApplicationProfileAssignments.First(a => a.Position == i).Position = i + 1;
119+
}
120+
while (Settings.ApplicationProfileAssignments.Any(a => a.Position >= count))
121+
{
122+
foreach (var assignment in Settings.ApplicationProfileAssignments)
123+
if (assignment.Position >= count)
124+
do
125+
{
126+
assignment.Position = assignment.Position - 1;
127+
} while (Settings.ApplicationProfileAssignments.Count(a => a.Position == assignment.Position) > 1);
128+
}
129+
}
130+
131+
99132

100133
public CheckUpdateResult CheckUpdate()
101134
{

‎Source/AutoActions/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.9.15.0")]
56-
[assembly: AssemblyFileVersion("1.9.15.0")]
55+
[assembly: AssemblyVersion("1.9.16.0")]
56+
[assembly: AssemblyFileVersion("1.9.16.0")]

‎Source/AutoActions/Views/ApplicationAdderView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
d:DataContext="{d:DesignInstance Type=root:ApplicationAdder, IsDesignTimeCreatable=False}"
1111
MinWidth="414">
1212

13-
<Grid >
13+
<Grid Margin="5">
1414
<Grid.RowDefinitions>
1515
<RowDefinition Height="Auto"/>
1616
<RowDefinition Height="Auto"/>
@@ -28,7 +28,7 @@
2828

2929
<TextBox Grid.Column="1" Grid.Row="0" Height="Auto" Margin="5" TextWrapping="Wrap" Text="{Binding DisplayName, Mode=TwoWay }" VerticalAlignment="Top"/>
3030
<TextBlock Style="{StaticResource DefaultTextBlock}" Grid.Column="1" Grid.Row="1" Text="{Binding FilePath}" Height="Auto" VerticalAlignment="Top" HorizontalAlignment="Stretch"/>
31-
<Border Width="50" Grid.Column="1" Grid.Row="2" Margin="5" CornerRadius="{StaticResource DefaultCornerRadius}" Background="{StaticResource IconBackgroundBrush}">
31+
<Border Width="50" Grid.Column="1" Grid.Row="2" Margin="5" CornerRadius="{StaticResource DefaultCornerRadius}" Background="{StaticResource IconBackgroundBrush}" HorizontalAlignment="Left">
3232
<Border Height="49" Width="49" CornerRadius="{StaticResource DefaultCornerRadius}" Margin="1">
3333
<Border.Background>
3434
<ImageBrush Stretch="Fill" ImageSource="{Binding ApplicationItem.Icon, Converter={StaticResource BitmapToBitmapImageConverter}}"/>

‎Source/AutoActions/Views/AutoActionsMainView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
xmlns:dsp="clr-namespace:AutoActions.Displays;assembly=AutoActions.Displays"
1212
xmlns:local="clr-namespace:AutoActions.Views"
1313
xmlns:root="clr-namespace:AutoActions"
14-
mc:Ignorable="d"
14+
mc:Ignorable="d"
1515
Title="AutoActions" Name="MainWindow" MinHeight="480" MinWidth="480" Closing="Window_Closing" Visibility="{Binding ShowView, Mode=TwoWay, Converter={StaticResource VisibilityBooleanConverter}}"
1616
Loaded="MainWindow_Loaded">
1717
<i:Interaction.Triggers>

0 commit comments

Comments
 (0)