summaryrefslogtreecommitdiff
path: root/ui/qt/byte_view_text.h
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-06-30 09:24:57 -0700
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2016-07-01 06:02:31 +0000
commit250f248fd917eb556f6e6838cf9a45385e00e358 (patch)
tree3059104a8fa18ebc114907d930230b6a11e51ecc /ui/qt/byte_view_text.h
parent5cf7fcdf0f62cf0d8617428141a26e6f280a45d0 (diff)
downloadwireshark-250f248fd917eb556f6e6838cf9a45385e00e358.tar.gz
Qt: Add ASCII+EBCDIC actions to the byte view context menu.
Add actions to switch between ASCII and EBCDIC, similar to the hex and bits items. Bug: 5298 Change-Id: Ib601ac6e89411e6482f3e4172726e16a08fdbd2b Reviewed-on: https://code.wireshark.org/review/16225 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'ui/qt/byte_view_text.h')
-rw-r--r--ui/qt/byte_view_text.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/qt/byte_view_text.h b/ui/qt/byte_view_text.h
index 917813d19e..29ddc2372c 100644
--- a/ui/qt/byte_view_text.h
+++ b/ui/qt/byte_view_text.h
@@ -46,7 +46,6 @@ public:
~ByteViewText();
bool hasDataSource(const tvbuff_t *ds_tvb = NULL);
- void setEncoding(packet_char_enc encoding);
void setFormat(bytes_view_type format);
void setHighlightStyle(bool bold) { bold_highlight_ = bold; }
void setProtocolHighlight(int start, int end);
@@ -104,8 +103,9 @@ private:
gboolean bold_highlight_;
// Data
- packet_char_enc encoding_; // ASCII or EBCDIC
QActionGroup *format_actions_;
+ QActionGroup *encoding_actions_;
+ packet_char_enc encoding_; // ASCII or EBCDIC
QMenu ctx_menu_;
// Data highlight
@@ -131,6 +131,8 @@ private:
private slots:
void setHexDisplayFormat(QAction *action);
+ void setCharacterEncoding(QAction *action);
+
};
#endif // BYTE_VIEW_TEXT_H