Skip to content

Commit 997fddd

Browse files
retailcoderretailcoder
committed
Merge pull request #643 from rubberduck-vba/GrammarIsFun
Minor UI tweaks
2 parents 86a918c + e453d23 commit 997fddd

File tree

9 files changed

+373
-1175
lines changed

9 files changed

+373
-1175
lines changed

‎RetailCoder.VBE/Properties/Resources.Designer.cs

Lines changed: 32 additions & 792 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RetailCoder.VBE/Properties/Resources.resx

Lines changed: 27 additions & 255 deletions
Large diffs are not rendered by default.

‎RetailCoder.VBE/Settings/DisplayLanguageSetting.cs

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
using System.Xml.Serialization;
1+
using System;
2+
using System.Globalization;
3+
using System.Xml.Serialization;
24
using Rubberduck.UI;
35

46
namespace Rubberduck.Settings
@@ -17,14 +19,31 @@ public DisplayLanguageSetting()
1719
public DisplayLanguageSetting(string code)
1820
{
1921
Code = code;
20-
_name = RubberduckUI.ResourceManager.GetString("Language_" + Code.Substring(0, 2).ToUpper(), RubberduckUI.Culture);
22+
23+
CultureInfo culture;
24+
try
25+
{
26+
culture = CultureInfo.GetCultureInfo(code);
27+
_exists = true;
28+
}
29+
catch (CultureNotFoundException)
30+
{
31+
culture = RubberduckUI.Culture;
32+
_exists = false;
33+
}
34+
35+
_name = RubberduckUI.ResourceManager.GetString("Language_" + Code.Substring(0, 2).ToUpper(), culture);
2136
}
2237

2338
private readonly string _name;
39+
private readonly bool _exists;
2440

2541
[XmlIgnore]
2642
public string Name { get { return _name; } }
2743

