Changeset 445

Timestamp:

05/15/08 19:04:34 (12 years ago)

Author:

Eoin

Message:

The preview snapshot.

Location:

trunk

Files:

• lang/Build.bat (modified) (1 diff)
• lang/Slovenian.txt (modified) (22 diffs)
• sln/Halite/Halite.vcproj (modified) (2 diffs)
• src/Halite.cpp (modified) (1 diff)
• src/HaliteDialog.hpp (modified) (1 diff)
• src/HaliteTabCtrl.hpp (modified) (1 diff)
• src/HaliteWindow.cpp (modified) (2 diffs)
• src/halTorrentInternal.hpp (modified) (1 diff)

trunk/lang/Build.bat

@@ -1 @@
-call ruby tools\res_translator.rb ../res/ Halite Dutch French German Italian Japanese Norwegian Template Polish Portuguese Russian Serbian "Serbian (Cyrillic)" Spanish Swedish Turkish
+call ruby tools\res_translator.rb ../res/ Halite Dutch French German Italian Japanese Norwegian Template Polish Portuguese Russian Serbian "Serbian (Cyrillic)" Spanish Slovenian Swedish Turkish

trunk/lang/Slovenian.txt

@@ -1 @@
-"" --->  ??? 
+"English" ---> "Slovenian"
+"English.rtf" ---> "Slovenian.rtf"
 "%1$.2fKB/s down - %2$.2fKB/s up" ---> "%1$.2fKB/s dol - %2$.2fKB/s gor"
 "%1$.2fMB down - %2$.2fMB up" ---> "%1$.2fMB dol - %2$.2fMB gor"
 "%1$.2fMB of %2$.2fMB" ---> "%1$.2fMB od %2$.2fMB"
 "%1% DHT node(s)" ---> "%1% DHT povezav"
+"%1% active torrent(s)" --->  ??? 
 "%1%, %2%." ---> "%1%, %2%."
 "%2%. %3% Peers. (%1%)" --->  ??? 
@@ -11 +13 @@
 "(D-U) 0000.000KB/s - 0000.000KB/s" ---> "(D-U) 0000.000KB/s - 0000.000KB/s"
 "(DHT will not apply to private torrents)" ---> "(DHT se uporablja samo pri t.i. "
-"*** Disabled ***" ---> "*** Onemogočeno ***"
-"..." ---> "..."
-"2" --->  ??? 
-"3" ---> "3"
-"4" ---> "4"
-"6" ---> "6"
 "About" ---> "O programu"
 "Above Normal" ---> "Nad običajno"
+"Active" --->  ??? 
 "Add New Peer" --->  ??? 
 "Add New Tracker" ---> "Dodaj nov tracker"
@@ -38 +35 @@
 "Block %2% of piece %3% finished. (%1%)" --->  ??? 
 "Both" ---> "Oboje"
-"Button1" ---> "Button1"
 "Calculating Piece Hashes..." --->  ??? 
 "Cancel" ---> "Prekliči"
@@ -44 +40 @@
 "Choked" ---> "Zadušeno"
 "Clear IP database" ---> "Počisti bazo IP naslovov"
+"Client" ---> "BT odjemalec"
 "Close to tray" --->  ??? 
 "Comment" --->  ??? 
-"Comments" ---> "Komentarji"
-"CompanyName" ---> "CompanyName"
+"Completed" --->  ??? 
 "Completed:" ---> "Končano:"
 "Confirm on close" --->  ??? 
@@ -54 +50 @@
 "Connection Policies" ---> "Nadzor povezave"
 "Construct a New Torrent" --->  ??? 
+"Copies" --->  ??? 
+"Country" ---> "DrÅŸava"
 "Creating Torrent..." --->  ??? 
+"Creating a New Torrent File" --->  ??? 
 "Creator" --->  ??? 
 "Critical" ---> "Kritično"
@@ -66 +65 @@
 "Delete" ---> "Izbriši"
 "Dev Msg: %1%." --->  ??? 
-"Dialog" --->  ??? 
 "Dir." --->  ??? 
 "Disabled" ---> "Onemogočena"
