added ability to parse multiple urls from plaintext selection and bumped versions

git-svn-id: http://svn.klever.net/kin/dipstick/trunk@126 fe716a7a-6dde-0310-88d9-d003556173a8

1 files changed, 12 insertions, 12 deletions

diff --git a/dipstick.rc b/dipstick.rc
index 55f9fde..8797946 100644
--- a/dipstick.rc
+++ b/dipstick.rc
@@ -69,45 +69,44 @@ IDR_MAINFRAME           ICON    DISCARDABLE     "res\\Dipstick.ico"
 IDI_PINGING             ICON    DISCARDABLE     "res\\pinging.ico"

 IDI_PENDING             ICON    DISCARDABLE     "res\\pending.ico"

 IDI_COMPLETED           ICON    DISCARDABLE     "res\\complete.ico"

 IDI_UNREACHABLE         ICON    DISCARDABLE     "res\\unreach.ico"

 

 /////////////////////////////////////////////////////////////////////////////

 //

 // Dialog

 //

 

 IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 213, 61

 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "About Dipstick"

 FONT 8, "MS Sans Serif"

 BEGIN

     ICON            IDR_MAINFRAME,IDC_STATIC,11,17,21,20

-    LTEXT           "Dipstick, Version 3.0",IDC_STATIC,40,7,89,8,

-                    SS_NOPREFIX

-    LTEXT           "Copyright © 1996-2004 Klever Group",

-                    IDC_STATIC,40,25,166,8

+    LTEXT           "Dipstick, Version 3.1-trunk",IDC_STATIC,40,7,89,8,SS_NOPREFIX

+    LTEXT           "Copyright © 1996-2005 Klever Group",IDC_STATIC,40,25,

+                    166,8

     DEFPUSHBUTTON   "OK",IDOK,174,7,32,14,WS_GROUP

     PUSHBUTTON      "http://www.klever.net/",IDC_KLEVERNET,40,40,91,14

 END

 

 IDD_DIPSTICK_DIALOG DIALOGEX 0, 0, 419, 152

 STYLE DS_3DLOOK | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

 EXSTYLE WS_EX_TOOLWINDOW | WS_EX_CLIENTEDGE | WS_EX_CONTEXTHELP | 

     WS_EX_APPWINDOW

-CAPTION "  Dipstick 3.0"

+CAPTION "  Dipstick 3.1-trunk"

 FONT 8, "MS Sans Serif", 0, 0, 0x1

 BEGIN

     CONTROL         "List1",IDC_HOSTLIST,"SysListView32",LVS_REPORT | 

                     LVS_SORTASCENDING | LVS_AUTOARRANGE | WS_BORDER | 

                     WS_TABSTOP,8,8,349,136,WS_EX_CLIENTEDGE

     PUSHBUTTON      "&Manual Ping",IDC_MANUALPING,361,8,50,14

     PUSHBUTTON      "&Reping",IDC_REPING,361,23,50,14,WS_DISABLED

     PUSHBUTTON      "Reping &All",IDC_REPINGALL,361,38,50,14,WS_DISABLED

     PUSHBUTTON      "R&emove",IDC_REMOVE,361,53,50,14,WS_DISABLED

     PUSHBUTTON      "Remove A&ll",IDC_CLEAR,361,68,50,14,WS_DISABLED

     PUSHBUTTON      "&Help",ID_HELP,361,99,50,14

     PUSHBUTTON      "&Options",IDC_OPTIONS,361,114,50,14

     PUSHBUTTON      "E&xit Dipstick",IDC_EXIT,361,129,50,14

     PUSHBUTTON      "",IDCANCEL,411,2,6,6,NOT WS_VISIBLE | WS_DISABLED

     PUSHBUTTON      "Ad&vanced",IDC_ADVANCED,361,83,50,11

 END

@@ -250,57 +249,57 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,7,171,50,14

     CONTROL         "&Smart adjust selection",IDC_DOADJUST,"Button",

                     BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,63,157,106,10

     CONTROL         "Adjust by &innermost URL",IDC_ADJUSTINN,"Button",

                     BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,63,

                     175,106,10

 END

 

 

 #ifndef _MAC

 /////////////////////////////////////////////////////////////////////////////

 //

 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,0,0,0

- PRODUCTVERSION 3,0,0,0

+ FILEVERSION 3,1,0,0

+ PRODUCTVERSION 3,1,0,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x9L

 #else

  FILEFLAGS 0x8L

 #endif

  FILEOS 0x4L

  FILETYPE 0x1L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "040904b0"

         BEGIN

             VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"

             VALUE "FileDescription", "Dipstick, mirror locator\0"

-            VALUE "FileVersion", "3, 0, 0, 0\0"

+            VALUE "FileVersion", "3, 1, 0, 0\0"

             VALUE "InternalName", "DIPSTICK\0"

-            VALUE "LegalCopyright", "Copyright © 1996-2004 Klever Group (http://www.klever.net/)\0"

