vhaudiquet/ginput
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated to staging cambalache for issues

Browse Source
This commit is contained in:
Valentin Haudiquet
2023-07-26 22:10:53 +02:00
parent 342b5cf7dd
commit 21faddc72b
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -1,5 +1,6 @@
NAME=ginput NAME=ginput
CC=gcc CC=gcc
CAMBALACHE=cambalache
CFLAGS=$(shell pkg-config --cflags gtk4 libadwaita-1) -O3 -I src CFLAGS=$(shell pkg-config --cflags gtk4 libadwaita-1) -O3 -I src
LDFLAGS=$(shell pkg-config --libs gtk4 libadwaita-1) LDFLAGS=$(shell pkg-config --libs gtk4 libadwaita-1)
BUILD_DIR=build BUILD_DIR=build
@@ -21,7 +22,7 @@ $(BUILD_DIR):
# UI : Cambalache contains all of the UI files, just compile them all # UI : Cambalache contains all of the UI files, just compile them all
$(BUILD_DIR)/%.ui: ui/$(NAME).cmb | $(BUILD_DIR) $(BUILD_DIR)/%.ui: ui/$(NAME).cmb | $(BUILD_DIR)
cambalache -E $^ $(CAMBALACHE) -E $^
mv ui/*.ui $(BUILD_DIR)/ mv ui/*.ui $(BUILD_DIR)/
# Resources # Resources

21
ui/ginput.cmb
View File

@@ -1,10 +1,11 @@
<?xml version='1.0' encoding='UTF-8' standalone='no'?> <?xml version='1.0' encoding='UTF-8' standalone='no'?>
<!DOCTYPE cambalache-project SYSTEM "cambalache-project.dtd"> <!DOCTYPE cambalache-project SYSTEM "cambalache-project.dtd">
<cambalache-project version="0.12.0" target_tk="gtk-4.0"> <cambalache-project version="0.13.1" target_tk="gtk-4.0">
<ui> <ui>
(1,1,"gkeyboards.ui","main-window.ui",None,None,None,None,None,None," &lt;menu id=\"primary_menu\"&gt;\n &lt;section&gt;\n &lt;item&gt;\n &lt;attribute name=\"label\" translatable=\"yes\"&gt;About&lt;/attribute&gt;\n &lt;attribute name=\"action\"&gt;app.about&lt;/attribute&gt;\n &lt;/item&gt;\n &lt;/section&gt;\n &lt;/menu&gt;\n"), (1,1,"gkeyboards.ui","main-window.ui",None,None,None,None,None,None," &lt;menu id=\"primary_menu\"&gt;\n &lt;section&gt;\n &lt;item&gt;\n &lt;attribute name=\"label\" translatable=\"yes\"&gt;About&lt;/attribute&gt;\n &lt;attribute name=\"action\"&gt;app.about&lt;/attribute&gt;\n &lt;/item&gt;\n &lt;/section&gt;\n &lt;/menu&gt;\n"),
(2,1,None,"panel.ui",None,None,None,None,None,None,None), (2,1,None,"panel.ui",None,None,None,None,None,None,None),
(3,None,None,"panel-empty.ui",None,None,None,None,None,None,"&lt;template class=\"EmptyPanel\" parent=\"Panel\"&gt;\n &lt;child type=\"content\"&gt;\n &lt;object class=\"GtkLabel\"&gt;\n &lt;property name=\"label\"&gt;Nothing to see here&lt;/property&gt;\n &lt;/object&gt;\n &lt;/child&gt;\n&lt;/template&gt;") (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)
</ui> </ui>
<object> <object>
(1,1,"AdwApplicationWindow","MainWindow",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,12,"AdwBin","content_bin",11,None,None,None,1,None),
(2,13,"AdwBin","titlebar_bin",11,None,None,None,None,None), (2,13,"AdwBin","titlebar_bin",11,None,None,None,None,None),
(2,15,"AdwHeaderBar","titlebar",13,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,"&lt;child type=\"content\"&gt;\n &lt;object class=\"GtkLabel\"&gt;\n &lt;property name=\"label\"&gt;Nothing to see here&lt;/property&gt;\n &lt;/object&gt;\n&lt;/child&gt;\n"),
(4,1,"Panel","MousePanel",None,None,None,None,None,"")
</object> </object>
<object_property> <object_property>
(1,1,"GtkWindow","default-height","980",None,None,None,None,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) (2,15,"AdwHeaderBar","title-widget",None,None,None,None,None,16,None,None,None,None)
</object_property> </object_property>
<object_data> <object_data>
(1,6,"GtkWidget",1,1,None,None,None), (1,6,"GtkWidget",1,1,None,None,None,None,None,None),
(1,10,"GtkWidget",1,1,None,None,None), (1,10,"GtkWidget",1,1,None,None,None,None,None,None),
(1,10,"GtkWidget",2,2,None,1,None), (1,10,"GtkWidget",2,2,None,1,None,None,None,None),
(1,8,"GtkWidget",1,1,None,None,None), (1,8,"GtkWidget",1,1,None,None,None,None,None,None),
(1,8,"GtkWidget",2,2,None,1,None), (1,8,"GtkWidget",2,2,None,1,None,None,None,None),
(1,6,"GtkWidget",2,2,None,1,None) (1,6,"GtkWidget",2,2,None,1,None,None,None,None)
</object_data> </object_data>
<object_data_arg> <object_data_arg>
(1,10,"GtkWidget",2,2,"name","background"), (1,10,"GtkWidget",2,2,"name","background"),