| 96 | } |
| 97 | |
| 98 | void MergeResultWindow::init( |
| 99 | const std::shared_ptr<LineDataVector> &pLineDataA, LineRef sizeA, |
| 100 | const std::shared_ptr<LineDataVector> &pLineDataB, LineRef sizeB, |
| 101 | const std::shared_ptr<LineDataVector> &pLineDataC, LineRef sizeC, |
| 102 | const Diff3LineList* pDiff3LineList, |
| 103 | TotalDiffStatus* pTotalDiffStatus, |
| 104 | bool bAutoSolve) |
| 105 | { |
| 106 | m_firstLine = 0; |
| 107 | m_horizScrollOffset = 0; |
| 108 | m_nofLines = 0; |
| 109 | m_bMyUpdate = false; |
| 110 | m_bInsertMode = true; |
| 111 | m_scrollDeltaX = 0; |
| 112 | m_scrollDeltaY = 0; |
| 113 | setModified(false); |
| 114 | |
| 115 | m_pldA = pLineDataA; |
| 116 | m_pldB = pLineDataB; |
| 117 | m_pldC = pLineDataC; |
| 118 | m_sizeA = sizeA; |
| 119 | m_sizeB = sizeB; |
| 120 | m_sizeC = sizeC; |
| 121 | |
| 122 | m_pDiff3LineList = pDiff3LineList; |
| 123 | m_pTotalDiffStatus = pTotalDiffStatus; |
| 124 | |
| 125 | m_selection.reset(); |
| 126 | m_cursorXPos = 0; |
| 127 | m_cursorOldXPixelPos = 0; |
| 128 | m_cursorYPos = 0; |
| 129 | |
| 130 | m_maxTextWidth = -1; |
| 131 | |
| 132 | merge(bAutoSolve, e_SrcSelector::Invalid); |
| 133 | update(); |
| 134 | updateSourceMask(); |
| 135 | |
| 136 | showUnsolvedConflictsStatusMessage(); |
| 137 | } |
| 138 | |
| 139 | //This must be called before KXMLGui::SetXMLFile and friends or the actions will not be shown in the menu. |
| 140 | // |