+            VALUE "LegalCopyright", "Copyright © 1996-2005 Klever Group (http://www.klever.net/)\0"

             VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"

             VALUE "OriginalFilename", "DIPSTICK.EXE\0"

             VALUE "ProductName", "Dipstick\0"

-            VALUE "ProductVersion", "3, 0, 0, 0\0"

+            VALUE "ProductVersion", "3, 1, 0, 0\0"

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

         VALUE "Translation", 0x409, 1200

     END

 END

 

 #endif    // !_MAC

 

 

 /////////////////////////////////////////////////////////////////////////////

 //

 // DESIGNINFO

 //

 

@@ -447,53 +446,53 @@ IDW_BESTURL             WAVE    DISCARDABLE     "res\\best.wav"
 

 /////////////////////////////////////////////////////////////////////////////

 //

 // String Table

 //

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     IDS_ABOUTBOX            "&About Dipstick.."

     IDS_PS_FAILEDTOLOCK     "Failed to gain access to internal resources. Please, report to Klever."

     IDP_SOCKETS_INIT_FAILED "Windows sockets initialization failed."

     IDS_CSVEXT              ".csv"

     IDS_HN_BADURL           "Bad URL"

     IDS_ABEST_CLEANUP       "Remove all locations from list?"

     IDS_ABEST_NONEFOUND     "No reachable locations were found."

     IDS_ABEST_TITLE         "  Dipstick - report"

-    IDS_DRAGPAD_TITLE       " Dipstick 3.0"

+    IDS_DRAGPAD_TITLE       " Dipstick 3.1-trunk"

     IDS_DRAGPAD_URLS        "  %d/%d URL(s)"

     IDS_REGEX_HTMLURL       "<A[^[:alpha:]][^>]*href[[:space:]]*=[[:space:]]*""?([^[:space:]>""]+)""?[^>]*>"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     IDS_KLEVERNET_URL       "http://www.klever.net/"

     IDS_PS_INTERNALERROR    "Internal Error. Please report to Klever."

     IDS_PS_NETUNREACHABLE   "Destination network unreachable"

     IDS_PS_HOSTUNREACHABLE  "Destination host unreachable"

     IDS_PS_PROTUNREACHABLE  "Destination protocol unreachable"

     IDS_PS_PORTUNREACHABLE  "Destination port unreachable"

     IDS_PS_NORESOURCES      "No resources"

     IDS_PS_HWERROR          "Hardware error"

     IDS_PS_BIGPACKET        "Packet size is too big"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

-    IDC_DNDTARGET           "Dipstick 3.0, click the right mouse button to display main window, left mouse button for menu"

+    IDC_DNDTARGET           "Dipstick 3.1-trunk, click the right mouse button to display main window, left mouse button for menu"

     IDC_HOST                "Host name as specified or resolved by Dipstick"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     IDC_URLCAPTION          "Universal Resource Locator (URL) associated with this location"

     IDC_URL                 "Universal Resource Locator (URL) associated with this location"

     IDC_HOSTCAPTION         "Host name as specified or resolved by Dipstick"

     IDC_IPCAPTION           "Host's IP address as specified or resolved by Dipstick"

     IDC_TIMESCAPTION        "Minmum, maximum and average round trip time in milliseconds. The less the better."

     IDC_TIMES               "Minmum, maximum and average round trip time in milliseconds. The less the better."

     IDC_LOSSCAPTION         "IP packets loss"

     IDC_LOSS                "IP packets loss"

     IDC_STATUSCAPTION       "Last error occured during attempt to ping this location"

     IDC_STATUS              "Last error occured during attempt to ping this location"

     IDC_OPENURL             "Open URL in your default browser"

@@ -524,32 +523,33 @@ BEGIN
     IDS_TIP_COMPLETE        "Pinging of this location has been completed"

     IDS_TIP_PROPSOK         "Click OK if you're done with looking and want to dismiss this window"

     IDS_TIP_INTERVAL        "Interval between ping requests in seconds"

     IDS_TIP_OPTIONSOK       "Click OK to make changes permanent"

     IDS_TIP_OPTIONSCANCEL   "Click CANCEL to leave dialog without making any changes"

     IDS_TIP_PINGING         "This location is being pinged at the moment.."

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     IDC_MSWORKAROUND        "In case of REDIRed URL - test the innermost one"

 END

 

 STRINGTABLE DISCARDABLE 

 BEGIN

     IDS_CSVFILTER           "Comma Separated Values (*.csv)|*.csv|All Files (*.*)|*.*||"

+    IDS_REGEX_URL           "([a-zA-Z]+://)?[a-zA-Z0-9-]+(\\.[a-zA-Z0-9-]*)+(/[^ \t\r\n\\f]*)?"

 END

 

 #endif    // English (U.S.) resources

 /////////////////////////////////////////////////////////////////////////////

 

 

 

 #ifndef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

 //

 // Generated from the TEXTINCLUDE 3 resource.

 //

 #define _AFX_NO_SPLITTER_RESOURCES

 #define _AFX_NO_OLE_RESOURCES

 #define _AFX_NO_TRACKER_RESOURCES

 #define _AFX_NO_PROPERTY_RESOURCES