From 04148a683460b78c85ca675f3e9d8e21946d0e55 Mon Sep 17 00:00:00 2001
From: Ankur Saini <ankur98saini@gmail.com>
Date: Sun, 21 Oct 2018 22:37:02 +0530
Subject: [PATCH] Minor Changes to Hexdump Widget (#863)

* Minor Changes to Hexdump Widget

* Some changes to side view

* Minor change to placeholder text
---
 src/img/icons/copy.svg        |  4 ++++
 src/img/icons/delete.svg      |  4 ++++
 src/img/icons/previous.svg    |  8 ++++++++
 src/resources.qrc             |  4 +++-
 src/widgets/HexdumpWidget.cpp | 26 +++++++++++++++++++++-----
 src/widgets/HexdumpWidget.ui  | 23 +++++++++++++++++++----
 6 files changed, 59 insertions(+), 10 deletions(-)
 create mode 100644 src/img/icons/copy.svg
 create mode 100644 src/img/icons/delete.svg
 create mode 100644 src/img/icons/previous.svg

diff --git a/src/img/icons/copy.svg b/src/img/icons/copy.svg
new file mode 100644
index 00000000..801d67ca
--- /dev/null
+++ b/src/img/icons/copy.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" width="512px" height="512px" viewBox="0 0 561 561" style="enable-background:new 0 0 561 561;">
+		<path d="M395.25,0h-306c-28.05,0-51,22.95-51,51v357h51V51h306V0z M471.75,102h-280.5c-28.05,0-51,22.95-51,51v357    c0,28.05,22.95,51,51,51h280.5c28.05,0,51-22.95,51-51V153C522.75,124.95,499.8,102,471.75,102z M471.75,510h-280.5V153h280.5V510    z" fill="#8c8c8c"/>
+</svg>
diff --git a/src/img/icons/delete.svg b/src/img/icons/delete.svg
new file mode 100644
index 00000000..05a896b2
--- /dev/null
+++ b/src/img/icons/delete.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 44 44" enable-background="new 0 0 44 44" width="512px" height="512px">
+  <path d="m22,0c-12.2,0-22,9.8-22,22s9.8,22 22,22 22-9.8 22-22-9.8-22-22-22zm3.2,22.4l7.5,7.5c0.2,0.2 0.3,0.5 0.3,0.7s-0.1,0.5-0.3,0.7l-1.4,1.4c-0.2,0.2-0.5,0.3-0.7,0.3-0.3,0-0.5-0.1-0.7-0.3l-7.5-7.5c-0.2-0.2-0.5-0.2-0.7,0l-7.5,7.5c-0.2,0.2-0.5,0.3-0.7,0.3-0.3,0-0.5-0.1-0.7-0.3l-1.4-1.4c-0.2-0.2-0.3-0.5-0.3-0.7s0.1-0.5 0.3-0.7l7.5-7.5c0.2-0.2 0.2-0.5 0-0.7l-7.5-7.5c-0.2-0.2-0.3-0.5-0.3-0.7s0.1-0.5 0.3-0.7l1.4-1.4c0.2-0.2 0.5-0.3 0.7-0.3s0.5,0.1 0.7,0.3l7.5,7.5c0.2,0.2 0.5,0.2 0.7,0l7.5-7.5c0.2-0.2 0.5-0.3 0.7-0.3 0.3,0 0.5,0.1 0.7,0.3l1.4,1.4c0.2,0.2 0.3,0.5 0.3,0.7s-0.1,0.5-0.3,0.7l-7.5,7.5c-0.2,0.1-0.2,0.5 3.55271e-15,0.7z" fill="#7d7c7d"/>
+</svg>
diff --git a/src/img/icons/previous.svg b/src/img/icons/previous.svg
new file mode 100644
index 00000000..f4a88b8c
--- /dev/null
+++ b/src/img/icons/previous.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 414.496 414.496" style="enable-background:new 0 0 414.496 414.496;" >
+	<polygon style="fill:#2488FF;" points="275.283,28.238 246.953,0 40.379,207.248 246.953,414.496 275.283,386.258 96.856,207.248 	
+		"/>
+	<polygon style="fill:#2488FF;" points="374.117,28.238 345.787,0 139.213,207.248 345.787,414.496 374.117,386.258 195.69,207.248 
+			"/>
+</svg>
diff --git a/src/resources.qrc b/src/resources.qrc
index a7a55457..424788d4 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -77,8 +77,10 @@
         <file>img/cutter_plain.svg</file>
         <file>img/cutter_white_plain.svg</file>
         <file>img/cutter.svg</file>
-
         <file>python/cutter_jupyter.py</file>
         <file>python/cutter_ipykernel.py</file>
+        <file>img/icons/copy.svg</file>
+        <file>img/icons/delete.svg</file>
+        <file>img/icons/previous.svg</file>
     </qresource>
 </RCC>
diff --git a/src/widgets/HexdumpWidget.cpp b/src/widgets/HexdumpWidget.cpp
index 18d4e597..be2abeff 100644
--- a/src/widgets/HexdumpWidget.cpp
+++ b/src/widgets/HexdumpWidget.cpp
@@ -24,10 +24,8 @@ HexdumpWidget::HexdumpWidget(MainWindow *main, QAction *action) :
     //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())));
+    ui->copyMD5->setIcon(QIcon(":/img/icons/copy.svg"));
+    ui->copySHA1->setIcon(QIcon(":/img/icons/copy.svg"));
 
     int margin = static_cast<int>(ui->hexOffsetText->document()->documentMargin());
     ui->offsetHeaderLabel->setContentsMargins(margin, 0, margin, 0);
@@ -41,8 +39,9 @@ HexdumpWidget::HexdumpWidget(MainWindow *main, QAction *action) :
     ui->splitter->setChildrenCollapsible(false);
 
     QToolButton *closeButton = new QToolButton;
-    QIcon closeIcon = qApp->style()->standardIcon(QStyle::SP_DialogCloseButton);
+    QIcon closeIcon = QIcon(":/img/icons/delete.svg");
     closeButton->setIcon(closeIcon);
+    closeButton->setAutoRaise(true);
     ui->hexSideTab_2->setCornerWidget(closeButton);
 
     ui->openSideViewB->hide();  // hide button at startup since side view is visible
@@ -57,8 +56,25 @@ HexdumpWidget::HexdumpWidget(MainWindow *main, QAction *action) :
         ui->openSideViewB->hide();
     });
 
