Skip to content

Commit

Permalink
Simplify about dialog and add icons
Browse files Browse the repository at this point in the history
  • Loading branch information
@hluk
hluk committed Mar 28, 2017
1 parent aa73fa1 commit fe6b710
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 47 deletions.
95 changes: 48 additions & 47 deletions src/gui/aboutdialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "common/shortcuts.h"
#include "common/textdata.h"
#include "common/version.h"
#include "gui/icons.h"

namespace {

Expand All @@ -46,36 +47,41 @@ QString helpMail(const char *url)
return QString("<a href='mailto:%1'>%1</a>").arg(url);
}

QString helpLink(const QString &name, const QString &link)
QString helpLink(const QString &name, const QString &link, ushort icon)
{
return QString("<tr><td class='h3'>%1</td><td class='link'>%2</td></tr>").arg(name, link);
return "<tr>"
"<td class='info'>" + name + "</td>"
"<td valign='middle' align='center' class='help-icon icon'>" + QString(QChar(icon)) + "</td>"
"<td>" + link + "</td>"
"</tr>";
}

QString helpDeveloper(const char *name, const char *mail)
{
return QString("<div>%1 &nbsp;&nbsp;&nbsp;<span class='h3'>%2</span></div>")
return QString("<div>%1 &nbsp;&nbsp;&nbsp;<span class='info'>%2</span></div>")
.arg(QString::fromUtf8(name))
.arg(mail);
}

QString helpLib(const char *name, const QString &description, const QString &copyright, const char *url)
{
return QString("<p class=\"ppp\"><span class='h2x'>%1</span>"
"&nbsp;&nbsp;&nbsp;<span class='h3'>%2</span><br />%3<br />%4</p>")
return QString("<p><span class='library'>%1</span>"
"&nbsp;&nbsp;&nbsp;<span class='info'>%2</span><br />%3<br />%4</p>")
.arg(name)
.arg( escapeHtml(description) )
.arg(copyright)
.arg( helpUrl(url) );
}

QString helpTitle(const QString &title)
QString helpSection(const QString &title, ushort icon)
{
return "<div class='h2'>" + escapeHtml(title) + "</div>";
return "<div class='section'>" + escapeHtml(title)
+ "<span class='section-icon icon'>&nbsp;&nbsp;" + QString(QChar(icon)) + "</span></div>";
}

QString helpParagraph(const QString &text)
{
return "<p class=\"pp\">" + escapeHtml(text) + "</p>";
return "<p>" + escapeHtml(text) + "</p>";
}

} // namespace
Expand All @@ -98,59 +104,55 @@ QString AboutDialog::aboutPage()
return
"<html>"

// CSS
"<head><style type=\"text/css\">"
"body{font-size:10pt;background:white;color:#333;margin:1.5em}"
"p, li{white-space:pre-wrap;margin-left:1ex}"
"<head><style type='text/css'>"
"body{font-size:10pt;background:white;color:#333;margin:1.0em}"
"p,li{margin-left:4ex;white-space:pre-wrap;margin-left:1ex}"
"a{text-decoration:none}"
".h1{font-size:26pt;color:#666;white-space:pre}"
".h1x{font-size:16pt;color:#888;white-space:pre}"
".h2{width:100%;font-size:16pt;margin-left:1ex;margin-top:0.2em}"
".h2x{font-size:12pt}"
".h3{font-size:9pt;color:#666}"
".links td{padding:0}"
".link{font-size:9pt}"
".pp{margin-left:4ex}"
".ppp{margin-left:4ex;font-size:9pt}"
"table{border:0}"
".odd {background:#def}"
"td{padding:0.1em}"
"#title{font-size:26pt;color:#666;white-space:pre;margin-bottom:0.2em}"
"#subtitle{font-size:16pt;color:#888;white-space:pre;margin-bottom:0.2em}"
"#version{font-size:12pt}"
"#copyright{font-size:9pt;color:#666}"
".icon{font-family:FontAwesome}"
".help-icon{color:#999;padding-left:1em;padding-right:1em}"
".section-icon{color:#777}"
".section{font-size:16pt}"
".library{font-size:12pt}"
".info{color:#666}"
".odd{background:#def}"
"#keys{margin-left:4ex}"
".key{font-family:monospace;font-size:9pt;padding-left:0.5em}"
".logo{float:left}"
".info{font-size:9pt}"
"</style></head>"

"<body>"

// logo
"<img class='logo' src=':/images/logo.png' />"

// title
"<div class='h1'>CopyQ</div>"
// subtitle
"<div class=\"h1x\">" + escapeHtml(tr("Clipboard Manager"))
+ " " COPYQ_VERSION "</div>"
"<table><tr valign='middle'>"
"<td><img src=':/images/logo.png' /></td>"
"<td>"
"<div id='title'>CopyQ</div>"
"<div id='subtitle'>" + escapeHtml(tr("Clipboard Manager")) + "</div>"
"<div id='version'>" + COPYQ_VERSION "</div>"
"</td>"
"</tr></table>"

"<p>"
"<table class='links'>"
+ helpLink( tr("Author"), QString::fromUtf8("Lukáš Holeček") )
+ helpLink( tr("E-mail"), helpMail("[email protected]") )
+ helpLink( tr("Web"), helpUrl("https://hluk.github.io/CopyQ/") )
+ helpLink( tr("Wiki"), helpUrl("https://github.com/hluk/CopyQ/wiki") )
+ helpLink( tr("Donate"), helpUrl("https://www.bountysource.com/teams/copyq") )
+ helpLink( tr("Author"), QString::fromUtf8("Lukáš Holeček"), IconUser )
+ helpLink( tr("E-mail"), helpMail("[email protected]"), IconEnvelope )
+ helpLink( tr("Web"), helpUrl("https://hluk.github.io/CopyQ/"), IconHome )
+ helpLink( tr("Wiki"), helpUrl("https://github.com/hluk/CopyQ/wiki"), IconBook )
+ helpLink( tr("Donate"), helpUrl("https://www.bountysource.com/teams/copyq"), IconGift )
+
"</table>"
"</p>"

// copyright
"<p class='info'>Copyright (c) 2009 - 2017</p>"
"<p id='copyright'>Copyright (c) 2009 - 2017</p>"

"<p></p>"

+ helpTitle(tr("Development"))
+ "<p class=\"pp\">"
// developers
+ helpSection(tr("Development"), IconPencil)
+ "<p>"
+ helpDeveloper("Adam Batkin", "[email protected]")
+ helpDeveloper("Giacomo Margarito", "[email protected]")
+ helpDeveloper("Greg Carp", "[email protected]")
Expand All @@ -175,20 +177,19 @@ QString AboutDialog::aboutPage()
+
"</p>"

// libraries
+ helpLib("Qt", tr("Library used in the application", "Qt library description"),
+ helpLib("Qt", "",
"The Qt Toolkit is Copyright (C) 2016 The Qt Company Ltd. and other contributors.", "https://www.qt.io/")
+ helpLib("Weblate", tr("Free web-based translation management system", "Weblate description"),
"Copyright (c) 2012 - 2016 Michal &#268;iha&#345;", "https://weblate.org")
+ helpLib("Font Awesome", tr("Iconic font used in the application", "Font Awesome description"),
"Created & Maintained by Dave Gandy", "https://fortawesome.github.io/Font-Awesome/")
+ helpLib("LibQxt", tr("Library used in the application", "LibQxt library description"),
+ helpLib("LibQxt", "",
"Copyright (c) 2006 - 2011, the LibQxt project", "http://libqxt.org")
+ helpLib("Solarized", tr("Color palette used for themes", "Solarized palette/themes description"),
"Copyright (c) 2011 Ethan Schoonover", "http://ethanschoonover.com/solarized")

// keyboard title
+ helpTitle(tr("Keyboard"))
+ helpSection(tr("Keyboard"), IconKeyboard)

+ helpParagraph(tr("Application shortcuts can be changed in Preferences dialog."))

Expand All @@ -199,7 +200,7 @@ QString AboutDialog::aboutPage()
+ helpParagraph(tr("Type any text to search the clipboard history."))

// keyboard table
+ "<p><table id=\"keys\">"
+ "<p><table id='keys'>"
+ helpKeys( tr("Item list navigation"), tr("Up/Down, Page Up/Down, Home/End") )
+ helpKeys( tr("Tab navigation"),
tr("Left, Right, %1, %2", "Keys for tab navigation (%1, %2 are the standard keys).")
Expand Down
5 changes: 5 additions & 0 deletions src/gui/icons.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@
enum IconId {
IconFirst = 0xf000,
IconSearch = 0xf002,
IconUser = 0xf007,
IconThList = 0xf00b,
IconCheck = 0xf00c,
IconRemove = 0xf00d,
IconOff = 0xf011,
IconCog = 0xf013,
IconTrash = 0xf014,
IconHome = 0xf015,
IconFileAlt = 0xf016,
IconDownloadAlt = 0xf019,
IconArrowCircleODown = 0xf01a,
Expand All @@ -42,6 +44,7 @@ enum IconId {
IconVolumeUp = 0xf028,
IconQRCode = 0xf029,
IconTag = 0xf02b,
IconBook = 0xf02d,
IconCamera = 0xf030,
IconFont = 0xf031,
IconBold = 0xf032,
Expand All @@ -62,6 +65,7 @@ enum IconId {
IconMinus = 0xf068,
IconAsterisk = 0xf069,
IconExclamationSign = 0xf06a,
IconGift = 0xf06b,
IconEyeOpen = 0xf06e,
IconEyeSlash = 0xf070,
IconWarningSign = 0xf071,
Expand All @@ -85,6 +89,7 @@ enum IconId {
IconColumns = 0xf0db,
IconSortDown = 0xf0dd,
IconSortUp = 0xf0de,
IconEnvelope = 0xf0e0,
IconUndo = 0xf0e2,
IconBolt = 0xf0e7,
IconPaste = 0xf0ea,
Expand Down

0 comments on commit fe6b710

Please sign in to comment.