projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Improve view removal
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index 8ebf4a50bd3344518b991aea4bf9322ebeaa1835..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
@@
-80,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);
@@
-101,9
+102,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);
@@
-132,13
+133,14
@@
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_;
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_;