Rename "clipboard" page to "extra settings" page

This patch is taken from VcXsrv git on sourceforge which uses the
GPLv3 license

4 files changed, 18 insertions, 17 deletions

diff --git a/main.cc b/main.cc
index db66944..bf5d80e 100644
--- a/main.cc
+++ b/main.cc
@@ -60,7 +60,7 @@ class CMyWizard : public CWizard
             AddPage(IDD_PROGRAM, IDS_PROGRAM_TITLE, IDS_PROGRAM_SUBTITLE);
             AddPage(IDD_XDMCP, IDS_XDMCP_TITLE, IDS_XDMCP_SUBTITLE);
             //AddPage(IDD_FONTPATH, IDS_FONTPATH_TITLE, IDS_FONTPATH_SUBTITLE);
-            AddPage(IDD_CLIPBOARD, IDS_CLIPBOARD_TITLE, IDS_CLIPBOARD_SUBTITLE);
+            AddPage(IDD_EXTRA, IDS_EXTRA_TITLE, IDS_EXTRA_SUBTITLE);
             AddPage(IDD_FINISH, IDS_FINISH_TITLE, IDS_FINISH_SUBTITLE);
         }
 
@@ -129,7 +129,7 @@ class CMyWizard : public CWizard
 		    } else if (IsDlgButtonChecked(hwndDlg, IDC_CLIENT_NONE))
 		    {
 			config.client = CConfig::NoClient;
-			SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CLIPBOARD);
+			SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_EXTRA);
 		    } else
 			SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
 		    return TRUE;
@@ -161,7 +161,7 @@ class CMyWizard : public CWizard
 		    if (!config.local && (config.host.empty() || config.program.empty()))
 			SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
 		    else
-			SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CLIPBOARD);
+			SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_EXTRA);
 		    return TRUE;
 		case IDD_XDMCP:
                     // Check for broadcast
@@ -190,9 +190,9 @@ class CMyWizard : public CWizard
 		    if (!config.broadcast && config.xdmcp_host.empty())
 			SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
 		    else
-			SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CLIPBOARD);
+			SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_EXTRA);
 		    return TRUE;
-                case IDD_CLIPBOARD:
+                case IDD_EXTRA:
                     // check for clipboard
                     if (IsDlgButtonChecked(hwndDlg, IDC_CLIPBOARD))
                         config.clipboard = true;
@@ -243,7 +243,8 @@ class CMyWizard : public CWizard
 		    SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CLIENTS);
 		    return TRUE;
 		case IDD_FONTPATH:
-                case IDD_CLIPBOARD: // temporary. fontpath is disabled
+                  // temporary. fontpath is disabled
+		case IDD_EXTRA:
 		    switch (config.client)
 		    {
 			case CConfig::NoClient:
@@ -293,7 +294,7 @@ class CMyWizard : public CWizard
 	    else if (idd==IDD_CLIENTS) offset = 1;
 	    else if (idd==IDD_PROGRAM) offset = 2;
 	    else if (idd==IDD_XDMCP) offset = 3;
-	    else if (idd==IDD_CLIPBOARD) offset = 4;
+	    else if (idd==IDD_EXTRA) offset = 4;
 	    else if (idd==IDD_FINISH) offset = 5;
 	    HtmlHelp(hwndDlg, "xlaunch.chm", HH_HELP_CONTEXT, 500 + offset);
 	}
@@ -465,7 +466,7 @@ class CMyWizard : public CWizard
                             // Set hostname
 			    SetDlgItemText(hwndDlg, IDC_XDMCP_HOST, config.xdmcp_host.c_str());
 			    break;
-                        case IDD_CLIPBOARD:
+                        case IDD_EXTRA:
 			    psp->dwFlags |= PSP_HASHELP;
                             CheckDlgButton(hwndDlg, IDC_CLIPBOARD, config.clipboard?BST_CHECKED:BST_UNCHECKED);
                             CheckDlgButton(hwndDlg, IDC_WGL, config.wgl?BST_CHECKED:BST_UNCHECKED);
diff --git a/resources/dialog.rc b/resources/dialog.rc
index 5369392..dafdd37 100644
--- a/resources/dialog.rc
+++ b/resources/dialog.rc
@@ -95,9 +95,9 @@ BEGIN
     LTEXT           STR_XDMCP_QUERY_DESC,IDC_XDMCP_QUERY_DESC,7,56,300,42
 END
 
-IDD_CLIPBOARD DIALOGEX 0, 0, 317, 143
+IDD_EXTRA DIALOGEX 0, 0, 317, 143
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTERMOUSE
-CAPTION STR_CAPTION_CLIPBOARD
+CAPTION STR_CAPTION_EXTRA
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     AUTOCHECKBOX    STR_CLIPBOARD,IDC_CLIPBOARD,7,14,300,10
diff --git a/resources/resources.h b/resources/resources.h
index 44d2f97..c29c940 100644
--- a/resources/resources.h
+++ b/resources/resources.h
@@ -33,7 +33,7 @@
 #define IDD_PROGRAM             104
 #define IDD_XDMCP               105
 #define IDD_FONTPATH            106
-#define IDD_CLIPBOARD           107
+#define IDD_EXTRA               107
 
 #define IDS_DISPLAY_TITLE       300
 #define IDS_DISPLAY_SUBTITLE    301
diff --git a/resources/strings.rc b/resources/strings.rc
index aeef09f..b6e6edc 100644
--- a/resources/strings.rc
+++ b/resources/strings.rc
@@ -57,7 +57,7 @@
 
 #define STR_CAPTION_FONTPATH        "Fontpath settings"
 
-#define STR_CAPTION_CLIPBOARD       "Clipboard settings"
+#define STR_CAPTION_EXTRA           "Extra settings"
 #define STR_CLIPBOARD               "Clipboard"
 #define STR_CLIPBOARD_DESC          "Start the integrated clipboard manager"
 #define STR_WGL                     "Native opengl"
@@ -81,8 +81,8 @@
 #define STR_FONTPATH_SUBTITLE       ""
 #define STR_FINISH_TITLE            "Configuration complete"
 #define STR_FINISH_SUBTITLE         ""
-#define STR_CLIPBOARD_TITLE         "Clipboard settings"
-#define STR_CLIPBOARD_SUBTITLE      ""
+#define STR_EXTRA_TITLE             "Extra settings"
+#define STR_EXTRA_SUBTITLE          ""
 
 #define STR_SAVE_TITLE              "Save configuration"
 #define STR_SAVE_FILETITLE          "Filename"
@@ -102,9 +102,9 @@ BEGIN
     IDS_FONTPATH_SUBTITLE   STR_FONTPATH_SUBTITLE
     IDS_FINISH_TITLE        STR_FINISH_TITLE
     IDS_FINISH_SUBTITLE     STR_FINISH_SUBTITLE
-    IDS_CLIPBOARD_TITLE     STR_CLIPBOARD_TITLE
-    IDS_CLIPBOARD_SUBTITLE  STR_CLIPBOARD_SUBTITLE
-    IDS_SAVE_TITLE	    STR_SAVE_TITLE
+    IDS_EXTRA_TITLE         STR_EXTRA_TITLE
+    IDS_EXTRA_SUBTITLE      STR_EXTRA_SUBTITLE
+    IDS_SAVE_TITLE          STR_SAVE_TITLE
     IDS_SAVE_FILETITLE      STR_SAVE_FILETITLE
     IDS_SAVE_FILTER         STR_SAVE_FILTER
 END