GNOME.org
 

ooo-build r14882 - in trunk: . patches/dev300

Author: jannieuw
Date: Wed Dec 17 13:28:59 2008
New Revision: 14882
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14882&view=rev

Log:
2008-12-17  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/layoutdialogs2-development.diff: Minor HIG spacing
	tweaks for zoom and wordcount dialogs.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/layoutdialogs2-development.diff

Modified: trunk/patches/dev300/layoutdialogs2-development.diff
==============================================================================
--- trunk/patches/dev300/layoutdialogs2-development.diff	(original)
+++ trunk/patches/dev300/layoutdialogs2-development.diff	Wed Dec 17 13:28:59 2008
@@ -1,3 +1,7 @@
+990a724... Wordcount: minor HIG tweaks.
+bdd96ae... Zoom: minor HIG spacing tweaks.
+5bf3455... Zoom: fix align-test and update zoom.xml.
+5621671... Zoom: add align-test.xml to illustrate zoom alignment bug.
 9f8efae... Find-and-Replace: request font-style-name="Bold", does not seem to work.
 775a44c... Find-and-Replace: Add alignment for combobox labels.
 74e6a94... Find-and-Replace: Replace pairs of <flow> with <align>.  Fixes ugly non-emptiness of more-<hbox>.
@@ -325,12 +329,64 @@
  	echo '#empty' | cat - find-and-replace-$@ zoom-$@ > $@
  	rm -f *-$@
 diff --git svx/uiconfig/layout/zoom.xml svx/uiconfig/layout/zoom.xml
-index 5938643..9f9d782 100644
+index 5938643..4b4270f 100644
 --- svx/uiconfig/layout/zoom.xml
 +++ svx/uiconfig/layout/zoom.xml
-@@ -51,9 +51,9 @@
-         <fixedline cnt:padding="1" id="FL_BOTTOM"/>
- 	<dialogbuttonhbox border="5" spacing="5">
+@@ -8,10 +8,10 @@
+              id="RID_SVXDLG_ZOOM" _title="Zoom &amp; View Layout" optimumsize="true"
+ 	     help-id="SID_ATTR_ZOOM"
+              has_border="true" sizeable="true" moveable="true" closeable="true">
+-    <vbox spacing="5" border="5">
++    <vbox spacing="0" border="12">
+ 	<hbox spacing="0" border="0">
+-	    <vbox spacing="5" border="5">
+-		<fixedline id="FL_ZOOM" _text="Zoom factor" cnt:expand="true"/>
++	    <vbox spacing="6" border="0">
++		<fixedline id="FL_ZOOM" _text="Zoom factor" cnt:expand="false"/>
+ 		<radiobutton radiogroup="zoom-factor" id="BTN_OPTIMAL"   _label="Optimal"/>
+ 		<radiobutton radiogroup="zoom-factor" id="BTN_WHOLE_PAGE" _label="Whole Page"/>
+ 		<radiobutton radiogroup="zoom-factor" id="BTN_PAGE_WIDTH" _label="Page Width"/>
+@@ -20,7 +20,7 @@
+ 		    <align cnt:expand="false" cnt:fill="true">
+ 			<radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom-factor" id="BTN_USER" _label="Variable"/>
+ 		    </align>
+-		    <flow cnt:padding="10" cnt:expand="false"/>
++		    <flow cnt:padding="12" cnt:expand="false"/>
+ 		    <metricfield id="ED_USER" value-step="1"
+ 				 repeat="true" has_border="true" spin="true"
+ 				 _text="100%" unit="11" custom-unit-text="%"
+@@ -28,15 +28,16 @@
+ 				 cnt:expand="false"/>
+ 		</hbox>
+ 	    </vbox>
+-	    <vbox spacing="5" border="5">
+-		<fixedline id="FL_VIEWLAYOUT" _text="View layout" cnt:expand="true"/>
++	    <flow/>
++	    <vbox spacing="6" border="0">
++		<fixedline id="FL_VIEWLAYOUT" _text="View layout" cnt:expand="false"/>
+ 		<radiobutton radiogroup="zoom-layout" id="BTN_AUTOMATIC" _label="~Automatic"/>
+ 		<radiobutton radiogroup="zoom-layout" id="BTN_SINGLE"    _label="~Single page"/>
+ 		<hbox cnt:expand="false" cnt:fill="true">
+ 		    <align cnt:expand="false" cnt:fill="true">
+ 			<radiobutton cnt:v-align="0.5" cnt:v-fill="0" radiogroup="zoom-layout" id="BTN_COLUMNS" _label="~Columns"/>
+ 		    </align>
+-		    <flow cnt:padding="10" cnt:expand="false"/>
++		    <flow cnt:padding="12" cnt:expand="false"/>
+ 		    <metricfield id="ED_COLUMNS" value-step="1"
+ 				 repeat="true" has_border="true" spin="true"
+ 				 _text="100%"
+@@ -45,15 +46,15 @@
+ 				 spin-value="1"
+ 				 cnt:expand="false"/>
+ 		</hbox>
+-		<hbox><flow cnt:expand="false" cnt:padding="10"/><checkbox id="CHK_BOOK" _label="~Book mode"/></hbox>
++		<hbox><flow cnt:expand="false" cnt:padding="12"/><checkbox id="CHK_BOOK" _label="~Book mode"/></hbox>
+ 	    </vbox>
+ 	</hbox>
+-        <fixedline cnt:padding="1" id="FL_BOTTOM"/>
+-	<dialogbuttonhbox border="5" spacing="5">
++        <fixedline cnt:padding="6" id="FL_BOTTOM"/>
++	<dialogbuttonhbox border="0" spacing="12">
  	    <flow/>
 -	    <okbutton     id="BTN_ZOOM_OK"/>
 +	    <okbutton defbutton="true" id="BTN_ZOOM_OK"/>
