Skip to content

Commit 4018ea9

Browse files
retailcoderretailcoder
authored
Merge branch 'next' into UI_ToolBars
2 parents c4c584c + 399dd45 commit 4018ea9

File tree

109 files changed

+8504
-6597
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+8504
-6597
lines changed

‎RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerItemViewModel.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ public class CompareByType : Comparer<CodeExplorerItemViewModel>
3131
{
3232
private static readonly Dictionary<DeclarationType, int> SortOrder = new Dictionary<DeclarationType, int>
3333
{
34-
// Some DeclarationTypes we want to treat the same, like Subs and Functions.
34+
// Some DeclarationTypes we want to treat the same, like Subs and Functions,
35+
// or Property Gets, Lets, and Sets.
3536
// Give them the same number.
3637
{DeclarationType.LibraryFunction, 0},
3738
{DeclarationType.LibraryProcedure, 0},
@@ -41,10 +42,10 @@ public class CompareByType : Comparer<CodeExplorerItemViewModel>
4142
{DeclarationType.Constant, 4},
4243
{DeclarationType.Variable, 5},
4344
{DeclarationType.PropertyGet, 6},
44-
{DeclarationType.PropertyLet, 7},
45-
{DeclarationType.PropertySet, 8},
46-
{DeclarationType.Function, 9},
47-
{DeclarationType.Procedure, 9}
45+
{DeclarationType.PropertyLet, 6},
46+
{DeclarationType.PropertySet, 6},
47+
{DeclarationType.Function, 7},
48+
{DeclarationType.Procedure, 7}
4849
};
4950

5051
public override int Compare(CodeExplorerItemViewModel x, CodeExplorerItemViewModel y)
@@ -83,7 +84,7 @@ public override int Compare(CodeExplorerItemViewModel x, CodeExplorerItemViewMod
8384

8485
if (xNodeAcc != yNodeAcc)
8586
{
86-
return xNodeAcc < yNodeAcc ? -1 : 1;
87+
return xNodeAcc > yNodeAcc ? -1 : 1;
8788
}
8889

8990
if (x.ExpandedIcon != y.ExpandedIcon)
@@ -227,9 +228,9 @@ public void AddChild(CodeExplorerItemViewModel item)
227228
_items.Add(item);
228229
}
229230

230-
public void ReorderItems(bool sortByName, bool sortByType)
231+
public void ReorderItems(bool sortByName, bool groupByType)
231232
{
232-
if (sortByType)
233+
if (groupByType)
233234
{
234235
Items = sortByName
235236
? Items.OrderBy(o => o, new CompareByType()).ThenBy(t => t, new CompareByName()).ToList()

‎RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,26 @@ public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState st
9797

9898
SetNameSortCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param =>
9999
{
100-
SortByName = (bool)param;
101-
SortBySelection = !(bool)param;
100+
if ((bool)param == true)
101+
{
102+
SortByName = (bool)param;
103+
SortByCodeOrder = !(bool)param;
104+
}
105+
}, param =>
106+
{
107+
return SortByName ? false : true;
102108
});
103109

104-
SetSelectionSortCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param =>
110+
SetCodeOrderSortCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param =>
111+
{
112+
if ((bool)param == true)
113+
{
114+
SortByCodeOrder = (bool)param;
115+
SortByName = !(bool)param;
116+
};
117+
}, param =>
105118
{
106-
SortBySelection = (bool)param;
107-
SortByName = !(bool)param;
119+
return SortByCodeOrder ? false : true;
108120
});
109121
}
110122

@@ -141,28 +153,30 @@ public bool SortByName
141153
}
142154

143155
_windowSettings.CodeExplorer_SortByName = value;
144-
_windowSettings.CodeExplorer_SortByLocation = !value;
156+
_windowSettings.CodeExplorer_SortByCodeOrder = !value;
145157
_windowSettingsProvider.Save(_windowSettings);
146158
OnPropertyChanged();
159+
OnPropertyChanged("SortByCodeOrder");
147160

