[prev in list] [next in list] [prev in thread] [next in thread]
List: klik-devel
Subject: [klik-devel] [klikclient commit] r1277 - in trunk/client/trunk: .
From: codesite-noreply () google ! com
Date: 2008-02-29 1:14:34
Message-ID: 000e0cd229d8044741c2df5e051d025 () google ! com
[Download RAW message or body]
Author: razielmine
Date: Thu Feb 28 17:13:29 2008
New Revision: 1277
Modified:
trunk/client/trunk/debian/install
trunk/client/trunk/debian/postinst
trunk/client/trunk/debian/prerm
trunk/client/trunk/install.py
trunk/client/trunk/klikclient/lib/klik/execute.py
trunk/client/trunk/klikclient/lib/klik/gtk/about.py
trunk/client/trunk/klikclient/lib/klik/integration.py
trunk/client/trunk/klikclient/share/klik/mimelnk.cmg.desktop
trunk/client/trunk/uninstall.py
Log:
Rename icon to new mimetype
Modified: trunk/client/trunk/debian/install
==============================================================================
--- trunk/client/trunk/debian/install (original)
+++ trunk/client/trunk/debian/install Thu Feb 28 17:13:29 2008
@@ -49,8 +49,8 @@
install/cmg-mimetype.xml usr/share/klik/
install/recipe-mimetype.xml usr/share/klik/
klikclient/share/klik/mimelnk.cmg.desktop usr/share/mimelnk/application/
-install/application-x-extension-cmg.png usr/share/klik/
-install/application-x-extension-cmg.png usr/share/icons/hicolor/48x48/apps/
+install/application-x-application-cmg.png usr/share/klik/
+install/application-x-application-cmg.png usr/share/icons/hicolor/48x48/apps/
install/klik.desktop usr/share/klik/
install/klik.desktop usr/share/applnk/.hidden/
install/kde/klik.protocol usr/share/services/
Modified: trunk/client/trunk/debian/postinst
==============================================================================
--- trunk/client/trunk/debian/postinst (original)
+++ trunk/client/trunk/debian/postinst Thu Feb 28 17:13:29 2008
@@ -19,7 +19,7 @@
# done
# fi
[ -x "`which xdg-mime`" ] && xdg-mime install --novendor
/usr/share/klik/cmg-mimetype.xml >/dev/null && xdg-mime install
--novendor /usr/share/klik/recipe-mimetype.xml >/dev/null
- [ -x "`which xdg-icon-resource`" ] && xdg-icon-resource install
--novendor --size 48 /usr/share/klik/application-x-extension-cmg.png >/dev/null
+ [ -x "`which xdg-icon-resource`" ] && xdg-icon-resource install
--novendor --size 48 /usr/share/klik/application-x-application-cmg.png >/dev/null
[ -x "`which xdg-desktop-menu`" ] && xdg-desktop-menu install
--novendor /usr/share/klik/klik.desktop >/dev/null
# lintian says this is useless
# [ -e /usr/lib/kde3 ] && ldconfig -n /usr/lib/kde3 >/dev/null
Modified: trunk/client/trunk/debian/prerm
==============================================================================
--- trunk/client/trunk/debian/prerm (original)
+++ trunk/client/trunk/debian/prerm Thu Feb 28 17:13:29 2008
@@ -7,7 +7,7 @@
case "$1" in
remove|deconfigure)
[ -x "`which xdg-mime`" ] && xdg-mime uninstall --novendor
/usr/share/klik/cmg-mimetype.xml >/dev/null
- [ -x "`which xdg-icon-resource`" ] && xdg-icon-resource
uninstall --novendor --size 48
/usr/share/klik/application-x-extension-cmg.png >/dev/null
+ [ -x "`which xdg-icon-resource`" ] && xdg-icon-resource
uninstall --novendor --size 48
/usr/share/klik/application-x-application-cmg.png >/dev/null
[ -x "`which xdg-desktop-menu`" ] && xdg-desktop-menu
uninstall --novendor /usr/share/klik/klik.desktop >/dev/null
# lintian says gconftools must go
if [ -x "`which gconftool-2 2>/dev/null`" ]; then
Modified: trunk/client/trunk/install.py
==============================================================================
--- trunk/client/trunk/install.py (original)
+++ trunk/client/trunk/install.py Thu Feb 28 17:13:29 2008
@@ -204,7 +204,7 @@
print ""
print "Register file type icon (.cmg) with system ..."
cmg_icon = os.path.join(klik_files_path , "install", "application-x-application-cmg.png")
-xdg.mime_icon_install( "48", cmg_icon, "application-x-extension-cmg")
+xdg.mime_icon_install( "48", cmg_icon, "application-x-application-cmg")
# RECIPIE MIMETYPE
cmg_mimetype = os.path.join(klik_files_path , "install", "recipe-mimetype.xml")
Modified: trunk/client/trunk/klikclient/lib/klik/execute.py
==============================================================================
--- trunk/client/trunk/klikclient/lib/klik/execute.py (original)
+++ trunk/client/trunk/klikclient/lib/klik/execute.py Thu Feb 28
17:13:29 2008
@@ -77,7 +77,7 @@
# Check for sandbox
if cmg.sandbox.jail_type != "none":
- self.klik.notify.show( "Application is in Jail" ,
cmg.sandbox.jail_path , "application-x-extension-cmg" )
+ self.klik.notify.show( "Application is in Jail" ,
cmg.sandbox.jail_path , "application-x-application-cmg" )
self.mount_cmg(cmg, True, reusable_mount_point)
Modified: trunk/client/trunk/klikclient/lib/klik/gtk/about.py
==============================================================================
--- trunk/client/trunk/klikclient/lib/klik/gtk/about.py (original)
+++ trunk/client/trunk/klikclient/lib/klik/gtk/about.py Thu Feb 28
17:13:29 2008
@@ -34,7 +34,7 @@
gtk.about_dialog_set_url_hook(self.on_url, None)
dlg.set_version(self.klik.settings.version) # fixme (get this from
proper location)
dlg.set_name("klik")
- #icon =
gtk.icon_theme_get_default().load_icon("application-x-extension-cmg",
48, 0)
+ #icon =
gtk.icon_theme_get_default().load_icon("application-x-application-cmg",
48, 0)
icon =
gtk.gdk.pixbuf_new_from_file(os.path.join(self.klik.sys_path ,
os.pardir, "share", "klik", "klik-window.png")) # fixme, use gtk.window_set_default_icon_list()
dlg.set_logo(icon)
dlg.set_authors(self.klik.settings.authors)
Modified: trunk/client/trunk/klikclient/lib/klik/integration.py
==============================================================================
--- trunk/client/trunk/klikclient/lib/klik/integration.py (original)
+++ trunk/client/trunk/klikclient/lib/klik/integration.py Thu Feb 28
17:13:29 2008
@@ -270,7 +270,7 @@
do.set( "Icon", package_id )
else:
# No valid icon for this entry, fallback to klik themed icon
- do.set( "Icon", "application-x-extension-cmg" )
+ do.set( "Icon", "application-x-application-cmg" )
# Write .desktop file
temp_desktop_path = os.path.join( build_path, package_id
+ ".desktop" )
@@ -310,14 +310,14 @@
- def notify_event(self, message, applications, notify_icon="application-x-extension-cmg"):
+ def notify_event(self, message, applications, notify_icon="application-x-application-cmg"):
if applications and self.base.settings.application_folder_notify:
n_apps = len(applications)
applications = list(applications)
# If more than one package need notification, force default
# icon instead of any package-specific icon
if n_apps > 1:
- notify_icon = "application-x-extension-cmg"
+ notify_icon = "application-x-application-cmg"
# Limit number of displaied items
if n_apps > self.max_items_to_notify:
applications = applications[0:self.max_items_to_notify]
Modified: trunk/client/trunk/klikclient/share/klik/mimelnk.cmg.desktop
==============================================================================
--- trunk/client/trunk/klikclient/share/klik/mimelnk.cmg.desktop (original)
+++ trunk/client/trunk/klikclient/share/klik/mimelnk.cmg.desktop Thu
Feb 28 17:13:29 2008
@@ -4,5 +4,5 @@
MimeType=application/x-extension-cmg
Patterns=*.cmg
Type=MimeType
-Icon=application-x-extension-cmg
+Icon=application-x-application-cmg
Modified: trunk/client/trunk/uninstall.py
==============================================================================
--- trunk/client/trunk/uninstall.py (original)
+++ trunk/client/trunk/uninstall.py Thu Feb 28 17:13:29 2008
@@ -85,8 +85,8 @@
#Default icon for mimetype
print "Removing file type icon (.cmg) from system ..."
-cmg_icon = os.path.join(klik_files_path , "install", "application-x-extension-cmg.png")
-xdg.mime_icon_uninstall( "48", cmg_icon, "application-x-extension-cmg")
+cmg_icon = os.path.join(klik_files_path , "install", "application-x-application-cmg.png")
+xdg.mime_icon_uninstall( "48", cmg_icon, "application-x-application-cmg")
# RECIPIE MIMETYPE
#recipe_mimetype = os.path.join(sys.path[0] , "install", "gnome", "cmg-mimetype.xml")
_______________________________________________
klik-devel mailing list
klik-devel@kde.org
https://mail.kde.org/mailman/listinfo/klik-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic