[Monodevelop-patches-list] r1411 - in trunk/MonoDevelop/src/Main/Base: . Gui/Dialogs

[commit-watcher at mono-cvs.ximian.com]

Author: jluke
Date: 2004-04-07 22:20:31 -0400 (Wed, 07 Apr 2004)
New Revision: 1411

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs
Log:
2004-04-07  John Luke  <jluke at cfl.rr.com>
                   
    * Gui/Dialogs/CommonAboutDialog.cs:
    * Gui/Dialogs/SharpDevelopAboutPanels.cs: rearrange the copyright, license,
    sponsorship, and version information.  Add back info about SharpDevelop and
    AlphaSierraPapa

and yes they shouldn't be aligned in the center but I can't seem to fix it



Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-08 02:12:53 UTC (rev 1410)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-08 02:20:31 UTC (rev 1411)
@@ -1,3 +1,10 @@
+2004-04-07  John Luke  <jluke at cfl.rr.com>
+
+	* Gui/Dialogs/CommonAboutDialog.cs:
+	* Gui/Dialogs/SharpDevelopAboutPanels.cs: rearrange the copyright, license,
+	sponsorship, and version information.  Add back info about SharpDevelop and
+	AlphaSierraPapa
+
 2004-04-07  Todd Berman  <tberman at sevenl.net>
 
 	* Commands/ProjectBrowserCommands/FolderNodeCommands: Incorporate bug

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs	2004-04-08 02:12:53 UTC (rev 1410)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs	2004-04-08 02:20:31 UTC (rev 1411)
@@ -131,9 +131,6 @@
 			aboutPictureScrollBox = new ScrollBox ();
 		
 			this.VBox.PackStart (aboutPictureScrollBox);
-			Label copyright = new Label ("(c) 2000-2003 by icsharpcode.net");
-			copyright.Justify = Justification.Left;
-			this.VBox.PackStart (copyright, false, true, 0);
 		
 			Notebook nb = new Notebook ();
 			nb.SetSizeRequest (400, 280);

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs	2004-04-08 02:12:53 UTC (rev 1410)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs	2004-04-08 02:20:31 UTC (rev 1411)
@@ -23,11 +23,11 @@
 	public class AboutMonoDevelopTabPage : VBox
 	{
 		static GLib.GType gtype;
-		Label      buildLabel   = new Label ();
-		Label    buildTextBox = new Label ();
 		Label      versionLabel   = new Label ();
 		Label    versionTextBox = new Label ();
 		Label      sponsorLabel   = new Label ();
+		Label      licenseLabel   = new Label ();
+		Label      copyrightLabel   = new Label ();
 		
 		public static new GLib.GType GType
 		{
@@ -41,33 +41,21 @@
 		
 		public AboutMonoDevelopTabPage() : base (GType)
 		{
-			HBox hbox = new HBox (false, 0);
 			Version v = Assembly.GetEntryAssembly().GetName().Version;
 			versionTextBox.Text = v.Major + "." + v.Minor;
-			buildTextBox.Text   = v.Revision + "." + v.Build;
+			versionLabel.Markup = String.Format ("<b>{0}</b>", GettextCatalog.GetString("Version"));
 			
-			ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
-			versionLabel.Text = GettextCatalog.GetString("Version");
-			
-			//versionLabel.TabIndex = 1;
-			hbox.PackStart (versionLabel, false, false, 10);
-			
-			//versionTextBox.TabIndex = 4;
-			hbox.PackStart (versionTextBox, false, false, 10);
-			
-			buildLabel.Text = GettextCatalog.GetString("Build");
-			//buildLabel.TabIndex = 2;
-			hbox.PackStart (buildLabel, false, false, 10);
-			
-			//buildTextBox.TabIndex = 3;
-			hbox.PackStart (buildTextBox, false, false, 10);
-			this.PackStart (hbox, false, false, 5);
-			
-			sponsorLabel.Text = GettextCatalog.GetString ("Released under the GNU General Public license.");
-				               // "Sponsored by AlphaSierraPapa\n" +
-			                   // "                   http://www.AlphaSierraPapa.com";
-			//sponsorLabel.TabIndex = 8;
-			this.PackStart (sponsorLabel, false, false, 5);
+			//FIXME why do they align in the center always
+			licenseLabel.Markup = String.Format ("<b>License</b>\n    {0}", GettextCatalog.GetString ("Released under the GNU General Public license."));
+			// FIXME should this be translated
+			sponsorLabel.Markup = "<b>Sponsors</b>\n    SharpDevelop is sponsored by AlphaSierraPapa\n    <span foreground=\"blue\">http://www.AlphaSierraPapa.com</span>\n    <span foreground=\"blue\">http://icsharpcode.net/opensource/sd</span>";
+			copyrightLabel.Markup = "<b>Copyright</b>\n    (c) 2000-2003 by icsharpcode.net\n    (c) 2004 by MonoDevelop contributors";
+
+			this.PackStart (versionLabel, false, true, 0);
+			this.PackStart (versionTextBox, false, true, 0);
+			this.PackStart (licenseLabel, false, true, 5);
+			this.PackStart (copyrightLabel, false, true, 5);
+			this.PackStart (sponsorLabel, false, true, 5);
 			this.ShowAll ();
 		}
 	}