From: Ben Pfaff <blp@cs.stanford.edu>
Date: Wed, 19 May 2010 05:05:52 +0000 (-0700)
Subject: Merge "paginate" branch into "master".
X-Git-Tag: v0.7.5~25
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=e4ef4d0f708651807d91bd92d7ab92c1b5c6d675

Merge "paginate" branch into "master".

This adds printing support to the PSPPIRE output viewer on the master
branch.
---

e4ef4d0f708651807d91bd92d7ab92c1b5c6d675
diff --cc src/ui/gui/output-viewer.ui
index 00000000,e664a6d9..3325e2ab
mode 000000,100644..100644
--- a/src/ui/gui/output-viewer.ui
+++ b/src/ui/gui/output-viewer.ui
@@@ -1,0 -1,130 +1,137 @@@
+ <?xml version="1.0"?>
+ <interface>
+   <object class="GtkUIManager" id="uimanager1">
+     <child>
+       <object class="GtkActionGroup" id="actiongroup1">
+         <child>
+           <object class="GtkAction" id="menuitem1">
+             <property name="name">menuitem1</property>
+             <property name="label" translatable="yes">_File</property>
+           </object>
+         </child>
++        <child>
++          <object class="GtkAction" id="file_print">
++            <property name="name">file_print</property>
++            <property name="label" translatable="yes">_Print</property>
++          </object>
++        </child>
+         <child>
+           <object class="GtkAction" id="file_export">
+             <property name="name">file_export</property>
+             <property name="label" translatable="yes">_Export</property>
+           </object>
+         </child>
+         <child>
+           <object class="GtkAction" id="menuitem2">
+             <property name="name">menuitem2</property>
+             <property name="label" translatable="yes">_Edit</property>
+           </object>
+         </child>
+         <child>
+           <object class="GtkAction" id="imagemenuitem7">
+             <property name="stock-id">gtk-copy</property>
+             <property name="name">imagemenuitem7</property>
+           </object>
+         </child>
+         <child>
+           <object class="GtkAction" id="windows_menuitem">
+             <property name="name">windows_menuitem</property>
+             <property name="label" translatable="yes">_Windows</property>
+           </object>
+         </child>
+         <child>
+           <object class="GtkAction" id="windows_minimise-all">
+             <property name="name">windows_minimise-all</property>
+             <property name="label" translatable="yes">_Minimize All Windows</property>
+           </object>
+         </child>
+       </object>
+     </child>
+     <ui>
+       <menubar name="menubar">
+         <menu action="menuitem1">
+           <menuitem action="file_export"/>
++          <menuitem action="file_print"/>
+         </menu>
+         <menu action="menuitem2">
+           <menuitem action="imagemenuitem7"/>
+         </menu>
+         <menu action="windows_menuitem">
+           <menuitem action="windows_minimise-all"/>
+         </menu>
+       </menubar>
+     </ui>
+   </object>
+   <!-- interface-requires gtk+ 2.16 -->
+   <!-- interface-naming-policy toplevel-contextual -->
+   <object class="GtkWindow" id="output-viewer-window">
+     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+     <property name="default_width">600</property>
+     <property name="default_height">400</property>
+     <child>
+       <object class="GtkVBox" id="vbox1">
+         <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>
+         <child>
+           <object class="GtkMenuBar" constructor="uimanager1" id="menubar">
+             <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>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+             <property name="position">0</property>
+           </packing>
+         </child>
+         <child>
+           <object class="GtkHPaned" id="hpaned1">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="position">112</property>
+             <property name="position_set">True</property>
+             <child>
+               <object class="GtkScrolledWindow" id="scrolledwindow2">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="hscrollbar_policy">automatic</property>
+                 <property name="vscrollbar_policy">automatic</property>
+                 <child>
+                   <object class="GtkTreeView" id="overview">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="headers_visible">False</property>
+                   </object>
+                 </child>
+               </object>
+               <packing>
+                 <property name="resize">False</property>
+                 <property name="shrink">True</property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkScrolledWindow" id="scrolledwindow1">
+                 <property name="visible">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="hscrollbar_policy">automatic</property>
+                 <property name="vscrollbar_policy">automatic</property>
+                 <child>
+                   <object class="GtkLayout" id="output">
+                     <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>
+                   </object>
+                 </child>
+               </object>
+               <packing>
+                 <property name="resize">True</property>
+                 <property name="shrink">True</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="position">1</property>
+           </packing>
+         </child>
+       </object>
+     </child>
+   </object>
+ </interface>