GNOME.org
 

[epiphany/wip/bookmarks: 29/76] bookmarks: Fix icons

commit 41a21e627a6e64282e658a18b76034289714833f
Author: Iulian Radu <iulian radu67 gmail com>
Date:   Mon Aug 8 20:19:39 2016 +0300

    bookmarks: Fix icons

 lib/widgets/ephy-location-entry.c                  |   13 ++-
 src/Makefile.am                                    |   60 +++++-----
 src/ephy-bookmarks-popover.c                       |    2 +-
 src/ephy-header-bar.c                              |    2 +-
 src/epiphany.gresource.xml                         |    8 +-
 src/resources/epiphany.css                         |    3 +
 src/resources/epiphany.scss                        |    4 +
 src/resources/icons/ephy-bookmark-empty.svg        |  124 --------------------
 src/resources/icons/ephy-bookmark-full.svg         |  124 --------------------
 .../actions/ephy-bookmark-tag-symbolic.svg}        |   21 +---
 .../scalable/actions/ephy-bookmarks-symbolic.svg}  |   19 +--
 11 files changed, 65 insertions(+), 315 deletions(-)
---
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index d1e12fe..2d9520b 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -701,7 +701,7 @@ ephy_location_entry_construct_contents (EphyLocationEntry *lentry)
 
   gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
                                      GTK_ENTRY_ICON_SECONDARY,
-                                     "ephy-bookmark-empty");
+                                     "non-starred-symbolic");
 
   g_object_connect (entry,
                     "signal::icon-press", G_CALLBACK (icon_button_press_event_cb), lentry,
@@ -1142,16 +1142,23 @@ void
 ephy_location_entry_set_bookmarked_status (EphyLocationEntry *entry,
                                            gboolean           is_bookmarked)
 {
+  GtkStyleContext *context;
+
   g_return_if_fail (EPHY_IS_LOCATION_ENTRY (entry));
 
+  context = gtk_widget_get_style_context (GTK_WIDGET (entry));
   if (is_bookmarked) {
     gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
                                        GTK_ENTRY_ICON_SECONDARY,
-                                       "ephy-bookmark-full");
+                                       "starred-symbolic");
+    gtk_style_context_remove_class (context, "non-starred");
+    gtk_style_context_add_class (context, "starred");
   } else {
     gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
                                        GTK_ENTRY_ICON_SECONDARY,
-                                       "ephy-bookmark-empty");
+                                       "non-starred-symbolic");
+    gtk_style_context_remove_class (context, "starred");
+    gtk_style_context_add_class (context, "non-starred");
   }
 }
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 35c1bcc..799252c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -119,37 +119,35 @@ libephymain_la_LIBADD = \
        $(WEBKIT2GTK_LIBS)
 
 RESOURCE_FILES = \
-       resources/about.css                       \
-       resources/bookmark-properties.ui          \
-       resources/channel-insecure-symbolic.png   \
-       resources/computer-fail-symbolic.png      \
-       resources/clear-data-dialog.ui            \
-       resources/cookies-dialog.ui               \
-       resources/encoding-dialog.ui              \
-       resources/encoding-row.ui                 \
-       resources/epiphany-application-menu.ui    \
-       resources/epiphany-bookmark-editor-ui.xml \
-       resources/epiphany.css                    \
-       resources/error.html                      \
-       resources/gtk/menus.ui                    \
-       resources/gtk/page-menu-popover.ui        \
-       resources/history-dialog.ui               \
-       resources/incognito.png                   \
-       resources/missing-thumbnail.png           \
-       resources/passwords-dialog.ui             \
-       resources/prefs-dialog.ui                 \
-       resources/prefs-lang-dialog.ui            \
-       resources/prism.css                       \
-       resources/prism.js                        \
-       resources/shortcuts-dialog.ui             \
-       resources/icons/ephy-bookmark-empty.svg   \
-       resources/icons/ephy-bookmark-full.svg    \
-       resources/icons/ephy-bookmark-tag.svg     \
-       resources/icons/ephy-bookmarks.svg        \
-       resources/gtk/bookmark-properties-grid.ui \
-       resources/gtk/bookmark-row.ui             \
-       resources/gtk/bookmarks-popover.ui        \
-       resources/gtk/menus.ui                    \
+       resources/about.css                                                             \
+       resources/bookmark-properties.ui                                                \
+       resources/channel-insecure-symbolic.png                                         \
+       resources/computer-fail-symbolic.png                                            \
+       resources/clear-data-dialog.ui                                                  \
+       resources/cookies-dialog.ui                                                     \
+       resources/encoding-dialog.ui                                                    \
+       resources/encoding-row.ui                                                       \
+       resources/epiphany-application-menu.ui                                          \
+       resources/epiphany-bookmark-editor-ui.xml                                       \
+       resources/epiphany.css                                                          \
+       resources/error.html                                                            \
+       resources/gtk/menus.ui                                                          \
+       resources/gtk/page-menu-popover.ui                                              \
+       resources/history-dialog.ui                                                     \
+       resources/incognito.png                                                         \
+       resources/missing-thumbnail.png                                                 \
+       resources/passwords-dialog.ui                                                   \
+       resources/prefs-dialog.ui                                                       \
+       resources/prefs-lang-dialog.ui                                                  \
+       resources/prism.css                                                             \
+       resources/prism.js                                                              \
+       resources/shortcuts-dialog.ui                                                   \
+       resources/icons/hicolor/scalable/actions/ephy-bookmark-tag-symbolic.svg         \
+       resources/icons/hicolor/scalable/actions/ephy-bookmarks-symbolic.svg            \
+       resources/gtk/bookmark-properties-grid.ui                                       \
+       resources/gtk/bookmark-row.ui                                                   \
+       resources/gtk/bookmarks-popover.ui                                              \
+       resources/gtk/menus.ui                                                          \
        $(NULL)
 
 epiphany-resources.c: epiphany.gresource.xml $(RESOURCE_FILES)
