X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=06eba40ac212760373defba5fbdac8b7c46b9037;hb=63e9fa9d569cfa2f098054b49317b6030a425f17;hp=8dfe1bd00e5beaac8bcdaaea694c15618a24e01c;hpb=f1e2d26b867fc5ab5723d83c00bd9467add2f748;p=pulseview.git
diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 8dfe1bd0..06eba40a 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,12 +25,20 @@
#include
#include
-#include
+#include
+#include
#include
+#include
#include "session.hpp"
+#include "subwindows/subwindowbase.hpp"
#include "views/viewbase.hpp"
+using std::list;
+using std::map;
+using std::shared_ptr;
+using std::string;
+
struct srd_decoder;
class QVBoxLayout;
@@ -64,33 +71,41 @@ private:
public:
explicit MainWindow(DeviceManager &device_manager,
- std::string open_file_name = std::string(),
- std::string open_file_format = std::string(),
- QWidget *parent = 0);
+ QWidget *parent = nullptr);
~MainWindow();
- QAction* action_view_sticky_scrolling() const;
- QAction* action_view_coloured_bg() const;
- QAction* action_about() const;
+ static void show_session_error(const QString text, const QString info_text);
+
+ shared_ptr get_active_view() const;
+
+ shared_ptr add_view(views::ViewType type, Session &session);
+
+ void remove_view(shared_ptr view);
+
+ shared_ptr add_subwindow(
+ subwindows::SubWindowType type, Session &session);
- std::shared_ptr get_active_view() const;
+ shared_ptr add_session();
- std::shared_ptr add_view(const QString &title,
- views::ViewType type, Session &session);
+ void remove_session(shared_ptr session);
- std::shared_ptr add_session();
+ void add_session_with_file(string open_file_name, string open_file_format,
+ string open_setup_file_name);
- void remove_session(std::shared_ptr session);
+ void add_default_session();
+
+ void save_sessions();
+ void restore_sessions();
private:
void setup_ui();
void save_ui_settings();
-
void restore_ui_settings();
-private:
+ shared_ptr get_tab_session(int index) const;
+
void closeEvent(QCloseEvent *event);
virtual QMenu* createPopupMenu();
@@ -98,39 +113,61 @@ private:
virtual bool restoreState(const QByteArray &state, int version = 0);
private Q_SLOTS:
- void on_add_view(const QString &title, views::ViewType type,
- Session *session);
+ void on_add_view(views::ViewType type, Session *session);
void on_focus_changed();
+ void on_focused_session_changed(shared_ptr session);
void on_new_session_clicked();
+ void on_run_stop_clicked();
+ void on_settings_clicked();
+
void on_session_name_changed();
- void on_new_view(Session *session);
+ void on_capture_state_changed(QObject *obj);
+
+ void on_new_view(Session *session, int view_type);
void on_view_close_clicked();
+ void on_tab_changed(int index);
void on_tab_close_requested(int index);
- void on_actionViewStickyScrolling_triggered();
+ void on_show_decoder_selector(Session *session);
+ void on_sub_window_close_clicked();
- void on_actionViewColouredBg_triggered();
+ void on_view_colored_bg_shortcut();
+ void on_view_sticky_scrolling_shortcut();
+ void on_view_show_sampling_points_shortcut();
+ void on_view_show_analog_minor_grid_shortcut();
- void on_actionAbout_triggered();
+ void on_close_current_tab();
private:
DeviceManager &device_manager_;
- std::list< std::shared_ptr > sessions_;
+ list< shared_ptr > sessions_;
+ shared_ptr last_focused_session_;
- std::map< QDockWidget*, std::shared_ptr > view_docks_;
+ map< QDockWidget*, shared_ptr > view_docks_;
+ map< QDockWidget*, shared_ptr > sub_windows_;
- std::map< std::shared_ptr, QMainWindow*> session_windows_;
+ map< 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_;
-
- QAction *const action_view_sticky_scrolling_;
- QAction *const action_view_coloured_bg_;
- QAction *const action_about_;
+ QSignalMapper session_state_mapper_;
+
+ QIcon icon_red_;
+ QIcon icon_green_;
+ QIcon icon_grey_;
+
+ QShortcut *view_sticky_scrolling_shortcut_;
+ QShortcut *view_show_sampling_points_shortcut_;
+ QShortcut *view_show_analog_minor_grid_shortcut_;
+ QShortcut *view_colored_bg_shortcut_;
+ QShortcut *run_stop_shortcut_;
+ QShortcut *close_application_shortcut_;
+ QShortcut *close_current_tab_shortcut_;
};
} // namespace pv