Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.2, 1.9.3, and 2.0

shelve: connect chunk movement toolbar buttons to functionality

Changeset b7a3405263a6…

Parent 53ff4aa2e8a3…

by Steve Borho

Changes to one file · Browse files at b7a3405263a6 Showing diff from parent 53ff4aa2e8a3 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​shelve.py Stacked
 
104
105
106
 
107
108
109
 
110
111
112
113
114
115
 
116
117
118
119
120
121
 
122
123
124
125
126
127
 
128
129
130
 
131
132
133
 
161
162
163
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
164
165
166
 
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
 
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
@@ -104,30 +104,36 @@
  a.setIcon(qtlib.geticon('delfilesleft'))   self.lefttbar.addAction(self.deletea)   self.allright = a = QAction(_('Move all files right'), self) + self.allright.triggered.connect(self.moveFilesRight)   a.setIcon(qtlib.geticon('all2right'))   self.lefttbar.addAction(self.allright)   self.fileright = a = QAction(_('Move selected file right'), self) + self.fileright.triggered.connect(self.moveFileRight)   a.setIcon(qtlib.geticon('file2right'))   self.lefttbar.addAction(self.fileright)   self.editfilea = a = QAction(_('Edit file'), self)   a.setIcon(qtlib.geticon('edit-find'))   self.lefttbar.addAction(self.editfilea)   self.chunksright = a = QAction(_('Move selected chunks right'), self) + self.chunksright.triggered.connect(self.moveChunksRight)   a.setIcon(qtlib.geticon('chunk2right'))   self.lefttbar.addAction(self.chunksright)     self.righttbar = QToolBar(_('Right Toolbar'), objectName='righttbar')   self.addToolBar(self.righttbar)   self.chunksleft = a = QAction(_('Move selected chunks left'), self) + self.chunksleft.triggered.connect(self.moveChunksLeft)   a.setIcon(qtlib.geticon('chunk2left'))   self.righttbar.addAction(self.chunksleft)   self.editfileb = a = QAction(_('Edit file'), self)   a.setIcon(qtlib.geticon('edit-find'))   self.righttbar.addAction(self.editfileb)   self.fileleft = a = QAction(_('Move selected file left'), self) + self.fileleft.triggered.connect(self.moveFileLeft)   a.setIcon(qtlib.geticon('file2left'))   self.righttbar.addAction(self.fileleft)   self.allleft = a = QAction(_('Move all files left'), self) + self.allleft.triggered.connect(self.moveFilesLeft)   a.setIcon(qtlib.geticon('all2left'))   self.righttbar.addAction(self.allleft)   self.deleteb = a = QAction(_('Deleted selected chunks'), self) @@ -161,6 +167,46 @@
  self.restoreSettings()     @pyqtSlot() + def moveFileRight(self): + file, _ = self.browsea.getSelectedFileAndChunks() + chunks = self.browsea.getChunksForFile(file) + if self.browseb.mergeChunks(file, chunks): + self.browsea.removeFile(file) + + @pyqtSlot() + def moveFileLeft(self): + file, _ = self.browseb.getSelectedFileAndChunks() + chunks = self.browseb.getChunksForFile(file) + if self.browsea.mergeChunks(file, chunks): + self.browseb.removeFile(file) + + @pyqtSlot() + def moveFilesRight(self): + for file in self.browsea.getFileList(): + chunks = self.browsea.getChunksForFile(file) + if self.browseb.mergeChunks(file, chunks): + self.browsea.removeFile(file) + + @pyqtSlot() + def moveFilesLeft(self): + for file in self.browseb.getFileList(): + chunks = self.browseb.getChunksForFile(file) + if self.browsea.mergeChunks(file, chunks): + self.browseb.removeFile(file) + + @pyqtSlot() + def moveChunksRight(self): + file, chunks = self.browsea.getSelectedFileAndChunks() + if self.browseb.mergeChunks(file, chunks): + self.browsea.deleteSelectedChunks() + + @pyqtSlot() + def moveChunksLeft(self): + file, chunks = self.browseb.getSelectedFileAndChunks() + if self.browsea.mergeChunks(file, chunks): + self.browseb.deleteSelectedChunks() + + @pyqtSlot()   def newShelf(self):   dlg = QInputDialog(self, Qt.Sheet)   dlg.setWindowModality(Qt.WindowModal)