From b7edd8a2238cf438dfbf0ba7eac1e0672cfcb947 Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Sat, 19 Aug 2017 00:29:08 +0200 Subject: [PATCH 1/2] Full screen fix, some site edits and fixes --- cropeditor/cropscene.cpp | 4 +--- docs/README.md | 16 ++++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/cropeditor/cropscene.cpp b/cropeditor/cropscene.cpp index 6125ebe..f24aa40 100644 --- a/cropeditor/cropscene.cpp +++ b/cropeditor/cropscene.cpp @@ -61,7 +61,7 @@ CropScene::CropScene(QObject *parent, QPixmap pixmap) } }); - addDrawingAction(menu, tr("Crop"), ":/icons/crop.png", [] { return nullptr; }); + addDrawingAction(menu, tr("None"), ":/icons/crop.png", [] { return nullptr; }); menu->addSeparator(); QAction *settings = menu->addAction(""); @@ -217,8 +217,6 @@ void CropScene::setVisible(bool visible) { view->setVisible(visible); if (visible) { if (QApplication::screens().size() == 1) view->showFullScreen(); - view->resize(_pixmap.width(), _pixmap.height()); - view->setMinimumSize(_pixmap.size()); QPoint p = screenshotutil::smallestScreenCoordinate() + QPoint(settings::settings().value("cropx", 0).toInt(), settings::settings().value("cropy", 0).toInt()); view->move(p.x(), p.y()); diff --git a/docs/README.md b/docs/README.md index 2980699..c39b6ce 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,6 +1,5 @@ # **KShare** ## The free open source and cross platform screen sharing software -###### Inspired by [ShareX](https://getsharex.com) KShare is a screenshotting utility built using Qt and written in C++. It has many features, including: @@ -17,28 +16,29 @@ It has many features, including: * Custom upload destinations ## Enough talking, show us how it looks -The main window is rather simple, with only a log, and a button in it: +The main window is rather simple, with only a log, and a button in it: ![image1](http://i.imgur.com/QOebwEM.png) -The settings have quite a bit more going on: +The settings have quite a bit more going on: ![image2](http://i.imgur.com/kZzQzGr.png) -The area selection editor is simple: +The area selection editor is simple: ![image3](http://i.imgur.com/kyWZk3p.jpg) -And the color picker is the simplest thing ever: +And the color picker is the simplest thing ever: ![image4](http://i.imgur.com/VIeGbdQ.jpg) -The way you select the area to record is by resizing this simple widget: +The way you select the area to record is by resizing this simple widget: ![image5](http://i.imgur.com/0iXFHnm.png) -And when you start recording there is a simple preview shown: +And when you start recording there is a simple preview shown: ![image6](http://i.imgur.com/6fu33TR.png) ## 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`, -and the Ubuntu build is a .deb found on my CI: [kshare.deb](https://nativeci.arsenarsen.com/job/KShare/73/artifact/packages/simpleName.deb) +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? From 45f07cfb997ab1d81f8407c1542a6d55875de66e Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Sat, 19 Aug 2017 00:32:20 +0200 Subject: [PATCH 2/2] Update arch packages --- .../arch/KShare/{PKGBUILD.sample => PKGBUILD} | 4 +-- packages/arch/KShare/pre-push | 12 ------- packages/arch/Stable-KShare/PKGBUILD | 10 ++++-- packages/arch/Stable-KShare/PKGBUILD.sample | 31 ------------------- packages/arch/Stable-KShare/release.sh | 5 --- 5 files changed, 9 insertions(+), 53 deletions(-) rename packages/arch/KShare/{PKGBUILD.sample => PKGBUILD} (84%) delete mode 100755 packages/arch/KShare/pre-push delete mode 100644 packages/arch/Stable-KShare/PKGBUILD.sample delete mode 100755 packages/arch/Stable-KShare/release.sh diff --git a/packages/arch/KShare/PKGBUILD.sample b/packages/arch/KShare/PKGBUILD similarity index 84% rename from packages/arch/KShare/PKGBUILD.sample rename to packages/arch/KShare/PKGBUILD index 43d8e28..8f75791 100644 --- a/packages/arch/KShare/PKGBUILD.sample +++ b/packages/arch/KShare/PKGBUILD @@ -31,8 +31,8 @@ build() { package() { cd KShare install -Dm755 KShare "$pkgdir/usr/bin/kshare" - install -Dm644 icons/icon.png "$pkgdir/usr/share/pixmaps/kshare.png" - install -Dm644 KShare.desktop "$pkgdir/usr/share/applications" + install -Dm644 icons/icon.png "$pkgdir/usr/share/pixmaps/KShare.png" + install -Dm644 KShare.desktop "$pkgdir/usr/share/applications/KShare.desktop" install -Dm644 LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/packages/arch/KShare/pre-push b/packages/arch/KShare/pre-push deleted file mode 100755 index 7d393f0..0000000 --- a/packages/arch/KShare/pre-push +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -if [[ `git rev-parse --abbrev-ref HEAD 2>/dev/null` == "dev" ]] -then - HASH=`git rev-parse --verify HEAD` - sed "s/;COMMIT;/c$HASH/g" /media/arsen/Data/Packages/KShare/PKGBUILD.sample > /media/arsen/Data/Packages/KShare/PKGBUILD - cd /media/arsen/Data/Packages/KShare - makepkg --printsrcinfo > .SRCINFO - git stage . - git commit -m "UPDATE $HASH" - git push -fi - diff --git a/packages/arch/Stable-KShare/PKGBUILD b/packages/arch/Stable-KShare/PKGBUILD index 42e737e..2bcf2b6 100644 --- a/packages/arch/Stable-KShare/PKGBUILD +++ b/packages/arch/Stable-KShare/PKGBUILD @@ -1,15 +1,15 @@ # Maintainer: ArsenArsen pkgname=kshare -pkgver=4.1 +pkgver=4.1r6 pkgrel=1 conflicts=("kshare-git") -pkgdesc="A ShareX inspired cross platform utility written with Qt." +pkgdesc="The free and open source and cross platform screen sharing software." arch=('i686' 'x86_64') url="https://github.com/ArsenArsen/KShare" license=('MIT') provides=('kshare=$pkgver') depends=(qt5-base qt5-x11extras xcb-util-cursor ffmpeg libxfixes) -source=(git+https://github.com/ArsenArsen/KShare.git#tag=v${pkgver}) +source=(git+https://github.com/ArsenArsen/KShare.git) sha1sums=('SKIP') build() { @@ -23,5 +23,9 @@ package() { cd "${srcdir}/KShare" mkdir -p "$pkgdir/usr/bin" install ./KShare "$pkgdir/usr/bin/kshare" + mkdir -p "$pkgdir/usr/share/pixmaps" + install "${srcdir}/KShare/icons/icon.png" "$pkgdir/usr/share/pixmaps/KShare.png" + mkdir -p "$pkgdir/usr/share/applications" +# install KShare.desktop "$pkgdir/usr/share/applications" } diff --git a/packages/arch/Stable-KShare/PKGBUILD.sample b/packages/arch/Stable-KShare/PKGBUILD.sample deleted file mode 100644 index 48829e6..0000000 --- a/packages/arch/Stable-KShare/PKGBUILD.sample +++ /dev/null @@ -1,31 +0,0 @@ -# Maintainer: ArsenArsen -pkgname=kshare -pkgver=;VER; -pkgrel=1 -conflicts=("kshare-git") -pkgdesc="The free and open source and cross platform screen sharing software." -arch=('i686' 'x86_64') -url="https://github.com/ArsenArsen/KShare" -license=('MIT') -provides=('kshare=$pkgver') -depends=(qt5-base qt5-svg qt5-x11extras xcb-util-cursor ffmpeg libxfixes) -source=(git+https://github.com/ArsenArsen/KShare.git#tag=v${pkgver}) -sha1sums=('SKIP') - -build() { - cd "${srcdir}/KShare" - git submodule update --init --recursive - qmake - make -j$(($(nproc) + 1)) -} - -package() { - cd "${srcdir}/KShare" - mkdir -p "$pkgdir/usr/bin" - install ./KShare "$pkgdir/usr/bin/kshare" - mkdir -p "$pkgdir/usr/share/pixmaps" - install "${srcdir}/KShare/icons/icon.png" "$pkgdir/usr/share/pixmaps" - mkdir -p "$pkgdir/usr/share/applications" - install KShare.desktop "$pkgdir/usr/share/applications" -} - diff --git a/packages/arch/Stable-KShare/release.sh b/packages/arch/Stable-KShare/release.sh deleted file mode 100755 index 9d2ce27..0000000 --- a/packages/arch/Stable-KShare/release.sh +++ /dev/null @@ -1,5 +0,0 @@ -sed "s/;VER;/$1/" PKGBUILD.sample > PKGBUILD -makepkg --printsrcinfo > .SRCINFO -git stage .SRCINFO PKGBUILD -git commit -m "Release $1" -git push