Changeset 385 for trunk


Ignore:
Timestamp:
02/23/08 19:17:15 (12 years ago)
Author:
Eoin
Message:

Working on torrent creation.

Location:
trunk
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • trunk/Halite.sln

    r382 r385  
    44Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Halite", "sln\Halite\Halite.vcproj", "{ED987C84-FFF9-4656-8F27-2A65FC0847FD}" 
    55        ProjectSection(ProjectDependencies) = postProject 
     6                {85145293-5491-4BA8-892C-F5A0C4AC9208} = {85145293-5491-4BA8-892C-F5A0C4AC9208} 
    67                {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8} = {333ECB6F-575B-4B11-BDDA-3E7F7555BAD8} 
    7                 {85145293-5491-4BA8-892C-F5A0C4AC9208} = {85145293-5491-4BA8-892C-F5A0C4AC9208} 
    88        EndProjectSection 
    99EndProject 
     
    1818EndProject 
    1919Project("{A49CE20D-CE64-4A08-9F24-92A6443D6699}") = "HalWiX", "sln\HalWiX\HalWiX.wixproj", "{8D768897-96D3-48DB-A7AB-9242E4D27DB4}" 
     20        ProjectSection(ProjectDependencies) = postProject 
     21                {ED987C84-FFF9-4656-8F27-2A65FC0847FD} = {ED987C84-FFF9-4656-8F27-2A65FC0847FD} 
     22        EndProjectSection 
    2023EndProject 
    2124Global 
  • trunk/lang/Build.bat

    r373 r385  
    1 convert.bat Halite Dutch German Italian Slovenian Spanish Turkish Norwegian Polish Russian French Template 
     1convert.bat Halite Dutch German Italian Slovenian Spanish Turkish Norwegian Polish Russian French Japanese Template 
  • trunk/lang/Italian.txt

    r382 r385  
    9292"..." --->  ???  
    9393"Prompt for alternate save folder." ---> "Consenti di scegliere una cartella alternativa." 
    94 "Halite shutting down..." ---> "Halite in chiusura...." 
    95 "It will take the BitTorrent session a moment to shutdown cleanly after which this message will disappear and the program will close." ---> "Ci vorrà qualche momento per la chiusura corretta della sessione BitTorrent, al termine della quale questo messaggio sparirà." 
    96 "Show this message in future" ---> "Mostra messaggio in futuro" 
    9794"Create new torrent" ---> "Crea nuovo torrent" 
    9895"Save" ---> "Salva" 
    9996"Select a file or directory to construct the torrent." ---> "Seleziona un file o una directory da aggiungere al file torrent." 
    10097"Enter the tracker URLs for the torrent." ---> "Inserisci gli indirizzi dei tracker per il torrent." 
    101 "Have Halite acts a DHT node." ---> "Abilita nodo DHT Hailte." 
     98"Private" --->  ???  
    10299"Add" ---> "Aggiungi" 
     100"Comment." --->  ???  
     101"Creator" --->  ???  
     102"Halite shutting down..." ---> "Halite in chiusura...." 
     103"It will take the BitTorrent session a moment to shutdown cleanly after which this message will disappear and the program will close." ---> "Ci vorrà qualche momento per la chiusura corretta della sessione BitTorrent, al termine della quale questo messaggio sparirà." 
     104"Show this message in future" ---> "Mostra messaggio in futuro" 
    103105"Pause" ---> "Pausa" 
    104106"Reannounce" ---> "Riannuncia" 
     
    145147"Torrent File" ---> "File Torrent" 
    146148"Torrent and Data" ---> "Torrent e Dati" 
     149"Open Download Folder" --->  ???  
    147150"New" ---> "Nuovo" 
    148151"Edit" ---> "Modifica" 
     
    260263"Successfully %1%." --->  ???  
    261264"Failed, %1%" --->  ???  
     265"IP version 6 listen atempt failed. Not serious." --->  ???  
    262266"IP Filter blocked %1%, %2%." --->  ???  
    263267"Torrent %1% finished." ---> "Torrent %1% finito" 
  • trunk/lang/Norwegian.txt

    r382 r385  
    9393"..." --->  ???  
    9494"Prompt for alternate save folder." ---> "SpÞr om alternativ lagringsmappe." 
    95 "Halite shutting down..." ---> "Halite lukkes..." 
    96 "It will take the BitTorrent session a moment to shutdown cleanly after which this message will disappear and the program will close." ---> "Det vil ta BitTorrent sesjonen et Þyeblikk Ã¥ stenges korrekt. Denne meldingen vil da forsvinne og programmet vil lukkes." 
    97 "Show this message in future" ---> "Vis denne meldingen i fremtiden" 
    9895"Create new torrent" ---> "Lag en ny torrent" 
    9996"Save" ---> "Lagre" 
    10097"Select a file or directory to construct the torrent." ---> "Velg en fil eller mappe for Ã¥ lage torrenten." 
    10198"Enter the tracker URLs for the torrent." ---> "Legg til tracker URL'er for torrenten." 
    102 "Have Halite acts a DHT node." ---> "La Halite fungere som en DHT node." 
     99"Private" --->  ???  
    103100"Add" ---> "Legg til" 
     101"Comment." --->  ???  
     102"Creator" --->  ???  
     103"Halite shutting down..." ---> "Halite lukkes..." 
     104"It will take the BitTorrent session a moment to shutdown cleanly after which this message will disappear and the program will close." ---> "Det vil ta BitTorrent sesjonen et Þyeblikk Ã¥ stenges korrekt. Denne meldingen vil da forsvinne og programmet vil lukkes." 
     105"Show this message in future" ---> "Vis denne meldingen i fremtiden" 
    104106"Pause" --->  ???  
    105107"Reannounce" ---> "Oppdater Tracker" 
     
    147149"Torrent File" ---> "Torrent Fil" 
    148150"Torrent and Data" ---> "Torrent og Data" 
     151"Open Download Folder" --->  ???  
    149152"New" ---> "Ny" 
    150153"Edit" ---> "Endre" 
     
    262265"Successfully %1%." --->  ???  
    263266"Failed, %1%" --->  ???  
     267"IP version 6 listen atempt failed. Not serious." --->  ???  
    264268"IP Filter blocked %1%, %2%." --->  ???  
    265269"Torrent %1% finished." --->  ???  
  • trunk/lang/Slovenian.txt

    r382 r385  
    9292"..." ---> "..." 
    9393"Prompt for alternate save folder." ---> "VpraÅ¡aj kam naj shranim." 
    94 "Halite shutting down..." ---> "Halite se izklaplja..." 
    95 "It will take the BitTorrent session a moment to shutdown cleanly after which this message will disappear and the program will close." ---> "Prosimo počakajte nekaj sekund, da se program zapre." 
    96 "Show this message in future" ---> "V prihodnosti mi prikaÅŸi to sporočilo" 
    9794"Create new torrent" ---> "Ustvari nov torrent" 
    9895"Save" ---> "Shrani" 
    9996"Select a file or directory to construct the torrent." ---> "Izberi datoteko ali mapo za ustvarjanje torrent datoteke" 
    10097"Enter the tracker URLs for the torrent." ---> "VpiÅ¡i sledilnikov (announce) URL." 
    101 "Have Halite acts a DHT node." ---> "Uporabi DHT omreÅŸje." 
     98"Private" --->  ???  
    10299"Add" ---> "Dodaj" 
     100"Comment." --->  ???  
     101"Creator" --->  ???  
     102"Halite shutting down..." ---> "Halite se izklaplja..." 
     103"It will take the BitTorrent session a moment to shutdown cleanly after which this message will disappear and the program will close." ---> "Prosimo počakajte nekaj sekund, da se program zapre." 
     104"Show this message in future" ---> "V prihodnosti mi prikaÅŸi to sporočilo" 
    103105"Pause" ---> "Premor" 
    104106"Reannounce" ---> "Posodobi sledilnik" 
     
    145147"Torrent File" ---> "Torrent datoteko" 
    146148"Torrent and Data" ---> "Torrent datoteko in podatke" 
     149"Open Download Folder" --->  ???  
    147150"New" ---> "Novo" 
    148151"Edit" ---> "Uredi" 
     
    260263"Successfully %1%." --->  ???  
    261264"Failed, %1%" --->  ???  
     265"IP version 6 listen atempt failed. Not serious." --->  ???  
    262266"IP Filter blocked %1%, %2%." --->  ???  
    263267"Torrent %1% finished." --->  ???  
  • trunk/lang/Spanish.txt

    r382 r385  
    9292"..." ---> "..." 
    9393"Prompt for alternate save folder." ---> "Preguntar por directorio de guardado alternativo." 
    94 "Halite shutting down..." ---> "Halite se está cerrando..." 
    95 "It will take the BitTorrent session a moment to shutdown cleanly after which this message will disappear and the program will close." ---> "La sesión BitTorrent tardará un tiempo en cerrarse limpiamente. Después este mensaje desaparecerá y el programa se cerrará." 
    96 "Show this message in future" ---> "Mostrar este mensaje en el futuro" 
    9794"Create new torrent" ---> "Crear nuevo torrent" 
    9895"Save" ---> "Guardar" 
    9996"Select a file or directory to construct the torrent." ---> "Elige un archivo o directorio para construir el torrent." 
    10097"Enter the tracker URLs for the torrent." ---> "Introduce las URLs de los trackers del torrent." 
    101 "Have Halite acts a DHT node." ---> "Permitir que Halite actúe como nodo DHT." 
     98"Private" --->  ???  
    10299"Add" ---> "Añadir" 
     100"Comment." --->  ???  
     101"Creator" --->  ???  
     102"Halite shutting down..." ---> "Halite se está cerrando..." 
     103"It will take the BitTorrent session a moment to shutdown cleanly after which this message will disappear and the program will close." ---> "La sesión BitTorrent tardará un tiempo en cerrarse limpiamente. Después este mensaje desaparecerá y el programa se cerrará." 
     104"Show this message in future" ---> "Mostrar este mensaje en el futuro" 
    103105"Pause" ---> "Pausa" 
    104106"Reannounce" ---> "Reanunciar" 
     
    145147"Torrent File" ---> "Archivo Torrent" 
    146148"Torrent and Data" ---> "Torrend y datos" 
     149"Open Download Folder" --->  ???  
    147150"New" ---> "Nuevo" 
    148151"Edit" ---> "Editar" 
     
    260263"Successfully %1%." --->  ???  
    261264"Failed, %1%" --->  ???  
     265"IP version 6 listen atempt failed. Not serious." --->  ???  
    262266"IP Filter blocked %1%, %2%." --->  ???  
    263267"Torrent %1% finished." --->  ???  
  • trunk/lang/Turkish.txt

    r382 r385  
    9292"..." ---> "..." 
    9393"Prompt for alternate save folder." ---> "Alternatif kaydetme klasörÃŒ için uyar." 
    94 "Halite shutting down..." ---> "Halite kapatılıyor..." 
    95 "It will take the BitTorrent session a moment to shutdown cleanly after which this message will disappear and the program will close." ---> "Bu mesaj kaybolduktan ve program kapandıktan sonra Bittorrent oturumunun dÃŒzgÃŒn bir biçimde kapatılması biraz zaman alacaktır." 
    96 "Show this message in future" ---> "Bu mesajı ilerde de göster" 
    9794"Create new torrent" ---> "Yeni torrent oluştur" 
    9895"Save" ---> "Kaydet" 
    9996"Select a file or directory to construct the torrent." ---> "Torrent oluşturmak için bir dizin ya da dosya seçin." 
    10097"Enter the tracker URLs for the torrent." ---> "Torrent için izleyici URL'lerini girin" 
    101 "Have Halite acts a DHT node." ---> "Halite bir DHT nodu gibi davransın." 
     98"Private" --->  ???  
    10299"Add" ---> "Ekle" 
     100"Comment." --->  ???  
     101"Creator" --->  ???  
     102"Halite shutting down..." ---> "Halite kapatılıyor..." 
     103"It will take the BitTorrent session a moment to shutdown cleanly after which this message will disappear and the program will close." ---> "Bu mesaj kaybolduktan ve program kapandıktan sonra Bittorrent oturumunun dÃŒzgÃŒn bir biçimde kapatılması biraz zaman alacaktır." 
     104"Show this message in future" ---> "Bu mesajı ilerde de göster" 
    103105"Pause" ---> "Duraklat" 
    104106"Reannounce" ---> "Tekrar Duyur" 
     
    145147"Torrent File" ---> "Torrent Dosyası" 
    146148"Torrent and Data" ---> "Torrent ve Veri" 
     149"Open Download Folder" --->  ???  
    147150"New" ---> "Yeni" 
    148151"Edit" ---> "DÃŒzenle" 
     
    260263"Successfully %1%." --->  ???  
    261264"Failed, %1%" --->  ???  
     265"IP version 6 listen atempt failed. Not serious." --->  ???  
    262266"IP Filter blocked %1%, %2%." --->  ???  
    263267"Torrent %1% finished." --->  ???  
  • trunk/res/Halite.rc

    r384 r385  
    240240    PUSHBUTTON      "Save",IDOK,130,114,45,14,BS_DEFPUSHBUTTON 
    241241    PUSHBUTTON      "Cancel",IDCANCEL,180,114,45,14 
    242     LTEXT           "Select a file or directory to construct the torrent.",IDC_NEWTORRENT_SELECT_TEXT,4,4,221,11 
     242    LTEXT           "Select a file or directory from which to construct the torrent.",IDC_NEWTORRENT_SELECT_TEXT,4,4,221,11 
    243243    EDITTEXT        IDC_NEWT_FILE,4,15,203,12,ES_AUTOHSCROLL 
    244     PUSHBUTTON      "...",IDC_NEWT_BROWSE,212,14,13,13 
     244    PUSHBUTTON      "File",IDC_NEWT_FILE_BROWSE,212,14,25,13 
     245    PUSHBUTTON      "Dir.",IDC_NEWT_DIR_BROWSE,212,14,25,13 
    245246    LISTBOX         IDC_NEWT_LISTTRACKERS,4,57,221,52,WS_TABSTOP|WS_VSCROLL|LBS_NOINTEGRALHEIGHT|LBS_SORT 
     247    CONTROL         "",IDC_NEWT_LISTFILES,"SysListView32",WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_REPORT,4,7,296,59 
    246248    LTEXT           "Enter the tracker URLs for the torrent.",IDC_NEWTORRENT_TRACKERS_TEXT,4,32,221,11 
    247249    EDITTEXT        IDC_NEWT_TRACKER,4,42,193,12,ES_AUTOHSCROLL 
     
    249251    AUTOCHECKBOX    "Private",IDC_NEWTORRENT_PRIVATE,4,116,118,8 
    250252    PUSHBUTTON      "Add",IDC_NEWT_ADDTRACKER,202,41,23,13 
    251     LTEXT           "Comment.",IDC_NEWTORRENT_COMMENT_TEXT,4,4,221,11 
     253    LTEXT           "Comment",IDC_NEWTORRENT_COMMENT_TEXT,4,4,50,11,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    252254    EDITTEXT        IDC_NEWTORRENT_COMMENT,4,15,203,12,ES_AUTOHSCROLL 
    253     LTEXT           "Creator",IDC_NEWTORRENT_CREATOR_TEXT,4,4,221,11 
     255    LTEXT           "Creator",IDC_NEWTORRENT_CREATOR_TEXT,4,4,50,11,SS_WORDELLIPSIS|SS_CENTERIMAGE 
    254256    EDITTEXT        IDC_NEWTORRENT_CREATOR,4,15,203,12,ES_AUTOHSCROLL 
    255257END 
  • trunk/sln/HalWiX/Product.wxs

    r382 r385  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> 
    3   <Product Id="E3A8BF7D-962F-476E-886B-FECEDD2F0FC7" Name="Halite BitTorrent Client" Language="1033" Version="0.3.0.3" Manufacturer="BinaryNotions.com"> 
     3<Product Id="E3A8BF7D-962F-476E-886B-FECEDD2F0FC7" Name="Halite BitTorrent Client" Language="1033" Version="0.3.0.3" Manufacturer="BinaryNotions.com"> 
    44    <Package Id="????????-????-????-????-????????????" Description="Description of your product" Comments="This will appear in the file summary stream." InstallerVersion="200" Compressed="yes" /> 
    55 
     
    77 
    88    <Directory Id="TARGETDIR" Name="SourceDir"> 
    9       <Directory Id="ProgramFilesFolder"> 
    10         <Directory Id="INSTALLLOCATION" Name="Halite" LongName="Halite"> 
    119 
    12           <Component Id='MainExecutable' Guid='E3A8BF7D-962F-476E-886B-FECEDD2F0FC7'> 
    13             <File Id='HaliteEXE' Name='Halite.exe' LongName='Halite.exe' DiskId='1' 
    14               Source='Halite.exe' Vital='yes'> 
    15               <Shortcut Id="startmenuHalite10" Directory="ProgramMenuDir" Name="Halite10" 
    16                 LongName="Halite 1.0" WorkingDirectory='INSTALLDIR' 
    17                 Icon="Halite10.exe" IconIndex="0" /> 
    18               <Shortcut Id="desktopHalite10" Directory="DesktopFolder" Name="Halite10" 
    19                 LongName="Halite 1.0" WorkingDirectory='INSTALLDIR' 
    20                 Icon="Halite10.exe" IconIndex="0" /> 
    21             </File> 
    22           </Component> 
     10        <Directory Id="ProgramFilesFolder"> 
     11            <Directory Id="INSTALLDIR" Name="Halite"> 
    2312 
     13                <Component Id='HaliteBinary' Guid='E3A8BF7D-962F-476E-886B-FECEDD2F0FC7'> 
     14                     
     15                    <File Id='MAINEXE' Name='Halite.exe' LongName='Halite.exe' DiskId='1' 
     16                            Source='..\..\Release\Halite.exe' Vital='yes'> 
     17                        <Shortcut Id="STARTMENUSCUT" Directory="ProgramMenuDir" Name="Halite10" 
     18                                LongName="Halite 1.0" WorkingDirectory='INSTALLDIR' 
     19                                Icon="Halite10.exe" IconIndex="0" /> 
     20                        <Shortcut Id="DESKTOPSCUT" Directory="DesktopFolder" Name="Halite10" 
     21                                LongName="Halite 1.0" WorkingDirectory='INSTALLDIR' 
     22                                Icon="Halite10.exe" IconIndex="0" /> 
     23                    </File> 
     24                     
     25                </Component> 
     26                 
     27            </Directory> 
    2428        </Directory> 
    25       </Directory> 
    2629 
    27       <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs"> 
    28         <Directory Id="ProgramMenuDir" Name='Halite' LongName="Halite 1.0" /> 
    29       </Directory> 
     30        <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs"> 
     31            <Directory Id="ProgramMenuDir" Name='Halite' LongName="Halite 1.0" /> 
     32        </Directory> 
    3033 
    31       <Directory Id="DesktopFolder" Name="Desktop" /> 
     34        <Directory Id="DesktopFolder" Name="Desktop" /> 
    3235    </Directory> 
     36     
     37    <Feature Id='Complete' Level='1'> 
     38        <ComponentRef Id='HaliteBinary' /> 
     39    </Feature> 
     40     
     41    <Icon Id="Halite10.exe" SourceFile='..\..\Release\Halite.exe' /> 
    3342 
    34     <Icon Id="Halite10.exe" SourceFile="Halite.exe" /> 
    35  
    36   </Product> 
     43</Product> 
    3744</Wix> 
  • trunk/src/Halite.cpp

    r384 r385  
    139139        else 
    140140        { 
    141 //              INI().LoadData();        
    142141                hal::event().post(shared_ptr<hal::EventDetail>( 
    143142                        new hal::EventMsg(wformat(L"Exe Path: %1%.") % hal::app().exe_path())));                 
     
    182181                        hal::bittorrent().shutDownSession();             
    183182                } 
    184                  
    185 //              INI().SaveData(); 
    186                  
     183                                 
    187184                halite().save(); 
    188185                hal::ini().save_data(); 
     
    201198         
    202199        return -1; 
    203         } 
    204          
     200        }        
    205201} 
  • trunk/src/HaliteListView.cpp

    r384 r385  
    192192 
    193193                if (!::ShellExecuteEx(&sei)) 
    194                 { 
    195194                        HAL_DEV_MSG(L"Fail"); 
    196                 } 
    197195                else 
    198                 { 
    199196                        HAL_DEV_MSG(L"Success"); 
    200                 } 
    201197        }        
    202198 
  • trunk/src/NewTorrentDialog.cpp

    r383 r385  
    77#include "stdAfx.hpp" 
    88#include "../res/resource.h" 
     9 
    910#include "NewTorrentDialog.hpp" 
     11#include "CSSFileDialog.hpp" 
    1012 
    1113LRESULT NewTorrentDialog::onInitDialog(HWND, LPARAM) 
     
    2527} 
    2628 
     29void NewTorrentDialog::OnFileBrowse(UINT, int, HWND hWnd) 
     30{        
     31        CSSFileDialog dlgOpen(TRUE, NULL, NULL, OFN_HIDEREADONLY, L"Torrents (*.torrent)|*.torrent|", m_hWnd); 
     32 
     33        if (dlgOpen.DoModal() == IDOK)  
     34        { 
     35        //      ProcessFile(dlgOpen.m_ofn.lpstrFile); 
     36        } 
     37} 
     38 
     39void NewTorrentDialog::OnDirBrowse(UINT, int, HWND hWnd) 
     40{        
     41        CFolderDialog fldDlg (NULL, L"", 
     42                BIF_RETURNONLYFSDIRS|BIF_NEWDIALOGSTYLE); 
     43 
     44        if (IDOK == fldDlg.DoModal()) 
     45        { 
     46//              SetDlgItemText(IDC_BC_SAVEFOLDER, fldDlg.m_szFolderPath); 
     47        } 
     48} 
     49 
    2750void NewTorrentDialog::onCancel(UINT, int, HWND hWnd) 
    2851{ 
     
    3154 
    3255#define NEWTORRENT_SELECT_LAYOUT \ 
    33         WMB_HEAD(WMB_COLNOMIN(_exp|150), WMB_COL(14)), \ 
    34                 WMB_ROW(_auto,  IDC_NEWTORRENT_SELECT_TEXT,  _r), \ 
    35                 WMB_ROW(_auto,  IDC_NEWT_FILE, IDC_NEWT_BROWSE), \ 
     56        WMB_HEAD(WMB_COLNOMIN(_exp|150), WMB_COL(_auto), WMB_COL(_auto)), \ 
     57                WMB_ROW(_auto,  IDC_NEWTORRENT_SELECT_TEXT,  _r, _r), \ 
     58                WMB_ROW(_auto,  IDC_NEWT_FILE, IDC_NEWT_FILE_BROWSE, IDC_NEWT_DIR_BROWSE), \ 
     59                WMB_ROWNOMAX(_exp|50,   IDC_NEWT_LISTFILES,  _r, _r), \ 
     60                WMB_ROW(_auto,  IDC_NEWTORRENT_TRACKERS_TEXT, _r, _r), \ 
     61                WMB_ROW(_auto,  IDC_NEWT_TRACKER, _r, IDC_NEWT_ADDTRACKER), \ 
     62                WMB_ROWNOMAX(_exp|50,   IDC_NEWT_LISTTRACKERS,  _r, _r), \ 
    3663        WMB_END() 
    3764 
    3865#define NEWTORRENT_TRACKERS_LAYOUT \ 
    3966        WMB_HEAD(WMB_COLNOMIN(_exp), WMB_COL(_auto)), \ 
    40                 WMB_ROW(_auto,  IDC_NEWTORRENT_TRACKERS_TEXT,  _r), \ 
    41                 WMB_ROW(_auto,  IDC_NEWT_TRACKER, IDC_NEWT_ADDTRACKER), \ 
    42                 WMB_ROW(_exp,   IDC_NEWT_LISTTRACKERS,  _r), \ 
    4367        WMB_END() 
    4468 
     
    4872        WMB_END() 
    4973 
     74#define NEWTORRENT_COMMENT_LAYOUT \ 
     75        WMB_HEAD(WMB_COL(_auto), WMB_COLNOMIN(_exp)), \ 
     76                WMB_ROW(_auto,  IDC_NEWTORRENT_COMMENT_TEXT,  IDC_NEWTORRENT_COMMENT), \ 
     77        WMB_END() 
     78 
     79#define NEWTORRENT_CREATOR_LAYOUT \ 
     80        WMB_HEAD(WMB_COL(_auto), WMB_COLNOMIN(_exp)), \ 
     81                WMB_ROW(_auto,  IDC_NEWTORRENT_CREATOR_TEXT,  IDC_NEWTORRENT_CREATOR), \ 
     82        WMB_END() 
     83 
    5084NewTorrentDialog::CWindowMapStruct* NewTorrentDialog::GetWindowMap() 
    5185{ 
    5286        BEGIN_WINDOW_MAP_INLINE(NewTorrentDialog, 3, 3, 3, 3) 
    5387                WMB_HEAD(WMB_COL(_exp)),  
    54                 WMB_ROW(_auto, NEWTORRENT_SELECT_LAYOUT), 
    55                 WMB_ROW(_exp, NEWTORRENT_TRACKERS_LAYOUT), 
    56                 WMB_ROW(_auto, IDC_NEWTORRENT_CREATOR_TEXT), 
    57                 WMB_ROW(_auto, IDC_NEWTORRENT_CREATOR), 
    58                 WMB_ROW(_auto, IDC_NEWTORRENT_COMMENT_TEXT), 
    59                 WMB_ROW(_auto, IDC_NEWTORRENT_COMMENT), 
     88                WMB_ROWNOMIN(_exp, NEWTORRENT_SELECT_LAYOUT), 
     89                WMB_ROW(_auto, NEWTORRENT_CREATOR_LAYOUT), 
     90                WMB_ROW(_auto, NEWTORRENT_COMMENT_LAYOUT), 
    6091                WMB_ROW(_auto, NEWTORRENT_BUTTONS_LAYOUT), 
    6192                WMB_END()  
     
    76107void NewTorrentDialog::OnSize(UINT type, CSize) 
    77108{ 
    78         GetWindowRect(rect_); 
    79          
     109        GetWindowRect(rect_);    
    80110        SetMsgHandled(false); 
    81111}        
  • trunk/src/NewTorrentDialog.hpp

    r383 r385  
    1515#define IDC_NEWTORRENT_COMMENT                  IDD_NEWTORRENT_BEGIN+6 
    1616#define IDC_NEWTORRENT_PRIVATE                  IDD_NEWTORRENT_BEGIN+7 
     17#define IDC_NEWT_FILE_BROWSE                    IDD_NEWTORRENT_BEGIN+8 
     18#define IDC_NEWT_DIR_BROWSE                             IDD_NEWTORRENT_BEGIN+9 
     19#define IDC_NEWT_LISTFILES                              IDD_NEWTORRENT_BEGIN+10 
    1720//#define IDC_PROG_CANCEL                 IDD_NEWTORRENT_BEGIN + 2 
    1821//#define IDC_PROG_PROGRESS               IDD_NEWTORRENT_BEGIN + 3 
     
    5558                MSG_WM_DESTROY(OnDestroy) 
    5659 
     60                COMMAND_ID_HANDLER_EX(IDC_NEWT_FILE_BROWSE, OnFileBrowse) 
     61                COMMAND_ID_HANDLER_EX(IDC_NEWT_DIR_BROWSE, OnDirBrowse) 
     62 
    5763                COMMAND_ID_HANDLER_EX(IDCANCEL, onCancel) 
    5864                COMMAND_ID_HANDLER_EX(IDOK, onCancel) 
     
    9197        } 
    9298         
     99        void OnFileBrowse(UINT, int, HWND hWnd); 
     100        void OnDirBrowse(UINT, int, HWND hWnd); 
    93101        void onCancel(UINT, int, HWND hWnd); 
    94102        void OnClose(); 
  • trunk/src/global/ini.cpp

    r383 r385  
    55//          http://www.boost.org/LICENSE_1_0.txt) 
    66 
    7 #include <boost/foreach.hpp> 
    8 #include <boost/date_time/posix_time/posix_time.hpp> 
    9  
    107#define WINVER 0x0500 
    118#define _WIN32_WINNT 0x0500 
     
    1310#define _RICHEDIT_VER 0x0200 
    1411#define VC_EXTRALEAN 
     12 
     13#include <boost/foreach.hpp> 
     14#include <boost/date_time/posix_time/posix_time.hpp> 
    1515 
    1616#include <atlbase.h> 
Note: See TracChangeset for help on using the changeset viewer.