diff --git a/KShare.pro b/KShare.pro index 78b1496..3330bde 100644 --- a/KShare.pro +++ b/KShare.pro @@ -1,187 +1,2 @@ -#------------------------------------------------- -# -# 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) +TEMPLATE = subdirs +SUBDIRS += src diff --git a/OlderSystemFix.patch b/OlderSystemFix.patch index 2741241..5f285d7 100644 --- a/OlderSystemFix.patch +++ b/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 -+++ b/recording/encoders/encoder.cpp +--- a/src/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); diff --git a/aboutbox.cpp b/src/aboutbox.cpp similarity index 100% rename from aboutbox.cpp rename to src/aboutbox.cpp diff --git a/aboutbox.hpp b/src/aboutbox.hpp similarity index 100% rename from aboutbox.hpp rename to src/aboutbox.hpp diff --git a/aboutbox.ui b/src/aboutbox.ui similarity index 100% rename from aboutbox.ui rename to src/aboutbox.ui diff --git a/colorpicker/colorpickerscene.cpp b/src/colorpicker/colorpickerscene.cpp similarity index 97% rename from colorpicker/colorpickerscene.cpp rename to src/colorpicker/colorpickerscene.cpp index 109b20b..5b4cd5a 100644 --- a/colorpicker/colorpickerscene.cpp +++ b/src/colorpicker/colorpickerscene.cpp @@ -6,10 +6,11 @@ #include #include #include +#include #include 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); diff --git a/colorpicker/colorpickerscene.hpp b/src/colorpicker/colorpickerscene.hpp similarity index 76% rename from colorpicker/colorpickerscene.hpp rename to src/colorpicker/colorpickerscene.hpp index 8c6c060..755e8bb 100644 --- a/colorpicker/colorpickerscene.hpp +++ b/src/colorpicker/colorpickerscene.hpp @@ -5,20 +5,20 @@ #include #include #include -#include #include #include +#include #include -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: diff --git a/cropeditor/cropeditor.cpp b/src/cropeditor/cropeditor.cpp similarity index 100% rename from cropeditor/cropeditor.cpp rename to src/cropeditor/cropeditor.cpp diff --git a/cropeditor/cropeditor.hpp b/src/cropeditor/cropeditor.hpp similarity index 100% rename from cropeditor/cropeditor.hpp rename to src/cropeditor/cropeditor.hpp diff --git a/cropeditor/cropeditor.ui b/src/cropeditor/cropeditor.ui similarity index 100% rename from cropeditor/cropeditor.ui rename to src/cropeditor/cropeditor.ui diff --git a/cropeditor/cropscene.cpp b/src/cropeditor/cropscene.cpp similarity index 100% rename from cropeditor/cropscene.cpp rename to src/cropeditor/cropscene.cpp diff --git a/cropeditor/cropscene.hpp b/src/cropeditor/cropscene.hpp similarity index 99% rename from cropeditor/cropscene.hpp rename to src/cropeditor/cropscene.hpp index 6ad2191..2630443 100644 --- a/cropeditor/cropscene.hpp +++ b/src/cropeditor/cropscene.hpp @@ -10,6 +10,7 @@ #include #include #include +#include #include class CropScene; diff --git a/src/cropeditor/cropview.cpp b/src/cropeditor/cropview.cpp new file mode 100644 index 0000000..6dc48bd --- /dev/null +++ b/src/cropeditor/cropview.cpp @@ -0,0 +1,8 @@ +#include "cropview.hpp" + +CropView::CropView(QGraphicsScene *scene) : ScreenOverlayView(scene) { + setCursor(Qt::BlankCursor); +} + +CropView::~CropView() { +} diff --git a/cropeditor/cropview.hpp b/src/cropeditor/cropview.hpp similarity index 59% rename from cropeditor/cropview.hpp rename to src/cropeditor/cropview.hpp index fab9983..d306a46 100644 --- a/cropeditor/cropview.hpp +++ b/src/cropeditor/cropview.hpp @@ -1,12 +1,13 @@ #ifndef CROPVIEW_HPP #define CROPVIEW_HPP -#include #include +#include -class CropView : public QGraphicsView { +class CropView : public ScreenOverlayView { public: CropView(QGraphicsScene *scene); + ~CropView(); }; #endif // CROPVIEW_HPP diff --git a/cropeditor/drawing/arrowitem.cpp b/src/cropeditor/drawing/arrowitem.cpp similarity index 100% rename from cropeditor/drawing/arrowitem.cpp rename to src/cropeditor/drawing/arrowitem.cpp diff --git a/cropeditor/drawing/arrowitem.hpp b/src/cropeditor/drawing/arrowitem.hpp similarity index 100% rename from cropeditor/drawing/arrowitem.hpp rename to src/cropeditor/drawing/arrowitem.hpp diff --git a/cropeditor/drawing/bluritem.cpp b/src/cropeditor/drawing/bluritem.cpp similarity index 100% rename from cropeditor/drawing/bluritem.cpp rename to src/cropeditor/drawing/bluritem.cpp diff --git a/cropeditor/drawing/bluritem.hpp b/src/cropeditor/drawing/bluritem.hpp similarity index 100% rename from cropeditor/drawing/bluritem.hpp rename to src/cropeditor/drawing/bluritem.hpp diff --git a/cropeditor/drawing/drawitem.hpp b/src/cropeditor/drawing/drawitem.hpp similarity index 100% rename from cropeditor/drawing/drawitem.hpp rename to src/cropeditor/drawing/drawitem.hpp diff --git a/cropeditor/drawing/ellipseitem.cpp b/src/cropeditor/drawing/ellipseitem.cpp similarity index 100% rename from cropeditor/drawing/ellipseitem.cpp rename to src/cropeditor/drawing/ellipseitem.cpp diff --git a/cropeditor/drawing/ellipseitem.hpp b/src/cropeditor/drawing/ellipseitem.hpp similarity index 100% rename from cropeditor/drawing/ellipseitem.hpp rename to src/cropeditor/drawing/ellipseitem.hpp diff --git a/cropeditor/drawing/eraseritem.cpp b/src/cropeditor/drawing/eraseritem.cpp similarity index 100% rename from cropeditor/drawing/eraseritem.cpp rename to src/cropeditor/drawing/eraseritem.cpp diff --git a/cropeditor/drawing/eraseritem.hpp b/src/cropeditor/drawing/eraseritem.hpp similarity index 100% rename from cropeditor/drawing/eraseritem.hpp rename to src/cropeditor/drawing/eraseritem.hpp diff --git a/cropeditor/drawing/lineitem.cpp b/src/cropeditor/drawing/lineitem.cpp similarity index 100% rename from cropeditor/drawing/lineitem.cpp rename to src/cropeditor/drawing/lineitem.cpp diff --git a/cropeditor/drawing/lineitem.hpp b/src/cropeditor/drawing/lineitem.hpp similarity index 100% rename from cropeditor/drawing/lineitem.hpp rename to src/cropeditor/drawing/lineitem.hpp diff --git a/cropeditor/drawing/pathitem.cpp b/src/cropeditor/drawing/pathitem.cpp similarity index 100% rename from cropeditor/drawing/pathitem.cpp rename to src/cropeditor/drawing/pathitem.cpp diff --git a/cropeditor/drawing/pathitem.hpp b/src/cropeditor/drawing/pathitem.hpp similarity index 100% rename from cropeditor/drawing/pathitem.hpp rename to src/cropeditor/drawing/pathitem.hpp diff --git a/cropeditor/drawing/rectitem.cpp b/src/cropeditor/drawing/rectitem.cpp similarity index 100% rename from cropeditor/drawing/rectitem.cpp rename to src/cropeditor/drawing/rectitem.cpp diff --git a/cropeditor/drawing/rectitem.hpp b/src/cropeditor/drawing/rectitem.hpp similarity index 100% rename from cropeditor/drawing/rectitem.hpp rename to src/cropeditor/drawing/rectitem.hpp diff --git a/cropeditor/drawing/textitem.cpp b/src/cropeditor/drawing/textitem.cpp similarity index 100% rename from cropeditor/drawing/textitem.cpp rename to src/cropeditor/drawing/textitem.cpp diff --git a/cropeditor/drawing/textitem.hpp b/src/cropeditor/drawing/textitem.hpp similarity index 100% rename from cropeditor/drawing/textitem.hpp rename to src/cropeditor/drawing/textitem.hpp diff --git a/cropeditor/settings/brushpenselection.cpp b/src/cropeditor/settings/brushpenselection.cpp similarity index 100% rename from cropeditor/settings/brushpenselection.cpp rename to src/cropeditor/settings/brushpenselection.cpp diff --git a/cropeditor/settings/brushpenselection.hpp b/src/cropeditor/settings/brushpenselection.hpp similarity index 100% rename from cropeditor/settings/brushpenselection.hpp rename to src/cropeditor/settings/brushpenselection.hpp diff --git a/cropeditor/settings/brushpenselection.ui b/src/cropeditor/settings/brushpenselection.ui similarity index 100% rename from cropeditor/settings/brushpenselection.ui rename to src/cropeditor/settings/brushpenselection.ui diff --git a/filenamevalidator.cpp b/src/filenamevalidator.cpp similarity index 100% rename from filenamevalidator.cpp rename to src/filenamevalidator.cpp diff --git a/filenamevalidator.hpp b/src/filenamevalidator.hpp similarity index 100% rename from filenamevalidator.hpp rename to src/filenamevalidator.hpp diff --git a/formats.cpp b/src/formats.cpp similarity index 100% rename from formats.cpp rename to src/formats.cpp diff --git a/formats.hpp b/src/formats.hpp similarity index 100% rename from formats.hpp rename to src/formats.hpp diff --git a/formatter.cpp b/src/formatter.cpp similarity index 100% rename from formatter.cpp rename to src/formatter.cpp diff --git a/formatter.hpp b/src/formatter.hpp similarity index 100% rename from formatter.hpp rename to src/formatter.hpp diff --git a/hotkeying.cpp b/src/hotkeying.cpp similarity index 100% rename from hotkeying.cpp rename to src/hotkeying.cpp diff --git a/hotkeying.hpp b/src/hotkeying.hpp similarity index 100% rename from hotkeying.hpp rename to src/hotkeying.hpp diff --git a/hotkeyinputdialog.cpp b/src/hotkeyinputdialog.cpp similarity index 100% rename from hotkeyinputdialog.cpp rename to src/hotkeyinputdialog.cpp diff --git a/hotkeyinputdialog.hpp b/src/hotkeyinputdialog.hpp similarity index 100% rename from hotkeyinputdialog.hpp rename to src/hotkeyinputdialog.hpp diff --git a/hotkeyinputdialog.ui b/src/hotkeyinputdialog.ui similarity index 100% rename from hotkeyinputdialog.ui rename to src/hotkeyinputdialog.ui diff --git a/icon.qrc b/src/icon.qrc similarity index 100% rename from icon.qrc rename to src/icon.qrc diff --git a/icon.rc b/src/icon.rc similarity index 100% rename from icon.rc rename to src/icon.rc diff --git a/icons/NOTICE.md b/src/icons/NOTICE.md similarity index 100% rename from icons/NOTICE.md rename to src/icons/NOTICE.md diff --git a/icons/accept.png b/src/icons/accept.png similarity index 100% rename from icons/accept.png rename to src/icons/accept.png diff --git a/icons/accept.svg b/src/icons/accept.svg similarity index 100% rename from icons/accept.svg rename to src/icons/accept.svg diff --git a/icons/arrow.png b/src/icons/arrow.png similarity index 100% rename from icons/arrow.png rename to src/icons/arrow.png diff --git a/icons/arrow.svg b/src/icons/arrow.svg similarity index 100% rename from icons/arrow.svg rename to src/icons/arrow.svg diff --git a/icons/blur.png b/src/icons/blur.png similarity index 100% rename from icons/blur.png rename to src/icons/blur.png diff --git a/icons/blur.svg b/src/icons/blur.svg similarity index 100% rename from icons/blur.svg rename to src/icons/blur.svg diff --git a/icons/cancel.png b/src/icons/cancel.png similarity index 100% rename from icons/cancel.png rename to src/icons/cancel.png diff --git a/icons/cancel.svg b/src/icons/cancel.svg similarity index 100% rename from icons/cancel.svg rename to src/icons/cancel.svg diff --git a/icons/circle.png b/src/icons/circle.png similarity index 100% rename from icons/circle.png rename to src/icons/circle.png diff --git a/icons/circle.svg b/src/icons/circle.svg similarity index 100% rename from icons/circle.svg rename to src/icons/circle.svg diff --git a/icons/crop.png b/src/icons/crop.png similarity index 100% rename from icons/crop.png rename to src/icons/crop.png diff --git a/icons/crop.svg b/src/icons/crop.svg similarity index 100% rename from icons/crop.svg rename to src/icons/crop.svg diff --git a/icons/delete.png b/src/icons/delete.png similarity index 100% rename from icons/delete.png rename to src/icons/delete.png diff --git a/icons/delete.svg b/src/icons/delete.svg similarity index 100% rename from icons/delete.svg rename to src/icons/delete.svg diff --git a/icons/erase.png b/src/icons/erase.png similarity index 100% rename from icons/erase.png rename to src/icons/erase.png diff --git a/icons/erase.svg b/src/icons/erase.svg similarity index 100% rename from icons/erase.svg rename to src/icons/erase.svg diff --git a/icons/fontsettings.png b/src/icons/fontsettings.png similarity index 100% rename from icons/fontsettings.png rename to src/icons/fontsettings.png diff --git a/icons/fontsettings.svg b/src/icons/fontsettings.svg similarity index 100% rename from icons/fontsettings.svg rename to src/icons/fontsettings.svg diff --git a/icons/icon.icns b/src/icons/icon.icns similarity index 100% rename from icons/icon.icns rename to src/icons/icon.icns diff --git a/icons/icon.ico b/src/icons/icon.ico similarity index 100% rename from icons/icon.ico rename to src/icons/icon.ico diff --git a/icons/icon.png b/src/icons/icon.png similarity index 100% rename from icons/icon.png rename to src/icons/icon.png diff --git a/icons/icon.svg b/src/icons/icon.svg similarity index 100% rename from icons/icon.svg rename to src/icons/icon.svg diff --git a/icons/line.png b/src/icons/line.png similarity index 100% rename from icons/line.png rename to src/icons/line.png diff --git a/icons/line.svg b/src/icons/line.svg similarity index 100% rename from icons/line.svg rename to src/icons/line.svg diff --git a/icons/pencil.png b/src/icons/pencil.png similarity index 100% rename from icons/pencil.png rename to src/icons/pencil.png diff --git a/icons/pencil.svg b/src/icons/pencil.svg similarity index 100% rename from icons/pencil.svg rename to src/icons/pencil.svg diff --git a/icons/rectangle.png b/src/icons/rectangle.png similarity index 100% rename from icons/rectangle.png rename to src/icons/rectangle.png diff --git a/icons/rectangle.svg b/src/icons/rectangle.svg similarity index 100% rename from icons/rectangle.svg rename to src/icons/rectangle.svg diff --git a/icons/settings.png b/src/icons/settings.png similarity index 100% rename from icons/settings.png rename to src/icons/settings.png diff --git a/icons/settings.svg b/src/icons/settings.svg similarity index 100% rename from icons/settings.svg rename to src/icons/settings.svg diff --git a/icons/text.png b/src/icons/text.png similarity index 100% rename from icons/text.png rename to src/icons/text.png diff --git a/icons/text.svg b/src/icons/text.svg similarity index 100% rename from icons/text.svg rename to src/icons/text.svg diff --git a/io/ioutils.cpp b/src/io/ioutils.cpp similarity index 100% rename from io/ioutils.cpp rename to src/io/ioutils.cpp diff --git a/io/ioutils.hpp b/src/io/ioutils.hpp similarity index 100% rename from io/ioutils.hpp rename to src/io/ioutils.hpp diff --git a/logs/historydialog.cpp b/src/logs/historydialog.cpp similarity index 95% rename from logs/historydialog.cpp rename to src/logs/historydialog.cpp index 9cd2f47..9fe4832 100644 --- a/logs/historydialog.cpp +++ b/src/logs/historydialog.cpp @@ -1,8 +1,8 @@ -#include "historydialog.h" +#include "historydialog.hpp" #include "requestlogging.hpp" #include "ui_historydialog.h" -#include +#include using requestlogging::LoggedRequest; diff --git a/logs/historydialog.h b/src/logs/historydialog.hpp similarity index 100% rename from logs/historydialog.h rename to src/logs/historydialog.hpp diff --git a/logs/historydialog.ui b/src/logs/historydialog.ui similarity index 100% rename from logs/historydialog.ui rename to src/logs/historydialog.ui diff --git a/logs/requestlogging.cpp b/src/logs/requestlogging.cpp similarity index 100% rename from logs/requestlogging.cpp rename to src/logs/requestlogging.cpp diff --git a/logs/requestlogging.hpp b/src/logs/requestlogging.hpp similarity index 100% rename from logs/requestlogging.hpp rename to src/logs/requestlogging.hpp diff --git a/main.cpp b/src/main.cpp similarity index 100% rename from main.cpp rename to src/main.cpp diff --git a/mainwindow.cpp b/src/mainwindow.cpp similarity index 100% rename from mainwindow.cpp rename to src/mainwindow.cpp diff --git a/mainwindow.hpp b/src/mainwindow.hpp similarity index 100% rename from mainwindow.hpp rename to src/mainwindow.hpp diff --git a/mainwindow.ui b/src/mainwindow.ui similarity index 100% rename from mainwindow.ui rename to src/mainwindow.ui diff --git a/monospacetextdialog.cpp b/src/monospacetextdialog.cpp similarity index 90% rename from monospacetextdialog.cpp rename to src/monospacetextdialog.cpp index cef111a..7fefacf 100644 --- a/monospacetextdialog.cpp +++ b/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) diff --git a/monospacetextdialog.h b/src/monospacetextdialog.hpp similarity index 100% rename from monospacetextdialog.h rename to src/monospacetextdialog.hpp diff --git a/monospacetextdialog.ui b/src/monospacetextdialog.ui similarity index 100% rename from monospacetextdialog.ui rename to src/monospacetextdialog.ui diff --git a/notifications.cpp b/src/notifications.cpp similarity index 100% rename from notifications.cpp rename to src/notifications.cpp diff --git a/notifications.hpp b/src/notifications.hpp similarity index 100% rename from notifications.hpp rename to src/notifications.hpp diff --git a/platformbackend.hpp b/src/platformbackend.hpp similarity index 100% rename from platformbackend.hpp rename to src/platformbackend.hpp diff --git a/platformspecifics/mac/macbackend.cpp b/src/platformspecifics/mac/macbackend.cpp similarity index 100% rename from platformspecifics/mac/macbackend.cpp rename to src/platformspecifics/mac/macbackend.cpp diff --git a/platformspecifics/mac/macbackend.hpp b/src/platformspecifics/mac/macbackend.hpp similarity index 100% rename from platformspecifics/mac/macbackend.hpp rename to src/platformspecifics/mac/macbackend.hpp diff --git a/platformspecifics/u32/u32backend.cpp b/src/platformspecifics/u32/u32backend.cpp similarity index 100% rename from platformspecifics/u32/u32backend.cpp rename to src/platformspecifics/u32/u32backend.cpp diff --git a/platformspecifics/u32/u32backend.hpp b/src/platformspecifics/u32/u32backend.hpp similarity index 100% rename from platformspecifics/u32/u32backend.hpp rename to src/platformspecifics/u32/u32backend.hpp diff --git a/platformspecifics/x11/x11backend.cpp b/src/platformspecifics/x11/x11backend.cpp similarity index 100% rename from platformspecifics/x11/x11backend.cpp rename to src/platformspecifics/x11/x11backend.cpp diff --git a/platformspecifics/x11/x11backend.hpp b/src/platformspecifics/x11/x11backend.hpp similarity index 100% rename from platformspecifics/x11/x11backend.hpp rename to src/platformspecifics/x11/x11backend.hpp diff --git a/recording/encoders/encoder.cpp b/src/recording/encoders/encoder.cpp similarity index 100% rename from recording/encoders/encoder.cpp rename to src/recording/encoders/encoder.cpp diff --git a/recording/encoders/encoder.cpp.orig b/src/recording/encoders/encoder.cpp.orig similarity index 100% rename from recording/encoders/encoder.cpp.orig rename to src/recording/encoders/encoder.cpp.orig diff --git a/recording/encoders/encoder.hpp b/src/recording/encoders/encoder.hpp similarity index 100% rename from recording/encoders/encoder.hpp rename to src/recording/encoders/encoder.hpp diff --git a/recording/encoders/encodersettings.cpp b/src/recording/encoders/encodersettings.cpp similarity index 100% rename from recording/encoders/encodersettings.cpp rename to src/recording/encoders/encodersettings.cpp diff --git a/recording/encoders/encodersettings.hpp b/src/recording/encoders/encodersettings.hpp similarity index 100% rename from recording/encoders/encodersettings.hpp rename to src/recording/encoders/encodersettings.hpp diff --git a/recording/encoders/encodersettingsdialog.cpp b/src/recording/encoders/encodersettingsdialog.cpp similarity index 100% rename from recording/encoders/encodersettingsdialog.cpp rename to src/recording/encoders/encodersettingsdialog.cpp diff --git a/recording/encoders/encodersettingsdialog.hpp b/src/recording/encoders/encodersettingsdialog.hpp similarity index 100% rename from recording/encoders/encodersettingsdialog.hpp rename to src/recording/encoders/encodersettingsdialog.hpp diff --git a/recording/encoders/encodersettingsdialog.ui b/src/recording/encoders/encodersettingsdialog.ui similarity index 100% rename from recording/encoders/encodersettingsdialog.ui rename to src/recording/encoders/encodersettingsdialog.ui diff --git a/recording/recordingcontroller.cpp b/src/recording/recordingcontroller.cpp similarity index 100% rename from recording/recordingcontroller.cpp rename to src/recording/recordingcontroller.cpp diff --git a/recording/recordingcontroller.hpp b/src/recording/recordingcontroller.hpp similarity index 100% rename from recording/recordingcontroller.hpp rename to src/recording/recordingcontroller.hpp diff --git a/recording/recordingformats.cpp b/src/recording/recordingformats.cpp similarity index 100% rename from recording/recordingformats.cpp rename to src/recording/recordingformats.cpp diff --git a/recording/recordingformats.hpp b/src/recording/recordingformats.hpp similarity index 100% rename from recording/recordingformats.hpp rename to src/recording/recordingformats.hpp diff --git a/recording/recordingpreview.cpp b/src/recording/recordingpreview.cpp similarity index 100% rename from recording/recordingpreview.cpp rename to src/recording/recordingpreview.cpp diff --git a/recording/recordingpreview.hpp b/src/recording/recordingpreview.hpp similarity index 100% rename from recording/recordingpreview.hpp rename to src/recording/recordingpreview.hpp diff --git a/screenareaselector/screenareaselector.cpp b/src/screenareaselector/screenareaselector.cpp similarity index 100% rename from screenareaselector/screenareaselector.cpp rename to src/screenareaselector/screenareaselector.cpp diff --git a/screenareaselector/screenareaselector.hpp b/src/screenareaselector/screenareaselector.hpp similarity index 100% rename from screenareaselector/screenareaselector.hpp rename to src/screenareaselector/screenareaselector.hpp diff --git a/cropeditor/cropview.cpp b/src/screenoverlayview.cpp similarity index 56% rename from cropeditor/cropview.cpp rename to src/screenoverlayview.cpp index 7568d0f..8318a79 100644 --- a/cropeditor/cropview.cpp +++ b/src/screenoverlayview.cpp @@ -1,13 +1,15 @@ -#include "cropview.hpp" +#include "screenoverlayview.hpp" -CropView::CropView(QGraphicsScene *scene) : QGraphicsView(scene) { +ScreenOverlayView::ScreenOverlayView(QGraphicsScene *scene, QWidget *parent) : QGraphicsView(scene, parent) { setFrameShape(QFrame::NoFrame); // Time taken to solve: A george99g and 38 minutes. setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - setWindowFlags(windowFlags() | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::Dialog); + setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint); setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform | QPainter::HighQualityAntialiasing); - setCursor(QCursor(Qt::CrossCursor)); setMouseTracking(true); setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); - setCursor(Qt::BlankCursor); +} + +void ScreenOverlayView::showEvent(QShowEvent *) { + move(0, 0); } diff --git a/src/screenoverlayview.hpp b/src/screenoverlayview.hpp new file mode 100644 index 0000000..4aa5a6a --- /dev/null +++ b/src/screenoverlayview.hpp @@ -0,0 +1,16 @@ +#ifndef SCREENOVERLAYVIEW_HPP +#define SCREENOVERLAYVIEW_HPP + +#include + +class ScreenOverlayView : public QGraphicsView { +public: + ScreenOverlayView(QGraphicsScene *scene, QWidget *parent = 0); + ~ScreenOverlayView() { + } + +protected: + void showEvent(QShowEvent *); +}; + +#endif // SCREENOVERLAYVIEW_HPP diff --git a/screenshotter.cpp b/src/screenshotter.cpp similarity index 100% rename from screenshotter.cpp rename to src/screenshotter.cpp diff --git a/screenshotter.hpp b/src/screenshotter.hpp similarity index 100% rename from screenshotter.hpp rename to src/screenshotter.hpp diff --git a/screenshotutil.cpp b/src/screenshotutil.cpp similarity index 100% rename from screenshotutil.cpp rename to src/screenshotutil.cpp diff --git a/screenshotutil.hpp b/src/screenshotutil.hpp similarity index 100% rename from screenshotutil.hpp rename to src/screenshotutil.hpp diff --git a/settings.cpp b/src/settings.cpp similarity index 100% rename from settings.cpp rename to src/settings.cpp diff --git a/settings.hpp b/src/settings.hpp similarity index 100% rename from settings.hpp rename to src/settings.hpp diff --git a/settingsdialog.cpp b/src/settingsdialog.cpp similarity index 100% rename from settingsdialog.cpp rename to src/settingsdialog.cpp diff --git a/settingsdialog.hpp b/src/settingsdialog.hpp similarity index 100% rename from settingsdialog.hpp rename to src/settingsdialog.hpp diff --git a/settingsdialog.ui b/src/settingsdialog.ui similarity index 100% rename from settingsdialog.ui rename to src/settingsdialog.ui diff --git a/src/src.pro b/src/src.pro new file mode 100644 index 0000000..ca91179 --- /dev/null +++ b/src/src.pro @@ -0,0 +1,190 @@ +#------------------------------------------------- +# +# 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 \ + screenoverlayview.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.hpp \ + screenoverlayview.hpp \ + screenoverlayview.hpp \ + monospacetextdialog.hpp + +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($$PWD/../QHotkey/qhotkey.pri) diff --git a/src/translations.qrc b/src/translations.qrc new file mode 100644 index 0000000..647e497 --- /dev/null +++ b/src/translations.qrc @@ -0,0 +1,8 @@ + + + ../translations/sr_RS.qm + ../translations/ru_RU.qm + ../translations/bg_BG.qm + ../translations/de_DE.qm + + diff --git a/uploaders/customuploader.cpp b/src/uploaders/customuploader.cpp similarity index 100% rename from uploaders/customuploader.cpp rename to src/uploaders/customuploader.cpp diff --git a/uploaders/customuploader.hpp b/src/uploaders/customuploader.hpp similarity index 100% rename from uploaders/customuploader.hpp rename to src/uploaders/customuploader.hpp diff --git a/uploaders/default/clipboarduploader.cpp b/src/uploaders/default/clipboarduploader.cpp similarity index 100% rename from uploaders/default/clipboarduploader.cpp rename to src/uploaders/default/clipboarduploader.cpp diff --git a/uploaders/default/clipboarduploader.hpp b/src/uploaders/default/clipboarduploader.hpp similarity index 100% rename from uploaders/default/clipboarduploader.hpp rename to src/uploaders/default/clipboarduploader.hpp diff --git a/uploaders/default/imgplusuploader.cpp b/src/uploaders/default/imgplusuploader.cpp similarity index 100% rename from uploaders/default/imgplusuploader.cpp rename to src/uploaders/default/imgplusuploader.cpp diff --git a/uploaders/default/imgplusuploader.hpp b/src/uploaders/default/imgplusuploader.hpp similarity index 100% rename from uploaders/default/imgplusuploader.hpp rename to src/uploaders/default/imgplusuploader.hpp diff --git a/uploaders/default/imgursettingsdialog.cpp b/src/uploaders/default/imgursettingsdialog.cpp similarity index 100% rename from uploaders/default/imgursettingsdialog.cpp rename to src/uploaders/default/imgursettingsdialog.cpp diff --git a/uploaders/default/imgursettingsdialog.hpp b/src/uploaders/default/imgursettingsdialog.hpp similarity index 100% rename from uploaders/default/imgursettingsdialog.hpp rename to src/uploaders/default/imgursettingsdialog.hpp diff --git a/uploaders/default/imgursettingsdialog.ui b/src/uploaders/default/imgursettingsdialog.ui similarity index 100% rename from uploaders/default/imgursettingsdialog.ui rename to src/uploaders/default/imgursettingsdialog.ui diff --git a/uploaders/default/imguruploader.cpp b/src/uploaders/default/imguruploader.cpp similarity index 100% rename from uploaders/default/imguruploader.cpp rename to src/uploaders/default/imguruploader.cpp diff --git a/uploaders/default/imguruploader.hpp b/src/uploaders/default/imguruploader.hpp similarity index 100% rename from uploaders/default/imguruploader.hpp rename to src/uploaders/default/imguruploader.hpp diff --git a/uploaders/uploader.hpp b/src/uploaders/uploader.hpp similarity index 100% rename from uploaders/uploader.hpp rename to src/uploaders/uploader.hpp diff --git a/uploaders/uploadersingleton.cpp b/src/uploaders/uploadersingleton.cpp similarity index 100% rename from uploaders/uploadersingleton.cpp rename to src/uploaders/uploadersingleton.cpp diff --git a/uploaders/uploadersingleton.hpp b/src/uploaders/uploadersingleton.hpp similarity index 100% rename from uploaders/uploadersingleton.hpp rename to src/uploaders/uploadersingleton.hpp diff --git a/worker/worker.cpp b/src/worker/worker.cpp similarity index 100% rename from worker/worker.cpp rename to src/worker/worker.cpp diff --git a/worker/worker.hpp b/src/worker/worker.hpp similarity index 100% rename from worker/worker.hpp rename to src/worker/worker.hpp diff --git a/translations.qrc b/translations.qrc deleted file mode 100644 index 5140cf2..0000000 --- a/translations.qrc +++ /dev/null @@ -1,8 +0,0 @@ - - - translations/sr_RS.qm - translations/ru_RU.qm - translations/bg_BG.qm - translations/de_DE.qm - - diff --git a/translations/README.md b/translations/README.md index 2c8d9ed..39f053f 100644 --- a/translations/README.md +++ b/translations/README.md @@ -4,6 +4,6 @@ Firstly, run `lupdate ../KShare.pro -no-obsolete -ts ` and add an entry into `../translations.qrc` for the newly produced `.qm` file (if there isn't one). +When you're done editing the file, save it and run `lrelease ` and add an entry into `../src/translations.qrc` for the newly produced `.qm` file (if there isn't one). That's all, thank you!