Changeset 264


Ignore:
Timestamp:
08/23/07 21:03:57 (12 years ago)
Author:
Eoin
Message:

Another overview layout in testing.

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • Halite.pnproj

    r260 r264  
    1 <Project name="Halite"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="res" path="res\"><File path="afxres.h"></File><File path="Document.rtf"></File><File path="Halite.aps"></File><File path="Halite.ico"></File><File path="Halite.rc"></File><File path="Manifest.xml"></File><File path="resource.h"></File><File path="toolbar.bmp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="src" path="src\"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="advtabs" path="advtabs\"><File path="Debug.cpp"></File><File path="Debug.hpp"></File><File path="Peers.cpp"></File><File path="Peers.hpp"></File><File path="ThemeTestDialog.hpp"></File><File path="Torrent.cpp"></File><File path="Torrent.hpp"></File><File path="Tracker.cpp"></File><File path="Tracker.hpp"></File><File path="TrackerAddDialog.hpp"></File><File path="TrackerListView.cpp"></File><File path="TrackerListView.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="global" path="global\"><File path="InheritEnum.hpp"></File><File path="ini.cpp"></File><File path="ini.hpp"></File><File path="ini_adapter.cpp"></File><File path="ini_adapter.hpp"></File><File path="logger.cpp"></File><File path="logger.hpp"></File><File path="string_conv.cpp"></File><File path="string_conv.hpp"></File><File path="tinyxml.cpp"></File><File path="tinyxml.hpp"></File><File path="tinyxmlerror.cpp"></File><File path="tinyxmlparser.cpp"></File><File path="unicode.hpp"></File><File path="utf8.hpp"></File><File path="wtl_app.cpp"></File><File path="wtl_app.hpp"></File></MagicFolder><File path="AdvHaliteDialog.cpp"></File><File path="AdvHaliteDialog.hpp"></File><File path="ConfigOptions.cpp"></File><File path="ConfigOptions.hpp"></File><File path="CSSFileDialog.hpp"></File><File path="DdxEx.hpp"></File><File path="DebugDialog.hpp"></File><File path="DropFileTarget.h"></File><File path="halConfig.cpp"></File><File path="halConfig.hpp"></File><File path="halEvent.cpp"></File><File path="halEvent.hpp"></File><File path="Halite.cpp"></File><File path="Halite.hpp"></File><File path="HaliteDialog.cpp"></File><File path="HaliteDialog.hpp"></File><File path="HaliteDialogBase.hpp"></File><File path="HaliteEditCtrl.hpp"></File><File path="HaliteIni.hpp"></File><File path="HaliteListManager.hpp"></File><File path="HaliteListView.cpp"></File><File path="HaliteListView.hpp"></File><File path="HaliteListViewCtrl.hpp"></File><File path="HaliteSortListViewCtrl.hpp"></File><File path="HaliteTabCtrl.hpp"></File><File path="HaliteTabPage.hpp"></File><File path="HaliteWindow.cpp"></File><File path="HaliteWindow.hpp"></File><File path="halTorrent.cpp"></File><File path="halTorrent.hpp"></File><File path="halTorrentInternal.hpp"></File><File path="halXmlRpc.cpp"></File><File path="halXmlRpc.hpp"></File><File path="NTray.cpp"></File><File path="NTray.hpp"></File><File path="ProgressDialog.hpp"></File><File path="SimpleHtml.h"></File><File path="SplashDialog.hpp"></File><File path="SSFileDialog.hpp"></File><File path="stdAfx.cpp"></File><File path="stdAfx.hpp"></File><File path="UxthemeWrapper.cpp"></File><File path="UxthemeWrapper.hpp"></File><File path="WinAPIMutex.hpp"></File><File path="WinAPIWaitableTimer.hpp"></File></MagicFolder><File path="Jamfile.v2"></File></Project> 
     1<Project name="Halite"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="res" path="res\"><File path="About.rtf"></File><File path="afxres.h"></File><File path="Halite.aps"></File><File path="Halite.ico"></File><File path="Halite.rc"></File><File path="Manifest.xml"></File><File path="resource.h"></File><File path="toolbar.bmp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="src" path="src\"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="advtabs" path="advtabs\"><File path="Debug.cpp"></File><File path="Debug.hpp"></File><File path="Peers.cpp"></File><File path="Peers.hpp"></File><File path="ThemeTestDialog.hpp"></File><File path="Torrent.cpp"></File><File path="Torrent.hpp"></File><File path="Tracker.cpp"></File><File path="Tracker.hpp"></File><File path="TrackerAddDialog.hpp"></File><File path="TrackerListView.cpp"></File><File path="TrackerListView.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="global" path="global\"><File path="InheritEnum.hpp"></File><File path="ini.cpp"></File><File path="ini.hpp"></File><File path="ini_adapter.cpp"></File><File path="ini_adapter.hpp"></File><File path="logger.cpp"></File><File path="logger.hpp"></File><File path="string_conv.cpp"></File><File path="string_conv.hpp"></File><File path="tinyxml.cpp"></File><File path="tinyxml.hpp"></File><File path="tinyxmlerror.cpp"></File><File path="tinyxmlparser.cpp"></File><File path="unicode.hpp"></File><File path="utf8.hpp"></File><File path="wtl_app.cpp"></File><File path="wtl_app.hpp"></File></MagicFolder><File path="AdvHaliteDialog.cpp"></File><File path="AdvHaliteDialog.hpp"></File><File path="ConfigOptions.cpp"></File><File path="ConfigOptions.hpp"></File><File path="CSSFileDialog.hpp"></File><File path="DdxEx.hpp"></File><File path="DebugDialog.hpp"></File><File path="DropFileTarget.h"></File><File path="halConfig.cpp"></File><File path="halConfig.hpp"></File><File path="halEvent.cpp"></File><File path="halEvent.hpp"></File><File path="Halite.cpp"></File><File path="Halite.hpp"></File><File path="HaliteDialog.cpp"></File><File path="HaliteDialog.hpp"></File><File path="HaliteDialogBase.hpp"></File><File path="HaliteEditCtrl.hpp"></File><File path="HaliteIni.hpp"></File><File path="HaliteListManager.hpp"></File><File path="HaliteListView.cpp"></File><File path="HaliteListView.hpp"></File><File path="HaliteListViewCtrl.hpp"></File><File path="HaliteSortListViewCtrl.hpp"></File><File path="HaliteTabCtrl.hpp"></File><File path="HaliteTabPage.hpp"></File><File path="HaliteWindow.cpp"></File><File path="HaliteWindow.hpp"></File><File path="halTorrent.cpp"></File><File path="halTorrent.hpp"></File><File path="halTorrentInternal.hpp"></File><File path="halXmlRpc.cpp"></File><File path="halXmlRpc.hpp"></File><File path="NTray.cpp"></File><File path="NTray.hpp"></File><File path="ProgressDialog.hpp"></File><File path="SimpleHtml.h"></File><File path="SplashDialog.hpp"></File><File path="SSFileDialog.hpp"></File><File path="stdAfx.cpp"></File><File path="stdAfx.hpp"></File><File path="UxthemeWrapper.cpp"></File><File path="UxthemeWrapper.hpp"></File><File path="WinAPIMutex.hpp"></File><File path="WinAPIWaitableTimer.hpp"></File></MagicFolder><File path="Jamfile.v2"></File></Project> 
  • res/Halite.rc

    r262 r264  
    1111    HALITE_LANGUAGE    "English" 
    1212END 
    13          
    14 IDD_ADVOVERVIEW DIALOGEX 0,0,313,121 
    15 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILDWINDOW 
    16 FONT 8,"MS Shell Dlg",400,0,1 
    17 BEGIN 
     13 
     14IDD_ADVOVERVIEW DIALOGEX 0, 0, 313, 121 
     15STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD 
     16FONT 8, "MS Shell Dlg", 400, 0, 0x1 
     17BEGIN    
    1818    GROUPBOX        "Torrent",IDC_GROUP_TORRENT,4,7,305,83 
    1919    GROUPBOX        "Tracker",IDC_GROUP_TRACKER,4,92,305,25 
    2020    CONTROL         "",TORRENTPROG,"msctls_progress32",WS_BORDER,10,77,291,8 
    21  
    22  
    23  /* RTEXT           "Name:",IDC_STATIC,10,16,40,8 
    24     RTEXT           "Tracker:",IDC_STATIC,10,28,40,8 
    25     RTEXT           "Status:",IDC_STATIC,10,27,40,8 
    26     RTEXT           "Time left:",IDC_STATIC,10,39,52,8*/ 
    2721         
    28     LTEXT           "N/A",IDC_NAME_STATUS,10,16,170,8,SS_WORDELLIPSIS 
    29     LTEXT           "N/A",IDC_SECOND,10,28,170,8,SS_WORDELLIPSIS 
    30     LTEXT           "N/A",IDC_TRANSFERED,10,40,170,8,SS_WORDELLIPSIS 
    31     LTEXT           "N/A",IDC_REMAINING,10,52,170,8,SS_WORDELLIPSIS 
    32     LTEXT           "N/A",IDC_RATE,10,64,170,8,SS_WORDELLIPSIS 
    33  
     22    LTEXT           "N/A",IDC_NAME_STATUS,56,17,170,8,SS_WORDELLIPSIS 
     23    LTEXT           "N/A",IDC_PEERS,56,28,66,8,SS_WORDELLIPSIS 
     24    LTEXT           "N/A",IDC_TRANSFERED,56,40,55,8,SS_WORDELLIPSIS 
     25    LTEXT           "N/A",IDC_REMAINING,56,52,58,8,SS_WORDELLIPSIS 
     26    LTEXT           "N/A",IDC_RATE,56,64,56,8,SS_WORDELLIPSIS 
     27         
    3428    EDITTEXT        IDC_EDITTLU,267,46,34,12,ES_AUTOHSCROLL 
    3529    EDITTEXT        IDC_EDITTLD,210,46,34,12,ES_AUTOHSCROLL 
    3630    EDITTEXT        IDC_EDITNCD,210,22,34,12,ES_AUTOHSCROLL 
    3731    EDITTEXT        IDC_EDITNCU,267,22,34,12,ES_AUTOHSCROLL 
    38          
    3932    LTEXT           "Torrent connection limits:",IDC_NC,185,13,115,8 
    4033    LTEXT           "Torrent transfer rates (KB/s):",IDC_TL,185,37,115,8 
     
    4336    RTEXT           "Up",IDC_TLU,245,49,20,8 
    4437    RTEXT           "Down",IDC_TLD,182,49,25,8 
    45          
    4638    LTEXT           "N/A",IDC_TRACKER,10,103,132,8,SS_WORDELLIPSIS 
    4739    LTEXT           "N/A",IDC_UPDATE,228,103,71,8,SS_WORDELLIPSIS 
     
    4941    EDITTEXT        IDC_EDITRATIO,267,60,34,12,ES_AUTOHSCROLL 
    5042    LTEXT           "Ratio (this session):",IDC_RATIOESTATIC,182,63,70,8,SS_WORDELLIPSIS 
     43         
     44    RTEXT           "Torrent:",IDC_NAME_STATUS_LABEL,10,17,41,8,SS_WORDELLIPSIS 
     45    RTEXT           "Peers:",IDC_PEERS_LABEL,9,28,42,8,SS_WORDELLIPSIS 
     46    RTEXT           "Transferd:",IDC_TRANSFERED_LABEL,9,40,42,8,SS_WORDELLIPSIS 
     47    RTEXT           "Remaining:",IDC_REMAINING_LABEL,9,52,42,8,SS_WORDELLIPSIS 
     48    RTEXT           "Rates:",IDC_RATE_LABEL,9,64,42,8,SS_WORDELLIPSIS 
     49    RTEXT           "Seeds:",IDC_SEEDS_LABEL,104,28,48,8,SS_WORDELLIPSIS 
     50    RTEXT           "Overhead:",IDC_OVERHEAD_LABEL,110,40,42,8,SS_WORDELLIPSIS 
     51    RTEXT           "ETA:",IDC_ETA_LABEL,109,52,42,8,SS_WORDELLIPSIS 
     52    RTEXT           "Ratio:",IDC_RATIO_LABEL,109,64,42,8,SS_WORDELLIPSIS 
     53         
     54    LTEXT           "N/A",IDC_SEEDS,156,28,66,8,SS_WORDELLIPSIS 
     55    LTEXT           "N/A",IDC_OVERHEAD,156,40,55,8,SS_WORDELLIPSIS 
     56    LTEXT           "N/A",IDC_ETA,155,53,58,8,SS_WORDELLIPSIS 
     57    LTEXT           "N/A",IDC_RATIO,155,64,56,8,SS_WORDELLIPSIS 
    5158END 
    5259 
  • res/resource.h

    r262 r264  
    262262#define HALITE_RTF_RES_TYPE                             40112 
    263263 
     264#define IDC_NAME_STATUS_LABEL                   40113 
     265#define IDC_PEERS_LABEL                                 40114 
     266#define IDC_TRANSFERED_LABEL                    40115 
     267#define IDC_REMAINING_LABEL                             40116 
     268#define IDC_RATE_LABEL                                  40117 
     269#define IDC_SEEDS_LABEL                                 40118 
     270#define IDC_OVERHEAD_LABEL                              40119 
     271#define IDC_ETA_LABEL                                   40120 
     272#define IDC_RATIO_LABEL                                 40121 
     273         
     274#define IDC_SEEDS                                               40122 
     275#define IDC_OVERHEAD                                    40123 
     276//#define IDC_ETA                                                       40124 
     277//#define IDC_RATIO                                             40125 
     278         
     279//#define IDC_NAME_STATUS                                       40126 
     280#define IDC_PEERS                                               40127 
     281//#define IDC_TRANSFERED                                        40128 
     282//#define IDC_REMAINING                                 40129 
     283//#define IDC_RATE                                              40130 
  • src/HaliteListView.cpp

    r258 r264  
    33#include "HaliteWindow.hpp" 
    44#include "halTorrent.hpp" 
    5  
    6  
    75 
    86HaliteListViewCtrl::HaliteListViewCtrl(HaliteWindow& HalWindow) : 
  • src/advtabs/Torrent.cpp

    r262 r264  
    134134*/       
    135135 
    136                 SetDlgItemInfo(IDC_NAME_STATUS,  
     136/*              SetDlgItemInfo(IDC_NAME_STATUS,  
    137137                        wformat(hal::app().res_wstr(HAL_NAME_STATUS))  
    138138                                % torrent->filename() 
     
    140140 
    141141                SetDlgItemInfo(IDC_SECOND, 
    142                         wformat(hal::app().res_wstr(HAL_SECOND))  
     142                        wformat(hal::app().res_wstr(HAL_SECOND)) 
     143                                % torrent->peersConnected() 
    143144                                % torrent->peers() 
    144                                 % torrent->peersConnected() 
    145                                 % torrent->seeds() 
    146                                 % torrent->seedsConnected()); 
     145                                % torrent->seedsConnected() 
     146                                % torrent->seeds()); 
    147147 
    148148                SetDlgItemInfo(IDC_TRANSFERED, 
     
    173173                                % (torrent->speed().second/1024) 
    174174                                % ratio);                
    175                  
     175                */ 
    176176                m_prog.SetPos(static_cast<int>(torrent->completion()*100));      
    177177                 
  • src/advtabs/Torrent.hpp

    r260 r264  
    8080                DLGRESIZE_CONTROL(TORRENTPROG, (DLSZ_SIZE_X)) 
    8181 
    82                 DLGRESIZE_CONTROL(IDC_NAME_STATUS, (DLSZ_SIZE_X)) 
    83                 DLGRESIZE_CONTROL(IDC_SECOND, (DLSZ_SIZE_X)) 
    84                 DLGRESIZE_CONTROL(IDC_TRANSFERED, (DLSZ_SIZE_X)) 
    85                 DLGRESIZE_CONTROL(IDC_REMAINING, (DLSZ_SIZE_X)) 
    86                 DLGRESIZE_CONTROL(IDC_RATE, (DLSZ_SIZE_X)) 
     82                DLGRESIZE_CONTROL(IDC_SEEDS_LABEL, (DLSZ_CENTER_X)) 
     83                DLGRESIZE_CONTROL(IDC_SEEDS, (DLSZ_CENTER_X)) 
     84//              DLGRESIZE_CONTROL(IDC_SECOND, (DLSZ_SIZE_X)) 
     85//              DLGRESIZE_CONTROL(IDC_TRANSFERED, (DLSZ_SIZE_X)) 
     86//              DLGRESIZE_CONTROL(IDC_REMAINING, (DLSZ_SIZE_X)) 
     87//              DLGRESIZE_CONTROL(IDC_RATE, (DLSZ_SIZE_X)) 
    8788                 
    8889                DLGRESIZE_CONTROL(IDC_TRACKER, (DLSZ_SIZE_X)) 
  • src/halTorrent.cpp

    r260 r264  
    10121012const TorrentDetails& BitTorrent::updateTorrentDetails(std::string focused, std::set<std::string> selected) 
    10131013{ 
     1014        try { 
     1015         
    10141016        mutex_t::scoped_lock l(torrentDetails_.mutex_);  
    10151017         
     
    10341036                torrentDetails_.torrents_.push_back(pT); 
    10351037        } 
     1038         
     1039        } HAL_GENERIC_TORRENT_EXCEPTION_CATCH("Torrent Unknown!", "updateTorrentDetails") 
    10361040         
    10371041        return torrentDetails_; 
  • src/halTorrentInternal.hpp

    r260 r264  
    411411TorrentDetail_ptr TorrentInternal::getTorrentDetail_ptr() const 
    412412{        
     413        try 
     414        { 
     415 
    413416        if (inSession()) 
    414417        { 
     
    499502                        downloaded_, payloadDownloaded_, totalPeers, peersConnected, totalSeeds, seedsConnected, ratio_, td, tS.next_announce)); 
    500503        } 
    501         else 
    502         { 
    503                 return TorrentDetail_ptr(new TorrentDetail(filename_, L"Not in Session", L"No tracker")); 
    504         } 
     504         
     505        } 
     506        catch (const lbt::invalid_handle&) 
     507        { 
     508                event().post(shared_ptr<EventDetail>( 
     509                        new EventInvalidTorrent(Event::critical, Event::invalidTorrent, "addTorrent", "addTorrent")));\ 
     510        } 
     511        catch (const std::exception& e) 
     512        { 
     513                event().post(shared_ptr<EventDetail>( 
     514                        new EventTorrentException(Event::critical, Event::torrentException, e.what(), "addTorrent", "addTorrent"))); 
     515        } 
     516         
     517        return TorrentDetail_ptr(new TorrentDetail(filename_, L"Not in Session", L"No tracker")); 
    505518} 
    506519 
Note: See TracChangeset for help on using the changeset viewer.