diff --git a/include/Diagnostic.hpp b/include/Diagnostic.hpp
index d7bb9e467c5271bb9b53a502c6df04526f6fa70d..aacdf37a83f5478166359a5f47a73d47d13430b2 100644
--- a/include/Diagnostic.hpp
+++ b/include/Diagnostic.hpp
@@ -4,6 +4,7 @@
#include <QSysInfo>
#include <QRegExp>
#include <QtNetwork/QNetworkInterface>
+#include <QtNetwork/QHostInfo>
#include "Globals.hpp"
#include "ProcessHandler.hpp"
@@ -18,12 +19,16 @@ public:
Diagnostic()
: func_vec({
- &Diagnostic::getRoutingInfo,
- &Diagnostic::getPingOutput,
- &Diagnostic::getInterfaceInfo,
- &Diagnostic::getOsInfo
+ &Diagnostic::getOsInfo,
+ &Diagnostic::getInterfaceInfo,
+ &Diagnostic::getRoutingInfo,
+ /*&Diagnostic::getDGPingOutput,*/
+ &Diagnostic::getODPingOutput,
+ &Diagnostic::getDNSLookup
})
- {}
+ {
+ INIT_GLOBALS();
+ }
QString getRoutingInfo(){
ProcessHandler proc(QIODevice::ReadOnly);
@@ -89,25 +94,51 @@ public:
return out.join(sep);
}
- QString getPingOutput(){
+ QString getDGPingOutput(){
ProcessHandler proc(QIODevice::ReadOnly);
QStringList out;
- QString ip("8.8.8.8");
- out << "- - - Pinging IPs - - -\n";
+ out << "- - - Pinging Default Gateways - - -\n";
+
+ foreach (QString ip, DEF_GATEWAYS) {
+ switch (CURRENT_OS){
+ case OS_WINDOWS:
+ out << proc.exec(QString("ping -n 4 -w 1 %1").arg(ip));
+ break;
+ case OS_LINUX:
+ out << proc.exec(QString("ping -n -c 4 -W 1 %1").arg(ip));
+ break;
+ case OS_OSX:
+ default:
+ static_assert(true, "This OS is not supported");
+ break;
+ }
+ }
- switch (CURRENT_OS){
- case OS_WINDOWS:
- out << proc.exec(QString("ping -n 4 -w 1 %1").arg(ip));
- break;
- case OS_LINUX:
- out << proc.exec(QString("ping -n -c 4 -W 1 %1").arg(ip));
- break;
- case OS_OSX:
- default:
- static_assert(true, "This OS is not supported");
- break;
+ return out.join(' ');
+ }
+
+ QString getODPingOutput(){
+ ProcessHandler proc(QIODevice::ReadOnly);
+ QStringList out;
+
+ out << "- - - Pinging Outer Destinations - - -\n";
+
+ foreach (QString ip, OUTER_DEST) {
+ switch (CURRENT_OS){
+ case OS_WINDOWS:
+ out << proc.exec(QString("ping -n 4 -w 1 %1").arg(ip));
+ break;
+ case OS_LINUX:
+ out << proc.exec(QString("ping -n -c 4 -W 1 %1").arg(ip));
+ break;
+ case OS_OSX:
+ default:
+ static_assert(true, "This OS is not supported");
+ break;
+ }
}
+
return out.join(' ');
}
@@ -137,6 +168,25 @@ public:
return out.join(sep);
}
+ QString getDNSLookup(){
+ QStringList out;
+ out << "- - - DNS Lookup for sch.bme.hu - - -\n";
+
+ QHostInfo info = QHostInfo::fromName("sch.bme.hu");
+ foreach (QHostAddress addr, info.addresses()) {
+ out << " - " << addr.toString() << "\n";
+ }
+
+ /* TODO: wait for QDnsLookup SIGNAL
+ foreach (QString dns_ip, DNS_ADDRS) {
+ QDnsLookup dl(QDnsLookup::NS, "", dns_ip);
+ }
+ */
+
+ QString sep;
+ return out.join(sep);
+ }
+
};
#endif
diff --git a/include/Globals.hpp b/include/Globals.hpp
index dc92ad4a21dc1a814a85ca9b0509900824ef7f99..56db7c48311199c9354a76aa2ab42eeb4fae3c8a 100644
--- a/include/Globals.hpp
+++ b/include/Globals.hpp
@@ -1,4 +1,5 @@
#include <QtGlobal>
+#include <QStringList>
#ifndef GLOBALS_HPP
#define GLOBALS_HPP
@@ -16,4 +17,33 @@ enum OS_TYPE {OS_WINDOWS, OS_LINUX, OS_OSX};
enum OS_TYPE CURRENT_OS = OS_OSX;
#endif
+//
+// Config
+//
+QStringList DEF_GATEWAYS;
+QStringList OUTER_DEST;
+QStringList DNS_ADDRS;
+
+void INIT_GLOBALS(){
+ DEF_GATEWAYS << "152.66.176.254";
+ DEF_GATEWAYS << "152.66.178.254";
+ DEF_GATEWAYS << "152.66.179.254";
+ DEF_GATEWAYS << "152.66.180.254";
+ DEF_GATEWAYS << "152.66.181.254";
+ DEF_GATEWAYS << "152.66.182.254";
+ DEF_GATEWAYS << "152.66.183.254";
+ DEF_GATEWAYS << "152.66.210.254";
+ DEF_GATEWAYS << "10.66.255.254";
+
+ OUTER_DEST << "152.66.0.1";
+ OUTER_DEST << "152.66.0.15";
+ OUTER_DEST << "8.8.8.8";
+ OUTER_DEST << "8.8.4.4";
+
+ DNS_ADDRS << "152.66.208.1";
+ DNS_ADDRS << "152.66.208.7";
+ DNS_ADDRS << "8.8.8.8";
+ DNS_ADDRS << "8.8.4.4";
+}
+
#endif // GLOBALS_HPP
diff --git a/include/NetCheckerWindow.cpp b/include/NetCheckerWindow.cpp
index 12774bb752876c53844cfb98d72b30da4e4bf8a1..5e569562649f4ba88d0f20227dc07095f5cec62d 100644
--- a/include/NetCheckerWindow.cpp
+++ b/include/NetCheckerWindow.cpp
@@ -7,196 +7,196 @@
#include "Translation.hpp"
NetCheckerWindow::NetCheckerWindow(){
- /* default language is hungarian */
- LANG = HUN;
- setWindowFlags(Qt::WindowCloseButtonHint);
- this->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- this->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT);
- /* initialize stacked window structure */
- initStackedWindow();
- /* localization for texts in program */
- initText();
+ /* default language is hungarian */
+ LANG = HUN;
+ setWindowFlags(Qt::WindowCloseButtonHint);
+ this->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ this->setFixedSize(WINDOW_WIDTH, WINDOW_HEIGHT);
+ /* initialize stacked window structure */
+ initStackedWindow();
+ /* localization for texts in program */
+ initText();
}
void NetCheckerWindow::initStackedWindow(){
- global_l = new QVBoxLayout;
- global_w = new QStackedWidget;
- global_l->addWidget(global_w);
- global_l->setMargin(0);
- global_l->setSpacing(0);
+ global_l = new QVBoxLayout;
+ global_w = new QStackedWidget;
+ global_l->addWidget(global_w);
+ global_l->setMargin(0);
+ global_l->setSpacing(0);
- initWelcomePage();
- initDiagnosticPage();
+ initWelcomePage();
+ initDiagnosticPage();
- setLayout(global_l);
+ setLayout(global_l);
}
void NetCheckerWindow::initWelcomePage(){
- /* inicializálás */
- welcome_page_l = new QHBoxLayout;
- welcome_page_w = new QWidget;
- welcome_page_l->setMargin(0);
- welcome_page_l->setSpacing(0);
+ /* inicializálás */
+ welcome_page_l = new QHBoxLayout;
+ welcome_page_w = new QWidget;
+ welcome_page_l->setMargin(0);
+ welcome_page_l->setSpacing(0);
- initLogoSide();
- initReadmeSide();
+ initLogoSide();
+ initReadmeSide();
- welcome_page_w->setLayout(welcome_page_l);
- global_w->addWidget(welcome_page_w);
+ welcome_page_w->setLayout(welcome_page_l);
+ global_w->addWidget(welcome_page_w);
}
void NetCheckerWindow::initLogoSide(){
- logo_side_w = new QWidget;
- logo_side_l = new QVBoxLayout;
+ logo_side_w = new QWidget;
+ logo_side_l = new QVBoxLayout;
- logo_side_l->setContentsMargins(9, 9, 0, 0);
+ logo_side_l->setContentsMargins(9, 9, 0, 0);
logo_side_w->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
logo_side_w->setFixedWidth(LOGO_WIDTH);
- /* logo image at the left */
- logo_image_w = new QLabel;
- QSvgRenderer renderer(tr(":/rsrc/logo.svg"));
- int image_width = LOGO_WIDTH - 9;
- QImage image(image_width, static_cast<int>(1.376888*image_width), QImage::Format_ARGB32);
- image.fill(Qt::transparent);
- QPainter painter(&image);
- renderer.render(&painter);
- QPixmap pix_logo = QPixmap::fromImage(image);
- //pix_logo = pix_logo.scaledToWidth(image_width, Qt::SmoothTransformation);
- logo_image_w->setPixmap(pix_logo);
- logo_image_w->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-
- /* flags for choosing language */
- QWidget *flag_holder_w = new QWidget;
- QHBoxLayout *flag_holder_l = new QHBoxLayout;
- QPushButton *flag_eng_w = new QPushButton;
- QPushButton *flag_hun_w = new QPushButton;
- QPixmap pix_flag_eng(":/rsrc/flag_eng.gif");
- QPixmap pix_flag_hun(":/rsrc/flag_hun.gif");
- QIcon icon_eng(pix_flag_eng);
- QIcon icon_hun(pix_flag_hun);
- QSize icon_size(pix_flag_eng.width(), pix_flag_eng.height());
-
- flag_eng_w->setIconSize(icon_size);
- flag_eng_w->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- flag_eng_w->setFixedSize(icon_size.width()+6, icon_size.height()+6);
- flag_eng_w->setIcon(icon_eng);
-
- flag_hun_w->setIconSize(icon_size);
- flag_hun_w->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- flag_hun_w->setFixedSize(icon_size.width()+6, icon_size.height()+6);
- flag_hun_w->setIcon(icon_hun);
-
- connect(flag_eng_w, SIGNAL(released()), this, SLOT(changeToEng()));
- connect(flag_hun_w, SIGNAL(released()), this, SLOT(changeToHun()));
-
- flag_holder_l->addWidget(flag_hun_w);
- flag_holder_l->addWidget(flag_eng_w);
- flag_holder_w->setLayout(flag_holder_l);
-
- logo_side_l->addWidget(logo_image_w);
- logo_side_l->addWidget(flag_holder_w);
- logo_side_w->setLayout(logo_side_l);
-
- welcome_page_l->addWidget(logo_side_w);
+ /* logo image at the left */
+ logo_image_w = new QLabel;
+ QSvgRenderer renderer(tr(":/rsrc/logo.svg"));
+ int image_width = LOGO_WIDTH - 9;
+ QImage image(image_width, static_cast<int>(1.376888*image_width), QImage::Format_ARGB32);
+ image.fill(Qt::transparent);
+ QPainter painter(&image);
+ renderer.render(&painter);
+ QPixmap pix_logo = QPixmap::fromImage(image);
+ //pix_logo = pix_logo.scaledToWidth(image_width, Qt::SmoothTransformation);
+ logo_image_w->setPixmap(pix_logo);
+ logo_image_w->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+ /* flags for choosing language */
+ QWidget *flag_holder_w = new QWidget;
+ QHBoxLayout *flag_holder_l = new QHBoxLayout;
+ QPushButton *flag_eng_w = new QPushButton;
+ QPushButton *flag_hun_w = new QPushButton;
+ QPixmap pix_flag_eng(":/rsrc/flag_eng.gif");
+ QPixmap pix_flag_hun(":/rsrc/flag_hun.gif");
+ QIcon icon_eng(pix_flag_eng);
+ QIcon icon_hun(pix_flag_hun);
+ QSize icon_size(pix_flag_eng.width(), pix_flag_eng.height());
+
+ flag_eng_w->setIconSize(icon_size);
+ flag_eng_w->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ flag_eng_w->setFixedSize(icon_size.width()+6, icon_size.height()+6);
+ flag_eng_w->setIcon(icon_eng);
+
+ flag_hun_w->setIconSize(icon_size);
+ flag_hun_w->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ flag_hun_w->setFixedSize(icon_size.width()+6, icon_size.height()+6);
+ flag_hun_w->setIcon(icon_hun);
+
+ connect(flag_eng_w, SIGNAL(released()), this, SLOT(changeToEng()));
+ connect(flag_hun_w, SIGNAL(released()), this, SLOT(changeToHun()));
+
+ flag_holder_l->addWidget(flag_hun_w);
+ flag_holder_l->addWidget(flag_eng_w);
+ flag_holder_w->setLayout(flag_holder_l);
+
+ logo_side_l->addWidget(logo_image_w);
+ logo_side_l->addWidget(flag_holder_w);
+ logo_side_w->setLayout(logo_side_l);
+
+ welcome_page_l->addWidget(logo_side_w);
}
void NetCheckerWindow::initReadmeSide(){
- readme_side_w = new QWidget;
- readme_side_l = new QVBoxLayout;
+ readme_side_w = new QWidget;
+ readme_side_l = new QVBoxLayout;
- readme_side_w->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ readme_side_w->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- text_w = new QTextEdit;
- text_w->setReadOnly(true);
+ text_w = new QTextEdit;
+ text_w->setReadOnly(true);
- next_button_w = new QPushButton;
- next_button_w->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- connect(next_button_w, SIGNAL(released()), this, SLOT(nextPage()));
+ next_button_w = new QPushButton;
+ next_button_w->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ connect(next_button_w, SIGNAL(released()), this, SLOT(nextPage()));
- readme_side_l->addWidget(text_w);
- readme_side_l->addWidget(next_button_w, 0, Qt::AlignRight);
- readme_side_w->setLayout(readme_side_l);
+ readme_side_l->addWidget(text_w);
+ readme_side_l->addWidget(next_button_w, 0, Qt::AlignRight);
+ readme_side_w->setLayout(readme_side_l);
- welcome_page_l->addWidget(readme_side_w);
+ welcome_page_l->addWidget(readme_side_w);
}
void NetCheckerWindow::initDiagnosticPage(){
- diagnostic_page_w = new QWidget;
- diagnostic_page_l = new QVBoxLayout;
-
- /* progress bar */
- progressbar_holder_w = new QGroupBox;
- progressbar_holder_l = new QVBoxLayout;
- progressbar_w = new QProgressBar;
- progressbar_w->setRange(0, 100);
- progressbar_w->setAlignment(Qt::AlignHCenter);
-
- progressbar_holder_w->setLayout(progressbar_holder_l);
- progressbar_holder_l->addWidget(progressbar_w);
- progressbar_holder_w->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-
- /* log */
- log_holder_w = new QGroupBox;
- log_holder_l = new QVBoxLayout;
- log_w = new QTextEdit;
- log_w->setReadOnly(true);
- log_w->setLineWrapMode(QTextEdit::NoWrap);
- log_w->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ diagnostic_page_w = new QWidget;
+ diagnostic_page_l = new QVBoxLayout;
+
+ /* progress bar */
+ progressbar_holder_w = new QGroupBox;
+ progressbar_holder_l = new QVBoxLayout;
+ progressbar_w = new QProgressBar;
+ progressbar_w->setRange(0, 100);
+ progressbar_w->setAlignment(Qt::AlignHCenter);
+
+ progressbar_holder_w->setLayout(progressbar_holder_l);
+ progressbar_holder_l->addWidget(progressbar_w);
+ progressbar_holder_w->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+ /* log */
+ log_holder_w = new QGroupBox;
+ log_holder_l = new QVBoxLayout;
+ log_w = new QTextEdit;
+ log_w->setReadOnly(true);
+ log_w->setLineWrapMode(QTextEdit::NoWrap);
+ log_w->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
log_w->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
- log_holder_w->setLayout(log_holder_l);
- log_holder_l->addWidget(log_w);
-
- /* buttons */
- button_holder_w = new QWidget;
- button_holder_l = new QHBoxLayout;
- clipboard_button_w = new QPushButton;
- save_button_w = new QPushButton;
- clipboard_button_w->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ log_holder_w->setLayout(log_holder_l);
+ log_holder_l->addWidget(log_w);
+
+ /* buttons */
+ button_holder_w = new QWidget;
+ button_holder_l = new QHBoxLayout;
+ clipboard_button_w = new QPushButton;
+ save_button_w = new QPushButton;
+ clipboard_button_w->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
clipboard_button_w->setEnabled(false);
- save_button_w->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ save_button_w->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
save_button_w->setEnabled(false);
- connect(clipboard_button_w, SIGNAL(released()), this, SLOT(copyClipboard()));
- connect(save_button_w, SIGNAL(released()), this, SLOT(saveToFile()));
-
- button_holder_l->addWidget(clipboard_button_w);
- button_holder_l->addWidget(save_button_w);
- button_holder_w->setLayout(button_holder_l);
- button_holder_w->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- button_holder_l->setContentsMargins(10, 0, 10, 0);
-
- /* add to parent */
- diagnostic_page_l->addWidget(progressbar_holder_w);
- diagnostic_page_l->addWidget(log_holder_w);
- diagnostic_page_l->addWidget(button_holder_w, 0, Qt::AlignRight);
- diagnostic_page_w->setLayout(diagnostic_page_l);
-
- global_w->addWidget(diagnostic_page_w);
+ connect(clipboard_button_w, SIGNAL(released()), this, SLOT(copyClipboard()));
+ connect(save_button_w, SIGNAL(released()), this, SLOT(saveToFile()));
+
+ button_holder_l->addWidget(clipboard_button_w);
+ button_holder_l->addWidget(save_button_w);
+ button_holder_w->setLayout(button_holder_l);
+ button_holder_w->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ button_holder_l->setContentsMargins(10, 0, 10, 0);
+
+ /* add to parent */
+ diagnostic_page_l->addWidget(progressbar_holder_w);
+ diagnostic_page_l->addWidget(log_holder_w);
+ diagnostic_page_l->addWidget(button_holder_w, 0, Qt::AlignRight);
+ diagnostic_page_w->setLayout(diagnostic_page_l);
+
+ global_w->addWidget(diagnostic_page_w);
}
void NetCheckerWindow::initText(){
- /* set program title */
- setWindowTitle(TXT_APP_TITLE[LANG]);
-
- next_button_w->setText(TXT_NEXT_BTN[LANG]);
-
- QFile readme_file(README_URL[LANG]);
- readme_file.open(QIODevice::ReadOnly);
- QTextStream readme_file_str(&readme_file);
- readme_file_str.setCodec("UTF-8");
- text_w->setHtml(readme_file_str.readAll());
- readme_file.close();
-
- progressbar_holder_w->setTitle(TXT_DIAG_GROUP[LANG]);
- log_holder_w->setTitle(TXT_LOG_GROUP[LANG]);
- clipboard_button_w->setText(TXT_CLIPB_BTN[LANG]);
- save_button_w->setText(TXT_SAVE_BTN[LANG]);
+ /* set program title */
+ setWindowTitle(TXT_APP_TITLE[LANG]);
+
+ next_button_w->setText(TXT_NEXT_BTN[LANG]);
+
+ QFile readme_file(README_URL[LANG]);
+ readme_file.open(QIODevice::ReadOnly);
+ QTextStream readme_file_str(&readme_file);
+ readme_file_str.setCodec("UTF-8");
+ text_w->setHtml(readme_file_str.readAll());
+ readme_file.close();
+
+ progressbar_holder_w->setTitle(TXT_DIAG_GROUP[LANG]);
+ log_holder_w->setTitle(TXT_LOG_GROUP[LANG]);
+ clipboard_button_w->setText(TXT_CLIPB_BTN[LANG]);
+ save_button_w->setText(TXT_SAVE_BTN[LANG]);
}
void NetCheckerWindow::nextPage(){
- Diagnostic d;
- global_w->setCurrentIndex(1);
+ Diagnostic d;
+ global_w->setCurrentIndex(1);
double step = 100.0/d.func_vec.size();
double i = 1.0;
foreach (Diagnostic::function_t fn, d.func_vec) {
@@ -209,35 +209,35 @@ void NetCheckerWindow::nextPage(){
}
void NetCheckerWindow::copyClipboard(){
- QClipboard *clipboard = QApplication::clipboard();
- clipboard->setText(log_w->toPlainText());
+ QClipboard *clipboard = QApplication::clipboard();
+ clipboard->setText(log_w->toPlainText());
}
void NetCheckerWindow::saveToFile(){
- QString filename = QFileDialog::getExistingDirectory(0, TXT_SAVE_DIALOG[LANG]);
- filename.append(tr("/log.txt"));
- if (!filename.isEmpty()){
- QFile file(filename);
- if (file.open(QIODevice::WriteOnly | QIODevice::Text)){
- QTextStream stream(&file);
- stream.setCodec("UTF-8");
- stream << log_w->toPlainText();
- stream.flush();
- file.close();
- }
- }
+ QString filename = QFileDialog::getExistingDirectory(0, TXT_SAVE_DIALOG[LANG]);
+ filename.append(tr("/%1.txt").arg(QDateTime::currentDateTime().toString("yyyy-MM-dd_h-m-s")));
+ if (!filename.isEmpty()){
+ QFile file(filename);
+ if (file.open(QIODevice::WriteOnly | QIODevice::Text)){
+ QTextStream stream(&file);
+ stream.setCodec("UTF-8");
+ stream << log_w->toPlainText();
+ stream.flush();
+ file.close();
+ }
+ }
}
void NetCheckerWindow::changeToHun(){
- if (LANG != HUN){
- LANG = HUN;
- initText();
- }
+ if (LANG != HUN){
+ LANG = HUN;
+ initText();
+ }
}
void NetCheckerWindow::changeToEng(){
- if (LANG != ENG){
- LANG = ENG;
- initText();
- }
+ if (LANG != ENG){
+ LANG = ENG;
+ initText();
+ }
}
diff --git a/include/NetCheckerWindow.hpp b/include/NetCheckerWindow.hpp
index 7627f71aec0bbaf726de8f9db30cc77408b4414f..35791adc21d6ba92731e2ac3f6f9aed0e94a6a58 100644
--- a/include/NetCheckerWindow.hpp
+++ b/include/NetCheckerWindow.hpp
@@ -19,47 +19,47 @@ QT_END_NAMESPACE
class NetCheckerWindow : public QDialog
{
- Q_OBJECT
+ Q_OBJECT
private:
- /* widget structure --> */
- QStackedWidget *global_w; QVBoxLayout *global_l;
- QWidget *welcome_page_w; QHBoxLayout *welcome_page_l;
- QWidget *logo_side_w; QVBoxLayout *logo_side_l;
- QLabel *logo_image_w;
- QWidget *readme_side_w; QVBoxLayout *readme_side_l;
- QTextEdit *text_w;
- QPushButton *next_button_w;
- QWidget *diagnostic_page_w; QVBoxLayout *diagnostic_page_l;
- QGroupBox *progressbar_holder_w; QVBoxLayout *progressbar_holder_l;
- QProgressBar *progressbar_w;
- QGroupBox *log_holder_w; QVBoxLayout *log_holder_l;
- QTextEdit *log_w;
- QWidget *button_holder_w; QHBoxLayout *button_holder_l;
- QPushButton* clipboard_button_w;
- QPushButton* save_button_w;
- /* <-- widget structure */
- int LANG;
+ /* widget structure --> */
+ QStackedWidget *global_w; QVBoxLayout *global_l;
+ QWidget *welcome_page_w; QHBoxLayout *welcome_page_l;
+ QWidget *logo_side_w; QVBoxLayout *logo_side_l;
+ QLabel *logo_image_w;
+ QWidget *readme_side_w; QVBoxLayout *readme_side_l;
+ QTextEdit *text_w;
+ QPushButton *next_button_w;
+ QWidget *diagnostic_page_w; QVBoxLayout *diagnostic_page_l;
+ QGroupBox *progressbar_holder_w; QVBoxLayout *progressbar_holder_l;
+ QProgressBar *progressbar_w;
+ QGroupBox *log_holder_w; QVBoxLayout *log_holder_l;
+ QTextEdit *log_w;
+ QWidget *button_holder_w; QHBoxLayout *button_holder_l;
+ QPushButton* clipboard_button_w;
+ QPushButton* save_button_w;
+ /* <-- widget structure */
+ int LANG;
public:
- NetCheckerWindow();
+ NetCheckerWindow();
public slots:
- void nextPage();
- void copyClipboard();
- void saveToFile();
- void changeToHun();
- void changeToEng();
+ void nextPage();
+ void copyClipboard();
+ void saveToFile();
+ void changeToHun();
+ void changeToEng();
private:
- void initStackedWindow();
- void initWelcomePage();
- void initLogoSide();
- void initReadmeSide();
- void initDiagnosticPage();
- void initText();
- enum {
+ void initStackedWindow();
+ void initWelcomePage();
+ void initLogoSide();
+ void initReadmeSide();
+ void initDiagnosticPage();
+ void initText();
+ enum {
WINDOW_WIDTH = 380,
WINDOW_HEIGHT = 420,
- LOGO_WIDTH = 120,
- README_WIDTH = (WINDOW_WIDTH-LOGO_WIDTH)
- };
+ LOGO_WIDTH = 120,
+ README_WIDTH = (WINDOW_WIDTH-LOGO_WIDTH)
+ };
};
#endif
diff --git a/include/ProcessHandler.hpp b/include/ProcessHandler.hpp
index 6f154bf2d2b5748d88315a8b3961f1c19c3b7946..dea2b55495575339c834d83cc6624303ab8da179 100644
--- a/include/ProcessHandler.hpp
+++ b/include/ProcessHandler.hpp
@@ -10,7 +10,7 @@ class ProcessHandler : protected QProcess {
public:
ProcessHandler(QProcess::OpenMode mode): QProcess() {
setOpenMode(mode);
- }
+ }
public:
QString exec(QString commands){
start(commands);
diff --git a/include/Translation.hpp b/include/Translation.hpp
index 3209fe2e2fc5c18b8e62716d6e2db0ff1b39c239..eebf79f6c980786050839ccbdae17740076e374a 100644
--- a/include/Translation.hpp
+++ b/include/Translation.hpp
@@ -4,13 +4,13 @@
#include <QString>
enum {ENG = 0, HUN = 1};
-QString TXT_APP_TITLE[] = { "NetChecker", "NetChecker" };
-QString README_URL[] = { ":/rsrc/readme_en.html", ":/rsrc/readme_hu.html" };
-QString TXT_NEXT_BTN[] = { "Next", "Tovább" };
-QString TXT_DIAG_GROUP[] = { "Running diagnostics", "Diagnosztika futtatása" };
-QString TXT_LOG_GROUP[] = { "Log", "Napló" };
-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_APP_TITLE[] = { "NetChecker", "NetChecker" };
+QString README_URL[] = { ":/rsrc/readme_en.html", ":/rsrc/readme_hu.html" };
+QString TXT_NEXT_BTN[] = { "Next", "Tovább" };
+QString TXT_DIAG_GROUP[] = { "Running diagnostics", "Diagnosztika futtatása" };
+QString TXT_LOG_GROUP[] = { "Log", "Napló" };
+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..." };
#endif
diff --git a/main.cpp b/main.cpp
index 472648d4341107692bd6cbe329d9d809c8f38d89..3db647a8f404c64f59421d781791c25eeee76b9b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,8 +4,8 @@
int main(int argc, char *argv[])
{
- QApplication app(argc, argv);
- NetCheckerWindow ncw;
- ncw.show();
- return app.exec();
+ QApplication app(argc, argv);
+ NetCheckerWindow ncw;
+ ncw.show();
+ return app.exec();
}
diff --git a/netchecker.pro b/netchecker.pro
index 1f30def10423c78f61c78332d5deaa77e12b4c49..51e976cbb581157f7f88006a1eb3a4c005f07147 100644
--- a/netchecker.pro
+++ b/netchecker.pro
@@ -13,11 +13,11 @@ SOURCES = \
main.cpp \
include/NetCheckerWindow.cpp
-CONFIG += c++11
-
# install
target.path = bin
INSTALLS += target
RESOURCES += \
resource.qrc
+
+CONFIG += c++11
diff --git a/netchecker.pro.user b/netchecker.pro.user
index 23e6a8035b1997801ebecb9c41ff91f4ecb2fc29..7c45b2aaab5c54b226b7301a4a1c4fe37057aa9e 100644
--- a/netchecker.pro.user
+++ b/netchecker.pro.user
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.4.2, 2015-08-10T00:30:12. -->
+<!-- Written by QtCreator 3.4.2, 2015-08-10T01:50:36. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>