X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fmainwindow.hpp;h=f11ed5db5834b5867a7d89275f8aeabf36dc6dfc;hb=ae5f66281c38a76dcb7011907d7a86a99b9dd4dd;hp=9d5b04125416e17ea24da97e065b03e67f47c359;hpb=e7aff437662e4a7dc891952bcb632d67c457d689;p=pulseview.git
diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 9d5b041..f11ed5d 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,6 +25,7 @@
#include
#include
+#include
#include
#include
@@ -92,14 +92,17 @@ private:
std::shared_ptr 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 +110,11 @@ private Q_SLOTS:
void on_focused_session_changed(std::shared_ptr 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();
@@ -124,17 +131,24 @@ 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_;
- 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_;
};
} // namespace pv