From: Camila Ayres Date: Wed, 7 Aug 2024 19:54:37 +0000 (+0200) Subject: Remove component versions under src/gui/tray. X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~5^2~216^2~36 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=10d622423578e8022377b1c7aa0c665db3e69f22;p=nextcloud-desktop.git Remove component versions under src/gui/tray. Signed-off-by: Camila Ayres --- diff --git a/src/gui/tray/ActivityActionButton.qml b/src/gui/tray/ActivityActionButton.qml index 1682bb293..b7089a42c 100644 --- a/src/gui/tray/ActivityActionButton.qml +++ b/src/gui/tray/ActivityActionButton.qml @@ -1,7 +1,7 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.3 -import Style 1.0 -import com.nextcloud.desktopclient 1.0 +import QtQuick +import QtQuick.Controls +import Style +import com.nextcloud.desktopclient AbstractButton { id: root diff --git a/src/gui/tray/ActivityItem.qml b/src/gui/tray/ActivityItem.qml index 2cac0580b..bc5861d33 100644 --- a/src/gui/tray/ActivityItem.qml +++ b/src/gui/tray/ActivityItem.qml @@ -1,9 +1,9 @@ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Style 1.0 -import com.nextcloud.desktopclient 1.0 +import QtQml +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Style +import com.nextcloud.desktopclient ItemDelegate { id: root diff --git a/src/gui/tray/ActivityItemActions.qml b/src/gui/tray/ActivityItemActions.qml index c233d218e..f398b96d7 100644 --- a/src/gui/tray/ActivityItemActions.qml +++ b/src/gui/tray/ActivityItemActions.qml @@ -1,9 +1,9 @@ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Style 1.0 -import com.nextcloud.desktopclient 1.0 +import QtQml +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Style +import com.nextcloud.desktopclient Repeater { id: root diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml index 62d552bd1..23ab907c3 100644 --- a/src/gui/tray/ActivityItemContent.qml +++ b/src/gui/tray/ActivityItemContent.qml @@ -1,10 +1,10 @@ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Style 1.0 +import QtQml +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Style import Qt5Compat.GraphicalEffects -import com.nextcloud.desktopclient 1.0 +import com.nextcloud.desktopclient RowLayout { id: root diff --git a/src/gui/tray/ActivityItemContextMenu.qml b/src/gui/tray/ActivityItemContextMenu.qml index 7dd000090..d0c4545a0 100644 --- a/src/gui/tray/ActivityItemContextMenu.qml +++ b/src/gui/tray/ActivityItemContextMenu.qml @@ -1,7 +1,7 @@ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Style 1.0 +import QtQml +import QtQuick +import QtQuick.Controls +import Style AutoSizingMenu { id: moreActionsButtonContextMenu diff --git a/src/gui/tray/ActivityList.qml b/src/gui/tray/ActivityList.qml index 150e6483b..1a97ebc02 100644 --- a/src/gui/tray/ActivityList.qml +++ b/src/gui/tray/ActivityList.qml @@ -1,8 +1,8 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls -import Style 1.0 -import com.nextcloud.desktopclient 1.0 as NC +import Style +import com.nextcloud.desktopclient as NC ScrollView { id: controlRoot diff --git a/src/gui/tray/AutoSizingMenu.qml b/src/gui/tray/AutoSizingMenu.qml index 1d3134b37..aaa90e79b 100644 --- a/src/gui/tray/AutoSizingMenu.qml +++ b/src/gui/tray/AutoSizingMenu.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.3 -import Style 1.0 +import QtQuick +import QtQuick.Controls +import Style Menu { width: { diff --git a/src/gui/tray/CallNotificationDialog.qml b/src/gui/tray/CallNotificationDialog.qml index 7fb42de2d..c2d9b0562 100644 --- a/src/gui/tray/CallNotificationDialog.qml +++ b/src/gui/tray/CallNotificationDialog.qml @@ -13,13 +13,13 @@ * for more details. */ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import Style 1.0 -import com.nextcloud.desktopclient 1.0 -import QtQuick.Layouts 1.2 -import QtMultimedia 5.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Window +import Style +import com.nextcloud.desktopclient +import QtQuick.Layouts +import QtMultimedia +import QtQuick.Controls import Qt5Compat.GraphicalEffects ApplicationWindow { diff --git a/src/gui/tray/CustomButton.qml b/src/gui/tray/CustomButton.qml index f57c065c9..c3ada8569 100644 --- a/src/gui/tray/CustomButton.qml +++ b/src/gui/tray/CustomButton.qml @@ -12,10 +12,10 @@ * for more details. */ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Style 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Style Button { id: root diff --git a/src/gui/tray/EditFileLocallyLoadingDialog.qml b/src/gui/tray/EditFileLocallyLoadingDialog.qml index 6e02637d8..b23b0da74 100644 --- a/src/gui/tray/EditFileLocallyLoadingDialog.qml +++ b/src/gui/tray/EditFileLocallyLoadingDialog.qml @@ -1,9 +1,9 @@ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import Style 1.0 -import com.nextcloud.desktopclient 1.0 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Window +import Style +import com.nextcloud.desktopclient +import QtQuick.Layouts +import QtQuick.Controls ApplicationWindow { id: root diff --git a/src/gui/tray/EnforcedPlainTextLabel.qml b/src/gui/tray/EnforcedPlainTextLabel.qml index f47692c2c..bfc3c0995 100644 --- a/src/gui/tray/EnforcedPlainTextLabel.qml +++ b/src/gui/tray/EnforcedPlainTextLabel.qml @@ -12,8 +12,8 @@ * for more details. */ -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls Label { function resetToPlainText() { diff --git a/src/gui/tray/HeaderButton.qml b/src/gui/tray/HeaderButton.qml index a1280176d..24ebb9264 100644 --- a/src/gui/tray/HeaderButton.qml +++ b/src/gui/tray/HeaderButton.qml @@ -12,16 +12,16 @@ * for more details. */ -import QtQml 2.15 -import QtQml.Models 2.15 -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQml +import QtQml.Models +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Layouts // Custom qml modules are in /theme (and included by resources.qrc) -import Style 1.0 -import com.nextcloud.desktopclient 1.0 +import Style +import com.nextcloud.desktopclient Button { id: root diff --git a/src/gui/tray/ListItemLineAndSubline.qml b/src/gui/tray/ListItemLineAndSubline.qml index ce1a76f10..56b962946 100644 --- a/src/gui/tray/ListItemLineAndSubline.qml +++ b/src/gui/tray/ListItemLineAndSubline.qml @@ -11,12 +11,12 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. */ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQml +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts -import Style 1.0 +import Style ColumnLayout { id: root diff --git a/src/gui/tray/NCBusyIndicator.qml b/src/gui/tray/NCBusyIndicator.qml index 973d3dee1..031c762f2 100644 --- a/src/gui/tray/NCBusyIndicator.qml +++ b/src/gui/tray/NCBusyIndicator.qml @@ -12,9 +12,9 @@ * for more details. */ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Style 1.0 +import QtQuick +import QtQuick.Controls +import Style BusyIndicator { id: root diff --git a/src/gui/tray/NCButtonBackground.qml b/src/gui/tray/NCButtonBackground.qml index d7a8e01e3..cc9d286e8 100644 --- a/src/gui/tray/NCButtonBackground.qml +++ b/src/gui/tray/NCButtonBackground.qml @@ -12,9 +12,9 @@ * for more details. */ -import QtQuick 2.15 +import QtQuick -import Style 1.0 +import Style Rectangle { property bool hovered: false diff --git a/src/gui/tray/NCButtonContents.qml b/src/gui/tray/NCButtonContents.qml index f469f168e..243b1225c 100644 --- a/src/gui/tray/NCButtonContents.qml +++ b/src/gui/tray/NCButtonContents.qml @@ -12,11 +12,11 @@ * for more details. */ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts -import Style 1.0 +import Style RowLayout { id: root diff --git a/src/gui/tray/NCIconWithBackgroundImage.qml b/src/gui/tray/NCIconWithBackgroundImage.qml index 0ef155ad9..a6f9587eb 100644 --- a/src/gui/tray/NCIconWithBackgroundImage.qml +++ b/src/gui/tray/NCIconWithBackgroundImage.qml @@ -12,8 +12,8 @@ * for more details. */ -import QtQuick 2.15 -import Style 1.0 +import QtQuick +import Style Image { id: root diff --git a/src/gui/tray/NCProgressBar.qml b/src/gui/tray/NCProgressBar.qml index da154d430..c620f149a 100644 --- a/src/gui/tray/NCProgressBar.qml +++ b/src/gui/tray/NCProgressBar.qml @@ -12,9 +12,9 @@ * for more details. */ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Style 1.0 +import QtQuick +import QtQuick.Controls +import Style ProgressBar { id: control diff --git a/src/gui/tray/NCToolTip.qml b/src/gui/tray/NCToolTip.qml index 942dbcab1..c953ad7a7 100644 --- a/src/gui/tray/NCToolTip.qml +++ b/src/gui/tray/NCToolTip.qml @@ -12,11 +12,11 @@ * for more details. */ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQml +import QtQuick +import QtQuick.Controls -import Style 1.0 +import Style ToolTip { id: toolTip diff --git a/src/gui/tray/SyncStatus.qml b/src/gui/tray/SyncStatus.qml index 25d4f6911..d304d9991 100644 --- a/src/gui/tray/SyncStatus.qml +++ b/src/gui/tray/SyncStatus.qml @@ -1,10 +1,10 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts -import Style 1.0 +import Style -import com.nextcloud.desktopclient 1.0 as NC +import com.nextcloud.desktopclient as NC RowLayout { id: root diff --git a/src/gui/tray/TalkReplyTextField.qml b/src/gui/tray/TalkReplyTextField.qml index 3cc1f867a..540c7b030 100644 --- a/src/gui/tray/TalkReplyTextField.qml +++ b/src/gui/tray/TalkReplyTextField.qml @@ -1,9 +1,9 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts -import com.nextcloud.desktopclient 1.0 -import Style 1.0 +import com.nextcloud.desktopclient +import Style TextField { id: replyMessageTextField diff --git a/src/gui/tray/TextButtonContents.qml b/src/gui/tray/TextButtonContents.qml index 9bd3b8a98..dbc3aa460 100644 --- a/src/gui/tray/TextButtonContents.qml +++ b/src/gui/tray/TextButtonContents.qml @@ -12,11 +12,11 @@ * for more details. */ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts -import Style 1.0 +import Style EnforcedPlainTextLabel { property bool hovered: false diff --git a/src/gui/tray/TrayFolderListItem.qml b/src/gui/tray/TrayFolderListItem.qml index b329645bc..111b3d788 100644 --- a/src/gui/tray/TrayFolderListItem.qml +++ b/src/gui/tray/TrayFolderListItem.qml @@ -11,11 +11,11 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. */ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Style 1.0 +import QtQml +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Style MenuItem { id: root diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMenuButton.qml index 82e51a6b0..e2338698d 100644 --- a/src/gui/tray/TrayFoldersMenuButton.qml +++ b/src/gui/tray/TrayFoldersMenuButton.qml @@ -11,11 +11,11 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. */ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import Qt5Compat.GraphicalEffects -import Style 1.0 +import Style HeaderButton { id: root diff --git a/src/gui/tray/UnifiedSearchInputContainer.qml b/src/gui/tray/UnifiedSearchInputContainer.qml index f57e2e2a9..5ab1c3820 100644 --- a/src/gui/tray/UnifiedSearchInputContainer.qml +++ b/src/gui/tray/UnifiedSearchInputContainer.qml @@ -12,13 +12,13 @@ * for more details. */ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQml +import QtQuick +import QtQuick.Controls import Qt5Compat.GraphicalEffects -import Style 1.0 +import Style -import com.nextcloud.desktopclient 1.0 +import com.nextcloud.desktopclient TextField { id: trayWindowUnifiedSearchTextField diff --git a/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml b/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml index cf894a12f..152b2805a 100644 --- a/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml +++ b/src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml @@ -12,11 +12,11 @@ * for more details. */ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Style 1.0 +import QtQml +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Style ColumnLayout { id: unifiedSearchResultItemFetchMore diff --git a/src/gui/tray/UnifiedSearchResultItem.qml b/src/gui/tray/UnifiedSearchResultItem.qml index 76e4db2bd..3f034143b 100644 --- a/src/gui/tray/UnifiedSearchResultItem.qml +++ b/src/gui/tray/UnifiedSearchResultItem.qml @@ -12,13 +12,13 @@ * for more details. */ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQml +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts import Qt5Compat.GraphicalEffects -import Style 1.0 +import Style RowLayout { id: unifiedSearchResultItemDetails diff --git a/src/gui/tray/UnifiedSearchResultItemSkeleton.qml b/src/gui/tray/UnifiedSearchResultItemSkeleton.qml index d8724eae5..f34862d83 100644 --- a/src/gui/tray/UnifiedSearchResultItemSkeleton.qml +++ b/src/gui/tray/UnifiedSearchResultItemSkeleton.qml @@ -12,11 +12,11 @@ * for more details. */ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQml +import QtQuick +import QtQuick.Layouts import Qt5Compat.GraphicalEffects -import Style 1.0 +import Style RowLayout { id: unifiedSearchResultSkeletonItemDetails diff --git a/src/gui/tray/UnifiedSearchResultItemSkeletonContainer.qml b/src/gui/tray/UnifiedSearchResultItemSkeletonContainer.qml index bcb43df37..d74cea80f 100644 --- a/src/gui/tray/UnifiedSearchResultItemSkeletonContainer.qml +++ b/src/gui/tray/UnifiedSearchResultItemSkeletonContainer.qml @@ -12,12 +12,12 @@ * for more details. */ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQml +import QtQuick +import QtQuick.Layouts import Qt5Compat.GraphicalEffects -import Style 1.0 +import Style ColumnLayout { id: unifiedSearchResultsListViewSkeletonColumn diff --git a/src/gui/tray/UnifiedSearchResultItemSkeletonGradientRectangle.qml b/src/gui/tray/UnifiedSearchResultItemSkeletonGradientRectangle.qml index a1b053b00..d7326262b 100644 --- a/src/gui/tray/UnifiedSearchResultItemSkeletonGradientRectangle.qml +++ b/src/gui/tray/UnifiedSearchResultItemSkeletonGradientRectangle.qml @@ -12,12 +12,12 @@ * for more details. */ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQml +import QtQuick +import QtQuick.Layouts import Qt5Compat.GraphicalEffects -import Style 1.0 +import Style Rectangle { id: root diff --git a/src/gui/tray/UnifiedSearchResultListItem.qml b/src/gui/tray/UnifiedSearchResultListItem.qml index 27e959621..ec6a8528c 100644 --- a/src/gui/tray/UnifiedSearchResultListItem.qml +++ b/src/gui/tray/UnifiedSearchResultListItem.qml @@ -12,11 +12,11 @@ * for more details. */ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Style 1.0 -import com.nextcloud.desktopclient 1.0 +import QtQml +import QtQuick +import QtQuick.Controls +import Style +import com.nextcloud.desktopclient MouseArea { id: unifiedSearchResultMouseArea diff --git a/src/gui/tray/UnifiedSearchResultNothingFound.qml b/src/gui/tray/UnifiedSearchResultNothingFound.qml index f66b1fdaf..79a2aee12 100644 --- a/src/gui/tray/UnifiedSearchResultNothingFound.qml +++ b/src/gui/tray/UnifiedSearchResultNothingFound.qml @@ -12,11 +12,11 @@ * for more details. */ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Style 1.0 +import QtQml +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Style ColumnLayout { id: unifiedSearchResultNothingFoundContainer diff --git a/src/gui/tray/UnifiedSearchResultSectionItem.qml b/src/gui/tray/UnifiedSearchResultSectionItem.qml index 1637424f7..c9bbf151e 100644 --- a/src/gui/tray/UnifiedSearchResultSectionItem.qml +++ b/src/gui/tray/UnifiedSearchResultSectionItem.qml @@ -12,12 +12,12 @@ * for more details. */ -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Style 1.0 -import com.nextcloud.desktopclient 1.0 +import QtQml +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Style +import com.nextcloud.desktopclient EnforcedPlainTextLabel { required property string section diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml index 8625efa15..f19d38a89 100644 --- a/src/gui/tray/UserLine.qml +++ b/src/gui/tray/UserLine.qml @@ -12,14 +12,14 @@ * for more details. */ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Layouts // Custom qml modules are in /theme (and included by resources.qrc) -import Style 1.0 -import com.nextcloud.desktopclient 1.0 +import Style +import com.nextcloud.desktopclient AbstractButton { id: userLine diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml index a652ffa6d..8a38ffef1 100644 --- a/src/gui/tray/Window.qml +++ b/src/gui/tray/Window.qml @@ -12,20 +12,20 @@ * for more details. */ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Layouts import Qt5Compat.GraphicalEffects -import Qt.labs.platform 1.1 as NativeDialogs +import Qt.labs.platform as NativeDialogs import "../" import "../filedetails/" // Custom qml modules are in /theme (and included by resources.qrc) -import Style 1.0 +import Style -import com.nextcloud.desktopclient 1.0 +import com.nextcloud.desktopclient ApplicationWindow { id: trayWindow