fix for longlongHash for architectures where sizeof(long long) == sizeof(long)

[wxWidgets.git] / wxPython / samples / ide / activegrid / tool / AboutDialog.py

diff --git a/wxPython/samples/ide/activegrid/tool/AboutDialog.py b/wxPython/samples/ide/activegrid/tool/AboutDialog.py
index 53a00402cab21ea41e0ccc5da6771b40392fe66b..c86043d91dc9d39d69a7534b56e023000ae7908b 100644 (file)
--- a/wxPython/samples/ide/activegrid/tool/AboutDialog.py
+++ b/wxPython/samples/ide/activegrid/tool/AboutDialog.py
@@ -5,7 +5,7 @@
 # Author:       Morgan Hua
 #
 # Created:      3/22/05
 # Author:       Morgan Hua
 #
 # Created:      3/22/05

-# Copyright:    (c) 2005 ActiveGrid, Inc.
+# Copyright:    (c) 2005-2006 ActiveGrid, Inc.

 # CVS-ID:       $Id$
 # License:      wxWindows License
 #----------------------------------------------------------------------------
 # CVS-ID:       $Id$
 # License:      wxWindows License
 #----------------------------------------------------------------------------


@@ -30,23 +30,25 @@ licenseData = [  # add licenses for base IDE features
     ("Python 2.4", "Python Software Foundation License", "http://www.python.org/2.4/license.html"),
     ("wxPython 2.6", "wxWidgets 2 - LGPL", "http://wxwidgets.org/newlicen.htm"),
     ("wxWidgets", "wxWindows Library License 3", "http://www.wxwidgets.org/manuals/2.6.1/wx_wxlicense.html"),
     ("Python 2.4", "Python Software Foundation License", "http://www.python.org/2.4/license.html"),
     ("wxPython 2.6", "wxWidgets 2 - LGPL", "http://wxwidgets.org/newlicen.htm"),
     ("wxWidgets", "wxWindows Library License 3", "http://www.wxwidgets.org/manuals/2.6.1/wx_wxlicense.html"),

-    ("pychecker", "MetaSlash - BSD", "http://pychecker.sourceforge.net/COPYRIGHT"), 
+    ("pychecker", "MetaSlash - BSD", "http://pychecker.sourceforge.net/COPYRIGHT"),

     ("process.py", "See file", "http://starship.python.net/~tmick/"),
     ("pysvn", "Apache License, Version 2.0", "http://pysvn.tigris.org/"),
 ]
 
 if not ACTIVEGRID_BASE_IDE:    # add licenses for non-base IDE features such as database connections
     licenseData += [
     ("process.py", "See file", "http://starship.python.net/~tmick/"),
     ("pysvn", "Apache License, Version 2.0", "http://pysvn.tigris.org/"),
 ]
 
 if not ACTIVEGRID_BASE_IDE:    # add licenses for non-base IDE features such as database connections
     licenseData += [

-        ("pydb2", "LGPL", "http://sourceforge.net/projects/pydb2"), 
+        ("pydb2", "LGPL", "http://sourceforge.net/projects/pydb2"),

         ("pysqlite", "Python License (CNRI)", "http://sourceforge.net/projects/pysqlite"),
         ("pysqlite", "Python License (CNRI)", "http://sourceforge.net/projects/pysqlite"),

-        ("mysql-python", "GPL, Python License (CNRI), Zope Public License", "http://sourceforge.net/projects/mysql-python"), 
-        ("cx_Oracle", "Computronix", "http://www.computronix.com/download/License(cxOracle).txt"), 
+        ("mysql-python", "GPL, Python License (CNRI), Zope Public License", "http://sourceforge.net/projects/mysql-python"),
+        ("cx_Oracle", "Computronix", "http://www.computronix.com/download/License(cxOracle).txt"),

         ("SQLite", "Public Domain", "http://www.sqlite.org/copyright.html"),
         ("PyGreSQL", "BSD", "http://www.pygresql.org"),
         ("pyXML", "CNRI Python License", "http://sourceforge.net/softwaremap/trove_list.php?form_cat=194"),
         ("Zolera Soap Infrastructure", "Zope Public License 2.0", "http://www.zope.org/Resources/License/"),
         ("SQLite", "Public Domain", "http://www.sqlite.org/copyright.html"),
         ("PyGreSQL", "BSD", "http://www.pygresql.org"),
         ("pyXML", "CNRI Python License", "http://sourceforge.net/softwaremap/trove_list.php?form_cat=194"),
         ("Zolera Soap Infrastructure", "Zope Public License 2.0", "http://www.zope.org/Resources/License/"),

+        ("python-ldap", "Python Software Foundation License", "http://python-ldap.sourceforge.net"),

         ("Sarissa", "LGPL", "http://sourceforge.net/projects/sarissa/"),
         ("Dynarch DHTML Calendar", "LGPL", "http://www.dynarch.com/projects/calendar/"),
         ("Sarissa", "LGPL", "http://sourceforge.net/projects/sarissa/"),
         ("Dynarch DHTML Calendar", "LGPL", "http://www.dynarch.com/projects/calendar/"),

+        ("python-dateutil", "Python Software Foundation License", "http://labix.org/python-dateutil"),        

     ]
 
 if wx.Platform == '__WXMSW__':  # add Windows only licenses
     ]
 
 if wx.Platform == '__WXMSW__':  # add Windows only licenses


