Commit 1291be2b by Ken Herbert

Update to 2.3.0

parent c93fbff9
///-----------------------------------------------------------------
///
/// @file CheckForUpdatesThread.cpp
/// @author Firedancer Software
/// Created: 3/05/2012 12:31:08 PM
/// @section DESCRIPTION
/// CheckForUpdatesThread class implementation
///
///------------------------------------------------------------------
#define _WIN32_WINNT 0x501
#include "Objects/MingW/IPFinder_private.h"
#include "CheckForUpdatesThread.h"
......@@ -43,7 +53,7 @@ void* CheckForUpdatesThread::Entry()
wxStringTokenizer tokenizer(res, "\n");
wxString product;
product << PRODUCT_NAME << "=";
product << INTERNAL_NAME << "=";
wxString dbVersion;
......@@ -58,23 +68,16 @@ void* CheckForUpdatesThread::Entry()
break;
}
}
if(dbVersion == "" && !b_CheckSilently)
if(dbVersion == "")
{
wxMessageBox("Unable to access the update database.\n Please try again.", "Error", wxICON_ERROR | wxOK);
if(!b_CheckSilently)
{
wxMessageBox("Unable to access the update database.\n Please try again.", "Error", wxICON_ERROR | wxOK);
}
}
else
{
if(dbVersion.IsSameAs(PRODUCT_VERSION))
{
if(!b_CheckSilently)
{
wxMessageBox("No new versions available.", "No New Updates", wxOK);
}
// evt.SetString("false");
// wxPostEvent(m_pParent, evt);
// return 0;
}
else
if(dbVersion.Cmp(PRODUCT_VERSION) > 0)
{
wxString output;
output << PRODUCT_NAME << " " << dbVersion << " is now available to download.\n";
......@@ -85,9 +88,13 @@ void* CheckForUpdatesThread::Entry()
{
wxLaunchDefaultBrowser(wxT("http://firedancer-software.com/software/ipfinder"));
}
// evt.SetString(version);
// wxPostEvent(m_pParent, evt);
// return 0;
}
else
{
if(!b_CheckSilently)
{
wxMessageBox("No new versions available.", "No New Updates", wxOK);
}
}
}
wxDELETE(stream);
......
///-----------------------------------------------------------------
///
/// @file CheckForUpdatesThread.cpp
/// @author Firedancer Software
/// Created: 3/05/2012 12:31:08 PM
/// @section DESCRIPTION
/// CheckForUpdatesThread class declaration
///
///------------------------------------------------------------------
#ifndef CHECKFORUPDATESTHREAD_H
#define CHECKFORUPDATESTHREAD_H
......
......@@ -12,20 +12,20 @@ Folders=
[VersionInfo]
Major=2
Minor=2
Minor=3
Release=0
Build=976
Build=1106
LanguageID=1033
CharsetID=1252
CompanyName=Firedancer Software
FileVersion=2.2.0
FileDescription=IPFinder
FileVersion=2.3.0
FileDescription=Resolve domain names to IP addresses
InternalName=IPFinder
LegalCopyright=2013 Firedancer Software
LegalTrademarks=
OriginalFilename=IPFinder.exe
ProductName=IPFinder
ProductVersion=2.2.0
ProductVersion=2.3.0
AutoIncBuildNrOnRebuild=0
AutoIncBuildNrOnCompile=1
UnitCount=11
......@@ -40,7 +40,7 @@ ResourceIncludes=
MakeIncludes=
Compiler=
CppCompiler=
Linker=-mwindows_@@_-l$(WXLIBNAME)_@@_-l$(WXLIBNAME)_gl_@@_-lwxscintilla_@@_-lwxtiff_@@_-lwxjpeg_@@_-lwxpng_@@_-lwxzlib_@@_-lwxregexu_@@_-lwxexpat_@@_-lkernel32_@@_-luser32_@@_-lgdi32_@@_-lcomdlg32_@@_-lwinspool_@@_-lwinmm_@@_-lshell32_@@_-lcomctl32_@@_-lole32_@@_-loleaut32_@@_-luuid_@@_-lrpcrt4_@@_-ladvapi32_@@_-lwsock32_@@_-lodbc32_@@_-lopengl32_@@_"C:/Program Files/Dev-Cpp/MinGW32/lib/libws2_32.a"_@@_
Linker=-mwindows_@@_-l$(WXLIBNAME)_@@_-l$(WXLIBNAME)_gl_@@_-lwxscintilla_@@_-lwxtiff_@@_-lwxjpeg_@@_-lwxpng_@@_-lwxzlib_@@_-lwxregexu_@@_-lwxexpat_@@_-lkernel32_@@_-luser32_@@_-lgdi32_@@_-lcomdlg32_@@_-lwinspool_@@_-lwinmm_@@_-lshell32_@@_-lcomctl32_@@_-lole32_@@_-loleaut32_@@_-luuid_@@_-lrpcrt4_@@_-ladvapi32_@@_-lwsock32_@@_-lodbc32_@@_-lopengl32_@@_"C:\Program Files (x86)\Dev-Cpp\MinGW32\lib\libws2_32.a"_@@_
PreprocDefines=__WXMSW___@@___GNUWIN32___@@__UNICODE_@@_
CompilerSettings=0000000001001001000000
Icon=IPFinder.ico
......@@ -66,8 +66,8 @@ Includes=
Libs=
ResourceIncludes=
MakeIncludes=
Compiler=/MD
CppCompiler=/MD
Compiler=/MD_@@_
CppCompiler=/MD_@@_
Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_
PreprocDefines=_@@_
CompilerSettings=000000000000010000000000000000000000
......@@ -76,12 +76,12 @@ ExeOutput=Output\Visual C++
ImagesOutput=Images\
ObjectOutput=Objects\Visual C++
OverrideOutput=0
OverrideOutputName=
OverrideOutputName=IPFinder.exe
HostApplication=
CommandLine=
UseCustomMakefile=0
CustomMakefile=
IncludeVersionInfo=0
IncludeVersionInfo=1
SupportXPThemes=0
CompilerSet=9
CompilerType=9
......@@ -155,8 +155,8 @@ OverrideBuildCmd=0
BuildCmd=
CompileCpp=1
[Unit10]
FileName=StandardTextCtrl.cpp
[Unit8]
FileName=CheckForUpdatesThread.h
CompileCpp=1
Folder=IPFinder
Compile=1
......@@ -165,8 +165,8 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=
[Unit8]
FileName=CheckForUpdatesThread.h
[Unit9]
FileName=CheckForUpdatesThread.cpp
CompileCpp=1
Folder=IPFinder
Compile=1
......@@ -175,8 +175,8 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=
[Unit9]
FileName=CheckForUpdatesThread.cpp
[Unit10]
FileName=StandardTextCtrl.cpp
CompileCpp=1
Folder=IPFinder
Compile=1
......
......@@ -4,22 +4,22 @@ Order=0,1,2,3,4,5
[Editor_0]
Open=1
Top=0
CursorCol=1
CursorRow=12
TopLine=1
CursorCol=46
CursorRow=7
TopLine=5
LeftChar=1
[Editor_1]
Open=1
Top=0
CursorCol=1
CursorRow=11
TopLine=1
CursorCol=39
CursorRow=39
TopLine=18
LeftChar=1
[Editor_2]
Open=1
Top=0
CursorCol=29
CursorRow=30
CursorCol=1
CursorRow=10
TopLine=1
LeftChar=1
[Editor_3]
......@@ -32,40 +32,40 @@ LeftChar=1
[Editor_4]
Open=1
Top=0
CursorCol=110
CursorRow=123
TopLine=94
CursorCol=51
CursorRow=332
TopLine=324
LeftChar=1
[Editor_5]
Open=1
Top=1
CursorCol=17
CursorRow=96
TopLine=1
CursorCol=22
CursorRow=155
TopLine=131
LeftChar=1
[Editor_6]
CursorCol=3
CursorRow=121
CursorCol=1
CursorRow=1
TopLine=1
LeftChar=1
[Editor_7]
CursorCol=1
CursorRow=3
CursorRow=10
TopLine=1
LeftChar=1
[Editor_8]
CursorCol=1
CursorRow=133
TopLine=88
CursorRow=80
TopLine=1
LeftChar=1
[Editor_9]
CursorCol=15
CursorRow=13
CursorCol=1
CursorRow=1
TopLine=1
LeftChar=1
[Editor_10]
CursorCol=1
CursorRow=20
CursorCol=34
CursorRow=3
TopLine=1
LeftChar=1
[Editor_11]
......
//---------------------------------------------------------------------------
//
// Name: IPFinderApp.cpp
// Author: Ken Herbert
// Created: 3/05/2012 12:31:07 PM
// Description:
//
//---------------------------------------------------------------------------
///-----------------------------------------------------------------
///
/// @file IPFinderApp.cpp
/// @author Firedancer Software
/// Created: 3/05/2012 12:31:08 PM
/// @section DESCRIPTION
/// IPFinderApp class implementation
///
///------------------------------------------------------------------
#include "IPFinderApp.h"
#include "IPFinderFrm.h"
#include <wx/stdpaths.h>
#include <wx/filefn.h>
#include <wx/protocol/http.h>
IMPLEMENT_APP(IPFinderFrmApp)
......@@ -25,18 +28,27 @@ bool IPFinderFrmApp::OnInit()
return 0;
}
wxHTTP::Initialize();
wxString appPath = wxStandardPaths::Get().GetExecutablePath();
defaultExportPath = wxPathOnly(appPath);
parser.Found(wxT("e"), &defaultExportPath);
// defaultConfigPath = wxPathOnly(appPath);
// parser.Found(wxT("c"), &defaultConfigPath);
wxString pAppsPath;
if(parser.Found(wxT("portableappspath"), &pAppsPath) && wxDirExists(pAppsPath))
{
portableAppsPath = pAppsPath;
}
IPFinderFrm* frame = new IPFinderFrm(defaultExportPath);
SetTopWindow(frame);
IPFinderFrm* frame = new IPFinderFrm(defaultConfigPath, defaultExportPath, portableAppsPath);
SetTopWindow(frame);
frame->SetIcon(wxICON(appicon));
frame->Show();
return true;
frame->SetIcon(wxICON(appicon));
frame->Show();
return true;
}
int IPFinderFrmApp::OnExit()
......
//---------------------------------------------------------------------------
//
// Name: IPFinderApp.h
// Author: Ken Herbert
// Created: 3/05/2012 12:31:07 PM
// Description:
//
//---------------------------------------------------------------------------
///-----------------------------------------------------------------
///
/// @file IPFinderApp.h
/// @author Firedancer Software
/// Created: 3/05/2012 12:31:07 PM
/// @section DESCRIPTION
/// IPFinderApp class declaration
///
///------------------------------------------------------------------
#ifndef __IPFINDERFRMApp_h__
#define __IPFINDERFRMApp_h__
......@@ -28,6 +29,8 @@ class IPFinderFrmApp : public wxApp
bool OnInit();
wxCmdLineParser parser;
wxString defaultExportPath;
wxString defaultConfigPath;
wxString portableAppsPath;
int OnExit();
};
......@@ -35,7 +38,11 @@ static const wxCmdLineEntryDesc g_cmdLineDesc [] =
{
{ wxCMD_LINE_SWITCH, "h", "help", "Displays help on the command line parameters",
wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
{ wxCMD_LINE_OPTION, "e", "exportpath", "The default location to save exported logs.",
{ wxCMD_LINE_OPTION, "e", "exportpath", "The default location to save exported logs",
wxCMD_LINE_VAL_STRING, wxCMD_LINE_NEEDS_SEPARATOR },
// { wxCMD_LINE_OPTION, "c", "configpath", "The location of the config file",
// wxCMD_LINE_VAL_STRING, wxCMD_LINE_NEEDS_SEPARATOR },
{ wxCMD_LINE_OPTION, "portableappspath", "portableappspath", "The location of the PortableApps directory",
wxCMD_LINE_VAL_STRING, wxCMD_LINE_NEEDS_SEPARATOR },
{ wxCMD_LINE_NONE }
};
......
//---------------------------------------------------------------------------
//
// Name: IPFinderApp.rc
// Author: Ken Herbert
// Created: 3/05/2012 12:31:07 PM
// Description:
//
//---------------------------------------------------------------------------
///-----------------------------------------------------------------
///
/// @file IPFinderApp.rc
/// @author Firedancer Software
/// Created: 3/05/2012 12:31:07 PM
/// @section DESCRIPTION
/// IPFinderApp resource file
///
///------------------------------------------------------------------
appIcon ICON "appicon.ico"
#include <wx/msw/wx.rc>
......@@ -45,13 +45,13 @@ class IPFinderFrm : public wxFrame
void WxButton2Click(wxCommandEvent& event);
public:
IPFinderFrm(wxString defaultExportPath, wxWindow *parent = NULL, wxWindowID id = 1, const wxString &title = wxT("IPFinder"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = IPFinderFrm_STYLE);
IPFinderFrm(wxString defaultConfigPath, wxString defaultExportPath, wxString portableAppsPath, wxWindow *parent = NULL, wxWindowID id = 1, const wxString &title = wxT("IPFinder"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = IPFinderFrm_STYLE);
virtual ~IPFinderFrm();
void Mnuwebsite1004Click(wxCommandEvent& event);
void Mnuupdate1006Click(wxCommandEvent& event);
void Mnuexit1002Click(wxCommandEvent& event);
void Mnuabout1005Click(wxCommandEvent& event);
// void MnuSaveClick(wxCommandEvent& event);
void MnuwebsiteClick(wxCommandEvent& event);
void MnuupdateClick(wxCommandEvent& event);
void MnuexitClick(wxCommandEvent& event);
void MnuaboutClick(wxCommandEvent& event);
void MnuSaveClick(wxCommandEvent& event);
void WxButtonLookupClick(wxCommandEvent& event);
void DomainLookup(wxString domainName);
void OnLookupThread(wxCommandEvent& event);
......@@ -61,16 +61,17 @@ class IPFinderFrm : public wxFrame
void WxButtonCopyClipboardClick(wxCommandEvent& event);
void WxTreeCtrlOnContextMenu(wxTreeEvent& event);
void WxsaveClick(wxCommandEvent& event);
void Mnuexpandall1100Click(wxCommandEvent& event);
void Mnuexpand1103Click(wxCommandEvent& event);
void Mnucollapseall1101Click(wxCommandEvent& event);
void Mnucollapse1104Click(wxCommandEvent& event);
void Mnulaunch1105Click(wxCommandEvent& event);
void Mnucopy1106Click(wxCommandEvent& event);
void Mnuremove1102Click(wxCommandEvent& event);
void MnuexpandallClick(wxCommandEvent& event);
void MnuexpandClick(wxCommandEvent& event);
void MnucollapseallClick(wxCommandEvent& event);
void MnucollapseClick(wxCommandEvent& event);
void MnulaunchClick(wxCommandEvent& event);
void MnucopyClick(wxCommandEvent& event);
void MnuremoveClick(wxCommandEvent& event);
void HandleButtonLookupState(wxCommandEvent& event);
void OnCheckUpdateThread(wxCommandEvent& event);
void OnContextMenu(wxContextMenuEvent& event);
// void KeyboardBinding(wxKeyEvent& event);
void CheckForUpdates(bool bCheckSilently);
wxString GetFormattedResults();
private:
......@@ -94,6 +95,7 @@ class IPFinderFrm : public wxFrame
// wxMenu *WxPopupMenu1;
wxMenu *WxTextCtrlPopupMenu;
wxMenu *WxTreeCtrlPopupMenu;
wxMenu *WxOpenWithSubMenu;
StandardTextCtrl *WxEdit1;
private:
......@@ -113,20 +115,17 @@ class IPFinderFrm : public wxFrame
ID_WXPANEL2 = 1035,
ID_WXPANEL1 = 1098,
ID_MNU_FILE_1001 = 1001,
ID_MNU_EXIT_1002 = 1002,
ID_MNU_HELP_1003 = 1003,
ID_MNU_WEBSITE_1004 = 1004,
ID_MNU_ABOUT_1005 = 1005,
ID_MNU_UPDATE_1006 = 1006,
ID_MNU_EXPAND_ALL_1100 = 1100,
ID_MNU_COLLAPSEALL_1101 = 1101,
ID_MNU_REMOVE_1102 = 1102,
ID_MNU_EXPAND_1103 = 1103,
ID_MNU_COLLAPSE_1104 = 1104,
ID_MNU_LAUNCH_1105 = 1105,
ID_MNU_COPY_1106 = 1106,
ID_MNU_WEBSITE = 1004,
ID_MNU_UPDATE = 1006,
ID_MNU_EXPAND_ALL = 1100,
ID_MNU_COLLAPSEALL = 1101,
ID_MNU_REMOVE = 1102,
ID_MNU_EXPAND = 1103,
ID_MNU_COLLAPSE = 1104,
ID_MNU_LAUNCH = 1105,
ID_MNU_COPY = 1106,
ID_MNU_LAUNCH_WITH = 1107,
////GUI Enum Control ID End
ID_DUMMY_VALUE_ //don't remove this value unless you have other enum values
......@@ -134,18 +133,25 @@ class IPFinderFrm : public wxFrame
private:
void OnClose(wxCloseEvent& event);
void OpenInBrowser(wxCommandEvent& event);
void CreateGUIControls();
void ResetOutput();
void OutputMessage(wxString message);
void CopyToClipboard(wxString text);
void SaveLogToFile();
bool bIsLookupRunning;
bool bIsCheckingUpdates;
bool isPortableApps;
wxTreeItemId rootItem;
wxTreeItemId currentChild;
wxString configPath;
wxString exportPath;
wxString pAppsPath;
wxArrayString systemBrowserPaths;
};
......
///-----------------------------------------------------------------
///
/// @file LookupThread.cpp
/// @author Firedancer Software
/// Created: 3/05/2012 12:31:07 PM
/// @section DESCRIPTION
/// LookupThread class implementation
///
///------------------------------------------------------------------
#define _WIN32_WINNT 0x501
#include "LookupThread.h"
#include <winsock2.h>
......
///-----------------------------------------------------------------
///
/// @file LookupThread.h
/// @author Firedancer Software
/// Created: 3/05/2012 12:31:07 PM
/// @section DESCRIPTION
/// LookupThread class declaration
///
///------------------------------------------------------------------
#ifndef LOOKUPTHREAD_H
#define LOOKUPTHREAD_H
......
# Project: IPFinder
# Compiler: Default GCC compiler
# Compiler Type: MingW 3
# Makefile created by wxDev-C++ IDE 7.4.2.569 on 27/02/13 08:14
# Makefile created by wxDev-C++ IDE 7.4.2.569 on 08/04/14 22:06
WXLIBNAME = wxmsw29u
CPP = g++.exe
......@@ -9,10 +9,10 @@ CC = gcc.exe
WINDRES = "windres.exe"
OBJ = Objects/MingW/IPFinderApp.o Objects/MingW/IPFinderFrm.o Objects/MingW/LookupThread.o Objects/MingW/CheckForUpdatesThread.o Objects/MingW/StandardTextCtrl.o Objects/MingW/IPFinder_private.res
LINKOBJ = "Objects/MingW/IPFinderApp.o" "Objects/MingW/IPFinderFrm.o" "Objects/MingW/LookupThread.o" "Objects/MingW/CheckForUpdatesThread.o" "Objects/MingW/StandardTextCtrl.o" Objects/MingW/IPFinder_private.res
LIBS = -L"C:/Program Files/Dev-Cpp/lib/wx/gcc_lib" -L"C:/Program Files/Dev-Cpp/lib" -L"C:/Program Files/Dev-Cpp/MinGW32/lib" -mwindows -l$(WXLIBNAME) -l$(WXLIBNAME)_gl -lwxscintilla -lwxtiff -lwxjpeg -lwxpng -lwxzlib -lwxregexu -lwxexpat -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 -lopengl32 "C:/Program Files/Dev-Cpp/MinGW32/lib/libws2_32.a" -g3
INCS = -I"C:/Program Files/Dev-Cpp/MinGW32/include"
CXXINCS = -I"C:/Program Files/Dev-Cpp/MinGW32/include" -I"C:/Program Files/Dev-Cpp/" -I"C:/Program Files/Dev-Cpp/include/common"
RCINCS = --include-dir "C:/PROGRA~1/Dev-Cpp/include/common"
LIBS = -L"C:/Program Files (x86)/Dev-Cpp/lib/wx/gcc_lib" -L"C:/Program Files (x86)/Dev-Cpp/lib" -L"C:/Program Files (x86)/Dev-Cpp/MinGW32/lib" -mwindows -l$(WXLIBNAME) -l$(WXLIBNAME)_gl -lwxscintilla -lwxtiff -lwxjpeg -lwxpng -lwxzlib -lwxregexu -lwxexpat -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 -lopengl32 "C:/Program Files (x86)/Dev-Cpp/MinGW32/lib/libws2_32.a" -g3
INCS = -I"C:/Program Files (x86)/Dev-Cpp/MinGW32/include"
CXXINCS = -I"C:/Program Files (x86)/Dev-Cpp/MinGW32/include" -I"C:/Program Files (x86)/Dev-Cpp/" -I"C:/Program Files (x86)/Dev-Cpp/include/common"
RCINCS = --include-dir "C:/PROGRA~2/Dev-Cpp/include/common"
BIN = Output/MingW/IPFinder.exe
DEFINES = -D__WXMSW__ -D__GNUWIN32__ -D_UNICODE
CXXFLAGS = $(CXXINCS) $(DEFINES) -fexpensive-optimizations -O3 -g3
......
IPFinder 2.2.0
IPFinder 2.3.0
Copyright 2013 Firedance Software
Licensed under the GPL version 3 (see accompanying LICENSE.TXT file or http://www.gnu.org/licenses/)
......@@ -15,6 +15,11 @@ May compile without errors on earlier or later versions, but no guarantee.
Revision History
2.3.0
* Added Open With right-click menu showing browsers installed on PC
* Added command line option to pass PortableApps directory. Official PortableApps browsers in their default folders will be listed in the Open With menu
* Fixed Ctrl shortcuts for Lookup, Empty Log and Copy to Clipboard buttons
2.2.0
* Fixed potential issues with rendering on systems with non-standard DPI or font settings
* Moved results to use a tree menu structure with collapsible results
......
///-----------------------------------------------------------------
///
/// @file StandardTextCtrl.cpp
/// @author Firedancer Software
/// Created: 3/05/2012 12:31:07 PM
/// @section DESCRIPTION
/// StandardTextCtrl class implementation
///
///------------------------------------------------------------------
#include "StandardTextCtrl.h"
#include <wx/menu.h>
......
///-----------------------------------------------------------------
///
/// @file StandardTextCtrl.h
/// @author Firedancer Software
/// Created: 3/05/2012 12:31:07 PM
/// @section DESCRIPTION
/// StandardTextCtrl class declaration
///
///------------------------------------------------------------------
#ifndef STANDARDTEXTCTRL_H
#define STANDARDTEXTCTRL_H
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment