diff --git a/src/console.ui b/src/console.ui index b2a87fbc..cfc027bb 100644 --- a/src/console.ui +++ b/src/console.ui @@ -1,7 +1,8 @@ - + + Console - - + + 0 0 @@ -9,713 +10,291 @@ 442 - + Action output window - QGit - - :/icons/resources/openterm.png + + + :/icons/resources/openterm.png:/icons/resources/openterm.png - - - - 9 - - - 6 - + + - - + + + 6 + + 0 - - 6 + + 0 + + + 0 + + + 0 - - - - 5 - 1 - 0 + + + + 3 0 - - - 16 - 70 - + + + Sans Serif + 9 + 75 + false + true + false + false + + + + Shows action definition + + + ... - - QFrame::StyledPanel + + Qt::PlainText - - QFrame::Plain + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true - - - 9 - - - 6 - - - - - 0 - - - 6 - - - - - - 5 - 5 - 3 - 0 - - - - - Sans Serif - 9 - 75 - false - true - false - false - - - - Shows action definition - - - ... - - - Qt::PlainText - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 1 - 0 - 0 - 0 - - - - Click to terminate action execution - - - &Terminate - - - :/icons/resources/cancel.png - - - false - - - true - - - - - - - - - QFrame::StyledPanel + + + Qt::Horizontal - - QFrame::Plain + + + 40 + 20 + - - - 9 - - - 6 - - - - - - - - - - 0 - 0 - 0 - - - - - - - 221 - 223 - 228 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 85 - 85 - 85 - - - - - - - 199 - 199 - 199 - - - - - - - 85 - 255 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 239 - 239 - 239 - - - - - - - 0 - 0 - 0 - - - - - - - 103 - 141 - 178 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 238 - - - - - - - 82 - 24 - 139 - - - - - - - 232 - 232 - 232 - - - - - - - - - 0 - 0 - 0 - - - - - - - 221 - 223 - 228 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 85 - 85 - 85 - - - - - - - 199 - 199 - 199 - - - - - - - 85 - 255 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 239 - 239 - 239 - - - - - - - 0 - 0 - 0 - - - - - - - 103 - 141 - 178 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 238 - - - - - - - 82 - 24 - 139 - - - - - - - 232 - 232 - 232 - - - - - - - - - 128 - 128 - 128 - - - - - - - 221 - 223 - 228 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 85 - 85 - 85 - - - - - - - 199 - 199 - 199 - - - - - - - 199 - 199 - 199 - - - - - - - 255 - 255 - 255 - - - - - - - 128 - 128 - 128 - - - - - - - 239 - 239 - 239 - - - - - - - 239 - 239 - 239 - - - - - - - 0 - 0 - 0 - - - - - - - 86 - 117 - 148 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 238 - - - - - - - 82 - 24 - 139 - - - - - - - 232 - 232 - 232 - - - - - - - - false - - - false - - - true - - - false - - - - - + - - - 0 + + + + 0 + 0 + + + + Click to terminate action execution + + + &Terminate + + + + :/icons/resources/cancel.png:/icons/resources/cancel.png + + + true - - 6 + + false - - - - Qt::Horizontal - - - - 531 - 20 - - - - - - - - - 1 - 0 - 0 - 0 - - - - Click to close window. Warning action will not be terminated if running - - - &Ok - - - true - - - - + + + + + + + + + + 85 + 255 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 103 + 141 + 178 + + + + + + + 255 + 255 + 255 + + + + + + + + + 85 + 255 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 103 + 141 + 178 + + + + + + + 255 + 255 + 255 + + + + + + + + + 199 + 199 + 199 + + + + + + + 255 + 255 + 255 + + + + + + + 239 + 239 + 239 + + + + + + + 86 + 117 + 148 + + + + + + + 255 + 255 + 255 + + + + + + + + false + + + false + + + true + + + false + + + + + + + QDialogButtonBox::Close + + + - - + + Terminate - + pushButtonTerminate - pushButtonOk - textEditOutput - + @@ -724,27 +303,27 @@ Console pushButtonTerminate_clicked() - + 658 49 - + 361 220 - pushButtonOk - clicked() + buttonBox + rejected() Console pushButtonOk_clicked() - - 658 - 404 + + 361 + 374 - + 361 220 diff --git a/src/customaction.ui b/src/customaction.ui index e7ecffdb..43e4a779 100644 --- a/src/customaction.ui +++ b/src/customaction.ui @@ -1,403 +1,214 @@ - + + CustomActionBase - - + + 0 0 - 564 + 579 492 - + Actions builder - - :/icons/resources/bookmark.png + + + :/icons/resources/bookmark.png:/icons/resources/bookmark.png - - - 0 - - - 5 - - - 5 - - - 5 - - - 5 - + - - - 6 + + + + 0 + 0 + - - 0 + + QFrame::StyledPanel - - 0 + + QFrame::Raised - - 0 - - - 0 - - - - - - 0 - 0 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 6 + + + + + &New - - 9 + + + :/icons/resources/bookmark_add.png:/icons/resources/bookmark_add.png - - 9 + + Alt+N - - 9 + + + + + + &Rename - - 9 + + + :/icons/resources/pencil.png:/icons/resources/pencil.png - - - - 15 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - &New - - - :/icons/resources/bookmark_add.png - - - Alt+N - - - - - - - &Rename - - - :/icons/resources/pencil.png - - - Alt+R - - - - - - - R&emove - - - :/icons/resources/remove.png - - - Alt+E - - - - - - - Qt::LeftToRight - - - Move &up - - - :/icons/resources/1uparrow.png - - - Alt+U - - - - - - - Move &down - - - :/icons/resources/1downarrow.png - - - Alt+D - - - - - - - - - - - - - 0 - 0 - - - - Qt::Horizontal - - - - QFrame::StyledPanel + + Alt+R - - QFrame::Raised + + + + + + R&emove + + + + :/icons/resources/remove.png:/icons/resources/remove.png + + + Alt+E + + + + + + + Qt::LeftToRight + + + Move &up + + + + :/icons/resources/1uparrow.png:/icons/resources/1uparrow.png + + + Alt+U - - - 6 - - - 9 - - - 9 - - - 9 - - - 9 - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Name - - - listWidgetNames - - - - - - - - - - - - QFrame::StyledPanel + + + + + Move &down - - QFrame::Raised + + + :/icons/resources/1downarrow.png:/icons/resources/1downarrow.png - - - 6 + + Alt+D + + + + + + + + + + + 0 + 0 + + + + Qt::Horizontal + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + &Name - - 9 + + listWidgetNames - - 9 + + + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + Insert commands to run: - - 9 + + + + + + Insert commands to run. See handbook (F1) for some examples. - - 9 + + false - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Insert commands to run: - - - - - - - Insert commands to run. See handbook (F1) for some examples. - - - false - - - - - - - Inserting tokens of the form %lineedit:arguments=defaults% -will open a dialog to enter arguments. Additionally, you can use -variables $CURRENT_BRANCH and $SHA. - - - - - - - If checked main view will be automatically refreshed when done - - - Refresh &view at the end - - - Alt+V - - - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - + + - - - Qt::Horizontal + + + Inserting tokens of the form <code>%lineedit:arguments=defaults%</code><br/> +will open a dialog to enter arguments. Additionally, you can use<br/> +variables <code>$CURRENT_BRANCH</code> and <code>$SHA</code>. - - QSizePolicy::Expanding + + false - - - 101 - 20 - - - + - - - &Ok + + + If checked main view will be automatically refreshed when done - - Alt+O + + Refresh &view at the end - - true - - - true + + Alt+V - - + + + + + + + QDialogButtonBox::Ok + + - + - + @@ -406,11 +217,11 @@ variables $CURRENT_BRANCH and $SHA. CustomActionBase pushButtonNew_clicked() - + 20 20 - + 20 20 @@ -422,11 +233,11 @@ variables $CURRENT_BRANCH and $SHA. CustomActionBase pushButtonRename_clicked() - + 20 20 - + 20 20 @@ -438,11 +249,11 @@ variables $CURRENT_BRANCH and $SHA. CustomActionBase pushButtonRemove_clicked() - + 20 20 - + 20 20 @@ -454,11 +265,11 @@ variables $CURRENT_BRANCH and $SHA. CustomActionBase checkBoxRefreshAfterAction_toggled(bool) - + 20 20 - + 20 20 @@ -470,11 +281,11 @@ variables $CURRENT_BRANCH and $SHA. CustomActionBase pushButtonMoveUp_clicked() - + 20 20 - + 20 20 @@ -486,27 +297,11 @@ variables $CURRENT_BRANCH and $SHA. CustomActionBase pushButtonMoveDown_clicked() - + 20 20 - - 20 - 20 - - - - - pushButtonOk - clicked() - CustomActionBase - pushButtonOk_clicked() - - - 20 - 20 - - + 20 20 @@ -518,11 +313,11 @@ variables $CURRENT_BRANCH and $SHA. CustomActionBase textEditAction_textChanged() - + 395 239 - + 330 231 @@ -534,15 +329,31 @@ variables $CURRENT_BRANCH and $SHA. CustomActionBase listWidgetNames_currentItemChanged(QListWidgetItem*,QListWidgetItem*) - + 129 256 - + 337 232 + + buttonBox + accepted() + CustomActionBase + pushButtonOk_clicked() + + + 289 + 428 + + + 289 + 245 + + + diff --git a/src/fileview.ui b/src/fileview.ui index 3069c702..5f5c6d4a 100644 --- a/src/fileview.ui +++ b/src/fileview.ui @@ -1,7 +1,8 @@ - + + TabFile - - + + 0 0 @@ -9,225 +10,232 @@ 480 - + File - - + + 0 - + 0 - + 0 - + 0 - + 0 - - + + 0 - + 0 - + 0 - + 0 - + 0 - - + + 0 - + 0 - + 0 - + 0 - + 0 - - + + 30 30 - + Copy selection to the clipboard stripping line headers (CTRL+C) - - :/icons/resources/editcopy.png + + + :/icons/resources/editcopy.png:/icons/resources/editcopy.png - + Ctrl+C - + true - - + + false - + 30 30 - + Hide/show file annotation - - :/icons/resources/view_choose.png + + + :/icons/resources/view_choose.png:/icons/resources/view_choose.png - + true - + true - + true - - + + false - + 30 30 - + Lock selection to first tagged line of current revision (CTRL + L) - - :/icons/resources/encrypted.png + + + :/icons/resources/encrypted.png:/icons/resources/encrypted.png - + true - + true - - + + false - + Go to previous annotation line - - :/icons/resources/1uparrow.png + + + :/icons/resources/1uparrow.png:/icons/resources/1uparrow.png - + true - - + + false - + Go to next annotation line - - :/icons/resources/1downarrow.png + + + :/icons/resources/1downarrow.png:/icons/resources/1downarrow.png - + true - - + + false - + 30 30 - + Filter revisions on selected line range - - :/icons/resources/filter.png + + + :/icons/resources/filter.png:/icons/resources/filter.png - + true - + true - - + + false - + 30 30 - + Source highlight (%1) - - :/icons/resources/colorize.png + + + :/icons/resources/colorize.png:/icons/resources/colorize.png - + true - + true - + Qt::Horizontal - + QSizePolicy::Expanding - + 300 20 @@ -236,68 +244,69 @@ - - + + QFrame::StyledPanel - + QFrame::Raised - - + + 0 - + 2 - + 2 - + 2 - + 2 - - + + 0 - + 0 - + 0 - + 0 - + 0 - - + + Pin View (Alt-V) - + - - :/icons/resources/ok.png + + + :/icons/resources/ok.png:/icons/resources/ok.png - + true - + true - - + + 65535 @@ -310,101 +319,101 @@ - - + + Qt::Vertical - - + + Qt::CustomContextMenu - + true - + false - + true - + false - + true - - + + QFrame::StyledPanel - + QFrame::Sunken - - + + 0 - + 0 - + 0 - + 0 - + 0 - - + + 1 - + 0 - + 0 - + 0 - + 0 - - + + QFrame::NoFrame - + Qt::ScrollBarAlwaysOff - + Qt::ScrollBarAlwaysOff - + QAbstractItemView::ScrollPerPixel - + QAbstractItemView::ScrollPerPixel - - + + QFrame::NoFrame - + false - + QTextEdit::NoWrap - + true @@ -419,7 +428,7 @@ - + ListView @@ -433,7 +442,7 @@ - + diff --git a/src/help.ui b/src/help.ui index d6c3211f..a82fca18 100644 --- a/src/help.ui +++ b/src/help.ui @@ -1,7 +1,8 @@ - + + HelpBase - - + + 0 0 @@ -9,112 +10,56 @@ 451 - + Help - - :/icons/resources/help.png + + + :/icons/resources/help.png:/icons/resources/help.png - - - 0 - - - 0 - + - - - 0 + + + Qt::Vertical - - 5 + + + false + + + true + + + + + + + + QDialogButtonBox::Close - - - - Qt::Vertical - - - - false - - - true - - - - - - - - 0 - - - 6 - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - - 80 - 0 - - - - O&K - - - Alt+K - - - true - - - true - - - - - - + - + - + - buttonOk - clicked() + buttonBox + rejected() HelpBase close() - - 20 - 20 + + 315 + 393 - - 20 - 20 + + 315 + 225 diff --git a/src/mainview.ui b/src/mainview.ui index 0b57c570..08a031dd 100644 --- a/src/mainview.ui +++ b/src/mainview.ui @@ -196,7 +196,7 @@ - + :/icons/resources/folder_open.png:/icons/resources/folder_open.png @@ -210,6 +210,9 @@ + + + E&xit @@ -221,6 +224,10 @@ + + + :/icons/resources/qgit.png:/icons/resources/qgit.png + &About QGit @@ -236,7 +243,7 @@ false - + :/icons/resources/mail_send.png:/icons/resources/mail_send.png @@ -251,7 +258,7 @@ - + :/icons/resources/help.png:/icons/resources/help.png @@ -266,7 +273,7 @@ - + :/icons/resources/configure.png:/icons/resources/configure.png @@ -301,6 +308,9 @@ false + + + Make &tag... @@ -315,6 +325,9 @@ + + + Open in a &new window... @@ -326,6 +339,9 @@ + + + &Close @@ -341,11 +357,11 @@ false - + :/icons/resources/mail_get.png:/icons/resources/mail_get.png - Apply patch... + Apply &patch... Apply a patch series @@ -390,7 +406,7 @@ false - + :/icons/resources/reload.png:/icons/resources/reload.png @@ -408,7 +424,7 @@ false - View patch + View &patch View patch @@ -447,8 +463,11 @@ false + + + - Save file as... + Save file &as... Save file as... @@ -468,7 +487,7 @@ false - + :/icons/resources/wizard.png:/icons/resources/wizard.png @@ -489,7 +508,7 @@ false - + :/icons/resources/view_tree.png:/icons/resources/view_tree.png @@ -509,8 +528,11 @@ false + + + - Delete references... + &Delete references... Delete tag @@ -526,8 +548,11 @@ false + + + - Check working directory + &Check working directory Check working dir @@ -538,7 +563,7 @@ - Mark for diff + &Mark for diff Mark for diff @@ -552,7 +577,7 @@ false - External diff... + E&xternal diff... Launch external diff viewer @@ -566,7 +591,7 @@ false - External editor... + External &editor... Launch external editor @@ -594,7 +619,7 @@ - + :/icons/resources/view_top_bottom.png:/icons/resources/view_top_bottom.png @@ -611,8 +636,11 @@ + + + - Find... + &Find... Find text in current view... @@ -623,7 +651,7 @@ - Find next + Find &next Find next @@ -640,11 +668,11 @@ false - + :/icons/resources/next.png:/icons/resources/next.png - Forward + &Forward Forward @@ -658,11 +686,11 @@ false - + :/icons/resources/previous.png:/icons/resources/previous.png - Back + &Back Back @@ -673,11 +701,11 @@ - + :/icons/resources/bookmark.png:/icons/resources/bookmark.png - Setup actions... + &Setup actions... Setup actions... @@ -687,6 +715,9 @@ false + + + View file in new tab @@ -701,6 +732,9 @@ false + + + View patch in new tab @@ -719,7 +753,7 @@ true - + :/icons/resources/filter.png:/icons/resources/filter.png @@ -737,7 +771,7 @@ true - + :/icons/resources/find.png:/icons/resources/find.png @@ -755,7 +789,7 @@ true - Show header info + Show &header info Show header info @@ -783,7 +817,7 @@ - + :/icons/resources/range_select.png:/icons/resources/range_select.png @@ -794,8 +828,11 @@ + + + - Amend commit... + &Amend commit... Amend previous commit diff --git a/src/settings.ui b/src/settings.ui index 101affc2..1da7f02e 100644 --- a/src/settings.ui +++ b/src/settings.ui @@ -29,994 +29,1144 @@ true - - - 6 - - - 9 - + - - - 6 + + + 5 - - 0 - - - - - 5 + + + &General + + + + 6 + + + 9 + + + 9 - - - &General - - + + 9 + + + 9 + + + 6 - - 9 + + 0 + + + 0 + + + 0 + + + 0 - - - 6 + + + QFrame::StyledPanel - - 0 + + QFrame::Raised - - - - QFrame::StyledPanel - - - QFrame::Raised - - + + + 6 + + + 9 + + + 9 + + + 9 + + + 9 + + + 6 - - 9 + + 0 + + + 0 + + + 0 + + + 0 - - - 6 + + + Check to see commit author date as relative time from now + + + Relati&ve time in date column - - 0 + + Alt+V - - - - Check to see commit author date as relative time from now - - - Relati&ve time in date column - - - Alt+V - - - - - - - Check to view range select dialog at repository opening - - - Show range select when opening a repositor&y - - - Alt+Y - - - - - - - Reopen last repository on startup - - - - - - - Double click opens file in editor - - - - + + + + + + Check to view range select dialog at repository opening + + + Show range select when opening a repositor&y + + + Alt+Y + + + + + + + Reopen last repository on startup + + + + + + + Double click opens file in editor + + + + + + + + + + Qt::Vertical + + + + 20 + 21 + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 4 + + + + + + 40 + 16777215 + + + + Browse directories + + + ... + + + + - - - - Qt::Vertical + + + + Typewriter (fixed width) font used by patch and file viewers - + + true + + + + + + + &Fixed width font + + + false + + + lineEditTypeWriterFont + + + + + + + Set path of the external diff tool + + + + + + + &External diff tool + + + false + + + lineEditExternalDiffViewer + + + + + + + Set path of the external editor + + + + + + + &External editor + + + false + + + lineEditExternalEditor + + + + + + - 20 - 21 + 40 + 16777215 - + + Browse directories + + + ... + + + + + - - - - 0 - - - 4 - - - - - - 40 - 16777215 - - - - Browse directories - - - ... - - - - - - - - - - Typewriter (fixed width) font used by patch and file viewers - - - true - - - - - - - Fixed width font - - - false - - - lineEditTypeWriterFont - - - - - - - Set path of the external diff tool - - - - - - - &External diff tool - - - false - - - lineEditExternalDiffViewer - - - - - - - Set path of the external editor - - - - - - - &External editor - - - false - - - lineEditExternalEditor - - - - - - - - 40 - 16777215 - - - - Browse directories - - - ... - - - - - - - - - - - 40 - 16777215 - - - - Choose font - - - ... - - - - - - - - - - Use %1 and %2 to denote files to diff. - - - - - - - Use %1 to denote files to edit. - - - - + + + + + 40 + 16777215 + + + + Choose font + + + ... + + + + + + + + + Use %1 and %2 to denote files to diff. + + + + + + + Use %1 to denote files to edit. + + + + + + + + + Qt::Vertical + + + + 20 + 20 + + + + + + + + 4 + + + 0 + + + 0 + + + 0 + + + 0 + - - - Qt::Vertical + + + Select text codec to use. You need to refresh the view (F5) after a codec change - - - 20 - 20 - + + Te&xt codec - + + false + + + comboBoxCodecs + + - - - 4 + + + + 1 + 0 + - - 0 + + Select text codec to use. You need to refresh the view (F5) after a codec change - - - - Select text codec to use. You need to refresh the view (F5) after a codec change - - - Te&xt codec - - - false - - - comboBoxCodecs - - - - - - - - 1 - 0 - - - - Select text codec to use. You need to refresh the view (F5) after a codec change - - - - + - - - - &Browse - - + + + + + + &Browse + + + + 6 + + + 9 + + + 9 + + + 9 + + + 9 + + + - 6 + 0 - - 9 + + 0 + + 0 + + + 0 + + + 0 + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 0 + + + 2 + + + 2 + + + 2 + + + 2 + + + + + 4 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Check to see tabbed revision log / diff pane + + + Show tabbed revision msg / diff pane + + + + + + + Check to show smart jump labels on revision description pane + + + Show smart labels + + + + + + + Check to see always the revision description in main view when browsing the repo. Patch content will be visible after request. + + + Show always revision message as first + + + Alt+Y + + + + + + + + + + + + Qt::Vertical + + + + 20 + 71 + + + + + + + + + + + Patc&h + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 0 + + + 2 + + + 2 + + + 2 + + + 2 + + + + + 4 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Check to see patch numbers on patch series header + + + Num&bered patches + + + Alt+B + + + + + + + Check to add a 'Signed-off-by:' line if not already existent + + + &Sign off patch + + + Alt+S + + + + + + + + + + + + Qt::Vertical + + + + 399 + 91 + + + + + + + + + + &Apply patch extra options + + + false + + + lineEditApplyPatchExtraOptions + + + + + + + Extra options to pass to 'git am' + + + 32767 + + + + + + + &Format patch extra options + + + false + + + lineEditFormatPatchExtraOptions + + + + + + + Extra options to pass to 'git format-patch' + + + 32767 + + + + + + + + + + + + &Working directory + + + + 6 + + + 9 + + + 9 + + + 9 + + + 9 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 4 + + + 5 + + + 5 + + + 5 + + + 5 + + + + + Check to see git status. You need this to commit changes + + + Diff again&st working directory + + + Alt+S + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - - + + 0 - + 0 - - - - QFrame::StyledPanel - - - QFrame::Raised + + 0 + + + 0 + + + 4 + + + + + Exclude patterns file that apply only to the + directory and its subdirectories - - - 0 - - - 2 - - - - - 4 - - - 0 - - - - - Check to see tabbed revision log / diff pane - - - Show tabbed revision msg / diff pane - - - - - - - Check to show smart jump labels on revision description pane - - - Show smart labels - - - - - - - Check to see always the revision description in main view when browsing the repo. Patch content will be visible after request. - - - Show always revision message as first - - - Alt+Y - - - - - - - - - - Qt::Vertical - - - - 20 - 71 - + + + + Exclude patterns are read from this file one per line - + - - - - - - - Patc&h - - - - - - - - QFrame::StyledPanel + + + + E&xclude per dir - - QFrame::Raised + + false + + + lineEditExcludePerDir - - - 0 - - - 2 - - - - - 4 - - - 0 - - - - - Check to see patch numbers on patch series header - - - Num&bered patches - - - Alt+B - - - - - - - Check to add a 'Signed-off-by:' line if not already existent - - - &Sign off patch - - - Alt+S - - - - - - - - - - Qt::Vertical + + + + &Exclude file path - - - 399 - 91 - + + false - - - - - - - - &Apply patch extra options - - - false - - - lineEditApplyPatchExtraOptions - - - - - - - Extra options to pass to 'git am' - - - 32767 - - - - - - - &Format patch extra options - - - false - - - lineEditFormatPatchExtraOptions - - - - - - - Extra options to pass to 'git format-patch' - - - 32767 - - - - + + lineEditExcludeFile + + - - - - &Working directory - - + + + + + + &Commit + + + + 6 + + + 9 + + + 9 + + + 9 + + + 9 + + + - 6 + 0 + + + 0 + + + 0 + + + 0 - - 9 + + 0 - - - 0 + + + QFrame::StyledPanel - - 0 + + QFrame::Raised - - - - QFrame::StyledPanel - - - QFrame::Raised - - + + + 0 + + + 2 + + + 2 + + + 2 + + + 2 + + + 4 - - 5 + + 3 + + + 3 + + + 3 + + + 3 - + - Check to see git status. You need this to commit changes + Check to add -s option to git commit-script - Diff again&st working directory + &Sign off commit Alt+S + + + + Check to add -v option to git commit-script + + + &Verify commit + + + Alt+V + + + + + + + Use default commit message + + + + + + + + + + + Qt::Vertical + + + + 20 + 21 + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 4 + + + + + Defined in: + - - - - Qt::Vertical + + + + Author - - - 20 - 40 - + + lineEditAuthor - + - - - - 0 + + + + + + + true - - 4 + + + + + + true - - - - Exclude patterns file that apply only to the - directory and its subdirectories - - - - - - - Exclude patterns are read from this file one per line - - - - - - - E&xclude per dir - - - false - - - lineEditExcludePerDir - - - - - - - &Exclude file path - - - false - - - lineEditExcludeFile - - - - + + + + + + E-mail + + + lineEditMail + + - - - - - &Commit - - - - 6 - - - 9 - - - + + + Qt::Vertical + + + + 20 + 21 + + + + + + + 0 - + 0 - - - - QFrame::StyledPanel + + 0 + + + 0 + + + 4 + + + + + Ms&g template - - QFrame::Raised + + Qt::PlainText + + + false + + + lineEditAuthor - - - 0 - - - 2 - - - - - 4 - - - 3 - - - - - Check to add -s option to git commit-script - - - &Sign off commit - - - Alt+S - - - - - - - Check to add -v option to git commit-script - - - &Verify commit - - - Alt+V - - - - - - - Use default commit message - - - - - - - - - - Qt::Vertical + + + + &Extra options - - - 20 - 21 - + + false - + + lineEditCommitExtraOptions + + - - - - 0 - - - 4 - - - - - Defined in: - - - - - - - Author - - - lineEditAuthor - - - - - - - - - - true - - - - - - - true - - - - - - - E-mail - - - lineEditMail - - - - + + + + Commit message template file + + + + + + + Extra options to pass to git commit-script + + + + + + + + + + + Gi&t config + + + + + + - + - Qt::Vertical + Qt::Horizontal - 20 - 21 + 40 + 20 - - - 0 - - - 4 - - - - - Ms&g template - - - Qt::PlainText - - - false - - - lineEditAuthor - - - - - - - &Extra options - - - false - - - lineEditCommitExtraOptions - - - - - - - Commit message template file - - - - - - - Extra options to pass to git commit-script - - - - + + + Git options source: + + - - - - - - - Gi&t config - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Git options source: - - - + - - - - Local - - - - - Global - - - - - - - - - - 2 - - - Parameter + Local - - + + - Value + Global - + + + + + 2 + + + + Parameter + + + + + Value + + + + - - - - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 181 - 20 - - - - - - - - O&K - - - Alt+K - - - false - - - false - - - - + + + + + + + QDialogButtonBox::Ok + + @@ -1025,22 +1175,6 @@ - - buttonOk - clicked() - settingsBase - close() - - - 501 - 365 - - - 20 - 20 - - - checkBoxNumbers toggled(bool) @@ -1489,5 +1623,21 @@ + + buttonBox + accepted() + settingsBase + accept() + + + 256 + 451 + + + 256 + 236 + + +