summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Fedoskin <afedoskin3@gmail.com>2016-10-19 06:37:48 (GMT)
committerArtem Fedoskin <afedoskin3@gmail.com>2016-10-19 06:37:48 (GMT)
commit5e935c6519ec7df67c63fc99768d33012c683263 (patch)
tree52652b89bf80a5c9b831f818a9701aacaa36d0b1
parent7c266f16be9d0910687ba8b0a41f4549e74d7367 (diff)
Use colors from current color scheme in KStars Lite pages, drawers and context menus. Change the way INDI client is built and included in Android version
-rw-r--r--CMakeLists.txt1
-rwxr-xr-xbuild_kstarslite/build-kstarslite.sh16
-rw-r--r--cmake/modules/FindCFitsio.cmake5
-rw-r--r--cmake/modules/FindINDI.cmake87
-rw-r--r--cmake/modules/FindNova.cmake4
-rw-r--r--kstars/CMakeLists.txt50
-rw-r--r--kstars/indi/clientmanagerlite.cpp2
-rw-r--r--kstars/kstarslite/qml/CMakeLists.txt5
-rw-r--r--kstars/kstarslite/qml/dialogs/DetailsDialog.qml46
-rw-r--r--kstars/kstarslite/qml/dialogs/FindDialog.qml6
-rw-r--r--kstars/kstarslite/qml/dialogs/LocationDialog.qml16
-rw-r--r--kstars/kstarslite/qml/dialogs/helpers/DetailsAddLink.qml8
-rw-r--r--kstars/kstarslite/qml/dialogs/helpers/DetailsItem.qml5
-rw-r--r--kstars/kstarslite/qml/dialogs/helpers/LocationEdit.qml24
-rw-r--r--kstars/kstarslite/qml/dialogs/helpers/LocationLoading.qml7
-rw-r--r--kstars/kstarslite/qml/dialogs/menus/DetailsLinkMenu.qml5
-rw-r--r--kstars/kstarslite/qml/dialogs/menus/LocationsGeoMenu.qml7
-rw-r--r--kstars/kstarslite/qml/images/lock-closed.pngbin451 -> 441 bytes
-rw-r--r--kstars/kstarslite/qml/images/lock-closed@2x.pngbin793 -> 750 bytes
-rw-r--r--kstars/kstarslite/qml/images/lock-closed@3x.pngbin992 -> 1017 bytes
-rw-r--r--kstars/kstarslite/qml/images/lock-closed@4x.pngbin1401 -> 1377 bytes
-rw-r--r--kstars/kstarslite/qml/images/svg/lock-closed.svg429
-rw-r--r--kstars/kstarslite/qml/indi/DevicePanel.qml13
-rw-r--r--kstars/kstarslite/qml/indi/INDIControlPanel.qml20
-rw-r--r--kstars/kstarslite/qml/indi/modules/KSINDIText.qml6
-rw-r--r--kstars/kstarslite/qml/indi/modules/KSINDITextField.qml8
-rw-r--r--kstars/kstarslite/qml/indi/modules/KSLed.qml2
-rw-r--r--kstars/kstarslite/qml/indi/modules/MotionControl.qml3
-rw-r--r--kstars/kstarslite/qml/main.qml51
-rw-r--r--kstars/kstarslite/qml/modules/BottomMenu.qml8
-rw-r--r--kstars/kstarslite/qml/modules/KSButton.qml7
-rw-r--r--kstars/kstarslite/qml/modules/KSLabel.qml7
-rw-r--r--kstars/kstarslite/qml/modules/KSListView.qml24
-rw-r--r--kstars/kstarslite/qml/modules/KSPage.qml5
-rw-r--r--kstars/kstarslite/qml/modules/KSTab.qml5
-rw-r--r--kstars/kstarslite/qml/modules/KSTabButton.qml15
-rw-r--r--kstars/kstarslite/qml/modules/KSText.qml7
-rw-r--r--kstars/kstarslite/qml/modules/KSTextField.qml9
-rw-r--r--kstars/kstarslite/qml/modules/SkyMapLiteWrapper.qml20
-rw-r--r--kstars/kstarslite/qml/modules/TimePage.qml20
-rw-r--r--kstars/kstarslite/qml/modules/TopMenu.qml2
-rw-r--r--kstars/kstarslite/qml/modules/helpers/BottomMenuButton.qml2
-rw-r--r--kstars/kstarslite/qml/modules/helpers/KSMenuItem.qml10
-rw-r--r--kstars/kstarslite/qml/modules/helpers/PassiveNotification.qml11
-rw-r--r--kstars/kstarslite/qml/modules/helpers/TimeSpinBox.qml2
-rw-r--r--kstars/kstarslite/qml/modules/menus/ContextMenu.qml14
-rw-r--r--kstars/kstarslite/qml/modules/popups/ColorSchemePopup.qml7
-rw-r--r--kstars/kstarslite/qml/modules/popups/FOVPopup.qml5
-rw-r--r--kstars/kstarslite/qml/modules/popups/ProjectionsPopup.qml5
-rw-r--r--kstars/kstarslite/qml/modules/tutorial/TutorialPane.qml5
-rw-r--r--kstars/kstarslite/qml/modules/tutorial/TutorialPopup.qml13
-rw-r--r--kstars/kstarslite/skyitems/rootnode.cpp3
52 files changed, 728 insertions, 304 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8276311..1229083 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,6 @@ if(BUILD_KSTARS_LITE)
if(ANDROID)
find_package(OpenMP REQUIRED) #Needed for LibRaw
if(OPENMP_FOUND)
- message("OPENMP FOUND")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
diff --git a/build_kstarslite/build-kstarslite.sh b/build_kstarslite/build-kstarslite.sh
index 374c196..bdda32b 100755
--- a/build_kstarslite/build-kstarslite.sh
+++ b/build_kstarslite/build-kstarslite.sh
@@ -209,6 +209,8 @@ fi
# Build INDI
if [ "$build_indi" = "Y" ] || [ "$build_indi" = "y" ] || [ "$build_indi" = "Yes" ] || [ "$build_indi" = "yes" ]
then
+ cd $indi_location/indi/
+ git pull
mkdir $indi_location/indi/build-android -p
cd $indi_location/indi/build-android
rm CMakeCache.txt
@@ -224,19 +226,19 @@ then
rm CMakeCache.txt
make clean
cd "${kstars_DIR}/build_kstarslite/android_libs/${ANDROID_ARCHITECTURE}"
- mv libindi.a _libindi.a
# Combine libindi and liblibnova
ar -M <<EOM
- CREATE libindi.a
+ CREATE libindiclientandroid.a
ADDLIB liblibnova.a
- ADDLIB _libindi.a
+ ADDLIB libindiclientqt.a
+ ADDLIB libindi.a
SAVE
END
EOM
-ranlib libindi.a
-rm _libindi.a
-
+ranlib libindiclientandroid.a
+rm libindiclientqt.a
+rm libindi.a
fi
#Build LibRAW
@@ -261,7 +263,7 @@ make clean
rm -rf "${build_dir}/export"
mkdir "${build_dir}/export" -p
-cmake "${kstars_DIR}" -DCMAKE_TOOLCHAIN_FILE="${kstars_DIR}/build_kstarslite/android_libs_src/AndroidToolchain.cmake" \
+ccmake "${kstars_DIR}" -DCMAKE_TOOLCHAIN_FILE="${kstars_DIR}/build_kstarslite/android_libs_src/AndroidToolchain.cmake" \
-DANDROID_ARCHITECTURE=${ANDROID_ARCHITECTURE} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH=${qt_android_libs} \
diff --git a/cmake/modules/FindCFitsio.cmake b/cmake/modules/FindCFitsio.cmake
index 3ff6d6d..851ed8a 100644
--- a/cmake/modules/FindCFitsio.cmake
+++ b/cmake/modules/FindCFitsio.cmake
@@ -29,7 +29,8 @@ else (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES)
find_path(CFITSIO_INCLUDE_DIR fitsio.h
if(ANDROID)
- ${CMAKE_SOURCE_DIR}/android_lib/
+ ${CMAKE_SOURCE_DIR}/build_kstarslite/include
+ NO_DEFAULT_PATH
elseif(ANDROID)
${PC_CFITSIO_INCLUDE_DIRS}
${_obIncDir}
@@ -40,7 +41,7 @@ else (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES)
find_library(CFITSIO_LIBRARIES NAMES cfitsio libcfitsio
PATHS
if(ANDROID)
- ${CMAKE_SOURCE_DIR}/android_lib
+ ${CMAKE_SOURCE_DIR}/build_kstarslite/android_libs/${ANDROID_ARCHITECTURE}
else(ANDROID)
${PC_CFITSIO_INCLUDE_DIRS}
${_obIncDir}
diff --git a/cmake/modules/FindINDI.cmake b/cmake/modules/FindINDI.cmake
index 404cbfd..dd4a267 100644
--- a/cmake/modules/FindINDI.cmake
+++ b/cmake/modules/FindINDI.cmake
@@ -42,15 +42,23 @@ macro(_INDI_check_version)
endif(NOT INDI_VERSION_OK)
endmacro(_INDI_check_version)
-if (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES))
-
+if (INDI_INCLUDE_DIR)
# in cache already
_INDI_check_version()
- set(INDI_FOUND ${INDI_VERSION_OK})
- message(STATUS "Found INDI: ${INDI_LIBRARIES}, ${INDI_CLIENT_LIBRARIES}, ${INDI_INCLUDE_DIR}")
-
-else (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_CLIENT_LIBRARIES)
+ if(ANDROID)
+ if(INDI_CLIENT_ANDROID_LIBRARIES)
+ set(INDI_FOUND ${INDI_VERSION_OK})
+ message(STATUS "Found INDI: ${INDI_CLIENT_ANDROID_LIBRARIES}")
+ endif(INDI_CLIENT_ANDROID_LIBRARIES)
+ else(ANDROID)
+ if(INDI_LIBRARIES AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES))
+ set(INDI_FOUND ${INDI_VERSION_OK})
+ message(STATUS "Found INDI: ${INDI_LIBRARIES}, ${INDI_CLIENT_LIBRARIES}, ${INDI_INCLUDE_DIR}")
+ endif(INDI_LIBRARIES AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES))
+ endif(ANDROID)
+endif(INDI_INCLUDE_DIR)
+if(NOT INDI_FOUND)
if (NOT WIN32 AND NOT ANDROID)
find_package(PkgConfig)
if (PKG_CONFIG_FOUND)
@@ -68,13 +76,12 @@ else (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND INDI_CLIENT_LIBRARIES)
if (INDI_INCLUDE_DIR)
_INDI_check_version()
- if(ANDROID)
- find_library(INDI_CLIENT_ANDROID_LIBRARIES NAMES indiclientandroid
- PATHS
- ${CMAKE_SOURCE_DIR}/android_lib
- )
-
- else(ANDROID)
+if(ANDROID)
+ find_library(INDI_CLIENT_ANDROID_LIBRARIES NAMES indiclientandroid
+ PATHS
+ ${CMAKE_SOURCE_DIR}/build_kstarslite/android_libs/${ANDROID_ARCHITECTURE}/
+ )
+else(ANDROID)
find_library(INDI_LIBRARIES NAMES indi
PATHS
${PC_INDI_LIBRARY_DIRS}
@@ -91,20 +98,19 @@ if (INDI_INCLUDE_DIR)
find_library(INDI_CLIENT_QT_LIBRARIES NAMES indiclientqt
PATHS
- ${PC_INDI_LIBRARY_DIRS}
- ${_obLinkDir}
- ${GNUWIN32_DIR}/lib
+ ${PC_INDI_LIBRARY_DIRS}
+ ${_obLinkDir}
+ ${GNUWIN32_DIR}/lib
)
-
- endif(ANDROID)
-
+endif(ANDROID)
endif(INDI_INCLUDE_DIR)
+
if(ANDROID)
- if(INDI_CLIENT_ANDROID_LIBRARIES)
+ if(INDI_INCLUDE_DIR AND INDI_CLIENT_ANDROID_LIBRARIES)
set(INDI_FOUND TRUE)
- else(INDI_CLIENT_ANDROID_LIBRARIES)
+ else()
set(INDI_FOUND FALSE)
- endif(INDI_CLIENT_ANDROID_LIBRARIES)
+ endif()
else(ANDROID)
if (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES) AND INDI_VERSION_OK)
# If INDI is found we need to make sure on WIN32 we have INDI Client Qt backend otherwise we can't use INDI
@@ -124,18 +130,18 @@ endif(ANDROID)
if (INDI_FOUND)
if (NOT INDI_FIND_QUIETLY)
- if(ANDROID)
- message(STATUS "Found INDI Android Client: ${INDI_CLIENT_ANDROID_LIBRARIES}")
- else(ANDROID)
- message(STATUS "Found INDI: ${INDI_LIBRARIES}, ${INDI_INCLUDE_DIR}")
-
- if (INDI_CLIENT_LIBRARIES)
- message(STATUS "Found INDI Client Library: ${INDI_CLIENT_LIBRARIES}")
- endif (INDI_CLIENT_LIBRARIES)
- if (INDI_CLIENT_QT_LIBRARIES)
- message(STATUS "Found INDI Qt5 Client Library: ${INDI_CLIENT_QT_LIBRARIES}")
- endif (INDI_CLIENT_QT_LIBRARIES)
- endif(ANDROID)
+ if(ANDROID)
+ message(STATUS "Found INDI Android Client: ${INDI_CLIENT_ANDROID_LIBRARIES}")
+ else(ANDROID)
+ message(STATUS "Found INDI: ${INDI_LIBRARIES}, ${INDI_INCLUDE_DIR}")
+
+ if (INDI_CLIENT_LIBRARIES)
+ message(STATUS "Found INDI Client Library: ${INDI_CLIENT_LIBRARIES}")
+ endif (INDI_CLIENT_LIBRARIES)
+ if (INDI_CLIENT_QT_LIBRARIES)
+ message(STATUS "Found INDI Qt5 Client Library: ${INDI_CLIENT_QT_LIBRARIES}")
+ endif (INDI_CLIENT_QT_LIBRARIES)
+ endif(ANDROID)
endif (NOT INDI_FIND_QUIETLY)
else (INDI_FOUND)
if (INDI_FIND_REQUIRED)
@@ -143,10 +149,9 @@ endif(ANDROID)
endif (INDI_FIND_REQUIRED)
endif (INDI_FOUND)
- if(ANDROID)
- mark_as_advanced(INDI_INCLUDE_DIR INDI_CLIENT_ANDROID_LIBRARIES)
- else(ANDROID)
- mark_as_advanced(INDI_INCLUDE_DIR INDI_LIBRARIES INDI_CLIENT_LIBRARIES INDI_CLIENT_QT_LIBRARIES)
- endif(ANDROID)
-
-endif (INDI_INCLUDE_DIR AND INDI_LIBRARIES AND (INDI_CLIENT_LIBRARIES OR INDI_CLIENT_QT_LIBRARIES))
+ if(ANDROID)
+ mark_as_advanced(INDI_INCLUDE_DIR INDI_CLIENT_ANDROID_LIBRARIES)
+ else(ANDROID)
+ mark_as_advanced(INDI_INCLUDE_DIR INDI_LIBRARIES INDI_CLIENT_LIBRARIES INDI_CLIENT_QT_LIBRARIES)
+ endif(ANDROID)
+endif(NOT INDI_FOUND)
diff --git a/cmake/modules/FindNova.cmake b/cmake/modules/FindNova.cmake
index 6f571ef..c66d14e 100644
--- a/cmake/modules/FindNova.cmake
+++ b/cmake/modules/FindNova.cmake
@@ -21,7 +21,7 @@ else (NOVA_INCLUDE_DIR AND NOVA_LIBRARIES)
find_path(NOVA_INCLUDE_DIR libnova.h
if(ANDROID)
- ${CMAKE_SOURCE_DIR}/android_lib/include
+ ${CMAKE_SOURCE_DIR}/build_kstarslite/include
endif(ANDROID)
PATH_SUFFIXES libnova
${_obIncDir}
@@ -31,7 +31,7 @@ else (NOVA_INCLUDE_DIR AND NOVA_LIBRARIES)
find_library(NOVA_LIBRARIES NAMES nova libnova
PATHS
if(ANDROID)
- ${CMAKE_SOURCE_DIR}/android_lib
+ ${CMAKE_SOURCE_DIR}/build_kstarslite/android_libs/${ANDROID_ARCHITECTURE}/
else(ANDROID)
${_obLinkDir}
${GNUWIN32_DIR}/lib
diff --git a/kstars/CMakeLists.txt b/kstars/CMakeLists.txt
index 0790754..631c933 100644
--- a/kstars/CMakeLists.txt
+++ b/kstars/CMakeLists.txt
@@ -54,7 +54,7 @@ if(NOT BUILD_KSTARS_LITE)
indi/streamform.ui
fitsviewer/fitshistogramui.ui
)
- include_directories(${CFITSIO_INCLUDE_DIR})
+ include_directories(${})
endif(CFITSIO_FOUND)
endif(NOT BUILD_KSTARS_LITE)
@@ -66,7 +66,7 @@ if (INDI_FOUND)
fitsviewer/bayer.c
)
if(ANDROID)
- include_directories(${kstars_SOURCE_DIR}/android_lib/include)
+ include_directories(${kstars_SOURCE_DIR}/build_kstarslite/include)
else()
#if it is not Android we need only CFITSIO
include_directories(${CFITSIO_INCLUDE_DIR})
@@ -724,13 +724,18 @@ if(BUILD_KSTARS_LITE)
kstarslite/qml/modules/BottomMenu.qml
kstarslite/qml/modules/KSPage.qml
kstarslite/qml/modules/KSListView.qml
+ kstarslite/qml/modules/KSLabel.qml
+ kstarslite/qml/modules/KSText.qml
+ kstarslite/qml/modules/KSTabButton.qml
+ kstarslite/qml/modules/KSTab.qml
+ kstarslite/qml/modules/KSTextField.qml
+ kstarslite/qml/modules/KSButton.qml
kstarslite/qml/modules/TopMenu.qml
kstarslite/qml/modules/helpers/TopMenuButton.qml
kstarslite/qml/modules/helpers/BottomMenuButton.qml
kstarslite/qml/modules/Splash.qml
kstarslite/qml/modules/helpers/TimeSpinBox.qml
kstarslite/qml/modules/TimePage.qml
- kstarslite/qml/modules/KSTab.qml
#Popups
kstarslite/qml/modules/popups/ProjectionsPopup.qml
kstarslite/qml/modules/popups/FOVPopup.qml
@@ -868,7 +873,7 @@ if(BUILD_KSTARS_LITE)
if(ANDROID)
#RAWExtractor is needed for converting RAW photos to JPEG in INDI Lite
add_library(RAWExtractor SHARED IMPORTED)
- set_property(TARGET RAWExtractor PROPERTY IMPORTED_LOCATION ${kstars_SOURCE_DIR}/android_lib/libRAWExtractor.so)
+ set_property(TARGET RAWExtractor PROPERTY IMPORTED_LOCATION ${kstars_SOURCE_DIR}/build_kstarslite/android_libs/${ANDROID_ARCHITECTURE}/libRAWExtractor.so)
target_link_libraries(KStarsLib RAWExtractor)
endif(ANDROID)
endif(INDI_FOUND)
@@ -904,31 +909,30 @@ endif(CFITSIO_FOUND)
if(INDI_FOUND)
if(BUILD_KSTARS_LITE)
- find_package(Nova REQUIRED)
- target_link_libraries(KStarsLib ${CMAKE_THREAD_LIBS_INIT} ${NOVA_LIBRARIES})
+# find_package(Nova REQUIRED)
+# target_link_libraries(KStarsLib ${CMAKE_THREAD_LIBS_INIT} ${NOVA_LIBRARIES})
+ target_link_libraries(KStarsLib ${CMAKE_THREAD_LIBS_INIT} )
else(BUILD_KSTARS_LITE)
target_link_libraries(KStarsLib ${CMAKE_THREAD_LIBS_INIT} KF5::Notifications)
endif(BUILD_KSTARS_LITE)
- if(ANDROID)
+ if(WIN32 OR ANDROID)
add_definitions(-DUSE_QT5_INDI)
- target_link_libraries(KStarsLib ${INDI_CLIENT_ANDROID_LIBRARIES})
- else(ANDROID)
- if(WIN32)
- add_definitions(-DUSE_QT5_INDI)
- find_package(Nova REQUIRED)
+ find_package(Nova REQUIRED)
+ if(ANDROID)
+ target_link_libraries(KStarsLib ${NOVA_LIBRARIES} ${INDI_CLIENT_ANDROID_LIBRARIES})
+ else(ANDROID)
target_link_libraries(KStarsLib ${NOVA_LIBRARIES} ${INDI_LIBRARIES} ${INDI_CLIENT_QT_LIBRARIES})
- else(WIN32)
- # If INDI Qt5 Client is found, use it.
-
- if (INDI_CLIENT_QT_LIBRARIES)
- add_definitions(-DUSE_QT5_INDI)
- target_link_libraries(KStarsLib ${INDI_LIBRARIES} ${INDI_CLIENT_QT_LIBRARIES} z)
- else(INDI_CLIENT_QT_LIBRARIES)
- target_link_libraries(KStarsLib ${INDI_LIBRARIES} ${INDI_CLIENT_LIBRARIES} z)
- endif(INDI_CLIENT_QT_LIBRARIES)
- endif(WIN32)
- endif(ANDROID)
+ endif(ANDROID)
+ else(WIN32 OR ANDROID)
+ # If INDI Qt5 Client is found, use it.
+ if (INDI_CLIENT_QT_LIBRARIES)
+ add_definitions(-DUSE_QT5_INDI)
+ target_link_libraries(KStarsLib ${INDI_LIBRARIES} ${INDI_CLIENT_QT_LIBRARIES} z)
+ else(INDI_CLIENT_QT_LIBRARIES)
+ target_link_libraries(KStarsLib ${INDI_LIBRARIES} ${INDI_CLIENT_LIBRARIES} z)
+ endif(INDI_CLIENT_QT_LIBRARIES)
+ endif(WIN32 OR ANDROID)
endif(INDI_FOUND)
diff --git a/kstars/indi/clientmanagerlite.cpp b/kstars/indi/clientmanagerlite.cpp
index 09aeb6b..61d8241 100644
--- a/kstars/indi/clientmanagerlite.cpp
+++ b/kstars/indi/clientmanagerlite.cpp
@@ -38,7 +38,7 @@
const char *libindi_strings_context = "string from libindi, used in the config dialog";
#ifdef Q_OS_ANDROID
-#include "../../android_lib/include/libraw/libraw.h"
+#include "libraw/libraw.h"
#endif
DeviceInfoLite::DeviceInfoLite(INDI::BaseDevice *dev)
diff --git a/kstars/kstarslite/qml/CMakeLists.txt b/kstars/kstarslite/qml/CMakeLists.txt
index 4fecfc3..f794574 100644
--- a/kstars/kstarslite/qml/CMakeLists.txt
+++ b/kstars/kstarslite/qml/CMakeLists.txt
@@ -14,6 +14,11 @@ install( FILES modules/BottomMenu.qml
modules/KSListView.qml
modules/SkyMapLiteWrapper.qml
modules/TimePage.qml
+ modules/KSLabel.qml
+ modules/KSTabButton.qml
+ modules/KSText.qml
+ modules/KSTextField.qml
+ modules/KSButton.qml
DESTINATION ${KDE_INSTALL_DATADIR}/kstars/kstarslite/qml/modules )
install( FILES dialogs/FindDialog.qml
diff --git a/kstars/kstarslite/qml/dialogs/DetailsDialog.qml b/kstars/kstarslite/qml/dialogs/DetailsDialog.qml
index 2c1113b..c363400 100644
--- a/kstars/kstarslite/qml/dialogs/DetailsDialog.qml
+++ b/kstars/kstarslite/qml/dialogs/DetailsDialog.qml
@@ -31,16 +31,20 @@ KSPage {
left: parent.left
right: parent.right
}
+ background: Rectangle {
+ anchors.fill: parent
+ color: num.sysPalette.base
+ }
- TabButton {
+ KSTabButton {
text: xi18n("General")
}
- TabButton {
+ KSTabButton {
text: xi18n("Position")
}
- TabButton {
+ KSTabButton {
Component.onCompleted: {
var oldParent = parent
parent = Qt.binding(function() { return DetailDialogLite.isLinksOn ? oldParent : null })
@@ -49,7 +53,7 @@ KSPage {
text: xi18n("Links")
}
- TabButton {
+ KSTabButton {
Component.onCompleted: {
var oldParent = parent
parent = Qt.binding(function() { return DetailDialogLite.isLogOn ? oldParent : null })
@@ -74,6 +78,11 @@ KSPage {
Pane {
clip: true
+ background: Rectangle {
+ anchors.fill: parent
+ color: num.sysPalette.base
+ }
+
Flickable {
anchors.fill: parent
ScrollBar.vertical: ScrollBar { }
@@ -86,7 +95,7 @@ KSPage {
width: parent.width
spacing: 15
- Text {
+ KSText {
text: DetailDialogLite.name
font.pointSize: 16
width: parent.width
@@ -99,7 +108,7 @@ KSPage {
anchors.horizontalCenter: parent.horizontalCenter
}
- Text {
+ KSText {
text: DetailDialogLite.typeInConstellation
anchors.horizontalCenter: parent.horizontalCenter
font.pointSize: 12
@@ -212,6 +221,11 @@ KSPage {
Pane {
clip: true
+ background: Rectangle {
+ anchors.fill: parent
+ color: num.sysPalette.base
+ }
+
Flickable {
anchors.fill: parent
ScrollBar.vertical: ScrollBar { }
@@ -224,7 +238,7 @@ KSPage {
width: parent.width
spacing: 15
- Text {
+ KSText {
text: xi18n("Coordinates")
font {
pointSize: 16
@@ -272,7 +286,7 @@ KSPage {
value: DetailDialogLite.airmass
}
- Text {
+ KSText {
text: xi18n("Rise/Set/Transit")
font {
pointSize: 16
@@ -318,6 +332,11 @@ KSPage {
clip: true
id: links
+ background: Rectangle {
+ anchors.fill: parent
+ color: num.sysPalette.base
+ }
+
GridLayout {
id: linkCol
rowSpacing: 15
@@ -339,7 +358,7 @@ KSPage {
spacing: 10
- Text {
+ KSText {
id: infoLabel
text: xi18n("Information Links")
@@ -375,7 +394,7 @@ KSPage {
spacing: 10
- Text {
+ KSText {
id: imgLabel
text: xi18n("Image Links")
@@ -419,6 +438,11 @@ KSPage {
parent: DetailDialogLite.isLogOn ? detailsSwipeView : null
clip: true
+ background: Rectangle {
+ anchors.fill: parent
+ color: num.sysPalette.base
+ }
+
Flickable {
anchors.fill: parent
ScrollBar.vertical: ScrollBar { }
@@ -431,7 +455,7 @@ KSPage {
width: parent.width
spacing: 15
- Text {
+ KSText {
text: xi18n("Log")
font {
pointSize: 16
diff --git a/kstars/kstarslite/qml/dialogs/FindDialog.qml b/kstars/kstarslite/qml/dialogs/FindDialog.qml
index 421b86e..ad83520 100644
--- a/kstars/kstarslite/qml/dialogs/FindDialog.qml
+++ b/kstars/kstarslite/qml/dialogs/FindDialog.qml
@@ -40,10 +40,10 @@ KSPage {
left: parent.left
right: parent.right
}
- Label {
+ KSLabel {
text: xi18n("Filter by name: ")
}
- TextField {
+ KSTextField {
id: searchQuery
Layout.fillWidth: true
onTextChanged: {
@@ -57,7 +57,7 @@ KSPage {
left: parent.left
right: parent.right
}
- Label {
+ KSLabel {
text: "Filter by type: "
}
diff --git a/kstars/kstarslite/qml/dialogs/LocationDialog.qml b/kstars/kstarslite/qml/dialogs/LocationDialog.qml
index eeb2129..7b9d694 100644
--- a/kstars/kstarslite/qml/dialogs/LocationDialog.qml
+++ b/kstars/kstarslite/qml/dialogs/LocationDialog.qml
@@ -43,11 +43,11 @@ KSPage {
right: parent.right
}
- Label {
+ KSLabel {
text: xi18n("Current Location: ")
}
- Label {
+ KSLabel {
text: LocationDialogLite.currentLocation
}
}
@@ -67,10 +67,10 @@ KSPage {
RowLayout {
Layout.fillWidth: true
Layout.fillHeight: true
- Label {
+ KSLabel {
text: xi18n("City filter: ")
}
- TextField {
+ KSTextField {
id: cityFilter
Layout.fillWidth: true
onTextChanged: {
@@ -82,11 +82,11 @@ KSPage {
RowLayout {
Layout.fillWidth: true
Layout.fillHeight: true
- Label {
+ KSLabel {
text: xi18n("Province filter: ")
}
- TextField {
+ KSTextField {
id: provinceFilter
Layout.fillWidth: true
onTextChanged: {
@@ -98,10 +98,10 @@ KSPage {
RowLayout {
Layout.fillWidth: true
Layout.fillHeight: true
- Label {
+ KSLabel {
text: xi18n("Country filter: ")
}
- TextField {
+ KSTextField {
id: countryFilter
Layout.fillWidth: true
onTextChanged: {
diff --git a/kstars/kstarslite/qml/dialogs/helpers/DetailsAddLink.qml b/kstars/kstarslite/qml/dialogs/helpers/DetailsAddLink.qml
index 94e8151..4bc9b8d 100644
--- a/kstars/kstarslite/qml/dialogs/helpers/DetailsAddLink.qml
+++ b/kstars/kstarslite/qml/dialogs/helpers/DetailsAddLink.qml
@@ -70,20 +70,20 @@ KSPage {
}
}
- Label {
+ KSLabel {
text: xi18n("Description")
}
- TextField {
+ KSTextField {
id: descField
Layout.fillWidth: true
}
- Label {
+ KSLabel {
text: xi18n("URL")
}
- TextField {
+ KSTextField {
id: urlField
Layout.fillWidth: true
}
diff --git a/kstars/kstarslite/qml/dialogs/helpers/DetailsItem.qml b/kstars/kstarslite/qml/dialogs/helpers/DetailsItem.qml
index 072df11..0674c70 100644
--- a/kstars/kstarslite/qml/dialogs/helpers/DetailsItem.qml
+++ b/kstars/kstarslite/qml/dialogs/helpers/DetailsItem.qml
@@ -10,6 +10,7 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
+import "../../modules"
Column {
property string label
@@ -19,7 +20,7 @@ Column {
width: parent.width
- Label {
+ KSLabel {
text: label
font.pointSize: 13
}
@@ -30,7 +31,7 @@ Column {
color: "grey"
}
- Label {
+ KSLabel {
font.pointSize: 11
text: value
}
diff --git a/kstars/kstarslite/qml/dialogs/helpers/LocationEdit.qml b/kstars/kstarslite/qml/dialogs/helpers/LocationEdit.qml
index 3fdd938..7da6315 100644
--- a/kstars/kstarslite/qml/dialogs/helpers/LocationEdit.qml
+++ b/kstars/kstarslite/qml/dialogs/helpers/LocationEdit.qml
@@ -128,11 +128,11 @@ KSPage {
Layout.maximumWidth: window.isPortrait ? parent.width : parent.width/2
RowLayout {
- Label {
+ KSLabel {
text: xi18n("City: ")
}
- TextField {
+ KSTextField {
id: cityField
Layout.fillWidth: true
onTextChanged: fieldsChanged = true
@@ -141,11 +141,11 @@ KSPage {
}
RowLayout {
- Label {
+ KSLabel {
text: xi18n("Province: ")
}
- TextField {
+ KSTextField {
id: provinceField
Layout.fillWidth: true
onTextChanged: fieldsChanged = true
@@ -154,11 +154,11 @@ KSPage {
}
RowLayout {
- Label {
+ KSLabel {
text: xi18n("Country: ")
}
- TextField {
+ KSTextField {
id: countryField
Layout.fillWidth: true
onTextChanged: fieldsChanged = true
@@ -175,11 +175,11 @@ KSPage {
Layout.maximumWidth: window.isPortrait ? parent.width : parent.width/2
RowLayout {
- Label {
+ KSLabel {
text: xi18n("Latitude: ")
}
- TextField {
+ KSTextField {
id: latField
Layout.fillWidth: true
readOnly: isReadOnly
@@ -188,11 +188,11 @@ KSPage {
RowLayout {
- Label {
+ KSLabel {
text: xi18n("Longitude: ")
}
- TextField {
+ KSTextField {
id: longField
Layout.fillWidth: true
readOnly: isReadOnly
@@ -204,7 +204,7 @@ KSPage {
spacing: 10
RowLayout {
- Label {
+ KSLabel {
text: xi18n("UT offset: ")
}
@@ -215,7 +215,7 @@ KSPage {
}
RowLayout {
- Label {
+ KSLabel {
text: xi18n("DST Rule: ")
}
diff --git a/kstars/kstarslite/qml/dialogs/helpers/LocationLoading.qml b/kstars/kstarslite/qml/dialogs/helpers/LocationLoading.qml
index 63384b3..41d6162 100644
--- a/kstars/kstarslite/qml/dialogs/helpers/LocationLoading.qml
+++ b/kstars/kstarslite/qml/dialogs/helpers/LocationLoading.qml
@@ -21,6 +21,11 @@ Popup {
focus: true
modal: true
+ background: Rectangle {
+ anchors.fill: parent
+ color: num.sysPalette.base
+ }
+
ColumnLayout {
id: aboutDialog
focus: true
@@ -34,7 +39,7 @@ Popup {
anchors.horizontalCenter: parent.horizontalCenter
}
- Label {
+ KSLabel {
id: fetchText
width: parent.width
wrapMode: Label.Wrap
diff --git a/kstars/kstarslite/qml/dialogs/menus/DetailsLinkMenu.qml b/kstars/kstarslite/qml/dialogs/menus/DetailsLinkMenu.qml
index 948ddd0..c6873ae 100644
--- a/kstars/kstarslite/qml/dialogs/menus/DetailsLinkMenu.qml
+++ b/kstars/kstarslite/qml/dialogs/menus/DetailsLinkMenu.qml
@@ -21,6 +21,11 @@ Menu {
padding: 5
property int itemIndex: -1
property bool isImage: false
+ background: Rectangle {
+ implicitWidth: 200
+ color: num.sysPalette.base
+ radius: 5
+ }
function openForImage(index) {
isImage = true
diff --git a/kstars/kstarslite/qml/dialogs/menus/LocationsGeoMenu.qml b/kstars/kstarslite/qml/dialogs/menus/LocationsGeoMenu.qml
index 0986cd2..c3df2cf 100644
--- a/kstars/kstarslite/qml/dialogs/menus/LocationsGeoMenu.qml
+++ b/kstars/kstarslite/qml/dialogs/menus/LocationsGeoMenu.qml
@@ -22,6 +22,11 @@ Menu {
padding: 0
property string locName
property bool isReadOnly
+ background: Rectangle {
+ implicitWidth: 200
+ color: num.sysPalette.base
+ radius: 5
+ }
function openMenu(name) {
locName = name
@@ -34,7 +39,7 @@ Menu {
width: parent.width
spacing: 10
- Label {
+ KSLabel {
id: name
text: locName
wrapMode: Label.WrapAtWordBoundaryOrAnywhere
diff --git a/kstars/kstarslite/qml/images/lock-closed.png b/kstars/kstarslite/qml/images/lock-closed.png
index 8757011..45ef86e 100644
--- a/kstars/kstarslite/qml/images/lock-closed.png
+++ b/kstars/kstarslite/qml/images/lock-closed.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/lock-closed@2x.png b/kstars/kstarslite/qml/images/lock-closed@2x.png
index d28477b..8b31e07 100644
--- a/kstars/kstarslite/qml/images/lock-closed@2x.png
+++ b/kstars/kstarslite/qml/images/lock-closed@2x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/lock-closed@3x.png b/kstars/kstarslite/qml/images/lock-closed@3x.png
index 30c13d5..923f32b 100644
--- a/kstars/kstarslite/qml/images/lock-closed@3x.png
+++ b/kstars/kstarslite/qml/images/lock-closed@3x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/lock-closed@4x.png b/kstars/kstarslite/qml/images/lock-closed@4x.png
index 5ed01f9..9e51b66 100644
--- a/kstars/kstarslite/qml/images/lock-closed@4x.png
+++ b/kstars/kstarslite/qml/images/lock-closed@4x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/svg/lock-closed.svg b/kstars/kstarslite/qml/images/svg/lock-closed.svg
index c3aa039..ac25ad4 100644
--- a/kstars/kstarslite/qml/images/svg/lock-closed.svg
+++ b/kstars/kstarslite/qml/images/svg/lock-closed.svg
@@ -1,122 +1,331 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="24" height="24" id="svg3869" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="document-encrypted.svg">
- <defs id="defs3871">
- <style type="text/css" id="current-color-scheme">
- .ColorScheme-Text {
- color:#4d4d4d;
- }
- .ColorScheme-Background {
- color:#eff0f1;
- }
- .ColorScheme-Highlight {
- color:#3daee9;
- }
- .ColorScheme-ViewText {
- color:#31363b;
- }
- .ColorScheme-ViewBackground {
- color:#fcfcfc;
- }
- .ColorScheme-ViewHover {
- color:#93cee9;
- }
- .ColorScheme-ViewFocus{
- color:#3daee9;
- }
- .ColorScheme-ButtonText {
- color:#31363b;
- }
- .ColorScheme-ButtonBackground {
- color:#eff0f1;
- }
- .ColorScheme-ButtonHover {
- color:#93cee9;
- }
- .ColorScheme-ButtonFocus{
- color:#3daee9;
- }
- </style>
- <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 12 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="24 : 12 : 1" inkscape:persp3d-origin="12 : 8 : 1" id="perspective4146"/>
- <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 12 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="24 : 12 : 1" inkscape:persp3d-origin="12 : 8 : 1" id="perspective4090"/>
- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath16">
- <path d="m 0,706.465 1490.926,0 L 1490.926,0 0,0 0,706.465 Z" id="path18"/>
- </clipPath>
- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath24">
- <path d="m 22.1953,686.117 1447.7347,0 0,-667.1902 -1447.7347,0 L 22.1953,686.117 Z" id="path26"/>
- </clipPath>
- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4534">
- <rect ry="15.999986" y="8.0000038" x="8.0000114" height="31.999971" width="31.999989" id="rect4536" style="fill:url(#linearGradient4538);fill-opacity:1;stroke:none"/>
- </clipPath>
- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4584">
- <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4586" style="fill:url(#linearGradient4588);fill-opacity:1;stroke:none"/>
- </clipPath>
- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4550">
- <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4552" style="fill:url(#linearGradient4554);fill-opacity:1;stroke:none"/>
- </clipPath>
- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4568">
- <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4570" style="fill:url(#linearGradient4572);fill-opacity:1;stroke:none"/>
- </clipPath>
- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4528">
- <rect ry="15.999986" y="8.0000038" x="8.0000114" height="31.999971" width="31.999989" id="rect4530" style="fill:url(#linearGradient4532);fill-opacity:1;stroke:none"/>
- </clipPath>
- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4578">
- <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4580" style="fill:url(#linearGradient4582);fill-opacity:1;stroke:none"/>
- </clipPath>
- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4562">
- <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4564" style="fill:url(#linearGradient4566);fill-opacity:1;stroke:none"/>
- </clipPath>
- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4544">
- <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4546" style="fill:url(#linearGradient4548);fill-opacity:1;stroke:none"/>
- </clipPath>
- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4390">
- <rect ry="15.999986" y="8.0000038" x="8.0000114" height="31.999971" width="31.999989" id="rect4392" style="fill:url(#linearGradient4532);fill-opacity:1;stroke:none"/>
- </clipPath>
- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4407">
- <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4409" style="fill:url(#linearGradient4582);fill-opacity:1;stroke:none"/>
- </clipPath>
- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4424">
- <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4426" style="fill:url(#linearGradient4566);fill-opacity:1;stroke:none"/>
- </clipPath>
- <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4441">
- <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4443" style="fill:url(#linearGradient4548);fill-opacity:1;stroke:none"/>
- </clipPath>
- <clipPath id="clipPath4528-1" clipPathUnits="userSpaceOnUse">
- <rect style="fill:url(#linearGradient4532);fill-opacity:1;stroke:none" id="rect4530-7" width="31.999989" height="31.999971" x="8.0000114" y="8.0000038" ry="15.999986"/>
- </clipPath>
- <clipPath id="clipPath4578-8" clipPathUnits="userSpaceOnUse">
- <rect style="fill:url(#linearGradient4582);fill-opacity:1;stroke:none" id="rect4580-7" width="31.999989" height="31.999971" x="392.57144" y="507.798" ry="15.999986"/>
- </clipPath>
- <clipPath id="clipPath4562-8" clipPathUnits="userSpaceOnUse">
- <rect style="fill:url(#linearGradient4566);fill-opacity:1;stroke:none" id="rect4564-8" width="31.999989" height="31.999971" x="392.57144" y="507.798" ry="15.999986"/>
- </clipPath>
- <clipPath id="clipPath4544-1" clipPathUnits="userSpaceOnUse">
- <rect style="fill:url(#linearGradient4548);fill-opacity:1;stroke:none" id="rect4546-1" width="31.999989" height="31.999971" x="392.57144" y="507.798" ry="15.999986"/>
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="24"
+ id="svg3869"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="document-encrypted.svg">
+ <defs
+ id="defs3871">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 12 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="24 : 12 : 1"
+ inkscape:persp3d-origin="12 : 8 : 1"
+ id="perspective4146" />
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 12 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="24 : 12 : 1"
+ inkscape:persp3d-origin="12 : 8 : 1"
+ id="perspective4090" />
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath16">
+ <path
+ d="m 0,706.465 1490.926,0 L 1490.926,0 0,0 0,706.465 Z"
+ id="path18" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath24">
+ <path
+ d="m 22.1953,686.117 1447.7347,0 0,-667.1902 -1447.7347,0 L 22.1953,686.117 Z"
+ id="path26" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath4534">
+ <rect
+ ry="15.999986"
+ y="8.0000038"
+ x="8.0000114"
+ height="31.999971"
+ width="31.999989"
+ id="rect4536"
+ style="fill:url(#linearGradient4538);fill-opacity:1;stroke:none" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath4584">
+ <rect
+ ry="15.999986"
+ y="507.798"
+ x="392.57144"
+ height="31.999971"
+ width="31.999989"
+ id="rect4586"
+ style="fill:url(#linearGradient4588);fill-opacity:1;stroke:none" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath4550">
+ <rect
+ ry="15.999986"
+ y="507.798"
+ x="392.57144"
+ height="31.999971"
+ width="31.999989"
+ id="rect4552"
+ style="fill:url(#linearGradient4554);fill-opacity:1;stroke:none" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath4568">
+ <rect
+ ry="15.999986"
+ y="507.798"
+ x="392.57144"
+ height="31.999971"
+ width="31.999989"
+ id="rect4570"
+ style="fill:url(#linearGradient4572);fill-opacity:1;stroke:none" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath4528">
+ <rect
+ ry="15.999986"
+ y="8.0000038"
+ x="8.0000114"
+ height="31.999971"
+ width="31.999989"
+ id="rect4530"
+ style="fill:url(#linearGradient4532);fill-opacity:1;stroke:none" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath4578">
+ <rect
+ ry="15.999986"
+ y="507.798"
+ x="392.57144"
+ height="31.999971"
+ width="31.999989"
+ id="rect4580"
+ style="fill:url(#linearGradient4582);fill-opacity:1;stroke:none" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath4562">
+ <rect
+ ry="15.999986"
+ y="507.798"
+ x="392.57144"
+ height="31.999971"
+ width="31.999989"
+ id="rect4564"
+ style="fill:url(#linearGradient4566);fill-opacity:1;stroke:none" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath4544">
+ <rect
+ ry="15.999986"
+ y="507.798"
+ x="392.57144"
+ height="31.999971"
+ width="31.999989"
+ id="rect4546"
+ style="fill:url(#linearGradient4548);fill-opacity:1;stroke:none" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath4390">
+ <rect
+ ry="15.999986"
+ y="8.0000038"
+ x="8.0000114"
+ height="31.999971"
+ width="31.999989"
+ id="rect4392"
+ style="fill:url(#linearGradient4532);fill-opacity:1;stroke:none" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath4407">
+ <rect
+ ry="15.999986"
+ y="507.798"
+ x="392.57144"
+ height="31.999971"
+ width="31.999989"
+ id="rect4409"
+ style="fill:url(#linearGradient4582);fill-opacity:1;stroke:none" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath4424">
+ <rect
+ ry="15.999986"
+ y="507.798"
+ x="392.57144"
+ height="31.999971"
+ width="31.999989"
+ id="rect4426"
+ style="fill:url(#linearGradient4566);fill-opacity:1;stroke:none" />
+ </clipPath>
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath4441">
+ <rect
+ ry="15.999986"
+ y="507.798"
+ x="392.57144"
+ height="31.999971"
+ width="31.999989"
+ id="rect4443"
+ style="fill:url(#linearGradient4548);fill-opacity:1;stroke:none" />
+ </clipPath>
+ <clipPath
+ id="clipPath4528-1"
+ clipPathUnits="userSpaceOnUse">
+ <rect
+ style="fill:url(#linearGradient4532);fill-opacity:1;stroke:none"
+ id="rect4530-7"
+ width="31.999989"
+ height="31.999971"
+ x="8.0000114"
+ y="8.0000038"
+ ry="15.999986" />
+ </clipPath>
+ <clipPath
+ id="clipPath4578-8"
+ clipPathUnits="userSpaceOnUse">
+ <rect
+ style="fill:url(#linearGradient4582);fill-opacity:1;stroke:none"
+ id="rect4580-7"
+ width="31.999989"
+ height="31.999971"
+ x="392.57144"
+ y="507.798"
+ ry="15.999986" />
+ </clipPath>
+ <clipPath
+ id="clipPath4562-8"
+ clipPathUnits="userSpaceOnUse">
+ <rect
+ style="fill:url(#linearGradient4566);fill-opacity:1;stroke:none"
+ id="rect4564-8"
+ width="31.999989"
+ height="31.999971"
+ x="392.57144"
+ y="507.798"
+ ry="15.999986" />
+ </clipPath>
+ <clipPath
+ id="clipPath4544-1"
+ clipPathUnits="userSpaceOnUse">
+ <rect
+ style="fill:url(#linearGradient4548);fill-opacity:1;stroke:none"
+ id="rect4546-1"
+ width="31.999989"
+ height="31.999971"
+ x="392.57144"
+ y="507.798"
+ ry="15.999986" />
</clipPath>
</defs>
- <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="22.627416" inkscape:cx="11.061087" inkscape:cy="12.032563" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1366" inkscape:window-height="709" inkscape:window-x="-4" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:showpageshadow="false" inkscape:object-nodes="true" inkscape:snap-bbox="true">
- <inkscape:grid type="xygrid" id="grid4132"/>
- <sodipodi:guide position="4,18" orientation="18,0" id="guide4138"/>
- <sodipodi:guide position="5,3" orientation="0,18" id="guide4140"/>
- <sodipodi:guide position="20,2.0000174" orientation="-18,0" id="guide4142"/>
- <sodipodi:guide position="2,21" orientation="0,-18" id="guide4144"/>
- <sodipodi:guide position="3,19.000017" orientation="16,0" id="guide4146"/>
- <sodipodi:guide position="2,4" orientation="0,16" id="guide4148"/>
- <sodipodi:guide position="21,20" orientation="-16,0" id="guide4150"/>
- <sodipodi:guide position="2,20" orientation="0,-16" id="guide4152"/>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="22.627416"
+ inkscape:cx="11.061087"
+ inkscape:cy="12.032563"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1366"
+ inkscape:window-height="709"
+ inkscape:window-x="-4"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:showpageshadow="false"
+ inkscape:object-nodes="true"
+ inkscape:snap-bbox="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4132" />
+ <sodipodi:guide
+ position="4,18"
+ orientation="18,0"
+ id="guide4138" />
+ <sodipodi:guide
+ position="5,3"
+ orientation="0,18"
+ id="guide4140" />
+ <sodipodi:guide
+ position="20,2.0000174"
+ orientation="-18,0"
+ id="guide4142" />
+ <sodipodi:guide
+ position="2,21"
+ orientation="0,-18"
+ id="guide4144" />
+ <sodipodi:guide
+ position="3,19.000017"
+ orientation="16,0"
+ id="guide4146" />
+ <sodipodi:guide
+ position="2,4"
+ orientation="0,16"
+ id="guide4148" />
+ <sodipodi:guide
+ position="21,20"
+ orientation="-16,0"
+ id="guide4150" />
+ <sodipodi:guide
+ position="2,20"
+ orientation="0,-16"
+ id="guide4152" />
</sodipodi:namedview>
- <metadata id="metadata3874">
+ <metadata
+ id="metadata3874">
<rdf:RDF>
- <cc:Work rdf:about="">
+ <cc:Work
+ rdf:about="">
<dc:format>image/svg+xml</dc:format>
- <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
- <dc:title/>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
- <g inkscape:label="Capa 1" inkscape:groupmode="layer" id="layer1" transform="translate(-326,-532.3622)">
- <g transform="translate(327,-497)" id="layer1-3" inkscape:label="Capa 1">
- <path id="rect4136" transform="translate(0,1030.3622)" d="M 11,3 C 8.784,3 7,4.784 7,7 l 0,4 -2,0 0,1 0,7 1,0 10,0 1,0 0,-8 -1,0 -1,0 0,-4 C 15,4.784 13.216,3 11,3 Z m 0,1 c 1.662,0 3,1.561 3,3.5 L 14,11 8,11 8,7.5 C 8,5.561 9.338,4 11,4 Z m -5,8 10,0 0,6 -10,0 0,-6 z" style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none" inkscape:connector-curvature="0" class="ColorScheme-Text"/>
+ <g
+ inkscape:label="Capa 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-326,-532.3622)">
+ <g
+ transform="translate(327,-497)"
+ id="layer1-3"
+ inkscape:label="Capa 1">
+ <path
+ id="rect4136"
+ transform="translate(0,1030.3622)"
+ d="M 11,3 C 8.784,3 7,4.784 7,7 l 0,4 -2,0 0,1 0,7 1,0 10,0 1,0 0,-8 -1,0 -1,0 0,-4 C 15,4.784 13.216,3 11,3 Z m 0,1 c 1.662,0 3,1.561 3,3.5 L 14,11 8,11 8,7.5 C 8,5.561 9.338,4 11,4 Z m -5,8 10,0 0,6 -10,0 0,-6 z"
+ style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
</g>
</g>
</svg>
diff --git a/kstars/kstarslite/qml/indi/DevicePanel.qml b/kstars/kstarslite/qml/indi/DevicePanel.qml
index 143c656..ad7b481 100644
--- a/kstars/kstarslite/qml/indi/DevicePanel.qml
+++ b/kstars/kstarslite/qml/indi/DevicePanel.qml
@@ -20,10 +20,6 @@ KSPage {
id: devicesPage
title: devicesPage.deviceName + " - " + tabBar.currentItem.text
- onTitleChanged: {
- console.log(title)
- }
-
property string deviceName
property ImagePreview imagePreview: null
@@ -33,6 +29,11 @@ KSPage {
TabBar {
id: tabBar
Layout.fillWidth: true
+
+ background: Rectangle {
+ anchors.fill: parent
+ color: num.sysPalette.base
+ }
}
SwipeView {
@@ -67,10 +68,10 @@ KSPage {
}', newTab.contentItem)
newTab.rootItem = columnForTab
-
var tabButton = Qt.createQmlObject('import QtQuick 2.7;
import QtQuick.Controls 2.0
- TabButton {}',
+ import "../modules"
+ KSTabButton {}',
tabBar);
tabButton.text = groupName
if(tabBar.count == 1) {
diff --git a/kstars/kstarslite/qml/indi/INDIControlPanel.qml b/kstars/kstarslite/qml/indi/INDIControlPanel.qml
index 84ad6b5..e092050 100644
--- a/kstars/kstarslite/qml/indi/INDIControlPanel.qml
+++ b/kstars/kstarslite/qml/indi/INDIControlPanel.qml
@@ -22,11 +22,11 @@ KSPage {
property bool connected: ClientManagerLite.connected
- Component.onCompleted: {
- if(Qt.platform.os != "android") {
- //ClientManagerLite.setHost("localhost", parseInt(7624))
- }
- }
+// Component.onCompleted: {
+// if(Qt.platform.os != "android") {
+// ClientManagerLite.setHost("localhost", parseInt(7624))
+// }
+// }
onConnectedChanged: {
if(!indiPage.connected) {
@@ -51,7 +51,7 @@ KSPage {
right: parent.right
}
- Label {
+ KSLabel {
text: xi18n("INDI Host")
}
@@ -61,7 +61,7 @@ KSPage {
right: parent.right
}
- TextField {
+ KSTextField {
id:ipHost
placeholderText: xi18n("IP")
Layout.alignment: Qt.AlignHCenter
@@ -70,7 +70,7 @@ KSPage {
text: ClientManagerLite.lastUsedServer
}
- TextField {
+ KSTextField {
id:portHost
placeholderText: xi18n("Port")
Layout.alignment: Qt.AlignHCenter
@@ -81,7 +81,7 @@ KSPage {
}
}
- Label {
+ KSLabel {
id: connectedTo
visible: indiPage.connected
text: xi18n("Connected to ") + ClientManagerLite.connectedHost
@@ -115,7 +115,7 @@ KSPage {
color: "gray"
}
- Label {
+ KSLabel {
id: devicesLabel
text: xi18n("Available Devices")
}
diff --git a/kstars/kstarslite/qml/indi/modules/KSINDIText.qml b/kstars/kstarslite/qml/indi/modules/KSINDIText.qml
index f58fd09..da1e109 100644
--- a/kstars/kstarslite/qml/indi/modules/KSINDIText.qml
+++ b/kstars/kstarslite/qml/indi/modules/KSINDIText.qml
@@ -12,6 +12,7 @@ import QtQuick 2.6
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.2
import "../../constants" 1.0
+import "../../modules"
Column {
id: columnTextProp
@@ -20,7 +21,7 @@ Column {
spacing: 5 * num.dp
property string propLabel: ""
- Label {
+ KSLabel {
text: propLabel
}
@@ -45,7 +46,8 @@ Column {
textItem = Qt.createQmlObject('import QtQuick 2.6
import QtQuick.Layouts 1.2
import "../../constants" 1.0
- Text {
+ import "../../modules"
+ KSText {
}', this)
textItem.text = propText
}
diff --git a/kstars/kstarslite/qml/indi/modules/KSINDITextField.qml b/kstars/kstarslite/qml/indi/modules/KSINDITextField.qml
index 6697a24..313a346 100644
--- a/kstars/kstarslite/qml/indi/modules/KSINDITextField.qml
+++ b/kstars/kstarslite/qml/indi/modules/KSINDITextField.qml
@@ -10,11 +10,11 @@
import QtQuick 2.6
import QtQuick.Layouts 1.2
+import QtQuick.Controls 2.0
+
import "../../constants" 1.0
+import "../../modules"
-import QtQuick 2.6
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 2.0
Flow {
id: textRow
@@ -31,7 +31,7 @@ Flow {
property string propName
property string fieldName
- TextField {
+ KSTextField {
id: field
}
diff --git a/kstars/kstarslite/qml/indi/modules/KSLed.qml b/kstars/kstarslite/qml/indi/modules/KSLed.qml
index 3f2a6bf..849391d 100644
--- a/kstars/kstarslite/qml/indi/modules/KSLed.qml
+++ b/kstars/kstarslite/qml/indi/modules/KSLed.qml
@@ -55,7 +55,7 @@ Row {
anchors.verticalCenter: parent.verticalCenter
}
- Label {
+ KSLabel {
text: ledRow.label
anchors.verticalCenter: parent.verticalCenter
}
diff --git a/kstars/kstarslite/qml/indi/modules/MotionControl.qml b/kstars/kstarslite/qml/indi/modules/MotionControl.qml
index e1e65ea..0fe2dac 100644
--- a/kstars/kstarslite/qml/indi/modules/MotionControl.qml
+++ b/kstars/kstarslite/qml/indi/modules/MotionControl.qml
@@ -14,6 +14,7 @@ import QtQuick.Layouts 1.2
import QtQuick.Controls 2.0
import TelescopeLiteEnums 1.0
import "../../constants" 1.0
+import "../../modules"
ColumnLayout {
id: motionCColumn
@@ -274,7 +275,7 @@ ColumnLayout {
text: xi18n("-")
}
- Text {
+ KSText {
height: parent.height * 0.15
Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter
diff --git a/kstars/kstarslite/qml/main.qml b/kstars/kstarslite/qml/main.qml
index e6b9c05..d6af8ea 100644
--- a/kstars/kstarslite/qml/main.qml
+++ b/kstars/kstarslite/qml/main.qml
@@ -57,6 +57,11 @@ ApplicationWindow {
height: stackView.currentItem != initPage ? backButton.height : 0
visible: stackView.currentItem != initPage
+ background: Rectangle {
+ anchors.fill: parent
+ color: num.sysPalette.dark
+ }
+
Behavior on height {
NumberAnimation {
duration: 200
@@ -83,7 +88,7 @@ ApplicationWindow {
}
}
- Label {
+ KSLabel {
id: titleLabel
text: stackView.currentItem.title
@@ -241,6 +246,10 @@ ApplicationWindow {
height: window.height
//Disable drawer while loading
dragMargin: isLoaded ? Qt.styleHints.startDragDistance : -Qt.styleHints.startDragDistance
+ background: Rectangle {
+ anchors.fill: parent
+ color: num.sysPalette.base
+ }
onOpened: {
contextDrawer.close()
@@ -259,6 +268,7 @@ ApplicationWindow {
}
ListView {
+ clip: true
id: pagesList
anchors {
left: parent.left
@@ -268,6 +278,7 @@ ApplicationWindow {
}
delegate: ItemDelegate {
+ id: globalDrawerControl
Rectangle {
anchors {
horizontalCenter: parent.horizontalCenter
@@ -278,6 +289,16 @@ ApplicationWindow {
height: 1
}
+ contentItem: KSText {
+ rightPadding: globalDrawerControl.spacing
+ text: globalDrawerControl.text
+ font: globalDrawerControl.font
+ elide: Text.ElideRight
+ visible: globalDrawerControl.text
+ horizontalAlignment: Text.AlignLeft
+ verticalAlignment: Text.AlignVCenter
+ }
+
width: parent.width
text: model.objID.title
onClicked: {
@@ -351,12 +372,16 @@ ApplicationWindow {
//Disable drawer while loading and if SkyMapLite is not visible
dragMargin: isSkyMapVisible && isLoaded ? Qt.styleHints.startDragDistance + 15 : -Qt.styleHints.startDragDistance
edge: Qt.RightEdge
+ background: Rectangle {
+ anchors.fill: parent
+ color: num.sysPalette.base
+ }
onOpened: {
globalDrawer.close()
}
- Label {
+ KSLabel {
id: contextTitle
anchors {
top: parent.top
@@ -380,6 +405,7 @@ ApplicationWindow {
model: drawerModel
delegate: ItemDelegate {
+ id: contextDrawerControl
Rectangle {
anchors {
horizontalCenter: parent.horizontalCenter
@@ -398,6 +424,16 @@ ApplicationWindow {
}
contextDrawer.close()
}
+
+ contentItem: KSText {
+ rightPadding: contextDrawerControl.spacing
+ text: contextDrawerControl.text
+ font: contextDrawerControl.font
+ elide: Text.ElideRight
+ visible: contextDrawerControl.text
+ horizontalAlignment: Text.AlignLeft
+ verticalAlignment: Text.AlignVCenter
+ }
}
property ListModel drawerModel : ListModel {
@@ -420,7 +456,7 @@ ApplicationWindow {
}
RowLayout {
- id: row
+ id: magnitudeRow
anchors {
leftMargin: 10
left: parent.left
@@ -428,6 +464,8 @@ ApplicationWindow {
right: parent.right
}
+ property color magnitudeColor: colorSchemePopup.currentCScheme == "cs_night" ? "white" : "black"
+
Rectangle {
anchors{
left: parent.left
@@ -437,7 +475,7 @@ ApplicationWindow {
width: 24
height: 24
radius: width * 0.5
- color: "black"
+ color: magnitudeRow.magnitudeColor
}
Rectangle {
@@ -449,7 +487,7 @@ ApplicationWindow {
width: 16
height: 16
radius: width * 0.5
- color: "black"
+ color: magnitudeRow.magnitudeColor
}
Rectangle {
@@ -463,7 +501,7 @@ ApplicationWindow {
width: 8
height: 8
radius: width * 0.5
- color: "black"
+ color: magnitudeRow.magnitudeColor
}
}
@@ -480,6 +518,7 @@ ApplicationWindow {
onValueChanged: {
SkyMapLite.magLim = value
+ console.log(colorSchemePopup.currentCScheme)
}
}
}
diff --git a/kstars/kstarslite/qml/modules/BottomMenu.qml b/kstars/kstarslite/qml/modules/BottomMenu.qml
index 6dbbd3c..78fb99e 100644
--- a/kstars/kstarslite/qml/modules/BottomMenu.qml
+++ b/kstars/kstarslite/qml/modules/BottomMenu.qml
@@ -126,7 +126,7 @@ ColumnLayout {
background: Rectangle {
id: menuRect
- color: num.sysPalette.dark
+ color: num.sysPalette.base
border {
width: 1
color: num.sysPalette.light
@@ -229,7 +229,7 @@ ColumnLayout {
Rectangle {
id: separatorSearchSmall
height: decreaseUnitLandscape.height*0.75
- color: num.sysPalette.light
+ color: num.sysPalette.shadow
width: 1
visible: isWindowWidthSmall
}
@@ -285,7 +285,7 @@ ColumnLayout {
Rectangle {
id: separator
height: decreaseUnitLandscape.height*0.75
- color: num.sysPalette.light
+ color: num.sysPalette.shadow
width: 1
visible: !isWindowWidthSmall
}
@@ -302,7 +302,7 @@ ColumnLayout {
Rectangle {
id: separatorSearchLarge
height: decreaseUnitLandscape.height*0.75
- color: num.sysPalette.light
+ color: num.sysPalette.shadow
width: 1
visible: !isWindowWidthSmall
}
diff --git a/kstars/kstarslite/qml/modules/KSButton.qml b/kstars/kstarslite/qml/modules/KSButton.qml
new file mode 100644
index 0000000..cecdb87
--- /dev/null
+++ b/kstars/kstarslite/qml/modules/KSButton.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.6
+import QtQuick.Controls 2.0
+import "../constants/" 1.0
+
+Button {
+ id: button
+}
diff --git a/kstars/kstarslite/qml/modules/KSLabel.qml b/kstars/kstarslite/qml/modules/KSLabel.qml
new file mode 100644
index 0000000..e04c473
--- /dev/null
+++ b/kstars/kstarslite/qml/modules/KSLabel.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.6
+import QtQuick.Controls 2.0
+import "../constants/" 1.0
+
+Label {
+ color: num.sysPalette.text
+}
diff --git a/kstars/kstarslite/qml/modules/KSListView.qml b/kstars/kstarslite/qml/modules/KSListView.qml
index caf931e..6869829 100644
--- a/kstars/kstarslite/qml/modules/KSListView.qml
+++ b/kstars/kstarslite/qml/modules/KSListView.qml
@@ -11,7 +11,7 @@
import QtQuick 2.6
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0
-import "../constants" 1.0
+import "../constants/" 1.0
ListView {
id: listView
@@ -26,6 +26,9 @@ ListView {
//To skip the case when contentItem.height equals to 99000+
implicitHeight: contentItem.height >= window.height ? window.height : contentItem.height
+ //For some reason we can't use num constant inside states so we wrap sysPalette as property
+ property SystemPalette sysPalette: num.sysPalette
+
onCountChanged: {
for(var child in listView.contentItem.children) {
var childWidth = listView.contentItem.children[child].textWidth
@@ -51,9 +54,10 @@ ListView {
property int textWidth: objRow.width + objRow.anchors.leftMargin*2
property bool checked: false
property string visibleText: objName.text
+ color: sysPalette.base
border {
- color: "#becad5"
+ color: num.sysPalette.light//"#becad5"
width: 1
}
@@ -66,33 +70,33 @@ ListView {
name: "hovered"
PropertyChanges {
target: delegateRect
- color: "#d0e8fa"
+ color: sysPalette.highlight //"#d0e8fa"
}
PropertyChanges {
target: objName
- color: "#31363b"
+ color: sysPalette.highlightedText //"#31363b"
}
},
State {
name: "selected"
PropertyChanges {
target: delegateRect
- color: "#2196F3"
+ color: sysPalette.button//"#2196F3"
}
PropertyChanges {
target: objName
- color: "#eff0fa"
+ color: sysPalette.buttonText//"#eff0fa"
}
},
State {
name: "default"
PropertyChanges {
target: delegateRect
- color: "white"
+ color: sysPalette.base//"white"
}
PropertyChanges {
target: objName
- color: "black"
+ color: sysPalette.text//"black"
}
}
]
@@ -140,13 +144,13 @@ ListView {
Rectangle {
visible: (checkCurrent && listView.currentIndex == model.index) || (checkable && delegateRect.checked)
- color: "#2173f3"
+ color: num.sysPalette.base //"#2173f3"
width: height
height: objName.font.pixelSize/2
radius: width * 0.5
}
- Text {
+ KSText {
id: objName
text: textRole == "" ? modelData : listView.modelIsArray ? modelData[textRole] : model[textRole]
diff --git a/kstars/kstarslite/qml/modules/KSPage.qml b/kstars/kstarslite/qml/modules/KSPage.qml
index 581608e..f7bd989 100644
--- a/kstars/kstarslite/qml/modules/KSPage.qml
+++ b/kstars/kstarslite/qml/modules/KSPage.qml
@@ -19,4 +19,9 @@ import "../constants" 1.0
Pane {
property string title: ""
visible: false
+
+ background: Rectangle {
+ anchors.fill: parent
+ color: num.sysPalette.base
+ }
}
diff --git a/kstars/kstarslite/qml/modules/KSTab.qml b/kstars/kstarslite/qml/modules/KSTab.qml
index 8c4effc..11e4b96 100644
--- a/kstars/kstarslite/qml/modules/KSTab.qml
+++ b/kstars/kstarslite/qml/modules/KSTab.qml
@@ -11,7 +11,6 @@
import QtQuick 2.6
import QtQuick.Layouts 1.2
import QtQuick.Controls 2.0
-//import QtQuick.Controls 1.4
import "../constants" 1.0
Pane {
@@ -21,6 +20,10 @@ Pane {
property Item flickableItem: flickable
padding: 0
+ background: Rectangle {
+ color: num.sysPalette.base
+ }
+
//contentItem is already used by Pane so be it rootItem
property Item rootItem
diff --git a/kstars/kstarslite/qml/modules/KSTabButton.qml b/kstars/kstarslite/qml/modules/KSTabButton.qml
new file mode 100644
index 0000000..f311b52
--- /dev/null
+++ b/kstars/kstarslite/qml/modules/KSTabButton.qml
@@ -0,0 +1,15 @@
+import QtQuick 2.6
+import QtQuick.Controls 2.0
+import "../constants/" 1.0
+
+TabButton {
+ id: tabButton
+ contentItem: KSText {
+ text: tabButton.text
+ font: tabButton.font
+ opacity: enabled ? 1.0 : 0.3
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ elide: Text.ElideRight
+ }
+}
diff --git a/kstars/kstarslite/qml/modules/KSText.qml b/kstars/kstarslite/qml/modules/KSText.qml
new file mode 100644
index 0000000..26257a0
--- /dev/null
+++ b/kstars/kstarslite/qml/modules/KSText.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.6
+import QtQuick.Controls 2.0
+import "../constants/" 1.0
+
+Text {
+ color: num.sysPalette.text
+}
diff --git a/kstars/kstarslite/qml/modules/KSTextField.qml b/kstars/kstarslite/qml/modules/KSTextField.qml
new file mode 100644
index 0000000..bfb3795
--- /dev/null
+++ b/kstars/kstarslite/qml/modules/KSTextField.qml
@@ -0,0 +1,9 @@
+import QtQuick 2.6
+import QtQuick.Controls 2.0
+import "../constants/" 1.0
+
+TextField {
+ color: num.sysPalette.text
+ selectedTextColor: num.sysPalette.highlightedText
+ selectionColor: num.sysPalette.highlight
+}
diff --git a/kstars/kstarslite/qml/modules/SkyMapLiteWrapper.qml b/kstars/kstarslite/qml/modules/SkyMapLiteWrapper.qml
index 1c815e9..8396f25 100644
--- a/kstars/kstarslite/qml/modules/SkyMapLiteWrapper.qml
+++ b/kstars/kstarslite/qml/modules/SkyMapLiteWrapper.qml
@@ -59,7 +59,25 @@ Item {
top: parent.top
margins: 25
}
- onClicked: SkyMapLite.centerLocked = false
+ onClicked: {
+ SkyMapLite.centerLocked = false
+ }
+ onPressedChanged: {
+ if(pressed)
+ lockBG.color = "#D40000"
+ else
+ lockBG.color = "red"
+ }
+
+ background: Rectangle {
+ id: lockBG
+ color: "red"
+ implicitWidth: 100
+ implicitHeight: 70
+ radius: 4
+ border.width: 3
+ border.color: "#AA0000"
+ }
Image {
source: "../images/lock-closed.png"
diff --git a/kstars/kstarslite/qml/modules/TimePage.qml b/kstars/kstarslite/qml/modules/TimePage.qml
index 2103cff..a5b9145 100644
--- a/kstars/kstarslite/qml/modules/TimePage.qml
+++ b/kstars/kstarslite/qml/modules/TimePage.qml
@@ -105,7 +105,7 @@ KSPage {
}
}
- Text {
+ KSText {
font.pointSize: 14
text: Qt.locale().standaloneMonthName(userMonth) + " " + monthGrid.year
anchors.centerIn: parent
@@ -182,7 +182,7 @@ KSPage {
color: "#DCDCDC"
}
- Text {
+ KSText {
anchors.centerIn: parent
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
@@ -235,7 +235,7 @@ KSPage {
Layout.fillWidth: true
ColumnLayout {
- Label {
+ KSLabel {
id:labelYear
text: "Year"
}
@@ -277,7 +277,7 @@ KSPage {
ColumnLayout {
Layout.fillHeight: true
- Label {
+ KSLabel {
id:labelMonth
text: "Month"
}
@@ -330,7 +330,7 @@ KSPage {
ColumnLayout {
visible: false
- Label {
+ KSLabel {
id:labelWeek
text: "Week"
}
@@ -376,7 +376,7 @@ KSPage {
}
ColumnLayout {
- Label {
+ KSLabel {
id:labelDay
text: "Day"
}
@@ -450,7 +450,7 @@ KSPage {
RowLayout {
Layout.fillWidth: true
ColumnLayout {
- Label {
+ KSLabel {
id: labelHour
text: "Hour"
}
@@ -462,7 +462,7 @@ KSPage {
implicitWidth: tumblersGrid.tumblerWidth
anchors.horizontalCenter: labelHour.horizontalCenter
- delegate: Text {
+ delegate: KSText {
text: modelData < 10 ? "0" + modelData : modelData
font: tumblerHour.font
horizontalAlignment: Text.AlignHCenter
@@ -481,7 +481,7 @@ KSPage {
}
ColumnLayout {
- Label {
+ KSLabel {
id:labelMinute
text: "Min."
}
@@ -493,7 +493,7 @@ KSPage {
implicitWidth: tumblersGrid.tumblerWidth
anchors.horizontalCenter: labelMinute.horizontalCenter
- delegate: Text {
+ delegate: KSText {
text: modelData < 10 ? "0" + modelData : modelData
font: tumblerHour.font
horizontalAlignment: Text.AlignHCenter
diff --git a/kstars/kstarslite/qml/modules/TopMenu.qml b/kstars/kstarslite/qml/modules/TopMenu.qml
index dd3c57c..b8146f5 100644
--- a/kstars/kstarslite/qml/modules/TopMenu.qml
+++ b/kstars/kstarslite/qml/modules/TopMenu.qml
@@ -96,7 +96,7 @@ ColumnLayout {
background: Rectangle {
id: menuRect
- color: num.sysPalette.dark
+ color: num.sysPalette.base
border {
width: 2
color: num.sysPalette.light
diff --git a/kstars/kstarslite/qml/modules/helpers/BottomMenuButton.qml b/kstars/kstarslite/qml/modules/helpers/BottomMenuButton.qml
index 21e0397..1d0062f 100644
--- a/kstars/kstarslite/qml/modules/helpers/BottomMenuButton.qml
+++ b/kstars/kstarslite/qml/modules/helpers/BottomMenuButton.qml
@@ -35,7 +35,7 @@ AbstractButton {
}
color: "black"
border {
- color: "grey"
+ color: num.sysPalette.light
width: 1
}
}
diff --git a/kstars/kstarslite/qml/modules/helpers/KSMenuItem.qml b/kstars/kstarslite/qml/modules/helpers/KSMenuItem.qml
index 941ae21..50c1713 100644
--- a/kstars/kstarslite/qml/modules/helpers/KSMenuItem.qml
+++ b/kstars/kstarslite/qml/modules/helpers/KSMenuItem.qml
@@ -13,15 +13,23 @@ import QtQuick.Controls 2.0
import "../../constants/" 1.0
MenuItem {
+ id: menuItem
onVisibleChanged: {
//Height stays the same when visible is changed so we update height manually
height = visible ? implicitHeight : 0
}
+ contentItem: Text {
+ text: menuItem.text
+ font: menuItem.font
+ color: num.sysPalette.text
+ opacity: enabled ? 1.0 : 0.3
+ }
+
Rectangle {
width: parent.width - 10
height: 1
- color: "#E8E8E8"
+ color: num.sysPalette.light
anchors {
bottom: parent.bottom
bottomMargin: 5
diff --git a/kstars/kstarslite/qml/modules/helpers/PassiveNotification.qml b/kstars/kstarslite/qml/modules/helpers/PassiveNotification.qml
index 0a3ecf6..ab5c495 100644
--- a/kstars/kstarslite/qml/modules/helpers/PassiveNotification.qml
+++ b/kstars/kstarslite/qml/modules/helpers/PassiveNotification.qml
@@ -22,6 +22,7 @@ import QtQuick.Controls 2.0 as Controls
import QtQuick.Layouts 1.2
import QtGraphicalEffects 1.0
import "../../constants" 1.0
+import "../../modules"
MouseArea {
id: root
@@ -113,7 +114,9 @@ MouseArea {
id: backgroundRect
anchors.centerIn: parent
radius: units.smallSpacing
- color: num.sysPalette.windowText
+ color: num.sysPalette.base
+ border.color: num.sysPalette.light
+ border.width: 1
opacity: 0.6
width: mainLayout.width + Math.round((height - mainLayout.height))
height: Math.max(mainLayout.height + units.smallSpacing*2, units.gridUnit*2)
@@ -122,11 +125,9 @@ MouseArea {
RowLayout {
id: mainLayout
anchors.centerIn: parent
- Controls.Label {
+ KSLabel {
id: messageLabel
width: Math.min(root.parent.width - units.largeSpacing*2, implicitWidth)
-
- color: num.sysPalette.window
}
Controls.Button {
id: actionButton
@@ -148,7 +149,7 @@ MouseArea {
verticalOffset: 0
radius: units.gridUnit
samples: 32
- color: Qt.rgba(0, 0, 0, 0.5)
+ color: num.sysPalette.shadow//Qt.rgba(0, 0, 0, 0.5)
}
}
}
diff --git a/kstars/kstarslite/qml/modules/helpers/TimeSpinBox.qml b/kstars/kstarslite/qml/modules/helpers/TimeSpinBox.qml
index 2b00f6f..574a08a 100644
--- a/kstars/kstarslite/qml/modules/helpers/TimeSpinBox.qml
+++ b/kstars/kstarslite/qml/modules/helpers/TimeSpinBox.qml
@@ -22,7 +22,7 @@ SpinBox {
text: control.textFromValue(control.value, control.locale)
font: control.font
- color: num.sysPalette.light
+ color: num.sysPalette.baseText
selectionColor: num.sysPalette.highlight
selectedTextColor: num.sysPalette.highlightedText
horizontalAlignment: Qt.AlignHCenter
diff --git a/kstars/kstarslite/qml/modules/menus/ContextMenu.qml b/kstars/kstarslite/qml/modules/menus/ContextMenu.qml
index ea3a61f..4ec896d 100644
--- a/kstars/kstarslite/qml/modules/menus/ContextMenu.qml
+++ b/kstars/kstarslite/qml/modules/menus/ContextMenu.qml
@@ -13,12 +13,18 @@ import QtQuick 2.7
import QtQuick.Layouts 1.1
import "../../constants" 1.0
import "../helpers"
+import "../../modules"
Menu {
id: contextMenu
modal: true
transformOrigin: Menu.Center
padding: 5
+ background: Rectangle {
+ implicitWidth: 200
+ color: num.sysPalette.base
+ radius: 5
+ }
property bool isPoint: false
@@ -36,7 +42,7 @@ Menu {
width: parent.width
spacing: 10
- Label {
+ KSLabel {
id: objectName
text: isPoint ? xi18n("Empty Sky") : SkyMapLite.clickedObjectLite.translatedName
wrapMode: Label.WrapAtWordBoundaryOrAnywhere
@@ -49,7 +55,7 @@ Menu {
}
Rectangle {
- color: "grey"
+ color: num.sysPalette.light
width: parent.width - 10
height: 1
anchors {
@@ -104,7 +110,7 @@ Menu {
}
}
- Text {
+ KSText {
id: telescopeName
visible: telescopeCol.isTelescope
wrapMode: Text.Wrap
@@ -116,7 +122,7 @@ Menu {
}
Rectangle {
- color: "grey"
+ color: num.sysPalette.light
visible: telescopeCol.isTelescope
width: parent.width - 10
height: 1
diff --git a/kstars/kstarslite/qml/modules/popups/ColorSchemePopup.qml b/kstars/kstarslite/qml/modules/popups/ColorSchemePopup.qml
index 2b92c01..909e977 100644
--- a/kstars/kstarslite/qml/modules/popups/ColorSchemePopup.qml
+++ b/kstars/kstarslite/qml/modules/popups/ColorSchemePopup.qml
@@ -22,10 +22,17 @@ Popup {
height: parent.height > colorsList.implicitHeight ? colorsList.implicitHeight : parent.height
signal colorSchemeChanged()
+ property string currentCScheme: colorsModel.get(colorsList.currentIndex).scheme
+
function formatColorScheme(schemeName) {
return schemeName.substring(3) + ".colors"
}
+ background: Rectangle {
+ anchors.fill: parent
+ color: num.sysPalette.base
+ }
+
KSListView {
id: colorsList
anchors.centerIn: parent
diff --git a/kstars/kstarslite/qml/modules/popups/FOVPopup.qml b/kstars/kstarslite/qml/modules/popups/FOVPopup.qml
index 9cfc7d2..131b5fe 100644
--- a/kstars/kstarslite/qml/modules/popups/FOVPopup.qml
+++ b/kstars/kstarslite/qml/modules/popups/FOVPopup.qml
@@ -21,6 +21,11 @@ Popup {
modal: true
width: fovList.implicitWidth
height: parent.height > fovList.implicitHeight ? fovList.implicitHeight : parent.height
+ background: Rectangle {
+ anchors.fill: parent
+ color: num.sysPalette.base
+ }
+
KSListView {
id: fovList
diff --git a/kstars/kstarslite/qml/modules/popups/ProjectionsPopup.qml b/kstars/kstarslite/qml/modules/popups/ProjectionsPopup.qml
index 3a4ec47..28842bc 100644
--- a/kstars/kstarslite/qml/modules/popups/ProjectionsPopup.qml
+++ b/kstars/kstarslite/qml/modules/popups/ProjectionsPopup.qml
@@ -22,6 +22,11 @@ Popup {
width: projList.implicitWidth
height: parent.height > projList.implicitHeight ? projList.implicitHeight : parent.height
+ background: Rectangle {
+ anchors.fill: parent
+ color: num.sysPalette.base
+ }
+
KSListView {
id: projList
anchors {
diff --git a/kstars/kstarslite/qml/modules/tutorial/TutorialPane.qml b/kstars/kstarslite/qml/modules/tutorial/TutorialPane.qml
index 8b3737b..bc1b9c8 100644
--- a/kstars/kstarslite/qml/modules/tutorial/TutorialPane.qml
+++ b/kstars/kstarslite/qml/modules/tutorial/TutorialPane.qml
@@ -16,6 +16,7 @@ import QtQuick.Controls.Universal 2.0
import QtQuick.Window 2.2 as Window
import QtQuick.Layouts 1.1
+import "../../modules"
Pane {
property string title
@@ -26,7 +27,7 @@ Pane {
width: parent.width
height: childrenRect.height
- Label {
+ KSLabel {
width: parent.width
wrapMode: Text.Wrap
horizontalAlignment: Text.AlignHCenter
@@ -34,7 +35,7 @@ Pane {
font.pointSize: 20
}
- Text {
+ KSText {
width: parent.width
wrapMode: Text.Wrap
horizontalAlignment: Text.AlignHCenter
diff --git a/kstars/kstarslite/qml/modules/tutorial/TutorialPopup.qml b/kstars/kstarslite/qml/modules/tutorial/TutorialPopup.qml
index 7546c53..3666802 100644
--- a/kstars/kstarslite/qml/modules/tutorial/TutorialPopup.qml
+++ b/kstars/kstarslite/qml/modules/tutorial/TutorialPopup.qml
@@ -17,6 +17,9 @@ import QtQuick.Controls.Universal 2.0
import QtQuick.Window 2.2 as Window
import QtQuick.Layouts 1.1
+import "../../constants" 1.0
+import "../../modules"
+
Popup {
id: studyMode
contentWidth: parent.width * 0.75
@@ -24,12 +27,16 @@ Popup {
focus: true
modal: true
+ background: Rectangle {
+ color: num.sysPalette.base
+ }
+
Column {
id: studyCol
width: parent.width
height: childrenRect.height
- Label {
+ KSLabel {
width: parent.width
wrapMode: Text.Wrap
horizontalAlignment: Text.AlignHCenter
@@ -37,14 +44,14 @@ Popup {
font.pointSize: 20
}
- Text {
+ KSText {
width: parent.width
wrapMode: Text.Wrap
horizontalAlignment: Text.AlignHCenter
text: xi18n("KStars Lite is a free, open source, cross-platform Astronomy Software designed for mobile devices.")
}
- Text {
+ KSText {
width: parent.width
wrapMode: Text.Wrap
horizontalAlignment: Text.AlignHCenter
diff --git a/kstars/kstarslite/skyitems/rootnode.cpp b/kstars/kstarslite/skyitems/rootnode.cpp
index 1c9eb3e..b3e1ab1 100644
--- a/kstars/kstarslite/skyitems/rootnode.cpp
+++ b/kstars/kstarslite/skyitems/rootnode.cpp
@@ -41,9 +41,10 @@
#ifdef HAVE_INDI
//Symbols
#include "kstarslite/skyitems/telescopesymbolsitem.h"
-#include "kstarslite/skyitems/fovitem.h"
#endif
+#include "kstarslite/skyitems/fovitem.h"
+
#include <QSGFlatColorMaterial>
RootNode::RootNode()