Hi all, on the master branch I already commited: http://cgit.freedesktop.org/libreoffice/libs-core/commit/?id=f6a16194d1348cb1c679acec5cd9e014ca3f3104 http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=00b43fc0d82950e2abc57cca3746d395252bc9e0 http://cgit.freedesktop.org/libreoffice/components/commit/?id=cfa7e88f5959a8b3b729107d61351410be80f49b which integrate the (currently outdated and failing to apply) patch human-icons-add.diff from the build repo into the master. The only thing it does not do is changing the fallback order of the setting of "automatic" theme, which might be disruptive for other distros. http://cgit.freedesktop.org/libreoffice/build/tree/patches/dev300/human-icons-add.diff The attached patch does the same for the 3.3 branch. If this patch gets accepted for 3.3, we likely can get rid of the patch in the build repo, which I would consider a Good Thing(tm). (Note: In the long run, we should likely get rid of the need to hardwire themes in the source). So please review the attached patch. Best Regards, Bjoern Michaelsen -- https://launchpad.net/~bjoern-michaelsen
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 762e025..f2aff18 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -270,6 +270,7 @@ TabPage OFA_TP_VIEW
< "Tango" ; > ;
< "Oxygen" ; > ;
< "Classic" ; > ;
+ < "Human" ; > ;
};
};
CheckBox CB_SYSTEM_FONT
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 54893bb..c191089 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5867,6 +5867,11 @@
<desc>Classic - the OpenOffice.org 2.0
default theme</desc>
</info>
</enumeration>
+ <enumeration oor:value="human">
+ <info>
+ <desc>Human - the Gnome default theme for
Ubuntu</desc>
+ </info>
+ </enumeration>
</constraints>
<value>auto</value>
</prop>
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 30308b2..5fa547d 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -525,7 +525,8 @@ private:
#define STYLE_SYMBOLS_TANGO ((ULONG)5)
#define STYLE_SYMBOLS_OXYGEN ((ULONG)6)
#define STYLE_SYMBOLS_CLASSIC ((ULONG)7)
-#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)8)
+#define STYLE_SYMBOLS_HUMAN ((ULONG)8)
+#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)9)
#define STYLE_MENUIMAGES_OFF ((USHORT)0)
#define STYLE_MENUIMAGES_ON ((USHORT)1)
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 20adcc8..2c89429 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -712,6 +712,7 @@ void StyleSettings::Set3DColors( const Color& rColor )
case STYLE_SYMBOLS_TANGO: return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tango"));
case STYLE_SYMBOLS_OXYGEN: return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("oxygen"));
case STYLE_SYMBOLS_CLASSIC: return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("classic"));
+ case STYLE_SYMBOLS_HUMAN: return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("human"));
}
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("auto"));
@@ -735,6 +736,8 @@ ULONG StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) cons
return STYLE_SYMBOLS_OXYGEN;
else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("classic")) )
return STYLE_SYMBOLS_CLASSIC;
+ else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("human")) )
+ return STYLE_SYMBOLS_HUMAN;
return STYLE_SYMBOLS_AUTO;
}
Attachment:
signature.asc
Description: PGP signature