Changeset 202


Ignore:
Timestamp:
04/28/07 13:23:16 (13 years ago)
Author:
Eoin
Message:
 
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • Halite.pnproj

    r201 r202  
    1 <Project name="Halite"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="res" path="res\"><File path="1337.rc"></File><File path="Halite.aps"></File><File path="Halite.ico"></File><File path="Halite.rc"></File><File path="Manifest.xml"></File><File path="RcTextExt.rb"></File><File path="resource.h"></File><File path="Template.rc"></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="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="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="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="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></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="Lang" path="lang\"><File path="1337.txt"></File><File path="Dutch.txt"></File><File path="French.txt"></File><File path="German.txt"></File><File path="NewLang.txt"></File><File path="Polish.txt"></File><File path="Slovenian.txt"></File><File path="Template.txt"></File><File path="Turkish.txt"></File></MagicFolder><File path="Jamfile"></File></Project> 
     1<Project name="Halite"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="res" path="res\"><File path="1337.rc"></File><File path="Halite.aps"></File><File path="Halite.ico"></File><File path="Halite.rc"></File><File path="Manifest.xml"></File><File path="RcTextExt.rb"></File><File path="resource.h"></File><File path="Template.rc"></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="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="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="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></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="Lang" path="lang\"><File path="1337.txt"></File><File path="Dutch.txt"></File><File path="French.txt"></File><File path="German.txt"></File><File path="NewLang.txt"></File><File path="Polish.txt"></File><File path="Slovenian.txt"></File><File path="Template.txt"></File><File path="Turkish.txt"></File></MagicFolder><File path="Jamfile"></File></Project> 
  • res/Halite.rc

    r199 r202  
    44 
    55#include "../res/resource.h" 
    6 #include <afxres.h> 
     6#include "afxres.h" 
    77 
    88 
     
    207207    RTEXT           "Completed:",IDC_STATIC,84,39,39,8 
    208208    LTEXT           "N/A",IDC_COMPLETE,125,39,59,8,SS_WORDELLIPSIS 
    209     GROUPBOX        "",IDC_DETAILS_GROUP,1,4294967292,359,77,0,WS_EX_TRANSPARENT 
     209    GROUPBOX        "",IDC_DETAILS_GROUP,1,-5,359,77,0,WS_EX_TRANSPARENT 
    210210END 
    211211 
  • src/HaliteDialog.cpp

    r152 r202  
    1212HaliteDialog::HaliteDialog(ui_signal& ui_sig, ListViewManager& single_sel) : 
    1313//      iniClass("dialogs/halite", "HaliteDialog"), 
    14         ui_(ui_sig), 
    15         selection_manager_(single_sel) 
    16 { 
    17         ui_.attach(bind(&HaliteDialog::updateDialog, this)); 
    18         selection_manager_.attach(bind(&HaliteDialog::selectionChanged, this, _1)); 
     14        dialogBaseClass(ui_sig, single_sel) 
     15{ 
     16//      ui_.attach(bind(&HaliteDialog::updateDialog, this)); 
     17//      selection_manager_.attach(bind(&HaliteDialog::selectionChanged, this, _1)); 
    1918         
    2019//      load(); 
     
    7473         
    7574        m_list.DeleteAllItems();         
    76         ui_.update(); 
     75        ui().update(); 
    7776} 
    7877 
    7978LRESULT HaliteDialog::onInitDialog(HWND, LPARAM) 
    8079{ 
     80        dialogBaseClass::InitializeHalDialogBase(); 
    8181        resizeClass::DlgResize_Init(false, true, WS_CLIPCHILDREN); 
    8282         
     
    112112void HaliteDialog::onPause(UINT, int, HWND) 
    113113{ 
    114         string torrentName = selection_manager_.selected(); 
     114        string torrentName = selection_manager().selected(); 
    115115        if (!hal::bittorrent().isTorrentActive(torrentName)) 
    116116        { 
     
    124124        } 
    125125         
    126         ui_.update(); 
     126        ui().update(); 
    127127} 
    128128 
     
    132132//              new hal::EventXmlException(hal::to_wstr("I'm an exception!"), hal::to_wstr("I'm a name!"))));  
    133133 
    134         hal::bittorrent().reannounceTorrent(selection_manager_.selected()); 
     134        hal::bittorrent().reannounceTorrent(selection_manager().selected()); 
    135135} 
    136136 
    137137void HaliteDialog::onRemove(UINT, int, HWND) 
    138138{ 
    139         hal::bittorrent().removeTorrent(selection_manager_.selected()); 
    140         selection_manager_.clear();              
    141          
    142         ui_.update(); 
     139        hal::bittorrent().removeTorrent(selection_manager().selected()); 
     140        selection_manager().clear();             
     141         
     142        ui().update(); 
    143143} 
    144144 
     
    147147        DoDataExchange(true); 
    148148         
    149         hal::bittorrent().setTorrentSpeed(selection_manager_.selected(), TranLimitDown, TranLimitUp); 
    150         hal::bittorrent().setTorrentLimit(selection_manager_.selected(), NoConnDown, NoConnUp); 
     149        hal::bittorrent().setTorrentSpeed(selection_manager().selected(), TranLimitDown, TranLimitUp); 
     150        hal::bittorrent().setTorrentLimit(selection_manager().selected(), NoConnDown, NoConnUp); 
    151151         
    152152        return 0; 
     
    163163{ 
    164164        hal::TorrentDetail_ptr pTD = hal::bittorrent().getTorrentDetails( 
    165                 selection_manager_.selected()); 
     165                selection_manager().selected()); 
    166166         
    167167        if (pTD)         
     
    189189                 
    190190                hal::PeerDetails peerDetails; 
    191                 hal::bittorrent().getAllPeerDetails(selection_manager_.selected(), peerDetails); 
     191                hal::bittorrent().getAllPeerDetails(selection_manager().selected(), peerDetails); 
    192192                 
    193193                if (!peerDetails.empty()) 
  • src/HaliteDialog.hpp

    r152 r202  
    55#include "DdxEx.hpp" 
    66#include "HaliteListViewCtrl.hpp" 
     7#include "HaliteDialogBase.hpp" 
    78#include "HaliteIni.hpp" 
    89 
     
    1920        public CDialogResize<HaliteDialog>, 
    2021        public CWinDataExchangeEx<HaliteDialog>, 
     22        public CHaliteDialogBase<HaliteDialog>, 
    2123//      public CHaliteIni<HaliteDialog>, 
    2224        private boost::noncopyable 
     
    2729        typedef CDialogResize<HaliteDialog> resizeClass; 
    2830//      typedef CHaliteIni<HaliteDialog> iniClass; 
     31        typedef CHaliteDialogBase<HaliteDialog> dialogBaseClass; 
    2932         
    3033         
     
    147150                DLGRESIZE_CONTROL(IDC_DETAILS_GROUP, (DLSZ_SIZE_X | DLSZ_SIZE_Y)) 
    148151        END_DLGRESIZE_MAP() 
    149  
     152         
     153        void selectionChanged(const string& torrent_name); 
     154        void updateDialog(); 
     155         
    150156protected: 
    151157        LRESULT onInitDialog(HWND, LPARAM); 
     
    159165        LRESULT OnCltColor(HDC hDC, HWND hWnd); 
    160166 
    161         void selectionChanged(const string& torrent_name); 
    162         void updateDialog(); 
    163  
    164167private: 
    165168        CButton m_btn_start; 
     
    170173        int NoConnDown, NoConnUp; 
    171174        float TranLimitDown, TranLimitUp; 
    172  
    173         ui_signal& ui_; 
    174         ListViewManager& selection_manager_; 
    175175}; 
Note: See TracChangeset for help on using the changeset viewer.