From d6192e2af6b8f822ac145231d323b7cc810366f1 Mon Sep 17 00:00:00 2001 From: Zolty Date: Sun, 24 Sep 2017 21:17:37 +0100 Subject: [PATCH] Release-ready changes. --- .../Happy Apps Core.csproj | 27 -------------- .../Program Data/Help/filtering.html | 21 ----------- .../Program Data/Help/tagfiltering.html | 35 ------------------ .../Program Data/Help/traitfiltering.html | 36 ------------------- HappySearchObjectClasses/VNDatabaseFile.cs | 1 + Visual Novel Database/FormMain.Designer.cs | 8 ++--- Visual Novel Database/Happy Search.csproj | 27 ++++++++++++++ .../Default Files/defaultfilters.json | 0 .../Program Data/Help/StyleSheet1.css | 0 .../Program Data/Help/favoriteproducers.html | 0 .../Program Data/Help/filtering.html | 29 +++++++++++++++ .../Program Data/Help/getstarted.html | 0 .../Help/listingandsearching.html | 0 .../Program Data/Help/listresults.html | 0 14 files changed, 61 insertions(+), 123 deletions(-) delete mode 100644 HappySearchObjectClasses/Program Data/Help/filtering.html delete mode 100644 HappySearchObjectClasses/Program Data/Help/tagfiltering.html delete mode 100644 HappySearchObjectClasses/Program Data/Help/traitfiltering.html rename {HappySearchObjectClasses => Visual Novel Database}/Program Data/Default Files/defaultfilters.json (100%) rename {HappySearchObjectClasses => Visual Novel Database}/Program Data/Help/StyleSheet1.css (100%) rename {HappySearchObjectClasses => Visual Novel Database}/Program Data/Help/favoriteproducers.html (100%) create mode 100644 Visual Novel Database/Program Data/Help/filtering.html rename {HappySearchObjectClasses => Visual Novel Database}/Program Data/Help/getstarted.html (100%) rename {HappySearchObjectClasses => Visual Novel Database}/Program Data/Help/listingandsearching.html (100%) rename {HappySearchObjectClasses => Visual Novel Database}/Program Data/Help/listresults.html (100%) diff --git a/HappySearchObjectClasses/Happy Apps Core.csproj b/HappySearchObjectClasses/Happy Apps Core.csproj index 917fa98..9164a1f 100644 --- a/HappySearchObjectClasses/Happy Apps Core.csproj +++ b/HappySearchObjectClasses/Happy Apps Core.csproj @@ -161,9 +161,6 @@ Always - - PreserveNewest - Always @@ -365,30 +362,6 @@ PreserveNewest - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - diff --git a/HappySearchObjectClasses/Program Data/Help/filtering.html b/HappySearchObjectClasses/Program Data/Help/filtering.html deleted file mode 100644 index ef0db40..0000000 --- a/HappySearchObjectClasses/Program Data/Help/filtering.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - Help - Filtering - - - -

Filtering

-

This section can be used to filter the results in the main tab:

-
    -
  • Each filter can be toggled on or off and you can save the combination of filters to be used later (These groupings of filters are called Custom Filters).
    • -
  • Each filter can also be marked as 'Fixed' which means that it will not change when a Custom Filter is selected.
    - This is useful if there are filters which you want to be on at all times (such as hide blacklisted items).
    • -
  • On the filters which have multiple possible options (such as Userlist), you can select a single option by double clicking it,
    - so you don't have to deselect each other option.
    • -
  • You can also switch between 'Tags AND Traits' mode and 'Tags OR Traits' mode, depending on your preference.
    • -
  • Information on tags and traits filtering is available in each section respectively.
    • -
- - diff --git a/HappySearchObjectClasses/Program Data/Help/tagfiltering.html b/HappySearchObjectClasses/Program Data/Help/tagfiltering.html deleted file mode 100644 index f38627a..0000000 --- a/HappySearchObjectClasses/Program Data/Help/tagfiltering.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Help - Tag Filtering - - - -

Tag Filtering

-

This section can be used to filter the Visual Novel list by tags:

-
    -
  • The big box contains the list of tags in the filter.
    • -
  • You can add tags by using the Tag Search Box described below.
    • -
  • You can save and manipulate custom tag filters with the buttons on the right.
    • -
-

Buttons and Boxes

-

Tag Search Box

-

