linuxdcpp-team team mailing list archive
-
linuxdcpp-team team
-
Mailing list archive
-
Message #01866
[Branch ~linuxdcpp-team/linuxdcpp/trunk] Rev 384: Renamed Nick to User for consistency and grammar
------------------------------------------------------------
revno: 384
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: trunk
timestamp: Sat 2010-09-04 19:10:54 -0500
message:
Renamed Nick to User for consistency and grammar
modified:
Changelog.txt
glade/hub.glade
glade/search.glade
glade/settingsdialog.glade
linux/favoritehubs.cc
linux/favoriteusers.cc
linux/hub.cc
linux/search.cc
linux/search.hh
--
lp:linuxdcpp
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk
Your team LinuxDC++ Team is subscribed to branch lp:linuxdcpp.
To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk/+edit-subscription
=== modified file 'Changelog.txt'
--- Changelog.txt 2010-09-04 21:34:43 +0000
+++ Changelog.txt 2010-09-05 00:10:54 +0000
@@ -56,6 +56,7 @@
[2010-08-08] Added a case-insensitive substring search for nick list. (Steven)
[2010-08-26] Added Ctrl+F4 to close a tab. (thanks Bart Vullings)
[2010-09-04] Show the filename when grouping by TTH in search. (Steven)
+[2010-09-04] Renamed Nick to User for consistency and grammar. (Steven)
*** 1.0.3 2009-02-01 ***
[2008-08-10] lp#256236: Fixed a crash on startup when using auto-open options.
=== modified file 'glade/hub.glade'
--- glade/hub.glade 2008-05-27 16:44:55 +0000
+++ glade/hub.glade 2010-09-05 00:10:54 +0000
@@ -192,7 +192,7 @@
<child>
<widget class="GtkMenuItem" id="copyNickItem">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Copy nick</property>
+ <property name="label" translatable="yes">_Copy user</property>
<property name="use_underline">True</property>
</widget>
</child>
=== modified file 'glade/search.glade'
--- glade/search.glade 2010-05-22 16:14:15 +0000
+++ glade/search.glade 2010-09-05 00:10:54 +0000
@@ -171,7 +171,7 @@
Size
Connection
TTH
-Nick
+User
Hub
File type
</property>
=== modified file 'glade/settingsdialog.glade'
--- glade/settingsdialog.glade 2009-09-16 23:40:48 +0000
+++ glade/settingsdialog.glade 2010-09-05 00:10:54 +0000
@@ -128,7 +128,7 @@
<widget class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Nick</property>
+ <property name="label" translatable="yes">Username</property>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -4532,7 +4532,7 @@
<widget class="GtkCheckButton" id="commandDialogOnce">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Send once per nick</property>
+ <property name="label" translatable="yes">Send once per user</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
=== modified file 'linux/favoritehubs.cc'
--- linux/favoritehubs.cc 2009-08-23 22:13:35 +0000
+++ linux/favoritehubs.cc 2010-09-05 00:10:54 +0000
@@ -47,7 +47,7 @@
favoriteView.insertColumn("Name", G_TYPE_STRING, TreeView::STRING, 150);
favoriteView.insertColumn("Description", G_TYPE_STRING, TreeView::STRING, 250);
favoriteView.insertColumn("Address", G_TYPE_STRING, TreeView::STRING, 175);
- favoriteView.insertColumn("Nick", G_TYPE_STRING, TreeView::STRING, 100);
+ favoriteView.insertColumn("Username", G_TYPE_STRING, TreeView::STRING, 100);
favoriteView.insertColumn("Password", G_TYPE_STRING, TreeView::STRING, 100);
favoriteView.insertColumn("User Description", G_TYPE_STRING, TreeView::STRING, 125);
favoriteView.insertColumn("Encoding", G_TYPE_STRING, TreeView::STRING, 125);
@@ -112,7 +112,7 @@
favoriteView.col("Auto Connect"), Util::toInt(params["Auto Connect"]),
favoriteView.col("Name"), params["Name"].c_str(),
favoriteView.col("Description"), params["Description"].c_str(),
- favoriteView.col("Nick"), params["Nick"].c_str(),
+ favoriteView.col("Username"), params["Username"].c_str(),
favoriteView.col("Password"), password.c_str(),
favoriteView.col("Hidden Password"), params["Password"].c_str(),
favoriteView.col("Address"), params["Address"].c_str(),
@@ -246,7 +246,7 @@
params["Name"] = emptyString;
params["Address"] = emptyString;
params["Description"] = emptyString;
- params["Nick"] = emptyString;
+ params["Username"] = emptyString;
params["Password"] = emptyString;
params["User Description"] = emptyString;
params["Encoding"] = emptyString;
@@ -274,7 +274,7 @@
params["Name"] = fh->favoriteView.getString(&iter, "Name");
params["Address"] = fh->favoriteView.getString(&iter, "Address");
params["Description"] = fh->favoriteView.getString(&iter, "Description");
- params["Nick"] = fh->favoriteView.getString(&iter, "Nick");
+ params["Username"] = fh->favoriteView.getString(&iter, "Username");
params["Password"] = fh->favoriteView.getString(&iter, "Hidden Password");
params["User Description"] = fh->favoriteView.getString(&iter, "User Description");
params["Encoding"] = fh->favoriteView.getString(&iter, "Encoding");
@@ -299,7 +299,7 @@
gtk_entry_set_text(GTK_ENTRY(getWidget("entryName")), params["Name"].c_str());
gtk_entry_set_text(GTK_ENTRY(getWidget("entryAddress")), params["Address"].c_str());
gtk_entry_set_text(GTK_ENTRY(getWidget("entryDescription")), params["Description"].c_str());
- gtk_entry_set_text(GTK_ENTRY(getWidget("entryNick")), params["Nick"].c_str());
+ gtk_entry_set_text(GTK_ENTRY(getWidget("entryNick")), params["Username"].c_str());
gtk_entry_set_text(GTK_ENTRY(getWidget("entryPassword")), params["Password"].c_str());
gtk_entry_set_text(GTK_ENTRY(getWidget("entryUserDescription")), params["User Description"].c_str());
gtk_entry_set_text(GTK_ENTRY(getWidget("comboboxentryCharset")), params["Encoding"].c_str());
@@ -314,7 +314,7 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(getWidget("checkbuttonEncoding")), overrideEncoding);
// Set the override default nick checkbox
- gboolean overrideNick = !(params["Nick"].empty() || params["Nick"] == SETTING(NICK));
+ gboolean overrideNick = !(params["Username"].empty() || params["Username"] == SETTING(NICK));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(getWidget("checkbuttonNick")), overrideNick);
// Set the override default user description checkbox
@@ -342,7 +342,7 @@
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(getWidget("checkbuttonNick"))))
{
- params["Nick"] = gtk_entry_get_text(GTK_ENTRY(getWidget("entryNick")));
+ params["Username"] = gtk_entry_get_text(GTK_ENTRY(getWidget("entryNick")));
}
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(getWidget("checkbuttonUserDescription"))))
@@ -464,7 +464,7 @@
params["Auto Connect"] = entry->getConnect() ? "1" : "0";
params["Name"] = entry->getName();
params["Description"] = entry->getDescription();
- params["Nick"] = entry->getNick(FALSE); // Don't display default nick to avoid accidentally saving it
+ params["Username"] = entry->getNick(FALSE); // Don't display default nick to avoid accidentally saving it
params["Password"] = entry->getPassword();
params["Address"] = entry->getServer();
params["User Description"] = entry->getUserDescription();
@@ -478,7 +478,7 @@
entry.setName(params["Name"]);
entry.setServer(params["Address"]);
entry.setDescription(params["Description"]);
- entry.setNick(params["Nick"]);
+ entry.setNick(params["Username"]);
entry.setPassword(params["Password"]);
entry.setUserDescription(params["User Description"]);
entry.setEncoding(params["Encoding"]);
@@ -495,7 +495,7 @@
entry->setName(params["Name"]);
entry->setServer(params["Address"]);
entry->setDescription(params["Description"]);
- entry->setNick(params["Nick"]);
+ entry->setNick(params["Username"]);
entry->setPassword(params["Password"]);
entry->setUserDescription(params["User Description"]);
entry->setEncoding(params["Encoding"]);
=== modified file 'linux/favoriteusers.cc'
--- linux/favoriteusers.cc 2010-05-25 06:12:37 +0000
+++ linux/favoriteusers.cc 2010-09-05 00:10:54 +0000
@@ -39,7 +39,7 @@
// Initialize favorite users list treeview
favoriteUserView.setView(GTK_TREE_VIEW(getWidget("favoriteUserView")), TRUE, "favoriteusers");
favoriteUserView.insertColumn(_("Auto Grant Slot"), G_TYPE_BOOLEAN, TreeView::BOOL, 120);
- favoriteUserView.insertColumn(_("Nick"), G_TYPE_STRING, TreeView::ICON_STRING, 100, "Icon");
+ favoriteUserView.insertColumn(_("User"), G_TYPE_STRING, TreeView::ICON_STRING, 100, "Icon");
favoriteUserView.insertColumn(_("Most Recent Hub"), G_TYPE_STRING, TreeView::STRING, 200);
favoriteUserView.insertColumn(_("Time Last Seen"), G_TYPE_STRING, TreeView::STRING, 120);
favoriteUserView.insertColumn(_("Description"), G_TYPE_STRING, TreeView::STRING, 150);
@@ -54,8 +54,8 @@
favoriteUserSelection = gtk_tree_view_get_selection(favoriteUserView.get());
gtk_tree_selection_set_mode(favoriteUserSelection, GTK_SELECTION_MULTIPLE);
- gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(favoriteUserStore), favoriteUserView.col(_("Nick")), GTK_SORT_ASCENDING);
- gtk_tree_view_column_set_sort_indicator(gtk_tree_view_get_column(favoriteUserView.get(), favoriteUserView.col(_("Nick"))), TRUE);
+ gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(favoriteUserStore), favoriteUserView.col(_("User")), GTK_SORT_ASCENDING);
+ gtk_tree_view_column_set_sort_indicator(gtk_tree_view_get_column(favoriteUserView.get(), favoriteUserView.col(_("User"))), TRUE);
gtk_tree_view_set_fixed_height_mode(favoriteUserView.get(), TRUE);
GList *list = gtk_tree_view_column_get_cell_renderers(gtk_tree_view_get_column(favoriteUserView.get(),
@@ -102,7 +102,7 @@
gtk_list_store_append(favoriteUserStore, &iter);
gtk_list_store_set(favoriteUserStore, &iter,
favoriteUserView.col(_("Auto Grant Slot")), user.isSet(FavoriteUser::FLAG_GRANTSLOT) ? TRUE : FALSE,
- favoriteUserView.col(_("Nick")), user.getNick().c_str(),
+ favoriteUserView.col(_("User")), user.getNick().c_str(),
favoriteUserView.col(_("Most Recent Hub")), hub.c_str(),
favoriteUserView.col(_("Time Last Seen")), seen.c_str(),
favoriteUserView.col(_("Description")), user.getDescription().c_str(),
@@ -356,7 +356,7 @@
if (gtk_tree_model_get_iter(GTK_TREE_MODEL(fu->favoriteUserStore), &iter, path))
{
description = fu->favoriteUserView.getString(&iter, _("Description"));
- nick = fu->favoriteUserView.getString(&iter, _("Nick"));
+ nick = fu->favoriteUserView.getString(&iter, _("User"));
cid = fu->favoriteUserView.getString(&iter, "CID");
}
gtk_tree_path_free(path);
@@ -409,7 +409,7 @@
if (gtk_tree_model_get_iter(GTK_TREE_MODEL(fu->favoriteUserStore), &iter, path))
{
string cid = fu->favoriteUserView.getString(&iter, "CID");
- string nick = fu->favoriteUserView.getString(&iter, _("Nick"));
+ string nick = fu->favoriteUserView.getString(&iter, _("User"));
params.insert(ParamMap::value_type(cid, nick));
}
gtk_tree_path_free(path);
@@ -569,7 +569,7 @@
{
gtk_list_store_append(favoriteUserStore, &iter);
gtk_list_store_set(favoriteUserStore, &iter,
- favoriteUserView.col(_("Nick")), params["Nick"].c_str(),
+ favoriteUserView.col(_("User")), params["User"].c_str(),
favoriteUserView.col(_("Most Recent Hub")), params["Hub"].c_str(),
favoriteUserView.col(_("Time Last Seen")), params["Time"].c_str(),
favoriteUserView.col(_("Description")), params["Description"].c_str(),
@@ -607,7 +607,7 @@
{
ParamMap params;
bool online = user.getUser()->isOnline();
- params.insert(ParamMap::value_type("Nick", user.getNick()));
+ params.insert(ParamMap::value_type("User", user.getNick()));
params.insert(ParamMap::value_type("Hub", online ? WulforUtil::getHubNames(user.getUser()) : user.getUrl()));
params.insert(ParamMap::value_type("Time", online ? _("Online") : Util::formatTime("%Y-%m-%d %H:%M", user.getLastSeen())));
params.insert(ParamMap::value_type("Description", user.getDescription()));
=== modified file 'linux/hub.cc'
--- linux/hub.cc 2010-08-09 03:11:55 +0000
+++ linux/hub.cc 2010-09-05 00:10:54 +0000
@@ -51,7 +51,7 @@
// Initialize nick treeview
nickView.setView(GTK_TREE_VIEW(getWidget("nickView")), true, "hub");
- nickView.insertColumn("Nick", G_TYPE_STRING, TreeView::ICON_STRING, 100, "Icon");
+ nickView.insertColumn("User", G_TYPE_STRING, TreeView::ICON_STRING, 100, "Icon");
nickView.insertColumn("Shared", G_TYPE_INT64, TreeView::SIZE, 75);
nickView.insertColumn("Description", G_TYPE_STRING, TreeView::STRING, 85);
nickView.insertColumn("Tag", G_TYPE_STRING, TreeView::STRING, 100);
@@ -67,9 +67,9 @@
g_object_unref(nickStore);
nickSelection = gtk_tree_view_get_selection(nickView.get());
gtk_tree_selection_set_mode(gtk_tree_view_get_selection(nickView.get()), GTK_SELECTION_MULTIPLE);
- nickView.setSortColumn_gui("Nick", "Nick Order");
+ nickView.setSortColumn_gui("User", "Nick Order");
gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(nickStore), nickView.col("Nick Order"), GTK_SORT_ASCENDING);
- gtk_tree_view_column_set_sort_indicator(gtk_tree_view_get_column(nickView.get(), nickView.col("Nick")), TRUE);
+ gtk_tree_view_column_set_sort_indicator(gtk_tree_view_get_column(nickView.get(), nickView.col("User")), TRUE);
gtk_tree_view_set_fixed_height_mode(nickView.get(), TRUE);
gtk_tree_view_set_search_equal_func(nickView.get(), onNickListSearch_gui, 0,0);
@@ -211,18 +211,18 @@
if (findUser_gui(cid, &iter))
{
totalShared += shared - nickView.getValue<int64_t>(&iter, "Shared");
- string nick = nickView.getString(&iter,"Nick");
+ string nick = nickView.getString(&iter,"User");
- if (nick != params["Nick"])
+ if (nick != params["User"])
{
// User has changed nick, update userMap and remove the old Nick tag
userMap.erase(nick);
removeTag_gui(nick);
- userMap[params["Nick"]] = cid;
+ userMap[params["User"]] = cid;
}
gtk_list_store_set(nickStore, &iter,
- nickView.col("Nick"), params["Nick"].c_str(),
+ nickView.col("User"), params["User"].c_str(),
nickView.col("Shared"), shared,
nickView.col("Description"), params["Description"].c_str(),
nickView.col("Tag"), params["Tag"].c_str(),
@@ -237,12 +237,12 @@
else
{
totalShared += shared;
- userMap[params["Nick"]] = cid;
+ userMap[params["User"]] = cid;
if (BOOLSETTING(SHOW_JOINS))
{
- addStatusMessage_gui(params["Nick"] + _(" has joined"));
- string line = params["Nick"] + _(" has joined hub ") + client->getHubName();
+ addStatusMessage_gui(params["User"] + _(" has joined"));
+ string line = params["User"] + _(" has joined hub ") + client->getHubName();
WulforManager::get()->getMainWindow()->addPrivateStatusMessage_gui(cid, line);
}
else if (BOOLSETTING(FAV_SHOW_JOINS))
@@ -253,7 +253,7 @@
}
gtk_list_store_insert_with_values(nickStore, &iter, userMap.size(),
- nickView.col("Nick"), params["Nick"].c_str(),
+ nickView.col("User"), params["User"].c_str(),
nickView.col("Shared"), shared,
nickView.col("Description"), params["Description"].c_str(),
nickView.col("Tag"), params["Tag"].c_str(),
@@ -279,7 +279,7 @@
if (findUser_gui(cid, &iter))
{
- nick = nickView.getString(&iter, "Nick");
+ nick = nickView.getString(&iter, "User");
totalShared -= nickView.getValue<int64_t>(&iter, "Shared");
gtk_list_store_remove(nickStore, &iter);
removeTag_gui(nick);
@@ -690,7 +690,7 @@
while (valid)
{
- string nick = hub->nickView.getString(&iter, "Nick");
+ string nick = hub->nickView.getString(&iter, "User");
string::size_type tagEnd = 0;
if (useNext && (tagEnd = Text::toLower(nick).find(key)) != string::npos)
{
@@ -734,7 +734,7 @@
{
// Select the user in the nick list view
GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(hub->nickStore), &nickIter);
- gtk_tree_view_scroll_to_cell(hub->nickView.get(), path, gtk_tree_view_get_column(hub->nickView.get(), hub->nickView.col("Nick")), FALSE, 0.0, 0.0);
+ gtk_tree_view_scroll_to_cell(hub->nickView.get(), path, gtk_tree_view_get_column(hub->nickView.get(), hub->nickView.col("User")), FALSE, 0.0, 0.0);
gtk_tree_view_set_cursor(hub->nickView.get(), path, NULL, FALSE);
gtk_tree_path_free(path);
@@ -951,7 +951,7 @@
else if (command == _("help"))
{
hub->addStatusMessage_gui(_("Available commands: /away <message>, /back, /clear, /close, /favorite, "\
- "/getlist <nick>, /grant <nick>, /help, /join <address>, /me <message>, /pm <nick>, /rebuild, /refresh, /userlist"));
+ "/getlist <user>, /grant <user>, /help, /join <address>, /me <message>, /pm <user>, /rebuild, /refresh, /userlist"));
}
else if (command == _("join") && !param.empty())
{
@@ -1028,7 +1028,7 @@
path = (GtkTreePath *)i->data;
if (gtk_tree_model_get_iter(GTK_TREE_MODEL(hub->nickStore), &iter, path))
{
- nicks += hub->nickView.getString(&iter, "Nick") + ' ';
+ nicks += hub->nickView.getString(&iter, "User") + ' ';
}
gtk_tree_path_free(path);
}
@@ -1232,7 +1232,7 @@
if (gtk_tree_model_get_iter(GTK_TREE_MODEL(hub->nickStore), &iter, path))
{
cid = hub->nickView.getString(&iter, "CID");
- nick = hub->nickView.getString(&iter, _("Nick"));
+ nick = hub->nickView.getString(&iter, _("User"));
if (!cid.empty() && nick != hub->client->getMyNick())
{
F1 *func = new F1(hub, &Hub::addFavoriteUser_client, cid);
@@ -1496,7 +1496,7 @@
params["Nick Order"] = "u" + id.getNick();
}
- params["Nick"] = id.getNick();
+ params["User"] = id.getNick();
params["Shared"] = Util::toString(id.getBytesShared());
params["Description"] = id.getDescription();
params["Tag"] = id.getTag();
=== modified file 'linux/search.cc'
--- linux/search.cc 2010-09-04 21:34:43 +0000
+++ linux/search.cc 2010-09-05 00:10:54 +0000
@@ -80,7 +80,7 @@
// Initialize search result treeview
resultView.setView(GTK_TREE_VIEW(getWidget("treeviewResult")), TRUE, "search");
resultView.insertColumn("Filename", G_TYPE_STRING, TreeView::ICON_STRING, 250, "Icon");
- resultView.insertColumn("Nick", G_TYPE_STRING, TreeView::STRING, 100);
+ resultView.insertColumn("User", G_TYPE_STRING, TreeView::STRING, 100);
resultView.insertColumn("Type", G_TYPE_STRING, TreeView::STRING, 65);
resultView.insertColumn("Size", G_TYPE_STRING, TreeView::STRING, 80);
resultView.insertColumn("Path", G_TYPE_STRING, TreeView::STRING, 100);
@@ -530,7 +530,7 @@
// Have to use insert with values since appending would cause searchFilterFunc to be
// called with empty row which in turn will cause assert failure in treeview::getString
gtk_tree_store_insert_with_values(resultStore, &iter, foundParent ? &parent : NULL, -1,
- resultView.col("Nick"), resultMap["Nick"].c_str(),
+ resultView.col("User"), resultMap["User"].c_str(),
resultView.col("Filename"), resultMap["Filename"].c_str(),
resultView.col("Slots"), resultMap["Slots"].c_str(),
resultView.col("Size"), resultMap["Size"].c_str(),
@@ -595,7 +595,7 @@
dcassert(children != 0);
string users = Util::toString(children) + _(" user(s)");
- gtk_tree_store_set(resultStore, parent, resultView.col("Nick"), users.c_str(), -1);
+ gtk_tree_store_set(resultStore, parent, resultView.col("User"), users.c_str(), -1);
if (child == NULL)
return;
@@ -624,8 +624,8 @@
WulforUtil::copyValue_gui(resultStore, child, parent, resultView.col("Real Size"));
break;
}
- case NICK:
- WulforUtil::copyValue_gui(resultStore, child, parent, resultView.col("Nick"));
+ case USER:
+ WulforUtil::copyValue_gui(resultStore, child, parent, resultView.col("User"));
break;
case HUB:
{
@@ -754,8 +754,8 @@
case Search::TTH:
column = "TTH";
break;
- case Search::NICK:
- column = "Nick";
+ case Search::USER:
+ column = "User";
break;
case Search::HUB:
column = "Hub";
@@ -1607,7 +1607,7 @@
}
}
- resultMap["Nick"] = WulforUtil::getNicks(result->getUser());
+ resultMap["User"] = WulforUtil::getNicks(result->getUser());
resultMap["CID"] = result->getUser()->getCID().toBase32();
resultMap["Slots"] = result->getSlotString();
resultMap["Connection"] = ClientManager::getInstance()->getConnection(result->getUser()->getCID());
=== modified file 'linux/search.hh'
--- linux/search.hh 2010-09-04 21:34:43 +0000
+++ linux/search.hh 2010-09-05 00:10:54 +0000
@@ -55,7 +55,7 @@
SIZE,
CONNECTION,
TTH,
- NICK,
+ USER,
HUB,
TYPE
} GroupType;
