From 2965799374b85a90b631b53661701e18045efdcd Mon Sep 17 00:00:00 2001 From: Christopher Davis Date: Sun, 2 Apr 2023 11:28:43 -0400 Subject: [PATCH] general: Remove help-related code Our help documents are unfinished, and we shouldn't ship unfinished documentation in our initial release. We can revert this commit when we're ready to write the documents properly. Part-of: --- data/gtk/window.ui | 4 ---- help/C/index.page | 19 ------------------- help/meson.build | 8 -------- meson.build | 1 - src/application.rs | 18 ------------------ 5 files changed, 50 deletions(-) delete mode 100644 help/C/index.page delete mode 100644 help/meson.build diff --git a/data/gtk/window.ui b/data/gtk/window.ui index 2e98095..f172102 100644 --- a/data/gtk/window.ui +++ b/data/gtk/window.ui @@ -42,10 +42,6 @@
- - _Help - app.help - _Keyboard Shortcuts win.show-help-overlay diff --git a/help/C/index.page b/help/C/index.page deleted file mode 100644 index fa1c4e3..0000000 --- a/help/C/index.page +++ /dev/null @@ -1,19 +0,0 @@ - - - - Help for Loupe. - <media its:translate="no" type="image" src="figures/org.gnome.eog-symbolic.svg"/> - Loupe - Loupe - - Christopher Davis - christopherdavis@gnome.org - 2020 - - - -Loupe - diff --git a/help/meson.build b/help/meson.build deleted file mode 100644 index 7d09c73..0000000 --- a/help/meson.build +++ /dev/null @@ -1,8 +0,0 @@ -sources = [ - 'index.page' -] - -gnome.yelp( - meson.project_name(), - sources: sources, -) diff --git a/meson.build b/meson.build index 6516bac..22b5da5 100644 --- a/meson.build +++ b/meson.build @@ -52,7 +52,6 @@ conf.set('localedir', iv_localedir) conf.set('pkgdatadir', iv_pkgdatadir) subdir('data') -subdir('help') subdir('src') subdir('po') diff --git a/src/application.rs b/src/application.rs index d4b1245..326ff43 100644 --- a/src/application.rs +++ b/src/application.rs @@ -22,8 +22,6 @@ use crate::i18n::*; use adw::prelude::*; use adw::subclass::prelude::*; -use glib::clone; -use gtk_macros::spawn; use crate::config; use crate::window::LpWindow; @@ -117,9 +115,6 @@ impl LpApplication { gio::ActionEntryBuilder::new("about") .activate(|app: &Self, _, _| app.show_about()) .build(), - gio::ActionEntryBuilder::new("help") - .activate(|app: &Self, _, _| app.show_help()) - .build(), gio::ActionEntryBuilder::new("quit") .activate(|app: &Self, _, _| app.quit()) .build(), @@ -133,7 +128,6 @@ impl LpApplication { self.add_action_entries(actions); - self.set_accels_for_action("app.help", &["F1"]); self.set_accels_for_action("app.quit", &["Q"]); self.set_accels_for_action("app.new-window", &["N"]); @@ -213,16 +207,4 @@ impl LpApplication { about.present(); } - - pub fn show_help(&self) { - spawn!(clone!(@weak self as app => async move { - let context = app - .active_window() - .map(|w| gtk::prelude::WidgetExt::display(&w).app_launch_context()); - - if let Err(e) = gio::AppInfo::launch_default_for_uri_future("help:loupe", context.as_ref()).await { - log::error!("Failed to launch help: {}", e.message()); - } - })); - } }