Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

cmenu: context menu tweaks

Fixes #591 by adding add, revert, forget, remove to folder menu. Renames 'View
Changelog' to 'Repository Explorer' and promotes it to top menu in default.
Removes a few ellipsis, adds quite a few more. If the menu item corresponds to
a command line action (add, remove, update, etc) it will have an ellipsis to
indicate a dialog window will open up so that you can review the results before
they are applied. Also tweaked some menu layouts on Windows.

Changeset dce32bb94ff9…

Parent 621c8ae5acb1…

by Steve Borho

Changes to 2 files · Browse files at dce32bb94ff9 Showing diff from parent 621c8ae5acb1 Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​util/​menuthg.py Stacked
 
22
23
24
25
 
26
27
28
 
41
42
43
44
 
45
46
47
 
48
49
50
51
52
53
 
54
55
56
 
57
58
59
 
 
 
 
60
61
62
63
64
65
 
66
67
68
 
71
72
73
74
 
75
76
77
 
86
87
88
89
 
90
91
92
 
104
105
106
107
 
108
109
110
 
22
23
24
 
25
26
27
28
 
41
42
43
 
44
45
46
 
47
48
49
50
51
52
 
53
54
55
 
56
57
58
 
59
60
61
62
63
64
65
66
67
 
68
69
70
71
 
74
75
76
 
77
78
79
80
 
89
90
91
 
92
93
94
95
 
107
108
109
 
