Ticket #7348: pairs-catalog-entry-attribute.patch

src/apps/pairs/Pairs.cpp

@@ -7 +7 @@
 
 #include <Application.h>
 #include <Catalog.h>
-#include <Locale.h>
 
 #include "Pairs.h"
 #include "PairsWindow.h"

src/apps/pairs/Jamfile

@@ -16 +16 @@
     PairsView.cpp
     PairsWindow.cpp
 ;
+
+AddCatalogEntryAttribute Pairs
+    :
+    x-vnd.Haiku-Pairs:PairsWindow:Pairs
+;

src/apps/pairs/PairsWindow.cpp

@@ -12 +12 @@
 #include <Alert.h>
 #include <Button.h>
 #include <Catalog.h>
-#include <Locale.h>
 #include <Menu.h>
 #include <MenuBar.h>
 #include <MenuItem.h>
@@ -246 +245 @@
                     font.SetFace(B_BOLD_FACE);
                     view->SetFontAndColor(0, 6, &font);
                     view->ResizeToPreferred();
+                    alert->SetShortcut(0, B_ESCAPE);
 
                     if (alert->Go() == 0) {
                         // New game

src/apps/pairs/PairsView.cpp

@@ -20 +20 @@
 #include <FindDirectory.h>
 #include <IconUtils.h>
 #include <List.h>
-#include <Locale.h>
 #include <Node.h>
 #include <NodeInfo.h>
 #include <Path.h>
@@ -171 +170 @@
             snprintf(buffer, sizeof(buffer), B_TRANSLATE("Pairs did not find "
                 "enough vector icons in the system; it needs at least %d."),
                 fNumOfCards / 2);
-            BAlert* alert = new BAlert("fatal", buffer, B_TRANSLATE("OK"),
-                NULL, NULL, B_WIDTH_FROM_WIDEST, B_STOP_ALERT);
+            BString msgStr(buffer);
+            msgStr << "\n";
+            BAlert* alert = new BAlert("Fatal", msgStr.String(),
+                B_TRANSLATE("OK"),  NULL, NULL, B_WIDTH_FROM_WIDEST,
+                B_STOP_ALERT);
+            alert->SetShortcut(0, B_ESCAPE);
             alert->Go();
             exit(1);
         }