dorian/modern-linbo-gui
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Qt5 migration #1

Merged
dorian merged 2 commits from qt5-migration into master 2024-10-17 17:52:37 +02:00
Conversation 1 Commits 2 Files changed 45 +292 -396
26 changed files with 292 additions and 396 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a3bb08af43 - Show all commits

38
forms/linboGUI.ui
View file

@ -47,7 +47,7 @@
<attribute name="title"> <attribute name="title">
<string>Imaging</string> <string>Imaging</string>
</attribute> </attribute>
<widget class="Q3ScrollView" name="imagingView" native="true"> <widget class="QScrollArea" name="imagingView">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
@ -56,11 +56,21 @@
<height>180</height> <height>180</height>
</rect> </rect>
</property> </property>
<property name="autoFillBackground"> <property name="widgetResizable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>408</width>
<height>178</height>
</rect>
</property>
</widget> </widget>
<widget class="Q3ScrollView" name="partitionView" native="true"> </widget>
<widget class="QScrollArea" name="partitionView">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>429</x> <x>429</x>
@ -69,9 +79,19 @@
<height>180</height> <height>180</height>
</rect> </rect>
</property> </property>
<property name="autoFillBackground"> <property name="widgetResizable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<widget class="QWidget" name="scrollAreaWidgetContents_2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>178</width>
<height>178</height>
</rect>
</property>
</widget>
</widget> </widget>
</widget> </widget>
</widget> </widget>
@ -406,17 +426,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>Q3ScrollView</class>
<extends>QWidget</extends>
<header location="global">qscrollview.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<includes> <includes>
<include location="local">q3scrollview.h</include>
<include location="local">q3scrollview.h</include>
</includes> </includes>
<resources/> <resources/>
<connections/> <connections/>

134
forms/linboImageSelector.ui
View file

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>linboImageSelector</class> <class>linboImageSelector</class>
<widget class="QDialog" name="linboImageSelector"> <widget class="QDialog" name="linboImageSelector">
@ -36,48 +37,6 @@ Auswahl:</string>
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
<widget class="Q3ButtonGroup" name="imageButtons" >
<property name="geometry" >
<rect>
<x>10</x>
<y>160</y>
<width>361</width>
<height>70</height>
</rect>
</property>
<property name="title" >
<string>Image-Typ für neue Image-Datei:</string>
</property>
<widget class="QRadioButton" name="baseRadioButton" >
<property name="geometry" >
<rect>
<x>10</x>
<y>20</y>
<width>251</width>
<height>20</height>
</rect>
</property>
<property name="text" >
<string>Neues Basisimage</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
<widget class="QRadioButton" name="incrRadioButton" >
<property name="geometry" >
<rect>
<x>10</x>
<y>40</y>
<width>251</width>
<height>21</height>
</rect>
</property>
<property name="text" >
<string>Differentielles Image</string>
</property>
</widget>
</widget>
<widget class="QLabel" name="textLabel2_2"> <widget class="QLabel" name="textLabel2_2">
<property name="geometry"> <property name="geometry">
<rect> <rect>
@ -133,7 +92,7 @@ Auswahl:</string>
</rect> </rect>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Erstellt das ausgewählte Image&lt;br>im lokalen Cache</string> <string>Erstellt das ausgewählte Image&lt;br&gt;im lokalen Cache</string>
</property> </property>
<property name="text"> <property name="text">
<string>Erstellen</string> <string>Erstellen</string>
@ -149,7 +108,7 @@ Auswahl:</string>
</rect> </rect>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Erstellt das ausgewählte Image im lokalen Cache und lädt es &lt;br> anschliessend auf den Server hoch</string> <string>Erstellt das ausgewählte Image im lokalen Cache und lädt es &lt;br&gt; anschliessend auf den Server hoch</string>
</property> </property>
<property name="text"> <property name="text">
<string>Erstellen+Hochladen</string> <string>Erstellen+Hochladen</string>
@ -171,27 +130,6 @@ Auswahl:</string>
<string>Abbruch</string> <string>Abbruch</string>
</property> </property>
</widget> </widget>
<widget class="Q3ListBox" name="listBox" >
<property name="geometry" >
<rect>
<x>10</x>
<y>80</y>
<width>360</width>
<height>72</height>
</rect>
</property>
<property name="vScrollBarMode" >
<enum>Q3ScrollView::Auto</enum>
</property>
<property name="hScrollBarMode" >
<enum>Q3ScrollView::Auto</enum>
</property>
<item>
<property name="text" >
<string>New Item</string>
</property>
</item>
</widget>
<widget class="QTextEdit" name="infoEditor"> <widget class="QTextEdit" name="infoEditor">
<property name="geometry"> <property name="geometry">
<rect> <rect>
@ -228,24 +166,62 @@ Auswahl:</string>
<string>Shutdown</string> <string>Shutdown</string>
</property> </property>
</widget> </widget>
<widget class="QListView" name="listBox">
<property name="geometry">
<rect>
<x>10</x>
<y>80</y>
<width>360</width>
<height>72</height>
</rect>
</property>
</widget>
<widget class="QGroupBox" name="imageButtons">
<property name="geometry">
<rect>
<x>10</x>
<y>160</y>
<width>361</width>
<height>70</height>
</rect>
</property>
<property name="title">
<string>GroupBox</string>
</property>
<widget class="QRadioButton" name="baseRadioButton">
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
<width>251</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Neues Basisimage</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
<widget class="QRadioButton" name="incrRadioButton">
<property name="geometry">
<rect>
<x>10</x>
<y>40</y>
<width>251</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Differentielles Image</string>
</property>
</widget>
</widget>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets>
<customwidget>
<class>Q3ButtonGroup</class>
<extends>Q3GroupBox</extends>
<header>Qt3Support/Q3ButtonGroup</header>
<container>1</container>
</customwidget>
<customwidget>
<class>Q3ListBox</class>
<extends>Q3Frame</extends>
<header>q3listbox.h</header>
</customwidget>
</customwidgets>
<tabstops> <tabstops>
<tabstop>listBox</tabstop>
<tabstop>baseRadioButton</tabstop> <tabstop>baseRadioButton</tabstop>
<tabstop>specialName</tabstop> <tabstop>specialName</tabstop>
<tabstop>createButton</tabstop> <tabstop>createButton</tabstop>

