Ticket #5626: screenshotEnhancement-5626.patch

src/apps/screenshot/ScreenshotWindow.cpp

@@ -159 +159 @@
             BCardLayout* layout = dynamic_cast<BCardLayout*> (GetLayout());
             if (layout)
                 layout->SetVisibleItem(1L);
+
+            fSaveScreenshot->MakeDefault(true);
+
             SetTitle(TR("Save screenshot"));
             break;
         }
@@ -168 +171 @@
             _TakeScreenshot();
             _UpdatePreviewPanel();
             Show();
+            _UpdateFilenameSelection();
             break;
         
         case kImageOutputFormat:
             message->FindInt32("be:type", &fImageFileType);
             message->FindInt32("be:translator", &fTranslator);
             fNameControl->SetText(_FindValidFileName(fNameControl->Text()).String());
+            _UpdateFilenameSelection();
             break;
         
         case kLocationChanged:
@@ -183 +188 @@
                 fLastSelectedPath = static_cast<BMenuItem*> (source);
 
             fNameControl->SetText(_FindValidFileName(fNameControl->Text()).String());
+            _UpdateFilenameSelection();
             break;
         }
         
@@ -235 +241 @@
             
             if (layout)
                 layout->SetVisibleItem(0L);
+            SetDefaultButton(NULL);
             
             SetTitle(TR("Take Screenshot"));
             fBackToSave->SetEnabled(true);
@@ -280 +287 @@
         _TakeScreenshot();
         _UpdatePreviewPanel();
         layout->SetVisibleItem(1L);
-    } else
+        fSaveScreenshot->MakeDefault(true);
+    } else {
         layout->SetVisibleItem(0L);
+        SetDefaultButton(NULL);
+    }
 }
 
 
@@ -392 +402 @@
     BBox* divider = new BBox(B_FANCY_BORDER, NULL);
     divider->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, 1));
 
+    fSaveScreenshot  = new BButton("", 
+        TR("Save"), new BMessage(kFinishScreenshot));
+
     BGridLayout* gridLayout = BGridLayoutBuilder(0.0, 5.0)
         .Add(fNameControl->CreateLabelLayoutItem(), 0, 0)
         .Add(fNameControl->CreateTextViewLayoutItem(), 1, 0)
@@ -416 +429 @@
             .Add(new BButton("", TR("Options"), new BMessage(kShowOptions)))
             .AddGlue()
             .Add(new BButton("", TR("Cancel"), new BMessage(B_QUIT_REQUESTED)))
-            .Add(new BButton("", TR("Save"), new BMessage(kFinishScreenshot)))
+            .Add(fSaveScreenshot)
             .End()
         .SetInsets(10.0, 10.0, 10.0, 10.0)
     );
@@ -561 +574 @@
     if (layout)
         layout->SetVisibleItem(1L);
 
+    _UpdateFilenameSelection();
+
     SetTitle(TR("Save screenshot"));
 }
 
 
+void
+ScreenshotWindow::_UpdateFilenameSelection()
+{
+    fNameControl->MakeFocus(true);
+    fNameControl->TextView()->Select(0,
+        fNameControl->TextView()->TextLength() -
+        fExtension.Length());
+    fNameControl->TextView()->ScrollToSelection();
+}
+
+
 BString
 ScreenshotWindow::_FindValidFileName(const char* name)
 {

src/apps/screenshot/ScreenshotWindow.h

@@ -56 +56 @@
                                 BString& label, int32 index, bool markItem);
 
             void            _UpdatePreviewPanel();
+            void            _UpdateFilenameSelection();
             BString         _FindValidFileName(const char* name);
             int32           _PathIndexInMenu(const BString& path) const;
 
@@ -76 +77 @@
             BCheckBox*      fShowMouse;
             BButton*        fBackToSave;
             BButton*        fTakeScreenshot;
+            BButton*        fSaveScreenshot;
             BTextControl*   fNameControl;
             BMenu*          fTranslatorMenu;
             BMenu*          fOutputPathMenu;