lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-12 10:45:38 +02:00
Code Activity

misc: move application sources from 'src/' to 'src/app/'

Browse source 
In preparation for vendoring libjamiclient into 'src/libclient/'.

GitLab: #734
Change-Id: Ibd956abc8fe9bd454ac0e9a5a28b77a5a74174e7
This commit is contained in:
Amin Bandali 2022-05-06 13:25:15 -04:00
parent cbde5d9047
commit c7fdf3ff30
409 changed files with 56635 additions and 56635 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -28,7 +28,7 @@ qml_without_webengine.qrc
# auto-gen files # auto-gen files
resources.qrc resources.qrc
src/constant/JamiResources.qml src/app/constant/JamiResources.qml
# macOS # macOS
.DS_Store .DS_Store

234
CMakeLists.txt
View file

@ -63,7 +63,7 @@ foreach(MODULE ${QT_MODULES})
list(APPEND QT_LIBS "Qt::${MODULE}") list(APPEND QT_LIBS "Qt::${MODULE}")
endforeach() endforeach()
set(SRC_DIR ${PROJECT_SOURCE_DIR}/src) set(APP_SRC_DIR ${PROJECT_SOURCE_DIR}/src/app)
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}) set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS})
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
@ -112,115 +112,115 @@ execute_process(
add_definitions(-DQT_NO_KEYWORDS) add_definitions(-DQT_NO_KEYWORDS)
set(COMMON_SOURCES set(COMMON_SOURCES
${SRC_DIR}/bannedlistmodel.cpp ${APP_SRC_DIR}/bannedlistmodel.cpp
${SRC_DIR}/accountlistmodel.cpp ${APP_SRC_DIR}/accountlistmodel.cpp
${SRC_DIR}/networkmanager.cpp ${APP_SRC_DIR}/networkmanager.cpp
${SRC_DIR}/instancemanager.cpp ${APP_SRC_DIR}/instancemanager.cpp
${SRC_DIR}/main.cpp ${APP_SRC_DIR}/main.cpp
${SRC_DIR}/smartlistmodel.cpp ${APP_SRC_DIR}/smartlistmodel.cpp
${SRC_DIR}/utils.cpp ${APP_SRC_DIR}/utils.cpp
${SRC_DIR}/mainapplication.cpp ${APP_SRC_DIR}/mainapplication.cpp
${SRC_DIR}/messagesadapter.cpp ${APP_SRC_DIR}/messagesadapter.cpp
${SRC_DIR}/accountadapter.cpp ${APP_SRC_DIR}/accountadapter.cpp
${SRC_DIR}/calladapter.cpp ${APP_SRC_DIR}/calladapter.cpp
${SRC_DIR}/conversationsadapter.cpp ${APP_SRC_DIR}/conversationsadapter.cpp
${SRC_DIR}/avadapter.cpp ${APP_SRC_DIR}/avadapter.cpp
${SRC_DIR}/contactadapter.cpp ${APP_SRC_DIR}/contactadapter.cpp
${SRC_DIR}/pluginadapter.cpp ${APP_SRC_DIR}/pluginadapter.cpp
${SRC_DIR}/deviceitemlistmodel.cpp ${APP_SRC_DIR}/deviceitemlistmodel.cpp
${SRC_DIR}/pluginlistmodel.cpp ${APP_SRC_DIR}/pluginlistmodel.cpp
${SRC_DIR}/pluginhandlerlistmodel.cpp ${APP_SRC_DIR}/pluginhandlerlistmodel.cpp
${SRC_DIR}/preferenceitemlistmodel.cpp ${APP_SRC_DIR}/preferenceitemlistmodel.cpp
${SRC_DIR}/mediacodeclistmodel.cpp ${APP_SRC_DIR}/mediacodeclistmodel.cpp
${SRC_DIR}/currentaccounttomigrate.cpp ${APP_SRC_DIR}/currentaccounttomigrate.cpp
${SRC_DIR}/audiodevicemodel.cpp ${APP_SRC_DIR}/audiodevicemodel.cpp
${SRC_DIR}/pluginlistpreferencemodel.cpp ${APP_SRC_DIR}/pluginlistpreferencemodel.cpp
${SRC_DIR}/audiomanagerlistmodel.cpp ${APP_SRC_DIR}/audiomanagerlistmodel.cpp
${SRC_DIR}/qmlregister.cpp ${APP_SRC_DIR}/qmlregister.cpp
${SRC_DIR}/utilsadapter.cpp ${APP_SRC_DIR}/utilsadapter.cpp
${SRC_DIR}/moderatorlistmodel.cpp ${APP_SRC_DIR}/moderatorlistmodel.cpp
${SRC_DIR}/screensaver.cpp ${APP_SRC_DIR}/screensaver.cpp
${SRC_DIR}/systemtray.cpp ${APP_SRC_DIR}/systemtray.cpp
${SRC_DIR}/appsettingsmanager.cpp ${APP_SRC_DIR}/appsettingsmanager.cpp
${SRC_DIR}/lrcinstance.cpp ${APP_SRC_DIR}/lrcinstance.cpp
${SRC_DIR}/selectablelistproxymodel.cpp ${APP_SRC_DIR}/selectablelistproxymodel.cpp
${SRC_DIR}/conversationlistmodelbase.cpp ${APP_SRC_DIR}/conversationlistmodelbase.cpp
${SRC_DIR}/conversationlistmodel.cpp ${APP_SRC_DIR}/conversationlistmodel.cpp
${SRC_DIR}/searchresultslistmodel.cpp ${APP_SRC_DIR}/searchresultslistmodel.cpp
${SRC_DIR}/calloverlaymodel.cpp ${APP_SRC_DIR}/calloverlaymodel.cpp
${SRC_DIR}/filestosendlistmodel.cpp ${APP_SRC_DIR}/filestosendlistmodel.cpp
${SRC_DIR}/wizardviewstepmodel.cpp ${APP_SRC_DIR}/wizardviewstepmodel.cpp
${SRC_DIR}/avatarregistry.cpp ${APP_SRC_DIR}/avatarregistry.cpp
${SRC_DIR}/currentconversation.cpp ${APP_SRC_DIR}/currentconversation.cpp
${SRC_DIR}/currentaccount.cpp ${APP_SRC_DIR}/currentaccount.cpp
${SRC_DIR}/videodevices.cpp ${APP_SRC_DIR}/videodevices.cpp
${SRC_DIR}/videoprovider.cpp ${APP_SRC_DIR}/videoprovider.cpp
${SRC_DIR}/callparticipantsmodel.cpp ${APP_SRC_DIR}/callparticipantsmodel.cpp
) )
set(COMMON_HEADERS set(COMMON_HEADERS
${SRC_DIR}/avatarimageprovider.h ${APP_SRC_DIR}/avatarimageprovider.h
${SRC_DIR}/networkmanager.h ${APP_SRC_DIR}/networkmanager.h
${SRC_DIR}/smartlistmodel.h ${APP_SRC_DIR}/smartlistmodel.h
${SRC_DIR}/updatemanager.h ${APP_SRC_DIR}/updatemanager.h
${SRC_DIR}/utils.h ${APP_SRC_DIR}/utils.h
${SRC_DIR}/bannedlistmodel.h ${APP_SRC_DIR}/bannedlistmodel.h
${SRC_DIR}/version.h ${APP_SRC_DIR}/version.h
${SRC_DIR}/accountlistmodel.h ${APP_SRC_DIR}/accountlistmodel.h
${SRC_DIR}/instancemanager.h ${APP_SRC_DIR}/instancemanager.h
${SRC_DIR}/connectivitymonitor.h ${APP_SRC_DIR}/connectivitymonitor.h
${SRC_DIR}/jamiavatartheme.h ${APP_SRC_DIR}/jamiavatartheme.h
${SRC_DIR}/mainapplication.h ${APP_SRC_DIR}/mainapplication.h
${SRC_DIR}/qrimageprovider.h ${APP_SRC_DIR}/qrimageprovider.h
${SRC_DIR}/messagesadapter.h ${APP_SRC_DIR}/messagesadapter.h
${SRC_DIR}/accountadapter.h ${APP_SRC_DIR}/accountadapter.h
${SRC_DIR}/calladapter.h ${APP_SRC_DIR}/calladapter.h
${SRC_DIR}/conversationsadapter.h ${APP_SRC_DIR}/conversationsadapter.h
${SRC_DIR}/qmladapterbase.h ${APP_SRC_DIR}/qmladapterbase.h
${SRC_DIR}/avadapter.h ${APP_SRC_DIR}/avadapter.h
${SRC_DIR}/contactadapter.h ${APP_SRC_DIR}/contactadapter.h
${SRC_DIR}/pluginadapter.h ${APP_SRC_DIR}/pluginadapter.h
${SRC_DIR}/deviceitemlistmodel.h ${APP_SRC_DIR}/deviceitemlistmodel.h
${SRC_DIR}/pluginlistmodel.h ${APP_SRC_DIR}/pluginlistmodel.h
${SRC_DIR}/pluginhandlerlistmodel.h ${APP_SRC_DIR}/pluginhandlerlistmodel.h
${SRC_DIR}/preferenceitemlistmodel.h ${APP_SRC_DIR}/preferenceitemlistmodel.h
${SRC_DIR}/mediacodeclistmodel.h ${APP_SRC_DIR}/mediacodeclistmodel.h
${SRC_DIR}/currentaccounttomigrate.h ${APP_SRC_DIR}/currentaccounttomigrate.h
${SRC_DIR}/audiodevicemodel.h ${APP_SRC_DIR}/audiodevicemodel.h
${SRC_DIR}/pluginlistpreferencemodel.h ${APP_SRC_DIR}/pluginlistpreferencemodel.h
${SRC_DIR}/audiomanagerlistmodel.h ${APP_SRC_DIR}/audiomanagerlistmodel.h
${SRC_DIR}/qmlregister.h ${APP_SRC_DIR}/qmlregister.h
${SRC_DIR}/abstractlistmodelbase.h ${APP_SRC_DIR}/abstractlistmodelbase.h
${SRC_DIR}/quickimageproviderbase.h ${APP_SRC_DIR}/quickimageproviderbase.h
${SRC_DIR}/qtutils.h ${APP_SRC_DIR}/qtutils.h
${SRC_DIR}/utilsadapter.h ${APP_SRC_DIR}/utilsadapter.h
${SRC_DIR}/moderatorlistmodel.h ${APP_SRC_DIR}/moderatorlistmodel.h
${SRC_DIR}/screensaver.h ${APP_SRC_DIR}/screensaver.h
${SRC_DIR}/systemtray.h ${APP_SRC_DIR}/systemtray.h
${SRC_DIR}/appsettingsmanager.h ${APP_SRC_DIR}/appsettingsmanager.h
${SRC_DIR}/lrcinstance.h ${APP_SRC_DIR}/lrcinstance.h
${SRC_DIR}/selectablelistproxymodel.h ${APP_SRC_DIR}/selectablelistproxymodel.h
${SRC_DIR}/conversationlistmodelbase.h ${APP_SRC_DIR}/conversationlistmodelbase.h
${SRC_DIR}/conversationlistmodel.h ${APP_SRC_DIR}/conversationlistmodel.h
${SRC_DIR}/searchresultslistmodel.h ${APP_SRC_DIR}/searchresultslistmodel.h
${SRC_DIR}/calloverlaymodel.h ${APP_SRC_DIR}/calloverlaymodel.h
${SRC_DIR}/filestosendlistmodel.h ${APP_SRC_DIR}/filestosendlistmodel.h
${SRC_DIR}/wizardviewstepmodel.h ${APP_SRC_DIR}/wizardviewstepmodel.h
${SRC_DIR}/avatarregistry.h ${APP_SRC_DIR}/avatarregistry.h
${SRC_DIR}/currentconversation.h ${APP_SRC_DIR}/currentconversation.h
${SRC_DIR}/currentaccount.h ${APP_SRC_DIR}/currentaccount.h
${SRC_DIR}/videodevices.h ${APP_SRC_DIR}/videodevices.h
${SRC_DIR}/videoprovider.h ${APP_SRC_DIR}/videoprovider.h
${SRC_DIR}/callparticipantsmodel.h ${APP_SRC_DIR}/callparticipantsmodel.h
) )
if(WITH_WEBENGINE) if(WITH_WEBENGINE)
list(APPEND COMMON_SOURCES list(APPEND COMMON_SOURCES
${SRC_DIR}/previewengine.cpp) ${APP_SRC_DIR}/previewengine.cpp)
add_definitions(-DWITH_WEBENGINE) add_definitions(-DWITH_WEBENGINE)
else() else()
list(APPEND COMMON_SOURCES list(APPEND COMMON_SOURCES
${SRC_DIR}/nowebengine/previewengine.cpp) ${APP_SRC_DIR}/nowebengine/previewengine.cpp)
endif() endif()
# For libavutil/avframe. # For libavutil/avframe.
@ -250,8 +250,8 @@ if(MSVC)
) )
list(APPEND COMMON_SOURCES list(APPEND COMMON_SOURCES
${SRC_DIR}/connectivitymonitor.cpp ${APP_SRC_DIR}/connectivitymonitor.cpp
${SRC_DIR}/updatemanager.cpp ${APP_SRC_DIR}/updatemanager.cpp
) )
# preprocessor defines # preprocessor defines
add_definitions(-DUNICODE -DQT_NO_DEBUG -DNDEBUG) add_definitions(-DUNICODE -DQT_NO_DEBUG -DNDEBUG)
@ -305,13 +305,13 @@ if(MSVC)
) )
elseif (NOT APPLE) elseif (NOT APPLE)
list(APPEND COMMON_SOURCES list(APPEND COMMON_SOURCES
${SRC_DIR}/xrectsel.c ${APP_SRC_DIR}/xrectsel.c
${SRC_DIR}/dbuserrorhandler.cpp ${APP_SRC_DIR}/dbuserrorhandler.cpp
${SRC_DIR}/connectivitymonitor.cpp ${APP_SRC_DIR}/connectivitymonitor.cpp
${SRC_DIR}/updatemanager.cpp) ${APP_SRC_DIR}/updatemanager.cpp)
list(APPEND COMMON_HEADERS list(APPEND COMMON_HEADERS
${SRC_DIR}/dbuserrorhandler.h ${APP_SRC_DIR}/dbuserrorhandler.h
${SRC_DIR}/xrectsel.h) ${APP_SRC_DIR}/xrectsel.h)
list(APPEND QT_LIBS Qt::DBus) list(APPEND QT_LIBS Qt::DBus)
list(APPEND QT_MODULES DBus) list(APPEND QT_MODULES DBus)
@ -389,11 +389,11 @@ elseif (NOT APPLE)
find_library(X11 X11) find_library(X11 X11)
else() # APPLE else() # APPLE
list(APPEND COMMON_SOURCES list(APPEND COMMON_SOURCES
${SRC_DIR}/os/macos/updatemanager.mm ${APP_SRC_DIR}/os/macos/updatemanager.mm
${SRC_DIR}/os/macos/connectivitymonitor.mm ${APP_SRC_DIR}/os/macos/connectivitymonitor.mm
${SRC_DIR}/os/macos/macutils.mm) ${APP_SRC_DIR}/os/macos/macutils.mm)
list(APPEND COMMON_HEADERS list(APPEND COMMON_HEADERS
${SRC_DIR}/os/macos/macutils.h) ${APP_SRC_DIR}/os/macos/macutils.h)
if(NOT DEFINED LRC) if(NOT DEFINED LRC)
if(EXISTS ${PROJECT_SOURCE_DIR}/../install/lrc) if(EXISTS ${PROJECT_SOURCE_DIR}/../install/lrc)
set(LRC ${PROJECT_SOURCE_DIR}/../install/lrc) set(LRC ${PROJECT_SOURCE_DIR}/../install/lrc)
@ -465,11 +465,11 @@ endif()
# common include # common include
include_directories(${PROJECT_SOURCE_DIR} include_directories(${PROJECT_SOURCE_DIR}
${SRC_DIR}) ${APP_SRC_DIR})
# common executable sources # common executable sources
qt_add_executable(${PROJECT_NAME} MANUAL_FINALIZATION qt_add_executable(${PROJECT_NAME} MANUAL_FINALIZATION
${SRC_DIR}/main.cpp ${APP_SRC_DIR}/main.cpp
${COMMON_HEADERS} ${COMMON_HEADERS}
${COMMON_SOURCES} ${COMMON_SOURCES}
${QML_RESOURCES} ${QML_RESOURCES}
@ -540,7 +540,7 @@ if(MSVC)
WORKING_DIRECTORY "$<TARGET_FILE_DIR:${PROJECT_NAME}>" WORKING_DIRECTORY "$<TARGET_FILE_DIR:${PROJECT_NAME}>"
COMMAND ${CMAKE_COMMAND} -DTIME_STAMP_FILE=${TIME_STAMP_FILE} COMMAND ${CMAKE_COMMAND} -DTIME_STAMP_FILE=${TIME_STAMP_FILE}
-DWIN_DEPLOY_QT_PATH=${CMAKE_PREFIX_PATH}/bin -DWIN_DEPLOY_QT_PATH=${CMAKE_PREFIX_PATH}/bin
-DQML_SRC_DIR=${SRC_DIR} -DQML_SRC_DIR=${APP_SRC_DIR}
-DEXE_NAME=$<TARGET_FILE:${PROJECT_NAME}> -DEXE_NAME=$<TARGET_FILE:${PROJECT_NAME}>
-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/windows_qt_deploy.cmake) -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/windows_qt_deploy.cmake)
@ -613,7 +613,7 @@ elseif (NOT APPLE)
# install jami launcher that selects between clients # install jami launcher that selects between clients
install( install(
FILES FILES
"${PROJECT_SOURCE_DIR}/src/jami" "${PROJECT_SOURCE_DIR}/src/app/jami"
DESTINATION DESTINATION
${CMAKE_INSTALL_PREFIX}/bin ${CMAKE_INSTALL_PREFIX}/bin
PERMISSIONS PERMISSIONS
@ -711,7 +711,7 @@ else()
XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME TRUE) XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME TRUE)
if(DEPLOY) if(DEPLOY)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -DQML_SRC_DIR=${SRC_DIR} COMMAND ${CMAKE_COMMAND} -DQML_SRC_DIR=${APP_SRC_DIR}
-DMAC_DEPLOY_QT_PATH=${CMAKE_PREFIX_PATH}/bin -DMAC_DEPLOY_QT_PATH=${CMAKE_PREFIX_PATH}/bin
-DEXE_NAME="${CMAKE_BINARY_DIR}/${PROJECT_NAME}.app" -DEXE_NAME="${CMAKE_BINARY_DIR}/${PROJECT_NAME}.app"
-DSPARKLE_PATH=${SPARKLE_FRAMEWORK} -DSPARKLE_PATH=${SPARKLE_FRAMEWORK}

