Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [972] dcplusplus/trunk/win32
|
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.
|
