X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=f11ed5db5834b5867a7d89275f8aeabf36dc6dfc;hp=2448a3570d45b9f10187a480d6ef7a85dcf5a83d;hb=ae5f66281c38a76dcb7011907d7a86a99b9dd4dd;hpb=cbf7b5db5c3c04b95daf77bc0e6dc112c15e0195

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 2448a357..f11ed5db 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 <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PULSEVIEW_PV_MAINWINDOW_HPP
@@ -26,6 +25,8 @@
 #include <memory>
 
 #include <QMainWindow>
+#include <QSignalMapper>
+#include <QToolButton>
 #include <QTabWidget>
 
 #include "session.hpp"
@@ -89,24 +90,37 @@ private:
 
 	void restore_ui_settings();
 
-private:
+	std::shared_ptr<Session> 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 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> session);
+
+	void on_new_session_clicked();
+	void on_run_stop_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_tab_changed(int index);
+	void on_tab_close_requested(int index);
+
 	void on_actionViewStickyScrolling_triggered();
 
 	void on_actionViewColouredBg_triggered();
@@ -117,16 +131,24 @@ 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_;
 
+	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