Cargo.lock

@@ -1127,29 +1127,6 @@ version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
-[[package]]
-name = "javascriptcore6"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95a69260c40bbf52066f2c6fa520c00c1ec8ab8208636cf3070c0157c5221f8"
-dependencies = [
- "glib",
- "javascriptcore6-sys",
- "libc",
-]
-
-[[package]]
-name = "javascriptcore6-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc104f99c5adcd7ed53dd491121c111e05e3e8d40020d3519e98c346ca64186b"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
 [[package]]
 name = "js-sys"
 version = "0.3.68"
@@ -1735,7 +1712,6 @@ dependencies = [
  "tracker",
  "url",
  "validator",
- "webkit6",
 ]
 
 [[package]]
@@ -1923,32 +1899,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "soup3"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb6bbb0e56d089517432ca8aac0879e5f343b309783384a7fdbdd6d5232e681"
-dependencies = [
- "futures-channel",
- "gio",
- "glib",
- "libc",
- "soup3-sys",
-]
-
-[[package]]
-name = "soup3-sys"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9c6d7beef555a91c6129f5e71ecf4b6e9eac8b48914098d713b1537ebbf6917"
-dependencies = [
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -2484,39 +2434,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webkit6"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d82bda18116290a9effc1e0f8dbd00236807bf4a9b990b9484bad5ba852fc06"
-dependencies = [
- "gdk4",
- "gio",
- "glib",
- "gtk4",
- "javascriptcore6",
- "libc",
- "soup3",
- "webkit6-sys",
-]
-
-[[package]]
-name = "webkit6-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c459941f1b22750cbda435ede3f94ed8e8dd8c8608d324ecb0b9a8556b49abd"
-dependencies = [
- "gdk4-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "gtk4-sys",
- "javascriptcore6-sys",
- "libc",
- "soup3-sys",
- "system-deps",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "0.25.4"

Cargo.toml

@@ -32,11 +32,10 @@ rust-ini = "*"
 gitlab = "0.1609.0"
 url = "2.5.0"
 pulldown-cmark = "0.10.0"
-webkit6 = "0.3.0"
 
 
 [build-dependencies]
 glib-build-tools = "0.17.0"
 
 [patch.crates-io]
-libadwaita = { path = "./libadwaita-rs/libadwaita" }
+libadwaita = { path = "./libadwaita-rs/libadwaita" }

rsp.toml

@@ -1,3 +0,0 @@
-alg_list_repo = "http://192.168.1.70:6020/awesomeradaralgorithms/lts.git"
-source_list_loc = "/Users/tsuki/.cache/rsp/lts"
-alg_source = "http://192.168.1.70:6020"

src/components/new_project.rs

@@ -87,9 +87,8 @@ impl AsyncComponent for NewPageModel {
                 add=&adw::PreferencesGroup{
                    add=&gtk::Label {
                         set_halign: gtk::Align::Start,
-                        // #[track = "model.changed(NewPageModel::project_name())"]
+                        #[track = "model.changed(NewPageModel::project_name())"]
-                        // set_text: &model.project_name,
+                        set_text: &model.project_name,
-                        set_text: "Project",
                         add_css_class: "h1"
                     }
                 },

src/components/package_detail.rs

@@ -1,5 +1,4 @@
 use adw::prelude::*;
-use webkit6::{prelude::*, WebView};
 use gitlab::Project;
 use gtk::prelude::*;
 use relm4::{
@@ -67,12 +66,8 @@ impl SimpleComponent for PackageDetail {
                     set_label: &init.web_url,
                     set_halign: gtk::Align::Start,
                 }
-            },
-            gtk::Box{
-                WebView {
-                    load_uri: "https://www.rust-lang.org",
-                }
             }
+            ,
         }
     }
 

src/main.rs

@@ -1,8 +1,7 @@
 #![allow(unused)]
 #![allow(dead_code)]
 use gtk::{
-    gio::{self, ApplicationFlags},
+    gio::{self},
-    Application,
     prelude::SettingsExt,
 };
 
@@ -15,17 +14,14 @@ use crate::setting::Config;
 use components::AppModel;
 use once_cell::{sync::Lazy as SafeLazy, unsync::Lazy as UnsafeLazy};
 use std::sync::Mutex;
-use crate::components::AppMsg;
 
 static CONFIG: SafeLazy<Mutex<Config>> = SafeLazy::new(|| Mutex::new(Config::from_env().unwrap()));
 const APP_ID: &str = "org.tsuki.rsproject";
 
 fn main() {
     // Load GL pointers from epoxy (GL context management library used by GTK).
-    gtk::init();
+    let relm = relm4::RelmApp::new(APP_ID);
-    adw::init();
+
-    let application = Application::new(Some(APP_ID), ApplicationFlags::HANDLES_OPEN);
-    let relm = relm4::RelmApp::from_app(application);
     initialize_custom_css();
     relm.run::<AppModel>(());
 }

src/setting.rs

@@ -34,14 +34,10 @@ impl Config {
     }
 
     pub fn from_env() -> Result<Self, SettingError> {
-        if let Some(dir_path) =
+        if let Some(dir_path) = env::var("RSP_CONFIG")
-            env::var("RSP_CONFIG")
+            .ok()
-                .ok()
+            .map(|x| PathBuf::from(x))
-                .map(|x| PathBuf::from(x))
+            .or(dirs::config_dir())
-                .or(dirs::config_dir())
-            // std::env::current_dir().ok().or(
-            //
-            // )
         {
             let path = dir_path.join("rsp.toml");
             println!("{:?}", path);