projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build without decoders enabled
[pulseview.git]
/
pv
/
widgets
/
importmenu.cpp
diff --git
a/pv/widgets/importmenu.cpp
b/pv/widgets/importmenu.cpp
index 72fb557c1f56e1b2262d3ae510763eb9f42f7f0c..e3034249769e66c73041b37af30fcab6f0ec1392 100644
(file)
--- a/
pv/widgets/importmenu.cpp
+++ b/
pv/widgets/importmenu.cpp
@@
-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/>.
*/
#include <algorithm>
*/
#include <algorithm>
@@
-23,7
+22,7
@@
#include <string>
#include <utility>
#include <string>
#include <utility>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include "importmenu.hpp"
#include "importmenu.hpp"
@@
-32,6
+31,7
@@
using std::map;
using std::pair;
using std::string;
using std::shared_ptr;
using std::pair;
using std::string;
using std::shared_ptr;
+using std::vector;
using sigrok::Context;
using sigrok::InputFormat;
using sigrok::Context;
using sigrok::InputFormat;
@@
-40,16
+40,23
@@
namespace pv {
namespace widgets {
ImportMenu::ImportMenu(QWidget *parent, shared_ptr<Context> context,
namespace widgets {
ImportMenu::ImportMenu(QWidget *parent, shared_ptr<Context> context,
-
QAction *open_action
) :
+
vector<QAction *>open_actions
) :
QMenu(parent),
context_(context),
mapper_(this)
{
assert(context);
QMenu(parent),
context_(context),
mapper_(this)
{
assert(context);
- if (open_action) {
- addAction(open_action);
- setDefaultAction(open_action);
+ if (!open_actions.empty()) {
+ bool first_action = true;
+ for (auto open_action : open_actions) {
+ addAction(open_action);
+
+ if (first_action) {
+ first_action = false;
+ setDefaultAction(open_action);
+ }
+ }
addSeparator();
}
addSeparator();
}
@@
-85,5
+92,5
@@
void ImportMenu::on_action(QObject *action)
format_selected((*iter).second);
}
format_selected((*iter).second);
}
-}
//
widgets
-}
//
pv
+}
// namespace
widgets
+}
// namespace
pv