linuxdcpp-team team mailing list archive
-
linuxdcpp-team team
-
Mailing list archive
-
Message #02195
[Branch ~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n] Rev 395: Translate tree view column titles
------------------------------------------------------------
revno: 395
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: linuxdcpp-i18n
timestamp: Thu 2010-10-21 23:05:48 -0500
message:
Translate tree view column titles
modified:
linux/downloadqueue.cc
linux/favoritehubs.cc
linux/favoriteusers.cc
linux/finishedtransfers.cc
linux/hub.cc
linux/publichubs.cc
linux/search.cc
linux/settingsdialog.cc
linux/sharebrowser.cc
linux/transfers.cc
linux/treeview.cc
--
lp:~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n
Your team LinuxDC++ Team is subscribed to branch lp:~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n.
To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n/+edit-subscription
=== modified file 'linux/downloadqueue.cc'
--- linux/downloadqueue.cc 2009-08-15 04:40:26 +0000
+++ linux/downloadqueue.cc 2010-10-22 04:05:48 +0000
@@ -57,17 +57,17 @@
// Initialize file treeview
fileView.setView(GTK_TREE_VIEW(getWidget("fileView")), TRUE, "downloadqueue");
- fileView.insertColumn("Filename", G_TYPE_STRING, TreeView::STRING, 200);
- fileView.insertColumn("Status", G_TYPE_STRING, TreeView::STRING, 100);
- fileView.insertColumn("Size", G_TYPE_STRING, TreeView::STRING, 100);
- fileView.insertColumn("Downloaded", G_TYPE_STRING, TreeView::STRING, 150);
- fileView.insertColumn("Priority", G_TYPE_STRING, TreeView::STRING, 75);
- fileView.insertColumn("Users", G_TYPE_STRING, TreeView::STRING, 200);
- fileView.insertColumn("Path", G_TYPE_STRING, TreeView::STRING, 200);
- fileView.insertColumn("Exact Size", G_TYPE_STRING, TreeView::STRING, 100);
- fileView.insertColumn("Errors", G_TYPE_STRING, TreeView::STRING, 200);
- fileView.insertColumn("Added", G_TYPE_STRING, TreeView::STRING, 120);
- fileView.insertColumn("TTH", G_TYPE_STRING, TreeView::STRING, 125);
+ fileView.insertColumn(N_("Filename"), G_TYPE_STRING, TreeView::STRING, 200);
+ fileView.insertColumn(N_("Status"), G_TYPE_STRING, TreeView::STRING, 100);
+ fileView.insertColumn(N_("Size"), G_TYPE_STRING, TreeView::STRING, 100);
+ fileView.insertColumn(N_("Downloaded"), G_TYPE_STRING, TreeView::STRING, 150);
+ fileView.insertColumn(N_("Priority"), G_TYPE_STRING, TreeView::STRING, 75);
+ fileView.insertColumn(N_("Users"), G_TYPE_STRING, TreeView::STRING, 200);
+ fileView.insertColumn(N_("Path"), G_TYPE_STRING, TreeView::STRING, 200);
+ fileView.insertColumn(N_("Exact Size"), G_TYPE_STRING, TreeView::STRING, 100);
+ fileView.insertColumn(N_("Errors"), G_TYPE_STRING, TreeView::STRING, 200);
+ fileView.insertColumn(N_("Added"), G_TYPE_STRING, TreeView::STRING, 120);
+ fileView.insertColumn(N_("TTH"), G_TYPE_STRING, TreeView::STRING, 125);
fileView.insertHiddenColumn("Size Sort", G_TYPE_INT64);
fileView.insertHiddenColumn("Downloaded Sort", G_TYPE_INT64);
fileView.insertHiddenColumn("Target", G_TYPE_STRING);
=== modified file 'linux/favoritehubs.cc'
--- linux/favoritehubs.cc 2010-10-11 06:05:22 +0000
+++ linux/favoritehubs.cc 2010-10-22 04:05:48 +0000
@@ -43,14 +43,14 @@
// Initialize favorite hub list treeview
favoriteView.setView(GTK_TREE_VIEW(getWidget("favoriteView")), TRUE, "favoritehubs");
- favoriteView.insertColumn("Auto Connect", G_TYPE_BOOLEAN, TreeView::BOOL, 100);
- 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("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);
+ favoriteView.insertColumn(N_("Auto Connect"), G_TYPE_BOOLEAN, TreeView::BOOL, 100);
+ favoriteView.insertColumn(N_("Name"), G_TYPE_STRING, TreeView::STRING, 150);
+ favoriteView.insertColumn(N_("Description"), G_TYPE_STRING, TreeView::STRING, 250);
+ favoriteView.insertColumn(N_("Address"), G_TYPE_STRING, TreeView::STRING, 175);
+ favoriteView.insertColumn(N_("Username"), G_TYPE_STRING, TreeView::STRING, 100);
+ favoriteView.insertColumn(N_("Password"), G_TYPE_STRING, TreeView::STRING, 100);
+ favoriteView.insertColumn(N_("User Description"), G_TYPE_STRING, TreeView::STRING, 125);
+ favoriteView.insertColumn(N_("Encoding"), G_TYPE_STRING, TreeView::STRING, 125);
favoriteView.insertHiddenColumn("Hidden Password", G_TYPE_STRING);
favoriteView.finalize();
favoriteStore = gtk_list_store_newv(favoriteView.getColCount(), favoriteView.getGTypes());
=== modified file 'linux/favoriteusers.cc'
--- linux/favoriteusers.cc 2010-10-11 06:05:22 +0000
+++ linux/favoriteusers.cc 2010-10-22 04:05:48 +0000
@@ -38,12 +38,12 @@
// 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(_("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);
- favoriteUserView.insertColumn("CID", G_TYPE_STRING, TreeView::STRING, 350);
+ favoriteUserView.insertColumn(N_("Auto Grant Slot"), G_TYPE_BOOLEAN, TreeView::BOOL, 120);
+ favoriteUserView.insertColumn(N_("User"), G_TYPE_STRING, TreeView::ICON_STRING, 100, "Icon");
+ favoriteUserView.insertColumn(N_("Most Recent Hub"), G_TYPE_STRING, TreeView::STRING, 200);
+ favoriteUserView.insertColumn(N_("Time Last Seen"), G_TYPE_STRING, TreeView::STRING, 120);
+ favoriteUserView.insertColumn(N_("Description"), G_TYPE_STRING, TreeView::STRING, 150);
+ favoriteUserView.insertColumn(N_("CID"), G_TYPE_STRING, TreeView::STRING, 350);
favoriteUserView.insertHiddenColumn("URL", G_TYPE_STRING);
favoriteUserView.insertHiddenColumn("Icon", G_TYPE_STRING);
favoriteUserView.finalize();
@@ -54,12 +54,12 @@
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(_("User")), GTK_SORT_ASCENDING);
- gtk_tree_view_column_set_sort_indicator(gtk_tree_view_get_column(favoriteUserView.get(), favoriteUserView.col(_("User"))), 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(),
- favoriteUserView.col(_("Auto Grant Slot"))));
+ favoriteUserView.col("Auto Grant Slot")));
GObject *renderer = (GObject *)g_list_nth_data(list, 0);
g_signal_connect(renderer, "toggled", G_CALLBACK(onAutoGrantSlotToggled_gui), (gpointer)this);
g_list_free(list);
@@ -101,11 +101,11 @@
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(_("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(),
+ favoriteUserView.col("Auto Grant Slot"), user.isSet(FavoriteUser::FLAG_GRANTSLOT) ? TRUE : FALSE,
+ 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(),
favoriteUserView.col("CID"), cid.c_str(),
favoriteUserView.col("URL"), user.getUrl().c_str(),
favoriteUserView.col("Icon"), "linuxdcpp-normal",
@@ -355,8 +355,8 @@
if (gtk_tree_model_get_iter(GTK_TREE_MODEL(fu->favoriteUserStore), &iter, path))
{
- description = fu->favoriteUserView.getString(&iter, _("Description"));
- nick = fu->favoriteUserView.getString(&iter, _("User"));
+ description = fu->favoriteUserView.getString(&iter, "Description");
+ nick = fu->favoriteUserView.getString(&iter, "User");
cid = fu->favoriteUserView.getString(&iter, "CID");
}
gtk_tree_path_free(path);
@@ -380,7 +380,7 @@
if (fu->findUser_gui(cid, &iter))
{
description = gtk_entry_get_text(GTK_ENTRY(fu->getWidget("descriptionEntry")));
- gtk_list_store_set(fu->favoriteUserStore, &iter, fu->favoriteUserView.col(_("Description")), description.c_str(), -1);
+ gtk_list_store_set(fu->favoriteUserStore, &iter, fu->favoriteUserView.col("Description"), description.c_str(), -1);
typedef Func2<FavoriteUsers, string, string> F2;
F2 *func = new F2(fu, &FavoriteUsers::setUserDescription_client, cid, description);
@@ -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, _("User"));
+ string nick = fu->favoriteUserView.getString(&iter, "User");
params.insert(ParamMap::value_type(cid, nick));
}
gtk_tree_path_free(path);
@@ -455,9 +455,9 @@
if (gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(fu->favoriteUserStore), &iter, path))
{
string cid = fu->favoriteUserView.getString(&iter, "CID");
- gboolean grant = fu->favoriteUserView.getValue<gboolean>(&iter, _("Auto Grant Slot"));
+ gboolean grant = fu->favoriteUserView.getValue<gboolean>(&iter, "Auto Grant Slot");
grant = !grant;
- gtk_list_store_set(fu->favoriteUserStore, &iter, fu->favoriteUserView.col(_("Auto Grant Slot")), grant, -1);
+ gtk_list_store_set(fu->favoriteUserStore, &iter, fu->favoriteUserView.col("Auto Grant Slot"), grant, -1);
typedef Func2<FavoriteUsers, string, bool> F2;
F2 *func = new F2(fu, &FavoriteUsers::setAutoGrantSlot_client, cid, grant);
@@ -563,16 +563,16 @@
if (findUser_gui(cid, &iter))
{
- gtk_list_store_set(favoriteUserStore, &iter, favoriteUserView.col(_("Time Last Seen")), params["Time"].c_str(), -1);
+ gtk_list_store_set(favoriteUserStore, &iter, favoriteUserView.col("Time Last Seen"), params["Time"].c_str(), -1);
}
else
{
gtk_list_store_append(favoriteUserStore, &iter);
gtk_list_store_set(favoriteUserStore, &iter,
- 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(),
+ 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(),
favoriteUserView.col("CID"), cid.c_str(),
favoriteUserView.col("URL"), params["URL"].c_str(),
favoriteUserView.col("Icon"), "linuxdcpp-normal",
=== modified file 'linux/finishedtransfers.cc'
--- linux/finishedtransfers.cc 2010-09-18 17:51:54 +0000
+++ linux/finishedtransfers.cc 2010-10-22 04:05:48 +0000
@@ -47,13 +47,13 @@
{
// Initialize transfer treeview
fileView.setView(GTK_TREE_VIEW(getWidget("fileView")), true, "finished");
- fileView.insertColumn("Time", G_TYPE_STRING, TreeView::STRING, 150);
- fileView.insertColumn("Filename", G_TYPE_STRING, TreeView::STRING, 100);
- fileView.insertColumn("Path", G_TYPE_STRING, TreeView::STRING, 200);
- fileView.insertColumn("Users", G_TYPE_STRING, TreeView::STRING, 100);
- fileView.insertColumn("Size", G_TYPE_INT64, TreeView::SIZE, 100);
- fileView.insertColumn("Average Speed", G_TYPE_INT64, TreeView::SPEED, 125);
- fileView.insertColumn("CRC Checked", G_TYPE_STRING, TreeView::STRING, 115);
+ fileView.insertColumn(N_("Time"), G_TYPE_STRING, TreeView::STRING, 150);
+ fileView.insertColumn(N_("Filename"), G_TYPE_STRING, TreeView::STRING, 100);
+ fileView.insertColumn(N_("Path"), G_TYPE_STRING, TreeView::STRING, 200);
+ fileView.insertColumn(N_("Users"), G_TYPE_STRING, TreeView::STRING, 100);
+ fileView.insertColumn(N_("Size"), G_TYPE_INT64, TreeView::SIZE, 100);
+ fileView.insertColumn(N_("Average Speed"), G_TYPE_INT64, TreeView::SPEED, 125);
+ fileView.insertColumn(N_("CRC Checked"), G_TYPE_STRING, TreeView::STRING, 115);
fileView.insertHiddenColumn("Target", G_TYPE_STRING);
fileView.insertHiddenColumn("Elapsed Time", G_TYPE_INT64);
fileView.finalize();
=== modified file 'linux/hub.cc'
--- linux/hub.cc 2010-10-11 06:05:22 +0000
+++ linux/hub.cc 2010-10-22 04:05:48 +0000
@@ -51,13 +51,13 @@
// Initialize nick treeview
nickView.setView(GTK_TREE_VIEW(getWidget("nickView")), true, "hub");
- 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);
- nickView.insertColumn("Connection", G_TYPE_STRING, TreeView::STRING, 85);
- nickView.insertColumn("IP", G_TYPE_STRING, TreeView::STRING, 85);
- nickView.insertColumn("eMail", G_TYPE_STRING, TreeView::STRING, 90);
+ nickView.insertColumn(N_("User"), G_TYPE_STRING, TreeView::ICON_STRING, 100, "Icon");
+ nickView.insertColumn(N_("Shared"), G_TYPE_INT64, TreeView::SIZE, 75);
+ nickView.insertColumn(N_("Description"), G_TYPE_STRING, TreeView::STRING, 85);
+ nickView.insertColumn(N_("Tag"), G_TYPE_STRING, TreeView::STRING, 100);
+ nickView.insertColumn(N_("Connection"), G_TYPE_STRING, TreeView::STRING, 85);
+ nickView.insertColumn(N_("IP"), G_TYPE_STRING, TreeView::STRING, 85);
+ nickView.insertColumn(N_("eMail"), G_TYPE_STRING, TreeView::STRING, 90);
nickView.insertHiddenColumn("Icon", G_TYPE_STRING);
nickView.insertHiddenColumn("Nick Order", G_TYPE_STRING);
nickView.insertHiddenColumn("CID", G_TYPE_STRING);
=== modified file 'linux/publichubs.cc'
--- linux/publichubs.cc 2010-01-01 00:57:24 +0000
+++ linux/publichubs.cc 2010-10-22 04:05:48 +0000
@@ -35,17 +35,17 @@
// Initialize public hub list treeview
hubView.setView(GTK_TREE_VIEW(getWidget("hubView")), true, "publichubs");
- hubView.insertColumn("Name", G_TYPE_STRING, TreeView::STRING, 200);
- hubView.insertColumn("Description", G_TYPE_STRING, TreeView::STRING, 350);
- hubView.insertColumn("Users", G_TYPE_INT, TreeView::INT, 75);
- hubView.insertColumn("Address", G_TYPE_STRING, TreeView::STRING, 110);
- hubView.insertColumn("Country", G_TYPE_STRING, TreeView::STRING, 100);
- hubView.insertColumn("Shared", G_TYPE_INT64, TreeView::SIZE, 70);
- hubView.insertColumn("Min Share", G_TYPE_INT64, TreeView::SIZE, 80);
- hubView.insertColumn("Min Slots", G_TYPE_INT, TreeView::INT, 70);
- hubView.insertColumn("Max Hubs", G_TYPE_INT, TreeView::INT, 80);
- hubView.insertColumn("Max Users", G_TYPE_INT, TreeView::INT, 80);
- hubView.insertColumn("Rating", G_TYPE_STRING, TreeView::STRING, 70);
+ hubView.insertColumn(N_("Name"), G_TYPE_STRING, TreeView::STRING, 200);
+ hubView.insertColumn(N_("Description"), G_TYPE_STRING, TreeView::STRING, 350);
+ hubView.insertColumn(N_("Users"), G_TYPE_INT, TreeView::INT, 75);
+ hubView.insertColumn(N_("Address"), G_TYPE_STRING, TreeView::STRING, 110);
+ hubView.insertColumn(N_("Country"), G_TYPE_STRING, TreeView::STRING, 100);
+ hubView.insertColumn(N_("Shared"), G_TYPE_INT64, TreeView::SIZE, 70);
+ hubView.insertColumn(N_("Min Share"), G_TYPE_INT64, TreeView::SIZE, 80);
+ hubView.insertColumn(N_("Min Slots"), G_TYPE_INT, TreeView::INT, 70);
+ hubView.insertColumn(N_("Max Hubs"), G_TYPE_INT, TreeView::INT, 80);
+ hubView.insertColumn(N_("Max Users"), G_TYPE_INT, TreeView::INT, 80);
+ hubView.insertColumn(N_("Rating"), G_TYPE_STRING, TreeView::STRING, 70);
hubView.finalize();
hubStore = gtk_list_store_newv(hubView.getColCount(), hubView.getGTypes());
gtk_tree_view_set_model(hubView.get(), GTK_TREE_MODEL(hubStore));
=== modified file 'linux/search.cc'
--- linux/search.cc 2010-10-14 06:00:38 +0000
+++ linux/search.cc 2010-10-22 04:05:48 +0000
@@ -79,17 +79,17 @@
// 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("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);
- resultView.insertColumn("Slots", G_TYPE_STRING, TreeView::STRING, 50);
- resultView.insertColumn("Connection", G_TYPE_STRING, TreeView::STRING, 90);
- resultView.insertColumn("Hub", G_TYPE_STRING, TreeView::STRING, 150);
- resultView.insertColumn("Exact Size", G_TYPE_STRING, TreeView::STRING, 80);
- resultView.insertColumn("IP", G_TYPE_STRING, TreeView::STRING, 100);
- resultView.insertColumn("TTH", G_TYPE_STRING, TreeView::STRING, 125);
+ resultView.insertColumn(N_("Filename"), G_TYPE_STRING, TreeView::ICON_STRING, 250, "Icon");
+ resultView.insertColumn(N_("User"), G_TYPE_STRING, TreeView::STRING, 100);
+ resultView.insertColumn(N_("Type"), G_TYPE_STRING, TreeView::STRING, 65);
+ resultView.insertColumn(N_("Size"), G_TYPE_STRING, TreeView::STRING, 80);
+ resultView.insertColumn(N_("Path"), G_TYPE_STRING, TreeView::STRING, 100);
+ resultView.insertColumn(N_("Slots"), G_TYPE_STRING, TreeView::STRING, 50);
+ resultView.insertColumn(N_("Connection"), G_TYPE_STRING, TreeView::STRING, 90);
+ resultView.insertColumn(N_("Hub"), G_TYPE_STRING, TreeView::STRING, 150);
+ resultView.insertColumn(N_("Exact Size"), G_TYPE_STRING, TreeView::STRING, 80);
+ resultView.insertColumn(N_("IP"), G_TYPE_STRING, TreeView::STRING, 100);
+ resultView.insertColumn(N_("TTH"), G_TYPE_STRING, TreeView::STRING, 125);
resultView.insertHiddenColumn("Icon", G_TYPE_STRING);
resultView.insertHiddenColumn("Real Size", G_TYPE_INT64);
resultView.insertHiddenColumn("Slots Order", G_TYPE_INT);
=== modified file 'linux/settingsdialog.cc'
--- linux/settingsdialog.cc 2010-07-27 04:26:37 +0000
+++ linux/settingsdialog.cc 2010-10-22 04:05:48 +0000
@@ -444,8 +444,8 @@
g_signal_connect(getWidget("favoriteAddButton"), "clicked", G_CALLBACK(onAddFavorite_gui), (gpointer)this);
g_signal_connect(getWidget("favoriteRemoveButton"), "clicked", G_CALLBACK(onRemoveFavorite_gui), (gpointer)this);
downloadToView.setView(GTK_TREE_VIEW(getWidget("favoriteTreeView")));
- downloadToView.insertColumn("Favorite Name", G_TYPE_STRING, TreeView::STRING, -1);
- downloadToView.insertColumn("Directory", G_TYPE_STRING, TreeView::STRING, -1);
+ downloadToView.insertColumn(N_("Favorite Name"), G_TYPE_STRING, TreeView::STRING, -1);
+ downloadToView.insertColumn(N_("Directory"), G_TYPE_STRING, TreeView::STRING, -1);
downloadToView.finalize();
downloadToStore = gtk_list_store_newv(downloadToView.getColCount(), downloadToView.getGTypes());
gtk_tree_view_set_model(downloadToView.get(), GTK_TREE_MODEL(downloadToStore));
@@ -502,9 +502,9 @@
g_signal_connect(getWidget("sharedRemoveButton"), "clicked", G_CALLBACK(onRemoveShare_gui), (gpointer)this);
shareView.setView(GTK_TREE_VIEW(getWidget("sharedTreeView")));
- shareView.insertColumn("Virtual Name", G_TYPE_STRING, TreeView::STRING, -1);
- shareView.insertColumn("Directory", G_TYPE_STRING, TreeView::STRING, -1);
- shareView.insertColumn("Size", G_TYPE_STRING, TreeView::STRING, -1);
+ shareView.insertColumn(N_("Virtual Name"), G_TYPE_STRING, TreeView::STRING, -1);
+ shareView.insertColumn(N_("Directory"), G_TYPE_STRING, TreeView::STRING, -1);
+ shareView.insertColumn(N_("Size"), G_TYPE_STRING, TreeView::STRING, -1);
shareView.insertHiddenColumn("Real Size", G_TYPE_INT64);
shareView.finalize();
shareStore = gtk_list_store_newv(shareView.getColCount(), shareView.getGTypes());
@@ -682,9 +682,9 @@
{ // User Commands
userCommandView.setView(GTK_TREE_VIEW(getWidget("userCommandTreeView")));
- userCommandView.insertColumn("Name", G_TYPE_STRING, TreeView::STRING, -1);
- userCommandView.insertColumn("Hub", G_TYPE_STRING, TreeView::STRING, -1);
- userCommandView.insertColumn("Command", G_TYPE_STRING, TreeView::STRING, -1);
+ userCommandView.insertColumn(N_("Name"), G_TYPE_STRING, TreeView::STRING, -1);
+ userCommandView.insertColumn(N_("Hub"), G_TYPE_STRING, TreeView::STRING, -1);
+ userCommandView.insertColumn(N_("Command"), G_TYPE_STRING, TreeView::STRING, -1);
userCommandView.finalize();
userCommandStore = gtk_list_store_newv(userCommandView.getColCount(), userCommandView.getGTypes());
gtk_tree_view_set_model(userCommandView.get(), GTK_TREE_MODEL(userCommandStore));
=== modified file 'linux/sharebrowser.cc'
--- linux/sharebrowser.cc 2010-10-14 03:51:12 +0000
+++ linux/sharebrowser.cc 2010-10-22 04:05:48 +0000
@@ -67,11 +67,11 @@
// Initialize the file TreeView
fileView.setView(GTK_TREE_VIEW(getWidget("fileView")), true, "sharebrowser");
- fileView.insertColumn("Filename", G_TYPE_STRING, TreeView::ICON_STRING, 400, "Icon");
- fileView.insertColumn("Size", G_TYPE_STRING, TreeView::STRINGR, 80);
- fileView.insertColumn("Type", G_TYPE_STRING, TreeView::STRING, 50);
- fileView.insertColumn("TTH", G_TYPE_STRING, TreeView::STRING, 150);
- fileView.insertColumn("Exact Size", G_TYPE_STRING, TreeView::STRINGR, 105);
+ fileView.insertColumn(N_("Filename"), G_TYPE_STRING, TreeView::ICON_STRING, 400, "Icon");
+ fileView.insertColumn(N_("Size"), G_TYPE_STRING, TreeView::STRINGR, 80);
+ fileView.insertColumn(N_("Type"), G_TYPE_STRING, TreeView::STRING, 50);
+ fileView.insertColumn(N_("TTH"), G_TYPE_STRING, TreeView::STRING, 150);
+ fileView.insertColumn(N_("Exact Size"), G_TYPE_STRING, TreeView::STRINGR, 105);
fileView.insertHiddenColumn("DL File", G_TYPE_POINTER);
fileView.insertHiddenColumn("Icon", G_TYPE_STRING);
fileView.insertHiddenColumn("Size Order", G_TYPE_INT64);
=== modified file 'linux/transfers.cc'
--- linux/transfers.cc 2010-10-11 06:05:22 +0000
+++ linux/transfers.cc 2010-10-22 04:05:48 +0000
@@ -46,15 +46,15 @@
// Initialize transfer treeview
transferView.setView(GTK_TREE_VIEW(getWidget("transfers")), TRUE, "transfers");
- transferView.insertColumn("User", G_TYPE_STRING, TreeView::ICON_STRING, 150, "Icon");
- transferView.insertColumn("Hub Name", G_TYPE_STRING, TreeView::STRING, 100);
- transferView.insertColumn("Status", G_TYPE_STRING, TreeView::PROGRESS, 250, "Progress");
- transferView.insertColumn("Time Left", G_TYPE_INT64, TreeView::TIME_LEFT, 85);
- transferView.insertColumn("Speed", G_TYPE_INT64, TreeView::SPEED, 125);
- transferView.insertColumn("Filename", G_TYPE_STRING, TreeView::STRING, 200);
- transferView.insertColumn("Size", G_TYPE_INT64, TreeView::SIZE, 125);
- transferView.insertColumn("Path", G_TYPE_STRING, TreeView::STRING, 200);
- transferView.insertColumn("IP", G_TYPE_STRING, TreeView::STRING, 175);
+ transferView.insertColumn(N_("User"), G_TYPE_STRING, TreeView::ICON_STRING, 150, "Icon");
+ transferView.insertColumn(N_("Hub Name"), G_TYPE_STRING, TreeView::STRING, 100);
+ transferView.insertColumn(N_("Status"), G_TYPE_STRING, TreeView::PROGRESS, 250, "Progress");
+ transferView.insertColumn(N_("Time Left"), G_TYPE_INT64, TreeView::TIME_LEFT, 85);
+ transferView.insertColumn(N_("Speed"), G_TYPE_INT64, TreeView::SPEED, 125);
+ transferView.insertColumn(N_("Filename"), G_TYPE_STRING, TreeView::STRING, 200);
+ transferView.insertColumn(N_("Size"), G_TYPE_INT64, TreeView::SIZE, 125);
+ transferView.insertColumn(N_("Path"), G_TYPE_STRING, TreeView::STRING, 200);
+ transferView.insertColumn(N_("IP"), G_TYPE_STRING, TreeView::STRING, 175);
transferView.insertHiddenColumn("Icon", G_TYPE_STRING);
transferView.insertHiddenColumn("Progress", G_TYPE_INT);
transferView.insertHiddenColumn("Sort Order", G_TYPE_STRING);
=== modified file 'linux/treeview.cc'
--- linux/treeview.cc 2010-10-22 03:36:33 +0000
+++ linux/treeview.cc 2010-10-22 04:05:48 +0000
@@ -23,6 +23,7 @@
#include "settingsmanager.hh"
#include "WulforUtil.hh"
+#include <glib/gi18n.h>
#include <sstream>
using namespace std;
@@ -226,50 +227,51 @@
{
GtkTreeViewColumn *col = NULL;
GtkCellRenderer *renderer;
+ const gchar *title = _(column.title.c_str());
switch (column.type)
{
case INT:
case STRING:
- col = gtk_tree_view_column_new_with_attributes(column.title.c_str(),
+ col = gtk_tree_view_column_new_with_attributes(title,
gtk_cell_renderer_text_new(), "text", column.pos, NULL);
break;
case SIZE:
renderer = gtk_cell_renderer_text_new();
- col = gtk_tree_view_column_new_with_attributes(column.title.c_str(),
+ col = gtk_tree_view_column_new_with_attributes(title,
renderer, "text", column.pos, NULL);
gtk_tree_view_column_set_cell_data_func(col, renderer, TreeView::sizeDataFunc, &column, NULL);
break;
case SPEED:
renderer = gtk_cell_renderer_text_new();
- col = gtk_tree_view_column_new_with_attributes(column.title.c_str(),
+ col = gtk_tree_view_column_new_with_attributes(title,
renderer, "text", column.pos, NULL);
gtk_tree_view_column_set_cell_data_func(col, renderer, TreeView::speedDataFunc, &column, NULL);
break;
case TIME_LEFT:
renderer = gtk_cell_renderer_text_new();
- col = gtk_tree_view_column_new_with_attributes(column.title.c_str(),
+ col = gtk_tree_view_column_new_with_attributes(title,
renderer, "text", column.pos, NULL);
gtk_tree_view_column_set_cell_data_func(col, renderer, TreeView::timeLeftDataFunc, &column, NULL);
break;
case STRINGR:
renderer = gtk_cell_renderer_text_new();
g_object_set(renderer, "xalign", 1.0, NULL);
- col = gtk_tree_view_column_new_with_attributes(column.title.c_str(), renderer, "text", column.pos, NULL);
+ col = gtk_tree_view_column_new_with_attributes(title, renderer, "text", column.pos, NULL);
gtk_tree_view_column_set_alignment(col, 1.0);
break;
case BOOL:
renderer = gtk_cell_renderer_toggle_new();
- col = gtk_tree_view_column_new_with_attributes(column.title.c_str(), renderer, "active", column.pos, NULL);
+ col = gtk_tree_view_column_new_with_attributes(title, renderer, "active", column.pos, NULL);
break;
case PIXBUF:
- col = gtk_tree_view_column_new_with_attributes(column.title.c_str(),
+ col = gtk_tree_view_column_new_with_attributes(title,
gtk_cell_renderer_pixbuf_new(), "pixbuf", column.pos, NULL);
break;
case ICON_STRING:
renderer = gtk_cell_renderer_pixbuf_new();
col = gtk_tree_view_column_new();
- gtk_tree_view_column_set_title(col, column.title.c_str());
+ gtk_tree_view_column_set_title(col, title);
gtk_tree_view_column_pack_start(col, renderer, false);
gtk_tree_view_column_add_attribute(col, renderer, "icon-name", TreeView::col(column.linkedCol));
renderer = gtk_cell_renderer_text_new();
@@ -279,12 +281,12 @@
case EDIT_STRING:
renderer = gtk_cell_renderer_text_new();
g_object_set(renderer, "editable", TRUE, NULL);
- col = gtk_tree_view_column_new_with_attributes(column.title.c_str(), renderer, "text", column.pos, NULL);
+ col = gtk_tree_view_column_new_with_attributes(title, renderer, "text", column.pos, NULL);
break;
case PROGRESS:
renderer = gtk_cell_renderer_progress_new();
g_object_set(renderer, "xalign", 0.0, NULL); // Doesn't work yet. See: http://bugzilla.gnome.org/show_bug.cgi?id=334576
- col = gtk_tree_view_column_new_with_attributes(column.title.c_str(),
+ col = gtk_tree_view_column_new_with_attributes(title,
renderer, "text", column.pos, "value", TreeView::col(column.linkedCol), NULL);
break;
}
@@ -315,13 +317,13 @@
gtk_tree_view_insert_column(view, col, column.pos);
g_object_set_data(G_OBJECT(col), "column", (gpointer)&column);
+ addCheckMenuItem(col);
+
/*
* Breaks GTK+ API, but is the only way to attach a signal to a gtktreeview column header. See GTK bug #141937.
* @todo: Replace when GTK adds a way to add a signal to the entire header (remove visibleColumns var, too).
*/
g_signal_connect(col->button, "button-release-event", G_CALLBACK(popupMenu_gui), (gpointer)this);
-
- addCheckMenuItem(col);
}
void TreeView::addCheckMenuItem(GtkTreeViewColumn *col)
