From 9d19a2ba378cba54b0859391ee284ca0dca2dbbb Mon Sep 17 00:00:00 2001 From: nhnielsen Date: Sun, 25 Nov 2007 23:40:27 +0000 Subject: [PATCH] New svg files for the playlist. Still has some obvious issues, but I will clean these up tomorrow. Thanks to Lee Olson for these! :-) git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/extragear/multimedia/amarok@741615 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/images/playlist_items.svg | 859 +++++++++++++++++++--------------- src/playlist/PlaylistGraphicsItem.cpp | 4 +- src/playlist/PlaylistTextItem.cpp | 2 +- 3 files changed, 483 insertions(+), 382 deletions(-) diff --git a/src/images/playlist_items.svg b/src/images/playlist_items.svg index 6ef2697d3..04db4f38c 100644 --- a/src/images/playlist_items.svg +++ b/src/images/playlist_items.svg @@ -9,98 +9,73 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="744.09448819" - height="1052.3622047" + width="630.04346" + height="322.79584" id="svg2465" sodipodi:version="0.32" inkscape:version="0.45.1" - sodipodi:docbase="/home/amarok-dev/amarok/src/images" - sodipodi:docname="playlist_items.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + sodipodi:docbase="/home/beast/Work/amarok" + sodipodi:docname="playlist_items_new3.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.0"> - - - - - + inkscape:collect="always" + id="linearGradient3447"> + id="stop3449" /> + id="stop3451" /> + inkscape:collect="always" + id="linearGradient3431"> + id="stop3433" /> + id="stop3435" /> + inkscape:collect="always" + id="linearGradient26757"> + id="stop26759" /> + id="stop26761" /> - - - + inkscape:collect="always" + xlink:href="#linearGradient3339" + id="linearGradient6365" + x1="379.00049" + y1="122.36126" + x2="379.00049" + y2="111.36217" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-153.49999,74.499997)" /> - - - - - - + inkscape:collect="always" + xlink:href="#linearGradient3339" + id="linearGradient6391" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-110.99998,74.500002)" + x1="379.00049" + y1="122.36126" + x2="379.00049" + y2="111.36217" /> @@ -125,7 +100,7 @@ id="stop3348" /> + y2="59.500198" /> + y2="59.500198" /> + y2="59.500198" /> + gradientTransform="translate(76.5,-270.13782)" /> + - + gradientTransform="matrix(0.9959188,0,0,0.9799999,331.0898,9.3572405)" + x1="239.5" + y1="480.36218" + x2="239" + y2="424.86218" /> - + + x1="585.35638" + y1="414.90317" + x2="585.9071" + y2="479.95697" /> + x1="585.35638" + y1="414.90317" + x2="585.9071" + y2="479.95697" /> + x1="585.35638" + y1="414.90317" + x2="585.9071" + y2="479.95697" /> + x1="585.35638" + y1="414.90317" + x2="585.9071" + y2="479.95697" + gradientTransform="matrix(0.9982993,0,0,1,1.232181,164.39605)" /> + xlink:href="#linearGradient3450" + id="linearGradient8649" + gradientUnits="userSpaceOnUse" + x1="585.35638" + y1="414.90317" + x2="585.9071" + y2="479.95697" + gradientTransform="matrix(0.9982993,0,0,1,1.232181,164.39605)" /> + x1="585.35638" + y1="414.90317" + x2="585.9071" + y2="479.95697" + gradientTransform="matrix(0.9982993,0,0,1,1.232181,164.39605)" /> + xlink:href="#linearGradient3450" + id="linearGradient8655" + gradientUnits="userSpaceOnUse" + x1="585.35638" + y1="414.90317" + x2="585.9071" + y2="479.95697" + gradientTransform="matrix(0.9982993,0,0,1,1.232181,164.39605)" /> + + + + + + + + + + + + + x1="585.35638" + y1="414.90317" + x2="585.9071" + y2="479.95697" /> + xlink:href="#linearGradient3450" + id="linearGradient9773" + gradientUnits="userSpaceOnUse" + x1="585.35638" + y1="414.90317" + x2="585.9071" + y2="479.95697" /> + + + + inkscape:window-width="1175" + inkscape:window-height="971" + inkscape:window-x="497" + inkscape:window-y="46" + inkscape:showpageshadow="false" /> @@ -1337,262 +1454,246 @@ + id="layer1" + transform="translate(-95,-432.36218)"> + inkscape:label="#324" + id="g8774" + transform="translate(5,162.79584)"> + d="M 95.5,443.36218 C 95.5,433.48218 96.13,432.86218 106.07,432.86218 L 378.93,432.86218 C 388.87,432.86218 389.5,433.48218 389.5,443.36218 L 389.5,492.86218 L 95.5,492.86218 L 95.5,443.36218 z " + id="path8776" + style="fill:#9fa19d;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-opacity:1" /> - - - + style="fill:url(#linearGradient8780);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1" + id="path8778" + d="M 95.8,443.75802 C 95.8,433.87802 96.426576,433.25802 106.3124,433.25802 L 377.6876,433.25802 C 387.57336,433.25802 388.2,433.87802 388.2,443.75802 L 388.2,493.25802 L 95.8,493.25802 L 95.8,443.75802 z " + clip-rule="evenodd" /> - - 7 - Angel (Hold on...) 7:12 + id="path4208" + d="M 430.54193,552.71524 L 430.54193,572.40274 L 724.54193,572.40274 L 724.54193,552.71524 L 430.54193,552.71524 z " + style="fill:#e8e8e8;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /> + id="path4210" + d="M 431.69251,552.86902 L 723.3919,552.86902" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#e8e8e8;stroke-width:1.30400872;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" /> + id="path4212" + d="M 430.54193,552.71524 L 430.54193,570.81048" + style="fill:#2e609c;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="path4214" + d="M 724.54193,552.71524 L 724.54193,570.81048" + style="fill:#2e609c;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="path4218" + d="M 430.52097,517.71562 L 430.52097,537.40313 L 724.52096,537.40313 L 724.52096,517.71562 L 430.52097,517.71562 z " + style="fill:#e8e8e8;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /> + id="path4220" + d="M 431.69055,517.86725 L 723.38993,517.86725" + style="fill:none;fill-rule:evenodd;stroke:#e8e8e8;stroke-width:1.30400872;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" /> + id="path4222" + d="M 430.52097,517.73622 L 430.52097,537.38127" + style="fill:none;fill-rule:evenodd;stroke:#2e3436;stroke-width:1.04194379;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="path4224" + d="M 724.52096,517.73633 L 724.52096,537.38116" + style="fill:none;fill-rule:evenodd;stroke:#2e3436;stroke-width:1.0419383;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="path4226" + d="M 431.6946,537.25352 L 723.34731,537.25352" + style="fill:none;fill-rule:evenodd;stroke:#e8e8e8;stroke-width:1.30390441;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" /> - 7 - Angel (Hold on...) 7:12 + id="expand_button"> + style="opacity:0.4;fill:url(#linearGradient8786);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.84579986;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 279.0625,623.25802 C 276.797,623.25802 275,621.52713 275,619.36647 L 275,603.25801 L 294.125,603.25801 L 294.125,619.36647 C 294.125,621.52713 292.32801,623.25802 290.0625,623.25802 L 279.0625,623.25802 z " + id="path27266" /> + + + + + + + d="M 434.96853,523.2958 C 434.96853,521.56554 436.52206,520.15802 438.43182,520.15802 L 711.53672,520.15802 C 713.44647,520.15802 715,521.56554 715,523.2958 L 715,529.5714 C 715,531.30166 713.44647,532.70918 711.53672,532.70918 L 438.43182,532.70918 C 436.52206,532.70918 434.96853,531.30166 434.96853,529.5714 L 434.96853,523.2958 z " + style="fill:#888a85;fill-opacity:1;fill-rule:evenodd" + id="path18847" /> + d="M 439.04498,520.64312 C 437.14277,520.64312 435.59938,522.23061 435.59938,524.1835 L 435.59938,526.64312 L 714.49938,526.64312 L 714.49938,524.1835 C 714.49938,522.23062 712.95599,520.64312 711.05377,520.64312 L 439.04498,520.64312 z " + style="opacity:0.1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd" + id="path4192" /> - + id="head"> + d="M 430.5,443.36218 C 430.5,433.48218 431.13,432.86218 441.07,432.86218 L 713.93,432.86218 C 723.87,432.86218 724.5,433.48218 724.5,443.36218 L 724.5,492.86218 L 430.5,492.86218 L 430.5,443.36218 z " + id="path4196" + style="fill:#9fa19d;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-opacity:1" /> + id="path4200" + d="M 430.36635,489.35963 L 430.36635,500.13058" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.75921756;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="path4202" + d="M 430.86653,500.06759 L 724.13346,500.06759" + style="fill:none;fill-rule:evenodd;stroke:#444444;stroke-width:0.91486323;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" /> - - - + id="path4204" + d="M 724.63673,489.35918 L 724.63673,500.13013" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.75921756;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" /> + id="path4198" + d="M 440.98395,486.94461 C 431.1028,486.94461 430.48272,487.52792 430.48272,496.82312 L 430.48272,504.67301 L 724.51728,504.67301 L 724.51728,496.82312 C 724.51728,487.52792 723.8972,486.94461 714.01605,486.94461 L 440.98395,486.94461 z " + style="fill:#e8e8e8;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.97001058;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /> + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#e8e8e8;stroke-width:0.98985672;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" + d="M 431.61628,504.71109 L 723.48388,504.71109" + id="path23783" /> - - - - + style="fill:url(#linearGradient9773);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1" + id="path7524" + d="M 430.5,443.36218 C 430.5,433.48218 431.13,432.86218 441.07,432.86218 L 713.93,432.86218 C 723.87,432.86218 724.5,433.48218 724.5,443.36218 L 724.5,492.86218 L 430.5,492.86218 L 430.5,443.36218 z " + clip-rule="evenodd" /> + + + + - + id="collapse_head"> + clip-rule="evenodd" + d="M 430.54193,607.10132 C 430.54193,597.22132 431.17193,596.60132 441.11193,596.60132 L 713.97193,596.60132 C 723.91193,596.60132 724.54193,597.22132 724.54193,607.10132 L 724.54193,656.60132 L 430.54193,656.60132 L 430.54193,607.10132 z " + id="path4232" + style="fill:#9fa19d;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-opacity:1" /> + + id="path4238" + d="M 724.54347,655.6565 L 724.54347,674.35991" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#2e3436;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" /> + id="path4236" + d="M 430.73986,655.61376 L 430.73986,674.70228" + style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#2e3436;stroke-width:1.01024258;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + id="g8663"> + style="fill:url(#linearGradient8661);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1" + id="path8523" + d="M 431.00003,607.75823 C 431.00003,597.87823 431.62896,597.25823 441.55205,597.25823 L 713.948,597.25823 C 723.8711,597.25823 724.50002,597.87823 724.50002,607.75823 L 724.50002,657.25823 L 431.00003,657.25823 L 431.00003,607.75823 z " + clip-rule="evenodd" /> + style="fill:url(#linearGradient8658);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 431.00157,654.4142 L 431.00157,673.11761" + id="path8525" /> + + + + - + id="track" + inkscape:label="#track"> + style="fill:#9fa19d;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-opacity:1" + id="path8772" + d="M 95.5,443.36218 C 95.5,433.48218 96.13,432.86218 106.07,432.86218 L 378.93,432.86218 C 388.87,432.86218 389.5,433.48218 389.5,443.36218 L 389.5,492.86218 L 95.5,492.86218 L 95.5,443.36218 z " + clip-rule="evenodd" /> + clip-rule="evenodd" + d="M 95.8,443.75802 C 95.8,433.87802 96.426576,433.25802 106.3124,433.25802 L 377.6876,433.25802 C 387.57336,433.25802 388.2,433.87802 388.2,443.75802 L 388.2,493.25802 L 95.8,493.25802 L 95.8,443.75802 z " + id="path8700" + style="fill:url(#linearGradient8765);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1" /> + + + + + + + id="path9814" + d="M 219.9375,625.15803 C 217.672,625.15803 215.875,623.42714 215.875,621.26648 L 215.875,605.15802 L 235,605.15802 L 235,621.26648 C 235,623.42714 233.20301,625.15803 230.9375,625.15803 L 219.9375,625.15803 z " + style="opacity:0.4;fill:url(#linearGradient9828);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.84579986;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + id="g9816" + transform="matrix(0.8598046,0,0,-0.9999998,53.76873,867.73729)"> - - - - diff --git a/src/playlist/PlaylistGraphicsItem.cpp b/src/playlist/PlaylistGraphicsItem.cpp index 3097c7707..96e82c58f 100644 --- a/src/playlist/PlaylistGraphicsItem.cpp +++ b/src/playlist/PlaylistGraphicsItem.cpp @@ -534,7 +534,7 @@ Playlist::GraphicsItem::resize( Meta::TrackPtr track, int totalWidth ) m_items->topLeftText->setPos( leftAlignX, headingCenter ); } - int underImageY = (int)( MARGIN + ALBUM_WIDTH + 2 ); + int underImageY = (int)( MARGIN + ALBUM_WIDTH + 6 ); m_items->bottomLeftText->setPos( MARGIN * 3, underImageY ); m_items->bottomRightText->setPos( bottomRightAlignX, underImageY ); @@ -874,7 +874,7 @@ void Playlist::GraphicsItem::setRow(int row) break; case Head: debug() << "Head"; - m_height = qMax( ALBUM_WIDTH, s_fm->height() * 2 ) + MARGIN + s_fm->height() + 4; + m_height = qMax( ALBUM_WIDTH, s_fm->height() * 2 ) + MARGIN + s_fm->height() + 6; break; case Head_Collapsed: debug() << "Collapsed head"; diff --git a/src/playlist/PlaylistTextItem.cpp b/src/playlist/PlaylistTextItem.cpp index 35efeed86..d9f7f9f74 100644 --- a/src/playlist/PlaylistTextItem.cpp +++ b/src/playlist/PlaylistTextItem.cpp @@ -20,7 +20,7 @@ Playlist::TextItem::TextItem( QGraphicsItem* parent ) { s_fm = new QFontMetricsF( QFont() ); } - setDefaultTextColor( Qt::white ); + //setDefaultTextColor( Qt::white ); } -- 2.11.4.GIT