← Back to branch summary

~optimisme/pantheon-files/1067061

« back to all changes in this revision

Viewing changes to src/View/LocationBar.vala

  • Committer: Cody Garver
  • Date: 2013-05-12 07:03:15 UTC
  • mfrom: (1170.1.4 files-fix)
  • Revision ID: cody@elementaryos.org-20130512070315-6ja1dmwlhmbhit8d
Refactor icon variables and implement some more symbolics to fix bug #1087694.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/View/LocationBar.vala
107
107
            /*add_icon({ Marlin.TRASH_URI, Marlin.ICON_TRASH, true, null, null, true, N_("Trash")});
108
108
            add_icon({ Marlin.NETWORK_URI, Marlin.ICON_NETWORK, true, null, null, true, N_("Network")});*/
109
109
            /* FIXME the string split of the path url is kinda too basic, we should use the Gile to split our uris and determine the protocol (if any) with g_uri_parse_scheme or g_file_get_uri_scheme */
110
 
            add_icon({ "trash://", Marlin.ICON_TRASH, true, null, null, null, true, _("Trash")});
111
 
            add_icon({ "network://", Marlin.ICON_NETWORK, true, null, null, null, true, _("Network")});
 
110
            add_icon({ "trash://", Marlin.ICON_TRASH_SYMBOLIC, true, null, null, null, true, _("Trash")});
 
111
            add_icon({ "network://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, _("Network")});
112
112
 
113
113
            /* music */
114
114
            string dir;
115
115
            dir = Environment.get_user_special_dir(UserDirectory.MUSIC);
116
116
            if(dir.contains("/"))
117
117
            {
118
 
                IconDirectory icon = {dir, "folder-music-symbolic", false, null, null, dir.split("/"), false, null};
 
118
                IconDirectory icon = {dir, Marlin.ICON_FOLDER_MUSIC_SYMBOLIC, false, null, null, dir.split("/"), false, null};
119
119
                icon.exploded[0] = "/";
120
120
                add_icon(icon);
121
121
            }
124
124
            dir = Environment.get_user_special_dir(UserDirectory.PICTURES);
125
125
            if(dir.contains("/"))
126
126
            {
127
 
                IconDirectory icon = {dir, "folder-pictures-symbolic", false, null, null, dir.split("/"), false, null};
 
127
                IconDirectory icon = {dir, Marlin.ICON_FOLDER_PICTURES_SYMBOLIC, false, null, null, dir.split("/"), false, null};
128
128
                icon.exploded[0] = "/";
129
129
                add_icon(icon);
130
130
            }
133
133
            dir = Environment.get_user_special_dir(UserDirectory.VIDEOS);
134
134
            if(dir.contains("/"))
135
135
            {
136
 
                IconDirectory icon = {dir, "folder-videos-symbolic", false, null, null, dir.split("/"), false, null};
 
136
                IconDirectory icon = {dir, Marlin.ICON_FOLDER_VIDEOS_SYMBOLIC, false, null, null, dir.split("/"), false, null};
137
137
                icon.exploded[0] = "/";
138
138
                add_icon(icon);
139
139
            }
142
142
            dir = Environment.get_user_special_dir(UserDirectory.DOWNLOAD);
143
143
            if(dir.contains("/"))
144
144
            {
145
 
                IconDirectory icon = {dir, "folder-downloads-symbolic", false, null, null, dir.split("/"), false, null};
 
145
                IconDirectory icon = {dir, Marlin.ICON_FOLDER_DOWNLOADS_SYMBOLIC, false, null, null, dir.split("/"), false, null};
146
146
                icon.exploded[0] = "/";
147
147
                add_icon(icon);
148
148
            }
151
151
            dir = Environment.get_user_special_dir(UserDirectory.DOCUMENTS);
152
152
            if(dir.contains("/"))
153
153
            {
154
 
                IconDirectory icon = {dir, "folder-documents-symbolic", false, null, null, dir.split("/"), false, null};
 
154
                IconDirectory icon = {dir, Marlin.ICON_FOLDER_DOCUMENTS_SYMBOLIC, false, null, null, dir.split("/"), false, null};
155
155
                icon.exploded[0] = "/";
156
156
                add_icon(icon);
157
157
            }
160
160
            dir = Environment.get_user_special_dir(UserDirectory.TEMPLATES);
161
161
            if(dir.contains("/"))
162
162
            {
163
 
                IconDirectory icon = {dir, "folder-templates-symbolic", false, null, null, dir.split("/"), false, null};
 
163
                IconDirectory icon = {dir, Marlin.ICON_FOLDER_TEMPLATES_SYMBOLIC, false, null, null, dir.split("/"), false, null};
164
164
                icon.exploded[0] = "/";
165
165
                add_icon(icon);
166
166
            }
168
168
            dir = Environment.get_home_dir();
169
169
            if(dir.contains("/"))
170
170
            {
171
 
                IconDirectory icon = {dir, "go-home-symbolic", false, null, null, dir.split("/"), true, null};
 
171
                IconDirectory icon = {dir, Marlin.ICON_GO_HOME_SYMBOLIC, false, null, null, dir.split("/"), true, null};
172
172
                icon.exploded[0] = "/";
173
173
                add_icon(icon);
174
174
            }
175
175
 
176
176
            
177
 
            IconDirectory icon = {"/", Marlin.ICON_FILESYSTEM, false, null, null, null, false, null};
 
177
            IconDirectory icon = {"/", Marlin.ICON_FILESYSTEM_SYMBOLIC, false, null, null, null, false, null};
178
178
            icon.exploded = {"/"};
179
179
            add_icon(icon);
180
180