summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-08-14 11:49:55 +0200
committerJan Holesovsky <kendy@collabora.com>2014-08-14 19:43:34 +0200
commitf4003ccbe4be3c5ef6ca08b98d43416b30ba8d0d (patch)
treed272a794478253e959886786a89f2b4ca7df6ca5 /cui
parent8288aaa59a7df3f3632e98e824aef29a25b96b47 (diff)
personas: Better default searches, improved error messaging.
Change-Id: I0a1303f5864516efbf69e7a0227f17e43aea4af7
Diffstat (limited to 'cui')
-rw-r--r--cui/source/options/personalization.cxx15
-rw-r--r--cui/source/options/personalization.src4
2 files changed, 10 insertions, 9 deletions
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 31e37e11fd4b..71da75ff345b 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -45,23 +45,23 @@ SelectPersonaDialog::SelectPersonaDialog( Window *pParent )
m_pSearchButton->SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) );
get( m_vSearchSuggestions[0], "suggestion1" );
- m_vSearchSuggestions[0]->SetText( "libreoffice" );
+ m_vSearchSuggestions[0]->SetText( "LibreOffice" );
m_vSearchSuggestions[0]->SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) );
get( m_vSearchSuggestions[1], "suggestion2" );
- m_vSearchSuggestions[1]->SetText( "science" );
+ m_vSearchSuggestions[1]->SetText( "Abstract" );
m_vSearchSuggestions[1]->SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) );
get( m_vSearchSuggestions[2], "suggestion3" );
- m_vSearchSuggestions[2]->SetText( "firefox" );
+ m_vSearchSuggestions[2]->SetText( "Color" );
m_vSearchSuggestions[2]->SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) );
get( m_vSearchSuggestions[3], "suggestion4" );
- m_vSearchSuggestions[3]->SetText( "nasa" );
+ m_vSearchSuggestions[3]->SetText( "Music" );
m_vSearchSuggestions[3]->SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) );
get( m_vSearchSuggestions[4], "suggestion5" );
- m_vSearchSuggestions[4]->SetText( "harry potter" );
+ m_vSearchSuggestions[4]->SetText( "Nature" );
m_vSearchSuggestions[4]->SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) );
get( m_pEdit, "search_term" );
@@ -562,8 +562,9 @@ void SearchAndParseThread::execute()
}
catch (...)
{
- sProgress = CUI_RES( RID_SVXSTR_SEARCHERROR );
- m_pPersonaDialog->SetProgress( sProgress );
+ sProgress = CUI_RES(RID_SVXSTR_SEARCHERROR);
+ sProgress = sProgress.replaceAll("%1", m_aURL);
+ m_pPersonaDialog->SetProgress(sProgress);
return;
}
diff --git a/cui/source/options/personalization.src b/cui/source/options/personalization.src
index 7cfe7c0a6344..e266e6c0d841 100644
--- a/cui/source/options/personalization.src
+++ b/cui/source/options/personalization.src
@@ -31,12 +31,12 @@ String RID_SVXSTR_SELECTEDPERSONA
String RID_SVXSTR_SEARCHING
{
- Text [ en-US ] = "Searching.. Please Wait..";
+ Text [ en-US ] = "Searching, please wait...";
};
String RID_SVXSTR_SEARCHERROR
{
- Text [ en-US ] = "Something went wrong. Please try again.";
+ Text [ en-US ] = "Cannot open %1, please try again later.";
};
String RID_SVXSTR_NORESULTS