Improved tooltip text of actions

Fixed empty pop-menu in toolbar


FossilOrigin-Name: af6bd9ca628ed1fe33819ac18706ed2bcabc79d2
This commit is contained in:
kostas
2011-10-22 08:41:13 +00:00
parent ff622939e9
commit db5c2af9ac
6 changed files with 141 additions and 24 deletions

View File

@ -2007,3 +2007,9 @@ _exit:
refresh();
}
//------------------------------------------------------------------------------
QMenu * MainWindow::createPopupMenu()
{
return NULL;
}

View File

@ -162,6 +162,7 @@ private:
void updateDirView();
void updateFileView();
void selectRootDir();
virtual QMenu *createPopupMenu();
enum RepoStatus
{

View File

@ -161,6 +161,9 @@
<addaction name="menuHelp"/>
</widget>
<widget class="QToolBar" name="mainToolBar">
<property name="windowTitle">
<string>Main Toolbar</string>
</property>
<property name="movable">
<bool>false</bool>
</property>
@ -215,6 +218,12 @@
<property name="text">
<string>Refresh</string>
</property>
<property name="toolTip">
<string>Refresh the views</string>
</property>
<property name="statusTip">
<string>Refresh the views</string>
</property>
<property name="shortcut">
<string>F5</string>
</property>
@ -227,6 +236,12 @@
<property name="text">
<string>Commit</string>
</property>
<property name="toolTip">
<string>Commit modifications</string>
</property>
<property name="statusTip">
<string>Commit modifications</string>
</property>
<property name="shortcut">
<string>Ctrl+M</string>
</property>
@ -239,6 +254,12 @@
<property name="text">
<string>Diff</string>
</property>
<property name="toolTip">
<string>Display the differences between the current and last committed version</string>
</property>
<property name="statusTip">
<string>Display the differences between the current and last committed version</string>
</property>
<property name="shortcut">
<string>Ctrl+D</string>
</property>
@ -251,6 +272,12 @@
<property name="text">
<string>Add</string>
</property>
<property name="toolTip">
<string>Add files to the repository</string>
</property>
<property name="statusTip">
<string>Add files to the repository</string>
</property>
<property name="shortcut">
<string>Ctrl++</string>
</property>
@ -263,6 +290,12 @@
<property name="text">
<string>Delete</string>
</property>
<property name="toolTip">
<string>Delete files from the repository</string>
</property>
<property name="statusTip">
<string>Delete files from the repository</string>
</property>
<property name="shortcut">
<string>Ctrl+-</string>
</property>
@ -310,6 +343,12 @@
<property name="text">
<string>Close</string>
</property>
<property name="toolTip">
<string>Close the current workspace</string>
</property>
<property name="statusTip">
<string>Close the current workspace</string>
</property>
</action>
<action name="actionCloneRepository">
<property name="icon">
@ -328,6 +367,12 @@
<property name="text">
<string>Push</string>
</property>
<property name="toolTip">
<string>Push changes to the remote repository</string>
</property>
<property name="statusTip">
<string>Push changes to the remote repository</string>
</property>
<property name="shortcut">
<string>Ctrl+P</string>
</property>
@ -340,6 +385,12 @@
<property name="text">
<string>Pull</string>
</property>
<property name="toolTip">
<string>Pull changes from the remote repository</string>
</property>
<property name="statusTip">
<string>Pull changes from the remote repository</string>
</property>
<property name="shortcut">
<string>Ctrl+L</string>
</property>
@ -353,7 +404,10 @@
<string>Rename</string>
</property>
<property name="toolTip">
<string>Rename</string>
<string>Rename the selected file</string>
</property>
<property name="statusTip">
<string>Rename the selected file</string>
</property>
<property name="shortcut">
<string>Ctrl+R</string>
@ -386,7 +440,10 @@
<string>History</string>
</property>
<property name="toolTip">
<string>History</string>
<string>Display the version history of a file via the fossil UI</string>
</property>
<property name="statusTip">
<string>Display the version history of a file via the fossil UI</string>
</property>
<property name="shortcut">
<string>Ctrl+H</string>
@ -404,7 +461,10 @@
<string>Fossil UI</string>
</property>
<property name="toolTip">
<string>Starts the Fosill UI</string>
<string>Starts the Fosill UI in the Web Browser</string>
</property>
<property name="statusTip">
<string>Starts the Fosill UI in the Web Browser</string>
</property>
</action>
<action name="actionRevert">
@ -416,7 +476,10 @@
<string>Revert</string>
</property>
<property name="toolTip">
<string>Revert</string>
<string>Revert files to the last commited version</string>
</property>
<property name="statusTip">
<string>Revert files to the last commited version</string>
</property>
</action>
<action name="actionClearLog">
@ -428,7 +491,7 @@
<string>Clear Log</string>
</property>
<property name="toolTip">
<string>Clear Log</string>
<string>Clears the log</string>
</property>
<property name="shortcut">
<string>Ctrl+K</string>
@ -442,6 +505,12 @@
<property name="text">
<string>Timeline</string>
</property>
<property name="toolTip">
<string>Display the change history of the fossil repository</string>
</property>
<property name="statusTip">
<string>Display the change history of the fossil repository</string>
</property>
</action>
<action name="actionOpenFile">
<property name="icon">
@ -451,6 +520,12 @@
<property name="text">
<string>Open file</string>
</property>
<property name="toolTip">
<string>Open the selected file</string>
</property>
<property name="statusTip">
<string>Open the selected file</string>
</property>
<property name="shortcut">
<string>Ctrl+Return</string>
</property>
@ -461,7 +536,13 @@
<normaloff>:/icons/icons/My Documents-01.png</normaloff>:/icons/icons/My Documents-01.png</iconset>
</property>
<property name="text">
<string>Open Containing Folder</string>
<string>Open Containing</string>
</property>
<property name="toolTip">
<string>Open the folder containing the selected file</string>
</property>
<property name="statusTip">
<string>Open the folder containing the selected file</string>
</property>
<property name="shortcut">
<string>Alt+Return</string>
@ -475,6 +556,12 @@
<property name="text">
<string>Undo</string>
</property>
<property name="toolTip">
<string>Undo the last fossil action</string>
</property>
<property name="statusTip">
<string>Undo the last fossil action</string>
</property>
<property name="shortcut">
<string>Ctrl+Z</string>
</property>
@ -499,6 +586,12 @@
<property name="text">
<string>Update</string>
</property>
<property name="toolTip">
<string>Update the workspace to the latest version</string>
</property>
<property name="statusTip">
<string>Update the workspace to the latest version</string>
</property>
<property name="shortcut">
<string>Ctrl+U</string>
</property>
@ -512,10 +605,10 @@
<string>Preferences...</string>
</property>
<property name="toolTip">
<string>Application Preferences</string>
<string>Fuel Preferences</string>
</property>
<property name="statusTip">
<string>Set application preferences</string>
<string>Fuel Preferences</string>
</property>
</action>
<action name="actionViewModified">
@ -579,7 +672,7 @@
<string>View as List</string>
</property>
<property name="statusTip">
<string>View workspace as a list of files</string>
<string>View the workspace as a list of files</string>
</property>
</action>
<action name="actionOpenFolder">
@ -590,6 +683,12 @@
<property name="text">
<string>Open Folder</string>
</property>
<property name="toolTip">
<string>Open the selected folder</string>
</property>
<property name="statusTip">
<string>Open the selected folder</string>
</property>
</action>
<action name="actionRenameFolder">
<property name="icon">
@ -600,7 +699,10 @@
<string>Rename Folder</string>
</property>
<property name="toolTip">
<string>Rename Folder</string>
<string>Rename the selected folder</string>
</property>
<property name="statusTip">
<string>Rename the selected folder</string>
</property>
</action>
</widget>

View File

@ -178,6 +178,9 @@
</item>
<item row="3" column="1">
<widget class="QPushButton" name="btnClearMessageHistory">
<property name="toolTip">
<string>Clear the commit message history</string>
</property>
<property name="text">
<string>Clear</string>
</property>
@ -192,12 +195,15 @@
</size>
</property>
<property name="text">
<string>File double click</string>
<string>Double-click Action</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="cmbDoubleClickAction">
<property name="toolTip">
<string>Action to perfom when double-clicking a file</string>
</property>
<property name="currentIndex">
<number>-1</number>
</property>
@ -236,7 +242,9 @@
</size>
</property>
<property name="toolTip">
<string>The repote url use push changes</string>
<string>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</string>
</property>
</widget>
</item>
@ -262,7 +270,7 @@
</size>
</property>
<property name="toolTip">
<string>A comma separated list of paths to ignore in fossil operations</string>
<string>A comma separated list of glob-style file/path patterns ignored in fossil file operations</string>
</property>
</widget>
</item>
@ -288,7 +296,7 @@
</size>
</property>
<property name="toolTip">
<string>A comma separated list of paths to ignore in fossil operations</string>
<string>A comma separated list of glob-style file patterns to exclude from fossil's CR/NL consistency checking</string>
</property>
</widget>
</item>

View File

@ -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

View File

@ -1 +1 @@
b0fda22886a7415ddf5d70457f3f7c8fe7ecf636
af6bd9ca628ed1fe33819ac18706ed2bcabc79d2