41
forms/linboImageUpload.ui
View file

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>linboImageUpload</class> <class>linboImageUpload</class>
<widget class="QDialog" name="linboImageUpload"> <widget class="QDialog" name="linboImageUpload">
@ -12,27 +13,6 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Image Auswahl</string> <string>Image Auswahl</string>
</property> </property>
<widget class="Q3ListBox" name="listBox" >
<property name="geometry" >
<rect>
<x>10</x>
<y>50</y>
<width>320</width>
<height>90</height>
</rect>
</property>
<property name="vScrollBarMode" >
<enum>Q3ScrollView::Auto</enum>
</property>
<property name="hScrollBarMode" >
<enum>Q3ScrollView::Auto</enum>
</property>
<item>
<property name="text" >
<string>New Item</string>
</property>
</item>
</widget>
<widget class="QLabel" name="OSLabel"> <widget class="QLabel" name="OSLabel">
<property name="geometry"> <property name="geometry">
<rect> <rect>
@ -78,7 +58,7 @@
</rect> </rect>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Lädt das ausgewählte&lt;br>Image auf den Server hoch</string> <string>Lädt das ausgewählte&lt;br&gt;Image auf den Server hoch</string>
</property> </property>
<property name="text"> <property name="text">
<string>OK</string> <string>OK</string>
@ -110,16 +90,19 @@
<string>Shutdown</string> <string>Shutdown</string>
</property> </property>
</widget> </widget>
<widget class="QListView" name="listBox">
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>320</width>
<height>90</height>
</rect>
</property>
</widget>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets>
<customwidget>
<class>Q3ListBox</class>
<extends>Q3Frame</extends>
<header>q3listbox.h</header>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

36
forms/linboInfoBrowser.ui
View file

