GNOME.org
 

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

Author: ccheney
Date: Wed Oct  1 02:00:31 2008
New Revision: 14163
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14163&view=rev

Log:
2008-09-30  Chris Cheney  <ccheney ubuntu com>

        * patches/dev300/human-icons-add.diff: Update patch for 3.0rc2


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/human-icons-add.diff

Modified: trunk/patches/dev300/human-icons-add.diff
==============================================================================
--- trunk/patches/dev300/human-icons-add.diff	(original)
+++ trunk/patches/dev300/human-icons-add.diff	Wed Oct  1 02:00:31 2008
@@ -1,105 +1,118 @@
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old	2007-07-18 05:44:03.000000000 -0500
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs	2007-08-04 02:48:14.000000000 -0500
-@@ -5383,7 +5383,12 @@
+--- officecfg/registry/schema/org/openoffice/Office/Common.xcs	2008-09-26 21:13:11 +0000
++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs	2008-09-26 21:21:30 +0000
+@@ -5588,6 +5588,11 @@
+ 							<desc>Classic - the OpenOffice.org 2.0 default theme</desc>
+ 						</info>
  					</enumeration>
- 					<enumeration oor:value="tango">
- 						<info>
--							<desc>Tango - the Gnome default theme</desc>
-+							<desc>Tango</desc>
-+						</info>
-+					</enumeration>
 +					<enumeration oor:value="human">
 +						<info>
 +							<desc>Human - the Gnome default theme for Ubuntu</desc>
- 						</info>
- 					</enumeration>
++						</info>
++					</enumeration>
  				</constraints>
---- solenv/inc/settings.mk.old	2007-08-04 02:51:40.000000000 -0500
-+++ solenv/inc/settings.mk	2007-08-04 02:51:55.000000000 -0500
-@@ -956,6 +956,9 @@
+ 				<value>auto</value>
+ 			</prop>
+
+--- solenv/inc/settings.mk	2008-09-26 21:13:11 +0000
++++ solenv/inc/settings.mk	2008-09-26 21:24:30 +0000
+@@ -989,6 +989,9 @@
  RSCDEFS+= -DDEBUG
  .ENDIF
  
 +# additional image sets
-+CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango human
++CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic human
 +
  # settings for mozilla idl compiler
  XPIDL=xpidl
  XPIDL_LINK=xpt_link
---- svtools/inc/imgdef.hxx.old	2007-06-04 09:47:50.000000000 -0500
-+++ svtools/inc/imgdef.hxx	2007-08-04 02:53:12.000000000 -0500
-@@ -50,7 +50,8 @@
-     SFX_SYMBOLS_STYLE_HICONTRAST,
+
+--- svtools/inc/imgdef.hxx	2008-09-26 21:13:11 +0000
++++ svtools/inc/imgdef.hxx	2008-09-26 21:25:01 +0000
+@@ -46,7 +46,8 @@
      SFX_SYMBOLS_STYLE_INDUSTRIAL,
      SFX_SYMBOLS_STYLE_CRYSTAL,
--    SFX_SYMBOLS_STYLE_TANGO
-+    SFX_SYMBOLS_STYLE_TANGO,
+     SFX_SYMBOLS_STYLE_TANGO,
+-    SFX_SYMBOLS_STYLE_CLASSIC
++    SFX_SYMBOLS_STYLE_CLASSIC,
 +    SFX_SYMBOLS_STYLE_HUMAN
  };
  
  #define SFX_TOOLBOX_CHANGESYMBOLSET		0x0001
---- svtools/source/config/miscopt.cxx.old	2007-06-27 16:14:41.000000000 -0500
-+++ svtools/source/config/miscopt.cxx	2007-08-04 02:56:14.000000000 -0500
-@@ -286,6 +286,7 @@
- 		case STYLE_SYMBOLS_INDUSTRIAL: return SFX_SYMBOLS_STYLE_INDUSTRIAL;
+
+--- svtools/source/config/miscopt.cxx	2008-09-26 21:13:11 +0000
++++ svtools/source/config/miscopt.cxx	2008-09-26 21:26:12 +0000
+@@ -275,6 +275,7 @@
  		case STYLE_SYMBOLS_CRYSTAL:    return SFX_SYMBOLS_STYLE_CRYSTAL;
  		case STYLE_SYMBOLS_TANGO:      return SFX_SYMBOLS_STYLE_TANGO;
+ 		case STYLE_SYMBOLS_CLASSIC:    return SFX_SYMBOLS_STYLE_CLASSIC;
 +		case STYLE_SYMBOLS_HUMAN:      return SFX_SYMBOLS_STYLE_HUMAN;
  	}
  
  	return SFX_SYMBOLS_STYLE_AUTO;
-@@ -301,6 +302,7 @@
- 		case SFX_SYMBOLS_STYLE_INDUSTRIAL: return STYLE_SYMBOLS_INDUSTRIAL;
+@@ -291,6 +292,7 @@
  		case SFX_SYMBOLS_STYLE_CRYSTAL:    return STYLE_SYMBOLS_CRYSTAL;
  		case SFX_SYMBOLS_STYLE_TANGO:      return STYLE_SYMBOLS_TANGO;