diff --git a/src/ephy-bookmarks-popover.c b/src/ephy-bookmarks-popover.c
index 59a192e..fcea7c0 100644
--- a/src/ephy-bookmarks-popover.c
+++ b/src/ephy-bookmarks-popover.c
@@ -192,7 +192,7 @@ create_tag_row (const char *tag)
   if (g_strcmp0 (tag, "Favorites") == 0)
     image = gtk_image_new_from_icon_name ("user-bookmarks-symbolic", GTK_ICON_SIZE_MENU);
   else
-    image = gtk_image_new_from_icon_name ("ephy-bookmark-tag", GTK_ICON_SIZE_MENU);
+    image = gtk_image_new_from_icon_name ("ephy-bookmark-tag-symbolic", GTK_ICON_SIZE_MENU);
   gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 6);
 
   label = gtk_label_new (tag);
diff --git a/src/ephy-header-bar.c b/src/ephy-header-bar.c
index 1ed61cf..198598e 100644
--- a/src/ephy-header-bar.c
+++ b/src/ephy-header-bar.c
@@ -740,7 +740,7 @@ ephy_header_bar_constructed (GObject *object)
   button = gtk_menu_button_new ();
   header_bar->bookmarks_button = button;
   gtk_button_set_image (GTK_BUTTON (button),
-                        gtk_image_new_from_icon_name ("user-bookmarks-symbolic", GTK_ICON_SIZE_BUTTON));
+                        gtk_image_new_from_icon_name ("ephy-bookmarks-symbolic", GTK_ICON_SIZE_BUTTON));
   gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
   gtk_menu_button_set_popover (GTK_MENU_BUTTON (button), GTK_WIDGET (ephy_bookmarks_popover_new 
(header_bar->window)));
 
diff --git a/src/epiphany.gresource.xml b/src/epiphany.gresource.xml
index 7fa1d10..e2d0e77 100644
--- a/src/epiphany.gresource.xml
+++ b/src/epiphany.gresource.xml
@@ -12,10 +12,6 @@
     <file preprocess="xml-stripblanks" compressed="true">history-dialog.ui</file>
     <file preprocess="xml-stripblanks" compressed="true">passwords-dialog.ui</file>
     <file preprocess="xml-stripblanks" compressed="true">shortcuts-dialog.ui</file>
-    <file preprocess="xml-stripblanks" compressed="true">icons/ephy-bookmark-empty.svg</file>
-    <file preprocess="xml-stripblanks" compressed="true">icons/ephy-bookmark-full.svg</file>
-    <file preprocess="xml-stripblanks" compressed="true">icons/ephy-bookmark-tag.svg</file>
-    <file preprocess="xml-stripblanks" compressed="true">icons/ephy-bookmarks.svg</file>
     <file preprocess="xml-stripblanks" compressed="true">gtk/bookmark-properties-grid.ui</file>
     <file preprocess="xml-stripblanks" compressed="true">gtk/bookmark-row.ui</file>
     <file preprocess="xml-stripblanks" compressed="true">gtk/bookmarks-popover.ui</file>
@@ -33,4 +29,8 @@
     <file compressed="true">prism.css</file>
     <file compressed="true">prism.js</file>
   </gresource>
