aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/simple_dialog.cpp
AgeCommit message (Collapse)AuthorFilesLines
2017-08-06simple_dialog.cpp: Fix missed Qt version wrapper.Michael Mann1-0/+2
check_box_ member was missing a #if (QT_VERSION > QT_VERSION_CHECK(5, 2, 0)) wrapper Change-Id: Ibdddbe523b8e15c0af31fddfd3f251c24114d11a Reviewed-on: https://code.wireshark.org/review/22959 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-27Qt: SimpleDialog fixes and updates.Gerald Combs1-5/+98
Add WiresharkApplication::mainWindow and use it to move the C simple_dialog routines to simple_dialog.cpp. In SimpleDialog, make sure our checkbox is initialized. Don't store our parent widget (which might go away) in a static variable, just use wsApp->mainWindow(). Make sure we use check boxes only in Qt 5.2 or later. Bug: 13275 Change-Id: I72a9715c59f2efd50f722197f416179e87bb6a8b Reviewed-on: https://code.wireshark.org/review/22805 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: Michael Mann <mmann78@netscape.net>
2017-07-26Qt: Move utils to separate utils directoryRoland Knall1-1/+1
Following the move for widgets directory, moving utils to the utils directory. Guidelines for this directory are: - Generic use but not a widget - Utility functionality used by many classes Note: additionally all includes affected by this move have been changed to absolute path includes, instead of relative ones. Change-Id: I019ae4b6e6f6d06a5745a63ed195edbd36fb936b Reviewed-on: https://code.wireshark.org/review/22602 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-07-25Qt: Make SimpleDialog a plain, non-QObject class.Gerald Combs1-22/+32
Don't assume that the application is initialized when we create a SimpleDialog. Bug: 13275 Change-Id: Ieeb52430500570db88463069833855c3789f686b Reviewed-on: https://code.wireshark.org/review/22778 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: Anders Broman <a.broman58@gmail.com>
2017-06-02Qt: Add version check for setTextInteractionFlagsStig Bjørlykke1-0/+2
This property was introduced in Qt 5.1. Change-Id: I3446886d65fbeaf011a69071b605b044e5205b60 Reviewed-on: https://code.wireshark.org/review/21895 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-25Qt: Make text in SimpleDialog selectable by mouseStig Bjørlykke1-0/+1
This makes it easier to copy error messages. Change-Id: I39284d9b2d716336c6fc4b211e5346abcebf0aee Reviewed-on: https://code.wireshark.org/review/21326 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-11-30Qt: Fix simple_dialog formatting.Gerald Combs1-12/+9
Make sure that simple_dialog displays plain text. Trim whitespace and remove excessive newlines in order to improve message formatting. Add a comment about simple_dialog's behavior in Qt and GTK+ and how it might be improved. Bug: 13178 Change-Id: Ic6ff3cecd5ef1d76ec095d7a409f38e602b41ce2 Reviewed-on: https://code.wireshark.org/review/18985 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-05Move utf8_entities.h to wsutilJoão Valverde1-1/+1
Change-Id: I6298b3de5f0a1cb988014ff16082eaf8c2a3c3c0 Reviewed-on: https://code.wireshark.org/review/10786 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-08-11Added Reload Lua plugins.Stig Bjørlykke1-2/+6
This is initial support for reloading Lua plugins without restarting the application. Still todo: - Deregister FileHandlers - Support deregister ProtoField with existing abbrev (same_name_hfinfo) - Add a progress dialog when reloading many plugins - Search for memory leakages in wslua functions Change-Id: I48870d8741251705ca15ffe1068613fcb0cb18c1 Reviewed-on: https://code.wireshark.org/review/5028 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-02-18Use plain old ASCII for the SimpleDialog delimiter.Gerald Combs1-9/+1
Use a UUID for the SimpleDialog primary delimiter instead of trying to leverage Unicode. Bug: 10953 Change-Id: Ib518b32ef65b50f311b061ab5a267e7d1aa9f01b Reviewed-on: https://code.wireshark.org/review/7240 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-14Qt: Defer startup messages.Gerald Combs1-2/+4
Wait until we've completely started up to show accumulated warnings and errors. Replace three periods with an ellipsis. Change-Id: Ic3b268836e4e4429786c5eba4862cbc0458a19b5 Reviewed-on: https://code.wireshark.org/review/5762 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-08Be less lazy about disabling a Visual C++ warning.Gerald Combs1-0/+4
As Graham pointed out, "#pragma warning(disable..." affects the rest of the file. Add a push+pop so that we only operate on the line in question. Ideally we'd be able to use "suppress" but an "#endif" prevents that. Change-Id: Ia01d6c245879f1c845dc68c18caea2cbceb273ef Reviewed-on: https://code.wireshark.org/review/4569 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-06Revert "Qt: Try to fix a Visual C++ encoding warning."Gerald Combs1-2/+6
Revert gafa8c02 since it didn't work on Windows. Use a pragma to squelch Visual C++ instead. Qt's rich text renderer doesn't handle "&apos;". Replace it with "&#x27;". Remove a QDebug include. Change-Id: I0e6308efda74a4bc0e67ce841a50a0a9b68f4a8b Reviewed-on: https://code.wireshark.org/review/4511 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-01Qt: Try to fix a Visual C++ encoding warning.Gerald Combs1-1/+1
Try to fix .\simple_dialog.cpp(49) : warning C4566: character represented by universal-character-name '\uFFFF' cannot be represented in the current code page (1252) We're assigning a delimiter. "Cannot be represented" is a feature, not a bug. Change-Id: Iba8bc5f5b42a43ec971d822b0e00f932787c7b16 Reviewed-on: https://code.wireshark.org/review/4409 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-25Update the simple dialog code.Gerald Combs1-0/+266
Rename simple_dialog_qt.{cpp,h} to simple_dialog.{cpp,h}. Make it a subclass of QMessageBox. Queue messages at startup similar to GTK+. Move the GTK+-specific simple_dialog declarations to gtk/simple_dialog.h. Don't yell at the user so much. Replace exclamation points with periods. Change-Id: I1cc771106222d5e06f1f52d67ac29d6dc367cce4 Reviewed-on: https://code.wireshark.org/review/4288 Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 07:45:08 +0000