Skip to content

Commit 65f4150

Browse files
committed
UI changes
- Revert backup frequency back to a NumericUpDown - Replace checkboxes with buttons to navigate sections - Moved checkboxes inside Settings section - Changed checkboxes ForeColor to White even if they're not checked - Replaced Home button with Uplay button - Background image will be visible only in Tasks and About section - Changed Form BackColor and Font - Changed TextBoxes and dropdowns BackColor - Changed buttons appearance in Settings section - Re-arranged controls inside Tasks section - Added tooltip to backup frequency NumericUpDown
1 parent 6a37bff commit 65f4150

25 files changed

+1424
-15005
lines changed

src/GHOSTbackup/GHOSTbackup.Helpers/BackupHelper.vb

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ Public Class BackupHelper
9191
End Sub
9292

9393
Public Shared Sub StartBackup()
94-
BackupTimer.Interval = Integer.Parse(Form1.BackupFreqTextBox.Text) * 60000
94+
BackupTimer.Interval = Form1.BackupFreqUpDown.Value * 60000
9595
BackupTimer.Start()
9696
IsBackupRunning = True
97-
Form1.BackupFreqTextBox.Enabled = False
97+
Form1.BackupFreqUpDown.Enabled = False
9898
Form1.BackupBtn.Enabled = False
9999
Form1.StopBtn.Enabled = True
100100
Form1.RestoreBtn.Enabled = False
@@ -111,7 +111,7 @@ Public Class BackupHelper
111111
Public Shared Sub StopBackup()
112112
BackupTimer.Stop()
113113
IsBackupRunning = False
114-
Form1.BackupFreqTextBox.Enabled = True
114+
Form1.BackupFreqUpDown.Enabled = True
115115
Form1.BackupBtn.Enabled = True
116116
Form1.StopBtn.Enabled = False
117117
Form1.RestoreBtn.Enabled = True

src/GHOSTbackup/GHOSTbackup.Helpers/Settings.vb

+20-20
Original file line numberDiff line numberDiff line change
@@ -78,22 +78,22 @@ Public Class Settings
7878

