git-svn-id: svn://db.shs.com.ru/libs@330 a8b55f48-bf90-11e4-a774-851b48703e85

qad/graphic/graphic.ui

@@ -54,7 +54,7 @@
          </property>
          <property name="icon">
           <iconset resource="qad_graphic.qrc">
-           <normaloff>:/icons/zoom-fit-best.png</normaloff>:/icons/zoom-fit-best.png</iconset>
+           <normaloff>:/icons/view-autofit.png</normaloff>:/icons/view-autofit.png</iconset>
          </property>
         </widget>
        </item>
@@ -64,7 +64,7 @@
           <string>Grid</string>
          </property>
          <property name="icon">
-          <iconset resource="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.qrc">
            <normaloff>:/icons/view-grid.png</normaloff>:/icons/view-grid.png</iconset>
          </property>
          <property name="checkable">
@@ -81,7 +81,7 @@
           <string>Cursor axis</string>
          </property>
          <property name="icon">
-          <iconset resource="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.qrc">
            <normaloff>:/icons/edit-guides.png</normaloff>:/icons/edit-guides.png</iconset>
          </property>
          <property name="checkable">
@@ -95,7 +95,7 @@
           <string>Only expand Y</string>
          </property>
          <property name="icon">
-          <iconset resource="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.qrc">
            <normaloff>:/icons/expand_s_y.png</normaloff>:/icons/expand_s_y.png</iconset>
          </property>
          <property name="checkable">
@@ -109,7 +109,7 @@
           <string>Only expand X</string>
          </property>
          <property name="icon">
-          <iconset resource="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.qrc">
            <normaloff>:/icons/expand_s_x.png</normaloff>:/icons/expand_s_x.png</iconset>
          </property>
          <property name="checkable">
@@ -123,7 +123,7 @@
           <string>Fullscreen</string>
          </property>
          <property name="icon">
-          <iconset resource="qad_graphic.qrc">
+          <iconset resource="../blockview/qad_blockview.qrc">
            <normaloff>:/icons/view-fullscreen.png</normaloff>:/icons/view-fullscreen.png</iconset>
          </property>
         </widget>
@@ -134,7 +134,7 @@
           <string>Border inputs</string>
          </property>
          <property name="icon">
-          <iconset resource="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.qrc">
            <normaloff>:/icons/border-line.png</normaloff>:/icons/border-line.png</iconset>
          </property>
          <property name="checkable">
@@ -151,7 +151,7 @@
           <string>Legend</string>
          </property>
          <property name="icon">
-          <iconset resource="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.qrc">
            <normaloff>:/icons/legend.png</normaloff>:/icons/legend.png</iconset>
          </property>
          <property name="checkable">
@@ -182,7 +182,7 @@
           <string>Configure ...</string>
          </property>
          <property name="icon">
-          <iconset resource="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.qrc">
            <normaloff>:/icons/configure.png</normaloff>:/icons/configure.png</iconset>
          </property>
         </widget>
@@ -193,7 +193,7 @@
           <string>Save image ...</string>
          </property>
          <property name="icon">
-          <iconset resource="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.qrc">
            <normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset>
          </property>
         </widget>
@@ -220,7 +220,7 @@
           <string>Clear</string>
          </property>
          <property name="icon">
-          <iconset resource="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.qrc">
            <normaloff>:/icons/edit-clear.png</normaloff>:/icons/edit-clear.png</iconset>
          </property>
         </widget>
@@ -231,7 +231,7 @@
           <string>Close</string>
          </property>
          <property name="icon">
-          <iconset resource="qad_graphic.qrc">
+          <iconset resource="../application/qad_application.qrc">
            <normaloff>:/icons/dialog-close.png</normaloff>:/icons/dialog-close.png</iconset>
          </property>
         </widget>
@@ -446,6 +446,8 @@
   </customwidget>
  </customwidgets>
  <resources>
+  <include location="../application/qad_application.qrc"/>
+  <include location="../blockview/qad_blockview.qrc"/>
   <include location="qad_graphic.qrc"/>
  </resources>
  <connections/>

qad/graphic/qad_graphic.qrc

@@ -5,16 +5,13 @@
         <file>../icons/edit-clear.png</file>
         <file>../icons/edit-guides.png</file>
         <file>../icons/view-grid.png</file>
-        <file>../icons/zoom-fit-best.png</file>
+		<file>../icons/view-autofit.png</file>
         <file>../icons/configure.png</file>
         <file>../icons/document-save.png</file>
         <file>../icons/edit-clear-locationbar-rtl.png</file>
         <file>../icons/edit-find.png</file>
         <file>../icons/list-add.png</file>
         <file>../icons/edit-delete.png</file>
-        <file>../icons/item.png</file>
-        <file>../icons/node-add.png</file>
-        <file>../icons/node.png</file>
         <file>../icons/edit-copy.png</file>
         <file>../icons/edit-paste.png</file>
         <file>../icons/expand_s_x.png</file>