wok-6.x view marlin/stuff/marlin-icons.patch @ rev 22735
updated discount and discount-dev again (2.2.5 -> 2.2.6)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Thu Jan 23 17:34:22 2020 +0100 (2020-01-23) |
| parents | |
| children |
line source
1 --- marlin-0.5/src/View/Chrome/ViewSwicher.vala
2 +++ marlin-0.5/src/View/Chrome/ViewSwicher.vala
3 @@ -74,16 +74,16 @@
5 switcher = new ModeButton ();
7 - icon = new Image.from_icon_name ("view-list-icons-symbolic", IconSize.MENU);
8 + icon = new Image.from_icon_name ("view-list-icons", IconSize.MENU);
9 icon.set_tooltip_text (_("View as icons"));
10 switcher.append(icon);
11 - list = new Image.from_icon_name ("view-list-details-symbolic", IconSize.MENU);
12 + list = new Image.from_icon_name ("view-list-details", IconSize.MENU);
13 list.set_tooltip_text (_("View as list"));
14 switcher.append(list);
15 - compact = new Image.from_icon_name ("view-list-compact-symbolic", IconSize.MENU);
16 + compact = new Image.from_icon_name ("view-list-compact", IconSize.MENU);
17 compact.set_tooltip_text (_("View as compact list"));
18 switcher.append(compact);
19 - miller = new Image.from_icon_name ("view-list-column-symbolic", IconSize.MENU);
20 + miller = new Image.from_icon_name ("view-list-column", IconSize.MENU);
21 miller.set_tooltip_text(_("View as column"));
22 switcher.append(miller);
24 --- marlin-0.5/src/View/Window.vala
25 +++ marlin-0.5/src/View/Window.vala
26 @@ -703,13 +703,13 @@
27 { "Redo", Stock.REDO, N_("_Redo"),
28 "<control>Y", N_("Redo the last action"),
29 action_redo_callback },
30 - { "Up", "go-up-symbolic", N_("Open _Parent"),
31 + { "Up", "go-up", N_("Open _Parent"),
32 "<alt>Up", N_("Open the parent folder"),
33 action_go_up },
34 - { "Back", "go-previous-symbolic", N_("_Back"),
35 + { "Back", "go-previous", N_("_Back"),
36 "<alt>Left", N_("Go to the previous visited location"),
37 action_go_back },
38 - { "Forward", "go-next-symbolic", N_("_Forward"),
39 + { "Forward", "go-next", N_("_Forward"),
40 "<alt>Right", N_("Go to the next visited location"),
41 action_go_forward },
42 { "Reload", Stock.REFRESH, N_("_Reload"),
43 --- marlin-0.5/src/View/LocationBar.vala
44 +++ marlin-0.5/src/View/LocationBar.vala
45 @@ -110,7 +110,7 @@
46 dir = Environment.get_user_special_dir(UserDirectory.MUSIC);
47 if(dir.contains("/"))
48 {
49 - IconDirectory icon = {dir, "folder-music-symbolic", false, null, null, dir.split("/"), false, null};
50 + IconDirectory icon = {dir, "folder-music", false, null, null, dir.split("/"), false, null};
51 icon.exploded[0] = "/";
52 add_icon(icon);
53 }
54 @@ -119,7 +119,7 @@
55 dir = Environment.get_user_special_dir(UserDirectory.PICTURES);
56 if(dir.contains("/"))
57 {
58 - IconDirectory icon = {dir, "folder-pictures-symbolic", false, null, null, dir.split("/"), false, null};
59 + IconDirectory icon = {dir, "folder-pictures", false, null, null, dir.split("/"), false, null};
60 icon.exploded[0] = "/";
61 add_icon(icon);
62 }
63 @@ -128,7 +128,7 @@
64 dir = Environment.get_user_special_dir(UserDirectory.VIDEOS);
65 if(dir.contains("/"))
66 {
67 - IconDirectory icon = {dir, "folder-videos-symbolic", false, null, null, dir.split("/"), false, null};
68 + IconDirectory icon = {dir, "folder-videos", false, null, null, dir.split("/"), false, null};
69 icon.exploded[0] = "/";
70 add_icon(icon);
71 }
72 @@ -137,7 +137,7 @@
73 dir = Environment.get_user_special_dir(UserDirectory.DOWNLOAD);
74 if(dir.contains("/"))
75 {
76 - IconDirectory icon = {dir, "folder-downloads-symbolic", false, null, null, dir.split("/"), false, null};
77 + IconDirectory icon = {dir, "folder-downloads", false, null, null, dir.split("/"), false, null};
78 icon.exploded[0] = "/";
79 add_icon(icon);
80 }
81 @@ -146,7 +146,7 @@
82 dir = Environment.get_user_special_dir(UserDirectory.DOCUMENTS);
83 if(dir.contains("/"))
84 {
85 - IconDirectory icon = {dir, "folder-documents-symbolic", false, null, null, dir.split("/"), false, null};
86 + IconDirectory icon = {dir, "folder-documents", false, null, null, dir.split("/"), false, null};
87 icon.exploded[0] = "/";
88 add_icon(icon);
89 }
90 @@ -155,7 +155,7 @@
91 dir = Environment.get_user_special_dir(UserDirectory.TEMPLATES);
92 if(dir.contains("/"))
93 {
94 - IconDirectory icon = {dir, "folder-templates-symbolic", false, null, null, dir.split("/"), false, null};
95 + IconDirectory icon = {dir, "folder-templates", false, null, null, dir.split("/"), false, null};
96 icon.exploded[0] = "/";
97 add_icon(icon);
98 }
99 @@ -163,7 +163,7 @@
100 dir = Environment.get_home_dir();
101 if(dir.contains("/"))
102 {
103 - IconDirectory icon = {dir, "go-home-symbolic", false, null, null, dir.split("/"), true, null};
104 + IconDirectory icon = {dir, "go-home", false, null, null, dir.split("/"), true, null};
105 icon.exploded[0] = "/";
106 add_icon(icon);
107 }
108 --- marlin-0.5/src/View/Chrome/TopMenu.vala
109 +++ marlin-0.5/src/View/Chrome/TopMenu.vala
110 @@ -43,7 +43,7 @@
111 compact_menu = (Gtk.Menu) win.ui.get_widget("/CompactMenu");
112 toolbar_menu = (Gtk.Menu) win.ui.get_widget("/ToolbarMenu");
114 - app_menu = new Varka.Widgets.ToolButtonWithMenu (new Image.from_icon_name ("emblem-system-symbolic", IconSize.MENU),
115 + app_menu = new Varka.Widgets.ToolButtonWithMenu (new Image.from_icon_name ("emblem-system", IconSize.MENU),
116 null, _("Menu"), compact_menu);
117 setup_items();
118 show();
119 --- marlin-0.5/libwidgets/BreadcrumbsEntry.vala
120 +++ marlin-0.5/libwidgets/BreadcrumbsEntry.vala
121 @@ -74,7 +74,7 @@
123 /* Load arrow image */
124 try {
125 - arrow_img = IconTheme.get_default ().load_icon ("go-jump-symbolic", 16, IconLookupFlags.GENERIC_FALLBACK);
126 + arrow_img = IconTheme.get_default ().load_icon ("go-jump", 16, IconLookupFlags.GENERIC_FALLBACK);
127 } catch(Error err) {
128 stderr.printf ("Unable to load home icon: %s", err.message);
129 }