AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'qt_migration' into qmake-to-cmake-migration

Browse source
This commit is contained in:
pokamest 2022-12-16 04:45:43 -08:00
commit 77124e098c
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -23,6 +23,7 @@ qrc_*.cpp
ui_*.h ui_*.h
Makefile* Makefile*
*build-* *build-*
compile_commands.json
# fastlane # fastlane
client/fastlane/report.xml client/fastlane/report.xml

4
client/ui/qml/Pages/InstallSettings/SelectContainer.qml
View file

@ -11,8 +11,6 @@ Drawer {
signal containerSelected(int c_index) signal containerSelected(int c_index)
property int selectedIndex: -1 property int selectedIndex: -1
z: -3
y: 0 y: 0
x: 0 x: 0
edge: Qt.RightEdge edge: Qt.RightEdge
@ -117,6 +115,7 @@ Drawer {
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: { onClicked: {
tb.currentIndex = index tb.currentIndex = index
tb_other.currentIndex = -1 tb_other.currentIndex = -1
@ -181,6 +180,7 @@ Drawer {
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: { onClicked: {
tb_other.currentIndex = index tb_other.currentIndex = index
tb.currentIndex = -1 tb.currentIndex = -1

2
client/ui/qml/Pages/PageServerContainers.qml
View file

@ -45,7 +45,7 @@ PageBase {
pageLoader.focus = true pageLoader.focus = true
} }
onContainerSelected: { onContainerSelected: function(c_index) {
var containerProto = ContainerProps.defaultProtocol(c_index) var containerProto = ContainerProps.defaultProtocol(c_index)

1
client/ui/qml/main.qml
View file

@ -285,7 +285,6 @@ Window {
Drawer { Drawer {
id: drawer_log id: drawer_log
z: -3
y: 0 y: 0
x: 0 x: 0
edge: Qt.BottomEdge edge: Qt.BottomEdge