diff --git a/mainwindow.cpp b/mainwindow.cpp index e856dfb3..198cd4cd 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -46,7 +46,7 @@ void MainWindow::on_actionExit_triggered() void MainWindow::on_newHostBtn_clicked() { - QString hostname = popupmanager::getHostnameDialog(); + QString hostname = popupmanager::getHostnameDialog(this); if (!hostname.isEmpty()) { //TODO: pairTo(hostname) } diff --git a/moonlight-qt.pro b/moonlight-qt.pro index 4e5f4b53..d51a30f0 100644 --- a/moonlight-qt.pro +++ b/moonlight-qt.pro @@ -22,6 +22,8 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 +INCLUDEPATH += \ + /usr/local/opt/openssl/include SOURCES += \ main.cpp \ @@ -46,5 +48,6 @@ RESOURCES += \ resources.qrc LIBS += \ + -L/usr/local/opt/openssl/lib \ -lssl \ -lcrypto diff --git a/popupmanager.cpp b/popupmanager.cpp index 5d968c14..aacfcbb5 100644 --- a/popupmanager.cpp +++ b/popupmanager.cpp @@ -1,13 +1,11 @@ #include "popupmanager.h" -popupmanager::popupmanager(); - // this opens a non-blocking informative message telling the user to enter the given pin // it is open-loop: if the user cancels, nothing happens // it is expected that upon pairing completion, the ::closePinDialog function will be called. -static void popupmanager::displayPinDialog(QString pin) { +void popupmanager::displayPinDialog(QString pin, QWidget* parent) { - pinMsgBox = new QMessageBox( this ); + pinMsgBox = new QMessageBox( parent ); pinMsgBox->setAttribute( Qt::WA_DeleteOnClose ); //makes sure the msgbox is deleted automatically when closed pinMsgBox->setStandardButtons( QMessageBox::Ok ); pinMsgBox->setText("Please enter the number " + pin + " on the GFE dialog on the computer."); @@ -16,23 +14,24 @@ static void popupmanager::displayPinDialog(QString pin) { } // to be called when the pairing is complete -static void popupmanager::closePinDialog() { +void popupmanager::closePinDialog() { pinMsgBox->close(); delete pinMsgBox; } -static QString popupmanager::getHostnameDialog() { +QString popupmanager::getHostnameDialog(QWidget* parent) { bool ok; QString responseHost - = QInputDialog::getText(this, tr("Add Host Manually"), - tr("IP Address or Hostname of GeForce PC"), + = QInputDialog::getText(parent, QObject::tr("Add Host Manually"), + QObject::tr("IP Address or Hostname of GeForce PC"), QLineEdit::Normal, - tr("default string"), + QObject::tr("default string"), &ok); if (ok && !responseHost.isEmpty()) { return responseHost; } else { - return tr(""); + return QObject::tr(""); } } + diff --git a/popupmanager.h b/popupmanager.h index 3284af7e..93faf25d 100644 --- a/popupmanager.h +++ b/popupmanager.h @@ -1,18 +1,17 @@ #ifndef POPUPMANAGER_H #define POPUPMANAGER_H -#include +#include class popupmanager { public: - popupmanager(); - static void displayPinDialog(QString pin); + static void displayPinDialog(QString pin, QWidget* parent); static void closePinDialog(); - static QString getHostnameDialog(); + static QString getHostnameDialog(QWidget* parent); private slots: - QMessageBox *pinMsgBox = nullptr; + static QMessageBox *pinMsgBox; }; #endif // POPUPMANAGER_H