|
@@ -1,17 +1,17 @@
|
|
import QtQuick 2.6
|
|
import QtQuick 2.6
|
|
import QtQuick.Window 2.2
|
|
import QtQuick.Window 2.2
|
|
-import QtQuick.Controls 2.0
|
|
|
|
-//import QtQuick.Controls 1.5
|
|
|
|
-import QtQuick.Controls 1.4 as Ctrl14
|
|
|
|
|
|
+import QtQuick.Controls 1.5
|
|
|
|
+import QtQuick.Controls 2.0 as Ctrl20
|
|
import QtQuick.Controls.Styles 1.4
|
|
import QtQuick.Controls.Styles 1.4
|
|
-import com.gfa.ipc.appctrl 1.0
|
|
|
|
import "globals.js" as Globals
|
|
import "globals.js" as Globals
|
|
|
|
+import com.gfa.ipc.appctrl 1.0
|
|
import QtQuick.FreeVirtualKeyboard 1.0
|
|
import QtQuick.FreeVirtualKeyboard 1.0
|
|
|
|
|
|
Rectangle {
|
|
Rectangle {
|
|
id: idEdit
|
|
id: idEdit
|
|
- width: Screen.width
|
|
|
|
- height: Screen.height
|
|
|
|
|
|
+ visible: true
|
|
|
|
+ width: 800
|
|
|
|
+ height: 480
|
|
|
|
|
|
property bool isDirty: false
|
|
property bool isDirty: false
|
|
property bool ifUpDownInProgress: false
|
|
property bool ifUpDownInProgress: false
|
|
@@ -88,10 +88,10 @@ Rectangle {
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////////////////////////////
|
|
/////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
- TabBar {
|
|
|
|
|
|
+ Ctrl20.TabBar {
|
|
id: idTabBar
|
|
id: idTabBar
|
|
width: parent.width
|
|
width: parent.width
|
|
- currentIndex: 2
|
|
|
|
|
|
+ currentIndex: 6
|
|
|
|
|
|
Repeater {
|
|
Repeater {
|
|
id: idRep
|
|
id: idRep
|
|
@@ -107,7 +107,7 @@ Rectangle {
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////////////////////////////
|
|
/////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
- Ctrl14.TableView {
|
|
|
|
|
|
+ TableView {
|
|
id: idItfList
|
|
id: idItfList
|
|
height: 420
|
|
height: 420
|
|
width: 180
|
|
width: 180
|
|
@@ -124,14 +124,14 @@ Rectangle {
|
|
updateUI(idItfList.currentRow);
|
|
updateUI(idItfList.currentRow);
|
|
}
|
|
}
|
|
|
|
|
|
- Ctrl14.TableViewColumn {
|
|
|
|
|
|
+ TableViewColumn {
|
|
role: "name"
|
|
role: "name"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////////////////////////////
|
|
/////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
- Ctrl14.ExclusiveGroup { id: idMethExGroup }
|
|
|
|
|
|
+ ExclusiveGroup { id: idMethExGroup }
|
|
|
|
|
|
Rectangle {
|
|
Rectangle {
|
|
id: idMethGroup
|
|
id: idMethGroup
|
|
@@ -146,7 +146,7 @@ Rectangle {
|
|
|
|
|
|
property int method: (idItfList.currentRow > 0) ? qGfaAppCtrl.sysInfo.netInterfaceInfo.interfaces[idItfList.currentRow].method : 0
|
|
property int method: (idItfList.currentRow > 0) ? qGfaAppCtrl.sysInfo.netInterfaceInfo.interfaces[idItfList.currentRow].method : 0
|
|
|
|
|
|
- Ctrl14.RadioButton {
|
|
|
|
|
|
+ RadioButton {
|
|
x: 10
|
|
x: 10
|
|
y: 10
|
|
y: 10
|
|
id: idMethStatic
|
|
id: idMethStatic
|
|
@@ -171,7 +171,7 @@ Rectangle {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- Ctrl14.RadioButton {
|
|
|
|
|
|
+ RadioButton {
|
|
x: 100
|
|
x: 100
|
|
y: 10
|
|
y: 10
|
|
id: idMethDhcp
|
|
id: idMethDhcp
|
|
@@ -359,8 +359,13 @@ Rectangle {
|
|
y: 230
|
|
y: 230
|
|
width: 590
|
|
width: 590
|
|
height: 180
|
|
height: 180
|
|
|
|
+// radius: 5
|
|
|
|
+// border.width: 1
|
|
|
|
+// border.color: "black"
|
|
visible: false
|
|
visible: false
|
|
|
|
|
|
|
|
+// ScrollView {
|
|
|
|
+// anchors.fill: parent
|
|
TextArea {
|
|
TextArea {
|
|
id: idIfUpDownText
|
|
id: idIfUpDownText
|
|
anchors.fill: parent
|
|
anchors.fill: parent
|
|
@@ -368,7 +373,9 @@ Rectangle {
|
|
selectByMouse: false
|
|
selectByMouse: false
|
|
selectByKeyboard: false
|
|
selectByKeyboard: false
|
|
font.pointSize: 8
|
|
font.pointSize: 8
|
|
|
|
+// verticalAlignment: Text.AlignTop
|
|
}
|
|
}
|
|
|
|
+// }
|
|
}
|
|
}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////////////////////////////
|
|
/////////////////////////////////////////////////////////////////////////////////////////////////
|
|
@@ -383,7 +390,7 @@ Rectangle {
|
|
border.width: 1
|
|
border.width: 1
|
|
border.color: "black"
|
|
border.color: "black"
|
|
|
|
|
|
- Ctrl14.Button {
|
|
|
|
|
|
+ Button {
|
|
x: 10
|
|
x: 10
|
|
y: 10
|
|
y: 10
|
|
width: 100
|
|
width: 100
|
|
@@ -398,7 +405,7 @@ Rectangle {
|
|
style: idButtonStyle
|
|
style: idButtonStyle
|
|
}
|
|
}
|
|
|
|
|
|
- Ctrl14.Button {
|
|
|
|
|
|
+ Button {
|
|
x: 120
|
|
x: 120
|
|
y: 10
|
|
y: 10
|
|
width: 100
|
|
width: 100
|
|
@@ -413,7 +420,7 @@ Rectangle {
|
|
style: idButtonStyle
|
|
style: idButtonStyle
|
|
}
|
|
}
|
|
|
|
|
|
- Ctrl14.Button {
|
|
|
|
|
|
+ Button {
|
|
x: 260
|
|
x: 260
|
|
y: 10
|
|
y: 10
|
|
width: 100
|
|
width: 100
|
|
@@ -429,7 +436,7 @@ Rectangle {
|
|
style: idButtonStyle
|
|
style: idButtonStyle
|
|
}
|
|
}
|
|
|
|
|
|
- Ctrl14.Button {
|
|
|
|
|
|
+ Button {
|
|
x: 370
|
|
x: 370
|
|
y: 10
|
|
y: 10
|
|
width: 100
|
|
width: 100
|
|
@@ -445,7 +452,7 @@ Rectangle {
|
|
style: idButtonStyle
|
|
style: idButtonStyle
|
|
}
|
|
}
|
|
|
|
|
|
- Ctrl14.Button {
|
|
|
|
|
|
+ Button {
|
|
x: 480
|
|
x: 480
|
|
y: 10
|
|
y: 10
|
|
width: 100
|
|
width: 100
|
|
@@ -465,31 +472,31 @@ Rectangle {
|
|
/////////////////////////////////////////////////////////////////////////////////////////////////
|
|
/////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
InputPanel {
|
|
InputPanel {
|
|
- id: inputPanel
|
|
|
|
- z: 99
|
|
|
|
- y: idEdit.height
|
|
|
|
- anchors.left: parent.left
|
|
|
|
- anchors.right: parent.right
|
|
|
|
-
|
|
|
|
- states: State {
|
|
|
|
- name: "visible"
|
|
|
|
- when: Qt.inputMethod.visible
|
|
|
|
- PropertyChanges {
|
|
|
|
- target: inputPanel
|
|
|
|
- y: idEdit.height - inputPanel.height
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- transitions: Transition {
|
|
|
|
- from: ""
|
|
|
|
- to: "visible"
|
|
|
|
- reversible: true
|
|
|
|
- ParallelAnimation {
|
|
|
|
- NumberAnimation {
|
|
|
|
- properties: "y"
|
|
|
|
- duration: 150
|
|
|
|
- easing.type: Easing.InOutQuad
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ id: inputPanel
|
|
|
|
+ z: 99
|
|
|
|
+ y: idEdit.height
|
|
|
|
+ anchors.left: parent.left
|
|
|
|
+ anchors.right: parent.right
|
|
|
|
+
|
|
|
|
+ states: State {
|
|
|
|
+ name: "visible"
|
|
|
|
+ when: Qt.inputMethod.visible
|
|
|
|
+ PropertyChanges {
|
|
|
|
+ target: inputPanel
|
|
|
|
+ y: idEdit.height - inputPanel.height
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ transitions: Transition {
|
|
|
|
+ from: ""
|
|
|
|
+ to: "visible"
|
|
|
|
+ reversible: true
|
|
|
|
+ ParallelAnimation {
|
|
|
|
+ NumberAnimation {
|
|
|
|
+ properties: "y"
|
|
|
|
+ duration: 150
|
|
|
|
+ easing.type: Easing.InOutQuad
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|