fix icon and version
Closes: #16 Fixed the icon so Qt renders it properly, and actually renders it properly in the About page. Also, scaled it up a bit Changed launcher.svg icon to temporary Ouroboros logo fixed genicons again Fix version to 1.0.3 (making tag rn) Install the PolyMC icon properly.
This commit is contained in:
parent
b3d8ecb467
commit
0e4ccaca02
@ -57,9 +57,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_DEPRECATED_WARNINGS=Y")
|
||||
set(Launcher_NEWS_RSS_URL "https://multimc.org/rss.xml" CACHE STRING "URL to fetch Launcher's news RSS feed from.")
|
||||
|
||||
######## Set version numbers ########
|
||||
set(Launcher_VERSION_MAJOR 0)
|
||||
set(Launcher_VERSION_MINOR 6)
|
||||
set(Launcher_VERSION_HOTFIX 14)
|
||||
set(Launcher_VERSION_MAJOR 1)
|
||||
set(Launcher_VERSION_MINOR 0)
|
||||
set(Launcher_VERSION_HOTFIX 3)
|
||||
|
||||
# Build number
|
||||
set(Launcher_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
|
||||
@ -211,6 +211,7 @@ elseif(Launcher_LAYOUT_REAL STREQUAL "lin-system")
|
||||
set(JARS_DEST_DIR "${Launcher_SHARE_DEST_DIR}/jars")
|
||||
set(Launcher_DESKTOP_DEST_DIR "share/applications" CACHE STRING "Path to the desktop file directory")
|
||||
set(Launcher_METAINFO_DEST_DIR "share/metainfo" CACHE STRING "Path to the metainfo directory")
|
||||
set(Launcher_ICON_DEST_DIR "share/icons/hicolor/scalable/apps" CACHE STRING "Path to the scalable icon directory")
|
||||
|
||||
set(BINARY_DEST_DIR ${Launcher_BINARY_DEST_DIR})
|
||||
set(LIBRARY_DEST_DIR ${Launcher_LIBRARY_DEST_DIR})
|
||||
@ -220,6 +221,7 @@ elseif(Launcher_LAYOUT_REAL STREQUAL "lin-system")
|
||||
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${Launcher_Desktop} DESTINATION ${Launcher_DESKTOP_DEST_DIR})
|
||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_MetaInfo} DESTINATION ${Launcher_METAINFO_DEST_DIR})
|
||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_SVG} DESTINATION ${Launcher_ICON_DEST_DIR})
|
||||
|
||||
# install as bundle with no dependencies included
|
||||
set(INSTALL_BUNDLE "nodeps")
|
||||
|
@ -1148,7 +1148,7 @@ void Application::setIconTheme(const QString& name)
|
||||
QIcon Application::getThemedIcon(const QString& name)
|
||||
{
|
||||
if(name == "logo") {
|
||||
return QIcon(":/polymc.svg");
|
||||
return QIcon(":/org.polymc.PolyMC.svg");
|
||||
}
|
||||
return XdgIcon::fromTheme(name);
|
||||
}
|
||||
|
File diff suppressed because one or more lines are too long
Before Width: | Height: | Size: 6.0 KiB After Width: | Height: | Size: 47 KiB |
@ -10,6 +10,7 @@ set(Launcher_Git "https://github.com/PolyMC/PolyMC" PARENT_SCOPE)
|
||||
|
||||
set(Launcher_Desktop "program_info/org.polymc.PolyMC.desktop" PARENT_SCOPE)
|
||||
set(Launcher_MetaInfo "program_info/org.polymc.PolyMC.metainfo.xml" PARENT_SCOPE)
|
||||
set(Launcher_SVG "program_info/org.polymc.PolyMC.svg" PARENT_SCOPE)
|
||||
set(Launcher_Branding_ICNS "program_info/polymc.icns" PARENT_SCOPE)
|
||||
set(Launcher_Branding_WindowsRC "program_info/polymc.rc" PARENT_SCOPE)
|
||||
set(Launcher_Branding_LogoQRC "program_info/polymc.qrc" PARENT_SCOPE)
|
||||
|
@ -5,13 +5,13 @@ inkscape -w 24 -h 24 -o polymc_24.png org.polymc.PolyMC.svg
|
||||
inkscape -w 32 -h 32 -o polymc_32.png org.polymc.PolyMC.svg
|
||||
inkscape -w 48 -h 48 -o polymc_48.png org.polymc.PolyMC.svg
|
||||
inkscape -w 64 -h 64 -o polymc_64.png org.polymc.PolyMC.svg
|
||||
inkscape -w 128 -h 128 -o polymc_128.png org.polymc.org.polymc.PolyMC.svg
|
||||
inkscape -w 128 -h 128 -o polymc_128.png org.polymc.PolyMC.svg
|
||||
|
||||
convert polymc_128.png polymc_64.png polymc_48.png polymc_32.png polymc_24.png polymc_16.png polymc.ico
|
||||
|
||||
inkscape -w 256 -h 256 -o polymc_256.png polymc.svg
|
||||
inkscape -w 512 -h 512 -o polymc_512.png polymc.svg
|
||||
inkscape -w 1024 -h 1024 -o polymc_1024.png polymc.svg
|
||||
inkscape -w 256 -h 256 -o polymc_256.png org.polymc.PolyMC.svg
|
||||
inkscape -w 512 -h 512 -o polymc_512.png org.polymc.PolyMC.svg
|
||||
inkscape -w 1024 -h 1024 -o polymc_1024.png org.polymc.PolyMC.svg
|
||||
|
||||
png2icns polymc.icns polymc_1024.png polymc_512.png polymc_256.png polymc_128.png polymc_32.png polymc_16.png
|
||||
|
||||
|
File diff suppressed because one or more lines are too long
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 47 KiB |
Binary file not shown.
Binary file not shown.
Before Width: | Height: | Size: 100 KiB After Width: | Height: | Size: 100 KiB |
Loading…
Reference in New Issue
Block a user