Ticket #7222: Mail.diff

src/apps/mail/Enclosures.h

@@ -54 +54 @@
 
 #include <MailMessage.h>
 
+#define B_TRANSLATE_CONTEXT "Mail"
+
 #define ENCLOSURES_HEIGHT    65
 
-#define ENCLOSE_TEXT        "Attachments:"
+#define ENCLOSE_TEXT        B_TRANSLATE("Attachments:")
 #define ENCLOSE_TEXT_H       7
 #define ENCLOSE_TEXT_V       3
 #define ENCLOSE_FIELD_V      3

src/apps/mail/Content.cpp

@@ -871 +871 @@
     fFirstSpellMark(NULL)
 {
     BFont menuFont = *be_plain_font;
-    menuFont.SetSize(10);
 
     fStopSem = create_sem(1, "reader_sem");
     SetStylable(true);
@@ -1543 +1542 @@
                         delete string;
                     }
                 } else {
-                    (menuItem = new BMenuItem("No matches", NULL))->SetEnabled(false);
+                    (menuItem = new BMenuItem(B_TRANSLATE("No matches"), NULL))->SetEnabled(false);
                     menu.AddItem(menuItem);
                 }
 

src/apps/mail/Enclosures.cpp

@@ -420 +420 @@
     if (buttons & B_SECONDARY_MOUSE_BUTTON)
     {
         BFont font = *be_plain_font;
-        font.SetSize(10);
 
         BPopUpMenu menu("enclosure", false, false);
         menu.SetFont(&font);
@@ -529 +528 @@
 
         BRect iconRect(0, 0, B_MINI_ICON - 1, B_MINI_ICON - 1);
 
-        BBitmap bitmap(iconRect, B_COLOR_8_BIT);
+        BBitmap bitmap(iconRect, B_RGBA32);
         if (GetTrackerIcon(type, &bitmap, B_MINI_ICON) == B_NO_ERROR) {
             BRect rect(r.left + 4, r.top + 1, r.left + 4 + 15, r.top + 1 + 15);
-            owner->SetDrawingMode(B_OP_OVER);
+            owner->SetDrawingMode(B_OP_ALPHA);
             owner->DrawBitmap(&bitmap, iconRect, rect);
             owner->SetDrawingMode(B_OP_COPY);
         } else {
@@ -552 +551 @@
         BNodeInfo info(&file);
         BRect sr(0, 0, B_MINI_ICON - 1, B_MINI_ICON - 1);
 
-        BBitmap bitmap(sr, B_COLOR_8_BIT);
+        BBitmap bitmap(sr, B_RGBA32);
         if (info.GetTrackerIcon(&bitmap, B_MINI_ICON) == B_NO_ERROR) {
             BRect dr(r.left + 4, r.top + 1, r.left + 4 + 15, r.top + 1 + 15);
-            owner->SetDrawingMode(B_OP_OVER);
+            owner->SetDrawingMode(B_OP_ALPHA);
             owner->DrawBitmap(&bitmap, sr, dr);
             owner->SetDrawingMode(B_OP_COPY);
         }

src/apps/mail/Header.cpp

@@ -77 +77 @@
 using std::map;
 
 
-const char* kDateLabel = "Date:";
+const char* kDateLabel = B_TRANSLATE("Date:");
 const uint32 kMsgFrom = 'hFrm';
 const uint32 kMsgEncoding = 'encd';
 const uint32 kMsgAddressChosen = 'acsn';
@@ -234 +234 @@
         fEncodingMenu->AddSeparatorItem();
         msg = new BMessage(kMsgEncoding);
         msg->AddInt32("charset", B_MAIL_NULL_CONVERSION);
-        fEncodingMenu->AddItem(item = new BMenuItem("Automatic", msg));
+        fEncodingMenu->AddItem(item = new BMenuItem(B_TRANSLATE("Automatic"), msg));
         if (!markedCharSet)
             item->SetMarked(true);
     }