consolidate main into application, add about dialog, add Build namespace, cleanup build files

Author: jaybaird

blueprints/main_window.blp

@@ -79,13 +79,13 @@ template $AppWindow : Window {
                   strings [
                     _("All"),
                     _("SSB"),
-                    _("FM"),
-                    _("AM"),
                     _("CW"),
                     _("FT8"),
                     _("FT4"),
-                    _("Data"),
-                    _("Phone")
+                    _("FM"),
+                    _("AM"),
+                    _("RTTY"),
+                    _("JT65"),
                   ]
                 };
               }
@@ -157,7 +157,6 @@ template $AppWindow : Window {
 
     ProgressBar refresh_progress {
       show-text: false;
-      height-request: 1;
       fraction: 0.5;
       styles ["osd"]
     }
@@ -173,11 +172,23 @@ template $AppWindow : Window {
 
 menu menu_app {
   section {
+    item {
+      label: _("Add Spot");
+        action: "app.add-spot";
+      }
+
+    item {
+      label: _("Refresh");
+      action: "app.refresh";
+    }
+
     item {
       label: _("Map");
       action: "app.open-map";
     }
+  }
 
+  section {
     item {
       label: _("Preferences");
       action: "app.preferences";

blueprints/preferences.blp

@@ -2,11 +2,22 @@ using Gtk 4.0;
 using Adw 1;
 
 /* Simple models for the combo rows */
-Gtk.StringList bands_model {
-  strings: ["160m","80m","60m","40m","30m","20m","17m","15m","12m","10m","6m","2m","70cm"];
+StringList bands_model {
+  strings ["All", "160m","80m","60m","40m","30m","20m","17m","15m","12m","10m","6m","2m","70cm"]
 }
-Gtk.StringList modes_model {
-  strings: ["SSB","CW","FT8","FM","AM","RTTY","JT65"];
+
+StringList modes_model {
+  strings [
+    _("All"),
+    _("SSB"),
+    _("CW"),
+    _("FT8"),
+    _("FT4"),
+    _("FM"),
+    _("AM"),
+    _("RTTY"),
+    _("JT65"),
+  ]
 }
 
 /* Radio connection models */
@@ -64,12 +75,12 @@ Adw.PreferencesDialog prefs_dialog {
 
       Adw.ComboRow row_default_band {
         title: _("Default Band");
-        model: bands_model;   // expression set in C
+        model: bands_model;
       }
 
       Adw.ComboRow row_default_mode {
         title: _("Default Mode");
-        model: modes_model;   // expression set in C
+        model: modes_model;
       }
     }
 

com.k0vcz.artemis.json

@@ -70,7 +70,10 @@
             "name" : "artemis",
             "builddir" : true,
             "buildsystem" : "meson",
-            "sources" : 
+            "config-opts":[
+                "-Dbuildtype=release"
+            ],
+            "sources" : [
                 {
                     "type" : "dir",
                     "path" : "."

data/artemis-vala.gresource.xml

@@ -12,6 +12,8 @@
     <file preprocess="xml-stripblanks">ui/park_log_dialog.ui</file>
 
     <file compressed="true" alias="style.css">../data/css/style.css</file>
+
+     <file preprocess="xml-stripblanks" alias="metainfo.xml">../data/com.k0vcz.artemis.metainfo.xml.in</file>
   </gresource>
 </gresources>
 

data/com.k0vcz.artemis.gschema.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-	<schema id="com.k0vcz.artemis" path="/com/k0vcz/artemis/">
+	<schema id="com.k0vcz.Artemis" path="/com/k0vcz/Artemis/" gettext-domain="com.k0vcz.Artemis">
         <key name="callsign" type="s">
         <default>""</default>
         <summary>User callsign</summary>
@@ -13,8 +13,6 @@
         <description>Your station location or QTH.</description>
         </key>
 
-
-
         <key name="spot-message" type="s">
         <default>""</default>
         <summary>Spot message</summary>
@@ -29,7 +27,7 @@
         </key>
 
         <key name="default-band" type="s">
-        <default>"20m"</default>
+        <default>"All"</default>
         <summary>Default band</summary>
         <description>The default frequency band (in meters).</description>
         <choices>
@@ -51,14 +49,15 @@
         </key>
 
         <key name="default-mode" type="s">
-        <default>"SSB"</default>
+        <default>"All"</default>
         <summary>Default mode</summary>
         <description>The default operating mode.</description>
         <choices>
             <choice value="All"/>
             <choice value="SSB"/>
             <choice value="CW"/>
             <choice value="FT8"/>
+            <choice value="FT4"/>
             <choice value="FM"/>
             <choice value="AM"/>
             <choice value="RTTY"/>

data/com.k0vcz.artemis.metainfo.xml.in

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-  <id>com.k0vcz.artemis</id>
+  <id>com.k0vcz.Artemis</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
 
-  <name>Artemis-vala</name>
-  <summary>Keep the summary shorter, between 10 and 35 characters</summary>
+  <name>Artemis</name>
+  <summary>A Parks on the Air Spotting Tool</summary>
   <description>
     <p>No description</p>
   </description>
 
   <developer id="tld.vendor">
-    <name>Developer name</name>
+    <name>Jay Baird (K0VCZ)</name>
   </developer>
 
   <!-- Required: Should be a link to the upstream homepage for the component -->

meson.build

@@ -1,7 +1,12 @@
-project('artemis', ['c', 'vala'],
-          version: '0.1.0',
-    meson_version: '>= 1.0.0',
-  default_options: ['werror=false', ],
+project(
+  'com.k0vcz.Artemis', 
+  ['c', 'vala'],
+  version: '0.1.0',
+  meson_version: '>= 1.0.0',
+  default_options: [
+    'warning_level=2',
+    'werror=false', 
+  ],
 )
 
 i18n = import('i18n')
@@ -12,14 +17,39 @@ prefix = get_option('prefix')
 data_dir = prefix / get_option('datadir')
 srcdir = meson.project_source_root() / 'src'
 
-config_h = configuration_data()
-config_h.set_quoted('PACKAGE_VERSION', meson.project_version ())
-config_h.set_quoted('GETTEXT_PACKAGE', 'artemis')
-config_h.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
-configure_file(output: 'config.h', configuration: config_h)
+# https://gitlab.gnome.org/GNOME/vala/-/issues/1413#note_1707480
+if meson.get_compiler ('c').get_id () == 'clang'
+  add_project_arguments('-Wno-incompatible-function-pointer-types', language: 'c')
+endif
+
+devel = get_option('debug')
+
+# Setup configuration file
+config = configuration_data()
+config.set('EXEC_NAME', meson.project_name())
+config.set('GETTEXT_PACKAGE', meson.project_name())
+config.set('BINDIR', join_paths(get_option('prefix'), get_option('bindir')))
+config.set('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
+config.set('DOMAIN', meson.project_name ())
+config.set('G_LOG_DOMAIN', 'Artemis')
+config.set('RESOURCES', '/' + '/'.join(meson.project_name().split('.')) + '/')
+config.set('VERSION', meson.project_version())
+config.set('PREFIX', get_option('prefix'))
+config.set('NAME', 'Artemis')
+config.set('WEBSITE', '')
+config.set('DONATE_WEBSITE', '')
+config.set('TRANSLATE_WEBSITE', '')
+config.set('PROFILE', devel ? 'development' : 'release')
 
-config_dep = valac.find_library ('config', dirs: srcdir)
-config_inc = include_directories('.')
+if devel
+  git = find_program('git')
+  if git.found()
+    branch = run_command('git', 'branch', '--show-current', check: true).stdout().strip()
+    revision = run_command('git', 'rev-parse', '--short', 'HEAD', check: true).stdout().strip()
+    version = '@0@-@1@'.format(branch, revision)
+    config.set('VERSION', version)
+  endif
+endif
 
 add_project_arguments('-DGETTEXT_PACKAGE="' + meson.project_name() + '"', language: 'c')
 
@@ -31,7 +61,6 @@ subdir('po')
 
 executable('artemis', artemis_vala_sources,
   dependencies: artemis_vala_deps,
-  include_directories: config_inc,
   vala_args: ['-g', '--save-temps', '--pkg=RadioControl', '--vapidir='+srcdir],
   link_with: [libradiocontrol],
   install: true,
@@ -42,17 +71,3 @@ gnome.post_install(
     gtk_update_icon_cache: true,
   update_desktop_database: true,
 )
-
-# Code formatting targets
-uncrustify = find_program('uncrustify', required: false)
-if uncrustify.found()
-  run_target('format',
-    command: [find_program('bash'), files('format.sh')],
-    depends: []
-  )
-
-  run_target('check-format',
-    command: [find_program('bash'), files('check-format.sh')],
-    depends: []
-  )
-endif