[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r16331: Made an Incognito sub-menu in the K-menu, and added it to th (in incognito/trunk: . root_overlay/usr/share/applications root_overlay/var/lib root_overlay/var/lib/incognito-menu root_overlay/var/lib/kdesession)



Author: anonym
Date: 2008-08-01 12:58:08 -0400 (Fri, 01 Aug 2008)
New Revision: 16331

Added:
   incognito/trunk/root_overlay/var/lib/incognito-menu/
   incognito/trunk/root_overlay/var/lib/incognito-menu/applications-kmenuedit.menu
   incognito/trunk/root_overlay/var/lib/incognito-menu/create-usb.desktop
   incognito/trunk/root_overlay/var/lib/incognito-menu/docs.desktop
   incognito/trunk/root_overlay/var/lib/incognito-menu/enable-persistent-vol.desktop
   incognito/trunk/root_overlay/var/lib/incognito-menu/incognito.directory
   incognito/trunk/root_overlay/var/lib/incognito-menu/walkthrough.desktop
Removed:
   incognito/trunk/root_overlay/usr/share/applications/create-usb.desktop
   incognito/trunk/root_overlay/usr/share/applications/docs.desktop
   incognito/trunk/root_overlay/usr/share/applications/enable-persistent-vol.desktop
   incognito/trunk/root_overlay/usr/share/applications/walkthrough.desktop
Modified:
   incognito/trunk/fsscript.sh
   incognito/trunk/root_overlay/var/lib/kdesession/kickerrc
Log:
Made an Incognito sub-menu in the K-menu, and added it to the Quick Launch.
Also cleaned up the Incognito stuff from the desktop for this reason.


Modified: incognito/trunk/fsscript.sh
===================================================================
--- incognito/trunk/fsscript.sh	2008-08-01 15:43:35 UTC (rev 16330)
+++ incognito/trunk/fsscript.sh	2008-08-01 16:58:08 UTC (rev 16331)
@@ -95,6 +95,12 @@
 		sed -i s/User=/User=${USERNAME}/ $USERDIR/.kde/share/config/torkrc
 		sed -i s/_USER_/${USERNAME}/ $USERDIR/.kde/share/config/ksmserverrc
 
+		echo "Setting up menu"
+		mkdir -p $USERDIR/.local/share/{desktop-directories,applications} $USERDIR/.config/menus
+		cp /var/lib/incognito-menu/applications-kmenuedit.menu $USERDIR/.config/menus
+		cp /var/lib/incognito-menu/incognito.directory $USERDIR/.local/share/desktop-directories
+		cp /var/lib/incognito-menu/*.desktop $USERDIR/.local/share/applications
+
 		[[ -x /usr/kde/3.5/bin/knetworkmanager ]] && KNETNM="/usr/kde/3.5/bin/knetworkmanager"
 		[[ -x /usr/bin/knetworkmanager ]] && KNETNM="/usr/bin/knetworkmanager"
 		if [[ -n "${KNETNM}" ]]; then
@@ -132,10 +138,12 @@
 	# Desktop files
 	echo "Preparing desktop"
 	mkdir ${USERDIR}/Desktop
-	for DESKTOP in /usr/share/applications/create-usb.desktop /usr/share/applications/docs.desktop /usr/share/applications/walkthrough.desktop; do
-		ln -s "${DESKTOP}" ${USERDIR}/Desktop
-	done
 
+	# If we want desktop shortcuts, do them here
+	#for DESKTOP in /usr/share/applications/create-usb.desktop /usr/share/applications/docs.desktop /usr/share/applications/walkthrough.desktop; do
+	#	ln -s "${DESKTOP}" ${USERDIR}/Desktop
+	#done
+
 	# Add Tor cookie fo user
 	echo "Setting up Tor Cookie for user"
 	mkdir ${USERDIR}/.tor
@@ -210,7 +218,7 @@
 
 # These configs are useless outside of a home directory
 echo "Removing uneccesary configuration files"
-rm -rf /var/lib/*-config
+rm -rf /var/lib/*-config /var/lib/kdesession /var/lib/incognito-menu
 
 # Remove static libraries, these are only needed when building
 echo "Removing static libraries"

Deleted: incognito/trunk/root_overlay/usr/share/applications/create-usb.desktop
===================================================================
--- incognito/trunk/root_overlay/usr/share/applications/create-usb.desktop	2008-08-01 15:43:35 UTC (rev 16330)
+++ incognito/trunk/root_overlay/usr/share/applications/create-usb.desktop	2008-08-01 16:58:08 UTC (rev 16331)
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Comment=Create a bootable USB drive running __INCOGNITO__
-Encoding=UTF-8
-Exec=sudo /usr/sbin/create-usb
-Icon=usbpendrive_unmount
-MimeType=
-Name=Install __INCOGNITO__ to USB
-Path=
-StartupNotify=true
-Terminal=false
-TerminalOptions=
-Type=Application
-Categories=Utility;KDE;
-

Deleted: incognito/trunk/root_overlay/usr/share/applications/docs.desktop
===================================================================
--- incognito/trunk/root_overlay/usr/share/applications/docs.desktop	2008-08-01 15:43:35 UTC (rev 16330)
+++ incognito/trunk/root_overlay/usr/share/applications/docs.desktop	2008-08-01 16:58:08 UTC (rev 16331)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Icon=html
-Type=Application
-Exec=firefox /usr/share/incognito/docs.html
-Name=__INCOGNITO__ Documentation
-Comment=The __INCOGNITO__ Documentation is mainly of interest for developers and advanced users that wish to modify the system
-Categories=Qt;KDE;Utility
-Terminal=false

Deleted: incognito/trunk/root_overlay/usr/share/applications/enable-persistent-vol.desktop
===================================================================
--- incognito/trunk/root_overlay/usr/share/applications/enable-persistent-vol.desktop	2008-08-01 15:43:35 UTC (rev 16330)
+++ incognito/trunk/root_overlay/usr/share/applications/enable-persistent-vol.desktop	2008-08-01 16:58:08 UTC (rev 16331)
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Comment=Enable the option to create and use persistent home volumes during boot.
-Encoding=UTF-8
-Exec=sudo /usr/sbin/enable-persistent-vol
-GenericName=
-Icon=reload
-MimeType=
-Name=Enable persistant home volume
-Path=
-StartupNotify=true
-Terminal=false
-TerminalOptions=
-Type=Application
-Categories=Utility;KDE;

Deleted: incognito/trunk/root_overlay/usr/share/applications/walkthrough.desktop
===================================================================
--- incognito/trunk/root_overlay/usr/share/applications/walkthrough.desktop	2008-08-01 15:43:35 UTC (rev 16330)
+++ incognito/trunk/root_overlay/usr/share/applications/walkthrough.desktop	2008-08-01 16:58:08 UTC (rev 16331)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Icon=html
-Type=Application
-Exec=firefox /usr/share/incognito/walkthrough/walkthrough.html
-Name=__INCOGNITO__ Walkthrough
-Comment=The __INCOGNITO__ Walkthrough contains useful information for new users
-Categories=Qt;KDE;Utility
-Terminal=false

Added: incognito/trunk/root_overlay/var/lib/incognito-menu/applications-kmenuedit.menu
===================================================================
--- incognito/trunk/root_overlay/var/lib/incognito-menu/applications-kmenuedit.menu	                        (rev 0)
+++ incognito/trunk/root_overlay/var/lib/incognito-menu/applications-kmenuedit.menu	2008-08-01 16:58:08 UTC (rev 16331)
@@ -0,0 +1,42 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd";>
+<Menu>
+ <Layout>
+  <Merge type="menus" />
+  <Menuname>Development</Menuname>
+  <Menuname>Edutainment</Menuname>
+  <Menuname>Games</Menuname>
+  <Menuname>Graphics</Menuname>
+  <Menuname>Incognito</Menuname>
+  <Menuname>Internet</Menuname>
+  <Menuname>Multimedia</Menuname>
+  <Menuname>Office</Menuname>
+  <Menuname>Science</Menuname>
+  <Menuname>Settingsmenu</Menuname>
+  <Menuname>System</Menuname>
+  <Menuname>Utilities</Menuname>
+  <Menuname>Applications</Menuname>
+  <Merge type="files" />
+  <Filename>kde-KControl.desktop</Filename>
+  <Filename>kde-Kfind.desktop</Filename>
+  <Filename>kde-Help.desktop</Filename>
+  <Filename>kde-Home.desktop</Filename>
+ </Layout>
+ <Menu>
+  <Name>Incognito</Name>
+  <Directory>incognito.directory</Directory>
+  <NotDeleted/>
+  <Layout>
+   <Merge type="files" />
+   <Filename>enable-persistent-vol.desktop</Filename>
+   <Filename>docs.desktop</Filename>
+   <Filename>walkthrough.desktop</Filename>
+   <Filename>create-usb.desktop</Filename>
+  </Layout>
+  <Include>
+   <Filename>enable-persistent-vol.desktop</Filename>
+   <Filename>docs.desktop</Filename>
+   <Filename>walkthrough.desktop</Filename>
+   <Filename>create-usb.desktop</Filename>
+  </Include>
+ </Menu>
+</Menu>

Added: incognito/trunk/root_overlay/var/lib/incognito-menu/create-usb.desktop
===================================================================
--- incognito/trunk/root_overlay/var/lib/incognito-menu/create-usb.desktop	                        (rev 0)
+++ incognito/trunk/root_overlay/var/lib/incognito-menu/create-usb.desktop	2008-08-01 16:58:08 UTC (rev 16331)
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Comment=Create a bootable USB drive running __INCOGNITO__
+Encoding=UTF-8
+Exec=sudo /usr/sbin/create-usb
+Icon=usbpendrive_unmount
+MimeType=
+Name=Install __INCOGNITO__ to USB
+Path=
+StartupNotify=true
+Terminal=false
+TerminalOptions=
+Type=Application
+Categories=Incognito;KDE;
+

Added: incognito/trunk/root_overlay/var/lib/incognito-menu/docs.desktop
===================================================================
--- incognito/trunk/root_overlay/var/lib/incognito-menu/docs.desktop	                        (rev 0)
+++ incognito/trunk/root_overlay/var/lib/incognito-menu/docs.desktop	2008-08-01 16:58:08 UTC (rev 16331)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Icon=html
+Type=Application
+Exec=firefox /usr/share/incognito/docs.html
+Name=__INCOGNITO__ Documentation
+Comment=The __INCOGNITO__ Documentation is mainly of interest for developers and advanced users that wish to modify the system
+Categories=Incognito;KDE
+Terminal=false

Added: incognito/trunk/root_overlay/var/lib/incognito-menu/enable-persistent-vol.desktop
===================================================================
--- incognito/trunk/root_overlay/var/lib/incognito-menu/enable-persistent-vol.desktop	                        (rev 0)
+++ incognito/trunk/root_overlay/var/lib/incognito-menu/enable-persistent-vol.desktop	2008-08-01 16:58:08 UTC (rev 16331)
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Comment=Enable the option to create and use persistent home volumes during boot.
+Encoding=UTF-8
+Exec=sudo /usr/sbin/enable-persistent-vol
+GenericName=
+Icon=reload
+MimeType=
+Name=Enable persistant home volume
+Path=
+StartupNotify=true
+Terminal=false
+TerminalOptions=
+Type=Application
+Categories=Incognito;KDE;

Added: incognito/trunk/root_overlay/var/lib/incognito-menu/incognito.directory
===================================================================
--- incognito/trunk/root_overlay/var/lib/incognito-menu/incognito.directory	                        (rev 0)
+++ incognito/trunk/root_overlay/var/lib/incognito-menu/incognito.directory	2008-08-01 16:58:08 UTC (rev 16331)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Comment=
+Encoding=UTF-8
+GenericName=
+Icon=/usr/share/icons/48x48/incognito.png
+Name=Incognito
+Type=Directory

Added: incognito/trunk/root_overlay/var/lib/incognito-menu/walkthrough.desktop
===================================================================
--- incognito/trunk/root_overlay/var/lib/incognito-menu/walkthrough.desktop	                        (rev 0)
+++ incognito/trunk/root_overlay/var/lib/incognito-menu/walkthrough.desktop	2008-08-01 16:58:08 UTC (rev 16331)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Icon=html
+Type=Application
+Exec=firefox /usr/share/incognito/walkthrough/walkthrough.html
+Name=__INCOGNITO__ Walkthrough
+Comment=The __INCOGNITO__ Walkthrough contains useful information for new users
+Categories=Incognito;KDE
+Terminal=false

Modified: incognito/trunk/root_overlay/var/lib/kdesession/kickerrc
===================================================================
--- incognito/trunk/root_overlay/var/lib/kdesession/kickerrc	2008-08-01 15:43:35 UTC (rev 16330)
+++ incognito/trunk/root_overlay/var/lib/kdesession/kickerrc	2008-08-01 16:58:08 UTC (rev 16331)
@@ -26,7 +26,7 @@
 WidthForHeightHint=77
 
 [General]
-Applets2=KMenuButton_1,ServiceButton_1,ServiceButton_3,ServiceButton_2,Applet_1,Applet_2,Applet_3,Applet_4
+Applets2=KMenuButton_1,ServiceMenuButton_1,ServiceButton_1,ServiceButton_3,ServiceButton_2,Applet_1,Applet_2,Applet_3,Applet_4
 IExist=true
 Locked=true
 UntrustedApplets=
@@ -50,6 +50,10 @@
 FreeSpace2=0
 StorageId=mozilla-firefox-bin.desktop
 
+[ServiceMenuButton_1]
+FreeSpace2=0
+RelPath[$e]=Incognito/
+
 [menus]
 MenuEntryFormat=DescriptionAndName