Winify – Diff between revs 28 and 30

Subversion Repositories:
Rev:
Only display areas with differences – Ignore whitespace
Rev 28 Rev 30
1 using System; 1 using System;
2 using System.Linq; 2 using System.Linq;
-   3 using System.Threading;
3 using System.Windows.Forms; 4 using System.Windows.Forms;
4 using Announcements; 5 using Announcements;
5 using Servers; 6 using Servers;
6 using Winify.Utilities; 7 using Winify.Utilities;
7   8  
8 namespace Winify.Settings 9 namespace Winify.Settings
9 { 10 {
10 public partial class SettingsForm : Form 11 public partial class SettingsForm : Form
11 { 12 {
12 #region Public Events & Delegates 13 #region Public Events & Delegates
13   14  
14 public event EventHandler<SettingsSavedEventArgs> Save; 15 public event EventHandler<SettingsSavedEventArgs> Save;
15   16  
16 #endregion 17 #endregion
17   18  
18 #region Private Delegates, Events, Enums, Properties, Indexers and Fields 19 #region Private Delegates, Events, Enums, Properties, Indexers and Fields
19   20  
20 private readonly BindingSource _announcementBindingSource; 21 private readonly BindingSource _announcementBindingSource;
21   22  
22 private readonly Announcements.Announcements _announcements; 23 private readonly Announcements.Announcements _announcements;
23   24  
24 private readonly BindingSource _serverBindingSource; 25 private readonly BindingSource _serverBindingSource;
25   26  
26 private readonly global::Servers.Servers _servers; 27 private readonly Servers.Servers _servers;
27   28  
28 private Announcement _announcement; 29 private Announcement _announcement;
29   30  
30 private Server _server; 31 private Server _server;
-   32 private readonly MainForm _mainForm;
-   33 private readonly CancellationToken _cancellationToken;
31   34  
32 #endregion 35 #endregion
33   36  
34 #region Constructors, Destructors and Finalizers 37 #region Constructors, Destructors and Finalizers
35   38  
36 private SettingsForm() 39 public SettingsForm()
37 { 40 {
38 InitializeComponent(); 41 InitializeComponent();
39 } 42 }
-   43  
-   44 public SettingsForm(MainForm mainForm) : this()
-   45 {
-   46 _mainForm = mainForm;
-   47 }
40   48  
-   49 public SettingsForm(MainForm mainForm, Servers.Servers servers, Announcements.Announcements announcements,
41 public SettingsForm(global::Servers.Servers servers, Announcements.Announcements announcements) : this() 50 CancellationToken cancellationToken) : this(mainForm)
42 { 51 {
43 _servers = servers; 52 _servers = servers;
44 _server = _servers.Server.FirstOrDefault() ?? new Server(); 53 _server = _servers.Server.FirstOrDefault() ?? new Server();
-   54 _cancellationToken = cancellationToken;
45   55  
46 _serverBindingSource = new BindingSource(); 56 _serverBindingSource = new BindingSource();
47 _serverBindingSource.DataSource = _server; 57 _serverBindingSource.DataSource = _server;
48   58  
49 serverNameTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Name), true, 59 serverNameTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Name), true,
50 DataSourceUpdateMode.OnPropertyChanged)); 60 DataSourceUpdateMode.OnPropertyChanged));
51 serverUrlTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Url), true, 61 serverUrlTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Url), true,
52 DataSourceUpdateMode.OnPropertyChanged)); 62 DataSourceUpdateMode.OnPropertyChanged));
53 serverUsernameTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Username), 63 serverUsernameTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Username),
54 true, 64 true,
55 DataSourceUpdateMode.OnPropertyChanged)); 65 DataSourceUpdateMode.OnPropertyChanged));
56 serverPasswordTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Password), 66 serverPasswordTextBox.DataBindings.Add(new Binding("Text", _serverBindingSource, nameof(_server.Password),
57 true, 67 true,
58 DataSourceUpdateMode.OnPropertyChanged)); 68 DataSourceUpdateMode.OnPropertyChanged));
59   69  
60 listBox1.DataSource = _servers.Server; 70 listBox1.DataSource = _servers.Server;
61 listBox1.DisplayMember = "Name"; 71 listBox1.DisplayMember = "Name";
62 listBox1.DataBindings.Add(new Binding("Text", _servers.Server, "Name", true, 72 listBox1.DataBindings.Add(new Binding("Text", _servers.Server, "Name", true,
63 DataSourceUpdateMode.OnPropertyChanged)); 73 DataSourceUpdateMode.OnPropertyChanged));
64   74  
65 _announcements = announcements; 75 _announcements = announcements;
66 _announcement = _announcements.Announcement.FirstOrDefault() ?? new Announcement(); 76 _announcement = _announcements.Announcement.FirstOrDefault() ?? new Announcement();
67   77  
68 _announcementBindingSource = new BindingSource(); 78 _announcementBindingSource = new BindingSource();
69 _announcementBindingSource.DataSource = _announcement; 79 _announcementBindingSource.DataSource = _announcement;
70   80  
71 appIdTextBox.DataBindings.Add(new Binding("Text", _announcementBindingSource, nameof(_announcement.AppId), 81 appIdTextBox.DataBindings.Add(new Binding("Text", _announcementBindingSource, nameof(_announcement.AppId),
72 true, 82 true,
73 DataSourceUpdateMode.OnPropertyChanged)); 83 DataSourceUpdateMode.OnPropertyChanged));
74 lingerTimeTextBox.DataBindings.Add(new Binding("Text", _announcementBindingSource, 84 lingerTimeTextBox.DataBindings.Add(new Binding("Text", _announcementBindingSource,
75 nameof(_announcement.LingerTime), true, 85 nameof(_announcement.LingerTime), true,
76 DataSourceUpdateMode.OnPropertyChanged)); 86 DataSourceUpdateMode.OnPropertyChanged));
77   87  
78 listBox2.DataSource = _announcements.Announcement; 88 listBox2.DataSource = _announcements.Announcement;
79 listBox2.DisplayMember = "Id"; 89 listBox2.DisplayMember = "Id";
80 listBox2.DataBindings.Add(new Binding("Text", _announcements.Announcement, "Id", true, 90 listBox2.DataBindings.Add(new Binding("Text", _announcements.Announcement, "Id", true,
81 DataSourceUpdateMode.OnPropertyChanged)); 91 DataSourceUpdateMode.OnPropertyChanged));
82 } 92 }
83   93  
84 #endregion 94 #endregion
85   95  
86 #region Event Handlers 96 #region Event Handlers
87   97  
88 private void CheckBox1_CheckedChanged(object sender, EventArgs e) 98 private void CheckBox1_CheckedChanged(object sender, EventArgs e)
89 { 99 {
90 Properties.Settings.Default.LaunchOnBoot = ((CheckBox)sender).Checked; 100 _mainForm.Configuration.LaunchOnBoot = ((CheckBox)sender).Checked;
-   101  
-   102 _mainForm.ChangedConfigurationContinuation.Schedule(TimeSpan.FromSeconds(1),
-   103 async () => { await _mainForm.SaveConfiguration(); }, _cancellationToken);
91   104  
92 Miscellaneous.LaunchOnBootSet(Properties.Settings.Default.LaunchOnBoot); 105 Miscellaneous.LaunchOnBootSet(_mainForm.Configuration.LaunchOnBoot);
93 } 106 }
94   107  
95 private void Button1_Click(object sender, EventArgs e) 108 private void Button1_Click(object sender, EventArgs e)
96 { 109 {
97 var server = new Server(); 110 var server = new Server();
98   111  
99 _servers.Server.Add(server); 112 _servers.Server.Add(server);
100   113  
101 listBox1.SelectedItem = server; 114 listBox1.SelectedItem = server;
102 } 115 }
103   116  
104 private void Button2_Click(object sender, EventArgs e) 117 private void Button2_Click(object sender, EventArgs e)
105 { 118 {
106 if (listBox1.SelectedItem is Server server) _servers.Server.Remove(server); 119 if (listBox1.SelectedItem is Server server) _servers.Server.Remove(server);
107 } 120 }
108   121  
109 private void ListBox1_SelectedIndexChanged(object sender, EventArgs e) 122 private void ListBox1_SelectedIndexChanged(object sender, EventArgs e)
110 { 123 {
111 var listBox = (ListBox)sender; 124 var listBox = (ListBox)sender;
112   125  
113 if (listBox.SelectedItem is Server server) 126 if (listBox.SelectedItem is Server server)
114 { 127 {
115 _server = server; 128 _server = server;
116   129  
117 _serverBindingSource.DataSource = _server; 130 _serverBindingSource.DataSource = _server;
118 } 131 }
119 } 132 }
120   133  
121 private void Button3_Click(object sender, EventArgs e) 134 private void Button3_Click(object sender, EventArgs e)
122 { 135 {
123 if (listBox2.SelectedItem is Announcement announcement) _announcements.Announcement.Remove(announcement); 136 if (listBox2.SelectedItem is Announcement announcement) _announcements.Announcement.Remove(announcement);
124 } 137 }
125   138  
126 private void Button4_Click(object sender, EventArgs e) 139 private void Button4_Click(object sender, EventArgs e)
127 { 140 {
128 var announcement = new Announcement(); 141 var announcement = new Announcement();
129   142  
130 _announcements.Announcement.Add(announcement); 143 _announcements.Announcement.Add(announcement);
131   144  
132 listBox2.SelectedItem = announcement; 145 listBox2.SelectedItem = announcement;
133 } 146 }
134   147  
135 private void ListBox2_SelectedIndexChanged(object sender, EventArgs e) 148 private void ListBox2_SelectedIndexChanged(object sender, EventArgs e)
136 { 149 {
137 var listBox = (ListBox)sender; 150 var listBox = (ListBox)sender;
138   151  
139 if (listBox.SelectedItem is Announcement announcement) 152 if (listBox.SelectedItem is Announcement announcement)
140 { 153 {
141 _announcement = announcement; 154 _announcement = announcement;
142   155  
143 _announcementBindingSource.DataSource = _announcement; 156 _announcementBindingSource.DataSource = _announcement;
144 } 157 }
145 } 158 }
146   159  
147 private void Button6_Click(object sender, EventArgs e) 160 private void Button6_Click(object sender, EventArgs e)
148 { 161 {
149 Close(); 162 Close();
150 } 163 }
151   164  
152 private void Button5_Click(object sender, EventArgs e) 165 private void Button5_Click(object sender, EventArgs e)
153 { 166 {
154 Save?.Invoke(this, new SettingsSavedEventArgs(_servers, _announcements)); 167 Save?.Invoke(this, new SettingsSavedEventArgs(_servers, _announcements));
-   168  
155 Close(); 169 Close();
156 } 170 }
-   171  
-   172 private void SettingsForm_Load(object sender, EventArgs e)
-   173 {
-   174 checkBox1.Checked = _mainForm.Configuration.LaunchOnBoot;
-   175 }
157   176  
158 #endregion 177 #endregion
159 } 178 }
160 } 179 }
161   180  
162
Generated by GNU Enscript 1.6.5.90.
 181
Generated by GNU Enscript 1.6.5.90.
163   182  
164   183  
165   184