From 2d5e7a03dd12758c8d21cd2b5df9c17f0f2ac519 Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Mon, 18 Sep 2017 15:33:50 +0200 Subject: [PATCH] Wiki update --- .gitignore | 1 + docs/index.md | 6 +++--- docs/wiki/Destinations.md | 3 ++- docs/wiki/Encoder-settings.md | 2 +- docs/wiki/Hotkeys.md | 2 +- docs/wiki/Settings.md | 4 ++-- docs/wiki/Tools.md | 12 ++++++------ 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 54e95dc..39c1498 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ Makefile *.out tags *.Debug +*.kdev* vgcore.* diff --git a/docs/index.md b/docs/index.md index 76a319d..91bf7d2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -22,13 +22,13 @@ It has many features, including: ## Enough talking, show us how it looks The main window is rather simple, with only a log, and a button in it: -![image1](http://i.imgur.com/QOebwEM.png) +![image1](https://i.imgur.com/Tnrj90b.png) The settings have quite a bit more going on: -![image2](http://i.imgur.com/kZzQzGr.png) +![image2](https://i.imgur.com/GFN2jCU.png) The area selection editor is simple: -![image3](http://i.imgur.com/kyWZk3p.jpg) +![image3](https://i.imgur.com/Cbi8YsL.png) And the color picker is the simplest thing ever: ![image4](http://i.imgur.com/VIeGbdQ.jpg) diff --git a/docs/wiki/Destinations.md b/docs/wiki/Destinations.md index 7325362..b0da1ff 100644 --- a/docs/wiki/Destinations.md +++ b/docs/wiki/Destinations.md @@ -37,7 +37,8 @@ Multipart is obviously made out of multiple parts. The way you define a multipar [ { "__HeaderName": "HeaderValue", // No limit here. Must start with __, which is removed later. - "body": { /* same way you define it for anything json */ } // Can be string. Strings matching `/.../` are processed same way as in a json field. + "body": { /* same way you define it for anything json */ }, // Can be string. Strings matching `/.../` are processed same way as in a json field. + "name": "files[]" // Info to add to Content-Disposition (eg part name, filename, ...) } ] ``` diff --git a/docs/wiki/Encoder-settings.md b/docs/wiki/Encoder-settings.md index f90a139..9cb32db 100644 --- a/docs/wiki/Encoder-settings.md +++ b/docs/wiki/Encoder-settings.md @@ -26,4 +26,4 @@ CRF is the constant rate factor of this video stream, and again I recommend leav VP9 is the WebP codec. Only option it has is lossless encoding, and you want it off, trust me. ### GIF -GIF has no options. +GIF has no options. It's terrible whatever you do to it. diff --git a/docs/wiki/Hotkeys.md b/docs/wiki/Hotkeys.md index 78f3c93..4dddc94 100644 --- a/docs/wiki/Hotkeys.md +++ b/docs/wiki/Hotkeys.md @@ -1,5 +1,5 @@ --- -title: Hotkeys +title: Hotkeys categories: [wiki] layout: wikipage --- diff --git a/docs/wiki/Settings.md b/docs/wiki/Settings.md index bed6747..db7d683 100644 --- a/docs/wiki/Settings.md +++ b/docs/wiki/Settings.md @@ -1,5 +1,5 @@ --- -title: Settings +title: Settings categories: [wiki] layout: wikipage --- @@ -11,7 +11,7 @@ Select the active destination. Adding more is possible and explained it Custom U ## Filename scheme ![](http://i.imgur.com/RHHEO3K.png) Used to generate filenames. Extensions are placed in place of `%ext`. `%(DATE FORMAT)date` can be used to replace the date format with a format as specified by [this documentation page](http://doc.qt.io/qt-5/qdatetime.html#toString) -**Default:** `Screenshot %(yyyy-MM-dd HH:mm:ss)date.%ext` +**Default:** `Screenshot %(yyyy-MM-dd HH-mm-ss)date.%ext` ## Delay before taking a screenshot ![](http://i.imgur.com/j0D7OqI.png) Applies only to the buttons in menus. Hotkeys do not follow this rule. In seconds. Mostly used to let animations fade. diff --git a/docs/wiki/Tools.md b/docs/wiki/Tools.md index de40faa..b8b1ac3 100644 --- a/docs/wiki/Tools.md +++ b/docs/wiki/Tools.md @@ -10,12 +10,10 @@ On-screen drawing is pretty simple. Right click in the crop editor to show a pen You can move drawings around by Ctrl+Dragging them ## Available pens: -### Dot -Draws dots as you move your mouse -### Path +### Free draw (pen icon) Makes a path where your mouse went. -### Blur -Allows you to set a rectangle to blur out. You'll get a settings popup upon selecting this pen. +### Blur (badly made blurred rectangle icon) +Allows you to set a rectangle to blur out. ### Straight line A line between where you start and end dragging ### Text @@ -23,8 +21,10 @@ Asks you to insert some text. **WARNING:** Avoid pressing esc ### Rectangle Drag to draw a rectangle -### Ellipse +### Ellipse Drag to draw an ellipse +### Arrow +Draws an arrow from start to end of your drag ### Eraser[](https://www.youtube.com/watch?v=OjGrcJ4lZCc) Removes all items you drag your mouse over