Ticket #4689: stylededit-shortcuts-2-v2.diff

src/apps/stylededit/StyledEditWindow.cpp

@@ -311 +311 @@
                 BMenuItem* item = static_cast<BMenuItem*>(ptr);
                 fontFamily = item->Label();
             }
+
+            BFont font;
+            font.SetFamilyAndStyle(fontFamily, fontStyle);
+            fItalicItem->SetMarked(font.Face() & B_ITALIC_FACE);
+            fBoldItem->SetMarked(font.Face() & B_BOLD_FACE);
+
             _SetFontStyle(fontFamily, fontStyle);
             break;
         }
@@ -329 +335 @@
                         fontFamily = super_item->Label();
                 }
             }
+
+            BFont font;
+            font.SetFamilyAndStyle(fontFamily, fontStyle);
+            fItalicItem->SetMarked(font.Face() & B_ITALIC_FACE);
+            fBoldItem->SetMarked(font.Face() & B_BOLD_FACE);
+
             _SetFontStyle(fontFamily, fontStyle);
             break;
         }
+        case SET_ITALIC:
+        {
+            uint32 sameProperties;
+            BFont font;
+
+            fTextView->GetFontAndColor(&font, &sameProperties);     
+            if(fItalicItem->IsMarked())
+                font.SetFace(B_REGULAR_FACE);
+            fItalicItem->SetMarked(!fItalicItem->IsMarked());
+
+            font_family family;
+            font_style style;
+            font.GetFamilyAndStyle(&family, &style);
+
+            _SetFontStyle(family, style);
+            break;
+        }
+        case SET_BOLD:
+        {
+            uint32 sameProperties;
+            BFont font;
+
+            fTextView->GetFontAndColor(&font, &sameProperties); 
+            if(fBoldItem->IsMarked())
+                font.SetFace(B_REGULAR_FACE);
+            fBoldItem->SetMarked(!fBoldItem->IsMarked());
+
+            font_family family;
+            font_style style;
+            font.GetFamilyAndStyle(&family, &style);
+
+            _SetFontStyle(family, style);
+            break;
+        }
         case FONT_COLOR:
         {
             void* ptr;
@@ -587 +633 @@
         }
     }
 
+    fBoldItem->SetMarked(font.Face() & B_BOLD_FACE);
+    fItalicItem->SetMarked(font.Face() & B_ITALIC_FACE);
+
     switch (fTextView->Alignment()) {
         case B_ALIGN_LEFT:
         default:
@@ -1106 +1155 @@
         YELLOW, new BMessage(FONT_COLOR)));
     fFontMenu->AddSeparatorItem();
 
+    // "Bold" & "Italic" menu items
+    fFontMenu->AddItem(fBoldItem = new BMenuItem(B_TRANSLATE("Bold"),
+        new BMessage(SET_BOLD)));
+    fFontMenu->AddItem(fItalicItem = new BMenuItem(B_TRANSLATE("Italic"),
+        new BMessage(SET_ITALIC)));
+    fBoldItem->SetShortcut('B', 0);
+    fItalicItem->SetShortcut('I', 0);
+    fFontMenu->AddSeparatorItem();
+
     // Available fonts
 
     fCurrentFontItem = 0;
@@ -1522 +1580 @@
     }
 
     font.SetFamilyAndStyle(fontFamily, fontStyle);
+
+    uint16 face = 0;
+
+    if (!(font.Face() & B_REGULAR_FACE))
+        face = font.Face();
+
+    if (fBoldItem->IsMarked())
+        face |= B_BOLD_FACE;
+
+    if (fItalicItem->IsMarked())
+        face |= B_ITALIC_FACE;
+
+    font.SetFace(face);
+
     fTextView->SetFontAndColor(&font);
 
     BMenuItem* superItem;

src/apps/stylededit/StyledEditWindow.h

@@ -106 +106 @@
             BMenuItem*          fMagentaItem;
             BMenuItem*          fYellowItem;
 
+            BMenuItem*          fBoldItem;
+            BMenuItem*          fItalicItem;
+
             BMenuItem*          fWrapItem;
             BMenuItem*          fAlignLeft;
             BMenuItem*          fAlignCenter;

src/apps/stylededit/Constants.h

@@ -48 +48 @@
 const uint32 FONT_FAMILY                = 'FFch';
 const uint32 FONT_STYLE                 = 'FSch';
 const uint32 FONT_COLOR                 = 'Fcol';
+const uint32 SET_ITALIC                 = 'Fita';
+const uint32 SET_BOLD                   = 'Fbld';
 
 // fontcolors
 const rgb_color BLACK                   = {0, 0, 0, 255};