Skip to content
Snippets Groups Projects
Commit 1ddd596e authored by Burak Hançerli's avatar Burak Hançerli :headphones:
Browse files

QDS-11197 Add QR Code registration instructions

parent 9cc065b0
No related branches found
No related tags found
1 merge request!17QDS-11197 Add QR Code registration instructions
Pipeline #64228 passed
<?xml version="1.0"?> <?xml version="1.0"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.qt.qtdesignviewer" <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.qt.qtdesignviewer"
android:installLocation="auto" android:versionCode="10" android:versionName="1.2"> android:installLocation="auto" android:versionCode="11" android:versionName="1.2">
<!-- %%INSERT_PERMISSIONS --> <!-- %%INSERT_PERMISSIONS -->
<!-- %%INSERT_FEATURES --> <!-- %%INSERT_FEATURES -->
<supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true"/> <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true"/>
......
...@@ -483,6 +483,7 @@ void Backend::registerUser(const QUrl &url) ...@@ -483,6 +483,7 @@ void Backend::registerUser(const QUrl &url)
printLog("Registering User Hash: " + userHash); printLog("Registering User Hash: " + userHash);
m_userHash = userHash; m_userHash = userHash;
QSettings().setValue("user/hash", m_userHash); QSettings().setValue("user/hash", m_userHash);
emit userRegistered();
updateUserProjectList(); updateUserProjectList();
} }
......
...@@ -94,6 +94,7 @@ signals: ...@@ -94,6 +94,7 @@ signals:
void popupTextChanged(QString text); void popupTextChanged(QString text);
void popupOpen(); void popupOpen();
void popupClose(); void popupClose();
void userRegistered();
public slots: public slots:
void downloadAndRun(const QString &url); void downloadAndRun(const QString &url);
......
...@@ -10,6 +10,8 @@ Item { ...@@ -10,6 +10,8 @@ Item {
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
Item { Item {
id: item2 id: item2
Layout.preferredWidth: 10 Layout.preferredWidth: 10
...@@ -18,6 +20,33 @@ Item { ...@@ -18,6 +20,33 @@ Item {
Layout.fillHeight: true Layout.fillHeight: true
} }
Text {
id: qrCodeStatus
text: qsTr("No user code is registered.\nTo access your shared projects;")
font.pixelSize: 12
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap
Layout.fillWidth: true
Connections {
target: backend
function onUserRegistered(){
qrCodeStatus.text = "QR Code Registered\nYou can simply scan a new QR code to register another user.";
qrCodeInstructions.text = "";
}
}
}
Text {
id: qrCodeInstructions
text: qsTr("1. Open Design Studio (4.4 or later)\n2. Open any project\n3. Click \"File\" menu from top\n4. Select \"Share Application Online\"\n5. Scan QR code with your camera or any QR reader app")
font.pixelSize: 12
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap
Layout.fillWidth: true
}
ComboBox { ComboBox {
id: projectList id: projectList
Layout.fillWidth: true Layout.fillWidth: true
...@@ -40,6 +69,7 @@ Item { ...@@ -40,6 +69,7 @@ Item {
Layout.preferredHeight: 50 Layout.preferredHeight: 50
} }
ColumnLayout { ColumnLayout {
id: column id: column
Layout.fillWidth: true Layout.fillWidth: true
...@@ -76,5 +106,7 @@ Item { ...@@ -76,5 +106,7 @@ Item {
} }
} }
} }
...@@ -203,11 +203,11 @@ Rectangle { ...@@ -203,11 +203,11 @@ Rectangle {
states: [ states: [
State { State {
name: "vertical" name: "vertical"
when: root.width <= 400 when: root.width >= 400
}, },
State { State {
name: "horizontal" name: "horizontal"
when: root.width > 400 when: root.width < 400
PropertyChanges { PropertyChanges {
target: qdsicon1 target: qdsicon1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment