Changeset 315
- Timestamp:
- 10/10/07 16:34:04 (13 years ago)
- Files:
-
- 10 edited
-
Halite.pnproj (modified) (1 diff)
-
res/ConfigDefines.h (modified) (1 diff)
-
res/Halite.rc (modified) (4 diffs)
-
res/resource.h (modified) (2 diffs)
-
sln/Halite/Halite.vcproj (modified) (1 diff)
-
src/AddTorrentDialog.hpp (modified) (1 diff)
-
src/HaliteDialog.cpp (modified) (2 diffs)
-
src/HaliteDialog.hpp (modified) (8 diffs)
-
src/advtabs/Torrent.cpp (modified) (5 diffs)
-
src/advtabs/Torrent.hpp (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
Halite.pnproj
r314 r315 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="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="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="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="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="HaliteUpdateLock.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\"><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="afxres.h"></File><File path="ConfigDefines.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="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="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="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="HaliteUpdateLock.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/ConfigDefines.h
r314 r315 6 6 7 7 #define IDC_SECURITY_IPF_GB 110001 8 9 10 #define TORRENT_LIMITS_LAYOUT \ 11 WMB_HEAD(WMB_COL(_exp|20), WMB_COL(_exp|30), WMB_COL(_exp|20), WMB_COL(_exp|30)), \ 12 WMB_ROW(10, IDC_TL, _r, _r, _r), \ 13 WMB_ROW(11, IDC_TLD, IDC_EDITTLD, IDC_TLU, IDC_EDITTLU), \ 14 WMB_ROW(10, IDC_NC, _r, _r, _r), \ 15 WMB_ROW(11, IDC_NCD, IDC_EDITNCD, IDC_NCU, IDC_EDITNCU), \ 16 WMB_END() 17 18 #define TORRENT_STATUS_LAYOUT \ 19 WMB_HEAD(WMB_COL(45), WMB_COLNOMIN(_exp|100), WMB_COL(_eq|0), WMB_COL(_exp|200)), \ 20 WMB_ROW(10, IDC_NAME_STATUS_LABEL, IDC_NAME, _r, _r), \ 21 WMB_ROW(10, IDC_PEERS_LABEL, IDC_PEERS, IDC_TRACKER, IDC_SEEDS), \ 22 WMB_ROW(10, IDC_TRANSFERED_LABEL, IDC_STATUS, IDC_OVERHEAD_LABEL, IDC_OVERHEAD), \ 23 WMB_ROW(10, IDC_REMAINING_LABEL, IDC_COMPLETE, IDC_ETA_LABEL, IDC_COMPLETE), \ 24 WMB_END() 25 26 #define TORRENT_REANNOUNCE_LAYOUT \ 27 WMB_HEAD(WMB_COL(50), WMB_COLNOMIN(_exp)), \ 28 WMB_ROW(10, IDC_UPDATESTAT, IDC_UPDATE), \ 29 WMB_END() -
res/Halite.rc
r314 r315 4 4 5 5 #include "../src/advtabs/Tracker.hpp" 6 #include "../src/HaliteDialog.hpp" 6 7 #include "../res/ConfigDefines.h" 7 8 #include "../src/halTorrent.cpp" … … 260 261 EDITTEXT IDC_EDITNCU,277,12,34,12,ES_AUTOHSCROLL 261 262 CONTROL "",TORRENTPROG,"msctls_progress32",WS_BORDER,4,52,362,8 262 RTEXT "Name:",IDC_ STATIC,4,3,40,8263 RTEXT "Tracker:",IDC_ STATIC,4,15,40,8264 RTEXT "Status:",IDC_STAT IC,4,27,40,8265 RTEXT "Time left:",IDC_ STATIC,4,39,40,8266 LTEXT "N/A",IDC_NAME,45,3,145,10,SS_WORDELLIPSIS 267 LTEXT "N/A",IDC_TRACKER,45,15,145,8,SS_WORDELLIPSIS 268 LTEXT "N/A",IDC_STATUS,45,27,145,8,SS_WORDELLIPSIS 269 LTEXT "N/A",IDC_AVAIL,45,39,36,8,SS_WORDELLIPSIS 270 LTEXT "Torrent connection limits:",IDC_NC,195,3,115,8 271 LTEXT "Torrent transfer rates (KB/s):",IDC_TL,195,27,115,8 272 RTEXT "Total",IDC_NCD,192,15,25,8 273 RTEXT "Up",IDC_NCU,255,15,20,8 274 RTEXT "Up",IDC_TLU,255,39,20,8 275 RTEXT "Down",IDC_TLD,192,39,25,8 276 RTEXT "Completed:",IDC_ STATIC,85,39,44,8277 LTEXT "N/A",IDC_COMPLETE,132,39,58,8,SS_WORDELLIPSIS 263 RTEXT "Name:",IDC_NAME_STATIC,4,3,40,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 264 RTEXT "Tracker:",IDC_TRACKER_STATIC,4,15,40,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 265 RTEXT "Status:",IDC_STATUS_STATIC,4,27,40,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 266 RTEXT "Time left:",IDC_TIME_STATIC,4,39,40,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 267 LTEXT "N/A",IDC_NAME,45,3,145,10,SS_WORDELLIPSIS|SS_CENTERIMAGE 268 LTEXT "N/A",IDC_TRACKER,45,15,145,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 269 LTEXT "N/A",IDC_STATUS,45,27,145,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 270 LTEXT "N/A",IDC_AVAIL,45,39,36,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 271 LTEXT "Torrent connection limits:",IDC_NC,195,3,115,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 272 LTEXT "Torrent transfer rates (KB/s):",IDC_TL,195,27,115,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 273 RTEXT "Total",IDC_NCD,192,15,25,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 274 RTEXT "Up",IDC_NCU,255,15,20,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 275 RTEXT "Up",IDC_TLU,255,39,20,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 276 RTEXT "Down",IDC_TLD,192,39,25,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 277 RTEXT "Completed:",IDC_COMPLETED_STATIC,85,39,44,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 278 LTEXT "N/A",IDC_COMPLETE,132,39,58,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 278 279 GROUPBOX "",IDC_DETAILS_GROUP,1,-4,368,77,0,WS_EX_TRANSPARENT 279 280 END … … 298 299 END 299 300 300 IDD_ADD_TORRENT DIALOGEX 0, 0, 225, 8 2301 IDD_ADD_TORRENT DIALOGEX 0, 0, 225, 86 301 302 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION 302 303 EXSTYLE WS_EX_STATICEDGE … … 304 305 FONT 8, "MS Shell Dlg", 400, 0, 0x1 305 306 BEGIN 306 PUSHBUTTON "Ok",IDOK,85,65,6 0,14307 PUSHBUTTON "Cancel",IDCANCEL,155,65,6 0,14307 PUSHBUTTON "Ok",IDOK,85,65,62,14 308 PUSHBUTTON "Cancel",IDCANCEL,155,65,62,14 308 309 309 310 EDITTEXT IDC_BC_SAVEFOLDER,5,5,195,12,ES_AUTOHSCROLL 310 PUSHBUTTON "...",IDC_BC_SAVEBROWSE,205,5,15,12 311 PUSHBUTTON "...",IDC_BC_SAVEBROWSE,205,5,15,12,SS_CENTERIMAGE 311 312 312 313 CONTROL "Use Compact Allocation.",IDC_CHECK_COMPACT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,38,220,8 313 314 CONTROL "Start Paused",IDC_CHECK_PAUSED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,25,220,8 314 LTEXT "Note. Compact Allocation is incompatible with File Selection",IDC_STATIC,8,51,215,8 315 LTEXT "Note. Compact Allocation is incompatible with File Selection",IDC_STATIC,8,51,215,8,SS_WORDELLIPSIS|SS_CENTERIMAGE 315 316 END 316 317 -
res/resource.h
r292 r315 63 63 #define IDC_STATUS 1010 64 64 #define IDC_AVAIL 1011 65 #define BTNREMOVE 101266 #define BTNREANNOUNCE 101367 65 #define IDC_EDITTLU 1014 68 66 #define IDC_EDITTLD 1015 … … 71 69 #define IDC_EDITRATIO 1018 72 70 #define IDC_TLD 1019 71 #define BTNREMOVE 1012 72 #define BTNREANNOUNCE 1013 73 #define BTNPAUSE 1034 73 74 #define IDC_TLU 1020 74 75 #define IDC_TL 1021 -
sln/Halite/Halite.vcproj
r312 r315 545 545 </File> 546 546 <File 547 RelativePath="..\..\src\HaliteUpdateLock.hpp" 548 > 549 </File> 550 <File 547 551 RelativePath="..\..\src\HaliteWindow.hpp" 548 552 > -
src/AddTorrentDialog.hpp
r290 r315 74 74 75 75 if (IDOK == fldDlg.DoModal()) 76 { 76 77 saveDirectory_ = wstring(fldDlg.m_szFolderPath); 78 DoDataExchange(false); 79 } 77 80 } 78 81 -
src/HaliteDialog.cpp
r306 r315 21 21 LRESULT HaliteDialog::OnInitDialog(HWND, LPARAM) 22 22 { 23 resizeClass::DlgResize_Init(false, true, WS_CLIPCHILDREN);24 25 23 m_prog.Attach(GetDlgItem(TORRENTPROG)); 26 24 m_prog.SetRange(0, 100); … … 35 33 DoDataExchange(false); 36 34 return 0; 35 } 36 37 HaliteDialog::CWindowMapStruct* HaliteDialog::GetWindowMap() 38 { 39 #define TORRENT_LIMITS_LAYOUT \ 40 WMB_HEAD(WMB_COL(_exp|20), WMB_COL(_exp|30), WMB_COL(_exp|20), WMB_COL(_exp|30)), \ 41 WMB_ROW(10, IDC_TL, _r, _r, _r), \ 42 WMB_ROW(11, IDC_TLD, IDC_EDITTLD, IDC_TLU, IDC_EDITTLU), \ 43 WMB_ROW(10, IDC_NC, _r, _r, _r), \ 44 WMB_ROW(11, IDC_NCD, IDC_EDITNCD, IDC_NCU, IDC_EDITNCU), \ 45 WMB_END() 46 47 #define TORRENT_STATUS_LAYOUT \ 48 WMB_HEAD(WMB_COL(45), WMB_COLNOMIN(_exp|100), WMB_COL(_eq|0), WMB_COL(_exp|200)), \ 49 WMB_ROW(_auto, IDC_NAME_STATIC, IDC_NAME, _r, _r), \ 50 WMB_ROW(_auto, IDC_TRACKER_STATIC, IDC_TRACKER, _r, _r), \ 51 WMB_ROW(_auto, IDC_STATUS_STATIC, IDC_STATUS, _r, _r), \ 52 WMB_ROW(_auto, IDC_TIME_STATIC, IDC_AVAIL, IDC_COMPLETED_STATIC, IDC_COMPLETE), \ 53 WMB_END() 54 55 #define TORRENT_BUTTON_LAYOUT \ 56 WMB_HEAD(WMB_COL(_exp)), \ 57 WMB_ROW(_gap), \ 58 WMB_ROWMINNOMAX(_exp, 13, BTNPAUSE), \ 59 WMB_ROWMINNOMAX(_exp, 13, BTNREANNOUNCE), \ 60 WMB_ROWMINNOMAX(_exp, 13, BTNREMOVE), \ 61 WMB_END() 62 63 BEGIN_WINDOW_MAP_INLINE(HaliteDialog, 6, 6, 3, 3) 64 WMB_HEAD(WMB_COL(_gap), WMB_COL(_exp), WMB_COL(120), WMB_COL(60), WMB_COL(_gap)), 65 WMB_ROW(_gap, IDC_DETAILS_GROUP, _r, _r, _r, _r), 66 WMB_ROW(_auto, _d, TORRENT_STATUS_LAYOUT, TORRENT_LIMITS_LAYOUT, TORRENT_BUTTON_LAYOUT), 67 WMB_ROWMIN(_auto, 8, _d, TORRENTPROG, _r, _r), 68 WMB_ROW(_gap, _d), 69 WMB_ROWNOMAX(_exp, _d, LISTPEERS, _r, _r), 70 WMB_ROW(_gap, _d), 71 WMB_END() 72 END_WINDOW_MAP_INLINE() 37 73 } 38 74 -
src/HaliteDialog.hpp
r306 r315 6 6 7 7 #pragma once 8 9 #define IDC_NAME_STATIC 15012 10 #define IDC_TRACKER_STATIC 15013 11 #define IDC_STATUS_STATIC 15014 12 #define IDC_TIME_STATIC 15015 13 #define IDC_COMPLETED_STATIC 15016 14 15 #ifndef RC_INVOKED 8 16 9 17 #include "stdAfx.hpp" … … 20 28 class HaliteDialog : 21 29 public CDialogImpl<HaliteDialog>, 22 public C DialogResize<HaliteDialog>,30 public CAutoSizeWindow<HaliteDialog, false>, 23 31 public CWinDataExchangeEx<HaliteDialog>, 24 32 public CHaliteDialogBase<HaliteDialog>, … … 26 34 { 27 35 typedef HaliteDialog thisClass; 28 typedef CDialogImpl< HaliteDialog> baseClass;29 typedef C DialogResize<HaliteDialog> resizeClass;30 typedef CHaliteDialogBase< HaliteDialog> dialogBaseClass;36 typedef CDialogImpl<thisClass> baseClass; 37 typedef CAutoSizeWindow<thisClass, false> autosizeClass; 38 typedef CHaliteDialogBase<thisClass> dialogBaseClass; 31 39 32 40 class DialogListView : … … 168 176 // MSG_WM_CTLCOLORSTATIC(OnCltColor) 169 177 170 CHAIN_MSG_MAP( resizeClass)178 CHAIN_MSG_MAP(autosizeClass) 171 179 REFLECT_NOTIFICATIONS() 172 180 END_MSG_MAP() … … 179 187 END_DDX_MAP() 180 188 181 BEGIN_DLGRESIZE_MAP(thisClass) 189 static CWindowMapStruct* GetWindowMap(); 190 191 /* BEGIN_DLGRESIZE_MAP(thisClass) 182 192 DLGRESIZE_CONTROL(BTNPAUSE, (DLSZ_MOVE_X)) 183 193 DLGRESIZE_CONTROL(BTNREANNOUNCE, (DLSZ_MOVE_X)) … … 206 216 DLGRESIZE_CONTROL(IDC_DETAILS_GROUP, (DLSZ_SIZE_X | DLSZ_SIZE_Y)) 207 217 END_DLGRESIZE_MAP() 208 218 */ 209 219 void uiUpdate(const hal::TorrentDetails& allTorrents); 210 220 void focusChanged(const hal::TorrentDetail_ptr pT); … … 220 230 LRESULT OnEditKillFocus(UINT uCode, int nCtrlID, HWND hwndCtrl); 221 231 LRESULT OnCltColor(HDC hDC, HWND hWnd); 232 222 233 223 234 private: … … 232 243 float TranLimitDown, TranLimitUp; 233 244 }; 245 246 #endif // RC_INVOKED -
src/advtabs/Torrent.cpp
r314 r315 33 33 AdvTorrentDialog::CWindowMapStruct* AdvTorrentDialog::GetWindowMap() 34 34 { 35 35 #define TORRENT_LIMITS_LAYOUT \ 36 36 WMB_HEAD(WMB_COL(_exp|20), WMB_COL(_exp|30), WMB_COL(_exp|20), WMB_COL(_exp|30)), \ 37 37 WMB_ROW(10, IDC_TL, _r, _r, _r), \ … … 50 50 WMB_ROW(10, IDC_RATE_LABEL, IDC_RATE, IDC_RATIO_LABEL, IDC_RATIO), \ 51 51 WMB_END() 52 52 53 53 #define TORRENT_REANNOUNCE_LAYOUT \ 54 54 WMB_HEAD(WMB_COL(50), WMB_COLNOMIN(_exp)), \ … … 68 68 END_WINDOW_MAP_INLINE() 69 69 } 70 70 71 71 void AdvTorrentDialog::onClose() 72 72 { … … 192 192 % (static_cast<float>(torrent->totalWanted())/(1024*1024))); 193 193 194 wstring eta = L" ∞";194 wstring eta = L"„"; 195 195 if (!torrent->estimatedTimeLeft().is_special()) 196 196 eta = hal::from_utf8(boost::posix_time::to_simple_string(torrent->estimatedTimeLeft())); … … 229 229 void AdvTorrentDialog::uiUpdateNone() 230 230 {} 231 -
src/advtabs/Torrent.hpp
r314 r315 1 1 2 2 // Copyright Eóin O'Callaghan 2006 - 2007. 3 3 // Distributed under the Boost Software License, Version 1.0. … … 6 6 7 7 #pragma once 8 9 #define HAL_PEER_INTERESTING 40037 10 #define HAL_PEER_CHOKED 40038 11 #define HAL_PEER_REMOTE_INTERESTING 40039 12 #define HAL_PEER_REMOTE_CHOKED 40040 13 #define HAL_PEER_SUPPORT_EXTENSIONS 40041 14 #define HAL_PEER_LOCAL_CONNECTION 40042 15 #define HAL_PEER_HANDSHAKE 40043 16 #define HAL_PEER_CONNECTING 40044 17 #define HAL_PEER_QUEUED 40045 18 #define HAL_PEER_RC4_ENCRYPTED 40046 19 #define HAL_PEER_PLAINTEXT_ENCRYPTED 40047 20 #define HAL_TORRENT_QUEUED_CHECKING 40050 21 #define HAL_TORRENT_CHECKING_FILES 40051 22 #define HAL_TORRENT_CONNECTING 40052 23 #define HAL_TORRENT_DOWNLOADING 40053 24 #define HAL_TORRENT_FINISHED 40054 25 #define HAL_TORRENT_SEEDING 40055 26 #define HAL_TORRENT_ALLOCATING 40056 27 #define HAL_TORRENT_QUEUED 40057 28 #define HAL_TORRENT_STOPPED 40058 29 #define HAL_TORRENT_PAUSED 40059 30 #define HAL_TORRENT_STOPPING 50000 31 #define HAL_TORRENT_PAUSING 50001 32 33 #ifndef RC_INVOKED 8 34 9 35 #include "../stdAfx.hpp" … … 86 112 string current_torrent_name_; 87 113 }; 114 115 #endif // RC_INVOKED
Note: See TracChangeset
for help on using the changeset viewer.
