Merge pull request 'master' (#92) from YanTheKaller/ubl-settings-diskquota:master into master

Reviewed-on: #92

ubl-settings-diskquota.css

@@ -106,3 +106,7 @@ background:transparent;
 .boxInfoMessOK{
     background-color: #f3f0ac;
 }
+
+.marginright image{
+	margin-right: 2px;
+}

ubl-settings-diskquota.glade

@@ -2413,17 +2413,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <object class="GtkImage" id="image8">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="icon-name">process-stop-symbolic</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.cancel-symbolic</property>
   </object>
   <object class="GtkImage" id="image9">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="icon-name">emblem-ok-symbolic</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.accept-symbolic</property>
   </object>
   <object class="GtkApplicationWindow" id="helpConfirmationWindow">
+    <property name="width-request">450</property>
     <property name="can-focus">False</property>
     <property name="resizable">False</property>
-    <property name="default-width">450</property>
     <property name="icon-name">dialog-question-symbolic</property>
     <child>
       <object class="GtkBox">
@@ -2459,13 +2459,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="margin-top">10</property>
                 <property name="orientation">vertical</property>
+                <property name="spacing">5</property>
                 <child>
                   <object class="GtkLabel" id="helpHeader">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="halign">start</property>
-                    <property name="margin-top">10</property>
                     <property name="margin-bottom">5</property>
                     <property name="label" translatable="yes">Would you like to read documentation in the Web?</property>
                     <property name="wrap">True</property>
@@ -2489,11 +2490,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                     <property name="can-focus">False</property>
                     <property name="halign">start</property>
                     <property name="valign">start</property>
-                    <property name="margin-right">10</property>
-                    <property name="margin-end">10</property>
                     <property name="label" translatable="yes">You will be redirected to documentation website where documentation is
 translated and supported by community.</property>
-                    <property name="wrap">True</property>
                     <property name="xalign">0</property>
                     <style>
                       <class name="fgnb"/>
@@ -2544,12 +2542,22 @@ translated and supported by community.</property>
             <property name="position">0</property>
           </packing>
         </child>
-        <child>
+      </object>
-          <object class="GtkBox">
+    </child>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="SettingsBar">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-            <property name="spacing">30</property>
+        <child type="title">
-            <property name="homogeneous">True</property>
+          <object class="GtkLabel" id="webHeaderNameLabel">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes">Disk quotas</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
         <child>
           <object class="GtkButton" id="CancelHelpButton">
             <property name="label" translatable="yes">Cancel</property>
@@ -2559,13 +2567,9 @@ translated and supported by community.</property>
             <property name="image">image8</property>
             <style>
               <class name="button"/>
+              <class name="marginright"/>
             </style>
           </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
         </child>
         <child>
           <object class="GtkButton" id="ReadHelpButton">
@@ -2576,40 +2580,16 @@ translated and supported by community.</property>
             <property name="image">image9</property>
             <style>
               <class name="button"/>
+              <class name="marginright"/>
             </style>
           </object>
           <packing>
-                <property name="expand">True</property>
+            <property name="pack-type">end</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>
           </packing>
         </child>
       </object>
     </child>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="SettingsBar">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="show-close-button">True</property>
-        <child type="title">
-          <object class="GtkLabel" id="webHeaderNameLabel">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="label" translatable="yes">Disk quotas</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-    </child>
   </object>
   <object class="GtkListStore" id="liststoreDevice">
     <columns>