summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Fedoskin <afedoskin3@gmail.com>2016-10-24 19:26:28 (GMT)
committerArtem Fedoskin <afedoskin3@gmail.com>2016-10-24 19:26:28 (GMT)
commitfe65e034f20c6d90446fb950af83a4ba7adb5cb5 (patch)
treef6cb1c805614135b8e09a23cf0131a319eadb8f9
parentabce52fc4b7605fb53afad1c03b59c8ff3c0fc9d (diff)
Added new splash screen and icon in KStars Lite
-rw-r--r--apk/res/drawable-hdpi/icon.pngbin3715 -> 4871 bytes
-rw-r--r--apk/res/drawable-hdpi/splashicon.pngbin8834 -> 0 bytes
-rw-r--r--apk/res/drawable-ldpi/icon.pngbin1472 -> 3494 bytes
-rw-r--r--apk/res/drawable-ldpi/splash.xml11
-rw-r--r--apk/res/drawable-ldpi/splashicon.pngbin8834 -> 0 bytes
-rw-r--r--apk/res/drawable-mdpi/icon.pngbin2509 -> 3494 bytes
-rw-r--r--apk/res/drawable-mdpi/splash.xml11
-rw-r--r--apk/res/drawable-mdpi/splashicon.pngbin8834 -> 0 bytes
-rw-r--r--apk/res/drawable-xhdpi/icon.pngbin8834 -> 7629 bytes
-rw-r--r--apk/res/drawable-xhdpi/splash.xml11
-rw-r--r--apk/res/drawable-xhdpi/splashicon.pngbin458659 -> 0 bytes
-rw-r--r--apk/res/drawable-xhdpi/splashicossn.pngbin23830 -> 0 bytes
-rw-r--r--apk/res/drawable-xxhdpi/icon.pngbin8834 -> 10591 bytes
-rw-r--r--apk/res/drawable-xxhdpi/splash.xml11
-rw-r--r--apk/res/drawable-xxhdpi/splashicon.pngbin23830 -> 0 bytes
-rw-r--r--apk/res/drawable-xxxhdpi/icon.pngbin8834 -> 16663 bytes
-rw-r--r--apk/res/drawable-xxxhdpi/splash.xml11
-rw-r--r--apk/res/drawable-xxxhdpi/splashicon.pngbin23830 -> 0 bytes
-rw-r--r--apk/res/drawable/splash.xml (renamed from apk/res/drawable-hdpi/splash.xml)5
-rw-r--r--kstars/kstarslite/qml/images/CMakeLists.txt7
-rw-r--r--kstars/kstarslite/qml/images/bg.pngbin0 -> 14415447 bytes
-rw-r--r--kstars/kstarslite/qml/images/kde-logo.pngbin0 -> 990 bytes
-rw-r--r--kstars/kstarslite/qml/images/kde-logo@2x.pngbin0 -> 2344 bytes
-rw-r--r--kstars/kstarslite/qml/images/kde-logo@3x.pngbin0 -> 3217 bytes
-rw-r--r--kstars/kstarslite/qml/images/kde-logo@4x.pngbin0 -> 5126 bytes
-rw-r--r--kstars/kstarslite/qml/images/kstars.pngbin206502 -> 271386 bytes
-rw-r--r--kstars/kstarslite/qml/images/splash.pngbin10473 -> 15532 bytes
-rw-r--r--kstars/kstarslite/qml/images/splash@2x.pngbin24931 -> 31072 bytes
-rw-r--r--kstars/kstarslite/qml/images/splash@3x.pngbin52309 -> 49076 bytes
-rw-r--r--kstars/kstarslite/qml/images/splash@4x.pngbin77157 -> 66391 bytes
-rw-r--r--kstars/kstarslite/qml/modules/Splash.qml32
31 files changed, 33 insertions, 66 deletions
diff --git a/apk/res/drawable-hdpi/icon.png b/apk/res/drawable-hdpi/icon.png
index dd424c8..9ff6440 100644
--- a/apk/res/drawable-hdpi/icon.png
+++ b/apk/res/drawable-hdpi/icon.png
Binary files differ
diff --git a/apk/res/drawable-hdpi/splashicon.png b/apk/res/drawable-hdpi/splashicon.png
deleted file mode 100644
index fccb40b..0000000
--- a/apk/res/drawable-hdpi/splashicon.png
+++ /dev/null
Binary files differ
diff --git a/apk/res/drawable-ldpi/icon.png b/apk/res/drawable-ldpi/icon.png
index 98672a7..cbb2cbf 100644
--- a/apk/res/drawable-ldpi/icon.png
+++ b/apk/res/drawable-ldpi/icon.png
Binary files differ
diff --git a/apk/res/drawable-ldpi/splash.xml b/apk/res/drawable-ldpi/splash.xml
deleted file mode 100644
index a1e5210..0000000
--- a/apk/res/drawable-ldpi/splash.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item>
- <shape android:shape="rectangle" >
- <solid android:color="#FFFFFFFF"/>
- </shape>
- </item>
- <item>
- <bitmap android:src="@drawable/splashicon" android:gravity="center" />
- </item>
-</layer-list>
diff --git a/apk/res/drawable-ldpi/splashicon.png b/apk/res/drawable-ldpi/splashicon.png
deleted file mode 100644
index fccb40b..0000000
--- a/apk/res/drawable-ldpi/splashicon.png
+++ /dev/null
Binary files differ
diff --git a/apk/res/drawable-mdpi/icon.png b/apk/res/drawable-mdpi/icon.png
index 3247fa8..1c221c1 100644
--- a/apk/res/drawable-mdpi/icon.png
+++ b/apk/res/drawable-mdpi/icon.png
Binary files differ
diff --git a/apk/res/drawable-mdpi/splash.xml b/apk/res/drawable-mdpi/splash.xml
deleted file mode 100644
index a1e5210..0000000
--- a/apk/res/drawable-mdpi/splash.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item>
- <shape android:shape="rectangle" >
- <solid android:color="#FFFFFFFF"/>
- </shape>
- </item>
- <item>
- <bitmap android:src="@drawable/splashicon" android:gravity="center" />
- </item>
-</layer-list>
diff --git a/apk/res/drawable-mdpi/splashicon.png b/apk/res/drawable-mdpi/splashicon.png
deleted file mode 100644
index fccb40b..0000000
--- a/apk/res/drawable-mdpi/splashicon.png
+++ /dev/null
Binary files differ
diff --git a/apk/res/drawable-xhdpi/icon.png b/apk/res/drawable-xhdpi/icon.png
index fccb40b..fe8ef97 100644
--- a/apk/res/drawable-xhdpi/icon.png
+++ b/apk/res/drawable-xhdpi/icon.png
Binary files differ
diff --git a/apk/res/drawable-xhdpi/splash.xml b/apk/res/drawable-xhdpi/splash.xml
deleted file mode 100644
index be89dee..0000000
--- a/apk/res/drawable-xhdpi/splash.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item>
- <shape android:shape="rectangle" >
- <solid android:color="#FFFFFFFF"/>
- </shape>
- </item>
- <item>
- <bitmap android:src="@drawable/splashicon" android:gravity="fill_vertical|fill_horizontal" />
- </item>
-</layer-list>
diff --git a/apk/res/drawable-xhdpi/splashicon.png b/apk/res/drawable-xhdpi/splashicon.png
deleted file mode 100644
index fe3d6a3..0000000
--- a/apk/res/drawable-xhdpi/splashicon.png
+++ /dev/null
Binary files differ
diff --git a/apk/res/drawable-xhdpi/splashicossn.png b/apk/res/drawable-xhdpi/splashicossn.png
deleted file mode 100644
index 6a8fa57..0000000
--- a/apk/res/drawable-xhdpi/splashicossn.png
+++ /dev/null
Binary files differ
diff --git a/apk/res/drawable-xxhdpi/icon.png b/apk/res/drawable-xxhdpi/icon.png
index fccb40b..966a54e 100644
--- a/apk/res/drawable-xxhdpi/icon.png
+++ b/apk/res/drawable-xxhdpi/icon.png
Binary files differ
diff --git a/apk/res/drawable-xxhdpi/splash.xml b/apk/res/drawable-xxhdpi/splash.xml
deleted file mode 100644
index a1e5210..0000000
--- a/apk/res/drawable-xxhdpi/splash.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item>
- <shape android:shape="rectangle" >
- <solid android:color="#FFFFFFFF"/>
- </shape>
- </item>
- <item>
- <bitmap android:src="@drawable/splashicon" android:gravity="center" />
- </item>
-</layer-list>
diff --git a/apk/res/drawable-xxhdpi/splashicon.png b/apk/res/drawable-xxhdpi/splashicon.png
deleted file mode 100644
index 6a8fa57..0000000
--- a/apk/res/drawable-xxhdpi/splashicon.png
+++ /dev/null
Binary files differ
diff --git a/apk/res/drawable-xxxhdpi/icon.png b/apk/res/drawable-xxxhdpi/icon.png
index fccb40b..99b70bd 100644
--- a/apk/res/drawable-xxxhdpi/icon.png
+++ b/apk/res/drawable-xxxhdpi/icon.png
Binary files differ
diff --git a/apk/res/drawable-xxxhdpi/splash.xml b/apk/res/drawable-xxxhdpi/splash.xml
deleted file mode 100644
index a1e5210..0000000
--- a/apk/res/drawable-xxxhdpi/splash.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item>
- <shape android:shape="rectangle" >
- <solid android:color="#FFFFFFFF"/>
- </shape>
- </item>
- <item>
- <bitmap android:src="@drawable/splashicon" android:gravity="center" />
- </item>
-</layer-list>
diff --git a/apk/res/drawable-xxxhdpi/splashicon.png b/apk/res/drawable-xxxhdpi/splashicon.png
deleted file mode 100644
index 6a8fa57..0000000
--- a/apk/res/drawable-xxxhdpi/splashicon.png
+++ /dev/null
Binary files differ
diff --git a/apk/res/drawable-hdpi/splash.xml b/apk/res/drawable/splash.xml
index a1e5210..fa8ee8b 100644
--- a/apk/res/drawable-hdpi/splash.xml
+++ b/apk/res/drawable/splash.xml
@@ -2,10 +2,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle" >
- <solid android:color="#FFFFFFFF"/>
+ <solid android:color="#000"/>
</shape>
</item>
- <item>
- <bitmap android:src="@drawable/splashicon" android:gravity="center" />
- </item>
</layer-list>
diff --git a/kstars/kstarslite/qml/images/CMakeLists.txt b/kstars/kstarslite/qml/images/CMakeLists.txt
index ae6131e..b8a1426 100644
--- a/kstars/kstarslite/qml/images/CMakeLists.txt
+++ b/kstars/kstarslite/qml/images/CMakeLists.txt
@@ -112,10 +112,15 @@ install( FILES
media-skip-forward@2x.png
media-skip-forward@3x.png
media-skip-forward@4x.png
+ bg.png
splash.png
splash@2x.png
splash@3x.png
splash@4x.png
+ kde-logo.png
+ kde-logo@2x.png
+ kde-logo@3x.png
+ kde-logo@4x.png
tutorial-arrow-horizontal.png
tutorial-arrow-horizontal@2x.png
tutorial-arrow-horizontal@3x.png
@@ -135,5 +140,5 @@ install( FILES
lock-open.png
lock-open@2x.png
lock-open@3x.png
- lock-open@4x.png
+ lock-open@4x.png
DESTINATION ${KDE_INSTALL_DATADIR}/kstars/kstarslite/qml/images )
diff --git a/kstars/kstarslite/qml/images/bg.png b/kstars/kstarslite/qml/images/bg.png
new file mode 100644
index 0000000..3b32f00
--- /dev/null
+++ b/kstars/kstarslite/qml/images/bg.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/kde-logo.png b/kstars/kstarslite/qml/images/kde-logo.png
new file mode 100644
index 0000000..40402e7
--- /dev/null
+++ b/kstars/kstarslite/qml/images/kde-logo.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/kde-logo@2x.png b/kstars/kstarslite/qml/images/kde-logo@2x.png
new file mode 100644
index 0000000..4d5ced3
--- /dev/null
+++ b/kstars/kstarslite/qml/images/kde-logo@2x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/kde-logo@3x.png b/kstars/kstarslite/qml/images/kde-logo@3x.png
new file mode 100644
index 0000000..5bce8a6
--- /dev/null
+++ b/kstars/kstarslite/qml/images/kde-logo@3x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/kde-logo@4x.png b/kstars/kstarslite/qml/images/kde-logo@4x.png
new file mode 100644
index 0000000..1da4d54
--- /dev/null
+++ b/kstars/kstarslite/qml/images/kde-logo@4x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/kstars.png b/kstars/kstarslite/qml/images/kstars.png
index 7ef8c1f..def3b61 100644
--- a/kstars/kstarslite/qml/images/kstars.png
+++ b/kstars/kstarslite/qml/images/kstars.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/splash.png b/kstars/kstarslite/qml/images/splash.png
index b8190e7..b3ce7ea 100644
--- a/kstars/kstarslite/qml/images/splash.png
+++ b/kstars/kstarslite/qml/images/splash.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/splash@2x.png b/kstars/kstarslite/qml/images/splash@2x.png
index 693437d..47be1e0 100644
--- a/kstars/kstarslite/qml/images/splash@2x.png
+++ b/kstars/kstarslite/qml/images/splash@2x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/splash@3x.png b/kstars/kstarslite/qml/images/splash@3x.png
index 4750d8a..882ada8 100644
--- a/kstars/kstarslite/qml/images/splash@3x.png
+++ b/kstars/kstarslite/qml/images/splash@3x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/splash@4x.png b/kstars/kstarslite/qml/images/splash@4x.png
index b2e5886..c672c4d 100644
--- a/kstars/kstarslite/qml/images/splash@4x.png
+++ b/kstars/kstarslite/qml/images/splash@4x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/modules/Splash.qml b/kstars/kstarslite/qml/modules/Splash.qml
index 35069bb..a7bcebd 100644
--- a/kstars/kstarslite/qml/modules/Splash.qml
+++ b/kstars/kstarslite/qml/modules/Splash.qml
@@ -19,21 +19,41 @@ Rectangle {
state: "Inivisble"
Image {
- id: splashImage
- source: "../images/splash.png"
- anchors.centerIn: parent
+ id: splashBG
+ source: "../images/bg.png"
+ anchors {
+ fill: parent
+ }
+
+ fillMode: Image.PreserveAspectCrop
width: sourceSize.width/num.pixelRatio
height: sourceSize.height/num.pixelRatio
+ Image {
+ id: kdeLogo
+ source: "../images/kde-logo.png"
+ anchors {
+ right: parent.right
+ top: parent.top
+ margins: 15
+ }
+ }
+
+ Image {
+ id: splashLogo
+ source: "../images/splash.png"
+ anchors.centerIn: parent
+ }
+
Text {
id: progress
- color: "#000"
+ color: "#999"
anchors {
- top: parent.bottom
+ bottom: parent.bottom
horizontalCenter: parent.horizontalCenter
- margins: 10
+ margins: 5
}
}
}