From f90ad736a9e51d2d30891aaa855fdf918fc1c4b6 Mon Sep 17 00:00:00 2001 From: opticyclic Date: Fri, 19 Jun 2015 02:40:09 -0400 Subject: [PATCH] Remove references to JSLint in the GUI --- src/OptionsDlg.cpp | 4 ++-- src/OutputDlg.cpp | 6 +++--- src/PluginDefinition.h | 2 +- src/PuppetLintNpp.rc | 23 ++++++++++++----------- src/resource.h | 3 ++- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/OptionsDlg.cpp b/src/OptionsDlg.cpp index e0b569e..a986274 100644 --- a/src/OptionsDlg.cpp +++ b/src/OptionsDlg.cpp @@ -257,7 +257,7 @@ void PuppetLintOptions::ReadOptions() std::map::iterator it; for (it = m_options.begin(); it != m_options.end(); ++it) { TCHAR szValue[256]; - GetPrivateProfileString(TEXT("JSLint Options"), it->second.name.c_str(), NULL, szValue, _countof(szValue), strConfigFileName.c_str()); + GetPrivateProfileString(TEXT("PuppetLint Options"), it->second.name.c_str(), NULL, szValue, _countof(szValue), strConfigFileName.c_str()); if (_tcscmp(szValue, TEXT("")) != 0) { tstring strValue = TrimSpaces(szValue); if (it->second.type == OPTION_TYPE_BOOL) { @@ -283,7 +283,7 @@ void PuppetLintOptions::SaveOptions() if (Path::IsFileExists(Path::GetDirectoryName(strConfigFileName))) { std::map::iterator it; for (it = m_options.begin(); it != m_options.end(); ++it) { - WritePrivateProfileString(TEXT("JSLint Options"), it->second.name.c_str(), it->second.value.c_str(), strConfigFileName.c_str()); + WritePrivateProfileString(TEXT("PuppetLint Options"), it->second.name.c_str(), it->second.value.c_str(), strConfigFileName.c_str()); } } } diff --git a/src/OutputDlg.cpp b/src/OutputDlg.cpp index f1b4f2f..5df1a85 100644 --- a/src/OutputDlg.cpp +++ b/src/OutputDlg.cpp @@ -314,11 +314,11 @@ void OutputDlg::GetNameStrFromCmd(UINT resID, LPTSTR tip, UINT count) { // NOTE: On change, keep sure to change order of IDM_EX_... in toolBarIcons also static LPTSTR szToolTip[] = { - _T("JSLint Current File"), - _T("JSLint All Files"), + _T("PuppetLint Current File"), + _T("PuppetLint All Files"), _T("Go To Previous Lint"), _T("Go To Next Lint"), - _T("JSLint Options"), + _T("PuppetLint Options"), }; _tcscpy(tip, szToolTip[resID - IDM_TB_JSLINT_CURRENT_FILE]); diff --git a/src/PluginDefinition.h b/src/PluginDefinition.h index de0cdad..77bed6e 100644 --- a/src/PluginDefinition.h +++ b/src/PluginDefinition.h @@ -24,7 +24,7 @@ // // All definitions of plugin interface // -const TCHAR NPP_PLUGIN_NAME[] = TEXT("JSLint"); +const TCHAR NPP_PLUGIN_NAME[] = TEXT("PuppetLint"); const int NB_FUNC = 9; extern NppData g_nppData; diff --git a/src/PuppetLintNpp.rc b/src/PuppetLintNpp.rc index 51c3647..fbe9a50 100644 --- a/src/PuppetLintNpp.rc +++ b/src/PuppetLintNpp.rc @@ -31,7 +31,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_OUTPUT DIALOGEX 0, 0, 316, 182 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_TOOLWINDOW -CAPTION "JSLint" +CAPTION "PuppetLint" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "",IDC_OUTPUT,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,8,302,167 @@ -39,7 +39,7 @@ END IDD_OPTIONS DIALOGEX 0, 0, 398, 272 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "JSLint Options" +CAPTION "PuppetLint Options" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "Strict white space",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,73,10 @@ -92,18 +92,19 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "About" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CTEXT "JSLint Plugin for Notepad++",IDC_STATIC,7,7,187,8 + CTEXT "PuppetLint Plugin for Notepad++",IDC_STATIC,7,7,187,8 CTEXT "Version: %s %s",IDC_VERSION_STATIC,7,17,187,8 - CTEXT "Copyright 2010 Martin Vladic",IDC_STATIC,7,27,187,8 + CTEXT "Open Source",IDC_STATIC,7,27,187,8 CONTROL "http://jslintnpp.sourceforge.net",IDC_SYSLINK1, "SysLink",WS_TABSTOP,49,37,104,14 - CTEXT "JSLint",IDC_STATIC,7,57,187,8 - CTEXT "Copyright 2002 Douglas Crockford",IDC_STATIC,7,67,187,8 - CONTROL "http://www.jslint.com",IDC_SYSLINK2, - "SysLink",WS_TABSTOP,65,76,71,14 - CTEXT "Special thanks to:",IDC_STATIC,7,97,187,8 - CTEXT "Douglas Crockford for JSLint",IDC_STATIC,7,107,187,8 + CTEXT "Based On JSLintNPP Plugin",IDC_STATIC,7,57,187,8 + CTEXT "Copyright 2010 Martin Vladic",IDC_STATIC,7,67,187,8 + CONTROL "https://github.com/rodjek/puppet-lint",IDC_SYSLINK2, + "SysLink",WS_TABSTOP,41,107,126,14 + CTEXT "Puppet Lint",IDC_STATIC,7,97,187,8 DEFPUSHBUTTON "OK",IDOK,76,127,50,14 + CONTROL "http://sourceforge.net/projects/jslintnpp",IDC_SYSLINK3, + "SysLink",WS_TABSTOP,37,78,141,14 END @@ -113,7 +114,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN IDD_OUTPUT, DIALOG BEGIN diff --git a/src/resource.h b/src/resource.h index 43df151..3a81e08 100644 --- a/src/resource.h +++ b/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by JSLintNpp.rc +// Used by PuppetLintNpp.rc // #define IDR_JSLINT 101 #define IDR_JSLINT_OUTPUT 102 @@ -54,6 +54,7 @@ #define IDC_SYSLINK1 1038 #define IDC_SYSLINK2 1039 #define IDC_TOOLBAR 1040 +#define IDC_SYSLINK3 1040 #define IDC_PREDEFINED 1041 // Next default values for new objects