- You can type the name/alias of a tag here and hit enter or click on a suggestion to add it as a filter.
- If tag entered has exactly the same name (not alias) as an existent tag, or only one tag is found, that tag is added, otherwise, a list of results will be shown.
- You can click a tag in the results list to add it or click anywhere else in the Tag Filtering section to hide the results.
- Example: Entering 'protagonist' and pressing enter will add Protagonist to active list of tags, if instead, you wish to search for all tags with 'protagonist' in the name/alias, you can click the 'S' button to the right. -

-

Custom Filter Name Box

-

If you wish to save the list of active filters, type a name here and hit Save Filter or press enter.

-

Save Filter

-

Save the list of active tag filters as a custom tag filter.

-

Delete Filter

-

Delete the active custom tag filter.

-

Clear Filter

-

Clear the list of active tag filters (does not modify custom tag filters).

-

Update Filter

-

Get all VNs that match the list of active tag filters which were not already in local database, if '10 Year Limit' is enabled, only titles released in the last 10 years will be fetched.

- - diff --git a/HappySearchObjectClasses/Program Data/Help/traitfiltering.html b/HappySearchObjectClasses/Program Data/Help/traitfiltering.html deleted file mode 100644 index c72b7a4..0000000 --- a/HappySearchObjectClasses/Program Data/Help/traitfiltering.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - - Help - Trait Filtering - - - -

Trait Filtering

-

This section can be used to filter the Visual Novel list by traits in the title's characters:

-
    -
  • The big box contains the list of traits in the filter.
    • -
  • You can add traits to the list using the Type Dropdown List and Search Box, described below.
    • -
  • You can save and manipulate custom trait filters with the buttons on the right.
    • -
  • Note that the filtering doesn't require that a single character has all the traits, just that the combination of all the title's characters has all the traits.
    - (An option may be added to allow for both types of operation in the future) -
    • -
-

Buttons and Boxes

-

Trait Type Dropdown List

-

Use this to select the type of trait to be added to the list of filters.

-

Trait Search Box

-

You can type the name/alias of a trait here and hit enter or click on a suggestion to add it as a filter.
- If a trait exists with the name entered for the selected trait type, or only one trait is found, it will be added, otherwise, a list of results is shown.
- You can click a trait in the results list to add it or click anywhere else in the Trait Filtering section to hide the results.
- Example: Selecting Hair type, typing 'green' and pressing enter will add 'Hair > Green' to active list of traits, if instead, you wish to search for all traits with 'green' in the name/alias, you can click the 'S' button to the right.

-

Custom Filter Name Box

-

If you wish to save the list of active trait filters, type a name here and hit Save Filter or press enter.

-

Save Filter

-

Save the list of active filters as a custom trait filter.

-

Delete Filter

-

Delete the active custom trait filter.

-

Clear Filter

-

Clear the list of active filters (does not modify custom trait filters).

