reapack

commit ccf24f84753b0dbdb330395e39d3934a458d660e
parent 0e6a47df9bbb962e0bcf65ad49fe477bce1c51c7
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Mon,  5 Jun 2017 18:16:41 -0400

import: allow multiline input

Diffstat:
M
src/import.cpp
 | 
2
+-
M
src/main.cpp
 | 
8
++++----
M
src/manager.cpp
 | 
2
+-
M
src/resource.rc
 | 
19
+++++++++----------

4 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/import.cpp b/src/import.cpp
@@ -31,7 +31,7 @@
 
 using namespace std;
 
-static const auto_char *TITLE = AUTO_STR("ReaPack: Import a repository");
+static const auto_char *TITLE = AUTO_STR("ReaPack: Import repositories");
 static const string DISCOVER_URL = "https://reapack.com/repos";
 
 Import::Import(ReaPack *reapack)
diff --git a/src/main.cpp b/src/main.cpp
@@ -92,12 +92,12 @@ static void menuHook(const char *name, HMENU handle, int f)
   menu.addAction(AUTO_STR("&Browse packages..."),
     NamedCommandLookup("_REAPACK_BROWSE"));
 
-  menu.addAction(AUTO_STR("&Import a repository..."),
-    NamedCommandLookup("_REAPACK_IMPORT"));
-
   menu.addAction(AUTO_STR("&Manage repositories..."),
     NamedCommandLookup("_REAPACK_MANAGE"));
 
+  menu.addAction(AUTO_STR("&Import repositories..."),
+    NamedCommandLookup("_REAPACK_IMPORT"));
+
   menu.addSeparator();
 
   auto_char aboutLabel[32];
@@ -149,7 +149,7 @@ static void setupActions()
   reapack->setupAction("REAPACK_BROWSE", "ReaPack: Browse packages...",
     &reapack->browseAction, bind(&ReaPack::browsePackages, reapack));
 
-  reapack->setupAction("REAPACK_IMPORT", "ReaPack: Import a repository...",
+  reapack->setupAction("REAPACK_IMPORT", "ReaPack: Import repositories...",
     &reapack->importAction, bind(&ReaPack::importRemote, reapack));
 
   reapack->setupAction("REAPACK_MANAGE", "ReaPack: Manage repositories...",
diff --git a/src/manager.cpp b/src/manager.cpp
@@ -466,7 +466,7 @@ void Manager::copyUrl()
 void Manager::importExport()
 {
   Menu menu;
-  menu.addAction(AUTO_STR("Import a &repository..."), ACTION_IMPORT_REPO);
+  menu.addAction(AUTO_STR("Import &repositories..."), ACTION_IMPORT_REPO);
   menu.addSeparator();
   menu.addAction(AUTO_STR("Import offline archive..."), ACTION_IMPORT_ARCHIVE);
   menu.addAction(AUTO_STR("&Export offline archive..."), ACTION_EXPORT_ARCHIVE);
diff --git a/src/resource.rc b/src/resource.rc
@@ -69,19 +69,18 @@ BEGIN
   DEFPUSHBUTTON "&Close", IDOK, 409, 248, 45, 14
 END
 
-IDD_IMPORT_DIALOG DIALOGEX 0, 0, 290, 69
+IDD_IMPORT_DIALOG DIALOGEX 0, 0, 290, 83
 STYLE DIALOG_STYLE
 FONT DIALOG_FONT
 BEGIN
-  GROUPBOX "Repository settings", IDC_GROUPBOX, 2, 4, 287, 41
-  RTEXT "Index URL:", IDC_LABEL, 5, 19, 50, 10
-  EDITTEXT IDC_URL, 60, 16, 220, 14, ES_AUTOHSCROLL
-  LTEXT "Type or paste the URL to a repository index in the box above.",
-    IDC_LABEL2, 60, 33, 220, 10
-  CONTROL "", IDC_PROGRESS, PROGRESS_CLASS, PBS_MARQUEE | NOT WS_VISIBLE, 10, 54, 150, 5
-  PUSHBUTTON "&Discover repositories...", IDC_DISCOVER, 5, 50, 90, 14
-  DEFPUSHBUTTON "&OK", IDOK, 201, 50, 40, 14
-  PUSHBUTTON "&Cancel", IDCANCEL, 244, 50, 40, 14
+  LTEXT "Type or paste one or more repository index URLs (one per line):",
+    IDC_LABEL, 5, 5, 280, 10
+  GROUPBOX "", IDC_GROUPBOX, 3, 9, 284, 51
+  EDITTEXT IDC_URL, 5, 18, 278, 40, WS_VSCROLL | ES_MULTILINE
+  CONTROL "", IDC_PROGRESS, PROGRESS_CLASS, PBS_MARQUEE | NOT WS_VISIBLE, 10, 68, 150, 5
+  PUSHBUTTON "&Discover repositories...", IDC_DISCOVER, 5, 64, 90, 14
+  DEFPUSHBUTTON "&OK", IDOK, 201, 64, 40, 14
+  PUSHBUTTON "&Cancel", IDCANCEL, 244, 64, 40, 14
 END
 
 IDD_BROWSER_DIALOG DIALOGEX 0, 0, 500, 250