August 2009 - Wine-Commits - list.winehq.org

Paul Vriens : transl: Add pedantic possibilities to the resource page.
by Alexandre Julliard Aug. 18, 2009

Aug. 18, 2009

Module: tools Branch: master Commit: 33b96dfdb6449ef35d0eceff29df576858e28979 URL: http://source.winehq.org/git/tools.git/?a=commit;h=33b96dfdb6449ef35d0eceff… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Aug 14 15:55:40 2009 +0200 transl: Add pedantic possibilities to the resource page. --- transl/resource.php | 47 +++++++++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 18 deletions(-) diff --git a/transl/resource.php b/transl/resource.php index c5652ca..4d3b61f 100644 --- a/transl/resource.php +++ b/transl/resource.php @@ -25,24 +25,43 @@ $pedantic = isset($_REQUEST['pedantic']); <div class="main"> <h1>Dump of <?php echo get_resource_name($type, $id) ?></h1> +<table class="resource" cellpadding="0" cellspacing="0"> +<tr class="header"><th colspan="5"><?php echo get_resource_name($type, $id) ?></th></tr> + <?php $resources = new ResFile(get_res_path($resfile)); - -$res_lang = update_lang_from_resfile($lang, $resfile); -load_resource($resources, $type, $id, $res_lang, $res); +load_resource($resources, $type, $id, $lang, $res); $master_res = NULL; if ($compare) load_resource($resources, $type, $id, $MASTER_LANGUAGE, $master_res); -?> +$warnings = 0; +if ($pedantic && ($lang != "$MASTER_LANGUAGE")) +{ + if (!$master_res) + load_resource($resources, $type, $id, $MASTER_LANGUAGE, $master_res); + $counts = $res->getcounts($master_res); + $warnings = $counts['warnings']; +} -<table class="resource" cellpadding="0" cellspacing="0"> -<tr class="header"><th colspan="5"><?php echo get_resource_name($type, $id) ?></th></tr> -<?php +if ($compare || ($pedantic && $warnings != 0)) +{ + if ($compare) + { + echo "<tr class=\"subheader\"><td colspan=\"5\" style=\"text-align: right\">"; + echo "<small>".gen_resource_a($lang, $resfile, $type, $id, FALSE); + echo "<< Hide compare with ".get_locale_name($MASTER_LANGUAGE)."</a></small>"; + echo "</td></tr>"; + } -if (!$compare) + echo "<tr class=\"subheader\"><td>id</td><td> </td><td>".get_lang_name($lang). + "</td><td> </td><td>".get_lang_name($MASTER_LANGUAGE)."</td></tr>"; + + $res->dump($master_res); +} +else { if ($lang != $MASTER_LANGUAGE) { @@ -51,20 +70,12 @@ if (!$compare) echo "Compare with ".get_locale_name($MASTER_LANGUAGE)." >></a></small>"; echo "</td></tr>"; } -} -else -{ - echo "<tr class=\"subheader\"><td colspan=\"5\" style=\"text-align: right\">"; - echo "<small>".gen_resource_a($lang, $resfile, $type, $id, FALSE); - echo "<< Hide compare with ".get_locale_name($MASTER_LANGUAGE)."</a></small>"; - echo "</td></tr>"; - echo "<tr class=\"subheader\"><td>id</td><td> </td><td>".get_lang_name($lang)."</td><td> </td><td>".get_lang_name($MASTER_LANGUAGE)."</td></tr>"; + $res->dump(NULL); } -$res->dump($master_res); - ?> + </table> </div> </body>

1 0

Paul Vriens : transl: Add pedantic possibilities to the resfile page.
by Alexandre Julliard Aug. 18, 2009

Aug. 18, 2009

