Changeset 356


Ignore:
Timestamp:
12/23/07 11:22:35 (12 years ago)
Author:
Eoin
Message:

Fixed a bug with blocking non-visible uiUpdate connections.

Files:
23 edited

Legend:

Unmodified
Added
Removed
  • Halite.pnproj

    r353 r356  
    1 <Project name="Halite"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="res" path="res\"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="res24" path="res24\"><File path="ad.ico"></File><File path="ae.ico"></File><File path="af.ico"></File><File path="ag.ico"></File><File path="ai.ico"></File><File path="al.ico"></File><File path="am.ico"></File><File path="an.ico"></File><File path="ao.ico"></File><File path="ar.ico"></File><File path="as.ico"></File><File path="at.ico"></File><File path="au.ico"></File><File path="aw.ico"></File><File path="ax.ico"></File><File path="az.ico"></File><File path="ba.ico"></File><File path="bb.ico"></File><File path="bd.ico"></File><File path="be.ico"></File><File path="bf.ico"></File><File path="bg.ico"></File><File path="bh.ico"></File><File path="bi.ico"></File><File path="bj.ico"></File><File path="bm.ico"></File><File path="bn.ico"></File><File path="bo.ico"></File><File path="br.ico"></File><File path="bs.ico"></File><File path="bt.ico"></File><File path="bw.ico"></File><File path="by.ico"></File><File path="bz.ico"></File><File path="ca.ico"></File><File path="cc.ico"></File><File path="cd.ico"></File><File path="cf.ico"></File><File path="cg.ico"></File><File path="ch.ico"></File><File path="ci.ico"></File><File path="ck.ico"></File><File path="cl.ico"></File><File path="cm.ico"></File><File path="cn.ico"></File><File path="co.ico"></File><File path="cr.ico"></File><File path="cu.ico"></File><File path="cv.ico"></File><File path="cx.ico"></File><File path="cy.ico"></File><File path="cz.ico"></File><File path="de.ico"></File><File path="dj.ico"></File><File path="dk.ico"></File><File path="dm.ico"></File><File path="do.ico"></File><File path="dz.ico"></File><File path="ec.ico"></File><File path="ee.ico"></File><File path="eg.ico"></File><File path="eh.ico"></File><File path="er.ico"></File><File path="es.ico"></File><File path="et.ico"></File><File path="fi.ico"></File><File path="fj.ico"></File><File path="fk.ico"></File><File path="fm.ico"></File><File path="fo.ico"></File><File path="fr.ico"></File><File path="ga.ico"></File><File path="gb.ico"></File><File path="gd.ico"></File><File path="ge.ico"></File><File path="gg.ico"></File><File path="gh.ico"></File><File path="gi.ico"></File><File path="gk.ico"></File><File path="gl.ico"></File><File path="gm.ico"></File><File path="gn.ico"></File><File path="gp.ico"></File><File path="gq.ico"></File><File path="gr.ico"></File><File path="gs.ico"></File><File path="gt.ico"></File><File path="gu.ico"></File><File path="gw.ico"></File><File path="gy.ico"></File><File path="hk.ico"></File><File path="hn.ico"></File><File path="hr.ico"></File><File path="ht.ico"></File><File path="hu.ico"></File><File path="Icons.h"></File><File path="Icons.rc"></File><File path="id.ico"></File><File path="ie.ico"></File><File path="il.ico"></File><File path="im.ico"></File><File path="in.ico"></File><File path="io.ico"></File><File path="iq.ico"></File><File path="ir.ico"></File><File path="is.ico"></File><File path="it.ico"></File><File path="je.ico"></File><File path="jm.ico"></File><File path="jo.ico"></File><File path="jp.ico"></File><File path="ke.ico"></File><File path="kg.ico"></File><File path="kh.ico"></File><File path="ki.ico"></File><File path="km.ico"></File><File path="kn.ico"></File><File path="kp.ico"></File><File path="kr.ico"></File><File path="kw.ico"></File><File path="ky.ico"></File><File path="kz.ico"></File><File path="la.ico"></File><File path="lb.ico"></File><File path="lc.ico"></File><File path="li.ico"></File><File path="lk.ico"></File><File path="lr.ico"></File><File path="ls.ico"></File><File path="lt.ico"></File><File path="lu.ico"></File><File path="lv.ico"></File><File path="ly.ico"></File><File path="ma.ico"></File><File path="mc.ico"></File><File path="md.ico"></File><File path="me.ico"></File><File path="mg.ico"></File><File path="mh.ico"></File><File path="mk.ico"></File><File path="ml.ico"></File><File path="mm.ico"></File><File path="mn.ico"></File><File path="mo.ico"></File><File path="mp.ico"></File><File path="mq.ico"></File><File path="mr.ico"></File><File path="ms.ico"></File><File path="mt.ico"></File><File path="mu.ico"></File><File path="mv.ico"></File><File path="mw.ico"></File><File path="mx.ico"></File><File path="my.ico"></File><File path="mz.ico"></File><File path="na.ico"></File><File path="nc.ico"></File><File path="ne.ico"></File><File path="nf.ico"></File><File path="ng.ico"></File><File path="ni.ico"></File><File path="nl.ico"></File><File path="no.ico"></File><File path="not.ico"></File><File path="np.ico"></File><File path="nr.ico"></File><File path="nu.ico"></File><File path="nz.ico"></File><File path="om.ico"></File><File path="pa.ico"></File><File path="pe.ico"></File><File path="pf.ico"></File><File path="pg.ico"></File><File path="ph.ico"></File><File path="pk.ico"></File><File path="pl.ico"></File><File path="pm.ico"></File><File path="pn.ico"></File><File path="pr.ico"></File><File path="ps.ico"></File><File path="pt.ico"></File><File path="pw.ico"></File><File path="py.ico"></File><File path="qa.ico"></File><File path="ro.ico"></File><File path="rs.ico"></File><File path="ru.ico"></File><File path="rw.ico"></File><File path="sa.ico"></File><File path="sb.ico"></File><File path="sc.ico"></File><File path="sd.ico"></File><File path="se.ico"></File><File path="sg.ico"></File><File path="sh.ico"></File><File path="si.ico"></File><File path="sk.ico"></File><File path="sl.ico"></File><File path="sm.ico"></File><File path="sn.ico"></File><File path="so.ico"></File><File path="sr.ico"></File><File path="st.ico"></File><File path="sv.ico"></File><File path="sy.ico"></File><File path="sz.ico"></File><File path="tc.ico"></File><File path="td.ico"></File><File path="Template.rc"></File><File path="tf.ico"></File><File path="tg.ico"></File><File path="th.ico"></File><File path="tj.ico"></File><File path="tk.ico"></File><File path="tl.ico"></File><File path="tm.ico"></File><File path="tn.ico"></File><File path="to.ico"></File><File path="tr.ico"></File><File path="tt.ico"></File><File path="tv.ico"></File><File path="tw.ico"></File><File path="tz.ico"></File><File path="ua.ico"></File><File path="ug.ico"></File><File path="us.ico"></File><File path="uy.ico"></File><File path="uz.ico"></File><File path="va.ico"></File><File path="vc.ico"></File><File path="ve.ico"></File><File path="vg.ico"></File><File path="vi.ico"></File><File path="vn.ico"></File><File path="vu.ico"></File><File path="wf.ico"></File><File path="ws.ico"></File><File path="ye.ico"></File><File path="yu.ico"></File><File path="za.ico"></File><File path="zm.ico"></File><File path="zw.ico"></File></MagicFolder><File path="About.rtf"></File><File path="afxres.h"></File><File path="English.rtf"></File><File path="Halite.aps"></File><File path="Halite.ico"></File><File path="Halite.rc"></File><File path="Icons.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="Files.cpp"></File><File path="Files.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="TinyXml.rb"></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><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="test" path="test\"><File path="client_test.cpp"></File></MagicFolder><File path="AddTorrentDialog.hpp"></File><File path="AdvHaliteDialog.cpp"></File><File path="AdvHaliteDialog.hpp"></File><File path="AtlAutosizeDlg.h"></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="halIni.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="HaliteMini.cpp"></File><File path="HaliteMini.hpp"></File><File path="HaliteSortListViewCtrl.hpp"></File><File path="HaliteTabCtrl.hpp"></File><File path="HaliteTabPage.hpp"></File><File path="HaliteUpdateLock.hpp"></File><File path="HaliteWindow.cpp"></File><File path="HaliteWindow.hpp"></File><File path="HaliteWindowMini.cpp"></File><File path="HaliteWindowMini.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="afxres.h"></File><File path="English.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="Files.cpp"></File><File path="Files.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="TinyXml.rb"></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><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="test" path="test\"><File path="client_test.cpp"></File></MagicFolder><File path="AddTorrentDialog.hpp"></File><File path="AdvHaliteDialog.cpp"></File><File path="AdvHaliteDialog.hpp"></File><File path="AtlAutosizeDlg.h"></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="halIni.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="HaliteListManager.hpp"></File><File path="HaliteListView.cpp"></File><File path="HaliteListView.hpp"></File><File path="HaliteListViewCtrl.hpp"></File><File path="HaliteMini.cpp"></File><File path="HaliteMini.hpp"></File><File path="HaliteSortListViewCtrl.hpp"></File><File path="HaliteTabCtrl.hpp"></File><File path="HaliteTabPage.hpp"></File><File path="HaliteUpdateLock.hpp"></File><File path="HaliteWindow.cpp"></File><File path="HaliteWindow.hpp"></File><File path="HaliteWindowMini.cpp"></File><File path="HaliteWindowMini.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> 
  • src/HaliteWindowMini.cpp

    r340 r356  
    5555         
    5656        RECT rc; GetClientRect(&rc); 
    57         SetMenu(0); 
    58          
     57        SetMenu(0);      
    5958         
    6059        m_trayIcon.Create(this, IDR_TRAY_MENU, L"Halite",  
    6160                CTrayNotifyIcon::LoadIconResource(IDR_APP_ICON), WM_TRAYNOTIFY, IDR_TRAY_MENU); 
     61         
     62        // Register StatusBar for UIUpdates 
     63        UISetCheck(ID_VIEW_STATUS_BAR, 1); 
     64        UISetCheck(IDR_TRAY_MENU, 1); 
    6265         
    6366        // Register UIEvents and the timer for the monitoring interval 
  • trunk/Halite.pnproj

    r355 r356  
    1 <Project name="Halite"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="res" path="res\"><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="res24" path="res24\"><File path="ad.ico"></File><File path="ae.ico"></File><File path="af.ico"></File><File path="ag.ico"></File><File path="ai.ico"></File><File path="al.ico"></File><File path="am.ico"></File><File path="an.ico"></File><File path="ao.ico"></File><File path="ar.ico"></File><File path="as.ico"></File><File path="at.ico"></File><File path="au.ico"></File><File path="aw.ico"></File><File path="ax.ico"></File><File path="az.ico"></File><File path="ba.ico"></File><File path="bb.ico"></File><File path="bd.ico"></File><File path="be.ico"></File><File path="bf.ico"></File><File path="bg.ico"></File><File path="bh.ico"></File><File path="bi.ico"></File><File path="bj.ico"></File><File path="bm.ico"></File><File path="bn.ico"></File><File path="bo.ico"></File><File path="br.ico"></File><File path="bs.ico"></File><File path="bt.ico"></File><File path="bw.ico"></File><File path="by.ico"></File><File path="bz.ico"></File><File path="ca.ico"></File><File path="cc.ico"></File><File path="cd.ico"></File><File path="cf.ico"></File><File path="cg.ico"></File><File path="ch.ico"></File><File path="ci.ico"></File><File path="ck.ico"></File><File path="cl.ico"></File><File path="cm.ico"></File><File path="cn.ico"></File><File path="co.ico"></File><File path="cr.ico"></File><File path="cu.ico"></File><File path="cv.ico"></File><File path="cx.ico"></File><File path="cy.ico"></File><File path="cz.ico"></File><File path="de.ico"></File><File path="dj.ico"></File><File path="dk.ico"></File><File path="dm.ico"></File><File path="do.ico"></File><File path="dz.ico"></File><File path="ec.ico"></File><File path="ee.ico"></File><File path="eg.ico"></File><File path="eh.ico"></File><File path="er.ico"></File><File path="es.ico"></File><File path="et.ico"></File><File path="fi.ico"></File><File path="fj.ico"></File><File path="fk.ico"></File><File path="fm.ico"></File><File path="fo.ico"></File><File path="fr.ico"></File><File path="ga.ico"></File><File path="gb.ico"></File><File path="gd.ico"></File><File path="ge.ico"></File><File path="gg.ico"></File><File path="gh.ico"></File><File path="gi.ico"></File><File path="gk.ico"></File><File path="gl.ico"></File><File path="gm.ico"></File><File path="gn.ico"></File><File path="gp.ico"></File><File path="gq.ico"></File><File path="gr.ico"></File><File path="gs.ico"></File><File path="gt.ico"></File><File path="gu.ico"></File><File path="gw.ico"></File><File path="gy.ico"></File><File path="hk.ico"></File><File path="hn.ico"></File><File path="hr.ico"></File><File path="ht.ico"></File><File path="hu.ico"></File><File path="Icons.h"></File><File path="Icons.rc"></File><File path="id.ico"></File><File path="ie.ico"></File><File path="il.ico"></File><File path="im.ico"></File><File path="in.ico"></File><File path="io.ico"></File><File path="iq.ico"></File><File path="ir.ico"></File><File path="is.ico"></File><File path="it.ico"></File><File path="je.ico"></File><File path="jm.ico"></File><File path="jo.ico"></File><File path="jp.ico"></File><File path="ke.ico"></File><File path="kg.ico"></File><File path="kh.ico"></File><File path="ki.ico"></File><File path="km.ico"></File><File path="kn.ico"></File><File path="kp.ico"></File><File path="kr.ico"></File><File path="kw.ico"></File><File path="ky.ico"></File><File path="kz.ico"></File><File path="la.ico"></File><File path="lb.ico"></File><File path="lc.ico"></File><File path="li.ico"></File><File path="lk.ico"></File><File path="lr.ico"></File><File path="ls.ico"></File><File path="lt.ico"></File><File path="lu.ico"></File><File path="lv.ico"></File><File path="ly.ico"></File><File path="ma.ico"></File><File path="mc.ico"></File><File path="md.ico"></File><File path="me.ico"></File><File path="mg.ico"></File><File path="mh.ico"></File><File path="mk.ico"></File><File path="ml.ico"></File><File path="mm.ico"></File><File path="mn.ico"></File><File path="mo.ico"></File><File path="mp.ico"></File><File path="mq.ico"></File><File path="mr.ico"></File><File path="ms.ico"></File><File path="mt.ico"></File><File path="mu.ico"></File><File path="mv.ico"></File><File path="mw.ico"></File><File path="mx.ico"></File><File path="my.ico"></File><File path="mz.ico"></File><File path="na.ico"></File><File path="nc.ico"></File><File path="ne.ico"></File><File path="nf.ico"></File><File path="ng.ico"></File><File path="ni.ico"></File><File path="nl.ico"></File><File path="no.ico"></File><File path="not.ico"></File><File path="np.ico"></File><File path="nr.ico"></File><File path="nu.ico"></File><File path="nz.ico"></File><File path="om.ico"></File><File path="pa.ico"></File><File path="pe.ico"></File><File path="pf.ico"></File><File path="pg.ico"></File><File path="ph.ico"></File><File path="pk.ico"></File><File path="pl.ico"></File><File path="pm.ico"></File><File path="pn.ico"></File><File path="pr.ico"></File><File path="ps.ico"></File><File path="pt.ico"></File><File path="pw.ico"></File><File path="py.ico"></File><File path="qa.ico"></File><File path="ro.ico"></File><File path="rs.ico"></File><File path="ru.ico"></File><File path="rw.ico"></File><File path="sa.ico"></File><File path="sb.ico"></File><File path="sc.ico"></File><File path="sd.ico"></File><File path="se.ico"></File><File path="sg.ico"></File><File path="sh.ico"></File><File path="si.ico"></File><File path="sk.ico"></File><File path="sl.ico"></File><File path="sm.ico"></File><File path="sn.ico"></File><File path="so.ico"></File><File path="sr.ico"></File><File path="st.ico"></File><File path="sv.ico"></File><File path="sy.ico"></File><File path="sz.ico"></File><File path="tc.ico"></File><File path="td.ico"></File><File path="Template.rc"></File><File path="tf.ico"></File><File path="tg.ico"></File><File path="th.ico"></File><File path="tj.ico"></File><File path="tk.ico"></File><File path="tl.ico"></File><File path="tm.ico"></File><File path="tn.ico"></File><File path="to.ico"></File><File path="tr.ico"></File><File path="tt.ico"></File><File path="tv.ico"></File><File path="tw.ico"></File><File path="tz.ico"></File><File path="ua.ico"></File><File path="ug.ico"></File><File path="us.ico"></File><File path="uy.ico"></File><File path="uz.ico"></File><File path="va.ico"></File><File path="vc.ico"></File><File path="ve.ico"></File><File path="vg.ico"></File><File path="vi.ico"></File><File path="vn.ico"></File><File path="vu.ico"></File><File path="wf.ico"></File><File path="ws.ico"></File><File path="ye.ico"></File><File path="yu.ico"></File><File path="za.ico"></File><File path="zm.ico"></File><File path="zw.ico"></File></MagicFolder><File path="About.rtf"></File><File path="afxres.h"></File><File path="English.rtf"></File><File path="Halite.aps"></File><File path="Halite.ico"></File><File path="Halite.rc"></File><File path="Icons.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="Files.cpp"></File><File path="Files.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="TinyXml.rb"></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><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="test" path="test\"><File path="client_test.cpp"></File></MagicFolder><File path="AddTorrentDialog.hpp"></File><File path="AdvHaliteDialog.cpp"></File><File path="AdvHaliteDialog.hpp"></File><File path="AtlAutosizeDlg.h"></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="halIni.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="HaliteMini.cpp"></File><File path="HaliteMini.hpp"></File><File path="HaliteSortListViewCtrl.hpp"></File><File path="HaliteTabCtrl.hpp"></File><File path="HaliteTabPage.hpp"></File><File path="HaliteUpdateLock.hpp"></File><File path="HaliteWindow.cpp"></File><File path="HaliteWindow.hpp"></File><File path="HaliteWindowMini.cpp"></File><File path="HaliteWindowMini.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="afxres.h"></File><File path="English.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="Files.cpp"></File><File path="Files.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="TinyXml.rb"></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><MagicFolder excludeFolders="CVS;.svn" filter="*.*" name="test" path="test\"><File path="client_test.cpp"></File></MagicFolder><File path="AddTorrentDialog.hpp"></File><File path="AdvHaliteDialog.cpp"></File><File path="AdvHaliteDialog.hpp"></File><File path="AtlAutosizeDlg.h"></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="halIni.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="HaliteListManager.hpp"></File><File path="HaliteListView.cpp"></File><File path="HaliteListView.hpp"></File><File path="HaliteListViewCtrl.hpp"></File><File path="HaliteMini.cpp"></File><File path="HaliteMini.hpp"></File><File path="HaliteSortListViewCtrl.hpp"></File><File path="HaliteTabCtrl.hpp"></File><File path="HaliteTabPage.hpp"></File><File path="HaliteUpdateLock.hpp"></File><File path="HaliteWindow.cpp"></File><File path="HaliteWindow.hpp"></File><File path="HaliteWindowMini.cpp"></File><File path="HaliteWindowMini.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> 
  • trunk/Jamfile.v2

    r355 r356  
    2424         
    2525        stdAfx.cpp 
     26        Halite.cpp 
     27        HaliteWindow.cpp 
    2628        HaliteListView.cpp 
    2729        HaliteDialog.cpp 
     
    3941        ; 
    4042         
    41         SOURCES += Halite.cpp ; 
    42         SOURCES += HaliteWindow.cpp ; 
     43SOURCES_MINI = 
     44        global/wtl_app.cpp 
     45        global/logger.cpp 
     46#       global/string_conv.cpp 
     47        global/ini.cpp 
     48        global/ini_adapter.cpp 
     49        global/tinyxml.cpp 
     50        global/tinyxmlerror.cpp 
     51        global/tinyxmlparser.cpp 
     52         
     53        stdAfx.cpp 
     54        Halite.cpp 
     55        HaliteWindowMini.cpp 
     56        NTray.cpp 
     57        ; 
    4358         
    4459RESOURCES = 
     
    7388exe Halite 
    7489        : 
     90        ./src/$(SOURCES) 
    7591        ./src/$(LIB_SOURCES) 
    76         ./src/$(SOURCES) 
    7792        ./res/$(RESOURCES) 
    7893        :  
     
    110125        ; 
    111126 
    112 exe ClientTest 
    113         : 
    114         ./src/test/client_test.cpp 
    115         :        
    116         <library>$(LIBS) 
    117         <library>/boost/program_options//boost_program_options/<link>static 
    118          
    119         <runtime-link>static 
    120         <threading>multi 
    121         <asynch-exceptions>on 
    122          
    123         <variant>release:<linkflags>/OPT:ICF=5 
    124         <variant>release:<linkflags>/OPT:REF 
    125         <variant>release:<warnings>off 
    126         <variant>release:<define>NDEBUG 
    127          
    128         <define>_UNICODE 
    129         <define>UNICODE 
    130         <define>WIN32 
    131         <define>_WINDOWS         
    132         <define>_CRT_SECURE_NO_DEPRECATE 
    133         <define>_SCL_SECURE_NO_DEPRECATE 
    134         <define>_CRT_SECURE_NO_WARNINGS 
    135          
    136         <linkflags>/SUBSYSTEM:CONSOLE 
    137         ; 
     127#exe ClientTest 
     128#       : 
     129#       ./src/test/client_test.cpp 
     130#       :        
     131#       <library>$(LIBS) 
     132#       <library>/boost/program_options//boost_program_options/<link>static 
     133#        
     134#       <runtime-link>static 
     135#       <threading>multi 
     136#       <asynch-exceptions>on 
     137#        
     138#       <variant>release:<linkflags>/OPT:ICF=5 
     139#       <variant>release:<linkflags>/OPT:REF 
     140#       <variant>release:<warnings>off 
     141#       <variant>release:<define>NDEBUG 
     142#        
     143#       <define>_UNICODE 
     144#       <define>UNICODE 
     145#       <define>WIN32 
     146#       <define>_WINDOWS         
     147#       <define>_CRT_SECURE_NO_DEPRECATE 
     148#       <define>_SCL_SECURE_NO_DEPRECATE 
     149#       <define>_CRT_SECURE_NO_WARNINGS 
     150#        
     151#       <linkflags>/SUBSYSTEM:CONSOLE 
     152#       ; 
    138153 
    139154lib comctl32 : : <name>comctl32.lib ; 
  • trunk/res/Halite.rc

    r348 r356  
    464464    IDS_SAVEPROMPT                "Select a directory to save the files to or cancel to not download torrent at all." 
    465465    IDS_NA                        "N/A" 
    466     HAL_INF                       "" 
     466    HAL_INF                       "" 
    467467    HAL_COMPLETED_SUMMARY         "%1$.2fMB of %2$.2fMB" 
    468468    HAL_DOWNLOAD_SUMMARY          "This Session Downloaded %1$.2fMB, Uploaded %2$.2fMB, Ratio %3$.2f." 
  • trunk/src/HaliteDialog.cpp

    r345 r356  
    4949                WMB_ROW(_auto,  IDC_NAME_STATIC, IDC_NAME, _r, _r), \ 
    5050                WMB_ROW(_auto,  IDC_TRACKER_STATIC, IDC_TRACKER, _r, _r), \ 
     51                WMB_ROW(_gap), \ 
    5152                WMB_ROW(_auto,  IDC_STATUS_STATIC, IDC_STATUS, _r, _r), \ 
    5253                WMB_ROW(_auto,  IDC_TIME_STATIC, IDC_AVAIL, IDC_COMPLETED_STATIC, IDC_COMPLETE), \ 
  • trunk/src/HaliteDialog.hpp

    r347 r356  
    8585                BEGIN_MSG_MAP_EX(thisClass) 
    8686                        MSG_WM_DESTROY(OnDestroy) 
    87          
    8887                        CHAIN_MSG_MAP(listClass) 
    8988                        DEFAULT_REFLECTION_HANDLER() 
     
    175174                COMMAND_ID_HANDLER_EX(BTNREMOVE, OnRemove) 
    176175 
     176                CHAIN_MSG_MAP(dialogBaseClass) 
    177177                CHAIN_MSG_MAP(autosizeClass) 
    178178                REFLECT_NOTIFICATIONS() 
     
    200200 
    201201        LRESULT OnEditKillFocus(UINT uCode, int nCtrlID, HWND hwndCtrl); 
    202         LRESULT OnCltColor(HDC hDC, HWND hWnd); 
    203          
     202        LRESULT OnCltColor(HDC hDC, HWND hWnd);  
    204203 
    205204private: 
  • trunk/src/HaliteDialogBase.hpp

    r326 r356  
    3636                if (show) 
    3737                { 
    38                 //      hal::event().post(shared_ptr<hal::EventDetail>( 
    39                 //              new hal::EventMsg(L"True"))); 
    4038                        connection_.unblock(); 
    4139                } 
    4240                else 
    4341                { 
    44                 //      hal::event().post(shared_ptr<hal::EventDetail>( 
    45                 //              new hal::EventMsg(L"False"))); 
    4642                        connection_.block(); 
    4743                } 
     44                 
     45                SetMsgHandled(false); 
    4846        } 
    4947         
    5048        void InitializeHalDialogBase() 
    51         {} 
     49        { 
     50                TBase* pT = static_cast<TBase*>(this);   
     51                OnShow(pT->IsWindowVisible(), 0); 
     52        } 
    5253         
    5354        HaliteListViewCtrl& torrentsList()  
     
    7576                         
    7677                        hal::event().post(shared_ptr<hal::EventDetail>( 
    77                                 new hal::EventMsg(L"focusChanged 3"))); 
     78                                new hal::EventMsg(L"Adv dialog focusChanged"))); 
    7879                } 
    7980                else 
     
    101102         
    102103protected: 
    103 //      wstring current_torrent_name_; 
    104104        hal::TorrentDetail_ptr focusedTorrent_; 
    105105 
  • trunk/src/HaliteMini.cpp

    r340 r356  
    2020#include "SplashDialog.hpp" 
    2121 
    22 #include "HaliteMini.hpp" 
     22#define HALITE_MINI 
     23#include "Halite.hpp" 
    2324 
    2425Halite& halite() 
     
    149150                _Module.AddMessageLoop(&theLoop); 
    150151                         
    151                         hal::app().set_initial_hinstance(hInstance); 
    152                         if (halite().dll() != L"") hal::app().set_res_dll(halite().dll()); 
     152                        if (halite().dll() != L"") hal::app().res_set_dll(halite().dll()); 
    153153                         
    154154                        HaliteWindow wndMain(WMU_ARE_YOU_ME); 
     
    162162                         
    163163                        wndMain.SetIcon(LoadIcon(hInstance, MAKEINTRESOURCE(IDR_APP_ICON)), false);      
     164                        wndMain.ShowWindow(nCmdShow); 
    164165                         
    165166                        nRet = theLoop.Run();                            
  • trunk/src/HaliteMini.hpp

    r347 r356  
    2020         
    2121class Halite : 
    22         public ChalIni<Halite>, 
     22        public hal::IniBase<Halite>, 
    2323        private boost::noncopyable 
    2424{ 
    2525public: 
    2626        Halite() : 
    27                 ChalIni<Halite>("globals/halite", "Halite"), 
     27                hal::IniBase<Halite>("globals/halite", "Halite"), 
    2828                oneInst(false), 
    2929                logDebug_(false), 
  • trunk/src/HaliteTabCtrl.hpp

    r268 r356  
    3434        { 
    3535                if (currentPage_) 
    36                         ::ShowWindow(currentPage_, false); 
     36                        ::ShowWindow(currentPage_, SW_HIDE); 
    3737 
    3838                if (!pages_.empty()) 
    3939                { 
    4040                        currentPage_ = pages_[index]; 
    41                         ::ShowWindow(currentPage_, true); 
     41                        ::ShowWindow(currentPage_, SW_SHOW); 
    4242 
    4343                        RECT rect; 
  • trunk/src/HaliteWindow.cpp

    r324 r356  
    151151        if (!advancedUI) 
    152152        {                
    153                 mp_dlg->ShowWindow(true); 
    154                 mp_advDlg->ShowWindow(false); 
     153                mp_dlg->ShowWindow(SW_SHOW); 
     154                mp_advDlg->ShowWindow(SW_HIDE); 
    155155                m_Split.SetSplitterPanes(haliteList, *mp_dlg); 
    156156        } 
    157157        else 
    158158        {                
    159                 mp_dlg->ShowWindow(false); 
    160                 mp_advDlg->ShowWindow(true); 
     159                mp_dlg->ShowWindow(SW_HIDE); 
     160                mp_advDlg->ShowWindow(SW_SHOW); 
    161161                m_Split.SetSplitterPanes(haliteList, *mp_advDlg); 
    162162        } 
  • trunk/src/HaliteWindowMini.cpp

    r340 r356  
    3737} 
    3838 
    39 BOOL HaliteWindow::PreTranslateMessage(MSG* pMsg) 
    40 { 
    41         if(CFrameWindowImpl<HaliteWindow>::PreTranslateMessage(pMsg)) 
    42                 return TRUE; 
    43                  
    44         return FALSE; 
    45  
    46 } 
    47  
    4839LRESULT HaliteWindow::OnCreate(LPCREATESTRUCT lpcs) 
    4940{ 
     
    5546         
    5647        RECT rc; GetClientRect(&rc); 
    57         SetMenu(0); 
    58          
    59          
     48        SetMenu(0);      
     49         
     50        //Init ToolBar 
     51        HWND hWndToolBar = CreateSimpleToolBarCtrl(m_hWnd, IDR_MAINFRAME, FALSE, ATL_SIMPLE_TOOLBAR_PANE_STYLE); 
     52         
     53        // Init ReBar 
     54        CreateSimpleReBar(ATL_SIMPLE_REBAR_NOBORDER_STYLE); 
     55        AddSimpleReBarBand(hWndToolBar, NULL, TRUE); 
     56         
     57        // Init the StatusBar    
     58        m_hWndStatusBar = m_StatusBar.Create(*this); 
     59        UIAddStatusBar(m_hWndStatusBar); 
     60         
     61        int panes[] = {ID_DEFAULT_PANE, IDPANE_FILTER, IDPANE_DHT, IDPANE_STATUS}; 
     62        m_StatusBar.SetPanes(panes, 4, false); 
     63         
     64        // Create the Splitter Control 
     65        m_Split.Create(m_hWnd, rc, NULL, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN); 
     66        m_Split.SetSplitterExtendedStyle(!SPLIT_PROPORTIONAL, SPLIT_PROPORTIONAL); 
     67        m_Split.SetSplitterPos(splitterPos); 
     68         
     69        m_hWndClient = m_Split.m_hWnd; 
     70         
     71        // Create the tray icon. 
    6072        m_trayIcon.Create(this, IDR_TRAY_MENU, L"Halite",  
    6173                CTrayNotifyIcon::LoadIconResource(IDR_APP_ICON), WM_TRAYNOTIFY, IDR_TRAY_MENU); 
     74        m_trayIcon.Hide(); 
     75         
     76        // Add ToolBar and register it along with StatusBar for UIUpdates 
     77        UIAddToolBar(hWndToolBar); 
     78        UISetCheck(ID_VIEW_TOOLBAR, 1); 
     79        UISetCheck(ID_VIEW_STATUS_BAR, 1); 
     80        UISetCheck(IDR_TRAY_MENU, 1); 
    6281         
    6382        // Register UIEvents and the timer for the monitoring interval 
     
    7190        CMessageLoop* pLoop = _Module.GetMessageLoop(); 
    7291        assert(pLoop != NULL); 
    73         pLoop->AddMessageFilter(this); 
     92//      pLoop->AddMessageFilter(this); 
    7493        pLoop->AddIdleHandler(this); 
    7594         
     
    187206 
    188207//      ui_update_signal_(torrents); 
     208        updateWindow(); 
    189209 
    190210        } 
  • trunk/src/HaliteWindowMini.hpp

    r347 r356  
    88 
    99#define HALITE_MINI 
     10#include "../res/resource.h" 
    1011 
    1112#include "stdAfx.hpp" 
     
    4748        public CUpdateUI<HaliteWindow>, 
    4849        public CDropFileTarget<HaliteWindow>, 
    49         public CMessageFilter, 
     50//      public CMessageFilter, 
    5051        public CIdleHandler, 
    51         public ChalIni<HaliteWindow>, 
     52        public hal::IniBase<HaliteWindow>, 
    5253        private boost::noncopyable 
    5354{ 
     
    128129         
    129130protected: 
    130         typedef ChalIni<HaliteWindow> iniClass; 
    131  
    132         virtual BOOL PreTranslateMessage(MSG* pMsg); 
     131        typedef hal::IniBase<HaliteWindow> iniClass; 
     132 
     133//      virtual BOOL PreTranslateMessage(MSG* pMsg); 
    133134 
    134135        virtual BOOL OnIdle() 
  • trunk/src/SplashDialog.hpp

    r340 r356  
    1010#       include "Halite.hpp" 
    1111#else 
    12 #       include "HaliteMini.hpp" 
     12#       include "Halite.hpp" 
    1313#endif 
    1414 
  • trunk/src/advtabs/Debug.hpp

    r347 r356  
    195195                        if (PreTranslateMessage((LPMSG)lParam)) return TRUE; 
    196196 
     197                CHAIN_MSG_MAP(dialogBaseClass) 
    197198                CHAIN_MSG_MAP(resizeClass) 
    198199                CHAIN_MSG_MAP(baseClass) 
  • trunk/src/advtabs/Peers.hpp

    r345 r356  
    160160                        if (PreTranslateMessage((LPMSG)lParam)) return TRUE; 
    161161 
     162                CHAIN_MSG_MAP(dialogBaseClass) 
    162163                CHAIN_MSG_MAP(resizeClass) 
    163164                CHAIN_MSG_MAP(baseClass) 
  • trunk/src/advtabs/Torrent.hpp

    r315 r356  
    7575                        if (PreTranslateMessage((LPMSG)lParam)) return TRUE; 
    7676 
     77                CHAIN_MSG_MAP(dialogBaseClass) 
    7778                CHAIN_MSG_MAP(autosizeClass) 
    7879                CHAIN_MSG_MAP(baseClass) 
  • trunk/src/advtabs/Tracker.hpp

    r316 r356  
    6060                        if (PreTranslateMessage((LPMSG)lParam)) return TRUE; 
    6161 
     62                CHAIN_MSG_MAP(dialogBaseClass) 
    6263                CHAIN_MSG_MAP(autosizeClass) 
    6364                CHAIN_MSG_MAP(baseClass) 
  • trunk/src/halConfig.cpp

    r352 r356  
    1111#include "halConfig.hpp" 
    1212//#include "ProgressDialog.hpp" 
    13  
    14 #ifndef HALITE_MINI 
    15 #       include "Halite.hpp" 
    16 #else 
    17 #       include "HaliteMini.hpp" 
    18 #endif 
     13#include "Halite.hpp" 
    1914 
    2015namespace hal 
  • trunk/src/halEvent.cpp

    r348 r356  
    2727#include "halEvent.hpp" 
    2828#include "global/string_conv.hpp" 
    29 #ifndef HALITE_MINI 
    30 #       include "Halite.hpp" 
    31 #else 
    32 #       include "HaliteMini.hpp" 
    33 #endif 
     29#include "Halite.hpp" 
    3430 
    3531#define foreach BOOST_FOREACH 
  • trunk/src/halTorrent.cpp

    r348 r356  
    13241324                wpath_t file = wpath_t(pimpl->workingDirectory)/L"torrents"/(*i).torrent->filename(); 
    13251325                 
    1326                  
    1327                 event().post(shared_ptr<EventDetail>( 
    1328                         new EventMsg(wformat_t(L"rAll -> %1% - %2%.") % (*i).torrent->filename() % (*i).torrent->state())));     
    1329                  
    13301326                if (exists(file)) 
    13311327                {                
  • trunk/src/halTorrentInternal.hpp

    r352 r356  
    464464        void addToSession(bool paused = false) 
    465465        { 
    466                 mutex_t::scoped_lock l(mutex_); 
    467                  
    468                 event().post(shared_ptr<EventDetail>( 
    469                         new EventMsg(wformat_t(L"    +-> %1%.") % paused)));     
     466                mutex_t::scoped_lock l(mutex_);  
    470467                 
    471468                if (!in_session_ && the_session_)  
    472                 { 
    473                         event().post(shared_ptr<EventDetail>( 
    474                                 new EventMsg(wformat_t(L"    +-> in session."))));       
    475                          
     469                {                        
    476470                        string_t dir = to_utf8(save_directory_); 
    477471                         
     
    492486                        applySettings(); 
    493487                }        
    494                         event().post(shared_ptr<EventDetail>( 
    495                                 new EventMsg(wformat_t(L"    +-> leaving addToSsession.")))); 
    496488        } 
    497489         
Note: See TracChangeset for help on using the changeset viewer.