GUI: Add Storage providers logos

StorageWizardDialog now shows logo of the Storage being connected (in
modern highres theme).

11 files changed, 27 insertions, 5 deletions

diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index e400e695db..96108bccce 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -62,6 +62,9 @@ const char *const ThemeEngine::kImageEditSmallButton = "editbtn_small.bmp";
 const char *const ThemeEngine::kImageSwitchModeSmallButton = "switchbtn_small.bmp";
 const char *const ThemeEngine::kImageFastReplaySmallButton = "fastreplay_small.bmp";
 const char *const ThemeEngine::kImageDropboxLogo = "dropbox.bmp";
+const char *const ThemeEngine::kImageOneDriveLogo = "onedrive.bmp";
+const char *const ThemeEngine::kImageGoogleDriveLogo = "googledrive.bmp";
+const char *const ThemeEngine::kImageBoxLogo = "box.bmp";
 
 struct TextDrawData {
 	const Graphics::Font *_fontPtr;
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index eb9b7daefa..7506cee95f 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -251,6 +251,9 @@ public:
 	static const char *const kImageSwitchModeSmallButton; ///< Switch mode button in recorder onscreen dialog (for 320xY)
 	static const char *const kImageFastReplaySmallButton; ///< Fast playback mode button in recorder onscreen dialog (for 320xY)
 	static const char *const kImageDropboxLogo;      ///< Dropbox logo used in the StorageWizardDialog
+	static const char *const kImageOneDriveLogo;      ///< OneDrive logo used in the StorageWizardDialog
+	static const char *const kImageGoogleDriveLogo;      ///< Google Drive logo used in the StorageWizardDialog
+	static const char *const kImageBoxLogo;      ///< Box logo used in the StorageWizardDialog
 
 	/**
 	 * Graphics mode enumeration.
diff --git a/gui/storagewizarddialog.cpp b/gui/storagewizarddialog.cpp
index f1b1796b5c..ba3ebd8597 100644
--- a/gui/storagewizarddialog.cpp
+++ b/gui/storagewizarddialog.cpp
@@ -88,7 +88,20 @@ StorageWizardDialog::StorageWizardDialog(uint32 storageId):
 #ifndef DISABLE_FANCY_THEMES
 	if (g_gui.theme()->supportsImages()) {
 		_picture->useThemeTransparency(true);
-		_picture->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDropboxLogo));
+		switch (_storageId) {
+		case Cloud::kStorageDropboxId:
+			_picture->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDropboxLogo));
+			break;
+		case Cloud::kStorageOneDriveId:
+			_picture->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageOneDriveLogo));
+			break;
+		case Cloud::kStorageGoogleDriveId:
+			_picture->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageGoogleDriveLogo));
+			break;
+		case Cloud::kStorageBoxId:
+			_picture->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageBoxLogo));
+			break;
+		}
 	}
 #endif
 
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 0b030ff799..79320b0756 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -645,8 +645,8 @@
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'>
 					<widget name = 'Picture'
-							width = '115'
-							height = '115'
+							width = '109'
+							height = '109'
 					/>
 					<widget name = 'OpenUrlButton'
 							type = 'Button'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 23662b1da8..3c1fe66f62 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
diff --git a/gui/themes/scummmodern/box.bmp b/gui/themes/scummmodern/box.bmp
new file mode 100644
index 0000000000..21fb650f02
--- /dev/null
+++ b/gui/themes/scummmodern/box.bmp
diff --git a/gui/themes/scummmodern/dropbox.bmp b/gui/themes/scummmodern/dropbox.bmp
index bfb9e90792..4ed95f0009 100644
--- a/gui/themes/scummmodern/dropbox.bmp
+++ b/gui/themes/scummmodern/dropbox.bmp
diff --git a/gui/themes/scummmodern/googledrive.bmp b/gui/themes/scummmodern/googledrive.bmp
new file mode 100644
index 0000000000..30377a5f74
--- /dev/null
+++ b/gui/themes/scummmodern/googledrive.bmp
diff --git a/gui/themes/scummmodern/onedrive.bmp b/gui/themes/scummmodern/onedrive.bmp
new file mode 100644
index 0000000000..cd26d71d3c
--- /dev/null
+++ b/gui/themes/scummmodern/onedrive.bmp
diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx
index d7b35b10b9..e3d2152e4b 100644
--- a/gui/themes/scummmodern/scummmodern_gfx.stx
+++ b/gui/themes/scummmodern/scummmodern_gfx.stx
@@ -120,6 +120,9 @@
 		<bitmap filename = 'switchbtn_small.bmp'/>
 		<bitmap filename = 'fastreplay_small.bmp'/>
 		<bitmap filename = 'dropbox.bmp'/>
+		<bitmap filename = 'onedrive.bmp'/>
+		<bitmap filename = 'googledrive.bmp'/>
+		<bitmap filename = 'box.bmp'/>
 	</bitmaps>
 
 	<fonts>
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index f1fd702c06..f4fa200cda 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -659,8 +659,8 @@
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'>
 					<widget name = 'Picture'
-							width = '115'
-							height = '115'
+							width = '109'
+							height = '109'
 					/>
 					<widget name = 'OpenUrlButton'
 							type = 'Button'