@@ -354,12 +410,42 @@
  	echo '#empty' | cat - wordcount-$@ > $@
  	rm -f *-$@
 diff --git sw/uiconfig/layout/wordcount.xml sw/uiconfig/layout/wordcount.xml
-index e922294..fbab778 100644
+index e922294..fc7ff94 100644
 --- sw/uiconfig/layout/wordcount.xml
 +++ sw/uiconfig/layout/wordcount.xml
-@@ -43,7 +43,7 @@
+@@ -9,10 +9,10 @@
+              id="DLG_WORDCOUNT"
+              sizeable="true" moveable="true" optimumsize="true" closeable="true"
+              has_border="true" sv-look="true" _title="Word Count">
+-    <vbox border="5" spacing="5">
++    <vbox border="12" spacing="6">
+         <fixedline id="FL_CURRENT" _text="Current selection"/>
+ 	<hbox>
+-	    <vbox cnt:padding="13" spacing="5">
++	    <vbox cnt:padding="12" spacing="6">
+ 		<hbox>
+ 		    <fixedtext id="FT_CURRENTWORD" _label="Words:"/>
+ 		    <flow cnt:padding="60"/>
+@@ -25,11 +25,11 @@
+ 		</hbox>
+ 	    </vbox>
+ 	</hbox>
+-	<!-- if we could do cnt:cnt:padding="-13" here, we would not have to close
++	<!-- if we could do cnt:cnt:padding="-12" here, we would not have to close
+ 	     and reopen the hbox/vbox thing !-->
+         <fixedline id="FL_DOC" _text="Whole document"/>
+ 	<hbox>
+-	    <vbox cnt:padding="13" spacing="5">
++	    <vbox cnt:padding="12" spacing="6">
+ 		<hbox>
+ 		    <fixedtext id="FT_DOCWORD" _label="Words:"/>
+ 		    <fixedtext id="FI_DOCWORD" right="true" _label="000"/>
+@@ -41,9 +41,9 @@
+ 	    </vbox>
+ 	</hbox>
          <fixedline cnt:padding="1" id="FL_BOTTOM"/>
- 	<dialogbuttonhbox spacing="5">
+-	<dialogbuttonhbox spacing="5">
++	<dialogbuttonhbox spacing="12">
              <flow/>
 -            <okbutton id="PB_OK"/>
 +            <okbutton defbutton="true" id="PB_OK"/>
@@ -851,6 +937,42 @@
 -LD_LIBRARY_PATH=$OOO_PREFIX_BRAND/basis-link/program:$OOO_PREFIX_BRAND/basis-link/ure-link/lib ../../unxlngx6.pro/bin/test "$@"
 +export LD_LIBRARY_PATH="$OOO_PREFIX_BRAND/basis-link/program:$OOO_PREFIX_BRAND/basis-link/ure-link/lib"
 +../../unx*.pro/bin/test "$@"
+diff --git toolkit/workben/layout/align-test.xml toolkit/workben/layout/align-test.xml
+new file mode 100644
+index 0000000..f01830e
+--- /dev/null
++++ toolkit/workben/layout/align-test.xml
+@@ -0,0 +1,30 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- This is a template.  i18n translation is not performed in-place;
++     i18n translated xml files are generated from this template by
++     transex3/layout/tralay.  !-->
++
++<dialog xmlns="http://openoffice.org/2007/layout";
++        xmlns:cnt="http://openoffice.org/2007/layout/container";
++        title="Align Test" optimumsize="true" has_border="true" sizeable="true" moveable="true">
++    <vbox spacing="5" border="5">
++	<fixedline/>
++	<hbox spacing="0" border="0">
++	    <vbox spacing="5" border="5">
++		<fixedline _text="X" cnt:expand="false"/>
++		<pushbutton label="foo"/>
++		<pushbutton label="foo"/>
++		<pushbutton label="foo"/>
++		<pushbutton label="foo"/>
++		<pushbutton label="foo"/>
++		<pushbutton label="foo"/>
++		<pushbutton label="foo"/>
++	    </vbox>
++	    <vbox spacing="5" border="5">
++		<fixedline _text="X" cnt:expand="false"/>
++		<pushbutton label="bar"/>
++	    </vbox>
++	</hbox>
++        <fixedline/>
++	<min-size cnt:spacing="0" min-width="200"/>
++    </vbox>
++</dialog>
 diff --git toolkit/workben/layout/boxtest.xml toolkit/workben/layout/boxtest.xml
 index 8015b3f..263ae40 100644
 --- toolkit/workben/layout/boxtest.xml
