def __init__(self, parent, repo): QtGui.QDialog.__init__(self, parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint) self.solved = False self.repo = repo self.ui = Ui_ConflictDialog() self.ui.setupUi(self) self.setWindowFlags(self.windowFlags() | QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowMinMaxButtonsHint) self.ui.buttonBox.rejected.connect(self.closePressed) self.ui.zoomButton.clicked.connect(self.zoomToFullExtent) self.ui.solveButton.clicked.connect(self.solve) self.ui.conflictsTree.itemClicked.connect(self.treeItemClicked) self.ui.attributesTable.cellClicked.connect(self.cellClicked) self.ui.solveAllOursButton.clicked.connect(self.solveOurs) self.ui.solveAllTheirsButton.clicked.connect(self.solveTheirs) self.ui.baseMapCombo.currentIndexChanged.connect(self.baseMapChanged) def refreshMap(): self.showGeoms() self.ui.showTheirsCheck.stateChanged.connect(refreshMap) self.ui.showOursCheck.stateChanged.connect(refreshMap) self.lastSelectedItem = None self.currentPath = None self.theirsLayer = None self.oursLayer = None self.baseLayer = None settings = QtCore.QSettings() horizontalLayout = QtGui.QHBoxLayout() horizontalLayout.setSpacing(0) horizontalLayout.setMargin(0) self.mapCanvas = QgsMapCanvas() self.mapCanvas.setCanvasColor(QtCore.Qt.white) self.mapCanvas.enableAntiAliasing(settings.value("/qgis/enable_anti_aliasing", False, type = bool)) self.mapCanvas.useImageToRender(settings.value("/qgis/use_qimage_to_render", False, type = bool)) self.mapCanvas.mapRenderer().setProjectionsEnabled(True) action = settings.value("/qgis/wheel_action", 0, type = float) zoomFactor = settings.value("/qgis/zoom_factor", 2, type = float) self.mapCanvas.setWheelAction(QgsMapCanvas.WheelAction(action), zoomFactor) horizontalLayout.addWidget(self.mapCanvas) self.ui.canvasWidget.setLayout(horizontalLayout) self.panTool = QgsMapToolPan(self.mapCanvas) self.mapCanvas.setMapTool(self.panTool) self.fillConflictsTree()