fix guides according to recent GTK1 changes

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24870 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/docbook/Makefile.common b/docbook/Makefile.common
index 379c4ddbd57b9aff3e0d3fcee682ce149412775c..596a461c9f79d8a29da8aedf8ffb7c8b8c85e55c 100644 (file)
--- a/docbook/Makefile.common
+++ b/docbook/Makefile.common
@@ -65,12 +65,12 @@ WSUG_GRAPHICS =     \
        wsug_graphics/ws-list-pane.png                  \
        wsug_graphics/ws-main-toolbar.png               \
        wsug_graphics/ws-menu.png                       \
-       wsug_graphics/ws-merge-gtk1.png                 \
-       wsug_graphics/ws-merge-gtk2.png                 \
+       wsug_graphics/ws-merge-gtk20.png                        \
+       wsug_graphics/ws-merge-gtk24.png                        \
        wsug_graphics/ws-merge-win32.png                \
        wsug_graphics/ws-nameresolution-preferences.png \
-       wsug_graphics/ws-open-gtk1.png                  \
-       wsug_graphics/ws-open-gtk2.png                  \
+       wsug_graphics/ws-open-gtk20.png                 \
+       wsug_graphics/ws-open-gtk24.png                 \
        wsug_graphics/ws-open-win32.png                 \
        wsug_graphics/ws-packet-format.png              \
        wsug_graphics/ws-packet-pane-popup-menu.png     \
@@ -79,8 +79,8 @@ WSUG_GRAPHICS =       \
        wsug_graphics/ws-packet-sep-win.png             \
        wsug_graphics/ws-print.png                      \
        wsug_graphics/ws-printing-preferences.png       \
-       wsug_graphics/ws-save-as-gtk1.png               \
-       wsug_graphics/ws-save-as-gtk2.png               \
+       wsug_graphics/ws-save-as-gtk20.png              \
+       wsug_graphics/ws-save-as-gtk24.png              \
        wsug_graphics/ws-save-as-win32.png              \
        wsug_graphics/ws-statistics-menu.png            \
        wsug_graphics/ws-stats-conversations.png        \

diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml
index d2f790976107d8ace9ff0650de2f2f24f78cb3e3..d386186e36ac46bb3adddc54a8e344771e766b1d 100644 (file)
--- a/docbook/user-guide.xml
+++ b/docbook/user-guide.xml
@@ -249,12 +249,12 @@ FILE SECTION
   <!ENTITY WiresharkStatsSrtDcerpc SYSTEM "./wsug_graphics/ws-stats-srt-dcerpc.png" NDATA PNG>
 
   <!-- Fifth Chapter -->
-  <!ENTITY WiresharkOpenDialog1 SYSTEM "./wsug_graphics/ws-open-gtk1.png" NDATA PNG> 
-  <!ENTITY WiresharkSaveAsDialog1 SYSTEM "./wsug_graphics/ws-save-as-gtk1.png" NDATA PNG>
-  <!ENTITY WiresharkMergeDialog1 SYSTEM "./wsug_graphics/ws-merge-gtk1.png" NDATA PNG>
-  <!ENTITY WiresharkOpenDialog2 SYSTEM "./wsug_graphics/ws-open-gtk2.png" NDATA PNG> 
-  <!ENTITY WiresharkSaveAsDialog2 SYSTEM "./wsug_graphics/ws-save-as-gtk2.png" NDATA PNG>
-  <!ENTITY WiresharkMergeDialog2 SYSTEM "./wsug_graphics/ws-merge-gtk2.png" NDATA PNG>
+  <!ENTITY WiresharkOpenDialog20 SYSTEM "./wsug_graphics/ws-open-gtk20.png" NDATA PNG> 
+  <!ENTITY WiresharkSaveAsDialog20 SYSTEM "./wsug_graphics/ws-save-as-gtk20.png" NDATA PNG>
+  <!ENTITY WiresharkMergeDialog20 SYSTEM "./wsug_graphics/ws-merge-gtk20.png" NDATA PNG>
+  <!ENTITY WiresharkOpenDialog24 SYSTEM "./wsug_graphics/ws-open-gtk24.png" NDATA PNG> 
+  <!ENTITY WiresharkSaveAsDialog24 SYSTEM "./wsug_graphics/ws-save-as-gtk24.png" NDATA PNG>
+  <!ENTITY WiresharkMergeDialog24 SYSTEM "./wsug_graphics/ws-merge-gtk24.png" NDATA PNG>
   <!ENTITY WiresharkOpenDialogWin32 SYSTEM "./wsug_graphics/ws-open-win32.png" NDATA PNG> 
   <!ENTITY WiresharkSaveAsDialogWin32 SYSTEM "./wsug_graphics/ws-save-as-win32.png" NDATA PNG>
   <!ENTITY WiresharkMergeDialogWin32 SYSTEM "./wsug_graphics/ws-merge-win32.png" NDATA PNG>