@@ -70,7 +72,7 @@ class AboutDialog(wx.Dialog):
         else:
             splash_bmp = getIDESplashBitmap()
 
         else:
             splash_bmp = getIDESplashBitmap()
 

-        # find version number from 
+        # find version number from

         versionFilepath = os.path.join(sysutilslib.mainModuleDir, "version.txt")
         if os.path.exists(versionFilepath):
             versionfile = open(versionFilepath, 'r')
         versionFilepath = os.path.join(sysutilslib.mainModuleDir, "version.txt")
         if os.path.exists(versionFilepath):
             versionfile = open(versionFilepath, 'r')


@@ -82,7 +84,7 @@ class AboutDialog(wx.Dialog):
 
         image = wx.StaticBitmap(aboutPage, -1, splash_bmp, (0,0), (splash_bmp.GetWidth(), splash_bmp.GetHeight()))
         sizer.Add(image, 0, wx.ALIGN_CENTER|wx.ALL, 0)
 
         image = wx.StaticBitmap(aboutPage, -1, splash_bmp, (0,0), (splash_bmp.GetWidth(), splash_bmp.GetHeight()))
         sizer.Add(image, 0, wx.ALIGN_CENTER|wx.ALL, 0)

-        sizer.Add(wx.StaticText(aboutPage, -1, wx.GetApp().GetAppName() + _("\n%s\n\nCopyright (c) 2003-2005 ActiveGrid Incorporated and Contributors.  All rights reserved.") % version), 0, wx.ALIGN_LEFT|wx.ALL, 10)
+        sizer.Add(wx.StaticText(aboutPage, -1, wx.GetApp().GetAppName() + _("\n%s\n\nCopyright (c) 2003-2006 ActiveGrid Incorporated and Contributors.  All rights reserved.") % version), 0, wx.ALIGN_LEFT|wx.ALL, 10)

         sizer.Add(wx.StaticText(aboutPage, -1, _("http://www.activegrid.com")), 0, wx.ALIGN_LEFT|wx.LEFT|wx.BOTTOM, 10)
         aboutPage.SetSizer(sizer)
         nb.AddPage(aboutPage, _("Copyright"))
         sizer.Add(wx.StaticText(aboutPage, -1, _("http://www.activegrid.com")), 0, wx.ALIGN_LEFT|wx.LEFT|wx.BOTTOM, 10)
         aboutPage.SetSizer(sizer)
         nb.AddPage(aboutPage, _("Copyright"))


@@ -90,15 +92,14 @@ class AboutDialog(wx.Dialog):
         licensePage = wx.Panel(nb, -1)
         grid = wx.grid.Grid(licensePage, -1)
         grid.CreateGrid(len(licenseData), 2)
         licensePage = wx.Panel(nb, -1)
         grid = wx.grid.Grid(licensePage, -1)
         grid.CreateGrid(len(licenseData), 2)

