diff options
| -rw-r--r-- | CMakeLists.txt | 24 | ||||
| -rw-r--r-- | cmake/modules/UseExecutableResources.cmake | 6 | ||||
| -rw-r--r-- | docbook/wsdg_src/WSDG_chapter_userinterface.adoc | 8 | ||||
| -rw-r--r-- | doxygen.cfg.in | 2 | ||||
| -rw-r--r-- | epan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | image/wsicon.qrc | 22 | ||||
| -rw-r--r-- | packaging/nsis/uninstall.nsi | 4 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 4 | ||||
| -rw-r--r-- | packaging/portableapps/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | resources/README.adoc (renamed from image/README.adoc) | 8 | ||||
| -rw-r--r-- | resources/about.qrc (renamed from image/about.qrc) | 0 | ||||
| -rw-r--r-- | resources/cli_template.rc.in (renamed from image/cli_template.rc.in) | 0 | ||||
| -rw-r--r-- | resources/dumpcap.rc.in (renamed from image/dumpcap.rc.in) | 0 | ||||
| -rw-r--r-- | resources/file_dlg_win32.rc (renamed from image/file_dlg_win32.rc) | 0 | ||||
| -rw-r--r-- | resources/icons/WiresharkDoc-128.png (renamed from image/WiresharkDoc-128.png) | bin | 14018 -> 14018 bytes | |||
| -rw-r--r-- | resources/icons/WiresharkDoc-16.png (renamed from image/WiresharkDoc-16.png) | bin | 872 -> 872 bytes | |||
| -rw-r--r-- | resources/icons/WiresharkDoc-24.png (renamed from image/WiresharkDoc-24.png) | bin | 1635 -> 1635 bytes | |||
| -rw-r--r-- | resources/icons/WiresharkDoc-256.png (renamed from image/WiresharkDoc-256.png) | bin | 35508 -> 35508 bytes | |||
| -rw-r--r-- | resources/icons/WiresharkDoc-32.png (renamed from image/WiresharkDoc-32.png) | bin | 2044 -> 2044 bytes | |||
| -rw-r--r-- | resources/icons/WiresharkDoc-48.png (renamed from image/WiresharkDoc-48.png) | bin | 3474 -> 3474 bytes | |||
| -rw-r--r-- | resources/icons/WiresharkDoc-64.png (renamed from image/WiresharkDoc-64.png) | bin | 5710 -> 5710 bytes | |||
| -rw-r--r-- | resources/icons/wireshark.ico (renamed from image/wireshark.ico) | bin | 287934 -> 287934 bytes | |||
| -rw-r--r-- | resources/icons/wiresharkcapture.ico (renamed from image/wiresharkcapture.ico) | bin | 287934 -> 287934 bytes | |||
| -rw-r--r-- | resources/icons/wiresharkdoc.ico (renamed from image/wiresharkdoc.ico) | bin | 372526 -> 372526 bytes | |||
| -rw-r--r-- | resources/icons/wiresharkinst.ico (renamed from image/wiresharkinst.ico) | bin | 287934 -> 287934 bytes | |||
| -rw-r--r-- | resources/icons/wsicon-ask.png (renamed from image/wsicon-ask.png) | bin | 768 -> 768 bytes | |||
| -rw-r--r-- | resources/icons/wsicon-ask.svg (renamed from image/wsicon-ask.svg) | 0 | ||||
| -rw-r--r-- | resources/icons/wsicon.svg (renamed from image/wsicon.svg) | 0 | ||||
| -rw-r--r-- | resources/icons/wsicon1024.png (renamed from image/wsicon1024.png) | bin | 288814 -> 288814 bytes | |||
| -rw-r--r-- | resources/icons/wsicon128.png (renamed from image/wsicon128.png) | bin | 15428 -> 15428 bytes | |||
| -rw-r--r-- | resources/icons/wsicon16.png (renamed from image/wsicon16.png) | bin | 775 -> 775 bytes | |||
| -rw-r--r-- | resources/icons/wsicon24.png (renamed from image/wsicon24.png) | bin | 1288 -> 1288 bytes | |||
| -rw-r--r-- | resources/icons/wsicon256.png (renamed from image/wsicon256.png) | bin | 46004 -> 46004 bytes | |||
| -rw-r--r-- | resources/icons/wsicon32.png (renamed from image/wsicon32.png) | bin | 1933 -> 1933 bytes | |||
| -rw-r--r-- | resources/icons/wsicon48.png (renamed from image/wsicon48.png) | bin | 3419 -> 3419 bytes | |||
| -rw-r--r-- | resources/icons/wsicon512.png (renamed from image/wsicon512.png) | bin | 142416 -> 142416 bytes | |||
| -rw-r--r-- | resources/icons/wsicon64.png (renamed from image/wsicon64.png) | bin | 5309 -> 5309 bytes | |||
| -rw-r--r-- | resources/icons/wsiconcap.svg (renamed from image/wsiconcap.svg) | 0 | ||||
| -rw-r--r-- | resources/icons/wsiconcap1024.png (renamed from image/wsiconcap1024.png) | bin | 330908 -> 330908 bytes | |||
| -rw-r--r-- | resources/icons/wsiconcap128.png (renamed from image/wsiconcap128.png) | bin | 18784 -> 18784 bytes | |||
| -rw-r--r-- | resources/icons/wsiconcap16.png (renamed from image/wsiconcap16.png) | bin | 800 -> 800 bytes | |||
| -rw-r--r-- | resources/icons/wsiconcap24.png (renamed from image/wsiconcap24.png) | bin | 1389 -> 1389 bytes | |||
| -rw-r--r-- | resources/icons/wsiconcap256.png (renamed from image/wsiconcap256.png) | bin | 56020 -> 56020 bytes | |||
| -rw-r--r-- | resources/icons/wsiconcap32.png (renamed from image/wsiconcap32.png) | bin | 2070 -> 2070 bytes | |||
| -rw-r--r-- | resources/icons/wsiconcap48.png (renamed from image/wsiconcap48.png) | bin | 4065 -> 4065 bytes | |||
| -rw-r--r-- | resources/icons/wsiconcap512.png (renamed from image/wsiconcap512.png) | bin | 169543 -> 169543 bytes | |||
| -rw-r--r-- | resources/icons/wsiconcap64.png (renamed from image/wsiconcap64.png) | bin | 6361 -> 6361 bytes | |||
| -rw-r--r-- | resources/icons/wsiconinst.svg (renamed from image/wsiconinst.svg) | 0 | ||||
| -rw-r--r-- | resources/icons/wsiconinst1024.png (renamed from image/wsiconinst1024.png) | bin | 263325 -> 263325 bytes | |||
| -rw-r--r-- | resources/icons/wsiconinst128.png (renamed from image/wsiconinst128.png) | bin | 14649 -> 14649 bytes | |||
| -rw-r--r-- | resources/icons/wsiconinst16.png (renamed from image/wsiconinst16.png) | bin | 814 -> 814 bytes | |||
| -rw-r--r-- | resources/icons/wsiconinst24.png (renamed from image/wsiconinst24.png) | bin | 1358 -> 1358 bytes | |||
| -rw-r--r-- | resources/icons/wsiconinst256.png (renamed from image/wsiconinst256.png) | bin | 42132 -> 42132 bytes | |||
| -rw-r--r-- | resources/icons/wsiconinst32.png (renamed from image/wsiconinst32.png) | bin | 1997 -> 1997 bytes | |||
| -rw-r--r-- | resources/icons/wsiconinst48.png (renamed from image/wsiconinst48.png) | bin | 3555 -> 3555 bytes | |||
| -rw-r--r-- | resources/icons/wsiconinst512.png (renamed from image/wsiconinst512.png) | bin | 126739 -> 126739 bytes | |||
| -rw-r--r-- | resources/icons/wsiconinst64.png (renamed from image/wsiconinst64.png) | bin | 5357 -> 5357 bytes | |||
| -rw-r--r-- | resources/languages/de.svg (renamed from image/languages/de.svg) | 0 | ||||
| -rw-r--r-- | resources/languages/en.svg (renamed from image/languages/en.svg) | 0 | ||||
| -rw-r--r-- | resources/languages/es.svg (renamed from image/languages/es.svg) | 0 | ||||
| -rw-r--r-- | resources/languages/fr.svg (renamed from image/languages/fr.svg) | 0 | ||||
| -rw-r--r-- | resources/languages/it.svg (renamed from image/languages/it.svg) | 0 | ||||
| -rw-r--r-- | resources/languages/ja_JP.svg (renamed from image/languages/ja_JP.svg) | 0 | ||||
| -rw-r--r-- | resources/languages/languages.qrc (renamed from image/languages/languages.qrc) | 0 | ||||
| -rw-r--r-- | resources/languages/pl.svg (renamed from image/languages/pl.svg) | 0 | ||||
| -rw-r--r-- | resources/languages/ru.svg (renamed from image/languages/ru.svg) | 0 | ||||
| -rw-r--r-- | resources/languages/sv.svg (renamed from image/languages/sv.svg) | 0 | ||||
| -rw-r--r-- | resources/languages/tr_TR.svg (renamed from image/languages/tr_TR.svg) | 0 | ||||
| -rw-r--r-- | resources/languages/uk.svg (renamed from image/languages/uk.svg) | 0 | ||||
| -rw-r--r-- | resources/languages/zh_CN.svg (renamed from image/languages/zh_CN.svg) | 0 | ||||
| -rw-r--r-- | resources/layout.qrc (renamed from image/layout.qrc) | 0 | ||||
| -rw-r--r-- | resources/layout_1.png (renamed from image/layout_1.png) | bin | 557 -> 557 bytes | |||
| -rw-r--r-- | resources/layout_1@2x.png (renamed from image/layout_1@2x.png) | bin | 1022 -> 1022 bytes | |||
| -rw-r--r-- | resources/layout_2.png (renamed from image/layout_2.png) | bin | 553 -> 553 bytes | |||
| -rw-r--r-- | resources/layout_2@2x.png (renamed from image/layout_2@2x.png) | bin | 1020 -> 1020 bytes | |||
| -rw-r--r-- | resources/layout_3.png (renamed from image/layout_3.png) | bin | 546 -> 546 bytes | |||
| -rw-r--r-- | resources/layout_3@2x.png (renamed from image/layout_3@2x.png) | bin | 1021 -> 1021 bytes | |||
| -rw-r--r-- | resources/layout_4.png (renamed from image/layout_4.png) | bin | 557 -> 557 bytes | |||
| -rw-r--r-- | resources/layout_4@2x.png (renamed from image/layout_4@2x.png) | bin | 1016 -> 1016 bytes | |||
| -rw-r--r-- | resources/layout_5.png (renamed from image/layout_5.png) | bin | 557 -> 557 bytes | |||
| -rw-r--r-- | resources/layout_5@2x.png (renamed from image/layout_5@2x.png) | bin | 990 -> 990 bytes | |||
| -rw-r--r-- | resources/layout_6.png (renamed from image/layout_6.png) | bin | 556 -> 556 bytes | |||
| -rw-r--r-- | resources/layout_6@2x.png (renamed from image/layout_6@2x.png) | bin | 1016 -> 1016 bytes | |||
| -rw-r--r-- | resources/layouts.svg (renamed from image/layouts.svg) | 0 | ||||
| -rw-r--r-- | resources/libwireshark.rc.in (renamed from image/libwireshark.rc.in) | 0 | ||||
| -rw-r--r-- | resources/libwiretap.rc.in (renamed from image/libwiretap.rc.in) | 0 | ||||
| -rw-r--r-- | resources/libwsutil.rc.in (renamed from image/libwsutil.rc.in) | 0 | ||||
| -rw-r--r-- | resources/stock_icons.qrc (renamed from image/stock_icons.qrc) | 4 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-capture-comment-update.png (renamed from image/stock_icons/14x14/x-capture-comment-update.png) | bin | 597 -> 597 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-capture-comment-update.svg (renamed from image/stock_icons/14x14/x-capture-comment-update.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-capture-comment-update@2x.png (renamed from image/stock_icons/14x14/x-capture-comment-update@2x.png) | bin | 1581 -> 1581 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-capture-filter-bookmark.active.png (renamed from image/stock_icons/14x14/x-capture-filter-bookmark.active.png) | bin | 250 -> 250 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-capture-filter-bookmark.active.svg (renamed from image/stock_icons/14x14/x-capture-filter-bookmark.active.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-capture-filter-bookmark.active@2x.png (renamed from image/stock_icons/14x14/x-capture-filter-bookmark.active@2x.png) | bin | 407 -> 407 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-capture-filter-bookmark.png (renamed from image/stock_icons/14x14/x-capture-filter-bookmark.png) | bin | 262 -> 262 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-capture-filter-bookmark.selected.png (renamed from image/stock_icons/14x14/x-capture-filter-bookmark.selected.png) | bin | 247 -> 247 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-capture-filter-bookmark.selected.svg (renamed from image/stock_icons/14x14/x-capture-filter-bookmark.selected.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-capture-filter-bookmark.selected@2x.png (renamed from image/stock_icons/14x14/x-capture-filter-bookmark.selected@2x.png) | bin | 408 -> 408 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-capture-filter-bookmark.svg (renamed from image/stock_icons/14x14/x-capture-filter-bookmark.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-capture-filter-bookmark@2x.png (renamed from image/stock_icons/14x14/x-capture-filter-bookmark@2x.png) | bin | 404 -> 404 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-display-filter-bookmark.active.png (renamed from image/stock_icons/14x14/x-display-filter-bookmark.active.png) | bin | 254 -> 254 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-display-filter-bookmark.active.svg (renamed from image/stock_icons/14x14/x-display-filter-bookmark.active.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-display-filter-bookmark.active@2x.png (renamed from image/stock_icons/14x14/x-display-filter-bookmark.active@2x.png) | bin | 402 -> 402 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-display-filter-bookmark.png (renamed from image/stock_icons/14x14/x-display-filter-bookmark.png) | bin | 238 -> 238 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-display-filter-bookmark.selected.png (renamed from image/stock_icons/14x14/x-display-filter-bookmark.selected.png) | bin | 258 -> 258 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-display-filter-bookmark.selected.svg (renamed from image/stock_icons/14x14/x-display-filter-bookmark.selected.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-display-filter-bookmark.selected@2x.png (renamed from image/stock_icons/14x14/x-display-filter-bookmark.selected@2x.png) | bin | 400 -> 400 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-display-filter-bookmark.svg (renamed from image/stock_icons/14x14/x-display-filter-bookmark.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-display-filter-bookmark@2x.png (renamed from image/stock_icons/14x14/x-display-filter-bookmark@2x.png) | bin | 384 -> 384 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-expert-chat.png (renamed from image/stock_icons/14x14/x-expert-chat.png) | bin | 498 -> 498 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-expert-chat@2x.png (renamed from image/stock_icons/14x14/x-expert-chat@2x.png) | bin | 1014 -> 1014 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-expert-error.png (renamed from image/stock_icons/14x14/x-expert-error.png) | bin | 485 -> 485 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-expert-error@2x.png (renamed from image/stock_icons/14x14/x-expert-error@2x.png) | bin | 997 -> 997 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-expert-indicators-all.svg (renamed from image/stock_icons/14x14/x-expert-indicators-all.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-expert-none.png (renamed from image/stock_icons/14x14/x-expert-none.png) | bin | 481 -> 481 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-expert-none@2x.png (renamed from image/stock_icons/14x14/x-expert-none@2x.png) | bin | 931 -> 931 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-expert-note.png (renamed from image/stock_icons/14x14/x-expert-note.png) | bin | 457 -> 457 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-expert-note@2x.png (renamed from image/stock_icons/14x14/x-expert-note@2x.png) | bin | 922 -> 922 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-expert-warn.png (renamed from image/stock_icons/14x14/x-expert-warn.png) | bin | 484 -> 484 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-expert-warn@2x.png (renamed from image/stock_icons/14x14/x-expert-warn@2x.png) | bin | 1003 -> 1003 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-clear.active.png (renamed from image/stock_icons/14x14/x-filter-clear.active.png) | bin | 285 -> 285 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-clear.active.svg (renamed from image/stock_icons/14x14/x-filter-clear.active.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-clear.active@2x.png (renamed from image/stock_icons/14x14/x-filter-clear.active@2x.png) | bin | 503 -> 503 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-clear.png (renamed from image/stock_icons/14x14/x-filter-clear.png) | bin | 277 -> 277 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-clear.selected.png (renamed from image/stock_icons/14x14/x-filter-clear.selected.png) | bin | 287 -> 287 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-clear.selected.svg (renamed from image/stock_icons/14x14/x-filter-clear.selected.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-clear.selected@2x.png (renamed from image/stock_icons/14x14/x-filter-clear.selected@2x.png) | bin | 505 -> 505 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-clear.svg (renamed from image/stock_icons/14x14/x-filter-clear.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-clear@2x.png (renamed from image/stock_icons/14x14/x-filter-clear@2x.png) | bin | 480 -> 480 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-deprecated.png (renamed from image/stock_icons/14x14/x-filter-deprecated.png) | bin | 316 -> 316 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-deprecated.svg (renamed from image/stock_icons/14x14/x-filter-deprecated.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-deprecated@2x.png (renamed from image/stock_icons/14x14/x-filter-deprecated@2x.png) | bin | 402 -> 402 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-dropdown.dark.png (renamed from image/stock_icons/14x14/x-filter-dropdown.dark.png) | bin | 224 -> 224 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-dropdown.dark.svg (renamed from image/stock_icons/14x14/x-filter-dropdown.dark.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-dropdown.dark@2x.png (renamed from image/stock_icons/14x14/x-filter-dropdown.dark@2x.png) | bin | 268 -> 268 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-dropdown.light.png (renamed from image/stock_icons/14x14/x-filter-dropdown.light.png) | bin | 120 -> 120 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-dropdown.light.svg (renamed from image/stock_icons/14x14/x-filter-dropdown.light.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-dropdown.light@2x.png (renamed from image/stock_icons/14x14/x-filter-dropdown.light@2x.png) | bin | 146 -> 146 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-invalid.png (renamed from image/stock_icons/14x14/x-filter-invalid.png) | bin | 211 -> 211 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-invalid.svg (renamed from image/stock_icons/14x14/x-filter-invalid.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-invalid@2x.png (renamed from image/stock_icons/14x14/x-filter-invalid@2x.png) | bin | 445 -> 445 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-matching-bookmark.active.png (renamed from image/stock_icons/14x14/x-filter-matching-bookmark.active.png) | bin | 238 -> 238 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-matching-bookmark.active.svg (renamed from image/stock_icons/14x14/x-filter-matching-bookmark.active.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-matching-bookmark.active@2x.png (renamed from image/stock_icons/14x14/x-filter-matching-bookmark.active@2x.png) | bin | 405 -> 405 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-matching-bookmark.png (renamed from image/stock_icons/14x14/x-filter-matching-bookmark.png) | bin | 233 -> 233 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-matching-bookmark.selected.png (renamed from image/stock_icons/14x14/x-filter-matching-bookmark.selected.png) | bin | 232 -> 232 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-matching-bookmark.selected.svg (renamed from image/stock_icons/14x14/x-filter-matching-bookmark.selected.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-matching-bookmark.selected@2x.png (renamed from image/stock_icons/14x14/x-filter-matching-bookmark.selected@2x.png) | bin | 402 -> 402 bytes | |||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-matching-bookmark.svg (renamed from image/stock_icons/14x14/x-filter-matching-bookmark.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/14x14/x-filter-matching-bookmark@2x.png (renamed from image/stock_icons/14x14/x-filter-matching-bookmark@2x.png) | bin | 380 -> 380 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/edit-find.template.png (renamed from image/stock_icons/16x16/edit-find.template.png) | bin | 427 -> 427 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/edit-find.template.svg (renamed from image/stock_icons/16x16/edit-find.template.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/edit-find.template@2x.png (renamed from image/stock_icons/16x16/edit-find.template@2x.png) | bin | 1192 -> 1192 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/go-first.png (renamed from image/stock_icons/16x16/go-first.png) | bin | 446 -> 446 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/go-first.svg (renamed from image/stock_icons/16x16/go-first.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/go-first@2x.png (renamed from image/stock_icons/16x16/go-first@2x.png) | bin | 822 -> 822 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/go-jump.png (renamed from image/stock_icons/16x16/go-jump.png) | bin | 458 -> 458 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/go-jump.svg (renamed from image/stock_icons/16x16/go-jump.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/go-jump@2x.png (renamed from image/stock_icons/16x16/go-jump@2x.png) | bin | 814 -> 814 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/go-last.png (renamed from image/stock_icons/16x16/go-last.png) | bin | 445 -> 445 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/go-last.svg (renamed from image/stock_icons/16x16/go-last.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/go-last@2x.png (renamed from image/stock_icons/16x16/go-last@2x.png) | bin | 819 -> 819 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/go-next.png (renamed from image/stock_icons/16x16/go-next.png) | bin | 428 -> 428 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/go-next.svg (renamed from image/stock_icons/16x16/go-next.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/go-next@2x.png (renamed from image/stock_icons/16x16/go-next@2x.png) | bin | 811 -> 811 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/go-previous.png (renamed from image/stock_icons/16x16/go-previous.png) | bin | 433 -> 433 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/go-previous.svg (renamed from image/stock_icons/16x16/go-previous.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/go-previous@2x.png (renamed from image/stock_icons/16x16/go-previous@2x.png) | bin | 811 -> 811 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-file-close.png (renamed from image/stock_icons/16x16/x-capture-file-close.png) | bin | 667 -> 667 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-file-close.svg (renamed from image/stock_icons/16x16/x-capture-file-close.svg) | 2 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-file-close@2x.png (renamed from image/stock_icons/16x16/x-capture-file-close@2x.png) | bin | 1556 -> 1556 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-file-close@2x.svg (renamed from image/stock_icons/16x16/x-capture-file-close@2x.svg) | 2 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-file-reload.png (renamed from image/stock_icons/16x16/x-capture-file-reload.png) | bin | 674 -> 674 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-file-reload.svg (renamed from image/stock_icons/16x16/x-capture-file-reload.svg) | 2 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-file-reload@2x.png (renamed from image/stock_icons/16x16/x-capture-file-reload@2x.png) | bin | 1583 -> 1583 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-file-reload@2x.svg (renamed from image/stock_icons/16x16/x-capture-file-reload@2x.svg) | 2 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-file-save.png (renamed from image/stock_icons/16x16/x-capture-file-save.png) | bin | 645 -> 645 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-file-save.svg (renamed from image/stock_icons/16x16/x-capture-file-save.svg) | 2 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-file-save@2x.png (renamed from image/stock_icons/16x16/x-capture-file-save@2x.png) | bin | 1589 -> 1589 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-file-save@2x.svg (renamed from image/stock_icons/16x16/x-capture-file-save@2x.svg) | 2 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-options-gear.svg (renamed from image/stock_icons/16x16/x-capture-options-gear.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-options-wrench.svg (renamed from image/stock_icons/16x16/x-capture-options-wrench.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-options.png (renamed from image/stock_icons/16x16/x-capture-options.png) | bin | 470 -> 470 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-options@2x.png (renamed from image/stock_icons/16x16/x-capture-options@2x.png) | bin | 1227 -> 1227 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-restart-fin.svg (renamed from image/stock_icons/16x16/x-capture-restart-fin.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-restart-triangle1.svg (renamed from image/stock_icons/16x16/x-capture-restart-triangle1.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-restart-triangle2.svg (renamed from image/stock_icons/16x16/x-capture-restart-triangle2.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-restart-turn1.svg (renamed from image/stock_icons/16x16/x-capture-restart-turn1.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-restart-turn2.svg (renamed from image/stock_icons/16x16/x-capture-restart-turn2.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-restart.png (renamed from image/stock_icons/16x16/x-capture-restart.png) | bin | 651 -> 651 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-restart@2x.png (renamed from image/stock_icons/16x16/x-capture-restart@2x.png) | bin | 1393 -> 1393 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-start.on.png (renamed from image/stock_icons/16x16/x-capture-start.on.png) | bin | 540 -> 540 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-start.on.svg (renamed from image/stock_icons/16x16/x-capture-start.on.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-start.on@2x.png (renamed from image/stock_icons/16x16/x-capture-start.on@2x.png) | bin | 1144 -> 1144 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-start.png (renamed from image/stock_icons/16x16/x-capture-start.png) | bin | 655 -> 655 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-start.svg (renamed from image/stock_icons/16x16/x-capture-start.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-start@2x.png (renamed from image/stock_icons/16x16/x-capture-start@2x.png) | bin | 1471 -> 1471 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-stop-red.svg (renamed from image/stock_icons/16x16/x-capture-stop-red.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-stop-white.svg (renamed from image/stock_icons/16x16/x-capture-stop-white.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-stop.png (renamed from image/stock_icons/16x16/x-capture-stop.png) | bin | 137 -> 137 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-capture-stop@2x.png (renamed from image/stock_icons/16x16/x-capture-stop@2x.png) | bin | 161 -> 161 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-colorize-packets.png (renamed from image/stock_icons/16x16/x-colorize-packets.png) | bin | 157 -> 157 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-colorize-packets.svg (renamed from image/stock_icons/16x16/x-colorize-packets.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-colorize-packets@2x.png (renamed from image/stock_icons/16x16/x-colorize-packets@2x.png) | bin | 163 -> 163 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-resize-columns.png (renamed from image/stock_icons/16x16/x-resize-columns.png) | bin | 343 -> 343 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-resize-columns.svg (renamed from image/stock_icons/16x16/x-resize-columns.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-resize-columns@2x.png (renamed from image/stock_icons/16x16/x-resize-columns@2x.png) | bin | 512 -> 512 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-stay-last.png (renamed from image/stock_icons/16x16/x-stay-last.png) | bin | 226 -> 226 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/x-stay-last.svg (renamed from image/stock_icons/16x16/x-stay-last.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/x-stay-last@2x.png (renamed from image/stock_icons/16x16/x-stay-last@2x.png) | bin | 303 -> 303 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/zoom-in.template.png (renamed from image/stock_icons/16x16/zoom-in.template.png) | bin | 442 -> 442 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/zoom-in.template.svg (renamed from image/stock_icons/16x16/zoom-in.template.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/zoom-in.template@2x.png (renamed from image/stock_icons/16x16/zoom-in.template@2x.png) | bin | 811 -> 811 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/zoom-original.template.png (renamed from image/stock_icons/16x16/zoom-original.template.png) | bin | 447 -> 447 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/zoom-original.template.svg (renamed from image/stock_icons/16x16/zoom-original.template.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/zoom-original.template@2x.png (renamed from image/stock_icons/16x16/zoom-original.template@2x.png) | bin | 805 -> 805 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/zoom-out.template.png (renamed from image/stock_icons/16x16/zoom-out.template.png) | bin | 440 -> 440 bytes | |||
| -rw-r--r-- | resources/stock_icons/16x16/zoom-out.template.svg (renamed from image/stock_icons/16x16/zoom-out.template.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/16x16/zoom-out.template@2x.png (renamed from image/stock_icons/16x16/zoom-out.template@2x.png) | bin | 778 -> 778 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x14/x-filter-apply.active.png (renamed from image/stock_icons/24x14/x-filter-apply.active.png) | bin | 381 -> 381 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x14/x-filter-apply.active.svg (renamed from image/stock_icons/24x14/x-filter-apply.active.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x14/x-filter-apply.active@2x.png (renamed from image/stock_icons/24x14/x-filter-apply.active@2x.png) | bin | 621 -> 621 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x14/x-filter-apply.png (renamed from image/stock_icons/24x14/x-filter-apply.png) | bin | 357 -> 357 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x14/x-filter-apply.selected.png (renamed from image/stock_icons/24x14/x-filter-apply.selected.png) | bin | 388 -> 388 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x14/x-filter-apply.selected.svg (renamed from image/stock_icons/24x14/x-filter-apply.selected.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x14/x-filter-apply.selected@2x.png (renamed from image/stock_icons/24x14/x-filter-apply.selected@2x.png) | bin | 636 -> 636 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x14/x-filter-apply.svg (renamed from image/stock_icons/24x14/x-filter-apply.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x14/x-filter-apply@2x.png (renamed from image/stock_icons/24x14/x-filter-apply@2x.png) | bin | 574 -> 574 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/edit-find.template.png (renamed from image/stock_icons/24x24/edit-find.template.png) | bin | 544 -> 544 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/edit-find.template.svg (renamed from image/stock_icons/24x24/edit-find.template.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/edit-find.template@2x.png (renamed from image/stock_icons/24x24/edit-find.template@2x.png) | bin | 1177 -> 1177 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/go-first.png (renamed from image/stock_icons/24x24/go-first.png) | bin | 547 -> 547 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/go-first.svg (renamed from image/stock_icons/24x24/go-first.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/go-first@2x.png (renamed from image/stock_icons/24x24/go-first@2x.png) | bin | 1058 -> 1058 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/go-jump.png (renamed from image/stock_icons/24x24/go-jump.png) | bin | 594 -> 594 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/go-jump.svg (renamed from image/stock_icons/24x24/go-jump.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/go-jump@2x.png (renamed from image/stock_icons/24x24/go-jump@2x.png) | bin | 1081 -> 1081 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/go-last.png (renamed from image/stock_icons/24x24/go-last.png) | bin | 535 -> 535 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/go-last.svg (renamed from image/stock_icons/24x24/go-last.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/go-last@2x.png (renamed from image/stock_icons/24x24/go-last@2x.png) | bin | 1029 -> 1029 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/go-next.png (renamed from image/stock_icons/24x24/go-next.png) | bin | 740 -> 740 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/go-next.svg (renamed from image/stock_icons/24x24/go-next.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/go-next@2x.png (renamed from image/stock_icons/24x24/go-next@2x.png) | bin | 1344 -> 1344 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/go-previous.png (renamed from image/stock_icons/24x24/go-previous.png) | bin | 743 -> 743 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/go-previous.svg (renamed from image/stock_icons/24x24/go-previous.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/go-previous@2x.png (renamed from image/stock_icons/24x24/go-previous@2x.png) | bin | 1389 -> 1389 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-file-close.png (renamed from image/stock_icons/24x24/x-capture-file-close.png) | bin | 1248 -> 1248 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-file-close.svg (renamed from image/stock_icons/24x24/x-capture-file-close.svg) | 2 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-file-close@2x.png (renamed from image/stock_icons/24x24/x-capture-file-close@2x.png) | bin | 2690 -> 2690 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-file-close@2x.svg (renamed from image/stock_icons/24x24/x-capture-file-close@2x.svg) | 2 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-file-reload.png (renamed from image/stock_icons/24x24/x-capture-file-reload.png) | bin | 1284 -> 1284 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-file-reload.svg (renamed from image/stock_icons/24x24/x-capture-file-reload.svg) | 2 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-file-reload@2x.png (renamed from image/stock_icons/24x24/x-capture-file-reload@2x.png) | bin | 2898 -> 2898 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-file-reload@2x.svg (renamed from image/stock_icons/24x24/x-capture-file-reload@2x.svg) | 2 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-file-save.png (renamed from image/stock_icons/24x24/x-capture-file-save.png) | bin | 1186 -> 1186 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-file-save.svg (renamed from image/stock_icons/24x24/x-capture-file-save.svg) | 2 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-file-save@2x.png (renamed from image/stock_icons/24x24/x-capture-file-save@2x.png) | bin | 2566 -> 2566 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-file-save@2x.svg (renamed from image/stock_icons/24x24/x-capture-file-save@2x.svg) | 2 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-options-gear.svg (renamed from image/stock_icons/24x24/x-capture-options-gear.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-options-wrench.svg (renamed from image/stock_icons/24x24/x-capture-options-wrench.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-options.png (renamed from image/stock_icons/24x24/x-capture-options.png) | bin | 848 -> 848 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-options@2x.png (renamed from image/stock_icons/24x24/x-capture-options@2x.png) | bin | 1631 -> 1631 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-restart-fin.svg (renamed from image/stock_icons/24x24/x-capture-restart-fin.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-restart-triangle1.svg (renamed from image/stock_icons/24x24/x-capture-restart-triangle1.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-restart-triangle2.svg (renamed from image/stock_icons/24x24/x-capture-restart-triangle2.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-restart-turn1.svg (renamed from image/stock_icons/24x24/x-capture-restart-turn1.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-restart-turn2.svg (renamed from image/stock_icons/24x24/x-capture-restart-turn2.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-restart.png (renamed from image/stock_icons/24x24/x-capture-restart.png) | bin | 1129 -> 1129 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-restart@2x.png (renamed from image/stock_icons/24x24/x-capture-restart@2x.png) | bin | 2086 -> 2086 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-start.on.png (renamed from image/stock_icons/24x24/x-capture-start.on.png) | bin | 934 -> 934 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-start.on.svg (renamed from image/stock_icons/24x24/x-capture-start.on.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-start.on@2x.png (renamed from image/stock_icons/24x24/x-capture-start.on@2x.png) | bin | 1669 -> 1669 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-start.png (renamed from image/stock_icons/24x24/x-capture-start.png) | bin | 995 -> 995 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-start.svg (renamed from image/stock_icons/24x24/x-capture-start.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-start@2x.png (renamed from image/stock_icons/24x24/x-capture-start@2x.png) | bin | 2019 -> 2019 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-stop-red.svg (renamed from image/stock_icons/24x24/x-capture-stop-red.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-stop-white.svg (renamed from image/stock_icons/24x24/x-capture-stop-white.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-stop.png (renamed from image/stock_icons/24x24/x-capture-stop.png) | bin | 148 -> 148 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-capture-stop@2x.png (renamed from image/stock_icons/24x24/x-capture-stop@2x.png) | bin | 166 -> 166 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-colorize-packets.png (renamed from image/stock_icons/24x24/x-colorize-packets.png) | bin | 157 -> 157 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-colorize-packets.svg (renamed from image/stock_icons/24x24/x-colorize-packets.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-colorize-packets@2x.png (renamed from image/stock_icons/24x24/x-colorize-packets@2x.png) | bin | 170 -> 170 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-resize-columns-motion.svg (renamed from image/stock_icons/24x24/x-resize-columns-motion.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-resize-columns.png (renamed from image/stock_icons/24x24/x-resize-columns.png) | bin | 299 -> 299 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-resize-columns.svg (renamed from image/stock_icons/24x24/x-resize-columns.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-resize-columns@2x.png (renamed from image/stock_icons/24x24/x-resize-columns@2x.png) | bin | 477 -> 477 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-stay-last.png (renamed from image/stock_icons/24x24/x-stay-last.png) | bin | 238 -> 238 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/x-stay-last.svg (renamed from image/stock_icons/24x24/x-stay-last.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/x-stay-last@2x.png (renamed from image/stock_icons/24x24/x-stay-last@2x.png) | bin | 332 -> 332 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/zoom-in.template.png (renamed from image/stock_icons/24x24/zoom-in.template.png) | bin | 572 -> 572 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/zoom-in.template.svg (renamed from image/stock_icons/24x24/zoom-in.template.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/zoom-in.template@2x.png (renamed from image/stock_icons/24x24/zoom-in.template@2x.png) | bin | 1208 -> 1208 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/zoom-original.svg (renamed from image/stock_icons/24x24/zoom-original.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/zoom-original.template.png (renamed from image/stock_icons/24x24/zoom-original.template.png) | bin | 567 -> 567 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/zoom-original.template.svg (renamed from image/stock_icons/24x24/zoom-original.template.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/zoom-original.template@2x.png (renamed from image/stock_icons/24x24/zoom-original.template@2x.png) | bin | 1182 -> 1182 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/zoom-out.svg (renamed from image/stock_icons/24x24/zoom-out.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/zoom-out.template.png (renamed from image/stock_icons/24x24/zoom-out.template.png) | bin | 554 -> 554 bytes | |||
| -rw-r--r-- | resources/stock_icons/24x24/zoom-out.template.svg (renamed from image/stock_icons/24x24/zoom-out.template.svg) | 0 | ||||
| -rw-r--r-- | resources/stock_icons/24x24/zoom-out.template@2x.png (renamed from image/stock_icons/24x24/zoom-out.template@2x.png) | bin | 1184 -> 1184 bytes | |||
| -rw-r--r-- | resources/stock_icons/8x8/list-add.template.png (renamed from image/stock_icons/8x8/list-add.template.png) | bin | 81 -> 81 bytes | |||
| -rw-r--r-- | resources/stock_icons/8x8/list-clear.template.png (renamed from image/stock_icons/8x8/list-clear.template.png) | bin | 378 -> 378 bytes | |||
| -rw-r--r-- | resources/stock_icons/8x8/list-clear.template@2x.png (renamed from image/stock_icons/8x8/list-clear.template@2x.png) | bin | 660 -> 660 bytes | |||
| -rw-r--r-- | resources/stock_icons/8x8/list-copy.template.png (renamed from image/stock_icons/8x8/list-copy.template.png) | bin | 147 -> 147 bytes | |||
| -rw-r--r-- | resources/stock_icons/8x8/list-copy.template.xcf (renamed from image/stock_icons/8x8/list-copy.template.xcf) | bin | 667 -> 667 bytes | |||
| -rw-r--r-- | resources/stock_icons/8x8/list-move-down.template.png (renamed from image/stock_icons/8x8/list-move-down.template.png) | bin | 294 -> 294 bytes | |||
| -rw-r--r-- | resources/stock_icons/8x8/list-move-down.template@2x.png (renamed from image/stock_icons/8x8/list-move-down.template@2x.png) | bin | 445 -> 445 bytes | |||
| -rw-r--r-- | resources/stock_icons/8x8/list-move-up.template.png (renamed from image/stock_icons/8x8/list-move-up.template.png) | bin | 294 -> 294 bytes | |||
| -rw-r--r-- | resources/stock_icons/8x8/list-move-up.template@2x.png (renamed from image/stock_icons/8x8/list-move-up.template@2x.png) | bin | 412 -> 412 bytes | |||
| -rw-r--r-- | resources/stock_icons/8x8/list-remove.template.png (renamed from image/stock_icons/8x8/list-remove.template.png) | bin | 74 -> 74 bytes | |||
| -rwxr-xr-x | resources/stock_icons/svg-to-png.sh (renamed from image/stock_icons/svg-to-png.sh) | 0 | ||||
| -rw-r--r-- | resources/tshark.rc.in (renamed from image/tshark.rc.in) | 0 | ||||
| -rw-r--r-- | resources/wireshark.exe.manifest.in (renamed from image/wireshark.exe.manifest.in) | 0 | ||||
| -rw-r--r-- | resources/wireshark.rc.in (renamed from image/wireshark.rc.in) | 0 | ||||
| -rw-r--r-- | resources/wsicon.qrc | 22 | ||||
| -rw-r--r-- | resources/wslogo-dev.svg (renamed from image/wslogo-dev.svg) | 0 | ||||
| -rw-r--r-- | resources/wslogo.eps (renamed from image/wslogo.eps) | 0 | ||||
| -rw-r--r-- | resources/wslogo.svg (renamed from image/wslogo.svg) | 0 | ||||
| -rw-r--r-- | resources/wssplash.png (renamed from image/wssplash.png) | bin | 11125 -> 11125 bytes | |||
| -rw-r--r-- | resources/wssplash_dev.png (renamed from image/wssplash_dev.png) | bin | 13448 -> 13448 bytes | |||
| -rw-r--r-- | tools/pre-commit-ignore.conf | 2 | ||||
| -rw-r--r-- | ui/qt/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | ui/qt/about_dialog.ui | 4 | ||||
| -rw-r--r-- | ui/qt/layout_preferences_frame.ui | 14 | ||||
| -rw-r--r-- | ui/qt/main_window.ui | 8 | ||||
| -rw-r--r-- | wiretap/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | wsutil/CMakeLists.txt | 2 |
327 files changed, 90 insertions, 90 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 31b98f03b2..665610a9fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -490,7 +490,7 @@ if(WIN32) # Make sure everyone is using the same API and that it's sufficient # for our needs. # This should match the following: - # - The <compatibility><application> section in image\wireshark.exe.manifest.in + # - The <compatibility><application> section in resources\wireshark.exe.manifest.in # - The GetWindowsVersion parts of packaging\nsis\wireshark.nsi # - The VersionNT parts of packaging\wix\Prerequisites.wxi # @@ -1695,18 +1695,18 @@ set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set(CFG_OUT_FILES doxygen.cfg - image/dumpcap.rc - image/libwireshark.rc - image/libwiretap.rc - image/libwsutil.rc - image/wireshark.exe.manifest - image/wireshark.rc packaging/macosx/Info.plist packaging/macosx/osx-app.sh packaging/macosx/osx-dmg.sh packaging/macosx/wireshark-app.dmgbuild packaging/macosx/wireshark-dsym.dmgbuild packaging/source/git-export-release.sh + resources/dumpcap.rc + resources/libwireshark.rc + resources/libwiretap.rc + resources/libwsutil.rc + resources/wireshark.exe.manifest + resources/wireshark.rc wireshark.pc ) foreach( _cfg_file ${CFG_OUT_FILES} ) @@ -1858,7 +1858,7 @@ if(WIN32) ui/win32/file_dlg_win32.cpp ) set(PLATFORM_UI_RC_FILES - image/file_dlg_win32.rc + resources/file_dlg_win32.rc ) elseif(APPLE) set(PLATFORM_UI_SRC @@ -3467,14 +3467,14 @@ if((BUILD_wireshark AND QT_FOUND) AND NOT (WIN32 OR APPLE)) DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") endif() foreach(size 16 24 32 48 64 128 256) - install(FILES image/wsicon${size}.png + install(FILES resources/icons/wsicon${size}.png DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${size}x${size}/apps" RENAME org.wireshark.Wireshark.png) - install(FILES image/WiresharkDoc-${size}.png + install(FILES resources/icons/WiresharkDoc-${size}.png DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${size}x${size}/mimetypes" RENAME org.wireshark.Wireshark-mimetype.png) endforeach() - install(FILES image/wsicon.svg + install(FILES resources/icons/wsicon.svg DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME org.wireshark.Wireshark.svg) endif() @@ -3736,7 +3736,7 @@ if(SHELLCHECK_EXECUTABLE) # added support for that. add_custom_command(TARGET shellcheck POST_BUILD COMMAND shellcheck --external-sources - image/stock_icons/svg-to-png.sh + resources/stock_icons/svg-to-png.sh packaging/appimage/AppRun "packaging/macosx/ChmodBPF/root/Library/Application Support/Wireshark/ChmodBPF/ChmodBPF" packaging/macosx/osx-app.sh.in diff --git a/cmake/modules/UseExecutableResources.cmake b/cmake/modules/UseExecutableResources.cmake index edb80d62e9..8eeb4a790e 100644 --- a/cmake/modules/UseExecutableResources.cmake +++ b/cmake/modules/UseExecutableResources.cmake @@ -14,13 +14,13 @@ function(set_executable_resources EXE_NAME PROGRAM_NAME) # Use the original Wireshark / TShark .rc copyright. set(COPYRIGHT_INFO "2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and many others") endif() - set(${EXE_NAME}_FILES ${${EXE_NAME}_FILES} ${CMAKE_BINARY_DIR}/image/${EXE_NAME}.rc PARENT_SCOPE) + set(${EXE_NAME}_FILES ${${EXE_NAME}_FILES} ${CMAKE_BINARY_DIR}/resources/${EXE_NAME}.rc PARENT_SCOPE) if (EXE_RC_UNIQUE_RC) set (_in_file ${EXE_NAME}) else() set (_in_file "cli_template") endif() - set(ICON_PATH "${CMAKE_SOURCE_DIR}/image/") - configure_file( ${CMAKE_SOURCE_DIR}/image/${_in_file}.rc.in ${CMAKE_BINARY_DIR}/image/${EXE_NAME}.rc @ONLY ) + set(ICON_PATH "${CMAKE_SOURCE_DIR}/resources/icons/") + configure_file( ${CMAKE_SOURCE_DIR}/resources/${_in_file}.rc.in ${CMAKE_BINARY_DIR}/resources/${EXE_NAME}.rc @ONLY ) endif() endfunction() diff --git a/docbook/wsdg_src/WSDG_chapter_userinterface.adoc b/docbook/wsdg_src/WSDG_chapter_userinterface.adoc index 5b5ef89ad1..072e776c60 100644 --- a/docbook/wsdg_src/WSDG_chapter_userinterface.adoc +++ b/docbook/wsdg_src/WSDG_chapter_userinterface.adoc @@ -103,7 +103,7 @@ open when the capture file closes. ===== Names The code in _ui/qt_ directory uses three APIs: Qt (which uses upper camel case), GLib (which uses snake_case), and the Wireshark -API (which also uses snake_case). +API (which also uses snake_case). As a general rule, for names, Wireshark’s Qt code: @@ -201,7 +201,7 @@ Qt makes translating the Wireshark UI into different languages easy. To add a ne translation, do the following: - Add your translation (_ui/qt/wireshark_XX.ts_) to _ui/qt/CMakeLists.txt_ -- (Recommended) Add a flag image for your language in _image/languages/XX.svg_. Update _image/languages/languages.qrc_ accordingly. +- (Recommended) Add a flag image for your language in _resources/languages/XX.svg_. Update _resources/languages/languages.qrc_ accordingly. - Run `lupdate ui/qt -ts ui/qt/wireshark_XX.ts` to generate/update your translation file. - Add ui/qt/wireshark_XX.ts to `.tx/config`. - Translate with Qt Linguist: `linguist ui/qt/wireshark_XX.ts`. @@ -261,7 +261,7 @@ includes proper dark theme support by doing the following: * You can use a macOS-style template icon by creating a monochrome SVG document with “.template” appended to the name, e.g. -`image/stock_icons/24x24/edit-find.template.svg`. +`resources/stock_icons/24x24/edit-find.template.svg`. * Qt draws unvisited links *Qt::blue* no matter what. You can work around this by using `ColorUtils::themeLinkBrush()` and `ColorUtils::themeLinkStyle()`. @@ -274,7 +274,7 @@ The main window has many QActions which are shared with child widgets. See _ui/qt/proto_tree.cpp_ for an example of this. To demonstrate the functionality of the plugin interface options, a -demonstration plugin exists (pluginifdemo). See _doc/README.plugins_ and +demonstration plugin exists (pluginifdemo). See _doc/README.plugins_ and _plugins/epan/pluginifdemo_. https://www.kdab.com/development-resources/qt-tools/gammaray/[GammaRay] lets you inspect diff --git a/doxygen.cfg.in b/doxygen.cfg.in index 9159c2b037..0027078c43 100644 --- a/doxygen.cfg.in +++ b/doxygen.cfg.in @@ -51,7 +51,7 @@ PROJECT_BRIEF = "The Wireshark network protocol analyzer" # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # the logo to the output directory. -PROJECT_LOGO = @DOXYGEN_INPUT_DIRECTORY@/image/wsicon48.png +PROJECT_LOGO = @DOXYGEN_INPUT_DIRECTORY@/resources/icons/wsicon48.png # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index bcad89506d..3c7c7d5aaa 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -302,7 +302,7 @@ add_library(epan $<TARGET_OBJECTS:dissector-registration> $<TARGET_OBJECTS:ftypes> $<$<BOOL:${LUA_FOUND}>:$<TARGET_OBJECTS:wslua>> - ${CMAKE_BINARY_DIR}/image/libwireshark.rc + ${CMAKE_BINARY_DIR}/resources/libwireshark.rc ) set_target_properties(epan PROPERTIES diff --git a/image/wsicon.qrc b/image/wsicon.qrc deleted file mode 100644 index 1e833e72ab..0000000000 --- a/image/wsicon.qrc +++ /dev/null @@ -1,22 +0,0 @@ -<RCC> - <qresource prefix="/wsicon"> - <file>wsiconcap16.png</file> - <file>wsiconcap24.png</file> - <file>wsiconcap32.png</file> - <file>wsiconcap48.png</file> - <file>wsiconcap64.png</file> - <file>wsiconcap128.png</file> - <file>wsiconcap256.png</file> - <file>wsiconcap512.png</file> - <file>wsiconcap1024.png</file> - <file>wsicon16.png</file> - <file>wsicon24.png</file> - <file>wsicon32.png</file> - <file>wsicon48.png</file> - <file>wsicon64.png</file> - <file>wsicon128.png</file> - <file>wsicon256.png</file> - <file>wsicon512.png</file> - <file>wsicon1024.png</file> - </qresource> -</RCC> diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index 05cb970dad..740161aa1f 100644 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -18,11 +18,11 @@ InstType "un.Default (keep Personal Settings and Npcap)" InstType "un.All (remove all)" ; Uninstaller icon -UninstallIcon "..\..\image\wiresharkinst.ico" +UninstallIcon "..\..\resources\wiresharkinst.ico" !include "MUI.nsh" -!define MUI_UNICON "..\..\image\wiresharkinst.ico" +!define MUI_UNICON "..\..\resources\wiresharkinst.ico" ; Uninstall stuff (NSIS 2.08: "\r\n" don't work here) !define MUI_UNCONFIRMPAGE_TEXT_TOP "The following ${PROGRAM_NAME} installation will be removed. Click 'Next' to continue." diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index f27c8d519a..3da2f93a3c 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -40,7 +40,7 @@ ${StrRep} ; The file to write OutFile "${OUTFILE_DIR}\${PROGRAM_NAME}-${WIRESHARK_TARGET_PLATFORM}-${VERSION}.exe" ; Installer icon -Icon "${TOP_SRC_DIR}\image\wiresharkinst.ico" +Icon "${TOP_SRC_DIR}\resources\wiresharkinst.ico" ; ============================================================================ ; Modern UI @@ -55,7 +55,7 @@ Icon "${TOP_SRC_DIR}\image\wiresharkinst.ico" !include "InstallOptions.nsh" ;!addplugindir ".\Plugins" -!define MUI_ICON "${TOP_SRC_DIR}\image\wiresharkinst.ico" +!define MUI_ICON "${TOP_SRC_DIR}\resources\wiresharkinst.ico" BrandingText "Wireshark${U+00ae} Installer" !define MUI_COMPONENTSPAGE_SMALLDESC diff --git a/packaging/portableapps/CMakeLists.txt b/packaging/portableapps/CMakeLists.txt index 92c87534f7..f2e0522789 100644 --- a/packaging/portableapps/CMakeLists.txt +++ b/packaging/portableapps/CMakeLists.txt @@ -116,10 +116,10 @@ macro( ADD_PORTABLEAPPS_PACKAGE_TARGET ) ${_portableapps_launcher_ini} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/packaging/portableapps/help.html ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/help.html COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/packaging/portableapps/help.html ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/help.html - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/image/wireshark.ico ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/AppInfo/appicon.ico - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/image/wsicon16.png ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/AppInfo/appicon_16.png - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/image/wsicon32.png ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/AppInfo/appicon_32.png - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/image/wsicon128.png ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/AppInfo/appicon_128.png + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/resources/icons/wireshark.ico ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/AppInfo/appicon.ico + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/resources/icons/wsicon16.png ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/AppInfo/appicon_16.png + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/resources/icons/wsicon32.png ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/AppInfo/appicon_32.png + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/resources/icons/wsicon128.png ${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/AppInfo/appicon_128.png COMMAND ${PORTABLEAPPS_LAUNCHER_GENERATOR_EXECUTABLE} ${_portableapps_native} ) diff --git a/image/README.adoc b/resources/README.adoc index 7a2cbcab85..d481d6e06a 100644 --- a/image/README.adoc +++ b/resources/README.adoc @@ -1,9 +1,9 @@ = Introduction -This directory contains a set of images and icons for the Wireshark -suite of applications. Of particular note for people creating packages -for distribution are the files wireshark.ico, wiresharkdoc.ico, -wsicon*.png, and WiresharkDoc-*.png +This directory contains a set of resources for the Wireshark suite of +applications. Of particular note for people creating packages for +distribution are the files wireshark.ico, wiresharkdoc.ico, wsicon*.png, +and WiresharkDoc-*.png in the icons directory. File descriptions: diff --git a/image/about.qrc b/resources/about.qrc index 86ce08e198..86ce08e198 100644 --- a/image/about.qrc +++ b/resources/about.qrc diff --git a/image/cli_template.rc.in b/resources/cli_template.rc.in index 9fbd343580..9fbd343580 100644 --- a/image/cli_template.rc.in +++ b/resources/cli_template.rc.in diff --git a/image/dumpcap.rc.in b/resources/dumpcap.rc.in index 37eb6fd8d4..37eb6fd8d4 100644 --- a/image/dumpcap.rc.in +++ b/resources/dumpcap.rc.in diff --git a/image/file_dlg_win32.rc b/resources/file_dlg_win32.rc index f674aef02c..f674aef02c 100644 --- a/image/file_dlg_win32.rc +++ b/resources/file_dlg_win32.rc diff --git a/image/WiresharkDoc-128.png b/resources/icons/WiresharkDoc-128.png Binary files differindex 95532248b1..95532248b1 100644 --- a/image/WiresharkDoc-128.png +++ b/resources/icons/WiresharkDoc-128.png diff --git a/image/WiresharkDoc-16.png b/resources/icons/WiresharkDoc-16.png Binary files differindex 5ba74ca1f8..5ba74ca1f8 100644 --- a/image/WiresharkDoc-16.png +++ b/resources/icons/WiresharkDoc-16.png diff --git a/image/WiresharkDoc-24.png b/resources/icons/WiresharkDoc-24.png Binary files differindex e9f5914aff..e9f5914aff 100644 --- a/image/WiresharkDoc-24.png +++ b/resources/icons/WiresharkDoc-24.png diff --git a/image/WiresharkDoc-256.png b/resources/icons/WiresharkDoc-256.png Binary files differindex 6e6a43ecac..6e6a43ecac 100644 --- a/image/WiresharkDoc-256.png +++ b/resources/icons/WiresharkDoc-256.png diff --git a/image/WiresharkDoc-32.png b/resources/icons/WiresharkDoc-32.png Binary files differindex 878d59117d..878d59117d 100644 --- a/image/WiresharkDoc-32.png +++ b/resources/icons/WiresharkDoc-32.png diff --git a/image/WiresharkDoc-48.png b/resources/icons/WiresharkDoc-48.png Binary files differindex c35698f78b..c35698f78b 100644 --- a/image/WiresharkDoc-48.png +++ b/resources/icons/WiresharkDoc-48.png diff --git a/image/WiresharkDoc-64.png b/resources/icons/WiresharkDoc-64.png Binary files differindex c481af7bf1..c481af7bf1 100644 --- a/image/WiresharkDoc-64.png +++ b/resources/icons/WiresharkDoc-64.png diff --git a/image/wireshark.ico b/resources/icons/wireshark.ico Binary files differindex 4ee4f9b93f..4ee4f9b93f 100644 --- a/image/wireshark.ico +++ b/resources/icons/wireshark.ico diff --git a/image/wiresharkcapture.ico b/resources/icons/wiresharkcapture.ico Binary files differindex f0a7412037..f0a7412037 100644 --- a/image/wiresharkcapture.ico +++ b/resources/icons/wiresharkcapture.ico diff --git a/image/wiresharkdoc.ico b/resources/icons/wiresharkdoc.ico Binary files differindex 8bc4df404d..8bc4df404d 100644 --- a/image/wiresharkdoc.ico +++ b/resources/icons/wiresharkdoc.ico diff --git a/image/wiresharkinst.ico b/resources/icons/wiresharkinst.ico Binary files differindex 9c18c7b18f..9c18c7b18f 100644 --- a/image/wiresharkinst.ico +++ b/resources/icons/wiresharkinst.ico diff --git a/image/wsicon-ask.png b/resources/icons/wsicon-ask.png Binary files differindex 0380445a58..0380445a58 100644 --- a/image/wsicon-ask.png +++ b/resources/icons/wsicon-ask.png diff --git a/image/wsicon-ask.svg b/resources/icons/wsicon-ask.svg index 6b80c44ffe..6b80c44ffe 100644 --- a/image/wsicon-ask.svg +++ b/resources/icons/wsicon-ask.svg diff --git a/image/wsicon.svg b/resources/icons/wsicon.svg index 53b01b061f..53b01b061f 100644 --- a/image/wsicon.svg +++ b/resources/icons/wsicon.svg diff --git a/image/wsicon1024.png b/resources/icons/wsicon1024.png Binary files differindex 61e2f36fc8..61e2f36fc8 100644 --- a/image/wsicon1024.png +++ b/resources/icons/wsicon1024.png diff --git a/image/wsicon128.png b/resources/icons/wsicon128.png Binary files differindex ad15e997ad..ad15e997ad 100644 --- a/image/wsicon128.png +++ b/resources/icons/wsicon128.png diff --git a/image/wsicon16.png b/resources/icons/wsicon16.png Binary files differindex 7d52cc891e..7d52cc891e 100644 --- a/image/wsicon16.png +++ b/resources/icons/wsicon16.png diff --git a/image/wsicon24.png b/resources/icons/wsicon24.png Binary files differindex 16a4031465..16a4031465 100644 --- a/image/wsicon24.png +++ b/resources/icons/wsicon24.png diff --git a/image/wsicon256.png b/resources/icons/wsicon256.png Binary files differindex f79c4a60bb..f79c4a60bb 100644 --- a/image/wsicon256.png +++ b/resources/icons/wsicon256.png diff --git a/image/wsicon32.png b/resources/icons/wsicon32.png Binary files differindex d0d8a5e029..d0d8a5e029 100644 --- a/image/wsicon32.png +++ b/resources/icons/wsicon32.png diff --git a/image/wsicon48.png b/resources/icons/wsicon48.png Binary files differindex 2979b71e4e..2979b71e4e 100644 --- a/image/wsicon48.png +++ b/resources/icons/wsicon48.png diff --git a/image/wsicon512.png b/resources/icons/wsicon512.png Binary files differindex e9a399ade3..e9a399ade3 100644 --- a/image/wsicon512.png +++ b/resources/icons/wsicon512.png diff --git a/image/wsicon64.png b/resources/icons/wsicon64.png Binary files differindex e49e1d27d5..e49e1d27d5 100644 --- a/image/wsicon64.png +++ b/resources/icons/wsicon64.png diff --git a/image/wsiconcap.svg b/resources/icons/wsiconcap.svg index 38c745eeec..38c745eeec 100644 --- a/image/wsiconcap.svg +++ b/resources/icons/wsiconcap.svg diff --git a/image/wsiconcap1024.png b/resources/icons/wsiconcap1024.png Binary files differindex 4886ff91bf..4886ff91bf 100644 --- a/image/wsiconcap1024.png +++ b/resources/icons/wsiconcap1024.png diff --git a/image/wsiconcap128.png b/resources/icons/wsiconcap128.png Binary files differindex 930a63dce5..930a63dce5 100644 --- a/image/wsiconcap128.png +++ b/resources/icons/wsiconcap128.png diff --git a/image/wsiconcap16.png b/resources/icons/wsiconcap16.png Binary files differindex 8328a30d98..8328a30d98 100644 --- a/image/wsiconcap16.png +++ b/resources/icons/wsiconcap16.png diff --git a/image/wsiconcap24.png b/resources/icons/wsiconcap24.png Binary files differindex 9bc02f0c9d..9bc02f0c9d 100644 --- a/image/wsiconcap24.png +++ b/resources/icons/wsiconcap24.png diff --git a/image/wsiconcap256.png b/resources/icons/wsiconcap256.png Binary files differindex ca401cb54b..ca401cb54b 100644 --- a/image/wsiconcap256.png +++ b/resources/icons/wsiconcap256.png diff --git a/image/wsiconcap32.png b/resources/icons/wsiconcap32.png Binary files differindex c6cb02a0ff..c6cb02a0ff 100644 --- a/image/wsiconcap32.png +++ b/resources/icons/wsiconcap32.png diff --git a/image/wsiconcap48.png b/resources/icons/wsiconcap48.png Binary files differindex 11b399ec31..11b399ec31 100644 --- a/image/wsiconcap48.png +++ b/resources/icons/wsiconcap48.png diff --git a/image/wsiconcap512.png b/resources/icons/wsiconcap512.png Binary files differindex 39761fe618..39761fe618 100644 --- a/image/wsiconcap512.png +++ b/resources/icons/wsiconcap512.png diff --git a/image/wsiconcap64.png b/resources/icons/wsiconcap64.png Binary files differindex 4f3d743fa6..4f3d743fa6 100644 --- a/image/wsiconcap64.png +++ b/resources/icons/wsiconcap64.png diff --git a/image/wsiconinst.svg b/resources/icons/wsiconinst.svg index 1779af6434..1779af6434 100644 --- a/image/wsiconinst.svg +++ b/resources/icons/wsiconinst.svg diff --git a/image/wsiconinst1024.png b/resources/icons/wsiconinst1024.png Binary files differindex 2c70e5e9cb..2c70e5e9cb 100644 --- a/image/wsiconinst1024.png +++ b/resources/icons/wsiconinst1024.png diff --git a/image/wsiconinst128.png b/resources/icons/wsiconinst128.png Binary files differindex 266c1560f7..266c1560f7 100644 --- a/image/wsiconinst128.png +++ b/resources/icons/wsiconinst128.png diff --git a/image/wsiconinst16.png b/resources/icons/wsiconinst16.png Binary files differindex effb2747a2..effb2747a2 100644 --- a/image/wsiconinst16.png +++ b/resources/icons/wsiconinst16.png diff --git a/image/wsiconinst24.png b/resources/icons/wsiconinst24.png Binary files differindex 5df6744d56..5df6744d56 100644 --- a/image/wsiconinst24.png +++ b/resources/icons/wsiconinst24.png diff --git a/image/wsiconinst256.png b/resources/icons/wsiconinst256.png Binary files differindex fcceeba243..fcceeba243 100644 --- a/image/wsiconinst256.png +++ b/resources/icons/wsiconinst256.png diff --git a/image/wsiconinst32.png b/resources/icons/wsiconinst32.png Binary files differindex 024fbcf495..024fbcf495 100644 --- a/image/wsiconinst32.png +++ b/resources/icons/wsiconinst32.png diff --git a/image/wsiconinst48.png b/resources/icons/wsiconinst48.png Binary files differindex a060741c94..a060741c94 100644 --- a/image/wsiconinst48.png +++ b/resources/icons/wsiconinst48.png diff --git a/image/wsiconinst512.png b/resources/icons/wsiconinst512.png Binary files differindex 2c9aae904b..2c9aae904b 100644 --- a/image/wsiconinst512.png +++ b/resources/icons/wsiconinst512.png diff --git a/image/wsiconinst64.png b/resources/icons/wsiconinst64.png Binary files differindex 1ccad7c31c..1ccad7c31c 100644 --- a/image/wsiconinst64.png +++ b/resources/icons/wsiconinst64.png diff --git a/image/languages/de.svg b/resources/languages/de.svg index 21d26c1057..21d26c1057 100644 --- a/image/languages/de.svg +++ b/resources/languages/de.svg diff --git a/image/languages/en.svg b/resources/languages/en.svg index 36c9889743..36c9889743 100644 --- a/image/languages/en.svg +++ b/resources/languages/en.svg diff --git a/image/languages/es.svg b/resources/languages/es.svg index ec0808eb02..ec0808eb02 100644 --- a/image/languages/es.svg +++ b/resources/languages/es.svg diff --git a/image/languages/fr.svg b/resources/languages/fr.svg index a4bdfc9314..a4bdfc9314 100644 --- a/image/languages/fr.svg +++ b/resources/languages/fr.svg diff --git a/image/languages/it.svg b/resources/languages/it.svg index 3ac830a963..3ac830a963 100644 --- a/image/languages/it.svg +++ b/resources/languages/it.svg diff --git a/image/languages/ja_JP.svg b/resources/languages/ja_JP.svg index 31a29c7fdb..31a29c7fdb 100644 --- a/image/languages/ja_JP.svg +++ b/resources/languages/ja_JP.svg diff --git a/image/languages/languages.qrc b/resources/languages/languages.qrc index c8ce7f8c47..c8ce7f8c47 100644 --- a/image/languages/languages.qrc +++ b/resources/languages/languages.qrc diff --git a/image/languages/pl.svg b/resources/languages/pl.svg index 909cb7230f..909cb7230f 100644 --- a/image/languages/pl.svg +++ b/resources/languages/pl.svg diff --git a/image/languages/ru.svg b/resources/languages/ru.svg index 855b805a55..855b805a55 100644 --- a/image/languages/ru.svg +++ b/resources/languages/ru.svg diff --git a/image/languages/sv.svg b/resources/languages/sv.svg index 196a2a98b0..196a2a98b0 100644 --- a/image/languages/sv.svg +++ b/resources/languages/sv.svg diff --git a/image/languages/tr_TR.svg b/resources/languages/tr_TR.svg index 5a0a0ad7da..5a0a0ad7da 100644 --- a/image/languages/tr_TR.svg +++ b/resources/languages/tr_TR.svg diff --git a/image/languages/uk.svg b/resources/languages/uk.svg index d1b537e7c7..d1b537e7c7 100644 --- a/image/languages/uk.svg +++ b/resources/languages/uk.svg diff --git a/image/languages/zh_CN.svg b/resources/languages/zh_CN.svg index 287704c693..287704c693 100644 --- a/image/languages/zh_CN.svg +++ b/resources/languages/zh_CN.svg diff --git a/image/layout.qrc b/resources/layout.qrc index 7b45e7fc17..7b45e7fc17 100644 --- a/image/layout.qrc +++ b/resources/layout.qrc diff --git a/image/layout_1.png b/resources/layout_1.png Binary files differindex 312ed860dd..312ed860dd 100644 --- a/image/layout_1.png +++ b/resources/layout_1.png diff --git a/image/layout_1@2x.png b/resources/layout_1@2x.png Binary files differindex d656f7f317..d656f7f317 100644 --- a/image/layout_1@2x.png +++ b/resources/layout_1@2x.png diff --git a/image/layout_2.png b/resources/layout_2.png Binary files differindex 62560aff4d..62560aff4d 100644 --- a/image/layout_2.png +++ b/resources/layout_2.png diff --git a/image/layout_2@2x.png b/resources/layout_2@2x.png Binary files differindex c79cb6eb81..c79cb6eb81 100644 --- a/image/layout_2@2x.png +++ b/resources/layout_2@2x.png diff --git a/image/layout_3.png b/resources/layout_3.png Binary files differindex fd9eb10e89..fd9eb10e89 100644 --- a/image/layout_3.png +++ b/resources/layout_3.png diff --git a/image/layout_3@2x.png b/resources/layout_3@2x.png Binary files differindex 7fe2fb20a1..7fe2fb20a1 100644 --- a/image/layout_3@2x.png +++ b/resources/layout_3@2x.png diff --git a/image/layout_4.png b/resources/layout_4.png Binary files differindex 16a8ff71be..16a8ff71be 100644 --- a/image/layout_4.png +++ b/resources/layout_4.png diff --git a/image/layout_4@2x.png b/resources/layout_4@2x.png Binary files differindex 2fca6e7852..2fca6e7852 100644 --- a/image/layout_4@2x.png +++ b/resources/layout_4@2x.png diff --git a/image/layout_5.png b/resources/layout_5.png Binary files differindex 967f9f8553..967f9f8553 100644 --- a/image/layout_5.png +++ b/resources/layout_5.png diff --git a/image/layout_5@2x.png b/resources/layout_5@2x.png Binary files differindex fd151cad5c..fd151cad5c 100644 --- a/image/layout_5@2x.png +++ b/resources/layout_5@2x.png diff --git a/image/layout_6.png b/resources/layout_6.png Binary files differindex af3a8fb45c..af3a8fb45c 100644 --- a/image/layout_6.png +++ b/resources/layout_6.png diff --git a/image/layout_6@2x.png b/resources/layout_6@2x.png Binary files differindex 6253b7035f..6253b7035f 100644 --- a/image/layout_6@2x.png +++ b/resources/layout_6@2x.png diff --git a/image/layouts.svg b/resources/layouts.svg index a7ea9cf5b2..a7ea9cf5b2 100644 --- a/image/layouts.svg +++ b/resources/layouts.svg diff --git a/image/libwireshark.rc.in b/resources/libwireshark.rc.in index 6a52b9acbc..6a52b9acbc 100644 --- a/image/libwireshark.rc.in +++ b/resources/libwireshark.rc.in diff --git a/image/libwiretap.rc.in b/resources/libwiretap.rc.in index 31ed0a0245..31ed0a0245 100644 --- a/image/libwiretap.rc.in +++ b/resources/libwiretap.rc.in diff --git a/image/libwsutil.rc.in b/resources/libwsutil.rc.in index 54d1e9a888..54d1e9a888 100644 --- a/image/libwsutil.rc.in +++ b/resources/libwsutil.rc.in diff --git a/image/stock_icons.qrc b/resources/stock_icons.qrc index 0dd8748cac..daa3513f9d 100644 --- a/image/stock_icons.qrc +++ b/resources/stock_icons.qrc @@ -1,7 +1,7 @@ <RCC> <qresource prefix="/menu/help"> - <file>wsicon16.png</file> - <file>wsicon-ask.png</file> + <file alias="wsicon16.png">icons/wsicon16.png</file> + <file alias="wsicon-ask.png">icons/wsicon-ask.png</file> </qresource> <qresource prefix=""> <file>stock_icons/8x8/list-add.template.png</file> diff --git a/image/stock_icons/14x14/x-capture-comment-update.png b/resources/stock_icons/14x14/x-capture-comment-update.png Binary files differindex 70496766ef..70496766ef 100644 --- a/image/stock_icons/14x14/x-capture-comment-update.png +++ b/resources/stock_icons/14x14/x-capture-comment-update.png diff --git a/image/stock_icons/14x14/x-capture-comment-update.svg b/resources/stock_icons/14x14/x-capture-comment-update.svg index 4bffb99275..4bffb99275 100644 --- a/image/stock_icons/14x14/x-capture-comment-update.svg +++ b/resources/stock_icons/14x14/x-capture-comment-update.svg diff --git a/image/stock_icons/14x14/x-capture-comment-update@2x.png b/resources/stock_icons/14x14/x-capture-comment-update@2x.png Binary files differindex 45d532d94e..45d532d94e 100644 --- a/image/stock_icons/14x14/x-capture-comment-update@2x.png +++ b/resources/stock_icons/14x14/x-capture-comment-update@2x.png diff --git a/image/stock_icons/14x14/x-capture-filter-bookmark.active.png b/resources/stock_icons/14x14/x-capture-filter-bookmark.active.png Binary files differindex 72b105e8c2..72b105e8c2 100644 --- a/image/stock_icons/14x14/x-capture-filter-bookmark.active.png +++ b/resources/stock_icons/14x14/x-capture-filter-bookmark.active.png diff --git a/image/stock_icons/14x14/x-capture-filter-bookmark.active.svg b/resources/stock_icons/14x14/x-capture-filter-bookmark.active.svg index f1085c1d18..f1085c1d18 100644 --- a/image/stock_icons/14x14/x-capture-filter-bookmark.active.svg +++ b/resources/stock_icons/14x14/x-capture-filter-bookmark.active.svg diff --git a/image/stock_icons/14x14/x-capture-filter-bookmark.active@2x.png b/resources/stock_icons/14x14/x-capture-filter-bookmark.active@2x.png Binary files differindex a453553114..a453553114 100644 --- a/image/stock_icons/14x14/x-capture-filter-bookmark.active@2x.png +++ b/resources/stock_icons/14x14/x-capture-filter-bookmark.active@2x.png diff --git a/image/stock_icons/14x14/x-capture-filter-bookmark.png b/resources/stock_icons/14x14/x-capture-filter-bookmark.png Binary files differindex 00f83f76b9..00f83f76b9 100644 --- a/image/stock_icons/14x14/x-capture-filter-bookmark.png +++ b/resources/stock_icons/14x14/x-capture-filter-bookmark.png diff --git a/image/stock_icons/14x14/x-capture-filter-bookmark.selected.png b/resources/stock_icons/14x14/x-capture-filter-bookmark.selected.png Binary files differindex 63bfabdf0b..63bfabdf0b 100644 --- a/image/stock_icons/14x14/x-capture-filter-bookmark.selected.png +++ b/resources/stock_icons/14x14/x-capture-filter-bookmark.selected.png diff --git a/image/stock_icons/14x14/x-capture-filter-bookmark.selected.svg b/resources/stock_icons/14x14/x-capture-filter-bookmark.selected.svg index 572ea701a1..572ea701a1 100644 --- a/image/stock_icons/14x14/x-capture-filter-bookmark.selected.svg +++ b/resources/stock_icons/14x14/x-capture-filter-bookmark.selected.svg diff --git a/image/stock_icons/14x14/x-capture-filter-bookmark.selected@2x.png b/resources/stock_icons/14x14/x-capture-filter-bookmark.selected@2x.png Binary files differindex 08013cbc0b..08013cbc0b 100644 --- a/image/stock_icons/14x14/x-capture-filter-bookmark.selected@2x.png +++ b/resources/stock_icons/14x14/x-capture-filter-bookmark.selected@2x.png diff --git a/image/stock_icons/14x14/x-capture-filter-bookmark.svg b/resources/stock_icons/14x14/x-capture-filter-bookmark.svg index 5a9d9fe732..5a9d9fe732 100644 --- a/image/stock_icons/14x14/x-capture-filter-bookmark.svg +++ b/resources/stock_icons/14x14/x-capture-filter-bookmark.svg diff --git a/image/stock_icons/14x14/x-capture-filter-bookmark@2x.png b/resources/stock_icons/14x14/x-capture-filter-bookmark@2x.png Binary files differindex cde8131495..cde8131495 100644 --- a/image/stock_icons/14x14/x-capture-filter-bookmark@2x.png +++ b/resources/stock_icons/14x14/x-capture-filter-bookmark@2x.png diff --git a/image/stock_icons/14x14/x-display-filter-bookmark.active.png b/resources/stock_icons/14x14/x-display-filter-bookmark.active.png Binary files differindex a9bf35a7dd..a9bf35a7dd 100644 --- a/image/stock_icons/14x14/x-display-filter-bookmark.active.png +++ b/resources/stock_icons/14x14/x-display-filter-bookmark.active.png diff --git a/image/stock_icons/14x14/x-display-filter-bookmark.active.svg b/resources/stock_icons/14x14/x-display-filter-bookmark.active.svg index 59336bb970..59336bb970 100644 --- a/image/stock_icons/14x14/x-display-filter-bookmark.active.svg +++ b/resources/stock_icons/14x14/x-display-filter-bookmark.active.svg diff --git a/image/stock_icons/14x14/x-display-filter-bookmark.active@2x.png b/resources/stock_icons/14x14/x-display-filter-bookmark.active@2x.png Binary files differindex 507373872f..507373872f 100644 --- a/image/stock_icons/14x14/x-display-filter-bookmark.active@2x.png +++ b/resources/stock_icons/14x14/x-display-filter-bookmark.active@2x.png diff --git a/image/stock_icons/14x14/x-display-filter-bookmark.png b/resources/stock_icons/14x14/x-display-filter-bookmark.png Binary files differindex fbeeb3466d..fbeeb3466d 100644 --- a/image/stock_icons/14x14/x-display-filter-bookmark.png +++ b/resources/stock_icons/14x14/x-display-filter-bookmark.png diff --git a/image/stock_icons/14x14/x-display-filter-bookmark.selected.png b/resources/stock_icons/14x14/x-display-filter-bookmark.selected.png Binary files differindex 0bb4dcd817..0bb4dcd817 100644 --- a/image/stock_icons/14x14/x-display-filter-bookmark.selected.png +++ b/resources/stock_icons/14x14/x-display-filter-bookmark.selected.png diff --git a/image/stock_icons/14x14/x-display-filter-bookmark.selected.svg b/resources/stock_icons/14x14/x-display-filter-bookmark.selected.svg index 3690c887a3..3690c887a3 100644 --- a/image/stock_icons/14x14/x-display-filter-bookmark.selected.svg +++ b/resources/stock_icons/14x14/x-display-filter-bookmark.selected.svg diff --git a/image/stock_icons/14x14/x-display-filter-bookmark.selected@2x.png b/resources/stock_icons/14x14/x-display-filter-bookmark.selected@2x.png Binary files differindex ae64fd7a86..ae64fd7a86 100644 --- a/image/stock_icons/14x14/x-display-filter-bookmark.selected@2x.png +++ b/resources/stock_icons/14x14/x-display-filter-bookmark.selected@2x.png diff --git a/image/stock_icons/14x14/x-display-filter-bookmark.svg b/resources/stock_icons/14x14/x-display-filter-bookmark.svg index 0e8dc9eff9..0e8dc9eff9 100644 --- a/image/stock_icons/14x14/x-display-filter-bookmark.svg +++ b/resources/stock_icons/14x14/x-display-filter-bookmark.svg diff --git a/image/stock_icons/14x14/x-display-filter-bookmark@2x.png b/resources/stock_icons/14x14/x-display-filter-bookmark@2x.png Binary files differindex 5b7526c4bc..5b7526c4bc 100644 --- a/image/stock_icons/14x14/x-display-filter-bookmark@2x.png +++ b/resources/stock_icons/14x14/x-display-filter-bookmark@2x.png diff --git a/image/stock_icons/14x14/x-expert-chat.png b/resources/stock_icons/14x14/x-expert-chat.png Binary files differindex e93ad17836..e93ad17836 100644 --- a/image/stock_icons/14x14/x-expert-chat.png +++ b/resources/stock_icons/14x14/x-expert-chat.png diff --git a/image/stock_icons/14x14/x-expert-chat@2x.png b/resources/stock_icons/14x14/x-expert-chat@2x.png Binary files differindex 228174b1d3..228174b1d3 100644 --- a/image/stock_icons/14x14/x-expert-chat@2x.png +++ b/resources/stock_icons/14x14/x-expert-chat@2x.png diff --git a/image/stock_icons/14x14/x-expert-error.png b/resources/stock_icons/14x14/x-expert-error.png Binary files differindex cd64a93f16..cd64a93f16 100644 --- a/image/stock_icons/14x14/x-expert-error.png +++ b/resources/stock_icons/14x14/x-expert-error.png diff --git a/image/stock_icons/14x14/x-expert-error@2x.png b/resources/stock_icons/14x14/x-expert-error@2x.png Binary files differindex 4cb29e8cb1..4cb29e8cb1 100644 --- a/image/stock_icons/14x14/x-expert-error@2x.png +++ b/resources/stock_icons/14x14/x-expert-error@2x.png diff --git a/image/stock_icons/14x14/x-expert-indicators-all.svg b/resources/stock_icons/14x14/x-expert-indicators-all.svg index 4c019e4228..4c019e4228 100644 --- a/image/stock_icons/14x14/x-expert-indicators-all.svg +++ b/resources/stock_icons/14x14/x-expert-indicators-all.svg diff --git a/image/stock_icons/14x14/x-expert-none.png b/resources/stock_icons/14x14/x-expert-none.png Binary files differindex 500f825b76..500f825b76 100644 --- a/image/stock_icons/14x14/x-expert-none.png +++ b/resources/stock_icons/14x14/x-expert-none.png diff --git a/image/stock_icons/14x14/x-expert-none@2x.png b/resources/stock_icons/14x14/x-expert-none@2x.png Binary files differindex eb3c42e6b2..eb3c42e6b2 100644 --- a/image/stock_icons/14x14/x-expert-none@2x.png +++ b/resources/stock_icons/14x14/x-expert-none@2x.png diff --git a/image/stock_icons/14x14/x-expert-note.png b/resources/stock_icons/14x14/x-expert-note.png Binary files differindex 88154d5d7a..88154d5d7a 100644 --- a/image/stock_icons/14x14/x-expert-note.png +++ b/resources/stock_icons/14x14/x-expert-note.png diff --git a/image/stock_icons/14x14/x-expert-note@2x.png b/resources/stock_icons/14x14/x-expert-note@2x.png Binary files differindex 0854a65838..0854a65838 100644 --- a/image/stock_icons/14x14/x-expert-note@2x.png +++ b/resources/stock_icons/14x14/x-expert-note@2x.png diff --git a/image/stock_icons/14x14/x-expert-warn.png b/resources/stock_icons/14x14/x-expert-warn.png Binary files differindex 9aa1de61b2..9aa1de61b2 100644 --- a/image/stock_icons/14x14/x-expert-warn.png +++ b/resources/stock_icons/14x14/x-expert-warn.png diff --git a/image/stock_icons/14x14/x-expert-warn@2x.png b/resources/stock_icons/14x14/x-expert-warn@2x.png Binary files differindex 9fddefd8c4..9fddefd8c4 100644 --- a/image/stock_icons/14x14/x-expert-warn@2x.png +++ b/resources/stock_icons/14x14/x-expert-warn@2x.png diff --git a/image/stock_icons/14x14/x-filter-clear.active.png b/resources/stock_icons/14x14/x-filter-clear.active.png Binary files differindex 2c0ed113db..2c0ed113db 100644 --- a/image/stock_icons/14x14/x-filter-clear.active.png +++ b/resources/stock_icons/14x14/x-filter-clear.active.png diff --git a/image/stock_icons/14x14/x-filter-clear.active.svg b/resources/stock_icons/14x14/x-filter-clear.active.svg index 3450bcf533..3450bcf533 100644 --- a/image/stock_icons/14x14/x-filter-clear.active.svg +++ b/resources/stock_icons/14x14/x-filter-clear.active.svg diff --git a/image/stock_icons/14x14/x-filter-clear.active@2x.png b/resources/stock_icons/14x14/x-filter-clear.active@2x.png Binary files differindex 344253fff4..344253fff4 100644 --- a/image/stock_icons/14x14/x-filter-clear.active@2x.png +++ b/resources/stock_icons/14x14/x-filter-clear.active@2x.png diff --git a/image/stock_icons/14x14/x-filter-clear.png b/resources/stock_icons/14x14/x-filter-clear.png Binary files differindex 85ea100b0b..85ea100b0b 100644 --- a/image/stock_icons/14x14/x-filter-clear.png +++ b/resources/stock_icons/14x14/x-filter-clear.png diff --git a/image/stock_icons/14x14/x-filter-clear.selected.png b/resources/stock_icons/14x14/x-filter-clear.selected.png Binary files differindex d94d4f99db..d94d4f99db 100644 --- a/image/stock_icons/14x14/x-filter-clear.selected.png +++ b/resources/stock_icons/14x14/x-filter-clear.selected.png diff --git a/image/stock_icons/14x14/x-filter-clear.selected.svg b/resources/stock_icons/14x14/x-filter-clear.selected.svg index ea77368620..ea77368620 100644 --- a/image/stock_icons/14x14/x-filter-clear.selected.svg +++ b/resources/stock_icons/14x14/x-filter-clear.selected.svg diff --git a/image/stock_icons/14x14/x-filter-clear.selected@2x.png b/resources/stock_icons/14x14/x-filter-clear.selected@2x.png Binary files differindex 27cf07f871..27cf07f871 100644 --- a/image/stock_icons/14x14/x-filter-clear.selected@2x.png +++ b/resources/stock_icons/14x14/x-filter-clear.selected@2x.png diff --git a/image/stock_icons/14x14/x-filter-clear.svg b/resources/stock_icons/14x14/x-filter-clear.svg index 01e74d9c56..01e74d9c56 100644 --- a/image/stock_icons/14x14/x-filter-clear.svg +++ b/resources/stock_icons/14x14/x-filter-clear.svg diff --git a/image/stock_icons/14x14/x-filter-clear@2x.png b/resources/stock_icons/14x14/x-filter-clear@2x.png Binary files differindex 492948c900..492948c900 100644 --- a/image/stock_icons/14x14/x-filter-clear@2x.png +++ b/resources/stock_icons/14x14/x-filter-clear@2x.png diff --git a/image/stock_icons/14x14/x-filter-deprecated.png b/resources/stock_icons/14x14/x-filter-deprecated.png Binary files differindex e2da3f0227..e2da3f0227 100644 --- a/image/stock_icons/14x14/x-filter-deprecated.png +++ b/resources/stock_icons/14x14/x-filter-deprecated.png diff --git a/image/stock_icons/14x14/x-filter-deprecated.svg b/resources/stock_icons/14x14/x-filter-deprecated.svg index 65b4258a0a..65b4258a0a 100644 --- a/image/stock_icons/14x14/x-filter-deprecated.svg +++ b/resources/stock_icons/14x14/x-filter-deprecated.svg diff --git a/image/stock_icons/14x14/x-filter-deprecated@2x.png b/resources/stock_icons/14x14/x-filter-deprecated@2x.png Binary files differindex 5c206670aa..5c206670aa 100644 --- a/image/stock_icons/14x14/x-filter-deprecated@2x.png +++ b/resources/stock_icons/14x14/x-filter-deprecated@2x.png diff --git a/image/stock_icons/14x14/x-filter-dropdown.dark.png b/resources/stock_icons/14x14/x-filter-dropdown.dark.png Binary files differindex 1ce176eaa4..1ce176eaa4 100644 --- a/image/stock_icons/14x14/x-filter-dropdown.dark.png +++ b/resources/stock_icons/14x14/x-filter-dropdown.dark.png diff --git a/image/stock_icons/14x14/x-filter-dropdown.dark.svg b/resources/stock_icons/14x14/x-filter-dropdown.dark.svg index 060a8b2af1..060a8b2af1 100644 --- a/image/stock_icons/14x14/x-filter-dropdown.dark.svg +++ b/resources/stock_icons/14x14/x-filter-dropdown.dark.svg diff --git a/image/stock_icons/14x14/x-filter-dropdown.dark@2x.png b/resources/stock_icons/14x14/x-filter-dropdown.dark@2x.png Binary files differindex 14a48faf69..14a48faf69 100644 --- a/image/stock_icons/14x14/x-filter-dropdown.dark@2x.png +++ b/resources/stock_icons/14x14/x-filter-dropdown.dark@2x.png diff --git a/image/stock_icons/14x14/x-filter-dropdown.light.png b/resources/stock_icons/14x14/x-filter-dropdown.light.png Binary files differindex a994dccf52..a994dccf52 100644 --- a/image/stock_icons/14x14/x-filter-dropdown.light.png +++ b/resources/stock_icons/14x14/x-filter-dropdown.light.png diff --git a/image/stock_icons/14x14/x-filter-dropdown.light.svg b/resources/stock_icons/14x14/x-filter-dropdown.light.svg index 6346f18c3f..6346f18c3f 100644 --- a/image/stock_icons/14x14/x-filter-dropdown.light.svg +++ b/resources/stock_icons/14x14/x-filter-dropdown.light.svg diff --git a/image/stock_icons/14x14/x-filter-dropdown.light@2x.png b/resources/stock_icons/14x14/x-filter-dropdown.light@2x.png Binary files differindex 162e4c817e..162e4c817e 100644 --- a/image/stock_icons/14x14/x-filter-dropdown.light@2x.png +++ b/resources/stock_icons/14x14/x-filter-dropdown.light@2x.png diff --git a/image/stock_icons/14x14/x-filter-invalid.png b/resources/stock_icons/14x14/x-filter-invalid.png Binary files differindex 9d28c93fb2..9d28c93fb2 100644 --- a/image/stock_icons/14x14/x-filter-invalid.png +++ b/resources/stock_icons/14x14/x-filter-invalid.png diff --git a/image/stock_icons/14x14/x-filter-invalid.svg b/resources/stock_icons/14x14/x-filter-invalid.svg index 27c68dfa71..27c68dfa71 100644 --- a/image/stock_icons/14x14/x-filter-invalid.svg +++ b/resources/stock_icons/14x14/x-filter-invalid.svg diff --git a/image/stock_icons/14x14/x-filter-invalid@2x.png b/resources/stock_icons/14x14/x-filter-invalid@2x.png Binary files differindex 8bccd9443b..8bccd9443b 100644 --- a/image/stock_icons/14x14/x-filter-invalid@2x.png +++ b/resources/stock_icons/14x14/x-filter-invalid@2x.png diff --git a/image/stock_icons/14x14/x-filter-matching-bookmark.active.png b/resources/stock_icons/14x14/x-filter-matching-bookmark.active.png Binary files differindex 78486c6155..78486c6155 100644 --- a/image/stock_icons/14x14/x-filter-matching-bookmark.active.png +++ b/resources/stock_icons/14x14/x-filter-matching-bookmark.active.png diff --git a/image/stock_icons/14x14/x-filter-matching-bookmark.active.svg b/resources/stock_icons/14x14/x-filter-matching-bookmark.active.svg index 1bcef4e69c..1bcef4e69c 100644 --- a/image/stock_icons/14x14/x-filter-matching-bookmark.active.svg +++ b/resources/stock_icons/14x14/x-filter-matching-bookmark.active.svg diff --git a/image/stock_icons/14x14/x-filter-matching-bookmark.active@2x.png b/resources/stock_icons/14x14/x-filter-matching-bookmark.active@2x.png Binary files differindex c1e25bb339..c1e25bb339 100644 --- a/image/stock_icons/14x14/x-filter-matching-bookmark.active@2x.png +++ b/resources/stock_icons/14x14/x-filter-matching-bookmark.active@2x.png diff --git a/image/stock_icons/14x14/x-filter-matching-bookmark.png b/resources/stock_icons/14x14/x-filter-matching-bookmark.png Binary files differindex 457eae38a8..457eae38a8 100644 --- a/image/stock_icons/14x14/x-filter-matching-bookmark.png +++ b/resources/stock_icons/14x14/x-filter-matching-bookmark.png diff --git a/image/stock_icons/14x14/x-filter-matching-bookmark.selected.png b/resources/stock_icons/14x14/x-filter-matching-bookmark.selected.png Binary files differindex 6d99fd02a5..6d99fd02a5 100644 --- a/image/stock_icons/14x14/x-filter-matching-bookmark.selected.png +++ b/resources/stock_icons/14x14/x-filter-matching-bookmark.selected.png diff --git a/image/stock_icons/14x14/x-filter-matching-bookmark.selected.svg b/resources/stock_icons/14x14/x-filter-matching-bookmark.selected.svg index 59a43a01df..59a43a01df 100644 --- a/image/stock_icons/14x14/x-filter-matching-bookmark.selected.svg +++ b/resources/stock_icons/14x14/x-filter-matching-bookmark.selected.svg diff --git a/image/stock_icons/14x14/x-filter-matching-bookmark.selected@2x.png b/resources/stock_icons/14x14/x-filter-matching-bookmark.selected@2x.png Binary files differindex 378b44bae8..378b44bae8 100644 --- a/image/stock_icons/14x14/x-filter-matching-bookmark.selected@2x.png +++ b/resources/stock_icons/14x14/x-filter-matching-bookmark.selected@2x.png diff --git a/image/stock_icons/14x14/x-filter-matching-bookmark.svg b/resources/stock_icons/14x14/x-filter-matching-bookmark.svg index 774970abeb..774970abeb 100644 --- a/image/stock_icons/14x14/x-filter-matching-bookmark.svg +++ b/resources/stock_icons/14x14/x-filter-matching-bookmark.svg diff --git a/image/stock_icons/14x14/x-filter-matching-bookmark@2x.png b/resources/stock_icons/14x14/x-filter-matching-bookmark@2x.png Binary files differindex 02af7246ef..02af7246ef 100644 --- a/image/stock_icons/14x14/x-filter-matching-bookmark@2x.png +++ b/resources/stock_icons/14x14/x-filter-matching-bookmark@2x.png diff --git a/image/stock_icons/16x16/edit-find.template.png b/resources/stock_icons/16x16/edit-find.template.png Binary files differindex 7eee37c2f2..7eee37c2f2 100644 --- a/image/stock_icons/16x16/edit-find.template.png +++ b/resources/stock_icons/16x16/edit-find.template.png diff --git a/image/stock_icons/16x16/edit-find.template.svg b/resources/stock_icons/16x16/edit-find.template.svg index bd4071be3b..bd4071be3b 100644 --- a/image/stock_icons/16x16/edit-find.template.svg +++ b/resources/stock_icons/16x16/edit-find.template.svg diff --git a/image/stock_icons/16x16/edit-find.template@2x.png b/resources/stock_icons/16x16/edit-find.template@2x.png Binary files differindex 5c4f21f180..5c4f21f180 100644 --- a/image/stock_icons/16x16/edit-find.template@2x.png +++ b/resources/stock_icons/16x16/edit-find.template@2x.png diff --git a/image/stock_icons/16x16/go-first.png b/resources/stock_icons/16x16/go-first.png Binary files differindex b77192cc7f..b77192cc7f 100644 --- a/image/stock_icons/16x16/go-first.png +++ b/resources/stock_icons/16x16/go-first.png diff --git a/image/stock_icons/16x16/go-first.svg b/resources/stock_icons/16x16/go-first.svg index cea04ff8f0..cea04ff8f0 100644 --- a/image/stock_icons/16x16/go-first.svg +++ b/resources/stock_icons/16x16/go-first.svg diff --git a/image/stock_icons/16x16/go-first@2x.png b/resources/stock_icons/16x16/go-first@2x.png Binary files differindex f9fad2fac9..f9fad2fac9 100644 --- a/image/stock_icons/16x16/go-first@2x.png +++ b/resources/stock_icons/16x16/go-first@2x.png diff --git a/image/stock_icons/16x16/go-jump.png b/resources/stock_icons/16x16/go-jump.png Binary files differindex c8ca3633bc..c8ca3633bc 100644 --- a/image/stock_icons/16x16/go-jump.png +++ b/resources/stock_icons/16x16/go-jump.png diff --git a/image/stock_icons/16x16/go-jump.svg b/resources/stock_icons/16x16/go-jump.svg index 5600b7eebe..5600b7eebe 100644 --- a/image/stock_icons/16x16/go-jump.svg +++ b/resources/stock_icons/16x16/go-jump.svg diff --git a/image/stock_icons/16x16/go-jump@2x.png b/resources/stock_icons/16x16/go-jump@2x.png Binary files differindex a0a283c8ee..a0a283c8ee 100644 --- a/image/stock_icons/16x16/go-jump@2x.png +++ b/resources/stock_icons/16x16/go-jump@2x.png diff --git a/image/stock_icons/16x16/go-last.png b/resources/stock_icons/16x16/go-last.png Binary files differindex de43e2ca19..de43e2ca19 100644 --- a/image/stock_icons/16x16/go-last.png +++ b/resources/stock_icons/16x16/go-last.png diff --git a/image/stock_icons/16x16/go-last.svg b/resources/stock_icons/16x16/go-last.svg index 9de94376ce..9de94376ce 100644 --- a/image/stock_icons/16x16/go-last.svg +++ b/resources/stock_icons/16x16/go-last.svg diff --git a/image/stock_icons/16x16/go-last@2x.png b/resources/stock_icons/16x16/go-last@2x.png Binary files differindex e4d5715955..e4d5715955 100644 --- a/image/stock_icons/16x16/go-last@2x.png +++ b/resources/stock_icons/16x16/go-last@2x.png diff --git a/image/stock_icons/16x16/go-next.png b/resources/stock_icons/16x16/go-next.png Binary files differindex c350c1ffc6..c350c1ffc6 100644 --- a/image/stock_icons/16x16/go-next.png +++ b/resources/stock_icons/16x16/go-next.png diff --git a/image/stock_icons/16x16/go-next.svg b/resources/stock_icons/16x16/go-next.svg index 55abcc9288..55abcc9288 100644 --- a/image/stock_icons/16x16/go-next.svg +++ b/resources/stock_icons/16x16/go-next.svg diff --git a/image/stock_icons/16x16/go-next@2x.png b/resources/stock_icons/16x16/go-next@2x.png Binary files differindex b0201e49bf..b0201e49bf 100644 --- a/image/stock_icons/16x16/go-next@2x.png +++ b/resources/stock_icons/16x16/go-next@2x.png diff --git a/image/stock_icons/16x16/go-previous.png b/resources/stock_icons/16x16/go-previous.png Binary files differindex 4a757fd9d1..4a757fd9d1 100644 --- a/image/stock_icons/16x16/go-previous.png +++ b/resources/stock_icons/16x16/go-previous.png diff --git a/image/stock_icons/16x16/go-previous.svg b/resources/stock_icons/16x16/go-previous.svg index a07ae8bde7..a07ae8bde7 100644 --- a/image/stock_icons/16x16/go-previous.svg +++ b/resources/stock_icons/16x16/go-previous.svg diff --git a/image/stock_icons/16x16/go-previous@2x.png b/resources/stock_icons/16x16/go-previous@2x.png Binary files differindex e2a1463e51..e2a1463e51 100644 --- a/image/stock_icons/16x16/go-previous@2x.png +++ b/resources/stock_icons/16x16/go-previous@2x.png diff --git a/image/stock_icons/16x16/x-capture-file-close.png b/resources/stock_icons/16x16/x-capture-file-close.png Binary files differindex 91e746ee7f..91e746ee7f 100644 --- a/image/stock_icons/16x16/x-capture-file-close.png +++ b/resources/stock_icons/16x16/x-capture-file-close.png diff --git a/image/stock_icons/16x16/x-capture-file-close.svg b/resources/stock_icons/16x16/x-capture-file-close.svg index cc09a35d2a..0e2ad88319 100644 --- a/image/stock_icons/16x16/x-capture-file-close.svg +++ b/resources/stock_icons/16x16/x-capture-file-close.svg @@ -76,7 +76,7 @@ y="1036.3622" x="0" id="image3135" - xlink:href="../../WiresharkDoc-16.png" + xlink:href="../../icons/WiresharkDoc-16.png" height="16" width="16" /> <path diff --git a/image/stock_icons/16x16/x-capture-file-close@2x.png b/resources/stock_icons/16x16/x-capture-file-close@2x.png Binary files differindex f15849fd21..f15849fd21 100644 --- a/image/stock_icons/16x16/x-capture-file-close@2x.png +++ b/resources/stock_icons/16x16/x-capture-file-close@2x.png diff --git a/image/stock_icons/16x16/x-capture-file-close@2x.svg b/resources/stock_icons/16x16/x-capture-file-close@2x.svg index a44a4034b4..efaf821df5 100644 --- a/image/stock_icons/16x16/x-capture-file-close@2x.svg +++ b/resources/stock_icons/16x16/x-capture-file-close@2x.svg @@ -76,7 +76,7 @@ y="1020.3622" x="0" id="image3272" - xlink:href="file:///Users/gcombs/Development/wireshark/image/WiresharkDoc-32.png" + xlink:href="../../icons/WiresharkDoc-32.png" height="32" width="32" /> <path diff --git a/image/stock_icons/16x16/x-capture-file-reload.png b/resources/stock_icons/16x16/x-capture-file-reload.png Binary files differindex 11c9a4c93f..11c9a4c93f 100644 --- a/image/stock_icons/16x16/x-capture-file-reload.png +++ b/resources/stock_icons/16x16/x-capture-file-reload.png diff --git a/image/stock_icons/16x16/x-capture-file-reload.svg b/resources/stock_icons/16x16/x-capture-file-reload.svg index 90e3ee7870..1f53b3e5f8 100644 --- a/image/stock_icons/16x16/x-capture-file-reload.svg +++ b/resources/stock_icons/16x16/x-capture-file-reload.svg @@ -87,7 +87,7 @@ id="layer1" transform="translate(0,-1036.3622)"> <image - xlink:href="../../WiresharkDoc-16.png" + xlink:href="../../icons/WiresharkDoc-16.png" y="1036.3622" x="0" id="image3882" diff --git a/image/stock_icons/16x16/x-capture-file-reload@2x.png b/resources/stock_icons/16x16/x-capture-file-reload@2x.png Binary files differindex fecb97cc5d..fecb97cc5d 100644 --- a/image/stock_icons/16x16/x-capture-file-reload@2x.png +++ b/resources/stock_icons/16x16/x-capture-file-reload@2x.png diff --git a/image/stock_icons/16x16/x-capture-file-reload@2x.svg b/resources/stock_icons/16x16/x-capture-file-reload@2x.svg index 16bbbfab75..7f57b4f355 100644 --- a/image/stock_icons/16x16/x-capture-file-reload@2x.svg +++ b/resources/stock_icons/16x16/x-capture-file-reload@2x.svg @@ -90,7 +90,7 @@ y="1020.3622" x="0" id="image3272" - xlink:href="file:///Users/gcombs/Development/wireshark/image/WiresharkDoc-32.png" + xlink:href="../../icons/WiresharkDoc-32.png" height="32" width="32" /> <path diff --git a/image/stock_icons/16x16/x-capture-file-save.png b/resources/stock_icons/16x16/x-capture-file-save.png Binary files differindex 8b7550aa36..8b7550aa36 100644 --- a/image/stock_icons/16x16/x-capture-file-save.png +++ b/resources/stock_icons/16x16/x-capture-file-save.png diff --git a/image/stock_icons/16x16/x-capture-file-save.svg b/resources/stock_icons/16x16/x-capture-file-save.svg index 090fb45453..0fccccc599 100644 --- a/image/stock_icons/16x16/x-capture-file-save.svg +++ b/resources/stock_icons/16x16/x-capture-file-save.svg @@ -76,7 +76,7 @@ y="1036.3622" x="0" id="image3135" - xlink:href="file:///Users/gcombs/Development/wireshark/image/WiresharkDoc-16.png" + xlink:href="../../icons/WiresharkDoc-16.png" height="16" width="16" /> <path diff --git a/image/stock_icons/16x16/x-capture-file-save@2x.png b/resources/stock_icons/16x16/x-capture-file-save@2x.png Binary files differindex 44e1d821a8..44e1d821a8 100644 --- a/image/stock_icons/16x16/x-capture-file-save@2x.png +++ b/resources/stock_icons/16x16/x-capture-file-save@2x.png diff --git a/image/stock_icons/16x16/x-capture-file-save@2x.svg b/resources/stock_icons/16x16/x-capture-file-save@2x.svg index e34ba10dac..f39e75d91e 100644 --- a/image/stock_icons/16x16/x-capture-file-save@2x.svg +++ b/resources/stock_icons/16x16/x-capture-file-save@2x.svg @@ -76,7 +76,7 @@ y="1020.3622" x="0" id="image3272" - xlink:href="file:///Users/gcombs/Development/wireshark/image/WiresharkDoc-32.png" + xlink:href="../../icons/WiresharkDoc-32.png" height="32" width="32" /> <path diff --git a/image/stock_icons/16x16/x-capture-options-gear.svg b/resources/stock_icons/16x16/x-capture-options-gear.svg index 4a03d39956..4a03d39956 100644 --- a/image/stock_icons/16x16/x-capture-options-gear.svg +++ b/resources/stock_icons/16x16/x-capture-options-gear.svg diff --git a/image/stock_icons/16x16/x-capture-options-wrench.svg b/resources/stock_icons/16x16/x-capture-options-wrench.svg index 9276524668..9276524668 100644 --- a/image/stock_icons/16x16/x-capture-options-wrench.svg +++ b/resources/stock_icons/16x16/x-capture-options-wrench.svg diff --git a/image/stock_icons/16x16/x-capture-options.png b/resources/stock_icons/16x16/x-capture-options.png Binary files differindex 6559591b2d..6559591b2d 100644 --- a/image/stock_icons/16x16/x-capture-options.png +++ b/resources/stock_icons/16x16/x-capture-options.png diff --git a/image/stock_icons/16x16/x-capture-options@2x.png b/resources/stock_icons/16x16/x-capture-options@2x.png Binary files differindex b953b96889..b953b96889 100644 --- a/image/stock_icons/16x16/x-capture-options@2x.png +++ b/resources/stock_icons/16x16/x-capture-options@2x.png diff --git a/image/stock_icons/16x16/x-capture-restart-fin.svg b/resources/stock_icons/16x16/x-capture-restart-fin.svg index 8b9526089b..8b9526089b 100644 --- a/image/stock_icons/16x16/x-capture-restart-fin.svg +++ b/resources/stock_icons/16x16/x-capture-restart-fin.svg diff --git a/image/stock_icons/16x16/x-capture-restart-triangle1.svg b/resources/stock_icons/16x16/x-capture-restart-triangle1.svg index 39661823f6..39661823f6 100644 --- a/image/stock_icons/16x16/x-capture-restart-triangle1.svg +++ b/resources/stock_icons/16x16/x-capture-restart-triangle1.svg diff --git a/image/stock_icons/16x16/x-capture-restart-triangle2.svg b/resources/stock_icons/16x16/x-capture-restart-triangle2.svg index 10e4fc6873..10e4fc6873 100644 --- a/image/stock_icons/16x16/x-capture-restart-triangle2.svg +++ b/resources/stock_icons/16x16/x-capture-restart-triangle2.svg diff --git a/image/stock_icons/16x16/x-capture-restart-turn1.svg b/resources/stock_icons/16x16/x-capture-restart-turn1.svg index 8d824a3ba1..8d824a3ba1 100644 --- a/image/stock_icons/16x16/x-capture-restart-turn1.svg +++ b/resources/stock_icons/16x16/x-capture-restart-turn1.svg diff --git a/image/stock_icons/16x16/x-capture-restart-turn2.svg b/resources/stock_icons/16x16/x-capture-restart-turn2.svg index ba3cf215bd..ba3cf215bd 100644 --- a/image/stock_icons/16x16/x-capture-restart-turn2.svg +++ b/resources/stock_icons/16x16/x-capture-restart-turn2.svg diff --git a/image/stock_icons/16x16/x-capture-restart.png b/resources/stock_icons/16x16/x-capture-restart.png Binary files differindex fb21b2884b..fb21b2884b 100644 --- a/image/stock_icons/16x16/x-capture-restart.png +++ b/resources/stock_icons/16x16/x-capture-restart.png diff --git a/image/stock_icons/16x16/x-capture-restart@2x.png b/resources/stock_icons/16x16/x-capture-restart@2x.png Binary files differindex 7cb85c0a02..7cb85c0a02 100644 --- a/image/stock_icons/16x16/x-capture-restart@2x.png +++ b/resources/stock_icons/16x16/x-capture-restart@2x.png diff --git a/image/stock_icons/16x16/x-capture-start.on.png b/resources/stock_icons/16x16/x-capture-start.on.png Binary files differindex 9d1fd1ac80..9d1fd1ac80 100644 --- a/image/stock_icons/16x16/x-capture-start.on.png +++ b/resources/stock_icons/16x16/x-capture-start.on.png diff --git a/image/stock_icons/16x16/x-capture-start.on.svg b/resources/stock_icons/16x16/x-capture-start.on.svg index 8e2f4144c1..8e2f4144c1 100644 --- a/image/stock_icons/16x16/x-capture-start.on.svg +++ b/resources/stock_icons/16x16/x-capture-start.on.svg diff --git a/image/stock_icons/16x16/x-capture-start.on@2x.png b/resources/stock_icons/16x16/x-capture-start.on@2x.png Binary files differindex 3bd5c5f7d8..3bd5c5f7d8 100644 --- a/image/stock_icons/16x16/x-capture-start.on@2x.png +++ b/resources/stock_icons/16x16/x-capture-start.on@2x.png diff --git a/image/stock_icons/16x16/x-capture-start.png b/resources/stock_icons/16x16/x-capture-start.png Binary files differindex a80f3baa4b..a80f3baa4b 100644 --- a/image/stock_icons/16x16/x-capture-start.png +++ b/resources/stock_icons/16x16/x-capture-start.png diff --git a/image/stock_icons/16x16/x-capture-start.svg b/resources/stock_icons/16x16/x-capture-start.svg index fbadf4581b..fbadf4581b 100644 --- a/image/stock_icons/16x16/x-capture-start.svg +++ b/resources/stock_icons/16x16/x-capture-start.svg diff --git a/image/stock_icons/16x16/x-capture-start@2x.png b/resources/stock_icons/16x16/x-capture-start@2x.png Binary files differindex c1a676dace..c1a676dace 100644 --- a/image/stock_icons/16x16/x-capture-start@2x.png +++ b/resources/stock_icons/16x16/x-capture-start@2x.png diff --git a/image/stock_icons/16x16/x-capture-stop-red.svg b/resources/stock_icons/16x16/x-capture-stop-red.svg index 42e138902b..42e138902b 100644 --- a/image/stock_icons/16x16/x-capture-stop-red.svg +++ b/resources/stock_icons/16x16/x-capture-stop-red.svg diff --git a/image/stock_icons/16x16/x-capture-stop-white.svg b/resources/stock_icons/16x16/x-capture-stop-white.svg index dd6bf9f082..dd6bf9f082 100644 --- a/image/stock_icons/16x16/x-capture-stop-white.svg +++ b/resources/stock_icons/16x16/x-capture-stop-white.svg diff --git a/image/stock_icons/16x16/x-capture-stop.png b/resources/stock_icons/16x16/x-capture-stop.png Binary files differindex 059cca395e..059cca395e 100644 --- a/image/stock_icons/16x16/x-capture-stop.png +++ b/resources/stock_icons/16x16/x-capture-stop.png diff --git a/image/stock_icons/16x16/x-capture-stop@2x.png b/resources/stock_icons/16x16/x-capture-stop@2x.png Binary files differindex 2c9d12e201..2c9d12e201 100644 --- a/image/stock_icons/16x16/x-capture-stop@2x.png +++ b/resources/stock_icons/16x16/x-capture-stop@2x.png diff --git a/image/stock_icons/16x16/x-colorize-packets.png b/resources/stock_icons/16x16/x-colorize-packets.png Binary files differindex 3509c1f50e..3509c1f50e 100644 --- a/image/stock_icons/16x16/x-colorize-packets.png +++ b/resources/stock_icons/16x16/x-colorize-packets.png diff --git a/image/stock_icons/16x16/x-colorize-packets.svg b/resources/stock_icons/16x16/x-colorize-packets.svg index 7c64eeae42..7c64eeae42 100644 --- a/image/stock_icons/16x16/x-colorize-packets.svg +++ b/resources/stock_icons/16x16/x-colorize-packets.svg diff --git a/image/stock_icons/16x16/x-colorize-packets@2x.png b/resources/stock_icons/16x16/x-colorize-packets@2x.png Binary files differindex 8e8693a91a..8e8693a91a 100644 --- a/image/stock_icons/16x16/x-colorize-packets@2x.png +++ b/resources/stock_icons/16x16/x-colorize-packets@2x.png diff --git a/image/stock_icons/16x16/x-resize-columns.png b/resources/stock_icons/16x16/x-resize-columns.png Binary files differindex ce64c73b37..ce64c73b37 100644 --- a/image/stock_icons/16x16/x-resize-columns.png +++ b/resources/stock_icons/16x16/x-resize-columns.png diff --git a/image/stock_icons/16x16/x-resize-columns.svg b/resources/stock_icons/16x16/x-resize-columns.svg index 51bf1cf3eb..51bf1cf3eb 100644 --- a/image/stock_icons/16x16/x-resize-columns.svg +++ b/resources/stock_icons/16x16/x-resize-columns.svg diff --git a/image/stock_icons/16x16/x-resize-columns@2x.png b/resources/stock_icons/16x16/x-resize-columns@2x.png Binary files differindex 7034c0b346..7034c0b346 100644 --- a/image/stock_icons/16x16/x-resize-columns@2x.png +++ b/resources/stock_icons/16x16/x-resize-columns@2x.png diff --git a/image/stock_icons/16x16/x-stay-last.png b/resources/stock_icons/16x16/x-stay-last.png Binary files differindex dd2f5c6d9a..dd2f5c6d9a 100644 --- a/image/stock_icons/16x16/x-stay-last.png +++ b/resources/stock_icons/16x16/x-stay-last.png diff --git a/image/stock_icons/16x16/x-stay-last.svg b/resources/stock_icons/16x16/x-stay-last.svg index 2962556869..2962556869 100644 --- a/image/stock_icons/16x16/x-stay-last.svg +++ b/resources/stock_icons/16x16/x-stay-last.svg diff --git a/image/stock_icons/16x16/x-stay-last@2x.png b/resources/stock_icons/16x16/x-stay-last@2x.png Binary files differindex 95e913b6dc..95e913b6dc 100644 --- a/image/stock_icons/16x16/x-stay-last@2x.png +++ b/resources/stock_icons/16x16/x-stay-last@2x.png diff --git a/image/stock_icons/16x16/zoom-in.template.png b/resources/stock_icons/16x16/zoom-in.template.png Binary files differindex d490d0bf7b..d490d0bf7b 100644 --- a/image/stock_icons/16x16/zoom-in.template.png +++ b/resources/stock_icons/16x16/zoom-in.template.png diff --git a/image/stock_icons/16x16/zoom-in.template.svg b/resources/stock_icons/16x16/zoom-in.template.svg index 607fbf666d..607fbf666d 100644 --- a/image/stock_icons/16x16/zoom-in.template.svg +++ b/resources/stock_icons/16x16/zoom-in.template.svg diff --git a/image/stock_icons/16x16/zoom-in.template@2x.png b/resources/stock_icons/16x16/zoom-in.template@2x.png Binary files differindex fe558b966d..fe558b966d 100644 --- a/image/stock_icons/16x16/zoom-in.template@2x.png +++ b/resources/stock_icons/16x16/zoom-in.template@2x.png diff --git a/image/stock_icons/16x16/zoom-original.template.png b/resources/stock_icons/16x16/zoom-original.template.png Binary files differindex f65a0099ae..f65a0099ae 100644 --- a/image/stock_icons/16x16/zoom-original.template.png +++ b/resources/stock_icons/16x16/zoom-original.template.png diff --git a/image/stock_icons/16x16/zoom-original.template.svg b/resources/stock_icons/16x16/zoom-original.template.svg index 745d8531af..745d8531af 100644 --- a/image/stock_icons/16x16/zoom-original.template.svg +++ b/resources/stock_icons/16x16/zoom-original.template.svg diff --git a/image/stock_icons/16x16/zoom-original.template@2x.png b/resources/stock_icons/16x16/zoom-original.template@2x.png Binary files differindex 43b998a803..43b998a803 100644 --- a/image/stock_icons/16x16/zoom-original.template@2x.png +++ b/resources/stock_icons/16x16/zoom-original.template@2x.png diff --git a/image/stock_icons/16x16/zoom-out.template.png b/resources/stock_icons/16x16/zoom-out.template.png Binary files differindex 4316e231b4..4316e231b4 100644 --- a/image/stock_icons/16x16/zoom-out.template.png +++ b/resources/stock_icons/16x16/zoom-out.template.png diff --git a/image/stock_icons/16x16/zoom-out.template.svg b/resources/stock_icons/16x16/zoom-out.template.svg index db52864234..db52864234 100644 --- a/image/stock_icons/16x16/zoom-out.template.svg +++ b/resources/stock_icons/16x16/zoom-out.template.svg diff --git a/image/stock_icons/16x16/zoom-out.template@2x.png b/resources/stock_icons/16x16/zoom-out.template@2x.png Binary files differindex d1a79d39eb..d1a79d39eb 100644 --- a/image/stock_icons/16x16/zoom-out.template@2x.png +++ b/resources/stock_icons/16x16/zoom-out.template@2x.png diff --git a/image/stock_icons/24x14/x-filter-apply.active.png b/resources/stock_icons/24x14/x-filter-apply.active.png Binary files differindex af62445f4d..af62445f4d 100644 --- a/image/stock_icons/24x14/x-filter-apply.active.png +++ b/resources/stock_icons/24x14/x-filter-apply.active.png diff --git a/image/stock_icons/24x14/x-filter-apply.active.svg b/resources/stock_icons/24x14/x-filter-apply.active.svg index ad0b22fa68..ad0b22fa68 100644 --- a/image/stock_icons/24x14/x-filter-apply.active.svg +++ b/resources/stock_icons/24x14/x-filter-apply.active.svg diff --git a/image/stock_icons/24x14/x-filter-apply.active@2x.png b/resources/stock_icons/24x14/x-filter-apply.active@2x.png Binary files differindex 87d65a8d22..87d65a8d22 100644 --- a/image/stock_icons/24x14/x-filter-apply.active@2x.png +++ b/resources/stock_icons/24x14/x-filter-apply.active@2x.png diff --git a/image/stock_icons/24x14/x-filter-apply.png b/resources/stock_icons/24x14/x-filter-apply.png Binary files differindex cf212fa052..cf212fa052 100644 --- a/image/stock_icons/24x14/x-filter-apply.png +++ b/resources/stock_icons/24x14/x-filter-apply.png diff --git a/image/stock_icons/24x14/x-filter-apply.selected.png b/resources/stock_icons/24x14/x-filter-apply.selected.png Binary files differindex 7aa4dd9ade..7aa4dd9ade 100644 --- a/image/stock_icons/24x14/x-filter-apply.selected.png +++ b/resources/stock_icons/24x14/x-filter-apply.selected.png diff --git a/image/stock_icons/24x14/x-filter-apply.selected.svg b/resources/stock_icons/24x14/x-filter-apply.selected.svg index d1489ddaf3..d1489ddaf3 100644 --- a/image/stock_icons/24x14/x-filter-apply.selected.svg +++ b/resources/stock_icons/24x14/x-filter-apply.selected.svg diff --git a/image/stock_icons/24x14/x-filter-apply.selected@2x.png b/resources/stock_icons/24x14/x-filter-apply.selected@2x.png Binary files differindex 14f281b512..14f281b512 100644 --- a/image/stock_icons/24x14/x-filter-apply.selected@2x.png +++ b/resources/stock_icons/24x14/x-filter-apply.selected@2x.png diff --git a/image/stock_icons/24x14/x-filter-apply.svg b/resources/stock_icons/24x14/x-filter-apply.svg index d795e46c03..d795e46c03 100644 --- a/image/stock_icons/24x14/x-filter-apply.svg +++ b/resources/stock_icons/24x14/x-filter-apply.svg diff --git a/image/stock_icons/24x14/x-filter-apply@2x.png b/resources/stock_icons/24x14/x-filter-apply@2x.png Binary files differindex 952b292ea0..952b292ea0 100644 --- a/image/stock_icons/24x14/x-filter-apply@2x.png +++ b/resources/stock_icons/24x14/x-filter-apply@2x.png diff --git a/image/stock_icons/24x24/edit-find.template.png b/resources/stock_icons/24x24/edit-find.template.png Binary files differindex 58c9468ec1..58c9468ec1 100644 --- a/image/stock_icons/24x24/edit-find.template.png +++ b/resources/stock_icons/24x24/edit-find.template.png diff --git a/image/stock_icons/24x24/edit-find.template.svg b/resources/stock_icons/24x24/edit-find.template.svg index f669b6b4df..f669b6b4df 100644 --- a/image/stock_icons/24x24/edit-find.template.svg +++ b/resources/stock_icons/24x24/edit-find.template.svg diff --git a/image/stock_icons/24x24/edit-find.template@2x.png b/resources/stock_icons/24x24/edit-find.template@2x.png Binary files differindex a100f18fab..a100f18fab 100644 --- a/image/stock_icons/24x24/edit-find.template@2x.png +++ b/resources/stock_icons/24x24/edit-find.template@2x.png diff --git a/image/stock_icons/24x24/go-first.png b/resources/stock_icons/24x24/go-first.png Binary files differindex 95b485a04f..95b485a04f 100644 --- a/image/stock_icons/24x24/go-first.png +++ b/resources/stock_icons/24x24/go-first.png diff --git a/image/stock_icons/24x24/go-first.svg b/resources/stock_icons/24x24/go-first.svg index c8973891e7..c8973891e7 100644 --- a/image/stock_icons/24x24/go-first.svg +++ b/resources/stock_icons/24x24/go-first.svg diff --git a/image/stock_icons/24x24/go-first@2x.png b/resources/stock_icons/24x24/go-first@2x.png Binary files differindex 21c81dcbbd..21c81dcbbd 100644 --- a/image/stock_icons/24x24/go-first@2x.png +++ b/resources/stock_icons/24x24/go-first@2x.png diff --git a/image/stock_icons/24x24/go-jump.png b/resources/stock_icons/24x24/go-jump.png Binary files differindex cc13792d2e..cc13792d2e 100644 --- a/image/stock_icons/24x24/go-jump.png +++ b/resources/stock_icons/24x24/go-jump.png diff --git a/image/stock_icons/24x24/go-jump.svg b/resources/stock_icons/24x24/go-jump.svg index 6a6a1c5be1..6a6a1c5be1 100644 --- a/image/stock_icons/24x24/go-jump.svg +++ b/resources/stock_icons/24x24/go-jump.svg diff --git a/image/stock_icons/24x24/go-jump@2x.png b/resources/stock_icons/24x24/go-jump@2x.png Binary files differindex 49677be9ae..49677be9ae 100644 --- a/image/stock_icons/24x24/go-jump@2x.png +++ b/resources/stock_icons/24x24/go-jump@2x.png diff --git a/image/stock_icons/24x24/go-last.png b/resources/stock_icons/24x24/go-last.png Binary files differindex 78ea4b706b..78ea4b706b 100644 --- a/image/stock_icons/24x24/go-last.png +++ b/resources/stock_icons/24x24/go-last.png diff --git a/image/stock_icons/24x24/go-last.svg b/resources/stock_icons/24x24/go-last.svg index cde521a1b3..cde521a1b3 100644 --- a/image/stock_icons/24x24/go-last.svg +++ b/resources/stock_icons/24x24/go-last.svg diff --git a/image/stock_icons/24x24/go-last@2x.png b/resources/stock_icons/24x24/go-last@2x.png Binary files differindex 742ed28d24..742ed28d24 100644 --- a/image/stock_icons/24x24/go-last@2x.png +++ b/resources/stock_icons/24x24/go-last@2x.png diff --git a/image/stock_icons/24x24/go-next.png b/resources/stock_icons/24x24/go-next.png Binary files differindex 0bc6a15620..0bc6a15620 100644 --- a/image/stock_icons/24x24/go-next.png +++ b/resources/stock_icons/24x24/go-next.png diff --git a/image/stock_icons/24x24/go-next.svg b/resources/stock_icons/24x24/go-next.svg index fe9e024394..fe9e024394 100644 --- a/image/stock_icons/24x24/go-next.svg +++ b/resources/stock_icons/24x24/go-next.svg diff --git a/image/stock_icons/24x24/go-next@2x.png b/resources/stock_icons/24x24/go-next@2x.png Binary files differindex f25a5dbaa4..f25a5dbaa4 100644 --- a/image/stock_icons/24x24/go-next@2x.png +++ b/resources/stock_icons/24x24/go-next@2x.png diff --git a/image/stock_icons/24x24/go-previous.png b/resources/stock_icons/24x24/go-previous.png Binary files differindex 6870ea2fbe..6870ea2fbe 100644 --- a/image/stock_icons/24x24/go-previous.png +++ b/resources/stock_icons/24x24/go-previous.png diff --git a/image/stock_icons/24x24/go-previous.svg b/resources/stock_icons/24x24/go-previous.svg index 93937953cd..93937953cd 100644 --- a/image/stock_icons/24x24/go-previous.svg +++ b/resources/stock_icons/24x24/go-previous.svg diff --git a/image/stock_icons/24x24/go-previous@2x.png b/resources/stock_icons/24x24/go-previous@2x.png Binary files differindex 7f23c8fb64..7f23c8fb64 100644 --- a/image/stock_icons/24x24/go-previous@2x.png +++ b/resources/stock_icons/24x24/go-previous@2x.png diff --git a/image/stock_icons/24x24/x-capture-file-close.png b/resources/stock_icons/24x24/x-capture-file-close.png Binary files differindex dab2f84ce0..dab2f84ce0 100644 --- a/image/stock_icons/24x24/x-capture-file-close.png +++ b/resources/stock_icons/24x24/x-capture-file-close.png diff --git a/image/stock_icons/24x24/x-capture-file-close.svg b/resources/stock_icons/24x24/x-capture-file-close.svg index e74a6467bc..1565edb046 100644 --- a/image/stock_icons/24x24/x-capture-file-close.svg +++ b/resources/stock_icons/24x24/x-capture-file-close.svg @@ -73,7 +73,7 @@ y="1028.3622" x="0" id="image3237" - xlink:href="../../WiresharkDoc-24.png" + xlink:href="../../icons/WiresharkDoc-24.png" height="24" width="24" /> <path diff --git a/image/stock_icons/24x24/x-capture-file-close@2x.png b/resources/stock_icons/24x24/x-capture-file-close@2x.png Binary files differindex 4ca5b80675..4ca5b80675 100644 --- a/image/stock_icons/24x24/x-capture-file-close@2x.png +++ b/resources/stock_icons/24x24/x-capture-file-close@2x.png diff --git a/image/stock_icons/24x24/x-capture-file-close@2x.svg b/resources/stock_icons/24x24/x-capture-file-close@2x.svg index 9d657ad54c..bc09b6e3ff 100644 --- a/image/stock_icons/24x24/x-capture-file-close@2x.svg +++ b/resources/stock_icons/24x24/x-capture-file-close@2x.svg @@ -73,7 +73,7 @@ y="1004.3622" x="0" id="image4129" - xlink:href="../../WiresharkDoc-48.png" + xlink:href="../../icons/WiresharkDoc-48.png" height="48" width="48" /> <path diff --git a/image/stock_icons/24x24/x-capture-file-reload.png b/resources/stock_icons/24x24/x-capture-file-reload.png Binary files differindex 22e6edb21e..22e6edb21e 100644 --- a/image/stock_icons/24x24/x-capture-file-reload.png +++ b/resources/stock_icons/24x24/x-capture-file-reload.png diff --git a/image/stock_icons/24x24/x-capture-file-reload.svg b/resources/stock_icons/24x24/x-capture-file-reload.svg index e244d08a03..61d3a67dab 100644 --- a/image/stock_icons/24x24/x-capture-file-reload.svg +++ b/resources/stock_icons/24x24/x-capture-file-reload.svg @@ -87,7 +87,7 @@ id="layer1" transform="translate(0,-1028.3622)"> <image - xlink:href="../../WiresharkDoc-24.png" + xlink:href="../../icons/WiresharkDoc-24.png" style="fill:#2e3436;stroke:#2e3436" width="24" height="24" diff --git a/image/stock_icons/24x24/x-capture-file-reload@2x.png b/resources/stock_icons/24x24/x-capture-file-reload@2x.png Binary files differindex e56a0b8beb..e56a0b8beb 100644 --- a/image/stock_icons/24x24/x-capture-file-reload@2x.png +++ b/resources/stock_icons/24x24/x-capture-file-reload@2x.png diff --git a/image/stock_icons/24x24/x-capture-file-reload@2x.svg b/resources/stock_icons/24x24/x-capture-file-reload@2x.svg index df81cb7370..cdcdd0704d 100644 --- a/image/stock_icons/24x24/x-capture-file-reload@2x.svg +++ b/resources/stock_icons/24x24/x-capture-file-reload@2x.svg @@ -84,7 +84,7 @@ id="layer1" transform="translate(0,-1004.3622)"> <image - xlink:href="../../WiresharkDoc-48.png" + xlink:href="../../icons/WiresharkDoc-48.png" width="48" height="48" id="image4129" diff --git a/image/stock_icons/24x24/x-capture-file-save.png b/resources/stock_icons/24x24/x-capture-file-save.png Binary files differindex 48ef2525d0..48ef2525d0 100644 --- a/image/stock_icons/24x24/x-capture-file-save.png +++ b/resources/stock_icons/24x24/x-capture-file-save.png diff --git a/image/stock_icons/24x24/x-capture-file-save.svg b/resources/stock_icons/24x24/x-capture-file-save.svg index b8d3cfc7cd..c8a5deedf0 100644 --- a/image/stock_icons/24x24/x-capture-file-save.svg +++ b/resources/stock_icons/24x24/x-capture-file-save.svg @@ -73,7 +73,7 @@ y="1028.3622" x="0" id="image3237" - xlink:href="../../WiresharkDoc-24.png" + xlink:href="../../icons/WiresharkDoc-24.png" height="24" width="24" /> <path diff --git a/image/stock_icons/24x24/x-capture-file-save@2x.png b/resources/stock_icons/24x24/x-capture-file-save@2x.png Binary files differindex ccc92d61f8..ccc92d61f8 100644 --- a/image/stock_icons/24x24/x-capture-file-save@2x.png +++ b/resources/stock_icons/24x24/x-capture-file-save@2x.png diff --git a/image/stock_icons/24x24/x-capture-file-save@2x.svg b/resources/stock_icons/24x24/x-capture-file-save@2x.svg index deafd1719d..4f5b668559 100644 --- a/image/stock_icons/24x24/x-capture-file-save@2x.svg +++ b/resources/stock_icons/24x24/x-capture-file-save@2x.svg @@ -73,7 +73,7 @@ y="1004.3622" x="0" id="image4129" - xlink:href="../../WiresharkDoc-48.png" + xlink:href="../../icons/WiresharkDoc-48.png" height="48" width="48" /> <path diff --git a/image/stock_icons/24x24/x-capture-options-gear.svg b/resources/stock_icons/24x24/x-capture-options-gear.svg index c47e5d1a44..c47e5d1a44 100644 --- a/image/stock_icons/24x24/x-capture-options-gear.svg +++ b/resources/stock_icons/24x24/x-capture-options-gear.svg diff --git a/image/stock_icons/24x24/x-capture-options-wrench.svg b/resources/stock_icons/24x24/x-capture-options-wrench.svg index f3a40f3e7a..f3a40f3e7a 100644 --- a/image/stock_icons/24x24/x-capture-options-wrench.svg +++ b/resources/stock_icons/24x24/x-capture-options-wrench.svg diff --git a/image/stock_icons/24x24/x-capture-options.png b/resources/stock_icons/24x24/x-capture-options.png Binary files differindex a3384e6aca..a3384e6aca 100644 --- a/image/stock_icons/24x24/x-capture-options.png +++ b/resources/stock_icons/24x24/x-capture-options.png diff --git a/image/stock_icons/24x24/x-capture-options@2x.png b/resources/stock_icons/24x24/x-capture-options@2x.png Binary files differindex 7ee5c74aff..7ee5c74aff 100644 --- a/image/stock_icons/24x24/x-capture-options@2x.png +++ b/resources/stock_icons/24x24/x-capture-options@2x.png diff --git a/image/stock_icons/24x24/x-capture-restart-fin.svg b/resources/stock_icons/24x24/x-capture-restart-fin.svg index dd32fa99db..dd32fa99db 100644 --- a/image/stock_icons/24x24/x-capture-restart-fin.svg +++ b/resources/stock_icons/24x24/x-capture-restart-fin.svg diff --git a/image/stock_icons/24x24/x-capture-restart-triangle1.svg b/resources/stock_icons/24x24/x-capture-restart-triangle1.svg index 282152c80d..282152c80d 100644 --- a/image/stock_icons/24x24/x-capture-restart-triangle1.svg +++ b/resources/stock_icons/24x24/x-capture-restart-triangle1.svg diff --git a/image/stock_icons/24x24/x-capture-restart-triangle2.svg b/resources/stock_icons/24x24/x-capture-restart-triangle2.svg index 5e65e22574..5e65e22574 100644 --- a/image/stock_icons/24x24/x-capture-restart-triangle2.svg +++ b/resources/stock_icons/24x24/x-capture-restart-triangle2.svg diff --git a/image/stock_icons/24x24/x-capture-restart-turn1.svg b/resources/stock_icons/24x24/x-capture-restart-turn1.svg index be34730e84..be34730e84 100644 --- a/image/stock_icons/24x24/x-capture-restart-turn1.svg +++ b/resources/stock_icons/24x24/x-capture-restart-turn1.svg diff --git a/image/stock_icons/24x24/x-capture-restart-turn2.svg b/resources/stock_icons/24x24/x-capture-restart-turn2.svg index b2187d9415..b2187d9415 100644 --- a/image/stock_icons/24x24/x-capture-restart-turn2.svg +++ b/resources/stock_icons/24x24/x-capture-restart-turn2.svg diff --git a/image/stock_icons/24x24/x-capture-restart.png b/resources/stock_icons/24x24/x-capture-restart.png Binary files differindex eb5eb0b654..eb5eb0b654 100644 --- a/image/stock_icons/24x24/x-capture-restart.png +++ b/resources/stock_icons/24x24/x-capture-restart.png diff --git a/image/stock_icons/24x24/x-capture-restart@2x.png b/resources/stock_icons/24x24/x-capture-restart@2x.png Binary files differindex 0ee183c082..0ee183c082 100644 --- a/image/stock_icons/24x24/x-capture-restart@2x.png +++ b/resources/stock_icons/24x24/x-capture-restart@2x.png diff --git a/image/stock_icons/24x24/x-capture-start.on.png b/resources/stock_icons/24x24/x-capture-start.on.png Binary files differindex ac5c5cd1b1..ac5c5cd1b1 100644 --- a/image/stock_icons/24x24/x-capture-start.on.png +++ b/resources/stock_icons/24x24/x-capture-start.on.png diff --git a/image/stock_icons/24x24/x-capture-start.on.svg b/resources/stock_icons/24x24/x-capture-start.on.svg index 38411e8a54..38411e8a54 100644 --- a/image/stock_icons/24x24/x-capture-start.on.svg +++ b/resources/stock_icons/24x24/x-capture-start.on.svg diff --git a/image/stock_icons/24x24/x-capture-start.on@2x.png b/resources/stock_icons/24x24/x-capture-start.on@2x.png Binary files differindex 75a983b7e7..75a983b7e7 100644 --- a/image/stock_icons/24x24/x-capture-start.on@2x.png +++ b/resources/stock_icons/24x24/x-capture-start.on@2x.png diff --git a/image/stock_icons/24x24/x-capture-start.png b/resources/stock_icons/24x24/x-capture-start.png Binary files differindex ac0a3d2b02..ac0a3d2b02 100644 --- a/image/stock_icons/24x24/x-capture-start.png +++ b/resources/stock_icons/24x24/x-capture-start.png diff --git a/image/stock_icons/24x24/x-capture-start.svg b/resources/stock_icons/24x24/x-capture-start.svg index 099c716f4c..099c716f4c 100644 --- a/image/stock_icons/24x24/x-capture-start.svg +++ b/resources/stock_icons/24x24/x-capture-start.svg diff --git a/image/stock_icons/24x24/x-capture-start@2x.png b/resources/stock_icons/24x24/x-capture-start@2x.png Binary files differindex 414fa921b1..414fa921b1 100644 --- a/image/stock_icons/24x24/x-capture-start@2x.png +++ b/resources/stock_icons/24x24/x-capture-start@2x.png diff --git a/image/stock_icons/24x24/x-capture-stop-red.svg b/resources/stock_icons/24x24/x-capture-stop-red.svg index 2cff0b6994..2cff0b6994 100644 --- a/image/stock_icons/24x24/x-capture-stop-red.svg +++ b/resources/stock_icons/24x24/x-capture-stop-red.svg diff --git a/image/stock_icons/24x24/x-capture-stop-white.svg b/resources/stock_icons/24x24/x-capture-stop-white.svg index 98880b9d8b..98880b9d8b 100644 --- a/image/stock_icons/24x24/x-capture-stop-white.svg +++ b/resources/stock_icons/24x24/x-capture-stop-white.svg diff --git a/image/stock_icons/24x24/x-capture-stop.png b/resources/stock_icons/24x24/x-capture-stop.png Binary files differindex 7a64753dd3..7a64753dd3 100644 --- a/image/stock_icons/24x24/x-capture-stop.png +++ b/resources/stock_icons/24x24/x-capture-stop.png diff --git a/image/stock_icons/24x24/x-capture-stop@2x.png b/resources/stock_icons/24x24/x-capture-stop@2x.png Binary files differindex 6cb456cfc2..6cb456cfc2 100644 --- a/image/stock_icons/24x24/x-capture-stop@2x.png +++ b/resources/stock_icons/24x24/x-capture-stop@2x.png diff --git a/image/stock_icons/24x24/x-colorize-packets.png b/resources/stock_icons/24x24/x-colorize-packets.png Binary files differindex 624b7eae46..624b7eae46 100644 --- a/image/stock_icons/24x24/x-colorize-packets.png +++ b/resources/stock_icons/24x24/x-colorize-packets.png diff --git a/image/stock_icons/24x24/x-colorize-packets.svg b/resources/stock_icons/24x24/x-colorize-packets.svg index c986c4f504..c986c4f504 100644 --- a/image/stock_icons/24x24/x-colorize-packets.svg +++ b/resources/stock_icons/24x24/x-colorize-packets.svg diff --git a/image/stock_icons/24x24/x-colorize-packets@2x.png b/resources/stock_icons/24x24/x-colorize-packets@2x.png Binary files differindex 50079694a2..50079694a2 100644 --- a/image/stock_icons/24x24/x-colorize-packets@2x.png +++ b/resources/stock_icons/24x24/x-colorize-packets@2x.png diff --git a/image/stock_icons/24x24/x-resize-columns-motion.svg b/resources/stock_icons/24x24/x-resize-columns-motion.svg index 3e37afee05..3e37afee05 100644 --- a/image/stock_icons/24x24/x-resize-columns-motion.svg +++ b/resources/stock_icons/24x24/x-resize-columns-motion.svg diff --git a/image/stock_icons/24x24/x-resize-columns.png b/resources/stock_icons/24x24/x-resize-columns.png Binary files differindex f79cf3216f..f79cf3216f 100644 --- a/image/stock_icons/24x24/x-resize-columns.png +++ b/resources/stock_icons/24x24/x-resize-columns.png diff --git a/image/stock_icons/24x24/x-resize-columns.svg b/resources/stock_icons/24x24/x-resize-columns.svg index fd8f79bcc8..fd8f79bcc8 100644 --- a/image/stock_icons/24x24/x-resize-columns.svg +++ b/resources/stock_icons/24x24/x-resize-columns.svg diff --git a/image/stock_icons/24x24/x-resize-columns@2x.png b/resources/stock_icons/24x24/x-resize-columns@2x.png Binary files differindex 7c51e40fe5..7c51e40fe5 100644 --- a/image/stock_icons/24x24/x-resize-columns@2x.png +++ b/resources/stock_icons/24x24/x-resize-columns@2x.png diff --git a/image/stock_icons/24x24/x-stay-last.png b/resources/stock_icons/24x24/x-stay-last.png Binary files differindex eba7ae54b2..eba7ae54b2 100644 --- a/image/stock_icons/24x24/x-stay-last.png +++ b/resources/stock_icons/24x24/x-stay-last.png diff --git a/image/stock_icons/24x24/x-stay-last.svg b/resources/stock_icons/24x24/x-stay-last.svg index 2bbd401b6f..2bbd401b6f 100644 --- a/image/stock_icons/24x24/x-stay-last.svg +++ b/resources/stock_icons/24x24/x-stay-last.svg diff --git a/image/stock_icons/24x24/x-stay-last@2x.png b/resources/stock_icons/24x24/x-stay-last@2x.png Binary files differindex 14d1a40d3e..14d1a40d3e 100644 --- a/image/stock_icons/24x24/x-stay-last@2x.png +++ b/resources/stock_icons/24x24/x-stay-last@2x.png diff --git a/image/stock_icons/24x24/zoom-in.template.png b/resources/stock_icons/24x24/zoom-in.template.png Binary files differindex f5ea80bc5e..f5ea80bc5e 100644 --- a/image/stock_icons/24x24/zoom-in.template.png +++ b/resources/stock_icons/24x24/zoom-in.template.png diff --git a/image/stock_icons/24x24/zoom-in.template.svg b/resources/stock_icons/24x24/zoom-in.template.svg index 8fd1ecff7b..8fd1ecff7b 100644 --- a/image/stock_icons/24x24/zoom-in.template.svg +++ b/resources/stock_icons/24x24/zoom-in.template.svg diff --git a/image/stock_icons/24x24/zoom-in.template@2x.png b/resources/stock_icons/24x24/zoom-in.template@2x.png Binary files differindex 02ffdd4d5a..02ffdd4d5a 100644 --- a/image/stock_icons/24x24/zoom-in.template@2x.png +++ b/resources/stock_icons/24x24/zoom-in.template@2x.png diff --git a/image/stock_icons/24x24/zoom-original.svg b/resources/stock_icons/24x24/zoom-original.svg index 5f7c85a258..5f7c85a258 100644 --- a/image/stock_icons/24x24/zoom-original.svg +++ b/resources/stock_icons/24x24/zoom-original.svg diff --git a/image/stock_icons/24x24/zoom-original.template.png b/resources/stock_icons/24x24/zoom-original.template.png Binary files differindex ca7c3ae970..ca7c3ae970 100644 --- a/image/stock_icons/24x24/zoom-original.template.png +++ b/resources/stock_icons/24x24/zoom-original.template.png diff --git a/image/stock_icons/24x24/zoom-original.template.svg b/resources/stock_icons/24x24/zoom-original.template.svg index e347e53b31..e347e53b31 100644 --- a/image/stock_icons/24x24/zoom-original.template.svg +++ b/resources/stock_icons/24x24/zoom-original.template.svg diff --git a/image/stock_icons/24x24/zoom-original.template@2x.png b/resources/stock_icons/24x24/zoom-original.template@2x.png Binary files differindex bfc13414ee..bfc13414ee 100644 --- a/image/stock_icons/24x24/zoom-original.template@2x.png +++ b/resources/stock_icons/24x24/zoom-original.template@2x.png diff --git a/image/stock_icons/24x24/zoom-out.svg b/resources/stock_icons/24x24/zoom-out.svg index 354f18f40d..354f18f40d 100644 --- a/image/stock_icons/24x24/zoom-out.svg +++ b/resources/stock_icons/24x24/zoom-out.svg diff --git a/image/stock_icons/24x24/zoom-out.template.png b/resources/stock_icons/24x24/zoom-out.template.png Binary files differindex 7cfdbcc5c4..7cfdbcc5c4 100644 --- a/image/stock_icons/24x24/zoom-out.template.png +++ b/resources/stock_icons/24x24/zoom-out.template.png diff --git a/image/stock_icons/24x24/zoom-out.template.svg b/resources/stock_icons/24x24/zoom-out.template.svg index 2a4f7eac7c..2a4f7eac7c 100644 --- a/image/stock_icons/24x24/zoom-out.template.svg +++ b/resources/stock_icons/24x24/zoom-out.template.svg diff --git a/image/stock_icons/24x24/zoom-out.template@2x.png b/resources/stock_icons/24x24/zoom-out.template@2x.png Binary files differindex 845bfd2007..845bfd2007 100644 --- a/image/stock_icons/24x24/zoom-out.template@2x.png +++ b/resources/stock_icons/24x24/zoom-out.template@2x.png diff --git a/image/stock_icons/8x8/list-add.template.png b/resources/stock_icons/8x8/list-add.template.png Binary files differindex f4796f1b7e..f4796f1b7e 100644 --- a/image/stock_icons/8x8/list-add.template.png +++ b/resources/stock_icons/8x8/list-add.template.png diff --git a/image/stock_icons/8x8/list-clear.template.png b/resources/stock_icons/8x8/list-clear.template.png Binary files differindex 52f9f112eb..52f9f112eb 100644 --- a/image/stock_icons/8x8/list-clear.template.png +++ b/resources/stock_icons/8x8/list-clear.template.png diff --git a/image/stock_icons/8x8/list-clear.template@2x.png b/resources/stock_icons/8x8/list-clear.template@2x.png Binary files differindex c1b2ccdafc..c1b2ccdafc 100644 --- a/image/stock_icons/8x8/list-clear.template@2x.png +++ b/resources/stock_icons/8x8/list-clear.template@2x.png diff --git a/image/stock_icons/8x8/list-copy.template.png b/resources/stock_icons/8x8/list-copy.template.png Binary files differindex 117d80c039..117d80c039 100644 --- a/image/stock_icons/8x8/list-copy.template.png +++ b/resources/stock_icons/8x8/list-copy.template.png diff --git a/image/stock_icons/8x8/list-copy.template.xcf b/resources/stock_icons/8x8/list-copy.template.xcf Binary files differindex 3be9d711f5..3be9d711f5 100644 --- a/image/stock_icons/8x8/list-copy.template.xcf +++ b/resources/stock_icons/8x8/list-copy.template.xcf diff --git a/image/stock_icons/8x8/list-move-down.template.png b/resources/stock_icons/8x8/list-move-down.template.png Binary files differindex f71e54ff48..f71e54ff48 100644 --- a/image/stock_icons/8x8/list-move-down.template.png +++ b/resources/stock_icons/8x8/list-move-down.template.png diff --git a/image/stock_icons/8x8/list-move-down.template@2x.png b/resources/stock_icons/8x8/list-move-down.template@2x.png Binary files differindex 067b143a98..067b143a98 100644 --- a/image/stock_icons/8x8/list-move-down.template@2x.png +++ b/resources/stock_icons/8x8/list-move-down.template@2x.png diff --git a/image/stock_icons/8x8/list-move-up.template.png b/resources/stock_icons/8x8/list-move-up.template.png Binary files differindex d6ce9b7ce6..d6ce9b7ce6 100644 --- a/image/stock_icons/8x8/list-move-up.template.png +++ b/resources/stock_icons/8x8/list-move-up.template.png diff --git a/image/stock_icons/8x8/list-move-up.template@2x.png b/resources/stock_icons/8x8/list-move-up.template@2x.png Binary files differindex a4f9a8b339..a4f9a8b339 100644 --- a/image/stock_icons/8x8/list-move-up.template@2x.png +++ b/resources/stock_icons/8x8/list-move-up.template@2x.png diff --git a/image/stock_icons/8x8/list-remove.template.png b/resources/stock_icons/8x8/list-remove.template.png Binary files differindex eddbcc614d..eddbcc614d 100644 --- a/image/stock_icons/8x8/list-remove.template.png +++ b/resources/stock_icons/8x8/list-remove.template.png diff --git a/image/stock_icons/svg-to-png.sh b/resources/stock_icons/svg-to-png.sh index e37c503e89..e37c503e89 100755 --- a/image/stock_icons/svg-to-png.sh +++ b/resources/stock_icons/svg-to-png.sh diff --git a/image/tshark.rc.in b/resources/tshark.rc.in index e995cf3f6d..e995cf3f6d 100644 --- a/image/tshark.rc.in +++ b/resources/tshark.rc.in diff --git a/image/wireshark.exe.manifest.in b/resources/wireshark.exe.manifest.in index 2cb3d4a1da..2cb3d4a1da 100644 --- a/image/wireshark.exe.manifest.in +++ b/resources/wireshark.exe.manifest.in diff --git a/image/wireshark.rc.in b/resources/wireshark.rc.in index ba337e6e9d..ba337e6e9d 100644 --- a/image/wireshark.rc.in +++ b/resources/wireshark.rc.in diff --git a/resources/wsicon.qrc b/resources/wsicon.qrc new file mode 100644 index 0000000000..9e1d28a11a --- /dev/null +++ b/resources/wsicon.qrc @@ -0,0 +1,22 @@ +<RCC> + <qresource prefix="/wsicon"> + <file alias="wsiconcap16.png">icons/wsiconcap16.png</file> + <file alias="wsiconcap24.png">icons/wsiconcap24.png</file> + <file alias="wsiconcap32.png">icons/wsiconcap32.png</file> + <file alias="wsiconcap48.png">icons/wsiconcap48.png</file> + <file alias="wsiconcap64.png">icons/wsiconcap64.png</file> + <file alias="wsiconcap128.png">icons/wsiconcap128.png</file> + <file alias="wsiconcap256.png">icons/wsiconcap256.png</file> + <file alias="wsiconcap512.png">icons/wsiconcap512.png</file> + <file alias="wsiconcap1024.png">icons/wsiconcap1024.png</file> + <file alias="wsicon16.png">icons/wsicon16.png</file> + <file alias="wsicon24.png">icons/wsicon24.png</file> + <file alias="wsicon32.png">icons/wsicon32.png</file> + <file alias="wsicon48.png">icons/wsicon48.png</file> + <file alias="wsicon64.png">icons/wsicon64.png</file> + <file alias="wsicon128.png">icons/wsicon128.png</file> + <file alias="wsicon256.png">icons/wsicon256.png</file> + <file alias="wsicon512.png">icons/wsicon512.png</file> + <file alias="wsicon1024.png">icons/wsicon1024.png</file> + </qresource> +</RCC> diff --git a/image/wslogo-dev.svg b/resources/wslogo-dev.svg index 23bce7b3fe..23bce7b3fe 100644 --- a/image/wslogo-dev.svg +++ b/resources/wslogo-dev.svg diff --git a/image/wslogo.eps b/resources/wslogo.eps index 2b808b3d77..2b808b3d77 100644 --- a/image/wslogo.eps +++ b/resources/wslogo.eps diff --git a/image/wslogo.svg b/resources/wslogo.svg index 191919701d..191919701d 100644 --- a/image/wslogo.svg +++ b/resources/wslogo.svg diff --git a/image/wssplash.png b/resources/wssplash.png Binary files differindex 35f1ab7d48..35f1ab7d48 100644 --- a/image/wssplash.png +++ b/resources/wssplash.png diff --git a/image/wssplash_dev.png b/resources/wssplash_dev.png Binary files differindex 49e82116e6..49e82116e6 100644 --- a/image/wssplash_dev.png +++ b/resources/wssplash_dev.png diff --git a/tools/pre-commit-ignore.conf b/tools/pre-commit-ignore.conf index a34cbe3273..09c40a8b05 100644 --- a/tools/pre-commit-ignore.conf +++ b/tools/pre-commit-ignore.conf @@ -19,7 +19,7 @@ epan/wmem/wmem_strbuf.c epan/wmem/wmem_strutil.c epan/wslua/init_wslua.c extcap/* -image/stock_icons/* +resources/stock_icons/* mmdbresolve.c packaging/* tools/lemon/* diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt index 2738eb747b..5df1019077 100644 --- a/ui/qt/CMakeLists.txt +++ b/ui/qt/CMakeLists.txt @@ -633,11 +633,11 @@ endforeach() configure_file(${CMAKE_CURRENT_SOURCE_DIR}/i18n.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc) set(WIRESHARK_QT_QRC - ../../image/about.qrc - ../../image/languages/languages.qrc - ../../image/layout.qrc - ../../image/stock_icons.qrc - ../../image/wsicon.qrc + ../../resources/about.qrc + ../../resources/languages/languages.qrc + ../../resources/layout.qrc + ../../resources/stock_icons.qrc + ../../resources/wsicon.qrc ${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc ) diff --git a/ui/qt/about_dialog.ui b/ui/qt/about_dialog.ui index f986b76d45..7d7ff4be5d 100644 --- a/ui/qt/about_dialog.ui +++ b/ui/qt/about_dialog.ui @@ -42,7 +42,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="../../image/about.qrc">:/about/wssplash.png</pixmap> + <pixmap resource="../../resources/about.qrc">:/about/wssplash.png</pixmap> </property> <property name="scaledContents"> <bool>false</bool> @@ -300,7 +300,7 @@ </layout> </widget> <resources> - <include location="../../image/about.qrc"/> + <include location="../../resources/about.qrc"/> </resources> <connections> <connection> diff --git a/ui/qt/layout_preferences_frame.ui b/ui/qt/layout_preferences_frame.ui index 163b880556..0120e2dd96 100644 --- a/ui/qt/layout_preferences_frame.ui +++ b/ui/qt/layout_preferences_frame.ui @@ -37,7 +37,7 @@ <string/> </property> <property name="icon"> - <iconset resource="../../image/layout.qrc"> + <iconset resource="../../resources/layout.qrc"> <normaloff>:/layout/layout_5.png</normaloff>:/layout/layout_5.png</iconset> </property> <property name="iconSize"> @@ -60,7 +60,7 @@ <string/> </property> <property name="icon"> - <iconset resource="../../image/layout.qrc"> + <iconset resource="../../resources/layout.qrc"> <normaloff>:/layout/layout_2.png</normaloff>:/layout/layout_2.png</iconset> </property> <property name="iconSize"> @@ -83,7 +83,7 @@ <string/> </property> <property name="icon"> - <iconset resource="../../image/layout.qrc"> + <iconset resource="../../resources/layout.qrc"> <normaloff>:/layout/layout_1.png</normaloff>:/layout/layout_1.png</iconset> </property> <property name="iconSize"> @@ -106,7 +106,7 @@ <string/> </property> <property name="icon"> - <iconset resource="../../image/layout.qrc"> + <iconset resource="../../resources/layout.qrc"> <normaloff>:/layout/layout_4.png</normaloff>:/layout/layout_4.png</iconset> </property> <property name="iconSize"> @@ -129,7 +129,7 @@ <string/> </property> <property name="icon"> - <iconset resource="../../image/layout.qrc"> + <iconset resource="../../resources/layout.qrc"> <normaloff>:/layout/layout_3.png</normaloff>:/layout/layout_3.png</iconset> </property> <property name="iconSize"> @@ -152,7 +152,7 @@ <string/> </property> <property name="icon"> - <iconset resource="../../image/layout.qrc"> + <iconset resource="../../resources/layout.qrc"> <normaloff>:/layout/layout_6.png</normaloff>:/layout/layout_6.png</iconset> </property> <property name="iconSize"> @@ -462,7 +462,7 @@ </layout> </widget> <resources> - <include location="../../image/layout.qrc"/> + <include location="../../resources/layout.qrc"/> </resources> <connections/> <buttongroups> diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index 0fc75613b8..f7adc4d61b 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -939,7 +939,7 @@ </action> <action name="actionHelpWebsite"> <property name="icon"> - <iconset resource="../../image/stock_icons.qrc"> + <iconset resource="../../resources/stock_icons.qrc"> <normaloff>:/menu/help/wsicon16.png</normaloff>:/menu/help/wsicon16.png</iconset> </property> <property name="text"> @@ -958,7 +958,7 @@ </action> <action name="actionHelpWiki"> <property name="icon"> - <iconset resource="../../image/stock_icons.qrc"> + <iconset resource="../../resources/stock_icons.qrc"> <normaloff>:/menu/help/wsicon16.png</normaloff>:/menu/help/wsicon16.png</iconset> </property> <property name="text"> @@ -983,7 +983,7 @@ </action> <action name="actionHelpAsk"> <property name="icon"> - <iconset resource="../../image/stock_icons.qrc"> + <iconset resource="../../resources/stock_icons.qrc"> <normaloff>:/menu/help/wsicon-ask.png</normaloff>:/menu/help/wsicon-ask.png</iconset> </property> <property name="text"> @@ -3088,7 +3088,7 @@ </customwidget> </customwidgets> <resources> - <include location="../../image/stock_icons.qrc"/> + <include location="../../resources/stock_icons.qrc"/> </resources> <connections> <connection> diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index 0b90f380af..53123d4c56 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -164,7 +164,7 @@ set_source_files_properties( add_library(wiretap ${WIRETAP_FILES} - ${CMAKE_BINARY_DIR}/image/libwiretap.rc + ${CMAKE_BINARY_DIR}/resources/libwiretap.rc ) set_target_properties(wiretap PROPERTIES diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index a15d44d9bd..7ee6cd212b 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -256,7 +256,7 @@ endif() add_library(wsutil ${WSUTIL_FILES} $<TARGET_OBJECTS:wmem> - ${CMAKE_BINARY_DIR}/image/libwsutil.rc + ${CMAKE_BINARY_DIR}/resources/libwsutil.rc ) set_target_properties(wsutil PROPERTIES |
