New binary versions to support PDF generation.

eugeni · Nov 12, 2008 · c205e98 · c205e98
1 parent 428b459
commit c205e98
Show file tree

Hide file tree

Showing 11 changed files with 152 additions and 36 deletions.
diff --git a/client/client.exe b/client/client.exe
diff --git a/client/iface/client.glade b/client/iface/client.glade
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <glade-interface>
+  <requires-version lib="gtk+" version="2.12"/>
   <widget class="GtkWindow" id="MainWindow">
     <property name="width_request">640</property>
     <property name="height_request">240</property>
@@ -92,13 +93,23 @@
           </packing>
         </child>
         <child>
-          <widget class="GtkTextView" id="textview1">
+          <widget class="GtkScrolledWindow" id="scrolledwindow1">
             <property name="width_request">420</property>
             <property name="height_request">160</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="editable">False</property>
-            <property name="wrap_mode">GTK_WRAP_WORD</property>
+            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <child>
+              <widget class="GtkTextView" id="textview1">
+                <property name="width_request">420</property>
+                <property name="height_request">160</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="editable">False</property>
+                <property name="wrap_mode">GTK_WRAP_WORD</property>
+              </widget>
+            </child>
           </widget>
           <packing>
             <property name="x">200</property>

diff --git a/client/lib.dat b/client/lib.dat
diff --git a/trafdump/PIL._imaging.pyd b/trafdump/PIL._imaging.pyd
diff --git a/trafdump/_imaging.pyd b/trafdump/_imaging.pyd
diff --git a/trafdump/_rl_accel.pyd b/trafdump/_rl_accel.pyd
diff --git a/trafdump/client.exe b/trafdump/client.exe
diff --git a/trafdump/iface/client.glade b/trafdump/iface/client.glade
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <glade-interface>
+  <requires-version lib="gtk+" version="2.12"/>
   <widget class="GtkWindow" id="MainWindow">
     <property name="width_request">640</property>
     <property name="height_request">240</property>
@@ -92,13 +93,23 @@
           </packing>
         </child>
         <child>
-          <widget class="GtkTextView" id="textview1">
+          <widget class="GtkScrolledWindow" id="scrolledwindow1">
             <property name="width_request">420</property>
             <property name="height_request">160</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="editable">False</property>
-            <property name="wrap_mode">GTK_WRAP_WORD</property>
+            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <child>
+              <widget class="GtkTextView" id="textview1">
+                <property name="width_request">420</property>
+                <property name="height_request">160</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="editable">False</property>
+                <property name="wrap_mode">GTK_WRAP_WORD</property>
+              </widget>
+            </child>
           </widget>
           <packing>
             <property name="x">200</property>

diff --git a/trafdump/iface/trafdump.glade b/trafdump/iface/trafdump.glade
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Wed Aug 13 21:01:00 2008 -->
+<?xml version="1.0"?>
 <glade-interface>
+  <requires-version lib="gtk+" version="2.12"/>
   <widget class="GtkWindow" id="MainWindow">
     <property name="width_request">800</property>
     <property name="height_request">600</property>
@@ -61,7 +60,7 @@
             <property name="height_request">520</property>
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="spacing">5</property>
+            <property name="spacing">2</property>
             <child>
               <widget class="GtkButton" id="SelectAllButton">
                 <property name="visible">True</property>
@@ -73,8 +72,6 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="padding">5</property>
-                <property name="position">1</property>
               </packing>
             </child>
             <child>
@@ -88,41 +85,61 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="padding">5</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkHSeparator" id="hseparator1">
+                <property name="visible">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="padding">3</property>
                 <property name="position">2</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="StartCapture">
+              <widget class="GtkButton" id="QuickTest">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">Start Capture</property>
+                <property name="label" translatable="yes">Quick Test</property>
                 <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="padding">5</property>
                 <property name="position">3</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="StopCapture">
+              <widget class="GtkButton" id="FullTest">
                 <property name="visible">True</property>
-                <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">Stop capture</property>
+                <property name="label" translatable="yes">Full Test</property>
                 <property name="response_id">0</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="padding">5</property>
                 <property name="position">4</property>
               </packing>
             </child>
+            <child>
+              <widget class="GtkLabel" id="LabelAdvanced">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">&lt;b&gt;Advanced options&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+                <property name="justify">GTK_JUSTIFY_CENTER</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">2</property>
+                <property name="position">5</property>
+              </packing>
+            </child>
             <child>
               <widget class="GtkButton" id="BandwidthButton">
                 <property name="visible">True</property>
@@ -134,8 +151,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="padding">5</property>
-                <property name="position">5</property>
+                <property name="position">6</property>
               </packing>
             </child>
             <child>
@@ -149,8 +165,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="padding">5</property>
-                <property name="position">6</property>
+                <property name="position">7</property>
               </packing>
             </child>
             <child>
@@ -164,24 +179,73 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="padding">5</property>
-                <property name="position">7</property>
+                <property name="position">8</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="AnalyzeButton">
+              <widget class="GtkLabel" id="WiresharkLabel">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">&lt;b&gt;Wireshark Integration&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">2</property>
+                <property name="position">9</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="StartCapture">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">Analyze results</property>
+                <property name="label" translatable="yes">Start capture</property>
                 <property name="response_id">0</property>
-                <signal name="clicked" handler="gtk_main_quit"/>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="padding">5</property>
-                <property name="position">8</property>
+                <property name="position">10</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="StopCapture">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">Stop capture</property>
+                <property name="response_id">0</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">11</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkHSeparator" id="hseparator2">
+                <property name="visible">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="padding">3</property>
+                <property name="position">12</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="Help">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">Help</property>
+                <property name="response_id">0</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">13</property>
               </packing>
             </child>
             <child>
@@ -196,8 +260,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="padding">5</property>
-                <property name="position">9</property>
+                <property name="position">14</property>
               </packing>
             </child>
           </widget>
@@ -209,16 +272,23 @@
         <child>
           <widget class="GtkScrolledWindow" id="MachinesScrollWindow">
             <property name="width_request">580</property>
-            <property name="height_request">520</property>
+            <property name="height_request">370</property>
             <property name="visible">True</property>
+            <property name="app_paintable">True</property>
             <property name="can_focus">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="has_focus">True</property>
+            <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_SCROLL_MASK</property>
             <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
             <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
             <child>
               <widget class="GtkLayout" id="MachineLayout">
                 <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="app_paintable">True</property>
+                <property name="can_focus">True</property>
+                <property name="has_focus">True</property>
+                <property name="is_focus">True</property>
+                <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_SCROLL_MASK</property>
+                <property name="width">580</property>
               </widget>
             </child>
           </widget>
@@ -227,6 +297,30 @@
             <property name="y">40</property>
           </packing>
         </child>
+        <child>
+          <widget class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="width_request">580</property>
+            <property name="height_request">140</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <child>
+              <widget class="GtkTextView" id="LogView">
+                <property name="width_request">580</property>
+                <property name="height_request">140</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="editable">False</property>
+                <property name="wrap_mode">GTK_WRAP_WORD</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="x">200</property>
+            <property name="y">415</property>
+          </packing>
+        </child>
       </widget>
     </child>
   </widget>

diff --git a/trafdump/lib.dat b/trafdump/lib.dat
diff --git a/trafdump/trafdump.exe b/trafdump/trafdump.exe