[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig
cui/uiconfig/ui/colorpage.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 1750192300d81c6ebc78e3265e2f01104b4a9f59 Author: Julien Nabet serval2...@yahoo.fr Date: Thu Jan 23 21:57:09 2014 +0100 Resolves: fdo#73970 CMYK labels are switched Change-Id: Ie6a2aa5b1123c0ab752e10c4e587ef780784b247 Reviewed-on: https://gerrit.libreoffice.org/7622 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui index 4a16e76..0ae95ea 100644 --- a/cui/uiconfig/ui/colorpage.ui +++ b/cui/uiconfig/ui/colorpage.ui @@ -362,7 +362,7 @@ /object packing property name=left_attach0/property -property name=top_attach2/property +property name=top_attach1/property property name=width1/property property name=height1/property /packing @@ -437,7 +437,7 @@ /object packing property name=left_attach0/property -property name=top_attach1/property +property name=top_attach2/property property name=width1/property property name=height1/property /packing ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig
cui/uiconfig/ui/optmemorypage.ui |6 -- 1 file changed, 6 deletions(-) New commits: commit 751b65b246f9adaad314af808940e31050edc642 Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa Date: Tue Aug 27 08:20:54 2013 +0300 fix uneditable field in memory option page this will fix an uneditable remove from memory after field Change-Id: I0b47c4b8082d3244186596a7127f059bbb7214a5 Reviewed-on: https://gerrit.libreoffice.org/5640 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit 93be66f98f3180cbbe358bb5b38f64852a0d30fc) Reviewed-on: https://gerrit.libreoffice.org/5642 Reviewed-by: Jan Holesovsky ke...@suse.cz Tested-by: Jan Holesovsky ke...@suse.cz diff --git a/cui/uiconfig/ui/optmemorypage.ui b/cui/uiconfig/ui/optmemorypage.ui index d8c91b7..2e5a2d8 100644 --- a/cui/uiconfig/ui/optmemorypage.ui +++ b/cui/uiconfig/ui/optmemorypage.ui @@ -22,11 +22,6 @@ property name=step_increment1/property property name=page_increment10/property /object - object class=GtkAdjustment id=adjustment4 -property name=lower1/property -property name=upper2359/property -property name=value10/property - /object object class=GtkBox id=OptMemoryPage property name=visibleTrue/property property name=can_focusFalse/property @@ -229,7 +224,6 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=invisible_charâ¢/property -property name=adjustmentadjustment4/property /object packing property name=left_attach1/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig
cui/uiconfig/ui/acorexceptpage.ui | 53 +++-- cui/uiconfig/ui/acorreplacepage.ui | 31 +++-- 2 files changed, 49 insertions(+), 35 deletions(-) New commits: commit d185b1d2ae6c24ec8c9a133741ad3dba9e5dc66e Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 1 11:38:09 2013 +0100 Resolves: fdo#65609 restrict width of all user-controlled edis and lists Change-Id: I1f15e17c903daee849c53a689a8bb3465bac5f74 (cherry picked from commit 4938d06ad251e8e57ff66b185189d98587ca5104) Reviewed-on: https://gerrit.libreoffice.org/5253 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/cui/uiconfig/ui/acorexceptpage.ui b/cui/uiconfig/ui/acorexceptpage.ui index 6f36c0e..44a1632 100644 --- a/cui/uiconfig/ui/acorexceptpage.ui +++ b/cui/uiconfig/ui/acorexceptpage.ui @@ -135,11 +135,19 @@ /packing /child child - object class=GtkTreeView id=abbrevlist:border + object class=GtkScrolledWindow id=scrolledwindow1 +property name=width_request1/property property name=visibleTrue/property property name=can_focusTrue/property -property name=hexpandTrue/property -property name=vexpandTrue/property +property name=shadow_typein/property +child + object class=GtkTreeView id=abbrevlist:border +property name=visibleTrue/property +property name=can_focusTrue/property +property name=hexpandTrue/property +property name=vexpandTrue/property + /object +/child /object packing property name=left_attach0/property @@ -208,23 +216,6 @@ /packing /child child - object class=GtkTreeView id=doublelist:border -property name=visibleTrue/property -property name=can_focusTrue/property -property name=hexpandTrue/property -property name=vexpandTrue/property -child internal-child=selection - object class=GtkTreeSelection id=treeview-selection3/ -/child - /object - packing -property name=left_attach0/property -property name=top_attach1/property -property name=width1/property -property name=height1/property - /packing -/child -child object class=GtkCheckButton id=autodouble property name=label translatable=yesA_utoInclude/property property name=visibleTrue/property @@ -313,6 +304,28 @@ property name=height2/property /packing /child +child + object class=GtkScrolledWindow id=scrolledwindow2 +property name=width_request1/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=shadow_typein/property +child + object class=GtkTreeView id=doublelist:border +property name=visibleTrue/property +property name=can_focusTrue/property +property name=hexpandTrue/property +property name=vexpandTrue/property + /object +/child + /object + packing +property name=left_attach0/property +property name=top_attach1/property +property name=width1/property +property name=height1/property + /packing +/child /object /child /object diff --git a/cui/uiconfig/ui/acorreplacepage.ui b/cui/uiconfig/ui/acorreplacepage.ui index f300c86..199269f 100644 --- a/cui/uiconfig/ui/acorreplacepage.ui +++ b/cui/uiconfig/ui/acorreplacepage.ui @@ -1,7 +1,7 @@ ?xml version=1.0 encoding=UTF-8? interface - !-- interface-requires gtk+ 3.0 -- !-- interface-requires LibreOffice 1.0 -- + !-- interface-requires gtk+ 3.0 -- object class=GtkGrid id=AcorReplacePage property name=visibleTrue/property property name=can_focusFalse/property @@ -91,20 +91,6 @@ /packing /child child - object class=svtlo-SvTabListBox id=tabview:border -property name=visibleTrue/property -property
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig
cui/uiconfig/ui/backgroundpage.ui | 60 +++--- 1 file changed, 44 insertions(+), 16 deletions(-) New commits: commit 26c320c7d56171bf61e5ddeb028d19d1d79e59fc Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 16 14:20:29 2013 +0100 tweak background fill color preview to be half-full height Change-Id: I44a9fc676129dda206e525ee89809f84d77aff48 (cherry picked from commit 3e787929d86ba9c306d54363a06de121fbe5c7aa) Reviewed-on: https://gerrit.libreoffice.org/5167 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui index 68a550a..0bf2060 100644 --- a/cui/uiconfig/ui/backgroundpage.ui +++ b/cui/uiconfig/ui/backgroundpage.ui @@ -151,22 +151,6 @@ property name=vexpandTrue/property property name=row_spacing6/property child - object class=cuilo-BackgroundPreview id=preview1 -property name=width_request150/property -property name=height_request150/property -property name=visibleTrue/property -property name=can_focusTrue/property -property name=hexpandTrue/property -property name=vexpandTrue/property - /object - packing -property name=left_attach0/property -property name=top_attach0/property -property name=width1/property -property name=height1/property - /packing -/child -child object class=GtkGrid id=grid12 property name=visibleTrue/property property name=can_focusFalse/property @@ -208,6 +192,50 @@ property name=height1/property /packing /child +child + object class=GtkBox id=box2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=hexpandTrue/property +property name=vexpandTrue/property +property name=orientationvertical/property +property name=homogeneousTrue/property +child + object class=cuilo-BackgroundPreview id=preview1 +property name=visibleTrue/property +property name=can_focusTrue/property +property name=hexpandTrue/property +property name=vexpandTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkBox id=box3 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +child + placeholder/ +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child + /object + packing +property name=left_attach0/property +property name=top_attach0/property +property name=width1/property +property name=height1/property + /packing +/child /object packing property name=left_attach1/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig include/svx svx/source
cui/uiconfig/ui/charnamepage.ui | 402 +--- cui/uiconfig/ui/effectspage.ui | 32 --- cui/uiconfig/ui/positionpage.ui | 45 +--- cui/uiconfig/ui/twolinespage.ui | 100 - include/svx/fntctrl.hxx |2 svx/source/dialog/fntctrl.cxx | 12 - 6 files changed, 259 insertions(+), 334 deletions(-) New commits: commit fd424dd6fcf367da671b6d31a64465cb0751a026 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 29 19:51:04 2013 +0100 Related: fdo#67395 adjust height of font name tabpage, etc. + put the language label beside the language listbox which reduces height by a line + use standard spacing between frames in position tabpage + use standard spacing horizonally between elements (cherry picked from commit 1d33fc35f787061c9440ba44dfd53de405bd430a) Related: fdo#67395 drop 'Preview' frame title it's clear that it's a preview, move that string into its Accessible name for those that can't see the preview (cherry picked from commit 1193dc782f4479a81f3d283c99df2f5c7e022682) Related: fdo#67395 drop 'Font' frame title + promote the family, style, size to frame titles and drop the surrounding 'Font' one + bottom align the previews again + drop empty spacing labels in favour of 6pixel spacing (cherry picked from commit 63ced8e54f1786e5814f082c9fb87c89e5c850a9) Related: fdo#67395 add border to preview to cut up whitespace (cherry picked from commit 167416c3ed3ed52249559ff3548c0fc06d0d0eef) Change-Id: I1191db7aaf0922978bf6dd8da17ec4f133944b94 684f451542f5300cc206c9ade7f3b130b1c3c876 2c0b78163894c5283162c37bd71fa1bbc3c341c7 c66bf59294f7c9fb4059574765734749a40b043f Reviewed-on: https://gerrit.libreoffice.org/5200 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui index 89bc974..d89402d 100644 --- a/cui/uiconfig/ui/charnamepage.ui +++ b/cui/uiconfig/ui/charnamepage.ui @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? interface !-- interface-requires gtk+ 3.0 -- + !-- interface-requires LibreOffice 1.0 -- object class=GtkBox id=CharNamePage property name=visibleTrue/property property name=can_focusFalse/property @@ -8,200 +9,203 @@ property name=orientationvertical/property property name=spacing12/property child - object class=GtkFrame id=simple + object class=GtkGrid id=simple property name=can_focusFalse/property property name=no_show_allTrue/property -property name=label_xalign0/property -property name=shadow_typenone/property +property name=hexpandTrue/property +property name=vexpandTrue/property +property name=row_spacing6/property +property name=column_spacing12/property child - object class=GtkAlignment id=alignment5 + object class=GtkLabel id=westfontinfo-nocjk property name=visibleTrue/property property name=can_focusFalse/property -property name=top_padding6/property -property name=left_padding12/property +property name=margin_top6/property +property name=xalign0/property + /object + packing +property name=left_attach0/property +property name=top_attach2/property +property name=width3/property +property name=height1/property + /packing +/child +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=halignstart/property +property name=spacing12/property +child + object class=GtkLabel id=westlangft-nocjk +property name=visibleTrue/property +property name=can_focusFalse/property +property name=halignstart/property +property name=hexpandTrue/property +property name=xalign0/property +property name=label translatable=yesLanguage/property +property name=use_underlineTrue/property +property name=mnemonic_widgetwestlanglb-nocjk/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child child - object class=GtkGrid id=grid4 + object class=svxcorelo-SvxLanguageBox id=westlanglb-nocjk +property name=visibleTrue/property +property name=can_focusFalse/property +property name=halignstart/property +
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig
cui/uiconfig/ui/optviewpage.ui |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 4d2e614b8bed3600de1b48babed6b01a31c12b01 Author: Stefan Knorr heinzless...@gmail.com Date: Sat Jul 27 22:38:14 2013 +0200 Fix problem in German UI with cutoff label in options page Change-Id: I8943aa1576f859db7e7f98fa0fa7d751116f0a8e (cherry picked from commit 5eeef5cb0814db643d31e3c5f0f4c4332e36f822) Reviewed-on: https://gerrit.libreoffice.org/5156 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui index 2cc72b1..2cd0f15 100644 --- a/cui/uiconfig/ui/optviewpage.ui +++ b/cui/uiconfig/ui/optviewpage.ui @@ -80,7 +80,7 @@ packing property name=left_attach0/property property name=top_attach1/property -property name=width1/property +property name=width2/property property name=height1/property /packing /child @@ -129,9 +129,6 @@ property name=height1/property /packing /child -child - placeholder/ -/child /object packing property name=left_attach0/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig
cui/uiconfig/ui/optsavepage.ui | 40 +--- 1 file changed, 21 insertions(+), 19 deletions(-) New commits: commit a80828ba6bfa68d3c23af98e2717bb1adc8983e8 Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 25 16:26:54 2013 +0100 Related: fdo#61544 convert save opt page from box to grid grids compress better than boxes if there isn't enough available space Change-Id: I12ec10c556fbe80fc1b74b12df47d6fc4b626f6c (cherry picked from commit 767b02bd7614059dd80d0cd1be306d9b63291f31) Reviewed-on: https://gerrit.libreoffice.org/5107 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui index 54320f8..a3702fb 100644 --- a/cui/uiconfig/ui/optsavepage.ui +++ b/cui/uiconfig/ui/optsavepage.ui @@ -1,19 +1,11 @@ ?xml version=1.0 encoding=UTF-8? interface !-- interface-requires gtk+ 3.0 -- - object class=GtkAdjustment id=adjustment1 -property name=lower1/property -property name=upper60/property -property name=value15/property -property name=step_increment1/property -property name=page_increment10/property - /object - object class=GtkBox id=OptSavePage + object class=GtkGrid id=OptSavePage property name=visibleTrue/property property name=can_focusFalse/property property name=border_width6/property -property name=orientationvertical/property -property name=spacing12/property +property name=row_spacing12/property child object class=GtkFrame id=frame1 property name=visibleTrue/property @@ -84,9 +76,10 @@ /child /object packing -property name=expandFalse/property -property name=fillTrue/property -property name=position0/property +property name=left_attach0/property +property name=top_attach0/property +property name=width1/property +property name=height1/property /packing /child child @@ -268,9 +261,10 @@ /child /object packing -property name=expandFalse/property -property name=fillTrue/property -property name=position1/property +property name=left_attach0/property +property name=top_attach1/property +property name=width1/property +property name=height1/property /packing /child child @@ -487,10 +481,18 @@ /child /object packing -property name=expandFalse/property -property name=fillTrue/property -property name=position2/property +property name=left_attach0/property +property name=top_attach2/property +property name=width1/property +property name=height1/property /packing /child /object + object class=GtkAdjustment id=adjustment1 +property name=lower1/property +property name=upper60/property +property name=value15/property +property name=step_increment1/property +property name=page_increment10/property + /object /interface ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig
cui/uiconfig/ui/optgeneralpage.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ab8f39aae069f65a8ebd3cad45d33e2e75426597 Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 25 16:32:42 2013 +0100 Related: fdo#61544 put help tips checkboxes side-by-side sucks some height out of the page Change-Id: If1aa064e2ca6515fdde55c077381806942a255bb (cherry picked from commit 4f2fa58f027707254cc6d8f076354787c252a26f) Reviewed-on: https://gerrit.libreoffice.org/5108 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/cui/uiconfig/ui/optgeneralpage.ui b/cui/uiconfig/ui/optgeneralpage.ui index 2e59fd9..98e757f 100644 --- a/cui/uiconfig/ui/optgeneralpage.ui +++ b/cui/uiconfig/ui/optgeneralpage.ui @@ -61,8 +61,8 @@ property name=draw_indicatorTrue/property /object packing -property name=left_attach0/property -property name=top_attach1/property +property name=left_attach1/property +property name=top_attach0/property property name=width1/property property name=height1/property /packing ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig include/vcl sfx2/uiconfig vcl/source
cui/uiconfig/ui/pastespecial.ui |1 +
include/vcl/edit.hxx |3 +++
sfx2/uiconfig/ui/documentinfopage.ui |2 ++
vcl/source/control/edit.cxx | 20 +++-
4 files changed, 25 insertions(+), 1 deletion(-)
New commits:
commit 112ce9b1dc1cbf34bb6378ff2e61dba6144782c9
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jun 24 12:42:39 2013 +0100
Resolves: fdo#66105 set max growth width for labels/edits which take paths
Change-Id: I12220821f76550baacdc8ce604f2e612d260c1a1
(cherry picked from commit 9495e912797f67897a4a658d20137bb94f39e9ab)
Reviewed-on: https://gerrit.libreoffice.org/4481
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/cui/uiconfig/ui/pastespecial.ui b/cui/uiconfig/ui/pastespecial.ui
index fb08b9e..3eb4e7d 100644
--- a/cui/uiconfig/ui/pastespecial.ui
+++ b/cui/uiconfig/ui/pastespecial.ui
@@ -97,6 +97,7 @@
property name=visibleTrue/property
property name=can_focusFalse/property
property name=wrapTrue/property
+property name=max_width_chars72/property
/object
packing
property name=expandFalse/property
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 11c1ae8..6df1f7b 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -71,6 +71,7 @@ private:
sal_uInt16 mnAlign;
xub_StrLen mnMaxTextLen;
sal_Int32 mnWidthInChars;
+sal_Int32 mnMaxWidthChars;
AutocompleteAction meAutocompleteAction;
sal_Unicode mcEchoChar;
sal_BoolmbModified:1,
@@ -193,6 +194,8 @@ public:
voidSetWidthInChars(sal_Int32 nWidthInChars);
sal_Int32 GetWidthInChars() const { return mnWidthInChars; }
+voidsetMaxWidthChars(sal_Int32 nWidth);
+
virtual voidSetSelection( const Selection rSelection );
virtual const SelectionGetSelection() const;
diff --git a/sfx2/uiconfig/ui/documentinfopage.ui
b/sfx2/uiconfig/ui/documentinfopage.ui
index eeccbd0..f25a95a 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -275,6 +275,7 @@
property name=can_focusFalse/property
property name=xalign0/property
property name=selectableTrue/property
+property name=max_width_chars56/property
/object
packing
property name=left_attach1/property
@@ -336,6 +337,7 @@
property name=can_focusFalse/property
property name=xalign0/property
property name=selectableTrue/property
+property name=max_width_chars56/property
/object
packing
property name=left_attach1/property
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 20323b3..e8798a2 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -214,10 +214,21 @@ void Edit::SetWidthInChars(sal_Int32 nWidthInChars)
}
}
+void Edit::setMaxWidthChars(sal_Int32 nWidth)
+{
+if (nWidth != mnMaxWidthChars)
+{
+mnMaxWidthChars = nWidth;
+queue_resize();
+}
+}
+
bool Edit::set_property(const OString rKey, const OString rValue)
{
if (rKey == width-chars)
SetWidthInChars(rValue.toInt32());
+else if (rKey == max-width-chars)
+setMaxWidthChars(rValue.toInt32());
else if (rKey == max-length)
{
sal_Int32 nTextLen = rValue.toInt32();
@@ -295,6 +306,7 @@ void Edit::ImplInitEditData()
mnAlign = EDIT_ALIGN_LEFT;
mnMaxTextLen= EDIT_NOLIMIT;
mnWidthInChars = -1;
+mnMaxWidthChars = -1;
meAutocompleteAction= AUTOCOMPLETE_KEYINPUT;
mbModified = sal_False;
mbInternModified= sal_False;
@@ -2886,8 +2898,14 @@ Size Edit::CalcMinimumSizeForText(const OUString
rString) const
}
else
{
+OUString aString;
+if (mnMaxWidthChars != -1 mnMaxWidthChars rString.getLength())
+aString = rString.copy(0, mnMaxWidthChars);
+else
+aString = rString;
+
aSize.Height() = GetTextHeight();
-aSize.Width() = GetTextWidth(rString);
+aSize.Width() = GetTextWidth(aString);
aSize.Width() += ImplGetExtraOffset() * 2;
// do not create edit fields in which one cannot enter anything
// a default minimum width should exist for at least 3 characters
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig
cui/uiconfig/ui/acorreplacepage.ui |2 ++ 1 file changed, 2 insertions(+) New commits: commit d3c17f11c8ee3c78be81fa7b85617f92852a3aa5 Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 10 14:26:46 2013 +0100 Resolves: fdo#65609 don't use whole text for optimal width Change-Id: Ie0aed71457891e58916d064c9a59d5927c31f1f7 (cherry picked from commit 11c89fe5fb40adf3d205c666e7b5d202c1dd314b) diff --git a/cui/uiconfig/ui/acorreplacepage.ui b/cui/uiconfig/ui/acorreplacepage.ui index 572057f..f300c86 100644 --- a/cui/uiconfig/ui/acorreplacepage.ui +++ b/cui/uiconfig/ui/acorreplacepage.ui @@ -66,6 +66,7 @@ property name=can_focusTrue/property property name=hexpandTrue/property property name=invisible_charâ/property +property name=width_chars20/property /object packing property name=left_attach0/property @@ -80,6 +81,7 @@ property name=can_focusTrue/property property name=hexpandTrue/property property name=invisible_charâ/property +property name=width_chars30/property /object packing property name=left_attach1/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig
cui/uiconfig/ui/optadvancedpage.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 42dc4187600f5ed0174c110ee4406ea1eb2ef3a0 Author: Cor Nouws oo...@nouenoff.nl Date: Wed May 29 15:36:56 2013 +0200 Improved text in GUI for Macro recording: it is limited Change-Id: Ib7243496a4fa0f563ae3bbba4c2c67b62e19f83c Reviewed-on: https://gerrit.libreoffice.org/4087 Reviewed-by: Michael Meeks michael.me...@suse.com Tested-by: Michael Meeks michael.me...@suse.com Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/cui/uiconfig/ui/optadvancedpage.ui b/cui/uiconfig/ui/optadvancedpage.ui index cb23222..d104663 100644 --- a/cui/uiconfig/ui/optadvancedpage.ui +++ b/cui/uiconfig/ui/optadvancedpage.ui @@ -358,7 +358,7 @@ /child child object class=GtkCheckButton id=macrorecording -property name=label translatable=yesEnable macro recording/property +property name=label translatable=yesEnable macro recording (limited)/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig
cui/uiconfig/ui/customize.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 47fd6b481c137d672466d69128327b3cac48a77e Author: Andras Timar ati...@suse.com Date: Sun May 26 14:31:11 2013 +0200 typo + branding: s/LiberOffice/%PRODUCTNAME/ Change-Id: I8007b4b1b1d620c05c9977d7bd3b8eb28b77f2be diff --git a/cui/uiconfig/ui/customize.ui b/cui/uiconfig/ui/customize.ui index d31efbe..4d6cc96 100644 --- a/cui/uiconfig/ui/customize.ui +++ b/cui/uiconfig/ui/customize.ui @@ -245,7 +245,7 @@ object class=GtkLabel id=label4 property name=visibleTrue/property property name=can_focusFalse/property -property name=label translatable=yesLiberOffice Writer Menus/property +property name=label translatable=yes%PRODUCTNAME Writer Menus/property /object /child /object @@ -1159,7 +1159,7 @@ object class=GtkLabel id=label26 property name=visibleTrue/property property name=can_focusFalse/property -property name=label translatable=yesLiberOffice Writer Toolbars/property +property name=label translatable=yes%PRODUCTNAME Writer Toolbars/property /object /child /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-1' - cui/uiconfig
cui/uiconfig/ui/optsecuritypage.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f98083890c55318dd4f10c666b749d6092eb4617 Author: Joren De Cuyper joren.libreoff...@telenet.be Date: Sun May 26 18:28:21 2013 +0200 Delete double whitespace in optsecuritypage.ui Found this double whitespace during translations. So lets fix it right away. Change-Id: Ifecfc15b5d0aead34b09df4cfb2c5a2c17c6b633 Reviewed-on: https://gerrit.libreoffice.org/4041 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/cui/uiconfig/ui/optsecuritypage.ui b/cui/uiconfig/ui/optsecuritypage.ui index 32acdd2..519ab25 100644 --- a/cui/uiconfig/ui/optsecuritypage.ui +++ b/cui/uiconfig/ui/optsecuritypage.ui @@ -139,7 +139,7 @@ property name=row_spacing6/property child object class=GtkCheckButton id=usemasterpassword -property name=label translatable=yesProtected _by a master passwords (recommended)/property +property name=label translatable=yesProtected _by a master passwords (recommended)/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig dbaccess/uiconfig svx/uiconfig sw/uiconfig xmlsecurity/uiconfig
cui/uiconfig/ui/backgroundpage.ui |2 +- cui/uiconfig/ui/optadvancedpage.ui|2 +- cui/uiconfig/ui/optpathspage.ui |2 +- dbaccess/uiconfig/ui/generalpagewizard.ui |2 +- dbaccess/uiconfig/ui/querypropertiesdialog.ui |4 ++-- svx/uiconfig/ui/headfootformatpage.ui |2 +- sw/uiconfig/swriter/ui/editsectiondialog.ui |2 +- xmlsecurity/uiconfig/ui/securitytrustpage.ui |2 +- 8 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 2f5a4b914daac00c8881ca69783c879d074fed9d Author: Andras Timar ati...@suse.com Date: Sat May 25 17:26:49 2013 +0200 translatable=yes for some elements in .ui files Conflicts: starmath/uiconfig/smath/ui/alignmentdialog.ui starmath/uiconfig/smath/ui/spacingdialog.ui Change-Id: I915cd6e73f907850f17b102c7860a827b91eef37 diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui index 5fcb803..68a550a 100644 --- a/cui/uiconfig/ui/backgroundpage.ui +++ b/cui/uiconfig/ui/backgroundpage.ui @@ -293,7 +293,7 @@ property name=no_show_allTrue/property property name=hexpandTrue/property property name=xalign0/property -property name=labellt;FILENAMEgt;/property +property name=label translatable=yeslt;FILENAMEgt;/property /object packing property name=left_attach0/property diff --git a/cui/uiconfig/ui/optadvancedpage.ui b/cui/uiconfig/ui/optadvancedpage.ui index 1c54497..cb23222 100644 --- a/cui/uiconfig/ui/optadvancedpage.ui +++ b/cui/uiconfig/ui/optadvancedpage.ui @@ -93,7 +93,7 @@ property name=layout_stylestart/property child object class=GtkButton id=add -property name=label_Add.../property +property name=label translatable=yes_Add.../property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property diff --git a/cui/uiconfig/ui/optpathspage.ui b/cui/uiconfig/ui/optpathspage.ui index 64f0b80..a273f7b 100644 --- a/cui/uiconfig/ui/optpathspage.ui +++ b/cui/uiconfig/ui/optpathspage.ui @@ -148,7 +148,7 @@ /child child object class=GtkButton id=edit -property name=label_Edit.../property +property name=label translatable=yes_Edit.../property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property diff --git a/dbaccess/uiconfig/ui/generalpagewizard.ui b/dbaccess/uiconfig/ui/generalpagewizard.ui index 95025e7..0e41080 100644 --- a/dbaccess/uiconfig/ui/generalpagewizard.ui +++ b/dbaccess/uiconfig/ui/generalpagewizard.ui @@ -136,7 +136,7 @@ /child child object class=dbulo-OpenDocumentButton id=openDatabase -property name=labelOpen/property +property name=label translatable=yesOpen/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property diff --git a/dbaccess/uiconfig/ui/querypropertiesdialog.ui b/dbaccess/uiconfig/ui/querypropertiesdialog.ui index 6f55af2..ddd5936 100644 --- a/dbaccess/uiconfig/ui/querypropertiesdialog.ui +++ b/dbaccess/uiconfig/ui/querypropertiesdialog.ui @@ -118,7 +118,7 @@ property name=layout_stylestart/property child object class=GtkRadioButton id=distinct -property name=labelYes/property +property name=label translatable=yesYes/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property @@ -134,7 +134,7 @@ /child child object class=GtkRadioButton id=nondistinct -property name=labelNo/property +property name=label translatable=yesNo/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property diff --git a/svx/uiconfig/ui/headfootformatpage.ui b/svx/uiconfig/ui/headfootformatpage.ui index 8fe9008..c77abad 100644 --- a/svx/uiconfig/ui/headfootformatpage.ui
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig extras/source
cui/uiconfig/ui/backgroundpage.ui |2 +- cui/uiconfig/ui/colorpage.ui |2 +- extras/source/glade/libreoffice-catalog.xml.in |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit d601bab683779c2db47c13a965405cc1be7f9147 Author: Caolán McNamara caol...@redhat.com Date: Wed May 22 19:08:04 2013 +0100 wrong libraries name again Change-Id: I5ee490c4d08e703b5ed825d2d4d0c981e21a1b9f (cherry picked from commit 711135d2867dc2c53457fe7de7837c70873974b6) diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui index 78d761f..5fcb803 100644 --- a/cui/uiconfig/ui/backgroundpage.ui +++ b/cui/uiconfig/ui/backgroundpage.ui @@ -217,7 +217,7 @@ /packing /child child - object class=svxlo-SvxColorValueSet id=backgroundcolorset + object class=svxcorelo-SvxColorValueSet id=backgroundcolorset property name=width_request150/property property name=height_request150/property property name=visibleTrue/property diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui index 0146da1..e190e4d 100644 --- a/cui/uiconfig/ui/colorpage.ui +++ b/cui/uiconfig/ui/colorpage.ui @@ -129,7 +129,7 @@ /packing /child child - object class=svxlo-SvxColorValueSet id=colorset + object class=svxcorelo-SvxColorValueSet id=colorset property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 91a087d..ecad897 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -78,7 +78,7 @@ glade-widget-class title=ValueSet name=svtlo-ValueSet generic-name=Set of Value Options parent=GtkDrawingArea icon-name=widget-gtk-drawingarea/ -glade-widget-class title=ValueSet name=svxlo-SvxColorValueSet +glade-widget-class title=ValueSet name=svxcorelo-SvxColorValueSet generic-name=Set of Value Options parent=GtkDrawingArea icon-name=widget-gtk-drawingarea/ glade-widget-class title=ValueSet name=swuilo-ColumnValueSet ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
