Renamed from "Bookmarks" to "Starred"

+ Renamed all variables from "bookmarks" to "starred", except for those in the user_places_xbel crate
+ Fixed glitch where List View headers would disappear early when shrinking the window into condensed view
+ Shrunk column widths to allow for more compact  view before switching to condensed

Author: MikhailValerie

i18n/en/cosmic_files.ftl

@@ -10,7 +10,7 @@ networks = Networks
 notification-in-progress = File operations are in progress
 trash = Trash
 recents = Recents
-bookmarks = Bookmarks
+starred = Starred
 undo = Undo
 today = Today
 
@@ -29,7 +29,7 @@ name = Name
 modified = Modified
 trashed-on = Trashed
 size = Size
-bookmarked = Bookmarked
+starred = Starred
 
 # Progress footer
 details = Details
@@ -280,22 +280,22 @@ removed-from-recents = Removed {$items} {$items ->
         [one] item
         *[other] items
     } from {recents}
-adding-to-bookmarks = Adding {$items} {$items ->
+adding-to-starred = Adding {$items} {$items ->
         [one] item
         *[other] items
-    } to {bookmarks}
-added-to-bookmarks = Added {$items} {$items ->
+    } to {starred}
+added-to-starred = Added {$items} {$items ->
         [one] item
         *[other] items
-    } to {bookmarks}
-removing-from-bookmarks = Removing {$items} {$items ->
+    } to {starred}
+removing-from-starred = Removing {$items} {$items ->
         [one] item
         *[other] items
-    } from {bookmarks}
-removed-from-bookmarks = Removed {$items} {$items ->
+    } from {starred}
+removed-from-starred = Removed {$items} {$items ->
         [one] item
         *[other] items
-    } from {bookmarks}
+    } from {starred}
 renaming = Renaming "{$from}" to "{$to}"
 renamed = Renamed "{$from}" to "{$to}"
 restoring = Restoring {$items} {$items ->
@@ -329,7 +329,7 @@ error = Error
 settings = Settings
 single-click = Single click to open
 show-recents = Recents folder in the sidebar
-show-bookmarks = Show bookmarks
+show-starred = Show starred
 
 ### Appearance
 appearance = Appearance
@@ -346,8 +346,8 @@ type-to-search-select = Selects the first matching file or folder
 
 # Context menu
 add-to-sidebar = Add to sidebar
-add-to-bookmarks = Add to bookmarks
-remove-from-bookmarks = Remove from bookmarks
+add-to-starred = Add to starred
+remove-from-starred = Remove from starred
 clear-recents-history = Clear recents history
 compress = Compress...
 copy-to = Copy to...

src/app.rs

@@ -167,10 +167,10 @@ pub struct Config {
     pub context_actions: Vec<ContextActionPreset>,
     pub thumb_cfg: ThumbCfg,
     pub favorites: Vec<Favorite>,
-    pub bookmarks: Vec<Favorite>,
+    pub starred: Vec<Favorite>,
     pub show_details: bool,
     pub show_recents: bool,
-    pub show_bookmarks: bool,
+    pub show_starred: bool,
     pub tab: TabConfig,
     pub type_to_search: TypeToSearch,
 }
@@ -213,7 +213,7 @@ impl Config {
             show_hidden: self.dialog.show_hidden,
             single_click: false,
             view: self.dialog.view,
-            show_bookmarks: self.show_bookmarks
+            show_starred: self.show_starred
         }
     }
 }
@@ -234,10 +234,10 @@ impl Default for Config {
                 Favorite::Pictures,
                 Favorite::Videos,
             ],
-            bookmarks: vec![],
+            starred: vec![],
             show_details: false,
             show_recents: true,
-            show_bookmarks: true,
+            show_starred: true,
             tab: TabConfig::default(),
             type_to_search: TypeToSearch::Recursive,
         }
@@ -338,8 +338,8 @@ pub struct TabConfig {
     pub single_click: bool,
     /// Selected view, grid or list
     pub view: View,
-    /// Show bookmarks icons
-    pub show_bookmarks: bool,
+    /// Show starred icons
+    pub show_starred: bool,
 }
 
 impl Default for TabConfig {
@@ -351,7 +351,7 @@ impl Default for TabConfig {
             show_hidden: false,
             single_click: false,
             view: View::List,
-            show_bookmarks: false
+            show_starred: false
         }
     }
 }

src/config.rs

@@ -780,8 +780,8 @@ impl App {
                     Some(SearchLocation::Path(path.clone()))
                 } else if self.tab.location.is_recents() {
                     Some(SearchLocation::Recents)
-                } else if self.tab.location.is_bookmarks() {
-                    Some(SearchLocation::Bookmarks)
+                } else if self.tab.location.is_starred() {
+                    Some(SearchLocation::Starred)
                 } else if self.tab.location.is_trash() {
                     Some(SearchLocation::Trash)
                 } else {
@@ -804,7 +804,7 @@ impl App {
                 Location::Search(search_location, ..) => match search_location {
                     SearchLocation::Path(path) => Some((Location::Path(path.clone()), false)),
                     SearchLocation::Recents => Some((Location::Recents, false)),
-                    SearchLocation::Bookmarks => Some((Location::Bookmarks, false)),
+                    SearchLocation::Starred => Some((Location::Starred, false)),
                     SearchLocation::Trash => Some((Location::Trash, false)),
                 },
                 _ => None,
@@ -890,11 +890,11 @@ impl App {
             });
         }
 
-        if self.flags.config.show_bookmarks {
+        if self.flags.config.show_starred {
             nav_model = nav_model.insert(|b| {
-                b.text(fl!("bookmarks"))
+                b.text(fl!("starred"))
                     .icon(widget::icon::from_name("starred-symbolic"))
-                    .data(Location::Bookmarks)
+                    .data(Location::Starred)
             });
         }
 
@@ -1856,7 +1856,7 @@ impl Application for App {
                                                             &app.key_binds,
                                                             &app.modifiers,
                                                             false,  // Paste not used in dialogs
-                                                            &false, // Show Bookmarks
+                                                            &false, // Show Starred
                                                             &app.flags.config.context_actions,
                                                         )
                                                         .map(Message::TabMessage)
@@ -2067,7 +2067,7 @@ impl Application for App {
                     &self.key_binds,
                     &self.modifiers,
                     false,  // Clipboard has content
-                    &false, // Show Bookmarks
+                    &false, // Show Starred
                     &[]
                 )
                 .map(Message::TabMessage),

src/dialog.rs

@@ -57,7 +57,7 @@ pub fn key_binds(mode: &tab::Mode) -> HashMap<KeyBind, Action> {
 
     // App-only keys
     if matches!(mode, tab::Mode::App) {
-        bind!([Ctrl], Key::Character("d".into()), AddToBookmarks);      // Taken over
+        bind!([Ctrl], Key::Character("d".into()), AddToStarred);      // Taken over
         bind!([Ctrl,Shift], Key::Character("d".into()), AddToSidebar);  // Moved
         bind!([Ctrl], Key::Named(Named::Enter), OpenInNewTab);
         bind!([Ctrl], Key::Character(",".into()), Settings);

src/key_bind.rs

@@ -165,11 +165,11 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
                 log::warn!("recents feature is disabled in config");
                 continue;
             }
-        } else if &arg == "--bookmarks" {
-            if config.show_bookmarks {
-                Location::Bookmarks
+        } else if &arg == "--starred" {
+            if config.show_starred {
+                Location::Starred
             } else {
-                log::warn!("bookmarks feature is disabled in config");
+                log::warn!("starred feature is disabled in config");
                 continue;
             }
         } else if &arg == "--network" {

src/lib.rs

@@ -58,7 +58,7 @@ pub fn context_menu<'a>(
     key_binds: &HashMap<KeyBind, Action>,
     modifiers: &Modifiers,
     clipboard_paste_available: bool,
-    show_bookmarks: &bool,
+    show_starred: &bool,
     context_actions: &[ContextActionPreset],
 ) -> Element<'a, tab::Message> {
     let find_key = |action: &Action| -> String {
@@ -139,7 +139,7 @@ pub fn context_menu<'a>(
     let mut selected_types: Vec<Mime> = vec![];
     let mut selected_mount_point = 0;
     let mut any_trash_item = false;
-    let mut bookmarked = 0;
+    let mut starred = 0;
     if let Some(items) = tab.items_opt() {
         for item in items {
             if item.selected {
@@ -148,8 +148,8 @@ pub fn context_menu<'a>(
                     selected_mount_point += i32::from(item.is_mount_point);
                     selected_dir += 1;
                 }
-                if item.bookmarked {
-                    bookmarked += 1
+                if item.starred {
+                    starred += 1
                 }
                 match &item.location_opt {
                     Some(Location::Trash) | Some(Location::Search(SearchLocation::Trash, ..)) => {
@@ -202,9 +202,9 @@ pub fn context_menu<'a>(
             | Location::Path(..)
             | Location::Search(SearchLocation::Path(..), ..)
             | Location::Search(SearchLocation::Recents, ..)
-            | Location::Search(SearchLocation::Bookmarks, ..)
+            | Location::Search(SearchLocation::Starred, ..)
             | Location::Recents
-            | Location::Bookmarks
+            | Location::Starred
             | Location::Network(_, _, Some(_)),
         ) => {
             if selected_trash_only {
@@ -298,17 +298,17 @@ pub fn context_menu<'a>(
                     children.push(menu_item(fl!("delete-permanently"), Action::Delete).into());
                 } else {
                     children.push(divider::horizontal::light().into());
-                    if *show_bookmarks {
-                        if bookmarked > 0 || matches!(tab.location, Location::Bookmarks) {
+                    if *show_starred {
+                        if starred > 0 || matches!(tab.location, Location::Starred) {
                             children.push(menu_item(
-                                fl!("remove-from-bookmarks"),
-                                Action::RemoveFromBookmarks
+                                fl!("remove-from-starred"),
+                                Action::RemoveFromStarred
                             ).into());
                         }
-                        if bookmarked < selected && !matches!(tab.location, Location::Bookmarks) {
+                        if starred < selected && !matches!(tab.location, Location::Starred) {
                             children.push(menu_item(
-                                fl!("add-to-bookmarks"),
-                                Action::AddToBookmarks
+                                fl!("add-to-starred"),
+                                Action::AddToStarred
                             ).into());
                         }
                     }
@@ -342,7 +342,7 @@ pub fn context_menu<'a>(
             } else {
                 //TODO: need better designs for menu with no selection
                 //TODO: have things like properties but they apply to the folder?
-                if tab.location != Location::Recents && tab.location != Location::Bookmarks {
+                if tab.location != Location::Recents && tab.location != Location::Starred {
                     children.push(menu_item(fl!("new-folder"), Action::NewFolder).into());
                     children.push(menu_item(fl!("new-file"), Action::NewFile).into());
                     children.push(menu_item(fl!("open-in-terminal"), Action::OpenTerminal).into());
@@ -391,9 +391,9 @@ pub fn context_menu<'a>(
             | Location::Path(..)
             | Location::Search(SearchLocation::Path(..), ..)
             | Location::Search(SearchLocation::Recents, ..)
-            | Location::Search(SearchLocation::Bookmarks, ..)
+            | Location::Search(SearchLocation::Starred, ..)
             | Location::Recents
-            | Location::Bookmarks
+            | Location::Starred
             | Location::Network(_, _, Some(_)),
         ) => {
             if selected > 0 {
@@ -711,8 +711,8 @@ pub fn menu_bar<'a>(
                         menu::Item::Button(fl!("reload-folder"), None, Action::Reload),
                         menu::Item::Divider,
                         menu_button_optional(
-                            fl!("add-to-bookmarks"),
-                            Action::AddToBookmarks,
+                            fl!("add-to-starred"),
+                            Action::AddToStarred,
                             selected > 0,
                         ),
                         menu_button_optional(
@@ -858,9 +858,9 @@ pub fn location_context_menu<'a>(ancestor_index: usize, tab_mode: tab::Mode) ->
 
     if matches!(tab_mode, tab::Mode::App) {
         children.push(divider::horizontal::light().into());
-        children.push(menu_button!(text::body(fl!("add-to-bookmarks")))
+        children.push(menu_button!(text::body(fl!("add-to-starred")))
             .on_press(tab::Message::LocationMenuAction(
-                LocationMenuAction::AddToBookmarks(ancestor_index),
+                LocationMenuAction::AddToStarred(ancestor_index),
             ))
             .into());
         children.push(menu_button!(text::body(fl!("add-to-sidebar")))

src/menu.rs

@@ -212,7 +212,7 @@ fn network_scan(uri: &str, sizes: IconSizes) -> Result<Vec<tab::Item>, String> {
             rect_opt: Cell::new(None),
             selected: false,
             highlighted: false,
-            bookmarked: false,
+            starred: false,
             overlaps_drag_rect: false,
             //TODO: scan directory size on gvfs mounts?
             dir_size: DirSize::NotDirectory,