Merge pull request #7826 from drew2a/fix/7809

Remove `Bandwidth Accounting` string leftovers.
Tribler · Jan 16, 2024 · 26b0be8 · 26b0be8
2 parents 4fb3d8a + 3be24d0
commit 26b0be8
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 437 deletions.
diff --git a/doc/restapi/trustview.rst b/doc/restapi/trustview.rst
diff --git a/scripts/application_tester/tribler_apptester/executor.py b/scripts/application_tester/tribler_apptester/executor.py
@@ -92,7 +92,7 @@ async def start_tribler(self):
         """
         Start Tribler if it has not been started yet.
         """
-        cmd = "%s --allow-code-injection --tunnel-testnet --trustchain-testnet" % self.tribler_path
+        cmd = "%s --allow-code-injection --tunnel-testnet" % self.tribler_path
         self._logger.info(f"Tribler not running - starting it: {cmd}")
 
         envvars = '\n'.join('%s=%s' % (key, val) for key, val in sorted(os.environ.items()))

diff --git a/src/run_tribler.py b/src/run_tribler.py
@@ -39,7 +39,6 @@ def __init__(self, *args, **kwargs):
         self.add_argument('--testnet', action="store_true", help="run Tribler in a separate test network")
 
         self.add_argument('--chant-testnet', action="store_true", help="use a separate test database for channels")
-        self.add_argument('--trustchain-testnet', action="store_true", help="use a separate trustchain community")
         self.add_argument('--tunnel-testnet', action="store_true", help="use a separate tunnel community")
 
 

diff --git a/src/tribler/core/exceptions.py b/src/tribler/core/exceptions.py
@@ -29,10 +29,6 @@ class InvalidConfigException(TriblerException):
     """The config file doesn't adhere to the config specification."""
 
 
-class TrustGraphException(TriblerException):
-    """Exception specific to Trust graph."""
-
-
 class CoreError(TriblerException):
     """This is the base class for exceptions that causes GUI shutdown"""
 

diff --git a/src/tribler/gui/defs.py b/src/tribler/gui/defs.py
@@ -152,21 +152,6 @@ def get(cls, item, default=None):
 CATEGORY_SELECTOR_FOR_SEARCH_ITEMS = ("All", "Channels") + ContentCategories.long_names
 CATEGORY_SELECTOR_FOR_POPULAR_ITEMS = ("All",) + ContentCategories.long_names
 
-# Trust Graph constants
-COLOR_RED = "#b37477"
-COLOR_GREEN = "#23cc2b"
-COLOR_NEUTRAL = "#cdcdcd"
-COLOR_DEFAULT = "#150507"
-COLOR_ROOT = "#FE6D01"
-COLOR_SELECTED = "#5c58ee"
-HTML_SPACE = '&nbsp;'
-TRUST_GRAPH_PEER_LEGENDS = (
-        "<span style='color:%s'>\u25CF Helpful user </span> &nbsp;&nbsp;&nbsp;"
-        "<span style='color:%s'>\u25CF Selfish user </span> &nbsp;&nbsp;&nbsp;"
-        "<span style='color:%s'>\u25CF Unknown </span> &nbsp;&nbsp;&nbsp;"
-        "<span style='color:%s'>\u25CF Selected</span>" % (COLOR_GREEN, COLOR_RED, COLOR_NEUTRAL, COLOR_SELECTED)
-)
-
 CONTEXT_MENU_WIDTH = 200
 
 BITTORRENT_BIRTHDAY = 994032000

diff --git a/src/tribler/gui/i18n/es_ES.ts b/src/tribler/gui/i18n/es_ES.ts
@@ -356,11 +356,6 @@ No puede deshacer esta acción.</translation>
         <source>Select a version to delete.</source>
         <translation>Seleccione la versión que desea eliminar.</translation>
     </message>
-    <message>
-        <location filename="../widgets/settingspage.py" line="332"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Download with &lt;b&gt;%d&lt;/b&gt; hop(s) of anonymity. When you download a file of 200 Megabyte, you will pay roughly &lt;b&gt;%d&lt;/b&gt;Megabyte of bandwidth tokens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Descargar con &lt;b&gt;%d&lt;/b&gt; salto(s) de anonimato. Cuando descarga un archivo de 200 Megabyte, usted pagará aproximadamente &lt;b&gt;%d&lt;/b&gt;Megabyte en tokens de ancho de banda.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location filename="../widgets/settingspage.py" line="339"/>
         <source>Current Priority = %s</source>