@ -13,19 +13,6 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Image Info</string> <string>Image Info</string>
</property> </property>
<widget class="Q3TextEdit" name="editor">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>340</width>
<height>230</height>
</rect>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton" name="saveButton"> <widget class="QPushButton" name="saveButton">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -42,22 +29,19 @@
<string>Speichern</string> <string>Speichern</string>
</property> </property>
</widget> </widget>
<widget class="QPlainTextEdit" name="editor">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>340</width>
<height>230</height>
</rect>
</property>
</widget>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets>
<customwidget>
<class>Q3Frame</class>
<extends>QFrame</extends>
<header>Qt3Support/Q3Frame</header>
<container>1</container>
</customwidget>
<customwidget>
<class>Q3TextEdit</class>
<extends>Q3Frame</extends>
<header>q3textedit.h</header>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

103
forms/linboMulticastBox.ui
View file

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>linboMulticastBox</class> <class>linboMulticastBox</class>
<widget class="QDialog" name="linboMulticastBox"> <widget class="QDialog" name="linboMulticastBox">
@ -12,7 +13,52 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Update Cache</string> <string>Update Cache</string>
</property> </property>
<widget class="Q3ButtonGroup" name="updateMethodGroup" > <widget class="QPushButton" name="okButton">
<property name="geometry">
<rect>
<x>10</x>
<y>120</y>
<width>61</width>
<height>21</height>
</rect>
</property>
<property name="toolTip">
<string>Aktualisiert den lokalen&lt;br&gt;Cache mit der gewählten Methode</string>
</property>
<property name="text">
<string>OK</string>
</property>
</widget>
<widget class="QPushButton" name="cancelButton">
<property name="geometry">
<rect>
<x>130</x>
<y>120</y>
<width>60</width>
<height>21</height>
</rect>
</property>
<property name="toolTip">
<string>Abbrechen ohne Cache-Aktualisierung</string>
</property>
<property name="text">
<string>Abbruch</string>
</property>
</widget>
<widget class="QCheckBox" name="checkFormat">
<property name="geometry">
<rect>
<x>10</x>
<y>100</y>
<width>161</width>
<height>19</height>
</rect>
</property>
<property name="text">
<string>Cache Partition formatieren</string>
</property>
</widget>
<widget class="QGroupBox" name="updateMethodGroup">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
@ -22,7 +68,7 @@
</rect> </rect>
</property> </property>
<property name="title"> <property name="title">
<string>Auswahl</string> <string>GroupBox</string>
</property> </property>
<widget class="QRadioButton" name="rsyncButton"> <widget class="QRadioButton" name="rsyncButton">
<property name="geometry"> <property name="geometry">
@ -67,62 +113,9 @@
</property> </property>
</widget> </widget>
</widget> </widget>
<widget class="QPushButton" name="okButton" >
<property name="geometry" >
<rect>
<x>10</x>
<y>120</y>
<width>61</width>
<height>21</height>
</rect>
</property>
<property name="toolTip" >
<string>Aktualisiert den lokalen&lt;br>Cache mit der gewählten Methode</string>
</property>
<property name="text" >
<string>OK</string>
</property>
</widget>
<widget class="QPushButton" name="cancelButton" >
<property name="geometry" >
<rect>
<x>130</x>
<y>120</y>
<width>60</width>
<height>21</height>
</rect>
</property>
<property name="toolTip" >
<string>Abbrechen ohne Cache-Aktualisierung</string>
</property>
<property name="text" >
<string>Abbruch</string>
</property>
</widget>
<widget class="QCheckBox" name="checkFormat" >
<property name="geometry" >
<rect>
<x>10</x>
<y>100</y>
<width>161</width>
<height>19</height>
</rect>
</property>
<property name="text" >
<string>Cache Partition formatieren</string>
</property>
</widget>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets>
<customwidget>
<class>Q3ButtonGroup</class>
<extends>Q3GroupBox</extends>
<header>Qt3Support/Q3ButtonGroup</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

4
headers/legacy/linboCounterImpl.hh
View file

@ -7,7 +7,7 @@
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
#include <qdialog.h> #include <qdialog.h>
#include <q3process.h> #include <qprocess.h>
#include <qstring.h> #include <qstring.h>
#include <QTextEdit> #include <QTextEdit>
#include "linboDialog.hh" #include "linboDialog.hh"
@ -20,7 +20,7 @@ class linboCounterImpl : public QWidget, public Ui::linboCounter, public linboDi
private: private:
QTextEdit *Console; QTextEdit *Console;
Q3Process* myProcess; QProcess* myProcess;
QString line; QString line;
QWidget *myMainApp,*myParent; QWidget *myMainApp,*myParent;
QStringList myCommand; QStringList myCommand;

1
headers/legacy/linboMulticastBoxImpl.hh
View file

@ -10,7 +10,6 @@
#include <qwidget.h> #include <qwidget.h>
#include <qdialog.h> #include <qdialog.h>
#include <QTextEdit> #include <QTextEdit>
#include <q3buttongroup.h>
#include <qstringlist.h> #include <qstringlist.h>
#include <qstring.h> #include <qstring.h>
#include <QProcess> #include <QProcess>

1
headers/legacy/linboPushButton.hh
View file

@ -10,6 +10,7 @@
#include <qstringlist.h> #include <qstringlist.h>
#include <qtimer.h> #include <qtimer.h>
#include <qdialog.h> #include <qdialog.h>
#include <QPushButton>
#include "linboProgressImpl.hh" #include "linboProgressImpl.hh"
#include "linboYesNoImpl.hh" #include "linboYesNoImpl.hh"
#include "linboPasswordBoxImpl.hh" #include "linboPasswordBoxImpl.hh"

2
headers/legacy/linboRegisterBoxImpl.hh
View file

@ -11,7 +11,7 @@
#include <QProcess> #include <QProcess>
#include <qstring.h> #include <qstring.h>
#include <QTextEdit> #include <QTextEdit>
#include <Qt3Support/Q3TextBrowser> #include <QTextBrowser>
#include "linboProgressImpl.hh" #include "linboProgressImpl.hh"
#include "linboDialog.hh" #include "linboDialog.hh"
#include "linboLogConsole.hh" #include "linboLogConsole.hh"

1
headers/legacy/linboYesNoImpl.hh
View file

@ -10,7 +10,6 @@
#include <qwidget.h> #include <qwidget.h>
#include <qdialog.h> #include <qdialog.h>
#include <qpushbutton.h> #include <qpushbutton.h>
#include <Q3TextEdit>
#include <qstringlist.h> #include <qstringlist.h>
#include <QProcess> #include <QProcess>
#include <iostream> #include <iostream>

2
headers/linbogui.h
View file

@ -26,8 +26,8 @@
#include <QBoxLayout> #include <QBoxLayout>
#include <QFont> #include <QFont>
#include <QFontDatabase> #include <QFontDatabase>
#include <QScreen>
#include "linboGUIImpl.hh"
#include "linbostartpage.h" #include "linbostartpage.h"
#include "linbobackend.h" #include "linbobackend.h"

2
headers/linbostartpage.h
View file

@ -43,9 +43,7 @@
#include <QButtonGroup> #include <QButtonGroup>
#include <QLabel> #include <QLabel>
#include <QProgressBar> #include <QProgressBar>
#include <QMacStyle>
#include "linboGUIImpl.hh"
#include "linbobackend.h" #include "linbobackend.h"
#include "linboosselectbutton.h" #include "linboosselectbutton.h"
#include "qmodernprogressbar.h" #include "qmodernprogressbar.h"

52
linboGUI.pro
View file

