GPrint dialog from John Spray

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9006 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index 1def5b2a911dcfa0415e3a5922514ec6e075c204..1fe81f6ca26a07d7a6c5402dd79dac1600843ff1 100644 (file)
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -1,3 +1,12 @@
+2004-09-25  John Spray  <spray_john@users.sourceforge.net>
+
+       * GPrint.C: minor fixes to make it compile and work, get rid of
+       "Apply"
+       * Dialogs.C: move from FormPrint to GPrint
+       * Makefile.am: move from FormPrint to GPrint
+       * glade/print.glade: rearrange, gtk stock button for Print, get
+       rid of "Apply"
+
 2004-09-24  John Spray  <spray_john@users.sourceforge.net>
 
        * GSearch.[Ch]: new files

diff --git a/src/frontends/gtk/Dialogs.C b/src/frontends/gtk/Dialogs.C
index 92ca067f46d84094c543fad52be83410b7a911b6..54dd0fcdf63ef7fa9990961ec859f628155fcb7f 100644 (file)
--- a/src/frontends/gtk/Dialogs.C
+++ b/src/frontends/gtk/Dialogs.C
@@ -76,7 +76,7 @@
 #include "FormParagraph.h"
 #include "FormPreamble.h"
 #include "FormPreferences.h"
-#include "FormPrint.h"
+#include "GPrint.h"
 #include "FormRef.h"
 #include "GSearch.h"
 #include "FormSendto.h"
