Option to merge games from different sources

Former-commit-id: 9906b6a

data/com.github.tkashkin.gamehub.appdata.xml.in

@@ -41,6 +41,11 @@
 	</screenshots>
 
 	<releases>
+		<release type="development" version="0.8.0" date="2018-08-15">
+			<description>
+				<p>Option to merge games from different sources</p>
+			</description>
+		</release>
 		<release type="development" version="0.7.0" date="2018-08-09">
 			<description>
 				<p>Settings dialog rework</p>

data/com.github.tkashkin.gamehub.gschema.xml

@@ -40,6 +40,9 @@
 		<key name="compact-list" type="b">
 			<default>false</default>
 		</key>
+		<key name="merge-games" type="b">
+			<default>true</default>
+		</key>
 	</schema>
 
 	<schema path="/com/github/tkashkin/gamehub/auth/steam/" id="com.github.tkashkin.gamehub.auth.steam" gettext-domain="com.github.tkashkin.gamehub">

debian/changelog

@@ -1,3 +1,9 @@
+com.github.tkashkin.gamehub (0.8.0) xenial; urgency=low
+
+  * Option to merge games from different sources
+
+ -- tkashkin <[email protected]>  Wed, 15 Aug 2018 16:25:54 +0300
+
 com.github.tkashkin.gamehub (0.7.0) xenial; urgency=low
 
   * Settings dialog rework

meson.build

@@ -1,4 +1,4 @@
-project('com.github.tkashkin.gamehub', 'vala', 'c', version: '0.7.0')
+project('com.github.tkashkin.gamehub', 'vala', 'c', version: '0.8.0')
 
 i18n = import('i18n')
 gnome = import('gnome')

po/POTFILES

@@ -41,6 +41,7 @@ src/ui/views/GamesView/GameListRow.vala
 src/ui/views/GamesView/GameDownloadProgressView.vala
 
 src/ui/views/GameDetailsView/GameDetailsView.vala
+src/ui/views/GameDetailsView/GameDetailsPage.vala
 
 src/ui/widgets/AutoSizeImage.vala
 src/ui/widgets/ActionButton.vala

po/com.github.tkashkin.gamehub.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.tkashkin.gamehub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-09 20:06+0300\n"
+"POT-Creation-Date: 2018-08-15 16:17+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -34,35 +34,35 @@ msgstr ""
 msgid "Manage your Steam, GOG and Humble Bundle games in one place."
 msgstr ""
 
-#: src/data/Game.vala:75
+#: src/data/Game.vala:80
 msgid "Installed"
 msgstr ""
 
-#: src/data/Game.vala:76
+#: src/data/Game.vala:81
 msgid "Installing"
 msgstr ""
 
-#: src/data/Game.vala:77 src/utils/downloader/Downloader.vala:137
+#: src/data/Game.vala:82 src/utils/downloader/Downloader.vala:137
 msgid "Download started"
 msgstr ""
 
-#: src/data/Game.vala:79
+#: src/data/Game.vala:84
 msgid "Not installed"
 msgstr ""
 
-#: src/data/Game.vala:89
+#: src/data/Game.vala:94
 msgid "Installed:"
 msgstr ""
 
-#: src/data/Game.vala:90
+#: src/data/Game.vala:95
 msgid "Installing:"
 msgstr ""
 
-#: src/data/Game.vala:91
+#: src/data/Game.vala:96
 msgid "Downloading:"
 msgstr ""
 
-#: src/data/Game.vala:93
+#: src/data/Game.vala:98
 msgid "Not installed:"
 msgstr ""
 
@@ -78,8 +78,8 @@ msgstr ""
 
 #: src/ui/dialogs/SettingsDialog/SettingsDialog.vala:17
 #: src/ui/views/WelcomeView.vala:34 src/ui/views/WelcomeView.vala:58
-#: src/ui/views/GamesView/GamesView.vala:159
-#: src/ui/views/GamesView/GamesView.vala:379
+#: src/ui/views/GamesView/GamesView.vala:163
+#: src/ui/views/GamesView/GamesView.vala:384
 msgid "Settings"
 msgstr ""
 
@@ -92,19 +92,19 @@ msgid "Interface"
 msgstr ""
 
 #: src/ui/dialogs/SettingsDialog/SettingsDialog.vala:60
-#: src/ui/dialogs/GameDetailsDialog.vala:31
+#: src/ui/dialogs/GameDetailsDialog.vala:32
 msgid "Close"
 msgstr ""
 
-#: src/ui/dialogs/SettingsDialog/SettingsDialogTab.vala:134
+#: src/ui/dialogs/SettingsDialog/SettingsDialogTab.vala:132
 msgid "Open"
 msgstr ""
 
-#: src/ui/dialogs/SettingsDialog/SettingsDialogTab.vala:141
+#: src/ui/dialogs/SettingsDialog/SettingsDialogTab.vala:139
 msgid "Clear"
 msgstr ""
 
-#: src/ui/dialogs/SettingsDialog/SettingsDialogTab.vala:157
+#: src/ui/dialogs/SettingsDialog/SettingsDialogTab.vala:155
 #, c-format
 msgid "%llu installer; %s"
 msgid_plural "%llu installers; %s"
