Clean up and small UI improvements

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "(lldb) Launch",
+            "type": "lldb",
+            "request": "launch",
+            "program": "${workspaceFolder}/build/src/psequel",
+            "args": [],
+            "stopOnEntry": false,
+            "cwd": "${workspaceFolder}",
+            "env": {
+
+            },
+        }
+    ]
+}

Makefile

@@ -1,8 +1,14 @@
 # This is just a file for me to type command faster, not the build file.
 
 
-debug:
-	cd build; ninja && G_MESSAGES_DEBUG=Psequel ./src/psequel
+debug: clean
+	ninja -C build/ && G_MESSAGES_DEBUG=Psequel ./build/src/psequel
+
+clean:
+	rm -rf build/res
+
+test:
+	ninja -C build/ && ./build/test/psequel-test
 
 flatpak:
 	flatpak-builder _build/ me.ppvan.psequel-debug.json --force-clean

data/me.ppvan.psequel.desktop.in

@@ -4,5 +4,5 @@ Exec=psequel
 Icon=me.ppvan.psequel
 Terminal=false
 Type=Application
-Categories=GTK;
+Categories=Database;Development;GTK;
 StartupNotify=true

data/meson.build

@@ -12,18 +12,19 @@ if desktop_utils.found()
   test('Validate desktop file', desktop_utils, args: [desktop_file])
 endif
 
-appstream_file = i18n.merge_file(
+i18n.merge_file(
         input: 'me.ppvan.psequel.appdata.xml.in',
        output: 'me.ppvan.psequel.appdata.xml',
        po_dir: '../po',
       install: true,
   install_dir: join_paths(get_option('datadir'), 'appdata')
 )
 
-appstream_util = find_program('appstream-util', required: false)
-if appstream_util.found()
-  test('Validate appstream file', appstream_util, args: ['validate', appstream_file])
-endif
+# Disable redudant check.
+# appstream_util = find_program('appstream-util', required: false)
+# if appstream_util.found()
+#   test('Validate appstream file', appstream_util, args: ['validate', appstream_file])
+# endif
 
 
 install_data('me.ppvan.psequel.gschema.xml',

meson.build

@@ -1,27 +1,37 @@
-project('psequel', ['c', 'vala'],
-          version: '0.1.8',
-    meson_version: '>= 0.62.0',
-  default_options: [ 'warning_level=2', 'werror=false', ],
+project(
+    'psequel',
+    ['c', 'vala'],
+    version: '0.1.8',
+    meson_version: '>= 1.3.0',
+    default_options: [
+        'warning_level=2',
+        'werror=false',
+    ],
 )
 app_id = 'me.ppvan.psequel'
 
 
 i18n = import('i18n')
 gnome = import('gnome')
-cc = meson.get_compiler('c')
+# cc = meson.get_compiler('c')
 valac = meson.get_compiler('vala')
 
-vapi_dir = join_paths (meson.project_source_root(), 'src', 'vapi')
+
+# Pass custom vapi to compiler (for libpq)
+vapi_dir = join_paths(meson.project_source_root(), 'src', 'vapi')
 
 add_project_arguments(['--vapidir', vapi_dir], language: 'vala')
 
 subdir('data')
 subdir('res')
 subdir('src')
+subdir('test')
 subdir('po')
 
+# Using gnome module to do some task after the app is installed, like compile schema (settings data)
+# Update icon cache.
 gnome.post_install(
-     glib_compile_schemas: true,
+    glib_compile_schemas: true,
     gtk_update_icon_cache: true,
-  update_desktop_database: true,
+    update_desktop_database: true,
 )

meson.options

@@ -0,0 +1 @@
+option('with_query', type : 'boolean', value : false, description : 'Run real query test(need postgresql server setup)')