Merge pull request #209 from vedgy/add-focus-shortcuts

luisangelsm · web-flow · commit 84c43e456e41 · 2021-03-13T17:09:46.000+01:00
Add focus shortcuts
diff --git a/YACReaderLibrary/classic_comics_view.cpp b/YACReaderLibrary/classic_comics_view.cpp
@@ -258,6 +258,15 @@ void ClassicComicsView::updateCurrentComicView()
 {
 }
 
+void ClassicComicsView::focusComicsNavigation(Qt::FocusReason reason)
+{
+    const bool comicFlowVisible = stack->currentWidget() == comicFlow && sVertical->sizes().constFirst() != 0;
+    if (comicFlowVisible)
+        comicFlow->setFocus(reason);
+    else // Let the user navigate the table.
+        tableView->setFocus(reason);
+}
+
 void ClassicComicsView::selectAll()
 {
     tableView->selectAll();
diff --git a/YACReaderLibrary/classic_comics_view.h b/YACReaderLibrary/classic_comics_view.h
@@ -19,7 +19,7 @@ class ClassicComicsView : public ComicsView
 {
     Q_OBJECT
 public:
-    ClassicComicsView(QWidget *parent = 0);
+    explicit ClassicComicsView(QWidget *parent = nullptr);
     void setToolBar(QToolBar *toolBar) override;
     void setModel(ComicModel *model) override;
 
@@ -32,6 +32,7 @@ class ClassicComicsView : public ComicsView
     void enableFilterMode(bool enabled) override;
     void selectIndex(int index) override;
     void updateCurrentComicView() override;
+    void focusComicsNavigation(Qt::FocusReason reason) override;
 
 public slots:
     void setCurrentIndex(const QModelIndex &index) override;
diff --git a/YACReaderLibrary/comics_view.h b/YACReaderLibrary/comics_view.h
@@ -29,6 +29,7 @@ class ComicsView : public QWidget
     virtual void enableFilterMode(bool enabled) = 0;
     virtual void selectIndex(int index) = 0;
     virtual void updateCurrentComicView() = 0;
+    virtual void focusComicsNavigation(Qt::FocusReason reason) = 0;
 
 public slots:
     virtual void updateInfoForIndex(int index);
diff --git a/YACReaderLibrary/comics_view_transition.cpp b/YACReaderLibrary/comics_view_transition.cpp
@@ -20,11 +20,6 @@ ComicsViewTransition::ComicsViewTransition(QWidget *parent)
 #endif
 }
 
-QSize ComicsViewTransition::sizeHint()
-{
-    return QSize(450, 350);
-}
-
 void ComicsViewTransition::paintEvent(QPaintEvent *)
 {
     QPainter painter(this);
diff --git a/YACReaderLibrary/comics_view_transition.h b/YACReaderLibrary/comics_view_transition.h
@@ -8,7 +8,6 @@ class ComicsViewTransition : public QWidget
     Q_OBJECT
 public:
     explicit ComicsViewTransition(QWidget *parent = nullptr);
-    QSize sizeHint();
 
 protected:
     void paintEvent(QPaintEvent *) override;
diff --git a/YACReaderLibrary/grid_comics_view.cpp b/YACReaderLibrary/grid_comics_view.cpp
@@ -469,11 +469,6 @@ void GridComicsView::resetScroll()
     QMetaObject::invokeMethod(scrollView, "scrollToOrigin");
 }
 
-QSize GridComicsView::sizeHint()
-{
-    return QSize(1280, 768);
-}
-
 QByteArray GridComicsView::getMimeDataFromSelection()
 {
     QByteArray data;
@@ -491,6 +486,11 @@ void GridComicsView::updateCurrentComicView()
     setCurrentComicIfNeeded();
 }
 
+void GridComicsView::focusComicsNavigation(Qt::FocusReason reason)
+{
+    view->setFocus(reason);
+}
+
 void GridComicsView::startDrag()
 {
     auto drag = new QDrag(this);
diff --git a/YACReaderLibrary/grid_comics_view.h b/YACReaderLibrary/grid_comics_view.h
@@ -19,8 +19,8 @@ class GridComicsView : public ComicsView
 {
     Q_OBJECT
 public:
-    explicit GridComicsView(QWidget *parent = 0);
-    virtual ~GridComicsView();
+    explicit GridComicsView(QWidget *parent = nullptr);
+    ~GridComicsView() override;
     void setToolBar(QToolBar *toolBar) override;
     void setModel(ComicModel *model) override;
     void setCurrentIndex(const QModelIndex &index) override;
@@ -31,9 +31,9 @@ class GridComicsView : public ComicsView
     void toNormal() override;
     void updateConfig(QSettings *settings) override;
     void enableFilterMode(bool enabled) override;
-    QSize sizeHint();
     QByteArray getMimeDataFromSelection();
     void updateCurrentComicView() override;
+    void focusComicsNavigation(Qt::FocusReason reason) override;
 
 public slots:
     //ComicsView
diff --git a/YACReaderLibrary/info_comics_view.cpp b/YACReaderLibrary/info_comics_view.cpp
@@ -208,6 +208,11 @@ void InfoComicsView::updateCurrentComicView()
 {
 }
 
+void InfoComicsView::focusComicsNavigation(Qt::FocusReason reason)
+{
+    view->setFocus(reason);
+}
+
 void InfoComicsView::setShowMarks(bool show)
 {
     QQmlContext *ctxt = view->rootContext();
diff --git a/YACReaderLibrary/info_comics_view.h b/YACReaderLibrary/info_comics_view.h
@@ -26,9 +26,10 @@ class InfoComicsView : public ComicsView
     void enableFilterMode(bool enabled) override;
     void selectIndex(int index) override;
     void updateCurrentComicView() override;
+    void focusComicsNavigation(Qt::FocusReason reason) override;
 
 public slots:
-    void setShowMarks(bool show);
+    void setShowMarks(bool show) override;
     void selectAll() override;
 
 protected slots:
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
@@ -377,6 +377,8 @@ void LibraryWindow::setUpShortcutsManagement()
                                          tmpList = QList<QAction *>()
                                                  << backAction
                                                  << forwardAction
+                                                 << focusSearchLineAction
+                                                 << focusComicsViewAction
                                                  << helpAboutAction
                                                  << optionsAction
                                                  << serverConfigAction
@@ -719,6 +721,17 @@ void LibraryWindow::createActions()
     getInfoAction->setIcon(QIcon(":/images/comics_view_toolbar/getInfo.png"));
     //-------------------------------------------------------------------------
 
+    focusSearchLineAction = new QAction(tr("Focus search line"), this);
+    focusSearchLineAction->setData(FOCUS_SEARCH_LINE_ACTION_YL);
+    focusSearchLineAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(FOCUS_SEARCH_LINE_ACTION_YL));
+    focusSearchLineAction->setIcon(QIcon(":/images/iconSearch.png"));
+    addAction(focusSearchLineAction);
+
+    focusComicsViewAction = new QAction(tr("Focus comics view"), this);
+    focusComicsViewAction->setData(FOCUS_COMICS_VIEW_ACTION_YL);
+    focusComicsViewAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(FOCUS_COMICS_VIEW_ACTION_YL));
+    addAction(focusComicsViewAction);
+
     showEditShortcutsAction = new QAction(tr("Edit shortcuts"), this);
     showEditShortcutsAction->setData(SHOW_EDIT_SHORTCUTS_ACTION_YL);
     showEditShortcutsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_EDIT_SHORTCUTS_ACTION_YL));