7979
'GHOST Buster
8080
Form1.SettingsInterfaceLangDropdown.SelectedIndex = Language()
81-
Form1.ConfirmExitChkBox.Checked = ConfirmExit()
82-
Form1.ConfirmStopBackupChkBox.Checked = ConfirmBackupInterruption()
83-
Form1.CheckUpdatesChkBox.Checked = CheckForUpdates()
84-
Form1.RememberFormPositionChkBox.Checked = RememberFormPosition()
81+
Form1.SettingsConfirmExitChkBox.Checked = ConfirmExit()
82+
Form1.SettingsConfirmStopBackupChkBox.Checked = ConfirmBackupInterruption()
83+
Form1.SettingsCheckUpdatesChkBox.Checked = CheckForUpdates()
84+
Form1.SettingsRememberFormPositionChkBox.Checked = RememberFormPosition()
8585
'Logging
8686
Form1.SettingsWriteLogToFileChkBox.Checked = WriteEventsToFile()
8787
Form1.SettingsLogFilePathTextBox.Text = LogFilePath()
8888
'Backup
8989
Form1.SavegamesLocTextBox.Text = SavegamesDirectory()
9090
Form1.BackupLocTextBox.Text = BackupDirectory()
91-
Form1.BackupFreqTextBox.Text = BackupFrequency()
92-
Form1.DisplayNotificationChkBox.Checked = DisplayNotification()
91+
Form1.BackupFreqUpDown.Value = BackupFrequency()
92+
Form1.SettingsDisplayNotificationChkBox.Checked = DisplayNotification()
9393
Form1.WhichBackupDropdown.SelectedIndex = WhichBackupToRestore()
9494
'Uplay
95-
Form1.DisableCloudSyncChkBox.Checked = DisableCloudSyncOnRestore()
96-
Form1.EnableCloudSyncChkBox.Checked = EnableCloudSyncOnQuit()
95+
Form1.SettingsDisableCloudSyncChkBox.Checked = DisableCloudSyncOnRestore()
96+
Form1.SettingsEnableCloudSyncChkBox.Checked = EnableCloudSyncOnQuit()
9797
Form1.SettingsNonUplayVersionChkBox.Checked = NoUplay()
9898
Form1.SettingsCustomExeTextBox.Text = WildlandsCustomPath()
9999
End If
@@ -106,23 +106,23 @@ Public Class Settings
106106
Dim ConfigData As IniData = New IniData()
107107
'GHOST Buster
108108
ConfigData("GHOSTbackup")("Language") = Form1.SettingsInterfaceLangDropdown.SelectedIndex
109-
ConfigData("GHOSTbackup")("ConfirmExit") = Form1.ConfirmExitChkBox.Checked
110-
ConfigData("GHOSTbackup")("ConfirmBackupInterruption") = Form1.ConfirmStopBackupChkBox.Checked
111-
ConfigData("GHOSTbackup")("CheckForUpdates") = Form1.CheckUpdatesChkBox.Checked
112-
ConfigData("GHOSTbackup")("RememberFormPosition") = Form1.RememberFormPositionChkBox.Checked
113-
ConfigData("GHOSTbackup")("FormPosition") = If(Form1.RememberFormPositionChkBox.Checked = True, Form1.Location.ToString(), "{X=-1,Y=-1}")
109+
ConfigData("GHOSTbackup")("ConfirmExit") = Form1.SettingsConfirmExitChkBox.Checked
110+
ConfigData("GHOSTbackup")("ConfirmBackupInterruption") = Form1.SettingsConfirmStopBackupChkBox.Checked
111+
ConfigData("GHOSTbackup")("CheckForUpdates") = Form1.SettingsCheckUpdatesChkBox.Checked
112+
ConfigData("GHOSTbackup")("RememberFormPosition") = Form1.SettingsRememberFormPositionChkBox.Checked
113+
ConfigData("GHOSTbackup")("FormPosition") = If(Form1.SettingsRememberFormPositionChkBox.Checked = True, Form1.Location.ToString(), "{X=-1,Y=-1}")
114114
'Logging
115115
ConfigData("Logging")("WriteEventsToFile") = Form1.SettingsWriteLogToFileChkBox.Checked
116116
ConfigData("Logging")("LogFilePath") = Form1.SettingsLogFilePathTextBox.Text
117117
'Backup
118118
ConfigData("Backup")("SavegamesDirectory") = Form1.SavegamesLocTextBox.Text
119119
ConfigData("Backup")("BackupDirectory") = Form1.BackupLocTextBox.Text
120-
ConfigData("Backup")("BackupFrequency") = If(Form1.BackupFreqTextBox.Text = "" OrElse Form1.BackupFreqTextBox.Text = "0", "5", Form1.BackupFreqTextBox.Text)
121-
ConfigData("Backup")("DisplayNotification") = Form1.DisplayNotificationChkBox.Checked
120+
ConfigData("Backup")("BackupFrequency") = Form1.BackupFreqUpDown.Value
121+
ConfigData("Backup")("DisplayNotification") = Form1.SettingsDisplayNotificationChkBox.Checked
122122
ConfigData("Backup")("WhichBackupToRestore") = Form1.WhichBackupDropdown.SelectedIndex
123123
'Uplay
124-
ConfigData("Uplay")("DisableCloudSyncOnRestore") = Form1.DisableCloudSyncChkBox.Checked
125-
ConfigData("Uplay")("EnableCloudSyncOnQuit") = Form1.EnableCloudSyncChkBox.Checked
124+
ConfigData("Uplay")("DisableCloudSyncOnRestore") = Form1.SettingsDisableCloudSyncChkBox.Checked
125+
ConfigData("Uplay")("EnableCloudSyncOnQuit") = Form1.SettingsEnableCloudSyncChkBox.Checked
126126
ConfigData("Uplay")("NoUplay") = If(Form1.SettingsNonUplayVersionChkBox.Checked = True AndAlso Form1.SettingsCustomExeTextBox.Text <> "", Form1.SettingsNonUplayVersionChkBox.Checked, False)
127127
ConfigData("Uplay")("WildlandsCustomPath") = If(Form1.SettingsNonUplayVersionChkBox.Checked = True AndAlso Form1.SettingsCustomExeTextBox.Text <> "", Form1.SettingsCustomExeTextBox.Text, Nothing)
128128

@@ -246,14 +246,14 @@ Public Class Settings
246246
Return Value
247247
End Function
248248

249-
Private Shared Function BackupFrequency() As String
249+
Private Shared Function BackupFrequency() As Decimal
250250
Dim ConfigData As IniData = ConfigParser.ReadFile(SettingsFile)
251251

