[Libreoffice-commits] core.git: 2 commits - solenv/bin sysui/desktop vcl/source

[Bjoern Michaelsen]

 solenv/bin/desktop-translate.pl      |    2 +-
 sysui/desktop/menus/base.desktop     |    2 +-
 sysui/desktop/menus/calc.desktop     |    2 +-
 sysui/desktop/menus/draw.desktop     |    2 +-
 sysui/desktop/menus/impress.desktop  |    2 +-
 sysui/desktop/menus/math.desktop     |    2 +-
 sysui/desktop/menus/writer.desktop   |    2 +-
 vcl/source/app/IconThemeSelector.cxx |    3 +++
 8 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit e60872a5894ee86b0db455d97c8373f995fc9612
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Oct 23 10:26:11 2015 +0200

    lp#1170035: Fix l10n for quicklist

diff --git a/solenv/bin/desktop-translate.pl b/solenv/bin/desktop-translate.pl
index 2b7b882..0680431 100644
--- a/solenv/bin/desktop-translate.pl
+++ b/solenv/bin/desktop-translate.pl
@@ -66,7 +66,7 @@ if (!defined $template_dir) {
 
 # hack for unity section
 my $outkey = $key;
-if ( $outkey eq "UnityQuicklist" ) {
+if ( $outkey eq "UnityQuickList" ) {
     $outkey = "Name";
 }
 
diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index 76255fe..06c3e72 100644
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -35,5 +35,5 @@ X-KDE-Protocols=file,http,ftp,webdav
 
 Actions=NewDocument;
 [Desktop Action NewDocument]
-Name=New Database
+UnityQuickList=New Database
 Exec=${UNIXBASISROOTNAME} --base
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index 6df6e08..a924062 100644
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -35,5 +35,5 @@ X-KDE-Protocols=file,http,ftp,webdav
 
 Actions=NewDocument;
 [Desktop Action NewDocument]
-Name=New Spreadsheet
+UnityQuickList=New Spreadsheet
 Exec=${UNIXBASISROOTNAME} --calc
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 3e20e8d..d4e82a4 100644
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -35,5 +35,5 @@ X-KDE-Protocols=file,http,ftp,webdav
 
 Actions=NewDocument;
 [Desktop Action NewDocument]
-Name=New Drawing
+UnityQuickList=New Drawing
 Exec=${UNIXBASISROOTNAME} --draw
diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
index b419593..e728eab 100644
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -35,5 +35,5 @@ X-KDE-Protocols=file,http,ftp,webdav
 
 Actions=NewDocument;
 [Desktop Action NewDocument]
-Name=New Presentation
+UnityQuickList=New Presentation
 Exec=${UNIXBASISROOTNAME} --impress
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index e437d26..535a669 100644
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -36,5 +36,5 @@ X-KDE-Protocols=file,http,ftp,webdav
 
 Actions=NewDocument;
 [Desktop Action NewDocument]
-Name=New Formula
+UnityQuickList=New Formula
 Exec=${UNIXBASISROOTNAME} --math
diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
index 0294b5d..1df1b49 100644
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -35,5 +35,5 @@ X-KDE-Protocols=file,http,ftp,webdav
 
 Actions=NewDocument;
 [Desktop Action NewDocument]
-Name=New Document
+UnityQuickList=New Document
 Exec=${UNIXBASISROOTNAME} --writer
commit 3622c7027af764e21ba48777f746a393e817ac63
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Oct 20 23:10:36 2015 +0200

    on unity, default to human if possible

diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
index bed75fa..fb73155 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -65,6 +65,9 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
     else if ( desktopEnvironment.equalsIgnoreAsciiCase("MacOSX") ) {
         r = "breeze";
     }
+    else if ( desktopEnvironment.equalsIgnoreAsciiCase("unity") ) {
+        r = "human";
+    }
     else {
         r = FALLBACK_ICON_THEME_ID;
     }