+ 		case SFX_SYMBOLS_STYLE_CLASSIC:    return STYLE_SYMBOLS_CLASSIC;
 +		case SFX_SYMBOLS_STYLE_HUMAN:      return STYLE_SYMBOLS_HUMAN;
  	}
  
  	return STYLE_SYMBOLS_AUTO;
---- svx/source/dialog/optgdlg.cxx.old	2007-07-11 06:03:03.000000000 -0500
-+++ svx/source/dialog/optgdlg.cxx	2007-08-04 02:59:17.000000000 -0500
-@@ -918,6 +918,7 @@
-             case 3: eSet = SFX_SYMBOLS_STYLE_INDUSTRIAL; break;
+
+--- svx/source/dialog/optgdlg.cxx	2008-09-26 21:13:11 +0000
++++ svx/source/dialog/optgdlg.cxx	2008-09-26 21:29:24 +0000
+@@ -798,6 +798,7 @@
+             case STYLE_SYMBOLS_TANGO:       aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
+             case STYLE_SYMBOLS_CLASSIC:     aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
+             case STYLE_SYMBOLS_HICONTRAST:  aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
++            case STYLE_SYMBOLS_HUMAN:       aAutoStr += aIconStyleLB.GetEntry( 7 ); break;
+         }
+ 
+         aIconStyleLB.RemoveEntry( 0 );
+@@ -880,6 +881,7 @@
              case 4: eSet = SFX_SYMBOLS_STYLE_CRYSTAL;    break;
              case 5: eSet = SFX_SYMBOLS_STYLE_TANGO;      break;
-+            case 6: eSet = SFX_SYMBOLS_STYLE_HUMAN;      break;
+             case 6: eSet = SFX_SYMBOLS_STYLE_CLASSIC;    break;
++            case 7: eSet = SFX_SYMBOLS_STYLE_HUMAN;      break;
              default:
                  DBG_ERROR( "OfaViewTabPage::FillItemSet(): This state of aIconStyleLB should not be possible!" );
          }
-@@ -1089,6 +1090,7 @@
-             case SFX_SYMBOLS_STYLE_INDUSTRIAL: nStyleLB_InitialSelection = 3; break;
+@@ -1052,6 +1054,7 @@
              case SFX_SYMBOLS_STYLE_CRYSTAL:    nStyleLB_InitialSelection = 4; break;
              case SFX_SYMBOLS_STYLE_TANGO:      nStyleLB_InitialSelection = 5; break;
-+            case SFX_SYMBOLS_STYLE_HUMAN:      nStyleLB_InitialSelection = 6; break;
+             case SFX_SYMBOLS_STYLE_CLASSIC:    nStyleLB_InitialSelection = 6; break;
++            case SFX_SYMBOLS_STYLE_HUMAN:      nStyleLB_InitialSelection = 7; break;
              default:                           nStyleLB_InitialSelection = 0; break;
          }
      }
---- svx/source/dialog/optgdlg.src.old	2007-06-27 12:27:39.000000000 -0500
-+++ svx/source/dialog/optgdlg.src	2007-08-04 03:18:01.000000000 -0500
-@@ -243,6 +243,7 @@
-             < "Industrial" ; > ;
+
+--- svx/source/dialog/optgdlg.src	2008-09-26 21:13:11 +0000
++++ svx/source/dialog/optgdlg.src	2008-09-26 21:31:34 +0000
+@@ -251,6 +251,7 @@
              < "Crystal" ; > ;
              < "Tango" ; > ;
+             < "Classic" ; > ;
 +            < "Human" ; > ;
          };
      };
  	CheckBox CB_SYSTEM_FONT
---- vcl/inc/vcl/settings.hxx.old	2007-06-04 09:57:34.000000000 -0500
-+++ vcl/inc/vcl/settings.hxx	2007-08-04 03:06:54.000000000 -0500
-@@ -529,7 +529,8 @@
- #define STYLE_SYMBOLS_INDUSTRIAL	((ULONG)3)
+
+--- vcl/inc/vcl/settings.hxx	2008-09-26 21:13:11 +0000
++++ vcl/inc/vcl/settings.hxx	2008-09-26 21:32:25 +0000
+@@ -516,7 +516,8 @@
  #define STYLE_SYMBOLS_CRYSTAL		((ULONG)4)
  #define STYLE_SYMBOLS_TANGO		((ULONG)5)
--#define STYLE_SYMBOLS_THEMES_MAX	((ULONG)5)
-+#define STYLE_SYMBOLS_HUMAN		((ULONG)6)
-+#define STYLE_SYMBOLS_THEMES_MAX	((ULONG)6)
+ #define STYLE_SYMBOLS_CLASSIC		((ULONG)6)
+-#define STYLE_SYMBOLS_THEMES_MAX	((ULONG)6)
++#define STYLE_SYMBOLS_HUMAN		((ULONG)7)
++#define STYLE_SYMBOLS_THEMES_MAX	((ULONG)7)
  
  #define STYLE_CURSOR_NOBLINKTIME    ((ULONG)0xFFFFFFFF)
  
---- vcl/source/app/settings.cxx.orig	2008-04-03 23:58:54.000000000 -0500
-+++ vcl/source/app/settings.cxx	2008-04-05 18:11:50.000000000 -0500
-@@ -84,6 +84,11 @@
- #include <tools/postwin.h>
+
+--- vcl/source/app/settings.cxx	2008-09-26 21:13:11 +0000
++++ vcl/source/app/settings.cxx	2008-09-26 21:39:55 +0000
+@@ -52,6 +52,11 @@
+ #include "tools/postwin.h"
  #endif
  
 +extern "C" {
@@ -110,24 +123,24 @@
  using namespace rtl;
  
  // =======================================================================
-@@ -728,6 +733,7 @@
- 		case STYLE_SYMBOLS_INDUSTRIAL: return ::rtl::OUString::createFromAscii( "industrial" );
+@@ -701,6 +706,7 @@
  		case STYLE_SYMBOLS_CRYSTAL:    return ::rtl::OUString::createFromAscii( "crystal" );
  		case STYLE_SYMBOLS_TANGO:      return ::rtl::OUString::createFromAscii( "tango" );
+ 		case STYLE_SYMBOLS_CLASSIC:    return ::rtl::OUString::createFromAscii( "classic" );
 +		case STYLE_SYMBOLS_HUMAN:      return ::rtl::OUString::createFromAscii( "human" );
  	}
  
  	return ::rtl::OUString::createFromAscii( "auto" );
-@@ -747,6 +753,8 @@
- 		return STYLE_SYMBOLS_CRYSTAL;
- 	else if ( rName == ::rtl::OUString::createFromAscii( "tango" ) )
+@@ -722,6 +728,8 @@
  		return STYLE_SYMBOLS_TANGO;
+ 	else if ( rName == ::rtl::OUString::createFromAscii( "classic" ) )
+ 		return STYLE_SYMBOLS_CLASSIC;
 +	else if ( rName == ::rtl::OUString::createFromAscii( "human" ) )
 +		return STYLE_SYMBOLS_HUMAN;
  
  	return STYLE_SYMBOLS_AUTO;
  }
-@@ -773,22 +781,46 @@
+@@ -756,22 +764,49 @@
  
  // -----------------------------------------------------------------------
  
@@ -144,6 +157,7 @@
 +			case STYLE_SYMBOLS_INDUSTRIAL: strcat (zipfile, "_industrial"); break;
 +			case STYLE_SYMBOLS_CRYSTAL:    strcat (zipfile, "_crystal"); break;
 +			case STYLE_SYMBOLS_TANGO:      strcat (zipfile, "_tango"); break;
++			case STYLE_SYMBOLS_CLASSIC:    strcat (zipfile, "_classic"); break;
 +			case STYLE_SYMBOLS_HUMAN:      strcat (zipfile, "_human"); break;
 +		}
 +		strcat (zipfile, ".zip");
@@ -153,6 +167,8 @@
 +	return nStyle;
 +}
 +
++// -----------------------------------------------------------------------
++
  ULONG StyleSettings::GetCurrentSymbolsStyle() const
  {
  	// style selected in Tools -> Options... -> OpenOffice.org -> View
@@ -164,10 +180,10 @@
  		// the preferred style can be read from the desktop setting by the desktop native widgets modules
  		ULONG nPreferredStyle = GetPreferredSymbolsStyle();
 +		nPreferredStyle = SymbolsStyleOrAuto(nPreferredStyle);
- 		
+ 
  		if ( nPreferredStyle == STYLE_SYMBOLS_AUTO )
  		{
- 		
+ 
  			// use a hardcoded desktop-specific fallback if no preferred style has been detected
  			static bool sbFallbackDesktopChecked = false;
 -			static ULONG snFallbackDesktopStyle = STYLE_SYMBOLS_DEFAULT;
@@ -175,12 +191,22 @@
  
  			if ( !sbFallbackDesktopChecked )
  			{
-@@ -796,7 +828,7 @@
- 
- 				if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ||
- 				    rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "windows" ) )
--					snFallbackDesktopStyle = STYLE_SYMBOLS_TANGO;
-+					snFallbackDesktopStyle = STYLE_SYMBOLS_HUMAN;
- 				else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
- 					snFallbackDesktopStyle = STYLE_SYMBOLS_CRYSTAL;
- 
+@@ -793,7 +828,7 @@
+ ULONG StyleSettings::GetAutoSymbolsStyle() const
+ {
+     const ::rtl::OUString&      rDesktopEnvironment = Application::GetDesktopEnvironment();
+-    ULONG                       nRet = STYLE_SYMBOLS_DEFAULT;
++    ULONG                       nRet = STYLE_SYMBOLS_HUMAN;
+     bool                        bCont = true;
+ 
+     try
+@@ -814,7 +849,7 @@
+     {
+         if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ||
+ 	     rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "windows" ) )
+-            nRet = STYLE_SYMBOLS_TANGO;
++            nRet = STYLE_SYMBOLS_HUMAN;
+         else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
+             nRet = STYLE_SYMBOLS_CRYSTAL;
+     }
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]