X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=6d92b270dc6394f4fd5c2a66bb604766044b8c98;hp=485b7b6df18243e8a7aa2085290639b86e6268e5;hb=16a832bc5bb4cce24598537c99e0655edb65c1d0;hpb=0f8f8c180b32413177f3940ea6f216d1cbadf09b
diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 485b7b6d..6d92b270 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,19 @@
#include
#include
+#include
+#include
+#include
+#include
+#include "globalsettings.hpp"
#include "session.hpp"
-#include "view/viewwidget.hpp"
+#include "views/viewbase.hpp"
+
+using std::list;
+using std::map;
+using std::shared_ptr;
+using std::string;
struct srd_decoder;
@@ -53,35 +62,49 @@ class DecoderMenu;
#endif
}
-class MainWindow : public QMainWindow
+class MainWindow : public QMainWindow, public GlobalSettingsInterface
{
Q_OBJECT
+private:
+ static const QString WindowTitle;
+
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(const QString &title,
+ views::ViewType type, Session &session);
+
+ void remove_view(shared_ptr view);
- std::shared_ptr get_active_view() const;
+ shared_ptr add_session();
- std::shared_ptr add_view(const QString &title,
- view::ViewType type, Session &session);
+ void remove_session(shared_ptr session);
+
+ void add_session_with_file(string open_file_name, string open_file_format);
+
+ void add_default_session();
+
+ void save_sessions();
+ void restore_sessions();
+
+ void on_setting_changed(const QString &key, const QVariant &value);
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();
@@ -89,25 +112,62 @@ private:
virtual bool restoreState(const QByteArray &state, int version = 0);
private Q_SLOTS:
- void on_actionViewStickyScrolling_triggered();
+ void on_add_view(const QString &title, 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_capture_state_changed(QObject *obj);
- void on_actionViewColouredBg_triggered();
+ void on_new_view(Session *session);
+ void on_view_close_clicked();
- void on_actionAbout_triggered();
+ void on_tab_changed(int index);
+ void on_tab_close_requested(int index);
+
+ 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_settingViewColoredBg_changed(const QVariant new_value);
+ void on_settingViewShowSamplingPoints_changed(const QVariant new_value);
+ void on_settingViewShowAnalogMinorGrid_changed(const QVariant new_value);
+
+ void on_close_current_tab();
private:
DeviceManager &device_manager_;
- Session session_;
+ list< shared_ptr > sessions_;
+ shared_ptr last_focused_session_;
+
+ map< QDockWidget*, shared_ptr > view_docks_;
+
+ map< shared_ptr, QMainWindow*> session_windows_;
- std::map< std::shared_ptr,
- std::shared_ptr > view_docks_;
+ QWidget *static_tab_widget_;
+ QToolButton *new_session_button_, *run_stop_button_, *settings_button_;
+ QTabWidget session_selector_;
+ QSignalMapper session_state_mapper_;
- std::string open_file_name_, open_file_format_;
+ 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_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