Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 70cbc9d

Browse files
committed
Merge branch 'v1.3.0'
2 parents 75617ac + 91d26dd commit 70cbc9d

File tree

66 files changed

+4628
-2913
lines changed

Some content is hidden

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

66 files changed

+4628
-2913
lines changed

‎ExcelMerge.GUI/App.xaml.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Windows;
5-
using System.Threading;
65
using ExcelMerge.GUI.Commands;
76
using ExcelMerge.GUI.Settings;
87

@@ -20,9 +19,7 @@ public static void Main()
2019
{
2120
App app = new App();
2221
app.InitializeComponent();
23-
2422
app.Setting = ApplicationSetting.Load();
25-
2623
app.Setting.EnsureCulture();
2724
app.UpdateResourceCulture();
2825

@@ -107,7 +104,7 @@ public void ExecuteExternalCommand()
107104

108105
public void UpdateSetting(ApplicationSetting setting)
109106
{
110-
Setting = setting.Clone();
107+
Setting = setting.DeepClone();
111108

112109
if (OnSettingUpdated == null)
113110
OnSettingUpdated += () => { };
@@ -135,7 +132,7 @@ public void UpdateRecentFiles(string srcPath, string dstPath)
135132
updated.RemoveAt(updated.Count - 1);
136133
}
137134

138-
Setting.RecentFileSets = updated;
135+
Setting.RecentFileSets = newSystem.Collections.ObjectModel.ObservableCollection<string>(updated);
139136
Setting.Save();
140137
}
141138

