diff options
| author | 2015-04-04 14:41:10 -0400 | |
|---|---|---|
| committer | 2015-04-04 14:41:10 -0400 | |
| commit | b5f93b05578293d1d233b4920a28a5c2fd826f94 (patch) | |
| tree | 82332679f647e9c76e331206786d07a58dcfa9b8 /SQLiteStudio3/guiSQLiteStudio/taskbar.h | |
| parent | af8a7a3e3dccf9c9ad257e3952173d180c8a7421 (diff) | |
| parent | a5b034d4a9c44f9bc1e83b01de82530f8fc63013 (diff) | |
Merge tag 'upstream/3.0.4'
Upstream version 3.0.4
# gpg: Signature made Sat 04 Apr 2015 02:41:09 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.org>"
# gpg: aka "Unit 193 <unit193@ubuntu.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.com>"
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/taskbar.h')
| -rw-r--r-- | SQLiteStudio3/guiSQLiteStudio/taskbar.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/taskbar.h b/SQLiteStudio3/guiSQLiteStudio/taskbar.h index 652b3f6..a7b7d4f 100644 --- a/SQLiteStudio3/guiSQLiteStudio/taskbar.h +++ b/SQLiteStudio3/guiSQLiteStudio/taskbar.h @@ -23,6 +23,9 @@ class GUI_API_EXPORT TaskBar : public QToolBar QList<QAction*> getTasks() const; bool isEmpty(); int count(); + QAction* getActiveTask() const; + QAction* getNextTask(QAction* from = nullptr) const; + QAction* getPrevTask(QAction* from = nullptr) const; protected: void mousePressEvent(QMouseEvent* event); @@ -63,11 +66,14 @@ class GUI_API_EXPORT TaskBar : public QToolBar public slots: void nextTask(); void prevTask(); + void setActiveTask(QAction* task); void initContextMenu(ExtActionContainer *mainWin); private slots: void taskBarMenuRequested(const QPoint& p); void mousePressed(); + void taskBarMenuAboutToShow(); + void taskBarMenuAboutToHide(); }; #endif // TASKBAR_H |
