Merge pull request #82 from ppvan/dev

Using precomit and update some code formating

.pre-commit-config.yaml

@@ -0,0 +1,7 @@
+fail_fast: false
+repos:
+  - repo: https://github.com/ppvan/pre-commit-hooks
+    rev: 2ce5a35bba2a6031563657dd4421250d644dd914
+    hooks:
+      - id: uncrustify
+        args: [--no-diff, -l, VALA, -c, uncrustify.cfg, --replace, --no-backup]

Makefile

@@ -2,6 +2,11 @@
 
 debug:
 	rm -rf build/resources/gtk
+	meson configure -Dbuildtype=debug build
+	ninja -C build/ && G_MESSAGES_DEBUG=Psequel ./build/src/psequel
+
+release:
+	meson configure -Dbuildtype=release build
 	ninja -C build/ && G_MESSAGES_DEBUG=Psequel ./build/src/psequel
 
 clean:
@@ -13,7 +18,7 @@ test:
 flatpak:
 	flatpak-builder --install-deps-from=flathub build-aux/ me.ppvan.psequel.json --force-clean
 	flatpak build-export export build-aux
-	flatpak build-bundle export me.ppvan.psequel.flatpak me.ppvan.psequel --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
+	flatpak build-bundle export ./build-aux/me.ppvan.psequel.flatpak me.ppvan.psequel --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
 
 run:
 	G_MESSAGES_DEBUG=Psequel ./build/src/psequel

resources/gtk/datacell.blp

@@ -15,21 +15,21 @@ menu menu {
         }
     }
 
-    // section {
-    //     item {
-    //         label: _("_Edit Row");
-    //         action: "schema.edit";
-    //     }
-    // }
+    section {
+        item {
+            label: _("_Edit Row");
+            action: "schema.edit";
+        }
+    }
 }
 
 template $PsequelDataCell: Adw.Bin {
     Box {
-        Label label {
+        Inscription label {
             styles [
                 "table-cell"
             ]
-
+            text-overflow: ellipsize_end;
             halign: start;
         }
 

resources/gtk/edit-row.blp

@@ -0,0 +1,69 @@
+using Gtk 4.0;
+using Adw 1;
+
+template $PsequelEditRowDialog: Adw.Dialog {
+    follows-content-size: true;
+    title: _("Edit");
+    presentation-mode: floating;
+
+    styles [
+        "backup-dialog"
+    ]
+
+    child: Adw.ToolbarView {
+        [top]
+        Adw.HeaderBar {}
+
+        width-request: 640;
+
+        content: ScrolledWindow {
+            vexpand: true;
+            hexpand: true;
+            max-content-height: 960;
+            min-content-height: 400;
+            valign: center;
+            hscrollbar-policy: never;
+
+            Grid grid {
+                margin-bottom: 16;
+                margin-top: 16;
+                margin-start: 16;
+                margin-end: 16;
+                row-spacing: 10;
+                column-spacing: 8;
+                column-homogeneous: true;
+            }
+        };
+
+        [bottom]
+        Box {
+            orientation: vertical;
+            Separator {
+
+            }
+            Box {
+                halign: end;
+                margin-bottom: 16;
+                margin-top: 16;
+                margin-start: 16;
+                margin-end: 16;
+                spacing: 16;
+
+                Button {
+                    label: "Cancel";
+                    clicked => $cancel_update();
+                }
+
+                Button {
+                    label: "Update";
+                    clicked => $update_row();
+                    sensitive: bind template.has_changed;
+
+                    styles [
+                        "suggested-action"
+                    ]
+                }
+            }
+        }
+    };
+}

resources/meson.build

@@ -33,6 +33,7 @@ mark_ups = [
     'gtk/window.blp',
     'gtk/backup-dialog.blp',
     'gtk/restore-dialog.blp',
+    'gtk/edit-row.blp',
     'gtk/where-entry.blp'
 ]
 

script/formater.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/bash
 # git diff --name-only --diff-filter=ACM
 
-for i in $(git diff --name-only --diff-filter=ACM|grep .vala$);
+for i in $(git diff --name-only --staged --diff-filter=ACM|grep .vala$);
 do
-    uncrustify -l VALA  -c uncrustify.cfg --replace --no-backup $i;
+    uncrustify -l VALA -c uncrustify.cfg --replace --no-backup $i;
 done