Patch Screenshot to not ignore the delay time setting from the command line. This fixes ticket #5862
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36969 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -128,6 +128,7 @@ ScreenshotWindow::ScreenshotWindow()
|
|||||||
settings.FindInt64("delay", &fDelay);
|
settings.FindInt64("delay", &fDelay);
|
||||||
settings.FindString("outputFilename", &fOutputFilename);
|
settings.FindString("outputFilename", &fOutputFilename);
|
||||||
|
|
||||||
|
_TakeScreenshot(0);
|
||||||
_InitWindow(settings);
|
_InitWindow(settings);
|
||||||
CenterOnScreen();
|
CenterOnScreen();
|
||||||
Show();
|
Show();
|
||||||
@@ -146,7 +147,7 @@ ScreenshotWindow::ScreenshotWindow(bigtime_t delay, bool includeBorder,
|
|||||||
fScreenshot(NULL),
|
fScreenshot(NULL),
|
||||||
fOutputPathPanel(NULL),
|
fOutputPathPanel(NULL),
|
||||||
fLastSelectedPath(NULL),
|
fLastSelectedPath(NULL),
|
||||||
fDelay(delay),
|
fDelay(0),
|
||||||
fTabHeight(0),
|
fTabHeight(0),
|
||||||
fIncludeBorder(includeBorder),
|
fIncludeBorder(includeBorder),
|
||||||
fIncludeMouse(includeMouse),
|
fIncludeMouse(includeMouse),
|
||||||
@@ -158,10 +159,13 @@ ScreenshotWindow::ScreenshotWindow(bigtime_t delay, bool includeBorder,
|
|||||||
fImageFileType(imageFileType)
|
fImageFileType(imageFileType)
|
||||||
{
|
{
|
||||||
if (fSaveScreenshotSilent) {
|
if (fSaveScreenshotSilent) {
|
||||||
_TakeScreenshot(fDelay);
|
_TakeScreenshot(delay);
|
||||||
_SaveScreenshot();
|
_SaveScreenshot();
|
||||||
be_app_messenger.SendMessage(B_QUIT_REQUESTED);
|
be_app_messenger.SendMessage(B_QUIT_REQUESTED);
|
||||||
} else {
|
} else {
|
||||||
|
if (!fShowConfigWindow)
|
||||||
|
_TakeScreenshot(delay);
|
||||||
|
|
||||||
BMessage settings = _ReadSettings();
|
BMessage settings = _ReadSettings();
|
||||||
_InitWindow(settings);
|
_InitWindow(settings);
|
||||||
CenterOnScreen();
|
CenterOnScreen();
|
||||||
@@ -336,7 +340,6 @@ ScreenshotWindow::_InitWindow(const BMessage& settings)
|
|||||||
_SetupSecondLayoutItem(layout, settings);
|
_SetupSecondLayoutItem(layout, settings);
|
||||||
|
|
||||||
if (!fShowConfigWindow) {
|
if (!fShowConfigWindow) {
|
||||||
_TakeScreenshot(0);
|
|
||||||
_UpdatePreviewPanel();
|
_UpdatePreviewPanel();
|
||||||
layout->SetVisibleItem(1L);
|
layout->SetVisibleItem(1L);
|
||||||
fSaveScreenshot->MakeDefault(true);
|
fSaveScreenshot->MakeDefault(true);
|
||||||
|
|||||||
Reference in New Issue
Block a user