basctl/inc/strings.hrc | 8 basctl/source/basicide/basicrenderable.cxx | 45 basctl/source/basicide/basicrenderable.hxx | 8 i18nutil/source/utility/paper.cxx | 11 include/i18nutil/paper.hxx | 6 include/vcl/print.hxx | 6 sc/inc/docuno.hxx | 5 sc/inc/strings.hrc | 17 sc/source/ui/unoobj/docuno.cxx | 122 + sd/inc/DocumentRenderer.hrc | 16 sd/inc/strings.hrc | 8 sd/source/ui/view/DocumentRenderer.cxx | 111 - sd/uiconfig/simpress/ui/impressprinteroptions.ui | 120 + sfx2/source/view/viewprn.cxx | 13 sw/inc/strings.hrc | 11 sw/source/core/doc/doc.cxx | 14 sw/source/core/view/printdata.cxx | 101 - sw/source/uibase/uno/unotxdoc.cxx | 57 sw/uiconfig/swriter/ui/printeroptions.ui | 40 vcl/UIConfig_vcl.mk | 1 vcl/inc/print.hrc | 51 vcl/inc/printdlg.hxx | 243 +- vcl/inc/strings.hrc | 1 vcl/source/gdi/print.cxx | 31 vcl/source/gdi/print3.cxx | 37 vcl/source/window/printdlg.cxx | 1809 ++++++++++++--------- vcl/uiconfig/ui/moreoptionsdialog.ui | 88 + vcl/uiconfig/ui/printdialog.ui | 1912 ++++++++--------------- 28 files changed, 2557 insertions(+), 2335 deletions(-)
New commits: commit bc0146c2ae43256552c276d2dd86291c98556c42 Author: Daniel Silva <[email protected]> AuthorDate: Wed Nov 28 19:28:26 2018 -0200 Commit: Daniel Silva <[email protected]> CommitDate: Thu Nov 29 13:02:16 2018 -0200 Prepare to rebase Change-Id: I27b17e27d56a236d5d3bf59e1ce1f452fe36cce0 Reviewed-on: https://gerrit.libreoffice.org/64197 Tested-by: Jenkins Reviewed-by: Daniel Silva <[email protected]> diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 5afddc7fd73d..5fe92285d650 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -159,15 +159,15 @@ namespace vcl VclPtr<NumericField> mpPageEdit; OUString maPageStr; - OUString maNoPageStr; - OUString maNoPreviewStr; + OUString const maNoPageStr; + OUString const maNoPreviewStr; sal_Int32 mnCurPage; sal_Int32 mnCachedPages; BitmapEx const maCollateBmp; BitmapEx const maNoCollateBmp; - long mnCollateUIMode; + bool mbCollateAlwaysOff; VclPtr<RadioButton> mpPagesBtn; VclPtr<RadioButton> mpBrochureBtn; @@ -201,7 +201,6 @@ namespace vcl maPropertyToWindowMap; std::map< VclPtr<vcl::Window>, sal_Int32 > maControlToNumValMap; - std::set< OUString > maReverseDependencySet; Size maNupPortraitSize; Size maNupLandscapeSize; diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index fd5fbbed9dd4..6a038106fd23 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -528,7 +528,6 @@ Size const & PrintDialog::getJobPageSize() PrintDialog::PrintDialog(vcl::Window* i_pWindow, const std::shared_ptr<PrinterController>& i_rController) : ModalDialog(i_pWindow, "PrintDialog", "vcl/ui/printdialog.ui") -, mpCustomOptionsUIBuilder(nullptr) , maPController( i_rController ) , maPrintToFileText( VclResId( SV_PRINT_TOFILE_TXT ) ) , maDefPrtText( VclResId( SV_PRINT_DEFPRT_TXT ) ) @@ -538,7 +537,7 @@ PrintDialog::PrintDialog(vcl::Window* i_pWindow, const std::shared_ptr<PrinterCo , mnCachedPages( 0 ) , maCollateBmp(SV_PRINT_COLLATE_BMP) , maNoCollateBmp(SV_PRINT_NOCOLLATE_BMP) -, mnCollateUIMode(0) +, mbCollateAlwaysOff(false) , mbShowLayoutFrame( true ) , mbSingleJobs( false ) { @@ -600,7 +599,7 @@ PrintDialog::PrintDialog(vcl::Window* i_pWindow, const std::shared_ptr<PrinterCo std::sort( rQueues.begin(), rQueues.end(), lcl_ListBoxCompare ); for( const auto& rQueue : rQueues ) { - mpPrinters->InsertEntry( *it ); + mpPrinters->InsertEntry( rQueue ); } // select current printer if( mpPrinters->GetEntryPos( maPController->getPrinter()->GetName() ) != LISTBOX_ENTRY_NOTFOUND ) @@ -847,13 +846,13 @@ void PrintDialog::readFromSettings() "CollateBox" ); if( aValue.equalsIgnoreAsciiCase("alwaysoff") ) { - mnCollateUIMode = 1; + mbCollateAlwaysOff = true; mpCollateBox->Check( false ); mpCollateBox->Enable( false ); } else { - mnCollateUIMode = 0; + mbCollateAlwaysOff = false; aValue = pItem->getValue( "PrintDialog", "Collate" ); mpCollateBox->Check( aValue.equalsIgnoreAsciiCase("true") ); @@ -1076,7 +1075,7 @@ void PrintDialog::checkControlDependencies() { if( mpCopyCountField->GetValue() > 1 ) - mpCollateBox->Enable( mnCollateUIMode == 0 ); + mpCollateBox->Enable( !mbCollateAlwaysOff ); else mpCollateBox->Enable( false ); @@ -1095,41 +1094,23 @@ void PrintDialog::checkControlDependencies() void PrintDialog::checkOptionalControlDependencies() { - for( auto it = maControlToPropertyMap.begin(); - it != maControlToPropertyMap.end(); ++it ) + for( const auto& rEntry : maControlToPropertyMap ) { - bool bShouldbeEnabled = maPController->isUIOptionEnabled( it->second ); - if( ! bShouldbeEnabled ) - { - // enable controls that are directly attached to a dependency anyway - // if the normally disabled controls get modified, change the dependency - // so the control would be enabled - // example: in print range "Print All" is selected, "Page Range" is then of course - // not selected and the Edit for the Page Range would be disabled - // as a convenience we should enable the Edit anyway and automatically select - // "Page Range" instead of "Print All" if the Edit gets modified - if( maReverseDependencySet.find( it->second ) != maReverseDependencySet.end() ) - { - OUString aDep( maPController->getDependency( it->second ) ); - // if the dependency is at least enabled, then enable this control anyway - if( !aDep.isEmpty() && maPController->isUIOptionEnabled( aDep ) ) - bShouldbeEnabled = true; - } - } + bool bShouldbeEnabled = maPController->isUIOptionEnabled( rEntry.second ); - if( bShouldbeEnabled && dynamic_cast<RadioButton*>(it->first.get()) ) + if( bShouldbeEnabled && dynamic_cast<RadioButton*>(rEntry.first.get()) ) { - auto r_it = maControlToNumValMap.find( it->first ); + auto r_it = maControlToNumValMap.find( rEntry.first ); if( r_it != maControlToNumValMap.end() ) { - bShouldbeEnabled = maPController->isUIChoiceEnabled( it->second, r_it->second ); + bShouldbeEnabled = maPController->isUIChoiceEnabled( rEntry.second, r_it->second ); } } - bool bIsEnabled = it->first->IsEnabled(); + bool bIsEnabled = rEntry.first->IsEnabled(); // Enable does not do a change check first, so can be less cheap than expected if( bShouldbeEnabled != bIsEnabled ) - it->first->Enable( bShouldbeEnabled ); + rEntry.first->Enable( bShouldbeEnabled ); } } @@ -1141,11 +1122,11 @@ void PrintDialog::initFromMultiPageSetup( const vcl::PrinterController::MultiPag // setup field units for metric fields const LocaleDataWrapper& rLocWrap( mpPageMarginEdt->GetLocaleDataWrapper() ); - FieldUnit eUnit = FUNIT_MM; + FieldUnit eUnit = FieldUnit::MM; sal_uInt16 nDigits = 0; if( rLocWrap.getMeasurementSystemEnum() == MeasurementSystem::US ) { - eUnit = FUNIT_INCH; + eUnit = FieldUnit::INCH; nDigits = 2; } // set units @@ -1156,8 +1137,8 @@ void PrintDialog::initFromMultiPageSetup( const vcl::PrinterController::MultiPag mpPageMarginEdt->SetDecimalDigits( nDigits ); mpSheetMarginEdt->SetDecimalDigits( nDigits ); - mpSheetMarginEdt->SetValue( mpSheetMarginEdt->Normalize( i_rMPS.nLeftMargin ), FUNIT_100TH_MM ); - mpPageMarginEdt->SetValue( mpPageMarginEdt->Normalize( i_rMPS.nHorizontalSpacing ), FUNIT_100TH_MM ); + mpSheetMarginEdt->SetValue( mpSheetMarginEdt->Normalize( i_rMPS.nLeftMargin ), FieldUnit::MM_100TH ); + mpPageMarginEdt->SetValue( mpPageMarginEdt->Normalize( i_rMPS.nHorizontalSpacing ), FieldUnit::MM_100TH ); mpBorderCB->Check( i_rMPS.bDrawBorder ); mpNupRowsEdt->SetValue( i_rMPS.nRows ); mpNupColEdt->SetValue( i_rMPS.nColumns ); @@ -1174,8 +1155,8 @@ void PrintDialog::updateNup( bool i_bMayUseCache ) { int nRows = int(mpNupRowsEdt->GetValue()); int nCols = int(mpNupColEdt->GetValue()); - long nPageMargin = mpPageMarginEdt->Denormalize(mpPageMarginEdt->GetValue( FUNIT_100TH_MM )); - long nSheetMargin = mpSheetMarginEdt->Denormalize(mpSheetMarginEdt->GetValue( FUNIT_100TH_MM )); + long nPageMargin = mpPageMarginEdt->Denormalize(mpPageMarginEdt->GetValue( FieldUnit::MM_100TH )); + long nSheetMargin = mpSheetMarginEdt->Denormalize(mpSheetMarginEdt->GetValue( FieldUnit::MM_100TH )); PrinterController::MultiPageSetup aMPS; aMPS.nRows = nRows; @@ -1228,8 +1209,8 @@ void PrintDialog::updateNupFromPages( bool i_bMayUseCache ) sal_IntPtr nPages = sal_IntPtr(mpNupPagesBox->GetSelectedEntryData()); int nRows = int(mpNupRowsEdt->GetValue()); int nCols = int(mpNupColEdt->GetValue()); - long nPageMargin = mpPageMarginEdt->Denormalize(mpPageMarginEdt->GetValue( FUNIT_100TH_MM )); - long nSheetMargin = mpSheetMarginEdt->Denormalize(mpSheetMarginEdt->GetValue( FUNIT_100TH_MM )); + long nPageMargin = mpPageMarginEdt->Denormalize(mpPageMarginEdt->GetValue( FieldUnit::MM_100TH )); + long nSheetMargin = mpSheetMarginEdt->Denormalize(mpSheetMarginEdt->GetValue( FieldUnit::MM_100TH )); bool bCustom = false; if( nPages == 1 ) @@ -1295,7 +1276,7 @@ void PrintDialog::updateNupFromPages( bool i_bMayUseCache ) mpSheetMarginEdt->SetMax( mpSheetMarginEdt->Normalize( - std::min(nHorzMax, nVertMax) ), FUNIT_100TH_MM ); + std::min(nHorzMax, nVertMax) ), FieldUnit::MM_100TH ); // maximum page distance nHorzMax = (aSize.Width() - 2*nSheetMargin); @@ -1312,13 +1293,13 @@ void PrintDialog::updateNupFromPages( bool i_bMayUseCache ) mpPageMarginEdt->SetMax( mpSheetMarginEdt->Normalize( - std::min(nHorzMax, nVertMax ) ), FUNIT_100TH_MM ); + std::min(nHorzMax, nVertMax ) ), FieldUnit::MM_100TH ); } mpNupRowsEdt->SetValue( nRows ); mpNupColEdt->SetValue( nCols ); - mpPageMarginEdt->SetValue( mpPageMarginEdt->Normalize( nPageMargin ), FUNIT_100TH_MM ); - mpSheetMarginEdt->SetValue( mpSheetMarginEdt->Normalize( nSheetMargin ), FUNIT_100TH_MM ); + mpPageMarginEdt->SetValue( mpPageMarginEdt->Normalize( nPageMargin ), FieldUnit::MM_100TH ); + mpSheetMarginEdt->SetValue( mpSheetMarginEdt->Normalize( nSheetMargin ), FieldUnit::MM_100TH ); showAdvancedControls( bCustom ); updateNup( i_bMayUseCache ); @@ -1729,6 +1710,10 @@ void PrintDialog::setupOptionalUI() mpPagesBoxTitleTxt->SetText( mpPagesBtn->GetText() ); mpPagesBoxTitleTxt->Show(); mpPagesBtn->Show( false ); + + mpPagesBoxTitleTxt->SetAccessibleRelationLabelFor(mpNupPagesBox); + mpNupPagesBox->SetAccessibleRelationLabeledBy(mpPagesBoxTitleTxt); + mpPagesBtn->SetAccessibleRelationLabelFor(nullptr); } // update enable states diff --git a/vcl/uiconfig/ui/moreoptionsdialog.ui b/vcl/uiconfig/ui/moreoptionsdialog.ui index 7fb615d60417..decde6d3ba41 100644 --- a/vcl/uiconfig/ui/moreoptionsdialog.ui +++ b/vcl/uiconfig/ui/moreoptionsdialog.ui @@ -59,7 +59,7 @@ <property name="orientation">vertical</property> <child> <object class="GtkCheckButton" id="singlejobs"> - <property name="label" translatable="yes" context="moreoptionsdialog|singlejobs">Create single print jobs for collated output</property> + <property name="label" translatable="yes" context="moreoptionsdialog|singlejobs">Create separate print jobs for collated output</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index 951c2e3ac189..b8a04ebf9093 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -254,6 +254,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="printdialog|forward">Next page</property> <property name="image">image2</property> </object> <packing> @@ -293,6 +294,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="printdialog|backward">Previous page</property> <property name="image">image1</property> </object> <packing> @@ -372,11 +374,14 @@ <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="scrollable">True</property> + <property name="enable_popup">True</property> <child> <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_right">6</property> <property name="margin_top">6</property> <property name="orientation">vertical</property> <property name="spacing">12</property> @@ -419,6 +424,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes" context="printdialog|labelstatus">Status:</property> + <accessibility> + <relation type="label-for" target="status"/> + </accessibility> </object> <packing> <property name="expand">False</property> @@ -431,6 +439,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes" context="printdialog|status">Default Printer</property> + <accessibility> + <relation type="labelled-by" target="labelstatus"/> + </accessibility> </object> <packing> <property name="expand">False</property> @@ -606,6 +617,9 @@ <property name="label" translatable="yes" context="printdialog|labelpages">Pages:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">pagerange</property> + <accessibility> + <relation type="label-for" target="pagerange"/> + </accessibility> </object> <packing> <property name="left_attach">0</property> @@ -616,6 +630,9 @@ <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> + <accessibility> + <relation type="labelled-by" target="printrange"/> + </accessibility> </object> <packing> <property name="left_attach">1</property> commit 6686eaa079f5557d0f3bbe92781ad9854d8a5ef6 Author: Daniel <[email protected]> AuthorDate: Tue Jul 31 09:49:07 2018 -0300 Commit: Daniel Silva <[email protected]> CommitDate: Thu Nov 29 13:02:16 2018 -0200 Print dialog UI adjustments Change-Id: Iecf66e31b66d65b9077da4870385ef8f9012f043 Reviewed-on: https://gerrit.libreoffice.org/58361 Tested-by: Jenkins Reviewed-by: Katarina Behrens <[email protected]> diff --git a/sd/uiconfig/simpress/ui/impressprinteroptions.ui b/sd/uiconfig/simpress/ui/impressprinteroptions.ui index 70e48f940aa8..c40508ae3b3f 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 d3efd6be93f1..36f9d87bff2e 100644 --- a/sw/uiconfig/swriter/ui/printeroptions.ui +++ b/sw/uiconfig/swriter/ui/printeroptions.ui @@ -116,6 +116,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> ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