@@ -1147,6 +1160,9 @@ void LibraryWindow::createConnections()
     //connect(comicsModel,SIGNAL(searchNumResults(int)),this,SLOT(checkSearchNumResults(int)));
     //connect(emptyFolderWidget,SIGNAL(subfolderSelected(QModelIndex,int)),this,SLOT(selectSubfolder(QModelIndex,int)));
 
+    connect(focusSearchLineAction, &QAction::triggered, searchEdit, [this] { searchEdit->setFocus(Qt::ShortcutFocusReason); });
+    connect(focusComicsViewAction, &QAction::triggered, comicsViewsManager, &YACReaderComicsViewsManager::focusComicsViewViaShortcut);
+
     connect(showEditShortcutsAction, SIGNAL(triggered()), editShortcutsDialog, SLOT(show()));
 
     //update folders (partial updates)
diff --git a/YACReaderLibrary/library_window.h b/YACReaderLibrary/library_window.h
@@ -213,6 +213,9 @@ class LibraryWindow : public QMainWindow
     QAction *forceCoverExtractedAction;
     QAction *deleteComicsAction;
 
+    QAction *focusSearchLineAction;
+    QAction *focusComicsViewAction;
+
     QAction *showEditShortcutsAction;
 
     QAction *updateFolderAction;
diff --git a/YACReaderLibrary/properties_dialog.h b/YACReaderLibrary/properties_dialog.h
@@ -122,6 +122,9 @@ class PropertiesDialog : public QDialog
     PropertiesDialog(QWidget *parent = nullptr);
     QString databasePath;
     QString basePath;
+    // TODO: this non-const member function hides rather than overrides
+    // QWidget::sizeHint(). But the function cannot be simply removed as it is used
+    // in our constructor. Will have to investigate and decide how to fix this.
     QSize sizeHint();
     void paintEvent(QPaintEvent *event) override;
 
diff --git a/YACReaderLibrary/yacreader_comics_views_manager.cpp b/YACReaderLibrary/yacreader_comics_views_manager.cpp
@@ -121,6 +121,11 @@ void YACReaderComicsViewsManager::toggleComicsView()
     }
 }
 
+void YACReaderComicsViewsManager::focusComicsViewViaShortcut()
+{
+    comicsView->focusComicsNavigation(Qt::ShortcutFocusReason);
+}
+
 //PROTECTED
 
 void YACReaderComicsViewsManager::disconnectComicsViewConnections(ComicsView *widget)
diff --git a/YACReaderLibrary/yacreader_comics_views_manager.h b/YACReaderLibrary/yacreader_comics_views_manager.h
@@ -55,6 +55,7 @@ class YACReaderComicsViewsManager : public QObject
 
 public slots:
     void toggleComicsView();
+    void focusComicsViewViaShortcut();
 
     void showComicsView();
     void showEmptyFolderView();
diff --git a/custom_widgets/yacreader_macosx_toolbar.h b/custom_widgets/yacreader_macosx_toolbar.h
@@ -12,6 +12,7 @@ class YACReaderMacOSXSearchLineEdit : public QObject
     Q_OBJECT
 public:
     YACReaderMacOSXSearchLineEdit();
+    void setFocus(Qt::FocusReason reason);
     void *getNSTextField();
 
 public slots:
diff --git a/custom_widgets/yacreader_macosx_toolbar.mm b/custom_widgets/yacreader_macosx_toolbar.mm
@@ -316,6 +316,13 @@ - (void)controlTextDidChange:(NSNotification *)notification
     nstextfield = searchEdit;
 }
 