@@ -73 +71 @@
 "Down" ---> "Dol"
 "Download Rate (KB/s) :" ---> "Prenos dol(KB/s) :"
+"Download" ---> "Dol"
 "Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." ---> "Prenešeno %1$.2fMB, Oddano %2$.2fMB, Delilno razmerje %3$.2f."
+"Downloaded" --->  ??? 
 "Downloading Metadata" ---> "Prenašam metadata"
 "Downloading" ---> "Prenašam"
 "E&xit" ---> "Izhod"
+"ETA" --->  ??? 
 "ETA:" ---> "ETA:"
+"Edit Download Folders" --->  ??? 
 "Edit Peer" --->  ??? 
+"Edit Torrent Save Folders" --->  ??? 
 "Edit Tracker" --->  ??? 
 "Edit" ---> "Uredi"
@@ -87 +90 @@
 "Enabled" ---> "Omogočena"
 "Encoding Level" ---> "Stopnja zaščite"
-"English" ---> "Slovenian"
-"English.rtf" ---> "Slovenian.rtf"
 "Enter any Web Seed URLs and DHT Nodes." --->  ??? 
 "Enter the tracker URLs for the torrent." ---> "Vpiši sledilnikov (announce) URL."
@@ -95 +96 @@
 "Fast resume failed: %2%. (%1%)" --->  ??? 
 "File" --->  ??? 
-"FileDescription" ---> "FileDescription"
-"FileVersion" ---> "FileVersion"
-"Filename;Path;Size" --->  ??? 
-"Filename;Path;Size;Progress;Priority" ---> "Ime;Pot;Velikost;Napredek;Prioriteta"
+"Filename" ---> "Ime"
 "Files" ---> "Datotek"
 "Filtering %1% range(s)" ---> "Filtriram %1% naslovov"
+"Finish Time" --->  ??? 
 "Finished" ---> "Končan"
+"Force Close" --->  ??? 
 "Forced" ---> "Prisiljeno"
 "General Settings" ---> "Splošne nastavitve"
@@ -111 +111 @@
 "Halite not listening!" ---> "Halite ne more prisluškovati!"
 "Halite shutting down..." ---> "Halite se izklaplja..."
-"Halite" ---> "Halite"
-"Halite.exe" ---> "Halite.exe"
 "Handshake" ---> "Pozdravljam"
 "Has choked us" ---> "Nas je zadušil"
@@ -131 +129 @@
 "Limit the no. of half-open connections" ---> "Omejitev Å¡tevila pol-odprtih povezav"
 "List of Trackers." ---> "Seznam trackerjev"
+"Loading IP filters..." --->  ??? 
 "Local connection" ---> "Lokalne povezave"
 "Log debug events." ---> "Shranjuj debug log."
@@ -136 +135 @@
 "Logging" ---> "Shranjevanje"
 "Maximum" ---> "Najvčja"
+"Message" ---> "Sporočilo"
 "Minimize to tray." ---> "Pomanjšaj v orodno vrstico"
 "Move finished torrents to :" --->  ??? 
@@ -141 +141 @@
 "N/A" ---> "N/A"
 "NAT-PMG" --->  ??? 
+"Name" --->  ??? 
 "Name:" ---> "Ime:"
-"Name;Status;Progress;Download;Upload;Peers;Seeds;ETA;Copies;Tracker;Preannounce;Ratio;Total;Completed;Remaining;Downloaded;Uploaded;Active;Seeding;Start Time;Finish Time" --->  ??? 
 "New" ---> "Novo"
 "None (Managed Externally)" --->  ??? 
@@ -153 +153 @@
 "Open Download Folder" --->  ??? 
 "Open a (single) port between : " ---> "Odpri posamičen port v rangu:"
-"OriginalFilename" ---> "OriginalFilename"
 "Outgoing" ---> "Odhodna povezava"
 "Output File" --->  ??? 
 "Overhead:" ---> "PreseÅŸek:"
 "Password : " ---> "Geslo : "
+"Path" ---> "Pot"
 "Pause" ---> "Premor"
 "Paused" ---> "Na pavzi"
@@ -165 +165 @@
 "Peer banned %2%. (%1%)" --->  ??? 
 "Peer" ---> "Peer"
-"Peer;Country;Download;Upload;Type;Client" ---> "Peer;DrÅŸava;Dol;Gor;Katgorija;BT odjemalec"
-"Peer;Country;Download;Upload;Type;Client;Status" ---> "Peer;DrÅŸava;Dol;Gor;Katgorija;BT odjemalec;Stanje"
 "Peers" ---> "Peerov"
 "Peers:" ---> "Sejalci+Pijavke:"
@@ -178 +176 @@
 "Port to listen on : " ---> "Port:"
 "Port" --->  ??? 
-"Preannounce" --->  ??? 
 "Prefer RC4" ---> "Uporabljaj raje RC4"
+"Priority" ---> "Prioriteta"
 "Private" --->  ??? 
-"ProductName" ---> "ProductName"
-"ProductVersion" ---> "ProductVersion"
+"Progress" ---> "Napredek"
 "Protocol Encryption" ---> "Å ifriranje protokola"
 "Proxies" ---> "Proxji"
@@ -193 +190 @@
 "Rates:" ---> "Hitrosti:"
 "Ratio (this session):" ---> "Delino razmerje seje:"
+"Ratio" --->  ??? 
 "Ratio:" ---> "Delilno razmerje:"
+"Reannounce" --->  ??? 
 "Recheck Files" --->  ??? 
+"Remaining" --->  ??? 
 "Remaining:" ---> "Do konca:"
 "Remote Control Options" ---> "Nastavitve oddaljenega nadzora"
@@ -206 +206 @@
 "Security" ---> "Varnost"
 "Seeding" ---> "Sejem"
+"Seeds" --->  ??? 
 "Seeds:" ---> "Sejalcev:"
 "Select a directory to save the downloads to. Select cancel to accept default 'incoming' location." ---> "Izberite mapo, kjer se bodo shranjevali preosi. Kliknite prekliči, če ste zadovoljni z privzeto nastavitvijo."
@@ -214 +215 @@
 "Set Priority" ---> "Nastavi prioriteto"
 "Set as Primary" --->  ??? 
+"Severity" ---> "Kritičnost"
 "Show this message in future" ---> "V prihodnosti mi prikaşi to sporočilo"
+"Shutting down session" --->  ??? 
+"Size" ---> "Velikost"
 "Standard exception (%1%) thrown from %2%." ---> "Standardna izjema (%1%) prejeta od %2%."
+"Start Time" --->  ??? 
+"Status" ---> "Stanje"
 "Status:" ---> "Status:"
 "Stop" ---> "Prekini"
 "Stopped initially (Allows changing advanced setting)" --->  ??? 
 "Stopped" ---> "Prekinjen"
+"Stopping Torrents" --->  ??? 
 "Stopping" --->  ??? 
 "Successfully %1%." --->  ??? 
@@ -231 +238 @@
 "Tier" ---> "Pomol"
 "Time left:" ---> "Čas do konca:"
-"Time;Message;Severity" ---> "Čas;Sporočilo;Kritičnost"
+"Time" ---> "Čas"
 "Torrent %1% finished." --->  ??? 
 "Torrent %1% paused." --->  ??? 
@@ -254 +261 @@
 "Tracker" ---> "Tracker"
 "Tracker:" ---> "Tracker"
-"Tracker;Tier" ---> "Tracker;Pomol"
 "Trackers" --->  ??? 
 "Transferred:" ---> "Prenešeno:"
-"Translation" ---> "Prevod"
-"Type" --->  ??? 
+"Type" ---> "Katgorija"
 "URL Seed %2%, %3%. (%1%)" --->  ??? 
 "URL" --->  ??? 
-"URL;Port;Type" --->  ??? 
 "UnPlug and Play" --->  ??? 
 "Unicode exception: %1%." ---> "Unicode izjema: %1%."
