summaryrefslogtreecommitdiff
path: root/ui/qt
AgeCommit message (Collapse)AuthorFilesLines
2013-05-13lupdate/lrelease ui/qt/QtShark.pro Sync with last change in Qt FilesAlexis La Goutte4-408/+933
svn path=/trunk/; revision=49272
2013-05-13Add Some missing text to translateAlexis La Goutte6-13/+13
svn path=/trunk/; revision=49271
2013-05-13Add Some missing text to translateAlexis La Goutte1-2/+2
svn path=/trunk/; revision=49270
2013-04-25Add Qt5 build support with cmake. Just do cmake ... -DENABLE_QT5=ON ...Jörg Mayer1-12/+21
svn path=/trunk/; revision=49042
2013-04-25Fix a warning: sparkline_delegate.h does not contain a Q_OBJECTJörg Mayer1-1/+1
svn path=/trunk/; revision=49039
2013-04-25Update QtShark.pro for Qt5, hopefully without breaking Qt4. Enable theGerald Combs2-6/+13
startup blur on OS X for Qt >= 5. svn path=/trunk/; revision=49036
2013-04-25Send the output of the -D and -L options to the standard output ratherGuy Harris1-46/+35
than the standard error. In Wireshark on Windows, create a console before doing so and destroy it before exiting. Don't do that in TShark or dumpcap, as those are console-mode programs on Windows. This should fix bug 8609 and still allow "wireshark -D" and "wireshark -L" to work when the standard output isn't redirected. svn path=/trunk/; revision=49025
2013-04-24The porting guide for Qt5 requires that Q_OS_ be used insteadJörg Mayer17-66/+66
of Q_WS_ in Qt4 projects See: http://qt-project.org/doc/qt-5.0/qtdoc/portingguide.html svn path=/trunk/; revision=49013
2013-04-11QT: Select default interface if none else is selectedIrene Rüngeler1-0/+6
svn path=/trunk/; revision=48816
2013-04-10Add a license header.Gerald Combs4-0/+93
svn path=/trunk/; revision=48811
2013-04-09Don't try to open <home>/.wireshark on Windows: Wireshark hasn't written toJeff Morriss1-1/+1
that directory since 2001 and reading from that directory was only left in for backwards compatibility with versions prior to r4702. I think it's now safe to remove that backwards compatibility. This eliminates the last argument of get_persconffile_path(). https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8437 svn path=/trunk/; revision=48797
2013-04-08Fix bug in "Import Hex Dump" where data was overwritten in the buffer.Irene Rüngeler1-2/+2
svn path=/trunk/; revision=48787
2013-04-05Add checkbox for the direction indication to the "Import from Hex Dump" dialog.Irene Rüngeler3-0/+23
svn path=/trunk/; revision=48745
2013-04-02OK, if we're setting the file path for the window - which we want to do,Guy Harris1-7/+60
at least on OS X, to set the "proxy icon" - we need to clear the window title *and* the file path before we set it, otherwise the set doesn't happen. While we're at it, clear the file path whenever we're *not* using a path. For temporary files, don't set the file path. The file path is, in fact, the *full path*, not just the last component. svn path=/trunk/; revision=48715
2013-04-02Rename cf_not_saved() to cf_has_unsaved_data() to clarify what itGuy Harris1-3/+3
indicates. (Note: "unsaved data" is more than just "unsaved changes"; it could also mean "temporary file that hasn't been saved anywhere".) svn path=/trunk/; revision=48709
2013-04-02Only enable Edit->Packet Comment... if we can save the file withoutGuy Harris1-1/+1
losing the packet comments, just as we now do in the GTK+ version. svn path=/trunk/; revision=48699
2013-04-01Add routines to file.c to indicate whether:Guy Harris1-35/+9
a save can be done ("can" in the sense of "there's something to save" and in the sense of "we can write that something out"); a "save as" can be done (in the sense of "we can write what we have out"); there's unsaved data to save (which might be unsaved changes or might be a temporary file full of packets); and use them as appropriate. This means that the "unsaved data" indicator in the UI will be turned on for temporary files full of packets as well as for files with unsaved changes; that's what we want. svn path=/trunk/; revision=48693
2013-04-01Add a wtap_dump_can_write() routine that indicates whether WiretapGuy Harris1-6/+1
supports writing files with a given set of encapsulations and comment types. Use it, rather than asking for a list of file formats that support the given set of encapsulation and comment types and checking whether we got back such a list, or duplicating its logic. Having file.c use it means that nobody's using wtap_dump_can_write_encaps() any more; get rid of it. Instead, have a private routine that checks whether a given file format supports a given set of encapsulations *and* comment types, and use that internally. svn path=/trunk/; revision=48690
2013-04-01Define a collection of bits for different types of capture file comments.Guy Harris1-25/+33
For each capture file type, have a bitset of comment types supported by that capture file type. Add a Wiretap routine that, for a given file type, returns the bitset of comment types it supports. Have wtap_get_savable_file_types() take a bitset of comment types that need to be supported by the file types it returns. Replace cf_has_comments() with a routine that returns a bitset of capture file comment types in the capture file. Use those routines in the capture file dialogs; don't wire in the notion that pcap-NG supports all comment types and no other file formats support any comment types. (That's currently true, but we don't want to wire that in as being forever true.) svn path=/trunk/; revision=48689
2013-04-01Add a setTitlebarForCaptureInProgress() method to MainWindow, and use itGuy Harris3-1/+21
to set the title when we have a capture in progress. svn path=/trunk/; revision=48688
2013-03-31Add a setTitlebarForCaptureFile() and have it set the titlebar and theGuy Harris3-4/+22
"modified" indicator. For some reason, it's not getting called in all the right places. svn path=/trunk/; revision=48682
2013-03-31Rename set_display_filename() to set_titlebar_for_capture_file(), asGuy Harris2-2/+3
it affects more than just the file name, it also affects whatever "you have unsaved changes" indicator the UI provides. Put a comment in the Qt code as a reminder of how to set the "you have unsaved changes" indicator. svn path=/trunk/; revision=48680
2013-03-31Make the menu item for importing a hex dump text file be "Import fromGuy Harris6-8/+8
Hex Dump", to clarify that it's not some sort of "generic" import function, just one that can read a hex dump file. ("Import from Hex Dump Text" is another possibility.) Use that string in the dialog title as well. svn path=/trunk/; revision=48665
2013-03-26More icon updates. Gerald Combs1-2/+2
Use the PNG versions of the new application icons. Remove the XPM versions of the Wireshark application and capture icons. To paraphrase Zoidberg, XPMs are bad and we should feel bad. Remove xpm_to_widget_from_parent (which we weren't using and likely won't use in the future). Replace wiki_24.xpm (which was a GNOME or GTK+ stock icon IIRC) with the 16x16 and 24x24 versions emblem-web.png from GNOME icon theme 2.30.3. This version was used specifically because it's GPLv2 and later versions are GPLv3. Update image/README. svn path=/trunk/; revision=48565
2013-03-06Add support for software updates. Remove qtshark.rc and useGerald Combs8-9/+43
image/wireshark.rc (which contains resources needed by WinSparkle) instead. svn path=/trunk/; revision=48147
2013-03-05Followup to r48081: use the DEFAULT_CAPTURE_BUFFER_SIZE macro from r47942.Jeff Morriss1-1/+1
svn path=/trunk/; revision=48085
2013-03-05Default capture buffer size is now 2MB. (See also r47920 and r47937)Chris Maynard1-1/+1
svn path=/trunk/; revision=48081
2013-03-01Export libwireshark symbols using WS_DLL_PUBLIC defineBalint Reczey1-0/+1
Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992
2013-02-20Only call create_app_running_mutex on Windows.Gerald Combs1-0/+3
svn path=/trunk/; revision=47766
2013-02-20When any of our executables start on Windows create or open a "WiresharkGerald Combs1-0/+1
is running" mutex. Have the NSIS installer check for this mutex and ask the user to close Wireshark if it's found. While not perfect this makes the WinSparkle update process much less annoying. svn path=/trunk/; revision=47758
2013-02-14main_window_slots.cpp includes ui_main_window.h, so make sure we buildGuy Harris1-1/+1
ui_main_window.h before doing anything with main_window_slots.cpp. svn path=/trunk/; revision=47659
2013-02-10Use the same destination directory everywhere. If we're building an NSISGerald Combs1-6/+11
package, assume that we're doing a "release" build. svn path=/trunk/; revision=47615
2013-02-09Put NODIST_ at the beginning of macro names, as was done for the pluginsGuy Harris2-12/+12
directory. svn path=/trunk/; revision=47599
2013-02-09Fix EXTRA_BINFILES for CMake + OS X.Gerald Combs1-1/+1
svn path=/trunk/; revision=47595
2013-02-09Try to figure out if we built the rest of the project using Autotools orGerald Combs1-3/+25
CMake automatically. svn path=/trunk/; revision=47576
2013-02-08Add a directory name preference type (PREF_DIRNAME) and registrationGerald Combs4-17/+102
routine (prefs_register_directory_preference). Add PREF_FILENAME and PREF_DIRNAME support to the Qt module preferences. Change a couple of preferences to directory names. Clean up some names and default settings. svn path=/trunk/; revision=47573
2013-02-08Add module_preferences_scroll_area.*.Gerald Combs3-0/+9
svn path=/trunk/; revision=47546
2013-02-08Add a ModulePreferencesScrollArea widget which builds a scrollable frameGerald Combs6-39/+664
for a preferences module. Use it to fill in the remaining preferences. Don't show the printing preferences since they're not used here. Change the titles and tooltips for some of the name resolution preferences. Disable the capture preferences if we can't capture. This is different from the GTK+ version which hides it completely. Thus concludes the preferences dialog (for the time being). svn path=/trunk/; revision=47545
2013-02-06Remove some unnecessary definitions.Gerald Combs1-3/+0
svn path=/trunk/; revision=47526
2013-02-06Add filter expressions frame entries.Gerald Combs3-0/+9
svn path=/trunk/; revision=47523
2013-02-06Add Filter Expressions^WButton^WShortcut^WBookmark preferences. Gerald Combs19-83/+747
Add comments noting that - We might want to do something different when the bookmark button is pressed. - The display filters (dfilters file) and gui.filter_expressions preferences should be merged. - Many buttons on Qt4 + OS X + unifiedTitleAndToolBarOnMac makes the main window really wide. Add a qstring_strdup convenience routine. Add "disabled" display filter edit icons. Fix up whitespace and descriptions in a couple of places. svn path=/trunk/; revision=47522
2013-02-05Prettify Qt build output.Gerald Combs1-3/+18
svn path=/trunk/; revision=47484
2013-02-03Sigh. At least on my Fedora 16 with KDE, the Qt 4 versions of uic andGuy Harris1-3/+3
moc are called uic-qt4 and moc-qt4. Look for them by names, plural. svn path=/trunk/; revision=47457
2013-02-02Reflect recent.c moving from the top-level directory to the uiGuy Harris1-1/+0
directory. svn path=/trunk/; revision=47441
2013-02-02Move the GUI-independent window geometry stuff to ui/recent.c, so weGuy Harris1-128/+0
only have one copy. svn path=/trunk/; revision=47440
2013-02-02In Qt 4, C strings are, by default, treated as 7-bit ASCII whenGuy Harris1-0/+7
converted to QStrings, and, to get them to be treated as UTF-8, you need to call the setCodecForCStrings method of the QTextCodec class to set the codec to a UTF-8 codec. In Qt 5, C strings are treated always as UTF-8 when converted to QStrings, and there's no setCodecForCStrings method for the QTextCodec class. In addition, there's also no setCodecForTr method for the QTextCodec class - and QObject isn't documented as even *having* a tr method, so I don't know what to do there. svn path=/trunk/; revision=47436
2013-02-01Fix [ 68%] Building CXX object ↵Alexis La Goutte1-1/+1
ui/qt/CMakeFiles/qtui.dir/font_color_preferences_frame.cpp.o ui/qt/font_color_preferences_frame.cpp: In member function ‘void FontColorPreferencesFrame::updateWidgets()’: ui/qt/font_color_preferences_frame.cpp:84:54: error: ‘class QFont’ has no member named ‘styleName’ make[2]: *** [ui/qt/CMakeFiles/qtui.dir/font_color_preferences_frame.cpp.o] Erreur 1 make[1]: *** [ui/qt/CMakeFiles/qtui.dir/all] Error 2 StyleName is not available in Qt < 4.8 disable this line for the moment (maye be add if QTVERSION > 4.8 ?) svn path=/trunk/; revision=47409
2013-02-01Add interface prefs. Adjust some spacing and resize behavior.Gerald Combs10-11/+376
svn path=/trunk/; revision=47403
2013-01-31Use the name "Wireshark" instead of "qtshark" on OS X.Gerald Combs1-1/+6
svn path=/trunk/; revision=47393
2013-01-30Copy over r47277 from ui/gtk.Gerald Combs1-1/+7
svn path=/trunk/; revision=47364