This appears to work. The first patch is for f19-branch, the second is not strictly for the branch but won't hurt anything. Let me know.
- Chris
The upstream one is now conveniently just grey. --- data/pixmaps/dialog-warning-symbolic.svg | 30 ++++++++++++++++++++++++++++++ widgets/src/SpokeSelector.c | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 data/pixmaps/dialog-warning-symbolic.svg
diff --git a/data/pixmaps/dialog-warning-symbolic.svg b/data/pixmaps/dialog-warning-symbolic.svg new file mode 100644 index 0000000..d89a442 --- /dev/null +++ b/data/pixmaps/dialog-warning-symbolic.svg @@ -0,0 +1,30 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:svg='http://www.w3.org/2000/svg' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' id='svg7384' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' version='1.1' inkscape:version='0.47 r22583' height='16' sodipodi:docname='dialog-warning-symbolic.svg' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns='http://www.w3.org/2000/svg' width='16'> + <metadata id='metadata90'> + rdf:RDF + <cc:Work rdf:about=''> + dc:formatimage/svg+xml</dc:format> + <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage%27/%3E + dc:titleGnome Symbolic Icon Theme</dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview inkscape:cy='-15.45876' inkscape:current-layer='layer9' inkscape:window-width='1310' pagecolor='#555753' showborder='false' showguides='true' inkscape:snap-nodes='true' objecttolerance='10' showgrid='false' inkscape:object-nodes='true' inkscape:pageshadow='2' inkscape:guide-bbox='true' inkscape:window-x='58' inkscape:snap-bbox='true' bordercolor='#666666' id='namedview88' inkscape:window-maximized='0' inkscape:snap-global='true' inkscape:window-y='353' gridtolerance='10' inkscape:zoom='1' inkscape:window-height='690' borderopacity='1' guidetolerance='10' inkscape:cx='-6.85259' inkscape:bbox-paths='false' inkscape:snap-grids='true' inkscape:pageopacity='1' inkscape:snap-to-guides='true'> + <inkscape:grid visible='true' spacingx='1px' type='xygrid' spacingy='1px' id='grid4866' empspacing='2' enabled='true' snapvisiblegridlinesonly='true'/> + </sodipodi:namedview> + <title id='title9167'>Gnome Symbolic Icon Theme</title> + <defs id='defs7386'/> + <g transform='translate(-301,-257)' inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline'> + + <path inkscape:connector-curvature='0' class='warning' d='m 308.91905,257.09375 c -0.5255,-0.0286 -1.03823,0.28305 -1.4375,0.96875 l -6.25,11.59375 C 300.69808,270.61964 301.27977,272 302.3253,272 l 13.15625,0 c 0.98172,0 1.90311,-1.15939 1.21875,-2.34375 L 310.3878,258.125 c -0.39872,-0.64617 -0.94325,-1.00262 -1.46875,-1.03125 z m -0.0313,3.9375 c 0.54448,-0.0172 1.04849,0.48677 1.03125,1.03125 l 0,3.9375 c 0.007,0.52831 -0.47163,1.01424 -1,1.01424 -0.52836,0 -1.00747,-0.48593 -1,-1.01424 l 0,-3.9375 c -0.008,-0.4666 0.3541,-0.91253 0.8125,-1 0.0511,-0.0145 0.10345,-0.025 0.15625,-0.0313 z m -0.9687,6.96875 2,0 0,2 -2,0 0,-2 z' id='path18112' sodipodi:nodetypes='cccccccccccsccscccccc' style='color:#bebebe;fill:#f57900;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new'/> + </g> + <g transform='translate(-301,-257)' inkscape:groupmode='layer' id='layer10' inkscape:label='devices'/> + <g transform='translate(-301,-257)' inkscape:groupmode='layer' id='layer11' inkscape:label='apps'/> + <g transform='translate(-301,-257)' inkscape:groupmode='layer' id='layer12' inkscape:label='actions'/> + <g transform='translate(-301,-257)' inkscape:groupmode='layer' id='layer13' inkscape:label='places'/> + <g transform='translate(-301,-257)' inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes'/> + <g transform='translate(-301,-257)' inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline'/> + <g transform='translate(-301,-257)' inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline'/> +</svg> diff --git a/widgets/src/SpokeSelector.c b/widgets/src/SpokeSelector.c index 0b5ea0b..8d3b645 100644 --- a/widgets/src/SpokeSelector.c +++ b/widgets/src/SpokeSelector.c @@ -208,7 +208,7 @@ static void set_icon(AnacondaSpokeSelector *widget, const char *icon_name) { return; }
- emblem_icon = g_icon_new_for_string("dialog-warning-symbolic", &err); + emblem_icon = g_icon_new_for_string("/usr/share/anaconda/pixmaps/dialog-warning-symbolic.svg", &err); if (!emblem_icon) { fprintf(stderr, "could not create emblem: %s\n", err->message); g_error_free(err);
With how updates images are now constructed, we do not need these environment variables. They are simply included in the right place to begin with. --- anaconda | 3 --- widgets/src/MountpointSelector.c | 37 ++++--------------------------------- 2 files changed, 4 insertions(+), 36 deletions(-)
diff --git a/anaconda b/anaconda index 875a23b..6f9d817 100755 --- a/anaconda +++ b/anaconda @@ -325,9 +325,6 @@ def setupEnvironment(): if os.environ.has_key("LD_PRELOAD"): del os.environ["LD_PRELOAD"]
- os.environ["GLADEPATH"] = "/tmp/updates/:/tmp/updates/data/ui/:ui/:/usr/share/anaconda/ui/:/usr/share/python-meh/" - os.environ["PIXMAPPATH"] = "/tmp/updates/pixmaps/:/tmp/updates/:/tmp/product/pixmaps/:/tmp/product/:pixmaps/:/usr/share/anaconda/pixmaps/:/usr/share/pixmaps/:/usr/share/anaconda/:/usr/share/python-meh/:/usr/share/icons/Fedora/48x48/apps/" - def setupLoggingFromOpts(opts): if opts.loglevel and anaconda_log.logLevelMap.has_key(opts.loglevel): level = anaconda_log.logLevelMap[opts.loglevel] diff --git a/widgets/src/MountpointSelector.c b/widgets/src/MountpointSelector.c index 3c6e3c9..517d77e 100644 --- a/widgets/src/MountpointSelector.c +++ b/widgets/src/MountpointSelector.c @@ -142,31 +142,6 @@ GtkWidget *anaconda_mountpoint_selector_new() { return g_object_new(ANACONDA_TYPE_MOUNTPOINT_SELECTOR, NULL); }
-static gchar *find_pixmap(const gchar *file) { - const gchar *envvar; - gchar **paths, **iterator = NULL; - - envvar = g_getenv("PIXMAPPATH"); - if (!envvar) - envvar = g_strdup("/usr/share/anaconda/pixmaps"); - - paths = g_strsplit(envvar, ":", 0); - iterator = paths; - - while (*iterator != NULL) { - gchar *path = g_strjoin("/", *iterator, file, NULL); - - if (!g_access(path, R_OK)) - return path; - - g_free(path); - iterator++; - } - - g_strfreev(paths); - return NULL; -} - static void format_mountpoint_label(AnacondaMountpointSelector *widget, const char *value) { char *markup;
@@ -192,8 +167,6 @@ static void format_name_label(AnacondaMountpointSelector *widget, const char *va }
static void anaconda_mountpoint_selector_init(AnacondaMountpointSelector *mountpoint) { - gchar *pixmap_path; - mountpoint->priv = G_TYPE_INSTANCE_GET_PRIVATE(mountpoint, ANACONDA_TYPE_MOUNTPOINT_SELECTOR, AnacondaMountpointSelectorPrivate); @@ -215,14 +188,12 @@ static void anaconda_mountpoint_selector_init(AnacondaMountpointSelector *mountp gtk_grid_set_column_spacing(GTK_GRID(mountpoint->priv->grid), 12); gtk_widget_set_margin_left(GTK_WIDGET(mountpoint->priv->grid), 30);
- /* Create the icon. We don't need to check if find_pixmap returned NULL - * since gtk_image_new_from_file will just display a broken image icon in - * that case. That's good enough error notification. + /* Create the icon. We don't need to check if it returned NULL since + * gtk_image_new_from_file will just display a broken image icon in that + * case. That's good enough error notification. */ - pixmap_path = find_pixmap("right-arrow-icon.png"); - mountpoint->priv->arrow = gtk_image_new_from_file(pixmap_path); + mountpoint->priv->arrow = gtk_image_new_from_file("/usr/share/anaconda/pixmaps/right-arrow-icon.png"); gtk_widget_set_no_show_all(GTK_WIDGET(mountpoint->priv->arrow), TRUE); - g_free(pixmap_path);
/* Set some properties. */ mountpoint->priv->chosen = FALSE;
On Wed, 2013-05-29 at 10:38 -0400, Chris Lumens wrote:
This appears to work. The first patch is for f19-branch, the second is not strictly for the branch but won't hurt anything. Let me know.
These both look good to me and I'd suggest going with both for the f19-branch at this point.
anaconda-patches@lists.fedorahosted.org
-
Chris Lumens -
Vratislav Podzimek