252252
Dim Value As String = ConfigData("Backup")("BackupFrequency")
253253
If Value <> Nothing Then
254-
Return Value
254+
Return Decimal.Round(Decimal.Parse(Value), 0)
255255
Else
256-
Return "5"
256+
Return Decimal.Round(5, 0)
257257
End If
258258
End Function
259259

src/GHOSTbackup/GHOSTbackup.Helpers/Updater.vb

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Public Class Updater
3232
Public Shared Sub CheckUpdates()
3333
'Check for updates
3434
'//docs.microsoft.com/en-us/dotnet/api/system.net.downloadstringcompletedeventargs
35-
If Form1.CheckUpdatesChkBox.Checked = True Then
35+
If Form1.SettingsCheckUpdatesChkBox.Checked = True Then
3636
Using Updater As WebClient = New WebClient()
3737
Updater.Headers.Add("User-Agent", "GHOST Buster (+https://strappazzon.xyz/GRW-GHOST-Buster)")
3838
Dim VersionURI As Uri = New Uri("https://raw.githubusercontent.com/Strappazzon/GRW-GHOST-Buster/master/version")

src/GHOSTbackup/GHOSTbackup.Helpers/UplayHelper.vb

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Public Class UplayHelper
8989

9090
Catch ex As Exception
9191
'Don't let GHOST Buster disable cloud save sync until the user enables the setting again
92-
Form1.DisableCloudSyncChkBox.Checked = False
92+
Form1.SettingsDisableCloudSyncChkBox.Checked = False
9393

9494
Logger.Log("[ERROR] Parsing of ""settings.yml"" failed: " & ex.Message())
9595
CustomMsgBox.Show(Localization.GetString("msgbox_disable_sync_error"), Localization.GetString("msgbox_parsing_error_title"), MessageBoxButtons.OKCancel, MessageBoxIcon.Error)

src/GHOSTbackup/GHOSTbackup.Localization/Localization.vb

+20-19
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ Public Class Localization
5353

