[Libreoffice-commits] core.git: sysui/desktop

Jean-Baptiste Faure jbf.faure at sud-ouest.org
Sat Nov 2 18:10:49 CET 2013


 sysui/desktop/menus/base.desktop        |   11 +++++----
 sysui/desktop/menus/calc.desktop        |   11 +++++----
 sysui/desktop/menus/draw.desktop        |   11 +++++----
 sysui/desktop/menus/impress.desktop     |   11 +++++----
 sysui/desktop/menus/math.desktop        |   13 ++++++-----
 sysui/desktop/menus/startcenter.desktop |   37 +++++++++++++++++++++++++++++++-
 sysui/desktop/menus/writer.desktop      |   11 +++++----
 7 files changed, 73 insertions(+), 32 deletions(-)

New commits:
commit 78e4c8a925f4735a7e9a4c32a29b19fd2b77670d
Author: Jean-Baptiste Faure <jbf.faure at sud-ouest.org>
Date:   Sat Nov 2 18:09:28 2013 +0100

    fdo#70553: Fix Unity Quicklists
    
    Change-Id: I4bf29d0021c1342cd529a7c6cbd86eceb467a9b5

diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index 2f3005c..62626d4 100755
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -30,10 +30,11 @@ StartupNotify=true
 X-GIO-NoFuse=true
 Keywords=Data;SQL;
 InitialPreference=5
-X-Ayatana-Desktop-Shortcuts=X-New
 StartupWMClass=libreoffice-base
 X-KDE-Protocols=file,http,smb,ftp,webdav
-[X-New Shortcut Group]
-UnityQuicklist=New Database
-Exec=${UNIXBASISROOTNAME} --base %%FILE%%
-TargetEnvironment=Unity
+
+Actions=NewDocument;
+[Desktop Action NewDocument]
+Name=New Database
+Exec=${UNIXBASISROOTNAME} --base
+OnlyShowIn=Unity;
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index 1c3f955..e50de65 100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -30,10 +30,11 @@ StartupNotify=true
 X-GIO-NoFuse=true
 Keywords=Accounting;Stats;OpenDocument Spreadsheet;Chart;Microsoft Excel;Microsoft Works;OpenOffice Calc;ods;xls;xlsx;
 InitialPreference=5
-X-Ayatana-Desktop-Shortcuts=X-New
 StartupWMClass=libreoffice-calc
 X-KDE-Protocols=file,http,smb,ftp,webdav
-[X-New Shortcut Group]
-UnityQuicklist=New Spreadsheet
-Exec=${UNIXBASISROOTNAME} --calc %%FILE%%
-TargetEnvironment=Unity
+
+Actions=NewDocument;
+[Desktop Action NewDocument]
+Name=New Spreadsheet
+Exec=${UNIXBASISROOTNAME} --calc
+OnlyShowIn=Unity;
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 9691841..3483331 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -30,10 +30,11 @@ StartupNotify=true
 X-GIO-NoFuse=true
 Keywords=Vector;Schema;Diagram;Layout;OpenDocument Graphics;Microsoft Publisher;Corel Draw;cdr;odg;svg;
 InitialPreference=5
-X-Ayatana-Desktop-Shortcuts=X-New
 StartupWMClass=libreoffice-draw
 X-KDE-Protocols=file,http,smb,ftp,webdav
-[X-New Shortcut Group]
-UnityQuicklist=New Drawing
-Exec=${UNIXBASISROOTNAME} --draw %%FILE%%
-TargetEnvironment=Unity
+
+Actions=NewDocument;
+[Desktop Action NewDocument]
+Name=New Drawing
+Exec=${UNIXBASISROOTNAME} --draw
+OnlyShowIn=Unity;
diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
index 082b2f6..7efe610 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -30,10 +30,11 @@ StartupNotify=true
 X-GIO-NoFuse=true
 Keywords=Slideshow;Slides;OpenDocument Presentation;Microsoft PowerPoint;Microsoft Works;OpenOffice Impress;odp;ppt;pptx;
 InitialPreference=5