110
111
112
113
@@ -22,7 +22,7 @@
  item = item.strip()   if item: promoted.append(str(item))   except EnvironmentError: - promoted = ['commit'] + promoted = ['commit', 'log']  except ImportError:   # fallback method for non-win32 platforms   u = ui.ui() @@ -41,28 +41,31 @@
  'init': { 'label': _('Create Repository Here'),   'help': _('Create a new repository'),   'icon': 'menucreaterepos.ico'}, - 'clone': { 'label': _('Clone a Repository'), + 'clone': { 'label': _('Clone...'),   'help': _('Create clone here from source'),   'icon': 'menuclone.ico'}, - 'status': { 'label': _('View File Status'), + 'status': { 'label': _('File Status'),   'help': _('Repository status & changes'),   'icon': 'menushowchanged.ico'},   'shelve': { 'label': _('Shelve Changes'),   'help': _('Shelve or unshelve file changes'),   'icon': 'shelve.ico'}, - 'add': { 'label': _('Add Files'), + 'add': { 'label': _('Add Files...'),   'help': _('Add files to version control'),   'icon': 'menuadd.ico'}, - 'revert': { 'label': _('Revert Files'), + 'revert': { 'label': _('Revert Files...'),   'help': _('Revert file changes'),   'icon': 'menurevert.ico'}, - 'remove': { 'label': _('Remove Files'), + 'forget': { 'label': _('Forget Files...'), + 'help': _('Remove files from version control'), + 'icon': 'menurevert.ico'}, + 'remove': { 'label': _('Remove Files...'),   'help': _('Remove files from version control'),   'icon': 'menudelete.ico'},   'rename': { 'label': _('Rename File'),   'help': _('Rename file or directory'),   'icon': 'general.ico'}, - 'log': { 'label': _('View Changelog'), + 'log': { 'label': _('Repository Explorer'),   'help': _('View change history in repository'),   'icon': 'menulog.ico'},   'synch': { 'label': _('Synchronize'), @@ -71,7 +74,7 @@
  'serve': { 'label': _('Web Server'),   'help': _('Start web server for this repository'),   'icon': 'proxy.ico'}, - 'update': { 'label': _('Update To Revision'), + 'update': { 'label': _('Update...'),   'help': _('Update working directory'),   'icon': 'menucheckout.ico'},   'recover': { 'label': _('Recovery...'), @@ -86,7 +89,7 @@
  'repoconf': { 'label': _('Repository Settings'),   'help': _('Configure repository settings'),   'icon': 'settings_repo.ico'}, - 'about': { 'label': _('About...'), + 'about': { 'label': _('About TortoiseHg'),   'help': _('Show About Dialog'),   'icon': 'menuabout.ico'},   'datamine': { 'label': _('Annotate Files'), @@ -104,7 +107,7 @@
  'grep': { 'label': _('Search History'),   'help': _('Search file revisions for patterns'),   'icon': 'menurepobrowse.ico'}, - 'dndsynch': { 'label': _('Synchronize'), + 'dndsynch': { 'label': _('DnD Synchronize'),   'help': _('Synchronize with dragged repository'),   'icon': 'menusynch.ico'}}  
Change 1 of 10 Show Entire File win32/​shellext/​ContextMenu.cpp Stacked
 
29
30
31
32
 
33
34
35
 
38
39
40
41
 
42
43
44
 
45
46
47
 
48
49
50
 
51
52
53
 
54
55
56
 
59
60
61
62
 
63
64
65
 
74
75
76
77
 
78
79
80
 
92
93
94
 
 
 
95
96
97
 
104
105
106
107
 
108
109
110
 
112
113
114
115
116
 
 
 
117
118
119
 
121
122
123
124
 
 
125
126
127
 
317
318
319
320
 
321
322
323
 
437
438
439
440
 
441
442
443
 
29
30
31
 
32
33
34
35
 
38
39
40
 
41
42
43
 
44
45
46
 
47
48
49
 
50
51
52
 
53
54
55
56
 
59
60
61
 
62
63
64
65
 
74
75
76
 
77
78
79
80
 
92
93
94
95
96
97
98
99
100
 
107
108
109
 
110
111
112
113
 
115
116
117
 
 
118
119
120
121
122
123
 
125
126
127
 
128
129
130
131
132
 
322
323
324
 
325
326
327
328
 
442
443
444
 
445
446
447
448
@@ -29,7 +29,7 @@
  {"init", L"Create Repository Here",   L"Create a new repository",   "menucreaterepos.ico", 0}, - {"clone", L"Clone a Repository", + {"clone", L"Clone...",   L"Create clone here from source",   "menuclone.ico", 0},   {"status", L"View File Status", @@ -38,19 +38,19 @@
  {"shelve", L"Shelve Changes",   L"Shelve or unshelve file changes",   "shelve.ico", 0}, - {"add", L"Add Files", + {"add", L"Add Files...",   L"Add files to version control",   "menuadd.ico", 0}, - {"revert", L"Revert Files", + {"revert", L"Revert Files...",   L"Revert file changes",   "menurevert.ico", 0}, - {"remove", L"Remove Files", + {"remove", L"Remove Files...",   L"Remove files from version control",   "menudelete.ico", 0}, - {"rename", L"Rename File", + {"rename", L"Rename File...",   L"Rename file or directory",   "general.ico", 0}, - {"log", L"View Changelog", + {"log", L"Repository Explorer",   L"View change history in repository",   "menulog.ico", 0},   {"synch", L"Synchronize", @@ -59,7 +59,7 @@
  {"serve", L"Web Server",   L"Start web server for this repository",   "proxy.ico", 0}, - {"update", L"Update To Revision", + {"update", L"Update...",   L"Update working directory",   "menucheckout.ico", 0},   {"recover", L"Recovery...", @@ -74,7 +74,7 @@
  {"repoconf", L"Repository Settings",   L"Configure repository settings",   "settings_repo.ico", 0}, - {"about", L"About...", + {"about", L"About TortoiseHg",   L"Show About Dialog",   "menuabout.ico", 0},   {"datamine", L"Annotate Files", @@ -92,6 +92,9 @@
  {"grep", L"Search History",   L"Search file revisions for patterns",   "menurepobrowse.ico", 0}, + {"forget", L"Forget Files...", + L"Remove files from version control", + "menudelete.ico", 0},     /* Add new items here */   @@ -104,7 +107,7 @@
 {   Commit, Init, Clone, Status, Shelve, Add, Revert, Remove, Rename,   Log, Synch, Serve, Update, Recover, Thgstatus, Userconf, Repoconf, - About, Datamine, VDiff, Ignore, Guess, Grep, + About, Datamine, VDiff, Ignore, Guess, Grep, Forget,   /* Add new items here */   Separator, EndOfList  }; @@ -112,8 +115,9 @@
 menuDescListEntries RepoNoFilesMenu[] =  {   Commit, Status, Shelve, VDiff, Separator, - Log, Update, Grep, Thgstatus, Separator, - Synch, Serve, Clone, Init, Separator, + Add, Revert, Rename, Forget, Remove, Separator, + Log, Update, Grep, Separator, + Synch, Serve, Clone, Init, Thgstatus, Separator,   Ignore, Guess, Recover, Separator,   Repoconf, Userconf, Separator,   About, EndOfList @@ -121,7 +125,8 @@
   menuDescListEntries RepoFilesMenu[] =  { - Commit, Status, VDiff, Add, Revert, Rename, Remove, Separator, + Commit, Status, VDiff, Separator, + Add, Revert, Rename, Forget, Remove, Separator,   Log, Datamine, Separator,   About, EndOfList  }; @@ -317,7 +322,7 @@
  bool promoted[sz];   memset(&promoted, 0, sizeof(promoted));   - std::string cval = "commit"; // default value if key not found + std::string cval = "commit,log"; // default value if key not found   GetRegistryConfig("PromotedItems", cval);     size_t found; @@ -437,7 +442,7 @@
    TDEBUG_TRACE(" CShellExt::QueryContextMenu: adding main THG menu");   InsertSubMenuItemWithIcon2(hMenu, hSubMenu, indexMenu++, idCmd++, - L"TortoiseHG...", "hg.ico"); + L"TortoiseHG", "hg.ico");     InsertMenu(hMenu, indexMenu++, MF_SEPARATOR | MF_BYPOSITION, 0, NULL);