[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - sw/uiconfig vcl/inc vcl/source

2012-09-04 Thread Libreoffice Gerrit user 
 sw/uiconfig/swriter/ui/linenumbering.ui |1 +
 vcl/inc/vcl/edit.hxx|7 ++-
 vcl/source/control/edit.cxx |   22 +-
 vcl/source/window/builder.cxx   |   11 +++
 4 files changed, 39 insertions(+), 2 deletions(-)

New commits:
commit ada3c1e8b898873e2bd070cc5abe3d6226e56d50
Author: Caolán McNamara 
Date:   Tue Sep 4 14:14:55 2012 +0100

support GtkEntry width-chars property

Change-Id: I5a3bdf6058b0d786923a9543a064bddcc84f001a

diff --git a/sw/uiconfig/swriter/ui/linenumbering.ui 
b/sw/uiconfig/swriter/ui/linenumbering.ui
index e4d3edf..f664a6b 100644
--- a/sw/uiconfig/swriter/ui/linenumbering.ui
+++ b/sw/uiconfig/swriter/ui/linenumbering.ui
@@ -363,6 +363,7 @@
 True
 True
 ●
+3
 True
   
   
diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index 42b9718..12314a6 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.hxx
@@ -76,8 +76,9 @@ private:
 XubString   maRedoText;
 longmnXOffset;
 Selection   maSelection;
-sal_uInt16  mnAlign;
+sal_uInt16  mnAlign;
 xub_StrLen  mnMaxTextLen;
+sal_Int32   mnMinWidthInChars;
 AutocompleteAction  meAutocompleteAction;
 xub_Unicode mcEchoChar;
 sal_BoolmbModified:1,
@@ -197,6 +198,9 @@ public:
 virtual voidSetMaxTextLen( xub_StrLen nMaxLen = EDIT_NOLIMIT );
 virtual xub_StrLen  GetMaxTextLen() const { return mnMaxTextLen; }
 
+voidSetMaxWidthInChars(sal_Int32 nMinWidthInChars);
+sal_Int32   GetMinWidthInChars() const { return mnMinWidthInChars; 
}
+
 virtual voidSetSelection( const Selection& rSelection );
 virtual const Selection&GetSelection() const;
 
@@ -248,6 +252,7 @@ public:
 virtual rtl::OUString GetSurroundingText() const;
 virtual Selection GetSurroundingTextSelection() const;
 virtual void take_properties(Window &rOther);
+virtual bool set_property(const rtl::OString &rKey, const rtl::OString 
&rValue);
 
 // returns the minimum size a bordered Edit should have given the current
 // global style settings (needed by sc's inputwin.cxx)
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 6dd30d5..dcbacdb 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -220,6 +220,24 @@ Edit::Edit( Window* pParent, const ResId& rResId ) :
 Show();
 }
 
+void Edit::SetMaxWidthInChars(sal_Int32 nMinWidthInChars)
+{
+if (mnMinWidthInChars != nMinWidthInChars)
+{
+mnMinWidthInChars = nMinWidthInChars;
+queue_resize();
+}
+}
+
+bool Edit::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
+{
+if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("width-chars")))
+SetMaxWidthInChars(rValue.toInt32());
+else
+return Control::set_property(rKey, rValue);
+return true;
+}
+
 void Edit::take_properties(Window &rOther)
 {
 if (!GetParent())
@@ -239,6 +257,7 @@ void Edit::take_properties(Window &rOther)
 maSelection = rOtherEdit.maSelection;
 mnAlign = rOtherEdit.mnAlign;
 mnMaxTextLen = rOtherEdit.mnMaxTextLen;
+mnMinWidthInChars = rOtherEdit.mnMinWidthInChars;
 meAutocompleteAction = rOtherEdit.meAutocompleteAction;
 mcEchoChar = rOtherEdit.mcEchoChar;
 mbModified = rOtherEdit.mbModified;
@@ -313,6 +332,7 @@ void Edit::ImplInitEditData()
 mnXOffset   = 0;
 mnAlign = EDIT_ALIGN_LEFT;
 mnMaxTextLen= EDIT_NOLIMIT;
+mnMinWidthInChars   = 3;
 meAutocompleteAction= AUTOCOMPLETE_KEYINPUT;
 mbModified  = sal_False;
 mbInternModified= sal_False;
@@ -2865,7 +2885,7 @@ Size Edit::CalcMinimumSizeForText(const rtl::OUString 
&rString) const
 Size aSize ( GetTextWidth( rString ), GetTextHeight() );
 // do not create edit fields in which one cannot enter anything
 // a default minimum width should exist for at least 3 characters
-Size aMinSize ( CalcSize( 3 ) );
+Size aMinSize ( CalcSize( mnMinWidthInChars ) );
 if( aSize.Width() < aMinSize.Width() )
 aSize.Width() = aMinSize.Width();
 // add some space between text entry and border
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index d85966f..7eb5d44 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -304,6 +304,14 @@ namespace
 
 return eUnit;
 }
