Ticket #7531: GLTeapot.patch

File GLTeapot.patch, 9.9 KB (added by taos, 13 years ago)

Attempt to localize GLTeapot.

  • src/apps/glteapot/TeapotWindow.cpp

     
    44*/
    55
    66#include <stdio.h>
     7#include <new>
     8
     9#include <Catalog.h>
    710#include <InterfaceKit.h>
     11#include <Point.h>
    812#include <Rect.h>
    9 #include <Point.h>
    10 #include <new>
    1113
    1214#include "TeapotWindow.h"
    1315
     16#undef B_TRANSLATE_CONTEXT
     17#define B_TRANSLATE_CONTEXT "TeapotWindow"
     18
    1419TeapotWindow::TeapotWindow(BRect rect, const char* name, window_type wt,
    1520    ulong something)
    1621    :
    1722    BDirectWindow(rect, name, wt, something)
    1823{
    1924    GLenum type = BGL_RGB | BGL_DEPTH | BGL_DOUBLE;
    20    
     25
    2126    Lock();
    2227    BRect bounds = Bounds();
    2328    bounds.bottom = bounds.top + 14;
    … …  
    2631    BMenu* menu;
    2732    BMessage msg(kMsgAddModel);
    2833
    29     menuBar->AddItem(menu = new BMenu("File"));
     34    menuBar->AddItem(menu = new BMenu(B_TRANSLATE("File")));
    3035    AddChild(menuBar);
    31    
     36
    3237    menuBar->ResizeToPreferred();
    3338
    3439    bounds = Bounds();
    3540    bounds.top = menuBar->Bounds().bottom + 1;
    3641    BView *subView = new BView(bounds, "subview", B_FOLLOW_ALL, 0);
    3742    AddChild(subView);
    38    
     43
    3944    bounds = subView->Bounds();
    40     fObjectView = new(std::nothrow) ObjectView(bounds, "objectView", B_FOLLOW_ALL_SIDES, type);
    41     subView->AddChild(fObjectView);
    42    
     45    fObjectView = new(std::nothrow) ObjectView(bounds, "objectView",
     46        B_FOLLOW_ALL_SIDES, type);
     47    subView->AddChild(fObjectView);
     48
    4349    BMenuItem*  item;
    4450    msg.AddInt32("num", 256);
    45     menu->AddItem(item = new BMenuItem("Add a teapot", new BMessage(msg), 'N'));
    46     item->SetTarget(fObjectView);   
     51    menu->AddItem(item = new BMenuItem(B_TRANSLATE("Add a teapot"),
     52        new BMessage(msg), 'N'));
     53    item->SetTarget(fObjectView);
    4754    menu->AddSeparatorItem();
    48     menu->AddItem(item = new BMenuItem("Quit", new BMessage(B_QUIT_REQUESTED), 'Q'));
     55    menu->AddItem(item = new BMenuItem(B_TRANSLATE("Quit"),
     56        new BMessage(B_QUIT_REQUESTED), 'Q'));
    4957    item->SetTarget(be_app);
    5058    msg.RemoveName("num");
    51     menuBar->AddItem(menu = new BMenu("Options"));
    52     menu->AddItem(item = new BMenuItem("Perspective", new BMessage(kMsgPerspective)));
     59    menuBar->AddItem(menu = new BMenu(B_TRANSLATE("Options")));
     60    menu->AddItem(item = new BMenuItem(B_TRANSLATE("Perspective"),
     61        new BMessage(kMsgPerspective)));
    5362    item->SetTarget(fObjectView);
    5463    item->SetMarked(false);
    55     menu->AddItem(item = new BMenuItem("FPS display", new BMessage(kMsgFPS)));
     64    menu->AddItem(item = new BMenuItem(B_TRANSLATE("FPS display"),
     65        new BMessage(kMsgFPS)));
    5666    item->SetTarget(fObjectView);
    5767    item->SetMarked(true);
    58     menu->AddItem(item = new BMenuItem("Filled polygons", new BMessage(kMsgFilled)));
     68    menu->AddItem(item = new BMenuItem(B_TRANSLATE("Filled polygons"),
     69        new BMessage(kMsgFilled)));
    5970    item->SetTarget(fObjectView);
    6071    item->SetMarked(true);
    61     menu->AddItem(item = new BMenuItem("Lighting", new BMessage(kMsgLighting)));
     72    menu->AddItem(item = new BMenuItem(B_TRANSLATE("Lighting"),
     73        new BMessage(kMsgLighting)));
    6274    item->SetTarget(fObjectView);
    6375    item->SetMarked(true);
    64     menu->AddItem(item = new BMenuItem("Backface culling", new BMessage(kMsgCulling)));
     76    menu->AddItem(item = new BMenuItem(B_TRANSLATE("Backface culling"),
     77        new BMessage(kMsgCulling)));
    6578    item->SetTarget(fObjectView);
    6679    item->SetMarked(true);
    67     menu->AddItem(item = new BMenuItem("Z-buffered", new BMessage(kMsgZBuffer)));
     80    menu->AddItem(item = new BMenuItem(B_TRANSLATE("Z-buffered"),
     81        new BMessage(kMsgZBuffer)));
    6882    item->SetTarget(fObjectView);
    6983    item->SetMarked(true);
    70     menu->AddItem(item = new BMenuItem("Gouraud shading", new BMessage(kMsgGouraud)));
     84    menu->AddItem(item = new BMenuItem(B_TRANSLATE("Gouraud shading"),
     85        new BMessage(kMsgGouraud)));
    7186    item->SetTarget(fObjectView);
    7287    item->SetMarked(true);
    7388//  menu->AddItem(item = new BMenuItem("Texture mapped", new BMessage(kMsgTextured)));
    7489//  item->SetTarget(fObjectView);
    75     menu->AddItem(item = new BMenuItem("Fog", new BMessage(kMsgFog)));
     90    menu->AddItem(item = new BMenuItem(B_TRANSLATE("Fog"),
     91        new BMessage(kMsgFog)));
    7692    item->SetTarget(fObjectView);
    7793
    7894    BMenu *subMenu;
    79     menuBar->AddItem(menu = new BMenu("Lights"));
     95    menuBar->AddItem(menu = new BMenu(B_TRANSLATE("Lights")));
    8096    msg.what = kMsgLights;
    8197
    8298    msg.AddInt32("num", 1);
    83     menu->AddItem(item = new BMenuItem(subMenu = new BMenu("Upper center"), NULL));
     99    menu->AddItem(item = new BMenuItem(subMenu =
     100        new BMenu(B_TRANSLATE("Upper center")), NULL));
    84101    item->SetTarget(fObjectView);
    85102    msg.AddInt32("color", lightNone);
    86     subMenu->AddItem(item = new BMenuItem("Off", new BMessage(msg)));
     103    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Off"),
     104        new BMessage(msg)));
    87105    item->SetTarget(fObjectView);
    88106    subMenu->AddSeparatorItem();
    89107    msg.ReplaceInt32("color", lightWhite);
    90     subMenu->AddItem(item = new BMenuItem("White", new BMessage(msg)));
     108    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("White"),
     109        new BMessage(msg)));
    91110    item->SetTarget(fObjectView);
    92111    item->SetMarked(true);
    93112    msg.ReplaceInt32("color", lightYellow);
    94     subMenu->AddItem(item = new BMenuItem("Yellow", new BMessage(msg)));
     113    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Yellow"),
     114        new BMessage(msg)));
    95115    item->SetTarget(fObjectView);
    96116    msg.ReplaceInt32("color", lightBlue);
    97     subMenu->AddItem(item = new BMenuItem("Blue", new BMessage(msg)));
     117    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Blue"),
     118        new BMessage(msg)));
    98119    item->SetTarget(fObjectView);
    99120    msg.ReplaceInt32("color", lightRed);
    100     subMenu->AddItem(item = new BMenuItem("Red", new BMessage(msg)));
     121    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Red"),
     122        new BMessage(msg)));
    101123    item->SetTarget(fObjectView);
    102124    msg.ReplaceInt32("color", lightGreen);
    103     subMenu->AddItem(item = new BMenuItem("Green", new BMessage(msg)));
     125    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Green"),
     126        new BMessage(msg)));
    104127    item->SetTarget(fObjectView);
    105128
    106129    msg.RemoveName("color");
    107130
    108131    msg.ReplaceInt32("num", 2);
    109     menu->AddItem(item = new BMenuItem(subMenu = new BMenu("Lower left"), NULL));
     132    menu->AddItem(item = new BMenuItem(subMenu =
     133        new BMenu(B_TRANSLATE("Lower left")), NULL));
    110134    item->SetTarget(fObjectView);
    111135    msg.AddInt32("color", lightNone);
    112     subMenu->AddItem(item = new BMenuItem("Off", new BMessage(msg)));
     136    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Off"),
     137        new BMessage(msg)));
    113138    item->SetTarget(fObjectView);
    114139    subMenu->AddSeparatorItem();
    115140    msg.ReplaceInt32("color", lightWhite);
    116     subMenu->AddItem(item = new BMenuItem("White", new BMessage(msg)));
     141    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("White"),
     142        new BMessage(msg)));
    117143    item->SetTarget(fObjectView);
    118144    msg.ReplaceInt32("color", lightYellow);
    119     subMenu->AddItem(item = new BMenuItem("Yellow", new BMessage(msg)));
     145    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Yellow"),
     146        new BMessage(msg)));
    120147    item->SetTarget(fObjectView);
    121148    msg.ReplaceInt32("color", lightBlue);
    122     subMenu->AddItem(item = new BMenuItem("Blue", new BMessage(msg)));
     149    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Blue"),
     150        new BMessage(msg)));
    123151    item->SetTarget(fObjectView);
    124152    item->SetMarked(true);
    125153    msg.ReplaceInt32("color", lightRed);
    126     subMenu->AddItem(item = new BMenuItem("Red", new BMessage(msg)));
     154    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Red"),
     155        new BMessage(msg)));
    127156    item->SetTarget(fObjectView);
    128157    msg.ReplaceInt32("color", lightGreen);
    129     subMenu->AddItem(item = new BMenuItem("Green", new BMessage(msg)));
     158    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Green"),
     159        new BMessage(msg)));
    130160    item->SetTarget(fObjectView);
    131161
    132162    msg.RemoveName("color");
    133163
    134164    msg.ReplaceInt32("num", 3);
    135     menu->AddItem(item = new BMenuItem(subMenu = new BMenu("Right"), NULL));
     165    menu->AddItem(item = new BMenuItem(subMenu =
     166        new BMenu(B_TRANSLATE("Right")), NULL));
    136167    item->SetTarget(fObjectView);
    137168    msg.AddInt32("color", lightNone);
    138     subMenu->AddItem(item = new BMenuItem("Off", new BMessage(msg)));
     169    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Off"),
     170        new BMessage(msg)));
    139171    item->SetTarget(fObjectView);
    140172    item->SetMarked(true);
    141173    subMenu->AddSeparatorItem();
    142174    msg.ReplaceInt32("color", lightWhite);
    143     subMenu->AddItem(item = new BMenuItem("White", new BMessage(msg)));
     175    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("White"),
     176        new BMessage(msg)));
    144177    item->SetTarget(fObjectView);
    145178    msg.ReplaceInt32("color", lightYellow);
    146     subMenu->AddItem(item = new BMenuItem("Yellow", new BMessage(msg)));
     179    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Yellow"),
     180        new BMessage(msg)));
    147181    item->SetTarget(fObjectView);
    148182    msg.ReplaceInt32("color", lightBlue);
    149     subMenu->AddItem(item = new BMenuItem("Blue", new BMessage(msg)));
     183    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Blue"),
     184        new BMessage(msg)));
    150185    item->SetTarget(fObjectView);
    151186    msg.ReplaceInt32("color", lightRed);
    152     subMenu->AddItem(item = new BMenuItem("Red", new BMessage(msg)));
     187    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Red"),
     188        new BMessage(msg)));
    153189    item->SetTarget(fObjectView);
    154190    msg.ReplaceInt32("color", lightGreen);
    155     subMenu->AddItem(item = new BMenuItem("Green", new BMessage(msg)));
     191    subMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Green"),
     192        new BMessage(msg)));
    156193    item->SetTarget(fObjectView);
    157194
    158195    float f = menuBar->Bounds().IntegerHeight() + 1;
    … …  
    167204{
    168205    if (fObjectView != NULL)
    169206        fObjectView->EnableDirectMode(false);
    170        
     207
    171208    be_app->PostMessage(B_QUIT_REQUESTED);
    172209    return true;
    173210}
    … …  
    177214TeapotWindow::DirectConnected(direct_buffer_info* info)
    178215{
    179216    if (fObjectView != NULL) {
    180         fObjectView->DirectConnected(info); 
     217        fObjectView->DirectConnected(info);
    181218        fObjectView->EnableDirectMode(true);
    182219    }
    183220}
    … …  
    190227    switch (msg->what) {
    191228        default:
    192229            BDirectWindow::MessageReceived(msg);
    193     }       
     230    }
    194231}

  • src/apps/glteapot/Jamfile

     
    1717    x-vnd.Haiku-GLTeapot
    1818    :
    1919    TeapotApp.cpp
     20    TeapotWindow.cpp
    2021;