work

Source/RMG/CMakeLists.txt

@@ -12,6 +12,8 @@ add_executable(RMG
     UserInterface/MainWindow.cpp
     UserInterface/RomBrowserWidget.cpp
     UserInterface/NoFocusDelegate.cpp
+    UserInterface/UIResources.rc
+    UserInterface/UIResources.qrc
     Thread/RomSearcherThread.cpp
     Thread/EmulationThread.cpp
     M64P/CoreApi.cpp
@@ -25,7 +27,6 @@ add_executable(RMG
     Util/Logger.cpp
     Globals.cpp
     main.cpp
-    RMG.qrc
 )
 
 if(UNIX)

Source/RMG/UserInterface/MainWindow.cpp

@@ -89,7 +89,7 @@ void MainWindow::ui_Setup(void)
 {
     this->ui_Stylesheet_Setup();
 
-    this->setWindowIcon(QIcon(":Res/Icon256.png"));
+    this->setWindowIcon(QIcon(":Icons/RMG.png"));
     this->setWindowTitle(WINDOW_TITLE);
     this->setCentralWidget(this->ui_Widgets);
     this->restoreGeometry(this->ui_Settings->value(APP_SETTINGS_GEOMETRY).toByteArray());

Source/RMG/UserInterface/RomBrowserWidget.cpp

@@ -125,7 +125,7 @@ void RomBrowserWidget::column_SetSize(void)
         int newSize = 0;
         if (label == "Name")
         {
-            newSize = 150;
+            newSize = 250;
         } else if (label == "Internal Name")
         {
             newSize = 100;
@@ -134,6 +134,8 @@ void RomBrowserWidget::column_SetSize(void)
             newSize = 100;
         }
 
+        this->setColumnWidth(i, newSize);
+    continue;
         if (oldSize != newSize)
         {
             this->setColumnWidth(i, oldSize);

Source/RMG/UserInterface/UIResources.qrc

@@ -1,5 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>Res/Icon256.png</file>
+  <file>Icons/RMG.png</file>
 </qresource>
 </RCC>

Source/RMG/UserInterface/UIResources.rc

@@ -0,0 +1,128 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#ifndef APSTUDIO_INVOKED
+//#include "targetver.h"
+#endif
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral (Default) (unknown sub-lang: 0x8) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ZZZ)
+LANGUAGE LANG_NEUTRAL, 0x8
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "200004b0"
+        BEGIN
+            VALUE "CompanyName", "Rosalie"
+            VALUE "FileDescription", "Rosalie's Mupen GUI"
+            VALUE "FileVersion", "1.0.0.1"
+            VALUE "InternalName", "RMG.exe"
+            VALUE "LegalCopyright", "Copyright (C) 2020 Rosalie Wanders"
+            VALUE "OriginalFilename", "RMG.exe"
+            VALUE "ProductName", "Rosalie's Mupen GUI"
+            VALUE "ProductVersion", "1.0.0.1"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x2000, 1200
+    END
+END
+
+#endif    // Neutral (Default) (unknown sub-lang: 0x8) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_RMG                 ICON                    "Icons/RMG.ico"
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#ifndef APSTUDIO_INVOKED\r\n"
+    "#include ""targetver.h""\r\n"
+    "#endif\r\n"
+    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "#include ""windows.h""\r\n"
+    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

Source/RMG/UserInterface/resource.h

@@ -0,0 +1,21 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by RMG.rc
+//
+#define IDC_MYICON                      2
+#define IDD_RMG_DIALOG                  102
+#define IDI_RMG                         107
+#define IDR_MAINFRAME                   128
+#define IDC_STATIC                      -1
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NO_MFC                     1
+#define _APS_NEXT_RESOURCE_VALUE        129
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           110
+#endif
+#endif

Source/Script/Build.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -ex
+script_dir="$(dirname "$0")"
+toplvl_dir="$(realpath "$script_dir/../../")"
+
+build_dir="$toplvl_dir/Build"
+install_dir="$toplvl_dir/Bin"
+
+mkdir -p "$build_dir"
+
+pushd "$build_dir"
+
+cmake -S "$toplvl_dir" -B "$build_dir"
+make -j6
+
+make install DESTDIR="$install_dir"
+
+popd

Source/Script/GenerateResIcon.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-script_dir="$(dirname "$0")"
-source_dir="$(realpath "$script_dir/../")"
-
-out_file="$source_dir/RMG/Res/Icon256.png"
-src_file="$source_dir/../Artwork/RMG Icon.xcf"
-
-echo "Generating $out_file"
-convert -layers merge "$src_file" "$out_file"
-convert -transparent white -resize 256x256 "$out_file" "$out_file"
-