-
-
Notifications
You must be signed in to change notification settings - Fork 517
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'refs/remotes/fluentribbon/develop' into…
… develop
- Loading branch information
Showing
67 changed files
with
2,366 additions
and
2,694 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| -- | ||
| ### Environment | ||
|
|
||
| - Fluent.Ribbon __v?.?.?__ | ||
| - Theme __?__ | ||
| - Windows __?__ | ||
| - .NET Framework __?.?__ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration> | ||
| <solution> | ||
| <add key="disableSourceControlIntegration" value="true" /> | ||
| </solution> | ||
| <packageRestore> | ||
| <add key="enabled" value="True" /> | ||
| <add key="automatic" value="True" /> | ||
| </packageRestore> | ||
| <packageSources> | ||
| <clear /> | ||
| <add key="CI.ControlzEx" value="https://ci.appveyor.com/nuget/controlzex-wfy5aam7u23j" /> | ||
| <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| </packageSources> | ||
| <activePackageSource> | ||
| <clear /> | ||
| <add key="CI.ControlzEx" value="https://ci.appveyor.com/nuget/controlzex-wfy5aam7u23j" /> | ||
| <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| </activePackageSource> | ||
| </configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,44 @@ | ||
| namespace FluentTest.ViewModels | ||
| { | ||
| public class GalleryItemViewModel | ||
| public class GalleryItemViewModel : ViewModel | ||
| { | ||
| private string text; | ||
| private string group; | ||
|
|
||
| public GalleryItemViewModel(string group, string text) | ||
| { | ||
| this.Group = group; | ||
| this.Text = text; | ||
| } | ||
|
|
||
| public string Text { get; set; } | ||
| public string Text | ||
| { | ||
| get { return this.text; } | ||
|
|
||
| set | ||
| { | ||
| if (value == this.text) | ||
| { | ||
| return; | ||
| } | ||
| this.text = value; | ||
| this.OnPropertyChanged(nameof(this.Text)); | ||
| } | ||
| } | ||
|
|
||
| public string Group { get; set; } | ||
| public string Group | ||
| { | ||
| get { return this.group; } | ||
|
|
||
| set | ||
| { | ||
| if (value == this.group) | ||
| { | ||
| return; | ||
| } | ||
| this.group = value; | ||
| this.OnPropertyChanged(nameof(this.Group)); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.