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 (file)
--- a/Win-VS2017/virtualjaguar.vcxproj
+++ b/Win-VS2017/virtualjaguar.vcxproj
@@ -1144,7 +1144,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>\r
     </Image>\r
-    <Image Include="..\res\tool-hw-regs.png" />\r
+    <Image Include="..\res\tool-hw-regs.png">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>\r
+    </Image>\r
+    <Image Include="..\res\vj_rx_title_small.png">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>\r
+    </Image>\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets" />\r

diff --git a/Win-VS2017/virtualjaguar.vcxproj.filters b/Win-VS2017/virtualjaguar.vcxproj.filters
index 8ccbb7f..33e9318 100644 (file)
--- a/Win-VS2017/virtualjaguar.vcxproj.filters
+++ b/Win-VS2017/virtualjaguar.vcxproj.filters
@@ -205,7 +205,7 @@
     <ClCompile Include="GeneratedFiles\Debug\moc_VideoWin.cpp">\r
       <Filter>Generated Files</Filter>\r
     </ClCompile>\r
-       <ClCompile Include="GeneratedFiles\Release\moc_VideoWin.cpp">\r
+    <ClCompile Include="GeneratedFiles\Release\moc_VideoWin.cpp">\r
       <Filter>Generated Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="GeneratedFiles\Debug\moc_stackbrowser.cpp">\r
@@ -859,5 +859,8 @@
     <Image Include="..\res\tool-hw-regs.png">\r
       <Filter>Resource Files</Filter>\r
     </Image>\r
+    <Image Include="..\res\vj_rx_title_small.png">\r
+      <Filter>Resource Files</Filter>\r
+    </Image>\r
   </ItemGroup>\r
 </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 (file)
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 (file)
--- 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 (file)
--- a/src/gui/virtualjaguar.qrc
+++ b/src/gui/virtualjaguar.qrc
@@ -28,7 +28,7 @@
        <file>../../res/generic.png</file>\r
        <file>../../res/cart-blank.png</file>\r
        <file>../../res/label-blank.png</file>\r
-       <file>../../res/vj_title_small.png</file>\r
+       <file>../../res/vj_rx_title_small.png</file>\r
        <file>../../res/controller.png</file>\r
        <file>../../res/insert.png</file>\r
        <file>../../res/software.png</file>\r