Add web extension files to install directory

contrib/meson.build

@@ -0,0 +1,4 @@
+install_data(
+  'xyz.iinuwa.credentialsd.Credentials.xml',
+  install_dir: datadir / 'credentialsd',
+)

credentialsd-ui/data/resources/ui/window.ui

@@ -10,23 +10,11 @@
         <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
         <attribute name="action">win.show-help-overlay</attribute>
       </item>
-      <item>
-        <attribute name="label" translatable="yes">_About Credential Manager</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
     </section>
   </menu>
-  <template class="ExampleApplicationWindow" parent="GtkApplicationWindow">
+  <template class="CredentialsUiWindow" parent="GtkApplicationWindow">
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
-        <child type="end">
-          <object class="GtkMenuButton" id="appmenu_button">
-            <property name="icon-name">open-menu-symbolic</property>
-            <property name="menu-model">primary_menu</property>
-            <property name="primary">True</property>
-            <property name="tooltip-text" translatable="yes">Main Menu</property>
-          </object>
-        </child>
       </object>
     </child>
     <child>
@@ -37,7 +25,7 @@
             <binding name="label">
               <lookup name="title">
                 <lookup name="view-model">
-                  ExampleApplicationWindow
+                  CredentialsUiWindow
                 </lookup>
               </lookup>
             </binding>
@@ -67,7 +55,7 @@
                         <binding name="child">
                           <lookup name="devices">
                             <lookup name="view-model">
-                              ExampleApplicationWindow
+                              CredentialsUiWindow
                             </lookup>
                           </lookup>
                         </binding>
@@ -95,7 +83,7 @@
                         <binding name="label">
                           <lookup name="prompt">
                             <lookup name="view-model">
-                              ExampleApplicationWindow
+                              CredentialsUiWindow
                             </lookup>
                           </lookup>
                         </binding>
@@ -107,7 +95,7 @@
                         <binding name="visible">
                           <lookup name="usb_pin_entry_visible">
                             <lookup name="view-model">
-                              ExampleApplicationWindow
+                              CredentialsUiWindow
                             </lookup>
                           </lookup>
                         </binding>
@@ -131,7 +119,7 @@
                         <binding name="visible">
                           <lookup name="qr_spinner_visible">
                             <lookup name="view-model">
-                              ExampleApplicationWindow
+                              CredentialsUiWindow
                             </lookup>
                           </lookup>
                         </binding>
@@ -142,7 +130,7 @@
                         <binding name="visible">
                           <lookup name="qr_code_visible">
                             <lookup name="view-model">
-                              ExampleApplicationWindow
+                              CredentialsUiWindow
                             </lookup>
                           </lookup>
                         </binding>
@@ -153,7 +141,7 @@
                         <binding name="label">
                           <lookup name="prompt">
                             <lookup name="view-model">
-                              ExampleApplicationWindow
+                              CredentialsUiWindow
                             </lookup>
                           </lookup>
                         </binding>
@@ -182,7 +170,7 @@
                         <binding name="child">
                           <lookup name="credentials">
                             <lookup name="view-model">
-                              ExampleApplicationWindow
+                              CredentialsUiWindow
                             </lookup>
                           </lookup>
                         </binding>
@@ -222,7 +210,7 @@
                         <binding name="label">
                           <lookup name="prompt">
                             <lookup name="view-model">
-                              ExampleApplicationWindow
+                              CredentialsUiWindow
                             </lookup>
                           </lookup>
                         </binding>

credentialsd-ui/src/gui/view_model/gtk/application.rs

@@ -1,12 +1,11 @@
 use async_std::channel::{Receiver, Sender};
-use gettextrs::gettext;
 use tracing::{debug, info};
 
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::{gdk, gio, glib};
 
-use super::{ViewModel, window::ExampleApplicationWindow};
+use super::{ViewModel, window::CredentialsUiWindow};
 use crate::config::{APP_ID, PKGDATADIR, PROFILE, VERSION};
 use crate::gui::view_model::{ViewEvent, ViewUpdate};
 
@@ -21,25 +20,25 @@ mod imp {
     };
 
     #[derive(Debug, Default)]
