Skip to content

Commit 939850c

Browse files
unitycoderunitycoder
committed
add grid column width settings, add settings for show/hide arguments and gitbranch columns
1 parent 12a7aca commit 939850c

File tree

5 files changed

+116
-21
lines changed

5 files changed

+116
-21
lines changed

‎UnityLauncherPro/App.config

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,21 @@
3030
<setting name="registerExplorerMenu" serializeAs="String">
3131
<value>False</value>
3232
</setting>
33+
<setting name="closeAfterProject" serializeAs="String">
34+
<value>False</value>
35+
</setting>
36+
<setting name="closeAfterExplorer" serializeAs="String">
37+
<value>True</value>
38+
</setting>
39+
<setting name="showArgumentsColumn" serializeAs="String">
40+
<value>False</value>
41+
</setting>
42+
<setting name="showGitBranchColumn" serializeAs="String">
43+
<value>False</value>
44+
</setting>
45+
<setting name="gridColumnWidths" serializeAs="String">
46+
<value>123</value>
47+
</setting>
3348
</UnityLauncherPro.Properties.Settings>
3449
</userSettings>
3550
</configuration>

‎UnityLauncherPro/MainWindow.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,8 +600,8 @@
600600
<CheckBox x:Name="chkRegisterExplorerMenu" Content="Register Explorer context menu" Foreground="{DynamicResource ButtonForeground}" Unchecked="ChkRegisterExplorerMenu_CheckedChanged" Checked="ChkRegisterExplorerMenu_CheckedChanged"/>
601601
<CheckBox Content="Close after opening project" Foreground="{DynamicResource ButtonForeground}"/>
602602
<CheckBox Content="Close after launching from Explorer" Foreground="{DynamicResource ButtonForeground}"/>
603-
<CheckBox Content="Show Arguments Column" Foreground="{DynamicResource ButtonForeground}"/>
604-
<CheckBox Content="Show Git Branch Column" Foreground="{DynamicResource ButtonForeground}"/>
603+
<CheckBox x:Name="chkShowLauncherArgumentsColumn" Content="Show Arguments Column" Foreground="{DynamicResource ButtonForeground}" Unchecked="ChkShowLauncherArgumentsColumn_CheckedChanged" Checked="ChkShowLauncherArgumentsColumn_CheckedChanged"/>
604+
<CheckBox x:Name="chkShowGitBranchColumn" Content="Show Git Branch Column" Foreground="{DynamicResource ButtonForeground}" Checked="ChkShowGitBranchColumn_CheckedChanged" Unchecked="ChkShowGitBranchColumn_CheckedChanged"/>
605605
<CheckBox Content="Show full modified time" Foreground="{DynamicResource ButtonForeground}" ToolTip="Full=dd/mm/yyyy hh:mm:ss, NotFull=x hours ago, x days ago.."/>
606606
</StackPanel>
607607

‎UnityLauncherPro/MainWindow.xaml.cs

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -94,23 +94,19 @@ void LoadSettings()
9494
// update settings window
9595
chkQuitAfterCommandline.Checked = Properties.Settings.Default.closeAfterExplorer;
9696
ChkQuitAfterOpen.Checked = Properties.Settings.Default.closeAfterProject;
97-
chkShowLauncherArgumentsColumn.Checked = Properties.Settings.Default.showArgumentsColumn;
98-
chkShowGitBranchColumn.Checked = Properties.Settings.Default.showGitBranchColumn;
99-
chkDarkSkin.Checked = Properties.Settings.Default.useDarkSkin;
97+
*/
98+
99+
chkShowLauncherArgumentsColumn.IsChecked = Properties.Settings.Default.showArgumentsColumn;
100+
chkShowGitBranchColumn.IsChecked = Properties.Settings.Default.showGitBranchColumn;
100101

101102
// update optional grid columns, hidden or visible
102-
gridRecent.Columns["_launchArguments"].Visible = chkShowLauncherArgumentsColumn.Checked;
103-
gridRecent.Columns["_gitBranch"].Visible = chkShowGitBranchColumn.Checked;
104-
*/
103+
gridRecent.Columns[4].Visibility = (bool)chkShowLauncherArgumentsColumn.IsChecked ? Visibility.Visible : Visibility.Collapsed;
104+
gridRecent.Columns[5].Visibility = (bool)chkShowGitBranchColumn.IsChecked ? Visibility.Visible : Visibility.Collapsed;
105+
105106

