Module implementing a dialog to show a list of files which had or still have conflicts.
None |
HgConflictsListDialog | Class implementing a dialog to show a list of files which had or still have conflicts. |
None |
Class implementing a dialog to show a list of files which had or still have conflicts.
FilenameRole |
StatusRole |
None |
HgConflictsListDialog | Constructor |
__finish | Private slot called when the process finished or the user pressed the button. |
__generateItem | Private method to generate a tag item in the tag list. |
__getEntries | Private method to get the conflict entries. |
__procFinished | Private slot connected to the finished signal. |
__processOutputLine | Private method to process the lines of output. |
__readStderr | Private slot to handle the readyReadStderr signal. |
__readStdout | Private slot to handle the readyReadStdout signal. |
__resizeColumns | Private method to resize the list columns. |
__resort | Private method to resort the tree. |
__showError | Private slot to show some error. |
closeEvent | Protected slot implementing a close event handler. |
keyPressEvent | Protected slot to handle a key press event. |
on_buttonBox_clicked | Private slot called by a button of the button box clicked. |
on_conflictsList_itemDoubleClicked | Private slot to open the double clicked entry. |
on_conflictsList_itemSelectionChanged | Private slot to handle a change of selected conflict entries. |
on_editButton_clicked | Private slot to open the selected file in an editor. |
on_input_returnPressed | Private slot to handle the press of the return key in the input field. |
on_passwordCheckBox_toggled | Private slot to handle the password checkbox toggled. |
on_reMergeButton_clicked | Private slot to re-merge the selected entries. |
on_refreshButton_clicked | Private slot to refresh the log. |
on_resolvedButton_clicked | Private slot to mark the selected entries as resolved. |
on_sendButton_clicked | Private slot to send the input to the subversion process. |
on_unresolvedButton_clicked | Private slot to mark the selected entries as unresolved. |
show | Public slot to show the dialog. |
start | Public slot to start the tags command. |
None |
Constructor
Private slot called when the process finished or the user pressed the button.
Private method to generate a tag item in the tag list.
Private method to get the conflict entries.
Private slot connected to the finished signal.
Private method to process the lines of output.
Private slot to handle the readyReadStderr signal.
It reads the error output of the process and inserts it into the error pane.
Private slot to handle the readyReadStdout signal.
It reads the output of the process, formats it and inserts it into the contents pane.
Private method to resize the list columns.
Private method to resort the tree.
Private slot to show some error.
Protected slot implementing a close event handler.
Protected slot to handle a key press event.
Private slot called by a button of the button box clicked.
Private slot to open the double clicked entry.
Private slot to handle a change of selected conflict entries.
Private slot to open the selected file in an editor.
Private slot to handle the press of the return key in the input field.
Private slot to handle the password checkbox toggled.
Private slot to re-merge the selected entries.
Private slot to refresh the log.
Private slot to mark the selected entries as resolved.
Private slot to send the input to the subversion process.
Private slot to mark the selected entries as unresolved.
Public slot to show the dialog.
Public slot to start the tags command.