[PATCH setup v4 5/6] Display full URLs of user sites and private mirrors

2017-12-10 Thread Ken Brown
--- site.cc | 6 ++ 1 file changed, 6 insertions(+) diff --git a/site.cc b/site.cc index 44cd114..a1a5e3f 100644 --- a/site.cc +++ b/site.cc @@ -207,6 +207,12 @@ site_list_type::site_list_type (const string &_url, idx = 0; } while (idx > 0); key += url; + if (!from_mirrors_lst)

[PATCH setup v4 3/6] Create new page UserSitePage for user URLs

2017-12-10 Thread Ken Brown
This is done in two new files, usersite.h and usersite.cc, based on site.h and site.cc. The new page is activated after the mirror selection page if IDC_ALLOW_USER_URL is checked. --- Makefile.am | 2 + main.cc | 4 + res.rc | 25 ++ resource.h | 5 ++ site.cc | 19 +++--

[PATCH setup v4 6/6] Display area and location of official mirrors

2017-12-10 Thread Ken Brown
From: Brian Inglis Mirrors from mirrors.lst have area and location info, which we now display and add to the sort key. For private mirrors, continue to display only the (full) URL, but make them sort last. Change site_list_type::operator== to compare URLs rather than keys, since the key no long

[PATCH setup v4 1/6] Use the IDD_SITE dialog for cygwin.com mirrors only

2017-12-10 Thread Ken Brown
Change wording in the dialog template to make it clear that this dialog is intended for mirrors only. Add a checkbox IDC_ALLOW_USER_URL; checking this sets a new boolean variable allow_user_url. In a future commit, this will enable a new page where the user can enter URLs for non-mirror package r

[PATCH setup v4 0/6] Distinguish between user URLs and cygwin mirrors in UI

2017-12-10 Thread Ken Brown
This is a followup to https://cygwin.com/ml/cygwin-apps/2011-04/msg00014.html, in which Jon suggested splitting site selection into two pages, one for cygwin.com mirrors (including private mirrors) and one for URLs of other package repositories. The latter would be visible only if the user had

[PATCH setup v4 4/6] Keep the mirror list sorted properly

2017-12-10 Thread Ken Brown
When site.cc:load_site_list() added a mirror whose URL was already in the list, it put the new entry in the same position as the old. Remove the old entry and merge the new one instead. --- site.cc | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/site.cc b/site.cc index

[PATCH setup v4 2/6] Use SitePage for cygwin.com mirrors only

2017-12-10 Thread Ken Brown
Add a bool member 'site_list_type::is_mirror' to indicate whether a site is a mirror (possibly private) rather than a user URL (corresponding to a non-mirror package repo). Display only mirrors in the site chooser listbox. Rename several SiteList variables to indicate that they now contain only m