@@ -267 +271 @@
 "Update in:" ---> "Posodobitev čez:"
 "Upload Rate (KB/s) :" ---> "Prenos gor (KB/s) :"
+"Upload" ---> "Gor"
+"Uploaded" --->  ??? 
 "Use Compact Allocation." --->  ??? 
 "Use a proxy." ---> "Uporabi proxy."
+"User canceled Torrent file creation" --->  ??? 
 "Username : " ---> "Uporabnik : "
 "Warning" --->  ??? 

trunk/sln/Halite/Halite.vcproj

@@ -1085 +1085 @@
                                 >
                                 <File
+                                        RelativePath="..\..\src\WTLx\GenericAddListView.hpp"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\global\ini.hpp"
                                         >
@@ -1146 +1150 @@
                                 <File
                                         RelativePath="..\..\src\WTLx\GenericAddDialog.hpp"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath="..\..\src\WTLx\GenericAddListView.hpp"
                                         >
                                 </File>

trunk/src/Halite.cpp

@@ -171 +171 @@
                 _Module.RemoveMessageLoop();
                 
-                hal::bittorrent().stopEventReceiver();
-                
-                if (halite().showMessage)
-                {
-                        SplashDialog splDlg;
-                        splDlg.DoModal();
-                }
-                else
-                {
-                        hal::bittorrent().closeAll(bind(&num_active, _1));
-                        hal::bittorrent().shutDownSession();            
-                }
-                                
-                halite().save();
-                hal::ini().save_data();
         }
         }

trunk/src/HaliteDialog.hpp

@@ -167 +167 @@
                 MESSAGE_HANDLER_EX(WM_USER_HAL_EDITCHANGED, OnHalEditChanged)
                 
-//              COMMAND_RANGE_CODE_HANDLER_EX(IDC_EDITTLU, IDC_EDITNCU, EN_KILLFOCUS, OnEditKillFocus)
-
                 if(uMsg == WM_FORWARDMSG)
                         if(PreTranslateMessage((LPMSG)lParam)) return TRUE;

trunk/src/HaliteTabCtrl.hpp

@@ -46 +46 @@
         virtual BOOL PreTranslateMessage(MSG* pMsg)
         {
-                assert(pages_[GetCurSel()].msgFilter);
+                if (::IsWindow(m_hWnd))
+                {
+                        assert(pages_[GetCurSel()].msgFilter);
                 
-                return pages_[GetCurSel()].msgFilter->PreTranslateMessage(pMsg);
+                        return pages_[GetCurSel()].msgFilter->PreTranslateMessage(pMsg);
+                }
+
+                return false;
         }
 

trunk/src/HaliteWindow.cpp

@@ -20 +20 @@
 #include "AddTorrentDialog.hpp"
 #include "NewTorrentDialog.hpp"
+#include "SplashDialog.hpp"
 
 #include "ConfigOptions.hpp"
@@ -398 +399 @@
  
 void HaliteWindow::OnDestroy()
-{
+{       
+        KillTimer(ID_UPDATE_TIMER);
+        KillTimer(ID_SAVE_TIMER);
+
+        Sleep(0);
+
         splitterPos = m_Split.GetSplitterPos();
 
         hal::config().save();
         save();
+
+                hal::bittorrent().stopEventReceiver();
+                
+//              if (halite().showMessage)
+                {
+                        SplashDialog splDlg;
+                        splDlg.DoModal();
+                }
+/*              else
+                {
+                        hal::bittorrent().closeAll(bind(&num_active, _1));
+                        hal::bittorrent().shutDownSession();            
+                }
+*/                              
+                halite().save();
+                hal::ini().save_data();
+
         PostQuitMessage(0);
 }

trunk/src/halTorrentInternal.hpp

@@ -956 +956 @@
 
                         wstring s;
-                        ar & slz::make_nvp("saveDirectory", save_directory_);
+                        ar & slz::make_nvp("saveDirectory", s);
                         save_directory_ = s;
 
-                        if (version == 1) {
+                        if (version == 2) {
                                 wstring m;
                                 ar & slz::make_nvp("moveToDirectory", m);