Organization Is Key To Success!!!!

KShare.pro

@@ -1,187 +1,2 @@
-#-------------------------------------------------
+TEMPLATE = subdirs
-#
+SUBDIRS += src
-# Project created by QtCreator 2017-04-19T15:47:09
-#
-#-------------------------------------------------
-
-QT       += core gui network widgets svg
-
-TARGET = KShare
-TEMPLATE = app
-
-CONFIG += c++11 thread
-
-# The following define makes your compiler emit warnings if you use
-# any feature of Qt which as been marked as deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if you use deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-
-SOURCES += main.cpp\
-        mainwindow.cpp \
-    cropeditor/cropeditor.cpp \
-    cropeditor/cropview.cpp \
-    cropeditor/cropscene.cpp \
-    uploaders/uploadersingleton.cpp \
-    screenshotter.cpp \
-    screenshotutil.cpp \
-    uploaders/default/imguruploader.cpp \
-    io/ioutils.cpp \
-    settings.cpp \
-    uploaders/default/clipboarduploader.cpp \
-    formatter.cpp \
-    uploaders/customuploader.cpp \
-    notifications.cpp \
-    hotkeying.cpp \
-    cropeditor/settings/brushpenselection.cpp \
-    cropeditor/drawing/bluritem.cpp \
-    cropeditor/drawing/pathitem.cpp \
-    cropeditor/drawing/lineitem.cpp \
-    cropeditor/drawing/textitem.cpp \
-    colorpicker/colorpickerscene.cpp \
-    worker/worker.cpp \
-    screenareaselector/screenareaselector.cpp \
-    recording/recordingpreview.cpp \
-    recording/recordingcontroller.cpp \
-    recording/recordingformats.cpp \
-    formats.cpp \
-    recording/encoders/encoder.cpp \
-    recording/encoders/encodersettings.cpp \
-    recording/encoders/encodersettingsdialog.cpp \
-    settingsdialog.cpp \
-    aboutbox.cpp \
-    cropeditor/drawing/eraseritem.cpp \
-    cropeditor/drawing/rectitem.cpp \
-    cropeditor/drawing/ellipseitem.cpp \
-    hotkeyinputdialog.cpp \
-    cropeditor/drawing/arrowitem.cpp \
-    uploaders/default/imgursettingsdialog.cpp \
-    uploaders/default/imgplusuploader.cpp \
-    filenamevalidator.cpp \
-    logs/requestlogging.cpp \
-    logs/historydialog.cpp \
-    monospacetextdialog.cpp
-
-HEADERS  += mainwindow.hpp \
-    cropeditor/cropeditor.hpp \
-    cropeditor/cropview.hpp \
-    cropeditor/cropscene.hpp \
-    uploaders/uploader.hpp \
-    uploaders/uploadersingleton.hpp \
-    screenshotter.hpp \
-    screenshotutil.hpp \
-    uploaders/default/imguruploader.hpp \
-    io/ioutils.hpp \
-    settings.hpp \
-    uploaders/default/clipboarduploader.hpp \
-    formatter.hpp \
-    uploaders/customuploader.hpp \
-    notifications.hpp \
-    hotkeying.hpp \
-    cropeditor/drawing/drawitem.hpp \
-    cropeditor/settings/brushpenselection.hpp \
-    cropeditor/drawing/bluritem.hpp \
-    cropeditor/drawing/pathitem.hpp \
-    cropeditor/drawing/lineitem.hpp \
-    cropeditor/drawing/textitem.hpp \
-    colorpicker/colorpickerscene.hpp \
-    platformbackend.hpp \
-    worker/worker.hpp \
-    screenareaselector/screenareaselector.hpp \
-    recording/recordingpreview.hpp \
-    recording/recordingcontroller.hpp \
-    recording/recordingformats.hpp \
-    formats.hpp \
-    recording/encoders/encoder.hpp \
-    recording/encoders/encodersettings.hpp \
-    recording/encoders/encodersettingsdialog.hpp \
-    settingsdialog.hpp \
-    aboutbox.hpp \
-    cropeditor/drawing/eraseritem.hpp \
-    cropeditor/drawing/rectitem.hpp \
-    cropeditor/drawing/ellipseitem.hpp \
-    hotkeyinputdialog.hpp \
-    cropeditor/drawing/arrowitem.hpp \
-    uploaders/default/imgursettingsdialog.hpp \
-    uploaders/default/imgplusuploader.hpp \
-    filenamevalidator.hpp \
-    logs/requestlogging.hpp \
-    logs/historydialog.h \
-    monospacetextdialog.h
-
-nopkg {
-#    win32 {
-#        !exists($$(FFMPEG_DEV_PATH)\README.txt) {
-#                error("You must define a valid FFMPEG_DEV_PATH")
-#        }
-
-#        !exists($$(FFMPEG_SHARED_PATH)\README.txt) {
-#                error("You must define a valid FFMPEG_SHARED_PATH")
-#        }
-
-#        INCLUDEPATH += $$(FFMPEG_DEV_PATH)\include
-#        LIBS += -L$$(FFMPEG_DEV_PATH)\lib
-#        message(Set the library and include paths);
-#    }
-    LIBS += -lavcodec -lavformat -lavutil -lswscale
-    message(nopkg);
-} else {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += libavformat libavcodec libswscale libavutil
-}
-
-mac {
-    ICON = $$PWD/icons/icon.icns
-    SOURCES += $$PWD/platformspecifics/mac/macbackend.cpp
-    HEADERS += $$PWD/platformspecifics/mac/macbackend.hpp
-    LIBS += -framework Carbon
-    QMAKE_INFO_PLIST = $$PWD/packages/macos/Info.plist
-    warning(Mac is on TODO);
-} else:win32 {
-    RC_FILE = $$PWD/icon.rc
-    SOURCES += $$PWD/platformspecifics/u32/u32backend.cpp
-    HEADERS += $$PWD/platformspecifics/u32/u32backend.hpp
-    LIBS += -luser32 -lkernel32 -lpthread
-    QT += winextras
-} else:unix {
-    RC_FILE = $$PWD/icon.rc
-    SOURCES += $$PWD/platformspecifics/x11/x11backend.cpp
-    HEADERS += $$PWD/platformspecifics/x11/x11backend.hpp
-    QT += x11extras
-    LIBS += -lxcb-cursor -lxcb-xfixes -lxcb
-} else {
-    error(Unsupported platform);
-}
-
-FORMS    += mainwindow.ui \
-    cropeditor/settings/brushpenselection.ui \
-    recording/encoders/encodersettingsdialog.ui \
-    settingsdialog.ui \
-    aboutbox.ui \
-    hotkeyinputdialog.ui \
-    uploaders/default/imgursettingsdialog.ui \
-    logs/historydialog.ui \
-    monospacetextdialog.ui
-
-DISTFILES += \
-    README.md \
-    LICENSE \
-    OlderSystemFix.patch \
-    AppVeyor/appveyor.yml \
-    AppVeyor/make_installer.sh \
-    .travis.yml \
-    install.sh
-
-RESOURCES += \
-    icon.qrc \
-    translations.qrc
-
-QMAKE_CFLAGS_DEBUG += -g
-
-include(QHotkey/qhotkey.pri)