@@ -119,49 +119,53 @@ msgstr ""
 msgid "Compact list"
 msgstr ""
 
-#: src/ui/dialogs/SettingsDialog/tabs/Steam.vala:20
-#: src/ui/dialogs/SettingsDialog/tabs/GOG.vala:20
-#: src/ui/dialogs/SettingsDialog/tabs/Humble.vala:20
+#: src/ui/dialogs/SettingsDialog/tabs/UI.vala:23
+msgid "Merge games from different sources"
+msgstr ""
+
+#: src/ui/dialogs/SettingsDialog/tabs/Steam.vala:23
+#: src/ui/dialogs/SettingsDialog/tabs/GOG.vala:23
+#: src/ui/dialogs/SettingsDialog/tabs/Humble.vala:23
 msgid "Enabled"
 msgstr ""
 
-#: src/ui/dialogs/SettingsDialog/tabs/Steam.vala:25
+#: src/ui/dialogs/SettingsDialog/tabs/Steam.vala:28
 msgid "Steam API keys have limited number of uses per day"
 msgstr ""
 
-#: src/ui/dialogs/SettingsDialog/tabs/Steam.vala:25
+#: src/ui/dialogs/SettingsDialog/tabs/Steam.vala:28
 msgid "Generate key"
 msgstr ""
 
-#: src/ui/dialogs/SettingsDialog/tabs/Steam.vala:29
+#: src/ui/dialogs/SettingsDialog/tabs/Steam.vala:32
 msgid "Installation directory"
 msgstr ""
 
-#: src/ui/dialogs/SettingsDialog/tabs/Steam.vala:37
+#: src/ui/dialogs/SettingsDialog/tabs/Steam.vala:50
 msgid "Default"
 msgstr ""
 
-#: src/ui/dialogs/SettingsDialog/tabs/Steam.vala:45
+#: src/ui/dialogs/SettingsDialog/tabs/Steam.vala:58
 msgid "Restore default API key"
 msgstr ""
 
-#: src/ui/dialogs/SettingsDialog/tabs/Steam.vala:56
+#: src/ui/dialogs/SettingsDialog/tabs/Steam.vala:69
 msgid "Steam API key"
 msgstr ""
 
-#: src/ui/dialogs/SettingsDialog/tabs/GOG.vala:25
-#: src/ui/dialogs/SettingsDialog/tabs/Humble.vala:25
+#: src/ui/dialogs/SettingsDialog/tabs/GOG.vala:28
+#: src/ui/dialogs/SettingsDialog/tabs/Humble.vala:28
 msgid "Games directory"
 msgstr ""
 
-#: src/ui/dialogs/SettingsDialog/tabs/GOG.vala:27
-#: src/ui/dialogs/SettingsDialog/tabs/Humble.vala:27
+#: src/ui/dialogs/SettingsDialog/tabs/GOG.vala:30
+#: src/ui/dialogs/SettingsDialog/tabs/Humble.vala:30
 msgid "Installers cache"
 msgstr ""
 
 #: src/ui/dialogs/GameInstallDialog.vala:31
 #: src/ui/dialogs/GameInstallDialog.vala:131
-#: src/ui/views/GameDetailsView/GameDetailsView.vala:202
+#: src/ui/views/GameDetailsView/GameDetailsPage.vala:187
 msgid "Install"
 msgstr ""
 
@@ -219,138 +223,138 @@ msgstr ""
 msgid "Return to GameHub after installing"
 msgstr ""
 
-#: src/ui/views/GamesView/GamesView.vala:62
+#: src/ui/views/GamesView/GamesView.vala:66
 msgid "No games"
 msgstr ""
 
-#: src/ui/views/GamesView/GamesView.vala:62
+#: src/ui/views/GamesView/GamesView.vala:66
 msgid "Get some games or enable some game sources in settings"
 msgstr ""
 
-#: src/ui/views/GamesView/GamesView.vala:63
-#: src/ui/views/GamesView/GamesView.vala:281
+#: src/ui/views/GamesView/GamesView.vala:67
+#: src/ui/views/GamesView/GamesView.vala:285
 msgid "Reload"
 msgstr ""
 
-#: src/ui/views/GamesView/GamesView.vala:109
+#: src/ui/views/GamesView/GamesView.vala:113
 msgid "Grid view"
 msgstr ""
 
-#: src/ui/views/GamesView/GamesView.vala:110
+#: src/ui/views/GamesView/GamesView.vala:114
 msgid "List view"
 msgstr ""
 
-#: src/ui/views/GamesView/GamesView.vala:122
+#: src/ui/views/GamesView/GamesView.vala:126
 msgid "All games"
 msgstr ""
 
-#: src/ui/views/GamesView/GamesView.vala:126
+#: src/ui/views/GamesView/GamesView.vala:130
 #, c-format
 msgid "%s games"
 msgstr ""
 
-#: src/ui/views/GamesView/GamesView.vala:132
+#: src/ui/views/GamesView/GamesView.vala:136
 msgid "Downloads"
 msgstr ""
 
-#: src/ui/views/GamesView/GamesView.vala:154
+#: src/ui/views/GamesView/GamesView.vala:158
 msgid "Search"
 msgstr ""
 
-#: src/ui/views/GamesView/GamesView.vala:274
+#: src/ui/views/GamesView/GamesView.vala:278
 #, c-format
 msgid "%u game"
 msgid_plural "%u games"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/ui/views/GamesView/GamesView.vala:278
+#: src/ui/views/GamesView/GamesView.vala:282
 #, c-format
 msgid "No %s games"
 msgstr ""
 
-#: src/ui/views/GamesView/GamesView.vala:279
+#: src/ui/views/GamesView/GamesView.vala:283
 msgid "Get some Linux-compatible games"
 msgstr ""
 
-#: src/ui/views/GamesView/GamesView.vala:300
+#: src/ui/views/GamesView/GamesView.vala:304
 #, c-format
 msgid "No games matching “%s”"
 msgstr ""
 
-#: src/ui/views/GamesView/GamesView.vala:305
+#: src/ui/views/GamesView/GamesView.vala:309
 #, c-format
 msgid "No %1$s games matching “%2$s”"
 msgstr ""
 
-#: src/ui/views/GamesView/GamesView.vala:377
+#: src/ui/views/GamesView/GamesView.vala:382
 msgid ""
 "No games were loaded from Steam. Set your games list privacy to public or "
 "use your own Steam API key in settings."
 msgstr ""
 
-#: src/ui/views/GamesView/GamesView.vala:378
+#: src/ui/views/GamesView/GamesView.vala:383
 msgid "Privacy"
 msgstr ""
 
 #: src/ui/views/GamesView/GameDownloadProgressView.vala:59
-#: src/ui/views/GameDetailsView/GameDetailsView.vala:129
+#: src/ui/views/GameDetailsView/GameDetailsPage.vala:114
 msgid "Pause download"
 msgstr ""
 
 #: src/ui/views/GamesView/GameDownloadProgressView.vala:64
-#: src/ui/views/GameDetailsView/GameDetailsView.vala:135
+#: src/ui/views/GameDetailsView/GameDetailsPage.vala:120
 msgid "Resume download"
 msgstr ""
 
 #: src/ui/views/GamesView/GameDownloadProgressView.vala:69
-#: src/ui/views/GameDetailsView/GameDetailsView.vala:141
+#: src/ui/views/GameDetailsView/GameDetailsPage.vala:126
 msgid "Cancel download"
 msgstr ""
 
-#: src/ui/views/GameDetailsView/GameDetailsView.vala:162
+#: src/ui/views/GameDetailsView/GameDetailsPage.vala:147
 msgid "Description"
 msgstr ""
 
-#: src/ui/views/GameDetailsView/GameDetailsView.vala:203
+#: src/ui/views/GameDetailsView/GameDetailsPage.vala:188
 msgid "Run"
 msgstr ""
 
-#: src/ui/views/GameDetailsView/GameDetailsView.vala:204
+#: src/ui/views/GameDetailsView/GameDetailsPage.vala:189
 msgid "Open installation directory"
 msgstr ""
 
-#: src/ui/views/GameDetailsView/GameDetailsView.vala:205
+#: src/ui/views/GameDetailsView/GameDetailsPage.vala:190
 msgid "Open store page"
 msgstr ""
 
-#: src/ui/views/GameDetailsView/GameDetailsView.vala:206
+#: src/ui/views/GameDetailsView/GameDetailsPage.vala:191
 msgid "Uninstall"
 msgstr ""
 
-#: src/ui/views/GameDetailsView/GameDetailsView.vala:313
-#: src/ui/views/GameDetailsView/GameDetailsView.vala:367
+#: src/ui/views/GameDetailsView/GameDetailsPage.vala:304
+#: src/ui/views/GameDetailsView/GameDetailsPage.vala:358
 msgid "Language"
 msgstr ""
 
-#: src/ui/views/GameDetailsView/GameDetailsView.vala:316
-#: src/ui/views/GameDetailsView/GameDetailsView.vala:370
+#: src/ui/views/GameDetailsView/GameDetailsPage.vala:307
+#: src/ui/views/GameDetailsView/GameDetailsPage.vala:361
 msgid "Languages"
 msgstr ""
 
-#: src/ui/views/GameDetailsView/GameDetailsView.vala:337
+#: src/ui/views/GameDetailsView/GameDetailsPage.vala:328
 msgid "Category"
 msgstr ""
 
-#: src/ui/views/GameDetailsView/GameDetailsView.vala:340
+#: src/ui/views/GameDetailsView/GameDetailsPage.vala:331
 msgid "Categories"
 msgstr ""
 
-#: src/ui/views/GameDetailsView/GameDetailsView.vala:355
+#: src/ui/views/GameDetailsView/GameDetailsPage.vala:346
 msgid "Genre"
 msgstr ""
 
-#: src/ui/views/GameDetailsView/GameDetailsView.vala:358
+#: src/ui/views/GameDetailsView/GameDetailsPage.vala:349
 msgid "Genres"
 msgstr ""