dunestorm/GBM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted new Sync settings

Browse Source
This commit is contained in:
Michael J. Seiferling
2016-05-24 11:15:29 -06:00
parent d788c751f7
commit 39460f57d5
6 changed files with 31 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GBM/Forms/frmSettings.Designer.vb
Generated
+29 -124
View File
@@ -26,10 +26,10 @@ Partial Class frmSettings
Me.chkBackupConfirm = New System.Windows.Forms.CheckBox()
Me.grpGeneral = New System.Windows.Forms.GroupBox()
Me.chkTimeTracking = New System.Windows.Forms.CheckBox()
Me.chkSync = New System.Windows.Forms.CheckBox()
Me.chkStartWindows = New System.Windows.Forms.CheckBox()
Me.chkShowDetectionTips = New System.Windows.Forms.CheckBox()
Me.chkStartToTray = New System.Windows.Forms.CheckBox()
Me.chkSync = New System.Windows.Forms.CheckBox()
Me.grpPaths = New System.Windows.Forms.GroupBox()
Me.btnBackupFolder = New System.Windows.Forms.Button()
Me.lblBackupFolder = New System.Windows.Forms.Label()
@@ -54,21 +54,12 @@ Partial Class frmSettings
Me.lbl7zProduct = New System.Windows.Forms.Label()
Me.cboCompression = New System.Windows.Forms.ComboBox()
Me.lblCompression = New System.Windows.Forms.Label()
Me.grpSync = New System.Windows.Forms.GroupBox()
Me.grpSyncData = New System.Windows.Forms.GroupBox()
Me.chkSyncTags = New System.Windows.Forms.CheckBox()
Me.chkSyncAll = New System.Windows.Forms.CheckBox()
Me.chkSyncGameConfigs = New System.Windows.Forms.CheckBox()
Me.chkSyncGameInfo = New System.Windows.Forms.CheckBox()
Me.chkSyncHours = New System.Windows.Forms.CheckBox()
Me.btnDefaults = New System.Windows.Forms.Button()
Me.grpGeneral.SuspendLayout()
Me.grpPaths.SuspendLayout()
Me.grpBackup.SuspendLayout()
CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).BeginInit()
Me.grp7z.SuspendLayout()
Me.grpSync.SuspendLayout()
Me.grpSyncData.SuspendLayout()
Me.SuspendLayout()
'
'chkMonitorOnStartup
@@ -94,13 +85,14 @@ Partial Class frmSettings
'grpGeneral
'
Me.grpGeneral.Controls.Add(Me.chkTimeTracking)
Me.grpGeneral.Controls.Add(Me.chkSync)
Me.grpGeneral.Controls.Add(Me.chkStartWindows)
Me.grpGeneral.Controls.Add(Me.chkShowDetectionTips)
Me.grpGeneral.Controls.Add(Me.chkStartToTray)
Me.grpGeneral.Controls.Add(Me.chkMonitorOnStartup)
Me.grpGeneral.Location = New System.Drawing.Point(12, 12)
Me.grpGeneral.Name = "grpGeneral"
Me.grpGeneral.Size = New System.Drawing.Size(215, 165)
Me.grpGeneral.Size = New System.Drawing.Size(360, 165)
Me.grpGeneral.TabIndex = 0
Me.grpGeneral.TabStop = False
Me.grpGeneral.Text = "General"
@@ -115,6 +107,16 @@ Partial Class frmSettings
Me.chkTimeTracking.Text = "Enable time tracking"
Me.chkTimeTracking.UseVisualStyleBackColor = True
'
'chkSync
'
Me.chkSync.AutoSize = True
Me.chkSync.Location = New System.Drawing.Point(6, 134)
Me.chkSync.Name = "chkSync"
Me.chkSync.Size = New System.Drawing.Size(100, 17)
Me.chkSync.TabIndex = 0
Me.chkSync.Text = "Enable Syncing"
Me.chkSync.UseVisualStyleBackColor = True
'
'chkStartWindows
'
Me.chkStartWindows.AutoSize = True
@@ -145,22 +147,12 @@ Partial Class frmSettings
Me.chkStartToTray.Text = "Start to system tray"
Me.chkStartToTray.UseVisualStyleBackColor = True
'
'chkSync
'
Me.chkSync.AutoSize = True
Me.chkSync.Location = New System.Drawing.Point(6, 21)
Me.chkSync.Name = "chkSync"
Me.chkSync.Size = New System.Drawing.Size(100, 17)
Me.chkSync.TabIndex = 0
Me.chkSync.Text = "Enable Syncing"
Me.chkSync.UseVisualStyleBackColor = True
'
'grpPaths
'
Me.grpPaths.Controls.Add(Me.btnBackupFolder)
Me.grpPaths.Controls.Add(Me.lblBackupFolder)
Me.grpPaths.Controls.Add(Me.txtBackupFolder)
Me.grpPaths.Location = New System.Drawing.Point(233, 326)
Me.grpPaths.Location = New System.Drawing.Point(378, 183)
Me.grpPaths.Name = "grpPaths"
Me.grpPaths.Size = New System.Drawing.Size(360, 60)
Me.grpPaths.TabIndex = 3
@@ -187,15 +179,15 @@ Partial Class frmSettings
'
'txtBackupFolder
'
Me.txtBackupFolder.Location = New System.Drawing.Point(110, 24)
Me.txtBackupFolder.Location = New System.Drawing.Point(91, 24)
Me.txtBackupFolder.Name = "txtBackupFolder"
Me.txtBackupFolder.Size = New System.Drawing.Size(211, 20)
Me.txtBackupFolder.Size = New System.Drawing.Size(230, 20)
Me.txtBackupFolder.TabIndex = 1
'
'btnSave
'
Me.btnSave.DialogResult = System.Windows.Forms.DialogResult.OK
Me.btnSave.Location = New System.Drawing.Point(437, 392)
Me.btnSave.Location = New System.Drawing.Point(586, 305)
Me.btnSave.Name = "btnSave"
Me.btnSave.Size = New System.Drawing.Size(75, 23)
Me.btnSave.TabIndex = 5
@@ -205,7 +197,7 @@ Partial Class frmSettings
'btnCancel
'
Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
Me.btnCancel.Location = New System.Drawing.Point(518, 392)
Me.btnCancel.Location = New System.Drawing.Point(667, 305)
Me.btnCancel.Name = "btnCancel"
Me.btnCancel.Size = New System.Drawing.Size(75, 23)
Me.btnCancel.TabIndex = 6
@@ -222,7 +214,7 @@ Partial Class frmSettings
Me.grpBackup.Controls.Add(Me.chkOverwriteWarning)
Me.grpBackup.Controls.Add(Me.chkCreateFolder)
Me.grpBackup.Controls.Add(Me.chkBackupConfirm)
Me.grpBackup.Location = New System.Drawing.Point(233, 12)
Me.grpBackup.Location = New System.Drawing.Point(378, 12)
Me.grpBackup.Name = "grpBackup"
Me.grpBackup.Size = New System.Drawing.Size(360, 165)
Me.grpBackup.TabIndex = 2
@@ -303,13 +295,11 @@ Partial Class frmSettings
Me.grp7z.Controls.Add(Me.lblLocation)
Me.grp7z.Controls.Add(Me.txt7zArguments)
Me.grp7z.Controls.Add(Me.lblArguments)
Me.grp7z.Controls.Add(Me.lbl7zCopyright)
Me.grp7z.Controls.Add(Me.lbl7zProduct)
Me.grp7z.Controls.Add(Me.cboCompression)
Me.grp7z.Controls.Add(Me.lblCompression)
Me.grp7z.Location = New System.Drawing.Point(233, 183)
Me.grp7z.Location = New System.Drawing.Point(12, 183)
Me.grp7z.Name = "grp7z"
Me.grp7z.Size = New System.Drawing.Size(360, 137)
Me.grp7z.Size = New System.Drawing.Size(360, 102)
Me.grp7z.TabIndex = 3
Me.grp7z.TabStop = False
Me.grp7z.Text = "7z Options"
@@ -357,17 +347,17 @@ Partial Class frmSettings
'
'lbl7zCopyright
'
Me.lbl7zCopyright.Location = New System.Drawing.Point(9, 114)
Me.lbl7zCopyright.Location = New System.Drawing.Point(375, 265)
Me.lbl7zCopyright.Name = "lbl7zCopyright"
Me.lbl7zCopyright.Size = New System.Drawing.Size(345, 20)
Me.lbl7zCopyright.Size = New System.Drawing.Size(363, 20)
Me.lbl7zCopyright.TabIndex = 8
Me.lbl7zCopyright.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'lbl7zProduct
'
Me.lbl7zProduct.Location = New System.Drawing.Point(9, 97)
Me.lbl7zProduct.Location = New System.Drawing.Point(375, 246)
Me.lbl7zProduct.Name = "lbl7zProduct"
Me.lbl7zProduct.Size = New System.Drawing.Size(345, 20)
Me.lbl7zProduct.Size = New System.Drawing.Size(363, 20)
Me.lbl7zProduct.TabIndex = 7
Me.lbl7zProduct.TextAlign = System.Drawing.ContentAlignment.TopRight
'
@@ -389,84 +379,9 @@ Partial Class frmSettings
Me.lblCompression.TabIndex = 0
Me.lblCompression.Text = "Compression:"
'
'grpSync
'
Me.grpSync.Controls.Add(Me.grpSyncData)
Me.grpSync.Controls.Add(Me.chkSync)
Me.grpSync.Location = New System.Drawing.Point(12, 183)
Me.grpSync.Name = "grpSync"
Me.grpSync.Size = New System.Drawing.Size(215, 203)
Me.grpSync.TabIndex = 1
Me.grpSync.TabStop = False
Me.grpSync.Text = "Sync Options"
'
'grpSyncData
'
Me.grpSyncData.Controls.Add(Me.chkSyncTags)
Me.grpSyncData.Controls.Add(Me.chkSyncAll)
Me.grpSyncData.Controls.Add(Me.chkSyncGameConfigs)
Me.grpSyncData.Controls.Add(Me.chkSyncGameInfo)
Me.grpSyncData.Controls.Add(Me.chkSyncHours)
Me.grpSyncData.Location = New System.Drawing.Point(6, 47)
Me.grpSyncData.Name = "grpSyncData"
Me.grpSyncData.Size = New System.Drawing.Size(194, 140)
Me.grpSyncData.TabIndex = 1
Me.grpSyncData.TabStop = False
Me.grpSyncData.Text = "Sync Data"
'
'chkSyncTags
'
Me.chkSyncTags.AutoSize = True
Me.chkSyncTags.Location = New System.Drawing.Point(6, 88)
Me.chkSyncTags.Name = "chkSyncTags"
Me.chkSyncTags.Size = New System.Drawing.Size(50, 17)
Me.chkSyncTags.TabIndex = 3
Me.chkSyncTags.Text = "Tags"
Me.chkSyncTags.UseVisualStyleBackColor = True
'
'chkSyncAll
'
Me.chkSyncAll.AutoSize = True
Me.chkSyncAll.Location = New System.Drawing.Point(6, 111)
Me.chkSyncAll.Name = "chkSyncAll"
Me.chkSyncAll.Size = New System.Drawing.Size(164, 17)
Me.chkSyncAll.TabIndex = 4
Me.chkSyncAll.Text = "All Data (Not Recommended)"
Me.chkSyncAll.UseVisualStyleBackColor = True
'
'chkSyncGameConfigs
'
Me.chkSyncGameConfigs.AutoSize = True
Me.chkSyncGameConfigs.Location = New System.Drawing.Point(6, 19)
Me.chkSyncGameConfigs.Name = "chkSyncGameConfigs"
Me.chkSyncGameConfigs.Size = New System.Drawing.Size(124, 17)
Me.chkSyncGameConfigs.TabIndex = 0
Me.chkSyncGameConfigs.Text = "Game Configurations"
Me.chkSyncGameConfigs.UseVisualStyleBackColor = True
'
'chkSyncGameInfo
'
Me.chkSyncGameInfo.AutoSize = True
Me.chkSyncGameInfo.Location = New System.Drawing.Point(6, 42)
Me.chkSyncGameInfo.Name = "chkSyncGameInfo"
Me.chkSyncGameInfo.Size = New System.Drawing.Size(109, 17)
Me.chkSyncGameInfo.TabIndex = 1
Me.chkSyncGameInfo.Text = "Game Information"
Me.chkSyncGameInfo.UseVisualStyleBackColor = True
'
'chkSyncHours
'
Me.chkSyncHours.AutoSize = True
Me.chkSyncHours.Location = New System.Drawing.Point(6, 65)
Me.chkSyncHours.Name = "chkSyncHours"
Me.chkSyncHours.Size = New System.Drawing.Size(80, 17)
Me.chkSyncHours.TabIndex = 2
Me.chkSyncHours.Text = "Game Time"
Me.chkSyncHours.UseVisualStyleBackColor = True
'
'btnDefaults
'
Me.btnDefaults.Location = New System.Drawing.Point(12, 392)
Me.btnDefaults.Location = New System.Drawing.Point(12, 305)
Me.btnDefaults.Name = "btnDefaults"
Me.btnDefaults.Size = New System.Drawing.Size(110, 23)
Me.btnDefaults.TabIndex = 4
@@ -477,14 +392,15 @@ Partial Class frmSettings
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(604, 426)
Me.Controls.Add(Me.grpSync)
Me.ClientSize = New System.Drawing.Size(749, 336)
Me.Controls.Add(Me.btnDefaults)
Me.Controls.Add(Me.grp7z)
Me.Controls.Add(Me.grpBackup)
Me.Controls.Add(Me.grpPaths)
Me.Controls.Add(Me.btnCancel)
Me.Controls.Add(Me.lbl7zCopyright)
Me.Controls.Add(Me.btnSave)
Me.Controls.Add(Me.lbl7zProduct)
Me.Controls.Add(Me.grpGeneral)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
Me.MaximizeBox = False
@@ -503,10 +419,6 @@ Partial Class frmSettings
CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).EndInit()
Me.grp7z.ResumeLayout(False)
Me.grp7z.PerformLayout()
Me.grpSync.ResumeLayout(False)
Me.grpSync.PerformLayout()
Me.grpSyncData.ResumeLayout(False)
Me.grpSyncData.PerformLayout()
Me.ResumeLayout(False)
End Sub
@@ -537,17 +449,10 @@ Partial Class frmSettings
Friend WithEvents lblCompression As Label
Friend WithEvents lbl7zProduct As Label
Friend WithEvents lbl7zCopyright As Label
Friend WithEvents grpSync As GroupBox
Friend WithEvents chkSyncGameConfigs As CheckBox
Friend WithEvents btn7zLocation As Button
Friend WithEvents txt7zLocation As TextBox
Friend WithEvents lblLocation As Label
Friend WithEvents txt7zArguments As TextBox
Friend WithEvents lblArguments As Label
Friend WithEvents chkSyncHours As CheckBox
Friend WithEvents chkSyncGameInfo As CheckBox
Friend WithEvents btnDefaults As Button
Friend WithEvents grpSyncData As GroupBox
Friend WithEvents chkSyncAll As CheckBox
Friend WithEvents chkSyncTags As CheckBox
End Class
GBM/Forms/frmSettings.vb
-49
View File
@@ -41,30 +41,6 @@ Public Class frmSettings
End If
End Sub
Private Sub HandleSyncState()
If chkSync.Checked Then
grpSyncData.Enabled = True
Else
grpSyncData.Enabled = False
End If
End Sub
Private Sub HandleSyncAllDataState()
If chkSyncAll.Checked Then
For Each chk As CheckBox In grpSyncData.Controls
If Not chk Is chkSyncAll Then
chk.Enabled = False
End If
Next
Else
For Each chk As CheckBox In grpSyncData.Controls
If Not chk Is chkSyncAll Then
chk.Enabled = True
End If
Next
End If
End Sub
Private Function ValidateSettings() As Boolean
'Only modify registry key when the value changed
@@ -103,11 +79,6 @@ Public Class frmSettings
bBackupLocationChanged = True
End If
oSettings.Sync = chkSync.Checked
oSettings.SyncGameConfigs = chkSyncGameConfigs.Checked
oSettings.SyncGameInfo = chkSyncGameInfo.Checked
oSettings.SyncHours = chkSyncHours.Checked
oSettings.SyncTags = chkSyncTags.Checked
oSettings.SyncAll = chkSyncAll.Checked
If Directory.Exists(txtBackupFolder.Text) Then
If oSettings.BackupFolder <> txtBackupFolder.Text Then
@@ -179,11 +150,6 @@ Public Class frmSettings
chkRestoreOnLaunch.Checked = oSettings.RestoreOnLaunch
txtBackupFolder.Text = oSettings.BackupFolder
chkSync.Checked = oSettings.Sync
chkSyncGameConfigs.Checked = oSettings.SyncGameConfigs
chkSyncGameInfo.Checked = oSettings.SyncGameInfo
chkSyncHours.Checked = oSettings.SyncHours
chkSyncTags.Checked = oSettings.SyncTags
chkSyncAll.Checked = oSettings.SyncAll
chkCheckSum.Checked = oSettings.CheckSum
chkTimeTracking.Checked = oSettings.TimeTracking
chkSupressBackup.Checked = oSettings.SupressBackup
@@ -247,13 +213,6 @@ Public Class frmSettings
chkMonitorOnStartup.Text = frmSettings_chkMonitorOnStartup
grp7z.Text = frmSettings_grp7z
lblCompression.Text = frmSettings_lblCompression
grpSync.Text = frmSettings_grpSync
grpSyncData.Text = frmSettings_grpSyncOptions
chkSyncGameConfigs.Text = frmSettings_chkSyncGameConfigs
chkSyncGameInfo.Text = frmSettings_chkSyncGameInfo
chkSyncHours.Text = frmSettings_chkSyncHours
chkSyncTags.Text = frmSettings_chkSyncTags
chkSyncAll.Text = frmSettings_chkSyncAll
btnDefaults.Text = frmSettings_btnDefaults
lblArguments.Text = frmSettings_lblArguments
lblLocation.Text = frmSettings_lblLocation
@@ -308,14 +267,6 @@ Public Class frmSettings
nudSupressBackupThreshold.Enabled = chkSupressBackup.Checked
End Sub
Private Sub chkSync_CheckedChanged(sender As Object, e As EventArgs) Handles chkSync.CheckedChanged
HandleSyncState()
End Sub
Private Sub chkSyncAllData_CheckedChanged(sender As Object, e As EventArgs) Handles chkSyncAll.CheckedChanged
HandleSyncAllDataState()
End Sub
Private Sub txt7zLocation_Leave(sender As Object, e As EventArgs) Handles txt7zLocation.Leave
Get7zInfo(txt7zLocation.Text.Trim)
End Sub