diff --git a/Makefile b/Makefile
index 8a9f984..e21be91 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,11 @@
NAME=ginput
CC=gcc
-CAMBALACHE=cambalache
CFLAGS=$(shell pkg-config --cflags gtk4 libadwaita-1 libusb-1.0) -O3 -I src
LDFLAGS=$(shell pkg-config --libs gtk4 libadwaita-1 libusb-1.0)
BUILD_DIR=build
-CMB := $(wildcard ui/*.cmb)
-C_FILES := $(shell find $(src) -name '*.c')
+UI := $(shell find ui/ -name '*.ui')
+C_FILES := $(shell find src/ -name '*.c')
all: resources $(BUILD_DIR)/$(NAME)
@@ -20,16 +19,11 @@ $(BUILD_DIR)/$(NAME): $(BUILD_DIR)/resource.c $(C_FILES) | $(BUILD_DIR)
$(BUILD_DIR):
mkdir -p $(BUILD_DIR)
-# UI : Cambalache contains all of the UI files, just compile them all
-$(BUILD_DIR)/%.ui: ui/$(NAME).cmb | $(BUILD_DIR)
- $(CAMBALACHE) -E $^
- mv ui/*.ui $(BUILD_DIR)/
-
# Resources
-$(BUILD_DIR)/resource.c: ui/ginput.gresource.xml ui/style.css $(BUILD_DIR)/main-window.ui
+$(BUILD_DIR)/resource.c: ui/ginput.gresource.xml ui/style.css ui
cp ui/style.css $(BUILD_DIR)/
- cp ui/ginput.gresource.xml $(BUILD_DIR)/
- cd $(BUILD_DIR) && glib-compile-resources --generate-source --target=resource.c ginput.gresource.xml
+ cd ui && glib-compile-resources --generate-source --target=resource.c ginput.gresource.xml
+ mv ui/resource.c $(BUILD_DIR)/
$(BUILD_DIR)/glib-2.0/schemas/gschemas.compiled: v.ginput.gschema.xml | $(BUILD_DIR)
mkdir -p $(BUILD_DIR)/glib-2.0/schemas
@@ -38,7 +32,6 @@ $(BUILD_DIR)/glib-2.0/schemas/gschemas.compiled: v.ginput.gschema.xml | $(BUILD_
# Phony targets
.PHONY: clean
clean:
- rm -f ui/*.ui # Remove compiled UI files that might be left over
rm -rf $(BUILD_DIR)
.PHONY: run
diff --git a/ui/ginput.cmb b/ui/ginput.cmb
deleted file mode 100644
index 10b7fdf..0000000
--- a/ui/ginput.cmb
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
- (1,1,"gkeyboards.ui","main-window.ui",None,None,None,None,None,None," <menu id=\"primary_menu\">\n <section>\n <item>\n <attribute name=\"label\" translatable=\"yes\">About</attribute>\n <attribute name=\"action\">app.about</attribute>\n </item>\n </section>\n </menu>\n"),
- (2,1,None,"panel.ui",None,None,None,None,None,None,None),
- (3,1,None,"panel-empty.ui",None,None,None,None,None,None,""),
- (4,1,None,"panel-mouse.ui",None,None,None,None,None,None,None)
-
-
-
- (1,1,"GtkWindow","default-height","980",None,None,None,None,None,None,None,None,None),
- (1,1,"GtkWindow","default-width","640",None,None,None,None,None,None,None,None,None),
- (1,3,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
- (1,4,"AdwHeaderBar","show-end-title-buttons","False",None,None,None,None,None,None,None,None,None),
- (1,4,"AdwHeaderBar","title-widget",None,None,None,None,None,5,None,None,None,None),
- (1,5,"AdwWindowTitle","title","Input devices",None,None,None,None,None,None,None,None,None),
- (1,6,"GtkMenuButton","icon-name","open-menu-symbolic",None,None,None,None,None,None,None,None,None),
- (1,6,"GtkMenuButton","primary","True",None,None,None,None,None,None,None,None,None),
- (1,7,"AdwLeafletPage","child",None,None,None,None,None,8,None,None,None,None),
- (1,7,"AdwLeafletPage","navigatable","False",None,None,None,None,None,None,None,None,None),
- (1,8,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
- (1,9,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
- (1,9,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
- (1,9,"GtkWidget","vexpand","True",None,None,None,None,None,None,None,None,None),
- (1,10,"GtkStack","transition-type","crossfade",None,None,None,None,None,None,None,None,None),
- (1,10,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
- (1,10,"GtkWidget","vexpand","True",None,None,None,None,None,None,None,None,None),
- (1,10,"GtkWidget","width-request","360",None,None,None,None,None,None,None,None,None),
- (1,11,"GtkScrolledWindow","child",None,None,None,None,None,12,None,None,None,None),
- (1,11,"GtkScrolledWindow","hscrollbar-policy","never",None,None,None,None,None,None,None,None,None),
- (1,11,"GtkWidget","vexpand","True",None,None,None,None,None,None,None,None,None),
- (1,11,"GtkWidget","width-request","200",None,None,None,None,None,None,None,None,None),
- (2,11,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
- (2,11,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
- (2,11,"GtkWidget","vexpand","True",None,None,None,None,None,None,None,None,None),
- (2,12,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
- (2,12,"GtkWidget","vexpand","True",None,None,None,None,None,None,None,None,None),
- (2,13,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
- (2,15,"AdwHeaderBar","show-start-title-buttons","False",None,None,None,None,None,None,None,None,None),
- (2,15,"AdwHeaderBar","title-widget",None,None,None,None,None,16,None,None,None,None),
- (3,2,"GtkLabel","justify","center",None,None,None,None,None,None,None,None,None),
- (3,2,"GtkLabel","label","There is nothing here...\nPerhaps you don't have the needed drivers installed and active ?",None,None,None,None,None,None,None,None,None),
- (4,5,"GtkBox","spacing","10",None,None,None,None,None,None,None,None,None),
- (4,5,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
- (4,5,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
- (4,6,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
- (4,6,"GtkWidget","height-request","250",None,None,None,None,None,None,None,None,None),
- (4,6,"GtkWidget","margin-top","30",None,None,None,None,None,None,None,None,None),
- (4,6,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
- (4,6,"GtkWidget","width-request","300",None,None,None,None,None,None,None,None,None),
- (4,7,"GtkLabel","justify","center",None,None,None,None,None,None,None,None,None),
- (4,7,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None)
-
-
- (1,6,"GtkWidget",1,1,None,None,None,None,None,None),
- (1,10,"GtkWidget",1,1,None,None,None,None,None,None),
- (1,10,"GtkWidget",2,2,None,1,None,None,None,None),
- (1,8,"GtkWidget",1,1,None,None,None,None,None,None),
- (1,8,"GtkWidget",2,2,None,1,None,None,None,None),
- (1,6,"GtkWidget",2,2,None,1,None,None,None,None),
- (4,1,"GtkWidget",2,2,None,1,None,None,None,None),
- (4,1,"GtkWidget",2,3,None,1,None,None,None,None),
- (4,1,"GtkWidget",2,4,None,1,None,None,None,None),
- (4,1,"GtkWidget",2,5,None,1,None,None,None,None),
- (4,1,"GtkWidget",2,6,None,1,None,None,None,None),
- (4,6,"GtkWidget",1,1,None,None,None,None,None,None),
- (4,7,"GtkWidget",1,1,None,None,None,None,None,None),
- (4,7,"GtkWidget",2,2,None,1,None,None,None,None)
-
-
- (1,10,"GtkWidget",2,2,"name","background"),
- (1,8,"GtkWidget",2,2,"name","sidebar"),
- (1,6,"GtkWidget",2,2,"name","image-button"),
- (4,7,"GtkWidget",2,2,"name","heading")
-
-
diff --git a/ui/main-window.ui b/ui/main-window.ui
new file mode 100644
index 0000000..ac47b39
--- /dev/null
+++ b/ui/main-window.ui
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+ 980
+ 640
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ui/panel-empty.ui b/ui/panel-empty.ui
new file mode 100644
index 0000000..6f42f67
--- /dev/null
+++ b/ui/panel-empty.ui
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+ center
+ There is nothing here...
+Perhaps you don't have the needed drivers installed and active ?
+
+
+
+
+
diff --git a/ui/panel-mouse.ui b/ui/panel-mouse.ui
new file mode 100644
index 0000000..7c2f592
--- /dev/null
+++ b/ui/panel-mouse.ui
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+ start
+ 10
+ start
+
+
+ start
+ vertical
+ 10
+
+
+ start
+ 250
+ 30
+ start
+ 300
+
+
+
+
+
+ center
+ center
+
+
+
+
+
+
+
+ start
+ 30
+ vertical
+ start
+
+
+ start
+ Basic settings
+ start
+
+
+
+
+
+ start
+ 30
+ start
+
+
+ start
+ center
+ DPI:
+ 10
+ center
+
+
+
+
+
+
+ 100.0
+ 26000.0
+ 200.0
+
+
+ 100.0
+ 10
+ 10
+ 200.0
+ 150
+
+
+
+
+ start
+ right
+ (Maximum: 26000)
+ 10
+ center
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ui/panel.ui b/ui/panel.ui
new file mode 100644
index 0000000..a009124
--- /dev/null
+++ b/ui/panel.ui
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+ True
+ vertical
+ True
+
+
+
+ True
+
+
+
+
+
+
+
+
+ True
+ True
+
+
+
+
+
+
+
\ No newline at end of file