diff --git a/docbook/wsdg_src/WSDG_chapter_userinterface.xml b/docbook/wsdg_src/WSDG_chapter_userinterface.xml
index 88f19a17e289eb90f6333709691d61446294558a..132dafeb864a561f69f103fc8d3047c7deed37cb 100644 (file)
--- a/docbook/wsdg_src/WSDG_chapter_userinterface.xml
+++ b/docbook/wsdg_src/WSDG_chapter_userinterface.xml
@@ -17,15 +17,15 @@
        The following frontends are currently maintained by the Wireshark
        development team:
        <itemizedlist>
-         <listitem><para>
-         Wireshark, GTK 1.x based
-         </para></listitem>
          <listitem><para>
          Wireshark, GTK 2.x based
          </para></listitem>
          <listitem><para>
          TShark, console based
          </para></listitem>
+         <listitem><para>
+         Wireshark, GTK 1.x based (was removed after the Wireshark 1.0.0 release)
+         </para></listitem>
        </itemizedlist>
        There exist other Wireshark frontends, not developed nor
        maintained by the Wireshark development team:
@@ -80,6 +80,10 @@
        <section id="ChUIGTK1x">
        <title>GTK Version 1.x</title>
        <para>
+       Please note: The HEAD (development) branch after the Wireshark release 
+       1.0.0 does no longer contain code to support GTK 1.x!
+       </para>
+       <para>
        GTK 1.x was the first major release. Today there are 1.2.x and 1.3.x
        versions "in the wild", with only very limitted differences in the API.
        </para>
@@ -99,7 +103,7 @@
          the look and feel is a bit old-fashioned
          </para></listitem>
          <listitem><para>
-         not recommended for future developments
+         not recommended for future developments (last GTK 1.x release in 2004)
          </para></listitem>
        </itemizedlist>
        GTK 1.x depends on the following libraries:
@@ -137,6 +141,9 @@
          <listitem><para>
          recommended for future developments
          </para></listitem>
+         <listitem><para>
+         stable (in productive code for years now)
+         </para></listitem>
        </itemizedlist>
        Disadvantages:
        <itemizedlist>
@@ -144,10 +151,6 @@
          not available on all platforms (compared to version 1.x)
          </para></listitem>
          <listitem><para>
-         maybe a bit less stable compared to version 1.x (but should be
-         production stable too)
-         </para></listitem>
-         <listitem><para>
          more dependencies compared to 1.x, see below
          </para></listitem>
        </itemizedlist>

diff --git a/docbook/wsug_graphics/ws-merge-gtk1.png b/docbook/wsug_graphics/ws-merge-gtk20.png
similarity index 100%
rename from docbook/wsug_graphics/ws-merge-gtk1.png
rename to docbook/wsug_graphics/ws-merge-gtk20.png

diff --git a/docbook/wsug_graphics/ws-merge-gtk2.png b/docbook/wsug_graphics/ws-merge-gtk24.png
similarity index 100%
rename from docbook/wsug_graphics/ws-merge-gtk2.png
rename to docbook/wsug_graphics/ws-merge-gtk24.png

diff --git a/docbook/wsug_graphics/ws-open-gtk1.png b/docbook/wsug_graphics/ws-open-gtk20.png
similarity index 100%
rename from docbook/wsug_graphics/ws-open-gtk1.png
rename to docbook/wsug_graphics/ws-open-gtk20.png

diff --git a/docbook/wsug_graphics/ws-open-gtk2.png b/docbook/wsug_graphics/ws-open-gtk24.png
similarity index 100%
rename from docbook/wsug_graphics/ws-open-gtk2.png
rename to docbook/wsug_graphics/ws-open-gtk24.png

diff --git a/docbook/wsug_graphics/ws-save-as-gtk1.png b/docbook/wsug_graphics/ws-save-as-gtk20.png
similarity index 100%
rename from docbook/wsug_graphics/ws-save-as-gtk1.png
rename to docbook/wsug_graphics/ws-save-as-gtk20.png

diff --git a/docbook/wsug_graphics/ws-save-as-gtk2.png b/docbook/wsug_graphics/ws-save-as-gtk24.png
similarity index 100%
rename from docbook/wsug_graphics/ws-save-as-gtk2.png
rename to docbook/wsug_graphics/ws-save-as-gtk24.png

