June 2008 - Wine-commits - list.winehq.org

Alexander Nicolaysen Sørnes : browse apps: Add support for filtering by license
by Chris Morgan 14 Jun '08

14 Jun '08

Module: appdb Branch: master Commit: 0a305197fd2f4ee0e7cf35525f8f9ab9c232edc2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0a305197fd2f4ee0e7cf3552… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jun 13 21:28:08 2008 +0200 browse apps: Add support for filtering by license --- include/application.php | 5 ++++- include/version.php | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/include/application.php b/include/application.php index aa49a9f..64f3cc6 100644 --- a/include/application.php +++ b/include/application.php @@ -1020,8 +1020,11 @@ class Application { $aCatIds[] = $oCategory->objectGetId(); } + $aLicenses = version::getLicenses(); + $oFilter->AddFilterInfo('appVersion.rating', 'Rating', array(FILTER_EQUALS, FILTER_LESS_THAN, FILTER_GREATER_THAN), FILTER_VALUES_ENUM, array('Platinum', 'Gold', 'Silver', 'Bronze', 'Garbage')); $oFilter->AddFilterInfo('appFamily.catId', 'Category', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aCatIds, $aCatNames); + $oFilter->AddFilterInfo('appVersion.license', 'License', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aLicenses); return $oFilter; } @@ -1044,7 +1047,7 @@ class Application { $oTableRow->AddSortableTextCell('Submission Date', 'submitTime'); /* Only show submitter when processing queued entries */ - $oTableRow->AddTextCell('Submitter'); + $oTableRow->AddTextCell('Submitter'); $oTableRow->AddSortableTextCell('Vendor', 'vendorName'); $oTableRow->AddSortableTextCell('Application', 'appName'); } diff --git a/include/version.php b/include/version.php index 04affed..be905e2 100644 --- a/include/version.php +++ b/include/version.php @@ -1368,6 +1368,13 @@ class version { return $oTable->GetString(); } + /* Returns an array containg the different software licences */ + public function getLicenses() + { + return array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREETOUSE, + LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE); + } + // returns a string containing the html for a selection list public function makeLicenseList($sLicense = NULL) { @@ -1376,8 +1383,7 @@ class version { $sReturn = "<select name=\"sLicense\">\n"; $sReturn .= "<option value=\"\">Choose . . .</option>\n"; - $aLicense = array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREETOUSE, - LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE); + $aLicense = version::getLicences(); $iMax = count($aLicense); for($i = 0; $i < $iMax; $i++)

1 0

Alexander Nicolaysen Sørnes : filter_ui: Improve display of filters with only one operator
by Chris Morgan 14 Jun '08

14 Jun '08

