merge manually

src/mainwindow.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>silentdragon</string>
+   <string>SilentDragonLite</string>
   </property>
   <property name="windowIcon">
    <iconset resource="../application.qrc">
@@ -399,8 +399,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>1226</width>
-                <height>504</height>
+                <width>1162</width>
+                <height>344</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="sendToLayout">
@@ -1095,7 +1095,7 @@
      <x>0</x>
      <y>0</y>
      <width>1274</width>
-     <height>22</height>
+     <height>39</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -1139,6 +1139,8 @@
     <addaction name="separator"/>
     <addaction name="actionEncrypt_Wallet"/>
     <addaction name="actionRemove_Wallet_Encryption"/>
+    <addaction name="separator"/>
+    <addaction name="actionRescan"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menu_Edit"/>
@@ -1245,6 +1247,11 @@
     <string>Remove Wallet Encryption</string>
    </property>
   </action>
+  <action name="actionRescan">
+   <property name="text">
+    <string>Rescan</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>