From 3daeab9b66126da218fa91048007a9f7f53b2fdb Mon Sep 17 00:00:00 2001
From: lupoDharkael <izhe@hotmail.es>
Date: Tue, 1 Aug 2017 13:21:39 +0200
Subject: [PATCH] Add minor visual improvements to the menu widgets

---
 graphics.qrc                 |   1 -
 img/gplv3.png                | Bin 3471 -> 0 bytes
 src/config/geneneralconf.cpp |   2 +-
 src/config/uicoloreditor.cpp |   1 +
 src/infowindow.cpp           |  49 +++++++++++++++++++++++------------
 src/infowindow.h             |   9 ++++---
 6 files changed, 39 insertions(+), 23 deletions(-)
 delete mode 100644 img/gplv3.png

diff --git a/graphics.qrc b/graphics.qrc
index 9f6d0cc6..682941ca 100644
--- a/graphics.qrc
+++ b/graphics.qrc
@@ -39,6 +39,5 @@
         <file>img/configBlack/name_edition.png</file>
         <file>img/buttonIconsBlack/size_indicator.png</file>
         <file>img/buttonIconsWhite/size_indicator.png</file>
-        <file>img/gplv3.png</file>
     </qresource>
 </RCC>
diff --git a/img/gplv3.png b/img/gplv3.png
deleted file mode 100644
index 3e9136e626683ac152b73bc8fffcb15d1806091a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3471
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

