diff --git a/.gitignore b/.gitignore index 5b90fd55d..a4bfc6e06 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,8 @@ deploy/build_64/* winbuild*.bat .cache/ +# Translations +#translations # Qt-es /.qmake.cache @@ -117,6 +119,9 @@ captures/ *.iml .idea/ +# Visual Studio +.vs/ + # Keystore files # Uncomment the following lines if you do not want to check your keystore files in. #*.jks @@ -133,4 +138,6 @@ client/3rd/ShadowSocks/ss_ios.xcconfig out/ # CMake files -CMakeFiles/ \ No newline at end of file +CMakeFiles/ +CMakePresets.json +CMakeUserPresets.json \ No newline at end of file diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml index 7f7cf9e1f..21e90fb7c 100644 --- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml +++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml @@ -134,11 +134,14 @@ PageType { id: continueButton Layout.fillWidth: true - Layout.topMargin: 16 + Layout.topMargin: textKey.textFieldText !== "" ? 16 : -72 Layout.rightMargin: 16 Layout.leftMargin: 16 + z: -1 - visible: textKey.textFieldText !== "" + Behavior on Layout.topMargin { + NumberAnimation { duration: 200 } + } text: qsTr("Continue") Keys.onTabPressed: lastItemTabClicked(focusItem)