Skip to content

Commit

Permalink
Adjust to coding conventions for PR#10625
Browse files Browse the repository at this point in the history
  • Loading branch information
0xdeadbeer committed Apr 26, 2024
1 parent fff6b52 commit 632a63d
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 17 deletions.
28 changes: 13 additions & 15 deletions src/gui/group/GroupView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ GroupView::GroupView(Database* db, QWidget* parent)
// clang-format on

new QShortcut(Qt::CTRL + Qt::Key_F10, this, SLOT(contextMenuShortcutPressed()), nullptr, Qt::WidgetShortcut);
new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_PageUp, this, SLOT(prevGroup()), nullptr, Qt::WindowShortcut);
new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_PageDown, this, SLOT(nextGroup()), nullptr, Qt::WindowShortcut);
new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_PageUp, this, SLOT(selectPreviousGroup()), nullptr, Qt::WindowShortcut);
new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_PageDown, this, SLOT(selectNextGroup()), nullptr, Qt::WindowShortcut);

// keyboard shortcuts to sort children of a group
auto shortcut = new QShortcut(Qt::CTRL + Qt::Key_Down, this);
Expand All @@ -62,24 +62,22 @@ GroupView::GroupView(Database* db, QWidget* parent)
setDefaultDropAction(Qt::MoveAction);
}

void GroupView::prevGroup()
void GroupView::selectPreviousGroup()
{
auto prevIndex = indexAbove(currentIndex());
if (!prevIndex.isValid())
return;

Group* prevGroup = m_model->groupFromIndex(prevIndex);
setCurrentGroup(prevGroup);
auto previousIndex = indexAbove(currentIndex());
if (previousIndex.isValid()) {
Group* previousGroup = m_model->groupFromIndex(previousIndex);
setCurrentGroup(previousGroup);
}
}

void GroupView::nextGroup()
void GroupView::selectNextGroup()
{
auto nextIndex = indexBelow(currentIndex());
if (!nextIndex.isValid())
return;

Group* nextGroup = m_model->groupFromIndex(nextIndex);
setCurrentGroup(nextGroup);
if (nextIndex.isValid()) {
Group* nextGroup = m_model->groupFromIndex(nextIndex);
setCurrentGroup(nextGroup);
}
}

void GroupView::contextMenuShortcutPressed()
Expand Down
4 changes: 2 additions & 2 deletions src/gui/group/GroupView.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ private slots:
void syncExpandedState(const QModelIndex& parent, int start, int end);
void modelReset();
void contextMenuShortcutPressed();
void prevGroup();
void nextGroup();
void selectPreviousGroup();
void selectNextGroup();

protected:
void dragMoveEvent(QDragMoveEvent* event) override;
Expand Down

0 comments on commit 632a63d

Please sign in to comment.