aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-04-04 11:28:19 (GMT)
committerfluxgen <fluxgen>2002-04-04 11:28:19 (GMT)
commit2526e4bce821eedcd4bcc13e0f27ac7b9e255350 (patch)
treef86898efe146ecb882e597955e1e94b375154b19 /src/Toolbar.cc
parentbd05695cfa6d066e5e5368d857eef8c0b11987c1 (diff)
downloadfluxbox_pavel-2526e4bce821eedcd4bcc13e0f27ac7b9e255350.zip
fluxbox_pavel-2526e4bce821eedcd4bcc13e0f27ac7b9e255350.tar.bz2
moved nls defines to enums in namespace FBNLS
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r--src/Toolbar.cc118
1 files changed, 35 insertions, 83 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 295a44c..546d970 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.cc,v 1.18 2002/04/03 23:02:49 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.19 2002/04/04 11:28:19 fluxgen Exp $
26 26
27// stupid macros needed to access some functions in version 2 of the GNU C 27// stupid macros needed to access some functions in version 2 of the GNU C
28// library 28// library
@@ -1248,14 +1248,10 @@ void Toolbar::HideHandler::timeout(void) {
1248Toolbarmenu::Toolbarmenu(Toolbar *tb) : Basemenu(tb->screen) { 1248Toolbarmenu::Toolbarmenu(Toolbar *tb) : Basemenu(tb->screen) {
1249 toolbar = tb; 1249 toolbar = tb;
1250 I18n *i18n = I18n::instance(); 1250 I18n *i18n = I18n::instance();
1251 1251 using namespace FBNLS;
1252 setLabel(i18n->getMessage( 1252 setLabel(i18n->getMessage(
1253#ifdef NLS 1253 ToolbarSet, ToolbarToolbarTitle,
1254 ToolbarSet, ToolbarToolbarTitle, 1254 "Toolbar"));
1255#else // !NLS
1256 0, 0,
1257#endif // NLS
1258 "Toolbar"));
1259 setInternalMenu(); 1255 setInternalMenu();
1260 1256
1261 placementmenu = new Placementmenu(this); 1257 placementmenu = new Placementmenu(this);
@@ -1266,13 +1262,9 @@ Toolbarmenu::Toolbarmenu(Toolbar *tb) : Basemenu(tb->screen) {
1266#endif // XINERAMA 1262#endif // XINERAMA
1267 1263
1268 insert(i18n->getMessage( 1264 insert(i18n->getMessage(
1269#ifdef NLS 1265 CommonSet, CommonPlacementTitle,
1270 CommonSet, CommonPlacementTitle, 1266 "Placement"),
1271#else // !NLS 1267 placementmenu);
1272 0, 0,
1273#endif // NLS
1274 "Placement"),
1275 placementmenu);
1276 1268
1277#ifdef XINERAMA 1269#ifdef XINERAMA
1278 if (toolbar->screen->hasXinerama()) { //TODO: NLS 1270 if (toolbar->screen->hasXinerama()) { //TODO: NLS
@@ -1281,29 +1273,17 @@ Toolbarmenu::Toolbarmenu(Toolbar *tb) : Basemenu(tb->screen) {
1281#endif // XINERAMA 1273#endif // XINERAMA
1282 1274
1283 insert(i18n->getMessage( 1275 insert(i18n->getMessage(
1284#ifdef NLS 1276 CommonSet, CommonAlwaysOnTop,
1285 CommonSet, CommonAlwaysOnTop, 1277 "Always on top"),
1286#else // !NLS 1278 1);
1287 0, 0,
1288#endif // NLS
1289 "Always on top"),
1290 1);
1291 insert(i18n->getMessage( 1279 insert(i18n->getMessage(
1292#ifdef NLS 1280 CommonSet, CommonAutoHide,
1293 CommonSet, CommonAutoHide, 1281 "Auto hide"),
1294#else // !NLS
1295 0, 0,
1296#endif // NLS
1297 "Auto hide"),
1298 2); 1282 2);
1299 insert(i18n->getMessage( 1283 insert(i18n->getMessage(
1300#ifdef NLS 1284 ToolbarSet, ToolbarEditWkspcName,
1301 ToolbarSet, ToolbarEditWkspcName, 1285 "Edit current workspace name"),
1302#else // !NLS 1286 3);
1303 0, 0,
1304#endif // NLS
1305 "Edit current workspace name"),
1306 3);
1307 1287
1308 update(); 1288 update();
1309 1289
@@ -1386,64 +1366,36 @@ Toolbarmenu::Placementmenu::Placementmenu(Toolbarmenu *tm)
1386 : Basemenu(tm->toolbar->screen) { 1366 : Basemenu(tm->toolbar->screen) {
1387 toolbarmenu = tm; 1367 toolbarmenu = tm;
1388 I18n *i18n = I18n::instance(); 1368 I18n *i18n = I18n::instance();
1389 1369 using namespace FBNLS;
1390 setLabel(i18n->getMessage( 1370 setLabel(i18n->getMessage(
1391#ifdef NLS 1371 ToolbarSet, ToolbarToolbarPlacement,
1392 ToolbarSet, ToolbarToolbarPlacement, 1372 "Toolbar Placement"));
1393#else // !NLS
1394 0, 0,
1395#endif // NLS
1396 "Toolbar Placement"));
1397 setInternalMenu(); 1373 setInternalMenu();
1398 setMinimumSublevels(3); 1374 setMinimumSublevels(3);
1399 1375
1400 insert(i18n->getMessage( 1376 insert(i18n->getMessage(
1401#ifdef NLS 1377 CommonSet, CommonPlacementTopLeft,
1402 CommonSet, CommonPlacementTopLeft, 1378 "Top Left"),
1403#else // !NLS 1379 Toolbar::TOPLEFT);
1404 0, 0,
1405#endif // NLS
1406 "Top Left"),
1407 Toolbar::TOPLEFT);
1408 insert(i18n->getMessage( 1380 insert(i18n->getMessage(
1409#ifdef NLS 1381 CommonSet, CommonPlacementBottomLeft,
1410 CommonSet, CommonPlacementBottomLeft, 1382 "Bottom Left"),
1411#else // !NLS 1383 Toolbar::BOTTOMLEFT);
1412 0, 0,
1413#endif // NLS
1414 "Bottom Left"),
1415 Toolbar::BOTTOMLEFT);
1416 insert(i18n->getMessage( 1384 insert(i18n->getMessage(
1417#ifdef NLS 1385 CommonSet, CommonPlacementTopCenter,
1418 CommonSet, CommonPlacementTopCenter, 1386 "Top Center"),
1419#else // !NLS 1387 Toolbar::TOPCENTER);
1420 0, 0,
1421#endif // NLS
1422 "Top Center"),
1423 Toolbar::TOPCENTER);
1424 insert(i18n->getMessage( 1388 insert(i18n->getMessage(
1425#ifdef NLS 1389 CommonSet, CommonPlacementBottomCenter,
1426 CommonSet, CommonPlacementBottomCenter, 1390 "Bottom Center"),
1427#else // !NLS 1391 Toolbar::BOTTOMCENTER);
1428 0, 0,
1429#endif // NLS
1430 "Bottom Center"),
1431 Toolbar::BOTTOMCENTER);
1432 insert(i18n->getMessage( 1392 insert(i18n->getMessage(
1433#ifdef NLS 1393 CommonSet, CommonPlacementTopRight,
1434 CommonSet, CommonPlacementTopRight, 1394 "Top Right"),
1435#else // !NLS 1395 Toolbar::TOPRIGHT);
1436 0, 0,
1437#endif // NLS
1438 "Top Right"),
1439 Toolbar::TOPRIGHT);
1440 insert(i18n->getMessage( 1396 insert(i18n->getMessage(
1441#ifdef NLS 1397 CommonSet, CommonPlacementBottomRight,
1442 CommonSet, CommonPlacementBottomRight, 1398 "Bottom Right"),
1443#else // !NLS
1444 0, 0,
1445#endif // NLS
1446 "Bottom Right"),
1447 Toolbar::BOTTOMRIGHT); 1399 Toolbar::BOTTOMRIGHT);
1448 1400
1449 update(); 1401 update();
generated by cgit v0.11.2 at 2024-06-28 16:03:46 (GMT)