diff --git a/.gitignore b/.gitignore index 36bdeb133a..4d03383ce7 100644 --- a/.gitignore +++ b/.gitignore @@ -52,21 +52,6 @@ ___* *_LOCAL_* *_REMOTE_* -# Mac Programming Files -*.pbxuser -PBProject/build -Xcode/build -Xcode/*.xcodeproj/xcuserdata/ -*.xcodeproj/xcuserdata -*.xcodeproj/project.xcworkspace -*.xcscheme -WorkspaceSettings.xcsettings -UserInterfaceState.xcuserstate -*.xccheckout -contents.xcworkspacedata -xcschememanagement.plist -PBProject/Hardware.plist - # Mac General Files *.app *.dmg diff --git a/CMake/CPackSetup.cmake b/CMake/CPackSetup.cmake index 3cfdbb7f46..59b07d45c3 100644 --- a/CMake/CPackSetup.cmake +++ b/CMake/CPackSetup.cmake @@ -1,5 +1,5 @@ set(CPACK_PACKAGE_NAME "${SM_EXE_NAME}") -set(CPACK_PACKAGE_VENDOR "ITGmania") +set(CPACK_PACKAGE_VENDOR "${SM_EXE_NAME} Developers") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Rhythm Game Simulator") set(CPACK_PACKAGE_VERSION_MAJOR "${SM_VERSION_MAJOR}") set(CPACK_PACKAGE_VERSION_MINOR "${SM_VERSION_MINOR}") @@ -31,28 +31,28 @@ if(WIN32) set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON) set(CPACK_NSIS_MUI_ICON "${SM_INSTALLER_DIR}/install.ico") set(CPACK_NSIS_MUI_UNIICON "${SM_INSTALLER_DIR}/uninstall.ico") + set(CPACK_NSIS_MUI_HEADERIMAGE "${SM_INSTALLER_DIR}/header.bmp") + set(CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP "${SM_INSTALLER_DIR}/welcome.bmp") set(CPACK_NSIS_COMPRESSOR "/SOLID lzma") - - # Custom items for nsis go here. - set(CPACK_SM_NSIS_REPOSITORY "https://github.com/itgmania/itgmania") - set(CPACK_SM_NSIS_ROOT_DIR "${SM_ROOT_DIR}") - set(CPACK_SM_NSIS_PRODUCT_ID "ITGmania ${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}") - set(CPACK_SM_NSIS_PRODUCT_VERSION "${SM_VERSION_TRADITIONAL}.0") - set(CPACK_SM_NSIS_HEADER_BITMAP "${SM_INSTALLER_DIR}/header-sm5.bmp") - set(CPACK_SM_NSIS_WELCOME_BITMAP "${SM_INSTALLER_DIR}/welcome-sm5.bmp") - set(CPACK_SM_NSIS_GIT_VERSION "${SM_VERSION_GIT}") + set(CPACK_NSIS_MUI_FINISHPAGE_RUN "${SM_EXE_NAME}.exe") + set(CPACK_NSIS_BRANDING_TEXT " ") # The header and welcome bitmaps require backslashes. string(REGEX REPLACE "/" "\\\\\\\\" - CPACK_SM_NSIS_HEADER_BITMAP - "${CPACK_SM_NSIS_HEADER_BITMAP}") + CPACK_NSIS_MUI_HEADERIMAGE + "${CPACK_NSIS_MUI_HEADERIMAGE}") string(REGEX REPLACE "/" "\\\\\\\\" - CPACK_SM_NSIS_WELCOME_BITMAP - "${CPACK_SM_NSIS_WELCOME_BITMAP}") + CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP + "${CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP}") + + # Custom items for nsis go here. + set(CPACK_SM_NSIS_PRODUCT_ID "ITGmania") + set(CPACK_SM_NSIS_PRODUCT_VERSION "${SM_VERSION_TRADITIONAL}.0") + set(CPACK_SM_NSIS_GIT_VERSION "${SM_VERSION_GIT}") elseif(MACOSX) set(CPACK_GENERATOR DragNDrop) set(CPACK_DMG_VOLUME_NAME "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}") diff --git a/CMake/Modules/NSIS.template.in b/CMake/Modules/NSIS.template.in index 063f8c713d..f92223a516 100644 --- a/CMake/Modules/NSIS.template.in +++ b/CMake/Modules/NSIS.template.in @@ -6,7 +6,6 @@ !define VERSION "@CPACK_PACKAGE_VERSION@" !define PATCH "@CPACK_PACKAGE_VERSION_PATCH@" !define INST_DIR "@CPACK_TEMPORARY_DIRECTORY@" - !define NSIS_SOURCE_PATH "@CPACK_SM_NSIS_ROOT_DIR@" ;-------------------------------- ;Variables @@ -35,23 +34,15 @@ Name "@CPACK_NSIS_PACKAGE_NAME@" OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@" - ;Captions for the process. - Caption "@CPACK_NSIS_PACKAGE_NAME@ | install" - UninstallCaption "@CPACK_NSIS_PACKAGE_NAME@ | uninstall" - ;Set compression SetCompressor @CPACK_NSIS_COMPRESSOR@ - ;Allow for optimized blocks. This can be off. - SetDatablockOptimize on - - ;Utilize a checksum for safety. - CRCCheck on - ;Require administrator access RequestExecutionLevel admin @CPACK_NSIS_DEFINES@ +@CPACK_NSIS_MANIFEST_DPI_AWARE_CODE@ +@CPACK_NSIS_BRANDING_TEXT_CODE@ ; Some additional version information. VIProductVersion "@CPACK_SM_NSIS_PRODUCT_VERSION@" @@ -59,20 +50,6 @@ VIAddVersionKey "FileVersion" "@CPACK_SM_NSIS_GIT_VERSION@" VIAddVersionKey "FileDescription" "@CPACK_SM_NSIS_PRODUCT_ID@ Installer" - ; Have the window close automatically at the end. - AutoCloseWindow true - - ; Allow for restoring files to their original date. - SetDateSave on - - ; Attempt to register an entry in the registry. - InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\@CPACK_SM_NSIS_PRODUCT_ID@" "" - - DirText "@CPACK_NSIS_PACKAGE_NAME@" - - ; Allow for smooth progress bars. - InstProgressFlags smooth - !include Sections.nsh ;--- Component support macros: --- @@ -186,18 +163,8 @@ Var AR_RegFlags ;Interface Settings !define MUI_HEADERIMAGE - ; The following two MUST use backslashes on Windows for some gosh-awful reason. - !define MUI_HEADERIMAGE_BITMAP "@CPACK_SM_NSIS_HEADER_BITMAP@" - !define MUI_WELCOMEFINISHPAGE_BITMAP "@CPACK_SM_NSIS_WELCOME_BITMAP@" !define MUI_ABORTWARNING -;-------------------------------- -; path functions - -!verbose 3 -!include "WinMessages.NSH" -!verbose 4 - ;---------------------------------------- ; based upon a script of "Written by KiCHiK 2003-01-18 05:57:02" ;---------------------------------------- @@ -564,26 +531,21 @@ Function DownloadFile FunctionEnd !endif -;-------------------------------- -; Installation types -@CPACK_NSIS_INSTALLATION_TYPES@ - -;-------------------------------- -; Component sections -@CPACK_NSIS_COMPONENT_SECTIONS@ - ;-------------------------------- ; Define some macro setting for the gui @CPACK_NSIS_INSTALLER_MUI_ICON_CODE@ @CPACK_NSIS_INSTALLER_ICON_CODE@ -@CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@ +@CPACK_NSIS_INSTALLER_MUI_WELCOMEFINISH_CODE@ +@CPACK_NSIS_INSTALLER_MUI_UNWELCOMEFINISH_CODE@ @CPACK_NSIS_INSTALLER_MUI_FINISHPAGE_RUN_CODE@ ;-------------------------------- ;Pages + @CPACK_NSIS_INSTALLER_WELCOME_TITLE_CODE@ + @CPACK_NSIS_INSTALLER_WELCOME_TITLE_3LINES_CODE@ !insertmacro MUI_PAGE_WELCOME - !insertmacro MUI_PAGE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@" + @CPACK_NSIS_LICENSE_PAGE@ Page custom InstallOptionsPage !insertmacro MUI_PAGE_DIRECTORY @@ -591,15 +553,16 @@ FunctionEnd !define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX" !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" + !define MUI_STARTMENUPAGE_DEFAULTFOLDER "@CPACK_SM_NSIS_PRODUCT_ID@" !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER @CPACK_NSIS_PAGE_COMPONENTS@ !insertmacro MUI_PAGE_INSTFILES + @CPACK_NSIS_INSTALLER_FINISH_TITLE_CODE@ + @CPACK_NSIS_INSTALLER_FINISH_TITLE_3LINES_CODE@ ; Modify the settings for MUI_PAGE_FINISH here. - !define MUI_FINISHPAGE_NOAUTOCLOSE - !define MUI_FINISHPAGE_RUN "$INSTDIR\Program\ITGmania.exe" !define MUI_FINISHPAGE_RUN_NOTCHECKED !define MUI_FINISHPAGE_RUN_TEXT "Launch ITGmania" @@ -612,21 +575,27 @@ FunctionEnd ;Languages !insertmacro MUI_LANGUAGE "English" ;first language is the default language + !insertmacro MUI_LANGUAGE "Afrikaans" !insertmacro MUI_LANGUAGE "Albanian" !insertmacro MUI_LANGUAGE "Arabic" + !insertmacro MUI_LANGUAGE "Asturian" !insertmacro MUI_LANGUAGE "Basque" !insertmacro MUI_LANGUAGE "Belarusian" !insertmacro MUI_LANGUAGE "Bosnian" !insertmacro MUI_LANGUAGE "Breton" !insertmacro MUI_LANGUAGE "Bulgarian" + !insertmacro MUI_LANGUAGE "Catalan" + !insertmacro MUI_LANGUAGE "Corsican" !insertmacro MUI_LANGUAGE "Croatian" !insertmacro MUI_LANGUAGE "Czech" !insertmacro MUI_LANGUAGE "Danish" !insertmacro MUI_LANGUAGE "Dutch" + !insertmacro MUI_LANGUAGE "Esperanto" !insertmacro MUI_LANGUAGE "Estonian" !insertmacro MUI_LANGUAGE "Farsi" !insertmacro MUI_LANGUAGE "Finnish" !insertmacro MUI_LANGUAGE "French" + !insertmacro MUI_LANGUAGE "Galician" !insertmacro MUI_LANGUAGE "German" !insertmacro MUI_LANGUAGE "Greek" !insertmacro MUI_LANGUAGE "Hebrew" @@ -645,25 +614,31 @@ FunctionEnd !insertmacro MUI_LANGUAGE "Malay" !insertmacro MUI_LANGUAGE "Mongolian" !insertmacro MUI_LANGUAGE "Norwegian" + !insertmacro MUI_LANGUAGE "NorwegianNynorsk" + !insertmacro MUI_LANGUAGE "Pashto" !insertmacro MUI_LANGUAGE "Polish" !insertmacro MUI_LANGUAGE "Portuguese" !insertmacro MUI_LANGUAGE "PortugueseBR" !insertmacro MUI_LANGUAGE "Romanian" !insertmacro MUI_LANGUAGE "Russian" + !insertmacro MUI_LANGUAGE "ScotsGaelic" !insertmacro MUI_LANGUAGE "Serbian" !insertmacro MUI_LANGUAGE "SerbianLatin" !insertmacro MUI_LANGUAGE "SimpChinese" !insertmacro MUI_LANGUAGE "Slovak" !insertmacro MUI_LANGUAGE "Slovenian" !insertmacro MUI_LANGUAGE "Spanish" + !insertmacro MUI_LANGUAGE "SpanishInternational" !insertmacro MUI_LANGUAGE "Swedish" + !insertmacro MUI_LANGUAGE "Tatar" !insertmacro MUI_LANGUAGE "Thai" !insertmacro MUI_LANGUAGE "TradChinese" !insertmacro MUI_LANGUAGE "Turkish" !insertmacro MUI_LANGUAGE "Ukrainian" + !insertmacro MUI_LANGUAGE "Uzbek" + !insertmacro MUI_LANGUAGE "Vietnamese" !insertmacro MUI_LANGUAGE "Welsh" - ;-------------------------------- ;Reserve Files @@ -674,6 +649,17 @@ FunctionEnd ReserveFile "NSIS.InstallOptions.ini" !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS + ; for UserInfo::GetName and UserInfo::GetAccountType + ReserveFile /plugin 'UserInfo.dll' + +;-------------------------------- +; Installation types +@CPACK_NSIS_INSTALLATION_TYPES@ + +;-------------------------------- +; Component sections +@CPACK_NSIS_COMPONENT_SECTIONS@ +@CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@ ;-------------------------------- ;Installer Sections @@ -688,27 +674,18 @@ Section "-Core installation" WriteRegStr SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "" $INSTDIR ;Create uninstaller - WriteUninstaller "$INSTDIR\Uninstall.exe" + WriteUninstaller "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME@.exe" Push "DisplayName" Push "@CPACK_NSIS_DISPLAY_NAME@" Call ConditionalAddToRegisty Push "DisplayVersion" Push "@CPACK_PACKAGE_VERSION@" Call ConditionalAddToRegisty - Push "Comments" - Push "ITGmania is a rhythm game simulator." - Call ConditionalAddToRegisty Push "Publisher" Push "@CPACK_PACKAGE_VENDOR@" Call ConditionalAddToRegisty - Push "URLInfoAbout" - Push "@CPACK_NSIS_URL_INFO_ABOUT@" - Call ConditionalAddToRegisty - Push "URLUpdateInfo" - Push "@CPACK_SM_NSIS_REPOSITORY@" - Call ConditionalAddToRegisty Push "UninstallString" - Push "$INSTDIR\Uninstall.exe" + Push "$\"$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME@.exe$\"" Call ConditionalAddToRegisty Push "NoRepair" Push "1" @@ -732,6 +709,9 @@ Section "-Core installation" Push "HelpLink" Push "@CPACK_NSIS_HELP_LINK@" Call ConditionalAddToRegisty + Push "URLInfoAbout" + Push "@CPACK_NSIS_URL_INFO_ABOUT@" + Call ConditionalAddToRegisty Push "Contact" Push "@CPACK_NSIS_CONTACT@" Call ConditionalAddToRegisty @@ -742,12 +722,6 @@ Section "-Core installation" WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\smzipfile\shell\open\command" "" '"$INSTDIR\Program\ITGmania.exe" "%1"' WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\.smzip" "" "smzipfile" - ; Associate SMURL protocol. - WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\stepmania" "" "ITGmania protocol handler" - WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\stepmania" "URL Protocol" "" - WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\stepmania\DefaultIcon" "" "$INSTDIR\Program\ITGmania.exe" - WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\stepmania\shell\open\command" "" '"$INSTDIR\Program\ITGmania.exe" "%1"' - !insertmacro MUI_INSTALLOPTIONS_READ $INSTALL_DESKTOP "NSIS.InstallOptions.ini" "Field 5" "State" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application @@ -755,7 +729,7 @@ Section "-Core installation" CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER" @CPACK_NSIS_CREATE_ICONS@ @CPACK_NSIS_CREATE_ICONS_EXTRA@ - CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe" + CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME@.exe" ;Read a value from an InstallOptions INI file !insertmacro MUI_INSTALLOPTIONS_READ $DO_NOT_ADD_TO_PATH "NSIS.InstallOptions.ini" "Field 2" "State" @@ -894,7 +868,7 @@ Section "Uninstall" !endif ;Remove the uninstaller itself. - Delete "$INSTDIR\Uninstall.exe" + Delete "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME@.exe" DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" ;Remove the installation directory if it is empty. @@ -912,7 +886,7 @@ Section "Uninstall" @CPACK_NSIS_DELETE_ICONS@ @CPACK_NSIS_DELETE_ICONS_EXTRA@ - ;Delete empty start menu parent diretories + ;Delete empty start menu parent directories StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP" startMenuDeleteLoop: @@ -931,7 +905,7 @@ Section "Uninstall" Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" @CPACK_NSIS_DELETE_ICONS_EXTRA@ - ;Delete empty start menu parent diretories + ;Delete empty start menu parent directories StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP" secondStartMenuDeleteLoop: @@ -970,15 +944,17 @@ Function .onInit MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION \ "@CPACK_NSIS_PACKAGE_NAME@ is already installed. $\n$\nDo you want to uninstall the old version before installing the new one?" \ - IDYES uninst IDNO inst + /SD IDYES IDYES uninst IDNO inst Abort ;Run the uninstaller uninst: ClearErrors - StrLen $2 "\Uninstall.exe" - StrCpy $3 $0 -$2 # remove "\Uninstall.exe" from UninstallString to get path - ExecWait '$0 _?=$3' ;Do not copy the uninstaller to a temp file + StrCpy $2 $0 1 + StrCmp '"' $2 0 +3 ; checks if string is quoted (CPack before v3.20.6 did not quote it) + ExecWait '$0 /S' + Goto +2 + ExecWait '"$0" /S' IfErrors uninst_failed inst uninst_failed: diff --git a/CMake/SMDefs.cmake b/CMake/SMDefs.cmake index eada739618..b85bea747e 100644 --- a/CMake/SMDefs.cmake +++ b/CMake/SMDefs.cmake @@ -35,42 +35,5 @@ else() endif() endif() -if(CMAKE_MAJOR_VERSION STREQUAL "3") - # Use the CMake 3 approach whenever possible. - string(TIMESTAMP SM_TIMESTAMP_DATE "%Y%m%d") - string(TIMESTAMP SM_TIMESTAMP_TIME "%H:%M:%S" UTC) -else() - if(MSVC) - message( - STATUS - "Getting date and time information via PowerShell. This may take a few seconds." - ) - execute_process(COMMAND powershell get-date -format "{yyyyMMdd}" - OUTPUT_VARIABLE SM_TIMESTAMP_DATE - RESULT_VARIABLE ret - OUTPUT_STRIP_TRAILING_WHITESPACE) - - execute_process(COMMAND powershell get-date -format "{HH:mm:ss zzz}" - OUTPUT_VARIABLE SM_TIMESTAMP_TIME - RESULT_VARIABLE ret - OUTPUT_STRIP_TRAILING_WHITESPACE) - else() - execute_process(COMMAND date "+%Y%m%d" - OUTPUT_VARIABLE SM_TIMESTAMP_DATE - RESULT_VARIABLE ret - OUTPUT_STRIP_TRAILING_WHITESPACE) - - execute_process(COMMAND date "+%H:%M:%S %z" - OUTPUT_VARIABLE SM_TIMESTAMP_TIME - RESULT_VARIABLE ret - OUTPUT_STRIP_TRAILING_WHITESPACE) - endif() - - if(NOT (ret STREQUAL "0")) - set(SM_TIMESTAMP_DATE "xxxxyyzz") - endif() - - if(NOT (ret STREQUAL "0")) - set(SM_TIMESTAMP_TIME "xx:yy:zz ???") - endif() -endif() +string(TIMESTAMP SM_TIMESTAMP_DATE "%Y%m%d") +string(TIMESTAMP SM_TIMESTAMP_TIME "%H:%M:%S" UTC) diff --git a/Data/icon.png b/Data/icon.png new file mode 100644 index 0000000000..930a1e1ef6 Binary files /dev/null and b/Data/icon.png differ diff --git a/Docs/CommandLineArgs.txt b/Docs/CommandLineArgs.txt index 543408aae8..ea2acb74f2 100644 --- a/Docs/CommandLineArgs.txt +++ b/Docs/CommandLineArgs.txt @@ -22,10 +22,6 @@ usage: --Type=arcade Reads preferences from [Preferences-{Type}], usually from the metrics. -------------------------------------------------------------------------------- [StepMania] -* ExportNsisStrings -usage: --ExportNsisStrings -Exports strings for the installer. - * ExportLuaInformation usage: --ExportLuaInformation Exports Lua.xml using the current theme (and anything it falls back on) diff --git a/Docs/Doxyfile b/Docs/Doxyfile index 8730181f8e..d15f8c3544 100644 --- a/Docs/Doxyfile +++ b/Docs/Doxyfile @@ -44,7 +44,7 @@ PROJECT_BRIEF = "An advanced dance and rhythm game" # exceed 55 pixels and the maximum width should not exceed 200 pixels. # Doxygen will copy the logo to the output directory. -PROJECT_LOGO = ../icons/hicolor/48x48/apps/stepmania-ssc.png +PROJECT_LOGO = ../Data/icon.png # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/Docs/Luadoc/favicon.ico b/Docs/Luadoc/favicon.ico index 95519364bc..6334a7700d 100644 Binary files a/Docs/Luadoc/favicon.ico and b/Docs/Luadoc/favicon.ico differ diff --git a/Installer/custom-sm5.bmp b/Installer/custom-sm5.bmp deleted file mode 100644 index 17c427c6b4..0000000000 Binary files a/Installer/custom-sm5.bmp and /dev/null differ diff --git a/Installer/custom.ini b/Installer/custom.ini deleted file mode 100644 index 840b11d4f9..0000000000 --- a/Installer/custom.ini +++ /dev/null @@ -1,47 +0,0 @@ -[Settings] -NumFields=5 - -[Field 1] -Type=Button -Flags=NOTIFY -Text=&Install -Left=160 -Right=-10 -Top=50 -Bottom=70 - -[Field 2] -Type=Button -Flags=NOTIFY -Text=&Play -Left=160 -Right=-10 -Top=30 -Bottom=50 - -[Field 3] -Type=Button -Flags=NOTIFY -Text=&Re-Install -Left=160 -Right=-10 -Top=60 -Bottom=80 - -[Field 4] -Type=Link -Text=http://www.urlhere.com -State=http://www.urlhere.com -Left=160 -Right=-10 -Top=130 -Bottom=140 - -[Field 5] -Type=Bitmap -Text=custom.bmp -Flags=TRANSPARENT -Left=0 -Right=150 -Top=0 -Bottom=120 \ No newline at end of file diff --git a/Installer/header-sm5.bmp b/Installer/header-sm5.bmp deleted file mode 100644 index 4231b9fae9..0000000000 Binary files a/Installer/header-sm5.bmp and /dev/null differ diff --git a/Installer/header.bmp b/Installer/header.bmp new file mode 100644 index 0000000000..609bbdf6cc Binary files /dev/null and b/Installer/header.bmp differ diff --git a/Installer/install.ico b/Installer/install.ico index 60a8122e56..3ebc82160f 100644 Binary files a/Installer/install.ico and b/Installer/install.ico differ diff --git a/Installer/welcome-sm5.bmp b/Installer/welcome-sm5.bmp deleted file mode 100644 index caed1b1c89..0000000000 Binary files a/Installer/welcome-sm5.bmp and /dev/null differ diff --git a/Installer/welcome.bmp b/Installer/welcome.bmp new file mode 100644 index 0000000000..e382269e21 Binary files /dev/null and b/Installer/welcome.bmp differ diff --git a/Themes/_Installer/Languages/de.ini b/Themes/_Installer/Languages/de.ini deleted file mode 100644 index ba0f89ac54..0000000000 --- a/Themes/_Installer/Languages/de.ini +++ /dev/null @@ -1,36 +0,0 @@ -[Installer Sections] -TEXT_IO_CHECK_FOR_UPDATES=Updates zu 黚erpr黤en -TEXT_IO_RUN=${PRODUCT_DISPLAY} -TEXT_IO_RUN_WITHOUT_SSE2=${PRODUCT_DISPLAY} (non-SSE2) -TEXT_IO_OPEN_PROGRAM_FOLDER=${PRODUCT_ID} Programmordner 鰂fnen -TEXT_IO_MANUAL=${PRODUCT_ID} Dokumentation -TEXT_IO_TOOLS=${PRODUCT_ID} Werkzeug -TEXT_IO_WEB_SITE=${PRODUCT_ID} Webseite -TEXT_IO_UNINSTALL=Deinstallation von ${PRODUCT_DISPLAY} -TEXT_IO_VIEW_STATISTICS=Statistiken anschauen -TEXT_IO_REMOVE_ONLY=${PRODUCT_DISPLAY} (Nur entfernen) -TEXT_IO_SMZIP_PACKAGE=SMZIP Paket -TEXT_IO_FATAL_ERROR_COPYING_PCK=Fatal error copying pck files. -TEXT_IO_FATAL_ERROR_INSTALL=Fatal error during install. -TEXT_IO_LAUNCH_THE_GAME=Spiel starten - -[Installer Functions] -TEXT_IO_TITLE=${PRODUCT_DISPLAY} -TEXT_IO_SUBTITLE= -TEXT_IO_INSTALL=Installieren -TEXT_IO_PLAY=Spielen -TEXT_IO_REINSTALL=Noch mal installieren - -[Leave Autorun] -TEXT_IO_COULD_NOT_EXECUTE=Konnte $INSTDIR\Program\${PRODUCT_FAMILY}.exe nicht ausf黨ren - -[PreInstall] -TEXT_IO_UNINSTALL_PREVIOUS=Die letzte Version von ${PRODUCT_ID} muss deinstalliert werden, bevor Sie weiter machen.\nWollen Sie fortfahren? -TEXT_IO_DIRECTX_VISIT_MICROSOFT=Die letzte Version von DirectX (8.1 oder h鰄er) ist dringend zu empfehlen.\nWollen Sie die Webseite von Microsoft jetzt besuchen? -TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY=Deinstallation fehlgeschlagen. Trotzdem installieren? -TEXT_IO_INSTALL_DIRECTX=Die letzte Version von DirectX (8.1 oder h鰄er) ist dringend zu empfehlen.\nWollen Sie es jetzt installieren? -TEXT_IO_FULL_INSTALL_NOT_FOUND=${PRODUCT_ID} scheint nicht installiert zu sein.\nWollen Sie fortfahren? - -[Uninstall] -TEXT_IO_FATAL_ERROR_UNINSTALL=Fatal error during uninstall. - diff --git a/Themes/_Installer/Languages/en.ini b/Themes/_Installer/Languages/en.ini deleted file mode 100644 index e0a3818c58..0000000000 --- a/Themes/_Installer/Languages/en.ini +++ /dev/null @@ -1,37 +0,0 @@ -[Installer Sections] -TEXT_IO_CHECK_FOR_UPDATES=Check for Updates -TEXT_IO_RUN=${PRODUCT_DISPLAY} -TEXT_IO_RUN_WITHOUT_SSE2=${PRODUCT_DISPLAY} (non-SSE2) -TEXT_IO_OPEN_PROGRAM_FOLDER=Open ${PRODUCT_ID} Program Folder -TEXT_IO_OPEN_SETTINGS_FOLDER=Open ${PRODUCT_ID} Settings Folder -TEXT_IO_MANUAL=${PRODUCT_ID} Manual -TEXT_IO_TOOLS=${PRODUCT_ID} Tools -TEXT_IO_WEB_SITE=${PRODUCT_ID} Web Site -TEXT_IO_UNINSTALL=Uninstall ${PRODUCT_DISPLAY} -TEXT_IO_VIEW_STATISTICS=View Statistics -TEXT_IO_REMOVE_ONLY=${PRODUCT_DISPLAY} (remove only) -TEXT_IO_SMZIP_PACKAGE=SMZIP package -TEXT_IO_FATAL_ERROR_COPYING_PCK =Fatal error copying pck files. -TEXT_IO_FATAL_ERROR_INSTALL=Fatal error during install. -TEXT_IO_LAUNCH_THE_GAME=Launch StepMania -TEXT_IO_TEXTURE_FONT_GENERATOR=Texture Font Generator - -[Installer Functions] -TEXT_IO_TITLE=${PRODUCT_DISPLAY} -TEXT_IO_SUBTITLE= -TEXT_IO_INSTALL=Install -TEXT_IO_PLAY=Play -TEXT_IO_REINSTALL=Reinstall - -[Leave Autorun] -TEXT_IO_COULD_NOT_EXECUTE=Could not execute $INSTDIR\Program\${PRODUCT_FAMILY}.exe - -[PreInstall] -TEXT_IO_UNINSTALL_PREVIOUS=The previous version of ${PRODUCT_ID} must be uninstalled before continuing.\nDo you wish to continue? -TEXT_IO_DIRECTX_VISIT_MICROSOFT=The latest version of DirectX (8.1 or higher) is strongly recommended.\nDo you wish to visit Microsoft's site now? -TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY=Uninstallation failed. Install anyway? -TEXT_IO_INSTALL_DIRECTX=The latest version of DirectX (8.1 or higher) is required.\nDo you wish to install DirectX 8.1 now? -TEXT_IO_FULL_INSTALL_NOT_FOUND=${PRODUCT_ID} does not appear to be installed.\nDo you wish to continue? - -[Uninstall] -TEXT_IO_FATAL_ERROR_UNINSTALL=Fatal error during uninstall. diff --git a/Themes/_Installer/Languages/es.ini b/Themes/_Installer/Languages/es.ini deleted file mode 100644 index 695f1786f6..0000000000 --- a/Themes/_Installer/Languages/es.ini +++ /dev/null @@ -1,37 +0,0 @@ -[Installer Sections] -TEXT_IO_CHECK_FOR_UPDATES=Comprobar actualizaciones -TEXT_IO_RUN=${PRODUCT_DISPLAY} -TEXT_IO_RUN_WITHOUT_SSE2=${PRODUCT_DISPLAY} (no SSE2) -TEXT_IO_OPEN_PROGRAM_FOLDER=Abrir la carpeta de programa de ${PRODUCT_ID} -TEXT_IO_OPEN_SETTINGS_FOLDER=Abrir la carpeta de preferencias de ${PRODUCT_ID} -TEXT_IO_MANUAL=Manual de ${PRODUCT_ID} -TEXT_IO_TOOLS=Herramientas de ${PRODUCT_ID} -TEXT_IO_WEB_SITE=Sitio web de ${PRODUCT_ID} -TEXT_IO_UNINSTALL=Desinstalar ${PRODUCT_DISPLAY} -TEXT_IO_VIEW_STATISTICS=Ver estad铆sticas -TEXT_IO_REMOVE_ONLY=${PRODUCT_DISPLAY} (s贸lo eliminar) -TEXT_IO_SMZIP_PACKAGE=Paquete SMZIP -TEXT_IO_FATAL_ERROR_COPYING_PCK=Error fatal copiando archivos pck. -TEXT_IO_FATAL_ERROR_INSTALL=Error fatal durante la instalaci贸n. -TEXT_IO_LAUNCH_THE_GAME=Ejecutar StepMania -TEXT_IO_TEXTURE_FONT_GENERATOR=Generador de fuentes en textura - -[Installer Functions] -TEXT_IO_TITLE=${PRODUCT_DISPLAY} -TEXT_IO_SUBTITLE= -TEXT_IO_INSTALL=Instalar -TEXT_IO_PLAY=Jugar -TEXT_IO_REINSTALL=Reinstalar - -[Leave Autorun] -TEXT_IO_COULD_NOT_EXECUTE=No se pudo ejecutar $INSTDIR\Program\${PRODUCT_FAMILY}.exe - -[PreInstall] -TEXT_IO_UNINSTALL_PREVIOUS=La versi贸n anterior de ${PRODUCT_ID} debe ser desinstalada antes de continuar.\n驴Desea continuar? -TEXT_IO_DIRECTX_VISIT_MICROSOFT=Se recomienda la 煤ltima versi贸n de DirectX (8.1 o superior).\n驴Desea visitar el sitio web de Microsoft ahora? -TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY=Fall贸 la desinstalaci贸n. 驴Instalar de todas maneras? -TEXT_IO_INSTALL_DIRECTX=Se requiere la 煤ltima versi贸n de DirectX (8.1 o superior).\n驴Desea instalar DirectX 8.1 ahora? -TEXT_IO_FULL_INSTALL_NOT_FOUND=${PRODUCT_ID} no parece estar instalado.\n驴Desea continuar? - -[Uninstall] -TEXT_IO_FATAL_ERROR_UNINSTALL=Error fatal durante la desinstalaci贸n. diff --git a/Themes/_Installer/Languages/fr.ini b/Themes/_Installer/Languages/fr.ini deleted file mode 100644 index 56106ff810..0000000000 --- a/Themes/_Installer/Languages/fr.ini +++ /dev/null @@ -1,36 +0,0 @@ -[Installer Sections] -TEXT_IO_CHECK_FOR_UPDATES=V閞ifier les mises jour -TEXT_IO_RUN=${PRODUCT_DISPLAY} -TEXT_IO_RUN_WITHOUT_SSE2=${PRODUCT_DISPLAY} (non-SSE2) -TEXT_IO_OPEN_PROGRAM_FOLDER=Ouvrir le dossier programme de ${PRODUCT_ID} -TEXT_IO_MANUAL=Documentation de ${PRODUCT_ID} -TEXT_IO_TOOLS=Outils de ${PRODUCT_ID} -TEXT_IO_WEB_SITE=Le site web de ${PRODUCT_ID} -TEXT_IO_UNINSTALL=D閟installer ${PRODUCT_DISPLAY} -TEXT_IO_VIEW_STATISTICS=Voir les statistiques -TEXT_IO_REMOVE_ONLY=${PRODUCT_DISPLAY} (Supprimer uniquement) -TEXT_IO_SMZIP_PACKAGE=SMZIP package -TEXT_IO_FATAL_ERROR_COPYING_PCK=Fatal error copying pck files. -TEXT_IO_FATAL_ERROR_INSTALL=Fatal error during install. -TEXT_IO_LAUNCH_THE_GAME=Lancer le jeu - -[Installer Functions] -TEXT_IO_TITLE=${PRODUCT_DISPLAY} -TEXT_IO_SUBTITLE= -TEXT_IO_INSTALL=Installer -TEXT_IO_PLAY=Jouer -TEXT_IO_REINSTALL=R閕nstaller - -[Leave Autorun] -TEXT_IO_COULD_NOT_EXECUTE=N'a pas pu ex閏uter $INSTDIR\Program\${PRODUCT_FAMILY}.exe - -[PreInstall] -TEXT_IO_UNINSTALL_PREVIOUS=La version pr閏閐ente de ${PRODUCT_ID} doit 阾re d閕nstall閑 pour pouvoir continuer. Voulez-vous continuer ? -TEXT_IO_DIRECTX_VISIT_MICROSOFT=La derni鑢e version de DirectX (8.1 ou sup閞ieure) est hautement recommand閑. Voulez-vous visiter le site de Microsoft maintenant ? -TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY=Echec de la d閕nstallation. Voulez-vous tout de m阭e lancer l'installation ? -TEXT_IO_INSTALL_DIRECTX=La derni鑢e version de DirectX (8.1 ou sup閞ieure) est hautement recommand閑. D閟irez-vous l'installer maintenant ? -TEXT_IO_FULL_INSTALL_NOT_FOUND=${PRODUCT_ID} ne semble pas install.\nVoulez-vous continuer? - -[Uninstall] -TEXT_IO_FATAL_ERROR_UNINSTALL=Fatal error during uninstall. - diff --git a/Themes/_Installer/Languages/it.ini b/Themes/_Installer/Languages/it.ini deleted file mode 100644 index a5f80d3f69..0000000000 --- a/Themes/_Installer/Languages/it.ini +++ /dev/null @@ -1,36 +0,0 @@ -[Installer Sections] -TEXT_IO_CHECK_FOR_UPDATES=Per cercare aggiornamenti -TEXT_IO_RUN=${PRODUCT_DISPLAY} -TEXT_IO_RUN_WITHOUT_SSE2=${PRODUCT_DISPLAY} (non-SSE2) -TEXT_IO_OPEN_PROGRAM_FOLDER=Apri ${PRODUCT_ID} Cartella Programmi -TEXT_IO_MANUAL=${PRODUCT_ID} Documentazione -TEXT_IO_TOOLS=${PRODUCT_ID} Strumenti -TEXT_IO_WEB_SITE=${PRODUCT_ID} Sito Web -TEXT_IO_UNINSTALL=Disinstalla ${PRODUCT_DISPLAY} -TEXT_IO_VIEW_STATISTICS=Mostra Statistiche -TEXT_IO_REMOVE_ONLY=${PRODUCT_DISPLAY} (Elimina soltanto) -TEXT_IO_SMZIP_PACKAGE=SMZIP pacchetto -TEXT_IO_FATAL_ERROR_COPYING_PCK=Fatal error copying pck files. -TEXT_IO_FATAL_ERROR_INSTALL=Fatal error during install. -TEXT_IO_LAUNCH_THE_GAME=Lancia gioco - -[Installer Functions] -TEXT_IO_TITLE=${PRODUCT_DISPLAY} -TEXT_IO_SUBTITLE= -TEXT_IO_INSTALL=Installa -TEXT_IO_PLAY=Gioca -TEXT_IO_REINSTALL=Re-installa - -[Leave Autorun] -TEXT_IO_COULD_NOT_EXECUTE=Impossibile eseguire $INSTDIR\Program\${PRODUCT_FAMILY}.exe - -[PreInstall] -TEXT_IO_UNINSTALL_PREVIOUS=Prima di continuare va installata la versione precendente di ${PRODUCT_ID}. Vuoi continuare? -TEXT_IO_DIRECTX_VISIT_MICROSOFT=Si consiglia vivamente di installare la versione pi recente di DirectX (8.1 o superiore). Vuoi visitare il sito Microsoft adesso? -TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY=Disinstallazione non riuscita. Vuoi installare comunque? -TEXT_IO_INSTALL_DIRECTX=Si consiglia vivamente di installare la versione pi recente di DirectX (8.1 o superiore). Vuoi installarla adesso? -TEXT_IO_FULL_INSTALL_NOT_FOUND=${PRODUCT_ID} non sembra installato.\nVuoi continuare? - -[Uninstall] -TEXT_IO_FATAL_ERROR_UNINSTALL=Fatal error during uninstall. - diff --git a/Themes/_Installer/Languages/ko.ini b/Themes/_Installer/Languages/ko.ini deleted file mode 100644 index 40c058b55e..0000000000 --- a/Themes/_Installer/Languages/ko.ini +++ /dev/null @@ -1,37 +0,0 @@ -[Installer Sections] -TEXT_IO_CHECK_FOR_UPDATES=臧膘嫚頇曥澑 -TEXT_IO_RUN=${PRODUCT_DISPLAY} -TEXT_IO_RUN_WITHOUT_SSE2=${PRODUCT_DISPLAY} (SSE2鞐嗢澊) -TEXT_IO_OPEN_PROGRAM_FOLDER=${PRODUCT_ID}頂勲攴鸽瀸韽措崝毳 鞐劯鞖 -TEXT_IO_OPEN_SETTINGS_FOLDER=${PRODUCT_ID}靹れ爼韽措崝毳 鞐劯鞖 -TEXT_IO_MANUAL=${PRODUCT_ID}靹る獏靹 -TEXT_IO_TOOLS=${PRODUCT_ID}霃勱惮 -TEXT_IO_WEB_SITE=${PRODUCT_ID}鞗轨偓鞚错姼 -TEXT_IO_UNINSTALL=${PRODUCT_DISPLAY}歆鞖瓣赴 -TEXT_IO_VIEW_STATISTICS=韱店硠氤搓赴 -TEXT_IO_REMOVE_ONLY=${PRODUCT_DISPLAY}(歆鞖瓣赴鞐愲) -TEXT_IO_SMZIP_PACKAGE=SMZIP(鞀ろ厺毵堧媹鞎勳晻於曧寣鞚)昃鸽煬氙 -TEXT_IO_FATAL_ERROR_COPYING_PCK=pck韺岇澕鞚 氩犽伡電旊嵃 鞁ろ尐頄堨姷雼堧嫟 -TEXT_IO_FATAL_ERROR_INSTALL=旯旍晞霊愱赴鞐 鞁ろ尐頄堨姷雼堧嫟 -TEXT_IO_LAUNCH_THE_GAME=鞀ろ厺毵堧媹鞎勲弻毽赴 -TEXT_IO_TEXTURE_FONT_GENERATOR=歆堦皭旮昙措霌り赴 - -[Installer Functions] -TEXT_IO_TITLE=${PRODUCT_DISPLAY} -TEXT_IO_SUBTITLE=鞛愲 -TEXT_IO_INSTALL=旯旍晞霊愱赴 -TEXT_IO_PLAY=歃愱赴旮 -TEXT_IO_REINSTALL=雼れ嫓旯旍晞霊愱赴 - -[Leave Autorun] -TEXT_IO_COULD_NOT_EXECUTE=$INSTDIR\Program\${PRODUCT_FAMILY}.exe 鞚 於旍稖頃犾垬 鞐嗢姷雼堧嫟. - -[PreInstall] -TEXT_IO_UNINSTALL_PREVIOUS=${PRODUCT_ID}鞚挫爠韺愳潃 鞚挫柎靹滍晿旮办爠鞐 歆鞗岇牳鞎柬暕雼堧嫟. \n瓿勳啀頃橃嫓瓴犾姷雼堦箤? -TEXT_IO_DIRECTX_VISIT_MICROSOFT=雼れ澊霠夗姼鞐戩姢斓滌嫚韺(8.1鞚挫儊)鞚 甓岅碃霅╇媹雼. \n鞚挫牅 毵堨澊韥靻岉攧韸胳浌靷澊韸鸽ゼ 霌る煬氲堨嫓瓴犾姷雼堦箤? -TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY=歆鞖瓣赴鞁ろ尐頄堨姷雼堧嫟. 攴鸽灅霃 旯旍晞霊愳嫓瓴犾姷雼堦箤? -TEXT_IO_INSTALL_DIRECTX=雼れ澊霠夗姼鞐戩姢斓滌嫚韺(8.1鞚挫儊)鞚 頃勳殧頃╇媹雼. \n鞚挫牅 雼れ澊霠夗姼鞐戩姢8.1鞚 旯旍晞霊愳嫓瓴犾姷雼堦箤? -TEXT_IO_FULL_INSTALL_NOT_FOUND=${PRODUCT_ID}電 旯旍晞霊愲姅雿 雮橅儉雮橃鞎婌姷雼堧嫟.\n瓿勳啀頃橃嫓瓴犾姷雼堦箤? - -[Uninstall] -TEXT_IO_FATAL_ERROR_UNINSTALL=歆鞖半姅雿 鞓る臧 雮姷雼堧嫟. diff --git a/Themes/_Installer/Languages/pl.ini b/Themes/_Installer/Languages/pl.ini deleted file mode 100644 index 868173bc5c..0000000000 --- a/Themes/_Installer/Languages/pl.ini +++ /dev/null @@ -1,36 +0,0 @@ -[Installer Sections] -TEXT_IO_CHECK_FOR_UPDATES=Sprawd aktualizacje -TEXT_IO_RUN=${PRODUCT_DISPLAY} -TEXT_IO_RUN_WITHOUT_SSE2=${PRODUCT_DISPLAY} (non-SSE2) -TEXT_IO_OPEN_PROGRAM_FOLDER=Otw髍z ${PRODUCT_ID} Folder Programu -TEXT_IO_OPEN_SETTINGS_FOLDER=Otw髍z ${PRODUCT_ID} Ustawienia Programu -TEXT_IO_MANUAL=${PRODUCT_ID} Obs硊ga -TEXT_IO_TOOLS=${PRODUCT_ID} Narz阣zia -TEXT_IO_WEB_SITE=${PRODUCT_ID} Strona WWW -TEXT_IO_UNINSTALL=Usu ${PRODUCT_DISPLAY} -TEXT_IO_VIEW_STATISTICS=Poka Statystyki -TEXT_IO_REMOVE_ONLY=${PRODUCT_DISPLAY} (tylko usu) -TEXT_IO_SMZIP_PACKAGE=Paczka SMZIP -TEXT_IO_FATAL_ERROR_COPYING_PCK =B彻d krytyczny kopiowania pliku pck. -TEXT_IO_FATAL_ERROR_INSTALL=B彻d krytyczny podczas instalacji. -TEXT_IO_LAUNCH_THE_GAME=Uruchom StepMania -TEXT_IO_TEXTURE_FONT_GENERATOR=Generator Tekstur Czcionek - -[Installer Functions] -TEXT_IO_TITLE=${PRODUCT_DISPLAY} -TEXT_IO_SUBTITLE= -TEXT_IO_INSTALL=Instaluj -TEXT_IO_PLAY=Graj -TEXT_IO_REINSTALL=Zainstaluj ponownie - -[Leave Autorun] -TEXT_IO_COULD_NOT_EXECUTE=Nie mo縩a uruchomi $INSTDIR\Program\${PRODUCT_FAMILY}.exe - -[PreInstall] -TEXT_IO_UNINSTALL_PREVIOUS=Wcze渘iejsza wersja ${PRODUCT_ID} musi zosta usuni阾a przed kontynuowaniem.\nCzy chcesz kontynuowa? -TEXT_IO_DIRECTX_VISIT_MICROSOFT=Zdecydowanie zaleca si najnowsz wersj DirectX (8.1 lub wy縮zej).\nCzy chcesz odwiedzi stron Microsoftu teraz? -TEXT_IO_UNINSTALL_FAILED_INSTALL_ANYWAY=Dezinstalacja nie powiod砤 si. Zainstalowa mimo wszystko? -TEXT_IO_INSTALL_DIRECTX=Wymagana jest najnowsza wersja DirectX (8.1 lub wy縮zej).\nCzy chcesz zainstalowa teraz DirectX 8.1? -TEXT_IO_FULL_INSTALL_NOT_FOUND=${PRODUCT_ID} nie wydaje si by zainstalowany.\nCzy chcesz kontynuowa? -[Uninstall] -TEXT_IO_FATAL_ERROR_UNINSTALL=B彻d krytyczny podczas odinstalowywania. \ No newline at end of file diff --git a/Themes/_Installer/readme.txt b/Themes/_Installer/readme.txt deleted file mode 100644 index 59d6d9edaf..0000000000 --- a/Themes/_Installer/readme.txt +++ /dev/null @@ -1,6 +0,0 @@ -The _Installer theme is only used for generating an installer with NSIS -(specifically, the strings used in the installer). Non-source code distributions -(aka public releases) should not contain this folder. - -kthx! :D --aj \ No newline at end of file diff --git a/Utils/CreatePackage.pl b/Utils/CreatePackage.pl deleted file mode 100755 index 1c69be08d2..0000000000 --- a/Utils/CreatePackage.pl +++ /dev/null @@ -1,199 +0,0 @@ -#!/usr/bin/perl -use strict; -use warnings; - -my $CWD = `pwd`; -chomp $CWD; -my $ZIP = "zip"; -if ( -x "$CWD/zip.exe" ) { $ZIP = "$CWD/zip.exe"; } - -if( $#ARGV < 1 ) -{ - print "Usage: create-zips.pl \n"; - exit 1; -} - -my $in = $ARGV[0]; -my $out = $ARGV[1]; - -if( ! -d $in ) -{ - print "$in isn't a directory\n"; - exit 1; -} -if( ! -d $out ) -{ - print "$out isn't a directory\n"; - exit 1; -} - -# Resolve $out to an absolute path. -my $pwd = `pwd`; -chomp $pwd; -chdir $out || die "chdir($out): $!"; -$out = `pwd`; -chomp $out; -chdir $pwd || die "chdir($pwd): $!"; - -print "$in -> $out\n"; - -sub ZipFiles($$@); -sub ZipFiles($$@) -{ - my $dir = shift; - my $file = shift; - my @files = @{(shift)}; - - $dir = $in . "/" . $dir; - chdir $dir || die "chdir($dir): $!"; - - my @list; - - foreach my $x ( @files ) - { - print "$x\n"; - # No CVS directories, no dotfiles, files only. - my $output = `find "$x" -path '*/CVS' -prune -o -path '*/.*' -prune -o -path '*/*.psd' -prune -o '(' -type f -a -name '*' ')' -print`; - if( $? == -1 ) { die "Find failed: $!\n"; } - if( $? & 127 ) { die "Find failed with signal %d\n", ($? & 127); } - if( $? >> 8 != 0 ) { exit 1; } - - push @list, split(/\n/, $output); - } - - # ZIP the files. - { - my @lst; - my %lst_hash; - for( my $f = 0; $f <= $#list; ++$f ) - { - push @lst, $list[$f]; - $lst_hash{$list[$f]} = 1; - } - - # @lst contains the files for zip number $zipno. - - my $filename = $out . "/$file.smzip"; - # If the ZIP already exists, get a list of files in it. Delete any files - # that shouldn't be there. - if( -e $filename ) - { - my @files = split(/\n/, `unzip -l "$filename"`); - shift @files; # "Archive: ..." - shift @files; # " Length Date Time Name" - shift @files; # "-------- ---- ---- ----" - pop @files; # "-------- ---- ---- -------" - pop @files; # " 2501 2 files" - - foreach my $fn ( @files ) - { - # " 1081 02-11-04 19:27 foo" -> "foo" - $fn = substr( $fn, 28 ); - } - - # Loop over files in the ZIP, and find any files not in %lst_hash. - my @unneeded; - for( my $n = 0; $n <= $#files; ++$n ) - { - my $file = $files[$n]; - # Skip directories. - if( $file =~ /.*\/$/ ) { next; } - if( defined( $lst_hash{$file} ) ) { next; } - push @unneeded, $files[$n]; - } - - if( $#unneeded != -1 ) - { - print "$filename has " . ($#unneeded+1) . " extra files; removing ...\n"; - - open TMP, ">/tmp/zip.lst" || die "$!"; - foreach my $fn ( @unneeded ) { print TMP "$fn\n"; } - close TMP; - - system "$ZIP -b $out $filename -d -@ < /tmp/zip.lst"; - if ($? == -1) { die "Zip failed: $!\n"; } - if ($? & 127) { die "Zip failed with signal %d\n", ($? & 127); } - if( $? >> 8 != 0 ) { die "Zip failed\n"; } - } - } - - if( -e $filename ) { print "Updating $filename ...\n"; } - else { print "Creating $filename ...\n"; } - - # -q: quiet - # -u: update only (only if it already exists) - # -y: store links - # -n: don't compress - - my $options = "-q -y -n .ogg:.mp3:.png:.jpg:.mpg:.avi"; - if( -e $filename ) { $options .= " -u"; } - open TMP, ">/tmp/zip.lst" || die "$!"; - foreach my $fn ( @lst ) { print TMP "$fn\n"; } - close TMP; - - system "$ZIP $options -b $out $filename -@ < /tmp/zip.lst" || die "Zip failed"; - - if ($? == -1) { die "Zip failed: $!\n"; } - if ($? & 127) { die "Zip failed with signal %d\n", ($? & 127); } - my $ret = ($? >> 8); - if( $ret != 0 && $ret != 12 ) { die "Zip failed\n"; } - } - - chdir $CWD || die "chdir($CWD): $!"; -} - -my @files = ( - "BackgroundEffects", - "BackgroundTransitions", - "BGAnimations", - "Characters/default", - "Courses/Default", - "Data", - "NoteSkins/beat/default", - "NoteSkins/common/common", - "NoteSkins/common/_Editor", - # dance noteskins - "NoteSkins/dance/default", - "NoteSkins/dance/Delta", - ## midi series - "NoteSkins/dance/midi-note", - "NoteSkins/dance/midi-note-3d", - "NoteSkins/dance/midi-solo", - "NoteSkins/dance/midi-vivid", - "NoteSkins/dance/midi-vivid-3d", - "NoteSkins/dance/midi-routine-p1", - "NoteSkins/dance/midi-routine-p2", - ## retro/retrobar - "NoteSkins/dance/retro", - "NoteSkins/dance/retrobar", - "NoteSkins/dance/retrobar-splithand_whiteblue", - # pump noteskins - "NoteSkins/pump/cmd", - "NoteSkins/pump/cmd-routine-p1", - "NoteSkins/pump/cmd-routine-p2", - "NoteSkins/pump/complex", - "NoteSkins/pump/default", - "NoteSkins/pump/delta", - "NoteSkins/pump/delta-note", - "NoteSkins/pump/delta-routine-p1", - "NoteSkins/pump/delta-routine-p2", - "NoteSkins/pump/frame5p", - "NoteSkins/pump/newextra", - "NoteSkins/pump/pad", - "NoteSkins/pump/rhythm", - "NoteSkins/pump/simple", - # kb7 noteskins - "NoteSkins/kb7/default", - "NoteSkins/kb7/orbital", - "NoteSkins/kb7/retrobar", - "NoteSkins/kb7/retrobar-iidx", - "NoteSkins/kb7/retrobar-o2jam", - "NoteSkins/kb7/retrobar-razor", - "NoteSkins/kb7/retrobar-razor_o2", - # themes - "Themes/_fallback", - "Themes/default", - "Scripts" -); - -ZipFiles( ".", "GameData", \@files ); diff --git a/Utils/make-src-archive.sh b/Utils/make-src-archive.sh deleted file mode 100755 index d1b1d9f279..0000000000 --- a/Utils/make-src-archive.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh - -MAC= WIN= - -# Parse options -while :; do - case "$1" in - -m) MAC=1; shift;; - -w) WIN=1; shift;; - *) break;; - esac -done - -# Usage message -if [ -z "$1" ]; then - echo "\ -Usage: $0 [-m] [-w] REV - -Generates a source tarball at \`dist/stepmania-TAG.tar.bz2'. - -m Include Mac-specific build components - -w Include Windows-specific build components\ -REV can be a Mercurial revision or tag -" 1>&2 - exit 1 -fi - -# Get confirmation -echo "WARNING! This will do a clean update of the current repository." 1>&2 -echo "If you have any uncommitted changes or extra files in this repository," 1>&2 -echo "they will be LOST!" 1>&2 -echo -read -sn1 -p "Do you want to continue [y/N]? " ISOK -if [ "$ISOK" != y -a "$ISOK" != Y ]; then - echo n - exit 1 -fi -echo y - -# Clean the source tree -hg update -C "$1" -hg clean --all - -# This replaces autogen.sh. Run now so our users don't need to have autoconf -# and friends installed. -# -# Note: the -f flag is here so any symlinks in autoconf/ get replaced with real -# files. -autoreconf -if - -# Tarball will be placed here -mkdir dist - -# List excludes for tar's -X flag -{ - echo './dist' - echo '*/.hg*' - echo './_assets' - echo './Utils/Font generation' - # OSX - if [ -z "$MAC" ]; then - echo './Xcode' - fi - # Windows/misc - if [ -z "$WIN" ]; then - echo './Program' - echo './Installer' - echo './sm-ssc.nsi' - echo './Utils/doxygen' - echo './Utils/Graphviz' - echo './Utils/NSIS' - echo './src/BaseClasses' - echo './src/Texture Font Generator' - echo './src/smpackage*' - echo '*.[ao]' - echo '*.lib' - echo '*.dll' - echo '*.exe' - echo '*.bat' - fi -} | tar cvjf "dist/stepmania-$1-src.tar.bz2" -X- . --transform "s,^\.,stepmania-$1," diff --git a/Xcode/Info.plist.in b/Xcode/Info.plist.in index 11819c0c3a..cfd7624aef 100644 --- a/Xcode/Info.plist.in +++ b/Xcode/Info.plist.in @@ -12,7 +12,7 @@ smzip CFBundleTypeIconFile - smicon.icns + logo.icns CFBundleTypeMIMETypes application/zip @@ -32,7 +32,7 @@ CFBundleGetInfoString ${SM_EXE_NAME} ${SM_VERSION_TRADITIONAL} CFBundleIconFile - smicon.icns + logo.icns CFBundleIdentifier com.${SM_EXE_NAME}-${SM_VERSION_MAJOR} CFBundleInfoDictionaryVersion diff --git a/Xcode/Patcher/CopyFiles.h b/Xcode/Patcher/CopyFiles.h deleted file mode 100644 index 79b11dd728..0000000000 --- a/Xcode/Patcher/CopyFiles.h +++ /dev/null @@ -1,30 +0,0 @@ -#import - -BOOL NeedsPrivs( NSString *path ); -NSString *CopyWithPrivs( NSString *src, NSString *dest ); -NSString *Copy( NSString *src, NSString *dest ); - -/* - * (c) 2006 Steve Checkoway - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons to - * whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF - * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS - * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT - * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/Xcode/Patcher/CopyFiles.m b/Xcode/Patcher/CopyFiles.m deleted file mode 100644 index 726e795660..0000000000 --- a/Xcode/Patcher/CopyFiles.m +++ /dev/null @@ -1,163 +0,0 @@ -#import "CopyFiles.h" -#include -#include -#include -#include -#include -#include -#include - -static NSString *COPY_FAILED; -static NSString *EXECUTE_FAILED; -static NSString *AUTH_FAILED; - -static void LoadStrings() -{ - static bool bLoaded = false; - if( bLoaded ) - return; - COPY_FAILED = NSLocalizedString( @"Copy failed.", nil ); - EXECUTE_FAILED = NSLocalizedString( @"Execute failed.", nil ); - AUTH_FAILED = NSLocalizedString( @"Authentication failed. File not patched.", nil ); - bLoaded = true; -} - -static BOOL CheckDir( const char *path ) -{ - DIR *dir = opendir( path ); - int fd = dirfd( dir ); - struct dirent entry, *ep; - int err; - - fchdir( fd ); - for( err = readdir_r(dir, &entry, &ep); ep && !err; err = readdir_r(dir, &entry, &ep) ) - { - if( !strcmp(".", entry.d_name) || !strcmp("..", entry.d_name) ) - continue; - if( access(entry.d_name, W_OK|R_OK) ) - { - closedir( dir ); - return YES; - } - if( entry.d_type == DT_DIR ) - { - if( CheckDir(entry.d_name) ) - { - closedir( dir ); - return YES; - } - fchdir( fd ); - } - } - closedir( dir ); - return err; -} - -BOOL NeedsPrivs( NSString *path ) -{ - const char *p = [path UTF8String]; - struct stat sb; - - if( stat(p, &sb) ) - return YES; - if( access(p, W_OK|R_OK) ) // I don't care to parse stat output. - return YES; - if( (sb.st_mode & S_IFDIR) && CheckDir(p) ) - return YES; - - return NO; -} - -NSString *CopyWithPrivs( NSString *src, NSString *dest ) -{ - LoadStrings(); - OSStatus error; - static AuthorizationRef authRef; - static BOOL bCreated = false; - - if( !bCreated ) - { - AuthorizationFlags flags = kAuthorizationFlagDefaults; - AuthorizationItem item = { kAuthorizationRightExecute, 0, NULL, 0 }; - AuthorizationRights rights = { 1, &item }; - - error = AuthorizationCreate( NULL, kAuthorizationEmptyEnvironment, flags, &authRef ); - - if (error != errAuthorizationSuccess) - return @"Failed to create authorization."; - - - flags = kAuthorizationFlagDefaults | - kAuthorizationFlagInteractionAllowed | - kAuthorizationFlagPreAuthorize | - kAuthorizationFlagExtendRights; - - error = AuthorizationCopyRights( authRef, &rights, NULL, flags, NULL ); - - if (error != errAuthorizationSuccess) - return AUTH_FAILED; - bCreated = YES; - } - - - // Don't pass path as the first argument. AuthorizationExecuteWithPrivileges must do it. - char path[] = "/bin/cp"; - const char *argv[] = { "-Rf", [src UTF8String], [dest UTF8String], NULL }; - NSString *result = nil; - - error = AuthorizationExecuteWithPrivileges( authRef, path, kAuthorizationFlagDefaults, (char **)argv, NULL ); - - if (error == errAuthorizationSuccess) - { - int status = 0; - pid_t pid = wait( &status ); - - if( pid == -1 ) - result = [NSString stringWithUTF8String:strerror(errno)]; - else if( !WIFEXITED(status) || WEXITSTATUS(status) ) - result = COPY_FAILED; - } - else - { - result = EXECUTE_FAILED; - } - - - return result; -} - -NSString *Copy( NSString *src, NSString *dest ) -{ - LoadStrings(); - // Again, don't pass the path. - NSArray *argv = [NSArray arrayWithObjects:@"-Rf", src, dest, nil]; - NSTask *task = [NSTask launchedTaskWithLaunchPath:@"/bin/cp" arguments:argv]; - - [task waitUntilExit]; - return [task terminationStatus] ? COPY_FAILED : nil; -} - -/* - * (c) 2006 Steve Checkoway - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons to - * whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF - * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS - * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT - * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/Xcode/Patcher/Identification.txt b/Xcode/Patcher/Identification.txt deleted file mode 100644 index 6b0ede8d25..0000000000 --- a/Xcode/Patcher/Identification.txt +++ /dev/null @@ -1,11 +0,0 @@ -# The format of this file is: -# Application name -# Bundle ID -# version1 -# version2 -# ... -# The version key -ALL- or no version keys matches all versions. - -StepMania -com.StepMania --ALL- diff --git a/Xcode/Patcher/Info.plist b/Xcode/Patcher/Info.plist deleted file mode 100644 index ae934822bb..0000000000 --- a/Xcode/Patcher/Info.plist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - smicon - CFBundleIdentifier - com.StepMania.Patcher - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleSignature - ITGp - CFBundleVersion - 1.0 - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/Xcode/Patcher/Patcher.xcodeproj/project.pbxproj b/Xcode/Patcher/Patcher.xcodeproj/project.pbxproj deleted file mode 100644 index 7e7d8c8696..0000000000 --- a/Xcode/Patcher/Patcher.xcodeproj/project.pbxproj +++ /dev/null @@ -1,337 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 42; - objects = { - -/* Begin PBXBuildFile section */ - 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; - 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; - AA2BF5C30A4F6E1B00A21643 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = AA2BF5C10A4F6E1B00A21643 /* Localizable.strings */; }; - AAD7D8740A36C53E0073BAC6 /* Identification.txt in Resources */ = {isa = PBXBuildFile; fileRef = AAD7D8730A36C53E0073BAC6 /* Identification.txt */; }; - AAD7D8BF0A36CC020073BAC6 /* smicon.icns in Resources */ = {isa = PBXBuildFile; fileRef = AAD7D8BE0A36CC020073BAC6 /* smicon.icns */; }; - AAF586BC0A27D9300046D33E /* CopyFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = AAF586BB0A27D9300046D33E /* CopyFiles.m */; }; - AAF586BF0A27D9410046D33E /* Upgrader.m in Sources */ = {isa = PBXBuildFile; fileRef = AAF586BE0A27D9410046D33E /* Upgrader.m */; }; - AAF586CC0A27DA7F0046D33E /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = AAF586CA0A27DA7F0046D33E /* MainMenu.nib */; }; - AAF586CF0A27DA900046D33E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = AAF586CD0A27DA900046D33E /* InfoPlist.strings */; }; - AAF587560A2826240046D33E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAF587550A2826240046D33E /* Security.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; - 13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; }; - 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; - 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; - 32CA4F630368D1EE00C91783 /* Patcher_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Patcher_Prefix.pch; sourceTree = ""; }; - 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; - 8D1107320486CEB800E47090 /* Patcher.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Patcher.app; sourceTree = BUILT_PRODUCTS_DIR; }; - AA2BF5C20A4F6E1B00A21643 /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; - AAD7D8730A36C53E0073BAC6 /* Identification.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Identification.txt; sourceTree = ""; }; - AAD7D8BE0A36CC020073BAC6 /* smicon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = smicon.icns; path = ../smicon.icns; sourceTree = SOURCE_ROOT; }; - AAF586BA0A27D9300046D33E /* CopyFiles.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; path = CopyFiles.h; sourceTree = ""; }; - AAF586BB0A27D9300046D33E /* CopyFiles.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CopyFiles.m; sourceTree = ""; }; - AAF586BD0A27D9410046D33E /* Upgrader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Upgrader.h; sourceTree = ""; }; - AAF586BE0A27D9410046D33E /* Upgrader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Upgrader.m; sourceTree = ""; }; - AAF586CB0A27DA7F0046D33E /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = en.lproj/MainMenu.nib; sourceTree = ""; }; - AAF586CE0A27DA900046D33E /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - AAF587550A2826240046D33E /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 8D11072E0486CEB800E47090 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, - AAF587560A2826240046D33E /* Security.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 080E96DDFE201D6D7F000001 /* Classes */ = { - isa = PBXGroup; - children = ( - AAF586BD0A27D9410046D33E /* Upgrader.h */, - AAF586BE0A27D9410046D33E /* Upgrader.m */, - ); - name = Classes; - sourceTree = ""; - }; - 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = { - isa = PBXGroup; - children = ( - 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */, - ); - name = "Linked Frameworks"; - sourceTree = ""; - }; - 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = { - isa = PBXGroup; - children = ( - 29B97324FDCFA39411CA2CEA /* AppKit.framework */, - 13E42FB307B3F0F600E4EEF1 /* CoreData.framework */, - 29B97325FDCFA39411CA2CEA /* Foundation.framework */, - ); - name = "Other Frameworks"; - sourceTree = ""; - }; - 19C28FACFE9D520D11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 8D1107320486CEB800E47090 /* Patcher.app */, - ); - name = Products; - sourceTree = ""; - }; - 29B97314FDCFA39411CA2CEA /* Patcher */ = { - isa = PBXGroup; - children = ( - 080E96DDFE201D6D7F000001 /* Classes */, - 29B97315FDCFA39411CA2CEA /* Other Sources */, - 29B97317FDCFA39411CA2CEA /* Resources */, - 29B97323FDCFA39411CA2CEA /* Frameworks */, - 19C28FACFE9D520D11CA2CBB /* Products */, - ); - name = Patcher; - sourceTree = ""; - }; - 29B97315FDCFA39411CA2CEA /* Other Sources */ = { - isa = PBXGroup; - children = ( - AAF586BA0A27D9300046D33E /* CopyFiles.h */, - AAF586BB0A27D9300046D33E /* CopyFiles.m */, - 32CA4F630368D1EE00C91783 /* Patcher_Prefix.pch */, - 29B97316FDCFA39411CA2CEA /* main.m */, - ); - name = "Other Sources"; - sourceTree = ""; - }; - 29B97317FDCFA39411CA2CEA /* Resources */ = { - isa = PBXGroup; - children = ( - AA2BF5C10A4F6E1B00A21643 /* Localizable.strings */, - AAD7D8BE0A36CC020073BAC6 /* smicon.icns */, - AAD7D8730A36C53E0073BAC6 /* Identification.txt */, - 8D1107310486CEB800E47090 /* Info.plist */, - AAF586CD0A27DA900046D33E /* InfoPlist.strings */, - AAF586CA0A27DA7F0046D33E /* MainMenu.nib */, - ); - name = Resources; - sourceTree = ""; - }; - 29B97323FDCFA39411CA2CEA /* Frameworks */ = { - isa = PBXGroup; - children = ( - AAF587550A2826240046D33E /* Security.framework */, - 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */, - 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */, - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 8D1107260486CEB800E47090 /* Patcher */ = { - isa = PBXNativeTarget; - buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Patcher" */; - buildPhases = ( - 8D1107290486CEB800E47090 /* Resources */, - 8D11072C0486CEB800E47090 /* Sources */, - 8D11072E0486CEB800E47090 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Patcher; - productInstallPath = "$(HOME)/Applications"; - productName = Patcher; - productReference = 8D1107320486CEB800E47090 /* Patcher.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 29B97313FDCFA39411CA2CEA /* Project object */ = { - isa = PBXProject; - buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Patcher" */; - hasScannedForEncodings = 1; - knownRegions = ( - English, - Japanese, - French, - German, - en, - ); - mainGroup = 29B97314FDCFA39411CA2CEA /* Patcher */; - projectDirPath = ""; - targets = ( - 8D1107260486CEB800E47090 /* Patcher */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 8D1107290486CEB800E47090 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - AAF586CC0A27DA7F0046D33E /* MainMenu.nib in Resources */, - AAF586CF0A27DA900046D33E /* InfoPlist.strings in Resources */, - AAD7D8740A36C53E0073BAC6 /* Identification.txt in Resources */, - AAD7D8BF0A36CC020073BAC6 /* smicon.icns in Resources */, - AA2BF5C30A4F6E1B00A21643 /* Localizable.strings in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 8D11072C0486CEB800E47090 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D11072D0486CEB800E47090 /* main.m in Sources */, - AAF586BC0A27D9300046D33E /* CopyFiles.m in Sources */, - AAF586BF0A27D9410046D33E /* Upgrader.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - AA2BF5C10A4F6E1B00A21643 /* Localizable.strings */ = { - isa = PBXVariantGroup; - children = ( - AA2BF5C20A4F6E1B00A21643 /* en */, - ); - name = Localizable.strings; - sourceTree = SOURCE_ROOT; - }; - AAF586CA0A27DA7F0046D33E /* MainMenu.nib */ = { - isa = PBXVariantGroup; - children = ( - AAF586CB0A27DA7F0046D33E /* en */, - ); - name = MainMenu.nib; - sourceTree = ""; - }; - AAF586CD0A27DA900046D33E /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - AAF586CE0A27DA900046D33E /* en */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - C01FCF4B08A954540054247B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_ENABLE_CPP_RTTI = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G4; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - PRODUCT_NAME = Patcher; - WRAPPER_EXTENSION = app; - }; - name = Debug; - }; - C01FCF4C08A954540054247B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = ( - ppc, - i386, - ); - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_ENABLE_CPP_RTTI = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G4; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - PRODUCT_NAME = Patcher; - WRAPPER_EXTENSION = app; - }; - name = Release; - }; - C01FCF4F08A954540054247B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/.."; - GCC_VERSION = 3.3; - GCC_VERSION_i386 = 4.0; - GCC_VERSION_ppc = 3.3; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; - MACOSX_DEPLOYMENT_TARGET_ppc = 10.2; - PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.2.8.sdk; - SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; - SDKROOT_ppc = /Developer/SDKs/MacOSX10.2.8.sdk; - ZERO_LINK = NO; - }; - name = Debug; - }; - C01FCF5008A954540054247B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/.."; - GCC_VERSION = 3.3; - GCC_VERSION_i386 = 4.0; - GCC_VERSION_ppc = 3.3; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; - MACOSX_DEPLOYMENT_TARGET_ppc = 10.2; - PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.2.8.sdk; - SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; - SDKROOT_ppc = /Developer/SDKs/MacOSX10.2.8.sdk; - ZERO_LINK = NO; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Patcher" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C01FCF4B08A954540054247B /* Debug */, - C01FCF4C08A954540054247B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Patcher" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C01FCF4F08A954540054247B /* Debug */, - C01FCF5008A954540054247B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; -} diff --git a/Xcode/Patcher/Patcher_Prefix.pch b/Xcode/Patcher/Patcher_Prefix.pch deleted file mode 100644 index 7ab2c1ad57..0000000000 --- a/Xcode/Patcher/Patcher_Prefix.pch +++ /dev/null @@ -1,28 +0,0 @@ -#ifdef __OBJC__ - #import -#endif - -/* - * (c) 2006 Steve Checkoway - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons to - * whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF - * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS - * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT - * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/Xcode/Patcher/Upgrader.h b/Xcode/Patcher/Upgrader.h deleted file mode 100644 index 785a531d16..0000000000 --- a/Xcode/Patcher/Upgrader.h +++ /dev/null @@ -1,56 +0,0 @@ -/* Upgrader */ - -#import - -@interface Upgrader : NSObject -{ - IBOutlet NSButton *m_Choose; - IBOutlet NSButton *m_Okay; - IBOutlet NSPanel *m_Panel; - IBOutlet NSProgressIndicator *m_ProgressBar; - IBOutlet NSProgressIndicator *m_Searching; - IBOutlet NSTextField *m_StatusText; - IBOutlet NSTextField *m_SelectionText; - IBOutlet NSTextField *m_PatchingText; - IBOutlet NSWindow *m_Window; - NSString *m_sAppID; - NSArray *m_vVersions; - NSString *m_sName; - NSString *m_sError; - NSString *m_sPath; -} -- (IBAction) chooseFile:(id)sender; -- (IBAction) upgrade:(id)sender; -- (void) findApp:(id)obj; -- (void) foundApp:(id)obj; -- (void) upgradeFile:(id)path; -- (void) sheetEnded:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo; -- (BOOL) panel:(id)sender isValidFilename:(NSString *)filename; -- (BOOL) panel:(id)sender shouldShowFilename:(NSString *)filename; -- (BOOL) checkPath:(NSString *)path; -@end - -/* - * (c) 2006 Steve Checkoway - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons to - * whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF - * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS - * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT - * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/Xcode/Patcher/Upgrader.m b/Xcode/Patcher/Upgrader.m deleted file mode 100644 index 16a3cadc94..0000000000 --- a/Xcode/Patcher/Upgrader.m +++ /dev/null @@ -1,364 +0,0 @@ -#import "Upgrader.h" -#import "CopyFiles.h" -#include -#include -#include - -@implementation Upgrader - -// Generate English strings using: genstring -o en.lproj Upgrader.m - -static NSString *CHOOSE_FILE; -static NSString *PATCH_FILE; -static NSString *PATCH_COMPLETE; -static NSString *QUIT; -static NSString *ERROR; -static NSString *ERROR_MESSAGE; -static NSString *PATCH_FILES_MISSING; -static NSString *PATCHER_CORRUPTED; -static NSString *CORRUPT_TITLE; -static NSString *PATCHING; -static NSString *SEARCHING; -static NSString *SELECTION; -static NSString *WINDOW_TITLE; - -static NSOpenPanel *panel = nil; - -- (void)awakeFromNib -{ - NSString *path = [[NSBundle mainBundle] pathForResource:@"Identification" ofType:@"txt"]; - NSData *data = [NSData dataWithContentsOfFile:path]; - NSString *stringData = [[[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding] autorelease]; - - CHOOSE_FILE = NSLocalizedString( @"Choose file to patch.", nil ); - PATCH_FILE = NSLocalizedString( @"Patch file.", nil ); - PATCH_COMPLETE = NSLocalizedString( @"Patch complete.", nil ); - QUIT = NSLocalizedString( @"Quit", nil ); - ERROR = NSLocalizedString( @"Error", nil ); - ERROR_MESSAGE = NSLocalizedString( @"Patching failed:\n%@", nil ); - PATCH_FILES_MISSING = NSLocalizedString( @"Patch files missing.", nil ); - PATCHER_CORRUPTED = NSLocalizedString( @"This patcher has become corrupted.", nil ); - CORRUPT_TITLE = NSLocalizedString( @"Corrupt Patcher", nil ); - PATCHING = NSLocalizedString( @"Patching", nil ); - SEARCHING = NSLocalizedString( @"Searching for %@...", nil ); - SELECTION = NSLocalizedString( @"You have chosen to patch \"%@\" in the folder:\n%@", nil ); - WINDOW_TITLE = NSLocalizedString( @"StepMania Patcher", nil ); - - if( !data ) - { - NSRunCriticalAlertPanel( CORRUPT_TITLE, PATCHER_CORRUPTED, @"OK", nil, nil ); - [NSApp terminate:self]; - } - - m_sName = nil; - m_sAppID = nil; - m_vVersions = nil; - - NSArray *lines = [stringData componentsSeparatedByString:@"\n"]; - NSEnumerator *iter = [lines objectEnumerator]; - NSString *line; - NSMutableArray *versions = [NSMutableArray array]; - - while( (line = [iter nextObject]) ) - { - line = [line stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; - if( [line length] == 0 || [line characterAtIndex:0] == '#' ) - continue; - if( m_sName == nil ) - { - m_sName = [line retain]; - } - else if( m_sAppID == nil ) - { - m_sAppID = [line retain]; - } - else if( [line isEqualToString:@"-ALL-"] ) - { - versions = nil; - break; - } - else - { - [versions addObject:line]; - } - } - - if( !m_sName || !m_sAppID ) - { - NSRunCriticalAlertPanel( CORRUPT_TITLE, PATCHER_CORRUPTED, @"OK", nil, nil ); - [NSApp terminate:self]; - } - - if( versions && [versions count] ) - m_vVersions = [versions retain]; - - // Set strings. - [m_StatusText setStringValue:[NSString stringWithFormat:SEARCHING, m_sName]]; - [m_SelectionText setStringValue:@""]; - [m_PatchingText setStringValue:PATCHING]; - - [m_Searching setUsesThreadedAnimation:YES]; - [m_ProgressBar setUsesThreadedAnimation:YES]; - [m_Window setTitle:WINDOW_TITLE]; - - [NSThread detachNewThreadSelector:@selector(findApp:) toTarget:self withObject:nil]; - [m_Choose setEnabled:YES]; -} - -- (void) dealloc -{ - [m_sName release]; - [m_sAppID release]; - [m_vVersions release]; - [super dealloc]; -} - -- (IBAction) chooseFile:(id)sender -{ - if( !panel ) - { - panel = [[NSOpenPanel openPanel] retain]; - [panel setCanChooseDirectories:YES]; - [panel setAllowsMultipleSelection:NO]; - [panel setDelegate:self]; - [panel setDirectory:@"/Applications"]; - } - - if( [panel runModal] == NSFileHandlingPanelOKButton ) - { - NSString *dir, *app; - - [m_StatusText setStringValue:PATCH_FILE]; - [m_Okay setEnabled:YES]; - [m_sPath release]; - m_sPath = [[panel filename] retain]; - dir = [m_sPath stringByDeletingLastPathComponent]; - app = [[m_sPath lastPathComponent] stringByDeletingPathExtension]; - [m_SelectionText setStringValue:[NSString stringWithFormat:SELECTION, app, dir]]; - [m_Okay setTitle:@"OK"]; - [m_Okay setAction:@selector(upgrade:)]; - [m_Okay setTarget:self]; - } -} - -- (IBAction) upgrade:(id)sender -{ - [NSApp beginSheet:m_Panel - modalForWindow:[sender window] - modalDelegate:self - didEndSelector:@selector(sheetEnded:returnCode:contextInfo:) - contextInfo:NULL]; - [NSThread detachNewThreadSelector:@selector(upgradeFile:) toTarget:self withObject:m_sPath]; -} - -- (void) findApp:(id)obj -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - [m_Searching startAnimation:self]; - - // Find ITG - CFStringRef key = CFSTR( "ApplicationBundlePath" ); - CFPropertyListRef list = CFPreferencesCopyAppValue( key, (CFStringRef)m_sAppID ); - - NSString *sPath = nil; - - if( list && CFGetTypeID(list) != CFDictionaryGetTypeID() ) - { - CFRelease( list ); - list = NULL; - } - if( list ) - { - CFTypeRef value; - CFDictionaryRef dict = (CFDictionaryRef)list; - - if( m_vVersions ) - { - NSEnumerator *iter = [m_vVersions objectEnumerator]; - id version; - - while( (version = [iter nextObject]) ) - { - if( CFDictionaryGetValueIfPresent(dict, (CFStringRef)version, &value) && - CFGetTypeID(value) == CFStringGetTypeID() && - [self checkPath:(NSString *)value] ) - { - sPath = (NSString *)CFRetain( value ); - [sPath autorelease]; - } - } - } - else - { - NSDictionary *dict = (NSDictionary *)list; - NSEnumerator *iter = [dict objectEnumerator]; - id path; - - while( (path = [iter nextObject]) ) - { - if( ![path isKindOfClass:[NSString class]] || ![self checkPath:path] ) - continue; - sPath = [[path retain] autorelease]; - break; - } - } - CFRelease( list ); - } - if( !sPath ) - { - NSWorkspace *ws = [NSWorkspace sharedWorkspace]; - - [ws findApplications]; - sPath = [ws fullPathForApplication:m_sName]; - - if( ![self checkPath:sPath] ) - sPath = nil; - } - [self performSelectorOnMainThread:@selector(foundApp:) withObject:sPath waitUntilDone:YES]; - [m_Searching stopAnimation:self]; - [pool release]; -} - -- (void) foundApp:(id)obj -{ - NSString *path = (NSString *)obj; - - if( path ) // found - { - NSString *dir = [path stringByDeletingLastPathComponent]; - NSString *app = [[path lastPathComponent] stringByDeletingPathExtension]; - - [m_sPath release]; - m_sPath = [path retain]; - [m_Okay setEnabled:YES]; - [m_StatusText setStringValue:PATCH_FILE]; - [m_SelectionText setStringValue:[NSString stringWithFormat:SELECTION, app, dir]]; - } - else - { - m_sPath = @""; - [m_StatusText setStringValue:CHOOSE_FILE]; - } - [m_Choose setEnabled:YES]; - [m_Choose setNeedsDisplay:YES]; - [m_Okay setNeedsDisplay:YES]; - [m_StatusText setNeedsDisplay:YES]; - [m_SelectionText setNeedsDisplay:YES]; -} - -- (void) upgradeFile:(id)path -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSBundle *bundle = [NSBundle mainBundle]; - NSString *patch = [bundle pathForResource:@"Contents" ofType:@"" inDirectory:@"Patch"]; - NSArray *parentFiles = [bundle pathsForResourcesOfType:@"" inDirectory:@"Patch/ParentContents"]; - - if( patch && parentFiles) - { - [m_ProgressBar startAnimation:self]; - - if( NeedsPrivs(path) ) - m_sError = CopyWithPrivs( patch, path ); - else - m_sError = Copy( patch, path ); - - path = [path stringByDeletingLastPathComponent]; - NSEnumerator *enumerator = [parentFiles objectEnumerator]; - while( !m_sError && (patch = [enumerator nextObject]) ) - { - if( NeedsPrivs(path) ) - m_sError = CopyWithPrivs( patch, path ); - else - m_sError = Copy( patch, path ); - } - - [m_ProgressBar stopAnimation:self]; - } - else - { - m_sError = PATCH_FILES_MISSING; - } - [NSApp performSelectorOnMainThread:@selector(endSheet:) withObject:m_Panel waitUntilDone:YES]; - [pool release]; -} - -- (void) sheetEnded:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo -{ - [m_Panel orderOut:self]; - if( m_sError ) - { - NSRunCriticalAlertPanel( ERROR, ERROR_MESSAGE, @"OK", nil, nil, m_sError ); - return; - } - [m_StatusText setStringValue:PATCH_COMPLETE]; - [m_Okay setTitle:QUIT]; - [m_Okay setAction:@selector(terminate:)]; - [m_Okay setTarget:NSApp]; -} - -- (BOOL) panel:(id)sender isValidFilename:(NSString *)filename -{ - return [filename hasSuffix:@".app"] && [self checkPath:filename]; -} - -- (BOOL) panel:(id)sender shouldShowFilename:(NSString *)filename -{ - if( [filename hasSuffix:@".app"] ) - return [self checkPath:filename]; - - struct stat sb; - - if( stat([filename UTF8String], &sb) ) - return NO; - return (sb.st_mode & S_IFDIR) == S_IFDIR; -} - -- (BOOL) checkPath:(NSString *)path -{ - NSBundle *b = [NSBundle bundleWithPath:path]; - - if( !b ) - return NO; - if( ![[b objectForInfoDictionaryKey:@"CFBundleIdentifier"] isEqualToString:m_sAppID] ) - return NO; - if( m_vVersions == nil ) - return YES; - - NSString *bundleVersion = [b objectForInfoDictionaryKey:@"CFBundleVersion"]; - NSEnumerator *iter = [m_vVersions objectEnumerator]; - NSString *version; - - while( (version = [iter nextObject]) ) - if( [bundleVersion isEqualToString:version] ) - return YES; - return NO; -} - -@end - -/* - * (c) 2006 Steve Checkoway - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons to - * whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF - * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS - * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT - * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - diff --git a/Xcode/Patcher/en.lproj/InfoPlist.strings b/Xcode/Patcher/en.lproj/InfoPlist.strings deleted file mode 100644 index 1740258462..0000000000 Binary files a/Xcode/Patcher/en.lproj/InfoPlist.strings and /dev/null differ diff --git a/Xcode/Patcher/en.lproj/Localizable.strings b/Xcode/Patcher/en.lproj/Localizable.strings deleted file mode 100644 index 7c72b799e0..0000000000 Binary files a/Xcode/Patcher/en.lproj/Localizable.strings and /dev/null differ diff --git a/Xcode/Patcher/en.lproj/MainMenu.nib/classes.nib b/Xcode/Patcher/en.lproj/MainMenu.nib/classes.nib deleted file mode 100644 index 8cfb81234f..0000000000 --- a/Xcode/Patcher/en.lproj/MainMenu.nib/classes.nib +++ /dev/null @@ -1,23 +0,0 @@ -{ - IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - ACTIONS = {chooseFile = id; upgrade = id; }; - CLASS = Upgrader; - LANGUAGE = ObjC; - OUTLETS = { - "m_Choose" = NSButton; - "m_Okay" = NSButton; - "m_Panel" = NSPanel; - "m_PatchingText" = NSTextField; - "m_ProgressBar" = NSProgressIndicator; - "m_Searching" = NSProgressIndicator; - "m_SelectionText" = NSTextField; - "m_StatusText" = NSTextField; - "m_Window" = NSWindow; - }; - SUPERCLASS = NSObject; - } - ); - IBVersion = 1; -} \ No newline at end of file diff --git a/Xcode/Patcher/en.lproj/MainMenu.nib/info.nib b/Xcode/Patcher/en.lproj/MainMenu.nib/info.nib deleted file mode 100644 index 298869de9b..0000000000 --- a/Xcode/Patcher/en.lproj/MainMenu.nib/info.nib +++ /dev/null @@ -1,34 +0,0 @@ - - - - - IBDocumentLocation - 39 98 356 240 0 0 1920 1178 - IBEditorPositions - - 29 - 207 529 151 44 0 0 1920 1178 - - IBFramework Version - 446.1 - IBOpenObjects - - 29 - 217 - - IBSystem Version - 8J135 - IBUserGuides - - 21 - - guideLocations - - Horizontal:180.000000 - - guidesLocked - - - - - diff --git a/Xcode/Patcher/en.lproj/MainMenu.nib/keyedobjects.nib b/Xcode/Patcher/en.lproj/MainMenu.nib/keyedobjects.nib deleted file mode 100644 index 3b6b429fbb..0000000000 Binary files a/Xcode/Patcher/en.lproj/MainMenu.nib/keyedobjects.nib and /dev/null differ diff --git a/Xcode/Patcher/main.m b/Xcode/Patcher/main.m deleted file mode 100644 index 00d0c8cfb4..0000000000 --- a/Xcode/Patcher/main.m +++ /dev/null @@ -1,29 +0,0 @@ -int main( int argc, const char *argv[] ) -{ - return NSApplicationMain( argc, argv ); -} - -/* - * (c) 2006 Steve Checkoway - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons to - * whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF - * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS - * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT - * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/Xcode/README.md b/Xcode/README.md deleted file mode 100644 index 2f5acfe55e..0000000000 --- a/Xcode/README.md +++ /dev/null @@ -1,17 +0,0 @@ -StepMania Xcode Project -======================= - -There used to be an Xcode project that lived here. However, it is no longer. - -Please use CMake to generate an Xcode project. - - -SDK Selection ------------------ - -Any Mac OS X SDK that is 10.6 or higher will work. However, the 10.6 SDK is needed to offer full screen support at this time. - -Please see this [comment](https://github.com/stepmania/stepmania/issues/224#issuecomment-48857894) on how to install 10.6 SDK in Xcode if this feature is necessary for your setup. - -Please note that you must restart Xcode after installing the SDK, in case Xcode is running, for it to detect the new SDKs. - diff --git a/Xcode/de.lproj/Localizable.strings b/Xcode/de.lproj/Localizable.strings deleted file mode 100644 index c6b358e6a7..0000000000 Binary files a/Xcode/de.lproj/Localizable.strings and /dev/null differ diff --git a/Xcode/en.lproj/Localizable.strings b/Xcode/en.lproj/Localizable.strings deleted file mode 100644 index e6d1cc6356..0000000000 Binary files a/Xcode/en.lproj/Localizable.strings and /dev/null differ diff --git a/Xcode/es.lproj/Localizable.strings b/Xcode/es.lproj/Localizable.strings deleted file mode 100644 index c5fbd54dcc..0000000000 Binary files a/Xcode/es.lproj/Localizable.strings and /dev/null differ diff --git a/Xcode/fr.lproj/Localizable.strings b/Xcode/fr.lproj/Localizable.strings deleted file mode 100644 index 574eebaf74..0000000000 Binary files a/Xcode/fr.lproj/Localizable.strings and /dev/null differ diff --git a/Xcode/it.lproj/Localizable.strings b/Xcode/it.lproj/Localizable.strings deleted file mode 100644 index 5a076526ad..0000000000 Binary files a/Xcode/it.lproj/Localizable.strings and /dev/null differ diff --git a/Xcode/ja.lproj/Localizable.strings b/Xcode/ja.lproj/Localizable.strings deleted file mode 100644 index 819fb6cf93..0000000000 Binary files a/Xcode/ja.lproj/Localizable.strings and /dev/null differ diff --git a/Xcode/logo.icns b/Xcode/logo.icns new file mode 100644 index 0000000000..e4554271f4 Binary files /dev/null and b/Xcode/logo.icns differ diff --git a/Xcode/product.xcconfig b/Xcode/product.xcconfig deleted file mode 100644 index 0658017da6..0000000000 --- a/Xcode/product.xcconfig +++ /dev/null @@ -1 +0,0 @@ -PRODUCT_NAME = sm-ssc \ No newline at end of file diff --git a/Xcode/scripts/README.md b/Xcode/scripts/README.md deleted file mode 100644 index 56b53116eb..0000000000 --- a/Xcode/scripts/README.md +++ /dev/null @@ -1,35 +0,0 @@ -StepMania Scripts For OS X -========= - -These scripts can be used to bundle a .dmg installer of StepMania. -It assumes you have already built a StepMania.app using Xcode and -that your *stepmania* directory structure is intact as you cloned it. - - -Bundling a Release: -------------------- -To bundle a release version of StepMania open a terminal and cd to -your *stepmania* directory, then run the following commands: - -``` -cd Xcode/scripts -ruby mkrelease.rb -``` - -This will create a disk image like *StepMania-v5.0-beta-4-mac.dmg* -in the root of your *stepmania* directory. - - - -Bundling a Nightly: -------------------- -To bundle an intermediate or "nightly" .dmg installer, cd to your -*stepmania* directory, and run the following commands: - -``` -cd Xcode/scripts -ruby mkrelease.rb nightly -``` - -This will create a disk image like *StepMania-v5.0-31-8-2014-mac.dmg* -in the root of your *stepmania* directory. \ No newline at end of file diff --git a/Xcode/scripts/increment_version.pl b/Xcode/scripts/increment_version.pl deleted file mode 100644 index 319a6e0fdf..0000000000 --- a/Xcode/scripts/increment_version.pl +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/perl -w -use File::Copy; - -$ver = 0; -if( open FH, ' =~ /version_num = (\d+);/ and $ver = $1 + 1; - close FH; -} -chop( $date = `date` ); -chop( $time = `time` ); -open FH, '>.ver.tmp' or die $!; -print FH <<"EOF"; -extern const unsigned long version_num = $ver; -extern const char *const version_date = "$date"; -extern const char *const version_time = "$time"; -extern char const * const product_version = "5.0-git-UNKNOWN"; -EOF -close FH; -move '.ver.tmp', 'ver.cpp'; diff --git a/Xcode/scripts/mkrelease.rb b/Xcode/scripts/mkrelease.rb deleted file mode 100644 index e13331468d..0000000000 --- a/Xcode/scripts/mkrelease.rb +++ /dev/null @@ -1,92 +0,0 @@ -# 'fileutils' is used to recursively copy directories -# 'tmpdir' is used to create and work with temporary directories -require 'fileutils' -require 'tmpdir' - -# cd to the StepMania 5 src directory -Dir.chdir "../../src" - -# check the command line for the presence of the "nightly" option, used -# if we are bundling a nightly build as opposed to an official release -nightly = (true and ARGV[0] == "nightly") or false - -# initialize empty strings -family, version, date = "" - -# if this is to be a nightly build, store the system date; -# we'll use it below to name the bundle -if nightly - time = time = Time.new - date = "#{time.day}-#{time.month}-#{time.year}" -end - -# open ProductInfo.h in read-only mode -File.open("#{Dir.pwd}/ProductInfo.h", "r") do |f| - # read each line, matching for product family - f.each do |line| - if line.match( /^#define\s+PRODUCT_FAMILY_BARE\s+(.*?)\s*$/ ) - family = $1 - end - end -end - -# Determine if the Cmake generated verstub.cpp is available. -File.open("#{Dir.pwd}/verstub.cpp", "r") do |verFile| - verFile.each do |verLine| - if verLine.match( /^extern char const \* const product_version \= "(.*?)"/ ) - version = $1 - end - end -end - -if (version.length == 0) - # open ver.h in read-only mode - File.open("#{Dir.pwd}/ver.h", "r") do |f| - # read each line, matching for product version - f.each do |line| - if line.match( /^#define\s+product_version\s+"(.*?)"/ ) - version = $1 - end - end - end -end - -# replace whitespace with hyphens in the version string -version.gsub!(/\s+/,"-") - -# the name of what we are bundling -if nightly - version = version.partition("-")[0] - name = "#{family}-#{version}-#{date}" -else - name = "#{family}-#{version}" -end - -# a list of directories we want to include in our .dmg -directories = [ "Announcers", "BackgroundEffects", "BackgroundTransitions", - "BGAnimations", "Characters", "Courses", "Data", "Docs", "Manual", - "NoteSkins", "Scripts", "Songs", "StepMania.app", "Themes" ] - -# cd back to the root of the StepMania 5 directory -Dir.chdir ".." - -# create a temp directory; this will be automatically deleted when the block completes -Dir.mktmpdir {|temp| - - # nest two directories named by family and version within the temp directory - # the outer will become the root of the dmg - # the inner will neatly tidy all the contents together so users can easily drag/drop everything at once - FileUtils.mkdir_p("#{temp}/#{name}/#{name}/") - - # loop through the directories array - directories.each do |directory| - # recursively copy each directory into our temp directory - FileUtils.cp_r directory, "#{temp}/#{name}/#{name}/", :verbose => true - end - - #construct the shell command that will create the dmg - cmd = "hdiutil create #{Dir.pwd}/#{name}-mac.dmg -srcfolder #{temp}/#{name} -ov" - - #execute the command in a subshell - system( cmd ) -} \ No newline at end of file diff --git a/Xcode/smicon.icns b/Xcode/smicon.icns deleted file mode 100644 index b7fb31671e..0000000000 Binary files a/Xcode/smicon.icns and /dev/null differ diff --git a/_assets/Installer/welcome-ssc.psd b/_assets/Installer/welcome-ssc.psd deleted file mode 100644 index afddaef71a..0000000000 Binary files a/_assets/Installer/welcome-ssc.psd and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/SMMAX20 graphics info.txt b/_assets/Themes/SMMAX2.0/SMMAX20 graphics info.txt deleted file mode 100644 index 519a100bd7..0000000000 --- a/_assets/Themes/SMMAX2.0/SMMAX20 graphics info.txt +++ /dev/null @@ -1,17 +0,0 @@ -This folder contains all graphics and fonts used in SMMAX2.0 theme project. -Project is aimed to cration of new version of very popular SM3.9`s SMMAX theme for use in SM5.0. -It`s not intended to be a port! Project was desingned to be new from scratch. -I was planning to do all work myself but I hit the wall of my poor coding skills. -So, after couple months lack of progress I`ve made a decision to share the project with community. -Main project file is "SMMAX20 screens project ver1_1.cdr". To open it you need Corel Draw X5 or later. -From corel you can export every tiny element to PNG or PSD whith transperacy. -It`s just a matter of proper selection. -Keep in mind that project graphisc was designed in 1920x1200 resolution. -It is native resolution of my monitor. So now you must bear with me, -because it`s lots of work to change it back to 1080p -Project use 2 fonts and you can find`em (or info about how to obtain it) in fonts folder. -Project is released under MIT License. Same as whole stepmania. -Thankyou for your attention, intrest, future contribution, -and please, really please, (I`m beging now) do not convert my work to something ugly. ^__^; - -~ John Reactor. \ No newline at end of file diff --git a/_assets/Themes/SMMAX2.0/SMMAX20 screens project ver1_1.cdr b/_assets/Themes/SMMAX2.0/SMMAX20 screens project ver1_1.cdr deleted file mode 100644 index 8a9cd14a3a..0000000000 Binary files a/_assets/Themes/SMMAX2.0/SMMAX20 screens project ver1_1.cdr and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/01 ScreenCompanyFirst/info.txt b/_assets/Themes/SMMAX2.0/exported graphics/01 ScreenCompanyFirst/info.txt deleted file mode 100644 index 3ede7c848b..0000000000 --- a/_assets/Themes/SMMAX2.0/exported graphics/01 ScreenCompanyFirst/info.txt +++ /dev/null @@ -1,3 +0,0 @@ -No graphics here. -Hey. It`s only black bacground and some text. What you`ve expeced. -All text should be dynamic, and translatable, remeber? \ No newline at end of file diff --git a/_assets/Themes/SMMAX2.0/exported graphics/02 ScreenCompany/logo shadow.png b/_assets/Themes/SMMAX2.0/exported graphics/02 ScreenCompany/logo shadow.png deleted file mode 100644 index c8adfbdc45..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/02 ScreenCompany/logo shadow.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/02 ScreenCompany/logo.png b/_assets/Themes/SMMAX2.0/exported graphics/02 ScreenCompany/logo.png deleted file mode 100644 index f3743dbf7e..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/02 ScreenCompany/logo.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/02 ScreenCompany/whitebg.png b/_assets/Themes/SMMAX2.0/exported graphics/02 ScreenCompany/whitebg.png deleted file mode 100644 index fbb68d76eb..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/02 ScreenCompany/whitebg.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/03 ScreenLogo & ScreenTitleMenu/bluearrow.png b/_assets/Themes/SMMAX2.0/exported graphics/03 ScreenLogo & ScreenTitleMenu/bluearrow.png deleted file mode 100644 index f4c6920431..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/03 ScreenLogo & ScreenTitleMenu/bluearrow.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/03 ScreenLogo & ScreenTitleMenu/redarrow.png b/_assets/Themes/SMMAX2.0/exported graphics/03 ScreenLogo & ScreenTitleMenu/redarrow.png deleted file mode 100644 index 9f356de215..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/03 ScreenLogo & ScreenTitleMenu/redarrow.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/03 ScreenLogo & ScreenTitleMenu/smmax20logo.png b/_assets/Themes/SMMAX2.0/exported graphics/03 ScreenLogo & ScreenTitleMenu/smmax20logo.png deleted file mode 100644 index 6ff879c9c3..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/03 ScreenLogo & ScreenTitleMenu/smmax20logo.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/03 ScreenLogo & ScreenTitleMenu/titlemenubackground.jpg b/_assets/Themes/SMMAX2.0/exported graphics/03 ScreenLogo & ScreenTitleMenu/titlemenubackground.jpg deleted file mode 100644 index 8260bf7d52..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/03 ScreenLogo & ScreenTitleMenu/titlemenubackground.jpg and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/Common background.png b/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/Common background.png deleted file mode 100644 index 7c419484ce..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/Common background.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/_shared footer.png b/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/_shared footer.png deleted file mode 100644 index da4b52fe84..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/_shared footer.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/redselectionbox.png b/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/redselectionbox.png deleted file mode 100644 index 7aa55614d2..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/redselectionbox.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/screenicon.png b/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/screenicon.png deleted file mode 100644 index 4ae70f27f0..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/screenicon.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/selectionbar.png b/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/selectionbar.png deleted file mode 100644 index af24577147..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/selectionbar.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/selectprofileribbon.png b/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/selectprofileribbon.png deleted file mode 100644 index a3175c85a6..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/selectprofileribbon.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/yellowheader.png b/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/yellowheader.png deleted file mode 100644 index 7c9b1747ee..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/04 ScreenSelectProfile/yellowheader.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/explanationbar.png b/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/explanationbar.png deleted file mode 100644 index d99da43580..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/explanationbar.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/options warning box.png b/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/options warning box.png deleted file mode 100644 index 6df3c19299..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/options warning box.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/screenselectstyleicon.png b/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/screenselectstyleicon.png deleted file mode 100644 index fa345f0080..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/screenselectstyleicon.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/singlevisualisation.png b/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/singlevisualisation.png deleted file mode 100644 index 39e156ab98..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/singlevisualisation.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/styleSingleExplanationPanel.png b/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/styleSingleExplanationPanel.png deleted file mode 100644 index 6637b2dc51..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/styleSingleExplanationPanel.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/stylecoupleicon.png b/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/stylecoupleicon.png deleted file mode 100644 index 17042cfc40..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/stylecoupleicon.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/styledoubleicon.png b/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/styledoubleicon.png deleted file mode 100644 index 3a5df7af40..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/styledoubleicon.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/stylesingleicon.png b/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/stylesingleicon.png deleted file mode 100644 index 858f2785f2..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/stylesingleicon.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/stylesoloicon.png b/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/stylesoloicon.png deleted file mode 100644 index 03bcfb6c89..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/stylesoloicon.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/styleversusicon.png b/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/styleversusicon.png deleted file mode 100644 index 6e0a86dfa4..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/05 ScreenSelectStyle - Single/styleversusicon.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/06 ScreenSelectStyle - Versus/styleVersusExplanationPanel.png b/_assets/Themes/SMMAX2.0/exported graphics/06 ScreenSelectStyle - Versus/styleVersusExplanationPanel.png deleted file mode 100644 index 4f20100bbf..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/06 ScreenSelectStyle - Versus/styleVersusExplanationPanel.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/06 ScreenSelectStyle - Versus/versusvisualisation.png b/_assets/Themes/SMMAX2.0/exported graphics/06 ScreenSelectStyle - Versus/versusvisualisation.png deleted file mode 100644 index 82896df5a3..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/06 ScreenSelectStyle - Versus/versusvisualisation.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/07 ScreenSelectStyle - Couple/styleCoupleExplanationPanel.png b/_assets/Themes/SMMAX2.0/exported graphics/07 ScreenSelectStyle - Couple/styleCoupleExplanationPanel.png deleted file mode 100644 index 5d9d4fc241..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/07 ScreenSelectStyle - Couple/styleCoupleExplanationPanel.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/08 ScreenSelectStyle - Double/doublevisualisation.png b/_assets/Themes/SMMAX2.0/exported graphics/08 ScreenSelectStyle - Double/doublevisualisation.png deleted file mode 100644 index 652aa2cebe..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/08 ScreenSelectStyle - Double/doublevisualisation.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/08 ScreenSelectStyle - Double/styleDoubleExplanationPanel.png b/_assets/Themes/SMMAX2.0/exported graphics/08 ScreenSelectStyle - Double/styleDoubleExplanationPanel.png deleted file mode 100644 index 59c44e6754..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/08 ScreenSelectStyle - Double/styleDoubleExplanationPanel.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/09 ScreenSelectStyle - Solo/solovisualisation.png b/_assets/Themes/SMMAX2.0/exported graphics/09 ScreenSelectStyle - Solo/solovisualisation.png deleted file mode 100644 index 0174bf9c84..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/09 ScreenSelectStyle - Solo/solovisualisation.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/09 ScreenSelectStyle - Solo/styleSoloExplanationPanel.png b/_assets/Themes/SMMAX2.0/exported graphics/09 ScreenSelectStyle - Solo/styleSoloExplanationPanel.png deleted file mode 100644 index 77de2831ee..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/09 ScreenSelectStyle - Solo/styleSoloExplanationPanel.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/ScreenSelectPlayModeIcon.png b/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/ScreenSelectPlayModeIcon.png deleted file mode 100644 index 7589153017..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/ScreenSelectPlayModeIcon.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/panel-endless.png b/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/panel-endless.png deleted file mode 100644 index fbbac05d12..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/panel-endless.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/panel-extended.png b/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/panel-extended.png deleted file mode 100644 index be8d3045d4..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/panel-extended.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/panel-normal.png b/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/panel-normal.png deleted file mode 100644 index aa47b47c53..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/panel-normal.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/panel-oni.png b/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/panel-oni.png deleted file mode 100644 index 005a2a607e..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/panel-oni.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/panel-rave.png b/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/panel-rave.png deleted file mode 100644 index ebb8019b22..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/10 ScreenSelectPlayMode/panel-rave.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/MusicWheel highlight.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/MusicWheel highlight.png deleted file mode 100644 index 04b7a83051..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/MusicWheel highlight.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/MusicWheelItem SectionCollapsed NormalPart.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/MusicWheelItem SectionCollapsed NormalPart.png deleted file mode 100644 index bbc902a8b9..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/MusicWheelItem SectionCollapsed NormalPart.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/MusicWheelItem Song NormalPart.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/MusicWheelItem Song NormalPart.png deleted file mode 100644 index a72bcde639..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/MusicWheelItem Song NormalPart.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/ScreenSelectMusicIcon.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/ScreenSelectMusicIcon.png deleted file mode 100644 index afd6ffeeda..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/ScreenSelectMusicIcon.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/bannerdisplaybox.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/bannerdisplaybox.png deleted file mode 100644 index 6cc4ef732c..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/bannerdisplaybox.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/feet displaybg p1.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/feet displaybg p1.png deleted file mode 100644 index 3856e83e70..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/feet displaybg p1.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/feet displaybg p2.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/feet displaybg p2.png deleted file mode 100644 index 42ed19a0b7..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/feet displaybg p2.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/feeticon.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/feeticon.png deleted file mode 100644 index 0f9ebd753d..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/feeticon.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelselectsmallp1.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelselectsmallp1.png deleted file mode 100644 index e1dfb5278f..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelselectsmallp1.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelselectsmallp2.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelselectsmallp2.png deleted file mode 100644 index 08e4ef1614..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelselectsmallp2.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelsmallbox-beginner.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelsmallbox-beginner.png deleted file mode 100644 index 7ff08aaa03..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelsmallbox-beginner.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelsmallbox-challenge.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelsmallbox-challenge.png deleted file mode 100644 index 5166f1334b..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelsmallbox-challenge.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelsmallbox-heavy.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelsmallbox-heavy.png deleted file mode 100644 index f5113f38c5..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelsmallbox-heavy.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelsmallbox-light.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelsmallbox-light.png deleted file mode 100644 index c3c3bfdcd7..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelsmallbox-light.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelsmallbox-standard.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelsmallbox-standard.png deleted file mode 100644 index af3937fe98..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/levelsmallbox-standard.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/mods display - box active.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/mods display - box active.png deleted file mode 100644 index 9ebe553a80..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/mods display - box active.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/mods display - box empty.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/mods display - box empty.png deleted file mode 100644 index 9b49810ff7..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/mods display - box empty.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/mods display - p1.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/mods display - p1.png deleted file mode 100644 index 7e7aa6ac90..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/mods display - p1.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/mods display - p2.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/mods display - p2.png deleted file mode 100644 index 727b1c83ef..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/mods display - p2.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/scrollbar.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/scrollbar.png deleted file mode 100644 index 01e8919625..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/scrollbar.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/songstatsdisplay.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/songstatsdisplay.png deleted file mode 100644 index 03f2bf6c6b..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/songstatsdisplay.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/warps-speedups-pauses-etc-iconbg.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/warps-speedups-pauses-etc-iconbg.png deleted file mode 100644 index f8cb15becc..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/warps-speedups-pauses-etc-iconbg.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheel cover right.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheel cover right.png deleted file mode 100644 index 1c3232563f..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheel cover right.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheelicon - beginner level indicator.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheelicon - beginner level indicator.png deleted file mode 100644 index 3e9614fe99..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheelicon - beginner level indicator.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheelicon - edit.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheelicon - edit.png deleted file mode 100644 index f553105398..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheelicon - edit.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheelicon - long.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheelicon - long.png deleted file mode 100644 index a1a721b1de..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheelicon - long.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheelicon - marathon.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheelicon - marathon.png deleted file mode 100644 index f4746febf6..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheelicon - marathon.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheelicon - popularity.png b/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheelicon - popularity.png deleted file mode 100644 index 31e2dd9899..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/11 ScreenSelectMusic/wheelicon - popularity.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/12 ScreenGamePlay/Common fallback background.jpg b/_assets/Themes/SMMAX2.0/exported graphics/12 ScreenGamePlay/Common fallback background.jpg deleted file mode 100644 index f1a12b58a1..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/12 ScreenGamePlay/Common fallback background.jpg and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/12 ScreenGamePlay/energyleverdisplaygradient.png b/_assets/Themes/SMMAX2.0/exported graphics/12 ScreenGamePlay/energyleverdisplaygradient.png deleted file mode 100644 index a9f0fad336..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/12 ScreenGamePlay/energyleverdisplaygradient.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/12 ScreenGamePlay/footer.png b/_assets/Themes/SMMAX2.0/exported graphics/12 ScreenGamePlay/footer.png deleted file mode 100644 index 5bf3aec97a..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/12 ScreenGamePlay/footer.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/12 ScreenGamePlay/header.png b/_assets/Themes/SMMAX2.0/exported graphics/12 ScreenGamePlay/header.png deleted file mode 100644 index 057acab518..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/12 ScreenGamePlay/header.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/12 ScreenGamePlay/leveldisplay.png b/_assets/Themes/SMMAX2.0/exported graphics/12 ScreenGamePlay/leveldisplay.png deleted file mode 100644 index 5999ac97cc..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/12 ScreenGamePlay/leveldisplay.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/ScreenEvaluationNormalIcon.png b/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/ScreenEvaluationNormalIcon.png deleted file mode 100644 index 406290f5a2..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/ScreenEvaluationNormalIcon.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/banner box.png b/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/banner box.png deleted file mode 100644 index c781e0c856..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/banner box.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/grade window.png b/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/grade window.png deleted file mode 100644 index 444f37fd6e..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/grade window.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/judge description background.png b/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/judge description background.png deleted file mode 100644 index 07a0efe90d..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/judge description background.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/statbox - p1.png b/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/statbox - p1.png deleted file mode 100644 index d678b0f740..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/statbox - p1.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/statbox - p2.png b/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/statbox - p2.png deleted file mode 100644 index 10eecec0c3..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/13 ScreenEvaluationNormal/statbox - p2.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/footer.png b/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/footer.png deleted file mode 100644 index 72dafb101b..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/footer.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/header.png b/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/header.png deleted file mode 100644 index 0201382a24..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/header.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/ranking icons - 1.png b/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/ranking icons - 1.png deleted file mode 100644 index 1fce74c034..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/ranking icons - 1.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/ranking icons - 2.png b/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/ranking icons - 2.png deleted file mode 100644 index b04a57990a..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/ranking icons - 2.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/ranking icons - 3.png b/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/ranking icons - 3.png deleted file mode 100644 index ca34ca775a..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/ranking icons - 3.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/ranking icons - 4.png b/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/ranking icons - 4.png deleted file mode 100644 index 183557b0f5..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/ranking icons - 4.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/ranking icons - 5.png b/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/ranking icons - 5.png deleted file mode 100644 index a5321a059f..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/14 ScreenRanking/ranking icons - 5.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/baground dance tile.png b/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/baground dance tile.png deleted file mode 100644 index 5bb9ec6fde..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/baground dance tile.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/energy bar.png b/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/energy bar.png deleted file mode 100644 index bbf29defcb..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/energy bar.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/hand pointer blue.png b/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/hand pointer blue.png deleted file mode 100644 index be50582a08..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/hand pointer blue.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/hand pointer green.png b/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/hand pointer green.png deleted file mode 100644 index 7f032b1e0f..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/hand pointer green.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/how to play text.png b/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/how to play text.png deleted file mode 100644 index 098b696316..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/how to play text.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/info panel.png b/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/info panel.png deleted file mode 100644 index af9773fede..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/15 ScreenHowToPlay/info panel.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/16 ScreenOptions/option cursors.png b/_assets/Themes/SMMAX2.0/exported graphics/16 ScreenOptions/option cursors.png deleted file mode 100644 index c9c6606f99..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/16 ScreenOptions/option cursors.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/16 ScreenOptions/option row arrow selected.png b/_assets/Themes/SMMAX2.0/exported graphics/16 ScreenOptions/option row arrow selected.png deleted file mode 100644 index 6a82f3c3bc..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/16 ScreenOptions/option row arrow selected.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/16 ScreenOptions/option row arrow unselected.png b/_assets/Themes/SMMAX2.0/exported graphics/16 ScreenOptions/option row arrow unselected.png deleted file mode 100644 index 4787f3beda..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/16 ScreenOptions/option row arrow unselected.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/16 ScreenOptions/options bg panel.png b/_assets/Themes/SMMAX2.0/exported graphics/16 ScreenOptions/options bg panel.png deleted file mode 100644 index f80bf3a1e8..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/16 ScreenOptions/options bg panel.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/SMMAX20 logo.svg b/_assets/Themes/SMMAX2.0/exported graphics/SMMAX20 logo.svg deleted file mode 100644 index d2733fbfa3..0000000000 --- a/_assets/Themes/SMMAX2.0/exported graphics/SMMAX20 logo.svg +++ /dev/null @@ -1,76984 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/_assets/Themes/SMMAX2.0/exported graphics/headers/Nowy folder/screen select mode notext transparent.png b/_assets/Themes/SMMAX2.0/exported graphics/headers/Nowy folder/screen select mode notext transparent.png deleted file mode 100644 index 02e101a62a..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/headers/Nowy folder/screen select mode notext transparent.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/headers/Nowy folder/screen select music notext transparent.png b/_assets/Themes/SMMAX2.0/exported graphics/headers/Nowy folder/screen select music notext transparent.png deleted file mode 100644 index 46c0c0ecfe..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/headers/Nowy folder/screen select music notext transparent.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/headers/Nowy folder/screen select profile notext transparent.png b/_assets/Themes/SMMAX2.0/exported graphics/headers/Nowy folder/screen select profile notext transparent.png deleted file mode 100644 index 97d9b7aca9..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/headers/Nowy folder/screen select profile notext transparent.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/headers/Nowy folder/screen select style notext transparent.png b/_assets/Themes/SMMAX2.0/exported graphics/headers/Nowy folder/screen select style notext transparent.png deleted file mode 100644 index 49e5c76b9c..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/headers/Nowy folder/screen select style notext transparent.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/headers/select mode header.png b/_assets/Themes/SMMAX2.0/exported graphics/headers/select mode header.png deleted file mode 100644 index 6603364c2f..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/headers/select mode header.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/headers/select music header.png b/_assets/Themes/SMMAX2.0/exported graphics/headers/select music header.png deleted file mode 100644 index 5cf5ede82c..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/headers/select music header.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/exported graphics/headers/select style header.png b/_assets/Themes/SMMAX2.0/exported graphics/headers/select style header.png deleted file mode 100644 index 429a613a97..0000000000 Binary files a/_assets/Themes/SMMAX2.0/exported graphics/headers/select style header.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/fonts/charlie_brown_m54.zip b/_assets/Themes/SMMAX2.0/fonts/charlie_brown_m54.zip deleted file mode 100644 index 4b9a31af59..0000000000 Binary files a/_assets/Themes/SMMAX2.0/fonts/charlie_brown_m54.zip and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/fonts/frutiger.txt b/_assets/Themes/SMMAX2.0/fonts/frutiger.txt deleted file mode 100644 index 462cb1c5ba..0000000000 --- a/_assets/Themes/SMMAX2.0/fonts/frutiger.txt +++ /dev/null @@ -1,6 +0,0 @@ -Second font used in project is frutiger. Unforutnatly it`s commersial, and cant be distributed. -But no worries. Firstly: This font is used only in "system layer" graphics, and isnt essential for design as charlie brown m54. -Secondly: This font has many free replacements. Just search the web for something simillar. Heres link to the original: -http://www.fonts.com/findfonts/detail.htm?productid=191443 for reference. - - \ No newline at end of file diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-01.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-01.png deleted file mode 100644 index 1e26e3484e..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-01.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-02.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-02.png deleted file mode 100644 index 39d05a1b63..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-02.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-03.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-03.png deleted file mode 100644 index 3c3403b108..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-03.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-04.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-04.png deleted file mode 100644 index 50b4281d77..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-04.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-05.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-05.png deleted file mode 100644 index 5687273661..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-05.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-06.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-06.png deleted file mode 100644 index 2119b24d90..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-06.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-07.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-07.png deleted file mode 100644 index 03629cea38..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-07.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-08.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-08.png deleted file mode 100644 index d5718a2c6b..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-08.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-09.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-09.png deleted file mode 100644 index 1bd9346dc2..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-09.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-10.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-10.png deleted file mode 100644 index 0f30ef2a8d..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-10.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-11.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-11.png deleted file mode 100644 index 090c7e329c..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-11.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-12.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-12.png deleted file mode 100644 index 17132d4093..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-12.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-13.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-13.png deleted file mode 100644 index 5112c5b469..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-13.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-14.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-14.png deleted file mode 100644 index bd664db910..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-14.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-15.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-15.png deleted file mode 100644 index 64ccaf6134..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-15.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-16.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-16.png deleted file mode 100644 index 07be18d652..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-16.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-17.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-17.png deleted file mode 100644 index 2f5bf875c8..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-17.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-18.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-18.png deleted file mode 100644 index e14c8153a8..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-18.png and /dev/null differ diff --git a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-19.png b/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-19.png deleted file mode 100644 index c3bc32b60d..0000000000 Binary files a/_assets/Themes/SMMAX2.0/preview screenshots in png/SMMAX20 screens project ver1_1-19.png and /dev/null differ diff --git a/_assets/Themes/default/~res/24x24 icon.psd b/_assets/Themes/default/~res/24x24 icon.psd deleted file mode 100644 index 1347ff1194..0000000000 Binary files a/_assets/Themes/default/~res/24x24 icon.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/BannerFrame.7z b/_assets/Themes/default/~res/BannerFrame.7z deleted file mode 100644 index 545f858d55..0000000000 Binary files a/_assets/Themes/default/~res/BannerFrame.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/Combo label.psd b/_assets/Themes/default/~res/Combo label.psd deleted file mode 100644 index f71c885975..0000000000 Binary files a/_assets/Themes/default/~res/Combo label.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/Common fallback background.7z b/_assets/Themes/default/~res/Common fallback background.7z deleted file mode 100644 index 7eac663a53..0000000000 Binary files a/_assets/Themes/default/~res/Common fallback background.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/Common fallback background.psd b/_assets/Themes/default/~res/Common fallback background.psd deleted file mode 100644 index c27c91fed0..0000000000 Binary files a/_assets/Themes/default/~res/Common fallback background.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/Common fallback banners.psd b/_assets/Themes/default/~res/Common fallback banners.psd deleted file mode 100644 index 5a994d2824..0000000000 Binary files a/_assets/Themes/default/~res/Common fallback banners.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/DualScrollbars .psd b/_assets/Themes/default/~res/DualScrollbars .psd deleted file mode 100644 index 65efb85b06..0000000000 Binary files a/_assets/Themes/default/~res/DualScrollbars .psd and /dev/null differ diff --git a/_assets/Themes/default/~res/EvaluationFrame.7z b/_assets/Themes/default/~res/EvaluationFrame.7z deleted file mode 100644 index 6be4df7e3f..0000000000 Binary files a/_assets/Themes/default/~res/EvaluationFrame.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/Footer.7z b/_assets/Themes/default/~res/Footer.7z deleted file mode 100644 index 0ab016882d..0000000000 Binary files a/_assets/Themes/default/~res/Footer.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/FoundationLogo.7z b/_assets/Themes/default/~res/FoundationLogo.7z deleted file mode 100644 index 03331b70b9..0000000000 Binary files a/_assets/Themes/default/~res/FoundationLogo.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/Header.7z b/_assets/Themes/default/~res/Header.7z deleted file mode 100644 index c3a6a93436..0000000000 Binary files a/_assets/Themes/default/~res/Header.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/HoldJudgment label 1x2.psd b/_assets/Themes/default/~res/HoldJudgment label 1x2.psd deleted file mode 100644 index be303b208a..0000000000 Binary files a/_assets/Themes/default/~res/HoldJudgment label 1x2.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/Judgments Normal 1x6.psd b/_assets/Themes/default/~res/Judgments Normal 1x6.psd deleted file mode 100644 index 61eb9ed1f0..0000000000 Binary files a/_assets/Themes/default/~res/Judgments Normal 1x6.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/Judgments.7z b/_assets/Themes/default/~res/Judgments.7z deleted file mode 100644 index 209d1c45e5..0000000000 Binary files a/_assets/Themes/default/~res/Judgments.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/Judgments.psd b/_assets/Themes/default/~res/Judgments.psd deleted file mode 100644 index d9a8a5c0d1..0000000000 Binary files a/_assets/Themes/default/~res/Judgments.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/LifeMeterBar.7z b/_assets/Themes/default/~res/LifeMeterBar.7z deleted file mode 100644 index 845f38f7fe..0000000000 Binary files a/_assets/Themes/default/~res/LifeMeterBar.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/LifeMeterBattery parts.psd b/_assets/Themes/default/~res/LifeMeterBattery parts.psd deleted file mode 100644 index 6d3002ea22..0000000000 Binary files a/_assets/Themes/default/~res/LifeMeterBattery parts.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/MenuTimer frame.7z b/_assets/Themes/default/~res/MenuTimer frame.7z deleted file mode 100644 index c13f9d3b59..0000000000 Binary files a/_assets/Themes/default/~res/MenuTimer frame.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/PaneDisplay frame.psd b/_assets/Themes/default/~res/PaneDisplay frame.psd deleted file mode 100644 index 048b2dfcd7..0000000000 Binary files a/_assets/Themes/default/~res/PaneDisplay frame.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/Player fc badge.psd b/_assets/Themes/default/~res/Player fc badge.psd deleted file mode 100644 index 644ae13dbb..0000000000 Binary files a/_assets/Themes/default/~res/Player fc badge.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/Rave win messages.psd b/_assets/Themes/default/~res/Rave win messages.psd deleted file mode 100644 index 42af21844e..0000000000 Binary files a/_assets/Themes/default/~res/Rave win messages.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/ScreenEvaluation Win p1 1x3.psd b/_assets/Themes/default/~res/ScreenEvaluation Win p1 1x3.psd deleted file mode 100644 index 4c5e9387b1..0000000000 Binary files a/_assets/Themes/default/~res/ScreenEvaluation Win p1 1x3.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/ScreenEvaluation Win p2 1x3.psd b/_assets/Themes/default/~res/ScreenEvaluation Win p2 1x3.psd deleted file mode 100644 index d264057a57..0000000000 Binary files a/_assets/Themes/default/~res/ScreenEvaluation Win p2 1x3.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/ScreenGameOver gameover.psd b/_assets/Themes/default/~res/ScreenGameOver gameover.psd deleted file mode 100644 index c05ce8d829..0000000000 Binary files a/_assets/Themes/default/~res/ScreenGameOver gameover.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/ScreenGameplay SongMeterDisplay parts.psd b/_assets/Themes/default/~res/ScreenGameplay SongMeterDisplay parts.psd deleted file mode 100644 index dbf9066d71..0000000000 Binary files a/_assets/Themes/default/~res/ScreenGameplay SongMeterDisplay parts.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/ScreenGameplay ready.7z b/_assets/Themes/default/~res/ScreenGameplay ready.7z deleted file mode 100644 index f1660e8d7c..0000000000 Binary files a/_assets/Themes/default/~res/ScreenGameplay ready.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/ScreenGameplay ready.psd b/_assets/Themes/default/~res/ScreenGameplay ready.psd deleted file mode 100644 index 61d38d4755..0000000000 Binary files a/_assets/Themes/default/~res/ScreenGameplay ready.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/ScreenHowToPlay bg.psd b/_assets/Themes/default/~res/ScreenHowToPlay bg.psd deleted file mode 100644 index bc4516f210..0000000000 Binary files a/_assets/Themes/default/~res/ScreenHowToPlay bg.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/ScreenOptions page.7z b/_assets/Themes/default/~res/ScreenOptions page.7z deleted file mode 100644 index e875d7fb39..0000000000 Binary files a/_assets/Themes/default/~res/ScreenOptions page.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/ScreenQuickSetupOverview icon.psd b/_assets/Themes/default/~res/ScreenQuickSetupOverview icon.psd deleted file mode 100644 index e02e2f004a..0000000000 Binary files a/_assets/Themes/default/~res/ScreenQuickSetupOverview icon.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/ScreenSelect generic icons.7z b/_assets/Themes/default/~res/ScreenSelect generic icons.7z deleted file mode 100644 index 3433363978..0000000000 Binary files a/_assets/Themes/default/~res/ScreenSelect generic icons.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/ScreenSelectMusic DifficultyDisplay.psd b/_assets/Themes/default/~res/ScreenSelectMusic DifficultyDisplay.psd deleted file mode 100644 index f8de5ba2a8..0000000000 Binary files a/_assets/Themes/default/~res/ScreenSelectMusic DifficultyDisplay.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/ScreenSelectMusic DifficultyDisplayLarge.psd b/_assets/Themes/default/~res/ScreenSelectMusic DifficultyDisplayLarge.psd deleted file mode 100644 index 2f819c3fcc..0000000000 Binary files a/_assets/Themes/default/~res/ScreenSelectMusic DifficultyDisplayLarge.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/ScreenSelectPlayMode scroller background.psd b/_assets/Themes/default/~res/ScreenSelectPlayMode scroller background.psd deleted file mode 100644 index ff30bf8429..0000000000 Binary files a/_assets/Themes/default/~res/ScreenSelectPlayMode scroller background.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/ScreenSelectPlayMode scroller icons.psd b/_assets/Themes/default/~res/ScreenSelectPlayMode scroller icons.psd deleted file mode 100644 index ef7815ead3..0000000000 Binary files a/_assets/Themes/default/~res/ScreenSelectPlayMode scroller icons.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/ScreenSelectProfile Card.psd b/_assets/Themes/default/~res/ScreenSelectProfile Card.psd deleted file mode 100644 index f66fc5be75..0000000000 Binary files a/_assets/Themes/default/~res/ScreenSelectProfile Card.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/ScreenStageInformation stage.psd b/_assets/Themes/default/~res/ScreenStageInformation stage.psd deleted file mode 100644 index 7a6136e8b1..0000000000 Binary files a/_assets/Themes/default/~res/ScreenStageInformation stage.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/SelectIcons.7z b/_assets/Themes/default/~res/SelectIcons.7z deleted file mode 100644 index 51352e246e..0000000000 Binary files a/_assets/Themes/default/~res/SelectIcons.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/SelectIcons.psd b/_assets/Themes/default/~res/SelectIcons.psd deleted file mode 100644 index 940f096ba6..0000000000 Binary files a/_assets/Themes/default/~res/SelectIcons.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/SnapDisplay icon 9x1.7z b/_assets/Themes/default/~res/SnapDisplay icon 9x1.7z deleted file mode 100644 index 1c29f50281..0000000000 Binary files a/_assets/Themes/default/~res/SnapDisplay icon 9x1.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/StepsDisplay StepsType.psd b/_assets/Themes/default/~res/StepsDisplay StepsType.psd deleted file mode 100644 index 61c4e42309..0000000000 Binary files a/_assets/Themes/default/~res/StepsDisplay StepsType.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/StepsDisplay frame.7z b/_assets/Themes/default/~res/StepsDisplay frame.7z deleted file mode 100644 index c239f3a228..0000000000 Binary files a/_assets/Themes/default/~res/StepsDisplay frame.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/StepsDisplayListRow Cursor.7z b/_assets/Themes/default/~res/StepsDisplayListRow Cursor.7z deleted file mode 100644 index 30566962f8..0000000000 Binary files a/_assets/Themes/default/~res/StepsDisplayListRow Cursor.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/StepsDisplayListRow arrow.7z b/_assets/Themes/default/~res/StepsDisplayListRow arrow.7z deleted file mode 100644 index 7d854f7284..0000000000 Binary files a/_assets/Themes/default/~res/StepsDisplayListRow arrow.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/StepsDisplayMusic frame.7z b/_assets/Themes/default/~res/StepsDisplayMusic frame.7z deleted file mode 100644 index b7b13d1d76..0000000000 Binary files a/_assets/Themes/default/~res/StepsDisplayMusic frame.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/StepsDisplayMusic frame.psd b/_assets/Themes/default/~res/StepsDisplayMusic frame.psd deleted file mode 100644 index a7283a6e9c..0000000000 Binary files a/_assets/Themes/default/~res/StepsDisplayMusic frame.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/_JudgmentLineLabel.psd b/_assets/Themes/default/~res/_JudgmentLineLabel.psd deleted file mode 100644 index 4553778d6b..0000000000 Binary files a/_assets/Themes/default/~res/_JudgmentLineLabel.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/hold judgments 1x2.psd b/_assets/Themes/default/~res/hold judgments 1x2.psd deleted file mode 100644 index 8d9870c9bd..0000000000 Binary files a/_assets/Themes/default/~res/hold judgments 1x2.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/moveon.psd b/_assets/Themes/default/~res/moveon.psd deleted file mode 100644 index 55d8516fab..0000000000 Binary files a/_assets/Themes/default/~res/moveon.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/musicwheel.7z b/_assets/Themes/default/~res/musicwheel.7z deleted file mode 100644 index 1e103cc650..0000000000 Binary files a/_assets/Themes/default/~res/musicwheel.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/musicwheel.psd b/_assets/Themes/default/~res/musicwheel.psd deleted file mode 100644 index c9b7aa491d..0000000000 Binary files a/_assets/Themes/default/~res/musicwheel.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/pills.7z b/_assets/Themes/default/~res/pills.7z deleted file mode 100644 index 986f063562..0000000000 Binary files a/_assets/Themes/default/~res/pills.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/sm-ssc logo.7z b/_assets/Themes/default/~res/sm-ssc logo.7z deleted file mode 100644 index 6acd648b10..0000000000 Binary files a/_assets/Themes/default/~res/sm-ssc logo.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/uf_footer.7z b/_assets/Themes/default/~res/uf_footer.7z deleted file mode 100644 index 57a81b1e7d..0000000000 Binary files a/_assets/Themes/default/~res/uf_footer.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/uf_footer.psd b/_assets/Themes/default/~res/uf_footer.psd deleted file mode 100644 index 0fed31db56..0000000000 Binary files a/_assets/Themes/default/~res/uf_footer.psd and /dev/null differ diff --git a/_assets/Themes/default/~res/uf_header.7z b/_assets/Themes/default/~res/uf_header.7z deleted file mode 100644 index baa6b64f44..0000000000 Binary files a/_assets/Themes/default/~res/uf_header.7z and /dev/null differ diff --git a/_assets/Themes/default/~res/uf_shared bg.7z b/_assets/Themes/default/~res/uf_shared bg.7z deleted file mode 100644 index d1d25ef027..0000000000 Binary files a/_assets/Themes/default/~res/uf_shared bg.7z and /dev/null differ diff --git a/_assets/installer-icon.psd b/_assets/installer-icon.psd deleted file mode 100644 index ce9fa032b7..0000000000 Binary files a/_assets/installer-icon.psd and /dev/null differ diff --git a/_assets/logo.png b/_assets/logo.png new file mode 100644 index 0000000000..65121a792c Binary files /dev/null and b/_assets/logo.png differ diff --git a/_assets/logo.psd b/_assets/logo.psd deleted file mode 100644 index 312e23b9ea..0000000000 Binary files a/_assets/logo.psd and /dev/null differ diff --git a/_assets/splash.psd b/_assets/splash.psd deleted file mode 100644 index ef1973a819..0000000000 Binary files a/_assets/splash.psd and /dev/null differ diff --git a/icons/hicolor/128x128/apps/stepmania-ssc.png b/icons/hicolor/128x128/apps/stepmania-ssc.png deleted file mode 100644 index ef99fb5593..0000000000 Binary files a/icons/hicolor/128x128/apps/stepmania-ssc.png and /dev/null differ diff --git a/icons/hicolor/16x16/apps/stepmania-ssc.png b/icons/hicolor/16x16/apps/stepmania-ssc.png deleted file mode 100644 index 8434bdcde2..0000000000 Binary files a/icons/hicolor/16x16/apps/stepmania-ssc.png and /dev/null differ diff --git a/icons/hicolor/192x192/apps/stepmania-ssc.png b/icons/hicolor/192x192/apps/stepmania-ssc.png deleted file mode 100644 index 1705de8549..0000000000 Binary files a/icons/hicolor/192x192/apps/stepmania-ssc.png and /dev/null differ diff --git a/icons/hicolor/22x22/apps/stepmania-ssc.png b/icons/hicolor/22x22/apps/stepmania-ssc.png deleted file mode 100644 index 34a340bd05..0000000000 Binary files a/icons/hicolor/22x22/apps/stepmania-ssc.png and /dev/null differ diff --git a/icons/hicolor/24x24/apps/stepmania-ssc.png b/icons/hicolor/24x24/apps/stepmania-ssc.png deleted file mode 100644 index 68756e6ec2..0000000000 Binary files a/icons/hicolor/24x24/apps/stepmania-ssc.png and /dev/null differ diff --git a/icons/hicolor/256x256/apps/stepmania-ssc.png b/icons/hicolor/256x256/apps/stepmania-ssc.png deleted file mode 100644 index cba4fba694..0000000000 Binary files a/icons/hicolor/256x256/apps/stepmania-ssc.png and /dev/null differ diff --git a/icons/hicolor/32x32/apps/stepmania-ssc.png b/icons/hicolor/32x32/apps/stepmania-ssc.png deleted file mode 100644 index e4538e71f1..0000000000 Binary files a/icons/hicolor/32x32/apps/stepmania-ssc.png and /dev/null differ diff --git a/icons/hicolor/36x36/apps/stepmania-ssc.png b/icons/hicolor/36x36/apps/stepmania-ssc.png deleted file mode 100644 index deb15afd51..0000000000 Binary files a/icons/hicolor/36x36/apps/stepmania-ssc.png and /dev/null differ diff --git a/icons/hicolor/48x48/apps/stepmania-ssc.png b/icons/hicolor/48x48/apps/stepmania-ssc.png deleted file mode 100644 index fba524bc11..0000000000 Binary files a/icons/hicolor/48x48/apps/stepmania-ssc.png and /dev/null differ diff --git a/icons/hicolor/64x64/apps/stepmania-ssc.png b/icons/hicolor/64x64/apps/stepmania-ssc.png deleted file mode 100644 index 93290290ea..0000000000 Binary files a/icons/hicolor/64x64/apps/stepmania-ssc.png and /dev/null differ diff --git a/icons/hicolor/72x72/apps/stepmania-ssc.png b/icons/hicolor/72x72/apps/stepmania-ssc.png deleted file mode 100644 index 7ae69f28f7..0000000000 Binary files a/icons/hicolor/72x72/apps/stepmania-ssc.png and /dev/null differ diff --git a/icons/hicolor/96x96/apps/stepmania-ssc.png b/icons/hicolor/96x96/apps/stepmania-ssc.png deleted file mode 100644 index bdebd10f4b..0000000000 Binary files a/icons/hicolor/96x96/apps/stepmania-ssc.png and /dev/null differ diff --git a/icons/hicolor/scalable/apps/stepmania-ssc.svg b/icons/hicolor/scalable/apps/stepmania-ssc.svg deleted file mode 100644 index 662b609871..0000000000 --- a/icons/hicolor/scalable/apps/stepmania-ssc.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/itgmania.desktop b/itgmania.desktop index e3ddd8c3a3..74b231b6c5 100644 --- a/itgmania.desktop +++ b/itgmania.desktop @@ -1,11 +1,10 @@ [Desktop Entry] -Encoding=UTF-8 Name=ITGmania GenericName=Rhythm and dance game -TryExec=itgmania -Exec=itgmania +TryExec=/usr/local/itgmania/itgmania +Exec=/usr/local/itgmania/itgmania Terminal=false -Icon=stepmania-ssc +Icon=/usr/local/itgmania/Data/icon.png Type=Application -Categories=Application;Game;ArcadeGame +Categories=Game;ArcadeGame Comment=A cross-platform rhythm video game. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8f07de86fc..8ce91bda28 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -67,7 +67,6 @@ if(APPLE) MACOSX_BUNDLE ${SMDATA_ALL_FILES_SRC} ${SMDATA_ALL_FILES_HPP}) - set_target_properties("${SM_EXE_NAME}" PROPERTIES MACOSX_BUNDLE TRUE) else() if(MSVC) foreach(sm_src_file ${SMDATA_ALL_FILES_SRC}) @@ -198,21 +197,7 @@ elseif(APPLE) RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${SM_ROOT_DIR}" MACOSX_BUNDLE_INFO_PLIST - "${SM_XCODE_DIR}/Info.plist.in" - XCODE_ATTRIBUTE_INFOPLIST_PREPROCESS - "YES" - XCODE_ATTRIBUTE_INFOPLIST_PREPROCESSOR_DEFINITIONS[variant=Release] - "RELEASE" - XCODE_ATTRIBUTE_INFOPLIST_PREPROCESSOR_DEFINITIONS[variant=Debug] - "DEBUG" - XCODE_ATTRIBUTE_INFOPLIST_PREPROCESSOR_DEFINITIONS[variant=MinSizeRel] - "MINSIZEREL" - XCODE_ATTRIBUTE_INFOPLIST_PREPROCESSOR_DEFINITIONS[variant=RelWithDebInfo] - "RELWITHDEBINFO" - XCODE_ATTRIBUTE_GCC_PREFIX_HEADER - "${CMAKE_CURRENT_SOURCE_DIR}/archutils/Darwin/StepMania.pch" - XCODE_ATTRIBUTE_GCC_ENABLE_CPP_EXCEPTIONS - "NO") + "${SM_XCODE_DIR}/Info.plist.in") set(APPLE_BUNDLE_RESOURCES "${SM_ROOT_DIR}/Announcers" @@ -252,7 +237,7 @@ elseif(APPLE) COMMAND ${CMAKE_COMMAND} -E make_directory "$/../Resources" COMMAND ${CMAKE_COMMAND} -E copy - "${SM_XCODE_DIR}/smicon.icns" + "${SM_XCODE_DIR}/logo.icns" "$/../Resources/" COMMAND ${CMAKE_COMMAND} -E copy "${SM_XCODE_DIR}/Hardware.plist" diff --git a/src/CommandLineActions.cpp b/src/CommandLineActions.cpp index 721baa0257..bf94daac91 100644 --- a/src/CommandLineActions.cpp +++ b/src/CommandLineActions.cpp @@ -24,44 +24,8 @@ #include #endif -/** @brief The directory where languages should be installed. */ -const RString INSTALLER_LANGUAGES_DIR = "Themes/_Installer/Languages/"; - vector CommandLineActions::ToProcess; -static void Nsis() -{ - RageFile out; - if(!out.Open("nsis_strings_temp.inc", RageFile::WRITE)) - RageException::Throw("Error opening file for write."); - - vector vs; - GetDirListing(INSTALLER_LANGUAGES_DIR + "*.ini", vs, false, false); - for (RString const &s : vs) - { - RString sThrowAway, sLangCode; - splitpath(s, sThrowAway, sLangCode, sThrowAway); - const LanguageInfo *pLI = GetLanguageInfo(sLangCode); - - RString sLangNameUpper = pLI->szEnglishName; - sLangNameUpper.MakeUpper(); - - IniFile ini; - if(!ini.ReadFile(INSTALLER_LANGUAGES_DIR + s)) - RageException::Throw("Error opening file for read."); - FOREACH_CONST_Child(&ini, child) - { - FOREACH_CONST_Attr(child, attr) - { - RString sName = attr->first; - RString sValue = attr->second->GetValue(); - sValue.Replace("\\n", "$\\n"); - RString sLine = ssprintf("LangString %s ${LANG_%s} \"%s\"", sName.c_str(), sLangNameUpper.c_str(), sValue.c_str()); - out.PutLine(sLine); - } - } - } -} static void LuaInformation() { XNode *pNode = LuaHelpers::GetLuaInformation(); @@ -107,11 +71,6 @@ void CommandLineActions::Handle(LoadingWindow* pLW) ToProcess.push_back(args); bool bExitAfter = false; - if( GetCommandlineArgument("ExportNsisStrings") ) - { - Nsis(); - bExitAfter = true; - } if( GetCommandlineArgument("ExportLuaInformation") ) { LuaInformation(); diff --git a/src/ProductInfo.h b/src/ProductInfo.h index 5347f435aa..0213f5df07 100644 --- a/src/ProductInfo.h +++ b/src/ProductInfo.h @@ -1,5 +1,3 @@ -/** @brief ProductInfo - Branding strings. Don't forget to also change ProductInfo.inc! */ - #ifndef PRODUCT_INFO_H #define PRODUCT_INFO_H @@ -20,8 +18,8 @@ #define PRODUCT_STRINGIFY(x) #x #define PRODUCT_XSTRINGIFY(x) PRODUCT_STRINGIFY(x) -#define PRODUCT_FAMILY PRODUCT_XSTRINGIFY(PRODUCT_FAMILY_BARE) -#define PRODUCT_ID PRODUCT_XSTRINGIFY(PRODUCT_ID_BARE) +#define PRODUCT_FAMILY PRODUCT_XSTRINGIFY(PRODUCT_FAMILY_BARE) +#define PRODUCT_ID PRODUCT_XSTRINGIFY(PRODUCT_ID_BARE) #define VIDEO_TROUBLESHOOTING_URL "http://old.stepmania.com/stepmaniawiki.php?title=Video_Driver_Troubleshooting" /** @brief The URL to report bugs on the program. */ diff --git a/src/ProductInfo.inc b/src/ProductInfo.inc deleted file mode 100644 index 50c90b4e14..0000000000 --- a/src/ProductInfo.inc +++ /dev/null @@ -1,28 +0,0 @@ -; Included by the NSIS installer script -; Don't forget to also change ProductInfo.h! - -; a friendly string to refer to the product -!define PRODUCT_FAMILY "ITGmania" -!define PRODUCT_ID "ITGmania" -; TODO: This needs to be updated with the git rev hash -!define PRODUCT_VER "0.5.1" -!define PRODUCT_DISPLAY "${PRODUCT_FAMILY} ${PRODUCT_VER}" -!define PRODUCT_BITMAP "sm5" - -!define PRODUCT_URL "https://www.itgmania.com/" -!define UPDATES_URL "https://www.itgmania.com/" - -;!define INSTALL_EXTERNAL_PCKS -;!define INSTALL_INTERNAL_PCKS -!define INSTALL_PROGRAM_LIBRARIES -!define INSTALL_EXECUTABLES -!define INSTALL_NON_PCK_FILES -!define ASSOCIATE_SMZIP -!define ASSOCIATE_SMURL -;!define SHOW_AUTORUN -!define MAKE_OPEN_PROGRAM_FOLDER_SHORTCUT -!define MAKE_OPEN_SETTINGS_FOLDER_SHORTCUT -;!define DIRECTX_81_REDIST_PRESENT -;!define MAKE_UPDATES_SHORTCUT -!define CRC_CHECK -!define COMPRESS diff --git a/src/archutils/Win32/StepMania.ico b/src/archutils/Win32/StepMania.ico deleted file mode 100644 index c9363aaa34..0000000000 Binary files a/src/archutils/Win32/StepMania.ico and /dev/null differ diff --git a/src/archutils/Win32/WindowsResources.rc b/src/archutils/Win32/WindowsResources.rc index e76e6e316e..12738fa20d 100644 --- a/src/archutils/Win32/WindowsResources.rc +++ b/src/archutils/Win32/WindowsResources.rc @@ -173,7 +173,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_ICON ICON "StepMania.ICO" +IDI_ICON ICON "logo.ico" IDI_ICON1 ICON "smzip.ico" ///////////////////////////////////////////////////////////////////////////// @@ -198,7 +198,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "ITGmania Team \n http://www.itgmania.com/" + VALUE "CompanyName", "ITGmania Team \n https://www.itgmania.com/" VALUE "FileDescription", "ITGmania" VALUE "FileVersion", "0, 5, 1, 0" VALUE "InternalName", "ITGmania" diff --git a/src/archutils/Win32/logo.ico b/src/archutils/Win32/logo.ico new file mode 100644 index 0000000000..3ebc82160f Binary files /dev/null and b/src/archutils/Win32/logo.ico differ diff --git a/src/smpackage-net2008.vcproj b/src/smpackage-net2008.vcproj index 4f914af735..bdcee8c1e1 100644 --- a/src/smpackage-net2008.vcproj +++ b/src/smpackage-net2008.vcproj @@ -350,7 +350,7 @@ >