@@ -1177,11 +1172,6 @@ Si no está seguro, pulse &quot;No&quot;. Más adelante podrá eliminar esas car
 </context>
 <context>
     <name>Form</name>
-    <message>
-        <location filename="../qt_resources/trustexplanation.ui" line="35"/>
-        <source>Form</source>
-        <translation>Formulario</translation>
-    </message>
     <message>
         <location filename="../qt_resources/add_tags_dialog.ui" line="137"/>
         <source>Suggest Tags</source>
@@ -1387,11 +1377,6 @@ Si no está seguro, pulse &quot;No&quot;. Más adelante podrá eliminar esas car
         <source>DOWNLOAD</source>
         <translation>DESCARGAR</translation>
     </message>
-    <message>
-        <location filename="../qt_resources/trustexplanation.ui" line="137"/>
-        <source>Bandwidth Tokens</source>
-        <translation>Tokens de ancho de banda</translation>
-    </message>
     <message>
         <location filename="../qt_resources/edit_metadata_dialog.ui" line="155"/>
         <source>Edit metadata</source>
@@ -2160,11 +2145,6 @@ Alto anonimato</translation>
         <source>This process might take around a minute.</source>
         <translation>Este proceso puede durar unos minutos.</translation>
     </message>
-    <message>
-        <location filename="../qt_resources/mainwindow.ui" line="4361"/>
-        <source>Trust statistics</source>
-        <translation>Estadísticas de confianza</translation>
-    </message>
     <message>
         <location filename="../qt_resources/mainwindow.ui" line="4486"/>
         <source>You can build trust by contributing bandwidth to the Tribler network. This is done by letting Tribler run idle.</source>
@@ -2195,11 +2175,6 @@ Alto anonimato</translation>
         <source>People who helped you</source>
         <translation>Personas que le han ayudado</translation>
     </message>
-    <message>
-        <location filename="../qt_resources/mainwindow.ui" line="4885"/>
-        <source>Trust Graph</source>
-        <translation>Gráfico de confianza</translation>
-    </message>
     <message>
         <location filename="../qt_resources/mainwindow.ui" line="4986"/>
         <source>The graph below is based on your historical interactions with other users in the network.</source>

diff --git a/src/tribler/gui/i18n/pt_BR.ts b/src/tribler/gui/i18n/pt_BR.ts
@@ -864,11 +864,6 @@ If unsure, press &apos;No&apos;. You will be able to remove those directories fr
         <source>Exclude files</source>
         <translation type="obsolete">Excluir arquivos</translation>
     </message>
-    <message>
-        <location filename="../widgets/settingspage.py" line="332"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Download with &lt;b&gt;%d&lt;/b&gt; hop(s) of anonymity. When you download a file of 200 Megabyte, you will pay roughly &lt;b&gt;%d&lt;/b&gt;Megabyte of bandwidth tokens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../widgets/searchresultswidget.py" line="81"/>
         <source>Search results for %s</source>
@@ -1189,11 +1184,6 @@ New remote results received: %(num_remote_results)i</source>
 </context>
 <context>
     <name>Form</name>
-    <message>
-        <location filename="../qt_resources/trustexplanation.ui" line="35"/>
-        <source>Form</source>
-        <translation>Formulário</translation>
-    </message>
     <message>
         <location filename="../qt_resources/addtochanneldialog.ui" line="123"/>
         <source>Add torrent(s) to personal channel</source>
@@ -1419,11 +1409,6 @@ New remote results received: %(num_remote_results)i</source>
         <source>DOWNLOAD</source>
         <translation>BAIXAR</translation>
     </message>
-    <message>
-        <location filename="../qt_resources/trustexplanation.ui" line="172"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;In Tribler, you compensate other users for the bandwidth you use when downloading with anonymity. When uploading content to other (Tribler) users, you earn &lt;span style=&quot; font-style:italic;&quot;&gt;bandwidth tokens&lt;/span&gt;. If you accumulate more bandwidth tokens, you get preferential treatment when downloading anonymously, which results in higher download speeds.&lt;/p&gt;&lt;p&gt;The exact amount of bandwidth tokens you pay to others, depends on the level of anonymity. This is the number of other users, or &lt;span style=&quot; font-style:italic;&quot;&gt;hops&lt;/span&gt;, you use during a download. If you download with three hop anonymity, your encrypted data is sent through the machines of three other Tribler users. Increasing the number of hops benefits anonymity but costs you more bandwidth tokens.&lt;/p&gt;&lt;p&gt;For example, if you download a &lt;span style=&quot; font-weight:600;&quot;&gt;1 Gigabyte&lt;/span&gt; video with one hop anonymity, you pay &lt;span style=&quot; font-weight:600;&quot;&gt;1 Gigabyte&lt;/span&gt; worth of bandwidth tokens. Each additional hop increases the amount of bandwidth tokens you have to pay. When downloading the same file using three hops, you pay &lt;span style=&quot; font-weight:600;&quot;&gt;3 Gigabyte&lt;/span&gt; of bandwidth tokens instead.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../qt_resources/feedback_dialog.ui" line="253"/>
         <source>Additional information:</source>
@@ -1602,11 +1587,6 @@ New remote results received: %(num_remote_results)i</source>
         <source> Video Player</source>
         <translation type="obsolete"> Video Player</translation>
     </message>
-    <message>
-        <location filename="../qt_resources/mainwindow.ui" line="880"/>
-        <source> Trust Graph </source>
-        <translation type="obsolete"> Grafo de confiança</translation>
-    </message>
     <message>
         <location filename="../qt_resources/mainwindow.ui" line="5441"/>
         <source> Debug</source>
@@ -2231,11 +2211,6 @@ High anonymity</source>
         <source>This process might take around a minute.</source>
         <translation>Isso pode demorar um minuto.</translation>
     </message>
-    <message>
-        <location filename="../qt_resources/mainwindow.ui" line="4361"/>
-        <source>Trust statistics</source>
-        <translation>Estatísticas de Confiança</translation>
-    </message>
     <message>
         <location filename="../qt_resources/mainwindow.ui" line="4645"/>
         <source>- MBytes</source>
@@ -2563,11 +2538,6 @@ High anonymity</source>
         <source>Create channel</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qt_resources/mainwindow.ui" line="4426"/>
-        <source>Show trust graph</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../qt_resources/mainwindow.ui" line="1439"/>
         <source>Minimize to system tray?</source>

diff --git a/src/tribler/gui/i18n/ru_RU.ts b/src/tribler/gui/i18n/ru_RU.ts
@@ -876,14 +876,6 @@ You can not undo this action.</source>
         <translation>Вы уверены, что хотите удалить данные для выбранных версий? 
 Это действие невозможно будет отменить</translation>
     </message>
-    <message>
-        <location filename="../widgets/settingspage.py" line="332"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Download with &lt;b&gt;%d&lt;/b&gt; hop(s) of anonymity. When you download a file of 200 Megabyte, you will pay roughly &lt;b&gt;%d&lt;/b&gt;Megabyte of bandwidth tokens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Загружать анонимно через &lt;b&gt;%d&lt;/b&gt; прокси Tribler.
-        Загрузка 200 МБайт обойдётся приблизительно в &lt;b&gt;%d&lt;/b&gt;
-        МБайт трафик-токенов.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;
-        </translation>
-    </message>
     <message>
         <location filename="../widgets/settingspage.py" line="558"/>
         <source>Tribler settings</source>
@@ -1204,11 +1196,6 @@ New remote results received: %(num_remote_results)i</source>
 </context>
 <context>
     <name>Form</name>
-    <message>
-        <location filename="../qt_resources/trustexplanation.ui" line="35"/>
-        <source>Form</source>
-        <translation>От</translation>
-    </message>
     <message>
         <location filename="../qt_resources/addtochanneldialog.ui" line="123"/>
         <source>Add torrent(s) to personal channel</source>
@@ -2131,11 +2118,6 @@ High anonymity</source>
         <source>This process might take around a minute.</source>
         <translation>Это может занять около минуты</translation>
     </message>
-    <message>
-        <location filename="../qt_resources/mainwindow.ui" line="4361"/>
-        <source>Trust statistics</source>
-        <translation>Статистика доверия</translation>
-    </message>
     <message>
         <location filename="../qt_resources/mainwindow.ui" line="4645"/>
         <source>- MBytes</source>
