From afb479044c79af39de3e9ff14f924a962726cc29 Mon Sep 17 00:00:00 2001
From: MikeMaximus <mseiferling@gmail.com>
Date: Tue, 6 Mar 2018 10:02:15 -0600
Subject: [PATCH] Added icons to import

---
 GBM/Forms/frmAdvancedImport.vb       |  12 +++++++++++-
 GBM/Game Backup Monitor.vbproj       |   2 ++
 GBM/My Project/Resources.Designer.vb |  20 ++++++++++++++++++++
 GBM/My Project/Resources.resx        |   6 ++++++
 GBM/Resources/New.png                | Bin 0 -> 926 bytes
 GBM/Resources/Update.png             | Bin 0 -> 891 bytes
 GBM/readme.txt                       |  13 ++++++++++---
 7 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 GBM/Resources/New.png
 create mode 100644 GBM/Resources/Update.png

diff --git a/GBM/Forms/frmAdvancedImport.vb b/GBM/Forms/frmAdvancedImport.vb
index 2ec181d..f9202e1 100644
--- a/GBM/Forms/frmAdvancedImport.vb
+++ b/GBM/Forms/frmAdvancedImport.vb
@@ -9,6 +9,7 @@ Public Class frmAdvancedImport
     Private bSelectAll As Boolean = True
     Private bIsLoading As Boolean = False
     Private iCurrentSort As Integer = 0
+    Private oImageList As ImageList
     Private WithEvents tmFilterTimer As Timer
 
     Public Property ImportInfo As ExportData
@@ -104,8 +105,10 @@ Public Class frmAdvancedImport
             End If
 
             If oApp.ImportUpdate Then
-                oListViewItem.ForeColor = Color.Red
+                oListViewItem.ImageIndex = 1
                 oListViewItem.Checked = True
+            Else
+                oListViewItem.ImageIndex = 0
             End If
 
             If sFilter = String.Empty Then
@@ -161,6 +164,13 @@ Public Class frmAdvancedImport
         btnImport.Text = frmAdvancedImport_btnImport
         chkSelectAll.Text = frmAdvancedImport_chkSelectAll
 
+
+        'Set Icons
+        oImageList = New ImageList()
+        oImageList.Images.Add(Icon_New)
+        oImageList.Images.Add(Icon_Update)
+        lstGames.SmallImageList = oImageList
+
         chkSelectAll.Checked = True
 
         'Init Filter Timer
diff --git a/GBM/Game Backup Monitor.vbproj b/GBM/Game Backup Monitor.vbproj
index 1384ed4..88a2cc1 100644
--- a/GBM/Game Backup Monitor.vbproj	
+++ b/GBM/Game Backup Monitor.vbproj	
@@ -365,6 +365,8 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="References\Mono.Data.Sqlite.dll" />
+    <Content Include="Resources\New.png" />
+    <Content Include="Resources\Update.png" />
     <Content Include="Utilities\x64\7za.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb
index 353741e..f668fd2 100644
--- a/GBM/My Project/Resources.Designer.vb	
+++ b/GBM/My Project/Resources.Designer.vb	
@@ -5098,6 +5098,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property Icon_New() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("Icon_New", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized resource of type System.Drawing.Bitmap.
         '''</summary>
@@ -5138,6 +5148,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property Icon_Update() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("Icon_Update", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized resource of type System.Drawing.Bitmap.
         '''</summary>
diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx
index 05992c3..e5d5567 100644
--- a/GBM/My Project/Resources.resx	
+++ b/GBM/My Project/Resources.resx	
@@ -2056,4 +2056,10 @@
   <data name="frmSettings_ConfirmMessageReset" xml:space="preserve">
     <value>Do you want to reset all hidden warnings and messages?</value>
   </data>
+  <data name="Icon_New" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\New.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Icon_Update" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Update.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/GBM/Resources/New.png b/GBM/Resources/New.png
new file mode 100644
index 0000000000000000000000000000000000000000..14d0fff80a6d0b85fd2c029290c5e5c03e957716
GIT binary patch
literal 926
zcmV;P17ZA$P)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;sXW`8~_-&FGT<V11m{H
zK~zY`?UlWY9c2{8pYzVgy|Xv$Rwfd4L2N9<2nr(Dm_oM*q!2~@3#=`*NMUK`Kaf5c
z8=Gy`R2G7ujba~Bvk=(qdgso(=i{-M%_Vp5Vs2zA@olD<;r-2Xp68qc{MV0c^3k=M
z-=u3Vy>NABt9hrcDisls06^rNtE2g1|EnK=xpVOGd-1rt%1wYT?_R#FQhw3QF1#|W
zCx8eb1OrH22W#^iuRXu}^8xVZD8Q<${K(|E?*z4!5E%+X2D$~%nJnt6<|cP-1XT4v
zi9P~|7)rTxL=v0=jm<pV2$+q4yQmXXUwLOvs0YkA9#A77PGogNIs>$TI-wEc0gVX-
zC8+~(Mxh(wloXUFYl}~A-j=PWp1m|{rW7O~2}A@YMS0)wYLxY@x|vNL2Ik=*iGF_4
zi}vq7J(cg_0gxbv=W)A``TXSY%Mag<6@^F5#l79_3!m=Hnr;Y#K$6f|Y%}x9y__c5
z;@n@3ax%F%EpJ_F(sv*O5ksFcusyAsA0D(f0356UP0DwFU+~SNqJX3{0A)yF8>hht
zKetSTV2*lnx5rgrP)7oEM{bGCw6_NAvfux0ZkR|wWPJw7V}{b<quvtBKJ8BwnMv0|
zqpB`G#9ZLu2s4u)JOJ}pPigi5)IoKKj5DZ7KsBJ}0<#0Pfoc$>N2bZY*GLjs6`E}w
z*!O)EWd|=NkfK<cC;%ujsOCS`4;-Solo#Q!wnJX@)w+i{?}xN+sqr}}OBYE)cR+x$
z+(|{fB`JYtr~&~a5SClIJpc#>0S3af@NRyWn)lZg&bvFcRM&+v6Dv6+H9<tcT)fDX
zZxwYjg`_h^1-xJM2>T!*ekBJOgP>*coaf!iUw=H&0>1M3*UzNs>~=ZZc|Dco>GB=c
zVwl0(<8Py1eDu?2*YAzAEy9xOab!i}s=`o%WsS&r#Py_xBraYV5{lI%s=>0Y4fPR#
ziXs~X)rt?y23JF<jkpi9A<^K4LQrBE90u5DL{>x|6WDbEi$(%K-$PD;WB}TOecQlQ
zMgxW|4kLJj9(yQyU5-8ibgd+GKUsf>{||t_0h<W`{D1{8iU0rr07*qoM6N<$f&xvM
A^Z)<=

literal 0
HcmV?d00001

diff --git a/GBM/Resources/Update.png b/GBM/Resources/Update.png
new file mode 100644
index 0000000000000000000000000000000000000000..c05f8e02ae24325efda36c9e29e80ca1868da2ab
GIT binary patch
literal 891
zcmV->1BCpEP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;sXW`93fQEKN|o50|-e(
zK~zY`?Uqky6iF0^f7M;nJu~f2hS6lasjNcKgP;TyJmjFD2yRdWz355VgY2>k3ONXp
zoINNA20>I%4_*wSM%1v1q7cQP23Hnca@k$7>}dYXOn1HasyqaTfN?U(=xHse+k3yS
zzt`181K-vxt9Njyy=QQ!eIdQxd>f8G8riTommBuenc<%MFE)HtVE4U|)hm`1F0{54
z!%V(4Ol6}BJr93h{Z)X6Z$B@tTUt1!GSRBP*oT*nptHGEDixmUzWuEDMS=USKh3un
z^QXOZwsSOAFrq*LK!@<tQK!x>I^F%-%lsDs9)0{)b+qOV6&6KZqp`!35hTP&h+$YD
zehScG7cmYUd;F(r8fZ$T1NkWGeNzESRRNK$Z9^8s4o;^59rTX<Gj?FEyt+^H>y6<b
zI+nLx{nv#UEelef0^nwiu~raIyhBo{boK36-#>5Qk%8x%SGMMECPAcMPY?p%o1Ill
za$sVZ$@grk@wT(OI_@+)(w%4TZd_Ar=^J-}9w{Yo;t(4_Om()gV5fi}($3R;d(Pe6
z*pT6tll|ZCSiACaC6(>?qXIzr^ZKxz6`1lQs^g_0s+RZm|G53lXMyW`FSTu6v+R6J
z?z^q8#vN>!fuGWFt}&Q`g0KOVr;tpIgR7MRA+vwrmz`rDYxK;9LPpb*w|`$#`oF<2
zlTE^WVYg04n>?>EODhDblpoOK`zw-ELt!dgE7b5Q-FoKUPpK$(LZ`E+e`2PiI4;9X
zP5gZ8VCTutRq1*WakUzVA0qI>h73(?Kye(@tEme#hG7lE1>At&bUhPe!9ZexV}T=?
zYx+=dAQmvm!hwlcSQ1#01`HLL1uV7+Lu27m0wICIT=%jA8v&bUfXuMO@M|M=b#F*v
zfp8P=(2&3<hG!T`d2<?yVF)#2NDN5`o=<@9&#+WA2%rGx04J~sL5P|#jN<^Jpu|CW
zK2Woq2?XFQU<Ed*0452VFib8&T#I56C~umhKA9wx1DvyPlK5b{`2YTi{s38BpgoxS
R)i(eD002ovPDHLkV1m})lIs8f

literal 0
HcmV?d00001

diff --git a/GBM/readme.txt b/GBM/readme.txt
index 20975da..74ad610 100644
--- a/GBM/readme.txt
+++ b/GBM/readme.txt
@@ -22,11 +22,17 @@ All Platforms:
 	- When a game is deleted via Game Manager (or sync), all backup manifest entries for that particular game are now deleted. The backup files themselves are not.
 	- The Game Manager now syncs changes to the remote database immediately, instead of only when closed.
 - Core Design Changes (Features)
+	- Added the ability to display messages that can be supressed.  These messages can be reset via the Settings screen.
 	- The "Enable Sync" feature is now mandatory and the option been removed from Settings.
-	- The "Clean Local Manifest" feature has been removed.  It is no longer required because manfiest entries can no longer be orphaned.  Existing orphaned entries will be removed during the v1.1.0 database upgrade.
+	- The "Clean Local Manifest" feature has been removed.  It is not required because manfiest entries are no longer orphaned by design.  Existing orphaned entries will be removed during the v1.1.0 database upgrade.
+	- Added "Sync Game IDs" feature.  This allows the user to update their game configuration identifiers to match the official list or an export file.
+		- The sync is based on similarly named game configurations, therefore it's not 100% effective.  Some data may be missed and require manual changes.
+		- This is mainly an optional upgrade tool for users with existing data from older versions.				
 - Import / Export Changes
-	- When importing a game list, GBM now uses the Game ID to determine if a game is new or has an updated configuration.
-	- Games with an updated configuration are identified by red text.
+	- GBM will offer to "Sync Game IDs" when importing from the official list after upgrading to v1.1.0.  
+		- This offer only appears once and only appears for users that have upgraded from an older version.
+	- GBM now uses the Game ID to determine if a game is new or has an updated configuration.
+	- Added icons to the import list to indicate a "New" or "Updated" game.
 - Added Regular Expression support for game detection
 	- This feature allows GBM to detect games based on a pattern instead of a single process name.
 	- This allows GBM to better support games that run from multiple executables and games that use interpreters or emulators.
@@ -49,5 +55,6 @@ Known Issues:
 - If one or more Game IDs are changed on one computer and these changes are synced to another PC sharing the same backup folder:
 	- The local session data on that PC for the changed game(s) will be lost.
 	- The local backup manifest data for the changed game(s) on that PC will be reset.  GBM will see any backups for the changed game(s) as new and will handle them accordingly.
+- If the "Create a sub-folder..." option is enabled, GBM may leave empty folders when backups are updated or deleted.  This only only applies to folders created with a prior version of GBM.
 
 The entire version history of GBM releases is available at http://mikemaximus.github.io/gbm-web/versionhistory.html
\ No newline at end of file