@ -3,7 +3,6 @@ DEPENDPATH += .
INCLUDEPATH += . INCLUDEPATH += .
CFLAGS += -DQWS -static CFLAGS += -DQWS -static
QT += \ QT += \
#qt3support \
gui \ gui \
svg svg
@ -15,8 +14,7 @@ target.path = /usr/bin
INCLUDEPATH += \ INCLUDEPATH += \
headers/ \ headers/ \
headers/backend \ headers/backend
headers/legacy
# Input # Input
HEADERS += \ HEADERS += \
@ -25,22 +23,6 @@ HEADERS += \
headers/backend/linboimage.h \ headers/backend/linboimage.h \
headers/backend/linbologger.h \ headers/backend/linbologger.h \
headers/backend/linboos.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/backend/linbobackend.h \
headers/linbogui.h \ headers/linbogui.h \
headers/linboosselectbutton.h \ headers/linboosselectbutton.h \
@ -58,22 +40,6 @@ SOURCES += \
sources/backend/linboimage.cpp \ sources/backend/linboimage.cpp \
sources/backend/linbologger.cpp \ sources/backend/linbologger.cpp \
sources/backend/linboos.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/backend/linbobackend.cpp \
sources/linbogui.cpp \ sources/linbogui.cpp \
sources/linboosselectbutton.cpp \ sources/linboosselectbutton.cpp \
@ -86,22 +52,6 @@ SOURCES += \
sources/qmodernpushbuttonoverlay.cpp \ sources/qmodernpushbuttonoverlay.cpp \
sources/qmodernstackedwidget.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 += \
resources/linbo.qrc resources/linbo.qrc

15
sources/backend/linbobackend.cpp
View file

