Merge remote-tracking branch 'upstream/dev' into dev

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());

docs/index.md

@@ -5,7 +5,6 @@ layout: layout
 
 # **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:
@@ -22,28 +21,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?
 

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"
 }

packages/arch/KShare/pre-push

@@ -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
-

packages/arch/Stable-KShare/PKGBUILD

@@ -1,15 +1,15 @@
 # Maintainer: ArsenArsen <arsenarsentmc@outlook.com>
 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"
 }
 

packages/arch/Stable-KShare/PKGBUILD.sample

@@ -1,31 +0,0 @@
-# Maintainer: ArsenArsen <arsenarsentmc@outlook.com>
-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"
-}
-

packages/arch/Stable-KShare/release.sh

@@ -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