projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Settings: Activate first item upon dialog creation
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index 8ebf4a50bd3344518b991aea4bf9322ebeaa1835..50708c2035a9f1069545292e03a50d3f6017e34d 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
@@
-29,6
+28,7
@@
#include <QSignalMapper>
#include <QToolButton>
#include <QTabWidget>
#include <QSignalMapper>
#include <QToolButton>
#include <QTabWidget>
+#include <QShortcut>
#include "session.hpp"
#include "views/viewbase.hpp"
#include "session.hpp"
#include "views/viewbase.hpp"
@@
-71,15
+71,13
@@
public:
~MainWindow();
~MainWindow();
- QAction* action_view_sticky_scrolling() const;
- QAction* action_view_coloured_bg() const;
- QAction* action_about() const;
-
std::shared_ptr<views::ViewBase> get_active_view() const;
std::shared_ptr<views::ViewBase> add_view(const QString &title,
views::ViewType type, Session &session);
std::shared_ptr<views::ViewBase> get_active_view() const;
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);
@@
-101,9
+99,9
@@
private:
void session_error(const QString text, const QString info_text);
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 show_session_error(const QString text, const QString info_text);
-private Q_SLOTS:
void on_add_view(const QString &title, views::ViewType type,
Session *session);
void on_add_view(const QString &title, views::ViewType type,
Session *session);
@@
-112,6
+110,7
@@
private Q_SLOTS:
void on_new_session_clicked();
void on_run_stop_clicked();
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_session_name_changed();
void on_capture_state_changed(QObject *obj);
@@
-122,33
+121,38
@@
private Q_SLOTS:
void on_tab_changed(int index);
void on_tab_close_requested(int index);
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_actionViewColouredBg_triggered();
+ void on_settingViewColouredBg_changed(const QVariant new_value);
+ void on_settingViewStickyScrolling_changed(const QVariant new_value);
- void on_
actionAbout_triggered
();
+ void on_
close_current_tab
();
private:
DeviceManager &device_manager_;
std::list< std::shared_ptr<Session> > sessions_;
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_;
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_;
+ QToolButton *new_session_button_, *run_stop_button_
, *settings_button_
;
QTabWidget session_selector_;
QSignalMapper session_state_mapper_;
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_;
QIcon icon_red_;
QIcon icon_green_;
QIcon icon_grey_;
+
+ QShortcut *view_sticky_scrolling_shortcut_;
+ QShortcut *view_coloured_bg_shortcut_;
+ QShortcut *run_stop_shortcut_;
+ QShortcut *close_application_shortcut_;
+ QShortcut *close_current_tab_shortcut_;
};
} // namespace pv
};
} // namespace pv