ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-21 04:16:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up Hexdump Sidebar (Fix #121)

Browse Source
This commit is contained in:
xarkes 2017-12-03 02:44:12 +01:00
parent 096db4b7e4
commit 5b21f970ac
3 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/HexdumpWidget.cpp
View File

@ -79,6 +79,7 @@ HexdumpWidget::HexdumpWidget(QWidget *parent, Qt::WindowFlags flags) :
}); });
fillPlugins(); fillPlugins();
selectHexPreview();
} }
HexdumpWidget::HexdumpWidget(const QString &title, QWidget *parent, Qt::WindowFlags flags) HexdumpWidget::HexdumpWidget(const QString &title, QWidget *parent, Qt::WindowFlags flags)
@ -812,13 +813,12 @@ void HexdumpWidget::on_codeCombo_2_currentTextChanged(const QString &arg1)
if (arg1 == "Dissasembly") if (arg1 == "Dissasembly")
{ {
ui->hexSideFrame_2->show(); ui->hexSideFrame_2->show();
ui->hexDisasTextEdit->setPlainText(";; Select some bytes on the left\n;; to see them disassembled");
} }
else else
{ {
ui->hexSideFrame_2->hide(); ui->hexSideFrame_2->hide();
ui->hexDisasTextEdit->setPlainText(";; Select some bytes on the left\n;; to see them parsed here");
} }
on_hexHexText_selectionChanged();
} }
QString HexdumpWidget::normalize_addr(QString addr) QString HexdumpWidget::normalize_addr(QString addr)

4
src/widgets/HexdumpWidget.h
View File

@ -45,8 +45,6 @@ public slots:
QString normalizeAddr(QString addr); QString normalizeAddr(QString addr);
void selectHexPreview();
void showOffsets(bool show); void showOffsets(bool show);
void zoomIn(int range = 1); void zoomIn(int range = 1);
@ -69,7 +67,7 @@ private:
void refresh(RVA addr = RVA_INVALID); void refresh(RVA addr = RVA_INVALID);
void appendHexdumpLines(int lines, bool top); void appendHexdumpLines(int lines, bool top);
void removeHexdumpLines(int lines, bool top); void removeHexdumpLines(int lines, bool top);
void selectHexPreview();
void updateHeaders(); void updateHeaders();
std::array<QString, 3> fetchHexdump(RVA offset, RVA bytes); std::array<QString, 3> fetchHexdump(RVA offset, RVA bytes);

33
src/widgets/HexdumpWidget.ui
View File

@ -368,6 +368,9 @@ QToolTip {
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentText">
<string>Dissasembly</string>
</property>
<item> <item>
<property name="text"> <property name="text">
<string>Dissasembly</string> <string>Dissasembly</string>
@ -574,8 +577,7 @@ QToolTip {
<number>0</number> <number>0</number>
</property> </property>
<property name="plainText"> <property name="plainText">
<string>;; Select some bytes on the left <string/>
;; to see them disassembled</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -832,40 +834,13 @@ QToolTip {
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="Line" name="line_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_22"> <layout class="QHBoxLayout" name="horizontalLayout_22">
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="QLabel" name="histogramLabel_2">
<property name="text">
<string>&lt;b&gt;Histogram&lt;/b&gt;</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item>
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>