-        
+

         dc = wx.ClientDC(grid)
         dc.SetFont(grid.GetLabelFont())
         grid.SetColLabelValue(0, _("License"))
         grid.SetColLabelValue(1, _("URL"))
         dc = wx.ClientDC(grid)
         dc.SetFont(grid.GetLabelFont())
         grid.SetColLabelValue(0, _("License"))
         grid.SetColLabelValue(1, _("URL"))

-        w, maxHeight = dc.GetTextExtent(_("License"))
-        w, h = dc.GetTextExtent(_("URL"))
-        if h > maxHeight:
-            maxHeight = h
+        w, h1 = dc.GetTextExtent(_("License"))
+        w, h2 = dc.GetTextExtent(_("URL"))
+        maxHeight = max(h1, h2)

         grid.SetColLabelSize(maxHeight + 6)  # add a 6 pixel margin
 
         maxW = 0
         grid.SetColLabelSize(maxHeight + 6)  # add a 6 pixel margin
 
         maxW = 0


@@ -115,7 +116,7 @@ class AboutDialog(wx.Dialog):
                 grid.SetCellValue(row, 0, license)
             if url:
                 grid.SetCellValue(row, 1, url)
                 grid.SetCellValue(row, 0, license)
             if url:
                 grid.SetCellValue(row, 1, url)

-        
+

         grid.EnableEditing(False)
         grid.EnableDragGridSize(False)
         grid.EnableDragColSize(False)
         grid.EnableEditing(False)
         grid.EnableDragGridSize(False)
         grid.EnableDragColSize(False)


@@ -132,10 +133,10 @@ class AboutDialog(wx.Dialog):
 
         creditsPage = wx.Panel(nb, -1)
         sizer = wx.BoxSizer(wx.VERTICAL)
 
         creditsPage = wx.Panel(nb, -1)
         sizer = wx.BoxSizer(wx.VERTICAL)

-        sizer.Add(wx.StaticText(creditsPage, -1, _("ActiveGrid Development Team:\n\nLarry Abrahams\nLawrence Bruhmuller\nEric Chu\nBeth Fryer\nMatt Fryer\nJoel Hare\nMorgan Hua\nMatt McNulty\nPratik Mehta\nAlan Mullendore\nJeff Norton\nSimon Toens\nKevin Wang\nPeter Yared")), 0, wx.ALIGN_LEFT|wx.ALL, 10)
+        sizer.Add(wx.StaticText(creditsPage, -1, _("ActiveGrid Development Team:\n\nLarry Abrahams\nLawrence Bruhmuller\nEric Chu\nBeth Fryer\nMatt Fryer\nFrankie Fu\nJoel Hare\nMorgan Hua\nMatt McNulty\nPratik Mehta\nAlan Mullendore\nJeff Norton\nKevin Ollivier\nMatt Small\nSimon Toens\nKevin Wang\nPeter Yared\nJeremy Yun")), 0, wx.ALIGN_LEFT|wx.ALL, 10)

         creditsPage.SetSizer(sizer)
         nb.AddPage(creditsPage, _("Credits"))
         creditsPage.SetSizer(sizer)
         nb.AddPage(creditsPage, _("Credits"))

-            
+

         sizer = wx.BoxSizer(wx.VERTICAL)
         sizer.Add(nb, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
         btn = wx.Button(self, wx.ID_OK)
         sizer = wx.BoxSizer(wx.VERTICAL)
         sizer.Add(nb, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
         btn = wx.Button(self, wx.ID_OK)


@@ -145,5 +146,5 @@ class AboutDialog(wx.Dialog):
         self.Layout()
         self.Fit()
         grid.ForceRefresh()  # wxBug: Get rid of unnecessary scrollbars
         self.Layout()
         self.Fit()
         grid.ForceRefresh()  # wxBug: Get rid of unnecessary scrollbars

-        
+