[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/uiconfig
sw/uiconfig/swriter/toolbar/previewobjectbar.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 995fd28f88a5122d4f649f7710501bcd752cf6b5 Author: Martin Owens docto...@gmail.com Date: Sun Jul 27 03:26:32 2014 + fdo#30425 - button should be print, not print preview Change-Id: I1b72fcc9d2134b9fb089db307d42d317017f4089 (cherry picked from commit 70599252873c3dbe03e36083ad093aedfdb8b923) diff --git a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml index 36db7df..771d40d 100644 --- a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml @@ -35,7 +35,7 @@ toolbar:toolbaritem xlink:href=.uno:ZoomMinus toolbar:helpid=10098/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:FullScreen toolbar:helpid=5627/ - toolbar:toolbaritem xlink:href=.uno:PrintPagePreview toolbar:helpid=21253/ + toolbar:toolbaritem xlink:href=.uno:Print toolbar:helpid=21253/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:ClosePreview toolbar:helpid=5325/ /toolbar:toolbar ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/uiconfig
sw/uiconfig/swriter/ui/objectdialog.ui | 20 +++- sw/uiconfig/swriter/ui/picturedialog.ui | 20 +++- 2 files changed, 6 insertions(+), 34 deletions(-) New commits: commit f899e508c35b6170bc11fc2eb4a74ec58d895625 Author: Michael Stahl mst...@redhat.com Date: Tue Jul 15 17:17:35 2014 +0200 fdo#81302: Revert sw: adapt object/picturedialog.ui to FillAttributes This reverts commit 270fabec85f37b513d29e74cb66b38d5eae7cf80. Required by commit dc17dad5fd7509f191718df8690e5847ab87669a, which reverted the FillAttributes. Change-Id: I525636d1e99b9fd639ad52aa69380a9896c7752b diff --git a/sw/uiconfig/swriter/ui/objectdialog.ui b/sw/uiconfig/swriter/ui/objectdialog.ui index cd56896..dc48bdf 100644 --- a/sw/uiconfig/swriter/ui/objectdialog.ui +++ b/sw/uiconfig/swriter/ui/objectdialog.ui @@ -160,10 +160,10 @@ placeholder/ /child child type=tab - object class=GtkLabel id=area + object class=GtkLabel id=background property name=visibleTrue/property property name=can_focusFalse/property -property name=label translatable=yesArea/property +property name=label translatable=yesBackground/property /object packing property name=position5/property @@ -174,27 +174,13 @@ placeholder/ /child child type=tab - object class=GtkLabel id=transparence -property name=visibleTrue/property -property name=can_focusFalse/property -property name=label translatable=yesTransparency/property - /object - packing -property name=position6/property -property name=tab_fillFalse/property - /packing -/child -child - placeholder/ -/child -child type=tab object class=GtkLabel id=macro property name=visibleTrue/property property name=can_focusFalse/property property name=label translatable=yesMacro/property /object packing -property name=position7/property +property name=position6/property property name=tab_fillFalse/property /packing /child diff --git a/sw/uiconfig/swriter/ui/picturedialog.ui b/sw/uiconfig/swriter/ui/picturedialog.ui index 5562076..71e3140 100644 --- a/sw/uiconfig/swriter/ui/picturedialog.ui +++ b/sw/uiconfig/swriter/ui/picturedialog.ui @@ -188,10 +188,10 @@ placeholder/ /child child type=tab - object class=GtkLabel id=area + object class=GtkLabel id=background property name=visibleTrue/property property name=can_focusFalse/property -property name=label translatable=yesArea/property +property name=label translatable=yesBackground/property /object packing property name=position7/property @@ -202,27 +202,13 @@ placeholder/ /child child type=tab - object class=GtkLabel id=transparence -property name=visibleTrue/property -property name=can_focusFalse/property -property name=label translatable=yesTransparency/property - /object - packing -property name=position8/property -property name=tab_fillFalse/property - /packing -/child -child - placeholder/ -/child -child type=tab object class=GtkLabel id=macro property name=visibleTrue/property property name=can_focusFalse/property property name=label translatable=yesMacro/property /object packing -property name=position9/property +property name=position8/property property name=tab_fillFalse/property /packing /child ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/uiconfig
sw/uiconfig/swriter/ui/mmaddressblockpage.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f8f70eed31e515262a50fef2239b716885c3f8c9 Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 9 10:13:59 2014 +0100 this widget should be hidden until expanded Change-Id: I1a6612428e3d9b98073983002db79b6f997d3968 (cherry picked from commit ee710b09f820aea01ec49521fad7d9525c5f9fa2) diff --git a/sw/uiconfig/swriter/ui/mmaddressblockpage.ui b/sw/uiconfig/swriter/ui/mmaddressblockpage.ui index 7c4c233..7d59874 100644 --- a/sw/uiconfig/swriter/ui/mmaddressblockpage.ui +++ b/sw/uiconfig/swriter/ui/mmaddressblockpage.ui @@ -97,8 +97,8 @@ /child child object class=GtkLabel id=currentaddress -property name=visibleTrue/property property name=can_focusFalse/property +property name=no_show_allTrue/property property name=xalign1/property property name=label translatable=yesCurrent address list: %1/property /object ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/uiconfig
sw/uiconfig/swriter/ui/optgeneralpage.ui | 554 +-- 1 file changed, 310 insertions(+), 244 deletions(-) New commits: commit 51c618f261a22ba477296d16dd9c9fe6e30ee3df Author: Caolán McNamara caol...@redhat.com Date: Mon May 26 16:55:25 2014 +0100 Resolves: fdo#79124 options cells shift down when unit clicked Change-Id: I528da752a38fcfb25aae40476891eb5052cf93b7 (cherry picked from commit 66925f65f83910ce97b4213f91d0d0e3aa2db43e) diff --git a/sw/uiconfig/swriter/ui/optgeneralpage.ui b/sw/uiconfig/swriter/ui/optgeneralpage.ui index 2a3d13c..d821366 100644 --- a/sw/uiconfig/swriter/ui/optgeneralpage.ui +++ b/sw/uiconfig/swriter/ui/optgeneralpage.ui @@ -1,13 +1,7 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.16.1 -- interface - !-- interface-requires gtk+ 3.0 -- - object class=GtkAdjustment id=adjustment1 -property name=lower0.5/property -property name=upper99.985/property -property name=value1.25/property -property name=step_increment0.10001/property -property name=page_increment10/property - /object + requires lib=gtk+ version=3.0/ object class=GtkAdjustment id=adjustment-sps property name=lower1/property property name=upper10/property @@ -15,225 +9,229 @@ property name=step_increment1/property property name=page_increment10/property /object - object class=GtkScrolledWindow id=scrolledwindow1 + object class=GtkAdjustment id=adjustment1 +property name=lower0.5/property +property name=upper99.985/property +property name=value1.25/property +property name=step_increment0.10001/property +property name=page_increment10/property + /object + object class=GtkBox id=OptGeneralPage property name=visibleTrue/property -property name=can_focusTrue/property +property name=can_focusFalse/property property name=hexpandTrue/property -property name=vexpandTrue/property -property name=shadow_typein/property -property name=vscrollbar_policyalways/property +property name=border_width6/property +property name=orientationvertical/property +property name=spacing12/property child - object class=GtkBox id=OptGeneralPage + object class=GtkGrid id=grid1 property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property -property name=border_width6/property -property name=orientationvertical/property -property name=spacing12/property +property name=row_spacing18/property +property name=column_spacing12/property child - object class=GtkGrid id=grid1 + object class=GtkGrid id=grid2 property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property -property name=row_spacing18/property property name=column_spacing12/property child - object class=GtkGrid id=grid2 + object class=GtkFrame id=frame1 property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property -property name=column_spacing12/property +property name=label_xalign0/property +property name=shadow_typenone/property child - object class=GtkFrame id=frame1 + object class=GtkAlignment id=alignment1 property name=visibleTrue/property property name=can_focusFalse/property -property name=hexpandTrue/property -property name=label_xalign0/property -property name=shadow_typenone/property +property name=top_padding6/property +property name=left_padding12/property child - object class=GtkAlignment id=alignment1 + object class=GtkGrid id=grid3 property name=visibleTrue/property property name=can_focusFalse/property -property name=top_padding6/property -property name=left_padding12/property +property name=row_spacing6/property child - object class=GtkGrid id=grid3 + object class=GtkRadioButton id=always +property name=label translatable=yes_Always/property property name=visibleTrue/property -property name=can_focusFalse/property -property name=row_spacing6/property -child - object class=GtkRadioButton id=always -