@@ -1044,12 +1166,42 @@
          </hbox>
      </vbox>
 diff --git toolkit/workben/layout/wordcount.xml toolkit/workben/layout/wordcount.xml
-index e922294..fbab778 100644
+index e922294..fc7ff94 100644
 --- toolkit/workben/layout/wordcount.xml
 +++ toolkit/workben/layout/wordcount.xml
-@@ -43,7 +43,7 @@
+@@ -9,10 +9,10 @@
+              id="DLG_WORDCOUNT"
+              sizeable="true" moveable="true" optimumsize="true" closeable="true"
+              has_border="true" sv-look="true" _title="Word Count">
+-    <vbox border="5" spacing="5">
++    <vbox border="12" spacing="6">
+         <fixedline id="FL_CURRENT" _text="Current selection"/>
+ 	<hbox>
+-	    <vbox cnt:padding="13" spacing="5">
++	    <vbox cnt:padding="12" spacing="6">
+ 		<hbox>
+ 		    <fixedtext id="FT_CURRENTWORD" _label="Words:"/>
+ 		    <flow cnt:padding="60"/>
+@@ -25,11 +25,11 @@
+ 		</hbox>
+ 	    </vbox>
+ 	</hbox>
+-	<!-- if we could do cnt:cnt:padding="-13" here, we would not have to close
++	<!-- if we could do cnt:cnt:padding="-12" here, we would not have to close
+ 	     and reopen the hbox/vbox thing !-->
+         <fixedline id="FL_DOC" _text="Whole document"/>
+ 	<hbox>
+-	    <vbox cnt:padding="13" spacing="5">
++	    <vbox cnt:padding="12" spacing="6">
+ 		<hbox>
+ 		    <fixedtext id="FT_DOCWORD" _label="Words:"/>
+ 		    <fixedtext id="FI_DOCWORD" right="true" _label="000"/>
+@@ -41,9 +41,9 @@
+ 	    </vbox>
+ 	</hbox>
          <fixedline cnt:padding="1" id="FL_BOTTOM"/>
- 	<dialogbuttonhbox spacing="5">
+-	<dialogbuttonhbox spacing="5">
++	<dialogbuttonhbox spacing="12">
              <flow/>
 -            <okbutton id="PB_OK"/>
 +            <okbutton defbutton="true" id="PB_OK"/>
@@ -1083,9 +1235,27 @@
          <cancelbutton height="14" id="BTN_ZOOM_CANCEL" width="50" x="104" y="23"/>
          <radiobutton height="10" id="BTN_PAGE_WIDTH" width="80" x="12" y="27"/>
 diff --git toolkit/workben/layout/zoom.xml toolkit/workben/layout/zoom.xml
-index 5938643..9f9d782 100644
+index 5938643..c443fe6 100644
 --- toolkit/workben/layout/zoom.xml
 +++ toolkit/workben/layout/zoom.xml
+@@ -11,7 +11,7 @@
+     <vbox spacing="5" border="5">
+ 	<hbox spacing="0" border="0">
+ 	    <vbox spacing="5" border="5">
+-		<fixedline id="FL_ZOOM" _text="Zoom factor" cnt:expand="true"/>
++		<fixedline id="FL_ZOOM" _text="Zoom factor" cnt:expand="false"/>
+ 		<radiobutton radiogroup="zoom-factor" id="BTN_OPTIMAL"   _label="Optimal"/>
+ 		<radiobutton radiogroup="zoom-factor" id="BTN_WHOLE_PAGE" _label="Whole Page"/>
+ 		<radiobutton radiogroup="zoom-factor" id="BTN_PAGE_WIDTH" _label="Page Width"/>
+@@ -29,7 +29,7 @@
+ 		</hbox>
+ 	    </vbox>
+ 	    <vbox spacing="5" border="5">
+-		<fixedline id="FL_VIEWLAYOUT" _text="View layout" cnt:expand="true"/>
++		<fixedline id="FL_VIEWLAYOUT" _text="View layout" cnt:expand="false"/>
+ 		<radiobutton radiogroup="zoom-layout" id="BTN_AUTOMATIC" _label="~Automatic"/>
+ 		<radiobutton radiogroup="zoom-layout" id="BTN_SINGLE"    _label="~Single page"/>
+ 		<hbox cnt:expand="false" cnt:fill="true">
 @@ -51,9 +51,9 @@
          <fixedline cnt:padding="1" id="FL_BOTTOM"/>
  	<dialogbuttonhbox border="5" spacing="5">
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]