All: Rebrand

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
-project(mGBA C)
+project(medusa C)
-set(BINARY_NAME mgba CACHE INTERNAL "Name of output binaries")
+set(BINARY_NAME medusa CACHE INTERNAL "Name of output binaries")
 if(NOT MSVC)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-missing-field-initializers -std=c99")
 else()

res/medusa-qt.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Icon=medusa
+Exec=medusa-qt %f
+Terminal=false
+Type=Application
+Name=medusa
+GenericName=DS/Game Boy Advance/Game Boy Emulator
+Comment=Nintendo DS/Game Boy Advance/Game Boy Emulator
+Categories=Game;Emulator;
+MimeType=application/x-gameboy-advance-rom;application/x-agb-rom;application/x-gba-rom;
+Keywords=emulator;Nintendo;advance;gba;ds;Game Boy Advance;

res/mgba-qt.desktop

@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Icon=mgba
-Exec=mgba-qt %f
-Terminal=false
-Type=Application
-Name=mGBA
-GenericName=Game Boy Advance Emulator
-Comment=Nintendo Game Boy Advance Emulator
-Categories=Game;Emulator;
-MimeType=application/x-gameboy-advance-rom;application/x-agb-rom;application/x-gba-rom;
-Keywords=emulator;Nintendo;advance;gba;Game Boy Advance;

res/win.rc.in

@@ -1,4 +1,4 @@
-IDI_ICON1 ICON DISCARDABLE "${CMAKE_SOURCE_DIR}/res/mgba.ico"
+IDI_ICON1 ICON DISCARDABLE "${CMAKE_SOURCE_DIR}/res/${BINARY_NAME}.ico"
 
 #include <windows.h>
 
@@ -11,10 +11,10 @@ BEGIN
         BLOCK "040904E4"
         BEGIN
             VALUE "CompanyName",        "endrift"
-            VALUE "FileDescription",    "mGBA Game Boy Advance emulator"
+            VALUE "FileDescription",    "${PROJECT_NAME} emulator"
             VALUE "FileVersion",        "${LIB_VERSION_STRING}.0"
             VALUE "InternalName",       "${BINARY_NAME}"
-            VALUE "LegalCopyright",     "(c) 2013 - 2016 Jeffrey Pfau"
+            VALUE "LegalCopyright",     "(c) 2013 - 2017 Jeffrey Pfau"
             VALUE "OriginalFilename",   "${BINARY_NAME}"
             VALUE "ProductName",        "${PROJECT_NAME}"
             VALUE "ProductVersion",     "${BINARY_NAME}"

src/platform/qt/AboutScreen.cpp

@@ -17,7 +17,7 @@ AboutScreen::AboutScreen(QWidget* parent)
 {
 	m_ui.setupUi(this);
 
-	QPixmap logo(":/res/mgba-1024.png");
+	QPixmap logo(":/res/medusa-1024.png");
 	logo = logo.scaled(m_ui.logo->minimumSize() * devicePixelRatio(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
 	logo.setDevicePixelRatio(devicePixelRatio());
 	m_ui.logo->setPixmap(logo);

src/platform/qt/AboutScreen.ui

@@ -84,7 +84,7 @@
      </property>
      <property name="text">
       <string>© 2013 – 2016 Jeffrey Pfau, licensed under the Mozilla Public License, version 2.0
-Game Boy Advance is a registered trademark of Nintendo Co., Ltd.</string>
+Game Boy and Game Boy Advance are registered trademarks of Nintendo Co., Ltd.</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
@@ -147,7 +147,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd.</string>
        </property>
        <property name="minimumSize">
         <size>
-         <width>256</width>
+         <width>192</width>
          <height>192</height>
         </size>
        </property>
@@ -174,7 +174,7 @@ Game Boy Advance is a registered trademark of Nintendo Co., Ltd.</string>
    <item row="3" column="1">
     <widget class="QLabel" name="description">
      <property name="text">
-      <string>{projectName} is an open-source Game Boy Advance emulator</string>
+      <string>{projectName} is an open-source Game Boy/Game Boy Advance/DS emulator</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>

src/platform/qt/CMakeLists.txt

@@ -195,16 +195,16 @@ endif()
 
 qt5_add_resources(RESOURCES resources.qrc)
 if(APPLE)
-	set(MACOSX_BUNDLE_ICON_FILE mgba.icns)
+	set(MACOSX_BUNDLE_ICON_FILE ${BINARY_NAME}.icns)
 	set(MACOSX_BUNDLE_BUNDLE_VERSION ${LIB_VERSION_STRING})
 	set(MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME})
 	set(MACOSX_BUNDLE_GUI_IDENTIFIER com.endrift.${BINARY_NAME}-qt)
-	set_source_files_properties(${CMAKE_SOURCE_DIR}/res/mgba.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+	set_source_files_properties(${CMAKE_SOURCE_DIR}/res/${BINARY_NAME}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 endif()
 if(WIN32)
-	configure_file(${CMAKE_SOURCE_DIR}/res/mgba.rc.in ${CMAKE_BINARY_DIR}/res/mgba.rc)
+	configure_file(${CMAKE_SOURCE_DIR}/res/win.rc.in ${CMAKE_BINARY_DIR}/res/${BINARY_NAME}.rc)
-	list(APPEND RESOURCES ${CMAKE_BINARY_DIR}/res/mgba.rc)
+	list(APPEND RESOURCES ${CMAKE_BINARY_DIR}/res/${BINARY_NAME}.rc)
-	set_source_files_properties(${CMAKE_BINARY_DIR}/res/mgba.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_SOURCE_DIR}/res/mgba.ico)
+	set_source_files_properties(${CMAKE_BINARY_DIR}/res/${BINARY_NAME}.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_SOURCE_DIR}/res/${BINARY_NAME}.ico)
 	if(QT_STATIC)
 		list(APPEND QT_LIBRARIES qwindows Qt5PlatformSupport imm32)
 	endif()
@@ -239,7 +239,7 @@ if(Qt5LinguistTools_FOUND)
 	list(APPEND RESOURCES ${TRANSLATION_RESOURCES})
 endif()
 
-add_executable(${BINARY_NAME}-qt WIN32 MACOSX_BUNDLE main.cpp ${CMAKE_SOURCE_DIR}/res/mgba.icns ${SOURCE_FILES} ${PLATFORM_SRC} ${UI_SRC} ${AUDIO_SRC} ${RESOURCES})
+add_executable(${BINARY_NAME}-qt WIN32 MACOSX_BUNDLE main.cpp ${CMAKE_SOURCE_DIR}/res/${BINARY_NAME}.icns ${SOURCE_FILES} ${PLATFORM_SRC} ${UI_SRC} ${AUDIO_SRC} ${RESOURCES})
 set_target_properties(${BINARY_NAME}-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/res/info.plist.in COMPILE_DEFINITIONS "${FEATURE_DEFINES};${FUNCTION_DEFINES};${OS_DEFINES};${QT_DEFINES}")
 
 list(APPEND QT_LIBRARIES Qt5::Widgets Qt5::OpenGL Qt5::Network)

src/platform/qt/Window.cpp

@@ -88,7 +88,7 @@ Window::Window(ConfigController* config, int playerId, QWidget* parent)
 	, m_logView(new LogView(&m_log))
 	, m_stateWindow(nullptr)
 	, m_screenWidget(new WindowBackground())
-	, m_logo(":/res/mgba-1024.png")
+	, m_logo(":/res/medusa-1024.png")
 	, m_config(config)
 	, m_inputModel(new InputModel(this))
 	, m_inputController(m_inputModel, playerId, this)
@@ -1638,7 +1638,7 @@ void WindowBackground::paintEvent(QPaintEvent*) {
 	}
 	QPainter painter(this);
 	painter.setRenderHint(QPainter::SmoothPixmapTransform);
-	painter.fillRect(QRect(QPoint(), size()), Qt::black);
+	painter.fillRect(QRect(QPoint(), size()), Qt::white);
 	QSize s = size();
 	QSize ds = s;
 	if (ds.width() * m_aspectHeight > ds.height() * m_aspectWidth) {

src/platform/qt/resources.qrc

@@ -1,7 +1,6 @@
  <!DOCTYPE RCC><RCC version="1.0">
  <qresource>
-     <file>../../../res/mgba-1024.png</file>
+     <file>../../../res/medusa-1024.png</file>
-     <file>../../../res/keymap.qpic</file>
      <file>../../../res/patrons.txt</file>
  </qresource>
  </RCC>

version.cmake

@@ -1,12 +1,12 @@
 if(NOT PROJECT_NAME)
-	set(PROJECT_NAME "mGBA")
+	set(PROJECT_NAME "medusa")
 endif()
 set(LIB_VERSION_MAJOR 0)
-set(LIB_VERSION_MINOR 6)
+set(LIB_VERSION_MINOR 1)
 set(LIB_VERSION_PATCH 0)
-set(LIB_VERSION_ABI 0.6)
+set(LIB_VERSION_ABI 0.1)
 set(LIB_VERSION_STRING ${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_PATCH})
-set(SUMMARY "${PROJECT_NAME} Game Boy Advance Emulator")
+set(SUMMARY "${PROJECT_NAME} DS Emulator")
 
 find_program(GIT git)
 if(GIT AND NOT SKIP_GIT)