projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pulseview_cross.nsi.in: Bump Python version to 3.6.
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index 37954fe85ac8e0006c78916737fe8aadbe47ac6d..93945d189f11c25f60361dfbce6a808d5280139b 100644
(file)
--- 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
* 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
*/
#ifndef PULSEVIEW_PV_MAINWINDOW_HPP
@@
-26,6
+25,8
@@
#include <memory>
#include <QMainWindow>
#include <memory>
#include <QMainWindow>
+#include <QSignalMapper>
+#include <QToolButton>
#include <QTabWidget>
#include "session.hpp"
#include <QTabWidget>
#include "session.hpp"
@@
-78,6
+79,8
@@
public:
std::shared_ptr<views::ViewBase> add_view(const QString &title,
views::ViewType type, Session &session);
std::shared_ptr<views::ViewBase> add_view(const QString &title,
views::ViewType type, Session &session);
+ void remove_view(std::shared_ptr<views::ViewBase> view);
+
std::shared_ptr<Session> add_session();
void remove_session(std::shared_ptr<Session> session);
std::shared_ptr<Session> add_session();
void remove_session(std::shared_ptr<Session> session);
@@
-89,24
+92,35
@@
private:
void restore_ui_settings();
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 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:
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_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_session_name_changed();
+ void on_capture_state_changed(QObject *obj);
+
void on_new_view(Session *session);
void on_view_close_clicked();
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_tab_close_requested(int index);
void on_actionViewStickyScrolling_triggered();
@@
-119,16
+133,24
@@
private:
DeviceManager &device_manager_;
std::list< std::shared_ptr<Session> > sessions_;
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_;
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_;
QTabWidget session_selector_;
+ QSignalMapper session_state_mapper_;
QAction *const action_view_sticky_scrolling_;
QAction *const action_view_coloured_bg_;
QAction *const action_about_;
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
};
} // namespace pv