44+
[XmlIgnore]
45+
public bool Exists { get { return _exists; } }
46+
2847
public override bool Equals(object obj)
2948
{
3049
var other = (DisplayLanguageSetting) obj;

‎RetailCoder.VBE/UI/CodeExplorer/CodeExplorerWindow.Designer.cs

Lines changed: 69 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RetailCoder.VBE/UI/CodeExplorer/CodeExplorerWindow.resx

Lines changed: 159 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,167 @@
120120
<metadata name="CodeExplorerToolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121121
<value>17, 17</value>
122122
</metadata>
123+
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
124+
<data name="ShowFoldersToggleButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
125+
<value>
126+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
127+
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPxZLvS1NhFMf3B0gIoSiVTYwEa1CRCEkvtFfD
128+
gsKiIAfBKMSKNJLBSKY5lU1yNtiYP2hTr+KdISJDisSC/AGRJoppuppT06m3vDXZ5r0Xvu4+jyFLit55
129+
4PvufD7nOYdHsf/l/zqLF4xlT+a9U9hp+XfJzdxSLyLf+0hCHIug3wp3y9P/k8iNf6bTWYuOZhM6mkxg
130+
GmvQ1lANl91IY6sksRhLqbzTVYstfiAmkV8eiJwb4qoL0jcbJJ8Z4owBkYlH2HxfiJ9vNdAXa6lAnkSg
131+
nRXCfBcErhXichT0myB5yyBMPkD4gxbBd9ew8UqNjw3JuwL5eb8Fwo8eCOtMDLw1VYLw6G0EB28QeIXN
132+
xIglDne116nAGd1HFsiTRa4d4oqDwOIXQwzMv84D13sei8xJvDHHoSBfTQXNz8rJdLJzoAnSoiUKV1B4
133+
rBCbQzfB918icIA9g4Xnx+B5Eo+8C9lU4KgrQ2itJ3owJ6QlK4GFT6UUHtZQ2JODgDsTy20Z8NqPgH2c
134+
gOyzKiqwmfUIBdzk2qLPSOHxIgoPXN6FmRPwNSoxXZ8Ip+4QVOlKKrDW6MD7WrE2WoyFl2rMdWfhM6vC
135+
RMtxjDhS0V+nRHdlCroMyWSyDNsfHkXq4UQqkD9Elf4edPdv4Y7mCq5ezEXOudM4lZFGmpIOHvhriGCf
136+
S6HYBncv2ZRaq4LKAAAAAElFTkSuQmCC
137+
</value>
138+
</data>
139+
<data name="ShowDesignerButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
140+
<value>
141+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
142+
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJlSURBVDhPrVLdT1JhGOdPyoVhXdVNA9dFd90aYhdetKXT
143+
bgLUsi9zFemcC1CkLKAPP/MAghIybKuoJgi4tZofnHMQ2tqsLT9+Pc97TrJuW+949/A+7/v8fs/v9xzD
144+
f1n9ARV9IRl3AmX0BbXdO67APiajw62gdWAL1rsbOHezhLNdWzht38DJznWcaPsKAcDF/iQwmtzHSOIA
145+
D2N7GJJ24ZrZw+2JXVwL/YL96U9c9u2g3f0DrcM7sA1+R50towMEFMF6K0SdBFVcfyzjikfFxaGSxty7
146+
iTPEeqpjHQ1tn2Fq38TxS19wxJrSAPxTb7Ct5MSuykWKeShlPudRVvWtFCnqudKayBktNg3A+yJFF1yY
147+
wzelAFVZFQ+dnjCueiSKc+h2h9HjicLueYWKuobCyiKMjVYNYDgYp6Is7nkldN8PofOGTwB2eSPYxwH4
148+
B+0fgURQlleRyyZQb9EBWEJFJWa5IJg1OUU43JIocIg9LwAd1NW2msXKxziM5vN/S+D2uVhoJBahmR5r
149+
milSju9ZQuZtGA2WlpqESokL8hQL4gF3wmxOdwROYmY/uBM+s6Hv0mGSoJs4OE5JKu4ng3pcz3QPcqJl
150+
IV/3gJdzREKV7tJL06iz6BJc/tnD1g5HRn44vHNiAho7deONig5YanJxEiazbuKDsbCYP8uo0jRYe1Vm
151+
M/N61L6NPzkmm489r41xwDcDhZgLuRTyn14jm1nAh0wM75clLKdnsZScRCL+EgvhAKLSE0hTjzA94auN
152+
kTvgA29GZXOOmZtQ39gictwq50zmCzhqaSL3m8XZaG7WAP59GQy/AaDujVuFBryLAAAAAElFTkSuQmCC
153+
</value>
154+
</data>
155+
<data name="AddClassButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
156+
<value>
157+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
158+
YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAAAYdEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My4wOGVynOEA
159+
AAFxSURBVDhPhZE7S8NQGIbPb3FwE1HRQdz8CS6COIlODgVXRYq4tVKolgZB7KqUoPYiLgULFkEHL0NK
160+
rOlNaRUkJSKSUl7PF8kxaU9t4CHn8j3v+TiHlfMr+NCCsN92oavDsBshtJ53ULsJgn9sEMyqxFA+Hwda
161+
IdQu5/k/AiMzCrMU5vtyyQujk2HFgHYB1kuS//PO/O6Rr0uEbljxeAiV3Bw+Gyo6MPH1nnLm1YspLOxr
162+
vEYuuvx20IoC3zknhDqhua4rWE81Mbt2zev80v3yg1hjVjUOIzuGTnMDr1eLgBnFZqqG7UzJ6YBNKKKY
163+
INlO2nBDWKUQwEk2iLoRQT03DUNTsJU2/pXteBt64AmhkfDf5uRS2pGobVfeOzxCIpGAeqBCWy32yOSJ
164+
AG+I92QKcMenM2c+mRCyWOhq2xtAeGVCDPrRHUBQl+7YtyGDAlzoTkhWbiGeVyr1w5W9Fy0tlCGTaV1a
165+
3A/ZK/UUDcL/SmA/uF38F0GkoWYAAAAASUVORK5CYII=
166+
</value>
167+
</data>
168+
<data name="AddStdModuleButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
169+
<value>
170+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
171+
YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAAAYdEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My4wOGVynOEA
172+
AAItSURBVDhPjZJPbxJBGIf3K5iYmHj0oCdj1LQHv0G9ejExnlDPNZ5M7IFLT9CY0BJIm6ikJlbSEiu0
173+
pW2k0vAfFAuULZuyLAiFtlKWpcCyLD93ByE1Uuokv0ze3XmeeXdmqcz2M5RpLVqH02Bs19Eq6sCnp5AL
174+
a6EM6qJQAmdEZu0OwOuQcz9U5tdgV24hHtRj2U33s/QljgXnd8x/DsATjirsH4G6MwQjIPkg5BeVebtb
175+
V96oi/4aHSVz1i2MjGnwzmpXH1HUnvUaONcD1Io2yKigfmQndX5jVF3QHx2FltodzMw7se6JE8lbRdLt
176+
gDcATReRqJ2Q+kwHsgpLHTRFGQbLKkbvP+mHErImsKu3IZcmUPA+VkADOQM6pMPy5jcsOIKwLHnwaJaG
177+
UG8jvHeMT64dEiLgfOPdWyhM4mDrHljajKP3kyhFtWjLgCjJBDZHgBGNA4cnEgrHIhGon/HPtfwcz6O1
178+
2MLO0xjpoAe/spdA3TVDP7cCttgcLOjBLZME3U09ag0ZYy8jfTi0WwZ70EAqWx8sUHftwZlUGdzHy4il
179+
eQI7vRl8sAegn3Ugxp4OFpSYJIHz6RMCIztNZq4ogsk3kOTqirCGSEo4/wzUa/pVlfoCMfEcftMV2NYj
180+
mLFsKGfggC9xgaBYFpHbD2Bt6irguQHji0uIMqcI0QK8iSrcP/jhgmxJxH6hidSun8D+KINgUoAnXsXX
181+
KI/NSGW44OzPMiznCtQX/xcNfgPKUhjJbTQwbgAAAABJRU5ErkJggg==
182+
</value>
183+
</data>
184+
<data name="AddFormButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
185+
<value>
186+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
187+
YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAAAYdEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My4wOGVynOEA
188+
AAHESURBVDhPpZHfS1NhGMfPn9IPKoRAFBIKAi+6qOtuMrCgYVRQSO4uQnbjRaglqyFFMFQisVqxzc1j
189+
dcKF6+wch9GNEaXTstli7XB0bGetT3tfY60ULXbgw8v3fc/7eR6eV1mInSU758H5cpN3gb046V6sD/0s
190+
mR4qn7Idip3ysRBtBquXpakTlfUG8+ON5N73Vc43v1SLIipj+6AUx/70sLLGZE4aAxx1z9DaaXLwgklz
191+
h8H+Mwb7TunsPqmzo20d5e3YLlLacVbTAcrkyGdCMi+qLXhGC1wZKeD257l0Z43zg6t03LKrSIHswPJC
192+
QZMS0YnIM4kBjlw2OXzRpOWcSaPLoOF0gj3tOjt/VZcCe3GQ+UgT5ZWrLE+3Q85bncHXlbktOXDMhZKK
193+
d6KrXTjLPXx+cQiyPvkqYr/77sSmiMtJQ10XiEl6hyJy89rtEN3XR3H3+GUWPxedH+SLZex8GWutVBUk
194+
Xo1vFPxNbdVaxNl0LLi9YCumtEB9HTyffPBvM/hmfydjlUhni3zMOFXBZOR+fR1EgyP1zSD8eGij4M1r
195+
7TezGrPJpxh6lPjLkBzaM3UMNXyP8JNhgo/8fwpE+H9c/ASARhD/A8EdKQAAAABJRU5ErkJggg==
196+
</value>
197+
</data>
198+
<data name="DisplayMemberNamesButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
199+
<value>
200+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
201+
YQUAAAAJcEhZcwAACxAAAAsQAa0jvXUAAAAYdEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My4wOGVynOEA
202+
AACBSURBVDhPpc6xCcAgEIVhFay0sHJld3Ajp3AMy5c7QkIwr8iR4uOOXxEdgF9otKDRgkYLGi1otKBR
203+
zTkRQkCtFb13SfwejWqMIePc9ZFr39Go1lpy6m77+YVGVUqR8d53NKrnt3PO976jUbXW4L1HSgkxRkn8
204+
Ho0WNFrQaEHjd3AHNRDmBreiY2QAAAAASUVORK5CYII=
205+
</value>
206+
</data>
207+
<data name="DisplaySignaturesButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
208+
<value>
209+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
210+
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAClSURBVDhP7ZExDsMgDEUJUiYYYOFErFwnV4AzcKMcAiHB
211+
IRjduipWrCRDhy5Vv4S+v2U9LBB/fVmtNXgalFLQxdspk2qtIKUE5xzknGnYew8pJTaMGfsMsu87BYSg
212+
z9t67wxwucUY49U8HBrE+kIcYIyhMOuPAHNtlNaaANba04NNMOvHGGFZFlBKwbquBAghwLZtDID59Ih3
213+
wm9E6BxGP+afkBAPom6SkrbHLt4AAAAASUVORK5CYII=
214+
</value>
215+
</data>
216+
<data name="DisplayModeButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
217+
<value>
218+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
219+
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABcSURBVDhPYxgFgxncv3//PxMT038xMbH/s2bN+g8VJh6c
220+
PHkSrglkCJRJPPj+/TtIEzImDQgICMA1IbOJBsjO5uHhId2A9vb2/4yMjP+5ubn/s7Kykm7AiAEMDADw
221+
LB6yIoqrPwAAAABJRU5ErkJggg==
222+
</value>
223+
</data>
123224
<metadata name="CodeExplorerContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
124225
<value>317, 17</value>
125226
</metadata>
227+
<data name="AddClassContextButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
228+
<value>
229+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
230+
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFVSURBVDhPpZE/S8NAHIbzWRzcRFR0EDc/gosgTqKTQ8FV
231+
kSBuUQqtpUEQsyolqGkrLgELFkEH/wwpsaZpqrQKkhARSSmvvdiraU2biA+EyyW8z738jinllvCmsHBe
232+
4lDFQThVDtbjNowrFkwYbD2B0ukoYHEwzmebaxRaZhhmcSucgJwMOwHU87CfUs015+5v7uPhBIXDAejy
233+
DN6rIhow8fEqufvy2QTmdpVgidvAigGfsishTcheVXmsSjVMr1z+ktwu3v18s8tJaNkRNGpreL6YB8wY
234+
1iUDm5nid4MxvkNAwk7KQVui5yM4yrKoaFFU5EloCo+NtNY37CTrUCMP4IY8gx5fSLshUpuGd/YPIAgC
235+
xD0RynKhd5hCJd6TiaD1yhxPnfQOt+mq7RUQ+od96BYQ3JZhIQL6kJmQMH8N3+sNhIa9g279CuZfYYrf
236+
Lf2djjDDfAFtVEe+/SRO1QAAAABJRU5ErkJggg==
237+
</value>
238+
</data>
239+
<data name="AddStdModuleContextButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
240+
<value>
241+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
242+
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIjSURBVDhPjZLfT1JhGMf5F9ra2rrsoq5aq6YX/Qd2201b
243+
64rq2tZVW1544xW4NpTBdKucbRlTl4G/F6ZDQKFIQRGm/AoENRSPIofj4RPnNdGWku/27N2zd5/P+z3P
244+
e3TxmWfkw62UNzqIDl6nnDVQWGsn5WtFd5ElJczER+9AwUBq+mF1f01s+BbBOSND0+FaDXwJ0jf2nd7P
245+
Xly+wIlcuxnJDIobKd1f3WeO+p03/ySoAN22KRqa9Lyz2Y/OV2zXSDgfsJcdRGWH4qZd9OmJxr8ElSqt
246+
HFbo7B1j3BUUkreaRCQomKDkFBItiehPJVA1WKlQklVMPSM03n9SK52UtBAbuY2aayEz+7gKmsQMwvMG
247+
hia/0eeYo2fAxaOuMFLxEN/KFp+cC6KEIOFuPnqFTBvrU/eIha1svm8jF2jlUAVZUQVs9UOD3sHGtkJm
248+
SxYC7TP+hDxZP5vTlPvLLDxdFAmO4Vf2HLq7Vozdw8SypbMFx3DZomC4aWTvQKXppb8Gzy/lia0fEEkW
249+
zxZotx7D8UiexMfLLK4VBDw2G+eD3Yuxy8FibP9sQS66LOD02raASXaIPZGViaYPWE4Uq8I9/BHp/Blo
250+
z/RrV6kJ5NBzPJYrDI776eyZqM7AgTv0H0E2L5Na9TLafhVcNzC/uEQgus98WGI2tMv0j0J9QTIns5op
251+
EVnyCNgTiDK3LOEK7vI1UGDSv1NfcPpnqVfnCrSDi5We38IYbmX0xtKCAAAAAElFTkSuQmCC
252+
</value>
253+
</data>
254+
<data name="AddFormContextButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
255+
<value>
256+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
257+
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG9SURBVDhPpZHfS1NhGMf3p/QDiyAQBYWCoIsu8robDSxo
258+
GBUUUruLkN14IWrJaogRDJNIrFZsc+tYnXDhPDvHoXRjiD+mZbPF2uHo2M5cn3xfY1mGLfbCh5fve877
259+
eR6e17EUvUhm1o395S5z/kPYqW7MhV5WDDeOSpaV9LIUqQezm5Xx5q39DoujtWTneyoTiMpYXijGsD49
260+
3dqjMif0Pk67pjjZbnDsikF9m87RCzqHz2kcPKuxr2Ubx4eRAyTVM6yn/JTIkksHZV5WGnEP57k5lMfl
261+
y3Ht/gaX+9dpu2eVkQLZgemBvColohORp+J9nLpucOKqQeMlg1qnzpHzcWpaNfb/rC4F1nI/i+E6Smu3
262+
WJ1ohaynPIOva7N70tDkxJGMtaMpN7BXO/n89jhkvPJVxHnHg5d/RVxO6Mq2QCzPYFgedg0E6bg9jKvT
263+
J7P4uWB/J1coYeVKmBvFsiA+Obpb8Cc7q+5EfJuIBv4t2Itx1V9dB2/GnlQ2g2/WJmmzSCpT4GPaLgvG
264+
wo+r6yASGKpuBqHng7sF72fUX0yrTCdeoWsRYu+CcmivlRGU0CNCLx4SeOb7XSDC/+PkB31UwEH17trP
265+
AAAAAElFTkSuQmCC
266+
</value>
267+
</data>
268+
<data name="ShowDesignerContextButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
269+
<value>
270+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
271+
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJkSURBVDhPrVJLTxNRFO5PklgsutKNaYkLd26xFBcsTISA
272+
G9sCii8kaoUQYlsoVbStD54ybWmhlqaYqFVDS1sSo+HRmSmtiQmayOPznDsjjVvjZG7O3HPvOd/jjOG/
273+
PP0BFX0hGXcCZfQFtdU7rsA+JqPDraB1YAvWuxs4d7OEs11bOG3fwMnOdZxo+wrRgIv9SWA0uY+RxAEe
274+
xvYwJO3CNbOH2xO7uBb6BfvTn7js20G7+wdah3dgG/yOOltGbxBQBOqtEDEJqrj+WMYVj4qLQyUNuXcT
275+
Zwj1VMc6Gto+w9S+ieOXvuCINaU18E+9wbaSE6sqFynmoZR5n0dZ1ZdSpKjnSmsiZ7TYtAbeFyk64MIc
276+
vikFqMqquOj0hHHVI1GcQ7c7jB5PFHbPK1TUNRRWFmFstGoNhoNxKsrinldC9/0QOm/4RMMubwT7OAC/
277+
0L6oSQRleRW5bAL1Fr0BS6iohCwXBLImpwiHWxIFDrHmRUMHsdpWs1j5GIfRfP5vCUyfi4VGQhGa6bKm
278+
mSLl+JwlZN6G0WBpqUmolLggT7EgLjATRnO6I3ASMvvBTHjPhr5Lh0mCbuLgOCWpuJ8M6nE90z3ICcpC
279+
vu4B33WOSKjSWXppGnUWXYLLP3tI7XBk5IfDOycmoKETG29UMGCpycVJmMy6iQ/GwmL+LKNK02DtVZnN
280+
zOtR+zf+5BhsPva8NsYB3wwUQi7kUsh/eo1sZgEfMjG8X5awnJ7FUnISifhLLIQDiEpPIE09wvSErzZG
281+
ZsAbXtyVzTlmbkJ9Y4vIMVXOmcwXcNTSRO43i73R3Kw1+PfHYPgNSAGJX463C6EAAAAASUVORK5CYII=
282+
</value>
283+
</data>
126284
<metadata name="TreeNodeIcons.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
127285
<value>183, 17</value>
128286
</metadata>
@@ -131,7 +289,7 @@
131289
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
132290
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
133291
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACa
134-
kgAAAk1TRnQBSQFMAgEBKwEAAZABAQGQAQEBEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
292+
kgAAAk1TRnQBSQFMAgEBKwEAAZgBAQGYAQEBEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
135293
AwABsAMAAQEBAAEYBgABhBIAA/sD8QGJAZwBtwFVAW0BowFVAWMBmQFVAWIBmAFVAVkBiwJVAX4BVQFY
136294
AYEBVQFgAYsBVQFpAZYBVQFyAaMBiQGbAbUD8AP7AwAD/QP6JPgD+gP9A/sD8QG+AbEBpAG7AaABhgG7
137295
AaABhgG7AaABhgG7AaABhgG7AaABhgG7AaABhgG7AaABhgG7AaABhgG7AaABhgG7AaABhgG+AbEBpAPx

‎RetailCoder.VBE/UI/Settings/GeneralSettingsControl.Designer.cs

Lines changed: 0 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RetailCoder.VBE/UI/Settings/GeneralSettingsControl.cs

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.IO;
1+
using System.Linq;
32
using System.Windows.Forms;
43
using Rubberduck.Settings;
54

@@ -15,29 +14,8 @@ public GeneralSettingsControl()
1514
InitializeComponent();
1615
TitleLabel.Text = RubberduckUI.SettingsCaption_GeneralSettings;
1716
LanguageLabel.Text = RubberduckUI.Settings_LanguageLabel;
18-
resetSettings.Text = RubberduckUI.Settings_ResetSettings;
1917

2018
LoadLanguageList();
21-
22-
resetSettings.Click += ResetSettingsClick;
23-
}
24-
25-
private void ResetSettingsClick(object sender, EventArgs e)
26-
{
27-
var confirmReset = MessageBox.Show(RubberduckUI.Settings_ResetSettingsConfirmation, RubberduckUI.Settings_Caption, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
28-
if (confirmReset == DialogResult.No)
29-
{
30-
return;
31-
}
32-
33-
ResetSettings();
34-
}
35-
36-
private void ResetSettings()
37-
{
38-
File.Delete(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Rubberduck\\rubberduck.config"));
39-
var config = _configService.GetDefaultConfiguration();
40-
_configService.SaveConfiguration(config, !Equals(_currentLanguage, config.UserSettings.LanguageSetting));
4119
}
4220

4321
public GeneralSettingsControl(DisplayLanguageSetting displayLanguage, IGeneralConfigService configService)
@@ -55,10 +33,14 @@ public DisplayLanguageSetting SelectedLanguage
5533

5634
private void LoadLanguageList()
5735
{
58-
LanguageList.Items.Add(new DisplayLanguageSetting("en-US"));
59-
LanguageList.Items.Add(new DisplayLanguageSetting("fr-CA"));
60-
LanguageList.Items.Add(new DisplayLanguageSetting("sv-SV"));
36+
var settings = new[]
37+
{
38+
new DisplayLanguageSetting("en-US"),
39+
new DisplayLanguageSetting("fr-CA"),
40+
new DisplayLanguageSetting("sv-SV")
41+
};
6142

43+
LanguageList.Items.AddRange(settings.Where(item => item.Exists).ToArray());
6244
LanguageList.DisplayMember = "Name";
6345
}
6446
}

0 commit comments

Comments
 (0)