2
gen-resources.py
View file

@ -3,7 +3,7 @@ import sys
import re import re
resdir = 'resources' resdir = 'resources'
qmlfile = os.path.join('src', 'constant', 'JamiResources.qml') qmlfile = os.path.join('src', 'app', 'constant', 'JamiResources.qml')
sep = '_' sep = '_'
print("Generating resource files ...") print("Generating resource files ...")

376
qml.qrc
View file

@ -1,193 +1,193 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/">
<file>src/MainApplicationWindow.qml</file> <file>src/app/MainApplicationWindow.qml</file>
<file>src/DaemonReconnectWindow.qml</file> <file>src/app/DaemonReconnectWindow.qml</file>
<file>src/constant/JamiQmlUtils.qml</file> <file>src/app/constant/JamiQmlUtils.qml</file>
<file>src/constant/JamiStrings.qml</file> <file>src/app/constant/JamiStrings.qml</file>
<file>src/constant/JamiTheme.qml</file> <file>src/app/constant/JamiTheme.qml</file>
<file>src/commoncomponents/VideoView.qml</file> <file>src/app/commoncomponents/VideoView.qml</file>
<file>src/commoncomponents/LocalVideo.qml</file> <file>src/app/commoncomponents/LocalVideo.qml</file>
<file>src/commoncomponents/SettingParaCombobox.qml</file> <file>src/app/commoncomponents/SettingParaCombobox.qml</file>
<file>src/commoncomponents/PreferenceItemDelegate.qml</file> <file>src/app/commoncomponents/PreferenceItemDelegate.qml</file>
<file>src/commoncomponents/PasswordDialog.qml</file> <file>src/app/commoncomponents/PasswordDialog.qml</file>
<file>src/commoncomponents/EditableLineEdit.qml</file> <file>src/app/commoncomponents/EditableLineEdit.qml</file>
<file>src/commoncomponents/MaterialLineEdit.qml</file> <file>src/app/commoncomponents/MaterialLineEdit.qml</file>
<file>src/commoncomponents/PhotoboothView.qml</file> <file>src/app/commoncomponents/PhotoboothView.qml</file>
<file>src/commoncomponents/JamiListView.qml</file> <file>src/app/commoncomponents/JamiListView.qml</file>
<file>src/commoncomponents/DeleteAccountDialog.qml</file> <file>src/app/commoncomponents/DeleteAccountDialog.qml</file>
<file>src/commoncomponents/CustomBorder.qml</file> <file>src/app/commoncomponents/CustomBorder.qml</file>
<file>src/commoncomponents/PushButton.qml</file> <file>src/app/commoncomponents/PushButton.qml</file>
<file>src/commoncomponents/JamiFileDialog.qml</file> <file>src/app/commoncomponents/JamiFileDialog.qml</file>
<file>src/commoncomponents/MaterialButton.qml</file> <file>src/app/commoncomponents/MaterialButton.qml</file>
<file>src/commoncomponents/ElidedTextLabel.qml</file> <file>src/app/commoncomponents/ElidedTextLabel.qml</file>
<file>src/commoncomponents/SpinnerButton.qml</file> <file>src/app/commoncomponents/SpinnerButton.qml</file>
<file>src/commoncomponents/UsernameLineEdit.qml</file> <file>src/app/commoncomponents/UsernameLineEdit.qml</file>
<file>src/commoncomponents/Scaffold.qml</file> <file>src/app/commoncomponents/Scaffold.qml</file>
<file>src/commoncomponents/LineEditContextMenu.qml</file> <file>src/app/commoncomponents/LineEditContextMenu.qml</file>
<file>src/commoncomponents/BaseModalDialog.qml</file> <file>src/app/commoncomponents/BaseModalDialog.qml</file>
<file>src/commoncomponents/SimpleMessageDialog.qml</file> <file>src/app/commoncomponents/SimpleMessageDialog.qml</file>
<file>src/commoncomponents/ResponsiveImage.qml</file> <file>src/app/commoncomponents/ResponsiveImage.qml</file>
<file>src/commoncomponents/PresenceIndicator.qml</file> <file>src/app/commoncomponents/PresenceIndicator.qml</file>
<file>src/commoncomponents/DaemonReconnectPopup.qml</file> <file>src/app/commoncomponents/DaemonReconnectPopup.qml</file>
<file>src/commoncomponents/SpinningAnimation.qml</file> <file>src/app/commoncomponents/SpinningAnimation.qml</file>
<file>src/commoncomponents/MediaPreviewBase.qml</file> <file>src/app/commoncomponents/MediaPreviewBase.qml</file>
<file>src/settingsview/SettingsView.qml</file> <file>src/app/settingsview/SettingsView.qml</file>
<file>src/settingsview/components/ChatviewSettings.qml</file> <file>src/app/settingsview/components/ChatviewSettings.qml</file>
<file>src/settingsview/components/FileTransferSettings.qml</file> <file>src/app/settingsview/components/FileTransferSettings.qml</file>
<file>src/settingsview/components/SettingsMenu.qml</file> <file>src/app/settingsview/components/SettingsMenu.qml</file>
<file>src/settingsview/components/SettingsMenuButton.qml</file> <file>src/app/settingsview/components/SettingsMenuButton.qml</file>
<file>src/settingsview/components/SettingsHeader.qml</file> <file>src/app/settingsview/components/SettingsHeader.qml</file>
<file>src/settingsview/components/SystemSettings.qml</file> <file>src/app/settingsview/components/SystemSettings.qml</file>
<file>src/settingsview/components/RecordingSettings.qml</file> <file>src/app/settingsview/components/RecordingSettings.qml</file>
<file>src/settingsview/components/UpdateSettings.qml</file> <file>src/app/settingsview/components/UpdateSettings.qml</file>
<file>src/settingsview/components/AvSettingPage.qml</file> <file>src/app/settingsview/components/AvSettingPage.qml</file>
<file>src/settingsview/components/AudioSettings.qml</file> <file>src/app/settingsview/components/AudioSettings.qml</file>
<file>src/settingsview/components/VideoSettings.qml</file> <file>src/app/settingsview/components/VideoSettings.qml</file>
<file>src/settingsview/components/GeneralSettingsPage.qml</file> <file>src/app/settingsview/components/GeneralSettingsPage.qml</file>
<file>src/settingsview/components/PluginSettingsPage.qml</file> <file>src/app/settingsview/components/PluginSettingsPage.qml</file>
<file>src/settingsview/components/PluginListView.qml</file> <file>src/app/settingsview/components/PluginListView.qml</file>
<file>src/settingsview/components/PluginPreferencesView.qml</file> <file>src/app/settingsview/components/PluginPreferencesView.qml</file>
<file>src/settingsview/components/PluginPreferencesListView.qml</file> <file>src/app/settingsview/components/PluginPreferencesListView.qml</file>
<file>src/settingsview/components/CurrentAccountSettings.qml</file> <file>src/app/settingsview/components/CurrentAccountSettings.qml</file>
<file>src/settingsview/components/UserIdentity.qml</file> <file>src/app/settingsview/components/UserIdentity.qml</file>
<file>src/settingsview/components/JamiUserIdentity.qml</file> <file>src/app/settingsview/components/JamiUserIdentity.qml</file>
<file>src/settingsview/components/SIPUserIdentity.qml</file> <file>src/app/settingsview/components/SIPUserIdentity.qml</file>
<file>src/settingsview/components/AccountProfile.qml</file> <file>src/app/settingsview/components/AccountProfile.qml</file>
<file>src/settingsview/components/LinkedDevices.qml</file> <file>src/app/settingsview/components/LinkedDevices.qml</file>
<file>src/settingsview/components/BannedContacts.qml</file> <file>src/app/settingsview/components/BannedContacts.qml</file>
<file>src/settingsview/components/AdvancedSettings.qml</file> <file>src/app/settingsview/components/AdvancedSettings.qml</file>
<file>src/settingsview/components/AdvancedJamiSecuritySettings.qml</file> <file>src/app/settingsview/components/AdvancedJamiSecuritySettings.qml</file>
<file>src/settingsview/components/AdvancedSIPSecuritySettings.qml</file> <file>src/app/settingsview/components/AdvancedSIPSecuritySettings.qml</file>
<file>src/settingsview/components/AdvancedMediaSettings.qml</file> <file>src/app/settingsview/components/AdvancedMediaSettings.qml</file>
<file>src/settingsview/components/MediaSettings.qml</file> <file>src/app/settingsview/components/MediaSettings.qml</file>
<file>src/settingsview/components/AdvancedSDPSettings.qml</file> <file>src/app/settingsview/components/AdvancedSDPSettings.qml</file>
<file>src/settingsview/components/AdvancedNameServerSettings.qml</file> <file>src/app/settingsview/components/AdvancedNameServerSettings.qml</file>
<file>src/settingsview/components/AdvancedVoiceMailSettings.qml</file> <file>src/app/settingsview/components/AdvancedVoiceMailSettings.qml</file>
<file>src/settingsview/components/AdvancedOpenDHTSettings.qml</file> <file>src/app/settingsview/components/AdvancedOpenDHTSettings.qml</file>
<file>src/settingsview/components/AdvancedPublicAddressSettings.qml</file> <file>src/app/settingsview/components/AdvancedPublicAddressSettings.qml</file>
<file>src/settingsview/components/AdvancedConnectivitySettings.qml</file> <file>src/app/settingsview/components/AdvancedConnectivitySettings.qml</file>
<file>src/settingsview/components/AdvancedCallSettings.qml</file> <file>src/app/settingsview/components/AdvancedCallSettings.qml</file>
<file>src/settingsview/components/AdvancedChatSettings.qml</file> <file>src/app/settingsview/components/AdvancedChatSettings.qml</file>
<file>src/settingsview/components/SettingMaterialButton.qml</file> <file>src/app/settingsview/components/SettingMaterialButton.qml</file>
<file>src/settingsview/components/ToggleSwitch.qml</file> <file>src/app/settingsview/components/ToggleSwitch.qml</file>
<file>src/settingsview/components/SettingSpinBox.qml</file> <file>src/app/settingsview/components/SettingSpinBox.qml</file>
<file>src/settingsview/components/SettingsComboBox.qml</file> <file>src/app/settingsview/components/SettingsComboBox.qml</file>
<file>src/settingsview/components/SettingsMaterialLineEdit.qml</file> <file>src/app/settingsview/components/SettingsMaterialLineEdit.qml</file>
<file>src/settingsview/components/LevelMeter.qml</file> <file>src/app/settingsview/components/LevelMeter.qml</file>
<file>src/settingsview/components/DeviceItemDelegate.qml</file> <file>src/app/settingsview/components/DeviceItemDelegate.qml</file>
<file>src/settingsview/components/PluginItemDelegate.qml</file> <file>src/app/settingsview/components/PluginItemDelegate.qml</file>
<file>src/settingsview/components/ContactItemDelegate.qml</file> <file>src/app/settingsview/components/ContactItemDelegate.qml</file>
<file>src/settingsview/components/MediaCodecDelegate.qml</file> <file>src/app/settingsview/components/MediaCodecDelegate.qml</file>
<file>src/settingsview/components/NameRegistrationDialog.qml</file> <file>src/app/settingsview/components/NameRegistrationDialog.qml</file>
<file>src/settingsview/components/LinkDeviceDialog.qml</file> <file>src/app/settingsview/components/LinkDeviceDialog.qml</file>
<file>src/settingsview/components/RevokeDevicePasswordDialog.qml</file> <file>src/app/settingsview/components/RevokeDevicePasswordDialog.qml</file>
<file>src/wizardview/WizardView.qml</file> <file>src/app/wizardview/WizardView.qml</file>
<file>src/wizardview/components/WelcomePage.qml</file> <file>src/app/wizardview/components/WelcomePage.qml</file>
<file>src/wizardview/components/CreateAccountPage.qml</file> <file>src/app/wizardview/components/CreateAccountPage.qml</file>
<file>src/wizardview/components/CreateSIPAccountPage.qml</file> <file>src/app/wizardview/components/CreateSIPAccountPage.qml</file>
<file>src/wizardview/components/ImportFromBackupPage.qml</file> <file>src/app/wizardview/components/ImportFromBackupPage.qml</file>
<file>src/wizardview/components/BackupKeyPage.qml</file> <file>src/app/wizardview/components/BackupKeyPage.qml</file>
<file>src/wizardview/components/ImportFromDevicePage.qml</file> <file>src/app/wizardview/components/ImportFromDevicePage.qml</file>
<file>src/wizardview/components/ConnectToAccountManagerPage.qml</file> <file>src/app/wizardview/components/ConnectToAccountManagerPage.qml</file>
<file>src/wizardview/components/ProfilePage.qml</file> <file>src/app/wizardview/components/ProfilePage.qml</file>
<file>src/wizardview/components/AccountCreationStepIndicator.qml</file> <file>src/app/wizardview/components/AccountCreationStepIndicator.qml</file>
<file>src/mainview/MainView.qml</file> <file>src/app/mainview/MainView.qml</file>
<file>src/mainview/components/PluginHandlerItemDelegate.qml</file> <file>src/app/mainview/components/PluginHandlerItemDelegate.qml</file>
<file>src/mainview/components/AboutPopUp.qml</file> <file>src/app/mainview/components/AboutPopUp.qml</file>
<file>src/mainview/components/SidePanel.qml</file> <file>src/app/mainview/components/SidePanel.qml</file>
<file>src/mainview/components/WelcomePage.qml</file> <file>src/app/mainview/components/WelcomePage.qml</file>
<file>src/mainview/components/ChatView.qml</file> <file>src/app/mainview/components/ChatView.qml</file>
<file>src/mainview/components/NewSwarmPage.qml</file> <file>src/app/mainview/components/NewSwarmPage.qml</file>
<file>src/mainview/components/ChatViewHeader.qml</file> <file>src/app/mainview/components/ChatViewHeader.qml</file>
<file>src/mainview/components/AccountComboBox.qml</file> <file>src/app/mainview/components/AccountComboBox.qml</file>
<file>src/mainview/components/CallStackView.qml</file> <file>src/app/mainview/components/CallStackView.qml</file>
<file>src/mainview/components/InitialCallPage.qml</file> <file>src/app/mainview/components/InitialCallPage.qml</file>
<file>src/mainview/components/CallOverlay.qml</file> <file>src/app/mainview/components/CallOverlay.qml</file>
<file>src/mainview/components/ContactSearchBar.qml</file> <file>src/app/mainview/components/ContactSearchBar.qml</file>
<file>src/mainview/components/OngoingCallPage.qml</file> <file>src/app/mainview/components/OngoingCallPage.qml</file>
<file>src/mainview/components/ParticipantOverlay.qml</file> <file>src/app/mainview/components/ParticipantOverlay.qml</file>
<file>src/mainview/components/ProjectCreditsScrollView.qml</file> <file>src/app/mainview/components/ProjectCreditsScrollView.qml</file>
<file>src/mainview/components/AccountComboBoxPopup.qml</file> <file>src/app/mainview/components/AccountComboBoxPopup.qml</file>
<file>src/mainview/components/SidePanelTabBar.qml</file> <file>src/app/mainview/components/SidePanelTabBar.qml</file>
<file>src/mainview/components/WelcomePageQrDialog.qml</file> <file>src/app/mainview/components/WelcomePageQrDialog.qml</file>
<file>src/mainview/components/ConversationSmartListContextMenu.qml</file> <file>src/app/mainview/components/ConversationSmartListContextMenu.qml</file>
<file>src/mainview/components/SwarmParticipantContextMenu.qml</file> <file>src/app/mainview/components/SwarmParticipantContextMenu.qml</file>
<file>src/mainview/components/CallViewContextMenu.qml</file> <file>src/app/mainview/components/CallViewContextMenu.qml</file>
<file>src/mainview/components/UserProfile.qml</file> <file>src/app/mainview/components/UserProfile.qml</file>
<file>src/mainview/components/SwarmDetailsPanel.qml</file> <file>src/app/mainview/components/SwarmDetailsPanel.qml</file>
<file>src/mainview/components/AddMemberPanel.qml</file> <file>src/app/mainview/components/AddMemberPanel.qml</file>
<file>src/mainview/components/SelectScreen.qml</file> <file>src/app/mainview/components/SelectScreen.qml</file>
<file>src/mainview/components/ScreenRubberBand.qml</file> <file>src/app/mainview/components/ScreenRubberBand.qml</file>
<file>src/mainview/components/ContactPicker.qml</file> <file>src/app/mainview/components/ContactPicker.qml</file>
<file>src/mainview/components/PluginHandlerPicker.qml</file> <file>src/app/mainview/components/PluginHandlerPicker.qml</file>
<file>src/mainview/components/ContactPickerItemDelegate.qml</file> <file>src/app/mainview/components/ContactPickerItemDelegate.qml</file>
<file>src/mainview/components/RecordBox.qml</file> <file>src/app/mainview/components/RecordBox.qml</file>
<file>src/mainview/components/SipInputPanel.qml</file> <file>src/app/mainview/components/SipInputPanel.qml</file>
<file>src/mainview/components/ParticipantOverlayMenu.qml</file> <file>src/app/mainview/components/ParticipantOverlayMenu.qml</file>
<file>src/mainview/js/selectscreenwindowcreation.js</file> <file>src/app/mainview/js/selectscreenwindowcreation.js</file>
<file>src/mainview/js/screenrubberbandcreation.js</file> <file>src/app/mainview/js/screenrubberbandcreation.js</file>
<file>src/mainview/js/contactpickercreation.js</file> <file>src/app/mainview/js/contactpickercreation.js</file>
<file>src/mainview/js/pluginhandlerpickercreation.js</file> <file>src/app/mainview/js/pluginhandlerpickercreation.js</file>
<file>src/mainview/components/FilterTabButton.qml</file> <file>src/app/mainview/components/FilterTabButton.qml</file>
<file>src/mainview/components/AccountItemDelegate.qml</file> <file>src/app/mainview/components/AccountItemDelegate.qml</file>
<file>src/mainview/components/ConversationListView.qml</file> <file>src/app/mainview/components/ConversationListView.qml</file>
<file>src/mainview/components/SmartListItemDelegate.qml</file> <file>src/app/mainview/components/SmartListItemDelegate.qml</file>
<file>src/mainview/components/BadgeNotifier.qml</file> <file>src/app/mainview/components/BadgeNotifier.qml</file>
<file>src/mainview/components/ParticipantsLayer.qml</file> <file>src/app/mainview/components/ParticipantsLayer.qml</file>
<file>src/mainview/components/MainOverlay.qml</file> <file>src/app/mainview/components/MainOverlay.qml</file>
<file>src/mainview/components/CallButtonDelegate.qml</file> <file>src/app/mainview/components/CallButtonDelegate.qml</file>
<file>src/mainview/components/CallActionBar.qml</file> <file>src/app/mainview/components/CallActionBar.qml</file>
<file>src/commoncomponents/HalfPill.qml</file> <file>src/app/commoncomponents/HalfPill.qml</file>
<file>src/commoncomponents/MaterialToolTip.qml</file> <file>src/app/commoncomponents/MaterialToolTip.qml</file>
<file>src/mainview/components/ParticipantCallInStatusDelegate.qml</file> <file>src/app/mainview/components/ParticipantCallInStatusDelegate.qml</file>
<file>src/mainview/components/ParticipantCallInStatusView.qml</file> <file>src/app/mainview/components/ParticipantCallInStatusView.qml</file>
<file>src/settingsview/components/TroubleshootSettings.qml</file> <file>src/app/settingsview/components/TroubleshootSettings.qml</file>
<file>src/settingsview/components/LogsView.qml</file> <file>src/app/settingsview/components/LogsView.qml</file>
<file>src/commoncomponents/contextmenu/ContextMenuAutoLoader.qml</file> <file>src/app/commoncomponents/contextmenu/ContextMenuAutoLoader.qml</file>
<file>src/commoncomponents/contextmenu/BaseContextMenu.qml</file> <file>src/app/commoncomponents/contextmenu/BaseContextMenu.qml</file>
<file>src/commoncomponents/contextmenu/GeneralMenuItem.qml</file> <file>src/app/commoncomponents/contextmenu/GeneralMenuItem.qml</file>
<file>src/commoncomponents/contextmenu/GeneralMenuSeparator.qml</file> <file>src/app/commoncomponents/contextmenu/GeneralMenuSeparator.qml</file>
<file>src/mainview/components/ParticipantOverlayButton.qml</file> <file>src/app/mainview/components/ParticipantOverlayButton.qml</file>
<file>src/mainview/components/ParticipantControlLayout.qml</file> <file>src/app/mainview/components/ParticipantControlLayout.qml</file>
<file>src/mainview/components/ChatViewFooter.qml</file> <file>src/app/mainview/components/ChatViewFooter.qml</file>
<file>src/commoncomponents/emojipicker/EmojiPicker.qml</file> <file>src/app/commoncomponents/emojipicker/EmojiPicker.qml</file>
<file>src/commoncomponents/emojipicker/emojiPickerLoader.js</file> <file>src/app/commoncomponents/emojipicker/emojiPickerLoader.js</file>
<file>src/commoncomponents/emojipicker/emojiPickerLoader.html</file> <file>src/app/commoncomponents/emojipicker/emojiPickerLoader.html</file>
<file>src/commoncomponents/emojipicker/emoji.js</file> <file>src/app/commoncomponents/emojipicker/emoji.js</file>
<file>src/mainview/components/MessageBarTextArea.qml</file> <file>src/app/mainview/components/MessageBarTextArea.qml</file>
<file>src/mainview/components/FilesToSendDelegate.qml</file> <file>src/app/mainview/components/FilesToSendDelegate.qml</file>
<file>src/mainview/components/MessageBar.qml</file> <file>src/app/mainview/components/MessageBar.qml</file>
<file>src/mainview/components/FilesToSendContainer.qml</file> <file>src/app/mainview/components/FilesToSendContainer.qml</file>
<file>src/commoncomponents/Avatar.qml</file> <file>src/app/commoncomponents/Avatar.qml</file>
<file>src/mainview/components/ConversationAvatar.qml</file> <file>src/app/mainview/components/ConversationAvatar.qml</file>
<file>src/mainview/components/InvitationView.qml</file> <file>src/app/mainview/components/InvitationView.qml</file>
<file>src/commoncomponents/GeneralWebEngineView.qml</file> <file>src/app/commoncomponents/GeneralWebEngineView.qml</file>
<file>src/constant/JamiResources.qml</file> <file>src/app/constant/JamiResources.qml</file>
<file>src/commoncomponents/BubbleLabel.qml</file> <file>src/app/commoncomponents/BubbleLabel.qml</file>
<file>src/commoncomponents/BackButton.qml</file> <file>src/app/commoncomponents/BackButton.qml</file>
<file>src/commoncomponents/JamiSwitch.qml</file> <file>src/app/commoncomponents/JamiSwitch.qml</file>
<file>src/mainview/components/ReadOnlyFooter.qml</file> <file>src/app/mainview/components/ReadOnlyFooter.qml</file>
<file>src/commoncomponents/TextMessageDelegate.qml</file> <file>src/app/commoncomponents/TextMessageDelegate.qml</file>
<file>src/mainview/components/MessageListView.qml</file> <file>src/app/mainview/components/MessageListView.qml</file>
<file>src/commoncomponents/MessageBubble.qml</file> <file>src/app/commoncomponents/MessageBubble.qml</file>
<file>src/constant/MsgSeq.qml</file> <file>src/app/constant/MsgSeq.qml</file>
<file>src/commoncomponents/SBSContextMenu.qml</file> <file>src/app/commoncomponents/SBSContextMenu.qml</file>
<file>src/commoncomponents/SBSMessageBase.qml</file> <file>src/app/commoncomponents/SBSMessageBase.qml</file>
<file>src/commoncomponents/ReadStatus.qml</file> <file>src/app/commoncomponents/ReadStatus.qml</file>
<file>src/commoncomponents/GeneratedMessageDelegate.qml</file> <file>src/app/commoncomponents/GeneratedMessageDelegate.qml</file>
<file>src/commoncomponents/DataTransferMessageDelegate.qml</file> <file>src/app/commoncomponents/DataTransferMessageDelegate.qml</file>
<file>src/commoncomponents/ContactMessageDelegate.qml</file> <file>src/app/commoncomponents/ContactMessageDelegate.qml</file>
<file>src/mainview/components/ScrollToBottomButton.qml</file> <file>src/app/mainview/components/ScrollToBottomButton.qml</file>
<file>src/commoncomponents/TypingDots.qml</file> <file>src/app/commoncomponents/TypingDots.qml</file>
<file>src/commoncomponents/JamiScrollBar.qml</file> <file>src/app/commoncomponents/JamiScrollBar.qml</file>
<file>qtquickcontrols2.conf</file> <file>qtquickcontrols2.conf</file>
<file>src/commoncomponents/JamiFlickable.qml</file> <file>src/app/commoncomponents/JamiFlickable.qml</file>
<file>src/AccountMigrationView.qml</file> <file>src/app/AccountMigrationView.qml</file>
<file>src/settingsview/js/logviewwindowcreation.js</file> <file>src/app/settingsview/js/logviewwindowcreation.js</file>
<file>src/mainview/js/keyboardshortcuttablecreation.js</file> <file>src/app/mainview/js/keyboardshortcuttablecreation.js</file>
<file>src/mainview/components/KeyboardShortcutTable.qml</file> <file>src/app/mainview/components/KeyboardShortcutTable.qml</file>
<file>src/mainview/components/KeyboardShortcutKeyDelegate.qml</file> <file>src/app/mainview/components/KeyboardShortcutKeyDelegate.qml</file>
<file>src/mainview/components/KeyboardShortcutTabButton.qml</file> <file>src/app/mainview/components/KeyboardShortcutTabButton.qml</file>
<file>src/LayoutManager.qml</file> <file>src/app/LayoutManager.qml</file>
</qresource> </qresource>
</RCC> </RCC>

4
scripts/gen-qrc-without-webengine.py
View file

@ -23,9 +23,9 @@ with open('qml_without_webengine.qrc', 'w') as outfile:
line = infile.readline() line = infile.readline()
while line: while line:
if 'EmojiPicker.qml' in line: if 'EmojiPicker.qml' in line:
outfile.write('\t<file>src/nowebengine/EmojiPicker.qml</file>\n') outfile.write('\t<file>src/app/nowebengine/EmojiPicker.qml</file>\n')
elif 'MediaPreviewBase.qml' in line: elif 'MediaPreviewBase.qml' in line:
outfile.write('\t<file>src/nowebengine/MediaPreviewBase.qml</file>\n') outfile.write('\t<file>src/app/nowebengine/MediaPreviewBase.qml</file>\n')
else: else:
outfile.write(line) outfile.write(line)
line = infile.readline() line = infile.readline()

0
src/AccountMigrationView.qml → src/app/AccountMigrationView.qml
View file

0
src/DaemonReconnectWindow.qml → src/app/DaemonReconnectWindow.qml
View file

0
src/LayoutManager.qml → src/app/LayoutManager.qml
View file

0
src/MainApplicationWindow.qml → src/app/MainApplicationWindow.qml
View file

0
src/abstractlistmodelbase.h → src/app/abstractlistmodelbase.h
View file

0
src/accountadapter.cpp → src/app/accountadapter.cpp
View file

0
src/accountadapter.h → src/app/accountadapter.h
View file

0
src/accountlistmodel.cpp → src/app/accountlistmodel.cpp
View file

0
src/accountlistmodel.h → src/app/accountlistmodel.h
View file

0
src/appsettingsmanager.cpp → src/app/appsettingsmanager.cpp
View file

0
src/appsettingsmanager.h → src/app/appsettingsmanager.h
View file

0
src/audiodevicemodel.cpp → src/app/audiodevicemodel.cpp
View file

0
src/audiodevicemodel.h → src/app/audiodevicemodel.h
View file

0
src/audiomanagerlistmodel.cpp → src/app/audiomanagerlistmodel.cpp
View file

0
src/audiomanagerlistmodel.h → src/app/audiomanagerlistmodel.h
View file

0
src/avadapter.cpp → src/app/avadapter.cpp
View file

0
src/avadapter.h → src/app/avadapter.h
View file

0
src/avatarimageprovider.h → src/app/avatarimageprovider.h
View file

0
src/avatarregistry.cpp → src/app/avatarregistry.cpp
View file

0
src/avatarregistry.h → src/app/avatarregistry.h
View file

0
src/bannedlistmodel.cpp → src/app/bannedlistmodel.cpp
View file

