Add advanced create options and remove Ctrl+D/Ctrl+L shortcuts

Author: ranfdev

data/gtk/shortcuts-dialog.ui

@@ -16,12 +16,6 @@
             <property name="action-name">win.preferences</property>
           </object>
         </child>
-        <child>
-          <object class="AdwShortcutsItem">
-            <property name="title" translatable="yes" context="shortcut window">Command Log</property>
-            <property name="action-name">win.command-log</property>
-          </object>
-        </child>
         <child>
           <object class="AdwShortcutsItem">
             <property name="title" translatable="yes" context="shortcut window">Quit</property>
@@ -51,12 +45,6 @@
             <property name="action-name">win.upgrade-all</property>
           </object>
         </child>
-        <child>
-          <object class="AdwShortcutsItem">
-            <property name="title" translatable="yes" context="shortcut window">Clone Container</property>
-            <property name="action-name">win.clone-container</property>
-          </object>
-        </child>
         <child>
           <object class="AdwShortcutsItem">
             <property name="title" translatable="yes" context="shortcut window">Stop Container</property>

src/application.rs

@@ -88,9 +88,7 @@ mod imp {
             obj.set_accels_for_action("win.upgrade-all", &["<primary><shift>u"]);
             obj.set_accels_for_action("win.install-package", &["<primary>i"]);
             obj.set_accels_for_action("win.preferences", &["<primary>comma"]);
-            obj.set_accels_for_action("win.command-log", &["<primary>l"]);
             obj.set_accels_for_action("win.open-terminal", &["<primary>period"]);
-            obj.set_accels_for_action("win.clone-container", &["<primary>d"]);
             obj.set_accels_for_action("win.view-exportable-apps", &["<primary>e"]);
             obj.set_accels_for_action("win.delete-container", &["<primary>Delete"]);
             obj.set_accels_for_action("win.stop-container", &["<primary>s"]);

src/backends/distrobox/distrobox.rs

@@ -240,6 +240,8 @@ impl CreateArgName {
 pub struct CreateArgs {
     pub init: bool,
     pub nvidia: bool,
+    pub root: bool,
+    pub hostname: Option<String>,
     pub home_path: Option<String>,
     pub image: String,
     pub name: CreateArgName,
@@ -1014,11 +1016,17 @@ impl Distrobox {
         if !args.name.0.is_empty() {
             cmd.arg("--name").arg(args.name.0);
         }
+        if let Some(hostname) = args.hostname {
+            cmd.arg("--hostname").arg(hostname);
+        }
         if args.init {
             cmd.arg("--init")
                 .arg("--additional-packages")
                 .arg("systemd");
         }
+        if args.root {
+            cmd.arg("--root");
+        }
         if args.nvidia {
             cmd.arg("--nvidia");
         }
@@ -1355,6 +1363,8 @@ Categories=Utility;Security;";
             image: "docker.io/library/ubuntu:latest".into(),
             init: true,
             nvidia: true,
+            root: true,
+            hostname: Some("my-host".into()),
             home_path: Some("/home/me".into()),
             volumes: vec![
                 Volume::from_str("/mnt/sdb1:/mnt/sdb1")?,
@@ -1363,7 +1373,7 @@ Categories=Utility;Security;";
             ..Default::default()
         };
         smol::block_on(db.create(args))?;
-        let expected = "distrobox create --yes --image docker.io/library/ubuntu:latest --init --additional-packages systemd --nvidia --home /home/me --volume /mnt/sdb1:/mnt/sdb1 --volume /mnt/sdb4:/mnt/sdb4:ro";
+        let expected = "distrobox create --yes --image docker.io/library/ubuntu:latest --hostname my-host --init --additional-packages systemd --root --nvidia --home /home/me --volume /mnt/sdb1:/mnt/sdb1 --volume /mnt/sdb4:/mnt/sdb4:ro";
         assert_eq!(
             output_tracker.items()[0].command().unwrap().to_string(),
             expected

src/dialogs/create_distrobox_dialog.rs

@@ -52,6 +52,8 @@ mod imp {
         pub assemble_url: RefCell<Option<String>>,
         pub nvidia_row: adw::SwitchRow,
         pub init_row: adw::SwitchRow,
+        pub hostname_row: adw::EntryRow,
+        pub root_row: adw::SwitchRow,
         pub volume_rows: Rc<RefCell<Vec<adw::EntryRow>>>,
         pub scrolled_window: gtk::ScrolledWindow,
         #[property(get, set, nullable, construct_only)]
@@ -277,14 +279,24 @@ impl CreateDistroboxDialog {
 
         imp.init_row.set_title(&gettext("Init process"));
 
+        imp.hostname_row.set_title(&gettext("Hostname"));
+
+        imp.root_row.set_title(&gettext("Privileged"));
+
         preferences_group.add(&imp.name_row);
         preferences_group.add(&imp.image_row);
         preferences_group.add(&imp.home_row_expander);
-        preferences_group.add(&imp.nvidia_row);
-        preferences_group.add(&imp.init_row);
+
+        let advanced_group = adw::PreferencesGroup::new();
+        advanced_group.set_title(&gettext("Advanced"));
+        advanced_group.add(&imp.hostname_row);
+        advanced_group.add(&imp.root_row);
+        advanced_group.add(&imp.nvidia_row);
+        advanced_group.add(&imp.init_row);
 
         let volumes_group = self.build_volumes_group();
         content.append(&preferences_group);
+        content.append(&advanced_group);
         content.append(&volumes_group);
 
         let create_btn = self.build_create_btn();
@@ -927,13 +939,23 @@ impl CreateDistroboxDialog {
             .collect::<Result<Vec<_>, _>>()?;
 
         let name = CreateArgName::new(&imp.name_row.text())?;
+        let hostname = {
+            let value = imp.hostname_row.text().trim().to_string();
+            if value.is_empty() {
+                None
+            } else {
+                Some(value)
+            }
+        };
 
         let create_args = CreateArgs {
             name,
             image: image.to_string(),
             nvidia: imp.nvidia_row.is_active(),
             home_path: self.home_folder(),
             init: imp.init_row.is_active(),
+            hostname,
+            root: imp.root_row.is_active(),
             volumes,
         };