mirrors/sddm
0
0
Fork 0
mirror of https://github.com/sddm/sddm.git synced 2024-11-27 20:13:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove COMPONENTS_VERSION

Browse Source 
We only have SDDM components version 2.0 and no longer maintain
two versions at the same time like we used to do before.
This commit is contained in:
Pier Luigi Fiorini 2018-03-01 09:15:23 +01:00
parent 945a95d908
commit b304011c26
13 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -101,9 +101,6 @@ if(NOT QT_IMPORTS_DIR)
exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" RETURN_VALUE return_code OUTPUT_VARIABLE QT_IMPORTS_DIR)
endif()
# Set components version
set(COMPONENTS_VERSION 2.0)
# Uninstall target
if ("${ECM_VERSION}" VERSION_LESS "1.7.0")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"

9
components/CMakeLists.txt
View File

@ -1,8 +1,5 @@
configure_file("${COMPONENTS_VERSION}/LayoutBox.qml" "${COMPONENTS_VERSION}/LayoutBox.qml")
configure_file("common/qmldir" "common/qmldir")
install(DIRECTORY "${COMPONENTS_VERSION}/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${COMPONENTS_VERSION}/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
configure_file("2.0/LayoutBox.qml" "2.0/LayoutBox.qml")
install(DIRECTORY "2.0/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
install(DIRECTORY "common/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/common/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/2.0/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")

22
components/common/qmldir
View File

@ -1,13 +1,13 @@
module SddmComponents
Background ${COMPONENTS_VERSION} Background.qml
Button ${COMPONENTS_VERSION} Button.qml
Clock ${COMPONENTS_VERSION} Clock.qml
ComboBox ${COMPONENTS_VERSION} ComboBox.qml
ImageButton ${COMPONENTS_VERSION} ImageButton.qml
LayoutBox ${COMPONENTS_VERSION} LayoutBox.qml
Menu ${COMPONENTS_VERSION} Menu.qml
PasswordBox ${COMPONENTS_VERSION} PasswordBox.qml
PictureBox ${COMPONENTS_VERSION} PictureBox.qml
TextBox ${COMPONENTS_VERSION} TextBox.qml
TextConstants ${COMPONENTS_VERSION} TextConstants.qml
Background 2.0 Background.qml
Button 2.0 Button.qml
Clock 2.0 Clock.qml
ComboBox 2.0 ComboBox.qml
ImageButton 2.0 ImageButton.qml
LayoutBox 2.0 LayoutBox.qml
Menu 2.0 Menu.qml
PasswordBox 2.0 PasswordBox.qml
PictureBox 2.0 PictureBox.qml
TextBox 2.0 TextBox.qml
TextConstants 2.0 TextConstants.qml

6
data/themes/CMakeLists.txt
View File

@ -6,19 +6,13 @@ foreach(THEME ${THEMES})
set(TRANSLATIONS_DIR "${THEME}/translations")
file(GLOB TRANSLATION_SOURCES "${TRANSLATIONS_DIR}/*.ts")
configure_file("${THEME}/Main.qml" "${THEME}/Main.qml")
configure_file("${THEME}/metadata.desktop" "${THEME}/metadata.desktop")
set_source_files_properties(${TRANSLATION_SOURCES} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${TRANSLATIONS_DIR}")
qt5_add_translation(QM_FILES "${TRANSLATION_SOURCES}")
install(DIRECTORY "${THEME}" DESTINATION "${DATA_INSTALL_DIR}/themes" PATTERN "${THEME}/*.ts"
EXCLUDE PATTERN "${THEME}/Main.qml"
EXCLUDE PATTERN "${THEME}/metadata.desktop"
EXCLUDE PATTERN "${THEME}/.gitattributes"
EXCLUDE)
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${THEME}" DESTINATION "${DATA_INSTALL_DIR}/themes")
list(APPEND THEMES_QM_FILES ${QM_FILES})
endforeach(THEME)

4
data/themes/elarun/Main.qml
View File

@ -23,8 +23,8 @@
*
***************************************************************************/
import QtQuick ${COMPONENTS_VERSION}
import SddmComponents ${COMPONENTS_VERSION}
import QtQuick 2.0
import SddmComponents 2.0
Rectangle {
width: 640

2
data/themes/elarun/metadata.desktop
View File

@ -44,6 +44,6 @@ MainScript=Main.qml
ConfigFile=theme.conf
TranslationsDirectory=translations
Theme-Id=elarun
Theme-API=${COMPONENTS_VERSION}
Theme-API=2.0
Website=https://github.com/sddm/sddm

4
data/themes/maldives/Main.qml
View File

@ -22,8 +22,8 @@
*
***************************************************************************/
import QtQuick ${COMPONENTS_VERSION}
import SddmComponents ${COMPONENTS_VERSION}
import QtQuick 2.0
import SddmComponents 2.0
Rectangle {
id: container

2
data/themes/maldives/metadata.desktop
View File

@ -13,4 +13,4 @@ ConfigFile=theme.conf
TranslationsDirectory=translations
Email=abdurrahmanavci@gmail.com
Theme-Id=maldives
Theme-API=${COMPONENTS_VERSION}
Theme-API=2.0

2
data/themes/maya/metadata.desktop
View File

@ -13,4 +13,4 @@ ConfigFile=theme.conf
TranslationsDirectory=translations
Email=spremi@ymail.com
Theme-Id=maya
Theme-API=${COMPONENTS_VERSION}
Theme-API=2.0

3
src/greeter/CMakeLists.txt
View File

@ -21,8 +21,7 @@ set(GREETER_SOURCES
XcbKeyboardBackend.cpp
)
configure_file("theme/Main.qml" "theme/Main.qml")
configure_file("theme.qrc" "theme.qrc")
configure_file("theme.qrc" "theme.qrc")
qt5_add_resources(RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/theme.qrc)

2
src/greeter/theme.qrc
View File

@ -4,7 +4,7 @@
<file alias="angle-left.png">${CMAKE_CURRENT_SOURCE_DIR}/theme/angle-left.png</file>
<file alias="angle-right.png">${CMAKE_CURRENT_SOURCE_DIR}/theme/angle-right.png</file>
<file alias="background.png">${CMAKE_CURRENT_SOURCE_DIR}/theme/background.png</file>
<file alias="Main.qml">${CMAKE_CURRENT_BINARY_DIR}/theme/Main.qml</file>
<file alias="Main.qml">${CMAKE_CURRENT_SOURCE_DIR}/theme/Main.qml</file>
<file alias="reboot.png">${CMAKE_CURRENT_SOURCE_DIR}/theme/reboot.png</file>
<file alias="shutdown.png">${CMAKE_CURRENT_SOURCE_DIR}/theme/shutdown.png</file>
<file alias="metadata.desktop">${CMAKE_CURRENT_SOURCE_DIR}/theme/metadata.desktop</file>

4
src/greeter/theme/Main.qml
View File

@ -23,8 +23,8 @@
*
***************************************************************************/
import QtQuick ${COMPONENTS_VERSION}
import SddmComponents ${COMPONENTS_VERSION}
import QtQuick 2.0
import SddmComponents 2.0
Rectangle {
id: container

2
src/greeter/theme/metadata.desktop
View File

@ -13,4 +13,4 @@ ConfigFile=theme.conf
TranslationsDirectory=translations
Email=abdurrahmanavci@gmail.com
Theme-Id=maui
Theme-API=${COMPONENTS_VERSION}
Theme-API=2.0