diff --git a/docbook/wsug_src/WSUG_chapter_build_install.xml b/docbook/wsug_src/WSUG_chapter_build_install.xml
index 6c5cc896f570da0fb835702f243ebdb686600897..af2868d58dec8dbe8f9a1348980334f4036d28a9 100644 (file)
--- a/docbook/wsug_src/WSUG_chapter_build_install.xml
+++ b/docbook/wsug_src/WSUG_chapter_build_install.xml
@@ -473,18 +473,12 @@ pkg_add -r wireshark
     <title>"Choose Components" page</title>
     <para>
        <command>Wireshark</command>
-       (both Wireshark GTK1 and 2 user interfaces cannot be installed at the same 
-       time):
        <itemizedlist>
        <listitem><para>
-       <command>Wireshark GTK1</command> - Wireshark is a GUI network protocol 
+       <command>Wireshark GTK</command> - Wireshark is a GUI network protocol 
        analyzer.
        </para></listitem>
        <listitem><para>
-       <command>Wireshark GTK2</command> - Wireshark is a GUI network protocol 
-       analyzer (using the modern GTK2 GUI toolkit, recommended).
-       </para></listitem>
-       <listitem><para>
        <command>GTK MS Windows Engine</command> - GTK MS Windows Engine
        (native Win32 look and feel, recommended).
        </para></listitem>
@@ -495,12 +489,6 @@ pkg_add -r wireshark
        protocol analyzer.
        </para>
        <para>
-       You may try the GTK1 selection if you experience any GUI problems with GTK2, 
-       e.g. Windows with only 256 (8bit) color displays won't work well with GTK2. 
-       However, the older GTK1 user interface doesn't provide some advanced 
-       analyze and statistics features.
-       </para>
-       <para>
        <command>Plugins / Extensions</command> (for the Wireshark and TShark 
        dissection engines):
        <itemizedlist>

diff --git a/docbook/wsug_src/WSUG_chapter_introduction.xml b/docbook/wsug_src/WSUG_chapter_introduction.xml
index e73d11c397ced95763edeab66685b5045b67d239..713954b0a296ebad71a5644edb5a88ee35bc0aec 100644 (file)
--- a/docbook/wsug_src/WSUG_chapter_introduction.xml
+++ b/docbook/wsug_src/WSUG_chapter_introduction.xml
@@ -222,7 +222,7 @@
        </para></listitem>
        <listitem><para>800*600 (1280*1024 or higher recommended) resolution with
        at least 65536 (16bit) colors (256 colors should work if Wireshark is
-       installed with the "legacy GTK1" selection)
+       installed with the "legacy GTK1" selection of the Wireshark 1.0.x releases)
        </para></listitem>
        <listitem><para>A supported network card for capturing:
        </para>

diff --git a/docbook/wsug_src/WSUG_chapter_io.xml b/docbook/wsug_src/WSUG_chapter_io.xml
index a92926113f2565e5501161e8f66d7a1f7e944c3a..687a144196456f61b8788b4c9d3f701056628136 100644 (file)
--- a/docbook/wsug_src/WSUG_chapter_io.xml
+++ b/docbook/wsug_src/WSUG_chapter_io.xml
@@ -74,9 +74,9 @@
            <note>
              <title>The dialog appearance depends on your system!</title>
              <para>
-                 The appearance of this dialog depends on the system and GTK+ toolkit 
-                 version used. However, the functionality remains basically the same 
-                 on any particular system.
+                 The appearance of this dialog depends on the system and/or GTK+ 
+                 toolkit version used. However, the functionality remains basically 
+                 the same on any particular system.
              </para>
            </note>
                
@@ -162,7 +162,7 @@
                </para>
                </entry>
                <entry valign="top">
-               <para><command>Microsoft Windows (GTK2 installed)</command></para>
+               <para><command>Microsoft Windows</command></para>
       <para>
                This is the common Windows file open dialog - 
                plus some Wireshark extensions.
@@ -197,7 +197,7 @@
                <para>
       <figure id="ChIOOpenFileDialog">
        <title>"Open" - new GTK version</title>
-       <graphic entityref="WiresharkOpenDialog2" format="PNG"/>
+       <graphic entityref="WiresharkOpenDialog24" format="PNG"/>
       </figure>
                </para>
          </entry>
@@ -239,14 +239,13 @@
                <para>
       <figure id="ChIOOpenFileDialog1">
        <title>"Open" - old GTK version</title>
