Skip to content
This repository has been archived by the owner on Oct 4, 2023. It is now read-only.

Commit

Permalink
Fix about dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
@oferkv
oferkv committed Mar 3, 2018
1 parent 48fec61 commit 64bde3a
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 42 deletions.
32 changes: 30 additions & 2 deletions MessageBox.cpp
View file
Expand Up @@ -17,6 +17,7 @@
*/

#include "MessageBox.h"
#include "Phototonic.h"

MessageBox::MessageBox(QWidget *parent) : QMessageBox(parent) {
setWindowIcon(QIcon(":/images/phototonic.png"));
Expand All @@ -36,9 +37,36 @@ void MessageBox::warning(const QString &title, const QString &message) {
exec();
}

void MessageBox::about(const QString &aboutMessage) {
void MessageBox::about() {
QString aboutString = "<h2>" + QString(VERSION) + "</h2>"
+ tr("<h4>Image Viewer and Organizer</h4>")
+ "Qt v" + QT_VERSION_STR
+ "<p><a href=\"https://github.com/oferkv/phototonic\">" + tr("Home page")
+ "</a></p></a></p><p></p>"
"<table><tr><td>Code:</td><td>Ofer Kashayov</td><td>(oferkv@gmail.com)</td></tr>"
"<tr><td></td><td>Christopher Roy Bratusek</td><td>(nano@jpberlin.de)</td></tr>"
"<tr><td></td><td>Krzysztof Pyrkosz</td><td>(pyrkosz@o2.pl)</td></tr>"
"<tr><td></td><td>Roman Chistokhodov</td><td>(freeslave93@gmail.com)</td></tr>"
"<tr><td></td><td>Thomas Lübking</td><td>(thomas.luebking@gmail.com)</td></tr>"
"<tr><td></td><td>Tung Le</td><td>(https://github.com/everbot)</td></tr>"
"<tr><td></td><td>Peter Mattern</td><td>(https://github.com/pmattern)</td></tr>"
"<tr><td>Bosnian:</td><td>Dino Duratović</td><td>(dinomol@mail.com)</td></tr>"
"<tr><td>Croatian:</td><td>Dino Duratović</td><td>(dinomol@mail.com)</td></tr>"
"<tr><td>Czech:</td><td>Pavel Fric</td><td>(pavelfric@seznam.cz)</td></tr>"
"<tr><td>French:</td><td>Adrien Daugabel</td><td>(adrien.d@mageialinux-online.org)</td></tr>"
"<tr><td></td><td>David Geiger</td><td>(david.david@mageialinux-online.org)</td></tr>"
"<tr><td></td><td>Rémi Verschelde</td><td>(akien@mageia.org)</td></tr>"
"<tr><td>German:</td><td>Jonathan Hooverman</td><td>(jonathan.hooverman@gmail.com)</td></tr>"
"<tr><td>Polish:</td><td>Robert Wojewódzki</td><td>(robwoj44@poczta.onet.pl)</td></tr>"
"<tr><td></td><td>Krzysztof Pyrkosz</td><td>(pyrkosz@o2.pl)</td></tr>"
"<tr><td>Portuguese:</td><td>Marcos M. Nascimento</td><td>(wstlmn@uol.com.br)</td></tr>"
"<tr><td>Russian:</td><td>Ilya Alexandrovich</td><td>(yast4ik@gmail.com)</td></tr>"
"<tr><td>Serbian:</td><td>Dino Duratović</td><td>(dinomol@mail.com)</td></tr></table>"
"<p>Phototonic is licensed under the GNU General Public License version 3</p>"
"<p>Copyright &copy; 2013-2018 Ofer Kashayov</p>";

setWindowTitle(tr("About"));
setText(aboutMessage);
setText(aboutString);
setIconPixmap(QIcon(":/images/phototonic.png").pixmap(64, 64));
exec();
}
2 changes: 1 addition & 1 deletion MessageBox.h
View file
Expand Up @@ -31,7 +31,7 @@ Q_OBJECT

void warning(const QString &title, const QString &message);

void about(const QString &aboutMessage);
void about();

};

Expand Down
41 changes: 2 additions & 39 deletions Phototonic.cpp
View file
Expand Up @@ -400,7 +400,6 @@ void Phototonic::createActions() {

aboutAction = new QAction(tr("About"), this);
aboutAction->setObjectName("about");
aboutAction->setIcon(QIcon::fromTheme("help-about", QIcon(":/images/about.png")));
connect(aboutAction, SIGNAL(triggered()), this, SLOT(about()));

// Sort actions
Expand Down Expand Up @@ -1032,44 +1031,8 @@ void Phototonic::toggleImageViewerToolbar() {
}

void Phototonic::about() {
QString aboutString = "<h2>" + QString(VERSION) + "</h2>"
+ tr("<p>Image viewer and organizer</p>")
+ "Qt v" + QT_VERSION_STR
+ "<p><a href=\"https://github.com/oferkv/phototonic\">" + tr("Home page") + "</a></p>"
"</a></p>"
+ "<p></p>"
+ "<table><tr><td>Code:</td><td>Ofer Kashayov</td><td>(oferkv@gmail.com)</td></tr>"
+ "<tr><td></td><td>Christopher Roy Bratusek</td><td>(nano@jpberlin.de)</td></tr>"
+ "<tr><td></td><td>Krzysztof Pyrkosz</td><td>(pyrkosz@o2.pl)</td></tr>"
+ "<tr><td></td><td>Roman Chistokhodov</td><td>(freeslave93@gmail.com)</td></tr>"
+ QString::fromUtf8(
"<tr><td></td><td>Thomas L\u00FCbking</td><td>(thomas.luebking@gmail.com)</td></tr>")
+ "<tr><td></td><td>Tung Le</td><td>(https://github.com/everbot)</td></tr>"
+ "<tr><td></td><td>Peter Mattern</td><td>(https://github.com/pmattern)</td></tr>"
+ QString::fromUtf8(
"<tr><td>Bosnian:</td><td>Dino Duratovi\u0107</td><td>(dinomol@mail.com)</td></tr>")
+ QString::fromUtf8(
"<tr><td>Croatian:</td><td>Dino Duratovi\u0107</td><td>(dinomol@mail.com)</td></tr>")
+ "<tr><td>Czech:</td><td>Pavel Fric</td><td>(pavelfric@seznam.cz)</td></tr>"
+
"<tr><td>French:</td><td>Adrien Daugabel</td><td>(adrien.d@mageialinux-online.org)</td></tr>"
+ "<tr><td></td><td>David Geiger</td><td>(david.david@mageialinux-online.org)</td></tr>"
+ QString::fromUtf8(
"<tr><td></td><td>R\u00E9mi Verschelde</td><td>(akien@mageia.org)</td></tr>")
+
"<tr><td>German:</td><td>Jonathan Hooverman</td><td>(jonathan.hooverman@gmail.com)</td></tr>"
+ QString::fromUtf8(
"<tr><td>Polish:</td><td>Robert Wojew\u00F3dzki</td><td>(robwoj44@poczta.onet.pl)</td></tr>")
+ QString::fromUtf8("<tr><td></td><td>Krzysztof Pyrkosz</td><td>(pyrkosz@o2.pl)</td></tr>")
+ "<tr><td>Portuguese:</td><td>Marcos M. Nascimento</td><td>(wstlmn@uol.com.br)</td></tr>"
+ "<tr><td>Russian:</td><td>Ilya Alexandrovich</td><td>(yast4ik@gmail.com)</td></tr>"
+ QString::fromUtf8(
"<tr><td>Serbian:</td><td>Dino Duratovi\u0107</td><td>(dinomol@mail.com)</td></tr></table>")
+ "<p>Phototonic is licensed under the GNU General Public License version 3</p>"
+ "<p>Copyright &copy; 2013-2018 Ofer Kashayov</p>";

MessageBox messageBox(this);
messageBox.about(aboutString);
messageBox.about();
}

void Phototonic::filterImagesFocus() {
Expand Down Expand Up @@ -3246,7 +3209,7 @@ void Phototonic::deleteDirectory(bool trash) {

if (!removeDirectoryOk) {
msgBox.critical(tr("Error"), trash ? tr("Failed to move directory to the trash: %1").arg(trashError)
: tr("Failed to delete directory."));
: tr("Failed to delete directory."));
selectCurrentViewDir();
return;
}
Expand Down

0 comments on commit 64bde3a

Please sign in to comment.