OlderSystemFix.patch

@@ -1,7 +1,7 @@
-diff --git a/recording/encoders/encoder.cpp b/recording/encoders/encoder.cpp
+diff --git a/src/recording/encoders/encoder.cpp b/src/recording/encoders/encoder.cpp
 index 481ba40..c04d32b 100644
---- a/recording/encoders/encoder.cpp
+--- a/src/recording/encoders/encoder.cpp
-+++ b/recording/encoders/encoder.cpp
++++ b/src/recording/encoders/encoder.cpp
 @@ -64,8 +64,8 @@ Encoder::Encoder(QString &targetFile, QSize res, CodecSettings *settings) {
      if (ret < 0) throwAVErr(ret, "codec open");
      if (codec->capabilities & AV_CODEC_CAP_DR1) avcodec_align_dimensions(out->enc, &out->enc->width, &out->enc->height);

src/colorpicker/colorpickerscene.cpp

@@ -6,10 +6,11 @@
 #include <QGraphicsPixmapItem>
 #include <QGraphicsTextItem>
 #include <QTimer>
+#include <screenoverlayview.hpp>
 #include <settings.hpp>
 
 ColorPickerScene::ColorPickerScene(QPixmap pixmap, QWidget *parentWidget)
-: QGraphicsScene(), QGraphicsView(this, parentWidget) {
+: QGraphicsScene(), ScreenOverlayView(this, parentWidget) {
     setFrameShape(QFrame::NoFrame); // Time taken to solve: A george99g and 38 minutes.
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);

src/colorpicker/colorpickerscene.hpp

@@ -5,20 +5,20 @@
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsTextItem>
-#include <QGraphicsView>
 #include <QKeyEvent>
 #include <QTimer>
+#include <screenoverlayview.hpp>
 #include <screenshotutil.hpp>
 
-class ColorPickerScene : public QGraphicsScene, public QGraphicsView {
+class ColorPickerScene : public QGraphicsScene, public ScreenOverlayView {
     Q_DECLARE_TR_FUNCTIONS(ColorPickerScene)
 public:
-    ColorPickerScene(QPixmap pixmap, QWidget *parentWidget);
+    ColorPickerScene(QPixmap pixmap, QWidget *parent = nullptr);
     void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
     void keyPressEvent(QKeyEvent *event) override;
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *) override;
     static void showPicker() {
-        new ColorPickerScene(screenshotutil::fullscreen(), 0);
+        new ColorPickerScene(screenshotutil::fullscreen());
     }
 
 private:

src/cropeditor/cropscene.hpp

@@ -10,6 +10,7 @@
 #include <QMenu>
 #include <QMenuBar>
 #include <functional>
+#include <screenoverlayview.hpp>
 #include <screenshotutil.hpp>
 class CropScene;
 

src/cropeditor/cropview.cpp

@@ -0,0 +1,8 @@
+#include "cropview.hpp"
+
+CropView::CropView(QGraphicsScene *scene) : ScreenOverlayView(scene) {
+    setCursor(Qt::BlankCursor);
+}
+
+CropView::~CropView() {
+}

src/cropeditor/cropview.hpp

@@ -1,12 +1,13 @@
 #ifndef CROPVIEW_HPP
 #define CROPVIEW_HPP
 
-#include <QGraphicsView>
 #include <QKeyEvent>
+#include <screenoverlayview.hpp>
 
-class CropView : public QGraphicsView {
+class CropView : public ScreenOverlayView {
 public:
     CropView(QGraphicsScene *scene);
+    ~CropView();
 };
 
 #endif // CROPVIEW_HPP

src/logs/historydialog.cpp

@@ -1,8 +1,8 @@
-#include "historydialog.h"
+#include "historydialog.hpp"
 #include "requestlogging.hpp"
 #include "ui_historydialog.h"
 
-#include <monospacetextdialog.h>
+#include <monospacetextdialog.hpp>
 
 using requestlogging::LoggedRequest;
 

src/monospacetextdialog.cpp

@@ -1,4 +1,4 @@
-#include "monospacetextdialog.h"
+#include "monospacetextdialog.hpp"
 #include "ui_monospacetextdialog.h"
 
 MonospaceTextDialog::MonospaceTextDialog(QString name, QByteArray data, QWidget *parent)