Ticket #5111: Sounds.patch

HWindow.cpp

@@ -19 +19 @@
 #include <Beep.h>
 #include <Box.h>
 #include <Button.h>
+#include <Catalog.h>
 #include <ClassInfo.h>
 #include <FindDirectory.h>
 #include <fs_attr.h>
+#include <GroupLayoutBuilder.h>
+#include <Locale.h>
 #include <MediaFiles.h>
 #include <MenuBar.h>
 #include <MenuField.h>
@@ -35 +38 @@
 #include <Sound.h>
 
 
-HWindow::HWindow(BRect rect, const char *name)
-    : _inherited(rect, name, B_TITLED_WINDOW, 0),
+#undef TR_CONTEXT
+#define TR_CONTEXT "HWindow"
+
+HWindow::HWindow(BRect rect, const char* name)
+    : _inherited(rect, name, B_TITLED_WINDOW, B_AUTO_UPDATE_SIZE_LIMITS),
     fFilePanel(NULL),
     fPlayer(NULL)
 {
     InitGUI();
-    float min_width, min_height, max_width, max_height;
-    GetSizeLimits(&min_width, &max_width, &min_height, &max_height);
-    min_width = 300;
-    min_height = 200;
-    SetSizeLimits(min_width, max_width, min_height, max_height);
 
     fFilePanel = new BFilePanel();
     fFilePanel->SetTarget(this);
@@ -62 +63 @@
 void
 HWindow::InitGUI()
 {
-    BRect rect = Bounds();
-    rect.bottom -= 106;
-    BView *listView = new BView(rect, "", B_FOLLOW_NONE, B_WILL_DRAW | B_PULSE_NEEDED);
-    listView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-    AddChild(listView);
-
-    rect.left += 13;
-    rect.right -= 13;
-    rect.top += 28;
-    rect.bottom -= 7;
-    fEventList = new HEventList(rect);
-    listView->AddChild(fEventList);
+    fEventList = new HEventList();
     fEventList->SetType(BMediaFiles::B_SOUNDS);
     fEventList->SetSelectionMode(B_SINGLE_SELECTION_LIST);
 
-    rect = Bounds();
-    rect.top = rect.bottom - 105;
-    BView *view = new BView(rect, "", B_FOLLOW_NONE, B_WILL_DRAW | B_PULSE_NEEDED);
-    view->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-    AddChild(view);
-    rect = view->Bounds().InsetBySelf(12, 12);
-    BBox *box = new BBox(rect, "", B_FOLLOW_ALL);
-    view->AddChild(box);
-    rect = box->Bounds();
-    rect.top += 10;
-    rect.left += 15;
-    rect.right -= 10;
-    rect.bottom = rect.top + 20;
-    BMenu *menu = new BMenu("file");
+    BGroupView* view = new BGroupView();
+    BBox* box = new BBox("", B_WILL_DRAW | B_FRAME_EVENTS
+        | B_NAVIGABLE_JUMP | B_PULSE_NEEDED);
+
+    BMenu* menu = new BMenu("file");
     menu->SetRadioMode(true);
     menu->SetLabelFromMarked(true);
     menu->AddSeparatorItem();
-    
-    menu->AddItem(new BMenuItem("<none>", new BMessage(M_NONE_MESSAGE)));
-    menu->AddItem(new BMenuItem("Other" B_UTF8_ELLIPSIS, new BMessage(M_OTHER_MESSAGE)));
-    BMenuField *menuField = new BMenuField(rect, "filemenu", "Sound File:", menu,
-        B_FOLLOW_TOP | B_FOLLOW_LEFT);
-    menuField->SetDivider(menuField->StringWidth("Sound File:") + 10);
-    box->AddChild(menuField);
-    rect.OffsetBy(-2, menuField->Bounds().Height() + 15);
-    BButton *button = new BButton(rect, "stop", "Stop", new BMessage(M_STOP_MESSAGE),
-        B_FOLLOW_RIGHT | B_FOLLOW_TOP);
-    button->ResizeToPreferred();
-    button->SetEnabled(false);
-    button->MoveTo(box->Bounds().right - button->Bounds().Width() - 15, rect.top);
-    box->AddChild(button);
+    menu->AddItem(new BMenuItem(TR("<none>"), new BMessage(M_NONE_MESSAGE)));
+    menu->AddItem(new BMenuItem(TR("Other…") /*B_UTF8_ELLIPSIS*/,
+        new BMessage(M_OTHER_MESSAGE)));
+    BMenuField* menuField = new BMenuField("filemenu", TR("Sound File:"), menu);
+    menuField->SetDivider(menuField->StringWidth(TR("Sound File:")) + 10);
 
-    rect = button->Frame();
-    view->ResizeTo(view->Bounds().Width(), 24 + rect.bottom + 12);
-    box->ResizeTo(box->Bounds().Width(), rect.bottom + 12);
+    BButton* stopbutton = new BButton("stop", TR("Stop"),
+        new BMessage(M_STOP_MESSAGE));
+    stopbutton->SetEnabled(false);
 
-    button->SetResizingMode(B_FOLLOW_RIGHT | B_FOLLOW_TOP);
-    button = new BButton(rect, "play", "Play", new BMessage(M_PLAY_MESSAGE),
-        B_FOLLOW_RIGHT | B_FOLLOW_TOP);
-    button->ResizeToPreferred();
-    button->SetEnabled(false);
-    button->MoveTo(rect.left - button->Bounds().Width() - 15, rect.top);
-    box->AddChild(button);
+    BButton* playbutton = new BButton("play", TR("Play"),
+        new BMessage(M_PLAY_MESSAGE));
+    playbutton->SetEnabled(false);
     
-    view->MoveTo(0, listView->Frame().bottom);
-    ResizeTo(Bounds().Width(), listView->Frame().bottom + view->Bounds().Height());
-    listView->SetResizingMode(B_FOLLOW_ALL);
-    view->SetResizingMode(B_FOLLOW_LEFT_RIGHT | B_FOLLOW_BOTTOM);
+    view->SetLayout(new BGroupLayout(B_HORIZONTAL));
+    view->AddChild(BGroupLayoutBuilder(B_VERTICAL, 15)
+        .AddGroup(B_HORIZONTAL)
+            .Add(menuField)
+            .AddGlue()
+        .End()
+        .AddGroup(B_HORIZONTAL, 15)
+            .AddGlue()
+            .Add(playbutton)
+            .Add(stopbutton)
+        .End()
+        .SetInsets(15, 15, 15, 15)
+    );
 
+    box->AddChild(view);
+
+    SetLayout(new BGroupLayout(B_HORIZONTAL));
+    AddChild(BGroupLayoutBuilder(B_VERTICAL)
+        .AddGroup(B_VERTICAL, 20)
+            .Add(fEventList)
+            .Add(box)
+        .End()
+        .SetInsets(12, 28, 12, 12)
+    );
+
     // setup file menu
     SetupMenuField();
-    menu->FindItem("<none>")->SetMarked(true);
+    menu->FindItem(TR("<none>"))->SetMarked(true);
 }
 
 
 void
-HWindow::MessageReceived(BMessage *message)
+HWindow::MessageReceived(BMessage* message)
 {
     switch (message->what) {
         case M_OTHER_MESSAGE:
         {
-            BMenuField *menufield = cast_as(FindView("filemenu"), BMenuField);
-            BMenu *menu = menufield->Menu();
+            BMenuField* menufield = cast_as(FindView("filemenu"), BMenuField);
+            BMenu* menu = menufield->Menu();
 
-            HEventRow* row = (HEventRow *)fEventList->CurrentSelection();
+            HEventRow* row = (HEventRow* )fEventList->CurrentSelection();
             if (row != NULL) {
                 BPath path(row->Path());
                 if (path.InitCheck() != B_OK) {
-                    BMenuItem *item = menu->FindItem("<none>");
+                    BMenuItem* item = menu->FindItem("<none>");
                     if (item)
                         item->SetMarked(true);
                 } else {
-                    BMenuItem *item = menu->FindItem(path.Leaf());
+                    BMenuItem* item = menu->FindItem(path.Leaf());
                     if (item)
                         item->SetMarked(true);
                 }
@@ -162 +150 @@
         case B_REFS_RECEIVED:
         {
             entry_ref ref;
-            HEventRow* row = (HEventRow *)fEventList->CurrentSelection();
+            HEventRow* row = (HEventRow* )fEventList->CurrentSelection();
             if (message->FindRef("refs", &ref) == B_OK && row != NULL) {
-                BMenuField *menufield = cast_as(FindView("filemenu"), BMenuField);
-                BMenu *menu = menufield->Menu();
+                BMenuField* menufield = cast_as(FindView("filemenu"), BMenuField);
+                BMenu* menu = menufield->Menu();
 
                 // check audio file
                 BNode node(&ref);
@@ -177 +165 @@
                 mtype.GetSupertype(&superType);
                 if (superType.Type() == NULL || strcmp(superType.Type(), "audio") != 0) {
                     beep();
-                    (new BAlert("", "This is not a audio file.", "OK", NULL, NULL,
+                    (new BAlert("", TR("This is not a audio file."), TR("OK"), NULL, NULL,
                         B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
                     break;
                 }
 
                 // add file item
-                BMessage *msg = new BMessage(M_ITEM_MESSAGE);
+                BMessage* msg = new BMessage(M_ITEM_MESSAGE);
                 BPath path(&ref);
                 msg->AddRef("refs", &ref);
-                BMenuItem *menuitem = menu->FindItem(path.Leaf());
+                BMenuItem* menuitem = menu->FindItem(path.Leaf());
                 if (!menuitem)
                     menu->AddItem(menuitem = new BMenuItem(path.Leaf(), msg), 0);
                 // refresh item
@@ -200 +188 @@
 
         case M_PLAY_MESSAGE:
         {
-            HEventRow* row = (HEventRow *)fEventList->CurrentSelection();
+            HEventRow* row = (HEventRow* )fEventList->CurrentSelection();
             if (row != NULL) {
-                const char *path = row->Path();
+                const char* path = row->Path();
                 if (path) {
                     entry_ref ref;
                     ::get_ref_for_path(path, &ref);
@@ -228 +216 @@
 
         case M_EVENT_CHANGED:
         {
-            const char *path;
-            BMenuField *menufield = cast_as(FindView("filemenu"), BMenuField);
-            BMenu *menu = menufield->Menu();
+            const char* path;
+            BMenuField* menufield = cast_as(FindView("filemenu"), BMenuField);
+            BMenu* menu = menufield->Menu();
 
             if (message->FindString("path", &path) == B_OK) {
                 BPath path(path);
                 if (path.InitCheck() != B_OK) {
-                    BMenuItem *item = menu->FindItem("<none>");
+                    BMenuItem* item = menu->FindItem(TR("<none>"));
                     if (item)
                         item->SetMarked(true);
                 } else {
-                    BMenuItem *item = menu->FindItem(path.Leaf());
+                    BMenuItem* item = menu->FindItem(path.Leaf());
                     if (item)
                         item->SetMarked(true);
                 }
@@ -270 +258 @@
 void
 HWindow::SetupMenuField()
 {
-    BMenuField *menufield = cast_as(FindView("filemenu"), BMenuField);
-    BMenu *menu = menufield->Menu();
+    BMenuField* menufield = cast_as(FindView("filemenu"), BMenuField);
+    BMenu* menu = menufield->Menu();
     int32 count = fEventList->CountRows();
     for (int32 i = 0; i < count; i++) {
-        HEventRow *row = (HEventRow *)fEventList->RowAt(i);
+        HEventRow* row = (HEventRow* )fEventList->RowAt(i);
         if (!row)
             continue;
 
@@ -284 +272 @@
         if (menu->FindItem(path.Leaf()))
             continue;
 
-        BMessage *msg = new BMessage(M_ITEM_MESSAGE);
+        BMessage* msg = new BMessage(M_ITEM_MESSAGE);
         entry_ref ref;
         ::get_ref_for_path(path.Path(), &ref);
         msg->AddRef("refs", &ref);
@@ -309 +297 @@
         if (menu->FindItem(item_path.Leaf()))
             continue;
 
-        BMessage *msg = new BMessage(M_ITEM_MESSAGE);
+        BMessage* msg = new BMessage(M_ITEM_MESSAGE);
         entry_ref ref;
         ::get_ref_for_path(item_path.Path(), &ref);
         msg->AddRef("refs", &ref);
@@ -329 +317 @@
         if (menu->FindItem(item_path.Leaf()))
             continue;
 
-        BMessage *msg = new BMessage(M_ITEM_MESSAGE);
+        BMessage* msg = new BMessage(M_ITEM_MESSAGE);
         entry_ref ref;
 
         ::get_ref_for_path(item_path.Path(), &ref);
@@ -350 +338 @@
         if (menu->FindItem(item_path.Leaf()))
             continue;
 
-        BMessage *msg = new BMessage(M_ITEM_MESSAGE);
+        BMessage* msg = new BMessage(M_ITEM_MESSAGE);
         entry_ref ref;
 
         ::get_ref_for_path(item_path.Path(), &ref);
@@ -364 +352 @@
 void
 HWindow::Pulse()
 {
-    HEventRow* row = (HEventRow *)fEventList->CurrentSelection();
-    BMenuField *menufield = cast_as(FindView("filemenu"), BMenuField);
-    BButton *button = cast_as(FindView("play"), BButton);
-    BButton *stop = cast_as(FindView("stop"), BButton);
+    HEventRow* row = (HEventRow* )fEventList->CurrentSelection();
+    BMenuField* menufield = cast_as(FindView("filemenu"), BMenuField);
+    BButton* button = cast_as(FindView("play"), BButton);
+    BButton* stop = cast_as(FindView("stop"), BButton);
 
     if (!menufield)
         return;
@@ -375 +363 @@
     if (row != NULL) {
         menufield->SetEnabled(true);
 
-        const char *path = row->Path();
+        const char* path = row->Path();
         if (path && strcmp(path, ""))
             button->SetEnabled(true);
         else
@@ -396 +384 @@
 
 
 void
-HWindow::DispatchMessage(BMessage *message, BHandler *handler)
+HWindow::DispatchMessage(BMessage* message, BHandler* handler)
 {
     if (message->what == B_PULSE)
         Pulse();

HWindow.h

@@ -6 +6 @@
 //  by the OpenBeOS license.
 //
 //
-//  File:        HWindow.h
-//  Author:      Jérôme Duval, Oliver Ruiz Dorantes, Atsushi Takamatsu
-//  Description: Sounds Preferences
-//  Created :    November 24, 2003
+//  File:           HWindow.h
+//  Author:         Jérôme Duval, Oliver Ruiz Dorantes, Atsushi Takamatsu
+//  Description:    Sounds Preferences
+//  Created :       November 24, 2003
 // 
 // ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
 
@@ -40 +40 @@
                         HWindow(BRect rect ,const char* name);
 protected:
         virtual         ~HWindow();
-        virtual void    MessageReceived(BMessage *message);
+        virtual void    MessageReceived(BMessage* message);
         virtual bool    QuitRequested();
-        virtual void    DispatchMessage(BMessage *message
-                                        ,BHandler *handler);
+        virtual void    DispatchMessage(BMessage* message
+                                        ,BHandler* handler);
                 void    InitGUI();
                 void    SetupMenuField();
                 void    Pulse();
@@ -52 +52 @@
             HEventList* fEventList;
         typedef BWindow _inherited;
             BFilePanel* fFilePanel;
-            BFileGameSound *fPlayer;
+            BFileGameSound* fPlayer;
 };
 #endif

HEventList.cpp

@@ -10 +10 @@
 #include "HEventList.h"
 
 #include <Alert.h>
+#include <Catalog.h>
 #include <ColumnTypes.h>
 #include <Entry.h>
+#include <Locale.h>
 #include <MediaFiles.h>
 #include <Path.h>
 #include <stdio.h>
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "HEventList"
 
 HEventRow::HEventRow(const char* name, const char* path)
     : BRow(),
@@ -36 +40 @@
 {
     fPath = _path;
     BPath path(_path);
-    SetField(new BStringField(_path ? path.Leaf() : "<none>"), kSoundColumn);
+    SetField(new BStringField(_path ? path.Leaf() : TR("<none>")), kSoundColumn);
 }
 
 
 void
-HEventRow::Remove(const char *type)
+HEventRow::Remove(const char* type)
 {
     BMediaFiles().RemoveItem(type, Name());
 }
 
 
-HEventList::HEventList(BRect rect, const char* name)
-    : BColumnListView(rect, name, B_FOLLOW_ALL, 0, B_PLAIN_BORDER, true),
+HEventList::HEventList(const char* name)
+    : BColumnListView(name, 0, B_PLAIN_BORDER, true),
         fType(NULL)
 {
-    AddColumn(new BStringColumn("Event", 150, 50, 500, B_TRUNCATE_MIDDLE), kEventColumn);
-    AddColumn(new BStringColumn("Sound", 150, 50, 500, B_TRUNCATE_END), kSoundColumn);
+    AddColumn(new BStringColumn(TR("Event"), 150, 50, 500, B_TRUNCATE_MIDDLE),
+        kEventColumn);
+    AddColumn(new BStringColumn(TR("Sound"), 150, 50, 500, B_TRUNCATE_END),
+        kSoundColumn);
 }
 
 
@@ -76 +82 @@
     entry_ref ref;
     while (mfiles.GetNextRef(&name,&ref) == B_OK) {
         BPath path(&ref);
-        if ((path.InitCheck() != B_OK) || (ref.name == NULL) || (strcmp(ref.name, "") == 0))
+        if ((path.InitCheck() != B_OK) || (ref.name == NULL)
+            || (strcmp(ref.name, "") == 0))
             AddRow(new HEventRow(name.String(), NULL));
         else
             AddRow(new HEventRow(name.String(), path.Path()));
@@ -87 +94 @@
 void
 HEventList::RemoveAll()
 {
-    BRow *row;
+    BRow* row;
     while ((row = RowAt((int32)0, NULL))!=NULL) {
         RemoveRow(row);
         delete row;
@@ -100 +107 @@
 {
     BColumnListView::SelectionChanged();
     
-    HEventRow* row = (HEventRow *)CurrentSelection();
+    HEventRow* row = (HEventRow* )CurrentSelection();
     if (row != NULL) {
         entry_ref ref;
         BMediaFiles().GetRefFor(fType, row->Name(), &ref);
         
         BPath path(&ref);
-        if ((path.InitCheck()==B_OK) || (ref.name == NULL) || (strcmp(ref.name, "") == 0)) {
+        if ((path.InitCheck()==B_OK) || (ref.name == NULL)
+            || (strcmp(ref.name, "") == 0)) {
             row->SetPath(path.Path());
             UpdateRow(row);
         } else {
             printf("name %s\n", ref.name);
             BMediaFiles().RemoveRefFor(fType, row->Name(), ref);
-            (new BAlert("alert", "No such file or directory", "Ok"))->Go();
+            (new BAlert("alert", TR("No such file or directory"),
+                TR("Ok")))->Go();
             return;
         }
         BMessage msg(M_EVENT_CHANGED);
@@ -126 +135 @@
 void
 HEventList::SetPath(const char* path)
 {
-    HEventRow* row = (HEventRow *)CurrentSelection();
+    HEventRow* row = (HEventRow* )CurrentSelection();
     if (row != NULL) {
         entry_ref ref;
         BEntry entry(path);

Jamfile

@@ -1 +1 @@
 SubDir HAIKU_TOP src preferences sounds ;
 
-SetSubDirSupportedPlatformsBeOSCompatible ;
-
 UsePrivateHeaders interface ;
 
 Preference Sounds : 
@@ -9 +7 @@
 #   HEventItem.cpp 
     HWindow.cpp 
     HEventList.cpp 
-    : be libcolumnlistview.a game tracker libmedia.so $(TARGET_LIBSUPC++)
+    : be libcolumnlistview.a game tracker libmedia.so $(TARGET_LIBSUPC++) liblocale.so
     : Sounds.rdef
     ;
+
+DoCatalogs Sounds :
+    x-vnd.Haiku-Sounds
+    :
+    HApp.cpp
+    HWindow.cpp
+    HEventList.cpp
+    : en.catalog
+    ;

HApp.cpp

@@ -13 +13 @@
 #include "HWindow.h"
 
 #include <Alert.h>
+#include <Catalog.h>
+#include <Locale.h>
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "SoundsHApp"
 
 HApp::HApp()
     : BApplication("application/x-vnd.Haiku-Sounds")
 {
+    be_locale->GetAppCatalog(&fCatalog);
+
     BRect rect;
     rect.Set(200, 150, 500, 450);
 
-    HWindow *win = new HWindow(rect, "Sounds");
+    HWindow* win = new HWindow(rect, TR("Sounds"));
     win->Show();
 }
 
@@ -34 +40 @@
 void
 HApp::AboutRequested()
 {
-    (new BAlert("About Sounds", "Sounds\n"
-                "  Brought to you by :\n"
-                "   Oliver Ruiz Dorantes\n"
-                "   Jérôme DUVAL.\n"
-                "  Original work from Atsushi Takamatsu.\n"
-                "Copyright " B_UTF8_COPYRIGHT "2003-2006 Haiku", "OK"))->Go();
+    (new BAlert(TR("About Sounds"),
+                TR("Sounds\n"
+                "  Brought to you by :\n"
+                "\tOliver Ruiz Dorantes\n"
+                "\tJérôme DUVAL.\n"
+                "  Original work from Atsushi Takamatsu.\n"
+                "Copyright ©2003-2006 Haiku"),
+                TR("OK")))->Go();
 }
 
 

HEventList.h

@@ -27 +27 @@
         
         const char*     Name() const { return fName.String();}
         const char*     Path() const { return fPath.String();}
-            void        Remove(const char *type);
+            void        Remove(const char* type);
             void        SetPath(const char* path);
 protected:
 
@@ -44 +44 @@
 
 class HEventList : public BColumnListView {
 public:
-                    HEventList(BRect rect, 
-                        const char* name = "EventList");
+                    HEventList( const char* name = "EventList");
         virtual         ~HEventList();
                 void    RemoveAll();
                 void    SetType(const char* type);

HApp.h

@@ -12 +12 @@
 
 
 #include <Application.h>
+#include <Catalog.h>
 
 
 class HApp :public BApplication {
@@ -21 +22 @@
 
     protected:
         virtual void AboutRequested();
+        BCatalog fCatalog;
 };
 
 #endif  // HAPP_H