diff --git a/src/config/geneneralconf.cpp b/src/config/geneneralconf.cpp
index 7845764d..39f53517 100644
--- a/src/config/geneneralconf.cpp
+++ b/src/config/geneneralconf.cpp
@@ -85,7 +85,7 @@ void GeneneralConf::initShowTrayIcon() {
     ConfigHandler config;
     bool checked = !config.getDisabledTrayIcon();
     m_showTray->setChecked(checked);
-    m_showTray->setToolTip(tr("Show systemtray icons"));
+    m_showTray->setToolTip(tr("Show the systemtray icon"));
     m_layout->addWidget(m_showTray);
 
     connect(m_showTray, &QCheckBox::clicked, this,
diff --git a/src/config/uicoloreditor.cpp b/src/config/uicoloreditor.cpp
index bf278189..69416490 100644
--- a/src/config/uicoloreditor.cpp
+++ b/src/config/uicoloreditor.cpp
@@ -118,6 +118,7 @@ void UIcolorEditor::initButtons() {
     h2->addWidget(frame2);
     frame2->setFixedSize(frameSize, frameSize);
     m_labelContrast = new ClickableLabel(tr("Contrast Color"), this);
+    m_labelContrast->setStyleSheet("color : gray");
     h2->addWidget(m_labelContrast);
     m_vLayout->addLayout(h2);
 
diff --git a/src/infowindow.cpp b/src/infowindow.cpp
index c52fabe8..5ec79dbe 100644
--- a/src/infowindow.cpp
+++ b/src/infowindow.cpp
@@ -30,22 +30,14 @@ InfoWindow::InfoWindow(QWidget *parent) : QWidget(parent) {
     setWindowIcon(QIcon(":img/flameshot.png"));
     setWindowTitle(tr("About"));
 
-    layout = new QVBoxLayout(this);
-    layout->addWidget(new QLabel(tr("<b>Shortcuts</b>"), this));
+    m_layout = new QVBoxLayout(this);
+    initLabels();
     initInfoTable();
-    layout->addWidget(new QLabel(tr("<b>License</b>"), this));
-
-    auto imgGPL = new QLabel(this);
-    imgGPL->setStyleSheet("background: white; border-color: black; border-width: 2px");
-    imgGPL->setPixmap(QPixmap(":img/gplv3.png"));
-    imgGPL->setFixedWidth(imgGPL->pixmap()->width());
-    layout->addWidget(imgGPL);
-
     show();
 }
 
 
-QVector<const char *> InfoWindow::keys = {
+QVector<const char *> InfoWindow::m_keys = {
     "←↓↑→",
     "SHIFT + ←↓↑→",
     "ESC",
@@ -55,7 +47,7 @@ QVector<const char *> InfoWindow::keys = {
     QT_TR_NOOP("Right Click")
 };
 
-QVector<const char *> InfoWindow::description = {
+QVector<const char *> InfoWindow::m_description = {
     QT_TR_NOOP("Move selection 1px"),
     QT_TR_NOOP("Resize selection 1px"),
     QT_TR_NOOP("Quit capture"),
@@ -70,10 +62,10 @@ void InfoWindow::initInfoTable() {
     QTableWidget *table = new QTableWidget(this);
     table->setToolTip(tr("Available shorcuts in the screen capture mode."));
 
-    layout->addWidget(table);
+    m_layout->addWidget(table);
 
     table->setColumnCount(2);
-    table->setRowCount(keys.size());
+    table->setRowCount(m_keys.size());
     table->setSelectionMode(QAbstractItemView::NoSelection);
     table->setFocusPolicy(Qt::NoFocus);
     table->verticalHeader()->hide();
@@ -82,9 +74,9 @@ void InfoWindow::initInfoTable() {
     names  << tr("Key") << tr("Description");
     table->setHorizontalHeaderLabels(names);
     //add content
-    for (int i= 0; i < keys.size(); ++i){
-        table->setItem(i, 0, new QTableWidgetItem(tr(keys.at(i))));
-        table->setItem(i, 1, new QTableWidgetItem(tr(description.at(i))));
+    for (int i= 0; i < m_keys.size(); ++i){
+        table->setItem(i, 0, new QTableWidgetItem(tr(m_keys.at(i))));
+        table->setItem(i, 1, new QTableWidgetItem(tr(m_description.at(i))));
     }
     // adjust size
     table->resizeColumnsToContents();
@@ -96,6 +88,29 @@ void InfoWindow::initInfoTable() {
                                              QSizePolicy::Expanding);
 }
 
+void InfoWindow::initLabels() {
+    m_layout->addStretch();
+    QLabel *licenseTitleLabel = new QLabel(tr("<b>License</b>"), this);
+    licenseTitleLabel->setAlignment(Qt::AlignHCenter);
+    m_layout->addWidget(licenseTitleLabel);
+    QLabel *licenseLabel = new QLabel("GPLv3+", this);
+    licenseLabel->setAlignment(Qt::AlignHCenter);
+    m_layout->addWidget(licenseLabel);
+    m_layout->addStretch();
+
+    QLabel *versionTitleLabel = new QLabel(tr("<b>Version</b>"), this);
+    versionTitleLabel->setAlignment(Qt::AlignHCenter);
+    m_layout->addWidget(versionTitleLabel);
+    QLabel *versionLabel = new QLabel(APP_VERSION, this);
+    versionLabel->setAlignment(Qt::AlignHCenter);
+    m_layout->addWidget(versionLabel);
+    m_layout->addStretch();
+    m_layout->addSpacing(10);
+    QLabel *shortcutsTitleLabel = new QLabel(tr("<b>Shortcuts</b>"), this);
+    shortcutsTitleLabel->setAlignment(Qt::AlignHCenter);;
+    m_layout->addWidget(shortcutsTitleLabel);
+}
+
 void InfoWindow::keyPressEvent(QKeyEvent *e) {
     if (e->key() == Qt::Key_Escape) {
             close();
diff --git a/src/infowindow.h b/src/infowindow.h
index 5a56a8fc..b88f64b9 100644
--- a/src/infowindow.h
+++ b/src/infowindow.h
@@ -31,11 +31,12 @@ protected:
     void keyPressEvent(QKeyEvent *);
 
 private:
-    void initInfoTable();
-    QVBoxLayout *layout;
+    inline void initInfoTable();
+    inline void initLabels();
+    QVBoxLayout *m_layout;
 
-    static QVector<const char *> keys;
-    static QVector<const char *> description;
+    static QVector<const char *> m_keys;
+    static QVector<const char *> m_description;
 };
 
 #endif // INFOWINDOW_H