From b0b5f9cdaa40e4ea3610c88ed3f57b7258cea42b Mon Sep 17 00:00:00 2001 From: Nicolas Mailloux Date: Tue, 6 Jul 2021 10:04:28 -0400 Subject: [PATCH] Fixes for VNC and virtual keyboard --- generaldialog.cpp | 7 ++++++- virtualkeyboard.cpp | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/generaldialog.cpp b/generaldialog.cpp index 2618226..71556b4 100644 --- a/generaldialog.cpp +++ b/generaldialog.cpp @@ -161,6 +161,11 @@ void generalDialog::on_cancelBtn_clicked() global::keyboard::keyboardDialog = false; global::keyboard::keyboardText = ""; } + else if(global::keyboard::vncDialog == true) { + global::keyboard::vncDialog = false; + global::keyboard::keyboardDialog = false; + global::keyboard::keyboardText = ""; + } generalDialog::close(); } } @@ -348,6 +353,6 @@ void generalDialog::startVNC(QString server, QString password, QString port) { string_writeconfig("/external_root/tmp/app_vnc_server", server_str); string_writeconfig("/external_root/tmp/app_vnc_password", password_str); string_writeconfig("/external_root/tmp/app_vnc_port", port_str); - string_writeconfig("/opt/ibxd", "app_start_vnc"); + string_writeconfig("/opt/ibxd", "app_start_vnc\n"); qApp->quit(); } diff --git a/virtualkeyboard.cpp b/virtualkeyboard.cpp index c295a67..92e7911 100644 --- a/virtualkeyboard.cpp +++ b/virtualkeyboard.cpp @@ -99,6 +99,15 @@ virtualkeyboard::virtualkeyboard(QWidget *parent) : ui->spaceBtn->setStyleSheet("font-weight: bold; font-size: 9pt; padding: 10px; border: 1px solid black"); ui->lineEdit->setStyleSheet("border: 3px solid black"); + if(global::keyboard::vncDialog == true) { + ui->lineEdit->setFont(QFont("Noto Mono")); + } + else if(global::keyboard::searchDialog == true){ + ui->lineEdit->setFont(QFont("Source Serif Pro")); + } + else { + ui->lineEdit->setFont(QFont("Roboto")); + } } virtualkeyboard::~virtualkeyboard()