Ticket #7536: FontDemo.patch
File FontDemo.patch, 6.5 KB (added by , 13 years ago) |
---|
-
src/apps/fontdemo/Jamfile
6 6 ControlView.cpp 7 7 FontDemo.cpp 8 8 FontDemoView.cpp 9 : be $( TARGET_LIBSUPC++)9 : be $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++) 10 10 : FontDemo.rdef 11 11 ; 12 13 DoCatalogs FontDemo : 14 x-vnd.Haiku-FontDemo 15 : 16 FontDemo.cpp 17 ControlView.cpp 18 ; -
src/apps/fontdemo/ControlView.cpp
11 11 #include "messages.h" 12 12 13 13 #include <Button.h> 14 #include <Catalog.h> 14 15 #include <CheckBox.h> 15 16 #include <Menu.h> 16 17 #include <MenuField.h> … … 24 25 25 26 #include <stdio.h> 26 27 28 #undef B_TRANSLATE_CONTEXT 29 #define B_TRANSLATE_CONTEXT "ControlView" 27 30 28 31 ControlView::ControlView(BRect rect) 29 32 : BView(rect, "ControlView", B_FOLLOW_ALL, B_WILL_DRAW | B_NAVIGABLE_JUMP), … … 66 69 float offsetX = 0; 67 70 float offsetY = 0; 68 71 69 fTextControl = new BTextControl(rect, "TextInput", "Text:", "Haiku, Inc.", NULL); 72 fTextControl = new BTextControl(rect, "TextInput", B_TRANSLATE("Text:"), 73 "Haiku, Inc.", NULL); 70 74 fTextControl->SetDivider(29.0); 71 75 fTextControl->SetModificationMessage(new BMessage(TEXT_CHANGED_MSG)); 72 76 AddChild(fTextControl); … … 75 79 _AddFontMenu(rect); 76 80 77 81 rect.OffsetBy(0.0, 29.0); 78 fFontsizeSlider = new BSlider(rect, "Fontsize", "Size: 50", NULL, 4, 360); 82 fFontsizeSlider = new BSlider(rect, "Fontsize", B_TRANSLATE("Size: 50"), 83 NULL, 4, 360); 79 84 fFontsizeSlider->SetModificationMessage(new BMessage(FONTSIZE_MSG)); 80 85 fFontsizeSlider->SetValue(50); 81 86 AddChild(fFontsizeSlider); … … 85 90 offsetX += 1; 86 91 87 92 rect.OffsetBy(0.0, offsetX); 88 fShearSlider = new BSlider(rect, "Shear", "Shear: 90", NULL, 45, 135); 93 fShearSlider = new BSlider(rect, "Shear", B_TRANSLATE("Shear: 90"), 94 NULL, 45, 135); 89 95 fShearSlider->SetModificationMessage(new BMessage(FONTSHEAR_MSG)); 90 96 fShearSlider->SetValue(90); 91 97 AddChild(fShearSlider); 92 98 93 99 rect.OffsetBy(0.0, offsetX); 94 fRotationSlider = new BSlider(rect, "Rotation", "Rotation: 0", NULL, 0, 360); 100 fRotationSlider = new BSlider(rect, "Rotation", B_TRANSLATE("Rotation: 0"), 101 NULL, 0, 360); 95 102 fRotationSlider->SetModificationMessage( new BMessage(ROTATION_MSG)); 96 103 fRotationSlider->SetValue(0); 97 104 AddChild(fRotationSlider); 98 105 99 106 rect.OffsetBy(0.0, offsetX); 100 fSpacingSlider = new BSlider(rect, "Spacing", "Spacing: 0", NULL, -5, 50); 107 fSpacingSlider = new BSlider(rect, "Spacing", B_TRANSLATE("Spacing: 0"), 108 NULL, -5, 50); 101 109 fSpacingSlider->SetModificationMessage(new BMessage(SPACING_MSG)); 102 110 fSpacingSlider->SetValue(0); 103 111 AddChild(fSpacingSlider); 104 112 105 113 rect.OffsetBy(0.0, offsetX); 106 fOutlineSlider = new BSlider(rect, "Outline", "Outline:", NULL, 0, 20); 114 fOutlineSlider = new BSlider(rect, "Outline", B_TRANSLATE("Outline:"), 115 NULL, 0, 20); 107 116 fOutlineSlider->SetModificationMessage(new BMessage(OUTLINE_MSG)); 108 117 AddChild(fOutlineSlider); 109 118 110 119 rect.OffsetBy(0.0, offsetX); 111 fAliasingCheckBox = new BCheckBox(rect, "Aliasing", "Antialiased text",112 new BMessage(ALIASING_MSG));120 fAliasingCheckBox = new BCheckBox(rect, "Aliasing", 121 B_TRANSLATE("Antialiased text"), new BMessage(ALIASING_MSG)); 113 122 fAliasingCheckBox->SetValue(B_CONTROL_ON); 114 123 AddChild(fAliasingCheckBox); 115 124 … … 154 163 155 164 fDrawingModeMenu->SetLabelFromMarked(true); 156 165 157 BMenuField *drawingModeMenuField = new BMenuField(rect, "FontMenuField", "Drawing mode:", fDrawingModeMenu, true); 166 BMenuField *drawingModeMenuField = new BMenuField(rect, "FontMenuField", 167 B_TRANSLATE("Drawing mode:"), fDrawingModeMenu, true); 158 168 drawingModeMenuField->SetDivider(5+StringWidth("Drawing mode:")); 159 169 AddChild(drawingModeMenuField); 160 170 161 171 rect.OffsetBy(0.0, 22); 162 fBoundingboxesCheckBox = new BCheckBox(rect, "BoundingBoxes", "Bounding boxes",163 new BMessage(BOUNDING_BOX_MSG));172 fBoundingboxesCheckBox = new BCheckBox(rect, "BoundingBoxes", 173 B_TRANSLATE("Bounding boxes"), new BMessage(BOUNDING_BOX_MSG)); 164 174 AddChild(fBoundingboxesCheckBox); 165 175 166 176 rect.OffsetBy(0.0, 22.0); 167 fCyclingFontButton = new BButton(rect, "Cyclefonts", "Cycle fonts",168 new BMessage(CYCLING_FONTS_MSG));177 fCyclingFontButton = new BButton(rect, "Cyclefonts", 178 B_TRANSLATE("Cycle fonts"), new BMessage(CYCLING_FONTS_MSG)); 169 179 AddChild(fCyclingFontButton); 170 180 171 181 fTextControl->SetTarget(this); … … 310 320 311 321 case CYCLING_FONTS_MSG: 312 322 { 313 fCyclingFontButton->SetLabel(fCycleFonts ? "Cycle fonts" : "Stop cycling"); 323 fCyclingFontButton->SetLabel(fCycleFonts ? 324 B_TRANSLATE("Cycle fonts") : B_TRANSLATE("Stop cycling")); 314 325 fCycleFonts = !fCycleFonts; 315 326 316 327 if (fCycleFonts) { … … 456 467 457 468 _UpdateFontmenus(true); 458 469 459 fFontMenuField = new BMenuField(rect, "FontMenuField", "Font:", fFontFamilyMenu, true); 470 fFontMenuField = new BMenuField(rect, "FontMenuField", B_TRANSLATE("Font:"), 471 fFontFamilyMenu, true); 460 472 fFontMenuField->SetDivider(30.0); 461 473 AddChild(fFontMenuField); 462 474 } -
src/apps/fontdemo/FontDemo.cpp
12 12 #include "ControlView.h" 13 13 14 14 #include <Window.h> 15 #include <Catalog.h> 15 16 17 #undef B_TRANSLATE_CONTEXT 18 #define B_TRANSLATE_CONTEXT "FontDemo" 16 19 17 20 FontDemo::FontDemo() 18 21 : BApplication("application/x-vnd.Haiku-FontDemo") 19 22 { 20 23 // Create the demo window where we draw the string 21 BWindow* demoWindow = new BWindow(BRect(80, 30, 490, 300), "FontDemo", 22 B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE); 24 BWindow* demoWindow = new BWindow(BRect(80, 30, 490, 300), 25 B_TRANSLATE_SYSTEM_NAME("FontDemo"), B_TITLED_WINDOW, 26 B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE); 23 27 24 28 FontDemoView* demoView = new FontDemoView(demoWindow->Bounds()); 25 29 demoWindow->AddChild(demoView); 26 30 27 BWindow* controlWindow = new BWindow(BRect(500, 30, 700, 402), "Controls", 28 B_FLOATING_WINDOW_LOOK, B_FLOATING_APP_WINDOW_FEEL, 29 B_NOT_CLOSABLE | B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS); 31 BWindow* controlWindow = new BWindow(BRect(500, 30, 700, 402), 32 B_TRANSLATE("Controls"), B_FLOATING_WINDOW_LOOK, 33 B_FLOATING_APP_WINDOW_FEEL, B_NOT_CLOSABLE | B_NOT_ZOOMABLE | 34 B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS); 30 35 31 36 ControlView* controlView = new ControlView(controlWindow->Bounds()); 32 37 controlWindow->AddChild(controlView);