diff --git a/include/NetCheckerWindow.hpp b/include/NetCheckerWindow.hpp index c5be79e1eaddf0118f461aadebe335efd2205565..36b2373e286c7194c1aa36841b72f25405941629 100644 --- a/include/NetCheckerWindow.hpp +++ b/include/NetCheckerWindow.hpp @@ -45,10 +45,11 @@ private: QTimer *progress_timer; int lang; Diagnostic *diag_obj; - QThread *diag_thread; + QThread *diag_thread; public: - NetCheckerWindow(); + NetCheckerWindow(); public slots: + void show(); void nextPage(); void copyClipboard(); void saveToFile(); diff --git a/include/Translation.hpp b/include/Translation.hpp index 36d09d6b9ea6f21bdd831e93dcaa9aa27dac7367..8ac06c7dbe3bfd7d109b9094a1998d9587fe97e3 100644 --- a/include/Translation.hpp +++ b/include/Translation.hpp @@ -6,7 +6,7 @@ struct LANG { enum {ENG = 0, HUN = 1}; }; -QString TXT_APP_TITLE[] = { "NetChecker", "NetChecker" }; +QString TXT_APP_TITLE[] = { "SCH NetChecker", "SCH NetChecker" }; QString README_URL[] = { ":/res/readme_en.html", ":/res/readme_hu.html" }; QString TXT_NEXT_BTN[] = { "Next", "Tovább" }; QString TXT_DIAG_GROUP[] = { "Running diagnostics", "Diagnosztika futtatása" }; @@ -18,12 +18,12 @@ QString TXT_CLIPB_BTN[] = { "Copy to clipboard", "Másolás vágólapra" }; QString TXT_SAVE_BTN[] = { "Save to file...", "Mentés fájlba..." }; QString TXT_SAVE_DIALOG[] = { "Save to...", "Mentés helye..." }; QString TXT_ROOT_MSG_TITLE_WIN[] ={ - "Diagnostics cannot start", - "A diagnosztika nem indítható" + "Error", + "Error" }; QString TXT_ROOT_MSG_WIN[] ={ - "Administrator privileges are needed to gather informations.", - "A program helyes működéséhez rendszergazdai jogosultság szükséges." + "Az alkalmazás futtatásához Rendszergazdai jogosultság szükséges!<br><br>You must have Administrator privileges to use this tool!", + "Az alkalmazás futtatásához Rendszergazdai jogosultság szükséges!<br><br>You must have Administrator privileges to use this tool!" }; #endif diff --git a/main.cpp b/main.cpp index 3706401bc75855c16695e08f182fb17650acdb63..c70ecec99ee78bfe586ad1ef6096242ecdc53987 100644 --- a/main.cpp +++ b/main.cpp @@ -5,7 +5,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - NetCheckerWindow ncw; - ncw.show(); + NetCheckerWindow ncw; + ncw.show(); return app.exec(); } diff --git a/src/NetCheckerWindow.cpp b/src/NetCheckerWindow.cpp index 578325cd6b8e96069fd4e29a7d94460b6308c371..e543ef60ae90866e6d3c99b47f789b8e76684ddd 100644 --- a/src/NetCheckerWindow.cpp +++ b/src/NetCheckerWindow.cpp @@ -1,6 +1,7 @@ #include <QSvgRenderer> #include <QPainter> #include <QImage> +#include <QApplication> #include <include/NetCheckerWindow.hpp> #include <include/Privileges.hpp> @@ -167,7 +168,8 @@ void NetCheckerWindow::initDiagnosticPage(){ log_w = new QTextEdit; log_w->setReadOnly(true); log_w->setLineWrapMode(QTextEdit::NoWrap); - log_w->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + log_w->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); + log_w->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); log_w->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont)); log_holder_w->setLayout(log_holder_l); log_holder_l->addWidget(log_w); @@ -235,9 +237,6 @@ void NetCheckerWindow::initText(){ } void NetCheckerWindow::nextPage(){ - /* check for root privileges */ - Privileges::checkPrivileges(this, TXT_ROOT_MSG_TITLE_WIN[lang], TXT_ROOT_MSG_WIN[lang]); - /* turns page */ global_w->setCurrentIndex(1); @@ -331,3 +330,9 @@ void NetCheckerWindow::incrementTime(){ } } } + +void NetCheckerWindow::show(){ + /* check for root privileges */ + QDialog::show(); + Privileges::checkPrivileges(this, TXT_ROOT_MSG_TITLE_WIN[lang], TXT_ROOT_MSG_WIN[lang]); +} diff --git a/src/Privileges.cpp b/src/Privileges.cpp index 815ebee6477365493dcf325ac518d6fd243eb883..1057d94682f85f903ac07b2c8da8c0c7b70b7591 100644 --- a/src/Privileges.cpp +++ b/src/Privileges.cpp @@ -10,8 +10,8 @@ void Privileges::checkPrivileges(QWidget *parent, const QString title, const QString message){ if (!isRoot()){ - QMessageBox::warning(parent, title, message, QMessageBox::Ok, QMessageBox::NoButton); - parent->close(); + QMessageBox::critical(parent, title, message, QMessageBox::Ok, QMessageBox::NoButton); + parent->close(); } }