@@ -2161,11 +2143,6 @@ High anonymity</source>
         <source>People who helped you</source>
         <translation>Узлы, которые помогли Вам</translation>
     </message>
-    <message>
-        <location filename="../qt_resources/mainwindow.ui" line="4885"/>
-        <source>Trust Graph</source>
-        <translation>Граф доверия</translation>
-    </message>
     <message>
         <location filename="../qt_resources/mainwindow.ui" line="4986"/>
         <source>The graph below is based on your historical interactions with other users in the network.</source>

diff --git a/src/tribler/gui/i18n/zh_CN.ts b/src/tribler/gui/i18n/zh_CN.ts
@@ -877,11 +877,6 @@ You can not undo this action.</source>
         <translation>你确定要移除所选的版本吗？
 此操作无法撤消。</translation>
     </message>
-    <message>
-        <location filename="../widgets/settingspage.py" line="332"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Download with &lt;b&gt;%d&lt;/b&gt; hop(s) of anonymity. When you download a file of 200 Megabyte, you will pay roughly &lt;b&gt;%d&lt;/b&gt;Megabyte of bandwidth tokens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;以 &lt;b&gt;%d&lt;/b&gt; 个跳数的匿名性下载。当你下载一个 200 MB 的文件，你将支付大约 &lt;b&gt;%d&lt;/b&gt;MB 的带宽代币。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location filename="../widgets/settingspage.py" line="558"/>
         <source>Tribler settings</source>
@@ -1392,16 +1387,6 @@ New remote results received: %(num_remote_results)i</source>
         <source>DOWNLOAD</source>
         <translation>下载</translation>
     </message>
-    <message>
-        <location filename="../qt_resources/trustexplanation.ui" line="137"/>
-        <source>Bandwidth Tokens</source>
-        <translation>带宽代币</translation>
-    </message>
-    <message>
-        <location filename="../qt_resources/trustexplanation.ui" line="255"/>
-        <source>CLOSE</source>
-        <translation>关闭</translation>
-    </message>
     <message>
         <location filename="../qt_resources/edit_metadata_dialog.ui" line="155"/>
         <source>Edit metadata</source>
@@ -2157,11 +2142,6 @@ High anonymity</source>
         <source>This process might take around a minute.</source>
         <translation>此过程可能需要一分钟左右的时间。</translation>
     </message>
-    <message>
-        <location filename="../qt_resources/mainwindow.ui" line="4361"/>
-        <source>Trust statistics</source>
-        <translation>信任统计信息</translation>
-    </message>
     <message>
         <location filename="../qt_resources/mainwindow.ui" line="4645"/>
         <source>- MBytes</source>
@@ -2187,11 +2167,6 @@ High anonymity</source>
         <source>People who helped you</source>
         <translation>帮助我的人</translation>
     </message>
-    <message>
-        <location filename="../qt_resources/mainwindow.ui" line="4885"/>
-        <source>Trust Graph</source>
-        <translation>信任链图</translation>
-    </message>
     <message>
         <location filename="../qt_resources/mainwindow.ui" line="4986"/>
         <source>The graph below is based on your historical interactions with other users in the network.</source>

diff --git a/src/tribler/gui/qt_resources/mainwindow.ui b/src/tribler/gui/qt_resources/mainwindow.ui
@@ -2121,19 +2121,6 @@ High anonymity</string>
                     </property>
                    </widget>
                   </item>
-                  <item>
-                   <widget class="QLabel" name="anonymity_costs_label">
-                    <property name="text">
-                     <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Download with &lt;span style=&quot; font-weight:600;&quot;&gt;1&lt;/span&gt; hop(s) of anonymity. When you download a file of 200 Megabyte, you will pay &lt;span style=&quot; font-weight:600;&quot;&gt;200&lt;/span&gt; Megabyte of bandwidth tokens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                    </property>
-                    <property name="textFormat">
-                     <enum>Qt::RichText</enum>
-                    </property>
-                    <property name="wordWrap">
-                     <bool>true</bool>
-                    </property>
-                   </widget>
-                  </item>
                   <item>
                    <spacer name="verticalSpacer_5">
                     <property name="orientation">