Module: tools Branch: master Commit: 9d52d9ce775c4c611d3b2a4440c549b1ae344bc8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9d52d9ce775c4c611d3b2a44… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Aug 14 15:48:25 2009 +0200 transl: Add pedantic possibilities to the resfile page. --- transl/parse_resfiles.php | 12 ++++---- transl/resfile.php | 60 ++++++++++++++++++++++++++------------------ 2 files changed, 41 insertions(+), 31 deletions(-) diff --git a/transl/parse_resfiles.php b/transl/parse_resfiles.php index 4c2feca..1911464 100644 --- a/transl/parse_resfiles.php +++ b/transl/parse_resfiles.php @@ -281,7 +281,7 @@ foreach (array_keys($checks) as $dir) if (!isset($resources[$basic_lang][$resource])) { $missing_rl[] = "$dir: Missing: resource ".resource_name2($resource). - ": No translation"; + ": No translation (0 0)"; $missing++; } else @@ -294,13 +294,13 @@ foreach (array_keys($checks) as $dir) if ($res_errors) { $errors_rl[] = "$dir: Error: resource ".resource_name2($resource). - ": Translation inherited from @LANG($basic_lang): translation out of sync"; + ": Translation inherited from @LANG($basic_lang): translation out of sync ($res_errors $res_warnings)"; $errors++; } else { $notes_rl[] = "$dir: note: resource ".resource_name2($resource). - ": Translation inherited from @LANG($basic_lang)"; + ": Translation inherited from @LANG($basic_lang) ($res_errors $res_warnings)"; $translated++; } @@ -316,13 +316,13 @@ foreach (array_keys($checks) as $dir) if ($res_errors) { $errors_rl[] = "$dir: Error: resource ".resource_name2($resource). - ": Translation out of sync"; + ": Translation out of sync ($res_errors $res_warnings)"; $errors++; } else { - $notes_rl[] = "$dir: note: resoure ".resource_name2($resource). - ": Resource translated"; + $notes_rl[] = "$dir: note: resource ".resource_name2($resource). + ": Resource translated ($res_errors $res_warnings)"; $translated++; } diff --git a/transl/resfile.php b/transl/resfile.php index 191ac65..febea69 100644 --- a/transl/resfile.php +++ b/transl/resfile.php @@ -35,11 +35,10 @@ if (preg_match("/:00/", $lang)) $file = fopen("$DATAROOT/$lang", "r"); while ($line = fgets($file, 4096)) { - if (preg_match("@$resfile: (.*)@", $line, $m)) - { - $msgs[] = $m[1]; - } + if (preg_match("@$resfile: (.*) $([0-9]+) ([0-9]+)$@", $line, $m)) + $msgs[] = array($m[1], $m[2], $m[3]); } +fclose($file); if (count($msgs) == 0) { @@ -60,52 +59,63 @@ echo "<table>\n"; sort($msgs); foreach ($msgs as $value) { - echo "<tr><td>"; - if (strpos($value, "Error: ") === 0) { + $org_value = $value[0]; + if (strpos($value[0], "Error: ") === 0) { $icon = "error.png"; - } else if (strpos($value, "Warning: ") === 0) { - $icon = "warning.png"; - } else if (strpos($value, "note: ") === 0) { + } else if (strpos($value[0], "note: ") === 0) { $icon = "ok.png"; - } else if (strpos($value, "Missing: ") === 0) { + } else if (strpos($value[0], "Missing: ") === 0) { $icon = "missing.gif"; } else { unset($icon); } - if (isset($icon)) - echo "<img src=\"img/icon-".$icon."\" width=\"32\" alt=\"".$value."\">"; $line_lang = $lang; - if (preg_match("/@LANG$([0-9a-f]{3}:[0-9a-f]{2})$/", $value, $m)) + if (preg_match("/@LANG$([0-9a-f]{3}:[0-9a-f]{2})$/", $value[0], $m)) { validate_lang($m[1]); $line_lang = $m[1]; - $value = preg_replace("/@LANG$([0-9a-f]{3}:[0-9a-f]{2})$/", get_lang_name($m[1]), $value); + $value[0] = preg_replace("/@LANG$([0-9a-f]{3}:[0-9a-f]{2})$/", get_lang_name($m[1]), $value[0]); } - if (preg_match("/@RES$([^:$]+):([^:\)]+)\)/", $value, $m)) + if (preg_match("/@RES$([^:$]+):([^:\)]+)\)/", $value[0], $m)) { - if (is_dumpable_type($m[1]) && (strpos($value, "Missing: ") !== 0)) + if (is_dumpable_type($m[1]) && (strpos($value[0], "Missing: ") !== 0)) { - $error = (strpos($value, "Error: ") === 0); - $value = preg_replace("/@RES$([^:$]+):([^:\)]+)\)/", + $error = (strpos($value[0], "Error: ") === 0); + $value[0] = preg_replace("/@RES$([^:$]+):([^:\)]+)\)/", gen_resource_a($line_lang, $resfile, $m[1], $m[2], $error). get_resource_name($m[1], $m[2])."</a>", - $value); + $value[0]); + + if ($pedantic && ($lang != "$MASTER_LANGUAGE")) + { + if ($value[2]) + { + if ($icon != "error.png") + $icon = "warning.png"; + $value[0] .= ", there are $value[2] potential translation problems"; + } + } } else { - $value = preg_replace("/@RES$([^:$]+):([^:\)]+)\)/", get_resource_name($m[1], $m[2]), $value); - if (is_dumpable_type($m[1]) && (strpos($value, "Missing: ") === 0)) - $value .= " (see ".gen_resource_a($MASTER_LANGUAGE, $resfile, $m[1], $m[2]) + $value[0] = preg_replace("/@RES$([^:$]+):([^:\)]+)\)/", get_resource_name($m[1], $m[2]), $value[0]); + if (is_dumpable_type($m[1]) && (strpos($value[0], "Missing: ") === 0)) + $value[0] .= " (see ".gen_resource_a($MASTER_LANGUAGE, $resfile, $m[1], $m[2]) .get_locale_name($MASTER_LANGUAGE)." resource</a>)"; } } - if (strpos($value, "note: ") === 0) - $value = substr($value, 6); + if (strpos($value[0], "note: ") === 0) + $value[0] = substr($value[0], 6); + + echo "<tr><td>"; + + if (isset($icon)) + echo "<img src=\"img/icon-".$icon."\" width=\"32\" alt=\"".$org_value."\">"; - echo "</td><td>".$value."</td></tr>\n"; + echo "</td><td>".$value[0]."</td></tr>\n"; } echo "</table>\n"; ?>

1 0

Paul Vriens : transl: Add pedantic possibilities to the lang page.
by Alexandre Julliard Aug. 18, 2009

Aug. 18, 2009

Module: tools Branch: master Commit: db2998dbc7f691ed45d6fb73a4134162f930a193 URL: http://source.winehq.org/git/tools.git/?a=commit;h=db2998dbc7f691ed45d6fb73… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Aug 14 15:30:26 2009 +0200 transl: Add pedantic possibilities to the lang page. --- transl/lang.php | 57 ++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 38 insertions(+), 19 deletions(-) diff --git a/transl/lang.php b/transl/lang.php index c008049..3904f7e 100644 --- a/transl/lang.php +++ b/transl/lang.php @@ -25,28 +25,17 @@ function parse_file($lang) $curr_file = $m[2]; if ($m[1] == "NONE") { - $notransl[$curr_file] = array($m[3], $m[4], $m[5], 0); + $notransl[$curr_file] = array($m[3], $m[4], $m[5], $m[6], $m[7], $m[8]); continue; } if ($m[4]>0 || $m[5]>0) { - $partial[$curr_file] = array($m[3], $m[4], $m[5], 0); + $partial[$curr_file] = array($m[3], $m[4], $m[5], $m[6], $m[7], $m[8]); continue; } - $transl[$curr_file] = array($m[3], $m[4], $m[5], 0); - } - if (preg_match(",$curr_file: Warning: ,", $line, $m)) - { - if (array_key_exists($curr_file, $transl)) - { - $partial[$curr_file] = $transl[$curr_file]; - unset($transl[$curr_file]); - } - - if (array_key_exists($curr_file, $partial)) /* should be true - warning for $notransl shouldn't happen */ - $partial[$curr_file][3]++; + $transl[$curr_file] = array($m[3], $m[4], $m[5], $m[6], $m[7], $m[8]); } } fclose($file); @@ -58,6 +47,8 @@ function parse_file($lang) function dump_table($table) { global $lang; + global $pedantic; + if (count($table) == 0) { echo "<div class=\"contents\">"; echo "none"; @@ -65,17 +56,45 @@ function dump_table($table) return; } echo "<table>\n"; - echo "<tr><th>name</th><th>translated</th><th>missing</th><th>errors</th></tr>\n"; + echo "<tr>"; + // Make room for a possible icon + if ($pedantic) + echo "<th></th>"; + echo "<th>name</th><th>translated</th><th>missing</th><th>errors</th>\n"; + // Make room for the warning count + if ($pedantic) + echo "<th>warnings</th>"; + echo "</tr>\n"; + foreach ($table as $key => $value) { $extra = ""; - if ($value[3] > 0) - $extra = "(<img src=\"img/icon-warning.png\" height=\"16\"> warnings: ".$value[3].")"; - echo "<tr><td>".gen_resfile_a($lang, $key).$key."</a> $extra</td>"; + echo "<tr>"; + if ($pedantic) + { + $title = "title=\""; + if ($value[2] > 0) $title .= "$value[3] errors in $value[2] resources"; + else $title .= "No errors"; + if ($value[4] > 0) $title .= ", $value[5] warnings in $value[4] resources"; + else $title .= ", No warnings"; + $title .= "\""; + + if ($value[2] > 0) + echo "<td><img src=\"img/icon-error.png\" $title height=\"16\" alt=\"errors\"></td>"; + else if ($value[4] > 0) + echo "<td><img src=\"img/icon-warning.png\" $title height=\"16\" alt=\"warnings\"></td>"; + else if ($value[1] > 0) + echo "<td><img src=\"img/icon-missing.gif\" $title height=\"16\" alt=\"missing\"></td>"; + else + echo "<td><img src=\"img/icon-ok.png\" height=\"16\" alt=\"ok\"></td>"; + } + echo "<td>".gen_resfile_a($lang, $key).$key."</a> $extra</td>"; echo "<td>".$value[0]."</td>"; echo "<td>".$value[1]."</td>"; echo "<td>".$value[2]."</td>"; - echo "</tr>"; + if ($pedantic) + echo "<td>$value[4]</td>"; + echo "</tr>\n"; } echo "</table>\n"; }

1 0

Paul Vriens : transl: Add pedantic possibilities to the index page.
by Alexandre Julliard Aug. 18, 2009

Aug. 18, 2009

Module: tools Branch: master Commit: b35d5c360b3a5d13e4db6c7210d1d370c4e88d54 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b35d5c360b3a5d13e4db6c72… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Aug 14 15:12:09 2009 +0200 transl: Add pedantic possibilities to the index page. --- transl/index.php | 35 +++++++++++++++++++++++++---------- 1 files changed, 25 insertions(+), 10 deletions(-) diff --git a/transl/index.php b/transl/index.php index f442594..3249265 100644 --- a/transl/index.php +++ b/transl/index.php @@ -9,7 +9,7 @@ $transl = array(); $sum = 0; while ($line = fgets($summary, 1024)) { - if (!preg_match("/LANG ([0-9a-f]+:[0-9a-f]+) ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)/", $line, $m)) + if (!preg_match("/LANG ([0-9a-f]+:[0-9a-f]+) ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)/", $line, $m)) { die("couldn't parse line $line"); } @@ -18,8 +18,9 @@ while ($line = fgets($summary, 1024)) continue; $sum = $m[2]; - $transl[] = array('langid' => $m[1], 'name' => get_locale_name($m[1]), 'translated' => $m[3], - 'missing' => $m[4], 'errors' => $m[5]); + $transl[] = array('langid' => $m[1], 'name' => get_locale_name($m[1]), + 'translated' => ($pedantic ? ($m[3] -$m[7]) : $m[3]), + 'missing' => $m[4], 'errors' => $m[5], 'warnings' => $m[7]); } ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> @@ -46,25 +47,34 @@ improve Wine translations check <?php echo $WINE_WIKI_TRANSLATIONS ?>. </p> <table class="index"> -<tr><th></th><th>Language</th><th>Translated</th><th>Missing</th><th>Errors</th><th> </th></tr> +<tr><th></th><th>Language</th><th>Translated</th><th>Missing</th><th>Errors</th> +<?php if ($pedantic) echo "<th>Warnings</th>"; ?> +<th> </th></tr> <?php -function draw_bar($tr, $err, $sum) +function draw_bar($tr, $err, $warn, $sum) { $tr_len = floor(($tr*300)/$sum); $err_len = floor(($err*300)/$sum); + $warn_len = floor(($warn*300)/$sum); if ($err_len == 0 && $err > 0) { $err_len++; if ($tr_len > 1) $tr_len--; } - $miss_len = 300 - $tr_len - $err_len; + if ($warn_len == 0 && $warn > 0) + { + $warn_len++; + if ($tr_len > 1) + $tr_len--; + } echo '<td class="bar">'; if ($tr_len > 0) echo "<img src=\"img/bar0.gif\" height=\"15\" width=\"$tr_len\" alt=\"translations\">"; + if ($warn_len > 0) + echo "<img src=\"img/bar5.gif\" height=\"15\" width=\"$warn_len\" alt=\"warnings\">"; if ($err_len > 0) echo "<img src=\"img/bar1.gif\" height=\"15\" width=\"$err_len\" alt=\"errors\">"; -// echo "<img src=\"img/bar6.gif\" height=\"15\" width=\"$miss_len\">"; echo "</td></tr>"; } @@ -85,6 +95,7 @@ function nicesort($a, $b) usort($transl, 'nicesort'); $nr = 1; $missing_sum = 0; +$warnings_sum = 0; $errors_sum = 0; $transl_sum = 0; $serial = 0; @@ -107,13 +118,16 @@ for ($i = 0; $i < count($transl); $i++) } echo "<td>".gen_lang_a($langid).$name."</a></td>"; printf("<td>%d (%.1f%%)</td>", $translated, ($translated*100)/$sum); - echo "<td>".$missing."</td><td>".$errors."</td>\n"; - draw_bar($translated, $errors, $sum); + echo "<td>".$missing."</td><td>".$errors."</td>"; + if ($pedantic) echo "<td>".$warnings."</td>"; + echo "\n"; + draw_bar($translated, $errors, $pedantic ? $warnings : 0, $sum); $nr++; $transl_sum += $translated; $missing_sum += $missing; $errors_sum += $errors; + $warnings_sum += $warnings; $serial--; } ?> @@ -121,7 +135,8 @@ for ($i = 0; $i < count($transl); $i++) <td><?php printf("%d (%.1f%%)", $transl_sum, ($transl_sum*100)/(($nr-1)*$sum)) ?></td> <td><?php echo $missing_sum ?></td> <td><?php echo $errors_sum ?></td> -<?php draw_bar($transl_sum, $errors_sum, ($nr-1)*$sum) ?> +<?php if ($pedantic) echo "<td>$warnings_sum</td>"; ?> +<?php draw_bar($transl_sum, $errors_sum, $pedantic ? $warnings_sum : 0, ($nr-1)*$sum) ?> </table> </div> </div>

1 0

Paul Vriens : transl: Add the ability to pass a pedantic parameter around.
by Alexandre Julliard Aug. 18, 2009

Aug. 18, 2009

Module: tools Branch: master Commit: f100c34cc9f317c5b8cb85565c53d1d47bdb403b URL: http://source.winehq.org/git/tools.git/?a=commit;h=f100c34cc9f317c5b8cb8556… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Aug 14 14:39:04 2009 +0200 transl: Add the ability to pass a pedantic parameter around. --- transl/index.php | 2 ++ transl/lang.php | 1 + transl/lib.php | 24 +++++++++++++++++------- transl/resfile.php | 1 + transl/resource.php | 1 + 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/transl/index.php b/transl/index.php index 51d7f9c..f442594 100644 --- a/transl/index.php +++ b/transl/index.php @@ -2,6 +2,8 @@ include_once("config.php"); include_once("lib.php"); +$pedantic = isset($_REQUEST['pedantic']); + $summary = fopen("$DATAROOT/summary", "r"); $transl = array(); $sum = 0; diff --git a/transl/lang.php b/transl/lang.php index 29b0692..c008049 100644 --- a/transl/lang.php +++ b/transl/lang.php @@ -3,6 +3,7 @@ include_once("config.php") ; include_once("lib.php"); $lang = validate_lang($_REQUEST['lang']); +$pedantic = isset($_REQUEST['pedantic']); $transl = array(); $notransl = array(); diff --git a/transl/lib.php b/transl/lib.php index 5f0580e..11f3d52 100644 --- a/transl/lib.php +++ b/transl/lib.php @@ -6,6 +6,15 @@ $WINE_WIKI_TRANSLATIONS = "<a href=\"redirect.php?url=http://wiki.winehq.org/Tra static $LOCALE_NAMES = array(); +function is_pedantic() +{ + global $pedantic; + + if ($pedantic) + return TRUE; + return FALSE; +} + // These resources are retrieved as a sequence of words that need to be converted to a string function convert_to_unicode($words) { @@ -227,28 +236,29 @@ function update_lang_from_resfile($lang, $resfile) function gen_lang_a($lang) { - return "<a href=\"lang.php?lang=".urlencode($lang)."\">"; + $extra = is_pedantic() ? "&pedantic=" : ""; + return "<a href=\"lang.php?lang=".urlencode($lang)."$extra\">"; } function gen_resfile_a($lang, $resfile) { - return "<a href=\"resfile.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile)."\">"; + $extra = is_pedantic() ? "&pedantic=" : ""; + return "<a href=\"resfile.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile)."$extra\">"; } function gen_resource_a($lang, $resfile, $type, $id, $compare=FALSE) { - if ($compare) - $extra = "&compare="; - else - $extra = ""; + $extra = ($compare) ? "&compare=" : ""; + $extra .= is_pedantic() ? "&pedantic=" : ""; return "<a href=\"resource.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile). "&type=".urlencode($type)."&id=".urlencode($id)."$extra\">"; } function dump_menu_root($link = TRUE) { + $extra = is_pedantic() ? "?pedantic=" : ""; if ($link) - echo "<a href=\"index.php\">"; + echo "<a href=\"index.php$extra\">"; echo "Wine translations"; if ($link) echo "</a>"; diff --git a/transl/resfile.php b/transl/resfile.php index 5e38dfc..191ac65 100644 --- a/transl/resfile.php +++ b/transl/resfile.php @@ -4,6 +4,7 @@ include("lib.php"); $lang = validate_lang($_REQUEST['lang']); $resfile = validate_resfile($_REQUEST['resfile']); +$pedantic = isset($_REQUEST['pedantic']); $msgs = array(); ?> diff --git a/transl/resource.php b/transl/resource.php index 9197210..c5652ca 100644 --- a/transl/resource.php +++ b/transl/resource.php @@ -8,6 +8,7 @@ $resfile = validate_resfile($_REQUEST['resfile']); $type = validate_type($_REQUEST['type']); $id = validate_id($_REQUEST['id']); $compare = isset($_REQUEST['compare']); +$pedantic = isset($_REQUEST['pedantic']); ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

1 0

Paul Vriens : transl: Have a separate <div> for the navigation bar.
by Alexandre Julliard Aug. 18, 2009

Aug. 18, 2009

Module: tools Branch: master Commit: dcfcf019f3ce57db8c1b055d60413f2b5df99273 URL: http://source.winehq.org/git/tools.git/?a=commit;h=dcfcf019f3ce57db8c1b055d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Aug 14 13:24:52 2009 +0200 transl: Have a separate <div> for the navigation bar. --- transl/index.php | 3 +++ transl/lang.php | 4 +++- transl/lib.php | 8 ++++++-- transl/resfile.php | 2 ++ transl/resource.php | 2 ++ transl/style.css | 8 ++++++++ 6 files changed, 24 insertions(+), 3 deletions(-) diff --git a/transl/index.php b/transl/index.php index 369b7de..51d7f9c 100644 --- a/transl/index.php +++ b/transl/index.php @@ -27,6 +27,9 @@ while ($line = fgets($summary, 1024)) <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Wine translation statistics <?php echo $TITLE_APPENDIX ?></title> </head> +<div class="navbar"> +<?php dump_menu_root(FALSE); ?> +</div> <div class="main"> <h1>Wine translation statistics <?php echo $TITLE_APPENDIX ?></h1> <div class="contents"> diff --git a/transl/lang.php b/transl/lang.php index 5f0fd6f..29b0692 100644 --- a/transl/lang.php +++ b/transl/lang.php @@ -88,7 +88,9 @@ function dump_table($table) <title><?php echo get_lang_name($lang) ?> language - Wine translations</title> </head> -<p><?php dump_menu_lang($lang, FALSE); ?> </p> +<div class="navbar"> +<?php dump_menu_lang($lang, FALSE); ?> +</div> <div class="main"> <h1><?php echo "Language: ".get_lang_name($lang) ?></h1> diff --git a/transl/lib.php b/transl/lib.php index 9e5b1a7..5f0580e 100644 --- a/transl/lib.php +++ b/transl/lib.php @@ -245,9 +245,13 @@ function gen_resource_a($lang, $resfile, $type, $id, $compare=FALSE) "&type=".urlencode($type)."&id=".urlencode($id)."$extra\">"; } -function dump_menu_root() +function dump_menu_root($link = TRUE) { - echo "<a href=\"index.php\">Wine translations</a>"; + if ($link) + echo "<a href=\"index.php\">"; + echo "Wine translations"; + if ($link) + echo "</a>"; } function dump_menu_lang($lang, $link = TRUE) diff --git a/transl/resfile.php b/transl/resfile.php index 29909ed..5e38dfc 100644 --- a/transl/resfile.php +++ b/transl/resfile.php @@ -15,7 +15,9 @@ $msgs = array(); <title>Module <?php echo $resfile?> - Wine translations</title> </head> +<div class="navbar"> <?php dump_menu_resfile($lang, $resfile, FALSE); ?> +</div> <div class="main"> <h1>Module <?php echo $resfile?></h1> diff --git a/transl/resource.php b/transl/resource.php index d8f1e20..9197210 100644 --- a/transl/resource.php +++ b/transl/resource.php @@ -18,7 +18,9 @@ $compare = isset($_REQUEST['compare']); <title><?php echo get_resource_name($type, $id) ?> from <?php echo $resfile?> - Wine translation</title> </head> <body> +<div class="navbar"> <?php dump_menu_resource($lang, $resfile, $type, $id); ?> +</div> <div class="main"> <h1>Dump of <?php echo get_resource_name($type, $id) ?></h1> diff --git a/transl/style.css b/transl/style.css index b963c06..557de2c 100644 --- a/transl/style.css +++ b/transl/style.css @@ -31,6 +31,14 @@ h1 :link { color: #ffe0e0; } +div.navbar { + background-color: #E2E2E2; + margin: 10px 0; + padding: 0; + text-align: left; + width: 100%; +} + div.main { margin: 10px 0 0 0; background-color: white;

1 0

Paul Vriens : transl: Merge some of the menu generation.
by Alexandre Julliard Aug. 18, 2009

Aug. 18, 2009

Module: tools Branch: master Commit: a1c05fbe629ed24a1eba276be1358e43ffa38677 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a1c05fbe629ed24a1eba276b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Aug 14 12:47:27 2009 +0200 transl: Merge some of the menu generation. --- transl/lang.php | 2 +- transl/lib.php | 9 +++++++++ transl/resfile.php | 2 +- transl/resource.php | 3 +-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/transl/lang.php b/transl/lang.php index 91aee9d..5f0fd6f 100644 --- a/transl/lang.php +++ b/transl/lang.php @@ -88,7 +88,7 @@ function dump_table($table) <title><?php echo get_lang_name($lang) ?> language - Wine translations</title> </head> -<p><?php dump_menu_root() ?> > <?php dump_menu_lang($lang, FALSE)?> </p> +<p><?php dump_menu_lang($lang, FALSE); ?> </p> <div class="main"> <h1><?php echo "Language: ".get_lang_name($lang) ?></h1> diff --git a/transl/lib.php b/transl/lib.php index e584f3c..9e5b1a7 100644 --- a/transl/lib.php +++ b/transl/lib.php @@ -252,6 +252,9 @@ function dump_menu_root() function dump_menu_lang($lang, $link = TRUE) { + dump_menu_root(); + echo " > "; + if ($link) echo gen_lang_a($lang); echo get_lang_name($lang); @@ -261,6 +264,9 @@ function dump_menu_lang($lang, $link = TRUE) function dump_menu_resfile($lang, $resfile, $link = TRUE) { + dump_menu_lang($lang); + echo " > "; + if ($link) echo gen_resfile_a($lang, $resfile); echo get_resfile_name($resfile); @@ -270,6 +276,9 @@ function dump_menu_resfile($lang, $resfile, $link = TRUE) function dump_menu_resource($lang, $resfile, $type, $id) { + dump_menu_resfile($lang, $resfile); + echo " > "; + echo get_resource_name($type, $id); } diff --git a/transl/resfile.php b/transl/resfile.php index f956845..29909ed 100644 --- a/transl/resfile.php +++ b/transl/resfile.php @@ -15,7 +15,7 @@ $msgs = array(); <title>Module <?php echo $resfile?> - Wine translations</title> </head> -<?php dump_menu_root() ?> &gt <?php dump_menu_lang($lang) ?> &gt <?php dump_menu_resfile($lang, $resfile, FALSE) ?> +<?php dump_menu_resfile($lang, $resfile, FALSE); ?> <div class="main"> <h1>Module <?php echo $resfile?></h1> diff --git a/transl/resource.php b/transl/resource.php index 4fdd9f0..d8f1e20 100644 --- a/transl/resource.php +++ b/transl/resource.php @@ -18,8 +18,7 @@ $compare = isset($_REQUEST['compare']); <title><?php echo get_resource_name($type, $id) ?> from <?php echo $resfile?> - Wine translation</title> </head> <body> -<?php dump_menu_root() ?> &gt <?php dump_menu_lang($lang) ?> &gt <?php dump_menu_resfile($lang, $resfile) ?> &gt -<?php dump_menu_resource($lang, $resfile, $type, $id) ?> +<?php dump_menu_resource($lang, $resfile, $type, $id); ?> <div class="main"> <h1>Dump of <?php echo get_resource_name($type, $id) ?></h1>

1 0

Alexandre Julliard : msvideo: Fix packing of the thunk structure.
by Alexandre Julliard Aug. 18, 2009

Aug. 18, 2009

Module: wine Branch: master Commit: d5ecc2d07719b483987f10afdb182ca9d0e53659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ecc2d07719b483987f10afd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 18 16:54:23 2009 +0200 msvideo: Fix packing of the thunk structure. --- dlls/msvideo.dll16/msvideo16.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index a48a613..faa8e62 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -702,6 +702,7 @@ static LRESULT CALLBACK IC_Callback3216(DWORD pfn16, HIC hic, HDRVR hdrv, UINT #define MAX_THUNKS 32 +#include "pshpack1.h" static struct msvideo_thunk { BYTE popl_eax; /* popl %eax (return address) */ @@ -712,6 +713,7 @@ static struct msvideo_thunk DWORD callback; HIC16 hIC16; /* driver's handle */ } *MSVIDEO_Thunks; +#include "poppack.h" static CRITICAL_SECTION msvideo_cs; static CRITICAL_SECTION_DEBUG critsect_debug =

1 0

Alexandre Julliard : ddeml: Fix packing of the thunk structure.
by Alexandre Julliard Aug. 18, 2009

Aug. 18, 2009

Module: wine Branch: master Commit: d8d2aa96faf8cce53e06f3fdbf5029c84e530f22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8d2aa96faf8cce53e06f3fdb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 18 16:54:14 2009 +0200 ddeml: Fix packing of the thunk structure. --- dlls/ddeml.dll16/ddeml.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ddeml.dll16/ddeml.c b/dlls/ddeml.dll16/ddeml.c index 1bc0f11..874c456 100644 --- a/dlls/ddeml.dll16/ddeml.c +++ b/dlls/ddeml.dll16/ddeml.c @@ -156,6 +156,7 @@ static HDDEDATA CALLBACK WDML_InvokeCallback16(DWORD pfn16, UINT uType, UINT uFm * WDML_InvokeCallback16. * The code below is mainly to create the thunks themselved */ +#include "pshpack1.h" static struct ddeml_thunk { BYTE popl_eax; /* popl %eax (return address) */ @@ -166,6 +167,7 @@ static struct ddeml_thunk DWORD callback; DWORD instId; /* instance ID */ } *DDEML16_Thunks; +#include "poppack.h" static CRITICAL_SECTION ddeml_cs; static CRITICAL_SECTION_DEBUG critsect_debug =

1 0

Rein Klazes : user32: Handle WM_PRINTCLIENT message in PopupMenuWndProc().
by Alexandre Julliard Aug. 18, 2009

Aug. 18, 2009

Module: wine Branch: master Commit: 251c26e0f9ce5d5461be00ad1d7e4bd4989632f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=251c26e0f9ce5d5461be00ad1… Author: Rein Klazes <wijn(a)online.nl> Date: Tue Aug 18 15:46:15 2009 +0200 user32: Handle WM_PRINTCLIENT message in PopupMenuWndProc(). --- dlls/user32/menu.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 90a6e5a..a3accaa 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3472,6 +3472,14 @@ static LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam, EndPaint( hwnd, &ps ); return 0; } + + case WM_PRINTCLIENT: + { + MENU_DrawPopupMenu( hwnd, (HDC)wParam, + (HMENU)GetWindowLongPtrW( hwnd, 0 ) ); + return 0; + } + case WM_ERASEBKGND: return 1;

1 0