From cbe9078d2ef626855f1094d98e81bf5c3a40a6d6 Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Sun, 21 May 2017 19:31:09 +0200 Subject: [PATCH 01/10] Set theme jekyll-theme-minimal --- _config.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 _config.yml diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000..2f7efbe --- /dev/null +++ b/_config.yml @@ -0,0 +1 @@ +theme: jekyll-theme-minimal \ No newline at end of file From ad5dad9b7e88778704fd7de836ae3d05ae4d65f4 Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Sun, 21 May 2017 19:32:47 +0200 Subject: [PATCH 02/10] Create CNAME --- CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 CNAME diff --git a/CNAME b/CNAME new file mode 100644 index 0000000..60b7cff --- /dev/null +++ b/CNAME @@ -0,0 +1 @@ +kshare.arsenarsen.com \ No newline at end of file From f70d0b431fb0545c5fedd89ba36ead9cd851548c Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Sun, 21 May 2017 19:51:06 +0200 Subject: [PATCH 03/10] Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index 60b7cff..baee403 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -kshare.arsenarsen.com \ No newline at end of file +pkshare.arsenarsen.com \ No newline at end of file From 22769c8815cdf6869390c0dd723119e07b0a7508 Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Sun, 21 May 2017 19:55:39 +0200 Subject: [PATCH 04/10] Update CNAME --- CNAME | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CNAME b/CNAME index baee403..60b7cff 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -pkshare.arsenarsen.com \ No newline at end of file +kshare.arsenarsen.com \ No newline at end of file From 7a27a0c6f491103c13cc85c0bdc437192ab6050d Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Sun, 21 May 2017 22:29:04 +0200 Subject: [PATCH 05/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d2a7efb..4b3e661 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A [ShareX](https://getsharex.com/) inspired cross platform utility written with |[![Build Status](https://nativeci.arsenarsen.com/job/KShare/badge/icon)](https://nativeci.arsenarsen.com/job/KShare)| [![Build Status](https://nativeci.arsenarsen.com/job/KShare%20Windows%20x86_64/badge/icon)](https://nativeci.arsenarsen.com/job/KShare%20Windows%20x86_64/)| Soon | ## Screenshot Made with KShare itself, of course :) -![](https://i.arsenarsen.com/2iphpxpah8.png) +![](https://i.arsenarsen.com/uwgzq9e5rn.png) ## Usage See the [wiki](https://github.com/ArsenArsen/KShare/wiki). From 4e928325da45fcb286e925b131b0c7f727f2ddc6 Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Mon, 5 Jun 2017 13:12:12 +0200 Subject: [PATCH 06/10] Ponce found a bug --- QHotkey | 2 +- uploaders/customuploader.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/QHotkey b/QHotkey index 9eace8f..2578b69 160000 --- a/QHotkey +++ b/QHotkey @@ -1 +1 @@ -Subproject commit 9eace8fbbd8dede95db623eea5e25403fd59b490 +Subproject commit 2578b69dc51e3786402777e650181c5735015e1a diff --git a/uploaders/customuploader.cpp b/uploaders/customuploader.cpp index e694fbd..079911a 100644 --- a/uploaders/customuploader.cpp +++ b/uploaders/customuploader.cpp @@ -173,7 +173,8 @@ QJsonObject recurseAndReplace(QJsonObject &body, QByteArray &data, QString conte if (str.startsWith("/") && str.endsWith("/")) { o.insert(s, str.replace("%image", data).replace("%contenttype", contentType)); } - } + } else + o.insert(s, v); } return o; } From aa0764aac5b5015d9a50f06db4c24a6d3365b877 Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Tue, 6 Jun 2017 13:06:41 +0200 Subject: [PATCH 07/10] Silly me! --- uploaders/customuploader.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/uploaders/customuploader.cpp b/uploaders/customuploader.cpp index 079911a..9ea4c44 100644 --- a/uploaders/customuploader.cpp +++ b/uploaders/customuploader.cpp @@ -172,7 +172,8 @@ QJsonObject recurseAndReplace(QJsonObject &body, QByteArray &data, QString conte QString str = v.toString(); if (str.startsWith("/") && str.endsWith("/")) { o.insert(s, str.replace("%image", data).replace("%contenttype", contentType)); - } + } else + o.insert(s, v); } else o.insert(s, v); } From dbc8063f66201f8f31fe8e958331b32a7c632440 Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Tue, 6 Jun 2017 21:26:46 +0200 Subject: [PATCH 08/10] Thanks to Ponce I have discovered and fixed a bug Hopefully --- uploaders/customuploader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uploaders/customuploader.cpp b/uploaders/customuploader.cpp index 9ea4c44..e81ac6f 100644 --- a/uploaders/customuploader.cpp +++ b/uploaders/customuploader.cpp @@ -171,7 +171,7 @@ QJsonObject recurseAndReplace(QJsonObject &body, QByteArray &data, QString conte } else if (v.isString()) { QString str = v.toString(); if (str.startsWith("/") && str.endsWith("/")) { - o.insert(s, str.replace("%image", data).replace("%contenttype", contentType)); + o.insert(s, str.mid(1, str.length() - 2).replace("%image", data).replace("%contenttype", contentType)); } else o.insert(s, v); } else From 806f918f4911257eefabcc8c46fccb8fc806ef9b Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Tue, 6 Jun 2017 22:12:22 +0200 Subject: [PATCH 09/10] Fix one more thing in custom uploaders --- uploaders/customuploader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uploaders/customuploader.cpp b/uploaders/customuploader.cpp index e81ac6f..29d4524 100644 --- a/uploaders/customuploader.cpp +++ b/uploaders/customuploader.cpp @@ -171,7 +171,7 @@ QJsonObject recurseAndReplace(QJsonObject &body, QByteArray &data, QString conte } else if (v.isString()) { QString str = v.toString(); if (str.startsWith("/") && str.endsWith("/")) { - o.insert(s, str.mid(1, str.length() - 2).replace("%image", data).replace("%contenttype", contentType)); + o.insert(s, str.mid(1, str.length() - 2).replace("%imagedata", data).replace("%contenttype", contentType)); } else o.insert(s, v); } else From cc9e8ccfbfe197d7b60adaad74bd6ca7a416ecf7 Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Wed, 7 Jun 2017 10:11:46 +0200 Subject: [PATCH 10/10] Fix from feature/recording: Closing automatically Moved the fix for closing in the background after taking a screenshot [originally on feature/recording] Qt why does that default to true? --- main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/main.cpp b/main.cpp index 105d7eb..6b9fda5 100644 --- a/main.cpp +++ b/main.cpp @@ -33,6 +33,7 @@ void handler(QtMsgType type, const QMessageLogContext &, const QString &msg) { int main(int argc, char *argv[]) { qInstallMessageHandler(handler); QApplication a(argc, argv); + a.setQuitOnLastWindowClosed(false); a.setApplicationName("KShare"); a.setOrganizationName("ArsenArsen"); a.setApplicationVersion("3.0");