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 @@ + + + + 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 @@ + + + + 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 @@ + + + + + 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 @@ img/cutter_plain.svg img/cutter_white_plain.svg img/cutter.svg - python/cutter_jupyter.py python/cutter_ipykernel.py + img/icons/copy.svg + img/icons/delete.svg + img/icons/previous.svg 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(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 @@ - 25 + 24 16777215 + + + - + + + + + :/img/icons/previous.svg:/img/icons/previous.svg + + + + 16 + 12 + true - Qt::LeftArrow + Qt::NoArrow @@ -900,6 +913,8 @@ - + + +