diff options
author | Petar Perisin <petar.perisin@gmail.com> | 2012-12-16 20:35:58 +0100 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-01-07 15:33:20 +0100 |
commit | 81bf2ec154f8a98269040b1e185d9b59d2c6f3e9 (patch) | |
tree | 445b19a8c792f65762e5ce03af78229f749e2eb2 /src/plugins/git/branchcheckoutdialog.ui | |
parent | 7df112b687c8694153ef3a5938921104b6e75115 (diff) | |
download | qt-creator-81bf2ec154f8a98269040b1e185d9b59d2c6f3e9.tar.gz |
Git: Auto stash for branches
Allow user to handle local changes when switching branches.
Task-number: QTCREATORBUG-8417
Change-Id: I62d615aadfbd81c8ae03f3cd292b98773a36e1e7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/branchcheckoutdialog.ui')
-rw-r--r-- | src/plugins/git/branchcheckoutdialog.ui | 133 |
1 files changed, 133 insertions, 0 deletions
diff --git a/src/plugins/git/branchcheckoutdialog.ui b/src/plugins/git/branchcheckoutdialog.ui new file mode 100644 index 0000000000..b8cbc406a9 --- /dev/null +++ b/src/plugins/git/branchcheckoutdialog.ui @@ -0,0 +1,133 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Git::Internal::BranchCheckoutDialog</class> + <widget class="QDialog" name="Git::Internal::BranchCheckoutDialog"> + <property name="windowModality"> + <enum>Qt::WindowModal</enum> + </property> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>394</width> + <height>199</height> + </rect> + </property> + <property name="windowTitle"> + <string>Dialog</string> + </property> + <property name="modal"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QGroupBox" name="localChangesGroupBox"> + <property name="title"> + <string>Local Changes Found. Choose Action:</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QRadioButton" name="makeStashRadioButton"> + <property name="text"> + <string>RadioButton</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="moveChangesRadioButton"> + <property name="text"> + <string>RadioButton</string> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="discardChangesRadioButton"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="text"> + <string>Discard Local Changes</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QCheckBox" name="popStashCheckBox"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>CheckBox</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </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>discardChangesRadioButton</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>Git::Internal::BranchCheckoutDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>227</x> + <y>219</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>179</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>Git::Internal::BranchCheckoutDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>295</x> + <y>219</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>179</y> + </hint> + </hints> + </connection> + </connections> +</ui> |