@ -24,8 +24,9 @@
LinboBackend::LinboBackend(QObject *parent) : QObject(parent) LinboBackend::LinboBackend(QObject *parent) : QObject(parent)
{ {
this->setState(Initializing);
this->currentOs = nullptr; this->currentOs = nullptr;
this->logger = nullptr;
this->state = Initializing;
// Init some objects // Init some objects
this->logger = new LinboLogger("/tmp/linbo.log", this); this->logger = new LinboLogger("/tmp/linbo.log", this);
@ -406,6 +407,7 @@ void LinboBackend::setState(LinboState state) {
this->state = state; this->state = state;
emit this->stateChanged(this->state); emit this->stateChanged(this->state);
if(this->logger != nullptr)
this->logger->log("Linbo state changed to: " + QString::number(state), LinboLogType::LinboGuiInfo); this->logger->log("Linbo state changed to: " + QString::number(state), LinboLogType::LinboGuiInfo);
} }
@ -431,7 +433,6 @@ void LinboBackend::loadStartConfiguration(QString startConfFilePath) {
// ignore capitalization // ignore capitalization
thisLine = thisLine.toLower(); thisLine = thisLine.toLower();
// remove empty characters // remove empty characters
thisLine = thisLine.stripWhiteSpace();
thisLine = thisLine.simplified(); thisLine = thisLine.simplified();
// ignore empty lines // ignore empty lines
if(thisLine.length() == 0) if(thisLine.length() == 0)
@ -457,8 +458,8 @@ void LinboBackend::loadStartConfiguration(QString startConfFilePath) {
if(keyValueList.length() < 2) if(keyValueList.length() < 2)
continue; continue;
QString key = keyValueList[0].stripWhiteSpace(); QString key = keyValueList[0].simplified();
QString value = keyValueList[1].stripWhiteSpace(); QString value = keyValueList[1].simplified();
// ignore empty keys and values // ignore empty keys and values
if(key.isEmpty() || value.isEmpty()) if(key.isEmpty() || value.isEmpty())
@ -548,7 +549,7 @@ void LinboBackend::loadEnvironmentValues() {
this->config->setMacAddress(this->executeCommand(true, "mac").replace("\n", "")); this->config->setMacAddress(this->executeCommand(true, "mac").replace("\n", ""));
// Version // Version
this->config->setLinboVersion(this->executeCommand(true, "version").stripWhiteSpace().replace("\n", "")); this->config->setLinboVersion(this->executeCommand(true, "version").simplified().replace("\n", ""));
// hostname // hostname
this->config->setHostname(this->executeCommand(true, "hostname").replace("\n", "")); this->config->setHostname(this->executeCommand(true, "hostname").replace("\n", ""));
@ -603,7 +604,7 @@ void LinboBackend::writeToPartitionConfig(QMap<QString, QString> config, LinboDi
else if(key == "size") partition->setSize(value.toInt()); else if(key == "size") partition->setSize(value.toInt());
else if(key == "id") partition->setId(value); else if(key == "id") partition->setId(value);
else if(key == "fstype") partition->setFstype(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"); QStringList trueWords("yes");
trueWords.append("true"); trueWords.append("true");
trueWords.append("enable"); trueWords.append("enable");
return trueWords.contains(value.stripWhiteSpace()); return trueWords.contains(value.simplified());
} }

3
sources/legacy/linboConsoleImpl.cc
View file

@ -1,10 +1,11 @@
#include "linboConsoleImpl.hh" #include "linboConsoleImpl.hh"
#include "linboProgressImpl.hh" #include "linboProgressImpl.hh"
#include "linboGUIImpl.hh" #include "linboGUIImpl.hh"
#include <q3progressbar.h> #include <QProgressBar>
#include <qapplication.h> #include <qapplication.h>
#include <QtGui> #include <QtGui>
#include <QByteArray> #include <QByteArray>
#include <QDesktopWidget>
#include "linboPushButton.hh" #include "linboPushButton.hh"

17
sources/legacy/linboGUIImpl.cc
View file

@ -24,22 +24,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#include "linboGUIImpl.hh" #include "linboGUIImpl.hh"
#include <signal.h> // for signal() #include <signal.h> // for signal()
#include <qpushbutton.h> #include <qpushbutton.h>
#include <q3buttongroup.h> #include <QButtonGroup>
#include <qstringlist.h> #include <qstringlist.h>
#include <qlabel.h> #include <qlabel.h>
#include <qtabwidget.h> #include <qtabwidget.h>
#include <q3listbox.h> #include <QListView>
#include <qapplication.h> #include <qapplication.h>
#include <q3scrollview.h> #include <QListView>
#include <qtooltip.h> #include <qtooltip.h>
#include <qfile.h> #include <qfile.h>
#include <q3textstream.h> #include <QTextStream>
#include <qpixmap.h> #include <qpixmap.h>
#include <qimage.h> #include <qimage.h>
#include <QBrush> #include <QBrush>
#include <qregexp.h> #include <qregexp.h>
#include <stdlib.h> #include <stdlib.h>
#include <q3stylesheet.h> //#include <q3stylesheet.h>
#include "linboProgressImpl.hh" #include "linboProgressImpl.hh"
#include "linboMulticastBoxImpl.hh" #include "linboMulticastBoxImpl.hh"
@ -53,8 +53,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#include "linboConsoleImpl.hh" #include "linboConsoleImpl.hh"
#include <QtGui> #include <QtGui>
#include <QTextCursor> #include <QTextCursor>
#include <qwindowsystem_qws.h>
#include <QWSServer> //#include <qwindowsystem_qws.h>
//#include <QWSServer>
#define LINBO_CMD(arg) QStringList("linbo_cmd") << (arg); #define LINBO_CMD(arg) QStringList("linbo_cmd") << (arg);
@ -62,7 +63,7 @@ void read_qstring( ifstream* input,
QString& tmp ) { QString& tmp ) {
char line[500]; char line[500];
input->getline(line,500,'\n'); input->getline(line,500,'\n');
tmp = QString::fromAscii( line, -1 ).stripWhiteSpace(); tmp = QByteArray::fromHex(QString(line).remove(" ").toLocal8Bit());
} }
void read_bool( ifstream* input, void read_bool( ifstream* input,

8
sources/legacy/linboImageSelectorImpl.cc
View file

@ -1,13 +1,13 @@
#include "linboImageSelectorImpl.hh" #include "linboImageSelectorImpl.hh"
#include <unistd.h> #include <unistd.h>
#include <q3progressbar.h> #include <QProgressBar>
#include <qapplication.h> #include <qapplication.h>
#include <q3buttongroup.h> #include <QButtonGroup>
#include <q3listbox.h> #include <QListView>
#include <QtGui> #include <QtGui>
#include <qradiobutton.h> #include <qradiobutton.h>
//Added by qt3to4: //Added by qt3to4:
#include <Q3TextStream> #include <QTextStream>
#include "linboImageUploadImpl.hh" #include "linboImageUploadImpl.hh"
#include "linboPushButton.hh" #include "linboPushButton.hh"

4
sources/legacy/linboImageUploadImpl.cc
View file

@ -1,8 +1,8 @@
#include "linboImageUploadImpl.hh" #include "linboImageUploadImpl.hh"
#include <unistd.h> #include <unistd.h>
#include <q3progressbar.h> #include <QProgressBar>
#include <qapplication.h> #include <qapplication.h>
#include <q3listbox.h> #include <QListView>
#include <QtGui> #include <QtGui>
#include "linboPushButton.hh" #include "linboPushButton.hh"
#include "linboYesNoImpl.hh" #include "linboYesNoImpl.hh"

2
sources/legacy/linboInfoBrowserImpl.cc
View file

@ -2,7 +2,7 @@
#include <unistd.h> #include <unistd.h>
#include <qapplication.h> #include <qapplication.h>
#include <QtGui> #include <QtGui>
#include <q3textstream.h> #include <QTextStream>
linboInfoBrowserImpl::linboInfoBrowserImpl(QWidget* parent ) : linboDialog() linboInfoBrowserImpl::linboInfoBrowserImpl(QWidget* parent ) : linboDialog()
{ {

2
sources/legacy/linboInputBoxImpl.cc
View file

@ -1,6 +1,6 @@
#include "linboInputBoxImpl.hh" #include "linboInputBoxImpl.hh"
#include <unistd.h> #include <unistd.h>
#include <q3progressbar.h> #include <QProgressBar>
#include <qapplication.h> #include <qapplication.h>
#include <QtGui> #include <QtGui>
#include "linboPushButton.hh" #include "linboPushButton.hh"

2
sources/legacy/linboMulticastBoxImpl.cc
View file

@ -1,7 +1,7 @@
#include "linboMulticastBoxImpl.hh" #include "linboMulticastBoxImpl.hh"
#include <unistd.h> #include <unistd.h>
#include "linboProgressImpl.hh" #include "linboProgressImpl.hh"
#include <q3progressbar.h> #include <QProgressBar>
#include <qapplication.h> #include <qapplication.h>
#include <qradiobutton.h> #include <qradiobutton.h>
#include "linboPushButton.hh" #include "linboPushButton.hh"

2
sources/legacy/linboPasswordBoxImpl.cc
View file

@ -1,5 +1,5 @@
#include "linboPasswordBoxImpl.hh" #include "linboPasswordBoxImpl.hh"
#include <q3process.h> #include <QProcess>
#include <iostream> #include <iostream>
#include <qmovie.h> #include <qmovie.h>
#include <qpoint.h> #include <qpoint.h>

10
sources/legacy/linboPushButton.cc
View file

@ -1,15 +1,15 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <q3progressbar.h> #include <QProgressBar>
#include <iostream> #include <iostream>
#include <qapplication.h> #include <qapplication.h>
#include <QtDebug> #include <QtDebug>
#include "linboPushButton.hh" #include "linboPushButton.hh"
linbopushbutton::linbopushbutton( QWidget* parent, linbopushbutton::linbopushbutton( QWidget* parent,
const char* name ) : QPushButton( parent, const char* name ) : QPushButton( parent )
name )
{ {
Q_UNUSED(name)
connect(this, SIGNAL(clicked()), this, SLOT(lclicked())); connect(this, SIGNAL(clicked()), this, SLOT(lclicked()));
// myprocess = new Q3Process( this ) // myprocess = new Q3Process( this )
@ -98,7 +98,7 @@ void linbopushbutton::lclicked()
//myMainApp->setEnabled( false ); //myMainApp->setEnabled( false );
myQDialog->show(); myQDialog->show();
myQDialog->raise(); myQDialog->raise();
myQDialog->setActiveWindow(); //myQDialog->setActiveWindow();
myQDialog->setEnabled( true ); myQDialog->setEnabled( true );
} }
@ -112,7 +112,7 @@ void linbopushbutton::lclicked()
progwindow->raise(); progwindow->raise();
// progwindow->setTextBrowser( Console ); // progwindow->setTextBrowser( Console );
progwindow->setActiveWindow(); //progwindow->setActiveWindow();
progwindow->setUpdatesEnabled( true ); progwindow->setUpdatesEnabled( true );
progwindow->setEnabled( true ); progwindow->setEnabled( true );
} }

6
sources/linbogui.cpp
View file

@ -25,9 +25,9 @@ LinboGui::LinboGui()
flags = Qt::FramelessWindowHint | Qt::WindowStaysOnBottomHint; flags = Qt::FramelessWindowHint | Qt::WindowStaysOnBottomHint;
setWindowFlags( flags ); setWindowFlags( flags );
setAttribute(Qt::WA_AlwaysShowToolTips); setAttribute(Qt::WA_AlwaysShowToolTips);
this->setGeometry(QApplication::desktop()->screenGeometry()); this->setGeometry(QGuiApplication::screens().at(0)->geometry());
this->setFixedHeight(QApplication::desktop()->screenGeometry().height()); this->setFixedHeight(QGuiApplication::screens().at(0)->geometry().height());
this->setFixedWidth(QApplication::desktop()->screenGeometry().width()); this->setFixedWidth(QGuiApplication::screens().at(0)->geometry().width());
// Load segoe font // Load segoe font
QFontDatabase::addApplicationFont(":/fonts/SegoeUI.ttf"); QFontDatabase::addApplicationFont(":/fonts/SegoeUI.ttf");

8
sources/linbostartpage.cpp
View file

@ -28,8 +28,8 @@ LinboStartPage::LinboStartPage(LinboBackend* backend, QWidget *parent) : QWidget
this->setGeometry(QRect(0,0,parent->width(), parent->height())); this->setGeometry(QRect(0,0,parent->width(), parent->height()));
// create an instance of the old GUI (as a backup) // create an instance of the old GUI (as a backup)
linboGUIImpl* legacyGui = new linboGUIImpl(this); //linboGUIImpl* legacyGui = new linboGUIImpl(this);
legacyGui->setStyleSheet( "QDialog { background: white }"); //legacyGui->setStyleSheet( "QDialog { background: white }");
// create the main layout // create the main layout
@ -53,7 +53,7 @@ LinboStartPage::LinboStartPage(LinboBackend* backend, QWidget *parent) : QWidget
this->startActionsWidget->setFixedHeight(this->height() * 0.45); this->startActionsWidget->setFixedHeight(this->height() * 0.45);
this->startActionsWidget->setFixedWidth(this->width()); 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")); versionLabel->setFont(QFont("Segoe UI"));
mainLayout->addWidget(versionLabel); 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)); powerActionsLayoutWidget->setGeometry(QRect(this->width() - (width + margins), this->height() - (height + margins), width * 1.1, height));
QModernPushButton* settingsActionButton = new QModernPushButton(":/svgIcons/settingsAction.svg"); 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); this->powerActionButtons.append(settingsActionButton);
settingsActionButton->setFixedHeight(buttonWidth); settingsActionButton->setFixedHeight(buttonWidth);
settingsActionButton->setFixedWidth(buttonWidth); settingsActionButton->setFixedWidth(buttonWidth);

6
sources/main.cpp
View file

@ -1,4 +1,4 @@
#include <QWSServer> //#include <QWSServer>
#include <QApplication> #include <QApplication>
#include "linbogui.h" #include "linbogui.h"
@ -8,11 +8,11 @@ int main( int argc, char* argv[] )
QApplication linboGuiApp( argc, argv ); QApplication linboGuiApp( argc, argv );
QWSServer* wsServer = QWSServer::instance(); /*QWSServer* wsServer = QWSServer::instance();
if ( wsServer ) { if ( wsServer ) {
wsServer->refresh(); wsServer->refresh();
} }*/
LinboGui* linboGui = new LinboGui; LinboGui* linboGui = new LinboGui;
linboGui->show(); linboGui->show();