Menu
▾
▴
dcplusplus-commit
|
From: <arn...@us...> - 2007-03-13 12:43:24
|
Revision: 723
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=723&view=rev
Author: arnetheduck
Date: 2007-03-13 05:43:22 -0700 (Tue, 13 Mar 2007)
Log Message:
-----------
Fav hub work
Modified Paths:
--------------
dcplusplus/trunk/win32/FavHubsFrame.cpp
dcplusplus/trunk/win32/FavHubsFrame.h
dcplusplus/trunk/win32/MainWindow.cpp
dcplusplus/trunk/win32/MainWindow.h
dcplusplus/trunk/win32/WidgetDataGrid.h
dcplusplus/trunk/win32/WidgetFactory.h
dcplusplus/trunk/win32/resource.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-05-06 19:17:48
|
Revision: 734
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=734&view=rev
Author: arnetheduck
Date: 2007-05-06 12:17:46 -0700 (Sun, 06 May 2007)
Log Message:
-----------
A few fixes to queue and hub frame
Modified Paths:
--------------
dcplusplus/trunk/win32/HubFrame.cpp
dcplusplus/trunk/win32/HubFrame.h
dcplusplus/trunk/win32/QueueFrame.cpp
dcplusplus/trunk/win32/QueueFrame.h
dcplusplus/trunk/win32/StupidWin.h
dcplusplus/trunk/win32/TypedListViewCtrl.h
dcplusplus/trunk/win32/WidgetDataGrid.h
dcplusplus/trunk/win32/WinUtil.cpp
dcplusplus/trunk/win32/WinUtil.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-05-14 22:20:37
|
Revision: 740
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=740&view=rev
Author: arnetheduck
Date: 2007-05-14 15:20:36 -0700 (Mon, 14 May 2007)
Log Message:
-----------
DirectoryListingFrame beginnings
Modified Paths:
--------------
dcplusplus/trunk/win32/QueueFrame.h
Added Paths:
-----------
dcplusplus/trunk/win32/DirectoryListingFrame.cpp
dcplusplus/trunk/win32/DirectoryListingFrame.h
Removed Paths:
-------------
dcplusplus/trunk/win32/DirectoryListingFrm.cpp
dcplusplus/trunk/win32/DirectoryListingFrm.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-06-02 23:15:18
|
Revision: 747
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=747&view=rev
Author: arnetheduck
Date: 2007-06-02 16:15:17 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
Right-click fix
Modified Paths:
--------------
dcplusplus/trunk/win32/QueueFrame.cpp
dcplusplus/trunk/win32/TypedTreeView.h
dcplusplus/trunk/win32/WidgetDataGrid.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-06-04 12:33:30
|
Revision: 748
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=748&view=rev
Author: arnetheduck
Date: 2007-06-04 05:33:26 -0700 (Mon, 04 Jun 2007)
Log Message:
-----------
finished fix
Modified Paths:
--------------
dcplusplus/trunk/win32/FinishedDLFrame.h
dcplusplus/trunk/win32/FinishedFrameBase.h
dcplusplus/trunk/win32/FinishedULFrame.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-06-07 12:48:44
|
Revision: 749
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=749&view=rev
Author: arnetheduck
Date: 2007-06-07 05:48:42 -0700 (Thu, 07 Jun 2007)
Log Message:
-----------
more finished patches
Modified Paths:
--------------
dcplusplus/trunk/win32/FinishedFrameBase.h
dcplusplus/trunk/win32/ShellContextMenu.h
dcplusplus/trunk/win32/WinUtil.cpp
dcplusplus/trunk/win32/WinUtil.h
dcplusplus/trunk/win32/resource.h
Removed Paths:
-------------
dcplusplus/trunk/win32/ShellContextMenu.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-06-07 22:18:19
|
Revision: 750
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=750&view=rev
Author: arnetheduck
Date: 2007-06-07 15:18:18 -0700 (Thu, 07 Jun 2007)
Log Message:
-----------
Decent popup menus from poy
Modified Paths:
--------------
dcplusplus/trunk/win32/FinishedFrameBase.h
dcplusplus/trunk/win32/ShellContextMenu.h
dcplusplus/trunk/win32/WidgetFactory.h
dcplusplus/trunk/win32/stdafx.h
Added Paths:
-----------
dcplusplus/trunk/win32/WidgetPopupMenu.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-06-09 21:54:45
|
Revision: 752
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=752&view=rev
Author: arnetheduck
Date: 2007-06-09 14:54:43 -0700 (Sat, 09 Jun 2007)
Log Message:
-----------
textview patch
Modified Paths:
--------------
dcplusplus/trunk/win32/FinishedFrameBase.h
dcplusplus/trunk/win32/TextFrame.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-06-14 16:26:24
|
Revision: 755
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=755&view=rev
Author: arnetheduck
Date: 2007-06-14 09:26:23 -0700 (Thu, 14 Jun 2007)
Log Message:
-----------
Spy frame/fav frames update
Modified Paths:
--------------
dcplusplus/trunk/win32/FinishedFrameBase.h
dcplusplus/trunk/win32/MainWindow.cpp
dcplusplus/trunk/win32/MainWindow.h
dcplusplus/trunk/win32/SpyFrame.cpp
dcplusplus/trunk/win32/SpyFrame.h
dcplusplus/trunk/win32/TypedListViewCtrl.h
dcplusplus/trunk/win32/TypedTreeView.h
dcplusplus/trunk/win32/WidgetDataGrid.h
dcplusplus/trunk/win32/resource.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-06-15 06:58:56
|
Revision: 756
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=756&view=rev
Author: arnetheduck
Date: 2007-06-14 23:58:54 -0700 (Thu, 14 Jun 2007)
Log Message:
-----------
settings page working
Modified Paths:
--------------
dcplusplus/trunk/win32/DCPlusPlus.rc
dcplusplus/trunk/win32/GeneralPage.cpp
dcplusplus/trunk/win32/GeneralPage.h
dcplusplus/trunk/win32/SettingsDialog.cpp
dcplusplus/trunk/win32/SettingsDialog.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-06-15 21:17:06
|
Revision: 757
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=757&view=rev
Author: arnetheduck
Date: 2007-06-15 14:17:04 -0700 (Fri, 15 Jun 2007)
Log Message:
-----------
directory listing stuff, spy frame patch
Modified Paths:
--------------
dcplusplus/trunk/win32/DirectoryListingFrame.cpp
dcplusplus/trunk/win32/DirectoryListingFrame.h
dcplusplus/trunk/win32/FinishedFrameBase.h
dcplusplus/trunk/win32/QueueFrame.cpp
dcplusplus/trunk/win32/SpyFrame.cpp
dcplusplus/trunk/win32/SpyFrame.h
dcplusplus/trunk/win32/TypedTreeView.h
dcplusplus/trunk/win32/WinUtil.cpp
dcplusplus/trunk/win32/WinUtil.h
dcplusplus/trunk/win32/resource.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-06-23 07:01:21
|
Revision: 762
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=762&view=rev
Author: arnetheduck
Date: 2007-06-23 00:01:20 -0700 (Sat, 23 Jun 2007)
Log Message:
-----------
Beginnings of a reasonable splitter
Modified Paths:
--------------
dcplusplus/trunk/win32/QueueFrame.cpp
dcplusplus/trunk/win32/QueueFrame.h
dcplusplus/trunk/win32/WidgetFactory.h
Added Paths:
-----------
dcplusplus/trunk/win32/WidgetPaned.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-06-25 18:19:09
|
Revision: 764
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=764&view=rev
Author: arnetheduck
Date: 2007-06-25 11:19:06 -0700 (Mon, 25 Jun 2007)
Log Message:
-----------
User info commands
Modified Paths:
--------------
dcplusplus/trunk/win32/HubFrame.cpp
dcplusplus/trunk/win32/HubFrame.h
dcplusplus/trunk/win32/LineDlg.cpp
dcplusplus/trunk/win32/LineDlg.h
dcplusplus/trunk/win32/QueueFrame.cpp
dcplusplus/trunk/win32/QueueFrame.h
dcplusplus/trunk/win32/SearchFrame.cpp
dcplusplus/trunk/win32/SearchFrame.h
dcplusplus/trunk/win32/TransferView.cpp
dcplusplus/trunk/win32/TransferView.h
dcplusplus/trunk/win32/UsersFrame.cpp
dcplusplus/trunk/win32/UsersFrame.h
dcplusplus/trunk/win32/WinUtil.cpp
dcplusplus/trunk/win32/WinUtil.h
dcplusplus/trunk/win32/resource.h
Added Paths:
-----------
dcplusplus/trunk/win32/UserInfoBase.cpp
dcplusplus/trunk/win32/UserInfoBase.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-07-04 13:02:26
|
Revision: 781
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=781&view=rev
Author: arnetheduck
Date: 2007-07-04 06:02:25 -0700 (Wed, 04 Jul 2007)
Log Message:
-----------
Enter fix
Modified Paths:
--------------
dcplusplus/trunk/win32/HubFrame.cpp
dcplusplus/trunk/win32/HubFrame.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-07-15 18:33:11
|
Revision: 794
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=794&view=rev
Author: arnetheduck
Date: 2007-07-15 11:33:09 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
Tab changnig
Modified Paths:
--------------
dcplusplus/trunk/win32/MDITab.cpp
dcplusplus/trunk/win32/MDITab.h
dcplusplus/trunk/win32/MainWindow.cpp
dcplusplus/trunk/win32/MainWindow.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-07-16 22:15:40
|
Revision: 798
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=798&view=rev
Author: arnetheduck
Date: 2007-07-16 15:15:37 -0700 (Mon, 16 Jul 2007)
Log Message:
-----------
Redraw fix
Modified Paths:
--------------
dcplusplus/trunk/win32/HubFrame.cpp
dcplusplus/trunk/win32/MDIChildFrame.h
dcplusplus/trunk/win32/PrivateFrame.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-07-30 14:01:53
|
Revision: 816
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=816&view=rev
Author: arnetheduck
Date: 2007-07-30 07:01:52 -0700 (Mon, 30 Jul 2007)
Log Message:
-----------
missing files
Added Paths:
-----------
dcplusplus/trunk/win32/HubListsDlg.cpp
dcplusplus/trunk/win32/HubListsDlg.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-08-27 15:48:26
|
Revision: 829
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=829&view=rev
Author: arnetheduck
Date: 2007-08-27 03:35:50 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
gui fixes (poy)
Modified Paths:
--------------
dcplusplus/trunk/win32/ADLSProperties.cpp
dcplusplus/trunk/win32/ADLSProperties.h
dcplusplus/trunk/win32/ADLSearchFrame.cpp
dcplusplus/trunk/win32/ADLSearchFrame.h
dcplusplus/trunk/win32/CommandDlg.cpp
dcplusplus/trunk/win32/CommandDlg.h
dcplusplus/trunk/win32/FavHubProperties.cpp
dcplusplus/trunk/win32/FavHubProperties.h
dcplusplus/trunk/win32/FavHubsFrame.cpp
dcplusplus/trunk/win32/FavHubsFrame.h
dcplusplus/trunk/win32/FavoriteDirsPage.cpp
dcplusplus/trunk/win32/FavoriteDirsPage.h
dcplusplus/trunk/win32/FinishedFrameBase.h
dcplusplus/trunk/win32/HashProgressDlg.cpp
dcplusplus/trunk/win32/HashProgressDlg.h
dcplusplus/trunk/win32/HubListsDlg.cpp
dcplusplus/trunk/win32/SearchFrame.cpp
dcplusplus/trunk/win32/SearchFrame.h
dcplusplus/trunk/win32/ShellContextMenu.cpp
dcplusplus/trunk/win32/ShellContextMenu.h
dcplusplus/trunk/win32/SpyFrame.cpp
dcplusplus/trunk/win32/UploadPage.cpp
dcplusplus/trunk/win32/UploadPage.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-10-08 10:50:26
|
Revision: 852
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=852&view=rev
Author: arnetheduck
Date: 2007-10-08 03:50:24 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
usersframe patch (poy)
Modified Paths:
--------------
dcplusplus/trunk/win32/UsersFrame.cpp
dcplusplus/trunk/win32/UsersFrame.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2007-10-10 21:59:52
|
Revision: 855
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=855&view=rev
Author: arnetheduck
Date: 2007-10-10 14:59:51 -0700 (Wed, 10 Oct 2007)
Log Message:
-----------
clean out some cruft
Modified Paths:
--------------
dcplusplus/trunk/win32/WinUtil.h
Removed Paths:
-------------
dcplusplus/trunk/win32/FlatTabCtrl.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zou...@us...> - 2007-11-09 22:01:31
|
Revision: 895
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=895&view=rev
Author: zouzou123gen
Date: 2007-11-09 14:01:30 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
ensureVisible on move up/down in some list views
Modified Paths:
--------------
dcplusplus/trunk/win32/ADLSearchFrame.cpp
dcplusplus/trunk/win32/FavHubsFrame.cpp
dcplusplus/trunk/win32/HubListsDlg.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zou...@us...> - 2007-12-01 23:05:17
|
Revision: 924
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=924&view=rev
Author: zouzou123gen
Date: 2007-12-01 15:05:03 -0800 (Sat, 01 Dec 2007)
Log Message:
-----------
tab handling in HubFrame
Modified Paths:
--------------
dcplusplus/trunk/win32/HubFrame.cpp
dcplusplus/trunk/win32/HubFrame.h
Modified: dcplusplus/trunk/win32/HubFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/HubFrame.cpp 2007-12-01 21:15:53 UTC (rev 923)
+++ dcplusplus/trunk/win32/HubFrame.cpp 2007-12-01 23:05:03 UTC (rev 924)
@@ -86,16 +86,17 @@
{
WidgetTextBox::Seed cs = WinUtil::Seeds::textBox;
- cs.style = WS_CHILD | WS_VISIBLE | WS_VSCROLL | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE;
+ cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE;
message = createTextBox(cs);
addWidget(message, true);
+ message->onRaw(std::tr1::bind(&HubFrame::handleMessageGetDlgCode, this), SmartWin::Message(WM_GETDLGCODE));
message->onKeyDown(std::tr1::bind(&HubFrame::handleMessageKeyDown, this, _1));
message->onChar(std::tr1::bind(&HubFrame::handleMessageChar, this, _1));
}
{
WidgetTextBox::Seed cs = WinUtil::Seeds::textBox;
- cs.style = WS_CHILD | WS_VISIBLE | WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
+ cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_READONLY;
chat = createTextBox(cs);
chat->setTextLimit(0);
addWidget(chat);
@@ -105,7 +106,7 @@
{
WidgetTextBox::Seed cs = WinUtil::Seeds::textBox;
- cs.style = WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL;
+ cs.style = WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL;
filter = createTextBox(cs);
addWidget(filter);
filter->onKeyUp(std::tr1::bind(&HubFrame::handleFilterKey, this, _1));
@@ -671,6 +672,11 @@
return false;
}
+LRESULT HubFrame::handleMessageGetDlgCode() {
+ // override the MDIChildFrame behavior, which tells the Dialog Manager to process Tab presses by itself
+ return DLGC_WANTMESSAGE;
+}
+
bool HubFrame::handleMessageChar(int c) {
switch(c) {
case VK_TAB:
Modified: dcplusplus/trunk/win32/HubFrame.h
===================================================================
--- dcplusplus/trunk/win32/HubFrame.h 2007-12-01 21:15:53 UTC (rev 923)
+++ dcplusplus/trunk/win32/HubFrame.h 2007-12-01 23:05:03 UTC (rev 924)
@@ -229,6 +229,7 @@
void runUserCommand(const UserCommand& uc);
+ LRESULT handleMessageGetDlgCode();
bool handleMessageChar(int c);
bool handleMessageKeyDown(int c);
bool handleUsersKeyDown(int c);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-01-10 11:39:04
|
Revision: 964
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=964&view=rev
Author: arnetheduck
Date: 2008-01-10 03:39:01 -0800 (Thu, 10 Jan 2008)
Log Message:
-----------
language patch
Modified Paths:
--------------
dcplusplus/trunk/win32/ADLSearchFrame.cpp
dcplusplus/trunk/win32/MDIChildFrame.h
dcplusplus/trunk/win32/PrivateFrame.cpp
dcplusplus/trunk/win32/SpyFrame.cpp
dcplusplus/trunk/win32/UsersFrame.cpp
Property Changed:
----------------
dcplusplus/trunk/win32/po/
Modified: dcplusplus/trunk/win32/ADLSearchFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/ADLSearchFrame.cpp 2008-01-09 14:26:12 UTC (rev 963)
+++ dcplusplus/trunk/win32/ADLSearchFrame.cpp 2008-01-10 11:39:01 UTC (rev 964)
@@ -22,15 +22,18 @@
#include "ADLSearchFrame.h"
-#include <dcpp/ResourceManager.h>
#include <dcpp/Client.h>
#include "HoldRedraw.h"
#include "ADLSProperties.h"
int ADLSearchFrame::columnIndexes[] = { COLUMN_ACTIVE_SEARCH_STRING, COLUMN_SOURCE_TYPE, COLUMN_DEST_DIR, COLUMN_MIN_FILE_SIZE, COLUMN_MAX_FILE_SIZE };
int ADLSearchFrame::columnSizes[] = { 120, 90, 90, 90, 90 };
-static ResourceManager::Strings columnNames[] = { ResourceManager::ACTIVE_SEARCH_STRING,
- ResourceManager::SOURCE_TYPE, ResourceManager::DESTINATION, ResourceManager::MIN_SIZE, ResourceManager::MAX_SIZE,
+static const char* columnNames[] = {
+ N_("Enabled / Search String"),
+ N_("Source Type"),
+ N_("Destination Directory"),
+ N_("Min Size"),
+ N_("Max Size"),
};
ADLSearchFrame::ADLSearchFrame(SmartWin::WidgetTabView* mdiParent) :
@@ -48,7 +51,7 @@
items = createListView(cs);
addWidget(items);
- items->createColumns(ResourceManager::getInstance()->getStrings(columnNames));
+ items->createColumns(WinUtil::getStrings(columnNames));
items->setColumnOrder(WinUtil::splitTokens(SETTING(ADLSEARCHFRAME_ORDER), columnIndexes));
items->setColumnWidths(WinUtil::splitTokens(SETTING(ADLSEARCHFRAME_WIDTHS), columnSizes));
items->setColor(WinUtil::textColor, WinUtil::bgColor);
@@ -62,32 +65,32 @@
{
WidgetButton::Seed cs = WinUtil::Seeds::button;
- cs.caption = TSTRING(NEW);
+ cs.caption = T_("&New...");
add = createButton(cs);
add->onClicked(std::tr1::bind(&ADLSearchFrame::handleAdd, this));
addWidget(add);
- cs.caption = TSTRING(PROPERTIES);
+ cs.caption = T_("&Properties");
properties = createButton(cs);
properties->onClicked(std::tr1::bind(&ADLSearchFrame::handleProperties, this));
addWidget(properties);
- cs.caption = TSTRING(MOVE_UP);
+ cs.caption = T_("Move &Up");
up = createButton(cs);
up->onClicked(std::tr1::bind(&ADLSearchFrame::handleUp, this));
addWidget(up);
- cs.caption = TSTRING(MOVE_DOWN);
+ cs.caption = T_("Move &Down");
down = createButton(cs);
down->onClicked(std::tr1::bind(&ADLSearchFrame::handleDown, this));
addWidget(down);
- cs.caption = TSTRING(REMOVE);
+ cs.caption = T_("&Remove");
remove = createButton(cs);
remove->onClicked(std::tr1::bind(&ADLSearchFrame::handleRemove, this));
addWidget(remove);
- cs.caption = TSTRING(MENU_HELP);
+ cs.caption = T_("&Help");
help = createButton(cs);
help->onClicked(std::tr1::bind(&ADLSearchFrame::handleHelp, this));
addWidget(help);
@@ -287,9 +290,9 @@
}
WidgetMenuPtr contextMenu = createMenu(true);
- contextMenu->appendItem(IDC_ADD, TSTRING(NEW), std::tr1::bind(&ADLSearchFrame::handleAdd, this));
- contextMenu->appendItem(IDC_EDIT, TSTRING(PROPERTIES), std::tr1::bind(&ADLSearchFrame::handleProperties, this));
- contextMenu->appendItem(IDC_REMOVE, TSTRING(REMOVE), std::tr1::bind(&ADLSearchFrame::handleRemove, this));
+ contextMenu->appendItem(IDC_ADD, T_("&New..."), std::tr1::bind(&ADLSearchFrame::handleAdd, this));
+ contextMenu->appendItem(IDC_EDIT, T_("&Properties"), std::tr1::bind(&ADLSearchFrame::handleProperties, this));
+ contextMenu->appendItem(IDC_REMOVE, T_("&Remove"), std::tr1::bind(&ADLSearchFrame::handleRemove, this));
bool status = items->hasSelection();
contextMenu->setItemEnabled(IDC_EDIT, status);
Modified: dcplusplus/trunk/win32/MDIChildFrame.h
===================================================================
--- dcplusplus/trunk/win32/MDIChildFrame.h 2008-01-09 14:26:12 UTC (rev 963)
+++ dcplusplus/trunk/win32/MDIChildFrame.h 2008-01-10 11:39:01 UTC (rev 964)
@@ -25,7 +25,6 @@
#include "AspectSpeaker.h"
#include "AspectStatus.h"
#include <dcpp/SettingsManager.h>
-#include <dcpp/ResourceManager.h>
#include "resource.h"
template<typename T>
@@ -188,7 +187,7 @@
bool handleContextMenu(const SmartWin::ScreenCoordinate& pt) {
SmartWin::WidgetMenu::ObjectType menu = SmartWin::WidgetCreator<SmartWin::WidgetMenu>::create(SmartWin::WidgetMenu::Seed(true));
- menu->appendItem(IDC_CLOSE_WINDOW, TSTRING(CLOSE), std::tr1::bind(&ThisType::close, this, true));
+ menu->appendItem(IDC_CLOSE_WINDOW, T_("Close"), std::tr1::bind(&ThisType::close, this, true));
menu->trackPopupMenu(this, pt, TPM_LEFTALIGN | TPM_RIGHTBUTTON);
Modified: dcplusplus/trunk/win32/PrivateFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PrivateFrame.cpp 2008-01-09 14:26:12 UTC (rev 963)
+++ dcplusplus/trunk/win32/PrivateFrame.cpp 2008-01-10 11:39:01 UTC (rev 964)
@@ -26,7 +26,6 @@
#include <dcpp/Client.h>
#include <dcpp/LogManager.h>
#include <dcpp/User.h>
-#include <dcpp/ResourceManager.h>
#include <dcpp/FavoriteManager.h>
#include <dcpp/UploadManager.h>
#include <dcpp/QueueItem.h>
@@ -283,12 +282,12 @@
chat->setText(Util::emptyStringT);
} else if(Util::stricmp(s.c_str(), _T("grant")) == 0) {
UploadManager::getInstance()->reserveSlot(replyTo);
- addStatus(TSTRING(SLOT_GRANTED));
+ addStatus(T_("Slot granted"));
} else if(Util::stricmp(s.c_str(), _T("close")) == 0) {
postMessage(WM_CLOSE);
} else if((Util::stricmp(s.c_str(), _T("favorite")) == 0) || (Util::stricmp(s.c_str(), _T("fav")) == 0)) {
FavoriteManager::getInstance()->addFavoriteUser(replyTo);
- addStatus(TSTRING(FAVORITE_USER_ADDED));
+ addStatus(T_("Favorite user added"));
} else if(Util::stricmp(s.c_str(), _T("getlist")) == 0) {
// TODO handleGetList();
} else if(Util::stricmp(s.c_str(), _T("log")) == 0) {
@@ -313,7 +312,7 @@
if(replyTo->isOnline()) {
sendMessage(s);
} else {
- addStatus(TSTRING(USER_WENT_OFFLINE));
+ addStatus(T_("User went offline"));
resetText = false;
}
}
@@ -363,15 +362,15 @@
bool PrivateFrame::handleTabContextMenu(const SmartWin::ScreenCoordinate& pt) {
WidgetMenuPtr menu = createMenu(true);
- menu->appendItem(IDC_GETLIST, TSTRING(GET_FILE_LIST), std::tr1::bind(&PrivateFrame::handleGetList, this));
- menu->appendItem(IDC_MATCH_QUEUE, TSTRING(MATCH_QUEUE), std::tr1::bind(&PrivateFrame::handleMatchQueue, this));
- menu->appendItem(IDC_GRANTSLOT, TSTRING(GRANT_EXTRA_SLOT), std::tr1::bind(&UploadManager::reserveSlot, UploadManager::getInstance(), replyTo));
+ menu->appendItem(IDC_GETLIST, T_("Get file list"), std::tr1::bind(&PrivateFrame::handleGetList, this));
+ menu->appendItem(IDC_MATCH_QUEUE, T_("Match queue"), std::tr1::bind(&PrivateFrame::handleMatchQueue, this));
+ menu->appendItem(IDC_GRANTSLOT, T_("Grant extra slot"), std::tr1::bind(&UploadManager::reserveSlot, UploadManager::getInstance(), replyTo));
if(!FavoriteManager::getInstance()->isFavoriteUser(replyTo))
- menu->appendItem(IDC_ADD_TO_FAVORITES, TSTRING(ADD_TO_FAVORITES), std::tr1::bind(&FavoriteManager::addFavoriteUser, FavoriteManager::getInstance(), replyTo));
+ menu->appendItem(IDC_ADD_TO_FAVORITES, T_("Add To Favorites"), std::tr1::bind(&FavoriteManager::addFavoriteUser, FavoriteManager::getInstance(), replyTo));
prepareMenu(menu, UserCommand::CONTEXT_CHAT, ClientManager::getInstance()->getHubs(replyTo->getCID()));
menu->appendSeparatorItem();
- menu->appendItem(IDC_CLOSE_WINDOW, TSTRING(CLOSE), std::tr1::bind(&PrivateFrame::close, this, true));
+ menu->appendItem(IDC_CLOSE_WINDOW, T_("Close"), std::tr1::bind(&PrivateFrame::close, this, true));
menu->trackPopupMenu(this, pt, TPM_LEFTALIGN | TPM_RIGHTBUTTON);
return TRUE;
Modified: dcplusplus/trunk/win32/SpyFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SpyFrame.cpp 2008-01-09 14:26:12 UTC (rev 963)
+++ dcplusplus/trunk/win32/SpyFrame.cpp 2008-01-10 11:39:01 UTC (rev 964)
@@ -28,7 +28,11 @@
int SpyFrame::columnSizes[] = { 305, 70, 85 };
int SpyFrame::columnIndexes[] = { COLUMN_STRING, COLUMN_COUNT, COLUMN_TIME };
-static ResourceManager::Strings columnNames[] = { ResourceManager::SEARCH_STRING, ResourceManager::COUNT, ResourceManager::TIME };
+static const char* columnNames[] = {
+ N_("Search String"),
+ N_("Count"),
+ N_("Time"),
+};
SpyFrame::SpyFrame(SmartWin::WidgetTabView* mdiParent) :
BaseType(mdiParent),
@@ -46,7 +50,7 @@
searches = createListView(cs);
addWidget(searches);
- searches->createColumns(ResourceManager::getInstance()->getStrings(columnNames));
+ searches->createColumns(WinUtil::getStrings(columnNames));
searches->setColumnOrder(WinUtil::splitTokens(SETTING(SPYFRAME_ORDER), columnIndexes));
searches->setColumnWidths(WinUtil::splitTokens(SETTING(SPYFRAME_WIDTHS), columnSizes));
searches->setSort(COLUMN_COUNT, SmartWin::WidgetListView::SORT_INT, false);
@@ -57,7 +61,7 @@
}
{
- WidgetCheckBox::Seed cs(TSTRING(IGNORE_TTH_SEARCHES));
+ WidgetCheckBox::Seed cs(T_("Ignore TTH searches"));
ignoreTTH = createCheckBox(cs);
ignoreTTH->setChecked(bIgnoreTTH);
ignoreTTH->onClicked(std::tr1::bind(&SpyFrame::handleIgnoreTTHClicked, this));
@@ -182,7 +186,7 @@
searchString = searches->getText(searches->getSelectedIndex(), COLUMN_STRING);
WidgetMenuPtr contextMenu = createMenu(true);
- contextMenu->appendItem(IDC_SEARCH, TSTRING(SEARCH), std::tr1::bind(&SpyFrame::handleSearch, this));
+ contextMenu->appendItem(IDC_SEARCH, T_("Search"), std::tr1::bind(&SpyFrame::handleSearch, this));
contextMenu->trackPopupMenu(this, pt, TPM_LEFTALIGN | TPM_RIGHTBUTTON);
return true;
Modified: dcplusplus/trunk/win32/UsersFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/UsersFrame.cpp 2008-01-09 14:26:12 UTC (rev 963)
+++ dcplusplus/trunk/win32/UsersFrame.cpp 2008-01-10 11:39:01 UTC (rev 964)
@@ -23,11 +23,16 @@
#include "HoldRedraw.h"
#include <dcpp/FavoriteManager.h>
-#include <dcpp/ResourceManager.h>
int UsersFrame::columnIndexes[] = { COLUMN_NICK, COLUMN_HUB, COLUMN_SEEN, COLUMN_DESCRIPTION, COLUMN_CID };
int UsersFrame::columnSizes[] = { 200, 300, 150, 200, 125 };
-static ResourceManager::Strings columnNames[] = { ResourceManager::AUTO_GRANT, ResourceManager::LAST_HUB, ResourceManager::LAST_SEEN, ResourceManager::DESCRIPTION, ResourceManager::CID };
+static const char* columnNames[] = {
+ N_("Auto grant slot / Nick"),
+ N_("Hub (last seen on if offline)"),
+ N_("Time last seen"),
+ N_("Description"),
+ N_("CID"),
+};
UsersFrame::UsersFrame(SmartWin::WidgetTabView* mdiParent) :
BaseType(mdiParent),
@@ -40,7 +45,7 @@
users = SmartWin::WidgetCreator<WidgetUsers>::create(this, cs);
addWidget(users);
- users->createColumns(ResourceManager::getInstance()->getStrings(columnNames));
+ users->createColumns(WinUtil::getStrings(columnNames));
users->setColumnOrder(WinUtil::splitTokens(SETTING(HUBFRAME_ORDER), columnIndexes));
users->setColumnWidths(WinUtil::splitTokens(SETTING(HUBFRAME_WIDTHS), columnSizes));
users->setSort(COLUMN_NICK);
@@ -100,7 +105,7 @@
void UsersFrame::UserInfo::update(const FavoriteUser& u) {
columns[COLUMN_NICK] = Text::toT(u.getNick());
columns[COLUMN_HUB] = user->isOnline() ? WinUtil::getHubNames(u.getUser()).first : Text::toT(u.getUrl());
- columns[COLUMN_SEEN] = user->isOnline() ? TSTRING(ONLINE) : Text::toT(Util::formatTime("%Y-%m-%d %H:%M", u.getLastSeen()));
+ columns[COLUMN_SEEN] = user->isOnline() ? T_("Online") : Text::toT(Util::formatTime("%Y-%m-%d %H:%M", u.getLastSeen()));
columns[COLUMN_DESCRIPTION] = Text::toT(u.getDescription());
columns[COLUMN_CID] = Text::toT(u.getUser()->getCID().toBase32());
}
@@ -115,7 +120,7 @@
for(int i = 0; i < users->size(); ++i) {
UserInfo *ui = users->getData(i);
if(ui->user == aUser) {
- ui->columns[COLUMN_SEEN] = aUser->isOnline() ? TSTRING(ONLINE) : Text::toT(Util::formatTime("%Y-%m-%d %H:%M", FavoriteManager::getInstance()->getLastSeen(aUser)));
+ ui->columns[COLUMN_SEEN] = aUser->isOnline() ? T_("Online") : Text::toT(Util::formatTime("%Y-%m-%d %H:%M", FavoriteManager::getInstance()->getLastSeen(aUser)));
users->update(i);
}
}
@@ -135,7 +140,7 @@
if(users->getSelectedCount() == 1) {
int i = users->getSelectedIndex();
UserInfo* ui = users->getData(i);
- LineDlg dlg(this, ui->columns[COLUMN_NICK], TSTRING(DESCRIPTION), ui->columns[COLUMN_DESCRIPTION]);
+ LineDlg dlg(this, ui->columns[COLUMN_NICK], T_("Description"), ui->columns[COLUMN_DESCRIPTION]);
if(dlg.run() == IDOK) {
FavoriteManager::getInstance()->setUserDescription(ui->user, Text::fromT(dlg.getLine()));
@@ -178,8 +183,8 @@
WidgetMenuPtr menu = createMenu(true);
appendUserItems(getParent(), menu);
menu->appendSeparatorItem();
- menu->appendItem(IDC_EDIT, TSTRING(PROPERTIES), std::tr1::bind(&UsersFrame::handleProperties, this));
- menu->appendItem(IDC_REMOVE, TSTRING(REMOVE), std::tr1::bind(&UsersFrame::handleRemove, this));
+ menu->appendItem(IDC_EDIT, T_("&Properties"), std::tr1::bind(&UsersFrame::handleProperties, this));
+ menu->appendItem(IDC_REMOVE, T_("&Remove"), std::tr1::bind(&UsersFrame::handleRemove, this));
menu->trackPopupMenu(this, pt, TPM_LEFTALIGN | TPM_RIGHTBUTTON);
Property changes on: dcplusplus/trunk/win32/po
___________________________________________________________________
Name: svn:ignore
+ dcpp-win32.pot
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-01-19 22:19:24
|
Revision: 969
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=969&view=rev
Author: arnetheduck
Date: 2008-01-19 14:19:19 -0800 (Sat, 19 Jan 2008)
Log Message:
-----------
Transfer and downloads frames fixes
Modified Paths:
--------------
dcplusplus/trunk/win32/DownloadsFrame.cpp
dcplusplus/trunk/win32/DownloadsFrame.h
dcplusplus/trunk/win32/TransferView.cpp
dcplusplus/trunk/win32/TransferView.h
Modified: dcplusplus/trunk/win32/DownloadsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/DownloadsFrame.cpp 2008-01-19 15:35:31 UTC (rev 968)
+++ dcplusplus/trunk/win32/DownloadsFrame.cpp 2008-01-19 22:19:19 UTC (rev 969)
@@ -28,7 +28,7 @@
#include "HoldRedraw.h"
#include "WinUtil.h"
-int DownloadsFrame::columnIndexes[] = { COLUMN_FILE, COLUMN_PATH, COLUMN_STATUS, COLUMN_TIMELEFT, COLUMN_SPEED, COLUMN_SIZE };
+int DownloadsFrame::columnIndexes[] = { COLUMN_FILE, COLUMN_PATH, COLUMN_STATUS, COLUMN_TIMELEFT, COLUMN_SPEED, COLUMN_DONE, COLUMN_SIZE };
int DownloadsFrame::columnSizes[] = { 200, 300, 150, 200, 125, 100};
static const char* columnNames[] = {
@@ -37,6 +37,7 @@
N_("Status"),
N_("Time left"),
N_("Speed"),
+ N_("Done"),
N_("Size")
};
@@ -97,6 +98,7 @@
columns[COLUMN_FILE] = Text::toT(Util::getFileName(target));
columns[COLUMN_PATH] = Text::toT(Util::getFilePath(target));
columns[COLUMN_SIZE] = Text::toT(Util::formatBytes(size));
+
update();
}
@@ -121,6 +123,7 @@
columns[COLUMN_TIMELEFT] = Text::toT(Util::formatSeconds(static_cast<int64_t>(timeleft())));
columns[COLUMN_SPEED] = str(TF_("%1%/s") % Text::toT(Util::formatBytes(static_cast<int64_t>(bps))));
}
+ columns[COLUMN_DONE] = Text::toT(Util::formatBytes(done));
}
bool DownloadsFrame::handleContextMenu(SmartWin::ScreenCoordinate pt) {
Modified: dcplusplus/trunk/win32/DownloadsFrame.h
===================================================================
--- dcplusplus/trunk/win32/DownloadsFrame.h 2008-01-19 15:35:31 UTC (rev 968)
+++ dcplusplus/trunk/win32/DownloadsFrame.h 2008-01-19 22:19:19 UTC (rev 969)
@@ -60,6 +60,7 @@
COLUMN_STATUS,
COLUMN_TIMELEFT,
COLUMN_SPEED,
+ COLUMN_DONE,
COLUMN_SIZE,
COLUMN_LAST
};
@@ -95,6 +96,7 @@
case COLUMN_TIMELEFT: return compare(a->timeleft(), b->timeleft());
case COLUMN_SPEED: return compare(a->bps, b->bps);
case COLUMN_SIZE: return compare(a->size, b->size);
+ case COLUMN_DONE: return compare(a->done, b->done);
default: return lstrcmpi(a->columns[col].c_str(), b->columns[col].c_str());
}
}
Modified: dcplusplus/trunk/win32/TransferView.cpp
===================================================================
--- dcplusplus/trunk/win32/TransferView.cpp 2008-01-19 15:35:31 UTC (rev 968)
+++ dcplusplus/trunk/win32/TransferView.cpp 2008-01-19 22:19:19 UTC (rev 969)
@@ -33,13 +33,14 @@
#include <dcpp/Download.h>
#include <dcpp/Upload.h>
-int TransferView::columnIndexes[] = { COLUMN_USER, COLUMN_STATUS, COLUMN_SPEED, COLUMN_TRANSFERED, COLUMN_QUEUED, COLUMN_CIPHER, COLUMN_IP };
-int TransferView::columnSizes[] = { 125, 375, 150, 150, 75, 100, 100 };
+int TransferView::columnIndexes[] = { COLUMN_USER, COLUMN_STATUS, COLUMN_SPEED, COLUMN_CHUNK, COLUMN_TRANSFERED, COLUMN_QUEUED, COLUMN_CIPHER, COLUMN_IP };
+int TransferView::columnSizes[] = { 125, 375, 100, 100, 125, 75, 100, 100 };
static const char* columnNames[] = {
N_("User"),
N_("Status"),
N_("Speed"),
+ N_("Chunk size"),
N_("Transfered (Ratio)"),
N_("Queued"),
N_("Cipher"),
@@ -110,12 +111,9 @@
menu->appendSeparatorItem();
menu->appendItem(IDC_FORCE, T_("Force attempt"), std::tr1::bind(&TransferView::handleForce, this));
- if(ii->download) {
- menu->appendItem(IDC_SEARCH_ALTERNATES, CTSTRING(SEARCH_FOR_ALTERNATES), std::tr1::bind(&TransferView::handleSearchAlternates, this));
- }
menu->appendItem(IDC_COPY_NICK, T_("Copy nick to clipboard"), std::tr1::bind(&TransferView::handleCopyNick, this));
menu->appendSeparatorItem();
- menu->appendItem(IDC_REMOVE, T_("Close connection"), std::tr1::bind(&TransferView::handleRemove, this));
+ menu->appendItem(IDC_REMOVE, T_("Disconnect"), std::tr1::bind(&TransferView::handleDisconnect, this));
menu->setDefaultItem(IDC_PRIVATEMESSAGE);
return menu;
}
@@ -136,7 +134,7 @@
return false;
}
-void TransferView::handleRemove() {
+void TransferView::handleDisconnect() {
transfers->forEachSelected(&ItemInfo::disconnect);
}
@@ -172,7 +170,8 @@
void TransferView::handleForce() {
int i = -1;
while( (i = transfers->getNext(i, LVNI_SELECTED)) != -1) {
- transfers->setText(i, COLUMN_STATUS, T_("Connecting (forced)..."));
+ transfers->getData(i)->columns[COLUMN_STATUS] = T_("Connecting (forced)");
+ transfers->update(i);
ConnectionManager::getInstance()->force(transfers->getData(i)->user);
}
}
@@ -324,6 +323,7 @@
case COLUMN_SPEED: return compare(a->speed, b->speed);
case COLUMN_TRANSFERED: return compare(a->transfered, b->transfered);
case COLUMN_QUEUED: return compare(a->queued, b->queued);
+ case COLUMN_CHUNK: return compare(a->chunk, b->chunk);
default: return lstrcmpi(a->columns[col].c_str(), b->columns[col].c_str());
}
}
@@ -371,35 +371,20 @@
return 0;
}
-void TransferView::handleSearchAlternates() {
-#ifdef PORT_ME
- int i = transfers->getNext(-1, LVNI_SELECTED);
-
- if(i != -1) {
- ItemInfo *ii = transfers->getData(i);
-
- string target = Text::fromT(ii->getText(COLUMN_PATH) + ii->getText(COLUMN_FILE));
-
- TTHValue tth;
- if(QueueManager::getInstance()->getTTH(target, tth)) {
- WinUtil::searchHash(tth);
- }
- }
-#endif
-}
-
TransferView::ItemInfo::ItemInfo(const UserPtr& u, bool aDownload) :
UserInfoBase(u),
download(aDownload),
transferFailed(false),
status(STATUS_WAITING),
actual(0),
+ lastActual(0),
transfered(0),
+ lastTransfered(0),
queued(0),
speed(0)
{
columns[COLUMN_USER] = WinUtil::getNicks(u);
- columns[COLUMN_STATUS] = T_("Idle...");
+ columns[COLUMN_STATUS] = T_("Idle");
columns[COLUMN_TRANSFERED] = Text::toT(Util::toString(0));
if(aDownload) {
queued = QueueManager::getInstance()->getQueued(u);
@@ -409,6 +394,7 @@
void TransferView::ItemInfo::update(const UpdateInfo& ui) {
if(ui.updateMask & UpdateInfo::MASK_STATUS) {
+ lastTransfered = lastActual = 0;
status = ui.status;
if(download) {
// Also update queued when status changes...
@@ -425,17 +411,24 @@
}
if(ui.updateMask & UpdateInfo::MASK_TRANSFERED) {
- actual = ui.actual;
- transfered = ui.transfered;
+ actual += ui.actual - lastActual;
+ lastActual = ui.actual;
+ transfered += ui.transfered - lastTransfered;
+ lastTransfered = ui.transfered;
if(actual == transfered) {
columns[COLUMN_TRANSFERED] = Text::toT(Util::formatBytes(transfered));
} else {
- columns[COLUMN_TRANSFERED] = str(TF_("%1% (%|.2|)")
+ columns[COLUMN_TRANSFERED] = str(TF_("%1% (%2$0.2f)")
% Text::toT(Util::formatBytes(transfered))
% (static_cast<double>(actual) / transfered));
}
}
+ if(ui.updateMask & UpdateInfo::MASK_CHUNK) {
+ chunk = ui.chunk;
+ columns[COLUMN_CHUNK] = Text::toT(Util::formatBytes(ui.chunk));
+ }
+
if(ui.updateMask & UpdateInfo::MASK_SPEED) {
speed = ui.speed;
if (status == STATUS_RUNNING) {
@@ -458,14 +451,14 @@
UpdateInfo* ui = new UpdateInfo(aCqi->getUser(), aCqi->getDownload());
ui->setStatus(ItemInfo::STATUS_WAITING);
- ui->setStatusString(T_("Connecting..."));
+ ui->setStatusString(T_("Connecting"));
speak(ADD_ITEM, ui);
}
void TransferView::on(ConnectionManagerListener::StatusChanged, ConnectionQueueItem* aCqi) throw() {
UpdateInfo* ui = new UpdateInfo(aCqi->getUser(), aCqi->getDownload());
- ui->setStatusString((aCqi->getState() == ConnectionQueueItem::CONNECTING) ? T_("Connecting...") : T_("Waiting to retry..."));
+ ui->setStatusString((aCqi->getState() == ConnectionQueueItem::CONNECTING) ? T_("Connecting") : T_("Waiting to retry"));
speak(UPDATE_ITEM, ui);
}
@@ -489,27 +482,56 @@
if(t->getType() == Transfer::TYPE_TREE) {
file = str(TF_("TTH: %1%") % Text::toT(Util::getFileName(t->getPath())));
+ } else if(t->getType() == Transfer::TYPE_FULL_LIST || t->getType() == Transfer::TYPE_PARTIAL_LIST) {
+ file = T_("file list");
} else {
- file = Text::toT(Util::getFileName(t->getPath()));
+ file = Text::toT(Util::getFileName(t->getPath()) +
+ " (" + Util::formatBytes(t->getStartPos()) +
+ " - " + Util::formatBytes(t->getStartPos() + t->getSize()) + ")");
}
return file;
}
-void TransferView::on(DownloadManagerListener::Starting, Download* aDownload) throw() {
- UpdateInfo* ui = new UpdateInfo(aDownload->getUser(), true);
+void TransferView::starting(UpdateInfo* ui, Transfer* t) {
ui->setStatus(ItemInfo::STATUS_RUNNING);
- ui->setTransfered(aDownload->getPos(), aDownload->getActual());
-
- ui->setStatusString(str(TF_("Requesting %1% (%2%)...") % getFile(aDownload) % aDownload->getSize()));
- ui->setCipher(Text::toT(aDownload->getUserConnection().getCipherName()));
- tstring country = Text::toT(Util::getIpCountry(aDownload->getUserConnection().getRemoteIp()));
- tstring ip = Text::toT(aDownload->getUserConnection().getRemoteIp());
+ ui->setTransfered(t->getPos(), t->getActual());
+ ui->setChunk(t->getSize());
+ const UserConnection& uc = t->getUserConnection();
+ ui->setCipher(Text::toT(uc.getCipherName()));
+ tstring country = Text::toT(Util::getIpCountry(uc.getRemoteIp()));
+ tstring ip = Text::toT(uc.getRemoteIp());
if(country.empty()) {
ui->setIP(ip);
} else {
ui->setIP(country + _T(" (") + ip + _T(")"));
}
+}
+void TransferView::on(DownloadManagerListener::Starting, Download* d) throw() {
+ UpdateInfo* ui = new UpdateInfo(d->getUser(), true);
+
+ starting(ui, d);
+ tstring statusString;
+
+ if(d->getUserConnection().isSecure()) {
+ if(d->getUserConnection().isTrusted()) {
+ statusString += _T("[S]");
+ } else {
+ statusString += _T("[U]");
+ }
+ }
+ if(d->isSet(Download::FLAG_TTH_CHECK)) {
+ statusString += _T("[T]");
+ }
+ if(d->isSet(Download::FLAG_ZDOWNLOAD)) {
+ statusString += _T("[Z]");
+ }
+ if(!statusString.empty()) {
+ statusString += _T(" ");
+ }
+ statusString += str(TF_("Downloading %1%") % getFile(d));
+
+ ui->setStatusString(statusString);
speak(UPDATE_ITEM, ui);
}
@@ -521,31 +543,6 @@
ui->setTransfered(d->getPos(), d->getActual());
ui->setSpeed(d->getAverageSpeed());
- tstring statusString;
-
- if(d->getUserConnection().isSecure()) {
- if(d->getUserConnection().isTrusted()) {
- statusString += _T("[S]");
- } else {
- statusString += _T("[U]");
- }
- }
- if(d->isSet(Download::FLAG_TTH_CHECK)) {
- statusString += _T("[T]");
- }
- if(d->isSet(Download::FLAG_ZDOWNLOAD)) {
- statusString += _T("[Z]");
- }
- if(!statusString.empty()) {
- statusString += _T(" ");
- }
- statusString += str(TF_("Downloading %1% (%2%/%3%)...")
- % getFile(d)
- % Text::toT(Util::formatBytes(d->getPos()))
- % Text::toT(Util::formatBytes(d->getSize())));
-
- ui->setStatusString(statusString);
-
tasks.add(UPDATE_ITEM, ui);
}
@@ -560,20 +557,30 @@
speak(UPDATE_ITEM, ui);
}
-void TransferView::on(UploadManagerListener::Starting, Upload* aUpload) throw() {
- UpdateInfo* ui = new UpdateInfo(aUpload->getUser(), false);
+void TransferView::on(UploadManagerListener::Starting, Upload* u) throw() {
+ UpdateInfo* ui = new UpdateInfo(u->getUser(), false);
- ui->setStatus(ItemInfo::STATUS_RUNNING);
- ui->setStatusString(T_("Upload starting..."));
- ui->setCipher(Text::toT(aUpload->getUserConnection().getCipherName()));
- tstring country = Text::toT(Util::getIpCountry(aUpload->getUserConnection().getRemoteIp()));
- tstring ip = Text::toT(aUpload->getUserConnection().getRemoteIp());
- if(country.empty()) {
- ui->setIP(ip);
- } else {
- ui->setIP(country + _T(" (") + ip + _T(")"));
+ starting(ui, u);
+
+ tstring statusString;
+
+ if(u->getUserConnection().isSecure()) {
+ if(u->getUserConnection().isTrusted()) {
+ statusString += _T("[S]");
+ } else {
+ statusString += _T("[U]");
+ }
}
+ if(u->isSet(Upload::FLAG_ZUPLOAD)) {
+ statusString += _T("[Z]");
+ }
+ if(!statusString.empty()) {
+ statusString += _T(" ");
+ }
+ statusString += str(TF_("Uploading %1%") % getFile(u));
+ ui->setStatusString(statusString);
+
speak(UPDATE_ITEM, ui);
}
@@ -582,30 +589,9 @@
Upload* u = *j;
UpdateInfo* ui = new UpdateInfo(u->getUser(), false);
+ ui->setTransfered(u->getPos(), u->getActual());
ui->setSpeed(u->getAverageSpeed());
- tstring statusString;
-
- if(u->getUserConnection().isSecure()) {
- if(u->getUserConnection().isTrusted()) {
- statusString += _T("[S]");
- } else {
- statusString += _T("[U]");
- }
- }
- if(u->isSet(Upload::FLAG_ZUPLOAD)) {
- statusString += _T("[Z]");
- }
- if(!statusString.empty()) {
- statusString += _T(" ");
- }
- statusString += str(TF_("Uploading %1% (%2%/%3%)...")
- % getFile(u)
- % Text::toT(Util::formatBytes(u->getPos()))
- % Text::toT(Util::formatBytes(u->getSize())));
-
- ui->setStatusString(statusString);
-
tasks.add(UPDATE_ITEM, ui);
}
@@ -624,7 +610,7 @@
UpdateInfo* ui = new UpdateInfo(aTransfer->getUser(), !isUpload);
ui->setStatus(ItemInfo::STATUS_WAITING);
- ui->setStatusString(T_("Idle..."));
+ ui->setStatusString(T_("Idle"));
speak(UPDATE_ITEM, ui);
}
Modified: dcplusplus/trunk/win32/TransferView.h
===================================================================
--- dcplusplus/trunk/win32/TransferView.h 2008-01-19 15:35:31 UTC (rev 968)
+++ dcplusplus/trunk/win32/TransferView.h 2008-01-19 22:19:19 UTC (rev 969)
@@ -63,6 +63,7 @@
COLUMN_USER = COLUMN_FIRST,
COLUMN_STATUS,
COLUMN_SPEED,
+ COLUMN_CHUNK,
COLUMN_TRANSFERED,
COLUMN_QUEUED,
COLUMN_CIPHER,
@@ -91,15 +92,17 @@
Status status;
int64_t actual;
+ int64_t lastActual;
int64_t transfered;
+ int64_t lastTransfered;
int64_t queued;
int64_t speed;
-
+ int64_t chunk;
+
tstring columns[COLUMN_LAST];
void update(const UpdateInfo& ui);
void disconnect();
- void deleteSelf() { delete this; }
double getRatio() { return (transfered > 0) ? (double)actual / (double)transfered : 1.0; }
@@ -120,7 +123,8 @@
MASK_SPEED = 1 << 2,
MASK_TRANSFERED = 1 << 3,
MASK_IP = 1 << 4,
- MASK_CIPHER = 1 << 5
+ MASK_CIPHER = 1 << 5,
+ MASK_CHUNK = 1 << 6
};
bool operator==(const ItemInfo& ii) { return download == ii.download && user == ii.user; }
@@ -144,6 +148,8 @@
int64_t speed;
void setStatusString(const tstring& aStatusString) { statusString = aStatusString; updateMask |= MASK_STATUS_STRING; }
tstring statusString;
+ void setChunk(int64_t aChunk) { chunk = aChunk; updateMask |= MASK_CHUNK; }
+ int64_t chunk;
void setIP(const tstring& aIp) { ip = aIp; updateMask |= MASK_IP; }
tstring ip;
@@ -168,9 +174,8 @@
HRESULT handleSpeaker(WPARAM wParam, LPARAM lParam);
HRESULT handleDestroy(WPARAM wParam, LPARAM lParam);
void handleForce();
- void handleSearchAlternates();
void handleCopyNick();
- void handleRemove();
+ void handleDisconnect();
void runUserCommand(const UserCommand& uc);
bool handleKeyDown(int c);
void handleDblClicked();
@@ -198,7 +203,8 @@
virtual void on(UploadManagerListener::Complete, Upload* aUpload) throw();
void onTransferComplete(Transfer* aTransfer, bool isUpload);
-
+ void starting(UpdateInfo* ui, Transfer* t);
+
#ifdef PORT_ME
LRESULT onCustomDraw(int /*idCtrl*/, LPNMHDR pnmh, BOOL& bHandled);
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arn...@us...> - 2008-01-21 21:01:02
|
Revision: 972
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=972&view=rev
Author: arnetheduck
Date: 2008-01-21 13:00:31 -0800 (Mon, 21 Jan 2008)
Log Message:
-----------
Translate titles
Modified Paths:
--------------
dcplusplus/trunk/win32/ADLSearchFrame.cpp
dcplusplus/trunk/win32/ADLSearchFrame.h
dcplusplus/trunk/win32/DownloadsFrame.cpp
dcplusplus/trunk/win32/DownloadsFrame.h
dcplusplus/trunk/win32/FavHubsFrame.cpp
dcplusplus/trunk/win32/FavHubsFrame.h
dcplusplus/trunk/win32/FinishedDLFrame.cpp
dcplusplus/trunk/win32/FinishedDLFrame.h
dcplusplus/trunk/win32/FinishedFrameBase.h
dcplusplus/trunk/win32/FinishedULFrame.cpp
dcplusplus/trunk/win32/FinishedULFrame.h
dcplusplus/trunk/win32/NotepadFrame.cpp
dcplusplus/trunk/win32/NotepadFrame.h
dcplusplus/trunk/win32/PublicHubsFrame.cpp
dcplusplus/trunk/win32/PublicHubsFrame.h
dcplusplus/trunk/win32/QueueFrame.cpp
dcplusplus/trunk/win32/QueueFrame.h
dcplusplus/trunk/win32/SpyFrame.cpp
dcplusplus/trunk/win32/SpyFrame.h
dcplusplus/trunk/win32/StaticFrame.h
dcplusplus/trunk/win32/StatsFrame.cpp
dcplusplus/trunk/win32/StatsFrame.h
dcplusplus/trunk/win32/SystemFrame.cpp
dcplusplus/trunk/win32/SystemFrame.h
dcplusplus/trunk/win32/UsersFrame.cpp
dcplusplus/trunk/win32/UsersFrame.h
dcplusplus/trunk/win32/WaitingUsersFrame.cpp
dcplusplus/trunk/win32/WaitingUsersFrame.h
Modified: dcplusplus/trunk/win32/ADLSearchFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/ADLSearchFrame.cpp 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/ADLSearchFrame.cpp 2008-01-21 21:00:31 UTC (rev 972)
@@ -37,7 +37,7 @@
};
ADLSearchFrame::ADLSearchFrame(SmartWin::WidgetTabView* mdiParent) :
- BaseType(mdiParent),
+ BaseType(mdiParent, T_("Automatic Directory Listing Search"), IDR_ADLSEARCH),
add(0),
properties(0),
up(0),
Modified: dcplusplus/trunk/win32/ADLSearchFrame.h
===================================================================
--- dcplusplus/trunk/win32/ADLSearchFrame.h 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/ADLSearchFrame.h 2008-01-21 21:00:31 UTC (rev 972)
@@ -29,9 +29,6 @@
STATUS_LAST
};
- static const ResourceManager::Strings TITLE_RESOURCE = ResourceManager::ADL_SEARCH;
- static const unsigned ICON_RESOURCE = IDR_ADLSEARCH;
-
protected:
typedef StaticFrame<ADLSearchFrame> BaseType;
friend class StaticFrame<ADLSearchFrame>;
Modified: dcplusplus/trunk/win32/DownloadsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/DownloadsFrame.cpp 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/DownloadsFrame.cpp 2008-01-21 21:00:31 UTC (rev 972)
@@ -42,7 +42,7 @@
};
DownloadsFrame::DownloadsFrame(SmartWin::WidgetTabView* mdiParent) :
- BaseType(mdiParent, T_("Downloads")),
+ BaseType(mdiParent, T_("Downloads"), IDR_QUEUE),
downloads(0),
startup(true)
{
Modified: dcplusplus/trunk/win32/DownloadsFrame.h
===================================================================
--- dcplusplus/trunk/win32/DownloadsFrame.h 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/DownloadsFrame.h 2008-01-21 21:00:31 UTC (rev 972)
@@ -37,8 +37,6 @@
STATUS_STATUS,
STATUS_LAST
};
- static const unsigned ICON_RESOURCE = IDR_QUEUE;
-
protected:
typedef StaticFrame<DownloadsFrame> BaseType;
friend class StaticFrame<DownloadsFrame>;
Modified: dcplusplus/trunk/win32/FavHubsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/FavHubsFrame.cpp 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/FavHubsFrame.cpp 2008-01-21 21:00:31 UTC (rev 972)
@@ -38,7 +38,7 @@
};
FavHubsFrame::FavHubsFrame(SmartWin::WidgetTabView* mdiParent) :
- BaseType(mdiParent),
+ BaseType(mdiParent, T_("Favorite Hubs"), IDR_FAVORITES),
hubs(0),
connect(0),
add(0),
Modified: dcplusplus/trunk/win32/FavHubsFrame.h
===================================================================
--- dcplusplus/trunk/win32/FavHubsFrame.h 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/FavHubsFrame.h 2008-01-21 21:00:31 UTC (rev 972)
@@ -34,9 +34,6 @@
STATUS_LAST
};
- static const ResourceManager::Strings TITLE_RESOURCE = ResourceManager::FAVORITE_HUBS;
- static const unsigned ICON_RESOURCE = IDR_FAVORITES;
-
protected:
typedef StaticFrame<FavHubsFrame> BaseType;
friend class StaticFrame<FavHubsFrame>;
Modified: dcplusplus/trunk/win32/FinishedDLFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/FinishedDLFrame.cpp 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/FinishedDLFrame.cpp 2008-01-21 21:00:31 UTC (rev 972)
@@ -22,6 +22,6 @@
#include "FinishedDLFrame.h"
FinishedDLFrame::FinishedDLFrame(SmartWin::WidgetTabView* mdiParent) :
- BaseType(mdiParent)
+ BaseType(mdiParent, T_("Finished Downloads"), IDR_FINISHED_DL)
{
}
Modified: dcplusplus/trunk/win32/FinishedDLFrame.h
===================================================================
--- dcplusplus/trunk/win32/FinishedDLFrame.h 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/FinishedDLFrame.h 2008-01-21 21:00:31 UTC (rev 972)
@@ -29,9 +29,6 @@
virtual ~FinishedDLFrame() { }
typedef FinishedFrameBase<FinishedDLFrame, false> BaseType;
-
- static const ResourceManager::Strings TITLE_RESOURCE = ResourceManager::FINISHED_DOWNLOADS;
- static const unsigned ICON_RESOURCE = IDR_FINISHED_DL;
};
#endif // !defined(DCPLUSPLUS_WIN32_FINISHED_DL_FRAME_H)
Modified: dcplusplus/trunk/win32/FinishedFrameBase.h
===================================================================
--- dcplusplus/trunk/win32/FinishedFrameBase.h 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/FinishedFrameBase.h 2008-01-21 21:00:31 UTC (rev 972)
@@ -47,8 +47,8 @@
friend class MDIChildFrame<T>;
typedef FinishedFrameBase<T, in_UL> ThisType;
- FinishedFrameBase(SmartWin::WidgetTabView* mdiParent) :
- BaseType(mdiParent),
+ FinishedFrameBase(SmartWin::WidgetTabView* mdiParent, const tstring& title, int icon) :
+ BaseType(mdiParent, title, icon),
items(0),
totalBytes(0),
totalTime(0)
Modified: dcplusplus/trunk/win32/FinishedULFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/FinishedULFrame.cpp 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/FinishedULFrame.cpp 2008-01-21 21:00:31 UTC (rev 972)
@@ -22,6 +22,6 @@
#include "FinishedULFrame.h"
FinishedULFrame::FinishedULFrame(SmartWin::WidgetTabView* mdiParent) :
- BaseType(mdiParent)
+ BaseType(mdiParent, T_("Finished Uploads"), IDR_FINISHED_UL)
{
}
Modified: dcplusplus/trunk/win32/FinishedULFrame.h
===================================================================
--- dcplusplus/trunk/win32/FinishedULFrame.h 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/FinishedULFrame.h 2008-01-21 21:00:31 UTC (rev 972)
@@ -29,8 +29,6 @@
virtual ~FinishedULFrame() { }
typedef FinishedFrameBase<FinishedULFrame, true> BaseType;
- static const ResourceManager::Strings TITLE_RESOURCE = ResourceManager::FINISHED_UPLOADS;
- static const unsigned ICON_RESOURCE = IDR_FINISHED_UL;
};
#endif // !defined(DCPLUSPLUS_WIN32_FINISHED_UL_FRAME_H)
Modified: dcplusplus/trunk/win32/NotepadFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/NotepadFrame.cpp 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/NotepadFrame.cpp 2008-01-21 21:00:31 UTC (rev 972)
@@ -24,7 +24,7 @@
#include <dcpp/Text.h>
NotepadFrame::NotepadFrame(SmartWin::WidgetTabView* mdiParent) :
- BaseType(mdiParent),
+ BaseType(mdiParent, T_("Notepad"), IDR_NOTEPAD),
pad(0)
{
{
Modified: dcplusplus/trunk/win32/NotepadFrame.h
===================================================================
--- dcplusplus/trunk/win32/NotepadFrame.h 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/NotepadFrame.h 2008-01-21 21:00:31 UTC (rev 972)
@@ -29,8 +29,6 @@
STATUS_LAST
};
- static const ResourceManager::Strings TITLE_RESOURCE = ResourceManager::NOTEPAD;
- static const unsigned ICON_RESOURCE = IDR_NOTEPAD;
protected:
typedef StaticFrame<NotepadFrame> BaseType;
friend class StaticFrame<NotepadFrame>;
Modified: dcplusplus/trunk/win32/PublicHubsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-01-21 21:00:31 UTC (rev 972)
@@ -90,7 +90,7 @@
}
PublicHubsFrame::PublicHubsFrame(SmartWin::WidgetTabView* mdiParent) :
- BaseType(mdiParent),
+ BaseType(mdiParent, T_("Public Hubs"), IDR_PUBLICHUBS),
hubs(0),
configure(0),
refresh(0),
Modified: dcplusplus/trunk/win32/PublicHubsFrame.h
===================================================================
--- dcplusplus/trunk/win32/PublicHubsFrame.h 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/PublicHubsFrame.h 2008-01-21 21:00:31 UTC (rev 972)
@@ -38,8 +38,6 @@
STATUS_USERS,
STATUS_LAST
};
- static const ResourceManager::Strings TITLE_RESOURCE = ResourceManager::PUBLIC_HUBS;
- static const unsigned ICON_RESOURCE = IDR_PUBLICHUBS;
private:
typedef StaticFrame<PublicHubsFrame> BaseType;
Modified: dcplusplus/trunk/win32/QueueFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/QueueFrame.cpp 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/QueueFrame.cpp 2008-01-21 21:00:31 UTC (rev 972)
@@ -54,7 +54,7 @@
}
QueueFrame::QueueFrame(SmartWin::WidgetTabView* mdiParent) :
- BaseType(mdiParent),
+ BaseType(mdiParent, T_("Download Queue"), IDR_QUEUE),
dirs(0),
files(0),
paned(0),
Modified: dcplusplus/trunk/win32/QueueFrame.h
===================================================================
--- dcplusplus/trunk/win32/QueueFrame.h 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/QueueFrame.h 2008-01-21 21:00:31 UTC (rev 972)
@@ -46,9 +46,6 @@
STATUS_LAST
};
- static const ResourceManager::Strings TITLE_RESOURCE = ResourceManager::DOWNLOAD_QUEUE;
- static const unsigned ICON_RESOURCE = IDR_QUEUE;
-
private:
typedef StaticFrame<QueueFrame> BaseType;
friend class StaticFrame<QueueFrame>;
Modified: dcplusplus/trunk/win32/SpyFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SpyFrame.cpp 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/SpyFrame.cpp 2008-01-21 21:00:31 UTC (rev 972)
@@ -35,7 +35,7 @@
};
SpyFrame::SpyFrame(SmartWin::WidgetTabView* mdiParent) :
- BaseType(mdiParent),
+ BaseType(mdiParent, T_("Search Spy"), IDR_SPY),
searches(0),
ignoreTTH(0),
bIgnoreTTH(BOOLSETTING(SPY_FRAME_IGNORE_TTH_SEARCHES)),
Modified: dcplusplus/trunk/win32/SpyFrame.h
===================================================================
--- dcplusplus/trunk/win32/SpyFrame.h 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/SpyFrame.h 2008-01-21 21:00:31 UTC (rev 972)
@@ -36,9 +36,6 @@
STATUS_LAST
};
- static const ResourceManager::Strings TITLE_RESOURCE = ResourceManager::SEARCH_SPY;
- static const unsigned ICON_RESOURCE = IDR_SPY;
-
protected:
typedef StaticFrame<SpyFrame> BaseType;
friend class StaticFrame<SpyFrame>;
Modified: dcplusplus/trunk/win32/StaticFrame.h
===================================================================
--- dcplusplus/trunk/win32/StaticFrame.h 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/StaticFrame.h 2008-01-21 21:00:31 UTC (rev 972)
@@ -28,17 +28,11 @@
class StaticFrame : public MDIChildFrame<T> {
public:
- StaticFrame(SmartWin::WidgetTabView* mdiClient, const tstring& title) :
- MDIChildFrame<T>(mdiClient, title, SmartWin::IconPtr(new SmartWin::Icon(T::ICON_RESOURCE)))
+ StaticFrame(SmartWin::WidgetTabView* mdiClient, const tstring& title, int icon) :
+ MDIChildFrame<T>(mdiClient, title, SmartWin::IconPtr(new SmartWin::Icon(icon)))
{
}
- /** @deprecated */
- StaticFrame(SmartWin::WidgetTabView* mdiClient) :
- MDIChildFrame<T>(mdiClient, TSTRING_I(T::TITLE_RESOURCE), SmartWin::IconPtr(new SmartWin::Icon(T::ICON_RESOURCE)))
- {
- }
-
virtual ~StaticFrame() {
frame = 0;
}
Modified: dcplusplus/trunk/win32/StatsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/StatsFrame.cpp 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/StatsFrame.cpp 2008-01-21 21:00:31 UTC (rev 972)
@@ -24,7 +24,7 @@
#include <dcpp/TimerManager.h>
StatsFrame::StatsFrame(SmartWin::WidgetTabView* mdiParent) :
- BaseType(mdiParent),
+ BaseType(mdiParent, T_("Network Statistics"), IDR_NET_STATS),
pen(new SmartWin::Pen(WinUtil::textColor)),
upPen(new SmartWin::Pen(SETTING(UPLOAD_BAR_COLOR))),
downPen(new SmartWin::Pen(SETTING(DOWNLOAD_BAR_COLOR))),
Modified: dcplusplus/trunk/win32/StatsFrame.h
===================================================================
--- dcplusplus/trunk/win32/StatsFrame.h 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/StatsFrame.h 2008-01-21 21:00:31 UTC (rev 972)
@@ -29,8 +29,6 @@
STATUS_STATUS,
STATUS_LAST
};
- static const ResourceManager::Strings TITLE_RESOURCE = ResourceManager::NETWORK_STATISTICS;
- static const unsigned ICON_RESOURCE = IDR_NET_STATS;
private:
typedef StaticFrame<StatsFrame> BaseType;
Modified: dcplusplus/trunk/win32/SystemFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/SystemFrame.cpp 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/SystemFrame.cpp 2008-01-21 21:00:31 UTC (rev 972)
@@ -23,7 +23,7 @@
#include "WinUtil.h"
SystemFrame::SystemFrame(SmartWin::WidgetTabView* mdiParent) :
- BaseType(mdiParent),
+ BaseType(mdiParent, T_("System Log"), IDR_MAINFRAME),
log(0)
{
{
Modified: dcplusplus/trunk/win32/SystemFrame.h
===================================================================
--- dcplusplus/trunk/win32/SystemFrame.h 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/SystemFrame.h 2008-01-21 21:00:31 UTC (rev 972)
@@ -32,8 +32,6 @@
STATUS_STATUS,
STATUS_LAST
};
- static const ResourceManager::Strings TITLE_RESOURCE = ResourceManager::SYSTEM_LOG;
- static const unsigned ICON_RESOURCE = IDR_MAINFRAME;
private:
typedef StaticFrame<SystemFrame> BaseType;
Modified: dcplusplus/trunk/win32/UsersFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/UsersFrame.cpp 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/UsersFrame.cpp 2008-01-21 21:00:31 UTC (rev 972)
@@ -35,7 +35,7 @@
};
UsersFrame::UsersFrame(SmartWin::WidgetTabView* mdiParent) :
- BaseType(mdiParent),
+ BaseType(mdiParent, T_("Favorite Users"), IDR_USERS),
users(0),
startup(true)
{
Modified: dcplusplus/trunk/win32/UsersFrame.h
===================================================================
--- dcplusplus/trunk/win32/UsersFrame.h 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/UsersFrame.h 2008-01-21 21:00:31 UTC (rev 972)
@@ -38,8 +38,6 @@
STATUS_STATUS,
STATUS_LAST
};
- static const ResourceManager::Strings TITLE_RESOURCE = ResourceManager::FAVORITE_USERS;
- static const unsigned ICON_RESOURCE = IDR_USERS;
protected:
typedef StaticFrame<UsersFrame> BaseType;
Modified: dcplusplus/trunk/win32/WaitingUsersFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/WaitingUsersFrame.cpp 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/WaitingUsersFrame.cpp 2008-01-21 21:00:31 UTC (rev 972)
@@ -30,7 +30,7 @@
// Constructor
WaitingUsersFrame::WaitingUsersFrame(SmartWin::WidgetTabView* mdiParent) :
- BaseType(mdiParent)
+ BaseType(mdiParent, T_("Waiting Users"), IDR_WAITING_USERS)
{
UploadManager::getInstance()->addListener(this);
Modified: dcplusplus/trunk/win32/WaitingUsersFrame.h
===================================================================
--- dcplusplus/trunk/win32/WaitingUsersFrame.h 2008-01-21 19:13:08 UTC (rev 971)
+++ dcplusplus/trunk/win32/WaitingUsersFrame.h 2008-01-21 21:00:31 UTC (rev 972)
@@ -35,9 +35,6 @@
STATUS_STATUS,
STATUS_LAST
};
- static const ResourceManager::Strings TITLE_RESOURCE = ResourceManager::WAITING_USERS;
- static const unsigned ICON_RESOURCE = IDR_WAITING_USERS;
-
protected:
typedef StaticFrame<WaitingUsersFrame> BaseType;
friend class StaticFrame<WaitingUsersFrame>;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X