Skip to content

Commit 5a73269

Browse files
braphbraph
committed
Moved the GUI into separate project
1 parent d79e346 commit 5a73269

17 files changed

+19
-1785
lines changed

‎CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
# Changelog
22

3+
## nbfc-linux-0.3.14 (2025-05-05)
4+
- The GUI is no longer part of this project.
5+
It has been moved to https://github.com/nbfc-linux/nbfc-qt
6+
37
## nbfc-linux-0.3.12 (2025-05-04)
48
- Fix possible bug while logging to syslog()
59
- Log to STDERR even when run as a daemon
6-
- Hopefully fixing a bug whlie building with rpmbuild
10+
- Hopefully fixing a bug while building with rpmbuild
711

812
## nbfc-linux-0.3.11 (2025-05-01)
913
- Fix incorrect error message if TemperatureThresholds are missing

‎Makefile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 0.3.13
1+
version = 0.3.14
22

33
PREFIX = /usr
44

@@ -34,7 +34,7 @@ override CPPFLAGS += \
3434
-DRUNSTATEDIR=\"$(runstatedir)\" \
3535
-DVERSION=\"$(version)\"
3636

37-
CORE = src/nbfc_service src/nbfc src/ec_probe src/test_model_config nbfc-gui/nbfc-qt.py
37+
CORE = src/nbfc_service src/nbfc src/ec_probe src/test_model_config
3838
DOC = doc/ec_probe.1 doc/nbfc.1 doc/nbfc_service.1 doc/nbfc_service.json.5
3939
SYSTEMD = etc/systemd/system/nbfc_service.service
4040
OPEN_RC = etc/init.d/nbfc_service.openrc
@@ -49,7 +49,6 @@ install-core: $(CORE)
4949
install -Dm 755 src/nbfc_service $(DESTDIR)$(bindir)/nbfc_service
5050
install -Dm 755 src/ec_probe $(DESTDIR)$(bindir)/ec_probe
5151
install -Dm 755 src/nbfc $(DESTDIR)$(bindir)/nbfc
52-
install -Dm 755 nbfc-gui/nbfc-qt.py $(DESTDIR)$(bindir)/nbfc-qt
5352

5453
REPLACE_VARS = sed \
5554
-e 's|@BINDIR@|$(bindir)|g' \
@@ -58,10 +57,6 @@ REPLACE_VARS = sed \
5857
-e 's|@RUNSTATEDIR@|$(runstatedir)|g' \
5958
-e 's|@VERSION@|$(version)|g'
6059

61-
nbfc-gui/nbfc-qt.py: nbfc-gui/about.py nbfc-gui/common.py nbfc-gui/fs_sensors.py nbfc-gui/nbfc_client.py nbfc-gui/qt.py
62-
(cd ./nbfc-gui; python3 ./include_files.py qt.py > nbfc-qt.py)
63-
chmod +x ./nbfc-gui/nbfc-qt.py
64-
6560
# Documentation ###############################################################
6661
doc/ec_probe.1: doc/ec_probe.1.in
6762
$(REPLACE_VARS) < $< > $@
@@ -166,7 +161,6 @@ uninstall:
166161
rm -f $(DESTDIR)$(bindir)/nbfc_config
167162
rm -f $(DESTDIR)$(bindir)/nbfc_service
168163
rm -f $(DESTDIR)$(bindir)/ec_probe
169-
rm -f $(DESTDIR)$(bindir)/nbfc-qt
170164

171165
# /usr/local/lib/systemd/system
172166
rm -f $(DESTDIR)$(sysddir)/nbfc_service.service

‎Makefile.in

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ override CPPFLAGS += \
3131
-DRUNSTATEDIR=\"$(runstatedir)\" \
3232
-DVERSION=\"$(version)\"
3333

34-
CORE = src/nbfc_service src/nbfc src/ec_probe src/test_model_config nbfc-gui/nbfc-qt.py
34+
CORE = src/nbfc_service src/nbfc src/ec_probe src/test_model_config
3535
DOC = doc/ec_probe.1 doc/nbfc.1 doc/nbfc_service.1 doc/nbfc_service.json.5
3636
SYSTEMD = etc/systemd/system/nbfc_service.service
3737
OPEN_RC = etc/init.d/nbfc_service.openrc
@@ -46,7 +46,6 @@ install-core: $(CORE)
4646
install -Dm 755 src/nbfc_service $(DESTDIR)$(bindir)/nbfc_service
4747
install -Dm 755 src/ec_probe $(DESTDIR)$(bindir)/ec_probe
4848
install -Dm 755 src/nbfc $(DESTDIR)$(bindir)/nbfc
49-
install -Dm 755 nbfc-gui/nbfc-qt.py $(DESTDIR)$(bindir)/nbfc-qt
5049

