aboutsummaryrefslogtreecommitdiff
path: root/src/WorkspaceMenu.cc
diff options
context:
space:
mode:
authorrathnor <rathnor>2004-06-07 11:46:05 (GMT)
committerrathnor <rathnor>2004-06-07 11:46:05 (GMT)
commitfff4456dee29e675d7f2ed3490db39bcb7e10e53 (patch)
tree2d2dbf386551773cbdc8231b2a93b493187bd733 /src/WorkspaceMenu.cc
parent073065ac56b388db1169108d44f37d32f1d19c67 (diff)
downloadfluxbox_pavel-fff4456dee29e675d7f2ed3490db39bcb7e10e53.zip
fluxbox_pavel-fff4456dee29e675d7f2ed3490db39bcb7e10e53.tar.bz2
update NLS string handling...
Diffstat (limited to 'src/WorkspaceMenu.cc')
-rw-r--r--src/WorkspaceMenu.cc19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/WorkspaceMenu.cc b/src/WorkspaceMenu.cc
index 575ddeb..dd45b38 100644
--- a/src/WorkspaceMenu.cc
+++ b/src/WorkspaceMenu.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: WorkspaceMenu.cc,v 1.1 2004/05/02 20:51:36 fluxgen Exp $ 22// $Id: WorkspaceMenu.cc,v 1.2 2004/06/07 11:46:04 rathnor Exp $
23 23
24#include "WorkspaceMenu.hh" 24#include "WorkspaceMenu.hh"
25 25
@@ -27,8 +27,8 @@
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28#include "Workspace.hh" 28#include "Workspace.hh"
29#include "MenuCreator.hh" 29#include "MenuCreator.hh"
30#include "I18n.hh"
31 30
31#include "FbTk/I18n.hh"
32#include "FbTk/SimpleCommand.hh" 32#include "FbTk/SimpleCommand.hh"
33#include "FbTk/RefCount.hh" 33#include "FbTk/RefCount.hh"
34#include "FbTk/MenuItem.hh" 34#include "FbTk/MenuItem.hh"
@@ -84,21 +84,17 @@ void WorkspaceMenu::init(BScreen &screen) {
84 screen.currentWorkspaceSig().attach(this); 84 screen.currentWorkspaceSig().attach(this);
85 screen.workspaceCountSig().attach(this); 85 screen.workspaceCountSig().attach(this);
86 screen.workspaceNamesSig().attach(this); 86 screen.workspaceNamesSig().attach(this);
87 I18n &i18n = *I18n::instance();
88 using namespace FbTk; 87 using namespace FbTk;
89 using namespace FBNLS; 88 _FB_USES_NLS;
90 89
91 removeAll(); 90 removeAll();
92 91
93 setLabel(i18n.getMessage(WorkspacemenuSet, WorkspacemenuWorkspacesTitle, 92 setLabel(_FBTEXT(Workspace, MenuTitle, "Workspace", "Title of main workspace menu"));
94 "Workspace"));
95 RefCount<Command> new_workspace(new SimpleCommand<BScreen, int>(screen, &BScreen::addWorkspace)); 93 RefCount<Command> new_workspace(new SimpleCommand<BScreen, int>(screen, &BScreen::addWorkspace));
96 RefCount<Command> remove_last(new SimpleCommand<BScreen, int>(screen, &BScreen::removeLastWorkspace)); 94 RefCount<Command> remove_last(new SimpleCommand<BScreen, int>(screen, &BScreen::removeLastWorkspace));
97 insert(i18n.getMessage(WorkspacemenuSet, WorkspacemenuNewWorkspace, 95 insert(_FBTEXT(Workspace, NewWorkspace, "New Workspace", "Add a new workspace"),
98 "New Workspace"),
99 new_workspace); 96 new_workspace);
100 insert(i18n.getMessage(WorkspacemenuSet, WorkspacemenuRemoveLast, 97 insert(_FBTEXT(Workspace, RemoveLast, "Remove Last", "Remove the last workspace"),
101 "Remove Last"),
102 remove_last); 98 remove_last);
103 // for each workspace add workspace name and it's menu to our workspace menu 99 // for each workspace add workspace name and it's menu to our workspace menu
104 for (size_t workspace = 0; workspace < screen.getCount(); ++workspace) { 100 for (size_t workspace = 0; workspace < screen.getCount(); ++workspace) {
@@ -108,8 +104,7 @@ void WorkspaceMenu::init(BScreen &screen) {
108 } 104 }
109 setItemSelected(screen.currentWorkspace()->workspaceID() + 2, true); 105 setItemSelected(screen.currentWorkspace()->workspaceID() + 2, true);
110 106
111 insert(i18n.getMessage(IconSet, IconIcons, 107 insert(_FBTEXT(Menu, Icons, "Icons", "Iconic windows menu title"),
112 "Icons"),
113 MenuCreator::createMenuType("iconmenu", screen.screenNumber())); 108 MenuCreator::createMenuType("iconmenu", screen.screenNumber()));
114 FbMenu::update(); 109 FbMenu::update();
115} 110}