-       <graphic entityref="WiresharkOpenDialog1" format="PNG"/>
+       <graphic entityref="WiresharkOpenDialog20" format="PNG"/>
       </figure>
                </para>
                </entry>
          <entry valign="top">
            <para>
-               <command>Unix/Linux: GTK version &lt; 2.4 / Microsoft Windows (GTK1 
-               installed)</command></para>
+               <command>Unix/Linux: GTK version &lt; 2.4</command></para>
                <para>
                  This is the file open dialog of former Gimp/GNOME versions - 
                  plus some Wireshark extensions.
@@ -304,6 +303,7 @@
                  <listitem><para>Endace Measurement Systems' ERF format captures</para></listitem>
                  <listitem><para>Linux Bluez Bluetooth stack hcidump -w traces</para></listitem>
                  <listitem><para>Catapult DCT2000 .out files</para></listitem>
+                 <listitem><para>... new file formats are added from time to time</para></listitem>
        </itemizedlist>
     </para>
     <note><title>Opening a file may fail due to invalid packet types!</title>
@@ -364,7 +364,7 @@
                </para>
                </entry>
                <entry valign="top">
-               <para><command>Microsoft Windows (GTK2 installed)</command></para>
+               <para><command>Microsoft Windows</command></para>
       <para>
                This is the common Windows file save dialog - 
                plus some Wireshark extensions.
@@ -394,7 +394,7 @@
                <para>
       <figure id="ChIOSaveAsFile2">
        <title>"Save" - new GTK version</title>
-       <graphic entityref="WiresharkSaveAsDialog2" format="PNG"/>
+       <graphic entityref="WiresharkSaveAsDialog24" format="PNG"/>
       </figure>
                </para>
                </entry>
@@ -422,13 +422,12 @@
                <para>
       <figure id="ChIOSaveAsFile1">
        <title>"Save" - old GTK version</title>
-       <graphic entityref="WiresharkSaveAsDialog1" format="PNG"/>
+       <graphic entityref="WiresharkSaveAsDialog20" format="PNG"/>
       </figure>
                </para>
                </entry>
                <entry valign="top">
-               <para><command>Unix/Linux: GTK version &lt; 2.4 / Microsoft Windows 
-               (GTK1 installed)</command></para>
+               <para><command>Unix/Linux: GTK version &lt; 2.4</command></para>
       <para>
                This is the file save dialog of former Gimp/GNOME versions - 
                plus some Wireshark extensions.
@@ -524,6 +523,7 @@
              <listitem><para>Novell LANalyzer (*.tr1)</para></listitem>
              <listitem><para>Sun snoop (*.snoop,*.cap)</para></listitem>
              <listitem><para>Visual Networks Visual UpTime traffic (*.*)</para></listitem>
+                 <listitem><para>... new file formats are added from time to time</para></listitem>
        </itemizedlist>
     </para>
     <para>
@@ -633,7 +633,7 @@
                </para>
                </entry>
                <entry valign="top">
-               <para><command>Microsoft Windows (GTK2 installed)</command></para>
+               <para><command>Microsoft Windows</command></para>
       <para>
                This is the common Windows file open dialog - 
                plus some Wireshark extensions.
@@ -645,7 +645,7 @@
                <para>
       <figure id="ChIOMergeFile2">
        <title>"Merge" - new GTK version</title>
-       <graphic entityref="WiresharkMergeDialog2" format="PNG"/>
+       <graphic entityref="WiresharkMergeDialog24" format="PNG"/>
       </figure>
                </para>
                </entry>
@@ -662,13 +662,12 @@
                <para>
       <figure id="ChIOMergeFile1">
        <title>"Merge" - old GTK version</title>
-       <graphic entityref="WiresharkMergeDialog1" format="PNG"/>
+       <graphic entityref="WiresharkMergeDialog20" format="PNG"/>
       </figure>
                </para>
                </entry>
                <entry valign="top">
-               <para><command>Unix/Linux: GTK version &lt; 2.4 / Microsoft Windows 
-               (GTK1 installed)</command></para>
+               <para><command>Unix/Linux: GTK version &lt; 2.4</command></para>
       <para>
                This is the file open dialog of former Gimp/GNOME versions - 
                plus some Wireshark extensions.
@@ -952,8 +951,8 @@
            opened with the proper viewer or executed in the case of
            executables (if it is for the same platform you are
            running Wireshark on) without any further work on your
-           part.  This feature is not available in the GTK1 build of
-           Wireshark or when using GTK2 versions below 2.4.
+           part.  This feature is not available when using GTK2 versions 
+               below 2.4.
          </para>
     <figure>
       <title>The "Export Objects" dialog box</title>