Thu, 03 Apr 2014 23:05:31 +0200
Merge with default branch.
<?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> <class>HgFetchDialog</class> <widget class="QDialog" name="HgFetchDialog"> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>400</width> <height>300</height> </rect> </property> <property name="windowTitle"> <string>Fetch Changes</string> </property> <property name="sizeGripEnabled"> <bool>true</bool> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <widget class="QGroupBox" name="groupBox"> <property name="title"> <string>Commit Message</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> <widget class="QPlainTextEdit" name="messageEdit"> <property name="toolTip"> <string>Enter commit message or leave empty to use the default message</string> </property> <property name="tabChangesFocus"> <bool>true</bool> </property> </widget> </item> <item> <widget class="QLabel" name="label_2"> <property name="text"> <string>Recent commit messages</string> </property> </widget> </item> <item> <widget class="QComboBox" name="recentComboBox"> <property name="toolTip"> <string>Select a recent commit message to use</string> </property> </widget> </item> </layout> </widget> </item> <item> <widget class="QCheckBox" name="switchCheckBox"> <property name="toolTip"> <string>Select to switch the merge order</string> </property> <property name="text"> <string>Switch Parents when Merging</string> </property> </widget> </item> <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> </layout> </widget> <tabstops> <tabstop>messageEdit</tabstop> <tabstop>recentComboBox</tabstop> <tabstop>switchCheckBox</tabstop> <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections> <connection> <sender>buttonBox</sender> <signal>accepted()</signal> <receiver>HgFetchDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> <x>248</x> <y>254</y> </hint> <hint type="destinationlabel"> <x>157</x> <y>274</y> </hint> </hints> </connection> <connection> <sender>buttonBox</sender> <signal>rejected()</signal> <receiver>HgFetchDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> <x>316</x> <y>260</y> </hint> <hint type="destinationlabel"> <x>286</x> <y>274</y> </hint> </hints> </connection> </connections> </ui>