From 55e21737dd7d30c1922615c575384b41cc77985f Mon Sep 17 00:00:00 2001 From: robotbrain Date: Mon, 24 Feb 2014 17:40:05 -0500 Subject: Deleting screenshots. Needs fixing. --- gui/ConsoleWindow.ui | 2 +- gui/MainWindow.ui | 2 +- gui/dialogs/ScreenshotDialog.cpp | 7 ++++++- gui/dialogs/ScreenshotDialog.h | 5 +++-- gui/dialogs/ScreenshotDialog.ui | 9 ++++++++- 5 files changed, 19 insertions(+), 6 deletions(-) (limited to 'gui') diff --git a/gui/ConsoleWindow.ui b/gui/ConsoleWindow.ui index e50fb520..344cf74d 100644 --- a/gui/ConsoleWindow.ui +++ b/gui/ConsoleWindow.ui @@ -52,7 +52,7 @@ - Upload Screenshots + Manage Screenshots diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui index 67625ac8..2bd8ec22 100644 --- a/gui/MainWindow.ui +++ b/gui/MainWindow.ui @@ -532,7 +532,7 @@ - Upload Screenshots + Manage Screenshots <html><head/><body><p>View and upload screenshots for this instance</p></body></html> diff --git a/gui/dialogs/ScreenshotDialog.cpp b/gui/dialogs/ScreenshotDialog.cpp index 3b4af5e5..c62e1d52 100644 --- a/gui/dialogs/ScreenshotDialog.cpp +++ b/gui/dialogs/ScreenshotDialog.cpp @@ -2,7 +2,7 @@ #include "ui_ScreenshotDialog.h" #include -#include +#include #include "ProgressDialog.h" #include "CustomMessageBox.h" @@ -71,3 +71,8 @@ void ScreenshotDialog::on_uploadBtn_clicked() reject(); } } + +void ScreenshotDialog::on_deleteBtn_clicked() +{ + m_list->deleteSelected(this); +} diff --git a/gui/dialogs/ScreenshotDialog.h b/gui/dialogs/ScreenshotDialog.h index ac1494d6..a406d1fe 100644 --- a/gui/dialogs/ScreenshotDialog.h +++ b/gui/dialogs/ScreenshotDialog.h @@ -24,16 +24,17 @@ public: }; QString message() const; + QList selected() const; private slots: void on_uploadBtn_clicked(); + void on_deleteBtn_clicked(); + private: Ui::ScreenshotDialog *ui; ScreenshotList *m_list; QList m_uploaded; std::shared_ptr m_imgurAlbum; - - QList selected() const; }; diff --git a/gui/dialogs/ScreenshotDialog.ui b/gui/dialogs/ScreenshotDialog.ui index 9e4bd6f0..4e42a548 100644 --- a/gui/dialogs/ScreenshotDialog.ui +++ b/gui/dialogs/ScreenshotDialog.ui @@ -11,7 +11,7 @@ - Screenshots + Screenshot Manager @@ -72,6 +72,13 @@ + + + + Delete + + + -- cgit v1.2.3