diff --git a/Makefile b/Makefile index 46c71ed..7505c6b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ NAME=ginput CC=gcc +CAMBALACHE=cambalache CFLAGS=$(shell pkg-config --cflags gtk4 libadwaita-1) -O3 -I src LDFLAGS=$(shell pkg-config --libs gtk4 libadwaita-1) BUILD_DIR=build @@ -21,7 +22,7 @@ $(BUILD_DIR): # UI : Cambalache contains all of the UI files, just compile them all $(BUILD_DIR)/%.ui: ui/$(NAME).cmb | $(BUILD_DIR) - cambalache -E $^ + $(CAMBALACHE) -E $^ mv ui/*.ui $(BUILD_DIR)/ # Resources diff --git a/ui/ginput.cmb b/ui/ginput.cmb index 45281c6..042eae8 100644 --- a/ui/ginput.cmb +++ b/ui/ginput.cmb @@ -1,10 +1,11 @@ - + (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,None,None,"panel-empty.ui",None,None,None,None,None,None,"<template class=\"EmptyPanel\" parent=\"Panel\">\n <child type=\"content\">\n <object class=\"GtkLabel\">\n <property name=\"label\">Nothing to see here</property>\n </object>\n </child>\n</template>") + (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,"AdwApplicationWindow","MainWindow",None,None,None,None,None,None), @@ -24,7 +25,9 @@ (2,12,"AdwBin","content_bin",11,None,None,None,1,None), (2,13,"AdwBin","titlebar_bin",11,None,None,None,None,None), (2,15,"AdwHeaderBar","titlebar",13,None,None,None,None,None), - (2,16,"AdwWindowTitle","title",15,None,None,None,None,None) + (2,16,"AdwWindowTitle","title",15,None,None,None,None,None), + (3,1,"Panel","EmptyPanel",None,None,None,None,None,"<child type=\"content\">\n <object class=\"GtkLabel\">\n <property name=\"label\">Nothing to see here</property>\n </object>\n</child>\n"), + (4,1,"Panel","MousePanel",None,None,None,None,None,"") (1,1,"GtkWindow","default-height","980",None,None,None,None,None,None,None,None,None), @@ -59,12 +62,12 @@ (2,15,"AdwHeaderBar","title-widget",None,None,None,None,None,16,None,None,None,None) - (1,6,"GtkWidget",1,1,None,None,None), - (1,10,"GtkWidget",1,1,None,None,None), - (1,10,"GtkWidget",2,2,None,1,None), - (1,8,"GtkWidget",1,1,None,None,None), - (1,8,"GtkWidget",2,2,None,1,None), - (1,6,"GtkWidget",2,2,None,1,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) (1,10,"GtkWidget",2,2,"name","background"),