projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix variable naming
[pulseview.git]
/
pv
/
toolbars
/
mainbar.hpp
diff --git
a/pv/toolbars/mainbar.hpp
b/pv/toolbars/mainbar.hpp
index a47288c736c022b415e5cece48fd9bb81ac68197..bc0c2dfdd528c11c6bfba37c499ae5078ab7cfeb 100644
(file)
--- a/
pv/toolbars/mainbar.hpp
+++ b/
pv/toolbars/mainbar.hpp
@@
-14,15
+14,13
@@
* 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_TOOLBARS_MAINBAR_HPP
#define PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
*/
#ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
#define PULSEVIEW_PV_TOOLBARS_MAINBAR_HPP
-#include <stdint.h>
-
+#include <cstdint>
#include <list>
#include <memory>
#include <list>
#include <memory>
@@
-40,13
+38,15
@@
#include <pv/widgets/popuptoolbutton.hpp>
#include <pv/widgets/sweeptimingwidget.hpp>
#include <pv/widgets/popuptoolbutton.hpp>
#include <pv/widgets/sweeptimingwidget.hpp>
+using std::shared_ptr;
+
namespace sigrok {
class Device;
class InputFormat;
class OutputFormat;
}
namespace sigrok {
class Device;
class InputFormat;
class OutputFormat;
}
-Q_DECLARE_METATYPE(s
td::s
hared_ptr<sigrok::Device>)
+Q_DECLARE_METATYPE(shared_ptr<sigrok::Device>)
class QAction;
class QAction;
@@
-56,7
+56,7
@@
class MainWindow;
class Session;
namespace views {
class Session;
namespace views {
-namespace
TraceView
{
+namespace
trace
{
class View;
}
}
class View;
}
}
@@
-86,7
+86,7
@@
private:
public:
MainBar(Session &session, QWidget *parent,
public:
MainBar(Session &session, QWidget *parent,
- pv::views::
TraceView
::View *view);
+ pv::views::
trace
::View *view);
void update_device_list();
void update_device_list();
@@
-98,10
+98,10
@@
public:
QAction* action_open() const;
QAction* action_save_as() const;
QAction* action_save_selection_as() const;
QAction* action_open() const;
QAction* action_save_as() const;
QAction* action_save_selection_as() const;
+ QAction* action_restore_setup() const;
+ QAction* action_save_setup() const;
QAction* action_connect() const;
QAction* action_connect() const;
- void session_error(const QString text, const QString info_text);
-
private:
void run_stop();
private:
void run_stop();
@@
-120,16
+120,16
@@
private:
QAction *const action_open_;
QAction *const action_save_as_;
QAction *const action_save_selection_as_;
QAction *const action_open_;
QAction *const action_save_as_;
QAction *const action_save_selection_as_;
+ QAction *const action_restore_setup_;
+ QAction *const action_save_setup_;
QAction *const action_connect_;
private Q_SLOTS:
void show_session_error(const QString text, const QString info_text);
QAction *const action_connect_;
private Q_SLOTS:
void show_session_error(const QString text, const QString info_text);
- void add_decoder(srd_decoder *decoder);
-
- void export_file(std::shared_ptr<sigrok::OutputFormat> format,
+ void export_file(shared_ptr<sigrok::OutputFormat> format,
bool selection_only = false);
bool selection_only = false);
- void import_file(s
td::s
hared_ptr<sigrok::InputFormat> format);
+ void import_file(shared_ptr<sigrok::InputFormat> format);
void on_device_selected();
void on_device_changed();
void on_device_selected();
void on_device_changed();
@@
-145,8
+145,13
@@
private Q_SLOTS:
void on_actionSaveAs_triggered();
void on_actionSaveSelectionAs_triggered();
void on_actionSaveAs_triggered();
void on_actionSaveSelectionAs_triggered();
+ void on_actionSaveSetup_triggered();
+ void on_actionRestoreSetup_triggered();
+
void on_actionConnect_triggered();
void on_actionConnect_triggered();
+ void on_add_decoder_clicked();
+
protected:
void add_toolbar_widgets();
protected:
void add_toolbar_widgets();
@@
-154,6
+159,7
@@
protected:
Q_SIGNALS:
void new_view(Session *session);
Q_SIGNALS:
void new_view(Session *session);
+ void show_decoder_selector(Session *session);
private:
QToolButton *open_button_, *save_button_;
private:
QToolButton *open_button_, *save_button_;
@@
-175,7
+181,6
@@
private:
#ifdef ENABLE_DECODE
QToolButton *add_decoder_button_;
#ifdef ENABLE_DECODE
QToolButton *add_decoder_button_;
- QMenu *const menu_decoders_add_;
#endif
};
#endif
};