5454
'Localize form elements
5555
Form1.PlayGameBtn.Text = GetString("ui_play")
56-
Form1.TasksTitleLabel.Text = GetString("ui_title_tasks")
56+
Form1.SidemenuTasks.Text = " " & GetString("ui_title_tasks")
57+
Form1.SidemenuSettings.Text = " " & GetString("ui_title_settings")
58+
Form1.TitleLabel.Text = GetString("ui_title_tasks")
5759
Form1.FoldersTitleLabel.Text = GetString("ui_title_folders")
5860
Form1.BrowseBackupLocBtn.Text = GetString("ui_btn_browse")
5961
Form1.BrowseSavegamesLocBtn.Text = GetString("ui_btn_browse")
@@ -64,17 +66,8 @@ Public Class Localization
6466
Form1.SettingsOpenLogBtn.Text = GetString("ui_btn_open")
6567
Form1.SettingsOpenCustomExeFolderBtn.Text = GetString("ui_btn_open_folder")
6668
'Top menu
67-
Form1.SettingsLabel.Text = GetString("topmenu_settings")
6869
Form1.LogLabel.Text = GetString("topmenu_logs")
6970
Form1.AboutLabel.Text = GetString("topmenu_about")
70-
'Checkboxes
71-
Form1.ConfirmExitChkBox.Text = GetString("ui_confirm_exit")
72-
Form1.ConfirmStopBackupChkBox.Text = GetString("ui_confirm_backup_interruption")
73-
Form1.DisplayNotificationChkBox.Text = GetString("ui_backup_notification")
74-
Form1.DisableCloudSyncChkBox.Text = GetString("ui_disable_sync")
75-
Form1.EnableCloudSyncChkBox.Text = GetString("ui_enable_sync")
76-
Form1.CheckUpdatesChkBox.Text = GetString("ui_updates")
77-
Form1.RememberFormPositionChkBox.Text = GetString("ui_coordinates")
7871
'Tasks
7972
Form1.BackupBtn.Text = GetString("ui_tasks_backup")
8073
Form1.StopBtn.Text = GetString("ui_tasks_stop")
@@ -92,9 +85,16 @@ Public Class Localization
9285
'Settings
9386
Form1.SettingsInterfaceLang.Text = GetString("ui_settings_lang_choice")
9487
Form1.SettingsLangRestartLabel.Text = GetString("ui_settings_restart")
95-
Form1.SettingsWriteLogToFileChkBox.Text = GetString("ui_settings_log_file")
88+
Form1.SettingsConfirmExitChkBox.Text = GetString("ui_settings_confirm_exit")
89+
Form1.SettingsConfirmStopBackupChkBox.Text = GetString("ui_settings_confirm_backup_interruption")
90+
Form1.SettingsDisplayNotificationChkBox.Text = GetString("ui_settings_backup_notification")
91+
Form1.SettingsDisableCloudSyncChkBox.Text = GetString("ui_settings_disable_sync")
92+
Form1.SettingsEnableCloudSyncChkBox.Text = GetString("ui_settings_enable_sync")
93+
Form1.SettingsCheckUpdatesChkBox.Text = GetString("ui_settings_updates")
94+
Form1.SettingsRememberFormPositionChkBox.Text = GetString("ui_settings_coordinates")
9695
Form1.SettingsNonUplayVersionChkBox.Text = GetString("ui_settings_nouplay")
9796
Form1.SettingsNonUplayVersionRestartLabel.Text = GetString("ui_settings_restart")
97+
Form1.SettingsWriteLogToFileChkBox.Text = GetString("ui_settings_log_file")
9898
'Logs
9999
Form1.CopyToolStripMenuItem.Text = GetString("ui_logs_context_copy")
100100
Form1.SelectAllToolStripMenuItem.Text = GetString("ui_logs_context_selectall")
@@ -106,14 +106,15 @@ Public Class Localization
106106
Form1.ChangelogLink.Text = GetString("ui_about_changelog")
107107
Form1.LicenseLink.Text = GetString("ui_about_legal")
108108
'Tooltips
109-
Form1.HelpToolTip.SetToolTip(Form1.UplayPictureBtn, GetString("tooltip_launch_uplay"))
110-
Form1.HelpToolTip.SetToolTip(Form1.ConfirmExitChkBox, GetString("tooltip_confirm_exit"))
111-
Form1.HelpToolTip.SetToolTip(Form1.ConfirmStopBackupChkBox, GetString("tooltip_confirm_backup_interruption"))
112-
Form1.HelpToolTip.SetToolTip(Form1.DisplayNotificationChkBox, GetString("tooltip_backup_notification"))
113-
Form1.HelpToolTip.SetToolTip(Form1.DisableCloudSyncChkBox, GetString("tooltip_disable_sync"))
114-
Form1.HelpToolTip.SetToolTip(Form1.EnableCloudSyncChkBox, GetString("tooltip_enable_sync"))
115-
Form1.HelpToolTip.SetToolTip(Form1.CheckUpdatesChkBox, GetString("tooltip_updates"))
116-
Form1.HelpToolTip.SetToolTip(Form1.RememberFormPositionChkBox, GetString("tooltip_coordinates"))
109+
Form1.HelpToolTip.SetToolTip(Form1.UplayBtn, GetString("tooltip_uplay"))
110+
Form1.HelpToolTip.SetToolTip(Form1.BackupFreqUpDown, String.Format(GetString("tooltip_backup_frequency"), Form1.BackupFreqUpDown.Minimum, Form1.BackupFreqUpDown.Maximum))
111+
Form1.HelpToolTip.SetToolTip(Form1.SettingsConfirmExitChkBox, GetString("tooltip_confirm_exit"))
112+
Form1.HelpToolTip.SetToolTip(Form1.SettingsConfirmStopBackupChkBox, GetString("tooltip_confirm_backup_interruption"))
113+
Form1.HelpToolTip.SetToolTip(Form1.SettingsDisplayNotificationChkBox, GetString("tooltip_backup_notification"))
114+
Form1.HelpToolTip.SetToolTip(Form1.SettingsDisableCloudSyncChkBox, GetString("tooltip_disable_sync"))
115+
Form1.HelpToolTip.SetToolTip(Form1.SettingsEnableCloudSyncChkBox, GetString("tooltip_enable_sync"))
116+
Form1.HelpToolTip.SetToolTip(Form1.SettingsCheckUpdatesChkBox, GetString("tooltip_updates"))
117+
Form1.HelpToolTip.SetToolTip(Form1.SettingsRememberFormPositionChkBox, GetString("tooltip_coordinates"))
117118

118119
'Localize Message Box
119120
'Buttons

0 commit comments

Comments
 (0)