Added Ctrl-Q and Ctrl-W shortcuts.

[pulseview.git] / pv / mainwindow.hpp

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 9d5b04125416e17ea24da97e065b03e67f47c359..d2653d26952c51f5078a18a17695deab5cfb01fe 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PULSEVIEW_PV_MAINWINDOW_HPP
@@ -26,8 +25,10 @@
 #include <memory>
 
 #include <QMainWindow>
+#include <QSignalMapper>
 #include <QToolButton>
 #include <QTabWidget>
+#include <QShortcut>
 
 #include "session.hpp"
 #include "views/viewbase.hpp"
@@ -79,6 +80,8 @@ public:
        std::shared_ptr<views::ViewBase> add_view(const QString &title,
                views::ViewType type, Session &session);
 
+       void remove_view(std::shared_ptr<views::ViewBase> view);
+
        std::shared_ptr<Session> add_session();
 
        void remove_session(std::shared_ptr<Session> session);
@@ -92,14 +95,17 @@ private:
 
        std::shared_ptr<Session> get_tab_session(int index) const;
 
-private:
        void closeEvent(QCloseEvent *event);
 
        virtual QMenu* createPopupMenu();
 
        virtual bool restoreState(const QByteArray &state, int version = 0);
 
+       void session_error(const QString text, const QString info_text);
+
 private Q_SLOTS:
+       void show_session_error(const QString text, const QString info_text);
+
        void on_add_view(const QString &title, views::ViewType type,
                Session *session);
 
@@ -107,7 +113,11 @@ private Q_SLOTS:
        void on_focused_session_changed(std::shared_ptr<Session> session);
 
        void on_new_session_clicked();
+       void on_run_stop_clicked();
+
        void on_session_name_changed();
+       void on_capture_state_changed(QObject *obj);
+
        void on_new_view(Session *session);
        void on_view_close_clicked();
 
@@ -120,21 +130,34 @@ private Q_SLOTS:
 
        void on_actionAbout_triggered();
 
+       void on_close_current_tab();
+
 private:
        DeviceManager &device_manager_;
 
        std::list< std::shared_ptr<Session> > sessions_;
+       std::shared_ptr<Session> last_focused_session_;
 
        std::map< QDockWidget*, std::shared_ptr<views::ViewBase> > view_docks_;
 
        std::map< std::shared_ptr<Session>, QMainWindow*> session_windows_;
 
-       QToolButton *new_session_button_;
+       QWidget *static_tab_widget_;
+       QToolButton *new_session_button_, *run_stop_button_, *settings_button_;
        QTabWidget session_selector_;
+       QSignalMapper session_state_mapper_;
 
        QAction *const action_view_sticky_scrolling_;
        QAction *const action_view_coloured_bg_;
        QAction *const action_about_;
+
+       QIcon icon_red_;
+       QIcon icon_green_;
+       QIcon icon_grey_;
+
+       QShortcut *run_stop_shortcut_;
+       QShortcut *close_application_shortcut_;
+       QShortcut *close_current_tab_shortcut_;
 };
 
 } // namespace pv