[Libreoffice-commits] core.git: 3 commits - cui/source cui/uiconfig openssl/ExternalProject_openssl.mk
Jan Holesovsky
kendy at suse.cz
Fri Apr 19 07:32:59 PDT 2013
cui/source/options/personalization.cxx | 34 ++++++++++---------------------
cui/uiconfig/ui/personalization_tab.ui | 10 ++++-----
cui/uiconfig/ui/select_persona_dialog.ui | 8 +++----
openssl/ExternalProject_openssl.mk | 7 +++---
4 files changed, 25 insertions(+), 34 deletions(-)
New commits:
commit 6faa622c13969ff198b471b0550aacf10b5baa57
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Apr 19 15:57:43 2013 +0200
Personas: Rename them to Themes even in the UI.
Change-Id: Ia7916e0cbbf91de09195c20b60f31ffe80256a9c
diff --git a/cui/uiconfig/ui/personalization_tab.ui b/cui/uiconfig/ui/personalization_tab.ui
index 415a6fb..806915e9 100644
--- a/cui/uiconfig/ui/personalization_tab.ui
+++ b/cui/uiconfig/ui/personalization_tab.ui
@@ -134,7 +134,7 @@
<property name="can_focus">False</property>
<child>
<object class="GtkRadioButton" id="no_persona">
- <property name="label" translatable="yes">Plain look, do not use Personas</property>
+ <property name="label" translatable="yes">Plain look, do not use Themes</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -150,7 +150,7 @@
</child>
<child>
<object class="GtkRadioButton" id="default_persona">
- <property name="label" translatable="yes">Pre-installed Persona (if available)</property>
+ <property name="label" translatable="yes">Pre-installed Theme (if available)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -171,7 +171,7 @@
<property name="homogeneous">True</property>
<child>
<object class="GtkRadioButton" id="own_persona">
- <property name="label" translatable="yes">Own Persona</property>
+ <property name="label" translatable="yes">Own Theme</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -187,7 +187,7 @@
</child>
<child>
<object class="GtkButton" id="select_persona">
- <property name="label" translatable="yes">Select Persona</property>
+ <property name="label" translatable="yes">Select Theme</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -213,7 +213,7 @@
<object class="GtkLabel" id="personas_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Firefox Personas</property>
+ <property name="label" translatable="yes">Firefox Themes</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/cui/uiconfig/ui/select_persona_dialog.ui b/cui/uiconfig/ui/select_persona_dialog.ui
index 14de389..7db2004 100644
--- a/cui/uiconfig/ui/select_persona_dialog.ui
+++ b/cui/uiconfig/ui/select_persona_dialog.ui
@@ -79,7 +79,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">First visit Firefox Personas (http://www.getpersonas.com). Find a Persona you like, and want to choose for LibreOffice.</property>
+ <property name="label" translatable="yes">First visit Firefox Themes (https://addons.mozilla.org/firefox/themes). Find the Theme you like, and want to choose for LibreOffice.</property>
<property name="wrap">True</property>
<property name="max_width_chars">54</property>
</object>
@@ -99,7 +99,7 @@
</child>
<child>
<object class="GtkButton" id="visit_personas">
- <property name="label" translatable="yes">Visit Firefox Personas</property>
+ <property name="label" translatable="yes">Visit Firefox Themes</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -126,7 +126,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Then, in your web browser's location bar, copy the address of the page that contains the Persona to clipboard, and paste it to the input field below.</property>
+ <property name="label" translatable="yes">Then, in your web browser's location bar, copy the address of the page that contains the Theme to clipboard, and paste it to the input field below.</property>
<property name="wrap">True</property>
<property name="max_width_chars">54</property>
</object>
@@ -141,7 +141,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Persona address:</property>
+ <property name="label" translatable="yes">Theme address:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">persona_url</property>
</object>
commit ca3fa2a210cc6978dc75566ff453c9138ab9c094
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Apr 19 15:56:38 2013 +0200
Personas: Now they are called 'Themes', and changed location.
Updated the URL's + the code that works with them & parses the page
accordingly.
Change-Id: Iba1414c749bdf227b3945162da83e3d35ce86244
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 86e7fff..1f88044 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -34,7 +34,7 @@ using namespace com::sun::star;
/** Dialog that will allow the user to choose a Persona to use.
So far there is no better possibility than just to paste the URL from
-http://www.getpersona.com ...
+https://addons.mozilla.org/firefox/themes ...
*/
class SelectPersonaDialog : public ModalDialog
{
@@ -60,34 +60,24 @@ SelectPersonaDialog::SelectPersonaDialog( Window *pParent )
pButton->SetClickHdl( LINK( this, SelectPersonaDialog, VisitPersonas ) );
get( m_pEdit, "persona_url" );
- m_pEdit->SetPlaceholderText( "http://www.getpersonas.com/persona/" );
+ m_pEdit->SetPlaceholderText( "https://addons.mozilla.org/firefox/themes/" );
}
OUString SelectPersonaDialog::GetPersonaURL() const
{
OUString aText( m_pEdit->GetText() );
- if ( !aText.startsWith( "http://www.getpersonas.com/" ) &&
- !aText.startsWith( "https://www.getpersonas.com/" ) )
- {
- return OUString();
- }
-
- // canonicalize the URL
- OUString aPersona( "persona/" );
- sal_Int32 nPersona = aText.lastIndexOf( aPersona );
-
- if ( nPersona < 0 )
- return OUString();
+ if ( aText.startsWith( "https://addons.mozilla.org/" ) )
+ return aText;
- return "http://www.getpersonas.com/persona/" + aText.copy( nPersona + aPersona.getLength() );
+ return OUString();
}
IMPL_LINK( SelectPersonaDialog, VisitPersonas, PushButton*, /*pButton*/ )
{
uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShell( com::sun::star::system::SystemShellExecute::create( ::comphelper::getProcessComponentContext() ) );
- xSystemShell->execute( "http://www.getpersonas.com", OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
+ xSystemShell->execute( "https://addons.mozilla.org/firefox/themes/", OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
return 0;
}
@@ -277,7 +267,7 @@ static OUString searchValue( const OString &rBuffer, sal_Int32 from, const OStri
where += rIdentifier.getLength();
- sal_Int32 end = rBuffer.indexOf( """, where );
+ sal_Int32 end = rBuffer.indexOf( """, where );
if ( end < 0 )
return OUString();
@@ -291,24 +281,24 @@ static OUString searchValue( const OString &rBuffer, sal_Int32 from, const OStri
static bool parsePersonaInfo( const OString &rBuffer, OUString *pHeaderURL, OUString *pFooterURL, OUString *pTextColor, OUString *pAccentColor )
{
// it is the first attribute that contains "persona="
- sal_Int32 persona = rBuffer.indexOf( "persona=\"{" );
+ sal_Int32 persona = rBuffer.indexOf( "data-browsertheme=\"{" );
if ( persona < 0 )
return false;
// now search inside
- *pHeaderURL = searchValue( rBuffer, persona, ""headerURL":"" );
+ *pHeaderURL = searchValue( rBuffer, persona, ""headerURL":"" );
if ( pHeaderURL->isEmpty() )
return false;
- *pFooterURL = searchValue( rBuffer, persona, ""footerURL":"" );
+ *pFooterURL = searchValue( rBuffer, persona, ""footerURL":"" );
if ( pFooterURL->isEmpty() )
return false;
- *pTextColor = searchValue( rBuffer, persona, ""textcolor":"" );
+ *pTextColor = searchValue( rBuffer, persona, ""textcolor":"" );
if ( pTextColor->isEmpty() )
return false;
- *pAccentColor = searchValue( rBuffer, persona, ""accentcolor":"" );
+ *pAccentColor = searchValue( rBuffer, persona, ""accentcolor":"" );
if ( pAccentColor->isEmpty() )
return false;
commit e7b2b505951d888d8b2337df991bd584090c9384
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Apr 19 15:54:00 2013 +0200
Fix https://-related crashes.
The internal openssl on 64bit linux was built as linux-generic32, instead of
linux-generi64, which caused crashes later when used. This patch alignes it
with the logic before gbuildization.
Change-Id: I2919a91138e8f33ad50e64728496144bac815321
diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk
index aa5492f..97cd10f 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -17,9 +17,10 @@ $(eval $(call gb_ExternalProject_register_targets,openssl,\
OPENSSL_PLATFORM := $(if $(filter LINUX FREEBSD ANDROID,$(OS)),\
$(if $(filter I,$(CPU)),\
- $(if $(filter GNU/kFreeBSD,$(shell uname)),\
- debian-kfreebsd-i386,linux-elf),\
- linux-generic32),\
+ $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-i386,linux-elf),\
+ $(if $(filter X,$(CPU)),\
+ $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-amd64,linux-generic64),\
+ linux-generic32)),\
$(if $(filter SOLARIS,$(OS)),\
$(if $(filter INTEL,$(CPUNAME)),\
$(if $(filter X,$(CPU)),\
More information about the Libreoffice-commits
mailing list