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