Some UI changes

1 files changed, 155 insertions, 29 deletions

diff --git a/ui/DOFuseInterface.glade b/ui/DOFuseInterface.glade
index ea9991c..4f3d847 100644
--- a/ui/DOFuseInterface.glade
+++ b/ui/DOFuseInterface.glade
@@ -188,8 +188,8 @@
                     <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
-                </child> -->
-<!--              </widget>
+                </child>
+              </widget>
 				<packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -497,29 +497,84 @@
                             <property name="position">0</property>
                           </packing>
                         </child>
+<!--  align -->
                         <child>
-                          <widget class="GtkFrame" id="frame1">
+                          <widget class="GtkFrame" id="frame_a5">
                             <property name="visible">True</property>
-                            <property name="label_xalign">0</property>
+                            <property name="label_xalign">0</property> -->
                             <child>
-                              <widget class="GtkAlignment" id="alignment1">
+                              <widget class="GtkAlignment" id="alignment_a5">
                                 <property name="visible">True</property>
                                 <property name="left_padding">12</property>
                                 <child>
-                                  <widget class="GtkCheckButton" id="checkbuttonexif">
-                                    <property name="label" translatable="yes">Copy exif info ?</property>
+                                    <widget class="GtkVBox" id="vboxa_a5">
+                                        <property name="visible">True</property>
+                                        <property name="orientation">vertical</property>
+                                <child>
+                                  <widget class="GtkCheckButton" id="checkbutton_a5_align">
+                                    <property name="label" translatable="yes">Align</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="active">False</property>
                                     <property name="receives_default">False</property>
                                     <property name="draw_indicator">True</property>
+                                    <property name="tooltip">
+Auto align images.
+</property>
                                   </widget>
                                 </child>
-                              </widget>
+                                
+                                <child>
+                                  <widget class="GtkCheckButton" id="checkbutton_a5_crop">
+                                    <property name="label" translatable="yes">Autocrop</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="tooltip">
+Auto crop the image to the area covered by all images.
+</property>
+                                  </widget>
+                                </child>
+                                
+                                <child>
+                                  <widget class="GtkCheckButton" id="checkbutton_a5_shift">
+                                    <property name="label" translatable="yes">Optimize image center shift</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="tooltip">
+Optimize image center shift for all images, except for first.
+Useful for aligning more distorted images.
+</property>
+                                  </widget>
+                                </child>
+                                
+                                <child>
+                                  <widget class="GtkCheckButton" id="checkbutton_a5_field">
+                                    <property name="label" translatable="yes">Optimize field of view</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="tooltip">
+Optimize field of view for all images, except for first.
+Useful for aligning focus stacks with slightly different magnification.
+</property>
+                                  </widget>
+                                </child>
+                          
+                                    </widget>
+                                </child>
+                                
+                             </widget>
                             </child>
+                            
                             <child>
-                              <widget class="GtkLabel" id="label5">
+                              <widget class="GtkLabel" id="label_a5">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Exif&lt;/b&gt;</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Align images&lt;/b&gt;</property>
                                 <property name="use_markup">True</property>
                               </widget>
                               <packing>
@@ -533,6 +588,7 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+<!-- align                       -->
                       </widget>
                     </child>
                     <child>
@@ -612,12 +668,14 @@
                                     <property name="label" translatable="yes">Force HardMask </property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="tooltip">--hard-mask
-                                    
+                                    <property name="tooltip">
+--hard-mask
+
 force hard blend masks and no averaging on finest
 scale; this is especially useful for focus
 stacks with thin and high contrast features,
-but leads to increased noise</property>                                    
+but leads to increased noise.
+                                    </property>                                    
                                     <property name="receives_default">False</property>
                                     <property name="draw_indicator">True</property>
                                   </widget>
@@ -658,8 +716,11 @@ but leads to increased noise</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="value">int</property>
-                                        <property name="tooltip">--entropy-window-size=SIZE
-																	set window SIZE for local entropy analysis</property>                                         
+                                        <property name="tooltip">
+--entropy-window-size=SIZE
+
+set window SIZE for local entropy analysis.
+                                        </property>                                         
                                         <property name="invisible_char">&#x2022;</property>
                                         <property name="adjustment">3 3 7 1 1 0</property>
                                         <property name="digits">0</property>
@@ -724,8 +785,11 @@ but leads to increased noise</property>
                                       <widget class="GtkSpinButton" id="spinbuttoncourb">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-										<property name="tooltip">--contrast-min-curvature=CURVATURE
-																	minimum CURVATURE for an edge to qualify</property>                                        
+										<property name="tooltip">
+--contrast-min-curvature=CURVATURE
+
+minimum CURVATURE for an edge to qualify.
+                                        </property>                                        
                                         <property name="invisible_char">&#x2022;</property>
                                         <property name="adjustment">0 -10 10 1 10 0</property>
                                       </widget>
@@ -758,15 +822,16 @@ but leads to increased noise</property>
                                     <property name="label" translatable="yes">EdgeScale:</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="tooltip">--contrast-edge-scale=EDGESCALE[:LCESCALE[:LCEFACTOR]]
+                                    <property name="tooltip">
+--contrast-edge-scale=EDGESCALE[:LCESCALE[:LCEFACTOR]]
 
 set scale on which to look for edges; positive
 LCESCALE switches on local contrast enhancement
 by LCEFACTOR (EDGESCALE, LCESCALE, LCEFACTOR >= 0);
 append "%" to LCESCALE for values relative to
 EDGESCALE; append "%" to LCEFACTOR for relative
