From 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:14:33 +0200 Subject: Merging upstream version 4.4.0. Signed-off-by: Daniel Baumann --- doc/wsdg_src/images/caution.svg | 3 + doc/wsdg_src/images/git-triangular-workflow.gv | 59 ++++ doc/wsdg_src/images/git-triangular-workflow.svg | 62 ++++ doc/wsdg_src/images/important.svg | 4 + doc/wsdg_src/images/note.svg | 3 + doc/wsdg_src/images/tip.svg | 3 + doc/wsdg_src/images/warning.svg | 4 + doc/wsdg_src/images/ws-capture-sync.dia | Bin 0 -> 2943 bytes doc/wsdg_src/images/ws-capture-sync.png | Bin 0 -> 5507 bytes doc/wsdg_src/images/ws-capture_internals.dia | Bin 0 -> 2149 bytes doc/wsdg_src/images/ws-capture_internals.png | Bin 0 -> 3699 bytes doc/wsdg_src/images/ws-dev-guide-cover.png | Bin 0 -> 13679 bytes doc/wsdg_src/images/ws-function-blocks.dia | Bin 0 -> 3354 bytes doc/wsdg_src/images/ws-function-blocks.svg | 449 ++++++++++++++++++++++++ doc/wsdg_src/images/ws-logo.png | Bin 0 -> 5707 bytes doc/wsdg_src/images/wslua-new-dialog.png | Bin 0 -> 21786 bytes doc/wsdg_src/images/wslua-progdlg.png | Bin 0 -> 12695 bytes doc/wsdg_src/images/wslua-textwindow.png | Bin 0 -> 26843 bytes 18 files changed, 587 insertions(+) create mode 100644 doc/wsdg_src/images/caution.svg create mode 100644 doc/wsdg_src/images/git-triangular-workflow.gv create mode 100644 doc/wsdg_src/images/git-triangular-workflow.svg create mode 100644 doc/wsdg_src/images/important.svg create mode 100644 doc/wsdg_src/images/note.svg create mode 100644 doc/wsdg_src/images/tip.svg create mode 100644 doc/wsdg_src/images/warning.svg create mode 100644 doc/wsdg_src/images/ws-capture-sync.dia create mode 100644 doc/wsdg_src/images/ws-capture-sync.png create mode 100644 doc/wsdg_src/images/ws-capture_internals.dia create mode 100644 doc/wsdg_src/images/ws-capture_internals.png create mode 100644 doc/wsdg_src/images/ws-dev-guide-cover.png create mode 100644 doc/wsdg_src/images/ws-function-blocks.dia create mode 100644 doc/wsdg_src/images/ws-function-blocks.svg create mode 100644 doc/wsdg_src/images/ws-logo.png create mode 100644 doc/wsdg_src/images/wslua-new-dialog.png create mode 100644 doc/wsdg_src/images/wslua-progdlg.png create mode 100644 doc/wsdg_src/images/wslua-textwindow.png (limited to 'doc/wsdg_src/images') diff --git a/doc/wsdg_src/images/caution.svg b/doc/wsdg_src/images/caution.svg new file mode 100644 index 00000000..793c6020 --- /dev/null +++ b/doc/wsdg_src/images/caution.svg @@ -0,0 +1,3 @@ + + + diff --git a/doc/wsdg_src/images/git-triangular-workflow.gv b/doc/wsdg_src/images/git-triangular-workflow.gv new file mode 100644 index 00000000..cb4fb174 --- /dev/null +++ b/doc/wsdg_src/images/git-triangular-workflow.gv @@ -0,0 +1,59 @@ +// dot -Tsvg -o doc/wsdg_graphics/git-triangular-workflow.svg doc/wsdg_graphics/git-triangular-workflow.gv + +digraph G { + // XXX Integrate ws.css. Match it manually for now. + graph [ + fontname = "Georgia", + fontsize = 12 + ]; + + node [ + fontname = "Georgia", + fontsize = 12, + shape=box, + style=rounded + ]; + + edge [ + fontname = "Georgia", + fontsize = 12 + ]; + + rankdir = TB; + ranksep = 1.0; + nodesep = 1.0; + // margin = "0.5,0.5"; + + main_repo [ + label=
gitlab.com/wireshark/wireshark> + ] + + your_fork [ + label=gitlab.com/you/wireshark> + ] + + your_repo [ + label=Somewhere on your machine> + ] + + { rank = same; main_repo; your_fork; } + + // :nw adds needed space + main_repo -> your_fork:nw [ + label = "Fork (once)", + style = dashed + ] + + main_repo -> your_repo [ + label = "Pull" + ] + + your_repo -> your_fork [ + label = "Push" + ] + + your_fork -> main_repo [ + label = "Merge Request" + ] + +} diff --git a/doc/wsdg_src/images/git-triangular-workflow.svg b/doc/wsdg_src/images/git-triangular-workflow.svg new file mode 100644 index 00000000..1f8ae3ac --- /dev/null +++ b/doc/wsdg_src/images/git-triangular-workflow.svg @@ -0,0 +1,62 @@ + + + + + + +G + + + +main_repo + +Main Repository +gitlab.com/wireshark/wireshark + + + +your_fork + +Your Fork +gitlab.com/you/wireshark + + + +main_repo->your_fork:nw + + +Fork (once) + + + +your_repo + +Your Local Repository +Somewhere on your machine + + + +main_repo->your_repo + + +Pull + + + +your_fork->main_repo + + +Merge Request + + + +your_repo->your_fork + + +Push + + + diff --git a/doc/wsdg_src/images/important.svg b/doc/wsdg_src/images/important.svg new file mode 100644 index 00000000..a2ee7012 --- /dev/null +++ b/doc/wsdg_src/images/important.svg @@ -0,0 +1,4 @@ + + + + diff --git a/doc/wsdg_src/images/note.svg b/doc/wsdg_src/images/note.svg new file mode 100644 index 00000000..803dc13e --- /dev/null +++ b/doc/wsdg_src/images/note.svg @@ -0,0 +1,3 @@ + + + diff --git a/doc/wsdg_src/images/tip.svg b/doc/wsdg_src/images/tip.svg new file mode 100644 index 00000000..1a60b74a --- /dev/null +++ b/doc/wsdg_src/images/tip.svg @@ -0,0 +1,3 @@ + + + diff --git a/doc/wsdg_src/images/warning.svg b/doc/wsdg_src/images/warning.svg new file mode 100644 index 00000000..80c0ba5c --- /dev/null +++ b/doc/wsdg_src/images/warning.svg @@ -0,0 +1,4 @@ + + + + diff --git a/doc/wsdg_src/images/ws-capture-sync.dia b/doc/wsdg_src/images/ws-capture-sync.dia new file mode 100644 index 00000000..00ba9cf8 Binary files /dev/null and b/doc/wsdg_src/images/ws-capture-sync.dia differ diff --git a/doc/wsdg_src/images/ws-capture-sync.png b/doc/wsdg_src/images/ws-capture-sync.png new file mode 100644 index 00000000..d46e1e94 Binary files /dev/null and b/doc/wsdg_src/images/ws-capture-sync.png differ diff --git a/doc/wsdg_src/images/ws-capture_internals.dia b/doc/wsdg_src/images/ws-capture_internals.dia new file mode 100644 index 00000000..0eae20e5 Binary files /dev/null and b/doc/wsdg_src/images/ws-capture_internals.dia differ diff --git a/doc/wsdg_src/images/ws-capture_internals.png b/doc/wsdg_src/images/ws-capture_internals.png new file mode 100644 index 00000000..6d110af3 Binary files /dev/null and b/doc/wsdg_src/images/ws-capture_internals.png differ diff --git a/doc/wsdg_src/images/ws-dev-guide-cover.png b/doc/wsdg_src/images/ws-dev-guide-cover.png new file mode 100644 index 00000000..8134d2d0 Binary files /dev/null and b/doc/wsdg_src/images/ws-dev-guide-cover.png differ diff --git a/doc/wsdg_src/images/ws-function-blocks.dia b/doc/wsdg_src/images/ws-function-blocks.dia new file mode 100644 index 00000000..bc17f05e Binary files /dev/null and b/doc/wsdg_src/images/ws-function-blocks.dia differ diff --git a/doc/wsdg_src/images/ws-function-blocks.svg b/doc/wsdg_src/images/ws-function-blocks.svg new file mode 100644 index 00000000..c9bc7f7e --- /dev/null +++ b/doc/wsdg_src/images/ws-function-blocks.svg @@ -0,0 +1,449 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/wsdg_src/images/ws-logo.png b/doc/wsdg_src/images/ws-logo.png new file mode 100644 index 00000000..04226f39 Binary files /dev/null and b/doc/wsdg_src/images/ws-logo.png differ diff --git a/doc/wsdg_src/images/wslua-new-dialog.png b/doc/wsdg_src/images/wslua-new-dialog.png new file mode 100644 index 00000000..9de7e4a9 Binary files /dev/null and b/doc/wsdg_src/images/wslua-new-dialog.png differ diff --git a/doc/wsdg_src/images/wslua-progdlg.png b/doc/wsdg_src/images/wslua-progdlg.png new file mode 100644 index 00000000..d8d95101 Binary files /dev/null and b/doc/wsdg_src/images/wslua-progdlg.png differ diff --git a/doc/wsdg_src/images/wslua-textwindow.png b/doc/wsdg_src/images/wslua-textwindow.png new file mode 100644 index 00000000..7defd0fa Binary files /dev/null and b/doc/wsdg_src/images/wslua-textwindow.png differ -- cgit v1.2.3