aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.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/Screen.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/Screen.cc')
-rw-r--r--src/Screen.cc56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index a382e89..a723f3c 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -147,7 +147,7 @@ namespace {
147 147
148int anotherWMRunning(Display *display, XErrorEvent *) { 148int anotherWMRunning(Display *display, XErrorEvent *) {
149 _FB_USES_NLS; 149 _FB_USES_NLS;
150 cerr<<_FBTEXT(Screen, AnotherWMRunning, 150 cerr<<_FB_CONSOLETEXT(Screen, AnotherWMRunning,
151 "BScreen::BScreen: an error occured while querying the X server.\n" 151 "BScreen::BScreen: an error occured while querying the X server.\n"
152 " another window manager already running on display ", 152 " another window manager already running on display ",
153 "Message when another WM is found already active on all screens") 153 "Message when another WM is found already active on all screens")
@@ -360,7 +360,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
360 360
361 _FB_USES_NLS; 361 _FB_USES_NLS;
362 362
363 fprintf(stderr, _FBTEXT(Screen, ManagingScreen, 363 fprintf(stderr, _FB_CONSOLETEXT(Screen, ManagingScreen,
364 "BScreen::BScreen: managing screen %d " 364 "BScreen::BScreen: managing screen %d "
365 "using visual 0x%lx, depth %d\n", 365 "using visual 0x%lx, depth %d\n",
366 "informational message saying screen number (%d), visual (%lx), and colour depth (%d)").c_str(), 366 "informational message saying screen number (%d), visual (%lx), and colour depth (%d)").c_str(),
@@ -428,7 +428,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
428 // own resources we must do this. 428 // own resources we must do this.
429 fluxbox->load_rc(*this); 429 fluxbox->load_rc(*this);
430 430
431 m_configmenu.reset(createMenu(_FBTEXT(Menu, Configuration, 431 m_configmenu.reset(createMenu(_FB_XTEXT(Menu, Configuration,
432 "Configuration", "Title of configuration menu"))); 432 "Configuration", "Title of configuration menu")));
433 setupConfigmenu(*m_configmenu.get()); 433 setupConfigmenu(*m_configmenu.get());
434 m_configmenu->setInternalMenu(); 434 m_configmenu->setInternalMenu();
@@ -1525,15 +1525,15 @@ void BScreen::initMenu() {
1525 1525
1526 if (m_rootmenu.get() == 0) { 1526 if (m_rootmenu.get() == 0) {
1527 _FB_USES_NLS; 1527 _FB_USES_NLS;
1528 m_rootmenu.reset(createMenu(_FBTEXT(Menu, DefaultRootMenu, "Fluxbox default menu", "Title of fallback root menu"))); 1528 m_rootmenu.reset(createMenu(_FB_XTEXT(Menu, DefaultRootMenu, "Fluxbox default menu", "Title of fallback root menu")));
1529 FbTk::RefCount<FbTk::Command> restart_fb(CommandParser::instance().parseLine("restart")); 1529 FbTk::RefCount<FbTk::Command> restart_fb(CommandParser::instance().parseLine("restart"));
1530 FbTk::RefCount<FbTk::Command> exit_fb(CommandParser::instance().parseLine("exit")); 1530 FbTk::RefCount<FbTk::Command> exit_fb(CommandParser::instance().parseLine("exit"));
1531 FbTk::RefCount<FbTk::Command> execute_xterm(CommandParser::instance().parseLine("exec xterm")); 1531 FbTk::RefCount<FbTk::Command> execute_xterm(CommandParser::instance().parseLine("exec xterm"));
1532 m_rootmenu->setInternalMenu(); 1532 m_rootmenu->setInternalMenu();
1533 m_rootmenu->insert("xterm", execute_xterm); 1533 m_rootmenu->insert("xterm", execute_xterm);
1534 m_rootmenu->insert(_FBTEXT(Menu, Restart, "Restart", "Restart command"), 1534 m_rootmenu->insert(_FB_XTEXT(Menu, Restart, "Restart", "Restart command"),
1535 restart_fb); 1535 restart_fb);
1536 m_rootmenu->insert(_FBTEXT(Menu, Exit, "Exit", "Exit command"), 1536 m_rootmenu->insert(_FB_XTEXT(Menu, Exit, "Exit", "Exit command"),
1537 exit_fb); 1537 exit_fb);
1538 } 1538 }
1539 1539
@@ -1587,16 +1587,16 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
1587 // create focus menu 1587 // create focus menu
1588 // we don't set this to internal menu so will 1588 // we don't set this to internal menu so will
1589 // be deleted toghether with the parent 1589 // be deleted toghether with the parent
1590 FbTk::FbString focusmenu_label = _FBTEXT(Configmenu, FocusModel, 1590 FbTk::FbString focusmenu_label = _FB_XTEXT(Configmenu, FocusModel,
1591 "Focus Model", 1591 "Focus Model",
1592 "Method used to give focus to windows"); 1592 "Method used to give focus to windows");
1593 FbTk::Menu *focus_menu = createMenu(focusmenu_label); 1593 FbTk::Menu *focus_menu = createMenu(focusmenu_label);
1594 1594
1595#define _BOOLITEM(m,a, b, c, d, e, f) (m).insert(new BoolMenuItem(_FBTEXT(a, b, c, d), e, f)) 1595#define _BOOLITEM(m,a, b, c, d, e, f) (m).insert(new BoolMenuItem(_FB_XTEXT(a, b, c, d), e, f))
1596 1596
1597 1597
1598#define _FOCUSITEM(a, b, c, d, e) \ 1598#define _FOCUSITEM(a, b, c, d, e) \
1599 focus_menu->insert(new FocusModelMenuItem(_FBTEXT(a, b, c, d), focusControl(), \ 1599 focus_menu->insert(new FocusModelMenuItem(_FB_XTEXT(a, b, c, d), focusControl(), \
1600 e, save_and_reconfigure)) 1600 e, save_and_reconfigure))
1601 1601
1602 _FOCUSITEM(Configmenu, ClickFocus, 1602 _FOCUSITEM(Configmenu, ClickFocus,
@@ -1615,7 +1615,7 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
1615 save_and_reconfigure)); 1615 save_and_reconfigure));
1616 1616
1617 1617
1618 focus_menu->insert(new BoolMenuItem(_FBTEXT(Configmenu, 1618 focus_menu->insert(new BoolMenuItem(_FB_XTEXT(Configmenu,
1619 AutoRaise, 1619 AutoRaise,
1620 "Auto Raise", 1620 "Auto Raise",
1621 "Auto Raise windows on sloppy"), 1621 "Auto Raise windows on sloppy"),
@@ -1630,11 +1630,11 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
1630 1630
1631 // BEGIN tab menu 1631 // BEGIN tab menu
1632 1632
1633 FbTk::FbString tabmenu_label = _FBTEXT(Configmenu, TabMenu, 1633 FbTk::FbString tabmenu_label = _FB_XTEXT(Configmenu, TabMenu,
1634 "Tab Options", 1634 "Tab Options",
1635 "heading for tab-related options"); 1635 "heading for tab-related options");
1636 FbTk::Menu *tab_menu = createMenu(tabmenu_label); 1636 FbTk::Menu *tab_menu = createMenu(tabmenu_label);
1637 FbTk::FbString tabplacement_label = _FBTEXT(Menu, Placement, "Placement", "Title of Placement menu"); 1637 FbTk::FbString tabplacement_label = _FB_XTEXT(Menu, Placement, "Placement", "Title of Placement menu");
1638 FbTk::Menu *tabplacement_menu = createToggleMenu(tabplacement_label); 1638 FbTk::Menu *tabplacement_menu = createToggleMenu(tabplacement_label);
1639 1639
1640 tab_menu->insert(tabplacement_label, tabplacement_menu); 1640 tab_menu->insert(tabplacement_label, tabplacement_menu);
@@ -1644,7 +1644,7 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
1644 *resource.default_internal_tabs, save_and_reconftabs); 1644 *resource.default_internal_tabs, save_and_reconftabs);
1645 1645
1646 FbTk::MenuItem *tab_width_item = 1646 FbTk::MenuItem *tab_width_item =
1647 new IntResMenuItem(_FBTEXT(Configmenu, ExternalTabWidth, 1647 new IntResMenuItem(_FB_XTEXT(Configmenu, ExternalTabWidth,
1648 "External Tab Width", 1648 "External Tab Width",
1649 "Width of external-style tabs"), 1649 "Width of external-style tabs"),
1650 resource.tab_width, 10, 3000, /* silly number */ 1650 resource.tab_width, 10, 3000, /* silly number */
@@ -1658,14 +1658,14 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
1658 Placements place_menu; 1658 Placements place_menu;
1659 1659
1660 // menu is 2 wide, 2 down 1660 // menu is 2 wide, 2 down
1661 place_menu.push_back(PlacementP(_FBTEXT(Align, TopLeft, "Top Left", "Top Left"), FbWinFrame::TOPLEFT)); 1661 place_menu.push_back(PlacementP(_FB_XTEXT(Align, TopLeft, "Top Left", "Top Left"), FbWinFrame::TOPLEFT));
1662 place_menu.push_back(PlacementP(_FBTEXT(Align, LeftTop, "Left Top", "Left Top"), FbWinFrame::LEFTTOP)); 1662 place_menu.push_back(PlacementP(_FB_XTEXT(Align, LeftTop, "Left Top", "Left Top"), FbWinFrame::LEFTTOP));
1663 place_menu.push_back(PlacementP(_FBTEXT(Align, LeftBottom, "Left Bottom", "Left Bottom"), FbWinFrame::LEFTBOTTOM)); 1663 place_menu.push_back(PlacementP(_FB_XTEXT(Align, LeftBottom, "Left Bottom", "Left Bottom"), FbWinFrame::LEFTBOTTOM));
1664 place_menu.push_back(PlacementP(_FBTEXT(Align, BottomLeft, "Bottom Left", "Bottom Left"), FbWinFrame::BOTTOMLEFT)); 1664 place_menu.push_back(PlacementP(_FB_XTEXT(Align, BottomLeft, "Bottom Left", "Bottom Left"), FbWinFrame::BOTTOMLEFT));
1665 place_menu.push_back(PlacementP(_FBTEXT(Align, TopRight, "Top Right", "Top Right"), FbWinFrame::TOPRIGHT)); 1665 place_menu.push_back(PlacementP(_FB_XTEXT(Align, TopRight, "Top Right", "Top Right"), FbWinFrame::TOPRIGHT));
1666 place_menu.push_back(PlacementP(_FBTEXT(Align, RightTop, "Right Top", "Right Top"), FbWinFrame::RIGHTTOP)); 1666 place_menu.push_back(PlacementP(_FB_XTEXT(Align, RightTop, "Right Top", "Right Top"), FbWinFrame::RIGHTTOP));
1667 place_menu.push_back(PlacementP(_FBTEXT(Align, RightBottom, "Right Bottom", "Right Bottom"), FbWinFrame::RIGHTBOTTOM)); 1667 place_menu.push_back(PlacementP(_FB_XTEXT(Align, RightBottom, "Right Bottom", "Right Bottom"), FbWinFrame::RIGHTBOTTOM));
1668 place_menu.push_back(PlacementP(_FBTEXT(Align, BottomRight, "Bottom Right", "Bottom Right"), FbWinFrame::BOTTOMRIGHT)); 1668 place_menu.push_back(PlacementP(_FB_XTEXT(Align, BottomRight, "Bottom Right", "Bottom Right"), FbWinFrame::BOTTOMRIGHT));
1669 1669
1670 tabplacement_menu->setMinimumSublevels(2); 1670 tabplacement_menu->setMinimumSublevels(2);
1671 // create items in sub menu 1671 // create items in sub menu
@@ -1733,20 +1733,20 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
1733 if (FbTk::Transparent::haveRender() || 1733 if (FbTk::Transparent::haveRender() ||
1734 FbTk::Transparent::haveComposite()) { 1734 FbTk::Transparent::haveComposite()) {
1735 1735
1736 FbTk::FbString alphamenu_label = _FBTEXT(Configmenu, Transparency, 1736 FbTk::FbString alphamenu_label = _FB_XTEXT(Configmenu, Transparency,
1737 "Transparency", 1737 "Transparency",
1738 "Menu containing various transparency options"); 1738 "Menu containing various transparency options");
1739 FbTk::Menu *alpha_menu = createMenu(alphamenu_label); 1739 FbTk::Menu *alpha_menu = createMenu(alphamenu_label);
1740 1740
1741 if (FbTk::Transparent::haveComposite(true)) { 1741 if (FbTk::Transparent::haveComposite(true)) {
1742 alpha_menu->insert(new BoolMenuItem(_FBTEXT(Configmenu, ForcePseudoTrans, 1742 alpha_menu->insert(new BoolMenuItem(_FB_XTEXT(Configmenu, ForcePseudoTrans,
1743 "Force Pseudo-Transparency", 1743 "Force Pseudo-Transparency",
1744 "When composite is available, still use old pseudo-transparency"), 1744 "When composite is available, still use old pseudo-transparency"),
1745 Fluxbox::instance()->getPseudoTrans(), save_and_reconfigure)); 1745 Fluxbox::instance()->getPseudoTrans(), save_and_reconfigure));
1746 } 1746 }
1747 1747
1748 FbTk::MenuItem *focused_alpha_item = 1748 FbTk::MenuItem *focused_alpha_item =
1749 new IntResMenuItem(_FBTEXT(Configmenu, FocusedAlpha, 1749 new IntResMenuItem(_FB_XTEXT(Configmenu, FocusedAlpha,
1750 "Focused Window Alpha", 1750 "Focused Window Alpha",
1751 "Transparency level of the focused window"), 1751 "Transparency level of the focused window"),
1752 resource.focused_alpha, 0, 255, *alpha_menu); 1752 resource.focused_alpha, 0, 255, *alpha_menu);
@@ -1754,7 +1754,7 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
1754 alpha_menu->insert(focused_alpha_item); 1754 alpha_menu->insert(focused_alpha_item);
1755 1755
1756 FbTk::MenuItem *unfocused_alpha_item = 1756 FbTk::MenuItem *unfocused_alpha_item =
1757 new IntResMenuItem(_FBTEXT(Configmenu, 1757 new IntResMenuItem(_FB_XTEXT(Configmenu,
1758 UnfocusedAlpha, 1758 UnfocusedAlpha,
1759 "Unfocused Window Alpha", 1759 "Unfocused Window Alpha",
1760 "Transparency level of unfocused windows"), 1760 "Transparency level of unfocused windows"),
@@ -1764,7 +1764,7 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
1764 alpha_menu->insert(unfocused_alpha_item); 1764 alpha_menu->insert(unfocused_alpha_item);
1765 1765
1766 FbTk::MenuItem *menu_alpha_item = 1766 FbTk::MenuItem *menu_alpha_item =
1767 new IntResMenuItem(_FBTEXT(Configmenu, MenuAlpha, 1767 new IntResMenuItem(_FB_XTEXT(Configmenu, MenuAlpha,
1768 "Menu Alpha", "Transparency level of menu"), 1768 "Menu Alpha", "Transparency level of menu"),
1769 resource.menu_alpha, 0, 255, *alpha_menu); 1769 resource.menu_alpha, 0, 255, *alpha_menu);
1770 menu_alpha_item->setCommand(saverc_cmd); 1770 menu_alpha_item->setCommand(saverc_cmd);
@@ -1862,7 +1862,7 @@ void BScreen::showGeometry(unsigned int gx, unsigned int gy) {
1862 _FB_USES_NLS; 1862 _FB_USES_NLS;
1863 1863
1864 sprintf(label, 1864 sprintf(label,
1865 _FBTEXT(Screen, GeometryFormat, 1865 _FB_XTEXT(Screen, GeometryFormat,
1866 "W: %4d x H: %4d", 1866 "W: %4d x H: %4d",
1867 "Format for width and height window, %4d for width, and %4d for height").c_str(), 1867 "Format for width and height window, %4d for width, and %4d for height").c_str(),
1868 gx, gy); 1868 gx, gy);
@@ -1929,7 +1929,7 @@ void BScreen::renderGeomWindow() {
1929 _FB_USES_NLS; 1929 _FB_USES_NLS;
1930 1930
1931 sprintf(label, 1931 sprintf(label,
1932 _FBTEXT(Screen, GeometryFormat, 1932 _FB_XTEXT(Screen, GeometryFormat,
1933 "W: %04d x H: %04d", "Representative maximum sized text for width and height dialog").c_str(), 1933 "W: %04d x H: %04d", "Representative maximum sized text for width and height dialog").c_str(),
1934 0, 0); 1934 0, 0);
1935 1935