Reinserts optional UI options into print dialog

Change-Id: I9ee0e250ea476aa546b842cbd45fff8ea208cfe5
Reviewed-on: https://gerrit.libreoffice.org/55450
Tested-by: Jenkins
Reviewed-by: Daniel Silva <danielfaleirosilva@gmail.com>

vcl/inc/printdlg.hxx

@@ -28,6 +28,7 @@
 #include <vcl/button.hxx>
 #include <vcl/prgsbar.hxx>
 #include <vcl/field.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/virdev.hxx>
@@ -104,9 +105,12 @@ namespace vcl
 
     private:
 
+        std::unique_ptr<VclBuilder>             mpCustomOptionsUIBuilder;
+
         std::shared_ptr<PrinterController>      maPController;
 
         VclPtr<TabControl>                      mpTabCtrl;
+        VclPtr<VclFrame>                        mpPageLayoutFrame;
         VclPtr<ListBox>                         mpPrinters;
         VclPtr<FixedText>                       mpStatusTxt;
         VclPtr<PushButton>                      mpSetupButton;
@@ -165,30 +169,47 @@ namespace vcl
         /// border around each page
         VclPtr<CheckBox>                        mpBorderCB;
 
-        std::map< VclPtr<vcl::Window>, OUString >      maControlToPropertyMap;
+        std::map< VclPtr<vcl::Window>, OUString >
+                                                maControlToPropertyMap;
+        std::map< OUString, std::vector< VclPtr<vcl::Window> > >
+                                                maPropertyToWindowMap;
+        std::map< VclPtr<vcl::Window>, sal_Int32 >
+                                                maControlToNumValMap;
+        std::set< OUString >                    maReverseDependencySet;
 
         Size                                    maNupPortraitSize;
         Size                                    maNupLandscapeSize;
         /// internal, used for automatic Nup-Portrait/landscape
         Size                                    maFirstPageSize;
 
+        bool                                    mbShowLayoutFrame;
+
         DECL_LINK( ClickHdl, Button*, void );
         DECL_LINK( SelectHdl, ListBox&, void );
         DECL_LINK( ModifyHdl, Edit&, void );
         DECL_LINK( ToggleHdl, CheckBox&, void );
         DECL_LINK( ToggleRadioHdl, RadioButton&, void );
 
+        DECL_LINK( UIOption_CheckHdl, CheckBox&, void );
+        DECL_LINK( UIOption_RadioHdl, RadioButton&, void );
+        DECL_LINK( UIOption_SelectHdl, ListBox&, void );
+        DECL_LINK( UIOption_ModifyHdl, Edit&, void );
+
         css::beans::PropertyValue* getValueForWindow( vcl::Window* ) const;
 
         void preparePreview( bool i_bPrintChanged = true, bool i_bMayUseCache = false );
         void setPreviewText();
         void updatePrinterText();
         void checkControlDependencies();
+        void checkOptionalControlDependencies();
+        void makeEnabled( vcl::Window* );
+        void updateWindowFromProperty( const OUString& );
         void initFromMultiPageSetup( const vcl::PrinterController::MultiPageSetup& );
         void showAdvancedControls( bool );
         void updateNup();
         void updateNupFromPages();
         void enableNupControls( bool bEnable );
+        void setupOptionalUI();
         Size const & getJobPageSize();
 
     };

vcl/uiconfig/ui/printdialog.ui

@@ -354,8 +354,7 @@
                   <object class="GtkNotebook" id="tabcontrol">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="show_tabs">False</property>
-                    <property name="show_border">False</property>
+                    <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox" id="box11">
                         <property name="visible">True</property>
@@ -690,7 +689,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkFrame" id="frame3">
+                          <object class="GtkFrame" id="layoutframe">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="label_xalign">0</property>
@@ -877,7 +876,7 @@
                                             <property name="receives_default">False</property>
                                             <property name="active">True</property>
                                             <property name="draw_indicator">True</property>
-                                            <property name="group">brochurebtn</property>
+                                            <property name="group">brochure</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">0</property>
@@ -896,8 +895,8 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkRadioButton" id="brochurebtn">
-                                            <property name="label" translatable="yes" context="printdialog|brochurebtn">Brochure</property>
+                                          <object class="GtkRadioButton" id="brochure">
+                                            <property name="label" translatable="yes" context="printdialog|brochure">Brochure</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
@@ -1001,7 +1000,11 @@
                       <object class="GtkBox" id="customcontents">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="border_width">6</property>
                         <property name="orientation">vertical</property>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                       <packing>
                         <property name="position">1</property>