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