Module: appdb Branch: master Commit: 7a138bd2c2ad80cb75f7b2cb2bb0d8514e08fbb5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7a138bd2c2ad80cb75f7b2cb… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jun 13 23:18:07 2008 +0200 filter_ui: Improve display of filters with only one operator --- include/db_filter_ui.php | 49 +++++++++++++++++++++++++++++---------------- 1 files changed, 31 insertions(+), 18 deletions(-) diff --git a/include/db_filter_ui.php b/include/db_filter_ui.php index d928b84..ed2f270 100644 --- a/include/db_filter_ui.php +++ b/include/db_filter_ui.php @@ -165,32 +165,45 @@ class FilterInterface $oColumn = $this->aFilterInfo[$oFilter->getColumn()]; $sId = ($iId == -1) ? '' : $iId; - $shEditor = $oColumn->getDisplayName(); + $shEditor = $oColumn->getDisplayName().' '; - $shEditor .= " <select name='i{$sColumn}Op$sId'>"; + $aTypes = $oColumn->getTypes(); - if($iId == -1) + /* It doesn't make sense to show a dropdown menu of choices if there is only one + If the filter is already active then there are more than one; one to remove */ + if($iId == -1 && sizeof($aTypes) == 1) { - $sText = 'select'; - $sSel = " selected='selected'"; + echo "<input type=\"hidden\" name=\"i{$sColumn}Op$sId\" value=\"{$aTypes[0]}\" />"; + + /* Printing 'equal to' sounds weird if it is the only choice */ + if($aTypes[0] != FILTER_EQUALS) + $shEditor .= $oColumn->getOpName($aTypes[0]); } else { - $sSel = ''; - $sText = 'remove'; - } - - $shEditor .= "<option value='0'$sSel>-- $sText --</option>"; + $shEditor .= "<select name='i{$sColumn}Op$sId'>"; - foreach($oColumn->getTypes() as $iType) - { - if($oFilter->getOperatorId() == $iType) + if($iId == -1) + { + $sText = 'select'; $sSel = " selected='selected'"; - else + } else + { $sSel = ''; - $shEditor .= "<option value='$iType'$sSel>".$oColumn->getOpName($iType).'</option> '; - } + $sText = 'remove'; + } + + $shEditor .= "<option value='0'$sSel>-- $sText --</option>"; - $shEditor .= '</select> '; + foreach($aTypes as $iType) + { + if($oFilter->getOperatorId() == $iType) + $sSel = " selected='selected'"; + else + $sSel = ''; + $shEditor .= "<option value='$iType'$sSel>".$oColumn->getOpName($iType).'</option> '; + } + $shEditor .= '</select> '; + } switch($oColumn->getValueType()) { @@ -344,7 +357,7 @@ class FilterInterface $sData = $aClean["s{$sColumn}Data"]; $iOp = $aClean["i{$sColumn}Op"]; - if($iOp) + if($iOp && $sData) { $oFilter = new Filter($oOption->getColumn(), $iOp, $sData); $aReturn[] = $oFilter;

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/source /git/website
by Jeremy Newman 13 Jun '08

13 Jun '08

Module: website Branch: master Commit: 48bb9f7809243185d99ca14bb5aebcabd6803f82 URL: http://source.winehq.org/git/website.git/?a=commit;h=48bb9f7809243185d99ca1… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Jun 13 15:33:32 2008 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Jeremy Newman : rewrite of the menu system to allow for translations of the sidebar menu
by Jeremy Newman 13 Jun '08

13 Jun '08

Module: website Branch: master Commit: 6986c16b671f1067cb3697a2c2badf26aa794d38 URL: http://source.winehq.org/git/website.git/?a=commit;h=6986c16b671f1067cb3697… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Jun 13 15:30:55 2008 -0500 rewrite of the menu system to allow for translations of the sidebar menu --- include/XMLToArray.php | 96 ++++++++++++ include/config.php | 48 ------ include/html.php | 15 +- include/incl.php | 3 +- include/menu.php | 192 ++++++++++++++++++++++++ include/sidebar.php | 86 ----------- include/themes/winehq/content.template | 4 - include/themes/winehq/menu.template | 33 +---- include/themes/winehq/menu_item_row.template | 10 ++ include/themes/winehq/menu_search_row.template | 19 +++ include/themes/winehq/menu_spacer_row.template | 7 + include/themes/winehq/menu_top_row.template | 17 ++ templates/en/menu.xml | 54 +++++++ templates/en/search.template | 16 -- templates/es/menu.xml | 54 +++++++ templates/es/search.template | 16 -- winehq_styles.css | 3 +- 17 files changed, 466 insertions(+), 207 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=6986c16b671f1067cb…

1 0

Alexandre Julliard : Wine release 1.0-rc5
by Alexandre Julliard 13 Jun '08

13 Jun '08

Module: website Branch: master Commit: e1a32379078163e5cdf453cbc489ad34201e6d9f URL: http://source.winehq.org/git/website.git/?a=commit;h=e1a32379078163e5cdf453… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 17:32:06 2008 +0200 Wine release 1.0-rc5 --- news/en/2008061301.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/en/2008061301.xml b/news/en/2008061301.xml new file mode 100644 index 0000000..d676ba9 --- /dev/null +++ b/news/en/2008061301.xml @@ -0,0 +1,13 @@ +<news> +<date>June 13, 2008</date> +<title>Wine 1.0-rc5 Released</title> +<body> + The Wine development release 1.0-rc5 is now available. + This should be the last release candidate for Wine 1.0, please give it a good testing. + <a href="?announce=1.0-rc5">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.0-rc5.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="/site/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : wine_release: Point to the git shortlog instead of the diffstat file.
by Alexandre Julliard 13 Jun '08

13 Jun '08

Module: website Branch: master Commit: dd0992d9ff81c31d200cf9c3b681f9c4e896fb61 URL: http://source.winehq.org/git/website.git/?a=commit;h=dd0992d9ff81c31d200cf9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 16:58:29 2008 +0200 wine_release: Point to the git shortlog instead of the diffstat file. --- templates/en/wine_release.template | 4 ++-- templates/es/wine_release.template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/en/wine_release.template b/templates/en/wine_release.template index 6d27d4d..d19e403 100644 --- a/templates/en/wine_release.template +++ b/templates/en/wine_release.template @@ -1,5 +1,5 @@ -<a href="?announce=latest">Wine {$snapshot_date}</a> +<a href="?announce={$snapshot_date}">Wine {$snapshot_date}</a> - (<a href="http://source.winehq.org/ds{$snapshot_date}.txt">diff:s</a>) + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$snapsho…">shortlog</a>) diff --git a/templates/es/wine_release.template b/templates/es/wine_release.template index 6d27d4d..d19e403 100644 --- a/templates/es/wine_release.template +++ b/templates/es/wine_release.template @@ -1,5 +1,5 @@ -<a href="?announce=latest">Wine {$snapshot_date}</a> +<a href="?announce={$snapshot_date}">Wine {$snapshot_date}</a> - (<a href="http://source.winehq.org/ds{$snapshot_date}.txt">diff:s</a>) + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$snapsho…">shortlog</a>)

1 0

Alexandre Julliard : Release 1.0-rc5.
by Alexandre Julliard 13 Jun '08

13 Jun '08

Module: wine Branch: master Commit: 062d61a5a4ba2d7972a0011387ceda64c79dd4e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=062d61a5a4ba2d7972a001138… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 17:15:29 2008 +0200 Release 1.0-rc5. --- ANNOUNCE | 428 +++++++++++++++------------------- VERSION | 2 +- configure | 18 +- documentation/ChangeLog.BETA | 536 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 738 insertions(+), 246 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=062d61a5a4ba2d7972a00…

1 0

Tag wine-1.0-rc5 : Alexandre Julliard : Release 1.0-rc5
by Alexandre Julliard 13 Jun '08

13 Jun '08

Module: wine Branch: refs/tags/wine-1.0-rc5 Tag: 316c569ad23d620d8ed21310eef1aed96af6f3c6 URL: http://source.winehq.org/git/wine.git/?a=tag;h=316c569ad23d620d8ed21310eef1… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 17:15:29 2008 +0200 Release 1.0-rc5

1 0

Alexandre Julliard : wine_release: Get rid of the diffstat generation.
by Alexandre Julliard 13 Jun '08

13 Jun '08

Module: tools Branch: master Commit: fa34c3f34d7a67154dede12166b1c1172b576afc URL: http://source.winehq.org/git/tools.git/?a=commit;h=fa34c3f34d7a67154dede121… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 16:59:33 2008 +0200 wine_release: Get rid of the diffstat generation. --- wine_release | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/wine_release b/wine_release index a9d230f..c93b863 100755 --- a/wine_release +++ b/wine_release @@ -3,19 +3,18 @@ # This script is ran after a new release of Wine. It updates the website # and FTP for the new wine release. -# usage: wine_release <old version> <new version> +# usage: wine_release <new version> set -e umask 002 -if [ $# -lt 2 ] +if [ $# -lt 1 ] then - echo "Usage: $0 oldver newver" + echo "Usage: $0 version" exit 1 fi -oldver=$1 -version=$2 +version=$1 website_dir="/home/winehq/opt/website" templates_dir=$website_dir/templates @@ -78,9 +77,6 @@ do nroff -man $f | ../bin/man2html --pgsize=100000 | $tools_dir/html2template -o $name.template && mv -f $name.template $templates_dir/en/docs/$name.template done -rm -f ../ds$version.txt -git diff -M --stat wine-$oldver wine-$version >../ds$version.txt - make htmlpages && rm -rf ../WineAPI && mv documentation/html ../WineAPI # Wine API Stats

1 0

Alexandre Julliard : update-winehq: Use more of the announcement text as news item instead of overriding it.
by Alexandre Julliard 13 Jun '08

13 Jun '08

Module: tools Branch: master Commit: aa5b65ebc749ca693994309cc6d7b2922be2f834 URL: http://source.winehq.org/git/tools.git/?a=commit;h=aa5b65ebc749ca693994309c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 16:41:44 2008 +0200 update-winehq: Use more of the announcement text as news item instead of overriding it. Fix wrapping in the what's changed list. Make links clickable. --- update-winehq | 81 +++++++++++++++++++++++++++++++++----------------------- 1 files changed, 48 insertions(+), 33 deletions(-) diff --git a/update-winehq b/update-winehq index 183f215..b5eef47 100755 --- a/update-winehq +++ b/update-winehq @@ -9,6 +9,9 @@ # Must be run from the top-level dir of a git checkout of the website module # +use strict; +use open ':utf8'; + sub xml_escape($) { my $str = shift; @@ -17,42 +20,69 @@ sub xml_escape($) $str =~ s/>/>/g; my @chars = unpack "U*", $str; $str = join "", map { ($_ > 127) ? sprintf "&#%u;", $_ : chr($_); } @chars; + $str =~ s/(http:\/\/\S+)/<a href=\"$1\">$1<\/a>/g; return $str; } my $rel; -my $changes = "\n"; +my @text; -die "Not in lostwages dir?" unless -d "news"; +die "Not in website dir?" unless -d "news/en"; system("git", "pull") == 0 or die "git pull failed"; # Parse the ANNOUNCE file open ANNOUNCE, $ARGV[0] || "ANNOUNCE" or die "cannot open ANNOUNCE"; my $whats_new = 0; +my $first = 1; + +push @text, "<body>\n"; + while (<ANNOUNCE>) { chomp; - if (/^This is release (\S*) /) - { - $rel = $1; - next; - } - if (/^What's new in this release/) - { - $whats_new = 1; - next; - } - if ($whats_new && /^ *- (.*)$/) + if (!$whats_new) { - $changes .= "<li>" . xml_escape($1) . "</li>\n"; - next; + if (!$rel && /release (\S*) /) + { + $rel = $1; + } + if (/^What's new in this release/) + { + $whats_new = 1; + push @text, " <a href=\"?announce=$rel\">What's new</a> in this release:"; + next; + } + if (/^\s*$/) + { + push @text, "\n"; + next; + } + last if (/^The source is available/); + last if (/^--------------------/); + push @text, " " . xml_escape($_); } - if ($whats_new && /^\s*$/) + else { - last; + if (/^ *- (.*)$/) + { + push @text, ($first ? "\n<ul>\n <li>" : "</li>\n <li>") . xml_escape($1); + $first = 0; + next; + } + if (/^\s*$/) + { + push @text, "</li>\n</ul>\n"; + $whats_new = 0; + next; + } + push @text, " " . xml_escape($_); } } + +push @text, "The source is <a href=\"http://prdownloads.sourceforge.net/wine/wine-$rel.tar.bz2\">available now</a>.\n"; +push @text, "Binary packages are in the process of being built, and will appear soon at their respective <a href=\"/site/download\">download locations</a>.\n"; +push @text, "</body></news>\n"; close ANNOUNCE; # Create the news file @@ -77,24 +107,9 @@ print NEWS <<EOF; <news> <date>$date</date> <title>Wine $rel Released</title> -<body> -Wine $rel was released today, with the following main changes: - -<ul>$changes</ul> - - -Binary packages are in the process of being built and it may take a -few days for them to appear, but the source is -<a href="http://prdownloads.sourceforge.net/wine/wine-$rel.tar.bz2">available now</a>. -You can find out more about this release in the -<a href="?announce=$rel">announcement</a>. Check out our -<a href="/site/download">download page</a> for packages for your -distribution. - -</body> -</news> EOF +print NEWS join "", @text; close NEWS; print "Created $newsfile\n";

1 0