linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 336
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2009-10-20 23:33:29 -0500
message:
  Application icons now install into theme search path & improved title bar app icon
added:
  icons/hicolor/16x16/apps/
  icons/hicolor/16x16/apps/linuxdcpp.png
  icons/hicolor/24x24/
  icons/hicolor/24x24/apps/
  icons/hicolor/24x24/apps/linuxdcpp.png
  icons/hicolor/48x48/
  icons/hicolor/48x48/apps/
  icons/hicolor/48x48/apps/linuxdcpp.png
modified:
  Changelog.txt
  SConstruct


--
lp:linuxdcpp
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk

Your team LinuxDC++ Team is subscribed to branch lp:linuxdcpp.
To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk/+edit-subscription.

=== modified file 'Changelog.txt'
--- Changelog.txt	2009-10-15 02:13:05 +0000
+++ Changelog.txt	2009-10-21 04:33:29 +0000
@@ -32,6 +32,8 @@
 [2009-09-22] lp#385284: Added an IP address column to the hub user list. (thanks mark)
 [2009-10-10] lp#406302: Added desktop notifications for messages and downloads. (thanks Jakh Daven)
 [2009-10-14] lp#449298: Updated package description and dependencies in Readme.
+[2009-10-20] Improved the look of the application icon in the title bar. (Steven)
+[2009-10-20] Application icons now install into theme search path. Allows for visiblity in other apps (e.g. notification daemon). (Steven)
 
 *** 1.0.3 2009-02-01 ***
 [2008-08-10] lp#256236: Fixed a crash on startup when using auto-open options.

=== modified file 'SConstruct'
--- SConstruct	2009-10-15 02:13:05 +0000
+++ SConstruct	2009-10-21 04:33:29 +0000
@@ -42,6 +42,22 @@
 	context.Result(retval)
 	return retval
 
+# Install app icons to share/icons and all others to share/linuxdcpp/icons
+def install_icons(icons_dir, env):
+	prefix = env['FAKE_ROOT'] + os.path.join(env['PREFIX'], 'share')
+
+	for root, dirs, files in os.walk(icons_dir):
+		for file in files:
+			(filename, ext) = file.rsplit('.', 1)
+
+			if (filename == APP_NAME):
+				target = os.path.join(prefix, root)
+			else:
+				target = os.path.join(prefix, APP_NAME, root)
+
+			src = os.path.join(root, file)
+			env.Alias('install', env.Install(dir = target, source = src))
+
 
 # ----------------------------------------------------------------------
 # Command-line options
@@ -263,9 +279,10 @@
 
 	glade_files = glob.glob('glade/*.glade')
 	text_files = glob.glob('*.txt')
+	prefix = env['FAKE_ROOT'] + env['PREFIX']
 
-	env.Alias('install', env.Install(dir = env['FAKE_ROOT'] + env['PREFIX'] + '/share/' + APP_NAME + '/glade', source = glade_files))
-	env.Alias('install', env.Install(dir = env['FAKE_ROOT'] + env['PREFIX'] + '/share/' + APP_NAME, source = 'icons/'))
-	env.Alias('install', env.Install(dir = env['FAKE_ROOT'] + env['PREFIX'] + '/share/doc/' + APP_NAME, source = text_files))
-	env.Alias('install', env.Install(dir = env['FAKE_ROOT'] + env['PREFIX'] + '/bin', source = APP_NAME))
+	install_icons('icons/hicolor/', env)
+	env.Alias('install', env.Install(dir = os.path.join(prefix, 'share', APP_NAME, 'glade'), source = glade_files))
+	env.Alias('install', env.Install(dir = os.path.join(prefix, 'share', 'doc', APP_NAME), source = text_files))
+	env.Alias('install', env.Install(dir = os.path.join(prefix, 'bin'), source = APP_NAME))
 

=== added directory 'icons/hicolor/16x16/apps'
=== added file 'icons/hicolor/16x16/apps/linuxdcpp.png'
Binary files icons/hicolor/16x16/apps/linuxdcpp.png	1970-01-01 00:00:00 +0000 and icons/hicolor/16x16/apps/linuxdcpp.png	2009-10-21 04:33:29 +0000 differ
=== added directory 'icons/hicolor/24x24'
=== added directory 'icons/hicolor/24x24/apps'
=== added file 'icons/hicolor/24x24/apps/linuxdcpp.png'
Binary files icons/hicolor/24x24/apps/linuxdcpp.png	1970-01-01 00:00:00 +0000 and icons/hicolor/24x24/apps/linuxdcpp.png	2009-10-21 04:33:29 +0000 differ
=== added directory 'icons/hicolor/48x48'
=== added directory 'icons/hicolor/48x48/apps'
=== added file 'icons/hicolor/48x48/apps/linuxdcpp.png'
Binary files icons/hicolor/48x48/apps/linuxdcpp.png	1970-01-01 00:00:00 +0000 and icons/hicolor/48x48/apps/linuxdcpp.png	2009-10-21 04:33:29 +0000 differ