‎ExcelMerge.GUI/Commands/DiffCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class DiffCommand : ICommand
99
{
1010
public static readonly List<string> DefaultEnabledExtensions = new List<string>
1111
{
12-
".xls", ".xlsx", ".csv",
12+
".xls", ".xlsx", ".csv","tsv",
1313
};
1414

1515
public CommandLineOption Option { get; }

‎ExcelMerge.GUI/ExcelMerge.GUI.csproj‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,18 @@
129129
</ItemGroup>
130130
<ItemGroup>
131131
<Compile Include="Controls\PowerShellConsole.cs" />
132+
<Compile Include="IgnoreEqualAttribute.cs" />
133+
<Compile Include="Settings\ISetting.cs" />
134+
<Compile Include="SerializableBindableBase.cs" />
135+
<Compile Include="Settings\ExternalCommandCollection.cs" />
136+
<Compile Include="Settings\FileSettingCollection.cs" />
137+
<Compile Include="Settings\Setting.cs" />
138+
<Compile Include="Settings\SettingCollection.cs" />
132139
<Compile Include="Shell\PowerShellHost.cs" />
133140
<Compile Include="Shell\PowerShellInvocation.cs" />
141+
<Compile Include="ViewModels\SettingCollectionWindowViewModelBase.cs" />
142+
<Compile Include="ViewModels\SettingEditorWindowViewModelBase.cs" />
143+
<Compile Include="Views\DiffViewEvent\DiffViewEventArgs.cs" />
134144
<Compile Include="Views\ProgressWindow.xaml.cs">
135145
<DependentUpon>ProgressWindow.xaml</DependentUpon>
136146
</Compile>
@@ -145,18 +155,16 @@
145155
<Compile Include="Commands\CommandType.cs" />
146156
<Compile Include="Commands\DiffCommand.cs" />
147157
<Compile Include="Commands\ICommand.cs" />
148-
<Compile Include="Settings\FileMatchType.cs" />
149158
<Compile Include="Settings\FileSetting.cs" />
150159
<Compile Include="ValueConverters\InverseBooleanConverter.cs" />
151160
<Compile Include="ValueConverters\PercentageConverter.cs" />
152161
<Compile Include="ViewModels\FileSettingEditorWindowViewModel.cs" />
153162
<Compile Include="ViewModels\FileSettingsWindowViewModel.cs" />
154-
<Compile Include="Views\EventDispathcer.cs" />
155-
<Compile Include="Views\EventHandler.cs" />
163+
<Compile Include="Views\DiffViewEvent\DiffViewEventDispatcher.cs" />
164+
<Compile Include="Views\DiffViewEvent\DiffViewEventHandler.cs" />
156165
<Compile Include="Exceptions\ExcelMergeException.cs" />
157-
<Compile Include="Views\EventListener.cs" />
166+
<Compile Include="Views\DiffViewEvent\DiffViewEventListener.cs" />
158167
<Compile Include="Models\DiffGridModel.cs" />
159-
<Compile Include="Models\DiffGridModelConfig.cs" />
160168
<Compile Include="Models\DiffType.cs" />
161169
<Compile Include="Settings\ApplicationSetting.cs" />
162170
<Compile Include="Settings\EMEnvironmentValue.cs" />
@@ -167,16 +175,16 @@
167175
<Compile Include="ValueConverters\FileDialogParameter.cs" />
168176
<Compile Include="ValueConverters\MultiEmptyStringConverter.cs" />
169177
<Compile Include="ValueConverters\MultiValueConverter.cs" />
170-
<Compile Include="ViewModels\CommandEditorWindowViewModel.cs" />
171-
<Compile Include="ViewModels\CommandsWindowViewModel.cs" />
178+
<Compile Include="ViewModels\ExternalCommandEditorWindowViewModel.cs" />
179+
<Compile Include="ViewModels\ExternalCommandsWindowViewModel.cs" />
172180
<Compile Include="ViewModels\DiffViewModel.cs" />
173181
<Compile Include="ViewModels\DiffExtractionSettingWindowViewModel.cs" />
174182
<Compile Include="ViewModels\MainWindowViewModel.cs" />
175-
<Compile Include="Views\CommandEditorWindow.xaml.cs">
176-
<DependentUpon>CommandEditorWindow.xaml</DependentUpon>
183+
<Compile Include="Views\ExternalCommandEditorWindow.xaml.cs">
184+
<DependentUpon>ExternalCommandEditorWindow.xaml</DependentUpon>
177185
</Compile>
178-
<Compile Include="Views\CommandsWindow.xaml.cs">
179-
<DependentUpon>CommandsWindow.xaml</DependentUpon>
186+
<Compile Include="Views\ExternalCommandsWindow.xaml.cs">
187+
<DependentUpon>ExternalCommandsWindow.xaml</DependentUpon>
180188
</Compile>
181189
<Compile Include="Views\DiffView.xaml.cs">
182190
<DependentUpon>DiffView.xaml</DependentUpon>
@@ -185,11 +193,11 @@
185193
<Generator>MSBuild:Compile</Generator>
186194
<SubType>Designer</SubType>
187195
</Page>
188-
<Page Include="Views\CommandEditorWindow.xaml">
196+
<Page Include="Views\ExternalCommandEditorWindow.xaml">
189197
<SubType>Designer</SubType>
190198
<Generator>MSBuild:Compile</Generator>
191199
</Page>
192-
<Page Include="Views\CommandsWindow.xaml">
200+
<Page Include="Views\ExternalCommandsWindow.xaml">
193201
<SubType>Designer</SubType>
194202
<Generator>MSBuild:Compile</Generator>
195203
</Page>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
using System;
2+
3+
namespace ExcelMerge.GUI
4+
{
5+
[AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
6+
public class IgnoreEqualAttribute : Attribute
7+
{
8+
}
9+
}

‎ExcelMerge.GUI/Models/DiffGridModel.cs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,19 @@ public override TooltipVisibilityMode ToolTipVisibility
5353
}
5454

5555
public int ColumnHeaderIndex { get; private set; }
56-
public int RowHeaderIndex { get; private set; }
56+
public int RowHeaderIndex { get; private set; }=-1;
5757
public DiffType DiffType { get; private set; }
5858
public ExcelSheetDiff SheetDiff { get; private set; }
59-
public DiffGridModelConfig Config { get; private set; }
6059

61-
public DiffGridModel(DiffTypetype,ExcelSheetDiff sheetDiff, DiffGridModelConfigconfig) : base()
60+
public DiffGridModel(ExcelSheetDiff sheetDiff, DiffTypetype) : base()
6261
{
63-
SheetDiff = sheetDiff;
64-
Config = config;
65-
ColumnHeaderIndex = Config.ColumnHeaderIndex;
66-
RowHeaderIndex = Config.RowHeaderIndex;
6762
DiffType = type;
63+
SheetDiff = sheetDiff;
6864

6965
columnCount = SheetDiff.Rows.Max(r => r.Value.Cells.Count);
7066
rowCount = SheetDiff.Rows.Count();
71-
72-
App.Instance.OnSettingUpdated += () => { NotifyRefresh(); };
67+
68+
App.Instance.OnSettingUpdated += () => { InvalidateAll(); };
7369
}
7470

7571
public override string GetColumnHeaderText(int column)

‎ExcelMerge.GUI/Models/DiffGridModelConfig.cs‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎ExcelMerge.GUI/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
5252
// 既定値にすることができます:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.2.4.0")]
55-
[assembly: AssemblyFileVersion("1.2.4.0")]
54+
[assembly: AssemblyVersion("1.3.0.0")]
55+
[assembly: AssemblyFileVersion("1.3.0.0")]

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /