adding back components that shouldnt have been moved to opaque
the build was successful
Details
the build was successful
Details
This commit is contained in:
parent
533b0d3fe0
commit
3ffdaa1ca3
6
qml.qrc
6
qml.qrc
|
@ -13,6 +13,12 @@
|
||||||
<file>qml/panes/SplashPane.qml</file>
|
<file>qml/panes/SplashPane.qml</file>
|
||||||
<file>qml/panes/ProfileManagerPane.qml</file>
|
<file>qml/panes/ProfileManagerPane.qml</file>
|
||||||
<file>qml/panes/ProfileAddEditPane.qml</file>
|
<file>qml/panes/ProfileAddEditPane.qml</file>
|
||||||
|
<file>qml/widgets/ContactList.qml</file>
|
||||||
|
<file>qml/widgets/ContactRow.qml</file>
|
||||||
|
<file>qml/widgets/Message.qml</file>
|
||||||
|
<file>qml/widgets/MyProfile.qml</file>
|
||||||
|
<file>qml/widgets/ProfileList.qml</file>
|
||||||
|
<file>qml/widgets/ProfileRow.qml</file>
|
||||||
<file>i18n/translation_de.qm</file>
|
<file>i18n/translation_de.qm</file>
|
||||||
<file>i18n/translation_en.qm</file>
|
<file>i18n/translation_en.qm</file>
|
||||||
<file>i18n/translation_fr.qm</file>
|
<file>i18n/translation_fr.qm</file>
|
||||||
|
|
|
@ -13,6 +13,7 @@ import "opaque/theme"
|
||||||
|
|
||||||
import "overlays"
|
import "overlays"
|
||||||
import "panes"
|
import "panes"
|
||||||
|
import "widgets"
|
||||||
import "utils.js" as Utils
|
import "utils.js" as Utils
|
||||||
|
|
||||||
|
|
||||||
|
@ -158,7 +159,7 @@ ApplicationWindow {
|
||||||
visible: (windowItem.width >= Theme.doublePaneMinSize && !Qt.inputMethod.visible) || theStack.pane == theStack.emptyPane
|
visible: (windowItem.width >= Theme.doublePaneMinSize && !Qt.inputMethod.visible) || theStack.pane == theStack.emptyPane
|
||||||
|
|
||||||
|
|
||||||
ContactList{
|
ContactList {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
dualPane: theStack.pane != theStack.emptyPane || theStack.pane == undefined
|
dualPane: theStack.pane != theStack.emptyPane || theStack.pane == undefined
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 9a88a124e52ad68a0e32ae23d9e9247020b0266b
|
Subproject commit 133a7697f159c2699fe46d9fc03148d85e6466a3
|
|
@ -8,6 +8,7 @@ import "../opaque" as Widgets
|
||||||
import "../opaque/controls" as Awesome
|
import "../opaque/controls" as Awesome
|
||||||
import "../opaque/fonts/Twemoji.js" as T
|
import "../opaque/fonts/Twemoji.js" as T
|
||||||
import "../utils.js" as Utils
|
import "../utils.js" as Utils
|
||||||
|
import "../widgets"
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
|
@ -29,7 +30,7 @@ Item {
|
||||||
ScrollBar.vertical: ScrollBar {}
|
ScrollBar.vertical: ScrollBar {}
|
||||||
maximumFlickVelocity: 1250
|
maximumFlickVelocity: 1250
|
||||||
|
|
||||||
delegate: Widgets.Message {
|
delegate: Message {
|
||||||
handle: _handle
|
handle: _handle
|
||||||
from: _from
|
from: _from
|
||||||
displayName: _displayName
|
displayName: _displayName
|
||||||
|
|
|
@ -10,6 +10,7 @@ import "../opaque/controls" as Awesome
|
||||||
import "../opaque/fonts/Twemoji.js" as T
|
import "../opaque/fonts/Twemoji.js" as T
|
||||||
import "../opaque/styles"
|
import "../opaque/styles"
|
||||||
import "../utils.js" as Utils
|
import "../utils.js" as Utils
|
||||||
|
import "../widgets"
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
Text {
|
Text {
|
||||||
|
|
|
@ -8,6 +8,8 @@ import QtQuick.Window 2.11
|
||||||
import QtQuick.Controls 1.4
|
import QtQuick.Controls 1.4
|
||||||
import QtQuick.Controls.Styles 1.4
|
import QtQuick.Controls.Styles 1.4
|
||||||
|
|
||||||
|
import "../widgets"
|
||||||
|
|
||||||
import "../opaque" as Widgets
|
import "../opaque" as Widgets
|
||||||
import "../opaque/controls"
|
import "../opaque/controls"
|
||||||
import "../opaque/styles"
|
import "../opaque/styles"
|
||||||
|
@ -80,7 +82,7 @@ ColumnLayout {
|
||||||
Layout.minimumWidth: Layout.maximumWidth
|
Layout.minimumWidth: Layout.maximumWidth
|
||||||
//Layout.maximumWidth: theStack.pane == theStack.emptyPane ? parent.width : 450
|
//Layout.maximumWidth: theStack.pane == theStack.emptyPane ? parent.width : 450
|
||||||
|
|
||||||
Widgets.ProfileList {
|
ProfileList {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,9 @@ import QtQuick 2.7
|
||||||
import QtQuick.Controls 2.4
|
import QtQuick.Controls 2.4
|
||||||
import QtQuick.Controls.Material 2.0
|
import QtQuick.Controls.Material 2.0
|
||||||
import QtQuick.Layouts 1.3
|
import QtQuick.Layouts 1.3
|
||||||
import "theme"
|
|
||||||
|
import "../opaque" as Widgets
|
||||||
|
import "../opaque/theme"
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: root
|
id: root
|
||||||
|
@ -25,7 +27,7 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
IconTextField {
|
Widgets.IconTextField {
|
||||||
id: searchAddText
|
id: searchAddText
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
|
||||||
|
|
|
@ -4,14 +4,14 @@ import QtQuick.Controls 2.4
|
||||||
import QtQuick.Controls.Material 2.0
|
import QtQuick.Controls.Material 2.0
|
||||||
import QtQuick.Layouts 1.3
|
import QtQuick.Layouts 1.3
|
||||||
import CustomQmlTypes 1.0
|
import CustomQmlTypes 1.0
|
||||||
import "styles"
|
|
||||||
import "." as Widgets
|
|
||||||
import "theme"
|
|
||||||
import QtQuick.Controls 1.4
|
import QtQuick.Controls 1.4
|
||||||
import QtQuick.Controls.Styles 1.4
|
import QtQuick.Controls.Styles 1.4
|
||||||
|
|
||||||
PortraitRow {
|
import "../opaque" as Widgets
|
||||||
|
import "../opaque/styles"
|
||||||
|
import "../opaque/theme"
|
||||||
|
|
||||||
|
Widgets.PortraitRow {
|
||||||
property int status: 0
|
property int status: 0
|
||||||
property int badge
|
property int badge
|
||||||
property bool loading
|
property bool loading
|
||||||
|
|
|
@ -4,7 +4,8 @@ import QtQuick.Controls 2.4
|
||||||
import QtQuick.Controls.Material 2.0
|
import QtQuick.Controls.Material 2.0
|
||||||
import QtQuick.Layouts 1.3
|
import QtQuick.Layouts 1.3
|
||||||
|
|
||||||
import "controls" as Awesome
|
import "../opaque" as Widgets
|
||||||
|
import "../opaque/controls" as Awesome
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
@ -42,7 +43,7 @@ Item {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Portrait {
|
Widgets.Portrait {
|
||||||
id: imgProfile
|
id: imgProfile
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
// TODO: currently unused?
|
// TODO: currently unused?
|
||||||
|
|
|
@ -7,9 +7,9 @@ import QtQuick.Layouts 1.3
|
||||||
import QtQuick.Window 2.11
|
import QtQuick.Window 2.11
|
||||||
import QtQuick.Controls 1.4
|
import QtQuick.Controls 1.4
|
||||||
|
|
||||||
import "." as Widgets
|
import "../opaque" as Widgets
|
||||||
import "styles"
|
import "../opaque/styles"
|
||||||
import "theme"
|
import "../opaque/theme"
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
@ -78,7 +78,7 @@ Item {
|
||||||
id: profile
|
id: profile
|
||||||
color: Theme.backgroundMainColor
|
color: Theme.backgroundMainColor
|
||||||
|
|
||||||
Portrait {
|
Widgets.Portrait {
|
||||||
id: portrait
|
id: portrait
|
||||||
|
|
||||||
source: root.image
|
source: root.image
|
||||||
|
@ -105,7 +105,7 @@ Item {
|
||||||
id: nameCenter
|
id: nameCenter
|
||||||
width: name.width + addBtn.width
|
width: name.width + addBtn.width
|
||||||
|
|
||||||
EllipsisLabel {
|
Widgets.EllipsisLabel {
|
||||||
id: name
|
id: name
|
||||||
|
|
||||||
anchors.right: undefined
|
anchors.right: undefined
|
||||||
|
|
|
@ -3,7 +3,9 @@ import QtQuick 2.7
|
||||||
import QtQuick.Controls 2.4
|
import QtQuick.Controls 2.4
|
||||||
import QtQuick.Controls.Material 2.0
|
import QtQuick.Controls.Material 2.0
|
||||||
import QtQuick.Layouts 1.3
|
import QtQuick.Layouts 1.3
|
||||||
import "theme"
|
|
||||||
|
import "../opaque" as Widgets
|
||||||
|
import "../opaque/theme"
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: root
|
id: root
|
||||||
|
@ -101,7 +103,7 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
PortraitRow {
|
Widgets.PortraitRow {
|
||||||
handle: ""
|
handle: ""
|
||||||
displayName: qsTr("add-new-profile-btn")
|
displayName: qsTr("add-new-profile-btn")
|
||||||
nameColor: Theme.mainTextColor
|
nameColor: Theme.mainTextColor
|
||||||
|
|
|
@ -4,14 +4,14 @@ import QtQuick.Controls 2.4
|
||||||
import QtQuick.Controls.Material 2.0
|
import QtQuick.Controls.Material 2.0
|
||||||
import QtQuick.Layouts 1.3
|
import QtQuick.Layouts 1.3
|
||||||
import CustomQmlTypes 1.0
|
import CustomQmlTypes 1.0
|
||||||
import "styles"
|
|
||||||
import "." as Widgets
|
|
||||||
import "theme"
|
|
||||||
import QtQuick.Controls 1.4
|
import QtQuick.Controls 1.4
|
||||||
import QtQuick.Controls.Styles 1.4
|
import QtQuick.Controls.Styles 1.4
|
||||||
|
|
||||||
PortraitRow {
|
import "../opaque" as Widgets
|
||||||
|
import "../opaque/styles"
|
||||||
|
import "../opaque/theme"
|
||||||
|
|
||||||
|
Widgets.PortraitRow {
|
||||||
badgeColor: Theme.portraitProfileBadgeColor
|
badgeColor: Theme.portraitProfileBadgeColor
|
||||||
|
|
||||||
portraitBorderColor: Theme.portraitOnlineBorderColor
|
portraitBorderColor: Theme.portraitOnlineBorderColor
|
||||||
|
|
Reference in New Issue