diff --git a/README.md b/README.md index 364098e..7875156 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ Originally written by [ArsenArsen](https://github.com/ArsenArsen) and here enhan | dev | [![CircleCI](https://circleci.com/gh/Gurkengewuerz/KShare/tree/dev.svg?style=svg)](https://circleci.com/gh/Gurkengewuerz/KShare/tree/dev) | [![Build status](https://ci.appveyor.com/api/projects/status/ujxmg1dk7f5p8ijh/branch/dev?svg=true)](https://ci.appveyor.com/project/Gurkengewuerz/kshare/branch/dev) | ## Screenshot -Made with KShare itself, of course :) -![](http://i.imgur.com/ffWvCun.png) +Made with KShare itself, of course :) +![](https://i.imgur.com/oJrCNkq.png) ## Usage See the [wiki](https://github.com/ArsenArsen/KShare/wiki). diff --git a/src/aboutbox.ui b/src/aboutbox.ui index 31e5918..c350b7e 100644 --- a/src/aboutbox.ui +++ b/src/aboutbox.ui @@ -33,6 +33,7 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Noto Sans'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">This software uses and possibly bundles Qt, OpenSSL, FFMpeg, and QHotkey, whose licenses are respectively:</span></p> <p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Icons made by <a href="https://www.flaticon.com/authors/maxim-basinski"><span style=" text-decoration: underline; color:#0000ff;">Maxim Basinski</span></a> from <a href="https://www.flaticon.com/"><span style=" text-decoration: underline; color:#0000ff;">www.flaticon.com</span></a> is licensed by <a href="http://creativecommons.org/licenses/by/3.0/"><span style=" text-decoration: underline; color:#0000ff;">CC 3.0 BY</span></a></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Noto Mono'; font-size:10pt;">------------------------------ </span><a href="http://code.qt.io/cgit/qt/qt5.git/tree/LICENSE.LGPLv3"><span style=" font-family:'Noto Mono'; font-size:10pt; text-decoration: underline; color:#007af4;">Qt</span></a><span style=" font-family:'Noto Mono'; font-size:10pt;">:</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Noto Mono'; font-size:10pt;">GNU LESSER GENERAL PUBLIC LICENSE</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;"><br /></span></p> diff --git a/src/icon.qrc b/src/icon.qrc index 62e7d4e..71966a8 100644 --- a/src/icon.qrc +++ b/src/icon.qrc @@ -19,5 +19,7 @@ icons/circle.png icons/highlighter.png icons/infinity.png + icons/checked.png + icons/error.png diff --git a/src/icons/checked.png b/src/icons/checked.png new file mode 100644 index 0000000..44e0f80 Binary files /dev/null and b/src/icons/checked.png differ diff --git a/src/icons/error.png b/src/icons/error.png new file mode 100644 index 0000000..ebc3967 Binary files /dev/null and b/src/icons/error.png differ diff --git a/src/io/ioutils.cpp b/src/io/ioutils.cpp index f74a088..731b7bc 100644 --- a/src/io/ioutils.cpp +++ b/src/io/ioutils.cpp @@ -146,17 +146,32 @@ void ioutils::postData(QUrl target, QString ioutils::methodString(QNetworkAccessManager::Operation operation) { switch (operation) { - case QNetworkAccessManager::GetOperation: - return "GET"; - case QNetworkAccessManager::PostOperation: - return "POST"; - case QNetworkAccessManager::PutOperation: - return "PUT"; - case QNetworkAccessManager::DeleteOperation: - return "DELETE"; - case QNetworkAccessManager::HeadOperation: - return "HEAD"; - default: - return "Unknown"; + case QNetworkAccessManager::GetOperation: + return "GET"; + case QNetworkAccessManager::PostOperation: + return "POST"; + case QNetworkAccessManager::PutOperation: + return "PUT"; + case QNetworkAccessManager::DeleteOperation: + return "DELETE"; + case QNetworkAccessManager::HeadOperation: + return "HEAD"; + default: + return "Unknown"; + } +} + +QString ioutils::httpString(int responseCode) { + switch (responseCode) { + case 200: + return "OK"; + case 201: + return "CREATED"; + case 500: + return "Internal Server Error"; + case 503: + return "Service Unavailable"; + default: + return "Unknown"; } } diff --git a/src/io/ioutils.hpp b/src/io/ioutils.hpp index d884a3d..ce3913e 100644 --- a/src/io/ioutils.hpp +++ b/src/io/ioutils.hpp @@ -31,6 +31,7 @@ namespace ioutils { QString filename, std::function callback); QString methodString(QNetworkAccessManager::Operation operation); + QString httpString(int responseCode); } // namespace ioutils #endif // IOUTILS_HPP diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index d6aa709..a4fa896 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -17,9 +17,11 @@ #include #include #include +#include #include #include #include +#include "io/ioutils.hpp" #include MainWindow *MainWindow::instance; @@ -108,8 +110,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi connect(ui->areaButton, &QPushButton::clicked, this, [] { screenshotter::areaDelayed(); }); connect(ui->aboutButton, &QPushButton::clicked, this, &MainWindow::on_actionAbout_triggered); connect(ui->screenshotFolderButton, &QPushButton::clicked, this, &MainWindow::openScreenshotFolder); + connect(ui->clipboardButton, &QPushButton::clicked, this, &MainWindow::openScreenshotFolder); connect(ui->colorPickerButton, &QPushButton::clicked, this, [] { ColorPickerScene::showPicker(); }); + ui->aboutButton->setFocus(); + tray->setContextMenu(menu); addHotkey("fullscreen", [] { screenshotter::fullscreen(); }); @@ -127,8 +132,16 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi QList requests = requestlogging::getRequests(); for (LoggedRequest req : requests) { - ui->treeWidget->addTopLevelItem( - new QTreeWidgetItem({ QString::number(req.getResponseCode()), req.getFilename(), req.getUrl(), req.getTime() + " UTC" })); + QString httpStatus = ioutils::httpString(req.getResponseCode()); + QTreeWidgetItem* tw = new QTreeWidgetItem({ QString::number(req.getResponseCode()) + " " + httpStatus, req.getFilename(), req.getUrl(), req.getTime() + " UTC" }); + + if(req.getResponseCode() >= 200 && req.getResponseCode() < 300) { + tw->setIcon(0, *(new QIcon(":/icons/checked.png"))); + } else { + tw->setIcon(0, *(new QIcon(":/icons/error.png"))); + } + + ui->treeWidget->addTopLevelItem(tw); } } diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 16aa810..73985cb 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -6,10 +6,15 @@ 0 0 - 760 - 363 + 819 + 388 + + + 12 + + KShare @@ -39,6 +44,9 @@ Copy Clipboard + + true + @@ -46,6 +54,9 @@ Settings + + true + @@ -53,6 +64,9 @@ Area + + true + @@ -60,6 +74,9 @@ Open color picker + + true + @@ -67,6 +84,15 @@ About + + false + + + false + + + true + @@ -74,6 +100,9 @@ Fullscreen + + true + @@ -81,6 +110,9 @@ Open Screenshot Folder + + true + @@ -97,6 +129,9 @@ + + 0 + true @@ -160,8 +195,8 @@ 0 0 - 760 - 23 + 819 + 29