Skip to content

Commit 82b4b50

Browse files
ThunderFrameThunderFrame
committed
Merge branch 'next' of https://github.com/rubberduck-vba/Rubberduck into next
2 parents 6479818 + f02f029 commit 82b4b50

14 files changed

+157
-91
lines changed

‎RetailCoder.VBE/Common/WinAPI/RawKeyboard.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public RawKeyboard(IntPtr hwnd, bool captureOnlyInForeground)
1010
var rid = new RawInputDevice[1];
1111
rid[0].UsagePage = HidUsagePage.GENERIC;
1212
rid[0].Usage = HidUsage.Keyboard;
13-
rid[0].Flags = (captureOnlyInForeground ? RawInputDeviceFlags.NONE : RawInputDeviceFlags.INPUTSINK) | RawInputDeviceFlags.DEVNOTIFY;
13+
rid[0].Flags = (captureOnlyInForeground ? RawInputDeviceFlags.NONE : RawInputDeviceFlags.INPUTSINK);
1414
rid[0].Target = hwnd;
1515
if (!User32.RegisterRawInputDevices(rid, (uint)rid.Length, (uint)Marshal.SizeOf(rid[0])))
1616
{

‎RetailCoder.VBE/Common/WinAPI/RawMouse.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public RawMouse(IntPtr hwnd, bool captureOnlyInForeground)
1010
var rid = new RawInputDevice[1];
1111
rid[0].UsagePage = HidUsagePage.GENERIC;
1212
rid[0].Usage = HidUsage.Mouse;
13-
rid[0].Flags = (captureOnlyInForeground ? RawInputDeviceFlags.NONE : RawInputDeviceFlags.INPUTSINK) | RawInputDeviceFlags.DEVNOTIFY;
13+
rid[0].Flags = (captureOnlyInForeground ? RawInputDeviceFlags.NONE : RawInputDeviceFlags.INPUTSINK);
1414
rid[0].Target = hwnd;
1515
if (!User32.RegisterRawInputDevices(rid, (uint)rid.Length, (uint)Marshal.SizeOf(rid[0])))
1616
{

‎RetailCoder.VBE/UI/Command/FindAllImplementationsCommand.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,11 @@ public FindAllImplementationsCommand(INavigateCommand navigateCommand, IMessageB
3838

3939
public override bool CanExecute(object parameter)
4040
{
41-
if (_vbe.ActiveCodePane == null && _state.Status != ParserState.Ready)
41+
if (_vbe.ActiveCodePane == null || _state.Status != ParserState.Ready)
4242
{
4343
return false;
4444
}
4545

46-
// todo: make this work for Code/Project Explorer context menus too (may require a new command implementation)
4746
var target = FindTarget(parameter);
4847
var canExecute = target != null;
4948

‎RetailCoder.VBE/UI/Command/FindAllReferencesCommand.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,11 @@ public FindAllReferencesCommand(INavigateCommand navigateCommand, IMessageBox me
3535

3636
public override bool CanExecute(object parameter)
3737
{
38-
if (_vbe.ActiveCodePane == null && _state.Status != ParserState.Ready)
38+
if (_vbe.ActiveCodePane == null || _state.Status != ParserState.Ready)
3939
{
4040
return false;
4141
}
42-
43-
// todo: make this work for Code/Project Explorer context menus too (may require a new command implementation)
42+
4443
var target = FindTarget(parameter);
4544
var canExecute = target != null;
4645

‎RetailCoder.VBE/UI/Command/Refactorings/RefactorRemoveParametersCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public override bool CanExecute(object parameter)
4545
return false;
4646
}
4747

48-
var parameters = _state.AllUserDeclarations.Where(item => member.Equals(item.ParentScopeDeclaration)).ToList();
48+
var parameters = _state.AllUserDeclarations.Where(item => item.DeclarationType == DeclarationType.Parameter && member.Equals(item.ParentScopeDeclaration)).ToList();
4949
var canExecute = (member.DeclarationType == DeclarationType.PropertyLet || member.DeclarationType == DeclarationType.PropertySet)
5050
? parameters.Count > 1
5151
: parameters.Any();

‎RetailCoder.VBE/UI/Command/Refactorings/RefactorReorderParametersCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public override bool CanExecute(object parameter)
4949
return false;
5050
}
5151

52-
var parameters = _state.AllUserDeclarations.Where(item => member.Equals(item.ParentScopeDeclaration)).ToList();
52+
var parameters = _state.AllUserDeclarations.Where(item => item.DeclarationType == DeclarationType.Parameter && member.Equals(item.ParentScopeDeclaration)).ToList();
5353
var canExecute = (member.DeclarationType == DeclarationType.PropertyLet || member.DeclarationType == DeclarationType.PropertySet)
5454
? parameters.Count > 2
5555
: parameters.Count > 1;

‎RetailCoder.VBE/UI/RubberduckUI.ja.resx

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@
900900
<value />
901901
</data>
902902
<data name="SmartIndenterMenu" xml:space="preserve">
903-
<value />
903+
<value>インデント</value>
904904
</data>
905905
<data name="RegexSearchReplaceScope_Selection" xml:space="preserve">
906906
<value />
@@ -1089,13 +1089,13 @@
10891089
<value />
10901090
</data>
10911091
<data name="HotkeyDescription_CodeExplorer" xml:space="preserve">
1092-
<value />
1092+
<value>コードエクスプローラ</value>
10931093
</data>
10941094
<data name="HotkeyDescription_RefactorRename" xml:space="preserve">
1095-
<value />
1095+
<value>名前の変更</value>
10961096
</data>
10971097
<data name="GeneralSettings_HotkeyShift" xml:space="preserve">
1098-
<value />
1098+
<value>Shiftキー</value>
10991099
</data>
11001100
<data name="SearchResults_MemberName" xml:space="preserve">
11011101
<value />
@@ -1107,7 +1107,7 @@
11071107
<value />
11081108
</data>
11091109
<data name="GeneralSettings_HotkeyAlt" xml:space="preserve">
1110-
<value />
1110+
<value>Altキー</value>
11111111
</data>
11121112
<data name="EndOfLineCommentStyle_AlignInColumn" xml:space="preserve">
11131113
<value />
@@ -1116,13 +1116,13 @@
11161116
<value />
11171117
</data>
11181118
<data name="HotkeyDescription_InspectionResults" xml:space="preserve">
1119-
<value />
1119+
<value>コード検査</value>
11201120
</data>
11211121
<data name="CodeInspectionResults_GroupByType" xml:space="preserve">
11221122
<value />
11231123
</data>
11241124
<data name="GeneralSettings_HotkeysLabel" xml:space="preserve">
1125-
<value />
1125+
<value>ショートカットキー</value>
11261126
</data>
11271127
<data name="SourceControl_CommitAndSync" xml:space="preserve">
11281128
<value />
@@ -1179,7 +1179,7 @@
11791179
<value />
11801180
</data>
11811181
<data name="HotkeyDescription_RefactorMoveCloserToUsage" xml:space="preserve">
1182-
<value />
1182+
<value>宣言へ移動</value>
11831183
</data>
11841184
<data name="IndenterSettings_ForceCompilerDirectivesToColumn1" xml:space="preserve">
11851185
<value />
@@ -1191,7 +1191,7 @@
11911191
<value />
11921192
</data>
11931193
<data name="RubberduckMenu_RegexSearchReplace" xml:space="preserve">
1194-
<value />
1194+
<value>&amp;x正規表現の検索置換</value>
11951195
</data>
11961196
<data name="IndenterSettings_IgnoreOperators" xml:space="preserve">
11971197
<value />
@@ -1212,7 +1212,7 @@
12121212
<value />
12131213
</data>
12141214
<data name="HotkeyDescription_IndentModule" xml:space="preserve">
1215-
<value />
1215+
<value>モジュールをインデント</value>
12161216
</data>
12171217
<data name="RubberduckCommandbarRefreshButtonTooltip" xml:space="preserve">
12181218
<value />
@@ -1233,16 +1233,16 @@
12331233
<value />
12341234
</data>
12351235
<data name="GeneralSettings_AutoSaveEnabled" xml:space="preserve">
1236-
<value />
1236+
<value>自動保存モードを有効</value>
12371237
</data>
12381238
<data name="SettingsCaption_IndenterSettings" xml:space="preserve">
1239-
<value />
1239+
<value>インデント設定</value>
12401240
</data>
12411241
<data name="ParserState_Pending" xml:space="preserve">
12421242
<value />
12431243
</data>
12441244
<data name="GeneralSettings_HotkeyCtrl" xml:space="preserve">
1245-
<value />
1245+
<value>Ctrlキー</value>
12461246
</data>
12471247
<data name="UnitTest_NewModule_RunBeforeTest" xml:space="preserve">
12481248
<value />
@@ -1251,7 +1251,7 @@
12511251
<value />
12521252
</data>
12531253
<data name="HotkeyDescription_IndentProcedure" xml:space="preserve">
1254-
<value />
1254+
<value>プロシージャをインデント</value>
12551255
</data>
12561256
<data name="SearchResults_Context" xml:space="preserve">
12571257
<value />
@@ -1272,25 +1272,25 @@
12721272
<value />
12731273
</data>
12741274
<data name="HotkeyDescription_RefactorExtractMethod" xml:space="preserve">
1275-
<value />
1275+
<value>メソッドを抽出</value>
12761276
</data>
12771277
<data name="SettingsInstructions_IndenterSettings" xml:space="preserve">
12781278
<value />
12791279
</data>
12801280
<data name="GeneralSettings_AutoSaveLabel" xml:space="preserve">
1281-
<value />
1281+
<value>自動保存モード</value>
12821282
</data>
12831283
<data name="GeneralSettings_HotkeyDescription" xml:space="preserve">
1284-
<value />
1284+
<value>記述</value>
12851285
</data>
12861286
<data name="SourceControl_ExcludeFileButton" xml:space="preserve">
12871287
<value />
12881288
</data>
12891289
<data name="GeneralSettings_HotkeyKey1" xml:space="preserve">
1290-
<value />
1290+
<value>1つ目のきー</value>
12911291
</data>
12921292
<data name="GeneralSettings_HotkeyKey2" xml:space="preserve">
1293-
<value />
1293+
<value>2つ目のきー</value>
12941294
</data>
12951295
<data name="SourceControl_Author" xml:space="preserve">
12961296
<value />
@@ -1302,7 +1302,7 @@
13021302
<value />
13031303
</data>
13041304
<data name="RubberduckMenu_Settings" xml:space="preserve">
1305-
<value />
1305+
<value>&amp;e設定</value>
13061306
</data>
13071307
<data name="IndenterSettings_IndentCase" xml:space="preserve">
13081308
<value />
@@ -1353,7 +1353,7 @@
13531353
<value />
13541354
</data>
13551355
<data name="HotkeyDescription_ParseAll" xml:space="preserve">
1356-
<value />
1356+
<value>パーサーのステートを更新</value>
13571357
</data>
13581358
<data name="SourceControl_NoBranchesTitle" xml:space="preserve">
13591359
<value />
@@ -1401,7 +1401,7 @@
14011401
<value />
14021402
</data>
14031403
<data name="HotkeyDescription_TestExplorer" xml:space="preserve">
1404-
<value />
1404+
<value>テストエクスプローラ</value>
14051405
</data>
14061406
<data name="IndenterSettings_AlignContinuations" xml:space="preserve">
14071407
<value />
@@ -1413,7 +1413,7 @@
14131413
<value />
14141414
</data>
14151415
<data name="GeneralSettings_HotkeyEnabled" xml:space="preserve">
1416-
<value />
1416+
<value>有効</value>
14171417
</data>
14181418
<data name="UnitTest_NewMethod_RaisedTestError" xml:space="preserve">
14191419
<value />
@@ -1434,7 +1434,7 @@
14341434
<value />
14351435
</data>
14361436
<data name="SettingsCaption_InspectionSettings" xml:space="preserve">
1437-
<value />
1437+
<value>コード検査設定</value>
14381438
</data>
14391439
<data name="ParserState_Parsing" xml:space="preserve">
14401440
<value />
@@ -1452,7 +1452,7 @@
14521452
<value />
14531453
</data>
14541454
<data name="SettingsCaption_UnitTestSettings" xml:space="preserve">
1455-
<value />
1455+
<value>ユニットテスト設定</value>
14561456
</data>
14571457
<data name="SourceControl_IncludeFileButton" xml:space="preserve">
14581458
<value />
@@ -1470,10 +1470,10 @@
14701470
<value />
14711471
</data>
14721472
<data name="HotkeyDescription_FindSymbol" xml:space="preserve">
1473-
<value />
1473+
<value>シンボルを検索</value>
14741474
</data>
14751475
<data name="GeneralSettings_LanguageLabel" xml:space="preserve">
1476-
<value />
1476+
<value>表示言語</value>
14771477
</data>
14781478
<data name="GeneralSettings_DebugLogLevel" xml:space="preserve">
14791479
<value>デバッグ</value>
@@ -1499,4 +1499,13 @@
14991499
<data name="GeneralSettings_WarnLogLevel" xml:space="preserve">
15001500
<value>警告</value>
15011501
</data>
1502+
<data name="GeneralSettings_FolderDelimiterLabel" xml:space="preserve">
1503+
<value>フォルダ デリミタ</value>
1504+
</data>
1505+
<data name="GeneralSettings_PeriodDelimiter" xml:space="preserve">
1506+
<value>ピリオド「 . 」</value>
1507+
</data>
1508+
<data name="GeneralSettings_SlashDelimiter" xml:space="preserve">
1509+
<value>スラッシュ「 / 」</value>
1510+
</data>
15021511
</root>

0 commit comments

Comments
 (0)