SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@954 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2020-04-17 16:50:58 +00:00
parent 1083b6ef5c
commit 7855fe123b
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
qad/application/aboutwindow.cpp
View File

@@ -11,14 +11,17 @@
QImage AboutWindow::logo; QImage AboutWindow::logo;
QVector<AboutWindow::SSPair> AboutWindow::versions, AboutWindow::builds; QVector<AboutWindow::SSPair> AboutWindow::versions, AboutWindow::builds;
QString AboutWindow::comment; QString AboutWindow::comment, AboutWindow::stylesheet;
AboutWindow::AboutWindow(QWidget * parent): QDialog(parent), ui(new Ui::AboutWindow) { AboutWindow::AboutWindow(QWidget * parent): QDialog(parent), ui(new Ui::AboutWindow) {
#ifdef ANDROID #ifdef ANDROID
setStyleSheet("font: 12pt \"DejaVu Sans\";"); QDialog::setStyleSheet("font: 12pt \"DejaVu Sans\";");
#endif #endif
if (!stylesheet.isEmpty())
QDialog::setStyleSheet(stylesheet);
ui->setupUi(this); ui->setupUi(this);
ui->labelAuthors->setOpenExternalLinks(true);
QImage logo_im = logo; QImage logo_im = logo;
if (logo_im.isNull()) if (logo_im.isNull())
logo_im.load(":/icons/splash.png"); logo_im.load(":/icons/splash.png");
@@ -92,6 +95,11 @@ void AboutWindow::addVersion(QString name, QString version) {
foreach (const SSPair & p, versions) { foreach (const SSPair & p, versions) {
if (p.first == name) return; if (p.first == name) return;
} }
version.prepend("<b>");
if (version.contains("("))
version.insert(version.indexOf("("), "</b>");
else
version.append("</b>");
versions << SSPair(name, version); versions << SSPair(name, version);
} }
@@ -110,6 +118,11 @@ void AboutWindow::setComment(QString text) {
} }
void AboutWindow::setStyleSheet(QString ss) {
stylesheet = ss;
}
void AboutWindow::show() { void AboutWindow::show() {
AboutWindow w; AboutWindow w;
w.exec(); w.exec();
@@ -155,8 +168,7 @@ QString AboutWindow::authors() {
sl = l.split(";"); sl = l.split(";");
if (sl.size() > 0) name = sl[0].trimmed(); if (sl.size() > 0) name = sl[0].trimmed();
if (sl.size() > 1) mail = sl[1].trimmed(); if (sl.size() > 1) mail = sl[1].trimmed();
if (!ret.isEmpty()) ret += "\n"; ret += QString("<p>%1 (<a href=\"mailto:%2?subject=%3\">%2</a>)</p>").arg(name, mail, QApplication::applicationName());
ret += QString("%1 (%2)").arg(name, mail);
} }
return ret; return ret;
} }

10
qad/application/aboutwindow.h
View File

@@ -11,6 +11,13 @@
else \ else \
AboutWindow::addVersion(#lib, lib##_VERSION_NAME); \ AboutWindow::addVersion(#lib, lib##_VERSION_NAME); \
} }
#define ADD_ABOUT_VERSION_NAMED(lib, label) \
{ \
if (lib##_VERSION_BUILD > 0) \
AboutWindow::addVersion(label, lib##_VERSION_NAME " (build " + QString::number(lib##_VERSION_BUILD) + ")"); \
else \
AboutWindow::addVersion(label, lib##_VERSION_NAME); \
}
#define ADD_ABOUT_BUILD_INFO(lib) \ #define ADD_ABOUT_BUILD_INFO(lib) \
AboutWindow::addBuildInfo("Arch", lib##_ARCH); \ AboutWindow::addBuildInfo("Arch", lib##_ARCH); \
AboutWindow::addBuildInfo("Compiler", lib##_CXX_COMPILER); \ AboutWindow::addBuildInfo("Compiler", lib##_CXX_COMPILER); \
@@ -34,6 +41,7 @@ public:
static void addVersion(QString name, QString version); static void addVersion(QString name, QString version);
static void addBuildInfo(QString name, QString value); static void addBuildInfo(QString name, QString value);
static void setComment(QString text); static void setComment(QString text);
static void setStyleSheet(QString ss);
static void show(); static void show();
@@ -48,7 +56,7 @@ private:
static QImage logo; static QImage logo;
static QVector<SSPair> versions, builds; static QVector<SSPair> versions, builds;
static QString comment; static QString stylesheet, comment;
}; };