From 2a7d2b79b647aff528dd62e9d901fb5cc33e5a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Sun, 3 Dec 2017 21:01:11 +0100
Subject: [PATCH] Adjust more buttons and logo in AboutDialog to dark theme

---
 src/dialogs/AboutDialog.cpp   |   4 ++
 src/dialogs/AboutDialog.ui    | 123 ++++++++++++----------------------
 src/widgets/HexdumpWidget.cpp |   4 ++
 src/widgets/HexdumpWidget.ui  |  66 +++---------------
 src/widgets/Notepad.cpp       |   4 ++
 src/widgets/Notepad.ui        |  29 +++++---
 6 files changed, 85 insertions(+), 145 deletions(-)

diff --git a/src/dialogs/AboutDialog.cpp b/src/dialogs/AboutDialog.cpp
index 01c02e58..ff588f65 100644
--- a/src/dialogs/AboutDialog.cpp
+++ b/src/dialogs/AboutDialog.cpp
@@ -9,6 +9,10 @@ AboutDialog::AboutDialog(QWidget *parent) :
 {
     ui->setupUi(this);
     setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint));
+
+    QString logoFile = (palette().window().color().value() < 127) ? ":/img/cutter_white.svg" : ":/img/cutter.svg";
+    ui->logoSvgWidget->load(logoFile);
+
     ui->label->setText(tr("<h1>Cutter</h1>"
                           "Version " CUTTER_VERSION "<br/>"
                           "Using r2-" R2_GITTAP
diff --git a/src/dialogs/AboutDialog.ui b/src/dialogs/AboutDialog.ui
index fa8fe2e3..753af435 100644
--- a/src/dialogs/AboutDialog.ui
+++ b/src/dialogs/AboutDialog.ui
@@ -13,87 +13,44 @@
   <property name="windowTitle">
    <string>About Cutter</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>5</number>
-   </property>
-   <property name="leftMargin">
-    <number>5</number>
-   </property>
-   <property name="topMargin">
-    <number>5</number>
-   </property>
-   <property name="rightMargin">
-    <number>5</number>
-   </property>
-   <property name="bottomMargin">
-    <number>5</number>
-   </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout_2">
-     <property name="spacing">
-      <number>0</number>
+    <widget class="QSvgWidget" name="logoSvgWidget" native="true">
+     <property name="minimumSize">
+      <size>
+       <width>96</width>
+       <height>96</height>
+      </size>
      </property>
-     <item>
-      <widget class="QLabel" name="aboutLogo">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>96</width>
-         <height>96</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>96</width>
-         <height>96</height>
-        </size>
-       </property>
-       <property name="text">
-        <string notr="true"/>
-       </property>
-       <property name="pixmap">
-        <pixmap resource="../resources.qrc">:/img/cutter.svg</pixmap>
-       </property>
-       <property name="scaledContents">
-        <bool>true</bool>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-       <property name="margin">
-        <number>8</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">s</string>
-       </property>
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-       </property>
-       <property name="margin">
-        <number>5</number>
-       </property>
-      </widget>
-     </item>
-    </layout>
+     <property name="maximumSize">
+      <size>
+       <width>96</width>
+       <height>96</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">s</string>
+     </property>
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="margin">
+      <number>5</number>
+     </property>
+    </widget>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
@@ -104,6 +61,14 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QSvgWidget</class>
+   <extends>QWidget</extends>
+   <header>QSvgWidget</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <resources>
   <include location="../resources.qrc"/>
  </resources>
diff --git a/src/widgets/HexdumpWidget.cpp b/src/widgets/HexdumpWidget.cpp
index 29a7d088..71444401 100644
--- a/src/widgets/HexdumpWidget.cpp
+++ b/src/widgets/HexdumpWidget.cpp
@@ -6,6 +6,7 @@
 #include "MainWindow.h"
 #include "utils/Helpers.h"
 #include "utils/TempConfig.h"
+#include "utils/SvgIconEngine.h"
 
 #include <QTemporaryFile>
 #include <QFontDialog>
@@ -35,6 +36,9 @@ HexdumpWidget::HexdumpWidget(QWidget *parent, Qt::WindowFlags flags) :
     //connect(ui->hexHexText, SIGNAL(cursorPositionChanged()), this, SLOT(highlightHexCurrentLine()));
     //highlightHexCurrentLine();
 
+    ui->copyMD5->setIcon(QIcon(new SvgIconEngine(QString(":/img/icons/transfer.svg"), palette().buttonText().color())));
+    ui->copySHA1->setIcon(QIcon(new SvgIconEngine(QString(":/img/icons/transfer.svg"), palette().buttonText().color())));
+
     int margin = static_cast<int>(ui->hexOffsetText->document()->documentMargin());
     ui->offsetHeaderLabel->setContentsMargins(margin, 0, margin, 0);
 
diff --git a/src/widgets/HexdumpWidget.ui b/src/widgets/HexdumpWidget.ui
index 25196f7b..9ef74fad 100644
--- a/src/widgets/HexdumpWidget.ui
+++ b/src/widgets/HexdumpWidget.ui
@@ -322,7 +322,7 @@ QToolTip {
        <enum>QTabWidget::North</enum>
       </property>
       <property name="currentIndex">
-       <number>0</number>
+       <number>1</number>
       </property>
       <property name="usesScrollButtons">
        <bool>true</bool>
@@ -687,37 +687,15 @@ QToolTip {
               </property>
               <property name="styleSheet">
                <string notr="true">QToolButton { /* all types of tool button */
-    border: 0px solid rgb(255, 255, 255);
+    padding: 1px;
+    padding-left: 5px;
+    padding-right: 5px;
+	background-color: palette(button);
     border-radius: 6px;
-    border-left: 5px solid rgb(255, 255, 255);
-    border-right: 5px solid rgb(255, 255, 255);
-    margin-bottom: 1px;
-    margin-top: 1px;
-	background-color: rgb(255, 255, 255);
-	image: url(:/img/icons/transfer.svg);
-}
-
-QToolButton:hover {
-
-    border: 0px solid #2180a9;
-    border-radius: 6px;
-    border-left: 5px solid #2180a9;
-    border-right: 5px solid #2180a9;
-    margin-bottom: 1px;
-    margin-top: 1px;
-	background-color: #2180a9;
-	image: url(:/img/icons/transfer_white.svg);
 }
 
 QToolButton:pressed {
-    border: 0px solid rgb(255, 255, 255);
-    border-radius: 6px;
-    border-left: 5px solid rgb(255, 255, 255);
-    border-right: 5px solid rgb(255, 255, 255);
-    margin-bottom: 1px;
-    margin-top: 1px;
-	background-color: rgb(255, 255, 255);
-	image: url(:/img/icons/transfer.svg);
+	background-color: palette(dark);
 }
 
 QToolTip {
@@ -768,37 +746,15 @@ QToolTip {
               </property>
               <property name="styleSheet">
                <string notr="true">QToolButton { /* all types of tool button */
-    border: 0px solid rgb(255, 255, 255);
+    padding: 1px;
+    padding-left: 5px;
+    padding-right: 5px;
+	background-color: palette(button);
     border-radius: 6px;
-    border-left: 5px solid rgb(255, 255, 255);
-    border-right: 5px solid rgb(255, 255, 255);
-    margin-bottom: 1px;
-    margin-top: 1px;
-	background-color: rgb(255, 255, 255);
-	image: url(:/img/icons/transfer.svg);
-}
-
-QToolButton:hover {
-
-    border: 0px solid #2180a9;
-    border-radius: 6px;
-    border-left: 5px solid #2180a9;
-    border-right: 5px solid #2180a9;
-    margin-bottom: 1px;
-    margin-top: 1px;
-	background-color: #2180a9;
-	image: url(:/img/icons/transfer_white.svg);
 }
 
 QToolButton:pressed {
-    border: 0px solid rgb(255, 255, 255);
-    border-radius: 6px;
-    border-left: 5px solid rgb(255, 255, 255);
-    border-right: 5px solid rgb(255, 255, 255);
-    margin-bottom: 1px;
-    margin-top: 1px;
-	background-color: rgb(255, 255, 255);
-	image: url(:/img/icons/transfer.svg);
+	background-color: palette(dark);
 }
 
 QToolTip {
diff --git a/src/widgets/Notepad.cpp b/src/widgets/Notepad.cpp
index a698e417..3f5dc587 100644
--- a/src/widgets/Notepad.cpp
+++ b/src/widgets/Notepad.cpp
@@ -5,6 +5,7 @@
 
 #include "utils/MdHighlighter.h"
 #include "utils/Highlighter.h"
+#include "utils/SvgIconEngine.h"
 
 #include <QPlainTextEdit>
 #include <QFont>
@@ -20,6 +21,9 @@ Notepad::Notepad(MainWindow *main, QWidget *parent) :
 {
     ui->setupUi(this);
 
+    ui->undoButton->setIcon(QIcon(new SvgIconEngine(QString(":/img/icons/undo.svg"), palette().buttonText().color())));
+    ui->redoButton->setIcon(QIcon(new SvgIconEngine(QString(":/img/icons/redo.svg"), palette().buttonText().color())));
+
     // Radare core found in:
     this->main = main;
 
diff --git a/src/widgets/Notepad.ui b/src/widgets/Notepad.ui
index 7e1981b3..a87de434 100644
--- a/src/widgets/Notepad.ui
+++ b/src/widgets/Notepad.ui
@@ -190,11 +190,16 @@ color: rgb(48, 48, 48);
         <item>
          <widget class="QToolButton" name="undoButton">
           <property name="styleSheet">
-           <string notr="true">border-radius: 5px;
-border: none;
-padding: 2px;
-/*color: darkgray;*/
-background-color: rgb(232, 232, 232);</string>
+           <string notr="true">
+QToolButton { /* all types of tool button */
+    padding: 2px;
+	background-color: palette(light);
+    border-radius: 5px;
+}
+
+QToolButton:pressed {
+	background-color: palette(dark);
+}</string>
           </property>
           <property name="text">
            <string>...</string>
@@ -208,13 +213,15 @@ background-color: rgb(232, 232, 232);</string>
         <item>
          <widget class="QToolButton" name="redoButton">
           <property name="styleSheet">
-           <string notr="true">border-radius: 5px;
-border: none;
-padding: 2px;
-/*color: darkgray;*/
-background-color: rgb(232, 232, 232);
+           <string notr="true">QToolButton { /* all types of tool button */
+    padding: 2px;
+	background-color: palette(light);
+    border-radius: 5px;
+}
 
-</string>
+QToolButton:pressed {
+	background-color: palette(dark);
+}</string>
           </property>
           <property name="text">
            <string>...</string>