forked from qt-creator/qt-creator
Git: Enable local branch selection in Push to Gerrit
Show dialog even if there are no local commits in current branch Change-Id: I11e0c6505981712df51bb33694a6cba9704d7324 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
292e4599aa
commit
1ed9f6bbca
@@ -47,6 +47,19 @@
|
||||
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
|
||||
</property>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="localBranchLabel">
|
||||
<property name="text">
|
||||
<string>&Local branch:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>localBranchComboBox</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="BranchComboBox" name="localBranchComboBox"/>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="remoteLabel">
|
||||
<property name="text">
|
||||
<string>R&emote:</string>
|
||||
@@ -56,10 +69,10 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<item row="2" column="1">
|
||||
<widget class="QComboBox" name="remoteComboBox"/>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="targetBranchLabel">
|
||||
<property name="text">
|
||||
<string>Target &branch:</string>
|
||||
@@ -69,10 +82,10 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<item row="3" column="1">
|
||||
<widget class="QComboBox" name="targetBranchComboBox"/>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<item row="4" column="0">
|
||||
<widget class="QLabel" name="topicLabel">
|
||||
<property name="text">
|
||||
<string>&Topic:</string>
|
||||
@@ -82,17 +95,17 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<item row="4" column="1">
|
||||
<widget class="QLineEdit" name="topicLineEdit"/>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<item row="5" column="0">
|
||||
<widget class="QCheckBox" name="draftCheckBox">
|
||||
<property name="text">
|
||||
<string>&Draft</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0" colspan="2">
|
||||
<item row="6" column="0" colspan="2">
|
||||
<widget class="QLabel" name="infoLabel">
|
||||
<property name="text">
|
||||
<string>Number of commits</string>
|
||||
@@ -178,6 +191,11 @@ Partial names can be used if they are unambiguous.</string>
|
||||
<extends>QTreeView</extends>
|
||||
<header location="global">git/logchangedialog.h</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>BranchComboBox</class>
|
||||
<extends>QComboBox</extends>
|
||||
<header location="global">git/gerrit/branchcombobox.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
<connections>
|
||||
|
||||
Reference in New Issue
Block a user