Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

[clitk.git] / vv / qt_ui / vvMainWindow.ui

diff --git a/vv/qt_ui/vvMainWindow.ui b/vv/qt_ui/vvMainWindow.ui
index 88eddcf87d9aef92a1a510ef23c8ece1fdf94e24..4cb79bb0d3a6f6b6ac50c58eb7ffa3ae20fb3540 100644 (file)
--- a/vv/qt_ui/vvMainWindow.ui
+++ b/vv/qt_ui/vvMainWindow.ui
@@ -626,7 +626,7 @@
            <number>2</number>
           </property>
           <item row="0" column="0">
-           <widget class="QVTKWidget" name="NOViewWidget">
+           <widget class="QVTKWidget" name="NOViewWidget" native="true">
             <property name="mouseTracking">
              <bool>true</bool>
             </property>
@@ -666,7 +666,7 @@
            <number>2</number>
           </property>
           <item row="0" column="0">
-           <widget class="QVTKWidget" name="SOViewWidget">
+           <widget class="QVTKWidget" name="SOViewWidget" native="true">
             <property name="mouseTracking">
              <bool>true</bool>
             </property>
@@ -708,7 +708,7 @@
            <number>2</number>
           </property>
           <item row="0" column="0">
-           <widget class="QVTKWidget" name="NEViewWidget">
+           <widget class="QVTKWidget" name="NEViewWidget" native="true">
             <property name="mouseTracking">
              <bool>true</bool>
             </property>
@@ -745,7 +745,7 @@
            <number>2</number>
           </property>
           <item row="0" column="0">
-           <widget class="QVTKWidget" name="SEViewWidget">
+           <widget class="QVTKWidget" name="SEViewWidget" native="true">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
               <horstretch>0</horstretch>
@@ -785,7 +785,7 @@
      <x>0</x>
      <y>0</y>
      <width>1008</width>
-     <height>19</height>
+     <height>20</height>
     </rect>
    </property>
    <property name="defaultUp">
@@ -804,6 +804,7 @@
      <string>Overlay</string>
     </property>
     <addaction name="actionAdd_VF_to_current_Image"/>
+    <addaction name="actionAdd_overlay_image_to_current_image"/>
     <addaction name="actionAdd_fusion_image"/>
    </widget>
    <widget class="QMenu" name="menuScreenshots">
@@ -849,9 +850,12 @@
     <addaction name="separator"/>
     <addaction name="actionSave_As"/>
     <addaction name="separator"/>
-    <addaction name="actionExit"/>
-    <addaction name="actionSave_current_state"/>
     <addaction name="actionRead_saved_state"/>
+    <addaction name="actionSave_current_state"/>
+    <addaction name="separator"/>
+    <addaction name="actionExit"/>
+    <addaction name="separator"/>
+    <addaction name="separator"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuOverlay"/>
@@ -976,6 +980,9 @@
    <property name="text">
     <string>Add deformation field to current image</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionNorth_West_Window">
    <property name="icon">
@@ -1123,8 +1130,8 @@
   </action>
   <action name="actionSave_current_state">
    <property name="icon">
-    <iconset>
-     <normaloff>../icons/filesave.png</normaloff>../icons/filesave.png</iconset>
+    <iconset resource="../vvIcons.qrc">
+     <normaloff>:/common/icons/filesave.png</normaloff>:/common/icons/filesave.png</iconset>
    </property>
    <property name="text">
     <string>Save current state</string>
@@ -1135,13 +1142,25 @@
   </action>
   <action name="actionRead_saved_state">
    <property name="icon">
-    <iconset>
-     <normaloff>../icons/filesave.png</normaloff>../icons/filesave.png</iconset>
+    <iconset resource="../vvIcons.qrc">
+     <normaloff>:/common/icons/open.png</normaloff>:/common/icons/open.png</iconset>
    </property>
    <property name="text">
     <string>Read Saved State</string>
    </property>
   </action>
+  <action name="actionAdd_overlay_image_to_current_image">
+   <property name="icon">
+    <iconset resource="../vvIcons.qrc">
+     <normaloff>:/common/icons/GPSup.png</normaloff>:/common/icons/GPSup.png</iconset>
+   </property>
+   <property name="text">
+    <string>Add overlay image to current image</string>
+   </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>