Skip to content

Commit 28aac7e

Browse files
committed
add auto-update;
add Edit 'wrap.Ini' menu item base themes adjusted; custom themes removed; menu painting adjusted;
1 parent 62c23b1 commit 28aac7e

File tree

4 files changed

+44
-13
lines changed

4 files changed

+44
-13
lines changed

rdpWrapper/MainForm.Designer.cs

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

rdpWrapper/MainForm.cs

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -187,16 +187,12 @@ public MainForm() {
187187
(message) => {
188188
return MessageBox.Show(message, Updater.ApplicationName, MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK;
189189
},
190-
Application.Exit
190+
() => { btnClose_Click(null, EventArgs.Empty); }
191191
);
192192

193-
var timer = new Timer();
194-
timer.Tick += async (_, _) => {
195-
timer.Enabled = false;
196-
timer.Enabled = !await Updater.CheckForUpdatesAsync(true);
197-
};
198-
timer.Interval = 3000;
199-
timer.Enabled = true;
193+
var timer = new System.Threading.Timer((_) => {
194+
Updater.CheckForUpdates(Updater.CheckUpdatesMode.AutoUpdate);
195+
}, null, 10 * 1000, 1000 * 60 * 60 * 24);
200196
}
201197

202198
protected override void WndProc(ref Message m) {
@@ -214,7 +210,7 @@ protected override void WndProc(ref Message m) {
214210
}
215211

216212
private void checkFoNewVersionToolStripMenuItem_Click(object sender, EventArgs e) {
217-
Updater.CheckForUpdates(false);
213+
Updater.CheckForUpdates(Updater.CheckUpdatesMode.AllMessages);
218214
}
219215

220216
private void siteToolStripMenuItem_Click(object sender, EventArgs e) {
@@ -260,6 +256,10 @@ private void RefreshSystemSettings() {
260256
}
261257

262258
private void btnClose_Click(object sender, EventArgs e) {
259+
if (InvokeRequired) {
260+
Invoke(new EventHandler(btnClose_Click), sender, e);
261+
return;
262+
}
263263
Close();
264264
}
265265

@@ -418,7 +418,7 @@ private void TimerTick(object sender, EventArgs e) {
418418
#if LITEVERSION
419419
btnGenerate.Visible = false;
420420
#else
421-
generateMenuItem.Enabled = btnGenerate.Enabled = btnGenerate.Visible = wrapperInstalled == WrapperInstalledState.RdpWrap;
421+
editWrapIniMenuItem.Enabled = generateMenuItem.Enabled = btnGenerate.Enabled = btnGenerate.Visible = wrapperInstalled == WrapperInstalledState.RdpWrap;
422422
#endif
423423
lblSupported.Visible = checkSupported is true;
424424
if (checkSupported is true) {
@@ -548,6 +548,27 @@ private void btnGenerate_Click(object sender, EventArgs e) {
548548
}
549549
}
550550

551+
private void btnEditWrapIni_Click(object sender, EventArgs e) {
552+
try {
553+
SetControlsState(false);
554+
#if LITEVERSION
555+
MessageBox.Show("No Ini file available with TermWrap.", Updater.ApplicationTitle, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
556+
#else
557+
if (!File.Exists(wrapperIniLastPath)) {
558+
MessageBox.Show($"File '{wrapperIniLastPath}' not found.", Updater.ApplicationTitle, MessageBoxButtons.OK, MessageBoxIcon.Warning);
559+
}
560+
561+
Process.Start(new ProcessStartInfo {
562+
FileName = wrapperIniLastPath,
563+
UseShellExecute = true
564+
});
565+
#endif
566+
}
567+
finally {
568+
SetControlsState(true);
569+
}
570+
}
571+
551572
private void AddToLog(string message, Logger.StateKind state, bool newLine) {
552573
if (InvokeRequired) {
553574
Invoke(new Action<string, Logger.StateKind, bool>(AddToLog), message, state);
@@ -603,7 +624,7 @@ private void SetControlsState(bool enabled) {
603624
refreshTimer.Enabled = enabled;
604625
if (!enabled) {
605626
btnInstall.Enabled = installMenuItem.Enabled = uninstallMenuItem.Enabled = enabled;
606-
btnGenerate.Enabled = generateMenuItem.Enabled = enabled;
627+
editWrapIniMenuItem.Enabled = btnGenerate.Enabled = generateMenuItem.Enabled = enabled;
607628
}
608629
btnRestartService.Enabled = restartServiceMenuItem.Enabled = enabled;
609630
}

rdpWrapper/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private static void StartConsole(string[] args) {
9999
// "-offline" should be the LAST parameter
100100
var offline = args.Any(a => a == "-offline");
101101
if (!offline) {
102-
Updater.CheckForUpdates(true);
102+
Updater.CheckForUpdates(Updater.CheckUpdatesMode.NotifyOnNewVersion);
103103
}
104104
switch (args[0]) {
105105
case "-help":

rdpWrapper/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414

1515
[assembly: Guid("3768507d-4e38-4ec7-8f1d-c9347ac45a5e")]
1616

17-
[assembly: AssemblyVersion("2.5.*")]
17+
[assembly: AssemblyVersion("2.6.*")]

0 commit comments

Comments
 (0)