148161
ReorderChildNodes(Projects);
149162
}
150163
}
151164

152-
public bool SortBySelection
165+
public bool SortByCodeOrder
153166
{
154-
get { return _windowSettings.CodeExplorer_SortByLocation; }
167+
get { return _windowSettings.CodeExplorer_SortByCodeOrder; }
155168
set
156169
{
157-
if (_windowSettings.CodeExplorer_SortByLocation == value)
170+
if (_windowSettings.CodeExplorer_SortByCodeOrder == value)
158171
{
159172
return;
160173
}
161174

162-
_windowSettings.CodeExplorer_SortByLocation = value;
175+
_windowSettings.CodeExplorer_SortByCodeOrder = value;
163176
_windowSettings.CodeExplorer_SortByName = !value;
164177
_windowSettingsProvider.Save(_windowSettings);
165178
OnPropertyChanged();
179+
OnPropertyChanged("SortByName");
166180

167181
ReorderChildNodes(Projects);
168182
}
@@ -172,9 +186,9 @@ public bool SortBySelection
172186

173187
public CommandBase SetNameSortCommand { get; }
174188

175-
public CommandBase SetSelectionSortCommand { get; }
189+
public CommandBase SetCodeOrderSortCommand { get; }
176190

177-
public bool SortByType
191+
public bool GroupByType
178192
{
179193
get { return _windowSettings.CodeExplorer_GroupByType; }
180194
set
@@ -414,7 +428,7 @@ private void ReorderChildNodes(IEnumerable<CodeExplorerItemViewModel> nodes)
414428
{
415429
foreach (var node in nodes)
416430
{
417-
node.ReorderItems(SortByName, SortByType);
431+
node.ReorderItems(SortByName, GroupByType);
418432
ReorderChildNodes(node.Items);
419433
}
420434
}

‎RetailCoder.VBE/Settings/WindowSettings.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public interface IWindowSettings
1818
bool TodoExplorerVisibleOnStartup { get; set; }
1919

2020
bool CodeExplorer_SortByName { get; set; }
21-
bool CodeExplorer_SortByLocation { get; set; }
21+
bool CodeExplorer_SortByCodeOrder { get; set; }
2222
bool CodeExplorer_GroupByType { get; set; }
2323

2424
bool IsWindowVisible(DockableToolwindowPresenter candidate);
@@ -34,7 +34,9 @@ public WindowSettings()
3434
//empty constructor needed for serialization
3535
}
3636

37-
public WindowSettings(bool codeExplorerVisibleOnStartup, bool codeInspectionsVisibleOnStartup, bool sourceControlVisibleOnStartup, bool testExplorerVisibleOnStartup, bool todoExplorerVisibleOnStartup, bool codeExplorer_SortByName, bool codeExplorer_SortByLocation, bool codeExplorer_GroupByType)
37+
public WindowSettings(bool codeExplorerVisibleOnStartup, bool codeInspectionsVisibleOnStartup,
38+
bool sourceControlVisibleOnStartup, bool testExplorerVisibleOnStartup, bool todoExplorerVisibleOnStartup,
39+
bool codeExplorer_SortByName, bool codeExplorer_SortByCodeOrder, bool codeExplorer_GroupByType)
3840
{
3941
CodeExplorerVisibleOnStartup = codeExplorerVisibleOnStartup;
4042
CodeInspectionsVisibleOnStartup = codeInspectionsVisibleOnStartup;
@@ -43,7 +45,7 @@ public WindowSettings(bool codeExplorerVisibleOnStartup, bool codeInspectionsVis
4345
TodoExplorerVisibleOnStartup = todoExplorerVisibleOnStartup;
4446

4547
CodeExplorer_SortByName = codeExplorer_SortByName;
46-
CodeExplorer_SortByLocation = codeExplorer_SortByLocation;
48+
CodeExplorer_SortByCodeOrder = codeExplorer_SortByCodeOrder;
4749
CodeExplorer_GroupByType = codeExplorer_GroupByType;
4850
}
4951

@@ -54,7 +56,7 @@ public WindowSettings(bool codeExplorerVisibleOnStartup, bool codeInspectionsVis
5456
public bool TodoExplorerVisibleOnStartup { get; set; }
5557

5658
public bool CodeExplorer_SortByName { get; set; }
57-
public bool CodeExplorer_SortByLocation { get; set; }
59+
public bool CodeExplorer_SortByCodeOrder { get; set; }
5860
public bool CodeExplorer_GroupByType { get; set; }
5961

6062
public bool IsWindowVisible(DockableToolwindowPresenter candidate)
@@ -94,7 +96,7 @@ public bool Equals(WindowSettings other)
9496
TestExplorerVisibleOnStartup == other.TestExplorerVisibleOnStartup &&
9597
TodoExplorerVisibleOnStartup == other.TodoExplorerVisibleOnStartup &&
9698
CodeExplorer_SortByName == other.CodeExplorer_SortByName &&
97-
CodeExplorer_SortByLocation == other.CodeExplorer_SortByLocation &&
99+
CodeExplorer_SortByCodeOrder == other.CodeExplorer_SortByCodeOrder &&
98100
CodeExplorer_GroupByType == other.CodeExplorer_GroupByType;
99101
}
100102
}

‎RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -373,24 +373,24 @@
373373

374374
<MenuItem Name="SortByName"
375375
Style="{DynamicResource MenuItemStyle}" VerticalAlignment="Center"
376-
Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SortStyle_ByName}"
376+
Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_SortStyle_ByName}"
377377
IsChecked="{Binding SortByName, UpdateSourceTrigger=PropertyChanged}"
378378
Command="{Binding SetNameSortCommand}"
379379
CommandParameter="{Binding ElementName=SortByName, Path=IsChecked}"
380380
IsCheckable="True" />
381-
<MenuItem Name="SortBySelection"
381+
<MenuItem Name="SortByCodeOrder"
382382
Style="{DynamicResource MenuItemStyle}" VerticalAlignment="Center"
383-
Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SortStyle_ByCodeOrder}"
384-
IsChecked="{Binding SortBySelection, UpdateSourceTrigger=PropertyChanged}"
385-
Command="{Binding SetSelectionSortCommand}"
386-
CommandParameter="{Binding ElementName=SortBySelection, Path=IsChecked}"
383+
Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_SortStyle_ByCodeOrder}"
384+
IsChecked="{Binding SortByCodeOrder, UpdateSourceTrigger=PropertyChanged}"
385+
Command="{Binding SetCodeOrderSortCommand}"
386+
CommandParameter="{Binding ElementName=SortByCodeOrder, Path=IsChecked}"
387387
IsCheckable="True" />
388388

389389
<Separator />
390390

391391
<MenuItem Style="{DynamicResource MenuItemStyle}" VerticalAlignment="Center"
392-
Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SortStyle_ByType}"
393-
IsChecked="{Binding SortByType, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
392+
Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_SortStyle_ByType}"
393+
IsChecked="{Binding GroupByType, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
394394
IsCheckable="True" />
395395
</MenuItem>
396396
</Menu>

‎RetailCoder.VBE/UI/RubberduckUI.Designer.cs

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

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1492,12 +1492,6 @@ Allen Sternguckern, Likern &amp; Followern, für das warme Kribbeln
14921492
<data name="SourceControl_CommitStatus" xml:space="preserve">
14931493
<value>Commit Status.</value>
14941494
</data>
1495-
<data name="SortStyle_ByType" xml:space="preserve">
1496-
<value>Nach Typ</value>
1497-
</data>
1498-
<data name="SortStyle_ByName" xml:space="preserve">
1499-
<value>Nach Name</value>
1500-
</data>
15011495
<data name="CodeExplorer_Sort" xml:space="preserve">
15021496
<value>Sortieren</value>
15031497
</data>
@@ -1636,9 +1630,6 @@ Allen Sternguckern, Likern &amp; Followern, für das warme Kribbeln
16361630
<data name="SourceControl_OpenCommandPromptButtonToolTip" xml:space="preserve">
16371631
<value>Eingabeaufforderung öffnen</value>
16381632
</data>
1639-
<data name="SortStyle_ByCodeOrder" xml:space="preserve">
1640-
<value>Nach Deklarationsreihenfolge</value>
1641-
</data>
16421633
<data name="SourceControl_FileStatus_Removed" xml:space="preserve">
16431634
<value>Gelöscht</value>
16441635
</data>

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,9 +1456,6 @@ Tous ceux qui nous ont donné une étoile ou un "like"
14561456
<data name="GeneralSettings_PeriodDelimiter" xml:space="preserve">
14571457
<value>Point (.)</value>
14581458
</data>
1459-
<data name="SortStyle_ByType" xml:space="preserve">
1460-
<value>Par type</value>
1461-
</data>
14621459
<data name="CodeExplorer_AddClassModuleText" xml:space="preserve">
14631460
<value>Module de classe (.cls)</value>
14641461
</data>
@@ -1501,9 +1498,6 @@ Tous ceux qui nous ont donné une étoile ou un "like"
15011498
<data name="CodeExplorer_Print" xml:space="preserve">
15021499
<value>Imprimer...</value>
15031500
</data>
1504-
<data name="SortStyle_ByName" xml:space="preserve">
1505-
<value>Par nom</value>
1506-
</data>
15071501
<data name="SourceControl_UndoTitle" xml:space="preserve">
15081502
<value>Contrôle des sources - annuler</value>
15091503
</data>
@@ -1752,9 +1746,6 @@ End Sub</value>
17521746
<data name="TestExplorerMenu_AddExpectedErrorTestMethod" xml:space="preserve">
17531747
<value>Méthode de test (&amp;erreur attendue)</value>
17541748
</data>
1755-
<data name="SortStyle_ByCodeOrder" xml:space="preserve">
1756-
<value>Tel que dans le module</value>
1757-
</data>
17581749
<data name="RubberduckReloadFailure_Message" xml:space="preserve">
17591750
<value>Les fenêtres ancrables n'ont probablement pas été correctement détruites, et/ou n'ont pas pu être recréées. l'environnement peut ne pas être dans un état stable. Rubberduck démerrera normalement à la prochaine initialisation du VBE.</value>
17601751
</data>
@@ -1926,4 +1917,4 @@ End Sub</value>
19261917
<data name="SettingsCaption_WindowSettings" xml:space="preserve">
19271918
<value>Paramètres des fenêtres</value>
19281919
</data>
1929-
</root>
1920+
</root>

‎RetailCoder.VBE/UI/RubberduckUI.resx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,13 +1529,13 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
15291529
<data name="CodeExplorer_Sort" xml:space="preserve">
15301530
<value>Sort</value>
15311531
</data>
1532-
<data name="SortStyle_ByName" xml:space="preserve">
1533-
<value>By name</value>
1532+
<data name="CodeExplorer_SortStyle_ByName" xml:space="preserve">
1533+
<value>by Name</value>
15341534
</data>
1535-
<data name="SortStyle_ByType" xml:space="preserve">
1536-
<value>By type</value>
1535+
<data name="CodeExplorer_SortStyle_ByType" xml:space="preserve">
1536+
<value>Group by Type</value>
15371537
</data>
1538-
<data name="SortStyle_ByCodeOrder" xml:space="preserve">
1538+
<data name="CodeExplorer_SortStyle_ByCodeOrder" xml:space="preserve">
15391539
<value>As in module</value>
15401540
</data>
15411541
<data name="TestOutcome_Ignored" xml:space="preserve">

0 commit comments

Comments
 (0)