- - diff --git a/HappySearchObjectClasses/VNDatabaseFile.cs b/HappySearchObjectClasses/VNDatabaseFile.cs index 12d0dda..41db6aa 100644 --- a/HappySearchObjectClasses/VNDatabaseFile.cs +++ b/HappySearchObjectClasses/VNDatabaseFile.cs @@ -257,6 +257,7 @@ private void CreateVNListTable() `Anime` TEXT, `Aliases` TEXT, `Languages` TEXT, +`DateFullyUpdated` DATE, PRIMARY KEY(`VNID`), FOREIGN KEY(`ProducerID`) REFERENCES `ProducerID` )"; var command = new SQLiteCommand(createCommand, Conn); diff --git a/Visual Novel Database/FormMain.Designer.cs b/Visual Novel Database/FormMain.Designer.cs index 214e4c5..96a021f 100644 --- a/Visual Novel Database/FormMain.Designer.cs +++ b/Visual Novel Database/FormMain.Designer.cs @@ -428,9 +428,9 @@ private void InitializeComponent() this.GetStartedHelpButton.FlatAppearance.BorderSize = 0; this.GetStartedHelpButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.GetStartedHelpButton.ForeColor = System.Drawing.SystemColors.ControlText; - this.GetStartedHelpButton.Location = new System.Drawing.Point(3, 242); + this.GetStartedHelpButton.Location = new System.Drawing.Point(3, 212); this.GetStartedHelpButton.Name = "GetStartedHelpButton"; - this.GetStartedHelpButton.Size = new System.Drawing.Size(123, 23); + this.GetStartedHelpButton.Size = new System.Drawing.Size(176, 23); this.GetStartedHelpButton.TabIndex = 89; this.GetStartedHelpButton.Text = "Get Started"; this.toolTip.SetToolTip(this.GetStartedHelpButton, "Help for getting started."); @@ -1535,10 +1535,10 @@ private void InitializeComponent() // panel1 // this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.GetStartedHelpButton); this.panel1.Controls.Add(this.button1); this.panel1.Controls.Add(this.otherMethodsCB); this.panel1.Controls.Add(this.yearLimitBox); - this.panel1.Controls.Add(this.GetStartedHelpButton); this.panel1.Controls.Add(this.autoUpdateURTBox); this.panel1.Controls.Add(this.updateTagsAndTraitsButton); this.panel1.Controls.Add(this.nsfwToggle); @@ -1615,7 +1615,7 @@ private void InitializeComponent() // this.userListReply.Location = new System.Drawing.Point(3, 172); this.userListReply.Name = "userListReply"; - this.userListReply.Size = new System.Drawing.Size(175, 63); + this.userListReply.Size = new System.Drawing.Size(176, 37); this.userListReply.TabIndex = 28; this.userListReply.Text = "(userListReply)"; this.userListReply.TextAlign = System.Drawing.ContentAlignment.TopCenter; diff --git a/Visual Novel Database/Happy Search.csproj b/Visual Novel Database/Happy Search.csproj index 9d0ea85..062a6cf 100644 --- a/Visual Novel Database/Happy Search.csproj +++ b/Visual Novel Database/Happy Search.csproj @@ -248,10 +248,37 @@ + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + diff --git a/HappySearchObjectClasses/Program Data/Default Files/defaultfilters.json b/Visual Novel Database/Program Data/Default Files/defaultfilters.json similarity index 100% rename from HappySearchObjectClasses/Program Data/Default Files/defaultfilters.json rename to Visual Novel Database/Program Data/Default Files/defaultfilters.json diff --git a/HappySearchObjectClasses/Program Data/Help/StyleSheet1.css b/Visual Novel Database/Program Data/Help/StyleSheet1.css similarity index 100% rename from HappySearchObjectClasses/Program Data/Help/StyleSheet1.css rename to Visual Novel Database/Program Data/Help/StyleSheet1.css diff --git a/HappySearchObjectClasses/Program Data/Help/favoriteproducers.html b/Visual Novel Database/Program Data/Help/favoriteproducers.html similarity index 100% rename from HappySearchObjectClasses/Program Data/Help/favoriteproducers.html rename to Visual Novel Database/Program Data/Help/favoriteproducers.html diff --git a/Visual Novel Database/Program Data/Help/filtering.html b/Visual Novel Database/Program Data/Help/filtering.html new file mode 100644 index 0000000..94fe9e9 --- /dev/null +++ b/Visual Novel Database/Program Data/Help/filtering.html @@ -0,0 +1,29 @@ + + + + + Help - Filtering + + + +

Filtering

+

+ This section can be used to filter the results in the main tab.
+ Select the type of filter and then the value, then click the Add Filter button to add it to the current custom filter, or Add Permanent Filter to add it to the permanent filter. +

+

Permanent Filters

+

+ Filters added to this section will persist regardless of Custom Filter selected, an example of how this is useful is to always hide blacklisted titles, or exclude titles in certain languages.
+ This is saved to file. +

+

Custom Filter

+

A custom filter is a selection of filters which can be saved to file, these filters can be quickly changed in this tab and in the main tab.

+

Other Information

+
    +
  • You can add any amount of filters to permanent and custom sections.
    • +
  • Each filter can be positive or negative (Include/Exclude).
    • +
  • Filters are added by default to the AND group, which means titles must meet the filter's criteria.
    • +
  • Optionally, a filter can be added to the OR group, which means titles must meet the criteria of at least one of the filters in the OR group.
    • +
+ + diff --git a/HappySearchObjectClasses/Program Data/Help/getstarted.html b/Visual Novel Database/Program Data/Help/getstarted.html similarity index 100% rename from HappySearchObjectClasses/Program Data/Help/getstarted.html rename to Visual Novel Database/Program Data/Help/getstarted.html diff --git a/HappySearchObjectClasses/Program Data/Help/listingandsearching.html b/Visual Novel Database/Program Data/Help/listingandsearching.html similarity index 100% rename from HappySearchObjectClasses/Program Data/Help/listingandsearching.html rename to Visual Novel Database/Program Data/Help/listingandsearching.html diff --git a/HappySearchObjectClasses/Program Data/Help/listresults.html b/Visual Novel Database/Program Data/Help/listresults.html similarity index 100% rename from HappySearchObjectClasses/Program Data/Help/listresults.html rename to Visual Novel Database/Program Data/Help/listresults.html