-X-Ayatana-Desktop-Shortcuts=X-New
 StartupWMClass=libreoffice-impress
 X-KDE-Protocols=file,http,smb,ftp,webdav
-[X-New Shortcut Group]
-UnityQuicklist=New Presentation
-Exec=${UNIXBASISROOTNAME} --impress %%FILE%%
-TargetEnvironment=Unity
+
+Actions=NewDocument;
+[Desktop Action NewDocument]
+Name=New Presentation
+Exec=${UNIXBASISROOTNAME} --impress
+OnlyShowIn=Unity;
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index 132c5c3..e13f466 100755
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -18,7 +18,7 @@
 [Desktop Entry]
 Version=1.0
 Terminal=false
-NoDisplay=true
+NoDisplay=false
 Icon=math
 Type=Application
 Categories=Office;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other;
@@ -31,10 +31,11 @@ StartupNotify=true
 X-GIO-NoFuse=true
 Keywords=Equation;OpenDocument Formula;Formula;odf;MathML
 InitialPreference=5
-X-Ayatana-Desktop-Shortcuts=X-New
 StartupWMClass=libreoffice-math
 X-KDE-Protocols=file,http,smb,ftp,webdav
-[X-New Shortcut Group]
-UnityQuicklist=New Formula
-Exec=${UNIXBASISROOTNAME} --math %%FILE%%
-TargetEnvironment=Unity
+
+Actions=NewDocument;
+[Desktop Action NewDocument]
+Name=New Formula
+Exec=${UNIXBASISROOTNAME} --math
+OnlyShowIn=Unity;
diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop
index 8a25b57..dabe887 100755
--- a/sysui/desktop/menus/startcenter.desktop
+++ b/sysui/desktop/menus/startcenter.desktop
@@ -18,7 +18,7 @@
 [Desktop Entry]
 Version=1.0
 Terminal=false
-NoDisplay=true
+NoDisplay=false
 Icon=startcenter
 Type=Application
 Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
@@ -31,3 +31,38 @@ StartupNotify=true
 X-GIO-NoFuse=true
 StartupWMClass=libreoffice-startcenter
 X-KDE-Protocols=file,http,smb,ftp,webdav
+
+##Define Actions
+Actions=Writer;Calc;Impress;Draw;Base;Math;
+
+[Desktop Action Writer]
+Name=Text Document
+Exec=${UNIXBASISROOTNAME} --writer
+OnlyShowIn=Unity;
+
+[Desktop Action Calc]
+Name=Spreadsheet
+Exec=${UNIXBASISROOTNAME} --calc
+OnlyShowIn=Unity;
+
+[Desktop Action Impress]
+Name=Presentation
+Exec=${UNIXBASISROOTNAME} --impress
+OnlyShowIn=Unity;
+
+[Desktop Action Draw]
+Name=Drawing
+Exec=${UNIXBASISROOTNAME} --draw
+OnlyShowIn=Unity;
+
+[Desktop Action Base]
+Name=Database
+Exec=${UNIXBASISROOTNAME} --base
+OnlyShowIn=Unity;
+
+[Desktop Action Math]
+Name=Formula
+Exec=${UNIXBASISROOTNAME} --math
+OnlyShowIn=Unity;
+
+##End of actions menu
diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
index bb32187..25d30cb 100755
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -30,10 +30,11 @@ StartupNotify=true
 X-GIO-NoFuse=true
 Keywords=Text;Letter;Fax;Document;OpenDocument Text;Microsoft Word;Microsoft Works;Lotus WordPro;OpenOffice Writer;CV;odt;doc;docx;rtf;
 InitialPreference=5
-X-Ayatana-Desktop-Shortcuts=X-New
 StartupWMClass=libreoffice-writer
 X-KDE-Protocols=file,http,smb,ftp,webdav
-[X-New Shortcut Group]
-UnityQuicklist=New Document
-Exec=${UNIXBASISROOTNAME} --writer %%FILE%%
-TargetEnvironment=Unity
+
+Actions=NewDocument;
+[Desktop Action NewDocument]
+Name=New Document
+Exec=${UNIXBASISROOTNAME} --writer
+OnlyShowIn=Unity;


More information about the Libreoffice-commits mailing list