#
#
# patch "res/forms/application_update.ui"
#  from [cfb6889da734fdfa20f68943c73d93983951ce5a]
#    to [7d2b3993e719ba0fea62c815d0cee25d6fd48562]
# 
# patch "res/forms/changeset_browser.ui"
#  from [b305fba833874efa7b6b53773d8cea303c0366d0]
#    to [ac59737143d7aac046048608d14ed2dbdefd23b6]
# 
# patch "res/forms/commit_revision.ui"
#  from [7743280f847be7c2fd842e55b24e48be78d2b6ab]
#    to [869cc6762e7b033d8186dc527e9d96ab5e77ff49]
# 
# patch "res/forms/file_diff.ui"
#  from [243551f9851e8129ce736dd81ca5b4049347c14d]
#    to [9999a04c668f9a40b1a9b20f7ecd0812e8dc7cd5]
# 
# patch "res/forms/file_history.ui"
#  from [4276a79e7a6dc28d7aeffbd5210ff5d9cadc0043]
#    to [04c0cef841a0eee70161d76b12d6772a92238bc0]
# 
# patch "res/forms/key_management.ui"
#  from [edec01c656964ce19977a8305c380207fa222bff]
#    to [4913ed46e0685544cb5e3cf7cdf98b54aacd42ce]
# 
# patch "res/forms/manifest.ui"
#  from [b0411bd9c26399c10dd09a486cc6403b80af3f7c]
#    to [5b3e49e7bec6ba679c67b10ef1c9c0ee7e6799d2]
# 
# patch "res/forms/preferences.ui"
#  from [4c7a832f0d210371eb68882a1f736ff150affdff]
#    to [9898dad2631df0a8a5cb6f06fc5055160b7e24d2]
# 
# patch "res/forms/revision_diff.ui"
#  from [d4d25a844c0a4a141bc9ac01933d96371b7116c0]
#    to [56845d2399bd6d4a4e6936b65311cb63a599ba99]
# 
# patch "res/forms/select_revision.ui"
#  from [fc9c11fc21389f539c56dd4e3b89e5e210fac96d]
#    to [b901de21917e7ec4fa9b7ebfa3f1bb5a93bdcf47]
# 
# patch "res/forms/unaccounted_renames.ui"
#  from [4f22b29be16ab911fd67766288f0385ffed6e9f1]
#    to [035b00da70ee362272c7fe50039ec41364a231ff]
#
============================================================
--- res/forms/application_update.ui	cfb6889da734fdfa20f68943c73d93983951ce5a
+++ res/forms/application_update.ui	7d2b3993e719ba0fea62c815d0cee25d6fd48562
@@ -42,6 +42,13 @@
         <number>6</number>
        </property>
        <item>
+        <widget class="QPushButton" name="visitWebsite" >
+         <property name="text" >
+          <string>Visit website</string>
+         </property>
+        </widget>
+       </item>
+       <item>
         <spacer>
          <property name="orientation" >
           <enum>Qt::Horizontal</enum>
@@ -55,17 +62,13 @@
         </spacer>
        </item>
        <item>
-        <widget class="QPushButton" name="visitWebsite" >
-         <property name="text" >
-          <string>Visit website</string>
-         </property>
-        </widget>
-       </item>
-       <item>
         <widget class="QPushButton" name="close" >
          <property name="text" >
           <string>Close</string>
          </property>
+         <property name="default" >
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
============================================================
--- res/forms/changeset_browser.ui	b305fba833874efa7b6b53773d8cea303c0366d0
+++ res/forms/changeset_browser.ui	ac59737143d7aac046048608d14ed2dbdefd23b6
@@ -122,6 +122,9 @@
          <property name="text" >
           <string>close</string>
          </property>
+         <property name="default" >
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
@@ -134,7 +137,7 @@
   <customwidget>
    <class>Splitter</class>
    <extends>QSplitter</extends>
-   <header>../Splitter.h</header>
+   <header>Splitter.h</header>
   </customwidget>
   <customwidget>
    <class>TreeView</class>
============================================================
--- res/forms/commit_revision.ui	7743280f847be7c2fd842e55b24e48be78d2b6ab
+++ res/forms/commit_revision.ui	869cc6762e7b033d8186dc527e9d96ab5e77ff49
@@ -249,41 +249,14 @@
       </layout>
      </item>
      <item>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
+      <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
        </property>
-       <property name="spacing" >
-        <number>6</number>
+       <property name="standardButtons" >
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
        </property>
-       <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" >
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QPushButton" name="abort" >
-         <property name="text" >
-          <string>Abort</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="commitRev" >
-         <property name="text" >
-          <string>Commit</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
+      </widget>
      </item>
     </layout>
    </item>
@@ -305,12 +278,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>89</x>
-     <y>458</y>
+     <x>100</x>
+     <y>514</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>238</x>
-     <y>461</y>
+     <x>456</x>
+     <y>515</y>
     </hint>
    </hints>
   </connection>
@@ -321,44 +294,44 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>87</x>
-     <y>425</y>
+     <x>98</x>
+     <y>484</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>243</x>
-     <y>427</y>
+     <x>456</x>
+     <y>485</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>abort</sender>
-   <signal>clicked()</signal>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
    <receiver>CommitRevision</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>294</x>
