Conor Curran has proposed merging lp:~cjcurran/indicator-sound/missing-nonmono-icon into lp:indicator-sound.
Requested reviews: Indicator Applet Developers (indicator-applet-developers) Related bugs: #628896 sound_icon for indicator-sound missing for ubuntu-light https://bugs.launchpad.net/bugs/628896 fixes bug attached -- https://code.launchpad.net/~cjcurran/indicator-sound/missing-nonmono-icon/+merge/35291 Your team ayatana-commits is subscribed to branch lp:indicator-sound.
=== modified file 'configure.ac' --- configure.ac 2010-09-10 13:21:38 +0000 +++ configure.ac 2010-09-13 14:59:40 +0000 @@ -135,6 +135,9 @@ Makefile src/Makefile data/Makefile +data/icons/Makefile +data/icons/scalable/Makefile +data/icons/scalable/status/Makefile tests/Makefile po/Makefile.in ]) === modified file 'data/Makefile.am' --- data/Makefile.am 2010-07-07 14:08:34 +0000 +++ data/Makefile.am 2010-09-13 14:59:40 +0000 @@ -1,3 +1,5 @@ +SUBDIRS = icons + dbus_servicesdir = $(DBUSSERVICEDIR) service_in_files = indicator-sound.service.in dbus_services_DATA = $(service_in_files:.service.in=.service) === added directory 'data/icons' === added file 'data/icons/Makefile.am' --- data/icons/Makefile.am 1970-01-01 00:00:00 +0000 +++ data/icons/Makefile.am 2010-09-13 14:59:40 +0000 @@ -0,0 +1,15 @@ +SUBDIRS = scalable + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(pkgdatadir)/icons/hicolor + +install-data-hook: update-icon-cache +uninstall-hook: update-icon-cache +update-icon-cache: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + === added directory 'data/icons/scalable' === added file 'data/icons/scalable/Makefile.am' --- data/icons/scalable/Makefile.am 1970-01-01 00:00:00 +0000 +++ data/icons/scalable/Makefile.am 2010-09-13 14:59:40 +0000 @@ -0,0 +1,1 @@ +SUBDIRS = status === added directory 'data/icons/scalable/status' === added file 'data/icons/scalable/status/Makefile.am' --- data/icons/scalable/status/Makefile.am 1970-01-01 00:00:00 +0000 +++ data/icons/scalable/status/Makefile.am 2010-09-13 14:59:40 +0000 @@ -0,0 +1,8 @@ + +iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status + +icons_DATA = \ + sound-icon.svg + +EXTRA_DIST = $(icons_DATA) + === added file 'data/icons/scalable/status/sound-icon.svg' --- data/icons/scalable/status/sound-icon.svg 1970-01-01 00:00:00 +0000 +++ data/icons/scalable/status/sound-icon.svg 2010-09-13 14:59:40 +0000 @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:xlink="http://www.w3.org/1999/xlink"; + version="1.1" + width="16" + height="16" + id="svg3809"> + <defs + id="defs3811"> + <linearGradient + x1="28.739122" + y1="144.11652" + x2="26.256771" + y2="125.39074" + id="linearGradient2974" + xlink:href="#linearGradient2372" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.2545239,0,0,0.12875595,6.0849926,-15.173532)" /> + <linearGradient + id="linearGradient2372"> + <stop + id="stop2374" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + <stop + id="stop2376" + style="stop-color:#ffffff;stop-opacity:0.37931034" + offset="1" /> + </linearGradient> + <linearGradient + x1="28.739122" + y1="144.11652" + x2="25.400293" + y2="119.86452" + id="linearGradient2977" + xlink:href="#linearGradient2372" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.12649532,0,0,0.12875595,2.1139996,-14.056928)" /> + <radialGradient + cx="17.058823" + cy="41.058823" + r="5.7384715" + fx="15.970393" + fy="39.105911" + id="radialGradient2980" + xlink:href="#linearGradient7067-814-120-245" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3698584,-0.06212313,0,0.35879901,4.6705097,-1.5148309)" /> + <linearGradient + id="linearGradient7067-814-120-245"> + <stop + id="stop3877" + style="stop-color:#aaaaaa;stop-opacity:1" + offset="0" /> + <stop + id="stop3879" + style="stop-color:#4d4d4d;stop-opacity:1" + offset="1" /> + </linearGradient> + <radialGradient + cx="17.058823" + cy="41.058823" + r="5.7384715" + fx="15.544384" + fy="39.027378" + id="radialGradient2983" + xlink:href="#linearGradient7067-814-120-245" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.37667571,-0.06311262,0,0.36451394,-2.446246,-0.69065449)" /> + </defs> + <g + id="layer1"> + <path + d="M 12.887143,11.242639 12.520463,8.2875931" + id="path2931" + style="fill:none;stroke:none" /> + <path + d="M 12.862181,0.50107998 C 10.505078,0.88091513 7.3505507,1.2719259 5,1.6729744 4.3775618,1.9766657 4.5174948,2.758676 4.4899572,3.3260967 c 0,2.5319424 0,5.0638848 0,7.5958273 -1.3117262,-0.246608 -2.9113558,0.837273 -2.9807337,2.553424 -0.1132522,1.068438 0.8342068,1.998453 1.8644819,2.023461 1.844664,0.04478 3.1062853,-1.179076 3.1262946,-2.726857 -0.020145,-2.599408 0.00566,-5.1998384 0,-7.7996448 0.2855763,-0.02115 4.61103,-0.8465037 5,-0.901457 0,1.9471472 0,3.8942945 0,5.8414417 -1.146387,-0.2746364 -2.6118971,0.4787211 -2.9752697,2.0172541 -0.15337,0.862385 0.1364969,1.944831 1.0115464,2.309984 1.7082373,0.784936 4.0532683,-0.805037 3.9579313,-2.671065 -0.02646,-3.4661732 0.02169,-6.933764 0,-10.4003066 -0.04486,-0.32575865 -0.265607,-0.69059252 -0.632027,-0.66707842 z" + id="path4031" + style="fill:#4d4d4d;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + <path + d="m 5.9735639,12.865117 a 1.7166647,2.0994822 57.095252 0 1 -3.9883314,0.66825 1.7166647,2.0994822 57.095252 0 1 3.9883314,-0.66825 z" + id="path2937" + style="fill:url(#radialGradient2983);fill-opacity:1;stroke:none" /> + <path + d="M 12.937933,11.82841 A 1.6885125,2.0629959 56.769744 0 1 9.0217849,12.486184 1.6885125,2.0629959 56.769744 1 1 12.937933,11.82841 z" + id="path2941" + style="fill:url(#radialGradient2980);fill-opacity:1;stroke:none" /> + <path + d="M 5.0536869,11.476373 5,2.7939369 c 0,0 0.05877,-0.6637646 0.4947159,-0.6657879 0.1546126,-0.027048 6.9317151,-1.15654738 6.9317151,-1.15654738 0,0 0.132983,0.70947368 -6.0694897,1.62965478 -0.516931,0.077068 -0.76544,0.068481 -0.7627163,0.5583664 0.00735,1.3216244 -0.030358,3.795953 -0.030358,8.6082552 0,0.03443 -0.3254384,-0.243938 -0.5101806,-0.291505 z" + id="path2945" + style="opacity:0.4;fill:url(#linearGradient2977);fill-opacity:1;fill-rule:evenodd;stroke:none" /> + <path + d="m 12,10.271349 0.03393,-6.5590211 c 0.357493,-0.0323 0.05489,-0.00519 0.53695,-0.053577 0.0066,1.2251582 2.74e-4,2.2420961 2.74e-4,6.8691941 0,0.03443 -0.199425,-0.209029 -0.571151,-0.256596 z" + id="path2947" + style="opacity:0.4;fill:url(#linearGradient2974);fill-opacity:1;fill-rule:evenodd;stroke:none" /> + </g> +</svg> === modified file 'src/title-widget.c' --- src/title-widget.c 2010-09-08 14:51:52 +0000 +++ src/title-widget.c 2010-09-13 14:59:40 +0000 @@ -85,7 +85,7 @@ gint width, height; gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height); - GtkWidget * icon = gtk_image_new_from_icon_name("sound_icon", GTK_ICON_SIZE_MENU); + GtkWidget * icon = gtk_image_new_from_icon_name("sound-icon", GTK_ICON_SIZE_MENU); gtk_widget_set_size_request(icon, width + 5 /* ref triangle is 5x9 pixels */
_______________________________________________ Mailing list: https://launchpad.net/~ayatana-commits Post to : [email protected] Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
