Merge lp:~victored/pantheon-files/no-menubar into lp:~elementary-apps/pantheon-files/trunk

[Victor Martinez]

- Remove dead code related to the context view
- Don't allow a menubar to be displayed inside the window. Menu support has been kept so that a global menu can still be used.

This branch doesn't allow any menubar to be displayed inside Files' window.

* Also drops dead code related to the already-removed context view/sidebar.

[lp:~victored/pantheon-files/no-menubar]

1164. By Victor Martinez on 2013-05-13

drop unnecessary built-in theming

1165. By Victor Martinez on 2013-05-13

Merge trunk

[Danielle Foré (danrabbit)]

Right clicking the toolbar seems to show an empty menu. Otherwise this works.

We should probably retain the toolbar menu item for hide/show source list until we figure out a better way to do this.

review: Needs Fixing

[Victor Martinez (victored)]

Thanks for the review Daniel,

I cannot reproduce that issue here.

Did you install the updated pantheon-files-ui.xml file? (i.e. run sudo make install)

[Danielle Foré (danrabbit)]

Ah Victor, you're correct. If I actually install it it works perfectly.

Today is a good day to piss off some more people. Approve ;)

review: Approve

[Victor Martinez (victored)]

haha let me go get my shield

=== renamed file 'src/View/Animations.vala' => 'libwidgets/Animations.vala'
--- src/View/Animations.vala	2011-12-23 02:45:45 +0000
+++ libwidgets/Animations.vala	2013-05-13 19:45:28 +0000
@@ -1,6 +1,6 @@
 namespace Marlin.Animation {
-    
-    static void smooth_adjustment_to (Gtk.Adjustment adj, int final) 
+
+    public static void smooth_adjustment_to (Gtk.Adjustment adj, int final)
     {
         var initial = adj.value;
         var to_do = final - initial;
 
=== modified file 'libwidgets/CMakeLists.txt'
--- libwidgets/CMakeLists.txt	2013-04-22 07:45:04 +0000
+++ libwidgets/CMakeLists.txt	2013-05-13 19:45:28 +0000
@@ -35,6 +35,7 @@
 link_directories(${LIB_PATHS})
 
 vala_precompile(VALA_C ${PKGNAME}
+    Animations.vala
     LocationBar.vala
     BreadcrumbsElements.vala
     BreadcrumbsEntry.vala
 
=== modified file 'schemas/org.pantheon.files.gschema.xml'
--- schemas/org.pantheon.files.gschema.xml	2013-05-12 21:15:15 +0000
+++ schemas/org.pantheon.files.gschema.xml	2013-05-13 19:45:28 +0000
@@ -14,11 +14,6 @@
     <value value="5" nick="larger"/>
     <value value="6" nick="largest"/>
   </enum>
-  <enum id="contextviewmode">
-    <value value="0" nick="horizontal"/>
-    <value value="1" nick="vertical"/>
-    <value value="2" nick="auto"/>
-  </enum>
   <enum id="dateformatmode">
     <value value="0" nick="iso"/>
     <value value="1" nick="locale"/>
@@ -26,16 +21,6 @@
   </enum>
 
   <schema path="/org/pantheon/files/preferences/" id="org.pantheon.files.preferences">
-    <key type="b" name="auto-theme">
-      <default>false</default>
-      <summary>Auto-theme</summary>
-      <description>Automaticly theme Marlin's specific widgets</description>
-    </key>
-    <key type="b" name="show-menubar">
-      <default>false</default>
-      <summary>Show the menubar</summary>
-      <description>Show the menubar</description>
-    </key>
     <key type="b" name="show-sidebar">
       <default>true</default>
       <summary>Show the sidebar</summary>
@@ -46,11 +31,6 @@
       <summary>Show hidden files</summary>
       <description>If set to true, hidden files will also be shown (files starting with a "." for example)</description>
     </key>
-    <key type="b" name="start-with-contextview">
-      <default>false</default>
-      <summary>Show the context view pane</summary>
-      <description>Show the context view pane</description>
-    </key>
     <key type="b" name="rgba-colormap">
       <default>false</default>
       <summary>enable rgba window</summary>
@@ -92,13 +72,6 @@
       <summary>interpret desktop files</summary>
       <description>If true the desktop files would be interpreted, a desktop file can represent an executable, a directory etc. (their filename, type and some other properties would be the target ones)</description>
     </key>
-    <key name="contextview-orientation" enum="contextviewmode">
-      <default>'auto'</default>
-      <summary>Context View Panel orientation</summary>
-      <description>
-        Auto Context View Panel orientation means the panel would be horizontal or vertical depending on the size of your window.
-      </description>
-    </key>
     <key name="default-viewmode" enum="viewmode">
       <default>'icon'</default>
       <summary>Default viewmode when browsing</summary>
@@ -106,11 +79,6 @@
         The default viewmode to be used when opening a new tab or window
       </description>
     </key>
-    <key type="b" name="toolbar-primary-css-style">
-      <default>true</default>
-      <summary>toolbar css style</summary>
-      <description>Set the toolbar css style to primary-toolbar.</description>
-    </key>
     <key type="as" name="toolbar-items">
       <default>[ 'Back', 'Forward', 'ViewSwitcher', 'LocationEntry']</default>
       <summary>List of actions present in the toolbar</summary>
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-05-13 09:26:42 +0000
+++ src/CMakeLists.txt	2013-05-13 19:45:28 +0000
@@ -48,12 +48,10 @@
     View/Resources.vala
     View/DbusTags.vala
     View/ViewContainer.vala
-    View/ContextView.vala
     View/OverlayBar.vala
     View/PropertiesWindow.vala
     View/Browser.vala
     View/ViewMode.vala
-    View/Animations.vala
     View/LocationBar.vala
     View/Chrome/TopMenu.vala
     View/Chrome/ViewSwicher.vala
 
=== modified file 'src/View/Chrome/TopMenu.vala'
--- src/View/Chrome/TopMenu.vala	2013-02-22 15:03:12 +0000
+++ src/View/Chrome/TopMenu.vala	2013-05-13 19:45:28 +0000
@@ -35,8 +35,8 @@
         public TopMenu (Window window)
         {
             win = window;
-            if (Preferences.settings.get_boolean("toolbar-primary-css-style"))
-	            get_style_context().add_class (Gtk.STYLE_CLASS_PRIMARY_TOOLBAR);
+
+            get_style_context ().add_class (Gtk.STYLE_CLASS_PRIMARY_TOOLBAR);
 
             compact_menu = (Gtk.Menu) win.ui.get_widget("/CompactMenu");
             toolbar_menu = (Gtk.Menu) win.ui.get_widget("/ToolbarMenu");
@@ -44,6 +44,8 @@
             app_menu = new Granite.Widgets.AppMenu (compact_menu);
             setup_items();
             show();
+
+            app_menu.show_all ();
         }
 
         public override bool popup_context_menu (int x, int y, int button) {
 
=== removed file 'src/View/ContextView.vala'
--- src/View/ContextView.vala	2013-01-19 23:24:06 +0000
+++ src/View/ContextView.vala	1970-01-01 00:00:00 +0000
@@ -1,481 +0,0 @@
-//
-//  ContextView.vala
-//
-//  Authors:
-//       Mathijs Henquet <[e-mail]>
-//       ammonkey <[e-mail]>
-//
-//  Copyright (c) 2011 Mathijs Henquet
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-using Gtk;
-using Gdk;
-using Cairo;
-using Gee;
-using Granite.Widgets;
-
-namespace Marlin.View {
-
-    public class ContextView : Gtk.EventBox
-    {
-        public const int height = 48;
-        public const int width = 190;
-        public const int key_value_padding = 8;
-        public const int key_value_width = 90;
-        public Gtk.Menu toolbar_menu;
-
-        public int panel_size{
-            get{
-                switch (orientation){
-                case Gtk.Orientation.HORIZONTAL:
-                    return height;
-                case Gtk.Orientation.VERTICAL:
-                default:
-                    return width;
-                }
-            }
-        }
-
-        private Window window;
-        private Gdk.Pixbuf? pixbuf {
-            set{
-                if (value != null)
-                    evbox.set_from_pixbuf (value);
-            }
-        }
-
-        private ImgEventBox evbox;
-        private Label label;
-        private Gee.List<Pair<string, string>> info;
-        private uint timeout = 0;
-        private uint timeout_update = 0;
-        private bool first_alloc = true;
-        private Allocation cv_alloc;    /* last allocation of the contextview */
-        private bool should_sync;
-
-        private GOF.File? last_gof = null;
-        private ulong icon_changed_callback = 0;
-        private unowned GLib.List<GOF.File>? last_selection = null;
-
-        private Orientation _orientation = Gtk.Orientation.HORIZONTAL;
-        public Orientation orientation {
-            set{
-                if(timeout != 0){
-                    Source.remove(timeout);
-                    timeout = 0;
-                }
-                first_alloc = true;
-                
-                _orientation = value;
-                change_css_class ();
-                /* reset pane position to original values */
-                window.main_box.set_position (window.main_box.max_position - panel_size);
-                //SPOTTED!
-                update(last_selection);
-            }
-            get{
-                return _orientation;
-            }
-        }
-
-        public Orientation parent_orientation {
-            set{
-                orientation = convert_parent_orientation(value);
-            }
-        }
-
-        private Orientation convert_parent_orientation (Orientation o) {
-            switch (o){
-            case Gtk.Orientation.HORIZONTAL:
-                return Gtk.Orientation.VERTICAL;
-            case Gtk.Orientation.VERTICAL:
-            default:
-                return Gtk.Orientation.HORIZONTAL;
-            }
-        }
-
-        /* TODO remove should_sync? */
-        public ContextView (Window window, bool _should_sync, 
-                           Gtk.Orientation parent_orientation = Gtk.Orientation.VERTICAL) 
-        {
-            this.window = window;
-            _orientation = convert_parent_orientation(parent_orientation);
-
-            should_sync = _should_sync;
-            if (should_sync) { 
-                window.selection_changed.connect (update);
-                window.item_hovered.connect (update_hovered);
-                change_css_class ();
-            }
-            
-            label = new Label("");
-            var font_style = new Pango.FontDescription();
-            font_style.set_size(14 * 1000);
-            label.override_font(font_style);
-            //label.ellipsize = Pango.EllipsizeMode.MIDDLE;
-            label.set_line_wrap (true);
-            label.set_line_wrap_mode (Pango.WrapMode.CHAR);
-            label.set_width_chars (10);
-            label.set_padding(key_value_padding, -1);
-
-            evbox = new ImgEventBox(Orientation.HORIZONTAL);
-
-            info = new LinkedList<Pair<string, string>>();
-        
-            toolbar_menu = (Gtk.Menu) window.ui.get_widget("/ToolbarMenu");
-            button_press_event.connect(right_click);
-            size_allocate.connect(size_allocate_changed);
-        }
-        
-        private void change_css_class () {
-            var ctx = window.main_box.get_style_context();
-
-            if (orientation == Orientation.VERTICAL) {
-                ctx.remove_class("contextview-horizontal");
-                ctx.add_class("contextview-vertical");
-            } else {
-                ctx.remove_class("contextview-vertical");
-                ctx.add_class("contextview-horizontal");
-            }
-            
-            window.main_box.reset_style ();
-        }
-
-#if VALA_0_14
-        private void size_allocate_changed (Gtk.Allocation s)
-#else
-        private void size_allocate_changed (Widget w, Gdk.Rectangle s)
-#endif
-        {
-            /* first allocations can be tricky ignore all allocations different 
-               than the panel requested size at first */
-            if (first_alloc) {
-                if (orientation == Orientation.VERTICAL && 
-                    s.width > 1 && s.width <= panel_size)
-                    first_alloc = false;
-                if (orientation == Orientation.HORIZONTAL && 
-                    s.height > 1 && s.height <= panel_size)
-                    first_alloc = false;
-            }
-            /*if (first_alloc && !should_sync) 
-                return;*/
-
-            //amtest
-            /*stdout.printf ("::::: %d %d :: %d %d\n", cv_alloc.width, cv_alloc.height,
-                           s.width, s.height);*/
-            if ((orientation == Orientation.VERTICAL && cv_alloc.width != s.width) ||
-                (orientation == Orientation.HORIZONTAL && cv_alloc.height != s.height)) {
-                //stdout.printf ("$$$$$$$$$$$ img alloc %d\n", s.width);
-                /* TODO don't create/destroy the contextview in miller */
-                //message ("zz");
-                if(timeout != 0){
-                    Source.remove(timeout);
-                    timeout = 0;
-                }
-                timeout = Timeout.add(300, () => {
-                    //message ("wwwwwwwwwwwww");
-                    update_icon();
-                    timeout = 0;
-
-                    return false;
-                });
-            }
-        
-        }
-
-        public bool right_click(Gdk.EventButton event)
-        {
-            if(event.button == 3)
-            {
-                Eel.pop_up_context_menu(toolbar_menu, 0, 0, event);
-                return true;
-            }
-            return false;
-        }
-
-        private void update_icon()
-        {
-            Allocation alloc;
-            int icon_size_req;
-    		
-            if (last_gof == null)
-                return;
-
-            //window.get_size(out w_width, out w_height);
-            get_allocation(out alloc);
-            cv_alloc = alloc;
-            //stdout.printf ("$$$$$$$$$ real alloc %d %d\n", alloc.width, alloc.height);
-           
-            /* fixing a minimum and maximum value */
-            if (orientation == Orientation.VERTICAL) {
-                /* add a little 16px padding for normal icons */
-                if (last_gof.info.has_attribute (FileAttribute.THUMBNAIL_PATH) &&
-                    last_gof.info.get_attribute_byte_string (FileAttribute.THUMBNAIL_PATH) != null) {
-                    icon_size_req = alloc.width.clamp (height, 256);
-                } else {
-                    icon_size_req = alloc.width.clamp (height, width-16);
-                }
-            } else {
-                icon_size_req = alloc.height.clamp (height, 256);
-            }
-
-            /*if (last_gof.thumbnail_path != null) {
-                //pixbuf = yield Pixbuf from_stream_at_scale_async ();
-                pixbuf = new Pixbuf.from_file (last_gof.thumbnail_path);
-            }*/
-
-            //pixbuf = last_gof.get_icon_pixbuf (icon_size_req, false, GOF.FileIconFlags.USE_THUMBNAILS);
-            string preview = last_gof.get_preview_path();
-            bool use_previewed = false;
-            if(preview != null)
-            {
-                try
-                {
-                    pixbuf = new Gdk.Pixbuf.from_file_at_size (preview, icon_size_req, -1); // FIXME need cache
-                    use_previewed = true;
-                }
-                catch(Error e)
-                {
-                }
-            }
-            else if(last_gof.get_thumbnail_path() != null && last_gof.flags == GOF.File.ThumbState.READY)
-            {
-                Marlin.Thumbnailer.get().queue_file(last_gof, null, true);
-            }
-            if(!use_previewed)
-            {
-                var micon = last_gof.get_icon (128, GOF.FileIconFlags.USE_THUMBNAILS);
-                pixbuf = micon.get_pixbuf_at_size (icon_size_req);
-            }
-
-            
-            /* TODO ask tumbler a LARGE thumb for size > 128 */
-            /*if (should_sync && (icon_size_req > w_width/2 || icon_size_req > w_height/2))
-                window.main_box.set_position (window.main_box.max_position - icon_size_req);*/
-        }
-
-        public void update (GLib.List<GOF.File>? selection = null) {
-            if (icon_changed_callback > 0) {
-                Source.remove((uint) icon_changed_callback);
-                icon_changed_callback = 0;
-            }
-
-            if (selection != null && selection.data != null && selection.data is GOF.File) {
-                last_gof = selection.data as GOF.File;
-                last_selection = selection;
-            } else {
-                last_gof = null;
-                /* if empty selection then pass the currentslot folder */
-                if (window.current_tab != null) {
-                    var aslot = window.current_tab.get_active_slot ();
-                    if (aslot != null)
-                        last_gof = aslot.directory.file;
-                }
-                last_selection = null;
-            }
-            if (last_gof == null)
-                return;
-            if (last_gof.info == null)
-                return;
-
-            timed_update ();
-        }
-        
-        public void update_hovered (GOF.File? file) {
-            if (file != null) {
-                last_gof = file;
-                timed_update ();
-            } else {
-                update (last_selection);       
-            }
-        }
-
-        private void timed_update () {
-            if(timeout_update != 0){
-                Source.remove(timeout_update);
-                timeout_update = 0;
-            }
-            timeout_update = Timeout.add(60, () => {
-                real_update ();
-                timeout_update = 0;
-
-                return false;
-            });
-        }
-
-        private void real_update () {
-            //warning ("ctx pane update");
-            return_if_fail (last_gof != null && last_gof.info != null);
-
-            /* don't update icon if we are in column view as the preview pane is 
-               built/destroyed foreach selection changed */
-            if (should_sync) 
-                update_icon();
-            icon_changed_callback = last_gof.icon_changed.connect (() => {
-                if (should_sync) 
-                    update_icon ();
-            });
-
-            info.clear();
-            var raw_type = last_gof.info.get_file_type();
-
-            /* TODO hide infos for ListView mode: we don't want the COLUMNS infos to show if
-               we are in listview: size, type, modified */
-            info.add(new Pair<string, string>(_("Name") + (": "), last_gof.info.get_name ()));
-            info.add(new Pair<string, string>(_("Type") + (": "), last_gof.formated_type));
-
-            if (last_gof.info.get_is_symlink())
-                info.add(new Pair<string, string>(_("Target") + (": "), last_gof.info.get_symlink_target ()));
-            if(raw_type != FileType.DIRECTORY)
-                info.add(new Pair<string, string>(_("Size") + (": "), last_gof.format_size));
-            /* localized time depending on MARLIN_PREFERENCES_DATE_FORMAT locale, iso .. */
-            info.add(new Pair<string, string>(_("Modified") + (": "), last_gof.formated_modified));
-            info.add(new Pair<string, string>(_("Owner") + (": "), last_gof.info.get_attribute_string(FileAttribute.OWNER_USER_REAL)));
-
-            label.label = last_gof.info.get_name ();
-
-            update_info_panel();
-            show();
-        }
-
-        public void update_info_panel(){
-            if(orientation == Gtk.Orientation.HORIZONTAL)
-                construct_info_panel_horizontal(info);
-            else
-                construct_info_panel_vertical(info);
-        }
-
-        private void construct_info_panel_vertical(Gee.List<Pair<string, string>> item_info){
-            var box = new Box (Gtk.Orientation.VERTICAL, 0);
-            
-            set_size_request (width, -1);
-
-            /*var blank_box = new VBox(false, 0);
-            blank_box.set_size_request (-1, 20);
-            box.pack_start(blank_box, false, false, 0);*/
-
-            if (evbox != null) {
-                if (evbox.parent != null)
-                    evbox.parent.remove(evbox);
-                evbox.orientation = convert_parent_orientation(orientation);
-                box.pack_start(evbox, false, true, 0);
-            }
-            if (label != null) {
-                if (label.parent != null)
-                    label.parent.remove(label);
-                label.set_selectable(true);
-                label.set_tooltip_text (last_gof.info.get_name ());
-                box.pack_start(label, false, false);
-            }
-            
-            var sep = new Gtk.Separator(Gtk.Orientation.HORIZONTAL);
-            sep.set_margin_top (4);
-            sep.set_margin_bottom (10);
-            box.pack_start(sep, false, false);
-
-            var information = new Grid();
-            information.row_spacing = 3;
-            var alignment_ = new Gtk.Alignment(0.5f, 0, 0, 0);
-
-            int n = 0;
-            foreach(var pair in item_info){
-                /* skip the firs parameter "name" for vertical panel */
-                if (n>0) {
-
-                    var lval = new Gtk.Label (pair.value);
-                    var lkey = new Gtk.Label (pair.key);
-                    lval.set_selectable(true);
-                    lkey.set_sensitive (false);
-                    lkey.set_alignment (1, 0);
-                    lval.set_alignment (0, 0);
-                    //lval.set_ellipsize(Pango.EllipsizeMode.MIDDLE);
-                    lval.set_line_wrap (true);
-                    lval.set_width_chars (10);
-
-                    information.attach(lkey, 0, n, 1, 1);
-                    information.attach(lval, 1, n, 1, 1);
-                }
-                n++;
-            }
-            alignment_.add(information);
-            box.pack_start(alignment_);
-            
-            box.show_all();
-            set_content(box);
-        }
-
-        private void construct_info_panel_horizontal(Gee.List<Pair<string, string>> item_info){
-            var box = new Box (Gtk.Orientation.HORIZONTAL, 0);
-
-            set_size_request (-1, height);
-            if (evbox != null) {
-                if (evbox.parent != null)
-                    evbox.parent.remove(evbox);
-                evbox.orientation = convert_parent_orientation(orientation);
-                box.pack_start(evbox, false, true, 0);
-            }
-
-            var alignment = new Gtk.Alignment(0, 0.5f, 0, 0);
-            var grid = new Grid ();
-            grid.set_orientation (Gtk.Orientation.HORIZONTAL);
-            alignment.add (grid);
-            box.add (alignment);
-
-            var i = 0;
-            foreach(var pair in item_info){
-                var left = (int) i/2 + i/2;
-                var top = i % 2;
-                //warning ("left %d top %d", left, top);
-            
-                var lkey = new Gtk.Label (pair.key);
-                //lkey.set_size_request (65, -1);
-                lkey.set_state_flags (Gtk.StateFlags.INSENSITIVE, false);
-                //lkey.set_justify(Justification.RIGHT);
-                lkey.set_alignment(1, 0);
-                grid.attach (lkey, left, top, 1, 1);
-
-                var lval = new Label (pair.value);
-                lval.set_selectable(true);
-                lval.set_margin_right (10);
-                lval.set_alignment(0, 0);
-                lval.set_width_chars (10);
-                lval.set_ellipsize (Pango.EllipsizeMode.END);
-                grid.attach (lval, left+1, top, 1, 1);
-                i++;
-            }
-            
-            box.show_all();
-            set_content(box);
-        }
-
-        private void set_content(Widget w){
-            var lw = get_child();
-            if (lw != null)
-                remove(lw);
-            add(w);
-        }
-    }
-
-    class Pair<F, G>{
-        public F key;
-        public G value;
-
-        public Pair(F key, G value){
-            this.key = key;
-            this.value = value;
-        }
-    }
-}
-
 
=== modified file 'src/View/OverlayBar.vala'
--- src/View/OverlayBar.vala	2013-01-01 22:34:19 +0000
+++ src/View/OverlayBar.vala	2013-05-13 19:45:28 +0000
@@ -1,20 +1,20 @@
-/*  
+/*
  * Copyright (C) 2012 ammonkey <[e-mail]>
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- */ 
+ */
 
 using Gtk;
 
@@ -40,14 +40,14 @@
         public bool showbar {
             set {
                 _showbar = value;
-                visible = count > 0 && value;
+                visible = value && count > 0;
             }
             get {
                 return _showbar;
             }
         }
 
-        public OverlayBar (Marlin.View.Window win) 
+        public OverlayBar (Marlin.View.Window win)
         {
             window = win;
 
@@ -166,13 +166,13 @@
         private GOF.File? goffile = null;
         //private unowned GLib.List<GOF.File>? last_selection = null;
 
-        private void update (GLib.List<GOF.File>? files = null) 
+        private void update (GLib.List<GOF.File>? files = null)
         {
             //last_selection = files;
             real_update (files);
         }
 
-        private void update_hovered (GOF.File? file) 
+        private void update_hovered (GOF.File? file)
         {
             if (file != null) {
                 GLib.List<GOF.File> list = null;
@@ -187,7 +187,7 @@
             }
         }
 
-        private void real_update (GLib.List<GOF.File>? files = null) 
+        private void real_update (GLib.List<GOF.File>? files = null)
         {
             count = 0;
             folders_count = 0;
@@ -202,7 +202,7 @@
                 /* list contain only one element */
                 if (files.next == null) {
                     goffile = files.data;
-                } 
+                }
                 scan_list (files);
                 update_status ();
 
@@ -212,7 +212,7 @@
             }
         }
 
-        private void update_status () 
+        private void update_status ()
         {
             if (count == 1) {
                 if (!goffile.is_folder ()) {
@@ -252,7 +252,7 @@
             }
         }
 
-        private void scan_list (List<GOF.File> files) 
+        private void scan_list (List<GOF.File> files)
         {
             foreach (var gof in files) {
                 if (gof.is_folder ()) {
 
=== modified file 'src/View/PropertiesWindow.vala'
--- src/View/PropertiesWindow.vala	2013-01-28 19:20:16 +0000
+++ src/View/PropertiesWindow.vala	2013-05-13 19:45:28 +0000
@@ -24,6 +24,16 @@
 
 public class Marlin.View.PropertiesWindow : Granite.Widgets.LightWindow
 {
+    private class Pair<F, G> {
+        public F key;
+        public G value;
+
+        public Pair (F key, G value) {
+            this.key = key;
+            this.value = value;
+        }
+    }
+
     private Gee.LinkedList<Pair<string, string>> info;
     private Granite.Widgets.ImgEventBox evbox;
     private Granite.Widgets.XsEntry perm_code;
@@ -70,10 +80,10 @@
         Box action_area = new Box (Orientation.VERTICAL, 12);
         border_width = 5;
         sg = new SizeGroup (SizeGroupMode.HORIZONTAL);
-        
+
         add (content_area);
         add (action_area);
-        
+
         Box content_vbox = new Box (Gtk.Orientation.VERTICAL, 0);
         //var content_vbox = new VBox(false, 12);
         content_area.pack_start (content_vbox);
@@ -135,16 +145,16 @@
             construct_preview_panel (preview_box);
             add_section (notebook, _("Preview"), PanelType.PREVIEW, preview_box);
         }
-        
+
         set_transient_for (parent);
         set_position (WindowPosition.CENTER_ALWAYS);
         set_destroy_with_parent (true);
-        
+
         content_vbox.show();
 
         content_area.show_all();
         show_all();
-        
+
         present ();
     }
 
@@ -363,7 +373,7 @@
     private void construct_info_panel (Box box, Gee.LinkedList<Pair<string, string>> item_info) {
         var information = new Grid();
         information.row_spacing = 3;
-        
+
         var label = new Label ("");
         label.use_markup = true;
         label.set_markup ("<b>" + _("Info:") + "\t\t\t</b>"); //FIXME: find a better solution for this
@@ -426,7 +436,7 @@
             combo.changed.connect (combo_open_with_changed);
 
             var key_label = create_label_key (_("Open with:"), Align.CENTER);
-            
+
             information.attach (key_label, 0, n, 1, 1);
             information.attach (hcombo, 1, n, 1, 1);
 
@@ -442,15 +452,15 @@
                     uint64 fs_free = info.get_attribute_uint64 (FileAttribute.FILESYSTEM_FREE);
 
                     n++;
-                    
+
                     debug ("%d", n);
                     label = new Label ("");
                     label.use_markup = true;
                     label.set_markup ("<b>" + _("Usage:") + "\t\t\t</b>"); //FIXME: find a better solution for this
                     information.attach (label, 0, n, 1, 1);
-                    
+
                     n++;
-                    
+
                     var key_label = create_label_key (_("Device usage:"), Align.CENTER);
                     information.attach (key_label, 0, n, 1, 1);
                     debug ("%d", n);
 
=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2013-02-19 22:00:20 +0000
+++ src/View/ViewContainer.vala	2013-05-13 19:45:28 +0000
@@ -45,7 +45,9 @@
         public ViewContainer (Marlin.View.Window win, GLib.File location, int _view_mode = 0)
         {
             window = win;
+            overlay_statusbar = new OverlayBar (win);
             view_mode = _view_mode;
+
             /* set active tab */
             browser = new Browser ();
             label = new Gtk.Label("Loading...");
@@ -67,11 +69,7 @@
 
             /* overlay statusbar */
             set_events (Gdk.EventMask.ENTER_NOTIFY_MASK | Gdk.EventMask.LEAVE_NOTIFY_MASK);
-            overlay_statusbar = new OverlayBar (win);
             add_overlay (overlay_statusbar);
-            /*var action_showhide_context_pane = (Gtk.ToggleAction) window.main_actions.get_action("Show Hide Context Pane");
-            overlay_statusbar.showbar = !action_showhide_context_pane.get_active ();
-            action_showhide_context_pane.bind_property ("active", overlay_statusbar, "showbar", BindingFlags.INVERT_BOOLEAN);*/
             overlay_statusbar.showbar = view_mode != ViewMode.LIST;
 
             path_changed.connect((myfile) => {
@@ -120,7 +118,7 @@
             }
         }
 
-        private void plugin_directory_loaded () 
+        private void plugin_directory_loaded ()
         {
             Object[] data = new Object[2];
             data[0] = window;
@@ -134,7 +132,7 @@
             //file_info_callback = slot.directory.file.info_available.connect((gof) => {
                 if(window.current_tab == this)
                     window.loading_uri (slot.directory.file.uri, window.sidebar);
-                
+
                 /*Source.remove((uint) file_info_callback);
             });*/
         }
@@ -151,31 +149,27 @@
 
             if (Posix.getuid() == 0)
                 tab_name = tab_name + " " + _("(as Administrator)");
-           
+
             /* update window title */
             if(window.current_tab == this) {
                 window.set_title(tab_name);
                 if (window.top_menu.location_bar != null)
-                    window.top_menu.location_bar.path = aslot.directory.file.location.get_parse_name(); 
+                    window.top_menu.location_bar.path = aslot.directory.file.location.get_parse_name();
             }
 
         }
 
-        /* handle directory not found, contextview */
+        /* handle directory not found */
         public void directory_done_loading () {
             if (!slot.directory.file.exists) {
                 content = new DirectoryNotFound (slot.directory, this);
             } else {
-                if (select_childs != null) 
+                if (select_childs != null)
                     ((FM.Directory.View) slot.view_box).select_glib_files (select_childs);
             }
-            sync_contextview();
 
             warning ("directory done loading");
-            //coltest  TODO remove
-            /*if (window.contextview != null)
-                window.contextview.update ();*/
-            
+
             slot.directory.done_loading.disconnect (directory_done_loading);
         }
 
@@ -196,7 +190,7 @@
                 /* check if the requested location is a parent of the previous one */
                 if (slot != null) {
                     var parent = slot.location.get_parent ();
-                    if (parent != null && parent.equal (location)) 
+                    if (parent != null && parent.equal (location))
                         select_childs.prepend (slot.directory.file.location);
                 }
             }
@@ -243,29 +237,6 @@
             overlay_statusbar.showbar = nview != ViewMode.LIST;
         }
 
-        public void sync_contextview(){
-            if (!slot.directory.file.exists) {
-                if (window.contextview != null) {
-                    window.main_box.remove (window.contextview);
-                    window.contextview = null;
-                }
-                return;
-            } 
-                
-            if (window.contextview == null &&
-                ((Gtk.ToggleAction) window.main_actions.get_action("Show Hide Context Pane")).get_active())
-            {
-                window.contextview = new ContextView(window, true, window.main_box.orientation);
-                    
-                window.main_box.notify.connect((prop) => {
-                    if(window.contextview != null && prop.name == "orientation")
-                        window.contextview.parent_orientation = window.main_box.orientation;
-                });
-                window.main_box.pack2(window.contextview, false, true);
-                window.contextview.show ();
-            }
-        }
-
         public GOF.Window.Slot? get_active_slot () {
             if (mwcol != null)
                 return mwcol.active_slot;
@@ -306,7 +277,7 @@
                               // You see if I would just use back(n) the reference to n would be passed
                               // in the clusure, restulting in a value of n which would always be n=1. So
                               // by introducting a new variable I can bypass this anoyance.
-                var item = new Gtk.MenuItem.with_label (path); 
+                var item = new Gtk.MenuItem.with_label (path);
                 item.activate.connect(() => { back(cn); });
                 back_menu.insert(item, -1);
             }
@@ -322,7 +293,7 @@
             var n = 1;
             foreach(var path in list){
                 int cn = n++; // For explenation look up
-                var item = new Gtk.MenuItem.with_label (path); 
+                var item = new Gtk.MenuItem.with_label (path);
                 item.activate.connect(() => forward(cn));
                 forward_menu.insert(item, -1);
             }
 
=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2013-05-12 20:41:24 +0000
+++ src/View/Window.vala	2013-05-13 19:45:28 +0000
@@ -38,8 +38,6 @@
         public Marlin.Places.Sidebar sidebar;
 
         public ViewContainer? current_tab;
-        public Granite.Widgets.CollapsiblePaned main_box;
-        public ContextView? contextview = null;
 
         public Gtk.ActionGroup main_actions;
         public Gtk.AccelGroup accel_group;
@@ -47,24 +45,6 @@
         public Granite.Widgets.ToolButtonWithMenu button_forward;
         public Granite.Widgets.ToolButtonWithMenu button_back;
 
-        private const int horizontal_contextplane_max_width = 910;
-        private const int horizontal_contextplane_max_height = 380; // after which we will go vertical
-
-        private Gtk.CssProvider css_provider = null;
-        private bool _auto_theme;
-        public bool auto_theme {
-            set {
-                _auto_theme = value;
-                if (value)
-                    load_css_style ();
-                else
-                    unload_css_style ();
-            }
-            get {
-                return _auto_theme;
-            }
-        }
-
         public bool can_go_up{
             set{
                 main_actions.get_action("Up").set_sensitive(value);
@@ -82,7 +62,7 @@
                 main_actions.get_action("Back").set_sensitive(value);
             }
         }
-        
+
         public signal void item_hovered (GOF.File gof_file);
         public signal void selection_changed (GLib.List<GOF.File> gof_file);
 
@@ -131,8 +111,10 @@
             ui.insert_action_group(main_actions, 0);
             ui.ensure_update();
 
-            /* Menubar */
+            /* Menubar. We only need a menubar for special cases like global menus or HUD.
+               We don't need to show it in any other case */
             menu_bar = ui.get_widget("/MenuBar");
+            menu_bar.no_show_all = true;
             menu_bar.hide ();
 
             /* Topmenu */
@@ -140,10 +122,10 @@
 
             /* Info Bar */
             info_bar = new Gtk.InfoBar ();
-            
+
             var label = new Gtk.Label (_("Files isn't your default file manager."));
             label.set_line_wrap (true);
-            
+
             var expander = new Label ("");
             expander.hexpand = true;
 
@@ -157,18 +139,18 @@
                 make_marlin_default_fm (false);
                 show_infobar (false);
             });
-            
+
             var bbox = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
             bbox.set_spacing (3);
             bbox.pack_start (make_default, true, true, 5);
             bbox.pack_start (ignore, true, true, 5);
-            
+
             ((Box)info_bar.get_content_area ()).add (label);
             ((Box)info_bar.get_content_area ()).add (expander);
             ((Box)info_bar.get_content_area ()).add (bbox);
-            
+
             show_infobar (!is_marlin_mydefault_fm ());
-            
+
             /* Contents */
             tabs = new Notebook();
             tabs.show_border = false;
@@ -180,24 +162,13 @@
             sidebar = new Marlin.Places.Sidebar (this);
             Preferences.settings.bind("sidebar-zoom-level", sidebar, "zoom-level", SettingsBindFlags.DEFAULT);
 
-            /* Devide main views into sidebars */
-            main_box = new Granite.Widgets.CollapsiblePaned (Orientation.VERTICAL);
-            main_box.show();
-
             var lside_pane = new Granite.Widgets.ThinPaned ();
             lside_pane.show();
 
             lside_pane.pack1(sidebar, false, false);
-            lside_pane.pack2(main_box, true, true);
+            lside_pane.pack2(tabs, true, true);
 
             sidebar.show ();
-            main_box.show ();
-
-            main_box.pack1(tabs, true, true);
-
-            ((Gtk.ToggleAction) main_actions.get_action("Show Hide Context Pane")).set_active(Preferences.settings.get_boolean("start-with-contextview"));
-
-            main_box.collapse_mode = Granite.CollapseMode.BOTTOM;
 
             /*/
             /* Pack up all the view
@@ -230,24 +201,16 @@
             }
             show();
 
-            Preferences.settings.bind("show-menubar", menu_bar, "visible", 0);
-            Preferences.settings.bind("show-menubar", main_actions.get_action("Show Hide Menubar"), "active", 0);
-            //Preferences.settings.bind("show-menubar", top_menu.compact_menu_button, "visible", SettingsBindFlags.INVERT_BOOLEAN);
-            Preferences.settings.bind("show-hiddenfiles", main_actions.get_action("Show Hidden Files"), "active", 0);
-            Preferences.settings.bind("interpret-desktop-files", main_actions.get_action("Show Desktop Files"), "active", SettingsBindFlags.INVERT_BOOLEAN);
             Preferences.settings.bind("show-sidebar", sidebar, "visible", 0);
             Preferences.settings.bind("show-sidebar", main_actions.get_action("Show Hide Sidebar"), "active", 0);
 
-            /* auto-theme Marlin's specific widgets. */
-            Preferences.settings.bind("auto-theme", this, "auto-theme", SettingsBindFlags.DEFAULT);
-
             /*/
             /* Connect and abstract signals to local ones
             /*/
 
             window_state_event.connect ((event) => {
                 if ((bool) event.changed_mask & Gdk.WindowState.MAXIMIZED) {
-                    Preferences.settings.set_boolean("maximized", 
+                    Preferences.settings.set_boolean("maximized",
                                                      (bool) get_window().get_state() & Gdk.WindowState.MAXIMIZED);
                 }
                 return false;
@@ -279,9 +242,6 @@
 
             Gtk.Allocation win_alloc;
             get_allocation (out win_alloc);
-            resized (win_alloc);
-            
-            size_allocate.connect(resized);
 
             /* keyboard shortcuts bindings */
             if (app.is_first_window ((Gtk.Window) this)) {
@@ -297,21 +257,6 @@
 
         }
 
-        private void load_css_style () {
-            css_provider = new Gtk.CssProvider();
-            try {
-                css_provider.load_from_data (CSS_STYLE, -1);
-                StyleContext.add_provider_for_screen (screen, css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-            } catch (Error e) {
-                warning ("Could not add css provider. Some widgets will not look as intended. %s", e.message);
-            }
-        }
-        
-        private void unload_css_style () {
-            if (css_provider != null)
-                StyleContext.remove_provider_for_screen (screen, css_provider);
-        }
-
         private void show_infobar (bool val) {
             if (val)
                 info_bar.show_all ();
@@ -323,7 +268,7 @@
         public virtual signal void go_up () {
             action_go_up ();
         }
-        
+
         [Signal (action=true)]
         public virtual signal void edit_path () {
             action_edit_path ();
@@ -335,7 +280,7 @@
 
 
         public GOF.Window.Slot? get_active_slot() {
-            if (current_tab != null) 
+            if (current_tab != null)
                 return current_tab.get_active_slot ();
             return null;
         }
@@ -363,17 +308,11 @@
                     current_tab.update_location_state(false);
                     /* update radio action view state */
                     update_action_radio_view(current_tab.view_mode);
-                    /* sync ContextView */
-                    current_tab.sync_contextview();
                     /* sync selection */
                     if (cur_slot.view_box != null)
                         ((FM.Directory.View) cur_slot.view_box).sync_selection();
                     /* sync sidebar selection */
                     loading_uri (current_tab.slot.directory.file.uri, sidebar);
-
-                    /* focus the main view */
-                    //((FM.Directory.View) current_tab.slot.view_box).grab_focus();
-                    //current_tab.content.grab_focus();
                 }
             }
         }
@@ -391,7 +330,7 @@
             button.clicked.connect(() => {
                 remove_tab(content);
             });
-            
+
             if (is_close_first ()) {
                 hbox.pack_start (button, false, false, 0);
                 hbox.pack_start (content.label, false, false, 0);
@@ -401,7 +340,7 @@
             }
 
             hbox.show_all();
-            
+
             var eventbox = new EventBox();
             eventbox.add(hbox);
             eventbox.set_visible_window(false);
@@ -435,41 +374,11 @@
 
             tabs.remove(view_container);
         }
-        
+
         public void add_window(File location){
             ((Marlin.Application) application).create_window (location, screen);
         }
 
-#if VALA_0_14
-        private void resized(Gtk.Allocation allocation){
-#else
-        private void resized(Gdk.Rectangle allocation){
-#endif
-            Orientation current_state = main_box.orientation;
-
-            int ctxview_orientation = Preferences.settings.get_enum("contextview-orientation");
-
-            Orientation future_state = Orientation.VERTICAL; // Because how Paned class works, this is inverted
-            switch (ctxview_orientation) {
-            case 0:
-                future_state = Orientation.VERTICAL;
-                break;
-            case 1:
-                future_state = Orientation.HORIZONTAL;
-                break;
-            case 2:
-                if(allocation.width  > horizontal_contextplane_max_width &&
-                   allocation.height > horizontal_contextplane_max_height){
-                    future_state = Orientation.HORIZONTAL;
-                }
-                break;
-            }
-
-            if(current_state != future_state){
-                main_box.orientation = future_state;
-            }
-        }
-       
         private void undo_actions_set_insensitive () {
             Gtk.Action action;
 
@@ -491,7 +400,7 @@
                 action.set_tooltip (_("Undo the last action"));
             }
             action.set_sensitive (data != null && data.undo_label != null);
-            
+
             action = main_actions.get_action ("Redo");
             if (data != null && data.redo_label != null && sensitive) {
                 action.set_label (data.redo_label);
@@ -531,9 +440,6 @@
             if (is_maximized == false)
                 Preferences.settings.set_string("geometry", geometry);
             Preferences.settings.set_boolean("maximized", is_maximized);
-
-            Preferences.settings.set_boolean("start-with-contextview",
-                ((Gtk.ToggleAction) main_actions.get_action("Show Hide Context Pane")).get_active());
         }
 
         public Gtk.ActionGroup get_actiongroup () {
@@ -544,18 +450,11 @@
             top_menu.setup_items();
         }
 
-        /*
-        private void action_toolbar_editor_callback (Gtk.Action action) {
-            marlin_toolbar_editor_dialog_show (this);
-        }
-        */
-
         private void action_go_up () {
             current_tab.up();
         }
 
         private void action_edit_path () {
-            //top_menu.location_bar.state = false;
             top_menu.location_bar.get_child ().grab_focus ();
         }
 
@@ -566,17 +465,16 @@
         private void action_go_forward (Gtk.Action action) {
             current_tab.forward();
         }
-       
+
         private uint t_reload_cb = 0;
-        
+
         private bool real_reload_callback () {
             current_tab.reload ();
             t_reload_cb = 0;
             return false;
         }
-        
+
         private bool is_close_first () {
-
             string path = "/apps/metacity/general/button_layout";
             GConf.Client cl = GConf.Client.get_default ();
             string key;
@@ -597,7 +495,7 @@
                 return false;
 
         }
-        
+
         private bool is_marlin_mydefault_fm ()
         {
             bool trash_uri_is_default = false;
@@ -608,7 +506,7 @@
 
             return foldertype_is_default && trash_uri_is_default;
         }
-        
+
         private void make_marlin_default_fm (bool active)
         {
             if (active) {
@@ -623,7 +521,7 @@
                 }
             } else {
                 AppInfo.reset_type_associations ("inode/directory");
-                AppInfo.reset_type_associations ("x-scheme-handler/trash");            
+                AppInfo.reset_type_associations ("x-scheme-handler/trash");
             }
         }
 
@@ -636,43 +534,16 @@
         /*private void action_show_hidden_files (Gtk.Action action) {
         }*/
 
-        private void action_show_hide_contextview (Gtk.Action action) {
-            if (((Gtk.ToggleAction)action).get_active()) {
-                current_tab.sync_contextview();
-                ((FM.Directory.View) current_tab.slot.view_box).sync_selection();
-            } else {
-                 //main_box.remove (contextview);
-                if (contextview != null) {
-                    contextview.destroy();
-                    contextview = null;
-                }
-            }
-        }
-
-
-        private void action_show_hide_menubar (Gtk.Action action) {
-            bool vis = true;
-            menu_bar.get("visible", &vis);
-            if (vis)
-                top_menu.app_menu.hide();
-            else
-                top_menu.app_menu.show_all();
-            }
-
-        /*private void action_show_hide_sidebar (Gtk.Action action) {
-            stdout.printf ("TODO\n");
-        }*/
-
         private void action_undo_callback (Gtk.Action action) {
             update_undo_actions ();
             undo_manager.undo (null);
         }
-        
+
         private void action_redo_callback (Gtk.Action action) {
             update_undo_actions ();
             undo_manager.redo (null);
         }
-        
+
         private void action_home_callback (Gtk.Action action) {
                 current_tab.path_changed(File.new_for_commandline_arg(Environment.get_home_dir()));
         }
@@ -684,17 +555,17 @@
         private void action_go_to_network_callback (Gtk.Action action) {
                 current_tab.path_changed(File.new_for_commandline_arg(Marlin.NETWORK_URI));
         }
-        
+
         private void action_zoom_in_callback (Gtk.Action action) {
-            if (current_tab != null && current_tab.slot != null) 
+            if (current_tab != null && current_tab.slot != null)
                 ((FM.Directory.View) current_tab.slot.view_box).zoom_in ();
         }
-        
+
         private void action_zoom_out_callback (Gtk.Action action) {
-            if (current_tab != null && current_tab.slot != null) 
+            if (current_tab != null && current_tab.slot != null)
                 ((FM.Directory.View) current_tab.slot.view_box).zoom_out ();
         }
-        
+
         void action_next_tab()
         {
             if(tabs.page == tabs.get_n_pages() - 1)
@@ -708,7 +579,7 @@
         }
 
         private void action_zoom_normal_callback (Gtk.Action action) {
-            if (current_tab != null && current_tab.slot != null) 
+            if (current_tab != null && current_tab.slot != null)
                 ((FM.Directory.View) current_tab.slot.view_box).zoom_normal ();
         }
 
@@ -735,7 +606,7 @@
                 "translate", Marlin.TRANSLATE_URL,
                 "bug", Marlin.BUG_URL);
         }
-        
+
         void show_report() {
             try { Gtk.show_uri (screen, Marlin.BUG_URL, -1); }
             catch (Error e) { critical("Can't open the link"); }
@@ -836,7 +707,7 @@
   /* label, accelerator */       N_("Previous Tab"), "<control>Page_Up",
   /* tooltip */                  "",
                                  action_previous_tab },
-  /* name, stock id */         { "Connect to Server", null, 
+  /* name, stock id */         { "Connect to Server", null,
   /* label, accelerator */       N_("Connect to _Server..."), null,
   /* tooltip */                  N_("Connect to a remote computer or shared disk"),
                                  action_connect_to_server_callback },
@@ -867,21 +738,6 @@
                                  null,
                                  //action_show_hidden_files,
                                  true },
-  /* name, stock id */         { "Show Desktop Files", null,
-  /* label, accelerator */       N_("Show _Desktop Files"), "<control>D",
-  /* tooltip */                  N_("Toggle the display of desktop files"),
-                                 null,
-                                 true },
-  /* name, stock id */         { "Show Hide Context Pane", null,
-  /* label, accelerator */       N_("_Context Pane"), "F7",
-  /* tooltip */                  N_("Change the visibility of the context pane"),
-                                 action_show_hide_contextview,
-  /* is_active */                true },
-  /* name, stock id */         { "Show Hide Menubar", null,
-  /* label, accelerator */       N_("_Menubar"), "F8",
-  /* tooltip */                  N_("Change the visibility of this window's menubar"),
-                                 action_show_hide_menubar,
-  /* is_active */                true },
   /* name, stock id */         { "Show Hide Sidebar", null,
   /* label, accelerator */       N_("_Places"), "F9",
   /* tooltip */                  N_("Change the visibility of this window's side pane"),
@@ -900,80 +756,7 @@
             { "view-as-columns", null,
               N_("Columns"), "<control>3", null,
               ViewMode.MILLER }
+     
         };
-
-        /*enum RowColor {
-            NONE,
-            BUTTER,
-            ORANGE,
-            CHOCOLATE,
-            CHAMELEON,
-            SKYBLUE,
-            PLUM,
-            RED,
-            LIGHTGRAY,
-            DARKGRAY,
-        }
-
-        static const Gtk.RadioActionEntry color_radio_entries[] = {
-            { "set-color-clear", null,
-              N_("None"), null, null,
-              RowColor.NONE },
-            { "set-color-butter", null,
-              N_("Butter"), null, null,
-              RowColor.BUTTER },
-            { "set-color-orange", null,
-              N_("Orange"), null, null,
-              RowColor.ORANGE },
-            { "set-color-chocolate", null,
-              N_("Chocolate"), null, null,
-              RowColor.CHOCOLATE },
-            { "set-color-chameleon", null,
-              N_("Green"), null, null,
-              RowColor.CHAMELEON },
-            { "set-color-skyblue", null,
-              N_("Sky Blue"), null, null,
-              RowColor.SKYBLUE },
-            { "set-color-plum", null,
-              N_("Plum"), null, null,
-              RowColor.PLUM },
-            { "set-color-red", null,
-              N_("Scarlet Red"), null, null,
-              RowColor.RED },
-            { "set-color-lightgray", null,
-              N_("Light Gray"), null, null,
-              RowColor.LIGHTGRAY },
-            { "set-color-darkgray", null,
-              N_("Dark Gray"), null, null,
-              RowColor.DARKGRAY }
-        };*/
-
-        private const string CSS_STYLE = """
-            ExoIconView.view {
-                 background-color: @base_color;
-            }
-
-            .sidebar,
-            .sidebar .view {
-                background-color: @bg_color;
-            }
-
-            MarlinViewWindow * {
-                -GtkPaned-handle-size: 1;
-            }
-
-            /*MarlinViewWindow .pane-separator {*/
-            VarkaWidgetsCollapsiblePaned,
-            VarkaWidgetsCollapsiblePaned.pane-separator {
-                -GtkPaned-handle-size: 1;
-                background-color: shade (@bg_color, 0.95);
-                border-color: @dark_bg_color;
-                border-style: solid;
-                border-width: 0;
-            }
-
-        """;
-
     }
 }
-
 
=== modified file 'src/pantheon-files-ui.xml'
--- src/pantheon-files-ui.xml	2013-05-12 20:41:24 +0000
+++ src/pantheon-files-ui.xml	2013-05-13 19:45:28 +0000
@@ -16,12 +16,9 @@
 		<separator/>
 		<menuitem name="Connect to Server" action="Connect to Server"/>
 		<separator/>
-		<!--<placeholder name="Close Items Placeholder"/>-->
 		<menuitem name="Close" action="Close"/>
 	</menu>
 	<menu name="Edit" action="Edit">
-        <!--<placeholder name="Undostack Actions"/>
-		<separator/>-->
         <placeholder name="Undostack Actions">
             <menuitem name="Undo" action="Undo"/>
             <menuitem name="Redo" action="Redo"/>
@@ -29,81 +26,37 @@
 		<separator/>
 		<placeholder name="Clipboard Actions"/>
 		<separator/>
-		<!--<placeholder name="Select Items"/>-->
         <placeholder name="File Items Placeholder"/>
 		<separator/>
         <placeholder name="Dangerous File Actions"/>
 		<separator/>
-		<!--<menuitem name="ToolbarEditor" 	  action="ToolbarEditor"/>-->
-                <!--<menu action="ColorMenu">-->
-                <!--    <menuitem action="set-color-clear" />
-                    <menuitem action="set-color-butter" />
-                    <menuitem action="set-color-orange" />
-                    <menuitem action="set-color-chocolate" />
-                    <menuitem action="set-color-chameleon" />
-                    <menuitem action="set-color-skyblue" />
-                    <menuitem action="set-color-plum" />
-                    <menuitem action="set-color-red" />
-                    <menuitem action="set-color-lightgray" />
-                    <menuitem action="set-color-darkgray" />-->
-                <!--</menu>-->
-
-		<!--<menuitem name="Preferences" action="Preferences"/>-->
 	</menu>
 	<menu action="View">
-		<!--<menuitem name="Stop" action="Stop"/>-->
 		<menuitem name="Reload" action="Reload"/>
 		<separator/>
-        <!--<menuitem name="Show Hide Toolbar" action="Show Hide Toolbar"/>-->
-	        <menuitem name="Show Hide Menubar" action="Show Hide Menubar"/>
-            <menuitem name="Show Hide Sidebar" action="Show Hide Sidebar"/>
-            <separator/>
-
-            <menuitem name="Show Desktop Files" action="Show Desktop Files"/>
-		<!--<separator/>-->
+        <menuitem name="Show Hide Sidebar" action="Show Hide Sidebar"/>
+        <separator/>
 		<placeholder name="View Items Placeholder"/>
 		<separator/>
-		    <placeholder name="Zoom Items Placeholder">
-			    <menuitem name="Zoom In" action="Zoom In"/>
-			    <menuitem name="Zoom Out" action="Zoom Out"/>
-			    <menuitem name="Zoom Normal" action="Zoom Normal"/>
-		    </placeholder>
-        <!--<separator/>
-                <placeholder name="Show Hide Clutter">
-                        <menuitem name="Clutterflow" action="Show Hide Clutter"/>
-                </placeholder>
-                        <menuitem name="Embed Terminal" action="Show Hide Embed Terminal"/>
-		<placeholder name="View Choices">
-		        <separator/>
-			<placeholder name="Extra Viewer"/>
-			<separator name="Before Short List"/>
-			<placeholder name="Short List"/>
-		</placeholder>-->
-            <separator/>
-            <menuitem action="view-as-icons" />
-            <menuitem action="view-as-detailed-list" />
-            <menuitem action="view-as-columns" />
+	    <placeholder name="Zoom Items Placeholder">
+		    <menuitem name="Zoom In" action="Zoom In"/>
+		    <menuitem name="Zoom Out" action="Zoom Out"/>
+		    <menuitem name="Zoom Normal" action="Zoom Normal"/>
+	    </placeholder>
+        <separator/>
+        <menuitem action="view-as-icons" />
+        <menuitem action="view-as-detailed-list" />
+        <menuitem action="view-as-columns" />
 	</menu>
 	<menu action="Go">
         <menuitem name="Up" action="Up"/>
         <menuitem name="Back" action="Back"/>
 	    <menuitem name="Forward"  action="Forward"/>
 	    <separator/>
-       	    <menuitem name="Home" action="Home"/>
-		<!--<menuitem name="Computer" action="Go to Computer"/>-->
-            <menuitem name="Go to Trash" action="Go to Trash"/>
-            <menuitem name="Go to Network" action="Go to Network"/>
-	<!--	<menuitem name="Go to Location" action="Go to Location"/>
-		<menuitem name="Search" action="Search"/>
-		<separator/>
-        <placeholder name="History Placeholder"/>-->
+   	    <menuitem name="Home" action="Home"/>
+        <menuitem name="Go to Trash" action="Go to Trash"/>
+        <menuitem name="Go to Network" action="Go to Network"/>
 	</menu>
-    <!--<menu action="Bookmarks">
-	    <menuitem name="Add Bookmark" action="Add Bookmark"/>
-		<menuitem name="Edit Bookmark" action="Edit Bookmarks"/>
-		<separator/>
-		<placeholder name="Bookmarks Placeholder"/>
-    </menu>-->
 	<menu action="Help">
 		<menuitem name="GetHelp" action="GetHelp"/>
 		<menuitem name="Translate" action="Translate"/>
@@ -112,27 +65,9 @@
 		<menuitem name="About" action="About"/>
 	</menu>
 </menubar>
-<!--<popup name="background">
-	<placeholder name="Before Zoom Items">
-		<placeholder name="New Window Items"/>
-		<placeholder name="New Object Items"/>
-		<separator/>
-	       <placeholder name="Extension Actions"/>
-	</placeholder>
-        <separator/>
-	<placeholder name="Zoom Items">
-		<menuitem name="Zoom Normal" action="Zoom Normal"/>
-	</placeholder>
-        <separator/>
-	<placeholder name="After Zoom Items"/>
-</popup>-->
 
 <popup name="ToolbarMenu" accelerators="false">
-    <!--<menuitem name="Show Hide Context Pane" action="Show Hide Context Pane"/>-->
-    <menuitem name="Show Hide Menubar" action="Show Hide Menubar"/>
     <menuitem name="Show Hide Sidebar" action="Show Hide Sidebar"/>
-	<separator/>
-	<!--<menuitem name="ToolbarEditor" action="ToolbarEditor"/>-->
 </popup>
 
 <popup name="CompactMenu" accelerators="false">
@@ -141,13 +76,6 @@
 	<separator/>
 	<menuitem name="Connect to Server" action="Connect to Server"/>
 	<separator/>
-    <!--
-        <menuitem name="Undo" action="Undo"/>
-        <menuitem name="Redo" action="Redo"/>
-	<separator/>
-        <menuitem name="Connect to Server" action="Connect to Server"/>
-	<separator/>
-	<menuitem name="Reset to Defaults" action="Reset to Defaults"/>-->
     <menuitem name="About" action="About"/>
 </popup>
 </ui>