| Index: remoting/host/win/core.rc
|
| diff --git a/remoting/host/host_ui.rc b/remoting/host/win/core.rc
|
| similarity index 57%
|
| rename from remoting/host/host_ui.rc
|
| rename to remoting/host/win/core.rc
|
| index d1e2d5ae21d6e63503f0398ba40186a31a05c5b3..ac7ca69954ffa6af3232394a1650a336e57a675a 100644
|
| --- a/remoting/host/host_ui.rc
|
| +++ b/remoting/host/win/core.rc
|
| @@ -1,13 +1,13 @@
|
| // Microsoft Visual C++ generated resource script.
|
| //
|
| -#include "host_ui_resource.h"
|
| +#include "core_resource.h"
|
|
|
| #define APSTUDIO_READONLY_SYMBOLS
|
| /////////////////////////////////////////////////////////////////////////////
|
| //
|
| // Generated from the TEXTINCLUDE 2 resource.
|
| //
|
| -#include "winres.h"
|
| +#include "afxres.h"
|
|
|
| /////////////////////////////////////////////////////////////////////////////
|
| #undef APSTUDIO_READONLY_SYMBOLS
|
| @@ -21,31 +21,49 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
| #pragma code_page(1252)
|
| #endif //_WIN32
|
|
|
| -#ifdef APSTUDIO_INVOKED
|
| +// Embedded type library.
|
| +1 typelib "remoting/host/elevated_controller.tlb"
|
| +
|
| /////////////////////////////////////////////////////////////////////////////
|
| //
|
| -// TEXTINCLUDE
|
| +// String Table
|
| //
|
|
|
| -1 TEXTINCLUDE
|
| +STRINGTABLE
|
| BEGIN
|
| - "host_ui_resource.h\0"
|
| +#ifdef OFFICIAL_BUILD
|
| + IDS_DISPLAY_SERVICE_NAME "Chrome Remote Desktop Service"
|
| + IDS_SERVICE_DESCRIPTION "This service enables incoming connections from Chrome Remote Desktop clients."
|
| + IDS_CONTROLLER "Chrome Remote Desktop Host Controller"
|
| +#else
|
| + IDS_DISPLAY_SERVICE_NAME "Chromoting Service"
|
| + IDS_SERVICE_DESCRIPTION "This service enables incoming connections from Chromoting clients."
|
| + IDS_CONTROLLER "Chromoting Host Controller"
|
| +#endif
|
| END
|
|
|
| -2 TEXTINCLUDE
|
| -BEGIN
|
| - "#include ""winres.h""\r\n"
|
| - "\0"
|
| -END
|
| -
|
| -#endif // APSTUDIO_INVOKED
|
| -
|
| +IDD_VERIFY_CONFIG_DIALOG ICON "remoting/resources/chromoting.ico"
|
|
|
| /////////////////////////////////////////////////////////////////////////////
|
| //
|
| // Dialog
|
| //
|
|
|
| +IDD_VERIFY_CONFIG_DIALOG DIALOGEX 0, 0, 221, 106
|
| +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_CAPTION
|
| +EXSTYLE 0
|
| +CAPTION "kTitle"
|
| +FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
| +BEGIN
|
| + LTEXT "kConfirmConfigChange",IDC_MESSAGE,7,7,207,30
|
| + LTEXT "kAccount",IDC_EMAIL_LABEL,7,38,50,30
|
| + LTEXT "kEmail",IDC_EMAIL,60,38,110,30
|
| + LTEXT "kPin",IDC_PIN_LABEL,7,55,50,30
|
| + EDITTEXT IDC_PIN,60,55,100,15,WS_TABSTOP | ES_PASSWORD | ES_NUMBER
|
| + DEFPUSHBUTTON "kOK",IDOK,68,86,68,14,WS_TABSTOP
|
| + PUSHBUTTON "kCancel",IDCANCEL,146,86,68,14,WS_TABSTOP
|
| +END
|
| +
|
| IDD_DISCONNECT DIALOGEX 0, 0, 145, 24
|
| STYLE DS_SETFONT | WS_POPUP
|
| EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW
|
| @@ -68,33 +86,5 @@ BEGIN
|
| PUSHBUTTON "kCancel",IDC_CONTINUE_CANCEL,7,38,98,14
|
| END
|
|
|
| -
|
| -/////////////////////////////////////////////////////////////////////////////
|
| -//
|
| -// DESIGNINFO
|
| -//
|
| -
|
| -#ifdef APSTUDIO_INVOKED
|
| -GUIDELINES DESIGNINFO
|
| -BEGIN
|
| - IDD_DISCONNECT, DIALOG
|
| - BEGIN
|
| - VERTGUIDE, 20
|
| - BOTTOMMARGIN, 23
|
| - END
|
| -
|
| - IDD_CONTINUE, DIALOG
|
| - BEGIN
|
| - LEFTMARGIN, 7
|
| - RIGHTMARGIN, 214
|
| - VERTGUIDE, 105
|
| - VERTGUIDE, 116
|
| - VERTGUIDE, 203
|
| - TOPMARGIN, 7
|
| - BOTTOMMARGIN, 52
|
| - END
|
| -END
|
| -#endif // APSTUDIO_INVOKED
|
| -
|
| #endif // English (U.S.) resources
|
| /////////////////////////////////////////////////////////////////////////////
|
|
|