status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: up import version and fix SplitViews

This commit is contained in:
Jonathan Rainville 2020-06-23 14:51:10 -04:00 committed by Iuri Matias
parent 2490a6fe4a
commit 02d915cb50
12 changed files with 34 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml
View File

@ -15,7 +15,6 @@ ScrollView {
property real scrollY: chatLogView.visibleArea.yPosition * chatLogView.contentHeight
contentItem: chatLogView
anchors.fill: parent
Layout.fillWidth: true
Layout.fillHeight: true

21
ui/app/AppLayouts/Chat/ChatLayout.qml
View File

@ -1,26 +1,19 @@
import QtQuick 2.13
//TODO: update to import QtQuick.Controls 2.13
import QtQuick.Controls 1.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.13
import QtQuick.Controls 2.13
import "../../../imports"
import "../../../shared"
import "."
SplitView {
id: chatView
x: 0
y: 0
Layout.fillHeight: true
Layout.fillWidth: true
handleDelegate: Rectangle {
implicitWidth: 1
implicitHeight: 4
color: Theme.grey
}
handle: SplitViewHandle {}
ContactsColumn {
id: contactsColumn
SplitView.preferredWidth: Theme.leftTabPrefferedSize
SplitView.minimumWidth: Theme.leftTabMinimumWidth
SplitView.maximumWidth: Theme.leftTabMaximumWidth
}
ChatColumn {
@ -31,6 +24,6 @@ SplitView {
/*##^##
Designer {
D{i:0;formeditorZoom:0.5;height:770;width:1152}
D{i:0;formeditorColor:"#ffffff";formeditorZoom:1.25;height:770;width:1152}
}
##^##*/

2
ui/app/AppLayouts/Chat/ContactsColumn.qml
View File

@ -12,8 +12,6 @@ Item {
property alias searchStr: searchBox.text
id: contactsColumn
width: 300
Layout.minimumWidth: 200
Layout.fillHeight: true
StyledText {

13
ui/app/AppLayouts/Node/NodeLayout.qml
View File

@ -4,24 +4,15 @@ import QtQuick.Layouts 1.13
import "../../../imports"
import "../../../shared"
SplitView {
Item {
id: nodeView
x: 0
y: 0
Layout.fillHeight: true
Layout.fillWidth: true
ColumnLayout {
id: rpcColumn
spacing: 0
// anchors.left: contactsColumn.right
anchors.leftMargin: 0
anchors.right: parent.right
anchors.rightMargin: 0
anchors.bottom: parent.bottom
anchors.bottomMargin: 0
anchors.top: parent.top
anchors.topMargin: 0
anchors.fill: parent
ColumnLayout {
id: messageContainer

5
ui/app/AppLayouts/Profile/LeftTab.qml
View File

@ -5,11 +5,9 @@ import "../../../shared"
import "./LeftTab"
ColumnLayout {
readonly property int w: 340
property alias currentTab: profileMenu.profileCurrentIndex
id: profileInfoContainer
width: w
spacing: 0
anchors.left: parent.left
anchors.leftMargin: 0
@ -17,13 +15,11 @@ ColumnLayout {
anchors.topMargin: 0
anchors.bottom: parent.bottom
anchors.bottomMargin: 0
Layout.minimumWidth: 300
RowLayout {
id: profileHeader
height: 240
Layout.fillWidth: true
width: profileInfoContainer.w
Profile {
username: profileModel.profile.username
@ -33,7 +29,6 @@ ColumnLayout {
}
RowLayout {
width: profileInfoContainer.w
height: btnheight * 10
Layout.fillHeight: true
Layout.fillWidth: true

9
ui/app/AppLayouts/Profile/ProfileLayout.qml
View File

@ -12,14 +12,13 @@ SplitView {
Layout.fillHeight: true
Layout.fillWidth: true
handle: Rectangle {
implicitWidth: 1
implicitHeight: 4
color: Theme.grey
}
handle: SplitViewHandle {}
LeftTab {
id: leftTab
SplitView.preferredWidth: Theme.leftTabPrefferedSize
SplitView.minimumWidth: Theme.leftTabMinimumWidth
SplitView.maximumWidth: Theme.leftTabMaximumWidth
}
StackLayout {

2
ui/app/AppLayouts/Wallet/LeftTab.qml
View File

@ -16,8 +16,6 @@ Item {
walletModel.setCurrentAccountByIndex(newIndex)
}
id: walletInfoContainer
width: 340
Layout.minimumWidth: 300
Rectangle {
id: walletInfoHeader

16
ui/app/AppLayouts/Wallet/WalletLayout.qml
View File

@ -1,7 +1,5 @@
import QtQuick 2.13
//TODO: update to import QtQuick.Controls 2.13
import QtQuick.Controls 1.3
import QtQuick.Controls 2.3
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../imports"
import "../../../shared"
@ -9,20 +7,16 @@ import "."
SplitView {
id: walletView
x: 0
y: 0
Layout.fillHeight: true
Layout.fillWidth: true
// handle for QtQuick.Controls 2.13
handleDelegate: Rectangle {
implicitWidth: 1
implicitHeight: 4
color: Theme.grey
}
handle: SplitViewHandle {}
LeftTab {
id: leftTab
SplitView.preferredWidth: Theme.leftTabPrefferedSize
SplitView.minimumWidth: Theme.leftTabMinimumWidth
SplitView.maximumWidth: Theme.leftTabMaximumWidth
}
Item {

4
ui/imports/Theme.qml
View File

@ -26,4 +26,8 @@ QtObject {
readonly property int padding: 16
readonly property int smallPadding: 10
readonly property int radius: 8
readonly property int leftTabPrefferedSize: 340
readonly property int leftTabMinimumWidth: 300
readonly property int leftTabMaximumWidth: 500
}

1
ui/nim-status-client.pro
View File

@ -212,6 +212,7 @@ DISTFILES += \
shared/SearchBox.qml \
shared/Select.qml \
shared/Separator.qml \
shared/SplitViewHandle.qml \
shared/StatusTabButton.qml \
shared/StyledButton.qml \
shared/RoundedIcon.qml \

10
ui/shared/SplitViewHandle.qml Normal file
View File

@ -0,0 +1,10 @@
import QtQuick 2.13
import QtQuick.Controls 2.13
import "../imports"
Rectangle {
// FIXME setting this 1 is prettier, but makes the handle complety unusable (too small to grab)
implicitWidth: 2
color: SplitHandle.pressed ? Theme.darkGrey
: (SplitHandle.hovered ? Qt.darker(Theme.grey, 1.1) : Theme.grey)
}

1
ui/shared/qmldir
View File

@ -14,3 +14,4 @@ StyledTextField 1.0 StyledTextField.qml
StyledTextEdit 1.0 StyledTextEdit.qml
Identicon 1.0 Identicon.qml
RoundedImage 1.0 RoundedImage.qml
SplitViewHandle 1.0 SplitViewHandle.qml