106107
// update installations folder listbox
107108
lstRootFolders.Items.Clear();
108109
lstRootFolders.ItemsSource = Properties.Settings.Default.rootFolders;
109-
//lstRootFolders.Items.AddRange(Properties.Settings.Default.rootFolders.Cast<string>().ToArray());
110-
111-
/*
112-
// update packages folder listbox
113-
lstPackageFolders.Items.AddRange(Properties.Settings.Default.packageFolders.Cast<string>().ToArray());
114110

115111
// restore datagrid column widths
116112
int[] gridColumnWidths = Properties.Settings.Default.gridColumnWidths;
@@ -121,12 +117,11 @@ void LoadSettings()
121117
gridRecent.Columns[i].Width = gridColumnWidths[i];
122118
}
123119
}
124-
*/
125120
} // LoadSettings()
126121

127122
private void SaveSettingsOnExit()
128123
{
129-
/*
124+
130125
// save list column widths
131126
List<int> gridWidths;
132127
if (Properties.Settings.Default.gridColumnWidths != null)
@@ -144,16 +139,16 @@ private void SaveSettingsOnExit()
144139
{
145140
if (Properties.Settings.Default.gridColumnWidths != null && Properties.Settings.Default.gridColumnWidths.Length > i)
146141
{
147-
gridWidths[i] = gridRecent.Columns[i].Width;
142+
gridWidths[i] = (int)gridRecent.Columns[i].Width.Value;
148143
}
149144
else
150145
{
151-
gridWidths.Add(gridRecent.Columns[i].Width);
146+
gridWidths.Add((int)gridRecent.Columns[i].Width.Value);
152147
}
153148
}
154149
Properties.Settings.Default.gridColumnWidths = gridWidths.ToArray();
155150
Properties.Settings.Default.Save();
156-
*/
151+
157152
}
158153

159154
void UpdateUnityInstallationsList()
@@ -728,8 +723,19 @@ private void ChkRegisterExplorerMenu_CheckedChanged(object sender, RoutedEventAr
728723
Properties.Settings.Default.registerExplorerMenu = (bool)chkRegisterExplorerMenu.IsChecked;
729724
Properties.Settings.Default.Save();
730725
}
731-
} // class
732-
} //namespace
733-
734726

727+
private void ChkShowLauncherArgumentsColumn_CheckedChanged(object sender, RoutedEventArgs e)
728+
{
729+
Properties.Settings.Default.showArgumentsColumn = (bool)chkShowLauncherArgumentsColumn.IsChecked;
730+
Properties.Settings.Default.Save();
731+
gridRecent.Columns[4].Visibility = (bool)chkShowLauncherArgumentsColumn.IsChecked ? Visibility.Visible : Visibility.Collapsed;
732+
}
735733

734+
private void ChkShowGitBranchColumn_CheckedChanged(object sender, RoutedEventArgs e)
735+
{
736+
Properties.Settings.Default.showGitBranchColumn = (bool)chkShowGitBranchColumn.IsChecked;
737+
Properties.Settings.Default.Save();
738+
gridRecent.Columns[5].Visibility = (bool)chkShowGitBranchColumn.IsChecked ? Visibility.Visible : Visibility.Collapsed;
739+
}
740+
} // class
741+
} //namespace

‎UnityLauncherPro/Properties/Settings.Designer.cs

Lines changed: 59 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UnityLauncherPro/Properties/Settings.settings

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,20 @@
2020
<Setting Name="registerExplorerMenu" Type="System.Boolean" Scope="User">
2121
<Value Profile="(Default)">False</Value>
2222
</Setting>
23+
<Setting Name="closeAfterProject" Type="System.Boolean" Scope="User">
24+
<Value Profile="(Default)">False</Value>
25+
</Setting>
26+
<Setting Name="closeAfterExplorer" Type="System.Boolean" Scope="User">
27+
<Value Profile="(Default)">True</Value>
28+
</Setting>
29+
<Setting Name="showArgumentsColumn" Type="System.Boolean" Scope="User">
30+
<Value Profile="(Default)">False</Value>
31+
</Setting>
32+
<Setting Name="showGitBranchColumn" Type="System.Boolean" Scope="User">
33+
<Value Profile="(Default)">False</Value>
34+
</Setting>
35+
<Setting Name="gridColumnWidths" Type="System.Int32[]" Scope="User">
36+
<Value Profile="(Default)" />
37+
</Setting>
2338
</Settings>
2439
</SettingsFile>

0 commit comments

Comments
 (0)