Ticket #4679: sourceURL-aboutsystem.patch

src/apps/aboutsystem/AboutSystem.cpp

@@ -126 +126 @@
             void            AddCopyrightEntry(const char* name,
                                 const char* text,
                                 const StringVector& licenses,
+                                const StringVector& sources,
                                 const char* url);
             void            AddCopyrightEntry(const char* name,
                                 const char* text, const char* url = NULL);
@@ -532 +533 @@
 
 
 void
-AboutView::AddCopyrightEntry(const char *name, const char *text,
+AboutView::AddCopyrightEntry(const char *name, const char *text, 
     const char *url)
 {
-    AddCopyrightEntry(name, text, StringVector(), url);
+    AddCopyrightEntry(name, text, StringVector(), StringVector(), url);
 }
 
 
 void
 AboutView::AddCopyrightEntry(const char *name, const char *text,
-    const StringVector& licenses, const char *url)
+    const StringVector& licenses, const StringVector& sources, const char *url)
 {
     BFont font(be_bold_font);
     //font.SetSize(be_bold_font->Size());
@@ -577 +578 @@
         fCreditsView->Insert("\n");
     }
 
+    if (sources.CountStrings() > 0) {
+        if (sources.CountStrings() > 1)
+            fCreditsView->Insert("Source Code: ");
+        else
+            fCreditsView->Insert("Source Code: ");
+
+        for (int32 i = 0; i < sources.CountStrings(); i++) {
+            const char* source = sources.StringAt(i);
+
+            if (i > 0)
+                fCreditsView->Insert(", ");
+
+            // TODO : what to do here?
+            fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kLinkBlue);
+            fCreditsView->InsertHyperText(source, new URLAction(source));
+        }
+
+        fCreditsView->Insert("\n");
+    }
+
     if (url) {
         fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kLinkBlue);
         fCreditsView->InsertHyperText(url, new URLAction(url));
@@ -911 +932 @@
         "Bourne Again Shell.\n"
         COPYRIGHT_STRING "The Free Software Foundation.",
         StringVector("GNU LGPL v2.1", "GNU GPL v2", "GNU GPL v3", NULL),
+        StringVector(),
         "http://www.gnu.org");
 
     // FreeBSD copyrights
@@ -1303 +1325 @@
             text << "\n" << package->CopyrightAt(i);
 
         AddCopyrightEntry(package->PackageName(), text.String(),
-            package->Licenses(), package->URL());
+            package->Licenses(), package->Sources(), package->URL());
     }
 }
 

src/apps/aboutsystem/Utilities.h

@@ -67 +67 @@
             PackageCredit&      SetCopyright(const char* copyright);
             PackageCredit&      SetLicenses(const char* license,...);
             PackageCredit&      SetLicense(const char* license);
+            PackageCredit&      SetSources(const char* source,...);
+            PackageCredit&      SetSource(const char* source);
             PackageCredit&      SetURL(const char* url);
 
             const char*         PackageName() const;
@@ -79 +81 @@
             int32               CountLicenses() const;
             const char*         LicenseAt(int32 index) const;
 
+            const StringVector& Sources() const;
+            int32               CountSources() const;
+            const char*         SourceAt(int32 index) const;
+
             const char*         URL() const;
 
 private:
@@ -88 +94 @@
             BString             fPackageName;
             StringVector        fCopyrights;
             StringVector        fLicenses;
+            StringVector        fSources;
             BString             fURL;
 };
 

src/apps/aboutsystem/Utilities.cpp

@@ -198 +198 @@
 {
     const char* package;
     const char* copyright;
+    const char* source;
     const char* url;
 
     // package and copyright are mandatory
@@ -213 +214 @@
     fPackageName = package;
     fCopyrights.SetTo(packageDescription, "Copyright", COPYRIGHT_STRING);
     fLicenses.SetTo(packageDescription, "License");
+    fSources.SetTo(packageDescription, "SourceURL");
     fURL = url;
 }
 
@@ -222 +224 @@
     fPackageName(other.fPackageName),
     fCopyrights(other.fCopyrights),
     fLicenses(other.fLicenses),
+    fSources(other.fSources),
     fURL(other.fURL)
 {
 }
@@ -249 +252 @@
 
     // Scan the copyrights for year numbers and let the greater one win.
     return _MaxCopyrightYear() > other._MaxCopyrightYear();
+    
+    // TODO: Do we prefer credits that provide source code?
 }
 
 
@@ -291 +296 @@
 
 
 PackageCredit&
+PackageCredit::SetSources(const char* source,...)
+{
+    va_list list;
+    va_start(list, source);
+    fSources.SetTo(source, list);
+    va_end(list);
+
+    return *this;
+}
+
+
+PackageCredit&
+PackageCredit::SetSource(const char* source)
+{
+    return SetSources(source, NULL);
+}
+
+
+PackageCredit&
 PackageCredit::SetURL(const char* url)
 {
     fURL = url;
@@ -348 +372 @@
 }
 
 
+const StringVector&
+PackageCredit::Sources() const
+{
+    return fSources;
+}
+
+
+int32
+PackageCredit::CountSources() const
+{
+    return fSources.CountStrings();
+}
+
+
 const char*
+PackageCredit::SourceAt(int32 index) const
+{
+    return fSources.StringAt(index);
+}
+
+
+const char*
 PackageCredit::URL() const
 {
     return fURL.Length() > 0 ? fURL.String() : NULL;