5150
REPLACE_VARS = sed \
5251
-e 's|@BINDIR@|$(bindir)|g' \
@@ -55,10 +54,6 @@ REPLACE_VARS = sed \
5554
-e 's|@RUNSTATEDIR@|$(runstatedir)|g' \
5655
-e 's|@VERSION@|$(version)|g'
5756

58-
nbfc-gui/nbfc-qt.py: nbfc-gui/about.py nbfc-gui/common.py nbfc-gui/fs_sensors.py nbfc-gui/nbfc_client.py nbfc-gui/qt.py
59-
(cd ./nbfc-gui; python3 ./include_files.py qt.py > nbfc-qt.py)
60-
chmod +x ./nbfc-gui/nbfc-qt.py
61-
6257
# Documentation ###############################################################
6358
doc/ec_probe.1: doc/ec_probe.1.in
6459
$(REPLACE_VARS) < $< > $@
@@ -163,7 +158,6 @@ uninstall:
163158
rm -f $(DESTDIR)$(bindir)/nbfc_config
164159
rm -f $(DESTDIR)$(bindir)/nbfc_service
165160
rm -f $(DESTDIR)$(bindir)/ec_probe
166-
rm -f $(DESTDIR)$(bindir)/nbfc-qt
167161

168162
# /usr/local/lib/systemd/system
169163
rm -f $(DESTDIR)$(sysddir)/nbfc_service.service

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ Comparison of NBFC C# and NBFC Linux
4040

4141
The [service](doc/nbfc_service.1.md), the [client](doc/nbfc.1.md) and the [probing tool](doc/ec_probe.1.md) are written in C.
4242

43-
The GUI is written in Python and Qt5 (a GUI for GTK-3 will follow).
44-
4543
Installation
4644
------------
4745

@@ -74,7 +72,7 @@ Installation
7472
- Fedora - this will not build the current working directory, but downloads a source archive from chosen release on github and builds an installable rpm:
7573
- ensure, that podman is installed
7674
- docker should work also, but is currently not tested
77-
- edit [pkgbuilds/rpm/nbfc-linux.spec](./pkgbuilds/rpm/nbfc-linux.spec) and
75+
- edit [pkgbuilds/rpm/nbfc-linux.spec](./pkgbuilds/rpm/nbfc-linux.spec) and
7876
- set wanted Version (e.g. 0.3.12)
7977
- set wanted Releasenumber (e.g. 1%{?dist} or 2%{?dist})
8078
- `./pkgbuilds/rpm/buildNBFC-LINUX`
@@ -92,7 +90,9 @@ Installation
9290
Getting started with the GUI
9391
----------------------------
9492

95-
After installing NBFC-Linux you can configure it by running `sudo nbfc-qt`.
93+
A graphical user interface (GUI) is available as a separate project.
94+
95+
You can find it on GitHub: [nbfc-qt](https://github.com/nbfc-linux/nbfc-qt)
9696

9797
Getting started without the GUI
9898
-------------------------------

‎README.md.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Installation
7474
- Fedora - this will not build the current working directory, but downloads a source archive from chosen release on github and builds an installable rpm:
7575
- ensure, that podman is installed
7676
- docker should work also, but is currently not tested
77-
- edit [pkgbuilds/rpm/nbfc-linux.spec](./pkgbuilds/rpm/nbfc-linux.spec) and
77+
- edit [pkgbuilds/rpm/nbfc-linux.spec](./pkgbuilds/rpm/nbfc-linux.spec) and
7878
- set wanted Version (e.g. %TAG%)
7979
- set wanted Releasenumber (e.g. 1%{?dist} or 2%{?dist})
8080
- `./pkgbuilds/rpm/buildNBFC-LINUX`
@@ -92,7 +92,9 @@ Installation
9292
Getting started with the GUI
9393
----------------------------
9494

95-
After installing NBFC-Linux you can configure it by running `sudo nbfc-qt`.
95+
A graphical user interface (GUI) is available as a separate project.
96+
97+
You can find it on GitHub: [nbfc-qt](https://github.com/nbfc-linux/nbfc-qt)
9698

9799
Getting started without the GUI
98100
-------------------------------

‎configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([nbfc-linux], [0.3.13], [braph93@gmx.de])
1+
AC_INIT([nbfc-linux], [0.3.14], [braph93@gmx.de])
22

33
# Checks for programs.
44
AC_PROG_CC

‎nbfc-gui/about.py

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎nbfc-gui/common.py

Lines changed: 0 additions & 107 deletions
This file was deleted.

‎nbfc-gui/fs_sensors.py

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)