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("Cutter
"
"Version " CUTTER_VERSION "
"
"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 @@
About Cutter
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
+
-
-
-
- 0
+
+
+
+ 96
+ 96
+
-
-
-
-
-
- 0
- 0
-
-
-
-
- 96
- 96
-
-
-
-
- 96
- 96
-
-
-
-
-
-
- :/img/cutter.svg
-
-
- true
-
-
- Qt::AlignCenter
-
-
- 8
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- s
-
-
- <html><head/><body><p><br/></p></body></html>
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
- 5
-
-
-
-
+
+
+ 96
+ 96
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ s
+
+
+ <html><head/><body><p><br/></p></body></html>
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+ 5
+
+
-
@@ -104,6 +61,14 @@
+
+
+ QSvgWidget
+ QWidget
+
+ 1
+
+
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
#include
@@ -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(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 {
QTabWidget::North
- 0
+ 1
true
@@ -687,37 +687,15 @@ QToolTip {
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 {
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
#include
@@ -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);
-
- border-radius: 5px;
-border: none;
-padding: 2px;
-/*color: darkgray;*/
-background-color: rgb(232, 232, 232);
+
+QToolButton { /* all types of tool button */
+ padding: 2px;
+ background-color: palette(light);
+ border-radius: 5px;
+}
+
+QToolButton:pressed {
+ background-color: palette(dark);
+}
...
@@ -208,13 +213,15 @@ background-color: rgb(232, 232, 232);
-
- border-radius: 5px;
-border: none;
-padding: 2px;
-/*color: darkgray;*/
-background-color: rgb(232, 232, 232);
+ QToolButton { /* all types of tool button */
+ padding: 2px;
+ background-color: palette(light);
+ border-radius: 5px;
+}
-
+QToolButton:pressed {
+ background-color: palette(dark);
+}
...