Changeset 381


Ignore:
Timestamp:
02/07/08 17:05:52 (11 years ago)
Author:
Eoin
Message:

UPnP and NAT-PMP snapshot.

Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/Jamfile.v2

    r369 r381  
    2626        Halite.cpp 
    2727        HaliteWindow.cpp 
     28        NewTorrentDialog.cpp 
    2829        HaliteListView.cpp 
    2930        HaliteDialog.cpp 
     
    5455        Halite.cpp 
    5556        HaliteWindowMini.cpp 
     57        NewTorrentDialog.cpp 
    5658        NTray.cpp 
    5759        ; 
  • trunk/lang/Italian.txt

    r376 r381  
    3434"General Settings" ---> "Opzioni Generali" 
    3535"Limit the no. of half-open connections" ---> "Limita il n. di connessioni simultanee" 
     36"Port Forwarding" --->  ???  
     37"None (Managed Externally)" --->  ???  
     38"UnPlug and Play" --->  ???  
     39"NAT-PMG" --->  ???  
     40"Test" --->  ???  
    3641"Proxies" --->  ???  
    3742"Proxy Host/IP : " --->  ???  
     
    111116"Ok" --->  ???  
    112117"Use Compact Allocation." ---> "Usa Allocazione Compatta" 
    113 "Start Paused" ---> "Aggiungi in Pausa" 
     118"Stopped initially (Allows changing advanced setting)." --->  ???  
    114119"Note. Compact Allocation is incompatible with File Selection" ---> "Nota: l'Allocazione Compatta Ú incompatibile con la Selezione File" 
    115120"General" ---> "Generale" 
     
    170175"DHT session could not start. Try selecting another port in the settings." ---> "La sessione DHT non si Ú avviata. Prova a selezionare un'altra porta nelle Opzioni." 
    171176"Select a directory to save the files to or cancel to not download torrent at all." ---> "Seleziona una directory in cui salvare i files, o annulla per non scaricare il torrent." 
    172 "∞" --->  ???  
     177"inf" --->  ???  
    173178"%1$.2fMB of %2$.2fMB" ---> "%1$.2fMB su %2$.2fMB" 
    174179"This Session Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." ---> "In questa Sessione: Scaricati %1$.2fMB, Inviati %2$.2fMB, Ratio %3$.2f." 
  • trunk/lang/Norwegian.txt

    r376 r381  
    3535"General Settings" ---> "Generelle instillinger" 
    3636"Limit the no. of half-open connections" --->  ???  
     37"Port Forwarding" --->  ???  
     38"None (Managed Externally)" --->  ???  
     39"UnPlug and Play" --->  ???  
     40"NAT-PMG" --->  ???  
     41"Test" --->  ???  
    3742"Proxies" --->  ???  
    3843"Proxy Host/IP : " ---> "Proxy Vert/IP : " 
     
    112117"Ok" --->  ???  
    113118"Use Compact Allocation." --->  ???  
    114 "Start Paused" --->  ???  
     119"Stopped initially (Allows changing advanced setting)." --->  ???  
    115120"Note. Compact Allocation is incompatible with File Selection" --->  ???  
    116121"General" ---> "Generelt" 
     
    172177"DHT session could not start. Try selecting another port in the settings." ---> "DHT sesjonen kunne ikke starte. PrÞv en annen port i instillingene." 
    173178"Select a directory to save the files to or cancel to not download torrent at all." ---> "Velg en mappe for lagring av filene eller avbryt for ikke Ã¥ laste ned torrenten." 
    174 "∞" --->  ???  
     179"inf" --->  ???  
    175180"%1$.2fMB of %2$.2fMB" --->  ???  
    176181"This Session Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." --->  ???  
  • trunk/lang/Slovenian.txt

    r376 r381  
    3434"General Settings" ---> "SploÅ¡ne nastavitve" 
    3535"Limit the no. of half-open connections" ---> "Omejitev Å¡tevila pol-odprtih povezav" 
     36"Port Forwarding" --->  ???  
     37"None (Managed Externally)" --->  ???  
     38"UnPlug and Play" --->  ???  
     39"NAT-PMG" --->  ???  
     40"Test" --->  ???  
    3641"Proxies" ---> "Proxji" 
    3742"Proxy Host/IP : " ---> "Proxy IP : " 
     
    111116"Ok" --->  ???  
    112117"Use Compact Allocation." --->  ???  
    113 "Start Paused" --->  ???  
     118"Stopped initially (Allows changing advanced setting)." --->  ???  
    114119"Note. Compact Allocation is incompatible with File Selection" --->  ???  
    115120"General" ---> "SploÅ¡no" 
     
    170175"DHT session could not start. Try selecting another port in the settings." ---> "Napaka DHT vtičnika, prosimo spremenite port." 
    171176"Select a directory to save the files to or cancel to not download torrent at all." ---> "Izberite mapo za shrambo datotek." 
    172 "∞" --->  ???  
     177"inf" --->  ???  
    173178"%1$.2fMB of %2$.2fMB" ---> "%1$.2fMB od %2$.2fMB" 
    174179"This Session Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." ---> "V tej seji ste prenesli  %1$.2fMB podatkov in oddali %2$.2fMB podatkov. Delilno razmerje seje: %3$.2f." 
  • trunk/lang/Spanish.txt

    r376 r381  
    3434"General Settings" ---> "Opciones generales" 
    3535"Limit the no. of half-open connections" --->  ???  
     36"Port Forwarding" --->  ???  
     37"None (Managed Externally)" --->  ???  
     38"UnPlug and Play" --->  ???  
     39"NAT-PMG" --->  ???  
     40"Test" --->  ???  
    3641"Proxies" ---> "Proxies" 
    3742"Proxy Host/IP : " --->  ???  
     
    111116"Ok" --->  ???  
    112117"Use Compact Allocation." --->  ???  
    113 "Start Paused" --->  ???  
     118"Stopped initially (Allows changing advanced setting)." --->  ???  
    114119"Note. Compact Allocation is incompatible with File Selection" --->  ???  
    115120"General" ---> "General" 
     
    170175"DHT session could not start. Try selecting another port in the settings." ---> "No se pudo iniciar la sesión DHT. Prueba a seleccionar otro puerto en las opciones." 
    171176"Select a directory to save the files to or cancel to not download torrent at all." ---> "Elige el directorio donde guardar los archivos o pulsa Cancelar para no descargar el torrent." 
    172 "∞" --->  ???  
     177"inf" --->  ???  
    173178"%1$.2fMB of %2$.2fMB" ---> "%1$.2fMB de %2$.2fMB" 
    174179"This Session Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." ---> "En esta sesión se han descargado %1$.2fMB y subido %2$.2fMB. Ratio %3$.2f." 
  • trunk/lang/Turkish.txt

    r376 r381  
    3434"General Settings" ---> "Genel Ayarlar" 
    3535"Limit the no. of half-open connections" --->  ???  
     36"Port Forwarding" --->  ???  
     37"None (Managed Externally)" --->  ???  
     38"UnPlug and Play" --->  ???  
     39"NAT-PMG" --->  ???  
     40"Test" --->  ???  
    3641"Proxies" --->  ???  
    3742"Proxy Host/IP : " ---> "Proxy Host/IP" 
     
    111116"Ok" --->  ???  
    112117"Use Compact Allocation." --->  ???  
    113 "Start Paused" --->  ???  
     118"Stopped initially (Allows changing advanced setting)." --->  ???  
    114119"Note. Compact Allocation is incompatible with File Selection" --->  ???  
    115120"General" ---> "Genel" 
     
    170175"DHT session could not start. Try selecting another port in the settings." ---> "DHT oturumu başlatılamadı. Ayarlardan başka bir port seçin." 
    171176"Select a directory to save the files to or cancel to not download torrent at all." ---> "Dosyaları kaydetmek için bir dizin seçin veya torrenti indirmemek için iptal edin." 
    172 "∞" --->  ???  
     177"inf" --->  ???  
    173178"%1$.2fMB of %2$.2fMB" --->  ???  
    174179"This Session Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." --->  ???  
  • trunk/res/Halite.rc

    r380 r381  
    1414#include "../src/halEvent.hpp" 
    1515 
    16 STRINGTABLE  
     16STRINGTABLE 
    1717BEGIN 
    1818    HALITE_LANGUAGE "English" 
     
    2424STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD 
    2525FONT 8, "MS Shell Dlg", 400, 0, 0x1 
    26 BEGIN    
     26BEGIN 
    2727    GROUPBOX        "Torrent",IDC_GROUP_TORRENT,4,7,305,83 
    2828    GROUPBOX        "Tracker",IDC_GROUP_TRACKER,4,92,305,25 
    2929    CONTROL         "",TORRENTPROG,"msctls_progress32",WS_BORDER,10,77,291,8 
    30          
     30 
    3131    EDITTEXT        IDC_EDITTLU,267,46,34,12,ES_AUTOHSCROLL 
    3232    EDITTEXT        IDC_EDITTLD,210,46,34,12,ES_AUTOHSCROLL 
     
    3939    RTEXT           "Up",IDC_TLU,245,49,20,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    4040    RTEXT           "Down",IDC_TLD,182,49,25,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    41          
     41 
    4242    LTEXT           "N/A",IDC_TRACKER,10,103,170,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    43          
     43 
    4444    RTEXT           "Update in:",IDC_UPDATESTAT,185,103,40,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    4545    LTEXT           "N/A",IDC_UPDATE,228,103,71,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    4646    EDITTEXT        IDC_EDITRATIO,267,60,34,12,ES_AUTOHSCROLL 
    4747    LTEXT           "Ratio (this session):",IDC_RATIOESTATIC,182,63,70,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    48          
     48 
    4949    RTEXT           "Torrent:",IDC_NAME_STATUS_LABEL,9,17,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    5050    LTEXT           "N/A",IDC_NAME_STATUS,53,17,127,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    51          
     51 
    5252    RTEXT           "Peers:",IDC_PEERS_LABEL,9,28,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    5353    RTEXT           "Transferred:",IDC_TRANSFERED_LABEL,9,40,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    5454    RTEXT           "Remaining:",IDC_REMAINING_LABEL,9,52,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    5555    RTEXT           "Rates:",IDC_RATE_LABEL,9,64,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    56          
     56 
    5757    RTEXT           "Seeds:",IDC_SEEDS_LABEL,97,28,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    58     RTEXT           "Overhead:",IDC_OVERHEAD_LABEL,97,40,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE  
     58    RTEXT           "Overhead:",IDC_OVERHEAD_LABEL,97,40,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    5959    RTEXT           "ETA:",IDC_ETA_LABEL,97,52,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    6060    RTEXT           "Ratio:",IDC_RATIO_LABEL,97,64,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    61          
     61 
    6262    LTEXT           "N/A",IDC_PEERS,53,28,39,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    6363    LTEXT           "N/A",IDC_TRANSFERED,53,40,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 
    6464    LTEXT           "N/A",IDC_REMAINING,53,52,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 
    6565    LTEXT           "N/A",IDC_RATE,53,64,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 
    66          
     66 
    6767    LTEXT           "N/A",IDC_SEEDS,141,28,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 
    6868    LTEXT           "N/A",IDC_OVERHEAD,141,40,39,8,SS_WORDELLIPSIS | SS_CENTERIMAGE 
     
    9494    CONTROL         "UnPlug and Play",IDC_BITT_GPORTFORWARD_UPNG,"Button",BS_AUTORADIOBUTTON,284,83,16,10 
    9595    CONTROL         "NAT-PMG",IDC_BIT_GPORTFORWARD_NATPMP,"Button",BS_AUTORADIOBUTTON,284,93,16,10 
    96     PUSHBUTTON      "Test",IDC_BITT_GPORTFORWARD_TEST,207,46,51,12 
    97          
    98     LISTBOX         IDC_BITT_GPORTFORWARD_LIST,165,24,149,7,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP 
     96    PUSHBUTTON      "Test",IDC_BITT_GPORTFORWARD_TEST,207,46,51,12,NOT WS_VISIBLE 
     97 
     98    LISTBOX         IDC_BITT_GPORTFORWARD_LIST,165,24,149,7,LBS_SORT|LBS_NOINTEGRALHEIGHT|WS_VSCROLL|WS_TABSTOP|NOT WS_VISIBLE 
    9999//    RTEXT           "Need Help?",IDC_BC_HELP_LINK,229,139,51,8 
    100100//    RTEXT           "Why?",IDC_BC_CON_WHY,239,47,31,8 
     
    252252    EDITTEXT        IDC_NEWT_FILE,4,15,203,12,ES_AUTOHSCROLL 
    253253    PUSHBUTTON      "...",IDC_NEWT_BROWSE,212,14,13,13 
    254     LISTBOX         IDC_NEWT_LISTTRACKERS,4,57,221,52,WS_TABSTOP | WS_VSCROLL | LBS_NOINTEGRALHEIGHT | LBS_SORT 
     254    LISTBOX         IDC_NEWT_LISTTRACKERS,4,57,221,52,WS_TABSTOP|WS_VSCROLL|LBS_NOINTEGRALHEIGHT|LBS_SORT 
    255255    LTEXT           "Enter the tracker URLs for the torrent.",IDC_STATIC,4,32,221,11 
    256256    EDITTEXT        IDC_NEWT_TRACKER,4,42,193,12,ES_AUTOHSCROLL 
     
    321321    EDITTEXT        IDC_BC_SAVEFOLDER,5,5,195,12,ES_AUTOHSCROLL 
    322322    PUSHBUTTON      "...",IDC_BC_SAVEBROWSE,205,5,15,12,SS_CENTERIMAGE 
    323          
    324     CONTROL         "Use Compact Allocation.",IDC_CHECK_COMPACT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,38,220,8 
    325     CONTROL         "Start Paused",IDC_CHECK_PAUSED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,25,220,8 
    326     LTEXT           "Note. Compact Allocation is incompatible with File Selection",IDC_STATIC,8,51,215,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
     323 
     324    CONTROL         "Use Compact Allocation.",IDC_CHECK_COMPACT,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,38,220,8 
     325    CONTROL         "Stopped initially (Allows changing advanced setting).",IDC_CHECK_PAUSED,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,5,25,220,8 
     326    LTEXT           "Note. Compact Allocation is incompatible with File Selection",IDC_STATIC,6,51,215,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    327327END 
    328328 
     
    508508END 
    509509 
    510 STRINGTABLE  
     510STRINGTABLE 
    511511BEGIN 
    512512    HAL_PEER_INTERESTING                "Interesting" 
     
    523523END 
    524524 
    525 STRINGTABLE  
     525STRINGTABLE 
    526526BEGIN 
    527527    HAL_TORRENT_QUEUED_CHECKING "Queued for Checking" 
     
    540540END 
    541541 
    542 STRINGTABLE  
     542STRINGTABLE 
    543543BEGIN 
    544544        HAL_LISTVIEW_COLUMNS              "Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Reannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time;Finish Time" 
     
    548548        HAL_DIALOGPEER_LISTVIEW_ADV       "Peer;Country;Download;Upload;Type;Client;Status" 
    549549        HAL_DIALOGFILE_LISTVIEW_ADV       "Filename;Path;Size;Progress;Priority" 
    550          
     550 
    551551        HAL_FILE_PRIORITY_0     "Don't download" 
    552552        HAL_FILE_PRIORITY_1     "Normal" 
     
    594594IDR_MAINFRAME       BITMAP        "toolbar.bmp" 
    595595 
    596 STRINGTABLE  
     596STRINGTABLE 
    597597BEGIN 
    598598    HAL_EVENTNONE                 "None" 
     
    601601    HAL_EVENTWARNING              "Warning" 
    602602    HAL_EVENTCRITICAL             "Critical" 
    603          
     603 
    604604    HAL_PEER_ALERT                "Peer %2%: %1%." 
    605605    HAL_PEER_BAN_ALERT            "Peer banned %2%. (%1%)" 
     
    617617        HAL_LISTEN_FAILED_ALERT                 "Failed, %1%" 
    618618        HAL_IPFILTER_ALERT                              "IP Filter blocked %1%, %2%." 
    619          
     619 
    620620        LBT_EVENT_TORRENT_FINISHED    "Torrent %1% finished." 
    621621        LBT_EVENT_TORRENT_PAUSED      "Torrent %1% paused." 
    622622    HAL_EVENT_TORRENTEXP          "Torrent (%1%) exception caught; %2% from %3%." 
    623623    HAL_EVENT_INVTORRENT          "Invalid torrent (%1%) from %2%." 
    624          
     624 
    625625        HAL_EVENT_EXP                 "Exception caught; %1%, from %2%." 
    626626    HAL_EVENT_XML_EXP              "Xml Exception (%1%) with %2%." 
  • trunk/sln/Halite/Halite.vcproj

    r380 r381  
    4545                                Optimization="0" 
    4646                                AdditionalIncludeDirectories=""$(SolutionDir)lib\libtorrent\include";"$(SolutionDir)lib\libtorrent\zlib";"$(SolutionDir)lib\Asio\include\";"$(SolutionDir)lib\openssl\inc"" 
    47                                 PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0500;__USE_W32_SOCKETS;WIN32;_WIN32;_WINDOWS;_DEBUG;TORRENT_USE_BOOST_DATE_TIME;TORRENT_USE_OPENSSL;TORRENT_LOGGING;TORRENT_VERBOSE_LOGGING;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SECURE_SCL=0" 
     47                                PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0500;__USE_W32_SOCKETS;WIN32;_WIN32;_WINDOWS;_DEBUG;TORRENT_USE_BOOST_DATE_TIME;TORRENT_USE_OPENSSL;TORRENT_LOGGING;TORRENT_VERBOSE_LOGGING;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0" 
    4848                                MinimalRebuild="true" 
    4949                                ExceptionHandling="2" 
     
    364364                                Name="VCCLCompilerTool" 
    365365                                FavorSizeOrSpeed="2" 
     366                                WholeProgramOptimization="false" 
    366367                                AdditionalIncludeDirectories=""$(SolutionDir)lib\libtorrent\include";"$(SolutionDir)lib\libtorrent\zlib";"$(SolutionDir)lib\Asio\include\";"$(SolutionDir)lib\openssl\inc"" 
    367368                                PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0500;__USE_W32_SOCKETS;WIN32;_WIN32;_WINDOWS;NDEBUG;TORRENT_USE_BOOST_DATE_TIME;TORRENT_USE_OPENSSL;TORRENT_LOGGING;TORRENT_VERBOSE_LOGGING;TORRENT_UPNP_LOGGING;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" 
     
    386387                                Name="VCLinkerTool" 
    387388                                AdditionalDependencies=""$(SolutionDir)lib\openssl\bin\release\link-static\runtime-link-static\threading-multi\libeay32.lib" "$(SolutionDir)lib\openssl\bin\release\link-static\runtime-link-static\threading-multi\ssleay32.lib"" 
    388                                 LinkIncremental="1" 
     389                                LinkIncremental="0" 
    389390                                GenerateDebugInformation="true" 
    390391                                SubSystem="2" 
    391392                                OptimizeReferences="2" 
    392393                                EnableCOMDATFolding="2" 
     394                                LinkTimeCodeGeneration="0" 
    393395                                TargetMachine="1" 
    394396                        /> 
     
    510512                        > 
    511513                        <File 
    512                                 RelativePath="..\..\src\AdvHaliteDialog.cpp" 
    513                                 > 
    514                         </File> 
    515                         <File 
    516514                                RelativePath="..\..\src\ConfigOptions.cpp" 
    517515                                > 
     
    592590                                Name="global" 
    593591                                > 
     592                                <File 
     593                                        RelativePath="..\..\src\AdvHaliteDialog.cpp" 
     594                                        > 
     595                                </File> 
    594596                                <File 
    595597                                        RelativePath="..\..\src\global\ini.cpp" 
  • trunk/sln/libtorrent/libtorrent.vcproj

    r380 r381  
    4545                                Optimization="0" 
    4646                                AdditionalIncludeDirectories="&quot;$(SolutionDir)lib\libtorrent\include&quot;;&quot;$(SolutionDir)lib\libtorrent\zlib&quot;;&quot;$(SolutionDir)lib\Asio\include\&quot;;&quot;$(SolutionDir)lib\Openssl\inc&quot;" 
    47                                 PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0500;__USE_W32_SOCKETS;WIN32;_WIN32;_WINDOWS;_DEBUG;TORRENT_USE_BOOST_DATE_TIME;TORRENT_USE_OPENSSL;TORRENT_LOGGING;TORRENT_VERBOSE_LOGGING;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SECURE_SCL=0" 
     47                                PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0500;__USE_W32_SOCKETS;WIN32;_WIN32;_WINDOWS;_DEBUG;TORRENT_USE_BOOST_DATE_TIME;TORRENT_USE_OPENSSL;TORRENT_LOGGING;TORRENT_VERBOSE_LOGGING;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0" 
    4848                                MinimalRebuild="true" 
    4949                                ExceptionHandling="2" 
     
    305305                                Name="VCCLCompilerTool" 
    306306                                FavorSizeOrSpeed="2" 
     307                                WholeProgramOptimization="false" 
    307308                                AdditionalIncludeDirectories="&quot;$(SolutionDir)lib\libtorrent\include&quot;;&quot;$(SolutionDir)lib\libtorrent\zlib&quot;;&quot;$(SolutionDir)lib\Asio\include\&quot;;&quot;$(SolutionDir)lib\Openssl\inc&quot;" 
    308309                                PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0500;__USE_W32_SOCKETS;WIN32;_WIN32;_WINDOWS;NDEBUG;TORRENT_USE_BOOST_DATE_TIME;TORRENT_USE_OPENSSL;TORRENT_LOGGING;TORRENT_VERBOSE_LOGGING;TORRENT_UPNP_LOGGING;_SCL_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" 
  • trunk/src/NewTorrentDialog.cpp

    r380 r381  
    2020} 
    2121 
    22  
    2322void NewTorrentDialog::onCancel(UINT, int, HWND hWnd) 
    2423{ 
     
    2827NewTorrentDialog::CWindowMapStruct* NewTorrentDialog::GetWindowMap() 
    2928{ 
    30  
    31 } 
     29        BEGIN_WINDOW_MAP_INLINE(NewTorrentDialog, 6, 6, 3, 3) 
     30                WMB_HEAD(WMB_COL(_gap), WMB_COL(_exp), WMB_COL(120), WMB_COL(_gap)),  
     31                WMB_END()  
     32        END_WINDOW_MAP_INLINE() } 
    3233 
    3334void NewTorrentDialog::OnClose() 
  • trunk/src/global/ini.cpp

    r376 r381  
    66 
    77#include <boost/foreach.hpp> 
     8#include <boost/date_time/posix_time/posix_time.hpp> 
    89 
    910#define WINVER 0x0500 
     
    3334public: 
    3435        ini_impl(std::wstring filename) : 
    35                 working_file_(app().working_directory()/filename) 
     36                main_file_(app().working_directory()/filename), 
     37                working_file_(app().working_directory()/(filename + L".working")) 
     38        {                
     39                if (boost::filesystem::exists(working_file_)) 
     40                {                        
     41                        std::wstringstream sstr; 
     42                        boost::posix_time::wtime_facet* facet = new boost::posix_time::wtime_facet(L"%Y-%m-%d.%H-%M-%S"); 
     43                        sstr.imbue(std::locale(std::cout.getloc(), facet)); 
     44                        sstr << boost::posix_time::second_clock::universal_time(); 
     45 
     46                        boost::filesystem::rename(working_file_, app().working_directory()/(filename + L"." + sstr.str()));                      
     47                } 
     48 
     49                boost::filesystem::copy_file(main_file_, working_file_); 
     50        } 
     51 
     52        ~ini_impl() 
    3653        { 
    37                 boost::filesystem::wpath backup = app().working_directory()/(filename + L".pre"); 
    38                  
    39                 if (boost::filesystem::exists(backup)) 
    40                         boost::filesystem::remove(backup); 
    41                          
    4254                if (boost::filesystem::exists(working_file_)) 
    43                         boost::filesystem::copy_file(working_file_, backup); 
     55                { 
     56                        if (boost::filesystem::last_write_time(main_file_) == 
     57                                        boost::filesystem::last_write_time(working_file_)) 
     58                        { 
     59                                boost::filesystem::remove(working_file_); 
     60                        } 
     61                } 
    4462        } 
    4563         
    4664        void load_data() 
    4765        { 
     66 
    4867                if (!xml_.load_file(working_file_.string())) 
    4968                { 
     
    5473        void save_data() 
    5574        {                
    56         //      ::MessageBox(0, to_wstr(working_file_.string()).c_str(), L"INI", 0); 
    5775                xml_.save_file(working_file_.string()); 
     76 
     77                if (boost::filesystem::exists(working_file_)) 
     78                { 
     79                        boost::filesystem::remove(main_file_); 
     80                        boost::filesystem::copy_file(working_file_, main_file_); 
     81                } 
    5882        } 
    5983         
     
    123147        } 
    124148         
     149        boost::filesystem::wpath main_file_; 
    125150        boost::filesystem::wpath working_file_; 
    126151        tinyxml::document xml_; 
  • trunk/src/halConfig.hpp

    r380 r381  
    6060                halfConnLimit(10), 
    6161                mappingType(0), 
    62                 peerTimeout(120), 
     62                peerTimeout(30), 
    6363                trackerTimeout(60) 
    6464        {} 
  • trunk/src/halTorrent.cpp

    r380 r381  
    66 
    77 
    8 #define HALITE_VERSION                                  0,3,0,376 
    9 #define HALITE_VERSION_STRING                   "v 0.3.0.2" 
    10 #define HALITE_FINGERPRINT                              "HL", 0, 3, 0, 2 
     8#define HALITE_VERSION                                  0, 3, 0, 381 
     9#define HALITE_VERSION_STRING                   "v 0.3.0.3 dev 381" 
     10#define HALITE_FINGERPRINT                              "HL", 0, 3, 0, 3 
    1111 
    1212#ifndef HAL_NA 
     
    952952{ 
    953953        lbt::session_settings settings = pimpl->theSession.settings(); 
    954         settings.peer_timeout = peers; 
     954        settings.peer_connect_timeout = peers; 
    955955        settings.tracker_completion_timeout = tracker; 
    956956 
     
    13661366} 
    13671367 
    1368 void BitTorrent::addTorrent(wpath_t file, wpath_t saveDirectory, bool startPaused, bool compactStorage)  
     1368void BitTorrent::addTorrent(wpath_t file, wpath_t saveDirectory, bool startStopped, bool compactStorage)  
    13691369{ 
    13701370        try  
     
    13831383                me->setConnectionLimit(bittorrent().defTorrentMaxConn(), bittorrent().defTorrentMaxUpload()); 
    13841384                 
    1385         //      me->addToSession(startPaused); 
     1385                if (!startStopped) me->addToSession(); 
    13861386        } 
    13871387         
    13881388        } HAL_GENERIC_TORRENT_EXCEPTION_CATCH(to_utf8(file.string()), "addTorrent") 
    13891389} 
    1390  
    13911390 
    13921391void add_files(lbt::torrent_info& t, fs::path const& p, fs::path const& l) 
Note: See TracChangeset for help on using the changeset viewer.