X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=90e915033b8bab19490a3614fbc3b5bc513e6fe5;hb=8de1e1b2fb1bcaaa21f08b7bba412b0839d6c4d2;hp=3cd269f4ff50c162e6868cddd6741a1f9fb91115;hpb=33e1afbe17cfa91c24adb775aba923f07fbeed01;p=pulseview.git
diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 3cd269f..90e9150 100644
--- 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 .
*/
#ifndef PULSEVIEW_PV_MAINWINDOW_HPP
@@ -26,9 +25,13 @@
#include
#include
+#include
+#include
+#include
+#include
#include "session.hpp"
-#include "view/viewwidget.hpp"
+#include "views/viewbase.hpp"
struct srd_decoder;
@@ -68,14 +71,12 @@ public:
~MainWindow();
- QAction* action_view_sticky_scrolling() const;
- QAction* action_view_coloured_bg() const;
- QAction* action_about() const;
+ std::shared_ptr get_active_view() const;
- std::shared_ptr get_active_view() const;
+ std::shared_ptr add_view(const QString &title,
+ views::ViewType type, Session &session);
- std::shared_ptr add_view(const QString &title,
- view::ViewType type, Session &session);
+ void remove_view(std::shared_ptr view);
std::shared_ptr add_session();
@@ -88,41 +89,72 @@ private:
void restore_ui_settings();
-private:
+ std::shared_ptr get_tab_session(int index) const;
+
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 on_add_view(const QString &title, view::ViewType type,
+ void show_session_error(const QString text, const QString info_text);
+
+ void on_add_view(const QString &title, views::ViewType type,
Session *session);
void on_focus_changed();
+ void on_focused_session_changed(std::shared_ptr session);
+
+ void on_new_session_clicked();
+ void on_run_stop_clicked();
+ void on_settings_clicked();
- void on_new_session();
void on_session_name_changed();
+ void on_capture_state_changed(QObject *obj);
+
void on_new_view(Session *session);
void on_view_close_clicked();
- void on_actionViewStickyScrolling_triggered();
+ void on_tab_changed(int index);
+ void on_tab_close_requested(int index);
+
+ void on_view_coloured_bg_shortcut();
+ void on_view_sticky_scrolling_shortcut();
+ void on_view_show_sampling_points_shortcut();
- void on_actionViewColouredBg_triggered();
+ void on_settingViewColouredBg_changed(const QVariant new_value);
+ void on_settingViewShowSamplingPoints_changed(const QVariant new_value);
- void on_actionAbout_triggered();
+ void on_close_current_tab();
private:
DeviceManager &device_manager_;
std::list< std::shared_ptr > sessions_;
+ std::shared_ptr last_focused_session_;
+
+ std::map< QDockWidget*, std::shared_ptr > view_docks_;
+
+ std::map< std::shared_ptr, QMainWindow*> session_windows_;
+
+ QWidget *static_tab_widget_;
+ QToolButton *new_session_button_, *run_stop_button_, *settings_button_;
+ QTabWidget session_selector_;
+ QSignalMapper session_state_mapper_;
- std::map< std::shared_ptr,
- std::shared_ptr > view_docks_;
+ QIcon icon_red_;
+ QIcon icon_green_;
+ QIcon icon_grey_;
- QAction *const action_view_sticky_scrolling_;
- QAction *const action_view_coloured_bg_;
- QAction *const action_about_;
+ QShortcut *view_sticky_scrolling_shortcut_;
+ QShortcut *view_show_sampling_points_shortcut_;
+ QShortcut *view_coloured_bg_shortcut_;
+ QShortcut *run_stop_shortcut_;
+ QShortcut *close_application_shortcut_;
+ QShortcut *close_current_tab_shortcut_;
};
} // namespace pv