sync

Cargo.lock

@@ -513,7 +513,6 @@ dependencies = [
  "iana-time-zone",
  "js-sys",
  "num-traits",
- "serde",
  "wasm-bindgen",
  "windows-targets 0.52.0",
 ]
@@ -531,7 +530,6 @@ dependencies = [
  "crossbeam",
  "dirs",
  "epoxy",
- "etws_loader",
  "euclid",
  "femtovg",
  "flate2",
@@ -1075,24 +1073,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "etws_loader"
-version = "0.1.0"
-dependencies = [
- "abi_stable",
- "anyhow",
- "byteorder",
- "chrono",
- "flate2",
- "nom",
- "nom-derive",
- "num-traits",
- "radarg_plugin_interface",
- "serde",
- "serde_json",
- "thiserror",
-]
-
 [[package]]
 name = "euclid"
 version = "0.22.9"
@@ -2627,28 +2607,6 @@ dependencies = [
  "minimal-lexical",
 ]
 
-[[package]]
-name = "nom-derive"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ff943d68b88d0b87a6e0d58615e8fa07f9fd5a1319fa0a72efc1f62275c79a7"
-dependencies = [
- "nom",
- "nom-derive-impl",
- "rustversion",
-]
-
-[[package]]
-name = "nom-derive-impl"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0b9a93a84b0d3ec3e70e02d332dc33ac6dfac9cde63e17fcb77172dededa62"
-dependencies = [
- "proc-macro2 1.0.76",
- "quote 1.0.35",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "npyz"
 version = "0.8.1"
@@ -3699,12 +3657,6 @@ dependencies = [
  "base64",
 ]
 
-[[package]]
-name = "rustversion"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
-
 [[package]]
 name = "rustybuzz"
 version = "0.13.0"

Cargo.toml

@@ -82,10 +82,10 @@ path = "geo-macros"
 [dependencies.radarg_plugin_interface]
 path = "radarg_plugin_interface"
 
-[dependencies.etws_loader]
-path = "etws_loader"
+#[dependencies.etws_loader]
+#path = "etws_loader"
 
 [dependencies.adw]
 package = "libadwaita"
-version = "*"
+version = "0.6.0"
 features = ["v1_4"]

src/main.rs

@@ -22,15 +22,19 @@ mod pipeline;
 mod plugin_system;
 use components::app::AppModel;
 use once_cell::{sync::Lazy as SafeLazy, unsync::Lazy as UnsafeLazy};
+use relm4::RelmApp;
 use surfman::declare_surfman;
 use tracing::info;
 use tracing_subscriber;
+use crate::components::app::AppMsg;
+
 mod data_utils;
 mod map_tile;
 mod map_tile_utils;
 mod predefined;
 mod widgets;
 
+#[cfg(target_env = "msvc")]
 declare_surfman!();
 
 const APP_ID: &str = "org.tsuki.radar_g";
@@ -63,11 +67,17 @@ fn main() {
         });
     }
 
+
+
+    let app =  adw::Application::builder()
+        .application_id(APP_ID)
+        .build();
+    let relm:RelmApp<AppMsg> = relm4::RelmApp::from_app(app.clone());
     relm4_icons::initialize_icons();
     info!("Init plugin system");
     let pluginmanager = PluginManager::new();
     initialize_custom_css();
-    let relm = relm4::RelmApp::new(APP_ID);
+
     relm.run::<AppModel>(());
 }