New prototype

2 files changed, 149 insertions, 133 deletions

diff --git a/src/resources/css/Adwaita.css b/src/resources/css/Adwaita.css
index 646749528..d4513e968 100644
--- a/src/resources/css/Adwaita.css
+++ b/src/resources/css/Adwaita.css
@@ -225,13 +225,3 @@ actionbar
   /* Same as sidebar_bg_color in gtk */
   background-color: mix(@theme_bg_color, @theme_base_color, 0.5);
 }
-
-.border-box
-{
-  /* Same as spacing between icons */
-  padding-left: 6px;
-  background-image: image(mix(@theme_bg_color, @borders, 1.0));
-  background-size: 1px 12px;
-  background-repeat: no-repeat;
-  background-position: 100%
-}
diff --git a/src/resources/ui/nautilus-action-bar.ui b/src/resources/ui/nautilus-action-bar.ui
index 2a8edcac0..016e317a6 100644
--- a/src/resources/ui/nautilus-action-bar.ui
+++ b/src/resources/ui/nautilus-action-bar.ui
@@ -12,33 +12,37 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
-        <property name="homogeneous">False</property>
+        <property name="border_width">0</property>
         <property name="transition_type">crossfade</property>
-        <property name="margin-left">6</property>
-        <property name="margin-right">6</property>
-        <property name="border-width">0</property>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="valign">center</property>
-            <property name="border-width">2</property>
-            <property name="margin-start">6</property>
-            <property name="spacing">0</property>
+            <property name="border_width">6</property>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="valign">center</property>
-                <property name="hexpand">True</property>
-                <property name="orientation">vertical</property>
+                <property name="hexpand">False</property>
                 <child>
-                  <object class="GtkLabel" id="primary_label">
+                  <object class="GtkButton" id="cut_button">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="vexpand">True</property>
-                    <property name="ellipsize">end</property>
-                    <property name="xalign">0</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Cut item</property>
+                    <property name="action_name">view.cut</property>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">edit-cut-symbolic</property>
+                      </object>
+                    </child>
+                    <style>
+                      <class name="image-button"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -47,16 +51,21 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="secondary_label">
+                  <object class="GtkButton" id="copy_button">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="ellipsize">end</property>
-                    <property name="xalign">0</property>
-                    <attributes>
-                      <attribute name="scale" value="0.85999999999999999"/>
-                    </attributes>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Copy item</property>
+                    <property name="action_name">view.copy</property>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">edit-copy-symbolic</property>
+                      </object>
+                    </child>
                     <style>
-                      <class name="dim-label"/>
+                      <class name="image-button"/>
                     </style>
                   </object>
                   <packing>
@@ -65,118 +74,105 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuButton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="valign">center</property>
-                <property name="menu_model">selection-menu</property>
-                <property name="margin-start">6</property>
                 <child>
-                  <object class="GtkImage">
+                  <object class="GtkButton" id="paste_button">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="icon_name">view-more-symbolic</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="action_name">view.paste</property>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">edit-paste-symbolic</property>
+                      </object>
+                    </child>
+                    <style>
+                      <class name="image-button"/>
+                    </style>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
-                <style>
-                  <class name="image-button"/>
-                  <class name="flat"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="pack_type">end</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="valign">center</property>
-                <property name="spacing">6</property>
                 <child>
                   <object class="GtkButton" id="rename_button">
-                    <property name="label" translatable="yes">Rename</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Rename the selected file</property>
                     <property name="action_name">view.rename</property>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">document-edit-symbolic</property>
+                      </object>
+                    </child>
                     <style>
-                      <class name="flat"/>
+                      <class name="image-button"/>
                     </style>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkButton">
-                    <property name="label" translatable="yes">Open</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Open the selected items</property>
-                    <property name="action_name">view.open-with-default-application</property>
-                    <property name="margin-end">6</property>
+                    <property name="action_name">view.star</property>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">star-new-symbolic</property>
+                      </object>
+                    </child>
                     <style>
-                      <class name="suggested-action"/>
-                      <class name="flat"/>
+                      <class name="image-button"/>
                     </style>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
                 <style>
                   <class name="border-box"/>
+                  <class name="linked"/>
                 </style>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="pack_type">end</property>
-                <property name="position">2</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="valign">center</property>
-                <property name="hexpand">False</property>
+                <property name="spacing">6</property>
                 <child>
-                  <object class="GtkButton" id="cut_button">
+                  <object class="GtkButton">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Cut item</property>
-                    <property name="action_name">view.cut</property>
+                    <property name="always_show_image">True</property>
                     <child>
                       <object class="GtkImage">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="icon_name">edit-cut-symbolic</property>
+                        <property name="icon_name">folder-new-symbolic</property>
+                        <style>
+                          <class name="image-button"/>
+                        </style>
                       </object>
                     </child>
                     <style>
                       <class name="image-button"/>
-                      <class name="flat"/>
                     </style>
                   </object>
                   <packing>
@@ -186,47 +182,78 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="copy_button">
+                  <object class="GtkButton" id="trash_button2">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Copy item</property>
-                    <property name="action_name">view.copy</property>
+                    <property name="tooltip_text" translatable="yes">Move to trash</property>
+                    <property name="action_name">view.move-to-trash</property>
                     <child>
                       <object class="GtkImage">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="icon_name">edit-copy-symbolic</property>
+                        <property name="icon_name">user-trash-symbolic</property>
                       </object>
                     </child>
                     <style>
                       <class name="image-button"/>
-                      <class name="flat"/>
                     </style>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="padding">6</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="primary_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="ellipsize">end</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">center</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkButton" id="copy_to_button">
+                    <property name="label" translatable="yes">Copy to…</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Copy files to a different place</property>
+                    <property name="action_name">view.copy-to</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="paste_button">
+                  <object class="GtkButton" id="move_to_button">
+                    <property name="label" translatable="yes">Move to…</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="action_name">view.paste</property>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">edit-paste-symbolic</property>
-                      </object>
-                    </child>
-                    <style>
-                      <class name="image-button"/>
-                      <class name="flat"/>
-                    </style>
+                    <property name="tooltip_text" translatable="yes">Move files to a different place</property>
+                    <property name="action_name">view.move-to</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -235,48 +262,46 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="trash_button">
+                  <object class="GtkButton" id="properties_button">
+                    <property name="label" translatable="yes">Properties</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Move to trash</property>
-                    <property name="action_name">view.move-to-trash</property>
-                    <property name="margin-end">6</property>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">user-trash-symbolic</property>
-                      </object>
-                    </child>
+                    <property name="tooltip_text" translatable="yes">Show properties</property>
+                    <property name="action_name">view.properties</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton">
+                    <property name="label" translatable="yes">Open</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Open the selected items</property>
+                    <property name="action_name">view.open-with-default-application</property>
                     <style>
-                      <class name="image-button"/>
-                      <class name="flat"/>
+                      <class name="suggested-action"/>
                     </style>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">3</property>
+                    <property name="position">4</property>
                   </packing>
                 </child>
-                <style>
-                  <class name="border-box"/>
-                </style>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
                 <property name="pack_type">end</property>
-                <property name="position">3</property>
+                <property name="position">4</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="name">main</property>
@@ -289,6 +314,7 @@
             <property name="valign">center</property>
             <property name="border_width">6</property>
             <property name="spacing">6</property>
+            <property name="valign">center</property>
             <child>
               <object class="GtkSpinner">
                 <property name="visible">True</property>