summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Fedoskin <afedoskin3@gmail.com>2016-05-20 14:48:16 (GMT)
committerArtem Fedoskin <afedoskin3@gmail.com>2016-05-20 14:48:16 (GMT)
commit6395454f744d99b92b6bdd2b3ea44047596e6866 (patch)
tree8a02d986d3f7574137c65f77af34131a71ceb40d
parentf3cbe01c7593f02609945694d1d37aa74fe79548 (diff)
Excluded KDECompilerSettings from CMakeLists.txt because it causes the
Android build to crash on startup. Added icons for different DPI and set Android style splash screen.
-rw-r--r--CMakeLists.txt13
-rw-r--r--apk/AndroidManifest.xml9
-rw-r--r--apk/res/drawable-hdpi/icon.pngbin0 -> 3715 bytes
-rw-r--r--apk/res/drawable-hdpi/splash.xml11
-rw-r--r--apk/res/drawable-ldpi/icon.pngbin0 -> 1472 bytes
-rw-r--r--apk/res/drawable-ldpi/splash.xml11
-rw-r--r--apk/res/drawable-mdpi/icon.pngbin0 -> 2509 bytes
-rw-r--r--apk/res/drawable-mdpi/splash.xml11
-rw-r--r--apk/res/drawable-xhdpi/icon.png (renamed from apk/res/drawable/kstars.png)bin8834 -> 8834 bytes
-rw-r--r--apk/res/drawable-xhdpi/splash.xml11
-rw-r--r--apk/res/drawable-xxhdpi/icon.pngbin0 -> 8834 bytes
-rw-r--r--apk/res/drawable-xxhdpi/splash.xml11
-rw-r--r--apk/res/drawable-xxxhdpi/icon.pngbin0 -> 8834 bytes
-rw-r--r--apk/res/drawable-xxxhdpi/splash.xml11
-rw-r--r--apk/res/values/apptheme.xml6
-rw-r--r--kstars/CMakeLists.txt17
-rw-r--r--kstars/kstarslite/qml/main.qml298
-rw-r--r--kstars/kstarslite/qml/modules/Splash.qml40
-rw-r--r--kstars/kstarslite/qml/modules/images/hdpi/icons/CMakeLists.txt3
-rw-r--r--kstars/kstarslite/qml/modules/images/hdpi/icons/icon.pngbin0 -> 3715 bytes
-rw-r--r--kstars/kstarslite/qml/modules/images/ldpi/icons/CMakeLists.txt3
-rw-r--r--kstars/kstarslite/qml/modules/images/ldpi/icons/icon.pngbin0 -> 1472 bytes
-rw-r--r--kstars/kstarslite/qml/modules/images/mdpi/icons/CMakeLists.txt3
-rw-r--r--kstars/kstarslite/qml/modules/images/mdpi/icons/icon.pngbin0 -> 2509 bytes
-rw-r--r--kstars/kstarslite/qml/modules/images/xhdpi/icons/CMakeLists.txt5
-rw-r--r--kstars/kstarslite/qml/modules/images/xhdpi/icons/icon.pngbin0 -> 8834 bytes
-rw-r--r--kstars/kstarslite/qml/modules/images/xxhdpi/icons/CMakeLists.txt3
-rw-r--r--kstars/kstarslite/qml/modules/images/xxhdpi/icons/icon.pngbin0 -> 8834 bytes
-rw-r--r--kstars/kstarslite/qml/modules/images/xxxhdpi/icons/CMakeLists.txt3
-rw-r--r--kstars/kstarslite/qml/modules/images/xxxhdpi/icons/icon.pngbin0 -> 8834 bytes
30 files changed, 295 insertions, 174 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83a074d..6e5bf29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ PROJECT(kstars CXX C)
set (KStars_VERSION_MAJOR 2)
set (KStars_VERSION_MINOR 6)
set (KStars_VERSION_REVISION 0)
-
+set (CMAKE_CXX_STANDARD 11)
#Build KStars Lite with -DKSTARS_LITE=ON
option(BUILD_KSTARS_LITE "Build KStars Lite" OFF)
if(BUILD_KSTARS_LITE)
@@ -17,14 +17,23 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON)
+if(CMAKE_SYSTEM_NAME STREQUAL Android)
+ add_definitions(-DANDROID )
+endif()
+
find_package(ECM 1.7.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
find_package(Qt5 5.4 REQUIRED COMPONENTS Gui Qml Quick Xml Sql Svg Network PrintSupport)
+#set(KDE_SKIP_RPATH_SETTINGS TRUE)
include(KDEInstallDirs)
-include(KDECompilerSettings NO_POLICY_SCOPE)
+if(NOT ANDROID)
+ message("CHECK ANDROID DEFINITION")
+ #We get error "could not find main method" with this module
+ include(KDECompilerSettings NO_POLICY_SCOPE)
+endif()
include(KDECMakeSettings)
include(ECMInstallIcons)
include(FeatureSummary)
diff --git a/apk/AndroidManifest.xml b/apk/AndroidManifest.xml
index bd76aa4..8daa418 100644
--- a/apk/AndroidManifest.xml
+++ b/apk/AndroidManifest.xml
@@ -1,11 +1,13 @@
<?xml version="1.0"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.0.3" package="org.kde.hellokandroid" android:installLocation="auto" android:versionCode="7">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.0.3" package="org.kde.kstars" android:installLocation="auto" android:versionCode="7">
<application android:name="org.qtproject.qt5.android.bindings.QtApplication"
android:label="KStars Lite"
- android:icon="@drawable/kde">
+ android:icon="@drawable/icon">
<activity android:name="org.qtproject.qt5.android.bindings.QtActivity"
android:label="KStars Lite"
android:screenOrientation="unspecified"
+ android:theme="@style/AppTheme"
+ android:launchMode="singleTop"
android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -16,6 +18,9 @@
<meta-data android:name="android.app.repository" android:value="default"/>
<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
<meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
+ <!-- Splash screen -->
+ <meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/splash"/>
+ <!-- Splash screen -->
<!-- Deploy Qt libs as part of package -->
<meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
<meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
diff --git a/apk/res/drawable-hdpi/icon.png b/apk/res/drawable-hdpi/icon.png
new file mode 100644
index 0000000..dd424c8
--- /dev/null
+++ b/apk/res/drawable-hdpi/icon.png
Binary files differ
diff --git a/apk/res/drawable-hdpi/splash.xml b/apk/res/drawable-hdpi/splash.xml
new file mode 100644
index 0000000..26b3306
--- /dev/null
+++ b/apk/res/drawable-hdpi/splash.xml
@@ -0,0 +1,11 @@
+<?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/icon" android:gravity="center" />
+ </item>
+</layer-list>
diff --git a/apk/res/drawable-ldpi/icon.png b/apk/res/drawable-ldpi/icon.png
new file mode 100644
index 0000000..98672a7
--- /dev/null
+++ 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
new file mode 100644
index 0000000..26b3306
--- /dev/null
+++ b/apk/res/drawable-ldpi/splash.xml
@@ -0,0 +1,11 @@
+<?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/icon" android:gravity="center" />
+ </item>
+</layer-list>
diff --git a/apk/res/drawable-mdpi/icon.png b/apk/res/drawable-mdpi/icon.png
new file mode 100644
index 0000000..3247fa8
--- /dev/null
+++ 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
new file mode 100644
index 0000000..26b3306
--- /dev/null
+++ b/apk/res/drawable-mdpi/splash.xml
@@ -0,0 +1,11 @@
+<?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/icon" android:gravity="center" />
+ </item>
+</layer-list>
diff --git a/apk/res/drawable/kstars.png b/apk/res/drawable-xhdpi/icon.png
index fccb40b..fccb40b 100644
--- a/apk/res/drawable/kstars.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
new file mode 100644
index 0000000..26b3306
--- /dev/null
+++ b/apk/res/drawable-xhdpi/splash.xml
@@ -0,0 +1,11 @@
+<?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/icon" android:gravity="center" />
+ </item>
+</layer-list>
diff --git a/apk/res/drawable-xxhdpi/icon.png b/apk/res/drawable-xxhdpi/icon.png
new file mode 100644
index 0000000..fccb40b
--- /dev/null
+++ 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
new file mode 100644
index 0000000..26b3306
--- /dev/null
+++ b/apk/res/drawable-xxhdpi/splash.xml
@@ -0,0 +1,11 @@
+<?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/icon" android:gravity="center" />
+ </item>
+</layer-list>
diff --git a/apk/res/drawable-xxxhdpi/icon.png b/apk/res/drawable-xxxhdpi/icon.png
new file mode 100644
index 0000000..fccb40b
--- /dev/null
+++ 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
new file mode 100644
index 0000000..26b3306
--- /dev/null
+++ b/apk/res/drawable-xxxhdpi/splash.xml
@@ -0,0 +1,11 @@
+<?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/icon" android:gravity="center" />
+ </item>
+</layer-list>
diff --git a/apk/res/values/apptheme.xml b/apk/res/values/apptheme.xml
new file mode 100644
index 0000000..952bc53
--- /dev/null
+++ b/apk/res/values/apptheme.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <style name="AppTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
+ <item name="android:windowBackground">@drawable/splash</item>
+ </style>
+</resources>
diff --git a/kstars/CMakeLists.txt b/kstars/CMakeLists.txt
index ec681c7..30d2fcb 100644
--- a/kstars/CMakeLists.txt
+++ b/kstars/CMakeLists.txt
@@ -733,16 +733,15 @@ endif (WCSLIB_FOUND)
target_link_libraries(kstars KStarsLib)
+if(NOT BUILD_KSTARS_LITE)
+ install(TARGETS kstars ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-install(TARGETS kstars ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-
-########### install files ###############
+ ########### install files ###############
-install( FILES kstars.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )
-install( FILES kstars.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} )
-ecm_install_icons(${KDE_INSTALL_ICONDIR})
+ install( FILES kstars.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )
+ install( FILES kstars.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} )
+ ecm_install_icons(${KDE_INSTALL_ICONDIR})
-if(NOT CMAKE_SYSTEM_NAME STREQUAL Android)
install( PROGRAMS org.kde.kstars.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
if (INDI_FOUND)
install( FILES kstarsui-indi.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kstars RENAME kstarsui.rc)
@@ -752,7 +751,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Android)
install( FILES fitsviewer.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kstars )
if (WIN32)
- install( FILES kstarsui-win.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kstars )
+ install( FILES kstarsui-win.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kstars )
endif (WIN32)
install(FILES kstars.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
-endif(NOT CMAKE_SYSTEM_NAME STREQUAL Android)
+endif(NOT BUILD_KSTARS_LITE)
diff --git a/kstars/kstarslite/qml/main.qml b/kstars/kstarslite/qml/main.qml
index 4faf717..5b3c1e5 100644
--- a/kstars/kstarslite/qml/main.qml
+++ b/kstars/kstarslite/qml/main.qml
@@ -2,41 +2,46 @@ import QtQuick 2.4
import QtQuick.Window 2.2
import "modules"
import "constants" 1.0
-import skymaplite 1.0
+//import skymaplite 1.0
Window {
id: mainWindow
- visible: false
width: Screen.desktopAvailableWidth
height: Screen.desktopAvailableHeight
+ visible: true
property double shadowBgOpacity
property int drawersOrder: 2
property int bgOrder: 1
property int skyMapOrder: 0
property int topMenuOrder: 0
- property Splash splash: Splash {
- onTimeout: mainWindow.visible = true
+ Splash {
+ onTimeout: content.visible = true
}
- Rectangle {
- id: skyMapLiteWrapper
- color: "#000"
- objectName: "skyMapLiteWrapper"
+ Item{
+ id: content
anchors.fill: parent
- }
+ visible: false
- GlobalDrawer{
- id: globalDrawer
- width: parent.width < parent.height ? parent.width * 0.65 + dragWidth: parent.width * 0.4 + dragWidth
- z: drawersOrder
- anchors {
- top: parent.top
- bottom: parent.bottom
+ Rectangle {
+ id: skyMapLiteWrapper
+ color: "#000"
+ objectName: "skyMapLiteWrapper"
+ anchors.fill: parent
+ }
+
+ GlobalDrawer{
+ id: globalDrawer
+ width: parent.width < parent.height ? parent.width * 0.65 + dragWidth: parent.width * 0.4 + dragWidth
+ z: drawersOrder
+ anchors {
+ top: parent.top
+ bottom: parent.bottom
+ }
}
- }
- /*Image {
+ /*Image {
anchors.fill: parent
z: skyMapOrder
source: "modules/images/SkyMap.png"
@@ -53,169 +58,170 @@ Window {
}
}*/
- // The instance of SkyMapLite is reparanted to this item and fill it
+ // The instance of SkyMapLite is reparanted to this item and fill it
- //SkyMapLite {
+ //SkyMapLite {
//anchors.fill: parent
- //}
-
- MouseArea {
- property int posY
- anchors {
- left: parent.left
- right: parent.right
- top: parent.top
- }
- height: parent.height * 0.25
+ //}
- onPressed: {
- posY = mouseY
- }
+ MouseArea {
+ property int posY
+ anchors {
+ left: parent.left
+ right: parent.right
+ top: parent.top
+ }
+ height: parent.height * 0.25
- onPositionChanged: {
- var ratio = 0.05
- var delta = mouseY - posY
- if (delta > parent.height * ratio) {
- if(topMenu.state != "open") topMenu.state = "open"
- } else if (delta < - (parent.height * ratio)) {
- if(topMenu.state != "") topMenu.state = ""
+ onPressed: {
+ posY = mouseY
}
- }
- TopMenu {
- z: topMenuOrder
- id: topMenu
- anchors.horizontalCenter: parent.horizontalCenter
- Connections {
- target: mainWindow
+ onPositionChanged: {
+ var ratio = 0.05
+ var delta = mouseY - posY
+ if (delta > parent.height * ratio) {
+ if(topMenu.state != "open") topMenu.state = "open"
+ } else if (delta < - (parent.height * ratio)) {
+ if(topMenu.state != "") topMenu.state = ""
+ }
- function setOrientation() {
- if (width < topMenu.width) {
- topMenu.state = "portrait"
+ }
+ TopMenu {
+ z: topMenuOrder
+ id: topMenu
+ anchors.horizontalCenter: parent.horizontalCenter
+ Connections {
+ target: mainWindow
+
+ function setOrientation() {
+ if (width < topMenu.width) {
+ topMenu.state = "portrait"
+ }
+ else topMenu.state = "landscape"
}
- else topMenu.state = "landscape"
- }
- Component.onCompleted: {
- setOrientation()
- }
+ Component.onCompleted: {
+ setOrientation()
+ }
- onWidthChanged: {
- setOrientation()
+ onWidthChanged: {
+ setOrientation()
+ }
}
}
}
- }
- Rectangle {
- id: shadowBg
- z: bgOrder
- anchors.fill: parent
- color: "black"
- opacity: 0
- property double minOpacity: 0.35
-
- Connections {
- target: globalDrawer
- onBgOpacityChanged: {
- var bgOpacity = globalDrawer.bgOpacity
- if (bgOpacity < shadowBg.minOpacity && contextDrawer.state != "open") shadowBg.opacity = bgOpacity
- }
- onStateChanged: {
- if(globalDrawer.state == "open") contextDrawer.state = ""
- }
- }
+ Rectangle {
+ id: shadowBg
+ z: bgOrder
+ anchors.fill: parent
+ color: "black"
+ opacity: 0
+ property double minOpacity: 0.35
- Connections {
- target: contextDrawer
- onBgOpacityChanged: {
- var bgOpacity = contextDrawer.bgOpacity
- if (bgOpacity < shadowBg.minOpacity && globalDrawer.state != "open") shadowBg.opacity = bgOpacity
- }
- onStateChanged: {
- if(contextDrawer.state == "open") globalDrawer.state = ""
+ Connections {
+ target: globalDrawer
+ onBgOpacityChanged: {
+ var bgOpacity = globalDrawer.bgOpacity
+ if (bgOpacity < shadowBg.minOpacity && contextDrawer.state != "open") shadowBg.opacity = bgOpacity
+ }
+ onStateChanged: {
+ if(globalDrawer.state == "open") contextDrawer.state = ""
+ }
}
- }
- MouseArea {
- anchors.fill: parent
- onPressed: {
- if(globalDrawer.state == "open") {
- globalDrawer.state = ""
- mouse.accepted = true
- return
+ Connections {
+ target: contextDrawer
+ onBgOpacityChanged: {
+ var bgOpacity = contextDrawer.bgOpacity
+ if (bgOpacity < shadowBg.minOpacity && globalDrawer.state != "open") shadowBg.opacity = bgOpacity
}
- if(contextDrawer.state == "open") {
- contextDrawer.state = ""
- mouse.accepted = true
- return
+ onStateChanged: {
+ if(contextDrawer.state == "open") globalDrawer.state = ""
}
- mouse.accepted = false
}
- }
- Behavior on opacity {
- PropertyAnimation {
- duration: 300
+ MouseArea {
+ anchors.fill: parent
+ onPressed: {
+ if(globalDrawer.state == "open") {
+ globalDrawer.state = ""
+ mouse.accepted = true
+ return
+ }
+ if(contextDrawer.state == "open") {
+ contextDrawer.state = ""
+ mouse.accepted = true
+ return
+ }
+ mouse.accepted = false
+ }
}
- }
- }
-
- MouseArea {
- property int posY
- anchors {
- left: parent.left
- right: parent.right
- bottom: parent.bottom
- }
- height: parent.height *0.25
- onPressed: {
- posY = mouseY
+ Behavior on opacity {
+ PropertyAnimation {
+ duration: 300
+ }
+ }
}
- onPositionChanged: {
- var ratio = 0.05
- var delta = mouseY - posY
- if (delta < parent.height * ratio) {
- if(bottomMenu.state != "open") bottomMenu.state = "open"
- } else if (delta > - (parent.height * ratio)) {
- if(bottomMenu.state != "") bottomMenu.state = ""
+ MouseArea {
+ property int posY
+ anchors {
+ left: parent.left
+ right: parent.right
+ bottom: parent.bottom
}
+ height: parent.height *0.25
- }
- BottomMenu {
- z: topMenuOrder
- id: bottomMenu
+ onPressed: {
+ posY = mouseY
+ }
- anchors.horizontalCenter: parent.horizontalCenter
- Connections {
- target: mainWindow
+ onPositionChanged: {
+ var ratio = 0.05
+ var delta = mouseY - posY
+ if (delta < parent.height * ratio) {
+ if(bottomMenu.state != "open") bottomMenu.state = "open"
+ } else if (delta > - (parent.height * ratio)) {
+ if(bottomMenu.state != "") bottomMenu.state = ""
+ }
- function setOrientation() {
- if (width < topMenu.width) {
- bottomMenu.state = "portrait"
+ }
+ BottomMenu {
+ z: topMenuOrder
+ id: bottomMenu
+
+ anchors.horizontalCenter: parent.horizontalCenter
+ Connections {
+ target: mainWindow
+
+ function setOrientation() {
+ if (width < topMenu.width) {
+ bottomMenu.state = "portrait"
+ }
+ else bottomMenu.state = "landscape"
}
- else bottomMenu.state = "landscape"
- }
- Component.onCompleted: {
- setOrientation()
- }
+ Component.onCompleted: {
+ setOrientation()
+ }
- onWidthChanged: {
- setOrientation()
+ onWidthChanged: {
+ setOrientation()
+ }
}
}
}
- }
- ContextDrawer{
- id: contextDrawer
- width: parent.width < parent.height ? parent.width * 0.65 + dragWidth: parent.width * 0.4 + dragWidth
- z: drawersOrder
- anchors {
- top: parent.top
- bottom: parent.bottom
+ ContextDrawer{
+ id: contextDrawer
+ width: parent.width < parent.height ? parent.width * 0.65 + dragWidth: parent.width * 0.4 + dragWidth
+ z: drawersOrder
+ anchors {
+ top: parent.top
+ bottom: parent.bottom
+ }
}
}
}
diff --git a/kstars/kstarslite/qml/modules/Splash.qml b/kstars/kstarslite/qml/modules/Splash.qml
index 169cbbb..1ce2de8 100644
--- a/kstars/kstarslite/qml/modules/Splash.qml
+++ b/kstars/kstarslite/qml/modules/Splash.qml
@@ -1,12 +1,13 @@
import QtQuick 2.4
import QtQuick.Window 2.2
+import "../constants"
-Window {
+Item {
id: splash
- color: "transparent"
- title: "Splash Window"
- modality: Qt.ApplicationModal
- flags: Qt.SplashScreen
+ //color: "transparent"
+ //title: "Splash Window"
+ //modality: Qt.ApplicationModal
+ //flags: Qt.SplashScreen
signal timeout
x: (Screen.width - splashImage.width) / 2
@@ -15,14 +16,37 @@ Window {
width: splashImage.width
height: splashImage.height
+ Timer {
+ interval: 3500;
+ running: true;
+ onTriggered: {
+ splash.timeout();
+ visible = false
+ }
+ }
+
+ Timer {
+ id: progressText
+ interval: 500
+ running: true
+ repeat: true
+ }
+
Image {
id: splashImage
- source: "images/kstars.png"
+ source: "images/" + num.density + "/icons/icon.png"
Text {
id: progress
color: "#FFF"
+ Connections {
+ target: progressText
+ onTriggered: {
+ progress.text = progress.text + "a"
+ }
+ }
+
anchors {
top: parent.top
left: parent.left
@@ -30,7 +54,7 @@ Window {
}
}
}
-
+/*
Connections {
target: KStarsData
onProgressText: {
@@ -47,6 +71,6 @@ Window {
visible = false
splash.timeout()
}
- }
+ }*/
}
diff --git a/kstars/kstarslite/qml/modules/images/hdpi/icons/CMakeLists.txt b/kstars/kstarslite/qml/modules/images/hdpi/icons/CMakeLists.txt
index d01f418..4eef98c 100644
--- a/kstars/kstarslite/qml/modules/images/hdpi/icons/CMakeLists.txt
+++ b/kstars/kstarslite/qml/modules/images/hdpi/icons/CMakeLists.txt
@@ -1,4 +1,5 @@
-install( FILES applications-system.png
+install( FILES icon.png
+ applications-system.png
arrow-down-double.png
arrow-down.png
arrow-right.png
diff --git a/kstars/kstarslite/qml/modules/images/hdpi/icons/icon.png b/kstars/kstarslite/qml/modules/images/hdpi/icons/icon.png
new file mode 100644
index 0000000..dd424c8
--- /dev/null
+++ b/kstars/kstarslite/qml/modules/images/hdpi/icons/icon.png
Binary files differ
diff --git a/kstars/kstarslite/qml/modules/images/ldpi/icons/CMakeLists.txt b/kstars/kstarslite/qml/modules/images/ldpi/icons/CMakeLists.txt
index d728901..39c443e 100644
--- a/kstars/kstarslite/qml/modules/images/ldpi/icons/CMakeLists.txt
+++ b/kstars/kstarslite/qml/modules/images/ldpi/icons/CMakeLists.txt
@@ -1,4 +1,5 @@
-install( FILES applications-system.png
+install( FILES icon.png
+ applications-system.png
arrow-down-double.png
arrow-down.png
arrow-right.png
diff --git a/kstars/kstarslite/qml/modules/images/ldpi/icons/icon.png b/kstars/kstarslite/qml/modules/images/ldpi/icons/icon.png
new file mode 100644
index 0000000..98672a7
--- /dev/null
+++ b/kstars/kstarslite/qml/modules/images/ldpi/icons/icon.png
Binary files differ
diff --git a/kstars/kstarslite/qml/modules/images/mdpi/icons/CMakeLists.txt b/kstars/kstarslite/qml/modules/images/mdpi/icons/CMakeLists.txt
index daff161..e9ff6a2 100644
--- a/kstars/kstarslite/qml/modules/images/mdpi/icons/CMakeLists.txt
+++ b/kstars/kstarslite/qml/modules/images/mdpi/icons/CMakeLists.txt
@@ -1,4 +1,5 @@
-install( FILES applications-system.png
+install( FILES icon.png
+ applications-system.png
arrow-down-double.png
arrow-down.png
arrow-right.png
diff --git a/kstars/kstarslite/qml/modules/images/mdpi/icons/icon.png b/kstars/kstarslite/qml/modules/images/mdpi/icons/icon.png
new file mode 100644
index 0000000..3247fa8
--- /dev/null
+++ b/kstars/kstarslite/qml/modules/images/mdpi/icons/icon.png
Binary files differ
diff --git a/kstars/kstarslite/qml/modules/images/xhdpi/icons/CMakeLists.txt b/kstars/kstarslite/qml/modules/images/xhdpi/icons/CMakeLists.txt
index 5c047df..80ca5b4 100644
--- a/kstars/kstarslite/qml/modules/images/xhdpi/icons/CMakeLists.txt
+++ b/kstars/kstarslite/qml/modules/images/xhdpi/icons/CMakeLists.txt
@@ -1,4 +1,5 @@
-install( FILES applications-system.png
+install( FILES icon.png
+ applications-system.png
arrow-down-double.png
arrow-down.png
arrow-right.png
@@ -21,4 +22,4 @@ install( FILES applications-system.png
sc-actions-kstars_planets.png
sc-actions-kstars_stars.png
system-search.png
- DESTINATION ${KDE_INSTALL_DATADIR}/kstars/kstarslite/qml/modules/images/xdpi/icons )
+ DESTINATION ${KDE_INSTALL_DATADIR}/kstars/kstarslite/qml/modules/images/xhdpi/icons )
diff --git a/kstars/kstarslite/qml/modules/images/xhdpi/icons/icon.png b/kstars/kstarslite/qml/modules/images/xhdpi/icons/icon.png
new file mode 100644
index 0000000..fccb40b
--- /dev/null
+++ b/kstars/kstarslite/qml/modules/images/xhdpi/icons/icon.png
Binary files differ
diff --git a/kstars/kstarslite/qml/modules/images/xxhdpi/icons/CMakeLists.txt b/kstars/kstarslite/qml/modules/images/xxhdpi/icons/CMakeLists.txt
index 148ce57..8399510 100644
--- a/kstars/kstarslite/qml/modules/images/xxhdpi/icons/CMakeLists.txt
+++ b/kstars/kstarslite/qml/modules/images/xxhdpi/icons/CMakeLists.txt
@@ -1,4 +1,5 @@
-install( FILES applications-system.png
+install( FILES icon.png
+ applications-system.png
arrow-down-double.png
arrow-down.png
arrow-right.png
diff --git a/kstars/kstarslite/qml/modules/images/xxhdpi/icons/icon.png b/kstars/kstarslite/qml/modules/images/xxhdpi/icons/icon.png
new file mode 100644
index 0000000..fccb40b
--- /dev/null
+++ b/kstars/kstarslite/qml/modules/images/xxhdpi/icons/icon.png
Binary files differ
diff --git a/kstars/kstarslite/qml/modules/images/xxxhdpi/icons/CMakeLists.txt b/kstars/kstarslite/qml/modules/images/xxxhdpi/icons/CMakeLists.txt
index cd1be9f..0d1ec98 100644
--- a/kstars/kstarslite/qml/modules/images/xxxhdpi/icons/CMakeLists.txt
+++ b/kstars/kstarslite/qml/modules/images/xxxhdpi/icons/CMakeLists.txt
@@ -1,4 +1,5 @@
-install( FILES applications-system.png
+install( FILES icon.png
+ applications-system.png
arrow-down-double.png
arrow-down.png
arrow-right.png
diff --git a/kstars/kstarslite/qml/modules/images/xxxhdpi/icons/icon.png b/kstars/kstarslite/qml/modules/images/xxxhdpi/icons/icon.png
new file mode 100644
index 0000000..fccb40b
--- /dev/null
+++ b/kstars/kstarslite/qml/modules/images/xxxhdpi/icons/icon.png
Binary files differ