-    pub struct ExampleApplication {
-        pub window: OnceCell<WeakRef<ExampleApplicationWindow>>,
+    pub struct CredentialsUi {
+        pub window: OnceCell<WeakRef<CredentialsUiWindow>>,
 
         pub(super) tx: RefCell<Option<Sender<ViewEvent>>>,
         pub(super) rx: RefCell<Option<Receiver<ViewUpdate>>>,
     }
 
     #[glib::object_subclass]
-    impl ObjectSubclass for ExampleApplication {
-        const NAME: &'static str = "ExampleApplication";
-        type Type = super::ExampleApplication;
+    impl ObjectSubclass for CredentialsUi {
+        const NAME: &'static str = "CredentialsUi";
+        type Type = super::CredentialsUi;
         type ParentType = gtk::Application;
     }
 
-    impl ObjectImpl for ExampleApplication {}
+    impl ObjectImpl for CredentialsUi {}
 
-    impl ApplicationImpl for ExampleApplication {
+    impl ApplicationImpl for CredentialsUi {
         fn activate(&self) {
-            debug!("GtkApplication<ExampleApplication>::activate");
+            debug!("GtkApplication<CredentialsUi>::activate");
             self.parent_activate();
             let app = self.obj();
 
@@ -53,7 +52,7 @@ mod imp {
             let rx = self.rx.take().expect("receiver to be initiated");
             let view_model = ViewModel::new(tx, rx);
             let vm2 = view_model.clone();
-            let window = ExampleApplicationWindow::new(&app, view_model);
+            let window = CredentialsUiWindow::new(&app, view_model);
             let window2 = window.clone();
             vm2.clone().connect_completed_notify(move |vm| {
                 if vm.completed() {
@@ -91,7 +90,7 @@ mod imp {
         }
 
         fn startup(&self) {
-            debug!("GtkApplication<ExampleApplication>::startup");
+            debug!("GtkApplication<CredentialsUi>::startup");
             self.parent_startup();
             let app = self.obj();
 
@@ -104,17 +103,17 @@ mod imp {
         }
     }
 
-    impl GtkApplicationImpl for ExampleApplication {}
+    impl GtkApplicationImpl for CredentialsUi {}
 }
 
 glib::wrapper! {
-    pub struct ExampleApplication(ObjectSubclass<imp::ExampleApplication>)
+    pub struct CredentialsUi(ObjectSubclass<imp::CredentialsUi>)
         @extends gio::Application, gtk::Application,
         @implements gio::ActionMap, gio::ActionGroup;
 }
 
-impl ExampleApplication {
-    fn main_window(&self) -> ExampleApplicationWindow {
+impl CredentialsUi {
+    fn main_window(&self) -> CredentialsUiWindow {
         self.imp().window.get().unwrap().upgrade().unwrap()
     }
 
@@ -128,13 +127,7 @@ impl ExampleApplication {
             })
             .build();
 
-        // About
-        let action_about = gio::ActionEntry::builder("about")
-            .activate(|app: &Self, _, _| {
-                app.show_about_dialog();
-            })
-            .build();
-        self.add_action_entries([action_quit, action_about]);
+        self.add_action_entries([action_quit]);
     }
 
     // Sets up keyboard shortcuts
@@ -155,21 +148,6 @@ impl ExampleApplication {
         }
     }
 
-    fn show_about_dialog(&self) {
-        let dialog = gtk::AboutDialog::builder()
-            .logo_icon_name(APP_ID)
-            .license_type(gtk::License::Lgpl30Only)
-            .website("https://github.com/linux-credentials/linux-webauthn-portal-api")
-            .version(VERSION)
-            .transient_for(&self.main_window())
-            .translator_credits(gettext("translator-credits"))
-            .modal(true)
-            .authors(vec!["Isaiah Inuwa <isaiah.inuwa@gmail.com>"])
-            .build();
-
-        dialog.present();
-    }
-
     pub fn run(&self) -> glib::ExitCode {
         info!("Credentials UI ({})", APP_ID);
         info!("Version: {} ({})", VERSION, PROFILE);

credentialsd-ui/src/gui/view_model/gtk/mod.rs

@@ -16,7 +16,7 @@ use qrcode::QrCode;
 use tracing::debug;
 
 use crate::config::{GETTEXT_PACKAGE, LOCALEDIR, RESOURCES_FILE};
-use application::ExampleApplication;
+use application::CredentialsUi;
 
 use super::Transport;
 use super::{Credential, Device};
@@ -365,7 +365,7 @@ pub fn start_gtk_app(
     let res = gio::Resource::load(RESOURCES_FILE).expect("Could not load gresource file");
     gio::resources_register(&res);
 
-    let app = ExampleApplication::new(tx_event, rx_update);
+    let app = CredentialsUi::new(tx_event, rx_update);
     app.run();
 }
 

credentialsd-ui/src/gui/view_model/gtk/window.rs

@@ -9,7 +9,7 @@ use gtk::{
     glib::{self, clone},
 };
 
-use super::application::ExampleApplication;
+use super::application::CredentialsUi;
 use super::{ViewModel, device::DeviceObject};
 use crate::config::{APP_ID, PROFILE};
 use crate::gui::view_model::Transport;
@@ -22,9 +22,9 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Properties, gtk::CompositeTemplate)]
-    #[properties(wrapper_type = super::ExampleApplicationWindow)]
+    #[properties(wrapper_type = super::CredentialsUiWindow)]
     #[template(resource = "/xyz/iinuwa/credentialsd/CredentialsUi/ui/window.ui")]
-    pub struct ExampleApplicationWindow {
+    pub struct CredentialsUiWindow {
         #[template_child]
         pub headerbar: TemplateChild<gtk::HeaderBar>,
         pub settings: gio::Settings,
@@ -42,7 +42,7 @@ mod imp {
     }
 
     #[gtk::template_callbacks]
-    impl ExampleApplicationWindow {
+    impl CredentialsUiWindow {
         #[template_callback]
         fn handle_usb_pin_entered(&self, entry: &gtk::PasswordEntry) {
             let view_model = &self.view_model.borrow();
@@ -58,7 +58,7 @@ mod imp {
         }
     }
 
-    impl Default for ExampleApplicationWindow {
+    impl Default for CredentialsUiWindow {
         fn default() -> Self {
             Self {
                 headerbar: TemplateChild::default(),
@@ -72,9 +72,9 @@ mod imp {
     }
 
     #[glib::object_subclass]
-    impl ObjectSubclass for ExampleApplicationWindow {
-        const NAME: &'static str = "ExampleApplicationWindow";
-        type Type = super::ExampleApplicationWindow;
+    impl ObjectSubclass for CredentialsUiWindow {
+        const NAME: &'static str = "CredentialsUiWindow";
+        type Type = super::CredentialsUiWindow;
         type ParentType = gtk::ApplicationWindow;
 
         fn class_init(klass: &mut Self::Class) {
@@ -89,7 +89,7 @@ mod imp {
     }
 
     #[glib::derived_properties]
-    impl ObjectImpl for ExampleApplicationWindow {
+    impl ObjectImpl for CredentialsUiWindow {
         fn constructed(&self) {
             self.parent_constructed();
             let obj = self.obj();
@@ -104,8 +104,8 @@ mod imp {
         }
     }
 
-    impl WidgetImpl for ExampleApplicationWindow {}
-    impl WindowImpl for ExampleApplicationWindow {
+    impl WidgetImpl for CredentialsUiWindow {}
+    impl WindowImpl for CredentialsUiWindow {
         // Save window state on delete event
         fn close_request(&self) -> glib::Propagation {
             if let Some(vm) = self.view_model.borrow().as_ref() {
@@ -128,19 +128,19 @@ mod imp {
         }
     }
 
-    impl ApplicationWindowImpl for ExampleApplicationWindow {}
+    impl ApplicationWindowImpl for CredentialsUiWindow {}
 }
 
 glib::wrapper! {
-    pub struct ExampleApplicationWindow(ObjectSubclass<imp::ExampleApplicationWindow>)
+    pub struct CredentialsUiWindow(ObjectSubclass<imp::CredentialsUiWindow>)
         @extends gtk::Widget, gtk::Window, gtk::ApplicationWindow,
         @implements gio::ActionMap, gio::ActionGroup, gtk::Root;
 
 }
 
-impl ExampleApplicationWindow {
-    pub fn new(app: &ExampleApplication, view_model: ViewModel) -> Self {
-        let window: ExampleApplicationWindow = glib::Object::builder()
+impl CredentialsUiWindow {
+    pub fn new(app: &CredentialsUi, view_model: ViewModel) -> Self {
+        let window: CredentialsUiWindow = glib::Object::builder()
             .property("application", app)
             .property("view-model", view_model)
             .build();

meson.build

@@ -10,6 +10,7 @@ version = meson.project_version()
 
 prefix = get_option('prefix')
 bindir = prefix / get_option('bindir')
+libdir = prefix / get_option('libdir')
 localedir = prefix / get_option('localedir')
 
 cargo_home = get_option('cargo_home')
@@ -29,4 +30,6 @@ subdir('credentialsd-common')
 subdir('credentialsd')
 subdir('credentialsd-ui')
 subdir('dbus')
-subdir('systemd')
+subdir('systemd')
+subdir('webext')
+subdir('contrib')

systemd/meson.build

@@ -24,4 +24,4 @@ configure_file(
   install_dir: systemd_user_service_dir,
   output: 'xyz.iinuwa.credentialsd.UiControl.service',
   configuration: systemd_config,
-)
+)