0
src/bannedlistmodel.h → src/app/bannedlistmodel.h
View file

0
src/calladapter.cpp → src/app/calladapter.cpp
View file

0
src/calladapter.h → src/app/calladapter.h
View file

0
src/calloverlaymodel.cpp → src/app/calloverlaymodel.cpp
View file

0
src/calloverlaymodel.h → src/app/calloverlaymodel.h
View file

0
src/callparticipantsmodel.cpp → src/app/callparticipantsmodel.cpp
View file

0
src/callparticipantsmodel.h → src/app/callparticipantsmodel.h
View file

0
src/commoncomponents/Avatar.qml → src/app/commoncomponents/Avatar.qml
View file

0
src/commoncomponents/BackButton.qml → src/app/commoncomponents/BackButton.qml
View file

0
src/commoncomponents/BaseModalDialog.qml → src/app/commoncomponents/BaseModalDialog.qml
View file

0
src/commoncomponents/BubbleLabel.qml → src/app/commoncomponents/BubbleLabel.qml
View file

0
src/commoncomponents/ContactMessageDelegate.qml → src/app/commoncomponents/ContactMessageDelegate.qml
View file

0
src/commoncomponents/CustomBorder.qml → src/app/commoncomponents/CustomBorder.qml
View file

0
src/commoncomponents/DaemonReconnectPopup.qml → src/app/commoncomponents/DaemonReconnectPopup.qml
View file

