Merged UpdateRevision into Update

Disabled unimplemented Remotes and Settings workspace items

FossilOrigin-Name: a297f70942e3dccf9904c054fb9e633edb9c59cb
This commit is contained in:
kostas
2015-05-03 15:37:36 +00:00
parent 435d1571e7
commit 8afb6c280c
5 changed files with 14 additions and 58 deletions

View File

@ -293,7 +293,6 @@
<addaction name="separator"/>
<addaction name="actionCommit"/>
<addaction name="actionUpdate"/>
<addaction name="actionUpdateRevision"/>
<addaction name="separator"/>
<addaction name="actionPush"/>
<addaction name="actionPull"/>
@ -701,7 +700,7 @@
<string>Update</string>
</property>
<property name="toolTip">
<string>Update the workspace to the latest version</string>
<string>Update the workspace to a revision</string>
</property>
<property name="statusTip">
<string>Update the workspace to the latest version</string>
@ -890,21 +889,6 @@
<string>Diff Stash</string>
</property>
</action>
<action name="actionUpdateRevision">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">
<normaloff>:/icons/icons/Button Forward-01.png</normaloff>:/icons/icons/Button Forward-01.png</iconset>
</property>
<property name="text">
<string>Update to Revision</string>
</property>
<property name="toolTip">
<string>Update the workspace to a specific revision</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+U</string>
</property>
</action>
<action name="actionNewTag">
<property name="icon">
<iconset resource="../rsrc/resources.qrc">