Skip to content

Commit

Permalink
First plausible mockup of the UI.
Browse files Browse the repository at this point in the history
  • Loading branch information
davidgiven committed Jan 11, 2024
1 parent e40d74c commit 35633ae
Show file tree
Hide file tree
Showing 6 changed files with 1,076 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
path: 'fluxengine-testdata'
- name: apt
run: |
sudo apt install libudev-dev libsqlite3-dev protobuf-compiler libwxgtk3.0-gtk3-dev libfmt-dev libprotobuf-dev wx-common qtbase5-dev
sudo apt install libudev-dev libsqlite3-dev protobuf-compiler libwxgtk3.0-gtk3-dev libfmt-dev libprotobuf-dev wx-common qtbase5-dev qttools5-dev-tools
- name: make
run: CXXFLAGS="-Wp,-D_GLIBCXX_ASSERTIONS" make -j`nproc` -C fluxengine

Expand Down
29 changes: 28 additions & 1 deletion src/gui2/build.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,36 @@
from build.ab import emit, normalrule
from build.c import cxxprogram
from build.c import cxxprogram, cxxlibrary
from build.pkg import package
import config

package(name="Qt5Widgets", package="Qt5Widgets")

normalrule(
name="userinterface_h",
ins=["./userinterface.ui"],
outs=["userinterface.h"],
commands=[
"uic -g cpp -o {outs[0]} {ins[0]}"
],
label="UIC"
)

normalrule(
name="resources_cc",
ins=["./resources.qrc"],
outs=["resources.cc"],
commands=[
"rcc -g cpp --name resources -o {outs[0]} {ins[0]}"
],
label="RCC"
)

cxxlibrary(
name="userinterface",
srcs=[".+resources_cc"],
hdrs={"userinterface.h": ".+userinterface_h"}
)

cxxprogram(
name="gui2",
srcs=[
Expand All @@ -28,6 +54,7 @@
"+fmt_lib",
"+protobuf_lib",
".+Qt5Widgets",
".+userinterface",
],
)

Expand Down
13 changes: 10 additions & 3 deletions src/gui2/main.cc
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
#include <QApplication>
#include <QPushButton>
#include "userinterface.h"

class UserInterface : public Ui_MainWindow {};

int main(int argc, char **argv)
{
QApplication app (argc, argv);

QPushButton button ("Hello world !");
button.show();
Q_INIT_RESOURCE(resources);
QMainWindow mainWindow;
UserInterface ui;
ui.setupUi(&mainWindow);
mainWindow.setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
mainWindow.setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
mainWindow.show();

return app.exec();
}
5 changes: 5 additions & 0 deletions src/gui2/resources.qrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<RCC>
<qresource prefix="ui">
<file>../../extras/icon.png</file>
</qresource>
</RCC>
Loading

0 comments on commit 35633ae

Please sign in to comment.