<rdar://problem/7292155> Control Panel name should just be "Bonjour"
authorsherscher@apple.com <sherscher@apple.com@214c2c4a-bf3b-4dcf-9390-e4dd3010487d>
Tue, 13 Oct 2009 19:42:35 +0000 (19:42 +0000)
committersherscher@apple.com <sherscher@apple.com@214c2c4a-bf3b-4dcf-9390-e4dd3010487d>
Tue, 13 Oct 2009 19:42:35 +0000 (19:42 +0000)
git-svn-id: http://svn.macosforge.org/repository/mDNSResponder/trunk@6736 214c2c4a-bf3b-4dcf-9390-e4dd3010487d

mDNSWindows/ControlPanel/ControlPanel.rc
mDNSWindows/ControlPanel/ControlPanelExe.cpp
mDNSWindows/ControlPanel/ControlPanelLocRes.rc
mDNSWindows/ControlPanel/resource.h

index 2b8412b..5a59002 100644 (file)
@@ -113,7 +113,7 @@ END
 STRINGTABLE\r
 BEGIN\r
        IDS_REINSTALL    "Bonjour Control Panel cannot run because some of its required files are missing.  Please reinstall Bonjour Control Panel."\r
-       IDS_REINSTALL_CAPTION "Bonjour Control Panel"\r
+       IDS_REINSTALL_CAPTION "Bonjour"\r
 END\r
 #endif    // English (U.S.) resources\r
 /////////////////////////////////////////////////////////////////////////////\r
index 48bd069..5391a13 100755 (executable)
@@ -49,11 +49,9 @@ DEFINE_GUID(CLSID_ControlPanel,
 0x1207552c, 0xe59, 0x4d9f, 0x85, 0x54, 0xf1, 0xf8, 0x6, 0xcd, 0x7f, 0xa9);
 
 static LPCTSTR g_controlPanelGUID                      =       TEXT( "{1207552C-0E59-4d9f-8554-F1F806CD7FA9}" );
-static LPCTSTR g_controlPanelName                      =       TEXT( "Bonjour Control Panel" );
+static LPCTSTR g_controlPanelName                      =       TEXT( "Bonjour" );
 static LPCTSTR g_controlPanelCanonicalName     =       TEXT( "Apple.Bonjour" );
 static LPCTSTR g_controlPanelCategory          =       TEXT( "3,8" );
-static LPCTSTR g_controlPanelLocalizedName     =       g_controlPanelName;
-static LPCTSTR g_controlPanelInfoTip           =       TEXT( "Configures Wide-Area Bonjour" );
 
 static CCPApp theApp;
 
@@ -289,6 +287,8 @@ CCPApp::InitInstance()
 
        if ( commandLine.m_nShellCommand == CCommandLineInfo::AppRegister )
        {
+               CString         localizedName;
+               CString         toolTip;
                TCHAR           iconPath[ MAX_PATH + 12 ]       = TEXT( "" );
                TCHAR           exePath[ MAX_PATH ]                     = TEXT( "" );
                DWORD           nChars;
@@ -302,7 +302,10 @@ CCPApp::InitInstance()
 
                wsprintf( iconPath, L"%s,-%d", exePath, IDR_APPLET );
 
-               Register( g_controlPanelGUID, g_controlPanelName, g_controlPanelCanonicalName, g_controlPanelCategory, g_controlPanelName, g_controlPanelInfoTip, iconPath, exePath );
+               localizedName.LoadString( IDS_APPLET_NAME );
+               toolTip.LoadString( IDS_APPLET_TOOLTIP );
+
+               Register( g_controlPanelGUID, g_controlPanelName, g_controlPanelCanonicalName, g_controlPanelCategory, localizedName, toolTip, iconPath, exePath );
        }
        else if ( commandLine.m_nShellCommand == CCommandLineInfo::AppUnregister )
        {
index 6db647d..5cf770e 100755 (executable)
@@ -256,7 +256,9 @@ END
 STRINGTABLE \r
 BEGIN\r
     IDR_APPLET              "Bonjour"\r
-    IDS_APPLET_DESCRIPTION  "Wide-Area Bonjour Control Panel"\r
+       IDS_APPLET_NAME                 "Bonjour"\r
+    IDS_APPLET_DESCRIPTION  "Bonjour"\r
+       IDS_APPLET_TOOLTIP              "Configures Bonjour for your computer."\r
 END\r
 \r
 #endif    // English (U.S.) resources\r
index 5870e1d..64acf2c 100644 (file)
@@ -16,6 +16,8 @@
 #define IDR_ADD_BROWSE_DOMAIN           142
 #define IDS_REINSTALL                                  143
 #define IDS_REINSTALL_CAPTION                  144
+#define IDS_APPLET_NAME                                        145
+#define IDS_APPLET_TOOLTIP                             146
 #define IDC_EDIT1                       1000
 #define IDC_BUTTON1                     1001
 #define IDC_COMBO1                      1002
@@ -41,7 +43,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        143
+#define _APS_NEXT_RESOURCE_VALUE        147
 #define _APS_NEXT_COMMAND_VALUE         32771
 #define _APS_NEXT_CONTROL_VALUE         1016
 #define _APS_NEXT_SYMED_VALUE           101