-     <y>502</y>
+     <x>302</x>
+     <y>541</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>146</x>
-     <y>487</y>
+     <x>252</x>
+     <y>561</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>commitRev</sender>
-   <signal>clicked()</signal>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
    <receiver>CommitRevision</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>371</x>
-     <y>492</y>
+     <x>411</x>
+     <y>543</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>45</x>
-     <y>483</y>
+     <x>392</x>
+     <y>560</y>
     </hint>
    </hints>
   </connection>
============================================================
--- res/forms/file_diff.ui	243551f9851e8129ce736dd81ca5b4049347c14d
+++ res/forms/file_diff.ui	9999a04c668f9a40b1a9b20f7ecd0812e8dc7cd5
@@ -148,6 +148,9 @@
          <property name="text" >
           <string>Close</string>
          </property>
+         <property name="default" >
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
============================================================
--- res/forms/file_history.ui	4276a79e7a6dc28d7aeffbd5210ff5d9cadc0043
+++ res/forms/file_history.ui	04c0cef841a0eee70161d76b12d6772a92238bc0
@@ -159,6 +159,9 @@
          <property name="text" >
           <string>Close</string>
          </property>
+         <property name="default" >
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
@@ -169,15 +172,15 @@
  </widget>
  <customwidgets>
   <customwidget>
+   <class>Splitter</class>
+   <extends>QSplitter</extends>
+   <header>Splitter.h</header>
+  </customwidget>
+  <customwidget>
    <class>TreeView</class>
    <extends>QTreeView</extends>
    <header>TreeView.h</header>
   </customwidget>
-  <customwidget>
-   <class>Splitter</class>
-   <extends>QSplitter</extends>
-   <header>Splitter.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="../guitone.qrc" />
============================================================
--- res/forms/key_management.ui	edec01c656964ce19977a8305c380207fa222bff
+++ res/forms/key_management.ui	4913ed46e0685544cb5e3cf7cdf98b54aacd42ce
@@ -79,6 +79,9 @@
          <property name="text" >
           <string>Close</string>
          </property>
+         <property name="default" >
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
============================================================
--- res/forms/manifest.ui	b0411bd9c26399c10dd09a486cc6403b80af3f7c
+++ res/forms/manifest.ui	5b3e49e7bec6ba679c67b10ef1c9c0ee7e6799d2
@@ -77,6 +77,9 @@
          <property name="text" >
           <string>Close</string>
          </property>
+         <property name="default" >
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
============================================================
--- res/forms/preferences.ui	4c7a832f0d210371eb68882a1f736ff150affdff
+++ res/forms/preferences.ui	9898dad2631df0a8a5cb6f06fc5055160b7e24d2
@@ -214,17 +214,20 @@
         </spacer>
        </item>
        <item>
-        <widget class="QPushButton" name="okButton" >
+        <widget class="QPushButton" name="cancelButton" >
          <property name="text" >
-          <string>OK</string>
+          <string>Cancel</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="cancelButton" >
+        <widget class="QPushButton" name="okButton" >
          <property name="text" >
-          <string>Cancel</string>
+          <string>OK</string>
          </property>
+         <property name="default" >
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
============================================================
--- res/forms/revision_diff.ui	d4d25a844c0a4a141bc9ac01933d96371b7116c0
+++ res/forms/revision_diff.ui	56845d2399bd6d4a4e6936b65311cb63a599ba99
@@ -56,6 +56,9 @@
          <property name="text" >
           <string>Close</string>
          </property>
+         <property name="default" >
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
============================================================
--- res/forms/select_revision.ui	fc9c11fc21389f539c56dd4e3b89e5e210fac96d
+++ res/forms/select_revision.ui	b901de21917e7ec4fa9b7ebfa3f1bb5a93bdcf47
@@ -185,17 +185,20 @@
         </spacer>
        </item>
        <item>
-        <widget class="QPushButton" name="okButton" >
+        <widget class="QPushButton" name="cancelButton" >
          <property name="text" >
-          <string>OK</string>
+          <string>Cancel</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="cancelButton" >
+        <widget class="QPushButton" name="okButton" >
          <property name="text" >
-          <string>Cancel</string>
+          <string>OK</string>
          </property>
+         <property name="default" >
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
============================================================
--- res/forms/unaccounted_renames.ui	4f22b29be16ab911fd67766288f0385ffed6e9f1
+++ res/forms/unaccounted_renames.ui	035b00da70ee362272c7fe50039ec41364a231ff
@@ -42,6 +42,16 @@
         <number>6</number>
        </property>
        <item>
+        <widget class="QPushButton" name="performRenames" >
+         <property name="enabled" >
+          <bool>false</bool>
+         </property>
+         <property name="text" >
+          <string>Perform checked renames</string>
+         </property>
+        </widget>
+       </item>
+       <item>
         <spacer>
          <property name="orientation" >
           <enum>Qt::Horizontal</enum>
@@ -55,17 +65,13 @@
         </spacer>
        </item>
        <item>
-        <widget class="QPushButton" name="performRenames" >
-         <property name="text" >
-          <string>Perform checked renames</string>
-         </property>
-        </widget>
-       </item>
-       <item>
         <widget class="QPushButton" name="closeButton" >
          <property name="text" >
           <string>Close</string>
          </property>
+         <property name="default" >
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>