[Libreoffice-commits] core.git: Branch 'feature/print_revamp' - 4620 commits - accessibility/source android/source animations/source autogen.sh avmedia/Library_avmedia.mk avmedia/Module_avmedia.mk avmedia/source basctl/inc basctl/source basctl/uiconfig basegfx/Library_basegfx.mk basegfx/source basegfx/test basic/qa basic/source bean/com binaryurp/source bin/check-elf-dynamic-objects bin/distro-install-desktop-integration bin/find-unneeded-includes bin/fuzzfiles bin/gbuild-to-ide bin/gen-boost-headers bin/get_config_variables bin/git-new-module-workdir bin/git-new-workdir bin/ios-mapfile-statistics bin/list-uitest.py bin/odfvalidator.sh.in bin/oss-fuzz-build.sh bin/update_pch bridges/source canvas/Library_vclcanvas.mk canvas/source chart2/CppunitTest_chart2_dump.mk chart2/CppunitTest_chart2_export.mk chart2/inc chart2/IwyuFilter_chart2.yaml chart2/Library_chartcontroller.mk chart2/Library_chartcore.mk chart2/Library_chartopengl.mk chart2/Module_chart2.mk chart2/opengl chart2/Package_opengl.mk char t2/qa chart2/source chart2/uiconfig cli_ure/source codemaker/source comphelper/Library_comphelper.mk comphelper/qa comphelper/source compilerplugins/clang config_host/config_cxxabi.h.in config_host/config_dbus.h.in config_host/config_global.h.in config_host/config_test.h.in config_host.mk.in configmgr/qa configmgr/source configure.ac connectivity/Configuration_mysql.mk connectivity/inc connectivity/Library_mysqlc.mk connectivity/Library_mysql.mk connectivity/Module_connectivity.mk connectivity/registry connectivity/source connectivity/workben cppcanvas/source cppuhelper/CppunitTest_cppuhelper_qa_misc.mk cppuhelper/Module_cppuhelper.mk cppuhelper/qa cppuhelper/source cppu/qa cppu/source cpputools/source cui/inc cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk dbaccess/CppunitTest_dbaccess_hsqlbinary_import.mk dbaccess/Executable_odbcconfig.mk dbaccess/Module_dbaccess.mk dbaccess/qa dbaccess/source dbaccess/uiconfig dbaccess/win32 desktop/CppunitTest_desktop_lokinit.mk d esktop/Executable_oosplash.mk desktop/Extension_test-passive.mk desktop/inc desktop/Library_sofficeapp.mk desktop/Module_desktop.mk desktop/qa desktop/scripts desktop/source desktop/test desktop/unx dictionaries distro-configs/Jenkins distro-configs/LibreOfficeFlatpak.conf distro-configs/LibreOfficeHaiku.conf distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeOssFuzz.conf distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf download.lst drawinglayer/Library_drawinglayer.mk drawinglayer/source dtrans/source dtrans/test editeng/inc editeng/qa editeng/source embeddedobj/source embeddedobj/test embedserv/source emfio/CppunitTest_emfio_wmf_test.mk emfio/inc emfio/source eventattacher/source extensions/CustomTarget_automationtest.mk extensions/inc extensions/Module_extensions.mk extensions/qa extensions/source extensions/uiconfig external/boost external/breakpad external/cairo external/cppunit external/epoxy external/f irebird external/gpgmepp external/harfbuzz external/hsqldb external/hunspell external/icu external/libatomic_ops external/libcmis external/libepubgen external/libexttextcat external/libmwaw external/libnumbertext external/liborcus external/libstaroffice external/libwps external/mariadb-connector-c external/mdds external/Module_external.mk external/more_fonts external/mysql-connector-cpp external/nss external/openssl external/pdfium external/poppler external/python3 external/twain_dsm external/xmlsec extras/CustomTarget_tplofficorr.mk extras/CustomTarget_tploffimisc.mk extras/CustomTarget_tplpersonal.mk extras/CustomTarget_tpl_styles.mk extras/Module_extras.mk extras/Package_tplofficorr.mk extras/Package_tploffimisc.mk extras/Package_tplpersonal.mk extras/Package_tpl_styles.mk extras/README extras/source filter/Configuration_filter.mk filter/Library_svgfilter.mk filter/qa filter/source filter/uiconfig forms/source formula/source fpicker/Library_fps.mk fpicker/source fpicker/uiconfig fpicker/WinResTarget_fps.mk framework/dtd framework/inc framework/source framework/uiconfig g helpcompiler/inc helpcompiler/source helpcontent2 hwpfilter/source i18nlangtag/qa i18nlangtag/source i18npool/inc i18npool/qa i18npool/source i18npool/util i18nutil/source icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_svg icon-themes/elementary icon-themes/elementary_svg icon-themes/karasa_jaga icon-themes/tango icon-themes/tango_svg idlc/inc idlc/source idl/inc idl/source include/android include/basegfx include/basic include/canvas include/com include/comphelper include/connectivity include/cppcanvas include/cppuhelper include/drawinglayer include/editeng include/filter include/formula include/framework include/i18nlangtag include/i18nutil include/ios include/IwyuFilter_include.yaml include/LibreOfficeKit include/o3tl include/oox include/osl include/package include/rtl include/sal include/salhelper include/sax include/sfx2 include /sot include/store include/svl include/svtools include/svx include/test include/toolkit include/tools include/ucbhelper include/unoidl include/unotest include/unotools include/vbahelper include/vcl include/xmloff include/xmlreader include/xmlscript instsetoo_native/CustomTarget_setup.mk instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/util ios/CustomTarget_iOS_setup.mk ios/LibreOfficeLight ios/Module_ios.mk io/source ios/source ios/StaticLibrary_ios.mk io/test javaunohelper/com javaunohelper/source jurt/com jurt/source jvmfwk/inc jvmfwk/plugins jvmfwk/source l10ntools/inc l10ntools/source libreofficekit/Executable_tilebench.mk libreofficekit/qa libreofficekit/README libreofficekit/source lingucomponent/source linguistic/source linguistic/workben lotuswordpro/inc lotuswordpro/source Makefile.fetch Makefile.in mysqlc/Configuration_mysql.mk mysqlc/Extension_mysql-connector-ooo.mk mysqlc/Library_mysqlc.mk mysqlc/Makefile mysqlc /Module_mysqlc.mk mysqlc/Rdb_mysqlc.mk mysqlc/README mysqlc/source nlpsolver/src o3tl/qa odk/docs odk/examples odk/source offapi/com offapi/UnoApi_offapi.mk officecfg/registry officecfg/util onlineupdate/source oovbaapi/ooo oovbaapi/UnoApi_oovbaapi.mk oox/CppunitTest_oox_crypto.mk oox/inc oox/Library_oox.mk oox/Module_oox.mk oox/qa oox/source oox/util opencl/inc opencl/source package/inc package/Library_package2.mk package/qa package/source postprocess/CustomTarget_registry.mk postprocess/Module_postprocess.mk postprocess/Rdb_services.mk pyuno/qa pyuno/source qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/runner qadevOOo/tests readlicense_oo/docs readlicense_oo/license README.md registry/source registry/test registry/tools remotebridges/source reportbuilder/java reportdesign/images reportdesign/inc reportdesign/qa reportdesign/source reportdesign/uiconfig RepositoryExternal.mk Repository.mk RepositoryModule_host.mk ridljar/com sal/cppunittester sal/CppunitTest_sal_rtl.mk salhelp er/qa salhelper/source sal/inc sal/Library_sal.mk sal/osl sal/qa sal/rtl sal/test sal/textenc sal/util sax/inc sax/qa sax/source sax/test scaddins/source sccomp/source sc/CppunitTest_sc_addin_functions_test.mk sc/CppunitTest_sc_anchor_test.mk sc/CppunitTest_sc_annotationobj.mk sc/CppunitTest_sc_annotationshapeobj.mk sc/CppunitTest_sc_annotationsobj.mk sc/CppunitTest_sc_arealinkobj.mk sc/CppunitTest_sc_arealinksobj.mk sc/CppunitTest_sc_array_functions_test.mk sc/CppunitTest_sc_autoformatobj.mk sc/CppunitTest_sc_bugfix_test.mk sc/CppunitTest_sc_cellcursorobj.mk sc/CppunitTest_sc_cellobj.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_cellrangesobj.mk sc/CppunitTest_sc_chart2dataprovider.mk sc/CppunitTest_sc_check_data_pilot_field.mk sc/CppunitTest_sc_check_data_pilot_table.mk sc/CppunitTest_sc_check_xcell_ranges_query.mk sc/CppunitTest_sc_cond_format_merge.mk sc/CppunitTest_sc_consolidationdescriptorobj.mk sc/CppunitTest_sc_copypaste.mk sc/CppunitTest_sc_database_functions_test .mk sc/CppunitTest_sc_databaserangeobj.mk sc/CppunitTest_sc_databaserangesobj.mk sc/CppunitTest_sc_datapilotfieldobj.mk sc/CppunitTest_sc_datapilottableobj.mk sc/CppunitTest_sc_dataprovider.mk sc/CppunitTest_sc_datatransformation.mk sc/CppunitTest_sc_datetime_functions_test.mk sc/CppunitTest_sc_ddelinkobj.mk sc/CppunitTest_sc_documentconfigurationobj.mk sc/CppunitTest_sc_editfieldobj_cell.mk sc/CppunitTest_sc_editfieldobj_header.mk sc/CppunitTest_sc_filterdescriptorbaseobj.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_financial_functions_test.mk sc/CppunitTest_sc_functionlistobj.mk sc/CppunitTest_sc_functions_test_old.mk sc/CppunitTest_sc_headerfootercontentobj.mk sc/CppunitTest_sc_html_export_test.mk sc/CppunitTest_sc_importdescriptorbaseobj.mk sc/CppunitTest_sc_information_functions_test.mk sc/CppunitTest_sc_labelrangeobj.mk sc/CppunitTest_sc_labelrangesobj.mk sc/CppunitTest_sc_logical_functions_test.mk sc/CppunitTest_sc_mathematical_functions_test.mk sc/CppunitTest_sc_mo delobj.mk sc/CppunitTest_sc_namedrangesobj.mk sc/CppunitTest_sc_opencl_test.mk sc/CppunitTest_sc_outlineobj.mk sc/CppunitTest_sc_parallelism.mk sc/CppunitTest_sc_perfobj.mk sc/CppunitTest_sc_pivottable_filters_test.mk sc/CppunitTest_sc_recentfunctionsobj.mk sc/CppunitTest_sc_recordchanges.mk sc/CppunitTest_sc_scenariosobj.mk sc/CppunitTest_sc_screenshots.mk sc/CppunitTest_sc_shapeobj.mk sc/CppunitTest_sc_sheetlinkobj.mk sc/CppunitTest_sc_spreadsheet_functions_test.mk sc/CppunitTest_sc_spreadsheetsettings.mk sc/CppunitTest_sc_spreadsheetsettingsobj.mk sc/CppunitTest_sc_statistical_functions_test.mk sc/CppunitTest_sc_styleloaderobj.mk sc/CppunitTest_sc_subsequent_export_test.mk sc/CppunitTest_sc_subsequent_filters_test.mk sc/CppunitTest_sc_subtotaldescriptorbaseobj.mk sc/CppunitTest_sc_subtotalfieldobj.mk sc/CppunitTest_sc_tableconditionalentryobj.mk sc/CppunitTest_sc_tableconditionalformatobj.mk sc/CppunitTest_sc_tablesheetobj.mk sc/CppunitTest_sc_tablesheetsobj.mk sc/CppunitTest_sc_ tablevalidationobj.mk sc/CppunitTest_sc_tabviewobj.mk sc/CppunitTest_sc_text_functions_test.mk sc/CppunitTest_sc_ucalc.mk sc/CppunitTest_sc_viewpaneobj.mk schema/libreoffice schema/mathml2 schema/odf1.3 schema/README sc/inc sc/IwyuFilter_sc.yaml sc/Library_scd.mk sc/Library_scfilt.mk sc/Library_sc.mk sc/Library_scqahelper.mk sc/Library_scui.mk sc/Module_sc.mk scp2/InstallModule_ooo.mk scp2/InstallScript_setup_osl.mk scp2/Module_scp2.mk scp2/source sc/qa sc/res scripting/java scripting/source sc/sdi sc/source sc/uiconfig sc/UIConfig_scalc.mk sc/UITest_calc_tests2.mk sc/UITest_calc_tests3.mk sc/UITest_calc_tests4.mk sc/UITest_calc_tests6.mk sc/UITest_conditional_format.mk sc/UITest_goalSeek.mk sc/UITest_key_f4.mk sc/UITest_options.mk sc/UITest_protect.mk sc/UITest_solver.mk sc/UITest_statistics.mk sc/UITest_textCase.mk sc/UITest_validity.mk sd/CppunitTest_sd_activex_controls_tests.mk sd/CppunitTest_sd_dialogs_test.mk sd/CppunitTest_sd_import_tests_smartart.mk sd/CppunitTest_sd_uimpres s.mk sdext/CppunitTest_sdext_pdfimport.mk sdext/Executable_pdf2xml.mk sdext/Executable_pdfunzip.mk sdext/Library_pdfimport.mk sdext/Library_PresentationMinimizer.mk sdext/source sd/inc sd/IwyuFilter_sd.yaml sd/Library_sdfilt.mk sd/Library_sd.mk sd/Module_sd.mk sd/qa sd/sdi sd/source sd/uiconfig sd/UIConfig_sdraw.mk sd/UITest_impress_tests.mk setup.cfg setup_native/Library_inst_msu_msi.mk setup_native/Library_instooofiltmsi.mk setup_native/Library_qslnkmsi.mk setup_native/Library_reg4allmsdoc.mk setup_native/Library_regactivex.mk setup_native/Library_sdqsmsi.mk setup_native/Library_sellangmsi.mk setup_native/Library_shlxtmsi.mk setup_native/Library_sn_tools.mk setup_native/scripts setup_native/source sfx2/classification sfx2/CppunitTest_sfx2_classification.mk sfx2/inc sfx2/Library_sfx.mk sfx2/qa sfx2/sdi sfx2/source sfx2/uiconfig shell/inc shell/Library_desktopbe.mk shell/source slideshow/Library_slideshow.mk slideshow/source slideshow/test smoketest/libtest.cxx solenv/bin solenv/cla ng-format solenv/CompilerTest_compilerplugins_clang.mk solenv/flatpak-manifest.in solenv/gbuild solenv/inc solenv/qa solenv/sanitizers solenv/vs soltools/cpp soltools/mkdepend sot/qa sot/source starmath/inc starmath/qa starmath/source starmath/uiconfig stoc/source stoc/test store/source svgio/inc svgio/source svl/qa svl/source svl/unx svtools/CppunitTest_svtools_graphic.mk svtools/inc svtools/langsupport svtools/qa svtools/source svtools/uiconfig svtools/UIConfig_svt.mk svx/Executable_gengal.mk svx/Executable_pixelctl.mk svx/inc svx/Library_svxcore.mk svx/Module_svx.mk svx/sdi svx/source svx/uiconfig svx/UIConfig_svx.mk svx/util svx/workben sw/CppunitTest_sw_docbookexport.mk sw/CppunitTest_sw_filters_test.mk sw/CppunitTest_sw_fodfexport.mk sw/CppunitTest_sw_globalfilter.mk sw/CppunitTest_sw_htmlexport.mk sw/CppunitTest_sw_htmlimport.mk sw/CppunitTest_sw_layoutwriter.mk sw/CppunitTest_sw_mailmerge.mk sw/CppunitTest_sw_odfexport.mk sw/CppunitTest_sw_odfimport.mk sw/CppunitTest_sw_ooxm lencryption.mk sw/CppunitTest_sw_ooxmlexport8.mk sw/CppunitTest_sw_ooxmlfieldexport.mk sw/CppunitTest_sw_ooxmlimport2.mk sw/CppunitTest_sw_ooxmlimport.mk sw/CppunitTest_sw_ooxmllinks.mk sw/CppunitTest_sw_ooxmlw14export.mk sw/CppunitTest_sw_rtfexport2.mk sw/CppunitTest_sw_rtfexport3.mk sw/CppunitTest_sw_rtfexport.mk sw/CppunitTest_sw_rtfimport.mk sw/CppunitTest_sw_tiledrendering.mk sw/CppunitTest_sw_txtexport.mk sw/CppunitTest_sw_uiwriter.mk sw/CppunitTest_sw_unowriter.mk sw/CppunitTest_sw_uwriter.mk sw/CppunitTest_sw_ww8export2.mk sw/CppunitTest_sw_ww8export3.mk sw/CppunitTest_sw_ww8export.mk sw/CppunitTest_sw_ww8import.mk sw/CppunitTest_sw_xhtmlexport.mk sw/inc sw/IwyuFilter_sw.yaml sw/Library_msword.mk sw/Library_sw.mk sw/Library_swui.mk sw/Library_vbaswobj.mk sw/Module_sw.mk sw/ooxmlexport_setup.mk sw/PythonTest_sw_python.mk sw/qa sw/sdi sw/source sw/uiconfig sw/UITest_table.mk sw/UITest_writer_tests2.mk sw/UITest_writer_tests3.mk sw/UITest_writer_tests4.mk sysui/desktop sysui/Pa ckage_infoplist.mk test/Library_subsequenttest.mk test/source testtools/source toolkit/inc toolkit/Library_tk.mk toolkit/source toolkit/test tools/CppunitTest_tools_config.mk tools/Library_tl.mk tools/Module_tools.mk tools/qa tools/source translations ucbhelper/Library_ucbhelper.mk ucbhelper/source ucb/source udkapi/com uitest/demo_ui uitest/loginterpreter.py uitest/test_main.py uitest/writer_tests UnoControls/inc UnoControls/source unodevtools/source unoidl/source unotest/source unotools/source unoxml/inc unoxml/qa unoxml/source uui/source vbahelper/source vcl/android vcl/backendtest vcl/CppunitTest_vcl_bitmap_test.mk vcl/CppunitTest_vcl_fontfeature.mk vcl/CustomTarget_kde5_moc.mk vcl/CustomTarget_qt5_moc.mk vcl/Executable_docxfuzzer.mk vcl/Executable_fodpfuzzer.mk vcl/Executable_fodsfuzzer.mk vcl/Executable_fodtfuzzer.mk vcl/Executable_htmlfuzzer.mk vcl/Executable_icontest.mk vcl/Executable_mmlfuzzer.mk vcl/Executable_pptxfuzzer.mk vcl/Executable_scrtffuzzer.mk vcl/Executable_vcld emo.mk vcl/Executable_wksfuzzer.mk vcl/Executable_xlsfuzzer.mk vcl/Executable_xlsxfuzzer.mk vcl/headless vcl/inc vcl/ios vcl/Library_vcl.mk vcl/Library_vclplug_kde5.mk vcl/Library_vclplug_qt5.mk vcl/Module_vcl.mk vcl/opengl vcl/osx vcl/qa vcl/qt5 vcl/quartz vcl/README vcl/README.lifecycle vcl/README.scheduler vcl/source vcl/uiconfig vcl/UIConfig_vcl.mk vcl/unx vcl/win vcl/workben winaccessibility/inc winaccessibility/source wizards/com wizards/source writerfilter/inc writerfilter/IwyuFilter_writerfilter.yaml writerfilter/Library_writerfilter.mk writerfilter/source writerperfect/inc writerperfect/qa writerperfect/source xmerge/source xmlhelp/source xmloff/inc xmloff/qa xmloff/source xmlreader/source xmlscript/source xmlscript/test xmlsecurity/inc xmlsecurity/IwyuFilter_xmlsecurity.yaml xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/qa xmlsecurity/source xmlsecurity/util xmlsecurity/workben
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Sep 21 02:17:41 UTC 2018
Rebased ref, commits from common ancestor:
commit 091916a809659ff06e84c6c5360efb8e76863adf
Author: Daniel <danielfaleirosilva at gmail.com>
AuthorDate: Tue Jul 31 09:49:07 2018 -0300
Commit: Daniel Silva <danielfaleirosilva at gmail.com>
CommitDate: Thu Sep 20 10:20:55 2018 -0300
Print dialog UI adjustments
Change-Id: Iecf66e31b66d65b9077da4870385ef8f9012f043
Reviewed-on: https://gerrit.libreoffice.org/58361
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
diff --git a/sd/uiconfig/simpress/ui/impressprinteroptions.ui b/sd/uiconfig/simpress/ui/impressprinteroptions.ui
index e09238699de7..44ea2df97feb 100644
--- a/sd/uiconfig/simpress/ui/impressprinteroptions.ui
+++ b/sd/uiconfig/simpress/ui/impressprinteroptions.ui
@@ -21,115 +21,83 @@
<property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
+ <property name="right_padding">7</property>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">3</property>
+ <property name="row_spacing">5</property>
+ <property name="column_spacing">6</property>
<child>
- <object class="GtkBox" id="box7">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="impressprinteroptions|label2">Type:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="impressdocument">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes" context="impressprinteroptions|label2">Type:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">impressdocument</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box5">
+ <object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="impressprinteroptions|label7">Slides per page:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="slidesperpage">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes" context="impressprinteroptions|label7">Slides per page:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">slidesperpage</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box6">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="impressprinteroptions|label1">Order:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="slidesperpageorder">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes" context="impressprinteroptions|label1">Order:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">slidesperpageorder</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="impressdocument">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="slidesperpage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="slidesperpageorder">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
</object>
diff --git a/sw/uiconfig/swriter/ui/printeroptions.ui b/sw/uiconfig/swriter/ui/printeroptions.ui
index 88bb58a22eb4..6b6fcc4cb586 100644
--- a/sw/uiconfig/swriter/ui/printeroptions.ui
+++ b/sw/uiconfig/swriter/ui/printeroptions.ui
@@ -121,6 +121,8 @@
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="label" translatable="yes" context="printeroptions|formcontrols">Comments:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">writercomments</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index f3ec99e83817..951c2e3ac189 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -106,10 +106,10 @@
</object>
<object class="GtkListStore" id="liststore4">
<columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
</columns>
- <data>
+ <data>
<row>
<col id="0" translatable="yes" context="printdialog|liststore4">Print only in one side</col>
</row>
@@ -143,7 +143,7 @@
<property name="use_stock">True</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="secondary">True</property>
@@ -155,11 +155,10 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="margin_left">50</property>
- <property name="margin_right">135</property>
+ <property name="margin_right">10</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
@@ -173,7 +172,7 @@
<property name="use_stock">True</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
@@ -187,7 +186,7 @@
<property name="use_stock">True</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
@@ -203,10 +202,7 @@
<object class="GtkBox" id="box0">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">5</property>
- <property name="margin_right">5</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
@@ -224,8 +220,8 @@
<property name="orientation">vertical</property>
<child>
<object class="vcllo-PrintPreviewWindow" id="preview">
- <property name="width_request">463</property>
- <property name="height_request">650</property>
+ <property name="width_request">500</property>
+ <property name="height_request">700</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -243,34 +239,16 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="previewbox">
- <property name="label" translatable="yes" context="printdialog|previewbox">Preview</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="halign">center</property>
- <property name="active">True</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">25</property>
+ <property name="spacing">30</property>
<child>
- <object class="GtkBox" id="box">
+ <object class="GtkBox" id="box14">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_right">10</property>
- <property name="spacing">3</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkButton" id="forward">
<property name="visible">True</property>
@@ -327,7 +305,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
@@ -339,76 +317,23 @@
<property name="margin_left">10</property>
<property name="spacing">3</property>
<child>
- <object class="GtkLabel" id="labelzoom">
+ <object class="GtkCheckButton" id="previewbox">
+ <property name="label" translatable="yes" context="printdialog|previewbox">Preview</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="printdialog|labelzoom">Zoom:</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">center</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">zoomscale</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="minus">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">5</property>
- <property name="margin_right">5</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScale" id="zoomscale">
- <property name="width_request">100</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="valign">center</property>
- <property name="adjustment">adjustment1</property>
- <property name="round_digits">1</property>
- <property name="digits">0</property>
- <property name="draw_value">False</property>
- <property name="has_origin">False</property>
- <property name="value_pos">bottom</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="plus">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">5</property>
- <property name="margin_right">5</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelzoomvalue">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="printdialog|labelzoomvalue">100%</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -421,7 +346,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -443,7 +368,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">10</property>
<child>
<object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
@@ -452,8 +376,10 @@
<object class="GtkBox" id="box11">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">6</property>
+ <property name="margin_top">6</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@@ -461,7 +387,7 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment">
+ <object class="GtkAlignment" id="alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
@@ -471,22 +397,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="labelprint">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes" context="printdialog|labelprint">Printer</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="spacing">6</property>
<child>
<object class="GtkComboBox" id="printersbox">
<property name="visible">True</property>
@@ -495,13 +406,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box6">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkLabel" id="labelstatus">
<property name="visible">True</property>
@@ -528,7 +440,7 @@
</child>
<child>
<object class="GtkButton" id="setup">
- <property name="label" translatable="yes" context="printdialog|setup">Printer Settings</property>
+ <property name="label" translatable="yes" context="printdialog|setup">Properties...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -545,7 +457,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -553,9 +465,15 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel">
+ <object class="GtkLabel" id="labelprinter">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="printdialog|labelprinter">Printer</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">printersbox</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -572,104 +490,43 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkExpander" id="expander1">
+ <object class="GtkBox" id="box7">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="expanded">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="box7">
+ <object class="GtkBox" id="box8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkBox" id="box8">
+ <object class="GtkLabel" id="labelcopies">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="labelcopies">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">8</property>
- <property name="label" translatable="yes" context="printdialog|labelcopies">Number of Copies:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">copycount</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="copycount">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustment2</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkCheckButton" id="collate">
- <property name="label" translatable="yes" context="printdialog|collate">Collate</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="collateimage">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="halign">start</property>
+ <property name="margin_left">8</property>
+ <property name="label" translatable="yes" context="printdialog|labelcopies">Number of Copies:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">copycount</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="printpagesbox">
- <property name="can_focus">False</property>
+ <object class="GtkSpinButton" id="copycount">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustment2</property>
</object>
<packing>
<property name="expand">False</property>
@@ -678,163 +535,77 @@
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkBox" id="box9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="orientation">vertical</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">3</property>
- <child>
- <object class="GtkLabel" id="printrange">
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="label" translatable="yes" context="printdialog|labelpages">Pages:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
<child>
- <object class="GtkEntry" id="pagerange">
- <property name="can_focus">True</property>
- <property name="placeholder_text" translatable="yes" context="printdialog|pagerange">e.g.: 1, 3-5, 7, 9</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelpapersides">
+ <object class="GtkCheckButton" id="collate">
+ <property name="label" translatable="yes" context="printdialog|collate">Collate</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="margin_left">6</property>
- <property name="label" translatable="yes" context="printdialog|labelpapersides">Paper Sides:</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="sidesbox">
+ <object class="GtkImage" id="collateimage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="model">liststore4</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="fromwhich">
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="label" translatable="yes" context="printdialog|fromwhich">From which print:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="printextrabox">
- <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">2</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="reverseorder">
- <property name="label" translatable="yes" context="printdialog|reverseorder">Print in Reverse Order</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="halign">start</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="labelrangeandcopies">
- <property name="visible">True</property>
+ <child>
+ <object class="GtkComboBox" id="printpagesbox">
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="printdialog|labelrangeandcopies">Range and Copies</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="layoutframe">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkExpander" id="expander2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="expanded">True</property>
<child>
- <object class="GtkGrid" id="grid2">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">6</property>
+ <property name="halign">start</property>
+ <property name="orientation">vertical</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">3</property>
+ <property name="column_spacing">6</property>
<child>
- <object class="GtkLabel" id="labelorientation">
- <property name="visible">True</property>
+ <object class="GtkLabel" id="printrange">
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="printdialog|labelorientation">Orientation:</property>
- <property name="mnemonic_widget">pageorientationbox</property>
+ <property name="halign">start</property>
+ <property name="margin_left">6</property>
+ <property name="label" translatable="yes" context="printdialog|labelpages">Pages:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">pagerange</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -842,286 +613,454 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="labelsize">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="printdialog|labelsize">Paper Size:</property>
- <property name="mnemonic_widget">papersizebox</property>
+ <object class="GtkEntry" id="pagerange">
+ <property name="can_focus">True</property>
+ <property name="placeholder_text" translatable="yes" context="printdialog|pagerange">e.g.: 1, 3-5, 7, 9</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="labelorder">
+ <object class="GtkLabel" id="labelpapersides">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="printdialog|labelorder">Order:</property>
- <property name="mnemonic_widget">orderbox</property>
+ <property name="halign">start</property>
+ <property name="margin_left">6</property>
+ <property name="label" translatable="yes" context="printdialog|labelpapersides">Paper Sides:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">sidesbox</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">6</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="orderbox">
+ <object class="GtkComboBox" id="sidesbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="model">liststore2</property>
+ <property name="model">liststore4</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">6</property>
- <property name="width">3</property>
- </packing>
- </child>
- <child>
- <object class="vcllo-ShowNupOrderWindow" id="orderpreview">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="valign">start</property>
- </object>
- <packing>
- <property name="left_attach">4</property>
<property name="top_attach">2</property>
- <property name="height">7</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="pageorientationbox">
- <property name="visible">True</property>
+ <object class="GtkLabel" id="fromwhich">
<property name="can_focus">False</property>
- <property name="model">liststore3</property>
+ <property name="halign">start</property>
+ <property name="margin_left">6</property>
+ <property name="label" translatable="yes" context="printdialog|fromwhich">From which print:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">printextrabox</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">4</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="papersizebox">
- <property name="visible">True</property>
+ <object class="GtkComboBox" id="printextrabox">
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">4</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="pagemargintxt1">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="printdialog|pagemargintxt1">Margin:</property>
- <property name="mnemonic_widget">pagemarginsb:0mm</property>
+ <object class="GtkCheckButton" id="reverseorder">
+ <property name="label" translatable="yes" context="printdialog|reverseorder">Print in Reverse Order</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="sheetmargintxt1">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="printdialog|sheetmargintxt1">Distance:</property>
- <property name="mnemonic_widget">sheetmarginsb:0mm</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="sheetmarginsb:0mm">
- <property name="can_focus">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="pagemarginsb:0mm">
- <property name="can_focus">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="pagemargintxt2">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="printdialog|pagemargintxt2">between pages</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">4</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="sheetmargintxt2">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="printdialog|sheetmargintxt2">to sheet border</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">5</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <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>
- <property name="halign">start</property>
- <property name="active">True</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">pagespersheetbtn</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
- <property name="width">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="pagerows">
- <property name="can_focus">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="pagecols">
- <property name="can_focus">True</property>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="by">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="printdialog|by">by</property>
- <property name="mnemonic_widget">pagecols</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
<property name="top_attach">3</property>
+ <property name="width">3</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="printdialog|label2">Range and Copies</property>
+ <property name="mnemonic_widget">printpagesbox</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="layoutframe">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="width_request">530</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="labelorientation">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes" context="printdialog|labelorientation">Orientation:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">pageorientationbox</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelsize">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes" context="printdialog|labelsize">Paper Size:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">papersizebox</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelorder">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">12</property>
+ <property name="label" translatable="yes" context="printdialog|labelorder">Order:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">orderbox</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="orderbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="model">liststore2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ <property name="width">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="vcllo-ShowNupOrderWindow" id="orderpreview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">start</property>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="height">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="pageorientationbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore3</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="papersizebox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="pagemargintxt1">
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">12</property>
+ <property name="label" translatable="yes" context="printdialog|pagemargintxt1">Margin:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">pagemarginsb:0mm</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="sheetmargintxt1">
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">12</property>
+ <property name="label" translatable="yes" context="printdialog|sheetmargintxt1">Distance:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">sheetmarginsb:0mm</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="sheetmarginsb:0mm">
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="pagemarginsb:0mm">
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="pagemargintxt2">
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">6</property>
+ <property name="label" translatable="yes" context="printdialog|pagemargintxt2">between pages</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="sheetmargintxt2">
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">6</property>
+ <property name="label" translatable="yes" context="printdialog|sheetmargintxt2">to sheet border</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <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>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">pagespersheetbtn</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="pagerows">
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="pagecols">
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="by">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="printdialog|by">by</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">pagecols</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="bordercb">
+ <property name="label" translatable="yes" context="printdialog|bordercb">Draw a border around each page</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">12</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">3</property>
<child>
- <object class="GtkCheckButton" id="bordercb">
- <property name="label" translatable="yes" context="printdialog|bordercb">Draw a border around each page</property>
+ <object class="GtkRadioButton" id="pagespersheetbtn">
+ <property name="label" translatable="yes" context="printdialog|pagespersheetbtn">Pages per sheet:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
+ <property name="active">True</property>
<property name="draw_indicator">True</property>
+ <property name="group">brochure</property>
+ <accessibility>
+ <relation type="label-for" target="pagespersheetbox"/>
+ </accessibility>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">8</property>
- <property name="width">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box12">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkRadioButton" id="pagespersheetbtn">
- <property name="label" translatable="yes" context="printdialog|pagespersheetbtn">Pages per sheet</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">brochure</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="pagespersheettxt">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="pagestxt">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="printdialog|pagespersheettxt">Pages</property>
- <property name="mnemonic_widget">pagerows</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="pagespersheetbox">
+ <object class="GtkLabel" id="pagespersheettxt">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="model">liststore1</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">3</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="pagelayout">
+ <child>
+ <object class="GtkLabel" id="pagestxt">
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">12</property>
+ <property name="label" translatable="yes" context="printdialog|pagespersheettxt">Pages:</property>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list