diff --git a/GUI/GUI.csproj b/GUI/GUI.csproj index 614a5b0..1fee1f4 100644 --- a/GUI/GUI.csproj +++ b/GUI/GUI.csproj @@ -1,4 +1,4 @@ - + net7.0-windows @@ -15,6 +15,7 @@ + diff --git a/GUI/config.json b/GUI/config.json index 86c018d..dc21d17 100644 --- a/GUI/config.json +++ b/GUI/config.json @@ -3,5 +3,5 @@ "wikiUrl": "https://github.com/naschorr/deep-rock-galactic-save-syncer/wiki", "updateCheckUrl": "https://api.github.com/repos/naschorr/deep-rock-galactic-save-syncer/releases", "overwriteFileRefreshIgnoreLockChangesMilliseconds": 7500, - "exitSteamExampleUrl": "https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/dev/resources/images/exit_steam_guide.png" + "exitSteamExampleUrl": "https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/140-splash-screen-logo/resources/images/exit_steam_guide.png" } diff --git a/GUI/electron.manifest.json b/GUI/electron.manifest.json index 5fd43a8..d21f391 100644 --- a/GUI/electron.manifest.json +++ b/GUI/electron.manifest.json @@ -1,7 +1,7 @@ { "executable": "GUI", "splashscreen": { - "imageFile": "/wwwroot/images/logo.png" + "imageFile": "/wwwroot/images/logo_splash.png" }, "name": "DeepRockGalacticSaveSyncer", "author": "Nick Schorr", diff --git a/GUI/icon.ico b/GUI/icon.ico index c64525e..73fe4cd 100644 Binary files a/GUI/icon.ico and b/GUI/icon.ico differ diff --git a/README.md b/README.md index ad8c0e0..89ef221 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -

+

# Deep Rock Galactic Save Syncer ![tests workflow](https://github.com/naschorr/deep-rock-galactic-save-syncer/actions/workflows/tests.yml/badge.svg) Easily keep your Steam and Xbox save files for Deep Rock Galactic synced up! That means no more lost progress when swapping between platforms to play with your friends. -

+

> Here's an example of the DRGSS interface @@ -22,22 +22,22 @@ There's no need to configure anything, just install and go! The save file that's progressed the most is automatically chosen to overwrite the other. In the screenshot above, the Steam save file's Driller has one more promotion than the Xbox save file, and so the Steam save file will be kept. Granular save file comparison lets you see what's changed at a glance: -

+

> Notice that the Gunner on the left has been promoted once to Gold I, while the one on the right is still Silver III. Since the left Gunner has more promotions, it means that the left save file has likely been played more recently. The `>` operator in the middle confirms this. ### One-click operation by default The big button at the bottom lets you know what's going to happen when you click on it: -

+

-

+

### Override the defaults and choose the save you want to keep Don't agree with DRGSS' choice? Click the save you'd like to keep to override it! ### Quickly open your save file's directory in the explorer -Access the save files yourself with a single click! Each save file has a button that'll open it for you. +Access the save files yourself with a single click! Each save file has a button that'll open it for you. ### Save files are backed up during the sync operation Chose the wrong file accidentally? Just delete the invalid one, and rename the `*.backup` file back to the original name. Alternatively, check out the [wiki](https://github.com/naschorr/deep-rock-galactic-save-syncer/wiki/Troubleshooting#restoring-drgss-backups) page that goes over restoring backups. @@ -45,17 +45,17 @@ Chose the wrong file accidentally? Just delete the invalid one, and rename the ` ### Refresh the save files Has something changed? Hit the refresh button to update your save files before syncing. -

+

### Safe save file manipulation DRGSS won't try to interfere with a save file while it's being written to by the game, so just hold tight until the all clear is given. -

+

### Divergent save file detection If you've made progress with both save files separately, DRGSS will alert you of this via the button at the bottom: -

+

To fix this, simply pick a save file to keep, and the button will become enabled again. diff --git a/resources/icon.svg b/resources/icon.svg index 2bc83c2..6082595 100644 --- a/resources/icon.svg +++ b/resources/icon.svg @@ -7,9 +7,9 @@ viewBox="0 0 79.374999 79.374999" version="1.1" id="svg5" - inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" + inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" sodipodi:docname="icon.svg" - inkscape:export-filename="H:\Google Drive\Code\Csharp\DeepRockGalacticSaveSyncer\resources\icon.png" + inkscape:export-filename="images\logo.png" inkscape:export-xdpi="81.919998" inkscape:export-ydpi="81.919998" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -29,15 +29,17 @@ showgrid="false" width="300mm" units="px" - inkscape:zoom="2" - inkscape:cx="120.5" - inkscape:cy="159" - inkscape:window-width="2497" + inkscape:zoom="2.8284271" + inkscape:cx="157.33126" + inkscape:cy="169.1753" + inkscape:window-width="2490" inkscape:window-height="1417" - inkscape:window-x="-32000" - inkscape:window-y="-32000" - inkscape:window-maximized="0" - inkscape:current-layer="layer1" /> + inkscape:window-x="62" + inkscape:window-y="1129" + inkscape:window-maximized="1" + inkscape:current-layer="svg5" + inkscape:showpageshadow="0" + inkscape:deskcolor="#505050" /> + style="display:inline;opacity:1;fill:#000000;stroke:#ffffff;stroke-width:2.37061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 1.1655771,1.1803027 V 12.099198 h 2.9553533 v 34.321236 l 22.2933586,0.02943 V 1.1803027 Z M 12.816547,12.034789 h 4.799558 v 23.914055 h -4.799558 z" /> SS + y="217.91509" + id="tspan1">SS diff --git a/resources/icons/icon.ico b/resources/icons/icon.ico index c64525e..73fe4cd 100644 Binary files a/resources/icons/icon.ico and b/resources/icons/icon.ico differ diff --git a/resources/images/logo.png b/resources/images/logo.png index 2c6884e..3c69b7b 100644 Binary files a/resources/images/logo.png and b/resources/images/logo.png differ diff --git a/resources/images/logo_splash.png b/resources/images/logo_splash.png new file mode 100644 index 0000000..c4044f9 Binary files /dev/null and b/resources/images/logo_splash.png differ