Date: Tue, 10 Feb 2004 21:52:25 -0600 From: Jeremy Messenger <mezz7@cox.net> To: Joe Marcus Clarke <marcus@FreeBSD.org> Cc: gnome <freebsd-gnome@FreeBSD.org> Subject: Re: Looking for GNOME users with KDE Message-ID: <opr26s1nka8ckrg5@smtp.central.cox.net> In-Reply-To: <1076455070.819.2.camel@gyros> References: <1076231925.915.8.camel@shumai.marcuscom.com> <1076314663.766.16.camel@localhost> <1076352014.830.61.camel@gyros> <1076399479.1054.3.camel@localhost> <1076442051.733.87.camel@gyros> <opr256tep28ckrg5@smtp.central.cox.net> <1076443069.733.89.camel@gyros> <opr258o5ik8ckrg5@smtp.central.cox.net> <1076455070.819.2.camel@gyros>
next in thread | previous in thread | raw e-mail | index | archive | help
------------Co6WSLOBzKtVEuG25qgc4z
Content-Type: text/plain; format=flowed; charset=utf-8
Content-Transfer-Encoding: 8bit
On Tue, 10 Feb 2004 18:18:53 -0500, Joe Marcus Clarke <marcus@FreeBSD.org>
wrote:
> Now this is what I'm talking about! Awesome. Let me know when you have
> something you like. Thanks a lot for looking at this.
Here are two attaches of kde-menus.png and gnomevfs2.diff; I think it's
done. Only one very small issue is that there are a lot of KDE icons
(*.desktop) don't have the 'Categories'. The menu read 'Categories' line
in the *.desktop files, so it's why there has three icons (see
kde-menus.png for yellow square) that are out of order. It will be nice if
it's possible to put the <MergeDir> in the KDE's <Folder> and any general
icon can be in the KDE menu rather than outside.
At least, it looks much cleaner than before. :-)
P.S. Can one of committer take a look at ports/62489?
Cheers,
Mezz
> Joe
--
bsdforums.org 's moderator, mezz.
------------Co6WSLOBzKtVEuG25qgc4z
Content-Disposition: attachment; filename=gnomevfs2.diff
Content-Type: text/plain; name=gnomevfs2.diff
Content-Transfer-Encoding: 8bit
diff -urN gnomevfs2.orig/Makefile gnomevfs2/Makefile
--- gnomevfs2.orig/Makefile Sun Feb 8 15:01:38 2004
+++ gnomevfs2/Makefile Tue Feb 10 20:59:14 2004
@@ -44,6 +44,9 @@
.if !defined(WITHOUT_KDE_MENUS)
EXTRA_PATCHES= ${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in
+PLIST_SUB+= KDEMENUS=""
+.else
+PLIST_SUB+= KDEMENUS="@comment "
.endif
.if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
@@ -72,6 +75,11 @@
PLIST_SUB+= SAMBA="@comment "
.endif
+.if !defined(WITHOUT_KDE_MENUS)
+post-extract:
+ @${CP} ${FILESDIR}/KDE.directory ${WRKSRC}
+.endif
+
post-patch:
@${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|\@datadir\@/gnome|\@datadir\@|g'
@@ -79,7 +87,16 @@
${WRKSRC}/libgnomevfs/Makefile.in \
${WRKSRC}/libgnomevfs/xdgmime.c \
${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in
+.if !defined(WITHOUT_KDE_MENUS)
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+ ${WRKSRC}/KDE.directory
+.endif
@${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \
${WRKSRC}/Makefile.in
+
+.if !defined(WITHOUT_KDE_MENUS)
+post-install:
+ @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders/
+.endif
.include <bsd.port.post.mk>
diff -urN gnomevfs2.orig/files/KDE.directory gnomevfs2/files/KDE.directory
--- gnomevfs2.orig/files/KDE.directory Wed Dec 31 18:00:00 1969
+++ gnomevfs2/files/KDE.directory Tue Feb 10 20:11:16 2004
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=KDE
+Comment=Some comment about KDE menu
+Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png
+Type=Directory
diff -urN gnomevfs2.orig/files/modules_vfolder_applications-all-users.vfolder-info.in gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in
--- gnomevfs2.orig/files/modules_vfolder_applications-all-users.vfolder-info.in Sun Feb 8 13:57:49 2004
+++ gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in Tue Feb 10 19:59:29 2004
@@ -1,5 +1,5 @@
---- modules/vfolder/applications-all-users.vfolder-info.in.orig Sun Feb 8 14:02:33 2004
-+++ modules/vfolder/applications-all-users.vfolder-info.in Sun Feb 8 14:00:32 2004
+--- modules/vfolder/applications-all-users.vfolder-info.in.orig Tue Feb 10 19:49:19 2004
++++ modules/vfolder/applications-all-users.vfolder-info.in Tue Feb 10 19:59:22 2004
@@ -19,7 +19,14 @@
<MergeDir>/usr/share/gnome/apps/</MergeDir>
@@ -16,3 +16,269 @@
<!-- Root folder -->
<Folder>
+@@ -34,10 +41,12 @@
+ <Query>
+ <And>
+ <Keyword>Core</Keyword>
+- <!-- FIXME: Seth, why would this be wanted? -->
+- <!--<Not>
+- <Keyword>Merged</Keyword>
+- </Not>-->
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ </And>
+ </Query>
+
+@@ -47,6 +56,12 @@
+ <Desktop>Accessories.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Utility</Keyword>
+ <Not>
+@@ -63,6 +78,12 @@
+ <Desktop>Accessibility.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Accessibility</Keyword>
+ <Not>
+@@ -80,6 +101,12 @@
+ <OnlyUnallocated/>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Not>
+ <Keyword>Settings</Keyword>
+@@ -101,6 +128,12 @@
+ <Desktop>Development.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Development</Keyword>
+ </And>
+@@ -114,6 +147,12 @@
+ <Desktop>Games.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Game</Keyword>
+ </And>
+@@ -127,6 +166,12 @@
+ <Desktop>Graphics.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Graphics</Keyword>
+ </And>
+@@ -140,6 +185,12 @@
+ <Desktop>Internet.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>Network</Keyword>
+ </And>
+@@ -153,6 +204,12 @@
+ <Desktop>Multimedia.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Keyword>AudioVideo</Keyword>
+ </And>
+@@ -170,6 +227,12 @@
+ <Desktop>Office.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Or>
+ <Keyword>Office</Keyword>
+@@ -195,6 +258,12 @@
+ <Desktop>System.directory</Desktop>
+ <Query>
+ <And>
++ <Not>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ </Not>
+ <Keyword>Application</Keyword>
+ <Not>
+ <Keyword>Settings</Keyword>
+@@ -204,6 +273,117 @@
+ </Query>
+ <DontShowIfEmpty/>
+ </Folder>
+-
++
++ <!-- KDE -->
++ <Folder>
++ <Name>KDE</Name>
++ <Desktop>KDE.directory</Desktop>
++
++ <!-- KAccessories -->
++ <Folder>
++ <Name>Accessories</Name>
++ <Desktop>Accessories.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Keyword>Utility</Keyword>
++ </And>
++ </Query>
++ <DontShowIfEmpty/>
++ </Folder>
++
++ <!-- KDevelopment Tools -->
++ <Folder>
++ <Name>Programming</Name>
++ <Desktop>Development.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Keyword>Development</Keyword>
++ </And>
++ </Query>
++ <DontShowIfEmpty/>
++ </Folder>
++
++ <!-- KGraphics -->
++ <Folder>
++ <Name>Graphics</Name>
++ <Desktop>Graphics.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Keyword>Graphics</Keyword>
++ </And>
++ </Query>
++ <DontShowIfEmpty/>
++ </Folder>
++
++ <!-- KInternet -->
++ <Folder>
++ <Name>Internet</Name>
++ <Desktop>Internet.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Keyword>Network</Keyword>
++ </And>
++ </Query>
++
++ <Include>/usr/local/share/applnk/konqueror.desktop</Include>
++
++ <DontShowIfEmpty/>
++ </Folder>
++
++ <!-- KMultimedia -->
++ <Folder>
++ <Name>Multimedia</Name>
++ <Desktop>Multimedia.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Keyword>AudioVideo</Keyword>
++ </And>
++ </Query>
++ <DontShowIfEmpty/>
++ </Folder>
++
++ <!-- KOffice -->
++ <Folder>
++ <Name>Office</Name>
++ <Desktop>Office.directory</Desktop>
++ <Query>
++ <And>
++ <Or>
++ <Keyword>Qt</Keyword>
++ <Keyword>KDE</Keyword>
++ </Or>
++ <Or>
++ <Keyword>Office</Keyword>
++ <Keyword>Spreadsheet</Keyword>
++ <Keyword>WordProcessor</Keyword>
++ <Keyword>Calendar</Keyword>
++ <Keyword>ProjectManagement</Keyword>
++ </Or>
++ </And>
++ </Query>
++ <DontShowIfEmpty/>
++ </Folder>
++ </Folder> <!-- KDE -->
++
+ </Folder>
+ </VFolderInfo>
diff -urN gnomevfs2.orig/pkg-plist gnomevfs2/pkg-plist
--- gnomevfs2.orig/pkg-plist Sun Feb 8 15:01:38 2004
+++ gnomevfs2/pkg-plist Tue Feb 10 20:59:06 2004
@@ -147,6 +147,7 @@
share/doc/gnome-vfs-2.0/left.png
share/doc/gnome-vfs-2.0/right.png
share/doc/gnome-vfs-2.0/up.png
+%%KDEMENUS%%share/gnome/vfolders/KDE.directory
share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
------------Co6WSLOBzKtVEuG25qgc4z--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?opr26s1nka8ckrg5>