+
+void ensureDefaultWidthChars(VclBuilder::stringmap &rMap)
+{
+rtl::OString sWidthChars(RTL_CONSTASCII_STRINGPARAM("width-chars"));
+VclBuilder::stringmap::iterator aFind =

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - sw/uiconfig

2012-08-29 Thread Libreoffice Gerrit user 
 sw/uiconfig/swriter/ui/wordcount.ui |  345 
 1 file changed, 345 insertions(+)

New commits:
commit 027816942203bbe1e4f0c0d2b8fa680b244ac802
Author: Gokul 
Date:   Wed Aug 29 16:36:50 2012 +0100

add a wordcount .ui

Change-Id: I3eb959c27fa99d0a088472de3f95bf3c659114ee

diff --git a/sw/uiconfig/swriter/ui/wordcount.ui 
b/sw/uiconfig/swriter/ui/wordcount.ui
new file mode 100644
index 000..486e574
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/wordcount.ui
@@ -0,0 +1,345 @@
+
+
+  
+  
+False
+5
+dialog
+
+  
+False
+vertical
+2
+
+  
+False
+
+  
+gtk-help
+False
+True
+True
+True
+False
+True
+0.4900953674316
+  
+  
+False
+True
+0
+  
+
+
+  
+gtk-close
+False
+True
+True
+True
+False
+True
+  
+  
+False
+True
+1
+  
+
+  
+  
+False
+True
+end
+0
+  
+
+
+  
+True
+False
+vertical
+10
+
+  
+True
+False
+0
+none
+
+  
+True
+False
+7
+5
+5
+5
+
+  
+True
+False
+2
+100
+
+  
+True
+False
+0
+10
+Words:
+  
+  
+0
+0
+1
+1
+  
+
+
+  
+True
+False
+center
+center
+1
+0
+right
+  
+  
+1
+0
+1
+1
+  
+
+
+  
+True
+False
+0
+10
+Characters:
+  
+  
+0
+1
+1
+1
+  
+
+
+  
+True
+False
+center
+end
+1
+0
+right
+  
+  
+1
+1
+1
+1
+  
+
+
+  
+True
+False
+0
+10
+Characters excluding spaces:
+  
+  
+0
+2
+1
+1
+  
+
+
+  
+True
+False
+center
+end
+1
+0
+right
+  
+  
+1
+2
+1
+1
+  
+
+

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - sw/uiconfig

2012-08-22 Thread Libreoffice Gerrit user 
 sw/uiconfig/sw/ui/20872.ui |1 +
 sw/uiconfig/sw/ui/20876.ui |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 15dcb4f124282aa341bf21e45e1b8528d1dd0022
Author: Caolán McNamara 
Date:   Wed Aug 22 21:42:24 2012 +0100

we need to set hexpand now that it's implemented to fill the dialog

Change-Id: Ib054f474a197c7cab6cd0d4b8ab650f4c78d1e79

diff --git a/sw/uiconfig/sw/ui/20872.ui b/sw/uiconfig/sw/ui/20872.ui
index 21d8538..d30d99b 100644
--- a/sw/uiconfig/sw/ui/20872.ui
+++ b/sw/uiconfig/sw/ui/20872.ui
@@ -100,6 +100,7 @@
 True
 False
 0
+True
 Numbering 
followed by
   
   
diff --git a/sw/uiconfig/sw/ui/20876.ui b/sw/uiconfig/sw/ui/20876.ui
index 5f06d72..3959035 100644
--- a/sw/uiconfig/sw/ui/20876.ui
+++ b/sw/uiconfig/sw/ui/20876.ui
@@ -76,6 +76,7 @@
 True
 False
 0
+True
 Paragraph Style
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - sw/uiconfig

2012-08-20 Thread Libreoffice Gerrit user 
 sw/uiconfig/swriter/ui/titlepage.ui |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 0cd4094a396da03f512ab68acb807fb109a65342
Author: Caolán McNamara 
Date:   Mon Aug 20 11:34:19 2012 +0100

now that halign works, use it to pretty titlepage dialog

Change-Id: Ifbb5fe1aa09bf96555601ce237e19d84417354c2

diff --git a/sw/uiconfig/swriter/ui/titlepage.ui 
b/sw/uiconfig/swriter/ui/titlepage.ui
index 7cee6ac..3f62f9c 100644
--- a/sw/uiconfig/swriter/ui/titlepage.ui
+++ b/sw/uiconfig/swriter/ui/titlepage.ui
@@ -97,6 +97,7 @@
   
 True
 False
+start
 0
 Number 
of title pages
   
@@ -125,6 +126,7 @@
   
 True
 False
+start
 0
 pages
   
@@ -139,6 +141,7 @@
   
 True
 True
+start
 ●
 adjustment1
 True
@@ -155,6 +158,7 @@
 True
 False
 True
+start
 ●
 0.040001
 1
@@ -176,6 +180,7 @@
 True
 True
 False
+start
 False
 0
 True
@@ -196,6 +201,7 @@
 True
 True
 False
+start
 False
 0
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - sw/uiconfig vcl/source

2012-08-08 Thread Caolán McNamara 
 sw/uiconfig/sw/ui/20872.ui|8 
 vcl/source/window/builder.cxx |   12 +---
 2 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 267b85930885264fe72865a127380808e2bdf4b8
Author: Caolán McNamara 
Date:   Wed Aug 8 14:39:02 2012 +0100

col ids all have to be 0, use order of appearance instead

Change-Id: I9508e2fa928db822b1776230c83fb48dfeb956de

diff --git a/sw/uiconfig/sw/ui/20872.ui b/sw/uiconfig/sw/ui/20872.ui
index add6a10..777d049 100644
--- a/sw/uiconfig/sw/ui/20872.ui
+++ b/sw/uiconfig/sw/ui/20872.ui
@@ -22,10 +22,10 @@
 Left
   
   
-Centered
+Centered
   
   
-Right
+Right
   
 
   
@@ -435,10 +435,10 @@
 Tap stop
   
   
-Space
+Space
   
   
-Nothing
+Nothing
   
 
   
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 465a806..43f4030 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -649,6 +649,7 @@ void VclBuilder::handleListStore(xmlreader::XmlReader 
&reader, const rtl::OStrin
 m_aModels.push_back(ModelAndId(rID, new ListStore));
 
 int nLevel = 1;
+sal_Int32 nIndex = 0;
 
 while(1)
 {
@@ -671,14 +672,9 @@ void VclBuilder::handleListStore(xmlreader::XmlReader 
&reader, const rtl::OStrin
 
 while (reader.nextAttribute(&nsId, &name))
 {
-if (name.equals(RTL_CONSTASCII_STRINGPARAM("id")))
-{
-name = reader.getAttributeValue(false);
-sProperty = rtl::OString(name.begin, name.length);
-}
-else if 
(name.equals(RTL_CONSTASCII_STRINGPARAM("translatable")) && 
reader.getAttributeValue(false).equals(RTL_CONSTASCII_STRINGPARAM("yes")))
+if 
(name.equals(RTL_CONSTASCII_STRINGPARAM("translatable")) && 
reader.getAttributeValue(false).equals(RTL_CONSTASCII_STRINGPARAM("yes")))
 {
-sValue = getTranslation(rID, sProperty);
+sValue = getTranslation(rID, 
rtl::OString::valueOf(nIndex));
 bTranslated = !sValue.isEmpty();
 }
 }
@@ -690,6 +686,8 @@ void VclBuilder::handleListStore(xmlreader::XmlReader 
&reader, const rtl::OStrin
 sValue = rtl::OString(name.begin, name.length);
 
 m_aModels.back().m_pModel->m_aEntries.push_back(sValue);
+
+++nIndex;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - sw/uiconfig

2012-08-07 Thread Caolán McNamara 
 sw/uiconfig/sw/ui/20872.ui |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6aec5f1970b35ce6f8261d301cd5cc94e90fe60e
Author: Caolán McNamara 
Date:   Tue Aug 7 15:38:02 2012 +0100

disambiguate list store entries

Change-Id: Ifcf3abd08bf2bf3fd170adfe52b2c9ff69b30c5b

diff --git a/sw/uiconfig/sw/ui/20872.ui b/sw/uiconfig/sw/ui/20872.ui
index 777d049..add6a10 100644
--- a/sw/uiconfig/sw/ui/20872.ui
+++ b/sw/uiconfig/sw/ui/20872.ui
@@ -22,10 +22,10 @@
 Left
   
   
-Centered
+Centered
   
   
-Right
+Right
   
 
   
@@ -435,10 +435,10 @@
 Tap stop
   
   
-Space
+Space
   
   
-Nothing
+Nothing
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits