Winify – Diff between revs 25 and 28

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