aboutsummaryrefslogtreecommitdiff
path: root/src/IconbarTool.cc
diff options
context:
space:
mode:
authorsimonb <simonb>2006-06-21 14:41:16 (GMT)
committersimonb <simonb>2006-06-21 14:41:16 (GMT)
commit3ada3b1f0d6d2debaaab48eecf828a406e964c8e (patch)
tree3c2f02462317408ee8604d0c7bb41092ecfd1c3a /src/IconbarTool.cc
parent62a298b0b30aa5b4990f462aece224e09e4fafe6 (diff)
downloadfluxbox_pavel-3ada3b1f0d6d2debaaab48eecf828a406e964c8e.zip
fluxbox_pavel-3ada3b1f0d6d2debaaab48eecf828a406e964c8e.tar.bz2
fix nls... notably classify text on conversion whether its for X or
console, plus handle catalogs better.
Diffstat (limited to 'src/IconbarTool.cc')
-rw-r--r--src/IconbarTool.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 6210d53..4dc6d24 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -243,65 +243,65 @@ void setupModeMenu(FbTk::Menu &menu, IconbarTool &handler) {
243 using namespace FbTk; 243 using namespace FbTk;
244 _FB_USES_NLS; 244 _FB_USES_NLS;
245 245
246 menu.setLabel(_FBTEXT(Toolbar, IconbarMode, "Iconbar Mode", "Menu title - chooses which set of icons are shown in the iconbar")); 246 menu.setLabel(_FB_XTEXT(Toolbar, IconbarMode, "Iconbar Mode", "Menu title - chooses which set of icons are shown in the iconbar"));
247 247
248 RefCount<Command> saverc_cmd(new FbCommands::SaveResources()); 248 RefCount<Command> saverc_cmd(new FbCommands::SaveResources());
249 249
250 250
251 menu.insert(new ToolbarModeMenuItem(_FBTEXT(Toolbar, IconbarModeNone, 251 menu.insert(new ToolbarModeMenuItem(_FB_XTEXT(Toolbar, IconbarModeNone,
252 "None", "No icons are shown in the iconbar"), 252 "None", "No icons are shown in the iconbar"),
253 handler, 253 handler,
254 IconbarTool::NONE, saverc_cmd)); 254 IconbarTool::NONE, saverc_cmd));
255 255
256 menu.insert(new ToolbarModeMenuItem( 256 menu.insert(new ToolbarModeMenuItem(
257 _FBTEXT(Toolbar, IconbarModeIcons, 257 _FB_XTEXT(Toolbar, IconbarModeIcons,
258 "Icons", "Iconified windows from all workspaces are shown"), 258 "Icons", "Iconified windows from all workspaces are shown"),
259 handler, 259 handler,
260 IconbarTool::ICONS, saverc_cmd)); 260 IconbarTool::ICONS, saverc_cmd));
261 261
262 menu.insert(new ToolbarModeMenuItem( 262 menu.insert(new ToolbarModeMenuItem(
263 _FBTEXT(Toolbar, IconbarModeNoIcons, 263 _FB_XTEXT(Toolbar, IconbarModeNoIcons,
264 "NoIcons", "No iconified windows from all workspaces are shown"), 264 "NoIcons", "No iconified windows from all workspaces are shown"),
265 handler, 265 handler,
266 IconbarTool::NOICONS, saverc_cmd)); 266 IconbarTool::NOICONS, saverc_cmd));
267 267
268 menu.insert(new ToolbarModeMenuItem( 268 menu.insert(new ToolbarModeMenuItem(
269 _FBTEXT(Toolbar, IconbarModeWorkspaceIcons, 269 _FB_XTEXT(Toolbar, IconbarModeWorkspaceIcons,
270 "WorkspaceIcons", "Iconified windows from this workspace are shown"), 270 "WorkspaceIcons", "Iconified windows from this workspace are shown"),
271 handler, 271 handler,
272 IconbarTool::WORKSPACEICONS, saverc_cmd)); 272 IconbarTool::WORKSPACEICONS, saverc_cmd));
273 273
274 menu.insert(new ToolbarModeMenuItem( 274 menu.insert(new ToolbarModeMenuItem(
275 _FBTEXT(Toolbar, IconbarModeWorkspaceNoIcons, 275 _FB_XTEXT(Toolbar, IconbarModeWorkspaceNoIcons,
276 "WorkspaceNoIcons", "No iconified windows from this workspace are shown"), 276 "WorkspaceNoIcons", "No iconified windows from this workspace are shown"),
277 handler, 277 handler,
278 IconbarTool::WORKSPACENOICONS, saverc_cmd)); 278 IconbarTool::WORKSPACENOICONS, saverc_cmd));
279 279
280 menu.insert(new ToolbarModeMenuItem( 280 menu.insert(new ToolbarModeMenuItem(
281 _FBTEXT(Toolbar, IconbarModeWorkspace, 281 _FB_XTEXT(Toolbar, IconbarModeWorkspace,
282 "Workspace", "Normal and iconified windows from this workspace are shown"), 282 "Workspace", "Normal and iconified windows from this workspace are shown"),
283 handler, 283 handler,
284 IconbarTool::WORKSPACE, saverc_cmd)); 284 IconbarTool::WORKSPACE, saverc_cmd));
285 285
286 menu.insert(new ToolbarModeMenuItem( 286 menu.insert(new ToolbarModeMenuItem(
287 _FBTEXT(Toolbar, IconbarModeAllWindows, "All Windows", "All windows are shown"), 287 _FB_XTEXT(Toolbar, IconbarModeAllWindows, "All Windows", "All windows are shown"),
288 handler, 288 handler,
289 IconbarTool::ALLWINDOWS, saverc_cmd)); 289 IconbarTool::ALLWINDOWS, saverc_cmd));
290 290
291 menu.insert(new FbTk::MenuSeparator()); 291 menu.insert(new FbTk::MenuSeparator());
292 292
293 menu.insert(new ToolbarAlignMenuItem( 293 menu.insert(new ToolbarAlignMenuItem(
294 _FBTEXT(Align, Left, "Left", "Align to the left"), 294 _FB_XTEXT(Align, Left, "Left", "Align to the left"),
295 handler, 295 handler,
296 Container::LEFT, saverc_cmd)); 296 Container::LEFT, saverc_cmd));
297 297
298 menu.insert(new ToolbarAlignMenuItem( 298 menu.insert(new ToolbarAlignMenuItem(
299 _FBTEXT(Align, Relative, "Relative", "Align relative to the width"), 299 _FB_XTEXT(Align, Relative, "Relative", "Align relative to the width"),
300 handler, 300 handler,
301 Container::RELATIVE, saverc_cmd)); 301 Container::RELATIVE, saverc_cmd));
302 302
303 menu.insert(new ToolbarAlignMenuItem( 303 menu.insert(new ToolbarAlignMenuItem(
304 _FBTEXT(Align, Right, "Right", "Align to the right"), 304 _FB_XTEXT(Align, Right, "Right", "Align to the right"),
305 handler, 305 handler,
306 Container::RIGHT, saverc_cmd)); 306 Container::RIGHT, saverc_cmd));
307 307
@@ -402,7 +402,7 @@ IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme, BScr
402 save_and_reconfig->add(reconfig); 402 save_and_reconfig->add(reconfig);
403 save_and_reconfig->add(save); 403 save_and_reconfig->add(save);
404 RefCount<Command> s_and_reconfig(save_and_reconfig); 404 RefCount<Command> s_and_reconfig(save_and_reconfig);
405 m_menu.insert(new BoolMenuItem(_FBTEXT(Toolbar, ShowIcons, "Show Pictures", "chooses if little icons are shown next to title in the iconbar") , 405 m_menu.insert(new BoolMenuItem(_FB_XTEXT(Toolbar, ShowIcons, "Show Pictures", "chooses if little icons are shown next to title in the iconbar") ,
406 *m_rc_use_pixmap, s_and_reconfig)); 406 *m_rc_use_pixmap, s_and_reconfig));
407 m_menu.updateMenu(); 407 m_menu.updateMenu();
408 // must be internal menu, otherwise toolbar main menu tries to delete it. 408 // must be internal menu, otherwise toolbar main menu tries to delete it.