new scaling system pass one #457
2
Makefile
2
Makefile
|
@ -14,7 +14,7 @@ clean:
|
||||||
|
|
||||||
linux:
|
linux:
|
||||||
date
|
date
|
||||||
qtdeploy -qt_version $(QT_BUILD_VERSION) build linux 2>&1 | tee qtdeploy.log | pv
|
qtdeploy -docker -qt_version $(QT_BUILD_VERSION) build linux 2>&1 | tee qtdeploy.log | pv
|
||||||
date
|
date
|
||||||
cp -R assets deploy/linux/
|
cp -R assets deploy/linux/
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 6b285e4bbc2a673fceb1c0ffb0065d1dae9c5f8b
|
Subproject commit 136e613ab596ae70edfa73fc6019f5dde44e0a08
|
|
@ -11,21 +11,27 @@ import "../opaque/controls" as Awesome
|
||||||
import "../utils.js" as Utils
|
import "../utils.js" as Utils
|
||||||
import "../opaque/styles"
|
import "../opaque/styles"
|
||||||
import "../opaque/theme"
|
import "../opaque/theme"
|
||||||
|
import "../widgets" as W
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
Layout.fillWidth: true
|
|
||||||
width: parent.width
|
|
||||||
id: listpanel
|
id: listpanel
|
||||||
|
Layout.fillWidth: true
|
||||||
|
width:parent.width
|
||||||
|
// todo: margins don't seem to be getting applied to search/additem textboxes? not sure why
|
||||||
|
Layout.margins: Theme.paddingStandard
|
||||||
|
|
||||||
property bool online: false
|
property bool online: false
|
||||||
|
|
||||||
Text {
|
|
||||||
Layout.fillWidth: true
|
Item {
|
||||||
|
width: 1
|
||||||
|
height: Theme.paddingStandard
|
||||||
}
|
}
|
||||||
|
|
||||||
Opaque.IconTextField {
|
Opaque.IconTextField {
|
||||||
id: filter
|
id: filter
|
||||||
visible:listpanel.online
|
visible:listpanel.online
|
||||||
width: parent.width - 2 * Theme.paddingStandard
|
Layout.fillWidth: true
|
||||||
|
|
||||||
//: ex: "Find..."
|
//: ex: "Find..."
|
||||||
placeholderText: qsTr("search-list")
|
placeholderText: qsTr("search-list")
|
||||||
|
@ -52,14 +58,15 @@ ColumnLayout {
|
||||||
height: 150
|
height: 150
|
||||||
width: 150
|
width: 150
|
||||||
}
|
}
|
||||||
// Label {
|
|
||||||
// visible:!listpanel.online
|
Opaque.Label {
|
||||||
// color: Theme.mainTextColor
|
visible:!listpanel.online
|
||||||
// Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
// elide: Text.ElideRight
|
Layout.fillWidth: true
|
||||||
// font.pixelSize: 18 * gcd.themeScale
|
elide: Text.ElideRight
|
||||||
// text: qsTr("peer-not-online")
|
size: Theme.textMediumPt
|
||||||
// }
|
text: qsTr("peer-not-online")
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -163,7 +170,7 @@ ColumnLayout {
|
||||||
delegate:
|
delegate:
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
width: parent.width
|
width: Listview.view.width
|
||||||
height: title.indexOf(listView.filter) >= 0 ? texttitle.height : 0
|
height: title.indexOf(listView.filter) >= 0 ? texttitle.height : 0
|
||||||
visible: title.indexOf(listView.filter) >= 0
|
visible: title.indexOf(listView.filter) >= 0
|
||||||
|
|
||||||
|
@ -210,7 +217,7 @@ ColumnLayout {
|
||||||
button_text: qsTr("add-list-item-btn")
|
button_text: qsTr("add-list-item-btn")
|
||||||
dropShadowColor: Theme.dropShadowPaneColor
|
dropShadowColor: Theme.dropShadowPaneColor
|
||||||
property int nextMessageID: 1
|
property int nextMessageID: 1
|
||||||
width: parent.width - 2 * Theme.paddingStandard
|
Layout.fillWidth: true
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
if (newlistitem.text != "") {
|
if (newlistitem.text != "") {
|
||||||
|
@ -221,9 +228,4 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Opaque.HLine{}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,7 +76,6 @@ Opaque.SettingsList { // groupSettingsPane
|
||||||
}
|
}
|
||||||
|
|
||||||
Opaque.Setting {
|
Opaque.Setting {
|
||||||
property color backgroundColor: "red"//parent.color
|
|
||||||
inline: true
|
inline: true
|
||||||
label: qsTr("server-info")
|
label: qsTr("server-info")
|
||||||
field: Column {
|
field: Column {
|
||||||
|
|
|
@ -45,23 +45,15 @@ ColumnLayout {
|
||||||
|
|
||||||
|
|
||||||
ChatOverlay { //0
|
ChatOverlay { //0
|
||||||
// Layout.maximumHeight: overlayStack.height
|
|
||||||
// Layout.maximumWidth: overlayStack.width
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ListOverlay{ //1
|
ListOverlay{ //1
|
||||||
// Layout.maximumHeight: overlayStack.height
|
|
||||||
// Layout.maximumWidth: overlayStack.width
|
|
||||||
}
|
}
|
||||||
|
|
||||||
BulletinOverlay{ //2
|
BulletinOverlay{ //2
|
||||||
// Layout.maximumHeight: overlayStack.height
|
|
||||||
// Layout.maximumWidth: overlayStack.width
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MembershipOverlay { //3
|
MembershipOverlay { //3
|
||||||
// Layout.maximumHeight: overlayStack.height
|
|
||||||
// Layout.maximumWidth: overlayStack.width
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -365,7 +365,6 @@ Opaque.Flickable {
|
||||||
|
|
||||||
|
|
||||||
Opaque.Button { // ADD or SAVE button
|
Opaque.Button { // ADD or SAVE button
|
||||||
//height: Theme.primaryTextSize * 1.5
|
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -35,16 +35,10 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
//width: 700 * gcd.themeScale
|
|
||||||
Layout.alignment: Qt.AlignHCenter
|
Layout.alignment: Qt.AlignHCenter
|
||||||
|
|
||||||
Opaque.UnderlineTextField {
|
Opaque.UnderlineTextField {
|
||||||
id: txtPassword
|
id: txtPassword
|
||||||
//anchors.horizontalCenter: parent.horizontalCenter
|
|
||||||
//Layout.fillWidth: true
|
|
||||||
//Layout.maximumWidth: 450 * gcd.themeScale
|
|
||||||
//Layout.minimumWidth: 450 * gcd.themeScale
|
|
||||||
|
|
||||||
Layout.rightMargin: 40
|
Layout.rightMargin: 40
|
||||||
Layout.leftMargin: 40
|
Layout.leftMargin: 40
|
||||||
placeholderText: qsTr("password")
|
placeholderText: qsTr("password")
|
||||||
|
|
|
@ -53,7 +53,7 @@ Opaque.SettingsList { // Add Profile Pane
|
||||||
|
|
||||||
checked: serverAddEditPane.server_available
|
checked: serverAddEditPane.server_available
|
||||||
onCheckedChanged: function() {
|
onCheckedChanged: function() {
|
||||||
//serverAddEditPane.server_available = !serverAddEditPane.server_available
|
serverAddEditPane.server_available = checked
|
||||||
if (serverAddEditPane.server_available) {
|
if (serverAddEditPane.server_available) {
|
||||||
gcd.startServer(serverAddEditPane.server_name)
|
gcd.startServer(serverAddEditPane.server_name)
|
||||||
} else {
|
} else {
|
||||||
|
@ -63,12 +63,6 @@ Opaque.SettingsList { // Add Profile Pane
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Opaque.Setting {
|
Opaque.Setting {
|
||||||
label: qsTr("server-autostart")
|
label: qsTr("server-autostart")
|
||||||
|
|
||||||
|
@ -77,7 +71,7 @@ Opaque.SettingsList { // Add Profile Pane
|
||||||
|
|
||||||
checked: serverAddEditPane.autostart_server
|
checked: serverAddEditPane.autostart_server
|
||||||
onCheckedChanged: function() {
|
onCheckedChanged: function() {
|
||||||
//serverAddEditPane.autostart_server = !serverAddEditPane.autostart_server
|
serverAddEditPane.autostart_server = checked
|
||||||
gcd.autostartServer(serverAddEditPane.server_name, serverAddEditPane.autostart_server)
|
gcd.autostartServer(serverAddEditPane.server_name, serverAddEditPane.autostart_server)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,11 +65,6 @@ Opaque.SettingsList { // groupSettingsPane
|
||||||
onSupplyServerSettings: function(server, key_names, keys) {
|
onSupplyServerSettings: function(server, key_names, keys) {
|
||||||
gsp.serverName = server;
|
gsp.serverName = server;
|
||||||
toolbar.setTitle(qsTr("server-settings"));
|
toolbar.setTitle(qsTr("server-settings"));
|
||||||
// console.log("Servers: " + key_names);
|
|
||||||
// for (let i=0; i<key_names.length;i++) {
|
|
||||||
// // TODO: Actually do something with these keys
|
|
||||||
// console.log("FOUND SERVER KEY " + key_names[i] + " " + keys[i]);
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -119,7 +119,7 @@ Rectangle {
|
||||||
|
|
||||||
color: Theme.messageFromOtherTextColor
|
color: Theme.messageFromOtherTextColor
|
||||||
|
|
||||||
elide: Text.ElideRight
|
multiline: false
|
||||||
width: parent.width - leftPadding - rightPadding // padding
|
width: parent.width - leftPadding - rightPadding // padding
|
||||||
size: Theme.chatSize
|
size: Theme.chatSize
|
||||||
bold: true
|
bold: true
|
||||||
|
@ -134,14 +134,12 @@ Rectangle {
|
||||||
width: Math.max(lbl.width, ts.width + ack.width + 10)
|
width: Math.max(lbl.width, ts.width + ack.width + 10)
|
||||||
|
|
||||||
anchors.top: fromMe ? parent.top : (calendarEvent ? parent.top : handle.bottom)
|
anchors.top: fromMe ? parent.top : (calendarEvent ? parent.top : handle.bottom)
|
||||||
anchors.topMargin: 10 * gcd.themeScale
|
|
||||||
|
|
||||||
TextEdit { // this is used as a helper to calculate the message box width
|
TextEdit { // this is used as a helper to calculate the message box width
|
||||||
id: dummy
|
id: dummy
|
||||||
visible: false
|
visible: false
|
||||||
padding: 6 * gcd.themeScale
|
padding: Theme.paddingSmall
|
||||||
leftPadding: 10 * gcd.themeScale
|
font.pointSize: lbl.font.pointSize
|
||||||
font.pixelSize: gcd.themeScale * Theme.chatSize
|
|
||||||
wrapMode: TextEdit.NoWrap
|
wrapMode: TextEdit.NoWrap
|
||||||
text: lbl.text
|
text: lbl.text
|
||||||
textFormat: Text.RichText
|
textFormat: Text.RichText
|
||||||
|
@ -152,7 +150,6 @@ Rectangle {
|
||||||
text: parse(message, Theme.uiEmojiSize, true)
|
text: parse(message, Theme.uiEmojiSize, true)
|
||||||
color: fromMe ? Theme.messageFromMeTextColor : Theme.messageFromOtherTextColor
|
color: fromMe ? Theme.messageFromMeTextColor : Theme.messageFromOtherTextColor
|
||||||
padding: Theme.paddingSmall
|
padding: Theme.paddingSmall
|
||||||
leftPadding: Theme.paddingStandard
|
|
||||||
font.pointSize: Theme.textSmallPt
|
font.pointSize: Theme.textSmallPt
|
||||||
selectByMouse: gcd.os != "android"
|
selectByMouse: gcd.os != "android"
|
||||||
readOnly: true
|
readOnly: true
|
||||||
|
|
|
@ -15,6 +15,7 @@ import "../const"
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
width: parent.width
|
||||||
property bool online: false
|
property bool online: false
|
||||||
|
|
||||||
property int state: Const.state_disconnected
|
property int state: Const.state_disconnected
|
||||||
|
|
|
@ -104,10 +104,6 @@ RowLayout {
|
||||||
hilightBackgroundColor: Theme.backgroundHilightElementColor
|
hilightBackgroundColor: Theme.backgroundHilightElementColor
|
||||||
iconColor: Theme.altTextColor
|
iconColor: Theme.altTextColor
|
||||||
|
|
||||||
//anchors.verticalCenter: parent.verticalCenter
|
|
||||||
// Layout.alignment: Qt.AlignVCenter
|
|
||||||
|
|
||||||
|
|
||||||
height: root.height / 2
|
height: root.height / 2
|
||||||
width: root.height / 2
|
width: root.height / 2
|
||||||
size: root.height / 2
|
size: root.height / 2
|
||||||
|
|
|
@ -63,10 +63,6 @@ ColumnLayout {
|
||||||
_messages: messages
|
_messages: messages
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// onResetServerList: function() {
|
|
||||||
// serversModel.clear()
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ListModel { // Profile OBJECTS ARE STORED HERE ...
|
ListModel { // Profile OBJECTS ARE STORED HERE ...
|
||||||
|
|
Reference in New Issue