diff --git a/.editorconfig b/.editorconfig index 3a8bbb3..263f643 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,4 +1,8 @@ -[*.cs] +[*] +indent_style = space +indent_size = 4 + +[*.cs] # CA1810: Initialize reference type static fields inline dotnet_diagnostic.CA1810.severity = none diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..42c2659 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.vs +/LibgenDesktop.Setup/obj +/LibgenDesktop/bin +/LibgenDesktop/obj +/packages diff --git a/LibgenDesktop/Common/Constants.cs b/LibgenDesktop/Common/Constants.cs index 1b8f9bf..3907c1c 100644 --- a/LibgenDesktop/Common/Constants.cs +++ b/LibgenDesktop/Common/Constants.cs @@ -27,6 +27,7 @@ internal static class Constants public const int NON_FICTION_GRID_AUTHORS_COLUMN_MIN_WIDTH = 150; public const int NON_FICTION_GRID_SERIES_COLUMN_MIN_WIDTH = 150; public const int NON_FICTION_GRID_YEAR_COLUMN_MIN_WIDTH = 60; + public const int NON_FICTION_GRID_IDENTIFIER_COLUMN_MIN_WIDTH = 150; public const int NON_FICTION_GRID_LANGUAGE_COLUMN_MIN_WIDTH = 150; public const int NON_FICTION_GRID_PUBLISHER_COLUMN_MIN_WIDTH = 150; public const int NON_FICTION_GRID_FORMAT_COLUMN_MIN_WIDTH = 80; @@ -95,6 +96,7 @@ internal static class Constants public const int DEFAULT_NON_FICTION_GRID_AUTHORS_COLUMN_WIDTH = 200; public const int DEFAULT_NON_FICTION_GRID_SERIES_COLUMN_WIDTH = 180; public const int DEFAULT_NON_FICTION_GRID_YEAR_COLUMN_WIDTH = 60; + public const int DEFAULT_NON_FICTION_GRID_IDENTIFIER_COLUMN_WIDTH = 180; public const int DEFAULT_NON_FICTION_GRID_LANGUAGE_COLUMN_WIDTH = 180; public const int DEFAULT_NON_FICTION_GRID_PUBLISHER_COLUMN_WIDTH = 180; public const int DEFAULT_NON_FICTION_GRID_FORMAT_COLUMN_WIDTH = 100; diff --git a/LibgenDesktop/Models/Localization/Localizators/SearchResultGrids/NonFictionSearchResultsGridColumnsLocalizator.cs b/LibgenDesktop/Models/Localization/Localizators/SearchResultGrids/NonFictionSearchResultsGridColumnsLocalizator.cs index 37a15f7..bb035ee 100644 --- a/LibgenDesktop/Models/Localization/Localizators/SearchResultGrids/NonFictionSearchResultsGridColumnsLocalizator.cs +++ b/LibgenDesktop/Models/Localization/Localizators/SearchResultGrids/NonFictionSearchResultsGridColumnsLocalizator.cs @@ -11,6 +11,7 @@ public NonFictionSearchResultsGridColumnsLocalizator(List prioritiz Authors = Format(section => section?.Authors); Series = Format(section => section?.Series); Year = Format(section => section?.Year); + Identifier = Format(section => section?.Identifier); Language = Format(section => section?.Language); Publisher = Format(section => section?.Publisher); FormatColumn = Format(section => section?.Format); @@ -23,6 +24,7 @@ public NonFictionSearchResultsGridColumnsLocalizator(List prioritiz public string Authors { get; } public string Series { get; } public string Year { get; } + public string Identifier { get; } public string Language { get; } public string Publisher { get; } public string FormatColumn { get; } diff --git a/LibgenDesktop/Models/Localization/Translation.cs b/LibgenDesktop/Models/Localization/Translation.cs index 4a8d054..8eb7951 100644 --- a/LibgenDesktop/Models/Localization/Translation.cs +++ b/LibgenDesktop/Models/Localization/Translation.cs @@ -275,6 +275,7 @@ internal class NonFictionSearchResultsGridColumnsTranslation public string Authors { get; set; } public string Series { get; set; } public string Year { get; set; } + public string Identifier { get; set; } public string Language { get; set; } public string Publisher { get; set; } public string Format { get; set; } diff --git a/LibgenDesktop/Models/Settings/AppSettings.cs b/LibgenDesktop/Models/Settings/AppSettings.cs index 165c1b3..0e020c7 100644 --- a/LibgenDesktop/Models/Settings/AppSettings.cs +++ b/LibgenDesktop/Models/Settings/AppSettings.cs @@ -100,6 +100,7 @@ public static NonFictionColumnSettings Default AuthorsColumnWidth = DEFAULT_NON_FICTION_GRID_AUTHORS_COLUMN_WIDTH, SeriesColumnWidth = DEFAULT_NON_FICTION_GRID_SERIES_COLUMN_WIDTH, YearColumnWidth = DEFAULT_NON_FICTION_GRID_YEAR_COLUMN_WIDTH, + IdentifierColumnWidth = DEFAULT_NON_FICTION_GRID_IDENTIFIER_COLUMN_WIDTH, LanguageColumnWidth = DEFAULT_NON_FICTION_GRID_LANGUAGE_COLUMN_WIDTH, PublisherColumnWidth = DEFAULT_NON_FICTION_GRID_PUBLISHER_COLUMN_WIDTH, FormatColumnWidth = DEFAULT_NON_FICTION_GRID_FORMAT_COLUMN_WIDTH, @@ -114,6 +115,7 @@ public static NonFictionColumnSettings Default public int AuthorsColumnWidth { get; set; } public int SeriesColumnWidth { get; set; } public int YearColumnWidth { get; set; } + public int IdentifierColumnWidth { get; set; } public int LanguageColumnWidth { get; set; } public int PublisherColumnWidth { get; set; } public int FormatColumnWidth { get; set; } diff --git a/LibgenDesktop/Resources/Languages/English.lng b/LibgenDesktop/Resources/Languages/English.lng index 27da70e..fda097d 100644 --- a/LibgenDesktop/Resources/Languages/English.lng +++ b/LibgenDesktop/Resources/Languages/English.lng @@ -241,6 +241,7 @@ "Authors": "Authors", "Series": "Series", "Year": "Year", + "Identifier": "Identifier", "Language": "Language", "Publisher": "Publisher", "Format": "Format", diff --git a/LibgenDesktop/Styles/Tabs/NonFictionSearchResults.xaml b/LibgenDesktop/Styles/Tabs/NonFictionSearchResults.xaml index 6f647a8..afbe286 100644 --- a/LibgenDesktop/Styles/Tabs/NonFictionSearchResults.xaml +++ b/LibgenDesktop/Styles/Tabs/NonFictionSearchResults.xaml @@ -14,6 +14,8 @@ + + + + + + + + @@ -94,6 +126,11 @@ Width="{Binding DataContext.YearColumnWidth, Source={StaticResource dataGridViewModel}, Converter={StaticResource dataGridLengthConverter}, Mode=TwoWay}" MinWidth="{Binding Source={x:Static const:Constants.NON_FICTION_GRID_YEAR_COLUMN_MIN_WIDTH}}" HeaderStyle="{StaticResource YearHeaderStyle}" ElementStyle="{StaticResource YearColumnStyle}" /> +