1 files changed, 38 insertions, 47 deletions
diff --git a/src/nautilus-progress-info-widget.xml b/src/nautilus-progress-info-widget.xml
index e4a980221..3eace47df 100644
--- a/src/nautilus-progress-info-widget.xml
+++ b/src/nautilus-progress-info-widget.xml
@@ -1,67 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="NautilusProgressInfoWidget" parent="GtkBox">
+  <template class="NautilusProgressInfoWidget" parent="GtkGrid">
     <property name="visible">True</property>
-    <property name="margin">5</property>
-    <property name="orientation">vertical</property>
+    <property name="margin-start">5</property>
+    <property name="margin-end">5</property>
     <child>
       <object class="GtkLabel" id="status">
         <property name="label">status</property>
         <property name="visible">True</property>
         <property name="xalign">0</property>
-        <property name="width-request">400</property>
-        <property name="wrap">True</property>
-        <property name="wrap-mode">word-char</property>
+        <property name="width-request">300</property>
+        <property name="max-width-chars">30</property>
+        <property name="ellipsize">middle</property>
+        <property name="margin-bottom">6</property>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
+        <property name="top-attach">0</property>
+        <property name="left-attach">0</property>
       </packing>
     </child>
     <child>
-      <object class="GtkBox" id="box2">
+      <object class="GtkProgressBar" id="progress_bar">
         <property name="visible">True</property>
+        <property name="valign">center</property>
+        <property name="pulse-step">0.05</property>
+        <property name="margin_start">2</property>
+        <property name="margin-bottom">4</property>
+      </object>
+      <packing>
+        <property name="top-attach">1</property>
+        <property name="left-attach">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkButton" id="cancel">
+        <property name="visible">True</property>
+        <property name="receives_default">True</property>
+        <property name="margin_start">20</property>
+        <property name="valign">center</property>
+        <style>
+          <class name="image-button"/>
+          <class name="nautilus-circular-button"/>
+        </style>
         <child>
-          <object class="GtkProgressBar" id="progress_bar">
-            <property name="visible">True</property>
-            <property name="valign">center</property>
-            <property name="pulse-step">0.05</property>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="cancel">
+          <object class="GtkImage" id="cancel_icon">
             <property name="visible">True</property>
-            <property name="receives_default">True</property>
-            <property name="margin_start">20</property>
-            <style>
-              <class name="image-button"/>
-              <class name="nautilus-circular-button"/>
-            </style>
-            <child>
-              <object class="GtkImage" id="cancel_icon">
-                <property name="visible">True</property>
-                <property name="icon-name">window-close-symbolic</property>
-                <property name="icon-size">1</property>
-              </object>
-            </child>
+            <property name="icon-name">window-close-symbolic</property>
+            <property name="icon-size">1</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
+        <property name="height">3</property>
+        <property name="top-attach">0</property>
+        <property name="left-attach">1</property>
       </packing>
     </child>
     <child>
@@ -78,9 +70,8 @@
         </style>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
+        <property name="top-attach">2</property>
+        <property name="left-attach">0</property>
       </packing>
     </child>
   </template>