GNOME.org
 

ooo-build r11222 - in trunk: . patches/src680

Author: jannieuw
Date: Tue Jan  8 14:13:21 2008
New Revision: 11222
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11222&view=rev

Log:
2008-01-08  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/src680/zoom-combobox.diff: Revert zoom.cxx and zoom.src
	modifications.

	* patches/src680/layout-dialogs-svx-sw.diff: Regenerate from GIT:
	accommodate for changes in zoom-combobox.diff.

	* patches/src680/layout-dialogs-layout.diff: Update from GIT:
	use Jakub's new icons.
	
	* patches/src680/apply (LayoutDialogs): Move to Common section.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/layout-dialogs-config_office-scp2.diff
   trunk/patches/src680/layout-dialogs-layout.diff
   trunk/patches/src680/layout-dialogs-svx-sw.diff
   trunk/patches/src680/zoom-combobox.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Jan  8 14:13:21 2008
@@ -14,7 +14,7 @@
 	 Icons, Branding, CalcFixes, WriterFixes, EasterEgg, \
 	 SpeedImageList, GStreamer, CWSBackports, WPG, Cleanups, WMF, \
 	 Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
-	 OOXML, EMFPlus
+	 OOXML, EMFPlus, LayoutDialogs
 
 LinuxCommon : Common, Defaults, TangoIcons, FontConfigTemporaryHacks, \
 	      FedoraFixes, LinuxOnly, NotMacOSX, SystemBits, \
@@ -28,7 +28,7 @@
               VBAUntested, ArkOnlyExperimental, SharedWorksheets, \
 	      UnUsedButNotYetRemovedFromSVN, \
 	      PostgreSQL, SELinux, OpenGLTransitions, VOSremoval, Glib2, \
-	      LayoutDialogs, SVGImport
+	      SVGImport
 # Binfilter patches: a special distro; applied only when building with binfilter
 Binfilter : BFBuildBits, BFFixes
 #Localize
@@ -1665,7 +1665,7 @@
 
 
 [ LayoutDialogs]
-SectionOwner => jannie
+SectionOwner => janneke
 layout-dialogs-config_office-scp2.diff
 layout-dialogs-layout.diff
 layout-dialogs-svx-sw.diff

Modified: trunk/patches/src680/layout-dialogs-config_office-scp2.diff
==============================================================================
--- trunk/patches/src680/layout-dialogs-config_office-scp2.diff	(original)
+++ trunk/patches/src680/layout-dialogs-config_office-scp2.diff	Tue Jan  8 14:13:21 2008
@@ -1,5 +1,5 @@
 diff --git a/config_office/configure.in b/config_office/configure.in
-index 07a0ef6..f00faab 100644
+index 3e94d62..660ec0c 100644
 --- config_office/configure.in
 +++ config_office/configure.in
 @@ -230,6 +230,9 @@ AC_ARG_ENABLE(static-gtk,
@@ -12,7 +12,7 @@
  AC_ARG_ENABLE(build-mozilla,
  [  --disable-build-mozilla Use this option if you do not want to build the
                            mozilla components from the mozilla source code but
-@@ -5913,6 +5916,16 @@ else
+@@ -5928,6 +5931,16 @@ else
  fi
  AC_SUBST(ENABLE_STATIC_GTK)
  
@@ -30,7 +30,7 @@
  dnl Setting up the environment.
  dnl ===================================================================
 diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in
-index 488597a..19885f7 100644
+index 8448a23..f653f99 100644
 --- config_office/set_soenv.in
 +++ config_office/set_soenv.in
 @@ -1795,6 +1795,7 @@ ToFile( "MKDEPENDSOLVER",    "TRUE",             "e" );

Modified: trunk/patches/src680/layout-dialogs-layout.diff
==============================================================================
--- trunk/patches/src680/layout-dialogs-layout.diff	(original)
+++ trunk/patches/src680/layout-dialogs-layout.diff	Tue Jan  8 14:13:21 2008
@@ -606,10 +606,10 @@
 +   ./soffice.bin
 diff --git a/layout/TODO b/layout/TODO
 new file mode 100644
-index 0000000..a7b7a80
+index 0000000..af6c453
 --- /dev/null
 +++ layout/TODO
-@@ -0,0 +1,123 @@
+@@ -0,0 +1,144 @@
 +-*-outline-*-
 +
 +* fixes before enabling LayoutDialogs
@@ -617,6 +617,7 @@
 +
 +* code
 +** features
++*** localization
 +*** support cnt:cnt:? 
 +*** icons from Jakub included
 +*** support using label (verb) on yes/ok no/cancel buttons for some platforms
@@ -671,6 +672,9 @@
 +
 +m241: 5e9b2546
 +m241': b8e24264
++m241'': 53ddc663
++m1: fbde8234
++m1': d1f42c9
 +
 +* porting
 +** Zoom dialog
@@ -733,6 +737,23 @@
 +	+ test-tool
 +    + scrolled-pane impl.
 +
++
++* i18n
++    + Find & fix dangerous uncontrolled translation of strings
++    + forget java property files nonsense
++	- dump old wiki pointers into layout/doc for reference
++    + hit on transex3
++	+ new tool 'slayex3' (or equiv. incomprehensible name to suit ;-)
++	+ 2 roles:
++	    + read XML dump to SDF [ AFAIR we can merge these ]
++	    + read XML file and SDF, dump <N> translated XML files
++	    + suitably named:
++    + in layout/ read right translation:
++	+ cf. vcl/source/gdi/impimagetree.cxx
++	    + does this for 'images.zip' case.
++	+ [ also does .zip load bits: if we impl. this we should
++	    have a simple file fallback first for now I think ]
++
 diff --git a/layout/doc/apinotes.txt b/layout/doc/apinotes.txt
 new file mode 100644
 index 0000000..dc5a8cf
@@ -2303,14 +2324,15 @@
 +</dialog>
 diff --git a/layout/source/awt/vclxbutton.cxx b/layout/source/awt/vclxbutton.cxx
 new file mode 100644
-index 0000000..7237971
+index 0000000..14aeccd
 --- /dev/null
 +++ layout/source/awt/vclxbutton.cxx
-@@ -0,0 +1,125 @@
+@@ -0,0 +1,128 @@
 +#include "vclxbutton.hxx"
 +
 +#include "layoutcore.hxx"
 +#include <com/sun/star/awt/ImagePosition.hpp>
++#include <vcl/button.hxx>
 +
 +IconButton::IconButton( css::uno::Reference< css::uno::XInterface > xButton,
 +                        rtl::OUString aDefaultLabel, const char *pGraphName )
@@ -2325,58 +2347,60 @@
 +                 css::uno::Any( (sal_Int16) 1 /* magic - center */ ) );
 +}
 +
-+// FIXME: i18n of OK / Cancel / Help etc.
++// FIXME: l10n/i18n of Reset & Apply
++
 +VCLXOKButton::VCLXOKButton( css::uno::Reference< css::uno::XInterface > xButton )
-+    : IconButton( xButton, rtl::OUString::createFromAscii( "OK" ),
-+                  "res/commandimagelist/sc_browseforward.png" )
++    : IconButton( xButton, Button::GetStandardText( BUTTON_OK ),
++                  "res/commandimagelist/sc_ok.png" )
 +{
 +}
 +
 +VCLXCancelButton::VCLXCancelButton( css::uno::Reference< css::uno::XInterface > xButton )
-+    : IconButton( xButton, rtl::OUString::createFromAscii( "Cancel" ),
-+                  "res/commandimagelist/sc_closedoc.png" )
++    : IconButton( xButton, Button::GetStandardText( BUTTON_CANCEL ),
++//    : IconButton( xButton, rtl::OUString::createFromAscii( "~Cancel " ),
++                  "res/commandimagelist/sc_cancel.png" )
 +{
 +}
 +
 +VCLXYesButton::VCLXYesButton( css::uno::Reference< css::uno::XInterface > xButton )
-+    : IconButton( xButton, rtl::OUString::createFromAscii( "Yes" ),
-+                  "res/commandimagelist/sc_yesindex.png" )
++    : IconButton( xButton, Button::GetStandardText( BUTTON_YES ),
++                  "res/commandimagelist/sc_yes.png" )
 +{
 +}
 +
 +VCLXNoButton::VCLXNoButton( css::uno::Reference< css::uno::XInterface > xButton )
-+    : IconButton( xButton, rtl::OUString::createFromAscii( "No" ),
-+                  "res/commandimagelist/sc_noindex.png" )
++    : IconButton( xButton, Button::GetStandardText( BUTTON_NO ),
++                  "res/commandimagelist/sc_no.png" )
 +{
 +}
 +
 +VCLXRetryButton::VCLXRetryButton( css::uno::Reference< css::uno::XInterface > xButton )
-+    : IconButton( xButton, rtl::OUString::createFromAscii( "Retry" ),
-+                  "res/commandimagelist/sc_retryindex.png" )
++    : IconButton( xButton, Button::GetStandardText( BUTTON_RETRY ),
++                  "res/commandimagelist/sc_retry.png" )
 +{
 +}
 +
 +VCLXIgnoreButton::VCLXIgnoreButton( css::uno::Reference< css::uno::XInterface > xButton )
-+    : IconButton( xButton, rtl::OUString::createFromAscii( "Ignore" ),
-+                  "res/commandimagelist/sc_ignoreindex.png" )
++    : IconButton( xButton, Button::GetStandardText( BUTTON_IGNORE ),
++                  "res/commandimagelist/sc_ignore.png" )
 +{
 +}
 +
 +VCLXResetButton::VCLXResetButton( css::uno::Reference< css::uno::XInterface > xButton )
-+    : IconButton( xButton, rtl::OUString::createFromAscii( "Reset" ),
-+                  "res/commandimagelist/sc_resetindex.png" )
++    : IconButton( xButton, rtl::OUString::createFromAscii( "~Reset " ),
++                  "res/commandimagelist/sc_reset.png" )
 +{
 +}
 +
 +VCLXApplyButton::VCLXApplyButton( css::uno::Reference< css::uno::XInterface > xButton )
 +    : IconButton( xButton, rtl::OUString::createFromAscii( "Apply" ),
-+                  "res/commandimagelist/sc_applyindex.png" )
++                  "res/commandimagelist/sc_apply.png" )
 +{
 +}
 +
 +VCLXHelpButton::VCLXHelpButton( css::uno::Reference< css::uno::XInterface > xButton )
