Commit 10a1299c authored by Walter Garcia-Fontes's avatar Walter Garcia-Fontes

Merge branch 'Splash' into 'master'

Add Splash Screen, Icon as svg

See merge request !84
parents 71de704b f1e4c534
Pipeline #199737888 passed with stage
in 3 minutes and 52 seconds
......@@ -19,7 +19,8 @@ set(APP_NAME terminal)
set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
set(APP_HARDCODE ubuntu-terminal-app)
set(MAIN_QML ubuntu-terminal-app.qml)
set(ICON_FILE terminal64.png)
set(ICON_FILE terminal-app.svg)
set(SPLASH_FILE terminal-app-splash.svg)
set(AUTOPILOT_DIR ubuntu_terminal_app)
set(EXEC "${APP_NAME}")
set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
......@@ -41,6 +42,7 @@ if(CLICK_MODE)
set(DATA_DIR /)
set(DESKTOP_DIR ${DATA_DIR})
set(ICON ${ICON_FILE})
set(SPLASH ${SPLASH_FILE})
set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
set(BIN_DIR /lib/${ARCH_TRIPLET}/bin)
if(NOT BZR_REVNO)
......@@ -70,6 +72,7 @@ else(CLICK_MODE)
set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/qml")
set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
set(SPLASH ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${SPLASH_FILE})
set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/terminal.1 DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man1)
endif(CLICK_MODE)
......@@ -82,7 +85,7 @@ list(SORT I18N_SRC_FILES)
file(GLOB SRC_FILES
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
*.qml *.js *.png *.js)
*.qml *.js *.png *.svg *.js)
install(FILES ${SRC_FILES}
DESTINATION ${DATA_DIR})
......
......@@ -8,7 +8,7 @@
"desktop": "ubuntu-terminal-app.desktop"
}
},
"icon": "terminal64.png",
"icon": "terminal-app.svg",
"maintainer": "UBports <dev@ubports.com>",
"name": "com.ubuntu.terminal",
"title": "Terminal",
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg style="enable-background:new" xmlns="http://www.w3.org/2000/svg" height="1024" width="1024" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1024 1024">
<defs>
<linearGradient id="a" y2="228" gradientUnits="userSpaceOnUse" y1="228" gradientTransform="matrix(1.998 0 0 2.003 158.4 130.2)" x2="35.7" x1="256">
<stop offset="0"/>
<stop stop-opacity="0" offset="1"/>
</linearGradient>
</defs>
<path opacity=".1" style="enable-background:new" d="m376.6 409.1-9.818 29.54 99.67 39.98-99.67 39.98 9.818 29.54 128.2-54.3v-30.43zm131.9 179.6v30.13h148.8v-30.13z"/>
<path opacity=".2" style="enable-background:new" d="m376 406.7-9.86 29.66 100.1 40.15-100.1 40.15 9.86 29.66 128.8-54.53v-30.8zm132.5 180.4v30.26h149.3v-30.3z" fill="url(#a)"/>
<path style="enable-background:new" d="m376.6 405.1-9.818 29.54 99.67 39.98-99.67 39.98 9.818 29.54 128.2-54.3v-30.43zm131.9 179.6v30.13h148.8v-30.13z" fill="#f2f2f2"/>
<path style="enable-background:new" d="m376.6 405.1-9.819 29.54 1.17 0.4675 8.649-26.02 128.2 54.3v-3.99zm84.87 71.51-94.69 37.98 1.17 3.522 98.5-39.51zm46.99 108.1v3.99h148.8v-3.99z" fill="#fff"/>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg style="enable-background:new" xmlns="http://www.w3.org/2000/svg" height="512" viewBox="0 0 512 512" width="512" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs>
<linearGradient id="a" y2="228" gradientUnits="userSpaceOnUse" x2="35.7" gradientTransform="matrix(1.07 0 0 1.073 -9.448 -11.6)" y1="228" x1="256">
<stop offset="0"/>
<stop stop-opacity="0" offset="1"/>
</linearGradient>
</defs>
<g>
<path d="m0 0v183.9 144.2 183.9h512v-183.9-144.2-183.9h-512z" fill="#414141"/>
<path opacity=".03" d="m0 512 512-512v512z" stroke="#808080" fill="#fff"/>
</g>
<g>
<path opacity=".1" style="enable-background:new" d="m108.9 138-4.935 14.81 50.1 20.04-50.1 20.04 4.935 14.81 64.46-27.22v-15.25zm66.29 90.03v15.1h74.8v-15.1z" transform="matrix(1.04 0 0 1.043 -4.188 -5.926)"/>
<path opacity=".2" style="enable-background:new" d="m107.1 136.5-5.281 15.89 53.61 21.5-53.61 21.5 5.281 15.89 68.97-29.21v-16.37zm70.93 96.6v16.21h80.1v-16.21z" fill="url(#a)"/>
<path style="enable-background:new" d="m109.1 136-5.134 15.45 52.12 20.91-52.12 20.91 5.134 15.45 67.06-28.39v-15.91zm68.96 93.92v15.76h77.79v-15.76z" fill="#f2f2f2"/>
<path style="enable-background:new" d="m109.1 136-5.135 15.45 0.6116 0.2445 4.523-13.6 67.06 28.4v-2.086zm44.38 37.39-49.52 19.86 0.6116 1.842 51.51-20.66zm24.58 56.53v2.086h77.79v-2.086z" fill="#fff"/>
</g>
</svg>
......@@ -7,5 +7,6 @@ Icon=@ICON@
_Name=Terminal
X-Ubuntu-Touch=true
X-Ubuntu-Default-Department-ID=accessories
X-Ubuntu-Splash-Color=#111111
X-Ubuntu-Splash-Color=#414141
X-Ubuntu-Single-Instance=true
X-Ubuntu-Splash-Image=@SPLASH@
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment