Commit 87ec6115 authored by Gertulla, Janis Luca's avatar Gertulla, Janis Luca
Browse files

add qcustomplot source

parent ce1878ce
*.o
ui_*
UE49Interlock
moc_*
*.stash
qrc_*
Makefile
*.user
*.a
build/
QT += core gui network charts
QT += core gui network charts qcustomplot
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<<<<<<< Updated upstream
<!-- Written by QtCreator 4.13.1, 2020-10-21T12:23:44. -->
=======
<!-- Written by QtCreator 4.13.1, 2020-10-18T12:48:46. -->
>>>>>>> Stashed changes
<qtcreator>
<data>
<variable>EnvironmentId</variable>
......
......@@ -5,13 +5,23 @@
int main(int argc, char *argv[])
{
<<<<<<< Updated upstream
QApplication a(argc, argv);
// auto f = QFile(":/stylesheet.qss");
// f.open(QFile::ReadOnly);
// QString StyleSheet = QLatin1String(f.readAll());
// a.setStyleSheet(StyleSheet);
=======
QApplication app(argc, argv);
QFontDatabase::addApplicationFont(":/Nunito_Sans/NunitoSans-Regular.ttf");
QFile stylesheet(":/stylesheet.qss");
stylesheet.open(QFile::ReadOnly);
QString setSheet = QLatin1String(stylesheet.readAll());
app.setStyleSheet(setSheet);
>>>>>>> Stashed changes
Window w;
w.show();
return a.exec();
return app.exec();
}
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -10,6 +10,23 @@
<file>svg/hv_inactive.svg</file>
<file>svg/icon.svg</file>
<file>stylesheet.qss</file>
<<<<<<< Updated upstream
<file>svg/overlay.svg</file>
=======
<file>Nunito_Sans/NunitoSans-SemiBoldItalic.ttf</file>
<file>Nunito_Sans/NunitoSans-SemiBold.ttf</file>
<file>Nunito_Sans/NunitoSans-Regular.ttf</file>
<file>Nunito_Sans/NunitoSans-LightItalic.ttf</file>
<file>Nunito_Sans/NunitoSans-Light.ttf</file>
<file>Nunito_Sans/NunitoSans-Italic.ttf</file>
<file>Nunito_Sans/NunitoSans-ExtraLightItalic.ttf</file>
<file>Nunito_Sans/NunitoSans-ExtraLight.ttf</file>
<file>Nunito_Sans/NunitoSans-ExtraBoldItalic.ttf</file>
<file>Nunito_Sans/NunitoSans-ExtraBold.ttf</file>
<file>Nunito_Sans/NunitoSans-BoldItalic.ttf</file>
<file>Nunito_Sans/NunitoSans-Bold.ttf</file>
<file>Nunito_Sans/NunitoSans-BlackItalic.ttf</file>
<file>Nunito_Sans/NunitoSans-Black.ttf</file>
>>>>>>> Stashed changes
</qresource>
</RCC>
......@@ -16,6 +16,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<<<<<<< Updated upstream
<property name="palette">
<palette>
<active>
......@@ -539,6 +540,8 @@
</disabled>
</palette>
</property>
=======
>>>>>>> Stashed changes
<property name="windowTitle">
<string>UE49 Interlock</string>
</property>
......@@ -769,7 +772,7 @@ QPushButton:pressed {
</font>
</property>
<property name="currentIndex">
<number>0</number>
<number>2</number>
</property>
<widget class="OverlayTab" name="overlay">
<property name="sizePolicy">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment