projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Name session tabs "Session 1" per default.
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index 0f7ec6431705c010204628c89cc2edd13b7af093..d2653d26952c51f5078a18a17695deab5cfb01fe 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"
@@
-80,6
+80,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);
@@
-128,6
+130,8
@@
private Q_SLOTS:
void on_actionAbout_triggered();
void on_actionAbout_triggered();
+ void on_close_current_tab();
+
private:
DeviceManager &device_manager_;
private:
DeviceManager &device_manager_;
@@
-139,7
+143,7
@@
private:
std::map< std::shared_ptr<Session>, QMainWindow*> session_windows_;
QWidget *static_tab_widget_;
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_;
@@
-150,6
+154,10
@@
private:
QIcon icon_red_;
QIcon icon_green_;
QIcon icon_grey_;
QIcon icon_red_;
QIcon icon_green_;
QIcon icon_grey_;
+
+ QShortcut *run_stop_shortcut_;
+ QShortcut *close_application_shortcut_;
+ QShortcut *close_current_tab_shortcut_;
};
} // namespace pv
};
} // namespace pv