#include "Workspace.h"
-Workspacemenu::Workspacemenu(BScreen *scrn) : Basemenu(scrn) {
- screen = scrn;
-
+Workspacemenu::Workspacemenu(BScreen &scrn) : Basemenu(scrn), screen(scrn) {
setInternalMenu();
- setLabel(i18n->getMessage(WorkspacemenuSet, WorkspacemenuWorkspacesTitle,
- "Workspaces"));
- insert(i18n->getMessage(WorkspacemenuSet, WorkspacemenuNewWorkspace,
- "New Workspace"));
- insert(i18n->getMessage(WorkspacemenuSet, WorkspacemenuRemoveLast,
- "Remove Last"));
+ setLabel(i18n(WorkspacemenuSet, WorkspacemenuWorkspacesTitle,
+ "Workspaces"));
+ insert(i18n(WorkspacemenuSet, WorkspacemenuNewWorkspace,
+ "New Workspace"));
+ insert(i18n(WorkspacemenuSet, WorkspacemenuRemoveLast,
+ "Remove Last"));
}
return;
if (index == 0)
- screen->addWorkspace();
+ screen.addWorkspace();
else if (index == 1)
- screen->removeLastWorkspace();
- else if ((screen->getCurrentWorkspace()->getWorkspaceID() !=
- (index - 2)) && ((index - 2) < screen->getCount()))
- screen->changeWorkspaceID(index - 2);
+ screen.removeLastWorkspace();
+ else if ((screen.getCurrentWorkspace()->getWorkspaceID() !=
+ (index - 2)) && ((index - 2) < screen.getWorkspaceCount()))
+ screen.changeWorkspaceID(index - 2);
- if (! (screen->getWorkspacemenu()->isTorn() || isTorn()))
+ if (! (screen.getWorkspacemenu()->isTorn() || isTorn()))
hide();
}