X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fimportmenu.cpp;h=e3034249769e66c73041b37af30fcab6f0ec1392;hp=a56bff7c3b4e448d025ef5c0a13afb3858937b29;hb=323715c41a09a1aba08f4b716e9d93da58f0f3a8;hpb=9448fb39f26b26f97fe39f734b1a882345a05692 diff --git a/pv/widgets/importmenu.cpp b/pv/widgets/importmenu.cpp index a56bff7..e303424 100644 --- 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 - * 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 . */ #include @@ -32,6 +31,7 @@ using std::map; using std::pair; using std::string; using std::shared_ptr; +using std::vector; using sigrok::Context; using sigrok::InputFormat; @@ -40,16 +40,23 @@ namespace pv { namespace widgets { ImportMenu::ImportMenu(QWidget *parent, shared_ptr context, - QAction *open_action) : + vectoropen_actions) : 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(); } @@ -85,5 +92,5 @@ void ImportMenu::on_action(QObject *action) format_selected((*iter).second); } -} // widgets -} // pv +} // namespace widgets +} // namespace pv