diff --git a/forms/linboGUI.ui b/forms/linboGUI.ui index 59d8513..8101041 100644 --- a/forms/linboGUI.ui +++ b/forms/linboGUI.ui @@ -47,7 +47,7 @@ Imaging - + 10 @@ -56,11 +56,21 @@ 180 - + true + + + + 0 + 0 + 408 + 178 + + + - + 429 @@ -69,9 +79,19 @@ 180 - + true + + + + 0 + 0 + 178 + 178 + + + @@ -406,17 +426,7 @@ p, li { white-space: pre-wrap; } - - - Q3ScrollView - QWidget -
qscrollview.h
- 1 - - - q3scrollview.h - q3scrollview.h diff --git a/forms/linboImageSelector.ui b/forms/linboImageSelector.ui index ca0ed0f..1f99657 100644 --- a/forms/linboImageSelector.ui +++ b/forms/linboImageSelector.ui @@ -1,7 +1,8 @@ - + + linboImageSelector - - + + 0 0 @@ -9,14 +10,14 @@ 451 - + Image erstellen - + - - + + 10 0 @@ -24,62 +25,20 @@ 80 - + Vorhandenes Image neu erstellen oder [Neues Image] zur Erstellung einer neuen Image-Datei auswählen. Auswahl: - + Qt::AlignVCenter - + false - - - - 10 - 160 - 361 - 70 - - - - Image-Typ für neue Image-Datei: - - - - - 10 - 20 - 251 - 20 - - - - Neues Basisimage - - - true - - - - - - 10 - 40 - 251 - 21 - - - - Differentielles Image - - - - - + + 10 230 @@ -87,15 +46,15 @@ Auswahl: 30 - + Dateiname für neue Imagedatei eingeben: - + false - - + + 10 260 @@ -103,12 +62,12 @@ Auswahl: 30 - + Neu - - + + 10 290 @@ -116,15 +75,15 @@ Auswahl: 30 - + Informationen zum Image: - + false - - + + 10 420 @@ -132,15 +91,15 @@ Auswahl: 21 - - Erstellt das ausgewählte Image<br>im lokalen Cache + + Erstellt das ausgewählte Image<br>im lokalen Cache - + Erstellen - - + + 110 420 @@ -148,15 +107,15 @@ Auswahl: 21 - - Erstellt das ausgewählte Image im lokalen Cache und lädt es <br> anschliessend auf den Server hoch + + Erstellt das ausgewählte Image im lokalen Cache und lädt es <br> anschliessend auf den Server hoch - + Erstellen+Hochladen - - + + 280 420 @@ -164,36 +123,15 @@ Auswahl: 21 - + Abbrechen ohne Imageerstellung - + Abbruch - - - - 10 - 80 - 360 - 72 - - - - Q3ScrollView::Auto - - - Q3ScrollView::Auto - - - - New Item - - - - - + + 10 320 @@ -202,8 +140,8 @@ Auswahl: - - + + 10 400 @@ -211,12 +149,12 @@ Auswahl: 19 - + Reboot - - + + 70 400 @@ -224,28 +162,66 @@ Auswahl: 19 - + Shutdown + + + + 10 + 80 + 360 + 72 + + + + + + + 10 + 160 + 361 + 70 + + + + GroupBox + + + + + 10 + 20 + 251 + 20 + + + + Neues Basisimage + + + true + + + + + + 10 + 40 + 251 + 21 + + + + Differentielles Image + + + - + qPixmapFromMimeSource - - - Q3ButtonGroup - Q3GroupBox -
Qt3Support/Q3ButtonGroup
- 1 - - - Q3ListBox - Q3Frame -
q3listbox.h
- - - listBox baseRadioButton specialName createButton diff --git a/forms/linboImageUpload.ui b/forms/linboImageUpload.ui index 192ca10..6c2f12d 100644 --- a/forms/linboImageUpload.ui +++ b/forms/linboImageUpload.ui @@ -1,7 +1,8 @@ - + + linboImageUpload - - + + 0 0 @@ -9,32 +10,11 @@ 213 - + Image Auswahl - - - - 10 - 50 - 320 - 90 - - - - Q3ScrollView::Auto - - - Q3ScrollView::Auto - - - - New Item - - - - - + + 10 10 @@ -42,18 +22,18 @@ 31 - + Welches Image soll hochgeladen werden? - + Qt::AlignCenter - + false - - + + 230 170 @@ -61,15 +41,15 @@ 31 - + Abbrechen ohne Hochladen - + Abbruch - - + + 10 170 @@ -77,15 +57,15 @@ 31 - - Lädt das ausgewählte<br>Image auf den Server hoch + + Lädt das ausgewählte<br>Image auf den Server hoch - + OK - - + + 10 150 @@ -93,12 +73,12 @@ 19 - + Reboot - - + + 70 150 @@ -106,20 +86,23 @@ 19 - + Shutdown + + + + 10 + 50 + 320 + 90 + + + - + qPixmapFromMimeSource - - - Q3ListBox - Q3Frame -
q3listbox.h
- - diff --git a/forms/linboInfoBrowser.ui b/forms/linboInfoBrowser.ui index 7b2a9d1..a79a597 100644 --- a/forms/linboInfoBrowser.ui +++ b/forms/linboInfoBrowser.ui @@ -13,19 +13,6 @@ Image Info - - - - 10 - 10 - 340 - 230 - - - - true - - false @@ -42,22 +29,19 @@ Speichern + + + + 10 + 10 + 340 + 230 + + + qPixmapFromMimeSource - - - Q3Frame - QFrame -
Qt3Support/Q3Frame
- 1 - - - Q3TextEdit - Q3Frame -
q3textedit.h
- - diff --git a/forms/linboMulticastBox.ui b/forms/linboMulticastBox.ui index fecb4fe..98b02e6 100644 --- a/forms/linboMulticastBox.ui +++ b/forms/linboMulticastBox.ui @@ -1,7 +1,8 @@ - + + linboMulticastBox - - + + 0 0 @@ -9,66 +10,11 @@ 155 - + Update Cache - - - - 10 - 10 - 180 - 81 - - - - Auswahl - - - - - 10 - 20 - 150 - 20 - - - - Update mit Rsync - - - true - - - - - - 10 - 40 - 160 - 20 - - - - Update mit Multicast - - - - - - 10 - 60 - 165 - 20 - - - - Update mit Bittorrent - - - - - + + 10 120 @@ -76,15 +22,15 @@ 21 - - Aktualisiert den lokalen<br>Cache mit der gewählten Methode + + Aktualisiert den lokalen<br>Cache mit der gewählten Methode - + OK - - + + 130 120 @@ -92,15 +38,15 @@ 21 - + Abbrechen ohne Cache-Aktualisierung - + Abbruch - - + + 10 100 @@ -108,21 +54,68 @@ 19 - + Cache Partition formatieren + + + + 10 + 10 + 180 + 81 + + + + GroupBox + + + + + 10 + 20 + 150 + 20 + + + + Update mit Rsync + + + true + + + + + + 10 + 40 + 160 + 20 + + + + Update mit Multicast + + + + + + 10 + 60 + 165 + 20 + + + + Update mit Bittorrent + + + - + qPixmapFromMimeSource - - - Q3ButtonGroup - Q3GroupBox -
Qt3Support/Q3ButtonGroup
- 1 - - diff --git a/headers/legacy/linboCounterImpl.hh b/headers/legacy/linboCounterImpl.hh index 86c2f45..9c832b6 100644 --- a/headers/legacy/linboCounterImpl.hh +++ b/headers/legacy/linboCounterImpl.hh @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include "linboDialog.hh" @@ -20,7 +20,7 @@ class linboCounterImpl : public QWidget, public Ui::linboCounter, public linboDi private: QTextEdit *Console; - Q3Process* myProcess; + QProcess* myProcess; QString line; QWidget *myMainApp,*myParent; QStringList myCommand; diff --git a/headers/legacy/linboMulticastBoxImpl.hh b/headers/legacy/linboMulticastBoxImpl.hh index 77e15d1..2cfc443 100644 --- a/headers/legacy/linboMulticastBoxImpl.hh +++ b/headers/legacy/linboMulticastBoxImpl.hh @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include diff --git a/headers/legacy/linboPushButton.hh b/headers/legacy/linboPushButton.hh index 6fa842b..bf14d13 100644 --- a/headers/legacy/linboPushButton.hh +++ b/headers/legacy/linboPushButton.hh @@ -10,6 +10,7 @@ #include #include #include +#include #include "linboProgressImpl.hh" #include "linboYesNoImpl.hh" #include "linboPasswordBoxImpl.hh" diff --git a/headers/legacy/linboRegisterBoxImpl.hh b/headers/legacy/linboRegisterBoxImpl.hh index fcef2a4..7050fcc 100644 --- a/headers/legacy/linboRegisterBoxImpl.hh +++ b/headers/legacy/linboRegisterBoxImpl.hh @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include "linboProgressImpl.hh" #include "linboDialog.hh" #include "linboLogConsole.hh" diff --git a/headers/legacy/linboYesNoImpl.hh b/headers/legacy/linboYesNoImpl.hh index c820210..15b7d6b 100644 --- a/headers/legacy/linboYesNoImpl.hh +++ b/headers/legacy/linboYesNoImpl.hh @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include diff --git a/headers/linbogui.h b/headers/linbogui.h index 68d8b81..6b8495e 100644 --- a/headers/linbogui.h +++ b/headers/linbogui.h @@ -26,8 +26,8 @@ #include #include #include +#include -#include "linboGUIImpl.hh" #include "linbostartpage.h" #include "linbobackend.h" diff --git a/headers/linbostartpage.h b/headers/linbostartpage.h index 6d291a1..88bfadd 100644 --- a/headers/linbostartpage.h +++ b/headers/linbostartpage.h @@ -43,9 +43,7 @@ #include #include #include -#include -#include "linboGUIImpl.hh" #include "linbobackend.h" #include "linboosselectbutton.h" #include "qmodernprogressbar.h" diff --git a/linboGUI.pro b/linboGUI.pro index 53f9126..8d9f5fb 100644 --- a/linboGUI.pro +++ b/linboGUI.pro @@ -3,7 +3,6 @@ DEPENDPATH += . INCLUDEPATH += . CFLAGS += -DQWS -static QT += \ - #qt3support \ gui \ svg @@ -15,8 +14,7 @@ target.path = /usr/bin INCLUDEPATH += \ headers/ \ - headers/backend \ - headers/legacy + headers/backend # Input HEADERS += \ @@ -25,22 +23,6 @@ HEADERS += \ headers/backend/linboimage.h \ headers/backend/linbologger.h \ headers/backend/linboos.h \ - headers/legacy/image_description.hh \ - headers/legacy/linboConsoleImpl.hh \ - headers/legacy/linboCounterImpl.hh \ - headers/legacy/linboGUIImpl.hh \ - headers/legacy/linboImageSelectorImpl.hh \ - headers/legacy/linboImageUploadImpl.hh \ - headers/legacy/linboInfoBrowserImpl.hh \ - headers/legacy/linboInputBoxImpl.hh \ - headers/legacy/linboMsgImpl.hh \ - headers/legacy/linboMulticastBoxImpl.hh \ - headers/legacy/linboPasswordBoxImpl.hh \ - headers/legacy/linboProgressImpl.hh \ - headers/legacy/linboPushButton.hh \ - headers/legacy/linboLogConsole.hh \ - headers/legacy/linboRegisterBoxImpl.hh \ - headers/legacy/linboYesNoImpl.hh \ headers/backend/linbobackend.h \ headers/linbogui.h \ headers/linboosselectbutton.h \ @@ -58,22 +40,6 @@ SOURCES += \ sources/backend/linboimage.cpp \ sources/backend/linbologger.cpp \ sources/backend/linboos.cpp \ - sources/legacy/image_description.cc \ - sources/legacy/linboConsoleImpl.cc \ - sources/legacy/linboCounterImpl.cc \ - sources/legacy/linboGUIImpl.cc \ - sources/legacy/linboImageSelectorImpl.cc \ - sources/legacy/linboImageUploadImpl.cc \ - sources/legacy/linboInfoBrowserImpl.cc \ - sources/legacy/linboInputBoxImpl.cc \ - sources/legacy/linboMsgImpl.cc \ - sources/legacy/linboMulticastBoxImpl.cc \ - sources/legacy/linboPasswordBoxImpl.cc \ - sources/legacy/linboProgressImpl.cc \ - sources/legacy/linboPushButton.cc \ - sources/legacy/linboLogConsole.cc \ - sources/legacy/linboRegisterBoxImpl.cc \ - sources/legacy/linboYesNoImpl.cc \ sources/backend/linbobackend.cpp \ sources/linbogui.cpp \ sources/linboosselectbutton.cpp \ @@ -86,22 +52,6 @@ SOURCES += \ sources/qmodernpushbuttonoverlay.cpp \ sources/qmodernstackedwidget.cpp -FORMS += \ - forms/linboConsole.ui \ - forms/linboCounter.ui \ - forms/linboGUI.ui \ - forms/linboImageSelector.ui \ - forms/linboImageUpload.ui \ - forms/linboInfoBrowser.ui \ - forms/linboInputBox.ui \ - forms/linboMovie.ui \ - forms/linboMsg.ui \ - forms/linboMulticastBox.ui \ - forms/linboPasswordBox.ui \ - forms/linboProgress.ui \ - forms/linboRegisterBox.ui \ - forms/linboYesNo.ui - RESOURCES += \ resources/linbo.qrc diff --git a/sources/backend/linbobackend.cpp b/sources/backend/linbobackend.cpp index 6df2b78..e6f026f 100644 --- a/sources/backend/linbobackend.cpp +++ b/sources/backend/linbobackend.cpp @@ -24,8 +24,9 @@ LinboBackend::LinboBackend(QObject *parent) : QObject(parent) { - this->setState(Initializing); this->currentOs = nullptr; + this->logger = nullptr; + this->state = Initializing; // Init some objects this->logger = new LinboLogger("/tmp/linbo.log", this); @@ -406,7 +407,8 @@ void LinboBackend::setState(LinboState state) { this->state = state; emit this->stateChanged(this->state); - this->logger->log("Linbo state changed to: " + QString::number(state), LinboLogType::LinboGuiInfo); + if(this->logger != nullptr) + this->logger->log("Linbo state changed to: " + QString::number(state), LinboLogType::LinboGuiInfo); } void LinboBackend::loadStartConfiguration(QString startConfFilePath) { @@ -431,7 +433,6 @@ void LinboBackend::loadStartConfiguration(QString startConfFilePath) { // ignore capitalization thisLine = thisLine.toLower(); // remove empty characters - thisLine = thisLine.stripWhiteSpace(); thisLine = thisLine.simplified(); // ignore empty lines if(thisLine.length() == 0) @@ -457,8 +458,8 @@ void LinboBackend::loadStartConfiguration(QString startConfFilePath) { if(keyValueList.length() < 2) continue; - QString key = keyValueList[0].stripWhiteSpace(); - QString value = keyValueList[1].stripWhiteSpace(); + QString key = keyValueList[0].simplified(); + QString value = keyValueList[1].simplified(); // ignore empty keys and values if(key.isEmpty() || value.isEmpty()) @@ -548,7 +549,7 @@ void LinboBackend::loadEnvironmentValues() { this->config->setMacAddress(this->executeCommand(true, "mac").replace("\n", "")); // Version - this->config->setLinboVersion(this->executeCommand(true, "version").stripWhiteSpace().replace("\n", "")); + this->config->setLinboVersion(this->executeCommand(true, "version").simplified().replace("\n", "")); // hostname this->config->setHostname(this->executeCommand(true, "hostname").replace("\n", "")); @@ -603,7 +604,7 @@ void LinboBackend::writeToPartitionConfig(QMap config, LinboDi else if(key == "size") partition->setSize(value.toInt()); else if(key == "id") partition->setId(value); else if(key == "fstype") partition->setFstype(value); - else if(key.startsWith("bootable", false)) partition->setBootable(toBool(value)); + else if(key.startsWith("bootable")) partition->setBootable(toBool(value)); } } @@ -635,5 +636,5 @@ bool LinboBackend::toBool(const QString& value) { QStringList trueWords("yes"); trueWords.append("true"); trueWords.append("enable"); - return trueWords.contains(value.stripWhiteSpace()); + return trueWords.contains(value.simplified()); } diff --git a/sources/legacy/linboConsoleImpl.cc b/sources/legacy/linboConsoleImpl.cc index b921aa6..49dee23 100644 --- a/sources/legacy/linboConsoleImpl.cc +++ b/sources/legacy/linboConsoleImpl.cc @@ -1,10 +1,11 @@ #include "linboConsoleImpl.hh" #include "linboProgressImpl.hh" #include "linboGUIImpl.hh" -#include +#include #include #include #include +#include #include "linboPushButton.hh" diff --git a/sources/legacy/linboGUIImpl.cc b/sources/legacy/linboGUIImpl.cc index 9b02c19..c6d142b 100644 --- a/sources/legacy/linboGUIImpl.cc +++ b/sources/legacy/linboGUIImpl.cc @@ -24,22 +24,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA #include "linboGUIImpl.hh" #include // for signal() #include -#include +#include #include #include #include -#include +#include #include -#include +#include #include #include -#include +#include #include #include #include #include #include -#include +//#include #include "linboProgressImpl.hh" #include "linboMulticastBoxImpl.hh" @@ -53,8 +53,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA #include "linboConsoleImpl.hh" #include #include -#include -#include + +//#include +//#include #define LINBO_CMD(arg) QStringList("linbo_cmd") << (arg); @@ -62,7 +63,7 @@ void read_qstring( ifstream* input, QString& tmp ) { char line[500]; input->getline(line,500,'\n'); - tmp = QString::fromAscii( line, -1 ).stripWhiteSpace(); + tmp = QByteArray::fromHex(QString(line).remove(" ").toLocal8Bit()); } void read_bool( ifstream* input, diff --git a/sources/legacy/linboImageSelectorImpl.cc b/sources/legacy/linboImageSelectorImpl.cc index 700cfb1..84d537c 100644 --- a/sources/legacy/linboImageSelectorImpl.cc +++ b/sources/legacy/linboImageSelectorImpl.cc @@ -1,13 +1,13 @@ #include "linboImageSelectorImpl.hh" #include -#include +#include #include -#include -#include +#include +#include #include #include //Added by qt3to4: -#include +#include #include "linboImageUploadImpl.hh" #include "linboPushButton.hh" diff --git a/sources/legacy/linboImageUploadImpl.cc b/sources/legacy/linboImageUploadImpl.cc index 4a2de18..dac6418 100644 --- a/sources/legacy/linboImageUploadImpl.cc +++ b/sources/legacy/linboImageUploadImpl.cc @@ -1,8 +1,8 @@ #include "linboImageUploadImpl.hh" #include -#include +#include #include -#include +#include #include #include "linboPushButton.hh" #include "linboYesNoImpl.hh" diff --git a/sources/legacy/linboInfoBrowserImpl.cc b/sources/legacy/linboInfoBrowserImpl.cc index bc5770e..226d71b 100644 --- a/sources/legacy/linboInfoBrowserImpl.cc +++ b/sources/legacy/linboInfoBrowserImpl.cc @@ -2,7 +2,7 @@ #include #include #include -#include +#include linboInfoBrowserImpl::linboInfoBrowserImpl(QWidget* parent ) : linboDialog() { diff --git a/sources/legacy/linboInputBoxImpl.cc b/sources/legacy/linboInputBoxImpl.cc index 95c6461..1c0160a 100644 --- a/sources/legacy/linboInputBoxImpl.cc +++ b/sources/legacy/linboInputBoxImpl.cc @@ -1,6 +1,6 @@ #include "linboInputBoxImpl.hh" #include -#include +#include #include #include #include "linboPushButton.hh" diff --git a/sources/legacy/linboMulticastBoxImpl.cc b/sources/legacy/linboMulticastBoxImpl.cc index afbba23..0b1f633 100644 --- a/sources/legacy/linboMulticastBoxImpl.cc +++ b/sources/legacy/linboMulticastBoxImpl.cc @@ -1,7 +1,7 @@ #include "linboMulticastBoxImpl.hh" #include #include "linboProgressImpl.hh" -#include +#include #include #include #include "linboPushButton.hh" diff --git a/sources/legacy/linboPasswordBoxImpl.cc b/sources/legacy/linboPasswordBoxImpl.cc index b00a4ba..6ab452e 100644 --- a/sources/legacy/linboPasswordBoxImpl.cc +++ b/sources/legacy/linboPasswordBoxImpl.cc @@ -1,5 +1,5 @@ #include "linboPasswordBoxImpl.hh" -#include +#include #include #include #include diff --git a/sources/legacy/linboPushButton.cc b/sources/legacy/linboPushButton.cc index b49ebc6..e5445c4 100644 --- a/sources/legacy/linboPushButton.cc +++ b/sources/legacy/linboPushButton.cc @@ -1,15 +1,15 @@ #include #include -#include +#include #include #include #include #include "linboPushButton.hh" linbopushbutton::linbopushbutton( QWidget* parent, - const char* name ) : QPushButton( parent, - name ) + const char* name ) : QPushButton( parent ) { + Q_UNUSED(name) connect(this, SIGNAL(clicked()), this, SLOT(lclicked())); // myprocess = new Q3Process( this ) @@ -98,7 +98,7 @@ void linbopushbutton::lclicked() //myMainApp->setEnabled( false ); myQDialog->show(); myQDialog->raise(); - myQDialog->setActiveWindow(); + //myQDialog->setActiveWindow(); myQDialog->setEnabled( true ); } @@ -112,7 +112,7 @@ void linbopushbutton::lclicked() progwindow->raise(); // progwindow->setTextBrowser( Console ); - progwindow->setActiveWindow(); + //progwindow->setActiveWindow(); progwindow->setUpdatesEnabled( true ); progwindow->setEnabled( true ); } diff --git a/sources/linbogui.cpp b/sources/linbogui.cpp index 0417ea3..452600d 100644 --- a/sources/linbogui.cpp +++ b/sources/linbogui.cpp @@ -24,10 +24,10 @@ LinboGui::LinboGui() Qt::WindowFlags flags; flags = Qt::FramelessWindowHint | Qt::WindowStaysOnBottomHint; setWindowFlags( flags ); - setAttribute( Qt::WA_AlwaysShowToolTips ); - this->setGeometry(QApplication::desktop()->screenGeometry()); - this->setFixedHeight(QApplication::desktop()->screenGeometry().height()); - this->setFixedWidth(QApplication::desktop()->screenGeometry().width()); + setAttribute(Qt::WA_AlwaysShowToolTips); + this->setGeometry(QGuiApplication::screens().at(0)->geometry()); + this->setFixedHeight(QGuiApplication::screens().at(0)->geometry().height()); + this->setFixedWidth(QGuiApplication::screens().at(0)->geometry().width()); // Load segoe font QFontDatabase::addApplicationFont(":/fonts/SegoeUI.ttf"); diff --git a/sources/linbostartpage.cpp b/sources/linbostartpage.cpp index 777b0e7..5aa9b86 100644 --- a/sources/linbostartpage.cpp +++ b/sources/linbostartpage.cpp @@ -28,8 +28,8 @@ LinboStartPage::LinboStartPage(LinboBackend* backend, QWidget *parent) : QWidget this->setGeometry(QRect(0,0,parent->width(), parent->height())); // create an instance of the old GUI (as a backup) - linboGUIImpl* legacyGui = new linboGUIImpl(this); - legacyGui->setStyleSheet( "QDialog { background: white }"); + //linboGUIImpl* legacyGui = new linboGUIImpl(this); + //legacyGui->setStyleSheet( "QDialog { background: white }"); // create the main layout @@ -53,7 +53,7 @@ LinboStartPage::LinboStartPage(LinboBackend* backend, QWidget *parent) : QWidget this->startActionsWidget->setFixedHeight(this->height() * 0.45); this->startActionsWidget->setFixedWidth(this->width()); - QLabel* versionLabel = new QLabel(backend->getConfig()->getLinboVersion() + " - mod by Dorian Zedler"); + QLabel* versionLabel = new QLabel(backend->getConfig()->getLinboVersion() );//+ " - GUI by Dorian Zedler"); versionLabel->setFont(QFont("Segoe UI")); mainLayout->addWidget(versionLabel); @@ -67,7 +67,7 @@ LinboStartPage::LinboStartPage(LinboBackend* backend, QWidget *parent) : QWidget powerActionsLayoutWidget->setGeometry(QRect(this->width() - (width + margins), this->height() - (height + margins), width * 1.1, height)); QModernPushButton* settingsActionButton = new QModernPushButton(":/svgIcons/settingsAction.svg"); - connect(settingsActionButton, SIGNAL(clicked()), legacyGui, SLOT(loginAndOpen())); + //connect(settingsActionButton, SIGNAL(clicked()), legacyGui, SLOT(loginAndOpen())); this->powerActionButtons.append(settingsActionButton); settingsActionButton->setFixedHeight(buttonWidth); settingsActionButton->setFixedWidth(buttonWidth); diff --git a/sources/main.cpp b/sources/main.cpp index a9477a2..24b4900 100644 --- a/sources/main.cpp +++ b/sources/main.cpp @@ -1,4 +1,4 @@ -#include +//#include #include #include "linbogui.h" @@ -8,11 +8,11 @@ int main( int argc, char* argv[] ) QApplication linboGuiApp( argc, argv ); - QWSServer* wsServer = QWSServer::instance(); + /*QWSServer* wsServer = QWSServer::instance(); if ( wsServer ) { wsServer->refresh(); - } + }*/ LinboGui* linboGui = new LinboGui; linboGui->show();