Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.3, 2.0, and 2.0.1

stable fileview: Add icons to file view mode radio buttons

Changeset 2588dededbb8…

Parent 1c46cf2106f8…

by Peer Sommerlund

Changes to 4 files · Browse files at 2588dededbb8 Showing diff from parent 1c46cf2106f8 Diff from another changeset...

Change 1 of 1 Show Entire File icons/​scalable/​actions/​view-annotate.svg Stacked
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
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
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48" + height="48" + id="svg2" + version="1.1" + inkscape:version="0.48.0 r9654" + sodipodi:docname="view-annotate.svg"> + <title + id="title3887">view annotations</title> + <defs + id="defs4"> + <linearGradient + id="linearGradient3897"> + <stop + style="stop-color:#427fbf;stop-opacity:1;" + offset="0" + id="stop3899" /> + <stop + style="stop-color:#a6c2e1;stop-opacity:0.99130434;" + offset="1" + id="stop3901" /> + </linearGradient> + <linearGradient + gradientTransform="translate(-29.642857,849.92853)" + y2="104.93361" + x2="61.142857" + y1="112.43361" + x1="68.64286" + gradientUnits="userSpaceOnUse" + id="linearGradient2846" + xlink:href="#linearGradient3897" + inkscape:collect="always" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="0.50196078" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="8.9791667" + inkscape:cx="3.6751741" + inkscape:cy="24" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:showpageshadow="true" + showborder="true" + inkscape:window-width="990" + inkscape:window-height="603" + inkscape:window-x="1611" + inkscape:window-y="0" + inkscape:window-maximized="0"> + <inkscape:grid + type="xygrid" + id="grid2997" + empspacing="6" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + spacingx="0.5px" + spacingy="0.5px" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title>view annotations</dc:title> + <dc:date>2011-02-16</dc:date> + <dc:creator> + <cc:Agent> + <dc:title>Peer Sommerlund</dc:title> + </cc:Agent> + </dc:creator> + <cc:license + rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/by-sa/3.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Notice" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Attribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#ShareAlike" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1004.3622)"> + <rect + style="fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="rect3777" + width="35" + height="41" + x="6.5" + y="1007.8622" /> + <path + style="fill:url(#linearGradient2846);fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + d="m 33,950.3622 0,6 -6,0 0,3 6,0 c 0,2.21541 0,6.94931 0,9 l -6,0 0,3 6,0 0,6 3,0 0,-6 9,0 0,6 3,0 0,-6 6,0 0,-3 -6,0 0,-9 6,0 0,-3 -6,0 0,-6 -3,0 0,6 -9,0 0,-6 z m 3,9 9,0 0,9 -9,0 z" + id="path2900" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc" /> + <text + xml:space="preserve" + style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="13" + y="1042.3622" + id="text3079" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3081" + x="13" + y="1042.3622">#</tspan></text> + </g> +</svg>
Change 1 of 1 Show Entire File icons/​scalable/​actions/​view-diff.svg Stacked
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
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
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48" + height="48" + id="svg2" + version="1.1" + inkscape:version="0.48.0 r9654" + sodipodi:docname="view-diff.svg"> + <title + id="title3859">view diff</title> + <defs + id="defs4"> + <linearGradient + id="linearGradient3771"> + <stop + id="stop3773" + offset="0" + style="stop-color:#cc0000;stop-opacity:1" /> + <stop + id="stop3775" + offset="1" + style="stop-color:#ef2929;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient3897"> + <stop + style="stop-color:#5dab12;stop-opacity:1;" + offset="0" + id="stop3899" /> + <stop + style="stop-color:#8ae234;stop-opacity:1;" + offset="1" + id="stop3901" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(1.9333333,0,0,1.9333333,-101.44286,809.25716)" + y2="104.93361" + x2="61.142857" + y1="112.43361" + x1="68.64286" + gradientUnits="userSpaceOnUse" + id="linearGradient2846" + xlink:href="#linearGradient3897" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3771" + id="linearGradient2995" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.9333334,0,0,1.5,-101.40582,884.96176)" + x1="67.920631" + y1="108.93362" + x2="61.142857" + y2="104.93361" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="0.50196078" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="10.791667" + inkscape:cx="7.0888031" + inkscape:cy="24" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:showpageshadow="true" + showborder="true" + inkscape:window-width="963" + inkscape:window-height="690" + inkscape:window-x="9" + inkscape:window-y="0" + inkscape:window-maximized="0"> + <inkscape:grid + type="xygrid" + id="grid2997" + empspacing="6" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + spacingx="0.5px" + spacingy="0.5px" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title>view diff</dc:title> + <cc:license + rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> + <dc:date>2011-02-16</dc:date> + <dc:creator> + <cc:Agent> + <dc:title>Peer Sommerlund</dc:title> + </cc:Agent> + </dc:creator> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/by-sa/3.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Notice" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Attribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#ShareAlike" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1004.3622)"> + <path + id="path2900" + style="fill:url(#linearGradient2846);fill-opacity:1;fill-rule:evenodd;stroke:#428205;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + d="m 19,1008.3622 7,0 0,9 9,0 0,7 -9,0 0,9 -7,0 0,-9 -9,0 0,-7 9,0 z" + sodipodi:nodetypes="ccccccccccccc" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="ccccc" + d="m 35.5,1040.8622 0,5 -26,0 0,-5 z" + style="fill:url(#linearGradient2995);fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path2993" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path3083" + style="fill:none;stroke:#f24e4e;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + d="m 34.5,1041.8622 0,3 -24,0 0,-3 z" + sodipodi:nodetypes="ccccc" /> + <path + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccc" + d="m 19.5,1008.8622 6,0 0,9 9,0 0,6 -9,0 0,9 -6,0 0,-9 -9,0 0,-6 9,0 z" + style="fill:none;stroke:#8ae234;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3855" /> + </g> +</svg>
Change 1 of 1 Show Entire File icons/​scalable/​actions/​view-file.svg Stacked
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
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
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48" + height="48" + id="svg2" + version="1.1" + inkscape:version="0.48.0 r9654" + sodipodi:docname="view-file.svg"> + <title + id="title3904">View changes in file</title> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="0.50196078" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="9.125" + inkscape:cx="21.972603" + inkscape:cy="24" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:showpageshadow="true" + showborder="true" + inkscape:window-width="1026" + inkscape:window-height="610" + inkscape:window-x="144" + inkscape:window-y="56" + inkscape:window-maximized="0"> + <inkscape:grid + type="xygrid" + id="grid2997" + empspacing="6" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + spacingx="0.5px" + spacingy="0.5px" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title>View changes in file</dc:title> + <cc:license + rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> + <dc:date>2011-02-16</dc:date> + <dc:creator> + <cc:Agent> + <dc:title>Peer Sommerlund</dc:title> + </cc:Agent> + </dc:creator> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/by-sa/3.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Notice" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Attribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#ShareAlike" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1004.3622)"> + <path + style="fill:none;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 15.5,3.5 0,41" + id="path3883" + inkscape:connector-curvature="0" + transform="translate(0,1004.3622)" /> + <path + inkscape:connector-curvature="0" + id="path3885" + d="m 32.5,1007.8622 0,41" + style="fill:none;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + style="fill:#d3d7cf;fill-opacity:1;stroke:none" + d="m 16,1007.8622 16,0 0,41 -16,0 z" + id="rect3777" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="ccccc" + d="m 32,1021.3622 0,3.5 -16,0 0,-3.5 z" + style="fill:#3465a4;fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path2993" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path3053" + style="fill:#3465a4;fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + d="m 32,1016.8622 0,1 -16,0 0,-1 z" + sodipodi:nodetypes="ccccc" /> + <path + sodipodi:nodetypes="ccccc" + d="m 32,1041.8622 0,1 -16,0 0,-1 z" + style="fill:#3465a4;fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="path3865" + inkscape:connector-curvature="0" /> + </g> +</svg>
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
138
139
140
141
 
142
143
 
144
145
 
146
147
148
 
208
209
210
211
 
 
 
 
212
213
214
 
138
139
140
 
141
142
 
143
144
 
145
146
147
148
 
208
209
210
 
211
212
213
214
215
216
217
@@ -138,11 +138,11 @@
  self._lostMode = None   self._lastSearch = u'', False   - self.actionDiffMode = QAction('Diff', self) + self.actionDiffMode = QAction(qtlib.geticon('view-diff'), _('View change as Unix diff output'), self)   self.actionDiffMode.setCheckable(True) - self.actionFileMode = QAction('File', self) + self.actionFileMode = QAction(qtlib.geticon('view-file'), _('View change in context of file'), self)   self.actionFileMode.setCheckable(True) - self.actionAnnMode = QAction('Ann', self) + self.actionAnnMode = QAction(qtlib.geticon('view-annotate'), _('View change in context, annotate with revision number'), self)   self.actionAnnMode.setCheckable(True)     self.modeToggleGroup = QActionGroup(self) @@ -208,7 +208,10 @@
  @pyqtSlot(QAction)   def setMode(self, action):   'One of the mode toolbar buttons has been toggled' - mode = {'Diff':'diff', 'File':'file', 'Ann':'ann'}[str(action.text())] + + mode = {self.actionDiffMode.text():'diff', + self.actionFileMode.text():'file', + self.actionAnnMode.text() :'ann'}[action.text()]   self.actionNextDiff.setEnabled(mode == 'file')   self.actionPrevDiff.setEnabled(False)   self.blk.setVisible(mode == 'file')