f-spot r3812 - in trunk: . src src/UI.Dialog

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Thu Apr 10 09:03:53 2008
New Revision: 3812
URL: http://svn.gnome.org/viewvc/f-spot?rev=3812&view=rev

Log:
2008-04-10  Stephane Delcroix  <sdelcroix novell com>

	* src/main.cs: new -versions commandline arg, implement -version
	properly.
	
	* src/Makefile.am:
	* src/UI/Dialog/ExceptionDialog.cs: moved in the UI.Dialog ns


Added:
   trunk/src/UI.Dialog/ExceptionDialog.cs
      - copied, changed from r3808, /trunk/src/ExceptionDialog.cs
Removed:
   trunk/src/ExceptionDialog.cs
Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/main.cs

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Apr 10 09:03:53 2008
@@ -99,7 +99,6 @@
 	$(srcdir)/Editors/Editor.cs		\
 	$(srcdir)/Editors/SoftFocus.cs		\
 	$(srcdir)/Editors/Tilt.cs		\
-	$(srcdir)/ExceptionDialog.cs		\
 	$(srcdir)/ExportStore.cs		\
 	$(srcdir)/Extensions/ExportMenuItemNode.cs	\
 	$(srcdir)/Extensions/IExporter.cs	\
@@ -225,6 +224,7 @@
 	$(srcdir)/TipWindow.cs			\
 	$(srcdir)/UI.Dialog/AboutDialog.cs	\
 	$(srcdir)/UI.Dialog/EditExceptionDialog.cs	\
+	$(srcdir)/UI.Dialog/ExceptionDialog.cs	\
 	$(srcdir)/UI.Dialog/HigMessageDialog.cs	\
 	$(srcdir)/UI.Dialog/SelectionRatioDialog.cs	\
 	$(srcdir)/Updater.cs			\

Copied: trunk/src/UI.Dialog/ExceptionDialog.cs (from r3808, /trunk/src/ExceptionDialog.cs)
==============================================================================
--- /trunk/src/ExceptionDialog.cs	(original)
+++ trunk/src/UI.Dialog/ExceptionDialog.cs	Thu Apr 10 09:03:53 2008
@@ -7,9 +7,9 @@
 using Mono.Unix;
 using Gtk;
 
-namespace FSpot
+namespace FSpot.UI.Dialog
 {
-    public class ExceptionDialog : Dialog
+    public class ExceptionDialog : Gtk.Dialog
     {
         private AccelGroup accel_group;
         private string debugInfo;

Modified: trunk/src/main.cs
==============================================================================
--- trunk/src/main.cs	(original)
+++ trunk/src/main.cs	Thu Apr 10 09:03:53 2008
@@ -1,6 +1,7 @@
 using Gtk;
 using Gnome;
 using System;
+using System.Reflection;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -10,14 +11,36 @@
 using Mono.Addins;
 using Mono.Addins.Setup;
 using FSpot.Utils;
+using FSpot.UI.Dialog;
 
 namespace FSpot 
 {
 public class Driver {
+	static void Version ()
+	{
+		Console.WriteLine (
+			"F-Spot  {0} - (c)2003-2008, Novell Inc" + Environment.NewLine +
+			"Personal photo management for the GNOME Desktop" + Environment.NewLine, 
+			FSpot.Defines.VERSION);
+	}
+
+	static void Versions ()
+	{
+	    Version ();
+            Console.WriteLine (".NET Version: " + Environment.Version.ToString());
+            Console.WriteLine (String.Format("{0}Assembly Version Information:", Environment.NewLine));
+            
+            foreach(Assembly asm in AppDomain.CurrentDomain.GetAssemblies()) {
+		    AssemblyName name = asm.GetName();
+                    Console.WriteLine ("\t" + name.Name + " (" + name.Version.ToString () + ")");
+		}	
+	}
+
 	static void Help ()
 	{
-		Console.WriteLine ("F-Spot  {0} - (c)2003-2008, Novell Inc" + Environment.NewLine +
-			"Personal photo management for the GNOME Desktop" + Environment.NewLine + Environment.NewLine +
+		Version ();
+		Console.WriteLine ();
+		Console.WriteLine (
 			"Usage: f-spot [options] " + Environment.NewLine +
 			"Options:" + Environment.NewLine +
 		  	"-b -basedir PARAM   path to the photo database folder" + Environment.NewLine +
@@ -27,7 +50,8 @@
 			"-shutdown           shutdown a running f-spot instance" + Environment.NewLine +
 			"-slideshow          display a slideshow" + Environment.NewLine +
 			"-V -version         Display version and licensing information" + Environment.NewLine +
-			"-v -view            view file(s) or directory(ies)" +Environment.NewLine, FSpot.Defines.VERSION);
+			"-versions           Display version and dependencies informations" + Environment.NewLine +
+			"-v -view            view file(s) or directory(ies)");
 	}
 
 	static int Main (string [] args)
@@ -99,6 +123,14 @@
 				view = true;
 				uris.Add (args [++i]);
 				break;
+
+			case "-versions": case "--versions":
+				Versions ();
+				return 0;
+			
+			case "-V": case "-version": case "--version":
+				Version ();
+				return 0;
 			
 			case "--debug": case "--trace": case "--profile": case "--uninstalled": case "--gdb":
 				break;