Implement find and improvements for focus

pop-os · Jan 9, 2024 · f3a8fef · f3a8fef
1 parent 81a0bbc
commit f3a8fef
Show file tree

Hide file tree

Showing 10 changed files with 358 additions and 105 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/i18n/en/cosmic_edit.ftl b/i18n/en/cosmic_edit.ftl
@@ -37,6 +37,9 @@ default-font-size = Default font size
 keyboard-shortcuts = Keyboard shortcuts
 enable-vim-bindings = Enable Vim bindings
 
+# Find
+find-placeholder = Find...
+
 # Menu
 
 ## File

diff --git a/res/icons/edit-clear-symbolic.svg b/res/icons/edit-clear-symbolic.svg
diff --git a/res/icons/go-up-symbolic.svg b/res/icons/go-up-symbolic.svg
diff --git a/src/config.rs b/src/config.rs
@@ -19,6 +19,8 @@ pub enum Action {
     CloseProject,
     Copy,
     Cut,
+    Find,
+    FindAndReplace,
     NewFile,
     NewWindow,
     OpenFileDialog,
@@ -42,6 +44,8 @@ impl Action {
             Self::CloseProject => Message::CloseProject,
             Self::Copy => Message::Copy,
             Self::Cut => Message::Cut,
+            Self::Find => Message::Find(Some(false)),
+            Self::FindAndReplace => Message::Find(Some(true)),
             Self::NewFile => Message::NewFile,
             Self::NewWindow => Message::NewWindow,
             Self::OpenFileDialog => Message::OpenFileDialog,
@@ -111,6 +115,8 @@ impl KeyBind {
         bind!([Ctrl], W, CloseFile);
         bind!([Ctrl], X, Cut);
         bind!([Ctrl], C, Copy);
+        bind!([Ctrl], F, Find);
+        bind!([Ctrl], H, FindAndReplace);
         bind!([Ctrl], V, Paste);
         bind!([Ctrl], T, NewFile);
         bind!([Ctrl], N, NewWindow);

diff --git a/src/icon_cache.rs b/src/icon_cache.rs
@@ -30,9 +30,11 @@ impl IconCache {
             };
         }
 
+        bundle!("edit-clear-symbolic", 16);
         bundle!("folder-open-symbolic", 16);
         bundle!("go-down-symbolic", 16);
         bundle!("go-next-symbolic", 16);
+        bundle!("go-up-symbolic", 16);
         bundle!("list-add-symbolic", 16);
         bundle!("object-select-symbolic", 16);
         bundle!("window-close-symbolic", 16);
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,9 @@ default-font-size = Default font size @@
     keyboard-shortcuts = Keyboard shortcuts
     enable-vim-bindings = Enable Vim bindings
+    # Find
+    find-placeholder = Find...
     # Menu
     ## File
@@ Expand Down @@