+  <gresource prefix="/org/gnome/Epiphany/icons">
+    <file compressed="true" 
alias="scalable/actions/ephy-bookmark-tag-symbolic.svg">icons/hicolor/scalable/actions/ephy-bookmark-tag-symbolic.svg</file>
+    <file compressed="true" 
alias="scalable/actions/ephy-bookmarks-symbolic.svg">icons/hicolor/scalable/actions/ephy-bookmarks-symbolic.svg</file>
+  </gresource>
 </gresources>
diff --git a/src/resources/epiphany.css b/src/resources/epiphany.css
index 013b1a8..02ac264 100644
--- a/src/resources/epiphany.css
+++ b/src/resources/epiphany.css
@@ -127,6 +127,9 @@ button.active-menu {
       box-shadow: none; }
 
 /* Bookmarks */
+.titlebar entry.starred image.right {
+  color: #fce94f; }
+
 .bookmarks-row button {
   opacity: 0; }
 .bookmarks-row:hover button {
diff --git a/src/resources/epiphany.scss b/src/resources/epiphany.scss
index c98b793..03a29ae 100644
--- a/src/resources/epiphany.scss
+++ b/src/resources/epiphany.scss
@@ -112,6 +112,10 @@ $edge_color: lighten($incognito_color, 13%);
 }
 
 /* Bookmarks */
+.titlebar entry.starred image.right {
+  color: #fce94f;
+}
+
 .bookmarks-row {
   button {
     opacity: 0;
diff --git a/src/resources/icons/ephy-bookmark-tag.svg 
b/src/resources/icons/hicolor/scalable/actions/ephy-bookmark-tag-symbolic.svg
similarity index 84%
rename from src/resources/icons/ephy-bookmark-tag.svg
rename to src/resources/icons/hicolor/scalable/actions/ephy-bookmark-tag-symbolic.svg
index 5b661a5..39626a6 100644
--- a/src/resources/icons/ephy-bookmark-tag.svg
+++ b/src/resources/icons/hicolor/scalable/actions/ephy-bookmark-tag-symbolic.svg
@@ -15,7 +15,7 @@
    id="svg7221"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="tag.svg">
+   sodipodi:docname="ephy-bookmark-tag-symbolic.svg">
   <defs
      id="defs7223" />
   <sodipodi:namedview
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="22.832423"
-     inkscape:cy="-5.8872186"
+     inkscape:zoom="45.254834"
+     inkscape:cx="8.1127432"
+     inkscape:cy="4.4986439"
      inkscape:document-units="px"
      inkscape:current-layer="g7890"
      showgrid="false"
@@ -37,8 +37,8 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:showpageshadow="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
+     inkscape:window-width="2560"
+     inkscape:window-height="1376"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
@@ -59,7 +59,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -75,13 +75,6 @@
         <g
            id="g7894"
            inkscape:label="tag">
-          <rect
-             
style="opacity:1;fill:#eaeaea;fill-opacity:0;stroke:#910f0f;stroke-width:0;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-             id="rect7821"
-             width="15.99999"
-             height="15.99999"
-             x="366.99826"
-             y="524.36218" />
           <path
              sodipodi:nodetypes="ccccsccccccccc"
              
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4,
 
4;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
diff --git a/src/resources/icons/ephy-bookmarks.svg 
b/src/resources/icons/hicolor/scalable/actions/ephy-bookmarks-symbolic.svg
similarity index 86%
rename from src/resources/icons/ephy-bookmarks.svg
rename to src/resources/icons/hicolor/scalable/actions/ephy-bookmarks-symbolic.svg
index 3ced9ee..b174985 100644
--- a/src/resources/icons/ephy-bookmarks.svg
+++ b/src/resources/icons/hicolor/scalable/actions/ephy-bookmarks-symbolic.svg
@@ -15,7 +15,7 @@
    id="svg7221"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="bookmarks.svg">
+   sodipodi:docname="ephy-bookmarks-symbolic.svg">
   <defs
      id="defs7223" />
   <sodipodi:namedview
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="19.359209"
-     inkscape:cy="7.9507135"
+     inkscape:zoom="1"
+     inkscape:cx="8.2824125"
+     inkscape:cy="11.498687"
      inkscape:document-units="px"
      inkscape:current-layer="g7201"
      showgrid="false"
@@ -37,8 +37,8 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:showpageshadow="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
+     inkscape:window-width="2560"
+     inkscape:window-height="1376"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="1" />
@@ -67,13 +67,6 @@
       <g
          id="g16974"
          inkscape:label="bookmarks">
-        <rect
-           y="461"
-           x="341.00369"
-           height="16"
-           width="16"
-           id="rect7203"
-           
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
         <path
            inkscape:connector-curvature="0"
            id="path7205"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]