From 81c68f61c9b070eab5760d435f4677ae887cd32d Mon Sep 17 00:00:00 2001 From: kostas Date: Tue, 2 Jun 2015 15:36:00 +0000 Subject: [PATCH] - Added View Modified Files only view option - Reorganized the View menu. FossilOrigin-Name: 34f0879b8cf7507c43d0d36de0aae704151aa4f4 --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/MainWindow.cpp | 11 +++++++++++ src/MainWindow.h | 1 + ui/MainWindow.ui | 22 ++++++++++++++++------ 5 files changed, 37 insertions(+), 15 deletions(-) diff --git a/manifest b/manifest index acff23d..79e2595 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C -\sCloning\snow\suses\sthe\skeychain\sto\sstore\scredentials,\sand\ssets\sthe\sdefault\sremote\n-\sClone\starget\sfossil\sfile\snow\sadds\sthe\sfossil\sextension\sif\smissing\n-\sFixed\sclipboard\sURL\sparsing\sfor\sclone\surl\n-\sAdded\smore\sactions\sto\sdisable\swhen\sa\svalid\sworkspace\sis\snot\savailable\n -D 2015-06-02T14:48:51.127 +C -\sAdded\sView\sModified\sFiles\sonly\sview\soption\n-\sReorganized\sthe\sView\smenu. +D 2015-06-02T15:36:00.596 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b @@ -224,8 +224,8 @@ F src/FslSettingsDialog.cpp 2531d3709f0eab66651671e3edead2ca720d07d5 F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 -F src/MainWindow.cpp dd63f28e8e76be4d1889d846d3fa5e10ef57a928 -F src/MainWindow.h 1ecfb255c8e013cf4e2d07bfd485ed41d26c97c7 +F src/MainWindow.cpp 191dff3e4759644be48ce40048d6f93d3a5e03f2 +F src/MainWindow.h 31870bca434835471159ab350583c21028e77e47 F src/RemoteDialog.cpp 8540cc5e2e41c4127ed8a028d84691604fa6ecac F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d F src/RevisionDialog.cpp e58c4f8a704f00addebb15d521b76620fdafda79 @@ -248,11 +248,11 @@ F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712 F ui/CommitDialog.ui aea77347eef82b6b591f31fb058a1bb96193c728 F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d F ui/FslSettingsDialog.ui eb3d4cb764cab90b01e82922237d8c42d6ce1749 -F ui/MainWindow.ui 5857b45ed96fb027b6159e44742e9afaa3e89cfb +F ui/MainWindow.ui 10181826a25056ed5aba2b23a7d110159be7c043 F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd F ui/SettingsDialog.ui 4c480cd595a32664d01c85bf74845c4282fc0068 -P 9a06e230f398a3c93247382ba8f37d29201268f8 -R 9ec0409d6daac9f2e3cfb869bd2ddac0 +P e7d9b59c32aa0d0ad5c97b24d7562e448dad16f3 +R 32d61169430606870e48bc157bdd9e16 U kostas -Z 8b0caa86a0cd20719647e3c92b4abcb3 +Z 9cd34eac85945c051003901d18aa0af0 diff --git a/manifest.uuid b/manifest.uuid index 5532e36..1c7fae8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e7d9b59c32aa0d0ad5c97b24d7562e448dad16f3 \ No newline at end of file +34f0879b8cf7507c43d0d36de0aae704151aa4f4 \ No newline at end of file diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index c01fb9d..337f0ab 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -1713,6 +1713,16 @@ void MainWindow::on_actionViewAll_triggered() refresh(); } +//------------------------------------------------------------------------------ +void MainWindow::on_actionViewModifedOnly_triggered() +{ + ui->actionViewModified->setChecked(true); + ui->actionViewUnchanged->setChecked(false); + ui->actionViewUnknown->setChecked(false); + ui->actionViewIgnored->setChecked(false); + refresh(); +} + //------------------------------------------------------------------------------ void MainWindow::on_actionViewAsList_triggered() { @@ -2650,3 +2660,4 @@ void MainWindow::on_actionDeleteRemote_triggered() getWorkspace().removeRemote(url); updateWorkspaceView(); } + diff --git a/src/MainWindow.h b/src/MainWindow.h index cfbf27b..cbdf458 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -108,6 +108,7 @@ private slots: void on_actionViewUnknown_triggered(); void on_actionViewIgnored_triggered(); void on_actionViewAll_triggered(); + void on_actionViewModifedOnly_triggered(); void on_actionViewAsList_triggered(); void on_actionViewAsFolders_triggered(); void on_actionOpenFolder_triggered(); diff --git a/ui/MainWindow.ui b/ui/MainWindow.ui index 0155000..9607069 100644 --- a/ui/MainWindow.ui +++ b/ui/MainWindow.ui @@ -250,11 +250,13 @@ &View + + + - @@ -783,7 +785,7 @@ true - &Modified + &Modified Files Show modifed files @@ -797,7 +799,7 @@ true - &Unchanged + &Unchanged Files Show unchanged files @@ -811,7 +813,7 @@ true - Un&known + Un&known Files Show unknown files @@ -822,7 +824,7 @@ true - &Ignored + &Ignored Files Show ignored files @@ -993,12 +995,20 @@ - &All + &All Files Show all files + + + Mo&dified Files Only + + + Show modified files only + +