From: Jean-Paul Mari <djipi.mari@gmail.com>
Date: Wed, 26 May 2021 00:18:41 +0000 (-0400)
Subject: Added a Virtual Jaguar Rx logo in the About window
X-Git-Tag: v2.1.3-R5^2~2
X-Git-Url: http://git.hcoop.net/clinton/Virtual-Jaguar-Rx.git/commitdiff_plain/da2c308d1a0ab9a34e96d250e26dec30604d5da7?ds=sidebyside

Added a Virtual Jaguar Rx logo in the About window
---

diff --git a/Win-VS2017/virtualjaguar.vcxproj b/Win-VS2017/virtualjaguar.vcxproj
index 5ca4faf..a340df7 100644
--- a/Win-VS2017/virtualjaguar.vcxproj
+++ b/Win-VS2017/virtualjaguar.vcxproj
@@ -1144,7 +1144,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </Image>
-    <Image Include="..\res\tool-hw-regs.png" />
+    <Image Include="..\res\tool-hw-regs.png">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Image>
+    <Image Include="..\res\vj_rx_title_small.png">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </Image>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
diff --git a/Win-VS2017/virtualjaguar.vcxproj.filters b/Win-VS2017/virtualjaguar.vcxproj.filters
index 8ccbb7f..33e9318 100644
--- a/Win-VS2017/virtualjaguar.vcxproj.filters
+++ b/Win-VS2017/virtualjaguar.vcxproj.filters
@@ -205,7 +205,7 @@
     <ClCompile Include="GeneratedFiles\Debug\moc_VideoWin.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
-	<ClCompile Include="GeneratedFiles\Release\moc_VideoWin.cpp">
+    <ClCompile Include="GeneratedFiles\Release\moc_VideoWin.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_stackbrowser.cpp">
@@ -859,5 +859,8 @@
     <Image Include="..\res\tool-hw-regs.png">
       <Filter>Resource Files</Filter>
     </Image>
+    <Image Include="..\res\vj_rx_title_small.png">
+      <Filter>Resource Files</Filter>
+    </Image>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/res/vj_rx_title_small.png b/res/vj_rx_title_small.png
new file mode 100644
index 0000000..8b9c1ba
Binary files /dev/null and b/res/vj_rx_title_small.png differ
diff --git a/src/gui/about.cpp b/src/gui/about.cpp
index 3f8cd21..e749ea1 100644
--- a/src/gui/about.cpp
+++ b/src/gui/about.cpp
@@ -35,7 +35,7 @@ AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
 
 	QString s;
 	s.append(tr(
-		"<img src=':/res/vj_title_small.png' style='float: right'>"
+		"<img src=':/res/vj_rx_title_small.png' style='float: right'>"
 		"<table>"
 		"<tr><td align='right'><b>Version: </b></td><td>"
 		VJ_RELEASE_VERSION " (" VJ_RELEASE_SUBVERSION ") Rx"
@@ -48,7 +48,7 @@ AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
 		"<br><br>"
 		"<i>Rx version:<i>"
 		"<br>"
-		"<b>Jean-Paul Mari</b> for the debugger integration, ELF/DWARF format, Win64 & Visual Studio 2015/2017 support"
+		"<b>Jean-Paul Mari</b> for the debugger integration, ELF/DWARF format, Win64 & Visual Studio 2017 support, among additional improvements"
 		"<br><br>"
 		"<i>The Virtual Jaguar team would like to express their gratitude to:</i>"
 		"<br><br>"
@@ -69,6 +69,9 @@ AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
 
 void AboutWindow::keyPressEvent(QKeyEvent * e)
 {
-	if (e->key() == Qt::Key_Escape || e->key() == Qt::Key_Return)
+	// close the window
+	if ((e->key() == Qt::Key_Escape) || (e->key() == Qt::Key_Return))
+	{
 		hide();
+	}
 }
diff --git a/src/gui/virtualjaguar.qrc b/src/gui/virtualjaguar.qrc
index 44ba3f7..860e192 100644
--- a/src/gui/virtualjaguar.qrc
+++ b/src/gui/virtualjaguar.qrc
@@ -28,7 +28,7 @@
 	<file>../../res/generic.png</file>
 	<file>../../res/cart-blank.png</file>
 	<file>../../res/label-blank.png</file>
-	<file>../../res/vj_title_small.png</file>
+	<file>../../res/vj_rx_title_small.png</file>
 	<file>../../res/controller.png</file>
 	<file>../../res/insert.png</file>
 	<file>../../res/software.png</file>