-+    : IconButton( xButton, rtl::OUString::createFromAscii( "Help" ),
-+                  "res/commandimagelist/sc_helpindex.png" )
++    : IconButton( xButton, Button::GetStandardText( BUTTON_HELP ),
++                  "res/commandimagelist/sc_help.png" )
 +{
 +}
 +
@@ -17704,12 +17728,12 @@
 +</framewindow>
 diff --git a/layout/workben/ooo-patch b/layout/workben/ooo-patch
 new file mode 100755
-index 0000000..bc29304
+index 0000000..7d62f47
 --- /dev/null
 +++ layout/workben/ooo-patch
 @@ -0,0 +1,6 @@
 +#! /bin/sh
-+commit=${1-b8e24264} # m241'
++commit=${1-d1f42c99} # m1'
 +
 +git diff $commit layout | sed 's ^\([+-]\{3\}\) \(a\|b\)/@\1 @' > layout-dialogs-layout.diff
 +git diff $commit config_office scp2 | sed 's ^\([+-]\{3\}\) \(a\|b\)/@\1 @' > layout-dialogs-config_office-scp2.diff
@@ -22718,10 +22742,10 @@
 +</modaldialog>
 diff --git a/layout/workben/zoom.cxx b/layout/workben/zoom.cxx
 new file mode 100644
-index 0000000..12cac95
+index 0000000..9046c28
 --- /dev/null
 +++ layout/workben/zoom.cxx
-@@ -0,0 +1,497 @@
+@@ -0,0 +1,491 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -23028,12 +23052,6 @@
 +	aOKBtn.SetClickHdl( LINK( this, SvxZoomDialog, OKHdl ) );
 +	aUserEdit.SetModifyHdl( LINK( this, SvxZoomDialog, SpinHdl ) );
 +
-+#if !TEST_LAYOUT
-+	aOptimalBtn.SetText( String( SVX_RESSTR ( RID_SVX_ZOOM_OPTIMAL  ) ) );
-+	aPageWidthBtn.SetText( String( SVX_RESSTR ( RID_SVX_ZOOM_PAGEWIDTH ) ) );
-+	aWholePageBtn.SetText( String( SVX_RESSTR ( RID_SVX_ZOOM_WHOLEPAGE  ) ) );
-+#endif /* !TEST_LAYOUT */
-+
 +	// Default-Werte
 +	USHORT nValue = 100;
 +	USHORT nMin = 10;

Modified: trunk/patches/src680/layout-dialogs-svx-sw.diff
==============================================================================
--- trunk/patches/src680/layout-dialogs-svx-sw.diff	(original)
+++ trunk/patches/src680/layout-dialogs-svx-sw.diff	Tue Jan  8 14:13:21 2008
@@ -24,7 +24,7 @@
  
  SRS1NAME=dialogs
 diff --git a/svx/source/dialog/zoom.cxx b/svx/source/dialog/zoom.cxx
-index 6809030..560605b 100644
+index 6809030..66bd0b8 100644
 --- svx/source/dialog/zoom.cxx
 +++ svx/source/dialog/zoom.cxx
 @@ -61,7 +61,9 @@

Modified: trunk/patches/src680/zoom-combobox.diff
==============================================================================
--- trunk/patches/src680/zoom-combobox.diff	(original)
+++ trunk/patches/src680/zoom-combobox.diff	Tue Jan  8 14:13:21 2008
@@ -215,43 +215,6 @@
  SRS1NAME=$(TARGET)
  SRC1FILES = \
 
---- svx/source/dialog/zoom.src	2004-06-25 17:36:12.000000000 +0530
-+++ svx/source/dialog/zoom.src	2005-03-29 14:29:01.000000000 +0530
-@@ -75,19 +75,16 @@
- 	{
-         Pos = MAP_APPFONT ( 12 , 14 ) ;
- 		Size = MAP_APPFONT ( 80 , 10 ) ;
--		Text [ en-US ] = "~Entire Page" ;
- 	};
- 	RadioButton BTN_PAGE_WIDTH
- 	{
-         Pos = MAP_APPFONT ( 12 , 27 ) ;
- 		Size = MAP_APPFONT ( 80 , 10 ) ;
--		Text [ en-US ] = "~Page Width" ;
- 	};
- 	RadioButton BTN_OPTIMAL
- 	{
-         Pos = MAP_APPFONT ( 12 , 40 ) ;
- 		Size = MAP_APPFONT ( 80 , 10 ) ;
--		Text [ en-US ] = "~Optimal" ;
- 	};
- 	RadioButton BTN_200
- 	{
-
---- svx/source/dialog/zoom.cxx	2005-01-21 22:26:06.000000000 +0530
-+++ svx/source/dialog/zoom.cxx	2005-03-29 17:57:10.766137558 +0530
-@@ -291,6 +291,10 @@
- 	aOKBtn.SetClickHdl( LINK( this, SvxZoomDialog, OKHdl ) );
- 	aUserEdit.SetModifyHdl( LINK( this, SvxZoomDialog, SpinHdl ) );
- 
-+	aOptimalBtn.SetText( String( SVX_RESSTR ( RID_SVX_ZOOM_OPTIMAL  ) ) );
-+	aPageWidthBtn.SetText( String( SVX_RESSTR ( RID_SVX_ZOOM_PAGEWIDTH ) ) );
-+	aWholePageBtn.SetText( String( SVX_RESSTR ( RID_SVX_ZOOM_WHOLEPAGE  ) ) );
-+
- 	// Default-Werte
- 	USHORT nValue = 100;
- 	USHORT nMin = 10;
-
 --- svx/inc/svx/dialogs.hrc	2005-02-02 19:27:13.000000000 +0530
 +++ svx/inc/svx/dialogs.hrc	2005-03-29 14:16:08.000000000 +0530
 @@ -243,6 +243,8 @@
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]