1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
|
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Banner.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Banner.qml
index f3affdc9..88d3a48a 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/Banner.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/Banner.qml
@@ -28,7 +28,7 @@ Popup {
implicitWidth: 600 // contentLayout.implicitWidth + contentLayout.anchors.leftMargin + contentLayout.anchors.rightMargin
leftMargin: (mainWindow.width - root.implicitWidth) / 2
modal: false
- popupType: ApplicationWindow.PopupType.Banner
+ popupPrio: ApplicationWindow.PopupPriority.Banner
shouldShow: notification ? (notification.active && !notification.dismissed) : false
topMargin: 37
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/BugReport/QuestionItem.qml b/internal/frontend/bridge-gui/bridge-gui/qml/BugReport/QuestionItem.qml
index 9cf37cc1..2e0ca39c 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/BugReport/QuestionItem.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/BugReport/QuestionItem.qml
@@ -13,6 +13,7 @@
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
+import QtQuick.Controls.impl
import Proton
Item {
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/ApplicationWindow.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/ApplicationWindow.qml
index ef23ede5..72207896 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/ApplicationWindow.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/ApplicationWindow.qml
@@ -21,7 +21,7 @@ T.ApplicationWindow {
id: root
// popup priority based on types
- enum PopupType {
+ enum PopupPriority {
Banner,
Dialog
}
@@ -78,10 +78,10 @@ T.ApplicationWindow {
topmost = obj;
break;
}
- if (topmost && (topmost.popupType > obj.popupType)) {
+ if (topmost && (topmost.popupPrio > obj.popupPrio)) {
continue;
}
- if (topmost && (topmost.popupType === obj.popupType) && (topmost.occurred > obj.occurred)) {
+ if (topmost && (topmost.popupPrio === obj.popupPrio) && (topmost.occurred > obj.occurred)) {
continue;
}
topmost = obj;
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Dialog.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Dialog.qml
index f1ab61a0..30e7a99d 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Dialog.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Dialog.qml
@@ -21,7 +21,7 @@ T.Dialog {
property ColorScheme colorScheme
readonly property var occurred: shouldShow ? new Date() : undefined
- readonly property int popupType: ApplicationWindow.PopupType.Dialog
+ readonly property int popupPrio: ApplicationWindow.PopupPriority.Dialog
property bool shouldShow: false
function close() {
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/InfoTooltip.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/InfoTooltip.qml
index 281e93e8..0ec6bf26 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/InfoTooltip.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/InfoTooltip.qml
@@ -16,6 +16,7 @@
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
import QtQuick
import QtQuick.Controls
+import QtQuick.Controls.impl
import QtQuick.Layouts
ColorImage {
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/LinkLabel.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/LinkLabel.qml
index 30871f21..af9b40d2 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/LinkLabel.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/LinkLabel.qml
@@ -12,6 +12,7 @@
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
import QtQuick
import QtQuick.Controls
+import QtQuick.Controls.impl
import QtQuick.Layouts
RowLayout {
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Popup.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Popup.qml
index 68c3af7c..78fa29c1 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Popup.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Popup.qml
@@ -21,7 +21,7 @@ T.Popup {
property ColorScheme colorScheme
readonly property var occurred: shouldShow ? new Date() : undefined
- property int popupType: ApplicationWindow.PopupType.Banner
+ property int popupPrio: ApplicationWindow.PopupPriority.Banner
property bool shouldShow: false
function close() {
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigCertInstall.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigCertInstall.qml
index 1ac498b0..9790afe9 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigCertInstall.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigCertInstall.qml
@@ -15,6 +15,7 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
+import QtQuick.Controls.impl
Item {
id: root
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigParameters.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigParameters.qml
index 52e3fec2..2a4c7d39 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigParameters.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigParameters.qml
@@ -14,6 +14,7 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
+import QtQuick.Controls.impl
import ".."
Rectangle {
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientListItem.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientListItem.qml
index 3e781d16..30e9307e 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientListItem.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientListItem.qml
@@ -14,6 +14,7 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
+import QtQuick.Controls.impl
Rectangle {
id: root
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/Login.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/Login.qml
index 20eba753..2f1a86a9 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/Login.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/Login.qml
@@ -14,6 +14,7 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
+import QtQuick.Controls.impl
FocusScope {
id: root
|
