diff -Nru /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/branch/revision-history /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/branch/revision-history diff -Nru /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/checkout/basis-inventory /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/checkout/basis-inventory diff -Nru /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/checkout/conflicts /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/checkout/conflicts diff -Nru /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/checkout/last-revision /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/checkout/last-revision diff -Nru /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/checkout/merge-hashes /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/checkout/merge-hashes diff -Nru /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/checkout/stat-cache /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/checkout/stat-cache diff -Nru /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/repository/inventory.kndx /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/repository/inventory.kndx Binary files /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/repository/inventory.knit and /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/repository/inventory.knit differ diff -Nru /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/repository/knits/5c/imagefunctions.php-20060822182453-thewd33joemexarr-44.kndx /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/repository/knits/5c/imagefunctions.php-20060822182453-thewd33joemexarr-44.kndx Binary files /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/repository/knits/5c/imagefunctions.php-20060822182453-thewd33joemexarr-44.knit and /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/repository/knits/5c/imagefunctions.php-20060822182453-thewd33joemexarr-44.knit differ diff -Nru /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/repository/knits/9c/createhelp.php-20060822182453-thewd33joemexarr-34.kndx /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/repository/knits/9c/createhelp.php-20060822182453-thewd33joemexarr-34.kndx Binary files /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/repository/knits/9c/createhelp.php-20060822182453-thewd33joemexarr-34.knit and /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/repository/knits/9c/createhelp.php-20060822182453-thewd33joemexarr-34.knit differ diff -Nru /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/repository/knits/be/createbookmarks.php-20060822182453-thewd33joemexarr-27.kndx /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/repository/knits/be/createbookmarks.php-20060822182453-thewd33joemexarr-27.kndx Binary files /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/repository/knits/be/createbookmarks.php-20060822182453-thewd33joemexarr-27.knit and /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/repository/knits/be/createbookmarks.php-20060822182453-thewd33joemexarr-27.knit differ diff -Nru /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/repository/knits/e3/createtoolbar.php-20060822182453-thewd33joemexarr-40.kndx /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/repository/knits/e3/createtoolbar.php-20060822182453-thewd33joemexarr-40.kndx Binary files /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/repository/knits/e3/createtoolbar.php-20060822182453-thewd33joemexarr-40.knit and /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/repository/knits/e3/createtoolbar.php-20060822182453-thewd33joemexarr-40.knit differ diff -Nru /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/repository/revisions.kndx /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/repository/revisions.kndx Binary files /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/.bzr/repository/revisions.knit and /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/.bzr/repository/revisions.knit differ diff -Nru /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/debian/changelog /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/debian/changelog --- /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/debian/changelog 2006-09-25 17:11:12.000000000 +0100 +++ /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/debian/changelog 2006-10-10 19:21:14.000000000 +0100 @@ -1,3 +1,12 @@ +firefox-themes-ubuntu (0.5.4) edgy; urgency=low + + * Updated to latest bzr (revno: 24), changes by Frank Schoep: + - Implemented pressed icon states for the main, small, bookmark + and help toolbar + - Added a renderDarkened() function to render pressed icon versions. + + -- Ian Jackson Tue, 10 Oct 2006 19:21:10 +0100 + firefox-themes-ubuntu (0.5.3) edgy; urgency=low Changes from bzr, by Frank Schoep: diff -Nru /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/src/createbookmarks.php /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/src/createbookmarks.php --- /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/src/createbookmarks.php 2006-09-25 17:06:38.000000000 +0100 +++ /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/src/createbookmarks.php 2006-10-10 19:17:31.000000000 +0100 @@ -15,7 +15,7 @@ * Delete * * The rows are: - * Normal, Hover, Disabled + * Normal, Hover, Pressed, Disabled */ function renderBookmarks($filename, $size) { // define the icons to render @@ -32,10 +32,11 @@ // compose the first rows of the toolbar $firstrow = renderRow($icons, $size); $highlight = renderHighlight($firstrow); + $pressed = renderDarkened($firstrow); $disabled = renderDisabled($firstrow); // create single PNG containing all states - $states = array($firstrow, $highlight, $disabled); + $states = array($firstrow, $highlight, $pressed, $disabled); $bookmarks = renderColumnFromPngs( $states, count($icons) * $size, $size); @@ -50,4 +51,4 @@ return array(ACTIONS, 'bookmark-move'); } -?> \ No newline at end of file +?> diff -Nru /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/src/createhelp.php /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/src/createhelp.php --- /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/src/createhelp.php 2006-09-25 17:06:38.000000000 +0100 +++ /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/src/createhelp.php 2006-10-10 19:17:31.000000000 +0100 @@ -14,7 +14,7 @@ * Back, Forward, Home, Print * * The rows are: - * Normal, Hover, Disabled + * Normal, Hover, Disabled, Pressed */ function renderHelp($filename, $size) { // define the icons to render @@ -29,13 +29,14 @@ $firstrow = renderRow($icons, $size); $highlight = renderHighlight($firstrow); $disabled = renderDisabled($firstrow); + $pressed = renderDarkened($firstrow); // create single PNG containing all states - $states = array($firstrow, $highlight, $disabled); + $states = array($firstrow, $highlight, $disabled, $pressed); $help = renderColumnFromPngs( $states, count($icons) * $size, $size); copy($help, $filename); } -?> \ No newline at end of file +?> diff -Nru /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/src/createtoolbar.php /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/src/createtoolbar.php --- /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/src/createtoolbar.php 2006-09-25 17:06:38.000000000 +0100 +++ /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/src/createtoolbar.php 2006-10-10 19:17:31.000000000 +0100 @@ -16,7 +16,7 @@ * Print, New Tab, New Window, Cut, Copy, Paste, Mail. * * The rows are: - * Normal, Hover, Disabled, "Open Bookmarks" + * Normal, Hover, Disabled, "Open Bookmarks", Pressed */ function renderToolbar($filename, $size) { // define the icons to render @@ -41,6 +41,7 @@ $firstrow = renderRow($icons, $size); $highlight = renderHighlight($firstrow); $disabled = renderDisabled($firstrow); + $pressed = renderDarkened($firstrow); // last row contains the "open bookmarks" icon $lasticons = @@ -48,10 +49,10 @@ null, null, null, null, null, null, null, getOpenBookmarkIcon(), null, null, null, null, null, null, null); - $lastrow = renderRow($lasticons, $size); + $bookmark = renderRow($lasticons, $size); // create single PNG containing all states - $states = array($firstrow, $highlight, $disabled, $lastrow); + $states = array($firstrow, $highlight, $disabled, $bookmark, $pressed); $toolbar = renderColumnFromPngs( $states, count($icons) * $size, $size); @@ -82,4 +83,4 @@ return array(PLACES, 'history'); } -?> \ No newline at end of file +?> diff -Nru /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/src/imagefunctions.php /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/src/imagefunctions.php --- /tmp/j29BugHkF5/firefox-themes-ubuntu-0.5.3/src/imagefunctions.php 2006-09-25 17:06:38.000000000 +0100 +++ /tmp/HkXTpThPB2/firefox-themes-ubuntu-0.5.4/src/imagefunctions.php 2006-10-10 19:17:31.000000000 +0100 @@ -180,6 +180,19 @@ } /** + * Render a darkened version of an image file and return the + * resulting filename. + */ + function renderDarkened($infile) { + $outfile = getTempFile(PNG); + + $command = "convert -modulate 70 $infile $outfile"; + system($command); + + return $outfile; + } + + /** * Render a desatured version of an image file and return the resulting * filename. */ @@ -316,4 +329,4 @@ return $outfile; } -?> \ No newline at end of file +?>