Merge branch 'master' into 'gtk3'
This commit is contained in:
@@ -224,11 +224,9 @@ FileBrowser::FileBrowser ()
|
||||
mMenuExtProgs.clear();
|
||||
amiExtProg = NULL;
|
||||
|
||||
for (std::list<ExtProgAction*>::iterator it = extProgStore->lActions.begin(); it != extProgStore->lActions.end(); it++) {
|
||||
ExtProgAction* pAct = *it;
|
||||
|
||||
if (pAct->target == 1 || pAct->target == 2) {
|
||||
mMenuExtProgs[pAct->GetFullName()] = pAct;
|
||||
for (const auto& action : extProgStore->getActions ()) {
|
||||
if (action.target == 1 || action.target == 2) {
|
||||
mMenuExtProgs[action.getFullName ()] = &action;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -247,7 +245,7 @@ FileBrowser::FileBrowser ()
|
||||
p++;
|
||||
}
|
||||
|
||||
for (std::map<Glib::ustring, ExtProgAction*>::iterator it = mMenuExtProgs.begin(); it != mMenuExtProgs.end(); it++, itemNo++) {
|
||||
for (auto it = mMenuExtProgs.begin(); it != mMenuExtProgs.end(); it++, itemNo++) {
|
||||
submenuExtProg->attach (*Gtk::manage(amiExtProg[itemNo] = new Gtk::MenuItem ((*it).first)), 0, 1, p, p + 1);
|
||||
p++;
|
||||
}
|
||||
@@ -260,7 +258,7 @@ FileBrowser::FileBrowser ()
|
||||
p++;
|
||||
}
|
||||
|
||||
for (std::map<Glib::ustring, ExtProgAction*>::iterator it = mMenuExtProgs.begin(); it != mMenuExtProgs.end(); it++, itemNo++) {
|
||||
for (auto it = mMenuExtProgs.begin(); it != mMenuExtProgs.end(); it++, itemNo++) {
|
||||
pmenu->attach (*Gtk::manage(amiExtProg[itemNo] = new Gtk::MenuItem ((*it).first)), 0, 1, p, p + 1);
|
||||
p++;
|
||||
}
|
||||
@@ -736,7 +734,7 @@ void FileBrowser::menuItemActivated (Gtk::MenuItem* m)
|
||||
|
||||
for (int j = 0; j < mMenuExtProgs.size(); j++) {
|
||||
if (m == amiExtProg[j]) {
|
||||
ExtProgAction* pAct = mMenuExtProgs[m->get_label()];
|
||||
const auto pAct = mMenuExtProgs[m->get_label()];
|
||||
|
||||
// Build vector of all file names
|
||||
std::vector<Glib::ustring> selFileNames;
|
||||
@@ -752,7 +750,7 @@ void FileBrowser::menuItemActivated (Gtk::MenuItem* m)
|
||||
selFileNames.push_back(fn);
|
||||
}
|
||||
|
||||
pAct->Execute(selFileNames);
|
||||
pAct->execute (selFileNames);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user