wok diff marlin/stuff/marlin-icons.patch @ rev 20645

updated hostapd (2.6 -> 2.7)
author Hans-G?nter Theisgen
date Fri Jan 11 16:39:21 2019 +0100 (2019-01-11)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/marlin/stuff/marlin-icons.patch	Fri Jan 11 16:39:21 2019 +0100
     1.3 @@ -0,0 +1,129 @@
     1.4 +--- marlin-0.5/src/View/Chrome/ViewSwicher.vala
     1.5 ++++ marlin-0.5/src/View/Chrome/ViewSwicher.vala
     1.6 +@@ -74,16 +74,16 @@
     1.7 + 
     1.8 +             switcher = new ModeButton ();
     1.9 + 
    1.10 +-            icon = new Image.from_icon_name ("view-list-icons-symbolic", IconSize.MENU);
    1.11 ++            icon = new Image.from_icon_name ("view-list-icons", IconSize.MENU);
    1.12 +             icon.set_tooltip_text (_("View as icons"));
    1.13 +             switcher.append(icon);
    1.14 +-            list = new Image.from_icon_name ("view-list-details-symbolic", IconSize.MENU);
    1.15 ++            list = new Image.from_icon_name ("view-list-details", IconSize.MENU);
    1.16 +             list.set_tooltip_text (_("View as list"));
    1.17 +             switcher.append(list);
    1.18 +-            compact = new Image.from_icon_name ("view-list-compact-symbolic", IconSize.MENU);
    1.19 ++            compact = new Image.from_icon_name ("view-list-compact", IconSize.MENU);
    1.20 +             compact.set_tooltip_text (_("View as compact list"));
    1.21 +             switcher.append(compact);
    1.22 +-            miller = new Image.from_icon_name ("view-list-column-symbolic", IconSize.MENU);
    1.23 ++            miller = new Image.from_icon_name ("view-list-column", IconSize.MENU);
    1.24 +             miller.set_tooltip_text(_("View as column"));
    1.25 +             switcher.append(miller);
    1.26 +             
    1.27 +--- marlin-0.5/src/View/Window.vala
    1.28 ++++ marlin-0.5/src/View/Window.vala
    1.29 +@@ -703,13 +703,13 @@
    1.30 +                                { "Redo", Stock.REDO, N_("_Redo"),
    1.31 +                                  "<control>Y", N_("Redo the last action"),
    1.32 +                                  action_redo_callback },
    1.33 +-                               { "Up", "go-up-symbolic", N_("Open _Parent"),
    1.34 ++                               { "Up", "go-up", N_("Open _Parent"),
    1.35 +                                  "<alt>Up", N_("Open the parent folder"),
    1.36 +                                  action_go_up },
    1.37 +-                               { "Back", "go-previous-symbolic", N_("_Back"),
    1.38 ++                               { "Back", "go-previous", N_("_Back"),
    1.39 +                                  "<alt>Left", N_("Go to the previous visited location"),
    1.40 +                                  action_go_back },
    1.41 +-                               { "Forward", "go-next-symbolic", N_("_Forward"),
    1.42 ++                               { "Forward", "go-next", N_("_Forward"),
    1.43 +                                  "<alt>Right", N_("Go to the next visited location"),
    1.44 +                                  action_go_forward },
    1.45 +                                { "Reload", Stock.REFRESH, N_("_Reload"),
    1.46 +--- marlin-0.5/src/View/LocationBar.vala
    1.47 ++++ marlin-0.5/src/View/LocationBar.vala
    1.48 +@@ -110,7 +110,7 @@
    1.49 +             dir = Environment.get_user_special_dir(UserDirectory.MUSIC);
    1.50 +             if(dir.contains("/"))
    1.51 +             {
    1.52 +-                IconDirectory icon = {dir, "folder-music-symbolic", false, null, null, dir.split("/"), false, null};
    1.53 ++                IconDirectory icon = {dir, "folder-music", false, null, null, dir.split("/"), false, null};
    1.54 +                 icon.exploded[0] = "/";
    1.55 +                 add_icon(icon);
    1.56 +             }
    1.57 +@@ -119,7 +119,7 @@
    1.58 +             dir = Environment.get_user_special_dir(UserDirectory.PICTURES);
    1.59 +             if(dir.contains("/"))
    1.60 +             {
    1.61 +-                IconDirectory icon = {dir, "folder-pictures-symbolic", false, null, null, dir.split("/"), false, null};
    1.62 ++                IconDirectory icon = {dir, "folder-pictures", false, null, null, dir.split("/"), false, null};
    1.63 +                 icon.exploded[0] = "/";
    1.64 +                 add_icon(icon);
    1.65 +             }
    1.66 +@@ -128,7 +128,7 @@
    1.67 +             dir = Environment.get_user_special_dir(UserDirectory.VIDEOS);
    1.68 +             if(dir.contains("/"))
    1.69 +             {
    1.70 +-                IconDirectory icon = {dir, "folder-videos-symbolic", false, null, null, dir.split("/"), false, null};
    1.71 ++                IconDirectory icon = {dir, "folder-videos", false, null, null, dir.split("/"), false, null};
    1.72 +                 icon.exploded[0] = "/";
    1.73 +                 add_icon(icon);
    1.74 +             }
    1.75 +@@ -137,7 +137,7 @@
    1.76 +             dir = Environment.get_user_special_dir(UserDirectory.DOWNLOAD);
    1.77 +             if(dir.contains("/"))
    1.78 +             {
    1.79 +-                IconDirectory icon = {dir, "folder-downloads-symbolic", false, null, null, dir.split("/"), false, null};
    1.80 ++                IconDirectory icon = {dir, "folder-downloads", false, null, null, dir.split("/"), false, null};
    1.81 +                 icon.exploded[0] = "/";
    1.82 +                 add_icon(icon);
    1.83 +             }
    1.84 +@@ -146,7 +146,7 @@
    1.85 +             dir = Environment.get_user_special_dir(UserDirectory.DOCUMENTS);
    1.86 +             if(dir.contains("/"))
    1.87 +             {
    1.88 +-                IconDirectory icon = {dir, "folder-documents-symbolic", false, null, null, dir.split("/"), false, null};
    1.89 ++                IconDirectory icon = {dir, "folder-documents", false, null, null, dir.split("/"), false, null};
    1.90 +                 icon.exploded[0] = "/";
    1.91 +                 add_icon(icon);
    1.92 +             }
    1.93 +@@ -155,7 +155,7 @@
    1.94 +             dir = Environment.get_user_special_dir(UserDirectory.TEMPLATES);
    1.95 +             if(dir.contains("/"))
    1.96 +             {
    1.97 +-                IconDirectory icon = {dir, "folder-templates-symbolic", false, null, null, dir.split("/"), false, null};
    1.98 ++                IconDirectory icon = {dir, "folder-templates", false, null, null, dir.split("/"), false, null};
    1.99 +                 icon.exploded[0] = "/";
   1.100 +                 add_icon(icon);
   1.101 +             }
   1.102 +@@ -163,7 +163,7 @@
   1.103 +             dir = Environment.get_home_dir();
   1.104 +             if(dir.contains("/"))
   1.105 +             {
   1.106 +-                IconDirectory icon = {dir, "go-home-symbolic", false, null, null, dir.split("/"), true, null};
   1.107 ++                IconDirectory icon = {dir, "go-home", false, null, null, dir.split("/"), true, null};
   1.108 +                 icon.exploded[0] = "/";
   1.109 +                 add_icon(icon);
   1.110 +             }
   1.111 +--- marlin-0.5/src/View/Chrome/TopMenu.vala
   1.112 ++++ marlin-0.5/src/View/Chrome/TopMenu.vala
   1.113 +@@ -43,7 +43,7 @@
   1.114 +             compact_menu = (Gtk.Menu) win.ui.get_widget("/CompactMenu");
   1.115 +             toolbar_menu = (Gtk.Menu) win.ui.get_widget("/ToolbarMenu");
   1.116 + 
   1.117 +-            app_menu = new Varka.Widgets.ToolButtonWithMenu (new Image.from_icon_name ("emblem-system-symbolic", IconSize.MENU), 
   1.118 ++            app_menu = new Varka.Widgets.ToolButtonWithMenu (new Image.from_icon_name ("emblem-system", IconSize.MENU), 
   1.119 +                                                              null, _("Menu"), compact_menu);
   1.120 +             setup_items();
   1.121 +             show();
   1.122 +--- marlin-0.5/libwidgets/BreadcrumbsEntry.vala
   1.123 ++++ marlin-0.5/libwidgets/BreadcrumbsEntry.vala
   1.124 +@@ -74,7 +74,7 @@
   1.125 +         
   1.126 +         /* Load arrow image */
   1.127 +         try {
   1.128 +-            arrow_img = IconTheme.get_default ().load_icon ("go-jump-symbolic", 16, IconLookupFlags.GENERIC_FALLBACK);
   1.129 ++            arrow_img = IconTheme.get_default ().load_icon ("go-jump", 16, IconLookupFlags.GENERIC_FALLBACK);
   1.130 +         } catch(Error err) {
   1.131 +             stderr.printf ("Unable to load home icon: %s", err.message);
   1.132 +         }