AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added merge support

Browse Source 
FossilOrigin-Name: ac65fbf8d33a9e64fb97bd8652a43b4d11c8e538
This commit is contained in:
kostas
2015-05-03 11:44:04 +00:00
parent f9eda348be
commit cdba8c05f6
10 changed files with 186 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/MainWindow.h
View File

@ -51,6 +51,8 @@ private:
void updateWorkspaceView();
void updateFileView();
void selectRootDir();
void MergeRevision(const QString& defaultRevision);
void fossilBrowse(const QString &fossilUrl);
void dragEnterEvent(class QDragEnterEvent *event);
void dropEvent(class QDropEvent *event);
@ -112,15 +114,10 @@ private slots:
void on_textBrowser_customContextMenuRequested(const QPoint &pos);
void on_fileTableView_customContextMenuRequested(const QPoint &pos);
void on_workspaceTreeView_customContextMenuRequested(const QPoint &pos);
void on_actionUpdateRevision_triggered();
void on_actionNewTag_triggered();
void on_actionDeleteTag_triggered();
void on_actionNewBranch_triggered();
void on_actionMergeBranch_triggered();
private:
@ -160,7 +157,7 @@ private:
QMenu *menuWorkspace;
QMenu *menuStashes;
QMenu *menuTags;
//QMenu *menuBranches;
QMenu *menuBranches;
bool operationAborted;
stringset_t selectedDirs; // The directory selected in the tree