-
-
-
- {% if site.google_analytics %}
-
- {% endif %}
-
-
diff --git a/docs/assets/css/style.scss b/docs/assets/css/style.scss
deleted file mode 100644
index 55a2807..0000000
--- a/docs/assets/css/style.scss
+++ /dev/null
@@ -1,13 +0,0 @@
----
----
-
-@import "{{ site.theme }}";
-
-/* stupid css killed the cat */
-header ul {
- background: none;
- border-radius: 0px;
- border: 0px solid #e0e0e0;
-
-
-}
diff --git a/docs/index.md b/docs/index.md
deleted file mode 100644
index c6c60f6..0000000
--- a/docs/index.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-layout: layout
----
-
-
-# **KShare**
-## The free open source and cross platform screen sharing software
-
-KShare is a screenshotting utility built using Qt and written in C++.
-It has many features, including:
-* Area capture,
-* Fullscreen capture,
-* Active window capture,
-* Magnifier, to make those aligments,
-* Drawing on screenshots (blur, shapes, text, ...),
-* Recording,
-* Highly customizable video codecs,
-* Automatic upload/clipboard copying,
-* Hotkeys,
-* Color picker, and last but not least,
-* Custom upload destinations,
-* Upload from clipboard,
-* Upload History,
-* Crossplatform,
-* Windows 10 Darkmode
-
-## Enough talking, show us how it looks
-The main window is rather simple, with only a log, and a button in it:
-
-
-The settings have quite a bit more going on:
-
-
-The area selection editor is simple:
-
-
-And the color picker is the simplest thing ever:
-
-
-The way you select the area to record is by resizing this simple widget:
-
-
-And when you start recording there is a simple preview shown:
-
-
-## Download
-Currently, the only good download I provide is for Arch Linux and Ubuntu 17.04
-The Arch download is on the AUR as `kshare` and `kshare-git`,
-The OS X and Debian/Ubuntu builds can be found here: [CI](https://nativeci.arsenarsen.com/job/KShare%20(master\))
-There is a windows build on [AppVeyor]()
-
-## Wait.. how do I actually use this?
-
-Here is the wiki: [`ding`](https://github.com/ArsenArsen/KShare/wiki)
diff --git a/docs/wiki/Basic-usage.md b/docs/wiki/Basic-usage.md
deleted file mode 100644
index 165cc17..0000000
--- a/docs/wiki/Basic-usage.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-title: Basic Usage
-categories: [wiki]
-layout: wikipage
----
-# Basic usage
-When you start the app (with no arguments, discussed later) a window is popped up, and a tray icon is made.
-
-## The window
-
-
-The main window is a log window with a settings button.
-
-The menu bar has a `File` menu. It has two options, `Quit`, which exits ~~no need to press it :^)~~, and `About`, which contains licensing information:
-
-
-There is a second menu, namely `Screenshot`. It has two options, area, and fullscreen capture. See below.
-
-The third, `Utility`, menu has the color picker in it.
-
-The fourth and final menu, `Recording`, has a start and stop recording button.
-
-## The tray
-
-
-The tray consists of a small, but nice, icon made by @BriannaFoxwell. Upon right clicking it you get the context menu shown above. The menu is rather simple, containing basic controls, and screenshotting options.
-These options will be explained below.
-
-## Screenshotting options
-### Area capture
-Area capture takes a snapshot of the screen, and shows you a fullscreen editor for you to select a region in. This editor is explained in a section below.
-
-### Fullscreen capture
-Fullscreen capture takes a snapshot of the entire screen and skips the editor part. Straight to the destination (explained later as well).
-
-### Active window capture
-Takes the active window and uploads it straight to your destination of choice
-
-## Crop Editor
-Crop Editor is a window you can use to select the area of the screen to upload. It consists of a grey overlay and a re-sizable rectangle. The rectangle is resized by holding the mouse buttons. When you let go of the button, a new selection will start replacing the old one. On the first press the same thing happens.
-Press `Escape` to cancel, and `Return`, or `Enter` to submit.
-Oh. And you can draw with the bar that appears on the top.
diff --git a/docs/wiki/Destinations.md b/docs/wiki/Destinations.md
deleted file mode 100644
index b0da1ff..0000000
--- a/docs/wiki/Destinations.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-title: Destinations
-categories: [wiki]
-layout: wikipage
----
-# Destinations
-Destinations determine where your image goes
-
-There is a set of default uploaders, two, to be exact.
-## Default uploaders:
-### imgur
-Uploads your image to imgur.
-### clipboard
-Copies your image to clipboard.
-
-## Custom uploaders
-Placed into `CONFIG PATH/KShare/uploaders`
-Eg: `$HOME/.config/KShare/uploaders`
-All uploaders have to be `.uploader` files!
-Custom uploaders can be added, and are made with JSON, and follow this template:
-```js
-{
- "name": "", // String, required
- "desc": "", // String, optional
- "method": "", // String, default: "POST", for now, just POST. Request more if you need them
- "target": "", // URL, required
- "format": "", // String, default: "json", can be `x-www-form-urlencoded` or `json` or `multipart-form-data`. Setting to `PLAIN` will make the body ignored and only the image sent.
- "base64": false, // Optional, makes the data base64
- "body": {}, // A JSON object, where one of the nodes can be a string in the format `/ANYTHING/`. In `ANYTHING`, `%contenttype` is replaced with the image type and `%imagedata` is replaced with the image encoded with `imageformat`. Unless you use multipart, see below
- "return": "" // Return pathspec. `|` copies the entire body, `.path.to.node` copies the value of the node. The dot IS IMPORTANT. Without it, nothing happens. If one of the nodes is not a string, the string is copied, if one is an object, recursion continues, if one is null, nothing is copied, otherwise the node is JSON stringified. Only supports JSON for now.
-}
-```
-Note that QJson does not support comments.
-### Multipart
-Multipart is obviously made out of multiple parts. The way you define a multipart body is:
-```js
-[
- {
- "__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.
- "name": "files[]" // Info to add to Content-Disposition (eg part name, filename, ...)
- }
-]
-```
-This would go in the `body` field of the above JSON.
diff --git a/docs/wiki/Encoder-settings.md b/docs/wiki/Encoder-settings.md
deleted file mode 100644
index 9cb32db..0000000
--- a/docs/wiki/Encoder-settings.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-title: Encoder Settings
-categories: [wiki]
-layout: wikipage
----
-# Encoder settings
-The encoders used can be customized to a high degree. Every encoder besides GIF has some settings.
-
-
-## Image encoder settings
-The only option here is quality, by default it uses the default for the format you use. You can change it by unticking format default. [More info](http://doc.qt.io/qt-5/qpixmap.html#save)
-
-## Video encoder settings
-The common settings are bitrate and GOP size.
-
-GOP Size is the size of a group of pictures.
-Bitrate is the target bitrate.
-
-### h264/h265
-The H.26[45] MP4 codec has a few presets to choose. The recommended is to choose the slowest one you can cope with.
-I recommend medium.
-
-CRF is the constant rate factor of this video stream, and again I recommend leaving the default value, `23`.
-
-### VP9
-VP9 is the WebP codec. Only option it has is lossless encoding, and you want it off, trust me.
-
-### GIF
-GIF has no options. It's terrible whatever you do to it.
diff --git a/docs/wiki/Hotkeys.md b/docs/wiki/Hotkeys.md
deleted file mode 100644
index 4dddc94..0000000
--- a/docs/wiki/Hotkeys.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-title: Hotkeys
-categories: [wiki]
-layout: wikipage
----
-# Hotkeys
-Hotkeys are configured in the settings UI.
-
-Currently available hotkeys are:
-## Fullscreen image
-This bind lets you take a fullscreen image and upload it instantly.
-## Area image
-Equivalent to `Take area shot` and `Screenshot -> Area`. Takes a snapshot and opens the crop editor.
-## Active window
-Equivalent to `Active window` and `Screenshot -> Active window`. Takes a snapshot of the active window and sends it.
-## Color picker
-Opens the color picker
-## Recording start/stop
-Starts and stops recording
-
-## Editing hotkeys
-All binds can be modified using by double clicking the hotkey name.
-You can either type the hotkey in or press record and press the key combination you want on your keyboard
diff --git a/docs/wiki/Settings.md b/docs/wiki/Settings.md
deleted file mode 100644
index db7d683..0000000
--- a/docs/wiki/Settings.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-title: Settings
-categories: [wiki]
-layout: wikipage
----
-# Settings
-## Destination
-
-Select the active destination. Adding more is possible and explained it Custom Uploaders
-**Default:** `imgur`
-## Filename scheme
-
-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`
-## Delay before taking a screenshot
-
-Applies only to the buttons in menus. Hotkeys do not follow this rule. In seconds. Mostly used to let animations fade.
-Min: `0.00`
-Max: `99.99`
-**Default:** `0.25`
-
-## Hotkeys
-**Explained on a separate page.**
diff --git a/docs/wiki/Tools.md b/docs/wiki/Tools.md
deleted file mode 100644
index b8b1ac3..0000000
--- a/docs/wiki/Tools.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-title: Tools
-categories: [wiki]
-layout: wikipage
----
-# Drawing
-
-On-screen drawing is pretty simple. Right click in the crop editor to show a pen selection tool. When you click on a pen it will stay selected until you press `Reset`.
-
-You can move drawings around by Ctrl+Dragging them
-
-## Available pens:
-### Free draw (pen icon)
-Makes a path where your mouse went.
-### 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
-Asks you to insert some text.
-**WARNING:** Avoid pressing esc
-### Rectangle
-Drag to draw a rectangle
-### 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
-
-### Clear all drawings
-Removes all drawings
-### Reset
-Allows you to choose a region to cut for the final result.
diff --git a/docs/wiki/index.md b/docs/wiki/index.md
deleted file mode 100644
index 384d708..0000000
--- a/docs/wiki/index.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: Index
-categories: [wiki]
-layout: wikipage
----
-
-# Welcome to the KShare wiki!
-The cross platform screenshotting utility
-
-# Usage
-See the [`Basic usage`](/wiki/Basic-Usage.html) page
diff --git a/packages/arch/KShare/PKGBUILD b/packages/arch/KShare/PKGBUILD
index 5837045..6bd3bf8 100644
--- a/packages/arch/KShare/PKGBUILD
+++ b/packages/arch/KShare/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Gurkengewuerz
pkgname=kshare-git
-pkgver=v4.1.r196.gc38161b
+pkgver=v5.0.1+dev
pkgrel=1
pkgdesc="The free and open source and cross platform screen sharing software."
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ sha1sums=('SKIP')
pkgver() {
cd KShare
- echo "v4.1.r196.gc38161b"
+ echo "v5.0.1+dev"
}
prepare() {
diff --git a/packages/arch/Stable-KShare/PKGBUILD b/packages/arch/Stable-KShare/PKGBUILD
index 518da34..1cf6aae 100644
--- a/packages/arch/Stable-KShare/PKGBUILD
+++ b/packages/arch/Stable-KShare/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Gurkengewuerz
pkgname=kshare
-pkgver=v5.0.0
+pkgver=v5.0.1
pkgrel=1
conflicts=("kshare-git")
pkgdesc="The free and open source and cross platform screen sharing software."
diff --git a/src/main.cpp b/src/main.cpp
index ceeb67f..0b99c6a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -74,7 +74,7 @@ int main(int argc, char *argv[]) {
a.setQuitOnLastWindowClosed(false);
a.setApplicationName("KShare");
a.setOrganizationName("ArsenArsen");
- a.setApplicationVersion("5.0.0");
+ a.setApplicationVersion("5.0.1");
QString locale = QLocale::system().name();
if (locale != "en_US") loadTranslation(locale);
diff --git a/src/notifications.cpp b/src/notifications.cpp
index 3106553..3b96cb5 100644
--- a/src/notifications.cpp
+++ b/src/notifications.cpp
@@ -3,6 +3,7 @@
#include "systemnotification.h"
#include "mainwindow.hpp"
#include "ui_mainwindow.h"
+#include
#include
#include
@@ -24,29 +25,34 @@ void notifications::notifyNolog(QString title, QString body, QSystemTrayIcon::Me
}
void notifications::playSound(notifications::Sound soundType) {
- QMediaPlayer*mediaPlayer = new QMediaPlayer(MainWindow::inst());
+ if(!settings::settings().value("playSound", true).toBool()) return;
- switch (soundType) {
- case notifications::Sound::CAPTURE:
- mediaPlayer->setMedia(QUrl("qrc:/capturesound.wav"));
- break;
+ try {
+ QMediaPlayer*mediaPlayer = new QMediaPlayer(MainWindow::inst());
- case notifications::Sound::SUCCESS:
- mediaPlayer->setMedia(QUrl("qrc:/successsound.wav"));
- break;
+ switch (soundType) {
+ case notifications::Sound::CAPTURE:
+ mediaPlayer->setMedia(QUrl("qrc:/capturesound.wav"));
+ break;
- case notifications::Sound::ERROR:
- mediaPlayer->setMedia(QUrl("qrc:/errorsound.wav"));
- break;
+ case notifications::Sound::SUCCESS:
+ mediaPlayer->setMedia(QUrl("qrc:/successsound.wav"));
+ break;
- default:
- break;
+ case notifications::Sound::ERROR:
+ mediaPlayer->setMedia(QUrl("qrc:/errorsound.wav"));
+ break;
+
+ default:
+ break;
+ }
+
+ mediaPlayer->setVolume(25);
+ mediaPlayer->play();
+
+ if(mediaPlayer->error() != QMediaPlayer::NoError && mediaPlayer->error() != QMediaPlayer::ServiceMissingError)
+ notifications::notify(QString::number(mediaPlayer->error()), mediaPlayer->errorString(), QSystemTrayIcon::Warning);
+ } catch (...) {
+ notifications::notifyNolog(QObject::tr("KShare: No sound driver"), "No sound driver found. Install libqt5multimedia5-plugins for notifcation sound support.", QSystemTrayIcon::Warning);
}
-
- mediaPlayer->setVolume(25);
- mediaPlayer->play();
-
- if(mediaPlayer->error() != QMediaPlayer::NoError && mediaPlayer->error() != QMediaPlayer::ServiceMissingError)
- notifications::notify(QString::number(mediaPlayer->error()), mediaPlayer->errorString(), QSystemTrayIcon::Warning);
-
}
diff --git a/src/uploaders/default/imguruploader.cpp b/src/uploaders/default/imguruploader.cpp
index 4107c3c..3113f83 100644
--- a/src/uploaders/default/imguruploader.cpp
+++ b/src/uploaders/default/imguruploader.cpp
@@ -92,9 +92,9 @@ void ImgurUploader::handleSend(QString auth, QString mime, QByteArray byteArray,
}
if (!result.isEmpty()) {
ioutils::addLogEntry(r, data, result, sf);
- utils::toClipboard(result);
notifications::notify(tr("KShare imgur Uploader"), tr("Uploaded to imgur!"));
notifications::playSound(notifications::Sound::SUCCESS);
+ utils::toClipboard(result);
} else {
ioutils::addLogEntry(r, data, result, sf);
notifications::notify(tr("KShare imgur Uploader "),