feat: add more shortcuts (#407, #408)

variar · Dec 18, 2021 · e874eb1 · e874eb1
1 parent fb478e6
commit e874eb1
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 5 deletions.
diff --git a/src/settings/include/shortcuts.h b/src/settings/include/shortcuts.h
@@ -97,6 +97,12 @@ struct ShortcutAction {
     static constexpr auto LogViewClearColorLabels = "logview.clear_color_labels";
     static constexpr auto LogViewAddNextColorLabel = "logview.add_next_color_label";
 
+    static constexpr auto LogViewSendSelectionToScratchpad = "logview.send_selection_to_scratchpad";
+
+    static constexpr auto LogViewAddToSearch = "logview.add_to_search";
+    static constexpr auto LogViewExcludeFromSearch = "logview.exclude_from_search";
+    static constexpr auto LogViewReplaceSearch = "logview.replace_search";
+
     static const std::map<std::string, QStringList>& defaultShortcuts();
 
     static QStringList defaultShortcuts( const std::string& action );

diff --git a/src/settings/src/shortcuts.cpp b/src/settings/src/shortcuts.cpp
@@ -138,6 +138,13 @@ const std::map<std::string, QStringList>& ShortcutAction::defaultShortcuts()
         shortcuts.emplace( LogViewClearColorLabels, QStringList() << "Ctrl+Shift+0" );
         shortcuts.emplace( LogViewAddNextColorLabel, QStringList() << "Ctrl+D" );
 
+        shortcuts.emplace( LogViewSendSelectionToScratchpad, QStringList() << "Ctrl+Z" );
+
+        shortcuts.emplace( LogViewSendSelectionToScratchpad, QStringList() << "Ctrl+Z" );
+        shortcuts.emplace( LogViewAddToSearch, QStringList() << "Shift+A" );
+        shortcuts.emplace( LogViewExcludeFromSearch, QStringList() << "Shift+E" );
+        shortcuts.emplace( LogViewReplaceSearch, QStringList() << "Shift+R" );
+
         return shortcuts;
     }();
 
@@ -229,6 +236,12 @@ QString ShortcutAction::actionName( const std::string& action )
 
         shortcuts.emplace( LogViewClearColorLabels, "Clear all color labels" );
 
+        shortcuts.emplace( LogViewSendSelectionToScratchpad, "Send selection to scratchpad" );
+
+        shortcuts.emplace( LogViewAddToSearch, "Add selection to search pattern" );
+        shortcuts.emplace( LogViewExcludeFromSearch, "Exclude selection from search pattern " );
+        shortcuts.emplace( LogViewReplaceSearch, "Replace search pattern with selection" );
+
         return shortcuts;
     }();
 

diff --git a/src/ui/src/abstractlogview.cpp b/src/ui/src/abstractlogview.cpp
@@ -56,6 +56,7 @@
 #include <memory>
 #include <numeric>
 #include <optional>
+#include <qobjectdefs.h>
 #include <qpen.h>
 #include <qwidget.h>
 #include <string_view>
@@ -715,6 +716,13 @@ void AbstractLogView::doRegisterShortcuts()
     } );
 
     registerShortcut( ShortcutAction::LogViewExitView, [ this ]() { emit exitView(); } );
+
+    registerShortcut( ShortcutAction::LogViewSendSelectionToScratchpad,
+                      [ this ]() { emit sendSelectionToScratchpad(); } );
+
+    registerShortcut( ShortcutAction::LogViewAddToSearch, [ this ]() { addToSearch(); } );
+    registerShortcut( ShortcutAction::LogViewExcludeFromSearch, [ this ]() { excludeFromSearch(); } );
+    registerShortcut( ShortcutAction::LogViewReplaceSearch, [ this ]() { replaceSearch(); } );
 }
 
 void AbstractLogView::keyPressEvent( QKeyEvent* keyEvent )

diff --git a/src/ui/src/scratchpad.cpp b/src/ui/src/scratchpad.cpp
@@ -149,11 +149,15 @@ ScratchPad::ScratchPad( QWidget* parent )
              &ScratchPad::updateTransformation );
 }
 
-void ScratchPad::addData( QString data )
+void ScratchPad::addData( QString newData )
 {
+    if ( newData.isEmpty() ) {
+        return;
+    }
+
     auto cursor = textEdit_->textCursor();
-    cursor.insertText( data );
-    cursor.insertText( QString{QChar::LineFeed} );
+    cursor.insertText( newData );
+    cursor.insertText( QString{ QChar::LineFeed } );
 }
 
 QString ScratchPad::transformText( const std::function<QString( QString )>& transform )

diff --git a/src/ui/src/tabbedscratchpad.cpp b/src/ui/src/tabbedscratchpad.cpp
@@ -112,10 +112,10 @@ void TabbedScratchPad::addTab()
     tabWidget_->setCurrentIndex( newIndex );
 }
 
-void TabbedScratchPad::addData( QString data )
+void TabbedScratchPad::addData( QString newData )
 {
     auto curretScratchPad = qobject_cast<ScratchPad*>( tabWidget_->currentWidget() );
     if ( curretScratchPad ) {
-        curretScratchPad->addData( data );
+        curretScratchPad->addData( std::move(newData) );
     }
 }