Merge pull request #51 from ppvan/dev

Small bundle size
ppvan · Aug 20, 2023 · 0940e13 · 0940e13
2 parents 0e4acf5 + 357a202
commit 0940e13
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .flatpak-builder
 builddir
 build
+export
 *~
 /subprojects/blueprint-compiler
diff --git a/me.ppvan.psequel-debug.json b/me.ppvan.psequel-debug.json
@@ -57,6 +57,12 @@
                 },
                 {
                     "name": "postgresql-libs",
+                    "buildsystem": "simple",
+                    "build-commands": [
+                        "./configure --prefix=/app --with-ssl=openssl",
+                        "make -C src/include install",
+                        "make -C src/interfaces/libpq install"
+                    ],
                     "sources": [
                         {
                             "type": "archive",

diff --git a/me.ppvan.psequel.json b/me.ppvan.psequel.json
@@ -38,7 +38,7 @@
                 {
                     "type": "git",
                     "url": "https://github.com/ppvan/psequel",
-                    "commit": "0e221b0ca0c10b367a5f2b256db76bf2c15b0c04"
+                    "commit": "33a0704cbbc7ab7ef8483404a4578319c001b1f9"
                 }
             ],
             "modules": [
@@ -58,6 +58,12 @@
                 },
                 {
                     "name": "postgresql-libs",
+                    "buildsystem": "simple",
+                    "build-commands": [
+                        "./configure --prefix=/app --with-ssl=openssl",
+                        "make -C src/include install",
+                        "make -C src/interfaces/libpq install"
+                    ],
                     "sources": [
                         {
                             "type": "archive",

diff --git a/src/ui/schema/QueryResult.vala b/src/ui/schema/QueryResult.vala
@@ -99,14 +99,17 @@ namespace Psequel {
                 var factory = new Gtk.SignalListItemFactory ();
                 factory.set_data<int> ("index", i);
 
-                factory.setup.connect ((_fact, _item) => {
+                factory.setup.connect ((_fact, obj) => {
+
+                    var _item = (Gtk.ListItem) obj;
                     var label = new Gtk.Label (null);
                     label.halign = Gtk.Align.START;
                     label.margin_start = 8;
                     _item.child = label;
                 });
 
-                factory.bind.connect ((_fact, _item) => {
+                factory.bind.connect ((_fact, obj) => {
+                    var _item = (Gtk.ListItem) obj;
                     var row = _item.item as Relation.Row;
                     var label = _item.child as Gtk.Label;
                     int index = _fact.get_data<int> ("index");

diff --git a/src/ui/schema/TableColumnInfo.vala b/src/ui/schema/TableColumnInfo.vala
@@ -22,12 +22,15 @@ namespace Psequel {
 
         private void setup_name_col () {
             var factory = new Gtk.SignalListItemFactory ();
-            factory.setup.connect ((listitem) => {
+            factory.setup.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
+
                 var label = new Gtk.Label (null);
                 label.halign = Gtk.Align.START;
                 listitem.child = label;
             });
-            factory.bind.connect ((listitem) => {
+            factory.bind.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var item = listitem.item as Column;
                 var label = listitem.child as Gtk.Label;
                 label.label = item.name;
@@ -39,13 +42,15 @@ namespace Psequel {
 
         private void setup_datatype_col () {
             var factory = new Gtk.SignalListItemFactory ();
-            factory.setup.connect ((listitem) => {
+            factory.setup.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var label = new Gtk.Label (null);
                 label.halign = Gtk.Align.START;
 
                 listitem.child = label;
             });
-            factory.bind.connect ((listitem) => {
+            factory.bind.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var item = listitem.item as Column;
                 var label = listitem.child as Gtk.Label;
                 label.label = item.column_type;
@@ -57,11 +62,13 @@ namespace Psequel {
 
         private void setup_nullable_col () {
             var factory = new Gtk.SignalListItemFactory ();
-            factory.setup.connect ((listitem) => {
+            factory.setup.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var label = new Gtk.Label (null);
                 listitem.child = label;
             });
-            factory.bind.connect ((listitem) => {
+            factory.bind.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var item = listitem.item as Column;
                 var label = listitem.child as Gtk.Label;
                 label.label = item.nullable ? "YES" : "NO";
@@ -74,14 +81,16 @@ namespace Psequel {
 
         private void setup_default_col () {
             var factory = new Gtk.SignalListItemFactory ();
-            factory.setup.connect ((listitem) => {
+            factory.setup.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var label = new Gtk.Label (null);
                 label.halign = Gtk.Align.END;
                 label.margin_end = 4;
                 label.margin_start = 4;
                 listitem.child = label;
             });
-            factory.bind.connect ((listitem) => {
+            factory.bind.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var item = listitem.item as Column;
                 var label = listitem.child as Gtk.Label;
                 label.label = item.default_val;

diff --git a/src/ui/schema/TableForeignKeyInfo.vala b/src/ui/schema/TableForeignKeyInfo.vala
@@ -25,12 +25,14 @@ namespace Psequel {
 
         private void setup_name_col () {
             var factory = new Gtk.SignalListItemFactory ();
-            factory.setup.connect ((listitem) => {
+            factory.setup.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var label = new Gtk.Label (null);
                 label.halign = Gtk.Align.START;
                 listitem.child = label;
             });
-            factory.bind.connect ((listitem) => {
+            factory.bind.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var item = listitem.item as ForeignKey;
                 var label = listitem.child as Gtk.Label;
                 label.label = item.name;
@@ -42,12 +44,14 @@ namespace Psequel {
 
         private void setup_table_columns_col () {
             var factory = new Gtk.SignalListItemFactory ();
-            factory.setup.connect ((listitem) => {
+            factory.setup.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var label = new Gtk.Label (null);
                 label.halign = Gtk.Align.START;
                 listitem.child = label;
             });
-            factory.bind.connect ((listitem) => {
+            factory.bind.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var item = listitem.item as ForeignKey;
                 var label = listitem.child as Gtk.Label;
                 label.label = item.columns;
@@ -59,12 +63,14 @@ namespace Psequel {
 
         private void setup_fk_tbname_col () {
             var factory = new Gtk.SignalListItemFactory ();
-            factory.setup.connect ((listitem) => {
+            factory.setup.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var label = new Gtk.Label (null);
                 label.halign = Gtk.Align.START;
                 listitem.child = label;
             });
-            factory.bind.connect ((listitem) => {
+            factory.bind.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var item = listitem.item as ForeignKey;
                 var label = listitem.child as Gtk.Label;
                 label.label = item.fk_table;
@@ -76,12 +82,14 @@ namespace Psequel {
 
         private void setup_fk_table_columns_col () {
             var factory = new Gtk.SignalListItemFactory ();
-            factory.setup.connect ((listitem) => {
+            factory.setup.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var label = new Gtk.Label (null);
                 label.halign = Gtk.Align.START;
                 listitem.child = label;
             });
-            factory.bind.connect ((listitem) => {
+            factory.bind.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var item = listitem.item as ForeignKey;
                 var label = listitem.child as Gtk.Label;
                 label.label = item.fk_columns;
@@ -93,12 +101,14 @@ namespace Psequel {
 
         private void setup_on_update_col () {
             var factory = new Gtk.SignalListItemFactory ();
-            factory.setup.connect ((listitem) => {
+            factory.setup.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var label = new Gtk.Label (null);
                 label.halign = Gtk.Align.CENTER;
                 listitem.child = label;
             });
-            factory.bind.connect ((listitem) => {
+            factory.bind.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var item = listitem.item as ForeignKey;
                 var label = listitem.child as Gtk.Label;
                 label.label = item.on_update.to_string ();
@@ -110,12 +120,14 @@ namespace Psequel {
 
         private void setup_fk_on_delete_col () {
             var factory = new Gtk.SignalListItemFactory ();
-            factory.setup.connect ((listitem) => {
+            factory.setup.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var label = new Gtk.Label (null);
                 label.halign = Gtk.Align.CENTER;
                 listitem.child = label;
             });
-            factory.bind.connect ((listitem) => {
+            factory.bind.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var item = listitem.item as ForeignKey;
                 var label = listitem.child as Gtk.Label;
                 label.label = item.on_delete.to_string ();

diff --git a/src/ui/schema/TableIndexInfo.vala b/src/ui/schema/TableIndexInfo.vala
@@ -24,12 +24,14 @@ namespace Psequel {
 
         private void setup_name_col () {
             var factory = new Gtk.SignalListItemFactory ();
-            factory.setup.connect ((listitem) => {
+            factory.setup.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var label = new Gtk.Label (null);
                 label.halign = Gtk.Align.START;
                 listitem.child = label;
             });
-            factory.bind.connect ((listitem) => {
+            factory.bind.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var item = listitem.item as Index;
                 var label = listitem.child as Gtk.Label;
                 label.label = item.name;
@@ -41,13 +43,15 @@ namespace Psequel {
 
         private void setup_indextype_col () {
             var factory = new Gtk.SignalListItemFactory ();
-            factory.setup.connect ((listitem) => {
+            factory.setup.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var label = new Gtk.Label (null);
                 label.halign = Gtk.Align.CENTER;
 
                 listitem.child = label;
             });
-            factory.bind.connect ((listitem) => {
+            factory.bind.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var item = listitem.item as Index;
                 var label = listitem.child as Gtk.Label;
                 label.label = item.index_type.to_string ();
@@ -59,11 +63,13 @@ namespace Psequel {
 
         private void setup_unique_col () {
             var factory = new Gtk.SignalListItemFactory ();
-            factory.setup.connect ((listitem) => {
+            factory.setup.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var label = new Gtk.Label (null);
                 listitem.child = label;
             });
-            factory.bind.connect ((listitem) => {
+            factory.bind.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var item = listitem.item as Index;
                 var label = listitem.child as Gtk.Label;
                 label.label = item.unique ? "YES" : "NO";
@@ -76,14 +82,16 @@ namespace Psequel {
 
         private void setup_indexcolumns_col () {
             var factory = new Gtk.SignalListItemFactory ();
-            factory.setup.connect ((listitem) => {
+            factory.setup.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var label = new Gtk.Label (null);
                 label.halign = Gtk.Align.START;
                 label.margin_end = 4;
                 label.margin_start = 4;
                 listitem.child = label;
             });
-            factory.bind.connect ((listitem) => {
+            factory.bind.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var item = listitem.item as Index;
                 var label = listitem.child as Gtk.Label;
                 label.label = item.columns;
@@ -95,14 +103,16 @@ namespace Psequel {
 
         private void setup_indexsize_col () {
             var factory = new Gtk.SignalListItemFactory ();
-            factory.setup.connect ((listitem) => {
+            factory.setup.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var label = new Gtk.Label (null);
                 label.halign = Gtk.Align.END;
                 label.margin_end = 4;
                 label.margin_start = 4;
                 listitem.child = label;
             });
-            factory.bind.connect ((listitem) => {
+            factory.bind.connect ((obj) => {
+                var listitem = obj as Gtk.ListItem;
                 var item = listitem.item as Index;
                 var label = listitem.child as Gtk.Label;
                 label.label = item.size;