+void YACReaderMacOSXSearchLineEdit::setFocus(Qt::FocusReason reason)
+{
+    Q_UNUSED(reason)
+
+    [((NSTextField *)nstextfield) becomeFirstResponder];
+}
+
 void *YACReaderMacOSXSearchLineEdit::getNSTextField()
 {
     return nstextfield;
diff --git a/shortcuts_management/shortcuts_manager.cpp b/shortcuts_management/shortcuts_manager.cpp
@@ -13,6 +13,7 @@ void ShortcutsManager::initDefaultShorcuts()
 {
 #ifdef YACREADER_LIBRARY
     //ACTIONS
+    defaultShorcuts.insert(FOCUS_SEARCH_LINE_ACTION_YL, Qt::CTRL | Qt::Key_F);
     defaultShorcuts.insert(CREATE_LIBRARY_ACTION_YL, Qt::Key_A);
     defaultShorcuts.insert(OPEN_LIBRARY_ACTION_YL, Qt::Key_O);
     defaultShorcuts.insert(UPDATE_LIBRARY_ACTION_YL, Qt::Key_U);
diff --git a/shortcuts_management/shortcuts_manager.h b/shortcuts_management/shortcuts_manager.h
@@ -75,6 +75,8 @@ class ShortcutsManager
 #define DELETE_COMICS_ACTION_YL "DELETE_COMICS_ACTION_YL"
 #define HIDE_COMIC_VIEW_ACTION_YL "HIDE_COMIC_VIEW_ACTION_YL"
 #define GET_INFO_ACTION_YL "GET_INFO_ACTION_YL"
+#define FOCUS_SEARCH_LINE_ACTION_YL "FOCUS_SEARCH_LINE_ACTION_YL"
+#define FOCUS_COMICS_VIEW_ACTION_YL "FOCUS_COMICS_VIEW_ACTION_YL"
 #define SHOW_EDIT_SHORTCUTS_ACTION_YL "SHOW_EDIT_SHORTCUTS_ACTION_YL"
 #define UPDATE_CURRENT_FOLDER_ACTION_YL "UPDATE_CURRENT_FOLDER_ACTION_YL"
 #define ADD_FOLDER_ACTION_YL "ADD_FOLDER_ACTION_YL"

Original file line number	Diff line number	Diff line change
`@@ -258,6 +258,15 @@ void ClassicComicsView::updateCurrentComicView()`
`258`	`258`	`{`
`259`	`259`	`}`
`260`	`260`
	`261`	`+void ClassicComicsView::focusComicsNavigation(Qt::FocusReason reason)`
	`262`	`+{`
	`263`	`+ const bool comicFlowVisible = stack->currentWidget() == comicFlow && sVertical->sizes().constFirst() != 0;`
	`264`	`+ if (comicFlowVisible)`
	`265`	`+ comicFlow->setFocus(reason);`
	`266`	`+ else // Let the user navigate the table.`
	`267`	`+ tableView->setFocus(reason);`
	`268`	`+}`
	`269`	`+`
`261`	`270`	`void ClassicComicsView::selectAll()`
`262`	`271`	`{`
`263`	`272`	`tableView->selectAll();`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,6 @@ ComicsViewTransition::ComicsViewTransition(QWidget *parent)`
`20`	`20`	`#endif`
`21`	`21`	`}`
`22`	`22`
`23`		`-QSize ComicsViewTransition::sizeHint()`
`24`		`-{`
`25`		`- return QSize(450, 350);`
`26`		`-}`
`27`		`-`
`28`	`23`	`void ComicsViewTransition::paintEvent(QPaintEvent *)`
`29`	`24`	`{`
`30`	`25`	`QPainter painter(this);`
Original file line number	Diff line number	Diff line change
`@@ -469,11 +469,6 @@ void GridComicsView::resetScroll()`
`469`	`469`	`QMetaObject::invokeMethod(scrollView, "scrollToOrigin");`
`470`	`470`	`}`
`471`	`471`
`472`		`-QSize GridComicsView::sizeHint()`
`473`		`-{`
`474`		`- return QSize(1280, 768);`
`475`		`-}`
`476`		`-`
`477`	`472`	`QByteArray GridComicsView::getMimeDataFromSelection()`
`478`	`473`	`{`
`479`	`474`	`QByteArray data;`
`@@ -491,6 +486,11 @@ void GridComicsView::updateCurrentComicView()`
`491`	`486`	`setCurrentComicIfNeeded();`
`492`	`487`	`}`
`493`	`488`
	`489`	`+void GridComicsView::focusComicsNavigation(Qt::FocusReason reason)`
	`490`	`+{`
	`491`	`+ view->setFocus(reason);`
	`492`	`+}`
	`493`	`+`
`494`	`494`	`void GridComicsView::startDrag()`
`495`	`495`	`{`
`496`	`496`	`auto drag = new QDrag(this);`
Original file line number	Diff line number	Diff line change
`@@ -208,6 +208,11 @@ void InfoComicsView::updateCurrentComicView()`
`208`	`208`	`{`
`209`	`209`	`}`
`210`	`210`
	`211`	`+void InfoComicsView::focusComicsNavigation(Qt::FocusReason reason)`
	`212`	`+{`
	`213`	`+ view->setFocus(reason);`
	`214`	`+}`
	`215`	`+`
`211`	`216`	`void InfoComicsView::setShowMarks(bool show)`
`212`	`217`	`{`
`213`	`218`	`QQmlContext *ctxt = view->rootContext();`