hrev50179 adds 2 changesets to branch 'master'
old head: bcd52c65cbb36ba816cfda808e197f2129ce34b5
new head: ea810bf683409ef7000f29aff9627f7ce13ca0bb
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=ea810bf68340+%5Ebcd52c65cbb3
----------------------------------------------------------------------------
63fd7a2041c9: Screenshot: default space between buttons
ea810bf68340: Screenshot: Ignore delay on Print Screen
The delay variable is only considered when you push the
"New screenshot" button as suggested by diver.
Fixes #11447
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 12 insertions(+), 8 deletions(-)
src/apps/screenshot/ScreenshotWindow.cpp | 17 ++++++++++-------
src/apps/screenshot/ScreenshotWindow.h | 3 ++-
############################################################################
Commit: 63fd7a2041c91ab4dfe1d28efd70872be6dd5819
URL: http://cgit.haiku-os.org/haiku/commit/?id=63fd7a2041c9
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Thu Mar 31 22:54:50 2016 UTC
Screenshot: default space between buttons
----------------------------------------------------------------------------
diff --git a/src/apps/screenshot/ScreenshotWindow.cpp
b/src/apps/screenshot/ScreenshotWindow.cpp
index 98fd819..23f1706 100644
--- a/src/apps/screenshot/ScreenshotWindow.cpp
+++ b/src/apps/screenshot/ScreenshotWindow.cpp
@@ -229,7 +229,7 @@ ScreenshotWindow::ScreenshotWindow(const Utility& utility,
bool silent,
.End()
.End()
.Add(new BSeparatorView(B_HORIZONTAL))
- .AddGroup(B_HORIZONTAL, 0)
+ .AddGroup(B_HORIZONTAL)
.SetInsets(B_USE_WINDOW_SPACING, B_USE_DEFAULT_SPACING,
B_USE_WINDOW_SPACING, B_USE_WINDOW_SPACING)
.Add(new BButton("", B_TRANSLATE("Copy to clipboard"),
############################################################################
Revision: hrev50179
Commit: ea810bf683409ef7000f29aff9627f7ce13ca0bb
URL: http://cgit.haiku-os.org/haiku/commit/?id=ea810bf68340
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Thu Mar 31 22:55:25 2016 UTC
Ticket: https://dev.haiku-os.org/ticket/11447
Screenshot: Ignore delay on Print Screen
The delay variable is only considered when you push the
"New screenshot" button as suggested by diver.
Fixes #11447
----------------------------------------------------------------------------
diff --git a/src/apps/screenshot/ScreenshotWindow.cpp
b/src/apps/screenshot/ScreenshotWindow.cpp
index 23f1706..113448c 100644
--- a/src/apps/screenshot/ScreenshotWindow.cpp
+++ b/src/apps/screenshot/ScreenshotWindow.cpp
@@ -140,7 +140,7 @@ ScreenshotWindow::ScreenshotWindow(const Utility& utility,
bool silent,
// Check if fUtility contains valid data
if (fUtility.wholeScreen == NULL) {
- _NewScreenshot(silent, clipboard);
+ _NewScreenshot(silent, clipboard, true);
return;
}
@@ -391,15 +391,18 @@ ScreenshotWindow::Quit()
void
-ScreenshotWindow::_NewScreenshot(bool silent, bool clipboard)
+ScreenshotWindow::_NewScreenshot(bool silent, bool clipboard, bool ignoreDelay)
{
BMessage message(B_ARGV_RECEIVED);
int32 argc = 3;
- BString delay;
- delay << fDelay / 1000000;
message.AddString("argv", "screenshot");
- message.AddString("argv", "--delay");
- message.AddString("argv", delay);
+
+ if (!ignoreDelay) {
+ BString delay;
+ delay << fDelay / 1000000;
+ message.AddString("argv", "--delay");
+ message.AddString("argv", delay);
+ }
if (silent || clipboard) {
if (silent) {
diff --git a/src/apps/screenshot/ScreenshotWindow.h
b/src/apps/screenshot/ScreenshotWindow.h
index 0e9726d..cdb0148 100644
--- a/src/apps/screenshot/ScreenshotWindow.h
+++ b/src/apps/screenshot/ScreenshotWindow.h
@@ -40,7 +40,8 @@ public:
private:
void _NewScreenshot(bool silent =
false,
- bool clipboard
= false);
+ bool clipboard
= false,
+ bool
ignoreDelay = false);
void _UpdatePreviewPanel();
void _DisallowChar(BTextView*
textView);
void _SetupOutputPathMenu(const
BMessage& settings);
