X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fmainwindow.hpp;h=0611e0021c512e4c3fb7b654a5432bae168bc38d;hb=12ea3616767553ee0a615f14bbcb8ec614589e34;hp=0f7ec6431705c010204628c89cc2edd13b7af093;hpb=33bedfc1262f3a6772f6a741144baf90790297fb;p=pulseview.git
diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 0f7ec64..0611e00 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
@@ -29,10 +28,16 @@
#include
#include
#include
+#include
#include "session.hpp"
#include "views/viewbase.hpp"
+using std::list;
+using std::map;
+using std::shared_ptr;
+using std::string;
+
struct srd_decoder;
class QVBoxLayout;
@@ -65,24 +70,22 @@ private:
public:
explicit MainWindow(DeviceManager &device_manager,
- std::string open_file_name = std::string(),
- std::string open_file_format = std::string(),
+ string open_file_name = string(),
+ string open_file_format = string(),
QWidget *parent = 0);
~MainWindow();
- QAction* action_view_sticky_scrolling() const;
- QAction* action_view_coloured_bg() const;
- QAction* action_about() const;
-
- std::shared_ptr get_active_view() const;
+ shared_ptr get_active_view() const;
- std::shared_ptr add_view(const QString &title,
+ shared_ptr add_view(const QString &title,
views::ViewType type, Session &session);
- std::shared_ptr add_session();
+ void remove_view(shared_ptr view);
+
+ shared_ptr add_session();
- void remove_session(std::shared_ptr session);
+ void remove_session(shared_ptr session);
private:
void setup_ui();
@@ -91,7 +94,7 @@ private:
void restore_ui_settings();
- std::shared_ptr get_tab_session(int index) const;
+ shared_ptr get_tab_session(int index) const;
void closeEvent(QCloseEvent *event);
@@ -108,10 +111,11 @@ private Q_SLOTS:
Session *session);
void on_focus_changed();
- void on_focused_session_changed(std::shared_ptr session);
+ 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);
@@ -122,34 +126,40 @@ private Q_SLOTS:
void on_tab_changed(int index);
void on_tab_close_requested(int index);
- void on_actionViewStickyScrolling_triggered();
+ 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_;
+ list< shared_ptr > sessions_;
+ shared_ptr last_focused_session_;
- std::map< QDockWidget*, std::shared_ptr > view_docks_;
+ map< QDockWidget*, shared_ptr > view_docks_;
- std::map< std::shared_ptr, QMainWindow*> session_windows_;
+ map< shared_ptr, QMainWindow*> session_windows_;
QWidget *static_tab_widget_;
- QToolButton *new_session_button_, *run_stop_button_;
+ 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_;
+
+ 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