diff --git a/MainWindow.cpp b/MainWindow.cpp index 807b73b..316edd4 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -2007,3 +2007,9 @@ _exit: refresh(); } +//------------------------------------------------------------------------------ +QMenu * MainWindow::createPopupMenu() +{ + return NULL; +} + diff --git a/MainWindow.h b/MainWindow.h index 34fc7cb..60131c7 100644 --- a/MainWindow.h +++ b/MainWindow.h @@ -162,6 +162,7 @@ private: void updateDirView(); void updateFileView(); void selectRootDir(); + virtual QMenu *createPopupMenu(); enum RepoStatus { diff --git a/MainWindow.ui b/MainWindow.ui index 3d15870..c4f7f6e 100644 --- a/MainWindow.ui +++ b/MainWindow.ui @@ -161,6 +161,9 @@ + + Main Toolbar + false @@ -215,6 +218,12 @@ Refresh + + Refresh the views + + + Refresh the views + F5 @@ -227,6 +236,12 @@ Commit + + Commit modifications + + + Commit modifications + Ctrl+M @@ -239,6 +254,12 @@ Diff + + Display the differences between the current and last committed version + + + Display the differences between the current and last committed version + Ctrl+D @@ -251,6 +272,12 @@ Add + + Add files to the repository + + + Add files to the repository + Ctrl++ @@ -263,6 +290,12 @@ Delete + + Delete files from the repository + + + Delete files from the repository + Ctrl+- @@ -310,6 +343,12 @@ Close + + Close the current workspace + + + Close the current workspace + @@ -328,6 +367,12 @@ Push + + Push changes to the remote repository + + + Push changes to the remote repository + Ctrl+P @@ -340,6 +385,12 @@ Pull + + Pull changes from the remote repository + + + Pull changes from the remote repository + Ctrl+L @@ -353,7 +404,10 @@ Rename - Rename + Rename the selected file + + + Rename the selected file Ctrl+R @@ -386,7 +440,10 @@ History - History + Display the version history of a file via the fossil UI + + + Display the version history of a file via the fossil UI Ctrl+H @@ -404,7 +461,10 @@ Fossil UI - Starts the Fosill UI + Starts the Fosill UI in the Web Browser + + + Starts the Fosill UI in the Web Browser @@ -416,7 +476,10 @@ Revert - Revert + Revert files to the last commited version + + + Revert files to the last commited version @@ -428,7 +491,7 @@ Clear Log - Clear Log + Clears the log Ctrl+K @@ -442,6 +505,12 @@ Timeline + + Display the change history of the fossil repository + + + Display the change history of the fossil repository + @@ -451,6 +520,12 @@ Open file + + Open the selected file + + + Open the selected file + Ctrl+Return @@ -461,7 +536,13 @@ :/icons/icons/My Documents-01.png:/icons/icons/My Documents-01.png - Open Containing Folder + Open Containing + + + Open the folder containing the selected file + + + Open the folder containing the selected file Alt+Return @@ -475,6 +556,12 @@ Undo + + Undo the last fossil action + + + Undo the last fossil action + Ctrl+Z @@ -499,6 +586,12 @@ Update + + Update the workspace to the latest version + + + Update the workspace to the latest version + Ctrl+U @@ -512,10 +605,10 @@ Preferences... - Application Preferences + Fuel Preferences - Set application preferences + Fuel Preferences @@ -579,7 +672,7 @@ View as List - View workspace as a list of files + View the workspace as a list of files @@ -590,6 +683,12 @@ Open Folder + + Open the selected folder + + + Open the selected folder + @@ -600,7 +699,10 @@ Rename Folder - Rename Folder + Rename the selected folder + + + Rename the selected folder diff --git a/SettingsDialog.ui b/SettingsDialog.ui index ab83d1b..d48b586 100644 --- a/SettingsDialog.ui +++ b/SettingsDialog.ui @@ -178,6 +178,9 @@ + + Clear the commit message history + Clear @@ -192,12 +195,15 @@ - File double click + Double-click Action + + Action to perfom when double-clicking a file + -1 @@ -236,7 +242,9 @@ - The repote url use push changes + The remote url used to push/pull changes. +URL style user names and passwords are also supported. +For example http://username:password@server.com/fossil @@ -262,7 +270,7 @@ - A comma separated list of paths to ignore in fossil operations + A comma separated list of glob-style file/path patterns ignored in fossil file operations @@ -288,7 +296,7 @@ - A comma separated list of paths to ignore in fossil operations + A comma separated list of glob-style file patterns to exclude from fossil's CR/NL consistency checking diff --git a/manifest b/manifest index 5b944a4..db594e9 100644 --- a/manifest +++ b/manifest @@ -1,17 +1,17 @@ -C Added\ssetting\sto\scustomize\sthe\sdouble-click\saction\sin\sthe\sfile\sview\n -D 2011-10-21T17:38:02.111 +C Improved\stooltip\stext\sof\sactions\nFixed\sempty\spop-menu\sin\stoolbar\n +D 2011-10-22T08:41:13.960 F CommitDialog.cpp bc05504be08d9ffe2b24d341a18e37035e1941b7 F CommitDialog.h 65a7238dcdd41b578536a0b0ac2a65f2e7f23c9a F CommitDialog.ui 5067623f6af6f5a42c87df903278e383e945e154 F FileActionDialog.cpp fcaebf9986f789b3440d5390b3458ad5f86fe0c8 F FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce F FileActionDialog.ui c63644428579741aeb5fa052e237ba799ced9ad7 -F MainWindow.cpp 9554c5f08dbe7bfede32dfeb5a92ab81e7c4dcb7 -F MainWindow.h 6efb750454037a2a9f7984fce46b5138ff47eac5 -F MainWindow.ui 7f9e5cda55cffd5da8c01de7729a1806126c0d6b +F MainWindow.cpp 1e1037c4a8047c1396b71e0ea669f7cc371beeb4 +F MainWindow.h 643f13d4b5615c51c38b164768bf62258ccb94b1 +F MainWindow.ui 0539292f618b60a94355ef35f59fa3bac6cab105 F SettingsDialog.cpp b9dc5eebf3a2404f4ea8a573fc46cce19ab3d639 F SettingsDialog.h f5da6cab4ccc82e2eb78ec835fb849c4c104d6cc -F SettingsDialog.ui f69c68cfa6c6d30a1e017fb77f853b492b162595 +F SettingsDialog.ui 778aaf233b8ac3ddac7dcfecc2fca7bd8ca5be1a F Utils.cpp 4bd6f104d7d666bdae2bbe54e392e8372f6ca186 F Utils.h e5ebab82b3455f2ea06d92e6b9eb18355470076c F fuel.pro 3dc8e31fde8137143dea0ae44a81eb6733d86168 @@ -174,7 +174,7 @@ F installer/fuel.iss 13b6a938bcdf273cbd3649d2549887baa1577214 F installer/license.txt 4cc77b90af91e615a64ae04893fdffa7939db84c F main.cpp f67a9b5c9ca0b634b19ef08e7136032372d37f93 F resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53 -P 457fb31debab309e4932ca3fb8e6fe6d3c111c6c -R 1315a42142211c8b31593a76897f6c1b +P b0fda22886a7415ddf5d70457f3f7c8fe7ecf636 +R e00c1b3ea6f98e52316fb62058db3cb4 U kostas -Z 6cc01b07abe22caec55570f6fbb0b85e +Z 776ad1437e04c1e2a30ae4fcf3fe5105 diff --git a/manifest.uuid b/manifest.uuid index 99be7a3..048c740 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b0fda22886a7415ddf5d70457f3f7c8fe7ecf636 \ No newline at end of file +af6bd9ca628ed1fe33819ac18706ed2bcabc79d2 \ No newline at end of file