2
src/commoncomponents/DataTransferMessageDelegate.qml → src/app/commoncomponents/DataTransferMessageDelegate.qml
View file

@ -265,7 +265,7 @@ Loader {
id: avComp id: avComp
Loader { Loader {
Component.onCompleted: { Component.onCompleted: {
var qml = WITH_WEBENGINE ? "qrc:/src/commoncomponents/MediaPreviewBase.qml" : "qrc:/src/nowebengine/MediaPreviewBase.qml" var qml = WITH_WEBENGINE ? "qrc:/src/app/commoncomponents/MediaPreviewBase.qml" : "qrc:/src/app/nowebengine/MediaPreviewBase.qml"
setSource( qml, { isVideo: mediaInfo.isVideo, html:mediaInfo.html } ) setSource( qml, { isVideo: mediaInfo.isVideo, html:mediaInfo.html } )
} }
} }

0
src/commoncomponents/DeleteAccountDialog.qml → src/app/commoncomponents/DeleteAccountDialog.qml
View file

0
src/commoncomponents/EditableLineEdit.qml → src/app/commoncomponents/EditableLineEdit.qml
View file

0
src/commoncomponents/ElidedTextLabel.qml → src/app/commoncomponents/ElidedTextLabel.qml
View file

0
src/commoncomponents/GeneralWebEngineView.qml → src/app/commoncomponents/GeneralWebEngineView.qml
View file

0
src/commoncomponents/GeneratedMessageDelegate.qml → src/app/commoncomponents/GeneratedMessageDelegate.qml
View file

0
src/commoncomponents/HalfPill.qml → src/app/commoncomponents/HalfPill.qml
View file

0
src/commoncomponents/JamiFileDialog.qml → src/app/commoncomponents/JamiFileDialog.qml
View file

0
src/commoncomponents/JamiFlickable.qml → src/app/commoncomponents/JamiFlickable.qml
View file

0
src/commoncomponents/JamiListView.qml → src/app/commoncomponents/JamiListView.qml
View file

0
src/commoncomponents/JamiScrollBar.qml → src/app/commoncomponents/JamiScrollBar.qml
View file

0
src/commoncomponents/JamiSwitch.qml → src/app/commoncomponents/JamiSwitch.qml
View file

0
src/commoncomponents/LineEditContextMenu.qml → src/app/commoncomponents/LineEditContextMenu.qml
View file

0
src/commoncomponents/LocalVideo.qml → src/app/commoncomponents/LocalVideo.qml
View file

0
src/commoncomponents/MaterialButton.qml → src/app/commoncomponents/MaterialButton.qml
View file

0
src/commoncomponents/MaterialLineEdit.qml → src/app/commoncomponents/MaterialLineEdit.qml
View file

0
src/commoncomponents/MaterialToolTip.qml → src/app/commoncomponents/MaterialToolTip.qml
View file

0
src/commoncomponents/MediaPreviewBase.qml → src/app/commoncomponents/MediaPreviewBase.qml
View file

0
src/commoncomponents/MessageBubble.qml → src/app/commoncomponents/MessageBubble.qml
View file

0
src/commoncomponents/PasswordDialog.qml → src/app/commoncomponents/PasswordDialog.qml
View file

0
src/commoncomponents/PhotoboothView.qml → src/app/commoncomponents/PhotoboothView.qml
View file

0
src/commoncomponents/PreferenceItemDelegate.qml → src/app/commoncomponents/PreferenceItemDelegate.qml
View file

0
src/commoncomponents/PresenceIndicator.qml → src/app/commoncomponents/PresenceIndicator.qml
View file

0
src/commoncomponents/PushButton.qml → src/app/commoncomponents/PushButton.qml
View file

0
src/commoncomponents/ReadStatus.qml → src/app/commoncomponents/ReadStatus.qml
View file

0
src/commoncomponents/ResponsiveImage.qml → src/app/commoncomponents/ResponsiveImage.qml
View file

0
src/commoncomponents/SBSContextMenu.qml → src/app/commoncomponents/SBSContextMenu.qml
View file

0
src/commoncomponents/SBSMessageBase.qml → src/app/commoncomponents/SBSMessageBase.qml
View file

0
src/commoncomponents/Scaffold.qml → src/app/commoncomponents/Scaffold.qml
View file

0
src/commoncomponents/SettingParaCombobox.qml → src/app/commoncomponents/SettingParaCombobox.qml
View file

0
src/commoncomponents/SimpleMessageDialog.qml → src/app/commoncomponents/SimpleMessageDialog.qml
View file

0
src/commoncomponents/SpinnerButton.qml → src/app/commoncomponents/SpinnerButton.qml
View file

0
src/commoncomponents/SpinningAnimation.qml → src/app/commoncomponents/SpinningAnimation.qml
View file

0
src/commoncomponents/TextMessageDelegate.qml → src/app/commoncomponents/TextMessageDelegate.qml
View file

0
src/commoncomponents/TypingDots.qml → src/app/commoncomponents/TypingDots.qml
View file

0
src/commoncomponents/UsernameLineEdit.qml → src/app/commoncomponents/UsernameLineEdit.qml
View file

0
src/commoncomponents/VideoView.qml → src/app/commoncomponents/VideoView.qml
View file

0
src/commoncomponents/contextmenu/BaseContextMenu.qml → src/app/commoncomponents/contextmenu/BaseContextMenu.qml
View file

0
src/commoncomponents/contextmenu/ContextMenuAutoLoader.qml → src/app/commoncomponents/contextmenu/ContextMenuAutoLoader.qml
View file

0
src/commoncomponents/contextmenu/GeneralMenuItem.qml → src/app/commoncomponents/contextmenu/GeneralMenuItem.qml
View file

0
src/commoncomponents/contextmenu/GeneralMenuSeparator.qml → src/app/commoncomponents/contextmenu/GeneralMenuSeparator.qml
View file

6
src/commoncomponents/emojipicker/EmojiPicker.qml → src/app/commoncomponents/emojipicker/EmojiPicker.qml
View file

@ -74,7 +74,7 @@ Rectangle {
webChannel.registeredObjects: [jsBridgeObject] webChannel.registeredObjects: [jsBridgeObject]
onCompletedLoadHtml: ":/src/commoncomponents/emojipicker/emojiPickerLoader.html" onCompletedLoadHtml: ":/src/app/commoncomponents/emojipicker/emojiPickerLoader.html"
onActiveFocusChanged: { onActiveFocusChanged: {
if (visible) { if (visible) {
@ -88,10 +88,10 @@ Rectangle {
":qwebchannel.js")) ":qwebchannel.js"))
emojiPickerWebView.runJavaScript( emojiPickerWebView.runJavaScript(
UtilsAdapter.qStringFromFile( UtilsAdapter.qStringFromFile(
":/src/commoncomponents/emojipicker/emoji.js")) ":/src/app/commoncomponents/emojipicker/emoji.js"))
emojiPickerWebView.runJavaScript( emojiPickerWebView.runJavaScript(
UtilsAdapter.qStringFromFile( UtilsAdapter.qStringFromFile(
":/src/commoncomponents/emojipicker/emojiPickerLoader.js")) ":/src/app/commoncomponents/emojipicker/emojiPickerLoader.js"))
emojiPickerWebView.runJavaScript( emojiPickerWebView.runJavaScript(
"init_emoji_picker(" + JamiTheme.darkTheme + ");") "init_emoji_picker(" + JamiTheme.darkTheme + ");")
} }

0
src/commoncomponents/emojipicker/emoji.js → src/app/commoncomponents/emojipicker/emoji.js
View file

0
src/commoncomponents/emojipicker/emojiPickerLoader.html → src/app/commoncomponents/emojipicker/emojiPickerLoader.html
View file

0
src/commoncomponents/emojipicker/emojiPickerLoader.js → src/app/commoncomponents/emojipicker/emojiPickerLoader.js
View file

0
src/connectivitymonitor.cpp → src/app/connectivitymonitor.cpp
View file

0
src/connectivitymonitor.h → src/app/connectivitymonitor.h
View file

6
src/constant/JamiQmlUtils.qml → src/app/constant/JamiQmlUtils.qml
View file

@ -26,9 +26,9 @@ import net.jami.Adapters 1.1
Item { Item {
property string qmlFilePrefix: "file:/" property string qmlFilePrefix: "file:/"
readonly property string mainViewLoadPath: "qrc:/src/mainview/MainView.qml" readonly property string mainViewLoadPath: "qrc:/src/app/mainview/MainView.qml"
readonly property string wizardViewLoadPath: "qrc:/src/wizardview/WizardView.qml" readonly property string wizardViewLoadPath: "qrc:/src/app/wizardview/WizardView.qml"
readonly property string accountMigrationViewLoadPath: "qrc:/src/AccountMigrationView.qml" readonly property string accountMigrationViewLoadPath: "qrc:/src/app/AccountMigrationView.qml"
readonly property string base64StringTitle: "data:image/png;base64," readonly property string base64StringTitle: "data:image/png;base64,"
property var accountCreationInputParaObject: ({}) property var accountCreationInputParaObject: ({})

0
src/constant/JamiStrings.qml → src/app/constant/JamiStrings.qml
View file

0
src/constant/JamiTheme.qml → src/app/constant/JamiTheme.qml
View file

0
src/constant/MsgSeq.qml → src/app/constant/MsgSeq.qml
View file

0
src/contactadapter.cpp → src/app/contactadapter.cpp
View file

0
src/contactadapter.h → src/app/contactadapter.h
View file

0
src/conversationlistmodel.cpp → src/app/conversationlistmodel.cpp
View file

0
src/conversationlistmodel.h → src/app/conversationlistmodel.h
View file

0
src/conversationlistmodelbase.cpp → src/app/conversationlistmodelbase.cpp
View file

0
src/conversationlistmodelbase.h → src/app/conversationlistmodelbase.h
View file

0
src/conversationsadapter.cpp → src/app/conversationsadapter.cpp
View file

0
src/conversationsadapter.h → src/app/conversationsadapter.h
View file

0
src/currentaccount.cpp → src/app/currentaccount.cpp
View file

Some files were not shown because too many files have changed in this diff Show more