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

Popup for showing the current operation and new app icon

parent 972d7d33
No related branches found
No related tags found
1 merge request!61Popup for showing the current operation and new app icon
Pipeline #77254 passed
src/android/res/mipmap-xxhdpi/ic_launcher_round.webp

7.01 KiB

src/android/res/mipmap-xxxhdpi/app_icon.png

30 KiB

src/android/res/mipmap-xxxhdpi/ic_launcher.webp

4.65 KiB

src/android/res/mipmap-xxxhdpi/ic_launcher_round.webp

9.29 KiB

<!--
~ Copyright (C) 2023 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ https://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<resources>
<string name="app_name">Qt UI Viewer</string>
</resources>
......@@ -184,8 +184,7 @@ void Backend::connectDesignStudio(const QString &ipAddr)
void Backend::runProject(const QString &id, const QByteArray &projectData)
{
emit popupOpen();
updatePopup("Running project...");
emit popupOpen("Running project...");
// we'll use this to notify the correct DS when the project started/stopped
m_lastProjectSenderId = id;
......
......@@ -14,31 +14,40 @@ DesignStudio::DesignStudio(QWebSocket *socket, const QString &m_deviceUuid, QObj
{
initPingPong();
initSocket();
m_pingTimer.start();
}
void DesignStudio::initPingPong()
{
m_pingTimer.setInterval(1000);
m_pongTimer.setInterval(10000);
m_pongTimer.setSingleShot(true);
m_pingTimer.setSingleShot(true);
connect(&m_pingTimer, &QTimer::timeout, this, [this]() {
m_socket->ping();
m_pongTimer.start(15000);
m_pongTimer.start();
});
connect(m_socket.data(),
&QWebSocket::pong,
this,
[this](quint64 elapsedTime, const QByteArray &) { m_pongTimer.stop(); });
[this](quint64 elapsedTime, const QByteArray &) {
m_pongTimer.stop();
m_pingTimer.start();
});
connect(&m_pongTimer, &QTimer::timeout, this, [this]() {
qDebug() << "Design Studio" << m_id << "is not responding. Reconnecting.";
qDebug() << "Design Studio" << m_id << "is not responding. Closing the connection.";
m_socket->close();
m_socket->abort();
emit disconnected(m_id);
});
}
void DesignStudio::initSocket()
{
m_pingTimer.start(15000);
m_pongTimer.stop();
connect(m_socket.data(), &QWebSocket::disconnected, this, [this]() {
qDebug() << "Design Studio" << m_id << "disconnected";
m_pingTimer.stop();
......
src/images/appicon.png

49.4 KiB

<?xml version="1.0" encoding="UTF-8"?>
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64">
<defs>
<style>
.cls-1 {
fill: none;
}
.cls-2 {
fill: url(#linear-gradient);
}
.cls-3 {
clip-path: url(#clippath-1);
}
.cls-4 {
fill: #2cde85;
}
.cls-5 {
clip-path: url(#clippath);
}
</style>
<clipPath id="clippath">
<rect class="cls-1" width="64" height="64"/>
</clipPath>
<linearGradient id="linear-gradient" x1="61.5" y1="80.21" x2="6.13" y2="-10.28" gradientTransform="translate(0 64) scale(1 -1)" gradientUnits="userSpaceOnUse">
<stop offset=".14" stop-color="#014b57"/>
<stop offset="1" stop-color="#0f7080"/>
</linearGradient>
<clipPath id="clippath-1">
<rect class="cls-1" x=".15" width="64" height="64"/>
</clipPath>
</defs>
<g class="cls-5">
<g>
<path class="cls-2" d="M0,8v56h56l8-8V0H8L0,8Z"/>
<g class="cls-3">
<path class="cls-4" d="M17.06,36.71c0,2.75,1.48,4.13,4.44,4.13s4.44-1.38,4.44-4.13v-15.71h5.06v15.61c0,2.89-.79,5.02-2.38,6.38-1.56,1.34-3.94,2.01-7.12,2.01s-5.56-.67-7.15-2.01c-1.57-1.36-2.35-3.49-2.35-6.38v-15.61h5.06v15.71ZM48.67,21h5.33l-5.81,24h-9.38l-5.81-24h5.33l4.34,19.76h1.65l4.34-19.76Z"/>
</g>
</g>
</g>
</svg>
\ No newline at end of file
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