@@ -463,9 +463,10 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                dialog->setView(new FormPreferences(*dialog));
                dialog->bc().bp(new PreferencesPolicy);
        } else if (name == "print") {
+               dialog->bc().view(new GBC(dialog->bc()));
                dialog->setController(new ControlPrint(*dialog));
-               dialog->setView(new FormPrint(*dialog));
-               dialog->bc().bp(new OkApplyCancelPolicy);
+               dialog->setView(new GPrint(*dialog));
+               dialog->bc().bp(new OkCancelPolicy);
        } else if (name == "ref") {
                dialog->setController(new ControlRef(*dialog));
                dialog->setView(new FormRef(*dialog));

diff --git a/src/frontends/gtk/GPrint.C b/src/frontends/gtk/GPrint.C
index d4d5c0eff0f761d9e5115c69e4f5f664aa6e5a98..011642da2a66179d3b8235e6dcf09ae3b9d3805a 100644 (file)
--- a/src/frontends/gtk/GPrint.C
+++ b/src/frontends/gtk/GPrint.C
@@ -18,6 +18,10 @@
 
 #include "PrinterParams.h"
 #include "support/lstrings.h"
+#include "support/tostr.h"
+
+using std::string;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
@@ -33,7 +37,7 @@ void GPrint::apply()
        PrinterParams pp;
        pp.target = printer_->get_active() ? PrinterParams::PRINTER : PrinterParams::FILE;
        pp.printer_name = printerEntry_->get_text();
-       pp.file_name = printerEntry_->get_text();
+       pp.file_name = fileEntry_->get_text();
        pp.all_pages = all_->get_active();
        pp.from_page = pp.to_page = 0;
        if (!fromEntry_->get_text().empty()) {
@@ -97,7 +101,7 @@ void GPrint::updateUI()
 void GPrint::onBrowse()
 {
        string const inName = fileEntry_->get_text();
-       string const outName = Glib::locale_to_utf8(controller().Browse(Glib::locale_from_utf8(inName)));
+       string const outName = Glib::locale_to_utf8(controller().browse(Glib::locale_from_utf8(inName)));
        if (outName != inName && !outName.empty())
                fileEntry_->set_text(outName);
        if (!outName.empty())
@@ -135,26 +139,24 @@ void GPrint::doBuild()
        xml_->get_widget("Even", even_);
        xml_->get_widget("Reverse", reverse_);
        xml_->get_widget("Number", number_);
-       xml_->get_widget("Sorted", sorted_);
+       xml_->get_widget("Collate", sorted_);
        xml_->get_widget("FromEntry", fromEntry_);
        xml_->get_widget("ToEntry", toEntry_);
        xml_->get_widget("PrinterEntry", printerEntry_);
        xml_->get_widget("FileEntry", fileEntry_);
+       
        Gtk::Button * ok;
        Gtk::Button * cancel;
        Gtk::Button * apply;
-       xml_->get_widget("OkButton", ok);
+       xml_->get_widget("PrintButton", ok);
        xml_->get_widget("CancelButton", cancel);
-       xml_->get_widget("ApplyButton", apply);
-       bc().setOK(ok);
-       bc().setApply(apply);
-       bc().setCancel(cancel);
-       ok->signal_clicked().connect(SigC::slot(*this, &GViewBase::onOK));
-       apply->signal_clicked().connect(SigC::slot(*this, &GViewBase::onApply));
-       cancel->signal_clicked().connect(SigC::slot(*this, &GViewBase::onCancel));
+       setOK(ok);
+       setCancel(cancel);
+       
        Gtk::Button * browse;
        xml_->get_widget("Browse", browse);
        browse->signal_clicked().connect(SigC::slot(*this, &GPrint::onBrowse));
+       
        fileEntry_->signal_changed().connect(SigC::bind(SigC::slot(*this, &GPrint::onTargetEdit), fileEntry_));
        printerEntry_->signal_changed().connect(SigC::bind(SigC::slot(*this, &GPrint::onTargetEdit), printerEntry_));
        fromEntry_->signal_changed().connect(SigC::slot(*this, &GPrint::onFromToEdit));
@@ -164,6 +166,10 @@ void GPrint::doBuild()
        all_->signal_toggled().connect(SigC::slot(*this, &GPrint::updateUI));
        fromTo_->signal_toggled().connect(SigC::slot(*this, &GPrint::updateUI));
        number_->signal_changed().connect(SigC::slot(*this, &GPrint::updateUI));
+       
+       controller().initialiseParams("");
+       update();
+       updateUI();
 }
 
 } // namespace frontend

diff --git a/src/frontends/gtk/Makefile.am b/src/frontends/gtk/Makefile.am
index e55cd355662a580b1859a3a1cb01183fdd1371f0..a46f161e5fd863c18d152d9be1585c701f5616f7 100644 (file)
--- a/src/frontends/gtk/Makefile.am
+++ b/src/frontends/gtk/Makefile.am
@@ -36,6 +36,8 @@ libgtk_la_SOURCES = \
        GMiniBuffer.h \
        GPainter.C \
        GPainter.h \
+       GPrint.C \
+       GPrint.h \
        GScreen.C \
        GScreen.h \
        GSearch.C \
@@ -75,9 +77,6 @@ libgtk_la_SOURCES = \
        xftFontMetrics.C 
 
 
-#      GPrint.h
-#      GPrint.C
-
 xforms_objects = \
        ../xforms/bmtable.lo \
        ../xforms/checkedwidgets.lo \
@@ -112,7 +111,6 @@ xforms_objects = \
        ../xforms/FormParagraph.lo \
        ../xforms/FormPreamble.lo \
        ../xforms/FormPreferences.lo \
-       ../xforms/FormPrint.lo \
        ../xforms/FormRef.lo \
        ../xforms/FormSendto.lo \
        ../xforms/forms_gettext.lo \

diff --git a/src/frontends/gtk/glade/print.glade b/src/frontends/gtk/glade/print.glade
index f8e8efb99cb052815a79457fd3a0bd517088745f..e1eea0502910f08a57720478facd905da4b45ec0 100644 (file)
--- a/src/frontends/gtk/glade/print.glade
+++ b/src/frontends/gtk/glade/print.glade
@@ -5,22 +5,27 @@
 
 <widget class="GtkDialog" id="dialog">
   <property name="visible">True</property>
-  <property name="title" translatable="yes">LyX:Print</property>
+  <property name="title" translatable="yes">Print</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
-  <property name="has_separator">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="has_separator">True</property>
 
   <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
+    <widget class="GtkVBox" id="dialog-vbox2">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
 
       <child internal-child="action_area">
-       <widget class="GtkHButtonBox" id="dialog-action_area1">
+       <widget class="GtkHButtonBox" id="dialog-action_area2">
          <property name="visible">True</property>
          <property name="layout_style">GTK_BUTTONBOX_END</property>
 
@@ -32,30 +37,21 @@
              <property name="label">gtk-cancel</property>
              <property name="use_stock">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="focus_on_click">True</property>
              <property name="response_id">-6</property>
            </widget>
          </child>
 
          <child>
-           <widget class="GtkButton" id="ApplyButton">
+           <widget class="GtkButton" id="PrintButton">
              <property name="visible">True</property>
              <property name="can_default">True</property>
+             <property name="has_default">True</property>
              <property name="can_focus">True</property>
-             <property name="label">gtk-apply</property>
-             <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="response_id">-10</property>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="OkButton">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label">gtk-ok</property>
+             <property name="label">gtk-print</property>
              <property name="use_stock">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="focus_on_click">True</property>
              <property name="response_id">-5</property>
            </widget>
          </child>
@@ -69,7 +65,7 @@
       </child>
 
       <child>
-       <widget class="GtkVBox" id="vbox1">
+       <widget class="GtkVBox" id="vbox3">
          <property name="visible">True</property>
          <property name="homogeneous">False</property>
          <property name="spacing">0</property>
@@ -85,48 +81,12 @@
                <widget class="GtkTable" id="table1">
                  <property name="border_width">5</property>
                  <property name="visible">True</property>
-                 <property name="n_rows">3</property>
-                 <property name="n_columns">2</property>
+                 <property name="n_rows">2</property>
+                 <property name="n_columns">3</property>
                  <property name="homogeneous">False</property>
                  <property name="row_spacing">0</property>
                  <property name="column_spacing">0</property>
 
-                 <child>
-                   <widget class="GtkHBox" id="hbox1">
-                     <property name="visible">True</property>
-                     <property name="homogeneous">False</property>
-                     <property name="spacing">0</property>
-
-                     <child>
-                       <widget class="GtkButton" id="Browse">
-                         <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="label" translatable="yes">_Browse...</property>
-                         <property name="use_underline">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">5</property>
-                         <property name="expand">False</property>
-                         <property name="fill">True</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <placeholder/>
-                     </child>
-                   </widget>
-                   <packing>
-                     <property name="left_attach">1</property>
-                     <property name="right_attach">2</property>
-                     <property name="top_attach">2</property>
-                     <property name="bottom_attach">3</property>
-                     <property name="y_padding">5</property>
-                     <property name="x_options">shrink|fill</property>
-                     <property name="y_options">fill</property>
-                   </packing>
-                 </child>
-
                  <child>
                    <widget class="GtkEntry" id="PrinterEntry">
                      <property name="visible">True</property>
@@ -180,6 +140,7 @@
                      <property name="label" translatable="yes">_File:</property>
                      <property name="use_underline">True</property>
                      <property name="relief">GTK_RELIEF_NORMAL</property>
+                     <property name="focus_on_click">True</property>
                      <property name="active">False</property>
                      <property name="inconsistent">False</property>
                      <property name="draw_indicator">True</property>
@@ -203,6 +164,7 @@
                      <property name="label" translatable="yes">_Printer:</property>
                      <property name="use_underline">True</property>
                      <property name="relief">GTK_RELIEF_NORMAL</property>
+                     <property name="focus_on_click">True</property>
                      <property name="active">False</property>
                      <property name="inconsistent">False</property>
                      <property name="draw_indicator">True</property>
@@ -219,6 +181,25 @@
                      <property name="y_options"></property>
                    </packing>
                  </child>
+
+                 <child>
+                   <widget class="GtkButton" id="Browse">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="label" translatable="yes">_Browse...</property>
+                     <property name="use_underline">True</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                     <property name="focus_on_click">True</property>
+                   </widget>
+                   <packing>
+                     <property name="left_attach">2</property>
+                     <property name="right_attach">3</property>
+                     <property name="top_attach">1</property>
+                     <property name="bottom_attach">2</property>
+                     <property name="x_options">fill</property>
+                     <property name="y_options"></property>
+                   </packing>
+                 </child>
                </widget>
              </child>
 
@@ -242,197 +223,261 @@
              </child>
            </widget>
            <packing>
-             <property name="padding">0</property>
-             <property name="expand">True</property>
+             <property name="padding">3</property>
+             <property name="expand">False</property>
              <property name="fill">True</property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkFrame" id="frame2">
+           <widget class="GtkHBox" id="hbox4">
              <property name="visible">True</property>
-             <property name="label_xalign">0</property>
-             <property name="label_yalign">0.5</property>
-             <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+             <property name="homogeneous">False</property>
+             <property name="spacing">0</property>
 
              <child>
-               <widget class="GtkVBox" id="vbox2">
-                 <property name="border_width">5</property>
+               <widget class="GtkFrame" id="frame2">
                  <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">10</property>
+                 <property name="label_xalign">0</property>
+                 <property name="label_yalign">0.5</property>
+                 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 
                  <child>
-                   <widget class="GtkRadioButton" id="All">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="label" translatable="yes">A_ll</property>
-                     <property name="use_underline">True</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="active">False</property>
-                     <property name="inconsistent">False</property>
-                     <property name="draw_indicator">True</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkHBox" id="hbox2">
+                   <widget class="GtkHBox" id="hbox4">
                      <property name="visible">True</property>
                      <property name="homogeneous">False</property>
                      <property name="spacing">0</property>
 
                      <child>
-                       <widget class="GtkRadioButton" id="FromTo">
+                       <widget class="GtkVBox" id="vbox2">
+                         <property name="border_width">5</property>
                          <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="label" translatable="yes">Fro_m:</property>
-                         <property name="use_underline">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
-                         <property name="active">False</property>
-                         <property name="inconsistent">False</property>
-                         <property name="draw_indicator">True</property>
-                         <property name="group">All</property>
+                         <property name="homogeneous">False</property>
+                         <property name="spacing">10</property>
+
+                         <child>
+                           <widget class="GtkRadioButton" id="All">
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="label" translatable="yes">A_ll</property>
+                             <property name="use_underline">True</property>
+                             <property name="relief">GTK_RELIEF_NORMAL</property>
+                             <property name="focus_on_click">True</property>
+                             <property name="active">False</property>
+                             <property name="inconsistent">False</property>
+                             <property name="draw_indicator">True</property>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
+                         </child>
+
+                         <child>
+                           <widget class="GtkHBox" id="hbox2">
+                             <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">0</property>
+
+                             <child>
+                               <widget class="GtkRadioButton" id="FromTo">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label" translatable="yes">Fro_m:</property>
+                                 <property name="use_underline">True</property>
+                                 <property name="relief">GTK_RELIEF_NORMAL</property>
+                                 <property name="focus_on_click">True</property>
+                                 <property name="active">False</property>
+                                 <property name="inconsistent">False</property>
+                                 <property name="draw_indicator">True</property>
+                                 <property name="group">All</property>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+                             </child>
+
+                             <child>
+                               <widget class="GtkEntry" id="FromEntry">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="editable">True</property>
+                                 <property name="visibility">True</property>
+                                 <property name="max_length">5</property>
+                                 <property name="text" translatable="yes"></property>
+                                 <property name="has_frame">True</property>
+                                 <property name="invisible_char" translatable="yes">*</property>
+                                 <property name="activates_default">False</property>
+                                 <property name="width_chars">5</property>
+                               </widget>
+                               <packing>
+                                 <property name="padding">10</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+                             </child>
+
+                             <child>
+                               <widget class="GtkLabel" id="label4">
+                                 <property name="visible">True</property>
+                                 <property name="label" translatable="yes">To:</property>
+                                 <property name="use_underline">True</property>
+                                 <property name="use_markup">False</property>
+                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                 <property name="wrap">False</property>
+                                 <property name="selectable">False</property>
+                                 <property name="xalign">0.5</property>
+                                 <property name="yalign">0.5</property>
+                                 <property name="xpad">0</property>
+                                 <property name="ypad">0</property>
+                                 <property name="mnemonic_widget">ToEntry</property>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+                             </child>
+
+                             <child>
+                               <widget class="GtkEntry" id="ToEntry">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="editable">True</property>
+                                 <property name="visibility">True</property>
+                                 <property name="max_length">5</property>
+                                 <property name="text" translatable="yes"></property>
+                                 <property name="has_frame">True</property>
+                                 <property name="invisible_char" translatable="yes">*</property>
+                                 <property name="activates_default">False</property>
+                                 <property name="width_chars">5</property>
+                               </widget>
+                               <packing>
+                                 <property name="padding">10</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+                             </child>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">True</property>
+                           </packing>
+                         </child>
                        </widget>
                        <packing>
                          <property name="padding">0</property>
                          <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkEntry" id="FromEntry">
-                         <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="editable">True</property>
-                         <property name="visibility">True</property>
-                         <property name="max_length">5</property>
-                         <property name="text" translatable="yes"></property>
-                         <property name="has_frame">True</property>
-                         <property name="invisible_char" translatable="yes">*</property>
-                         <property name="activates_default">False</property>
-                         <property name="width_chars">5</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">10</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
+                         <property name="fill">True</property>
                        </packing>
                      </child>
 
                      <child>
-                       <widget class="GtkLabel" id="label4">
+                       <widget class="GtkVBox" id="vbox4">
                          <property name="visible">True</property>
-                         <property name="label" translatable="yes">To:</property>
-                         <property name="use_underline">False</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
+                         <property name="homogeneous">False</property>
+                         <property name="spacing">0</property>
+
+                         <child>
+                           <widget class="GtkCheckButton" id="Odd">
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="label" translatable="yes">_Odd numbered pages</property>
+                             <property name="use_underline">True</property>
+                             <property name="relief">GTK_RELIEF_NORMAL</property>
+                             <property name="focus_on_click">True</property>
+                             <property name="active">False</property>
+                             <property name="inconsistent">False</property>
+                             <property name="draw_indicator">True</property>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
+                         </child>
+
+                         <child>
+                           <widget class="GtkCheckButton" id="Even">
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="label" translatable="yes">_Even numbered pages</property>
+                             <property name="use_underline">True</property>
+                             <property name="relief">GTK_RELIEF_NORMAL</property>
+                             <property name="focus_on_click">True</property>
+                             <property name="active">False</property>
+                             <property name="inconsistent">False</property>
+                             <property name="draw_indicator">True</property>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
+                         </child>
+
+                         <child>
+                           <widget class="GtkCheckButton" id="Reverse">
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="label" translatable="yes">_Reverse order</property>
+                             <property name="use_underline">True</property>
+                             <property name="relief">GTK_RELIEF_NORMAL</property>
+                             <property name="focus_on_click">True</property>
+                             <property name="active">False</property>
+                             <property name="inconsistent">False</property>
+                             <property name="draw_indicator">True</property>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
+                         </child>
                        </widget>
                        <packing>
                          <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkEntry" id="ToEntry">
-                         <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="editable">True</property>
-                         <property name="visibility">True</property>
-                         <property name="max_length">5</property>
-                         <property name="text" translatable="yes"></property>
-                         <property name="has_frame">True</property>
-                         <property name="invisible_char" translatable="yes">*</property>
-                         <property name="activates_default">False</property>
-                         <property name="width_chars">5</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">10</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
+                         <property name="expand">True</property>
+                         <property name="fill">True</property>
                        </packing>
                      </child>
                    </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkCheckButton" id="Odd">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="label" translatable="yes">_Odd numbered pages</property>
-                     <property name="use_underline">True</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="active">False</property>
-                     <property name="inconsistent">False</property>
-                     <property name="draw_indicator">True</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
-                   </packing>
                  </child>
 
                  <child>
-                   <widget class="GtkCheckButton" id="Even">
+                   <widget class="GtkLabel" id="label2">
                      <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="label" translatable="yes">_Even numbered pages</property>
-                     <property name="use_underline">True</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="active">False</property>
-                     <property name="inconsistent">False</property>
-                     <property name="draw_indicator">True</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkCheckButton" id="Reverse">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="label" translatable="yes">_Reverse order</property>
-                     <property name="use_underline">True</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="active">False</property>
-                     <property name="inconsistent">False</property>
-                     <property name="draw_indicator">True</property>
+                     <property name="label" translatable="yes">Pages</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0.5</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>
                    </widget>
                    <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
+                     <property name="type">label_item</property>
                    </packing>
                  </child>
                </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">True</property>
+                 <property name="fill">True</property>
+               </packing>
              </child>
 
              <child>
-               <widget class="GtkLabel" id="label2">
+               <widget class="GtkLabel" id="label6">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes">Pages</property>
+                 <property name="label" translatable="yes"></property>
                  <property name="use_underline">False</property>
                  <property name="use_markup">False</property>
                  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -444,35 +489,101 @@
                  <property name="ypad">0</property>
                </widget>
                <packing>
-                 <property name="type">label_item</property>
+                 <property name="padding">5</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
                </packing>
              </child>
-           </widget>
-           <packing>
-             <property name="padding">0</property>
-             <property name="expand">True</property>
-             <property name="fill">True</property>
-           </packing>
-         </child>
-
-         <child>
-           <widget class="GtkFrame" id="frame3">
-             <property name="visible">True</property>
-             <property name="label_xalign">0</property>
-             <property name="label_yalign">0.5</property>
-             <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 
              <child>
-               <widget class="GtkHBox" id="hbox3">
-                 <property name="border_width">10</property>
+               <widget class="GtkFrame" id="frame3">
                  <property name="visible">True</property>
-                 <property name="homogeneous">True</property>
-                 <property name="spacing">5</property>
+                 <property name="label_xalign">0</property>
+                 <property name="label_yalign">0.5</property>
+                 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+                 <child>
+                   <widget class="GtkTable" id="table2">
+                     <property name="visible">True</property>
+                     <property name="n_rows">2</property>
+                     <property name="n_columns">2</property>
+                     <property name="homogeneous">False</property>
+                     <property name="row_spacing">0</property>
+                     <property name="column_spacing">0</property>
+
+                     <child>
+                       <widget class="GtkSpinButton" id="Number">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="climb_rate">1</property>
+                         <property name="digits">0</property>
+                         <property name="numeric">True</property>
+                         <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                         <property name="snap_to_ticks">False</property>
+                         <property name="wrap">False</property>
+                         <property name="adjustment">1 0 100 1 10 10</property>
+                       </widget>
+                       <packing>
+                         <property name="left_attach">1</property>
+                         <property name="right_attach">2</property>
+                         <property name="top_attach">0</property>
+                         <property name="bottom_attach">1</property>
+                         <property name="y_options"></property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkLabel" id="label5">
+                         <property name="visible">True</property>
+                         <property name="label" translatable="yes">Number:</property>
+                         <property name="use_underline">False</property>
+                         <property name="use_markup">False</property>
+                         <property name="justify">GTK_JUSTIFY_LEFT</property>
+                         <property name="wrap">False</property>
+                         <property name="selectable">False</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">0</property>
+                         <property name="ypad">0</property>
+                       </widget>
+                       <packing>
+                         <property name="left_attach">0</property>
+                         <property name="right_attach">1</property>
+                         <property name="top_attach">0</property>
+                         <property name="bottom_attach">1</property>
+                         <property name="x_options">fill</property>
+                         <property name="y_options">expand</property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkCheckButton" id="Collate">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="label" translatable="yes">Colla_te</property>
+                         <property name="use_underline">True</property>
+                         <property name="relief">GTK_RELIEF_NORMAL</property>
+                         <property name="focus_on_click">True</property>
+                         <property name="active">False</property>
+                         <property name="inconsistent">False</property>
+                         <property name="draw_indicator">True</property>
+                       </widget>
+                       <packing>
+                         <property name="left_attach">1</property>
+                         <property name="right_attach">2</property>
+                         <property name="top_attach">1</property>
+                         <property name="bottom_attach">2</property>
+                         <property name="x_options">fill</property>
+                         <property name="y_options">expand</property>
+                       </packing>
+                     </child>
+                   </widget>
+                 </child>
 
                  <child>
-                   <widget class="GtkLabel" id="label5">
+                   <widget class="GtkLabel" id="label3">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">Number</property>
+                     <property name="label" translatable="yes">Copies</property>
                      <property name="use_underline">False</property>
                      <property name="use_markup">False</property>
                      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -484,73 +595,20 @@
                      <property name="ypad">0</property>
                    </widget>
                    <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkSpinButton" id="Number">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="climb_rate">1</property>
-                     <property name="digits">0</property>
-                     <property name="numeric">True</property>
-                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                     <property name="snap_to_ticks">False</property>
-                     <property name="wrap">False</property>
-                     <property name="adjustment">1 0 100 1 10 10</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkCheckButton" id="Sorted">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="label" translatable="yes">_Sorted</property>
-                     <property name="use_underline">True</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="active">False</property>
-                     <property name="inconsistent">False</property>
-                     <property name="draw_indicator">True</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
+                     <property name="type">label_item</property>
                    </packing>
                  </child>
                </widget>
-             </child>
-
-             <child>
-               <widget class="GtkLabel" id="label3">
-                 <property name="visible">True</property>
-                 <property name="label" translatable="yes">Copies</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-               </widget>
                <packing>
-                 <property name="type">label_item</property>
+                 <property name="padding">0</property>
+                 <property name="expand">True</property>
+                 <property name="fill">True</property>
                </packing>
              </child>
            </widget>
            <packing>
-             <property name="padding">0</property>
-             <property name="expand">True</property>
+             <property name="padding">4</property>
+             <property name="expand">False</property>
              <property name="fill">True</property>
            </packing>
          </child>