f-spot r3684 - in trunk: . src src/UI.Dialog
- From: sdelcroix svn gnome org
- To: svn-commits-list gnome org
- Subject: f-spot r3684 - in trunk: . src src/UI.Dialog
- Date: Fri, 15 Feb 2008 14:41:30 +0000 (GMT)
Author: sdelcroix
Date: Fri Feb 15 14:41:30 2008
New Revision: 3684
URL: http://svn.gnome.org/viewvc/f-spot?rev=3684&view=rev
Log:
2008-02-15 Lorenzo Milesi <maxxer yetopen it>
* src/Makefile.am:
* src/UI.Dialog/AboutDialog.cs: use COPYING file as text for the
license info in the about dialog.
Modified:
trunk/ChangeLog
trunk/src/Makefile.am
trunk/src/UI.Dialog/AboutDialog.cs
trunk/src/f-spot.glade
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Fri Feb 15 14:41:30 2008
@@ -325,6 +325,7 @@
F_SPOT_RESOURCES = \
$(F_SPOT_DISTRESOURCES) \
+ $(top_srcdir)/COPYING \
$(top_srcdir)/icons/f-spot-not.png \
$(top_srcdir)/icons/f-spot-logo.svg
Modified: trunk/src/UI.Dialog/AboutDialog.cs
==============================================================================
--- trunk/src/UI.Dialog/AboutDialog.cs (original)
+++ trunk/src/UI.Dialog/AboutDialog.cs Fri Feb 15 14:41:30 2008
@@ -8,6 +8,7 @@
*/
using System;
+using System.IO;
using Mono.Unix;
namespace FSpot.UI.Dialog
@@ -73,7 +74,18 @@
"Miguel de Icaza",
"Stephane Delcroix",
};
- License = "GPL v2";
+ //Read license from COPYING
+ try {
+ System.Reflection.Assembly assembly = System.Reflection.Assembly.GetCallingAssembly ();
+ using (Stream s = assembly.GetManifestResourceStream ("COPYING")) {
+ StreamReader reader = new StreamReader (s);
+ License = reader.ReadToEnd ();
+ s.Close ();
+ }
+ } catch (Exception e) {
+ Console.WriteLine (e);
+ License = "GPL v2";
+ }
Logo = PixbufUtils.LoadFromAssembly ("f-spot-logo.svg");
#if !GTK_2_11
Name = "F-Spot";
Modified: trunk/src/f-spot.glade
==============================================================================
--- trunk/src/f-spot.glade (original)
+++ trunk/src/f-spot.glade Fri Feb 15 14:41:30 2008
@@ -7602,8 +7602,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="tooltip" translatable="yes">Create a mail with the selected photos (possible resized) attached</property>
- <property name="label" translatable="yes">Create Mail</property>
+ <property name="tooltip" translatable="yes">Create a mail with the selected photos (possibly resized) attached</property>
+ <property name="label" translatable="yes">_Create Mail</property>
<property name="use_underline">True</property>
<property name="response_id">-5</property>
</widget>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]