From 12667c9d738c739abb4c0eac2a7cca05a9f054e6 Mon Sep 17 00:00:00 2001 From: Rosalie Wanders Date: Fri, 18 Sep 2020 16:55:05 +0200 Subject: [PATCH] work --- Source/RMG/CMakeLists.txt | 3 +- Source/RMG/UserInterface/Icons/RMG.ico | Bin 0 -> 36109 bytes .../Icons/RMG.png} | Bin 35955 -> 35955 bytes Source/RMG/UserInterface/MainWindow.cpp | 2 +- Source/RMG/UserInterface/RomBrowserWidget.cpp | 4 +- .../UIResources.qrc} | 2 +- Source/RMG/UserInterface/UIResources.rc | 128 ++++++++++++++++++ Source/RMG/UserInterface/resource.h | 21 +++ Source/Script/Build.sh | 18 +++ Source/Script/GenerateResIcon.sh | 13 -- 10 files changed, 174 insertions(+), 17 deletions(-) create mode 100644 Source/RMG/UserInterface/Icons/RMG.ico rename Source/RMG/{Res/Icon256.png => UserInterface/Icons/RMG.png} (99%) rename Source/RMG/{RMG.qrc => UserInterface/UIResources.qrc} (67%) create mode 100644 Source/RMG/UserInterface/UIResources.rc create mode 100644 Source/RMG/UserInterface/resource.h create mode 100755 Source/Script/Build.sh delete mode 100755 Source/Script/GenerateResIcon.sh diff --git a/Source/RMG/CMakeLists.txt b/Source/RMG/CMakeLists.txt index 1d03b04a..5c40e155 100644 --- a/Source/RMG/CMakeLists.txt +++ b/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) diff --git a/Source/RMG/UserInterface/Icons/RMG.ico b/Source/RMG/UserInterface/Icons/RMG.ico new file mode 100644 index 0000000000000000000000000000000000000000..d2bbaf321e83f511c3a82f99270bac443bbb0b12 GIT binary patch literal 36109 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 JKH0ZN4FJ)i6fXb( delta 66 zcmex7gX!}OrU}*ToVpy-6`wP2Z0hJ1GO)BVF|{(V&^9ozGB7yuAUJEXOpiR8@YcPr KuTA#tQ3C+_7Z#lW diff --git a/Source/RMG/UserInterface/MainWindow.cpp b/Source/RMG/UserInterface/MainWindow.cpp index c9ebdda7..da020eb3 100644 --- a/Source/RMG/UserInterface/MainWindow.cpp +++ b/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()); diff --git a/Source/RMG/UserInterface/RomBrowserWidget.cpp b/Source/RMG/UserInterface/RomBrowserWidget.cpp index 23f491cf..13445d66 100644 --- a/Source/RMG/UserInterface/RomBrowserWidget.cpp +++ b/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); diff --git a/Source/RMG/RMG.qrc b/Source/RMG/UserInterface/UIResources.qrc similarity index 67% rename from Source/RMG/RMG.qrc rename to Source/RMG/UserInterface/UIResources.qrc index 325ecac2..79460ea0 100644 --- a/Source/RMG/RMG.qrc +++ b/Source/RMG/UserInterface/UIResources.qrc @@ -1,5 +1,5 @@ - Res/Icon256.png + Icons/RMG.png \ No newline at end of file diff --git a/Source/RMG/UserInterface/UIResources.rc b/Source/RMG/UserInterface/UIResources.rc new file mode 100644 index 00000000..2e63fad2 --- /dev/null +++ b/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 + diff --git a/Source/RMG/UserInterface/resource.h b/Source/RMG/UserInterface/resource.h new file mode 100644 index 00000000..bcc5376c --- /dev/null +++ b/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 diff --git a/Source/Script/Build.sh b/Source/Script/Build.sh new file mode 100755 index 00000000..26feef78 --- /dev/null +++ b/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 diff --git a/Source/Script/GenerateResIcon.sh b/Source/Script/GenerateResIcon.sh deleted file mode 100755 index b4c38d51..00000000 --- a/Source/Script/GenerateResIcon.sh +++ /dev/null @@ -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" -