diff --git a/manifest b/manifest index 085e540..ab5fe0d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Goodbye\sStash\sView\nWorking\sstash\smanagement\sin\sWorkspace\sview -D 2015-05-01T19:29:12.162 +C Renamed\sgetStashViewSelection\sto\sgetSelectionStashes +D 2015-05-01T19:31:56.612 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b @@ -200,8 +200,8 @@ F src/Fossil.cpp b54d136f05764535636da04bcc5f60b2eb97e5b6 F src/Fossil.h e46ec6cdb5c23a34176050fbd90e561ac87c07f9 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 -F src/MainWindow.cpp 50bcfea121159016f6658abcece3208b6cbc6419 -F src/MainWindow.h d21a0e993f44dfa6c751613fc07325ec287a58cf +F src/MainWindow.cpp 96ebf7dd8ecbff629a334160079051f671cf57d9 +F src/MainWindow.h ef23aacdae4a6795fc19d9c24b3c76394a7b669d F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4 F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43 F src/Utils.cpp f78728e0817b1db23007ba0d2c5c26980ee7ebca @@ -217,7 +217,7 @@ F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d F ui/MainWindow.ui b735238428bad38bbb5c03e09975e5bb0fa156ab F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b -P 268641002b332e82e893dacce6698a2c298c4f98 -R 88c5523fcc03ef8f78e0d4bd0720be73 +P 1b0d47442df7a239ed11a048bde0073603b514f1 +R 7380968ed8535cfc03d075d0ca405f15 U kostas -Z ce07e9006ea4abb3d7459eb4c758192a +Z b61f064d91c92dc5af55c95f81df5c39 diff --git a/manifest.uuid b/manifest.uuid index 18a911c..892cf21 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1b0d47442df7a239ed11a048bde0073603b514f1 \ No newline at end of file +82357d43ca742466e08d3794bdc9a4ab800ad867 \ No newline at end of file diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index cf8b801..2e7ed74 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -1072,7 +1072,7 @@ void MainWindow::getFileViewSelection(QStringList &filenames, int includeMask, b } } //------------------------------------------------------------------------------ -void MainWindow::getStashViewSelection(QStringList &stashNames) +void MainWindow::getSelectionStashes(QStringList &stashNames) { QModelIndexList selection = ui->workspaceTreeView->selectionModel()->selectedIndexes(); @@ -1850,7 +1850,7 @@ void MainWindow::on_actionNewStash_triggered() void MainWindow::on_actionApplyStash_triggered() { QStringList stashes; - getStashViewSelection(stashes); + getSelectionStashes(stashes); bool delete_stashes = false; if(!FileActionDialog::run(this, tr("Apply Stash"), tr("The following stashes will be applied.")+"\n"+tr("Are you sure?"), stashes, tr("Delete after applying"), &delete_stashes)) @@ -1889,7 +1889,7 @@ void MainWindow::on_actionApplyStash_triggered() void MainWindow::on_actionDeleteStash_triggered() { QStringList stashes; - getStashViewSelection(stashes); + getSelectionStashes(stashes); if(stashes.empty()) return; @@ -1917,7 +1917,7 @@ void MainWindow::on_actionDeleteStash_triggered() void MainWindow::on_actionDiffStash_triggered() { QStringList stashes; - getStashViewSelection(stashes); + getSelectionStashes(stashes); if(stashes.length() != 1) return; diff --git a/src/MainWindow.h b/src/MainWindow.h index c9f097e..e188126 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -36,7 +36,7 @@ private: void getSelectionFilenames(QStringList &filenames, int includeMask=WorkspaceFile::TYPE_ALL, bool allIfEmpty=false); void getFileViewSelection(QStringList &filenames, int includeMask=WorkspaceFile::TYPE_ALL, bool allIfEmpty=false); void getDirViewSelection(QStringList &filenames, int includeMask=WorkspaceFile::TYPE_ALL, bool allIfEmpty=false); - void getStashViewSelection(QStringList &stashNames); + void getSelectionStashes(QStringList &stashNames); void getSelectionPaths(stringset_t &paths); void getAllFilenames(QStringList &filenames, int includeMask=WorkspaceFile::TYPE_ALL); bool startUI();