diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2010-10-04 15:37:15 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2010-10-04 15:49:22 +0200 |
| commit | c7142affef4b4ea78306254b62da13d66f9be0af (patch) | |
| tree | 9e01360bc8a052f8bb1d07c40d17ebf3f8c51a57 /src/plugins/git/gitsubmitpanel.ui | |
| parent | 685ae6bc55f8a0b5fb94c059daa1f414aa57e6eb (diff) | |
Git: Only allow commit if author information is valid
Check author information to be valid before enableing
the commit button.
Task-number: QTCREATORBUG-2410
Diffstat (limited to 'src/plugins/git/gitsubmitpanel.ui')
| -rw-r--r-- | src/plugins/git/gitsubmitpanel.ui | 105 |
1 files changed, 76 insertions, 29 deletions
diff --git a/src/plugins/git/gitsubmitpanel.ui b/src/plugins/git/gitsubmitpanel.ui index 7dfa9b3ba0f..c790299aa11 100644 --- a/src/plugins/git/gitsubmitpanel.ui +++ b/src/plugins/git/gitsubmitpanel.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>374</width> - <height>229</height> + <width>364</width> + <height>172</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout"> @@ -59,49 +59,96 @@ <property name="title"> <string>Commit Information</string> </property> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <layout class="QFormLayout" name="formLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="authorLabel"> - <property name="text"> - <string>Author:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLineEdit" name="authorLineEdit"/> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="emailLabel"> - <property name="text"> - <string>Email:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QLineEdit" name="emailLineEdit"/> - </item> - </layout> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="authorLabel"> + <property name="text"> + <string>Author:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="authorLineEdit"> + <property name="minimumSize"> + <size> + <width>150</width> + <height>0</height> + </size> + </property> + </widget> </item> - <item> + <item row="0" column="2"> + <widget class="QLabel" name="invalidAuthorLabel"> + <property name="minimumSize"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_error.png</pixmap> + </property> + </widget> + </item> + <item row="0" column="3"> <spacer name="horizontalSpacer"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> + <property name="sizeType"> + <enum>QSizePolicy::MinimumExpanding</enum> + </property> <property name="sizeHint" stdset="0"> <size> - <width>161</width> + <width>5</width> <height>20</height> </size> </property> </spacer> </item> + <item row="1" column="0"> + <widget class="QLabel" name="emailLabel"> + <property name="text"> + <string>Email:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="emailLineEdit"> + <property name="minimumSize"> + <size> + <width>150</width> + <height>0</height> + </size> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QLabel" name="invalidEmailLabel"> + <property name="minimumSize"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="../projectexplorer/projectexplorer.qrc">:/projectexplorer/images/compile_error.png</pixmap> + </property> + </widget> + </item> </layout> </widget> </item> </layout> </widget> - <resources/> + <resources> + <include location="../projectexplorer/projectexplorer.qrc"/> + </resources> <connections/> </ui> |