diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-27 21:38:57 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-27 21:38:57 +0000 |
commit | 2410b4e25d39f34c5312311423ecbc43941703a3 (patch) | |
tree | a3fc715668c2e65da4c972f261de0cc6f44417a8 | |
parent | 1fd6d1afcbe91ded5fa58f724143f81f8b1084f9 (diff) | |
download | ktorrent-2410b4e25d39f34c5312311423ecbc43941703a3.tar.gz ktorrent-2410b4e25d39f34c5312311423ecbc43941703a3.zip |
Fix a number of accidental tqStatus string conversions
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ktorrent@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r-- | apps/ktorrent/ktorrentview.cpp | 2 | ||||
-rw-r--r-- | estimation-scripts/enable-logging.diff | 4 | ||||
-rw-r--r-- | plugins/infowidget/infowidgetplugin.cpp | 2 | ||||
-rw-r--r-- | plugins/ipfilter/ipblockingprefpage.cpp | 10 | ||||
-rw-r--r-- | plugins/webinterface/www/coldmilk/page_update.js | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/apps/ktorrent/ktorrentview.cpp b/apps/ktorrent/ktorrentview.cpp index 624c508..e445fbb 100644 --- a/apps/ktorrent/ktorrentview.cpp +++ b/apps/ktorrent/ktorrentview.cpp @@ -132,7 +132,7 @@ void KTorrentView::setupColumns() m_headerMenu->insertTitle(i18n("Visible columns")); insertColumn(i18n("File"), TQt::AlignLeft); - insertColumn(i18n("tqStatus"), TQt::AlignLeft); + insertColumn(i18n("Status"), TQt::AlignLeft); insertColumn(i18n("Downloaded"), TQt::AlignRight); insertColumn(i18n("Size"), TQt::AlignRight); insertColumn(i18n("Uploaded"), TQt::AlignRight); diff --git a/estimation-scripts/enable-logging.diff b/estimation-scripts/enable-logging.diff index 072ad45..e030443 100644 --- a/estimation-scripts/enable-logging.diff +++ b/estimation-scripts/enable-logging.diff @@ -32,7 +32,7 @@ Index: estimation-scripts/enable-logging.diff -+ bool tmpLog = true; - /* - addColumn(i18n("File")); -- addColumn(i18n("tqStatus")); +- addColumn(i18n("Status")); -@@ -114,8 +119,43 @@ - setText(6,KBytesPerSecToString(tc->getUploadRate() / 1024.0)); - @@ -141,7 +141,7 @@ Index: apps/ktorrent/ktorrentviewitem.cpp + bool tmpLog = true; /* addColumn(i18n("File")); - addColumn(i18n("tqStatus")); + addColumn(i18n("Status")); @@ -114,8 +121,46 @@ setText(6,KBytesPerSecToString(s.upload_rate / 1024.0)); diff --git a/plugins/infowidget/infowidgetplugin.cpp b/plugins/infowidget/infowidgetplugin.cpp index 8928841..ed334b6 100644 --- a/plugins/infowidget/infowidgetplugin.cpp +++ b/plugins/infowidget/infowidgetplugin.cpp @@ -73,7 +73,7 @@ namespace kt pref = new InfoWidgetPrefPage(this); getGUI()->addViewListener(this); - getGUI()->addToolWidget(status_tab,"info",i18n("tqStatus"),GUIInterface::DOCK_BOTTOM); + getGUI()->addToolWidget(status_tab,"info",i18n("Status"),GUIInterface::DOCK_BOTTOM); getGUI()->addToolWidget(file_view,"folder",i18n("Files"),GUIInterface::DOCK_BOTTOM); showPeerView( InfoWidgetPluginSettings::showPeerView() ); diff --git a/plugins/ipfilter/ipblockingprefpage.cpp b/plugins/ipfilter/ipblockingprefpage.cpp index 210e8c5..c717c6a 100644 --- a/plugins/ipfilter/ipblockingprefpage.cpp +++ b/plugins/ipfilter/ipblockingprefpage.cpp @@ -67,13 +67,13 @@ namespace kt if(use_level1) { - lbl_status1->setText(i18n("tqStatus: Loaded and running.")); + lbl_status1->setText(i18n("Status: Loaded and running.")); m_url->setEnabled(true); btnDownload->setEnabled(true); } else { - lbl_status1->setText(i18n("tqStatus: Not loaded.")); + lbl_status1->setText(i18n("Status: Not loaded.")); m_url->setEnabled(false); btnDownload->setEnabled(false); } @@ -91,12 +91,12 @@ namespace kt { TQFile target(KGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat"); if(target.exists()) - lbl_status1->setText(i18n("tqStatus: Loaded and running.")); + lbl_status1->setText(i18n("Status: Loaded and running.")); else - lbl_status1->setText(i18n("tqStatus: <font color=\"#ff0000\">Filter file not found.</font> Download and convert filter file.")); + lbl_status1->setText(i18n("Status: <font color=\"#ff0000\">Filter file not found.</font> Download and convert filter file.")); } else - lbl_status1->setText(i18n("tqStatus: Not loaded.")); + lbl_status1->setText(i18n("Status: Not loaded.")); } void IPBlockingPrefPageWidget::btnDownload_clicked() diff --git a/plugins/webinterface/www/coldmilk/page_update.js b/plugins/webinterface/www/coldmilk/page_update.js index c6b33be..c004456 100644 --- a/plugins/webinterface/www/coldmilk/page_update.js +++ b/plugins/webinterface/www/coldmilk/page_update.js @@ -403,7 +403,7 @@ function _get_file_status_name(status_id) } function _torrents_details_header(row) { - headers = new Array("Actions", "File", "Size", "Perc done", "tqStatus"); + headers = new Array("Actions", "File", "Size", "Perc done", "Status"); for (var i in headers) { var header = document.createElement("th"); header.appendChild(document.createTextNode(headers[i])); @@ -414,7 +414,7 @@ function _torrents_details_header(row) { function _torrent_table_header(row) { headers = new Array( - "Actions", "File", "tqStatus", + "Actions", "File", "Status", "Speed", "Size", "Peers", "Transferred", "% done" ); |