Skip to content

Commit

Permalink
Remove references to JSLint in the GUI
Browse files Browse the repository at this point in the history
  • Loading branch information
opticyclic committed Jun 19, 2015
1 parent f7186bc commit f90ad73
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 18 deletions.
4 changes: 2 additions & 2 deletions src/OptionsDlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ void PuppetLintOptions::ReadOptions()
std::map<UINT, Option>::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) {
Expand All @@ -283,7 +283,7 @@ void PuppetLintOptions::SaveOptions()
if (Path::IsFileExists(Path::GetDirectoryName(strConfigFileName))) {
std::map<UINT, Option>::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());
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/OutputDlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down
2 changes: 1 addition & 1 deletion src/PluginDefinition.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
23 changes: 12 additions & 11 deletions src/PuppetLintNpp.rc
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ 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
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
Expand Down Expand Up @@ -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 "<a href=""http://jslintnpp.sourceforge.net"">http://jslintnpp.sourceforge.net</a>",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 "<a href=""http://www.jslint.com"">http://www.jslint.com</a>",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 "<a href=""https://github.com/rodjek/puppet-lint"">https://github.com/rodjek/puppet-lint</a>",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 "<a href=""http://sourceforge.net/projects/jslintnpp"">http://sourceforge.net/projects/jslintnpp</a>",IDC_SYSLINK3,
"SysLink",WS_TABSTOP,37,78,141,14
END


Expand All @@ -113,7 +114,7 @@ END
//

#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
GUIDELINES DESIGNINFO
BEGIN
IDD_OUTPUT, DIALOG
BEGIN
Expand Down
3 changes: 2 additions & 1 deletion src/resource.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f90ad73

Please sign in to comment.