← Back to branch summary

~fluxbox-maintainers/fluxbox/debian

« back to all changes in this revision

Viewing changes to src/WorkspaceMenu.cc

  • Committer: Paul Tagliamonte
  • Date: 2015-02-18 19:26:13 UTC
  • Revision ID: git-v1:4decd3cfddc6edc7a655cc05d2216fda87f91a14
Update Fluxbox to 1.3.7

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/WorkspaceMenu.cc
60
60
        FbTk::MultiButtonMenuItem* submenu = new FbTk::MultiButtonMenuItem(5, FbTk::BiDiString(w->name()), &w->menu());
61
61
        FbTk::RefCount<FbTk::Command<void> > jump_cmd(new JumpToWorkspaceCmd(w->workspaceID()));
62
62
        submenu->setCommand(3, jump_cmd);
63
 
        menu.insert(submenu, i + IDX_AFTER_ICONS);
 
63
        menu.insertItem(submenu, i + IDX_AFTER_ICONS);
64
64
    }
65
65
}
66
66
 
111
111
    removeAll();
112
112
 
113
113
    setLabel(_FB_XTEXT(Workspace, MenuTitle, "Workspaces", "Title of main workspace menu"));
114
 
    insert(_FB_XTEXT(Menu, Icons, "Icons", "Iconic windows menu title"),
 
114
    insertSubmenu(_FB_XTEXT(Menu, Icons, "Icons", "Iconic windows menu title"),
115
115
           MenuCreator::createMenuType("iconmenu", screen.screenNumber()));
116
 
    insert(new FbTk::MenuSeparator());
 
116
    insertItem(new FbTk::MenuSeparator());
117
117
 
118
118
    ::add_workspaces(*this, screen);
119
119
    setItemSelected(screen.currentWorkspace()->workspaceID() + IDX_AFTER_ICONS, true);
134
134
 
135
135
    RefCount<Command<void> > start_edit(FbTk::CommandParser<void>::instance().parse("setworkspacenamedialog"));
136
136
 
137
 
    insert(new FbTk::MenuSeparator());
138
 
    insert(_FB_XTEXT(Workspace, NewWorkspace, "New Workspace", "Add a new workspace"), 
 
137
    insertItem(new FbTk::MenuSeparator());
 
138
    insertCommand(_FB_XTEXT(Workspace, NewWorkspace, "New Workspace", "Add a new workspace"), 
139
139
           new_workspace_cmd);
140
 
    insert(_FB_XTEXT(Toolbar, EditWkspcName, "Edit current workspace name", "Edit current workspace name"),
 
140
    insertCommand(_FB_XTEXT(Toolbar, EditWkspcName, "Edit current workspace name", "Edit current workspace name"),
141
141
           start_edit);
142
 
    insert(_FB_XTEXT(Workspace, RemoveLast, "Remove Last", "Remove the last workspace"), 
 
142
    insertCommand(_FB_XTEXT(Workspace, RemoveLast, "Remove Last", "Remove the last workspace"), 
143
143
          remove_last_cmd);
144
144
 
145
145
    updateMenu();