-value</property>
-
+value.
+                                    </property>
                                     <property name="receives_default">False</property>
                                     <property name="draw_indicator">True</property>
                                   </widget>
@@ -792,7 +857,8 @@ value</property>
                                             <property name="tooltip">
 A non-zero value for EDGE-SCALE switches on the Laplacian-of-
 Gaussian (LoG) edge detection algorithm. EDGE-SCALE is the
-radius of the Gaussian used in the search for edges</property>
+radius of the Gaussian used in the search for edges.
+                                            </property>
                                             <property name="invisible_char">&#x2022;</property>
                                             <property name="adjustment">0 0 100 0.1 1 0</property>
                                           </widget>
@@ -843,7 +909,8 @@ A positive LCE-SCALE turns on local contrast
 enhancement (LCE) before the LoG edge detection.
 LCE-SCALE is the radius of the Gaussian used in 
 the enhancement step, LCE-FACTOR is the weight
-factor (“strength”)</property>
+factor (“strength”).
+                                            </property>
                                             <property name="invisible_char">&#x2022;</property>
                                             <property name="adjustment">0 0 100 0.1 1 0</property>
                                           </widget>
@@ -902,7 +969,8 @@ factor (“strength”)</property>
                                             <property name="can_focus">True</property>
                                             <property name="digits">1</property>
                                             <property name="tooltip">
-LCE-FACTOR is the weight factor (“strength”)</property>
+LCE-FACTOR is the weight factor (“strength”)
+                                            </property>
                                             <property name="invisible_char">&#x2022;</property>
                                             <property name="adjustment">0 0 100 0.1 1 0</property>
                                           </widget>
@@ -965,8 +1033,11 @@ LCE-FACTOR is the weight factor (“strength”)</property>
                                     <property name="label" translatable="yes">Use CIECAM02 color profile</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="tooltip">-c
-																use CIECAM02 to blend colors</property>
+                                    <property name="tooltip">
+-c
+
+use CIECAM02 to blend colors.
+                                    </property>
                                     <property name="receives_default">False</property>
                                     <property name="xalign">0.43000000715255737</property>
                                     <property name="draw_indicator">True</property>
@@ -1003,13 +1074,15 @@ LCE-FACTOR is the weight factor (“strength”)</property>
                                         <property name="label" translatable="yes">Gray projector:</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-										<property name="tooltip">--gray-projector=OPERATOR
+										<property name="tooltip">
+--gray-projector=OPERATOR
 
 apply gray-scale projection OPERATOR in exposure
 or contrast weighing, where OPERATOR is one of
 "average", "l-star", "lightness", "value",
 "luminance", or
-"channel-mixer:RED-WEIGHT:GREEN-WEIGHT:BLUE-WEIGHT"</property>                                        
+"channel-mixer:RED-WEIGHT:GREEN-WEIGHT:BLUE-WEIGHT".
+                                        </property>                                        
                                         <property name="receives_default">False</property>
                                         <property name="draw_indicator">True</property>
                                       </widget>
@@ -1071,6 +1144,11 @@ Luminance</property>
                         <property name="type">tab</property>
                       </packing>
                     </child>
+<!-- vbox - config -->                    
+                    <child>
+                        <widget class="GtkVBox" id="label_c5">
+                            <property name="visible">True</property>
+                    
                     <child>
                       <widget class="GtkFrame" id="frame5">
                         <property name="visible">True</property>
@@ -1590,10 +1668,15 @@ Deflate</property>
                                     <property name="position">15</property>
                                   </packing>
                                 </child>
+
                               </widget>
+                              
                             </child>
+                            
                           </widget>
+                          
                         </child>
+                        
                         <child>
                           <widget class="GtkLabel" id="label28">
                             <property name="visible">True</property>
@@ -1604,11 +1687,52 @@ Deflate</property>
                             <property name="type">label_item</property>
                           </packing>
                         </child>
+                        
                       </widget>
                       <packing>
                         <property name="position">2</property>
                       </packing>
                     </child>
+                    <!-- exif -->
+                                <child>
+                          <widget class="GtkFrame" id="frame1">
+                            <property name="visible">True</property>
+                            <property name="label_xalign">0</property>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment1">
+                                <property name="visible">True</property>
+                                <property name="left_padding">12</property>
+                                <child>
+                                  <widget class="GtkCheckButton" id="checkbuttonexif">
+                                    <property name="label" translatable="yes">Copy exif info ?</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                </child>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label5">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Exif&lt;/b&gt;</property>
+                                <property name="use_markup">True</property>
+                              </widget>
+                              <packing>
+                                <property name="type">label_item</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">16</property>
+                          </packing>
+                        </child>
+<!-- exif-->
+                    </widget>
+                    </child>
                     <child>
                       <widget class="GtkLabel" id="label4">
                         <property name="visible">True</property>
@@ -1620,6 +1744,7 @@ Deflate</property>
                         <property name="type">tab</property>
                       </packing>
                     </child>
+                    
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -1627,6 +1752,7 @@ Deflate</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
+                
                 <child>
                   <widget class="GtkHButtonBox" id="hbuttonbox1">
                     <property name="visible">True</property>
@@ -1676,7 +1802,7 @@ Deflate</property>
                   <widget class="GtkFrame" id="frame6">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-<!-- buttony na dole -->
+<!--  buttony na dole  -->
                     <child>
 						
                       <widget class="GtkHButtonBox" id="hbuttonbox3">
@@ -1823,7 +1949,7 @@ Deflate</property>
                 <property name="position">0</property>
               </packing>
             </child>
-  <!-- preview -->
+  <!--  preview  -->
   
             <child>
               <widget class="GtkVBox" id="vbox7">