Followup e583d88, fix image paths

src/ui/composer/qgsatlascompositionwidgetbase.ui

@@ -23,7 +23,16 @@
    <property name="spacing">
     <number>0</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -32,15 +41,24 @@
       <enum>QFrame::StyledPanel</enum>
      </property>
      <layout class="QGridLayout" name="gridLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
       <property name="horizontalSpacing">
        <number>0</number>
       </property>
       <property name="verticalSpacing">
        <number>3</number>
       </property>
-      <property name="margin">
-       <number>0</number>
-      </property>
       <item row="0" column="1">
        <widget class="QCheckBox" name="mUseAtlasCheckBox">
         <property name="text">
@@ -151,7 +169,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../../images/images.qrc">
+                <iconset resource="../../../images/images.qrc">
                  <normaloff>:/images/themes/default/mIconExpression.svg</normaloff>:/images/themes/default/mIconExpression.svg</iconset>
                </property>
               </widget>
@@ -280,7 +298,7 @@
                 <string>...</string>
                </property>
                <property name="icon">
-                <iconset resource="../../images/images.qrc">
+                <iconset resource="../../../images/images.qrc">
                  <normaloff>:/images/themes/default/mIconExpression.svg</normaloff>:/images/themes/default/mIconExpression.svg</iconset>
                </property>
               </widget>
@@ -362,7 +380,7 @@
   <tabstop>mAtlasSingleFileCheckBox</tabstop>
  </tabstops>
  <resources>
-  <include location="../../images/images.qrc"/>
+  <include location="../../../images/images.qrc"/>
  </resources>
  <connections/>
 </ui>

src/ui/composer/qgsattributeselectiondialogbase.ui

@@ -32,7 +32,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="../../images/images.qrc">
+            <iconset resource="../../../images/images.qrc">
              <normaloff>:/images/themes/default/symbologyUp.svg</normaloff>:/images/themes/default/symbologyUp.svg</iconset>
            </property>
           </widget>
@@ -43,7 +43,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="../../images/images.qrc">
+            <iconset resource="../../../images/images.qrc">
              <normaloff>:/images/themes/default/symbologyDown.svg</normaloff>:/images/themes/default/symbologyDown.svg</iconset>
            </property>
           </widget>
@@ -54,7 +54,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="../../images/images.qrc">
+            <iconset resource="../../../images/images.qrc">
              <normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
            </property>
           </widget>
@@ -65,7 +65,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="../../images/images.qrc">
+            <iconset resource="../../../images/images.qrc">
              <normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
            </property>
           </widget>
@@ -167,7 +167,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="../../images/images.qrc">
+            <iconset resource="../../../images/images.qrc">
              <normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
            </property>
           </widget>
@@ -182,7 +182,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="../../images/images.qrc">
+            <iconset resource="../../../images/images.qrc">
              <normaloff>:/images/themes/default/symbologyUp.png</normaloff>:/images/themes/default/symbologyUp.png</iconset>
            </property>
           </widget>
@@ -193,7 +193,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="../../images/images.qrc">
+            <iconset resource="../../../images/images.qrc">
              <normaloff>:/images/themes/default/symbologyDown.png</normaloff>:/images/themes/default/symbologyDown.png</iconset>
            </property>
           </widget>
@@ -204,7 +204,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="../../images/images.qrc">
+            <iconset resource="../../../images/images.qrc">
              <normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
            </property>
           </widget>
@@ -270,7 +270,7 @@
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>
-  <include location="../../images/images.qrc"/>
+  <include location="../../../images/images.qrc"/>
  </resources>
  <connections>
   <connection>

src/ui/composer/qgscomposerattributetablewidgetbase.ui

@@ -225,7 +225,7 @@
                <string>...</string>
               </property>
               <property name="icon">
-               <iconset resource="../../images/images.qrc">
+               <iconset resource="../../../images/images.qrc">
                 <normaloff>:/images/themes/default/mIconExpression.svg</normaloff>:/images/themes/default/mIconExpression.svg</iconset>
               </property>
              </widget>
@@ -756,12 +756,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>QgsColorButtonV2</class>
-   <extends>QToolButton</extends>
-   <header>qgscolorbuttonv2.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>QgsCollapsibleGroupBoxBasic</class>
    <extends>QGroupBox</extends>
@@ -771,7 +765,13 @@
   <customwidget>
    <class>QgsMapLayerComboBox</class>
    <extends>QComboBox</extends>
-   <header>qgsmaplayercombobox.h</header>
+   <header location="global">qgsmaplayercombobox.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QgsColorButtonV2</class>
+   <extends>QToolButton</extends>
+   <header>qgscolorbuttonv2.h</header>
+   <container>1</container>
   </customwidget>
   <customwidget>
    <class>QgsDoubleSpinBox</class>
@@ -826,7 +826,7 @@
   <tabstop>mHideEmptyBgCheckBox</tabstop>
  </tabstops>
  <resources>
-  <include location="../../images/images.qrc"/>
+  <include location="../../../images/images.qrc"/>
  </resources>
  <connections/>
 </ui>