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

qglview/qglview_test/qglview_window.ui

@@ -1015,7 +1015,7 @@
      </widget>
     </item>
     <item>
-     <widget class="QGLView" name="view" native="true">
+     <widget class="GLWidget" name="view" native="true">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
         <horstretch>0</horstretch>
@@ -1075,7 +1075,7 @@
      <x>0</x>
      <y>0</y>
      <width>1125</width>
-     <height>24</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -1096,7 +1096,7 @@
   <widget class="QStatusBar" name="statusBar_"/>
   <action name="actionExit">
    <property name="icon">
-    <iconset>
+    <iconset resource="../../qad/application/qad_application.qrc">
      <normaloff>:/icons/application-exit.png</normaloff>:/icons/application-exit.png</iconset>
    </property>
    <property name="text">
@@ -1105,7 +1105,7 @@
   </action>
   <action name="actionImport">
    <property name="icon">
-    <iconset>
+    <iconset resource="../qglview.qrc">
      <normaloff>:/icons/document-import.png</normaloff>:/icons/document-import.png</iconset>
    </property>
    <property name="text">
@@ -1117,7 +1117,7 @@
   </action>
   <action name="actionOpen">
    <property name="icon">
-    <iconset resource="../../../SM/src/SignalModelling/signalmodelling.qrc">
+    <iconset resource="../../qad/application/qad_application.qrc">
      <normaloff>:/icons/document-open.png</normaloff>:/icons/document-open.png</iconset>
    </property>
    <property name="text">
@@ -1129,7 +1129,7 @@
   </action>
   <action name="actionSave">
    <property name="icon">
-    <iconset resource="../../../SM/src/SignalModelling/signalmodelling.qrc">
+    <iconset resource="../../qad/application/qad_application.qrc">
      <normaloff>:/icons/document-save-all.png</normaloff>:/icons/document-save-all.png</iconset>
    </property>
    <property name="text">
@@ -1141,7 +1141,7 @@
   </action>
   <action name="actionReset">
    <property name="icon">
-    <iconset resource="../../../SM/src/SMBricks/SM_plugins/signal_process/icons.qrc">
+    <iconset resource="../../qad/application/qad_application.qrc">
      <normaloff>:/icons/document-new.png</normaloff>:/icons/document-new.png</iconset>
    </property>
    <property name="text">
@@ -1153,7 +1153,7 @@
   </action>
   <action name="actionSaveSelected">
    <property name="icon">
-    <iconset resource="../../../SM/src/SMBricks/SM_plugins/signal_process/icons.qrc">
+    <iconset resource="../../piqt_utils/piconnedit/piconnedit.qrc">
      <normaloff>:/icons/document-save-.png</normaloff>:/icons/document-save-.png</iconset>
    </property>
    <property name="text">
@@ -1179,9 +1179,9 @@
    <header>colorbutton.h</header>
   </customwidget>
   <customwidget>
-   <class>QGLView</class>
+   <class>GLWidget</class>
    <extends>QWidget</extends>
-   <header location="global">qglview.h</header>
+   <header location="global">glwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
@@ -1202,6 +1202,10 @@
    <header>propertyeditor.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../qad/application/qad_application.qrc"/>
+  <include location="../../piqt_utils/piconnedit/piconnedit.qrc"/>
+  <include location="../qglview.qrc"/>
+ </resources>
  <connections/>
 </ui>