diff --git a/GBM/Forms/frmAdvancedImport.vb b/GBM/Forms/frmAdvancedImport.vb
index d3e5997..70ef96b 100644
--- a/GBM/Forms/frmAdvancedImport.vb
+++ b/GBM/Forms/frmAdvancedImport.vb
@@ -84,6 +84,7 @@ Public Class frmAdvancedImport
If oApp.AbsolutePath Then
If Directory.Exists(oApp.Path) Then
oListViewItem.Checked = True
+ SaveChecked(oListViewItem)
Else
oListViewItem.Checked = False
End If
diff --git a/GBM/Forms/frmFilter.Designer.vb b/GBM/Forms/frmFilter.Designer.vb
index b2a9ae4..71f4469 100644
--- a/GBM/Forms/frmFilter.Designer.vb
+++ b/GBM/Forms/frmFilter.Designer.vb
@@ -293,30 +293,29 @@ Partial Class frmFilter
Me.grpFilterType.Controls.Add(Me.optAnd)
Me.grpFilterType.Location = New System.Drawing.Point(259, 81)
Me.grpFilterType.Name = "grpFilterType"
- Me.grpFilterType.Size = New System.Drawing.Size(106, 46)
+ Me.grpFilterType.Size = New System.Drawing.Size(105, 46)
Me.grpFilterType.TabIndex = 8
Me.grpFilterType.TabStop = False
Me.grpFilterType.Text = "Filter Type"
'
'optOr
'
- Me.optOr.Location = New System.Drawing.Point(56, 19)
+ Me.optOr.Checked = True
+ Me.optOr.Location = New System.Drawing.Point(6, 19)
Me.optOr.Name = "optOr"
- Me.optOr.Size = New System.Drawing.Size(36, 17)
- Me.optOr.TabIndex = 1
+ Me.optOr.Size = New System.Drawing.Size(44, 17)
+ Me.optOr.TabIndex = 0
Me.optOr.TabStop = True
- Me.optOr.Text = "Or"
+ Me.optOr.Text = "Any"
Me.optOr.UseVisualStyleBackColor = True
'
'optAnd
'
- Me.optAnd.Checked = True
- Me.optAnd.Location = New System.Drawing.Point(6, 19)
+ Me.optAnd.Location = New System.Drawing.Point(56, 19)
Me.optAnd.Name = "optAnd"
Me.optAnd.Size = New System.Drawing.Size(44, 17)
- Me.optAnd.TabIndex = 0
- Me.optAnd.TabStop = True
- Me.optAnd.Text = "And"
+ Me.optAnd.TabIndex = 1
+ Me.optAnd.Text = "All"
Me.optAnd.UseVisualStyleBackColor = True
'
'txtStringFilter
diff --git a/GBM/Forms/frmFilter.vb b/GBM/Forms/frmFilter.vb
index 0a06276..0907c56 100644
--- a/GBM/Forms/frmFilter.vb
+++ b/GBM/Forms/frmFilter.vb
@@ -13,7 +13,7 @@ Public Class frmFilter
Dim oGameFilters As New List(Of clsGameFilter)
Dim oValidFields As New List(Of clsGameFilterField)
Dim eCurrentFilterType As eFilterType = eFilterType.BaseFilter
- Dim bAndOperator As Boolean = True
+ Dim bAndOperator As Boolean = False
Dim bSortAsc As Boolean = True
Dim sSortField As String = "Name"
Dim hshTags As New Hashtable
@@ -537,7 +537,7 @@ Public Class frmFilter
grpSortOptions.Text = frmFilter_grpSortOptions
'Defaults
- optAnd.Checked = True
+ optOr.Checked = True
optSortAsc.Checked = True
grpGameFilter.Enabled = False
grpTagFilter.Enabled = False
@@ -579,7 +579,7 @@ Public Class frmFilter
If chkGameInfo.Checked Then
grpGameFilter.Enabled = True
Else
- optAnd.Checked = True
+ optOr.Checked = True
grpGameFilter.Enabled = False
oGameFilters.Clear()
lstFilter.Items.Clear()
diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb
index 61983da..c1daa0e 100644
--- a/GBM/Forms/frmGameManager.vb
+++ b/GBM/Forms/frmGameManager.vb
@@ -22,7 +22,7 @@ Public Class frmGameManager
Private oCurrentTagFilters As New List(Of clsTag)
Private oCurrentFilters As New List(Of clsGameFilter)
Private eCurrentFilter As frmFilter.eFilterType = frmFilter.eFilterType.BaseFilter
- Private bCurrentAndOperator As Boolean = True
+ Private bCurrentAndOperator As Boolean = False
Private bCurrentSortAsc As Boolean = True
Private sCurrentSortField As String = "Name"
Private WithEvents tmFilterTimer As Timer
diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb
index 2e9ef39..ef39147 100644
--- a/GBM/My Project/Resources.Designer.vb
+++ b/GBM/My Project/Resources.Designer.vb
@@ -1276,7 +1276,7 @@ Namespace My.Resources
End Property
'''
- ''' Looks up a localized string similar to And.
+ ''' Looks up a localized string similar to All.
'''
Friend ReadOnly Property frmFilter_optAnd() As String
Get
@@ -1294,7 +1294,7 @@ Namespace My.Resources
End Property
'''
- ''' Looks up a localized string similar to Or.
+ ''' Looks up a localized string similar to Any.
'''
Friend ReadOnly Property frmFilter_optOr() As String
Get
diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx
index 11162f3..468bfb0 100644
--- a/GBM/My Project/Resources.resx
+++ b/GBM/My Project/Resources.resx
@@ -905,7 +905,7 @@
All Tags
- And
+ All
Any Tag
@@ -914,7 +914,7 @@
Game Information
- Or
+ Any
Tag
diff --git a/GBM/readme.txt b/GBM/readme.txt
index 9b96e04..77c1e33 100644
--- a/GBM/readme.txt
+++ b/GBM/readme.txt
@@ -1,14 +1,20 @@
-Game Backup Monitor v1.03 Readme
+Game Backup Monitor v1.04 Readme
http://mikemaximus.github.io/gbm-web/
gamebackupmonitor@gmail.com
-August 2, 2017
+September 26, 2017
-New in 1.03
-
-- (Windows) You can no longer Alt-Tab to GBM while it's minimized to the system tray. This was an unintentional change in v1.02 and caused various bugs.
-- (Windows) Fixed various issues and inconsistent behavior when using the system tray and menu.
-- (Linux) Free drive space is now checked correctly when performing a backup. GBM now requires "df" (Coreutils) on Linux.
-- (All) Error messages related to SQLite will now be displayed correctly, instead of forcing the application to exit.
+New in 1.04
+- (All) The import feature now detects most saved games currently on your PC and automatically selects configurations for you.
+- (All) The Game Manager's "Custom Filter" feature has received a major overhaul:
+ - More fields are now available for use.
+ - Added the ability to combine different filters.
+ - Added the ability to set a sort field and order.
+ - The current filter is now saved when the Custom Filter window is closed and re-opened.
+- (All) The "Monitor Only" feature has been updated. This feature allows tracking play time for games that do not require a backup, such as MMOs or CCGs.
+ - The Game Manager now disables and ignores validation on fields that aren't needed for a Monitor Only configuration.
+ - Monitor Only is now included in the XML Import / Export.
+ - Monitor Only configurations may now be included in the official game lists.
+
The entire version history of GBM releases is available at http://mikemaximus.github.io/gbm-web/versionhistory.html
\ No newline at end of file