+    ui->bytesMD5->setPlaceholderText("Select bytes to display information");
+    ui->bytesEntropy->setPlaceholderText("Select bytes to display information");
+    ui->bytesSHA1->setPlaceholderText("Select bytes to display information");
+    ui->hexDisasTextEdit->setPlaceholderText("Select bytes to display information");
+
     setupFonts();
 
+    ui->openSideViewB->setStyleSheet(""
+                                     "QToolButton {"
+                                     "   border : 0px;"
+                                     "   padding : 0px;"
+                                     "   margin : 0px;"
+                                     "}"
+                                     "QToolButton:hover {"
+                                     "  border : 1px solid;"
+                                     "  border-width : 1px;"
+                                     "  border-color : #3daee9"
+                                     "}");
+
     colorsUpdatedSlot();
     updateHeaders();
 
diff --git a/src/widgets/HexdumpWidget.ui b/src/widgets/HexdumpWidget.ui
index cfee4c39..684d1d6e 100644
--- a/src/widgets/HexdumpWidget.ui
+++ b/src/widgets/HexdumpWidget.ui
@@ -676,18 +676,31 @@
       </property>
       <property name="maximumSize">
        <size>
-        <width>25</width>
+        <width>24</width>
         <height>16777215</height>
        </size>
       </property>
+      <property name="styleSheet">
+       <string notr="true"/>
+      </property>
       <property name="text">
-       <string/>
+       <string notr="true"/>
+      </property>
+      <property name="icon">
+       <iconset resource="../resources.qrc">
+        <normaloff>:/img/icons/previous.svg</normaloff>:/img/icons/previous.svg</iconset>
+      </property>
+      <property name="iconSize">
+       <size>
+        <width>16</width>
+        <height>12</height>
+       </size>
       </property>
       <property name="autoRaise">
        <bool>true</bool>
       </property>
       <property name="arrowType">
-       <enum>Qt::LeftArrow</enum>
+       <enum>Qt::NoArrow</enum>
       </property>
      </widget>
     </item>
@@ -900,6 +913,8 @@
    </property>
   </action>
  </widget>
- <resources/>
+ <resources>
+  <include location="../resources.qrc"/>
+ </resources>
  <connections/>
 </ui>