Winify – Diff between revs 24 and 25

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