From d3786a895bb13ef0588efd9bb438fe666dc6bd7e Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 4 Jul 2022 13:11:23 +0200 Subject: [PATCH] Debugger: Use some Tr::tr in WatchModel related classes Change-Id: I1fcd0c5f342da4fd5ff52c19eb9f3f20a9bdcc5b Reviewed-by: Eike Ziller --- share/qtcreator/translations/qtcreator_cs.ts | 346 +--------------- share/qtcreator/translations/qtcreator_da.ts | 19 +- share/qtcreator/translations/qtcreator_de.ts | 17 +- share/qtcreator/translations/qtcreator_es.ts | 11 +- share/qtcreator/translations/qtcreator_fr.ts | 294 +------------- share/qtcreator/translations/qtcreator_hr.ts | 18 +- share/qtcreator/translations/qtcreator_hu.ts | 11 +- share/qtcreator/translations/qtcreator_it.ts | 11 +- share/qtcreator/translations/qtcreator_ja.ts | 285 +------------ share/qtcreator/translations/qtcreator_pl.ts | 17 +- share/qtcreator/translations/qtcreator_ru.ts | 19 +- share/qtcreator/translations/qtcreator_sl.ts | 30 +- share/qtcreator/translations/qtcreator_uk.ts | 66 +-- .../qtcreator/translations/qtcreator_zh_CN.ts | 254 +----------- .../qtcreator/translations/qtcreator_zh_TW.ts | 375 +++--------------- src/plugins/debugger/CMakeLists.txt | 2 +- src/plugins/debugger/debuggerprotocol.cpp | 23 +- src/plugins/debugger/watchdata.cpp | 52 +-- src/plugins/debugger/watchdata.h | 4 - src/plugins/debugger/watchhandler.cpp | 213 +++++----- src/plugins/debugger/watchhandler.h | 6 +- src/plugins/debugger/watchwindow.cpp | 4 +- tests/auto/debugger/CMakeLists.txt | 4 + tests/auto/debugger/dumpers.qbs | 1 + tests/auto/debugger/gdb.qbs | 2 +- tests/auto/debugger/protocol.qbs | 2 +- 26 files changed, 244 insertions(+), 1842 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index b7e0efc99e3..a73cf4b2af4 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -5814,22 +5814,6 @@ informacemi o ladění. Open Memory Editor at %1 Otevřít editor paměti u %1 - - Hexadecimal - Šestnáctkový - - - Decimal - Desítkový - - - Octal - Osmičkový - - - Binary - Dvojkový - Adjust Column Widths to Contents Přizpůsobit šířku sloupců obsahu @@ -6371,7 +6355,7 @@ informacemi o ladění. - Debugger::Internal::WatchData + Debugger <not in scope> Value of variable in Debugger Locals display for variables out of scope (stopped above initialization). @@ -6382,13 +6366,6 @@ informacemi o ladění. Display of variables shadowed by variables of the same name in nested scopes: Variable %1 is the variable name, %2 is a simple count. %1 <překryto %2> - - - Debugger::Internal::WatchHandler - - Name - Název - Expression Výraz @@ -6457,22 +6434,6 @@ informacemi o ladění. <Edit> <Upravit> - - Root - Kořen (root) - - - Return Value - Návratová hodnota - - - Locals - Místní proměnné - - - Tooltip - Kontextová nápověda - Debugger - Qt Creator Ladicí program - Qt Creator @@ -6509,46 +6470,6 @@ informacemi o ladění. <%n prvků> - - Raw pointer - Hodnota ukazatele - - - Latin1 string - Řetězec Latin1 - - - UTF8 string - Řetězec UTF8 - - - Local 8bit string - Řetězec znaků v místním 8bitovém kódování - - - UTF16 string - Řetězec UTF16 - - - UCS4 string - Řetězec UCS4 - - - Decimal - Desítkový - - - Hexadecimal - Šestnáctkový - - - Binary - Dvojkový - - - Octal - Osmičkový - %1 Object at %2 Objekt typu %1 při %2 @@ -6569,17 +6490,6 @@ informacemi o ladění. Watchers Sledované výrazy - - Value - Hodnota - - - Type - Typ - - - - Debugger::Internal::WatchWindow Locals and Watchers Místní proměnné a sledované výrazy @@ -6618,122 +6528,26 @@ informacemi o ladění. Register <i>%1</i> Registr <i>%1</i> - - Memory Referenced by Pointer '%1' (0x%2) - Paměť odkazovaná ukazatelem '%1' (0x%2) - Memory at Variable '%1' (0x%2) Paměť při proměnné '%1' (0x%2) Memory Referenced by Pointer "%1" (0x%2) - Paměť odkazovaná ukazatelem "%1" (0x%2) - - - Memory at Variable "%1" (0x%2) - Paměť při proměnné "%1" (0x%2) + Paměť odkazovaná ukazatelem "%1" (0x%2) Cannot Display Stack Layout Nelze zobrazit rozvržení zásobníku - - Could not determine a suitable address range. - Nepodařilo se určit žádný vhodný rozsah adresy. - - - Memory Layout of Local Variables at 0x%1 - Rozložení paměti místní proměnné při 0x%1 - - - Locals and Expressions - Místní proměnné a výrazy - Evaluate Expression Vyhodnotit výraz - - Evaluate Expression "%1" - Vyhodnotit výraz "%1" - - - Remove Evaluated Expression - Odstranit vyhodnocený výraz - - - Remove Evaluated Expression "%1" - Odstranit vyhodnocený výraz "%1" - Change Display Format... Změnit formát zobrazení... - - Treat All Characters as Printable - Považovat všechny znaky za tisknutelné - - - Show Unprintable Characters as Escape Sequences - Ukázat netisknutelné znaky jako únikové posloupnosti - - - Show Unprintable Characters as Octal - Ukázat netisknutelné znaky jako osmičkové - - - Show Unprintable Characters as Hexadecimal - Ukázat netisknutelné znaky jako šestnáctkové - - - Change Display for Object Named "%1": - Změnit formát zobrazení pro objekt s názvem "%1": - - - Use Display Format Based on Type - Použít formát zobrazení založený na typu - - - Change Display for Type "%1": - Změnit zobrazení pro typ '%1': - - - Automatic - Automaticky - - - Change Display for Type or Item... - Změnit zobrazení pro typ nebo prvek... - - - Add Data Breakpoint... - Přidat bod přerušení dat... - - - Add Data Breakpoint at Object's Address (0x%1) - Přidat bod přerušení dat na adrese objektu (0x%1) - - - Add Data Breakpoint at Referenced Address (0x%1) - Přidat bod přerušení dat na odkazované adrese (0x%1) - - - Add Data Breakpoint - Přidat bod přerušení dat - - - Setting a data breakpoint on an address will cause the program to stop when the data at the address is modified. - Nastavení bodu přerušení dat na určitou adresu způsobí, že program se zastaví, když jsou tam nacházející se data změněna. - - - Add Data Breakpoint at Expression "%1" - Přidat bod přerušení dat při výrazu "%1" - - - Setting a data breakpoint on an expression will cause the program to stop when the data at the address given by the expression is modified. - Nastavení bodu přerušení dat na určitý výraz způsobí, že program se zastaví, když jsou změněna data nacházející se na adrese dané oním výrazem. - Insert New Evaluated Expression Vložit nový vyhodnocený výraz @@ -6750,90 +6564,10 @@ informacemi o ladění. Remove All Watch Items Odstranit všechny sledované výrazy - - Change Local Display Format... - Změnit místní formát zobrazení... - - - Use Format for Type (Currently %1) - Použít formát zobrazení na typ (nyní %1) - - - Use Display Format Based on Type - Použít formát zobrazení založený na typu - - - Add Data Breakpoint at Expression - Přidat bod přerušení dat při výrazu - Change Global Display Formats... Změnit celkové formáty zobrazení... - - Open Memory Editor... - Otevřít editor paměti... - - - Open Memory Editor at Object's Address (0x%1) - Otevřít editor paměti na adrese objektu (0x%1) - - - Open Memory View at Object's Address (0x%1) - Otevřít zobrazení paměti na adrese objektu (0x%1) - - - Open Memory Editor at Object's Address - Otevřít editor paměti na adrese objektu - - - Open Memory View at Object's Address - Otevřít zobrazení paměti na adrese objektu - - - Open Memory Editor at Referenced Address (0x%1) - Otevřít editor paměti na odkazované adrese (0x%1) - - - Open Memory View at Referenced Address (0x%1) - Otevřít zobrazení paměti na odkazované adrese (0x%1) - - - Open Memory Editor at Referenced Address - Otevřít editor paměti na odkazované adrese - - - Open Memory View at Referenced Address - Otevřít zobrazení paměti na odkazované adrese - - - Open Memory Editor Showing Stack Layout - Otevřít editor paměti s ukázáním rozložení zásobníku - - - Copy Contents to Clipboard - Obsah kopírovat do schránky - - - Copy Value to Clipboard - Kopírovat hodnotu do schránky - - - Show View Contents in Editor - Ukázat obsah pohledu v editoru - - - Close Editor Tooltips - Zavřít vysvětlivky editoru - - - Enter watch expression - Zadat sledovaný výraz - - - Expression: - Výraz: - Locals & Watchers Místní proměnné a sledované výrazy @@ -6844,7 +6578,7 @@ informacemi o ladění. Refresh Code Model Snapshot - Obnovit stav modelu kódu + Obnovit stav modelu kódu Adjust Column Widths to Contents @@ -22236,7 +21970,7 @@ Chcete jej ukončit? - Debugger::Internal::WatchModel + Debugger decimal Desítkový @@ -22257,10 +21991,6 @@ Chcete jej ukončit? Bald pointer Prosté ukazovátko - - <Edit> - <Upravit> - Array of %n items @@ -56459,33 +56189,7 @@ Nainstalujte, prosím, alespoň jedno SDK. - Debugger::Internal::WatchTreeView - - <i>%1</i> %2 at #%3 - HTML tooltip of a variable in the memory editor - <i>%1</i> %2 při #%3 - - - <i>%1</i> %2 - HTML tooltip of a variable in the memory editor - <i>%1</i> %2 - - - Register <i>%1</i> - Registr <i>%1</i> - - - Memory Referenced by Pointer "%1" (0x%2) - Paměť odkazovaná ukazatelem "%1" (0x%2) - - - Memory at Variable "%1" (0x%2) - Paměť při proměnné "%1" (0x%2) - - - Cannot Display Stack Layout - Nelze zobrazit rozvržení zásobníku - + Debugger Could not determine a suitable address range. Nepodařilo se určit žádný vhodný rozsah adresy. @@ -56498,21 +56202,17 @@ Nainstalujte, prosím, alespoň jedno SDK. Locals and Expressions Místní proměnné a výrazy - - Evaluate Expression - Vyhodnotit výraz - Evaluate Expression "%1" Vyhodnotit výraz "%1" Remove Evaluated Expression - Odstranit vyhodnocený výraz + Odstranit vyhodnocený výraz Remove Evaluated Expression "%1" - Odstranit vyhodnocený výraz "%1" + Odstranit vyhodnocený výraz "%1" Memory at Pointer's Address "%1" (0x%2) @@ -56658,22 +56358,6 @@ Nainstalujte, prosím, alespoň jedno SDK. Locals & Expressions Místní proměnné a výrazy - - Insert New Evaluated Expression - Vložit nový vyhodnocený výraz - - - Select Widget to Watch - Vybrat prvek za účelem sledování - - - Change Global Display Formats... - Změnit celkové formáty zobrazení... - - - Remove All Evaluated Expressions - Odstranit všechny vyhodnocené výrazy - Open Memory Editor... Otevřít editor paměti... @@ -56696,19 +56380,19 @@ Nainstalujte, prosím, alespoň jedno SDK. Open Memory Editor at Referenced Address (0x%1) - Otevřít editor paměti na odkazované adrese (0x%1) + Otevřít editor paměti na odkazované adrese (0x%1) Open Memory View at Referenced Address (0x%1) - Otevřít zobrazení paměti na odkazované adrese (0x%1) + Otevřít zobrazení paměti na odkazované adrese (0x%1) Open Memory Editor at Referenced Address - Otevřít editor paměti na odkazované adrese + Otevřít editor paměti na odkazované adrese Open Memory View at Referenced Address - Otevřít zobrazení paměti na odkazované adrese + Otevřít zobrazení paměti na odkazované adrese Open Memory Editor Showing Stack Layout @@ -56722,10 +56406,6 @@ Nainstalujte, prosím, alespoň jedno SDK. Copy Value to Clipboard Kopírovat hodnotu do schránky - - Refresh Code Model Snapshot - Obnovit stav modelu kódu - Show View Contents in Editor Ukázat obsah pohledu v editoru @@ -56742,10 +56422,6 @@ Nainstalujte, prosím, alespoň jedno SDK. Expression: Výraz: - - Locals & Watchers - Místní proměnné a sledované výrazy - Git::Internal::CommitData diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 7a603fdb40d..29816ffca56 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -14806,7 +14806,7 @@ Du kan vælge andre kommunikationskanaler her, såsom en seriel linje eller brug - Debugger::Internal::WatchHandler + Debugger <empty> <tom> @@ -14853,10 +14853,6 @@ Du kan vælge andre kommunikationskanaler her, såsom en seriel linje eller brug <out of scope> <udenfor område> - - Name - Navn - Expression Udtryk @@ -14865,10 +14861,6 @@ Du kan vælge andre kommunikationskanaler her, såsom en seriel linje eller brug Internal Type Intern type - - Value - Værdi - ... <cut off> ... <afkortet> @@ -14904,9 +14896,6 @@ Du kan vælge andre kommunikationskanaler her, såsom en seriel linje eller brug Debugger - %1 Fejlretter - %1 - - - Debugger::Internal::WatchItem <not in scope> Value of variable in Debugger Locals display for variables out of scope (stopped above initialization). @@ -14917,9 +14906,6 @@ Du kan vælge andre kommunikationskanaler her, såsom en seriel linje eller brug Display of variables shadowed by variables of the same name in nested scopes: Variable %1 is the variable name, %2 is a simple count. %1 <skygget %2> - - - Debugger::Internal::WatchModel Name Navn @@ -15297,9 +15283,6 @@ Du kan vælge andre kommunikationskanaler her, såsom en seriel linje eller brug Are you sure you want to remove all expression evaluators? Er du sikker på, at du vil fjerne alle udtryksevaluerer? - - - Debugger::Internal::WatchTreeView Locals and Expressions Locals og expressions diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 52ca1873aa5..7ed263c6ff7 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -3348,7 +3348,7 @@ markers in the source code editor. - Debugger::Internal::WatchHandler + Debugger Expression Ausdruck @@ -3434,25 +3434,14 @@ markers in the source code editor. <%n Elemente> - - Name - Name - ... <cut off> ... <gekürzt> - - Value - Wert - Debugger - %1 Debugger - %1 - - - Debugger::Internal::WatchModel Locals Lokale Variablen @@ -19817,7 +19806,7 @@ manuellen Herunterladen im Browser des System zu öffnen. - Debugger::Internal::WatchTreeView + Debugger Locals and Expressions Lokale Variablen und Ausdrücke @@ -35906,7 +35895,7 @@ Dies könnte Probleme während der Ausführung verursachen. - Debugger::Internal::WatchItem + Debugger <not in scope> Value of variable in Debugger Locals display for variables out of scope (stopped above initialization). diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts index 6a356dee87a..0c74eb4d3bd 100644 --- a/share/qtcreator/translations/qtcreator_es.ts +++ b/share/qtcreator/translations/qtcreator_es.ts @@ -5097,15 +5097,12 @@ Es recomendado usar gdb 6.7 o posterior. - Debugger::Internal::WatchData + Debugger <not in scope> <fuera de alcance> - - - Debugger::Internal::WatchHandler Expression @@ -5188,9 +5185,6 @@ Es recomendado usar gdb 6.7 o posterior. <No Watchers> <Sin observadores> - - - Debugger::Internal::WatchModel decimal @@ -5226,9 +5220,6 @@ Es recomendado usar gdb 6.7 o posterior. Type Tipo - - - Debugger::Internal::WatchWindow Locals and Watchers diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index ec42c365792..2c563c9ee6d 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -7603,7 +7603,7 @@ at debugger startup. - Debugger::Internal::WatchData + Debugger <not in scope> Value of variable in Debugger Locals display for variables out of scope (stopped above initialization). @@ -7614,21 +7614,10 @@ at debugger startup. Display of variables shadowed by variables of the same name in nested scopes: Variable %1 is the variable name, %2 is a simple count. %1 <shadowed %2> - - - Debugger::Internal::WatchHandler - - Name - Nom - Expression Expression - - Type - Type - Internal Type Type interne @@ -7645,10 +7634,6 @@ at debugger startup. ... <cut off> ... <coupé> - - Value - Valeur - Object Address Adresse de l'objet @@ -7681,26 +7666,6 @@ at debugger startup. Stored Address Adresse stockée - - Root - Racine - - - Return Value - Valeur de retour - - - Locals - Variables locales - - - Watchers - Observateurs - - - Tooltip - Info-bulle - Debugger - Qt Creator Débogueur - Qt Creator @@ -7736,46 +7701,6 @@ at debugger startup. <%n éléments> - - Raw pointer - Pointeur simple - - - Latin1 string - Chaîne de caractères latin1 - - - UTF8 string - Chaîne de caractères UTF8 - - - Local 8bit string - Chaîne de caractères locale au format 8 bits - - - UTF16 string - Chaîne de caractères UTF16 - - - UCS4 string - Chaîne de caractères UCS4 - - - Decimal - Décimal - - - Hexadecimal - Hexadécimal - - - Binary - Binaire - - - Octal - Octal - %1 Object at %2 Objet %1 à %2 @@ -7785,22 +7710,10 @@ at debugger startup. %1 est le data type => "Objet QMainWindow" par exemple. Objet %1 à une adresse inconnue - - Locals & Watchers - Variables locales et observateurs - unknown address adresse inconnue - - %1 object at %2 - %1 objet à %2 - - - <Edit> - <Éditer> - Internal ID ID interne @@ -7809,9 +7722,6 @@ at debugger startup. Generation Génération - - - Debugger::Internal::WatchModel decimal décimal @@ -7924,9 +7834,6 @@ at debugger startup. Type Type - - - Debugger::Internal::WatchWindow Locals and Watchers Variables locales et observateurs @@ -7976,18 +7883,6 @@ at debugger startup. Remove All Evaluated Expressions Enlever toutes les expressions évaluées - - Open Memory Editor... - Ouvrir l'éditeur de mémoire... - - - Open Memory Editor at Object's Address (0x%1) - Ouvrir l'éditeur de mémoire à l'adresse de l'objet (0x%1) - - - Open Memory Editor at Referenced Address (0x%1) - Ouvrir l'éditeur de mémoire à l'adresse référencée (0x%1) - Break on Changes at Object's Address (0x%1) Arrêter lors de changements à l'adresse de l'objet (0x%1) @@ -8020,76 +7915,14 @@ at debugger startup. Change Display Format... Changer le format d'affichage... - - Treat All Characters as Printable - Traiter tous les caractères comme imprimables - - - Show Unprintable Characters as Octal - Montrer les caractères non imprimables comme octaux - - - Show Unprintable Characters as Hexadecimal - Montrer les caractères non imprimables comme hexadécimaux - - - Use Format for Type (Currently %1) - Utiliser le format pour le type (actuellement %1) - - - Use Display Format Based on Type - Utiliser le format d'affichage basé sur le type - - - Change Display for Type "%1": - Changer l'affichage du type "%1" : - - - Change Display for Object Named "%1": - Changer l'affichage de l'objet nommé "%1" : - - - <i>%1</i> %2 at #%3 - HTML tooltip of a variable in the memory editor - <i>%1</i> %2 à #%3 - - - <i>%1</i> %2 - HTML tooltip of a variable in the memory editor - <i>%1</i> %2 - - - Register <i>%1</i> - Registre <i>%1</i> - Memory Referenced by Pointer '%1' (0x%2) Mémoire référencée par le pointeur "%1" (0x%2) - - Memory at Variable '%1' (0x%2) - Mémoire à la variable "%1" (0x%2) - Memory Referenced by Pointer "%1" (0x%2) Mémoire référencée par le pointeur "%1" (0x%2) - - Memory at Variable "%1" (0x%2) - Mémoire à la variable "%1" (0x%2) - - - Cannot Display Stack Layout - Impossible d'afficher la disposition de la pile - - - Could not determine a suitable address range. - Impossible de déterminer une plage d'adresses convenable. - - - Memory Layout of Local Variables at 0x%1 - Disposition de la mémoire des variables locales à 0x%1 - Locals and Expressions Locales et expressions @@ -8110,62 +7943,9 @@ at debugger startup. Remove Evaluated Expression "%1" Enlever l'expression "%1" évaluée - - Change Local Display Format... - Changer le format d'affichage local... - - - Show Unprintable Characters as Escape Sequences - Montrer les caractères non imprimables comme des séquences d'échappement - - - Use Display Format Based on Type - Utiliser le format d'affichage basé sur le type - - - Change Display for Type or Item... - Changer l'affichage du type ou de l'item... - - - Add Data Breakpoint... - ??? - Ajouter un point d'arrêt sur les données... - - - Add Data Breakpoint at Object's Address (0x%1) - Ajouter un point d'arrêt sur les données à l'adresse de l'objet (0x%1) - - - Add Data Breakpoint at Referenced Address (0x%1) - Ajouter un point d'arrêt sur les données à l'adresse référencée (0x%1) - - - Add Data Breakpoint - Ajouter un point d'arrêt sur les données - - - Setting a data breakpoint on an address will cause the program to stop when the data at the address is modified. - Définir un point d'arrêt sur les données à une adresse fera que le programme s'arrêtera quand les données à cette adresse seront modifiées. - - - Add Data Breakpoint at Expression - Ajouter un point d'arrêt de donnée sur l'expression - - - Add Data Breakpoint at Expression "%1" - Ajouter un point d'arrêt sur les données à l'expression "%1" - - - Setting a data breakpoint on an expression will cause the program to stop when the data at the address given by the expression is modified. - Définir un point d'arrêt sur les données à une adresse fera que le programme s'arrêtera quand les données à cette adresse fournies par l'expression seront modifiées. - - - Insert New Evaluated Expression - Insérer une nouvelle expression évaluée - Add Watchpoint at Object's Address (0x%1) - Ajouter un point d'observation à l'adresse de l'objet (0x%1) + Ajouter un point d'observation à l'adresse de l'objet (0x%1) Add Watchpoint at Referenced Address (0x%1) @@ -8183,54 +7963,18 @@ at debugger startup. Remove All Watch Items Supprimer tous les éléments observés - - Open Memory View at Object's Address (0x%1) - Ouvrir la vue mémoire à l'adresse de l'objet (0x%1) - - - Open Memory Editor at Object's Address - Ouvrir l'éditeur mémoire à l'adresse de l'objet - - - Open Memory View at Object's Address - Ouvrir la vue mémoire à l'adresse de l'objet - Open Memory View at Referenced Address (0x%1) - Ouvrir la vue mémoire à l'adresse référencée (0x%1) - - - Open Memory Editor at Referenced Address - Ouvrir l'éditeur mémoire à l'adresse référencée + Ouvrir la vue mémoire à l'adresse référencée (0x%1) Open Memory View at Referenced Address - Ouvrir la vue mémoire à l'adresse référencée - - - Open Memory Editor Showing Stack Layout - Ouvrir l'éditeur mémoire montrant la pile (stack) - - - Copy Contents to Clipboard - Copier le contenu dans le presse papier - - - Copy Value to Clipboard - Copier la valeur dans le presse papier + Ouvrir la vue mémoire à l'adresse référencée Refresh Code Model Snapshot Rafraîchir le snapshot du modèle de code - - Show View Contents in Editor - Ouvrir le contenu de la vue dans l'éditeur - - - Close Editor Tooltips - Fermer l'éditeur d'info-bulles - Enter watch expression Entrer l'expression à observer @@ -8247,10 +7991,6 @@ at debugger startup. Adjust Column Widths to Contents Ajuster la largeur des colonnes au contenu - - Automatic - Automatique - Always Adjust Column Widths to Contents Toujours ajuster la largeur des colonnes au contenu @@ -62840,7 +62580,7 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi - Debugger::Internal::WatchTreeView + Debugger <i>%1</i> %2 at #%3 HTML tooltip of a variable in the memory editor @@ -62855,14 +62595,6 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi Register <i>%1</i> Registre <i>%1</i> - - Memory Referenced by Pointer "%1" (0x%2) - Mémoire référencée par le pointeur "%1" (0x%2) - - - Memory at Variable "%1" (0x%2) - Mémoire à la variable "%1" (0x%2) - Memory at Pointer's Address "%1" (0x%2) Mémoire à l'adresse du pointeur "%1" (0x%2) @@ -62883,10 +62615,6 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi Memory Layout of Local Variables at 0x%1 Disposition de la mémoire des variables locales à 0x%1 - - Locals and Expressions - Locales et expressions - Add Expression Evaluator Ajouter un évaluateur d'expression @@ -63039,18 +62767,10 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi Open Memory Editor at Referenced Address (0x%1) Ouvrir l'éditeur de mémoire à l'adresse référencée (0x%1) - - Open Memory View at Referenced Address (0x%1) - Ouvrir la vue mémoire à l'adresse référencée (0x%1) - Open Memory Editor at Referenced Address Ouvrir l'éditeur mémoire à l'adresse référencée - - Open Memory View at Referenced Address - Ouvrir la vue mémoire à l'adresse référencée - Open Memory Editor Showing Stack Layout Ouvrir l'éditeur mémoire montrant la pile @@ -63075,10 +62795,6 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi Enter Expression for Evaluator Entrer une expression pour l'évaluateur - - Expression: - Expression : - Locals & Expressions Locales et expressions diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index fe908b5b806..c21c1c4649e 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -25071,7 +25071,7 @@ Affected are breakpoints %1 - Debugger::Internal::WatchHandler + Debugger <empty> <prazno> @@ -25120,10 +25120,6 @@ Affected are breakpoints %1 <out of scope> - - Name - Naziv - Expression @@ -25132,10 +25128,6 @@ Affected are breakpoints %1 Internal Type - - Value - Vrijednost - ... <cut off> @@ -26950,7 +26942,7 @@ Do you want to retry? - Debugger::Internal::WatchItem + Debugger <not in scope> Value of variable in Debugger Locals display for variables out of scope (stopped above initialization). @@ -26961,9 +26953,6 @@ Do you want to retry? Display of variables shadowed by variables of the same name in nested scopes: Variable %1 is the variable name, %2 is a simple count. - - - Debugger::Internal::WatchModel Name Naziv @@ -27346,9 +27335,6 @@ Do you want to retry? Are you sure you want to remove all expression evaluators? - - - Debugger::Internal::WatchTreeView Locals and Expressions diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts index 020e3c19855..91d164d21dc 100644 --- a/share/qtcreator/translations/qtcreator_hu.ts +++ b/share/qtcreator/translations/qtcreator_hu.ts @@ -6791,7 +6791,7 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. - Debugger::Internal::WatchData + Debugger <not in scope> <nem a hatókörben> @@ -6800,9 +6800,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. %1 <shadowed %2> %1 <árnyékolt %2> - - - Debugger::Internal::WatchHandler Expression Kifejezés @@ -6855,9 +6852,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. <Edit> <Szerkesztés> - - - Debugger::Internal::WatchModel decimal @@ -6886,9 +6880,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. Type Típus - - - Debugger::Internal::WatchWindow Locals and Watchers Helyi és őrzők diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts index 8d3dd1119df..2ed2079d98f 100644 --- a/share/qtcreator/translations/qtcreator_it.ts +++ b/share/qtcreator/translations/qtcreator_it.ts @@ -5065,15 +5065,12 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. - Debugger::Internal::WatchData + Debugger <not in scope> <fuori contesto> - - - Debugger::Internal::WatchHandler Expression @@ -5159,9 +5156,6 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. <No Watchers> <Niente Osservazioni> - - - Debugger::Internal::WatchModel decimal @@ -5197,9 +5191,6 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. Type Tipo - - - Debugger::Internal::WatchWindow Locals and Watchers diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 2ae3ffb1690..a74564d2189 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -8992,10 +8992,6 @@ preferShaping プロパティを false に設定すると、このような機 Exports this item as an alias property of the root item. このアイテムを、ルートアイテムのエイリアスプロパティとしてエクスポートします。 - - Custom id - カスタムID - Component コンポーネント @@ -9028,38 +9024,18 @@ preferShaping プロパティを false に設定すると、このような機 Exports this item as an alias property of the root item. このアイテムを、ルートアイテムのエイリアスプロパティとしてエクスポートします。 - - Custom id - カスタムID - Component コンポーネント - - Changes the type of this component. - このアイテムの型を変更する。 - ID ID - - Exports this component as an alias property of the root component. - このコンポーネントを、ルートコンポーネントのエイリアスプロパティとしてエクスポートします。 - Custom ID Custom ID - - customId - customId - - - Add Annotation - アノテーションを追加する - Visibility 可視性 @@ -9118,10 +9094,6 @@ preferShaping プロパティを false に設定すると、このような機 ID ID - - Exports this component as an alias property of the root component. - このコンポーネントを、ルートコンポーネントのエイリアスプロパティとしてエクスポートします。 - Changes the type of this item. このアイテムのタイプを変更する。 @@ -16980,10 +16952,6 @@ Flags: %3 Breakpoint ブレークポイント - - Internal ID: - 内部ID: - State: 状態: @@ -20560,10 +20528,6 @@ Do you want to retry? Content as %1-bit Floating Point Values %1ビット浮動小数点としての値 - - Registers group - レジスタグループ - A group of registers. レジスターのグループです。 @@ -21092,7 +21056,7 @@ Do you want to retry? - Debugger::Internal::WatchHandler + Debugger Name 名前 @@ -21195,10 +21159,6 @@ Do you want to retry? <optimized out> <最適化による省略> - - Remove All Expression Evaluators - すべての式エバリュエータを削除 - Are you sure you want to remove all expression evaluators? 本当にすべての式エバリュエータを削除しますか？ @@ -21207,9 +21167,6 @@ Do you want to retry? Debugger - %1 デバッガ - %1 - - - Debugger::Internal::WatchModel Locals ローカル @@ -21308,22 +21265,6 @@ Do you want to retry? Cannot Display Stack Layout スタックレイアウトを表示できません - - Could not determine a suitable address range. - 適応するアドレス範囲が特定できません。 - - - Memory Layout of Local Variables at 0x%1 - 0x%1 のローカル変数のメモリレイアウト - - - Add Expression Evaluator - 式エバリュエータを追加 - - - Add Expression Evaluator for "%1" - 式エバリュエータ "%1" を追加 - Remove Expression Evaluator 式エバリュエータを削除 @@ -21336,14 +21277,6 @@ Do you want to retry? Enter an expression to evaluate. 評価する式を入力してください。 - - Note: Evaluators will be re-evaluated after each step. For details, see the <a href="qthelp://org.qt-project.qtcreator/doc/creator-debug-mode.html#locals-and-expressions">documentation</a>. - 注意: 式は各ステップ実行ごとに再評価されます。詳細は <a href="qthelp://org.qt-project.qtcreator/doc/creator-debug-mode.html#locals-and-expressions">ドキュメント</a> を参照してください。 - - - New Evaluated Expression - 新しい評価済み式 - Add New Expression Evaluator... 新しい式エバリュエータを追加... @@ -21364,10 +21297,6 @@ Do you want to retry? Collapse All Children すべての子プロセスを折りたたむ - - Close Editor Tooltips - エディタのツールチップを閉じる - Copy View Contents to Clipboard 表示内容をクリップボードにコピー @@ -21384,34 +21313,6 @@ Do you want to retry? Locals & Expressions ローカル変数と式 - - Add Data Breakpoint - データブレークポイントを追加 - - - Add Data Breakpoint at Object's Address (0x%1) - オブジェクトのアドレス (0x%1) にデータブレークポイントを追加 - - - Stop the program when the data at the address is modified. - そのアドレスのデータが変更されたら、プログラムを停止します。 - - - Add Data Breakpoint at Pointer's Address (0x%1) - ポインタのアドレス (0x%1) にデータブレークポイントを追加 - - - Add Data Breakpoint at Pointer's Address - ポインタのアドレスにデータブレークポイントを追加 - - - Add Data Breakpoint at Expression "%1" - 式 "%1" にデータブレークポイントを追加 - - - Add Data Breakpoint at Expression - 式にデータブレークポイントを追加 - Stop the program when the data at the address given by the expression is modified. 式で指定されたアドレスのデータが変更されたら、プログラムを停止します。 @@ -21420,14 +21321,6 @@ Do you want to retry? Open Memory Editor メモリエディタを開く - - Open Memory View at Object's Address (0x%1) - オブジェクトのアドレス (0x%1) をメモリビューで開く - - - Open Memory View at Object's Address - オブジェクトのアドレスをメモリビューで開く - Open Memory View at Pointer's Address (0x%1) ポインタのアドレス (0x%1) をメモリビューで開く @@ -21440,22 +21333,6 @@ Do you want to retry? Open Memory View Showing Stack Layout 表示しているスタックレイアウトをメモリビューで開く - - Open Memory Editor at Object's Address (0x%1) - オブジェクトのアドレス (0x%1) をメモリエディタで開く - - - Open Memory Editor at Object's Address - オブジェクトのアドレスをメモリエディタで開く - - - Open Memory Editor at Pointer's Address (0x%1) - ポインタのアドレス (0x%1) をメモリエディタで開く - - - Open Memory Editor at Pointer's Address - ポインタのアドレスをメモリエディタで開く - Open Memory Editor Showing Stack Layout 表示しているスタックレイアウトをメモリエディタで開く @@ -21488,10 +21365,6 @@ Do you want to retry? Change Display for Object Named "%1": "%1" という名前のオブジェクトの表示形式を変更: - - Use Format for Type (Currently %1) - 型の表示形式を使う(現在は %1) - Use Display Format Based on Type 型に基づいたフォーマットで表示する @@ -21500,10 +21373,6 @@ Do you want to retry? Reset All Individual Formats すべてのフォーマットをリセットする - - Change Display for Type "%1": - 型 "%1" の表示形式を変更: - Reset All Formats for Types すべての型の表示形式をリセットする @@ -21610,9 +21479,6 @@ Do you want to retry? %n 個の配列 - - - Debugger::Internal::WatchTreeView <i>%1</i> %2 at #%3 HTML tooltip of a variable in the memory editor @@ -21623,22 +21489,6 @@ Do you want to retry? HTML tooltip of a variable in the memory editor <i>%1</i> %2 - - Register <i>%1</i> - レジスタ <i>%1</i> - - - Memory at Pointer's Address "%1" (0x%2) - ポインタのアドレス "%1" (0x%2) が指すメモリ - - - Memory at Object's Address "%1" (0x%2) - オブジェクトのアドレス "%1" (0x%2) が指すメモリ - - - Cannot Display Stack Layout - スタックレイアウトを表示できません - Could not determine a suitable address range. 適応するアドレス範囲が特定できません。 @@ -21647,94 +21497,26 @@ Do you want to retry? Memory Layout of Local Variables at 0x%1 0x%1 のローカル変数のメモリレイアウト - - Locals and Expressions - ローカル変数と式 - - - Add Expression Evaluator - 式エバリュエータを追加 - Add Expression Evaluator for "%1" 式エバリュエータ "%1" を追加 - - Remove Expression Evaluator - 式エバリュエータを削除 - - - Remove Expression Evaluator for "%1" - 式エバリュエータ "%1" を削除 - - - Add Data Breakpoint at Pointer's Address - ポインタのアドレスにデータブレークポイントを追加 - - - Add New Expression Evaluator... - 新しい式エバリュエータを追加... - - - Remove All Expression Evaluators - すべての式エバリュエータを削除 - - - Copy View Contents to Clipboard - 表示内容をクリップボードにコピー - - - Copy Current Value to Clipboard - 現在の値をクリップボードにコピー - Copy Selected Rows to Clipboard 選択された行をクリップボードにコピー - - Open View Contents in Editor - 表示内容をエディタで開く - New Evaluated Expression 新しい評価済み式 - - Enter an expression to evaluate. - 評価する式を入力してください。 - Note: Evaluators will be re-evaluated after each step. For details check the <a href="qthelp://org.qt-project.qtcreator/doc/creator-debug-mode.html#locals-and-expressions">documentation</a>. 注意: 式は各ステップ実行ごとに再評価されます。詳細は <a href="qthelp://org.qt-project.qtcreator/doc/creator-debug-mode.html#locals-and-expressions">ドキュメント</a> を参照してください。 - - Treat All Characters as Printable - すべての文字を印刷可能文字として扱う - - - Show Unprintable Characters as Escape Sequences - 印刷不可文字をエスケープシーケンスとして表示 - - - Show Unprintable Characters as Octal - 印刷不可文字を8進数の文字として表示 - - - Show Unprintable Characters as Hexadecimal - 印刷不可文字を16進数の文字として表示 - - - Change Display for Object Named "%1": - "%1" という名前のオブジェクトの表示形式を変更: - Use Format for Type (Currently %1) 型の表示形式を使う(現在は %1) - - Use Display Format Based on Type - 型に基づいたフォーマットで表示する - Change Display for Type "%1": 型 "%1" の表示形式を変更: @@ -21743,14 +21525,6 @@ Do you want to retry? Automatic 自動 - - Add Data Breakpoint at Object's Address (0x%1) - オブジェクトのアドレス (0x%1) にデータブレークポイントを追加 - - - Add Data Breakpoint at Pointer's Address (0x%1) - ポインタのアドレス (0x%1) にデータブレークポイントを追加 - Add Data Breakpoint データブレークポイントを追加 @@ -21771,18 +21545,6 @@ Do you want to retry? Setting a data breakpoint on an expression will cause the program to stop when the data at the address given by the expression is modified. 式にデータブレークポイントを設定すると、式によって得られるアドレスのデータが変更された時にプログラムが停止します。 - - Select Widget to Add into Expression Evaluator - 式エバリュエータに追加するウィジェットの選択 - - - Change Value Display Format - 値の表示形式を変更 - - - Open Memory Editor... - メモリエディタを開く... - Open Memory Editor at Object's Address (0x%1) オブジェクトのアドレス (0x%1) をメモリエディタで開く @@ -21815,10 +21577,6 @@ Do you want to retry? Open Memory View at Pointer's Address ポインタのアドレスをメモリビューで開く - - Open Memory Editor Showing Stack Layout - 表示しているスタックレイアウトをメモリエディタで開く - Close Editor Tooltips エディタのツールチップを閉じる @@ -31006,14 +30764,6 @@ Locked items cannot be modified or selected. Reverse Component Order コンポーネントの順序を逆にする - - Show only visible items. - 可視化されたアイテムだけを表示する。 - - - Reverse item order. - アイテムの順序を逆にする。 - WidgetPluginManager @@ -31250,13 +31000,6 @@ Ids must begin with a lowercase letter. 無効あるいは重複したアイテムライブラリエントリー %1 - - SubComponentManager::parseDirectory - - Invalid meta info - 無効なメタ情報 - - QmlDesigner::Internal::ModelPrivate @@ -43118,10 +42861,6 @@ Do you want to check them out now? Step Over ステップオーバー - - Add Expression Evaluator - 式エバリュエータを追加 - Toggle Breakpoint ブレークポイントの切替 @@ -43798,7 +43537,7 @@ Affected are breakpoints %1 - Debugger::Internal::WatchItem + Debugger <not in scope> Value of variable in Debugger Locals display for variables out of scope (stopped above initialization). @@ -45878,10 +45617,6 @@ Would you like to overwrite it? New Package 新しいパッケージ - - Component - コンポーネント - New Component 新しいコンポーネント @@ -49594,17 +49329,9 @@ Output: Object3DPane - - Component - コンポーネント - ID - ID - - - id - ID + ID Toggles whether this item is exported as an alias property of the root item. @@ -49617,10 +49344,6 @@ Output: Edit Annotation アノテーションを編集する - - Add Annotation - アノテーションを追加する - Remove Annotation アノテーションを削除する @@ -50457,7 +50180,7 @@ Output: ScxmlEditor::Common::Statistics Time - タイム + タイム 0 diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 4bd2dfddc49..f8b7598655a 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -4915,7 +4915,7 @@ receives a signal like SIGSEGV during debugging. - Debugger::Internal::WatchHandler + Debugger Expression Wyrażenie @@ -4948,10 +4948,6 @@ receives a signal like SIGSEGV during debugging. %n bajtów - - Name - Nazwa - Internal Type Typ wewnętrzny @@ -5016,9 +5012,6 @@ receives a signal like SIGSEGV during debugging. <%n elementów> - - - Debugger::Internal::WatchModel returned value zwrócona wartość @@ -5055,10 +5048,6 @@ receives a signal like SIGSEGV during debugging. Tooltip Podpowiedź - - Value - Wartość - Type Typ @@ -22352,7 +22341,7 @@ Wersje Qt można dodać w: Opcje > Budowanie i uruchamianie > Wersje Qt. - Debugger::Internal::WatchTreeView + Debugger Locals and Expressions Zmienne lokalne i wyrażenia @@ -39061,7 +39050,7 @@ Ustaw prawdziwy plik wykonywalny Clang. - Debugger::Internal::WatchItem + Debugger <not in scope> Value of variable in Debugger Locals display for variables out of scope (stopped above initialization). diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 9991fe97151..dc08bd4b3df 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -18770,7 +18770,7 @@ You can choose another communication channel here, such as a serial line or cust - Debugger::Internal::WatchHandler + Debugger Expression Выражение @@ -18867,17 +18867,10 @@ You can choose another communication channel here, such as a serial line or cust <optimized out> <оптимизировано> - - Name - Имя - Debugger - %1 Отладчик - %1 - - - Debugger::Internal::WatchItem <not in scope> Value of variable in Debugger Locals display for variables out of scope (stopped above initialization). @@ -18888,9 +18881,6 @@ You can choose another communication channel here, such as a serial line or cust Display of variables shadowed by variables of the same name in nested scopes: Variable %1 is the variable name, %2 is a simple count. %1 <затеняет %2> - - - Debugger::Internal::WatchModel Locals Локальные переменные @@ -18919,10 +18909,6 @@ You can choose another communication channel here, such as a serial line or cust Name Имя - - Value - Значение - Type Тип @@ -19293,9 +19279,6 @@ You can choose another communication channel here, such as a serial line or cust Are you sure you want to remove all expression evaluators? Удалить все вычисляемые выражения? - - - Debugger::Internal::WatchTreeView Locals and Expressions Переменные и выражения diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index ca8f7d46bb3..a60db9f85ad 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -4547,7 +4547,7 @@ Ali želite ustaviti razhroščevani proces in naložiti izbrani posnetek? - Debugger::Internal::WatchData + Debugger @@ -4563,9 +4563,6 @@ Ali želite ustaviti razhroščevani proces in naložiti izbrani posnetek? %1 <zakriva %2> - - - Debugger::Internal::WatchHandler Expression @@ -4611,11 +4608,6 @@ Ali želite ustaviti razhroščevani proces in naložiti izbrani posnetek?Generation Ustvarjanje - - - <Edit> - <urejanje> - Root @@ -4691,16 +4683,6 @@ Ali želite ustaviti razhroščevani proces in naložiti izbrani posnetek?Watchers Opazovalci - - - Value - Vrednost - - - - Name - Ime - unknown address neznan naslov @@ -4709,13 +4691,6 @@ Ali želite ustaviti razhroščevani proces in naložiti izbrani posnetek?%1 object at %2 Objekt %1 na %2 - - Type - Vrsta - - - - Debugger::Internal::WatchModel <Edit> @@ -4803,9 +4778,6 @@ Ali želite ustaviti razhroščevani proces in naložiti izbrani posnetek?Bald pointer Surov kazalec - - - Debugger::Internal::WatchWindow <i>%1</i> %2 at #%3 diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 7ed2f44691f..46340d09557 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -6262,10 +6262,6 @@ Qt Creator не може під'єднатись до нього.Threads Нитки - - Locals and Expressions - Локальні змінні та вирази - Snapshots Знімки @@ -7214,11 +7210,6 @@ You can choose between waiting longer or aborting debugging. Custom dumper setup: %1 Налаштування відображувача користувача: %1 - - <shadowed> - Type of local variable or parameter shadowed by another variable of the same name in a nested block. - <затінено> - Disassembler failed: %1 Збій дизасемблера: %1 @@ -8172,20 +8163,12 @@ Do you want to retry? - Debugger::Internal::WatchData + Debugger <not in scope> Value of variable in Debugger Locals display for variables out of scope (stopped above initialization). <Поза областю видимості> - - %1 <shadowed %2> - Display of variables shadowed by variables of the same name in nested scopes: Variable %1 is the variable name, %2 is a simple count. - %1 <затінено %2> - - - - Debugger::Internal::WatchHandler Name Назва @@ -8246,10 +8229,6 @@ Do you want to retry? Debugger - Qt Creator Зневаджувач - Qt Creator - - <Edit> - <Змініть> - <empty> <порожнє> @@ -8302,25 +8281,10 @@ Do you want to retry? <%n елементів> - - Remove All Expression Evaluators - Видалити усі обчислювані вирази - Are you sure you want to remove all expression evaluators? Ви впевнені, що бажаєте видалити усі обчислювані вирази? - - %1 Object at %2 - Об'єкт %1 в %2 - - - %1 Object at Unknown Address - Об'єкт %1 за невідомою адресою - - - - Debugger::Internal::WatchModel <Edit> <Змінити> @@ -8409,14 +8373,6 @@ Do you want to retry? Tooltip Підказка - - Name - Назва - - - Value - Значення - Type Тип @@ -8518,13 +8474,6 @@ Do you want to retry? Об'єкт %1 за невідомою адресою - - Debugger::Internal::WatchWindow - - Locals and Expressions - Локальні змінні та вирази - - DebuggerEngine @@ -34590,7 +34539,7 @@ Stepping into the module or setting breakpoints by file and is expected to work. - Debugger::Internal::WatchTreeView + Debugger <i>%1</i> %2 at #%3 HTML tooltip of a variable in the memory editor @@ -34709,10 +34658,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Change Display for Type "%1": Змінити формат відображення для типу "%1": - - Automatic - Автоматичний - Change Display for Type or Item... Змінити відображення для типу чи елемента... @@ -56984,12 +56929,7 @@ Please set a real Clang executable. - Debugger::Internal::WatchItem - - <not in scope> - Value of variable in Debugger Locals display for variables out of scope (stopped above initialization). - <Поза областю видимості> - + Debugger %1 <shadowed %2> Display of variables shadowed by variables of the same name in nested scopes: Variable %1 is the variable name, %2 is a simple count. diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 8e6d46bd95c..76bccaa2cf7 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -940,10 +940,6 @@ Gui behavior 图形界面行为 - - Register Qt Creator for debugging crashed applications. - 注册 Qt Creator 来调试崩溃的应用. - Use Creator for post-mortem debugging 使用Creator进行崩溃后调试 @@ -3896,10 +3892,6 @@ Qt Creator 无法附属到进程. Add Breakpoint 添加断点 - - Always Adjust Column Widths to Contents - 总是按内容调整列宽 - Edit Breakpoint... 编辑断点... @@ -4615,10 +4607,6 @@ Qt Creator 无法附属到进程. Watch Expression "%1" 监视表达式 "%1" - - Remove Watch Expression "%1" - 删除监视表达式"%1" - Watch Expression "%1" in Separate Window 在独立窗口中监视表达式 "%1" @@ -6073,10 +6061,6 @@ markers in the source code editor. Adjust Column Widths to Contents 按内容调整列宽 - - Always Adjust Column Widths to Contents - 总是按内容调整列宽 - Adjust column widths to contents 按内容调整列宽 @@ -6494,7 +6478,7 @@ markers in the source code editor. - Debugger::Internal::WatchData + Debugger <not in scope> Value of variable in Debugger Locals display for variables out of scope (stopped above initialization). @@ -6505,9 +6489,6 @@ markers in the source code editor. Display of variables shadowed by variables of the same name in nested scopes: Variable %1 is the variable name, %2 is a simple count. %1 <隐藏了 %2> - - - Debugger::Internal::WatchHandler Expression 表达式 @@ -6558,38 +6539,6 @@ markers in the source code editor. Generation 创建 - - unknown address - 未知地址 - - - %1 object at %2 - 在 %2 的 %1 对象 - - - <Edit> - <编辑> - - - Root - 根 - - - Name - 名称 - - - Return Value - 返回值 - - - Locals - 局部的 - - - Tooltip - 工具提示 - <empty> <空> @@ -6626,41 +6575,6 @@ markers in the source code editor. %1 Object at Unknown Address 未知地址处的 %1对象 - - Locals & Watchers - 局部变量和监视器 - - - Watchers - 监视器 - - - Value - 值 - - - Type - 类型 - - - - Debugger::Internal::WatchModel - - decimal - 10进制 - - - hexadecimal - 16进制 - - - binary - 2进制 - - - octal - 8进制 - Bald pointer plain pointer @@ -6750,9 +6664,6 @@ markers in the source code editor. Type 类型 - - - Debugger::Internal::WatchWindow Locals and Watchers 局部变量和监视器 @@ -6761,10 +6672,6 @@ markers in the source code editor. Change Format for Type "%1" 根据类型 "%1" 改变格式 - - Automatic - 自动 - Change Format for Type 根据类型改变格式 @@ -6805,10 +6712,6 @@ markers in the source code editor. Remove All Watch Items 删除所有监控项目 - - Open Memory Editor... - 打开内存编辑器... - Open Memory Editor at %1 在 %1 处打开内存编辑器 @@ -6825,18 +6728,6 @@ markers in the source code editor. Change Format for Object Named "%1" 改变名为"%1"的对象的格式 - - Open Memory Editor at Object's Address (0x%1) - 在对象的地址 (0x%1)处打开内存编辑器 - - - Open Memory Editor at Object's Address - 在对象的地址 打开内存编辑器 - - - Open Memory Editor at Referenced Address (0x%1) - 在参考地址(0x%1)处打开内存编辑器 - Break on Changes at Object's Address (0x%1) 在对象地址(0x%1)发生更改时断点 @@ -6869,63 +6760,6 @@ markers in the source code editor. Change Display Format... 改变显示格式... - - Treat All Characters as Printable - 所有字符可打印 - - - Show Unprintable Characters as Octal - 显示所有不可打印的字符为八进制 - - - Show Unprintable Characters as Hexadecimal - 显示所有不可打印的字符为十六进制 - - - Change Display for Type "%1": - 为类型"%1"改变显示: - - - Change Display for Object Named "%1": - 为对象名称为"%1"改变显示: - - - <i>%1</i> %2 at #%3 - HTML tooltip of a variable in the memory editor - <i>%1</i> %2 在 #%3 - - - Register <i>%1</i> - 注册<i>%1</i> - - - Memory Referenced by Pointer '%1' (0x%2) - 内存被指针'%1'引用 (0x%2) - - - Memory at Variable '%1' (0x%2) - 可变内存'%1' (0x%2) - - - Memory Referenced by Pointer "%1" (0x%2) - 内存被指针'%1'引用 (0x%2) - - - Memory at Variable "%1" (0x%2) - 可变内存'%1' (0x%2) - - - Cannot Display Stack Layout - 无法显示堆栈布局 - - - Could not determine a suitable address range. - 无法绝对一个合适的地址范围. - - - Memory Layout of Local Variables at 0x%1 - 局部变量的内存布局在0x%1 - Locals and Expressions 局部变量和表达式 @@ -6946,46 +6780,10 @@ markers in the source code editor. Remove Evaluated Expression "%1" 移除计算表达式"%1" - - Show Unprintable Characters as Escape Sequences - 显示所有不可打印的字符为转义序列 - Use Display Format Based on Type 使用基于类型的显示格式 - - Change Display for Type or Item... - 为类型或项改变显示... - - - Add Data Breakpoint... - 添加数据断点... - - - Add Data Breakpoint at Object's Address (0x%1) - 在对象地址(0x%1)添加数据断点 - - - Add Data Breakpoint at Referenced Address (0x%1) - 在引用地址(0x%1)添加数据断点 - - - Add Data Breakpoint - 添加数据断点 - - - Setting a data breakpoint on an address will cause the program to stop when the data at the address is modified. - 在一个地址上设置数据断点,当数据在这个地址上被修改将会导致程序停止. - - - Add Data Breakpoint at Expression "%1" - 在表达式"%1"处添加数据断点 - - - Setting a data breakpoint on an expression will cause the program to stop when the data at the address given by the expression is modified. - 在一个表达式地址上设置数据断点,当数据在这个表达式地址上被修改将会导致程序停止. - Insert New Evaluated Expression 插入新的计算表达式 @@ -6994,50 +6792,10 @@ markers in the source code editor. Remove All Evaluated Expressions 移除所有计算表达式 - - Open Memory View at Object's Address (0x%1) - 在对象地址(0x%1)处打开内存监视器 - - - Open Memory View at Object's Address - 在对象地址打开内存监视器 - - - Open Memory View at Referenced Address (0x%1) - 在引用地址(0x%1)处打开内存监视器 - - - Open Memory Editor at Referenced Address - 在引用的地址 打开内存编辑器 - - - Open Memory View at Referenced Address - 在引用地址打开内存监视器 - - - Open Memory Editor Showing Stack Layout - 打开内存编辑器显示堆栈布局 - - - Copy Contents to Clipboard - 复制内容到剪贴板 - - - Copy Value to Clipboard - 复制数值到剪贴板 - - - Close Editor Tooltips - 关闭编辑器工具提示 - Enter watch expression 输入监控表达式 - - Expression: - 表达式: - Locals & Watchers 局部变量和监视器 @@ -7046,10 +6804,6 @@ markers in the source code editor. Always Adjust Column Widths to Contents 总是按内容调整列宽 - - Show View Contents in Editor - 在编辑器中显示视图内容 - Change format for type '%1' 根据'%1' 型改变格式 @@ -54394,7 +54148,7 @@ Stepping into the module or setting breakpoints by file and is expected to work. - Debugger::Internal::WatchTreeView + Debugger <i>%1</i> %2 at #%3 HTML tooltip of a variable in the memory editor @@ -54429,10 +54183,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Memory Layout of Local Variables at 0x%1 局部变量在0x%1处的内存布局 - - Locals and Expressions - 局部变量和表达式 - Add Expression Evaluator 添加表达式求值器 diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 253df6a4499..0613ce51cc2 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -3987,10 +3987,6 @@ at debugger startup. Disassemble Function 反組譯函式 - - Copy Contents to Clipboard - 複製內容到剪貼簿 - Open Memory Editor 開啟記憶體編輯器 @@ -4154,7 +4150,7 @@ at debugger startup. - Debugger::Internal::WatchData + Debugger <not in scope> Value of variable in Debugger Locals display for variables out of scope (stopped above initialization). @@ -4165,9 +4161,6 @@ at debugger startup. Display of variables shadowed by variables of the same name in nested scopes: Variable %1 is the variable name, %2 is a simple count. %1 <遮蔽了 %2> - - - Debugger::Internal::WatchHandler Expression 表示式 @@ -4220,23 +4213,19 @@ at debugger startup. Root - 根 - - - Name - 名稱 + 根 Return Value - 回傳值 + 回傳值 Locals - 局部 + 局部 Tooltip - 工具提示 + 工具提示 <empty> @@ -4272,39 +4261,39 @@ at debugger startup. Latin1 string - Latin1 字串 + Latin1 字串 UTF8 string - UTF8 字串 + UTF8 字串 Local 8bit string - 本地 8 位元字串 + 本地 8 位元字串 UTF16 string - UTF16 字串 + UTF16 字串 UCS4 string - UCS4 字串 + UCS4 字串 Decimal - 十進位 + 十進位 Hexadecimal - 十六進位 + 十六進位 Binary - 二進位 + 二進位 Octal - 八進位 + 八進位 %1 Object at %2 @@ -4322,17 +4311,6 @@ at debugger startup. Value 值 - - - Debugger::Internal::WatchModel - - Root - 根 - - - Locals - 局部 - Inspector @@ -4341,18 +4319,6 @@ at debugger startup. Expressions - - Return Value - 回傳值 - - - Tooltip - 工具提示 - - - <Edit> - <編輯> - returned value 回傳值 @@ -4361,146 +4327,77 @@ at debugger startup. Name 名稱 - - Value - 值 - Type 型態 - - Raw pointer - 原始指標 - - - Latin1 string - Latin1 字串 - - - UTF8 string - UTF8 字串 - - - Local 8bit string - 本地 8 位元字串 - - - UTF16 string - UTF16 字串 - - - UCS4 string - UCS4 字串 - - - Decimal - 十進位 - - - Hexadecimal - 十六進位 - - - Binary - 二進位 - - - Octal - 八進位 - - - - Debugger::Internal::WatchWindow Automatic - 自動 + 自動 Select Widget to Watch 選擇要監視的元件 - - Open Memory Editor... - 開啟記憶體編輯器... - Refresh Code Model Snapshot - 更新代碼模型快照 + 更新代碼模型快照 Open Memory Editor at Object's Address (0x%1) - 在物件位址 (0x%1) 處開啟記憶體編輯器 + 在物件位址 (0x%1) 處開啟記憶體編輯器 Open Memory Editor at Object's Address - 在物件位址處開啟記憶體編輯器 + 在物件位址處開啟記憶體編輯器 Open Memory Editor at Referenced Address (0x%1) - 在參考位址 (0x%1) 處開啟記憶體編輯器 + 在參考位址 (0x%1) 處開啟記憶體編輯器 Treat All Characters as Printable - 將所有字元視為可列印字元 + 將所有字元視為可列印字元 Show Unprintable Characters as Octal - 將所有不可列印的字元以八進位數值顯示 + 將所有不可列印的字元以八進位數值顯示 Show Unprintable Characters as Hexadecimal - 將所有不可列印的字元以十六進位數值顯示 + 將所有不可列印的字元以十六進位數值顯示 Use Format for Type (Currently %1) - 此型態使用格式 (目前為 %1) + 此型態使用格式 (目前為 %1) Use Display Format Based on Type - 依據型態使用顯示格式 - - - Change Display for Type "%1": - 變更型態 "%1" 的顯示： + 依據型態使用顯示格式 Change Display for Object Named "%1": - 變更物件名稱 "%1" 的顯示： - - - <i>%1</i> %2 at #%3 - HTML tooltip of a variable in the memory editor - <i>%1</i> %2 於 #%3 - - - <i>%1</i> %2 - HTML tooltip of a variable in the memory editor - <i>%1</i> %2 + 變更物件名稱 "%1" 的顯示： Register <i>%1</i> - 暫存器 <i>%1</i> + 暫存器 <i>%1</i> Memory Referenced by Pointer "%1" (0x%2) - 指標 "%1" 參考的記憶體 (0x%2) + 指標 "%1" 參考的記憶體 (0x%2) Memory at Variable "%1" (0x%2) - 變數 "%1" 的記憶體 (0x%2) + 變數 "%1" 的記憶體 (0x%2) Cannot Display Stack Layout - 無法顯示堆疊佈局 - - - Could not determine a suitable address range. - 無法決定一個適合的位址範圍。 + 無法顯示堆疊佈局 Memory Layout of Local Variables at 0x%1 - 局部變數於 0x%1 的記憶體佈局 + 局部變數於 0x%1 的記憶體佈局 Locals and Expressions @@ -4516,51 +4413,47 @@ at debugger startup. Remove Evaluated Expression - 移除已計算表示式 + 移除已計算表示式 Remove Evaluated Expression "%1" - 移除已計算表示式"%1" - - - Change Local Display Format... - 變更本地顯示格式... + 移除已計算表示式"%1" Show Unprintable Characters as Escape Sequences - 將所有不可列印的字元以脫逸序列顯示 + 將所有不可列印的字元以脫逸序列顯示 Change Display for Type or Item... - 變更型態或項目的顯示... + 變更型態或項目的顯示... Add Data Breakpoint... - 新增資料中斷點... + 新增資料中斷點... Add Data Breakpoint at Object's Address (0x%1) - 於物件位址 (0x%1) 新增資料中斷點 + 於物件位址 (0x%1) 新增資料中斷點 Add Data Breakpoint at Referenced Address (0x%1) - 於參考位址 (0x%1) 新增資料中斷點 + 於參考位址 (0x%1) 新增資料中斷點 Add Data Breakpoint - 新增資料中斷點 + 新增資料中斷點 Setting a data breakpoint on an address will cause the program to stop when the data at the address is modified. - 在某個位址上設定資料中斷點時，該位址上的資料被變更時程式會被中斷。 + 在某個位址上設定資料中斷點時，該位址上的資料被變更時程式會被中斷。 Add Data Breakpoint at Expression - 在表示式處新增資料中斷點 + 在表示式處新增資料中斷點 Add Data Breakpoint at Expression "%1" - 在表示式 "%1" 處新增資料中斷點 + 在表示式 "%1" 處新增資料中斷點 Setting a data breakpoint on an expression will cause the program to stop when the data at the address given by the expression is modified. @@ -4578,57 +4471,37 @@ at debugger startup. Remove All Evaluated Expressions 移除所有已計算表示式 - - Open Memory View at Object's Address (0x%1) - 在物件地址 (0x%1) 處開啟記憶體檢視 - - - Open Memory View at Object's Address - 在物件地址開啟記憶體檢視 - - - Open Memory View at Referenced Address (0x%1) - 在參考地址 (0x%1) 處開啟記憶體檢視 - - - Open Memory Editor at Referenced Address - 在引用位址處開啟記憶體編輯器 - - - Open Memory View at Referenced Address - 在引用位址處開啟記憶體檢視 - Open Memory Editor Showing Stack Layout - 開啟記憶體編輯器顯示堆疊佈局 + 開啟記憶體編輯器顯示堆疊佈局 Copy Contents to Clipboard - 複製內容到剪貼簿 + 複製內容到剪貼簿 Copy Value to Clipboard - 複製數值到剪貼簿 + 複製數值到剪貼簿 Close Editor Tooltips - 關閉編輯器工具提示 + 關閉編輯器工具提示 Enter watch expression - 輸入監視表示式 + 輸入監視表示式 Expression: - 表示式： + 表示式： Locals & Watchers - 局部變數和監視器 + 局部變數和監視器 Show View Contents in Editor - 在編輯器中顯示檢視內容 + 在編輯器中顯示檢視內容 @@ -35489,10 +35362,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Disassemble Function 反組譯函式 - - Copy Contents to Clipboard - 複製內容到剪貼簿 - Open Memory Editor 開啟記憶體編輯器 @@ -35531,44 +35400,20 @@ Stepping into the module or setting breakpoints by file and is expected to work. - Debugger::Internal::WatchTreeView + Debugger <i>%1</i> %2 at #%3 HTML tooltip of a variable in the memory editor - <i>%1</i> %2 於 #%3 + <i>%1</i> %2 於 #%3 <i>%1</i> %2 HTML tooltip of a variable in the memory editor - <i>%1</i> %2 - - - Register <i>%1</i> - 暫存器 <i>%1</i> - - - Memory Referenced by Pointer "%1" (0x%2) - 指標 "%1" 參考的記憶體 (0x%2) - - - Memory at Variable "%1" (0x%2) - 變數 "%1" 的記憶體 (0x%2) - - - Cannot Display Stack Layout - 無法顯示堆疊佈局 + <i>%1</i> %2 Could not determine a suitable address range. - 無法決定一個適合的位址範圍。 - - - Memory Layout of Local Variables at 0x%1 - 局部變數於 0x%1 的記憶體佈局 - - - Locals and Expressions - 局部變數與表示式 + 無法決定一個適合的位址範圍。 Add Expression Evaluator @@ -35588,80 +35433,12 @@ Stepping into the module or setting breakpoints by file and is expected to work. Change Local Display Format... - 變更本地顯示格式... - - - Treat All Characters as Printable - 將所有字元視為可列印字元 - - - Show Unprintable Characters as Escape Sequences - 將所有不可列印的字元以脫逸序列顯示 - - - Show Unprintable Characters as Octal - 將所有不可列印的字元以八進位數值顯示 - - - Show Unprintable Characters as Hexadecimal - 將所有不可列印的字元以十六進位數值顯示 - - - Change Display for Object Named "%1": - 變更物件名稱 "%1" 的顯示： - - - Use Format for Type (Currently %1) - 此型態使用格式 (目前為 %1) - - - Use Display Format Based on Type - 依據型態使用顯示格式 + 變更本地顯示格式... Change Display for Type "%1": 變更型態 "%1" 的顯示： - - Automatic - 自動 - - - Change Display for Type or Item... - 變更型態或項目的顯示... - - - Add Data Breakpoint... - 新增資料中斷點... - - - Add Data Breakpoint at Object's Address (0x%1) - 於物件位址 (0x%1) 新增資料中斷點 - - - Add Data Breakpoint at Referenced Address (0x%1) - 於參考位址 (0x%1) 新增資料中斷點 - - - Add Data Breakpoint - 新增資料中斷點 - - - Setting a data breakpoint on an address will cause the program to stop when the data at the address is modified. - 在某個位址上設定資料中斷點時，該位址上的資料被變更時程式會被中斷。 - - - Add Data Breakpoint at Expression - 在表示式處新增資料中斷點 - - - Add Data Breakpoint at Expression "%1" - 在表示式 "%1" 處新增資料中斷點 - - - Setting a data breakpoint on an expression will cause the program to stop when the data at the address given by the expression is modified. - 在某個表示式上設定資料中斷點時，該表示式所給的位址上的資料被變更時程式會被中斷。 - Insert New Expression Evaluator @@ -35678,26 +35455,10 @@ Stepping into the module or setting breakpoints by file and is expected to work. Open Memory Editor... 開啟記憶體編輯器... - - Open Memory Editor at Object's Address (0x%1) - 在物件位址 (0x%1) 處開啟記憶體編輯器 - - - Open Memory View at Object's Address (0x%1) - 在物件地址 (0x%1) 處開啟記憶體檢視 - - - Open Memory Editor at Object's Address - 在物件位址處開啟記憶體編輯器 - Open Memory View at Object's Address 在物件地址開啟記憶體檢視 - - Open Memory Editor at Referenced Address (0x%1) - 在參考位址 (0x%1) 處開啟記憶體編輯器 - Open Memory View at Referenced Address (0x%1) 在參考地址 (0x%1) 處開啟記憶體檢視 @@ -35710,38 +35471,10 @@ Stepping into the module or setting breakpoints by file and is expected to work. Open Memory View at Referenced Address 在引用位址處開啟記憶體檢視 - - Open Memory Editor Showing Stack Layout - 開啟記憶體編輯器顯示堆疊佈局 - - - Copy Contents to Clipboard - 複製內容到剪貼簿 - - - Copy Value to Clipboard - 複製數值到剪貼簿 - - - Show View Contents in Editor - 在編輯器中顯示檢視內容 - - - Close Editor Tooltips - 關閉編輯器工具提示 - Enter Expression for Evaluator - - Expression: - 表示式： - - - Locals & Expressions - - Gerrit::Internal::GerritDialog diff --git a/src/plugins/debugger/CMakeLists.txt b/src/plugins/debugger/CMakeLists.txt index 2bd5da24498..f5f45deb4af 100644 --- a/src/plugins/debugger/CMakeLists.txt +++ b/src/plugins/debugger/CMakeLists.txt @@ -29,7 +29,6 @@ add_qtc_plugin(Debugger console/consoleview.cpp console/consoleview.h debugger.qrc debugger_global.h - debuggertr.h debuggeractions.cpp debuggeractions.h debuggerconstants.h debuggercore.h @@ -47,6 +46,7 @@ add_qtc_plugin(Debugger debuggerruncontrol.cpp debuggerruncontrol.h debuggersourcepathmappingwidget.cpp debuggersourcepathmappingwidget.h debuggertooltipmanager.cpp debuggertooltipmanager.h + debuggertr.h disassembleragent.cpp disassembleragent.h disassemblerlines.cpp disassemblerlines.h gdb/gdbengine.cpp gdb/gdbengine.h diff --git a/src/plugins/debugger/debuggerprotocol.cpp b/src/plugins/debugger/debuggerprotocol.cpp index 9c671c14144..922a5c1e7f4 100644 --- a/src/plugins/debugger/debuggerprotocol.cpp +++ b/src/plugins/debugger/debuggerprotocol.cpp @@ -24,6 +24,7 @@ ****************************************************************************/ #include "debuggerprotocol.h" +#include "debuggertr.h" #include #include @@ -640,31 +641,31 @@ QString decodeData(const QString &ba, const QString &encoding) return quoteUnprintableLatin1(ba); // The common case. if (encoding == "empty") - return QCoreApplication::translate("Debugger::Internal::WatchHandler", ""); + return Tr::tr(""); if (encoding == "minimumitemcount") - return QCoreApplication::translate("Debugger::Internal::WatchHandler", "", nullptr, ba.toInt()); + return Tr::tr("", nullptr, ba.toInt()); if (encoding == "undefined") return QLatin1String("Undefined"); if (encoding == "null") return QLatin1String("Null"); if (encoding == "itemcount") - return QCoreApplication::translate("Debugger::Internal::WatchHandler", "<%n items>", nullptr, ba.toInt()); + return Tr::tr("<%n items>", nullptr, ba.toInt()); if (encoding == "notaccessible") - return QCoreApplication::translate("Debugger::Internal::WatchHandler", ""); + return Tr::tr(""); if (encoding == "optimizedout") - return QCoreApplication::translate("Debugger::Internal::WatchHandler", ""); + return Tr::tr(""); if (encoding == "nullreference") - return QCoreApplication::translate("Debugger::Internal::WatchHandler", ""); + return Tr::tr(""); if (encoding == "emptystructure") return QLatin1String("{...}"); if (encoding == "uninitialized") - return QCoreApplication::translate("Debugger::Internal::WatchHandler", ""); + return Tr::tr(""); if (encoding == "invalid") - return QCoreApplication::translate("Debugger::Internal::WatchHandler", ""); + return Tr::tr(""); if (encoding == "notcallable") - return QCoreApplication::translate("Debugger::Internal::WatchHandler", ""); + return Tr::tr(""); if (encoding == "outofscope") - return QCoreApplication::translate("Debugger::Internal::WatchHandler", ""); + return Tr::tr(""); DebuggerEncoding enc(encoding); QString result; @@ -781,7 +782,7 @@ QString decodeData(const QString &ba, const QString &encoding) return dateTime.toString(); } qDebug() << "ENCODING ERROR: " << enc.type; - return QCoreApplication::translate("Debugger", ""); + return Tr::tr(""); } if (enc.quotes) { diff --git a/src/plugins/debugger/watchdata.cpp b/src/plugins/debugger/watchdata.cpp index 7b72fbf6b2f..b10b47db8e8 100644 --- a/src/plugins/debugger/watchdata.cpp +++ b/src/plugins/debugger/watchdata.cpp @@ -27,8 +27,10 @@ // This is used in the debugger auto-tests. #include "watchdata.h" + #include "watchutils.h" #include "debuggerprotocol.h" +#include "debuggertr.h" #include @@ -201,30 +203,14 @@ QString WatchItem::toString() const return res + '}'; } -QString WatchItem::msgNotInScope() -{ - //: Value of variable in Debugger Locals display for variables out - //: of scope (stopped above initialization). - static const QString rc = - QCoreApplication::translate("Debugger::Internal::WatchItem", ""); - return rc; -} - -const QString &WatchItem::shadowedNameFormat() -{ - //: Display of variables shadowed by variables of the same name - //: in nested scopes: Variable %1 is the variable name, %2 is a - //: simple count. - static const QString format = - QCoreApplication::translate("Debugger::Internal::WatchItem", "%1 "); - return format; -} - QString WatchItem::shadowedName(const QString &name, int seen) { if (seen <= 0) return name; - return shadowedNameFormat().arg(name).arg(seen); + //: Display of variables shadowed by variables of the same name + //: in nested scopes: Variable %1 is the variable name, %2 is a + //: simple count. + return Tr::tr("%1 ").arg(name).arg(seen); } QString WatchItem::hexAddress() const @@ -515,13 +501,13 @@ QString WatchItem::toToolTip() const QString res; QTextStream str(&res); str << ""; - formatToolTipRow(str, tr("Name"), name); - formatToolTipRow(str, tr("Expression"), expression()); - formatToolTipRow(str, tr("Internal Type"), type); + formatToolTipRow(str, Tr::tr("Name"), name); + formatToolTipRow(str, Tr::tr("Expression"), expression()); + formatToolTipRow(str, Tr::tr("Internal Type"), type); bool ok; const quint64 intValue = value.toULongLong(&ok); if (ok && intValue) { - formatToolTipRow(str, tr("Value"), "(dec) " + value); + formatToolTipRow(str, Tr::tr("Value"), "(dec) " + value); formatToolTipRow(str, QString(), "(hex) " + QString::number(intValue, 16)); formatToolTipRow(str, QString(), "(oct) " + QString::number(intValue, 8)); formatToolTipRow(str, QString(), "(bin) " + QString::number(intValue, 2)); @@ -530,21 +516,21 @@ QString WatchItem::toToolTip() const if (val.size() > 1000) { val.truncate(1000); val += ' '; - val += tr("... "); + val += Tr::tr("... "); } - formatToolTipRow(str, tr("Value"), val); + formatToolTipRow(str, Tr::tr("Value"), val); } if (address) - formatToolTipRow(str, tr("Object Address"), formatToolTipAddress(address)); + formatToolTipRow(str, Tr::tr("Object Address"), formatToolTipAddress(address)); if (origaddr) - formatToolTipRow(str, tr("Pointer Address"), formatToolTipAddress(origaddr)); + formatToolTipRow(str, Tr::tr("Pointer Address"), formatToolTipAddress(origaddr)); if (arrayIndex >= 0) - formatToolTipRow(str, tr("Array Index"), QString::number(arrayIndex)); + formatToolTipRow(str, Tr::tr("Array Index"), QString::number(arrayIndex)); if (size) - formatToolTipRow(str, tr("Static Object Size"), tr("%n bytes", nullptr, size)); - formatToolTipRow(str, tr("Internal ID"), internalName()); - formatToolTipRow(str, tr("Creation Time in ms"), QString::number(int(time * 1000))); - formatToolTipRow(str, tr("Source"), sourceExpression()); + formatToolTipRow(str, Tr::tr("Static Object Size"), Tr::tr("%n bytes", nullptr, size)); + formatToolTipRow(str, Tr::tr("Internal ID"), internalName()); + formatToolTipRow(str, Tr::tr("Creation Time in ms"), QString::number(int(time * 1000))); + formatToolTipRow(str, Tr::tr("Source"), sourceExpression()); str << "
"; return res; } diff --git a/src/plugins/debugger/watchdata.h b/src/plugins/debugger/watchdata.h index aa668009303..4e3e3197756 100644 --- a/src/plugins/debugger/watchdata.h +++ b/src/plugins/debugger/watchdata.h @@ -29,7 +29,6 @@ #include -#include #include #include @@ -72,9 +71,7 @@ public: QString toString() const; - static QString msgNotInScope(); static QString shadowedName(const QString &name, int seen); - static const QString &shadowedNameFormat(); QString hexAddress() const; QString key() const { return address ? hexAddress() : iname; } @@ -106,7 +103,6 @@ public: private: void parseHelper(const GdbMi &input, bool maySort); - Q_DECLARE_TR_FUNCTIONS(Debugger::Internal::WatchHandler) }; } // namespace Internal diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index 3663daa5296..7a24390a4b5 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -34,6 +34,7 @@ #include "debuggermainwindow.h" #include "debuggerprotocol.h" #include "debuggertooltipmanager.h" +#include "debuggertr.h" #include "imageviewer.h" #include "memoryagent.h" #include "registerhandler.h" @@ -289,7 +290,7 @@ public: this, &SeparatedView::tabBarContextMenuRequested); tabBar()->setContextMenuPolicy(Qt::CustomContextMenu); setWindowFlags(windowFlags() | Qt::Window); - setWindowTitle(WatchHandler::tr("Debugger - %1").arg(Core::Constants::IDE_DISPLAY_NAME)); + setWindowTitle(Tr::tr("Debugger - %1").arg(Core::Constants::IDE_DISPLAY_NAME)); QVariant geometry = SessionManager::value("DebuggerSeparateWidgetGeometry"); if (geometry.isValid()) { @@ -416,8 +417,8 @@ public: class WatchModel : public WatchModelBase { - Q_DECLARE_TR_FUNCTIONS(Debugger::Internal::WatchModel) typedef QSet WatchItemSet; + public: WatchModel(WatchHandler *handler, DebuggerEngine *engine); @@ -507,22 +508,22 @@ WatchModel::WatchModel(WatchHandler *handler, DebuggerEngine *engine) m_contentsValid = true; - setHeader({tr("Name"), tr("Time"), tr("Value"), tr("Type")}); + setHeader({Tr::tr("Name"), Tr::tr("Time"), Tr::tr("Value"), Tr::tr("Type")}); m_localsRoot = new WatchItem; m_localsRoot->iname = "local"; - m_localsRoot->name = tr("Locals"); + m_localsRoot->name = Tr::tr("Locals"); m_inspectorRoot = new WatchItem; m_inspectorRoot->iname = "inspect"; - m_inspectorRoot->name = tr("Inspector"); + m_inspectorRoot->name = Tr::tr("Inspector"); m_watchRoot = new WatchItem; m_watchRoot->iname = "watch"; - m_watchRoot->name = tr("Expressions"); + m_watchRoot->name = Tr::tr("Expressions"); m_returnRoot = new WatchItem; m_returnRoot->iname = "return"; - m_returnRoot->name = tr("Return Value"); + m_returnRoot->name = Tr::tr("Return Value"); m_tooltipRoot = new WatchItem; m_tooltipRoot->iname = "tooltip"; - m_tooltipRoot->name = tr("Tooltip"); + m_tooltipRoot->name = Tr::tr("Tooltip"); auto root = new WatchItem; root->appendChild(m_localsRoot); root->appendChild(m_inspectorRoot); @@ -908,7 +909,7 @@ static QString displayName(const WatchItem *item) return result; } if (item->iname.startsWith("return") && item->name.startsWith('$')) - result = WatchModel::tr("returned value"); + result = Tr::tr("returned value"); else if (item->name == "*") result = '*' + p->name; else @@ -1359,9 +1360,9 @@ static QString variableToolTip(const QString &name, const QString &type, quint64 { return offset ? //: HTML tooltip of a variable in the memory editor - WatchModel::tr("%1 %2 at #%3").arg(type, name).arg(offset) + Tr::tr("%1 %2 at #%3").arg(type, name).arg(offset) : //: HTML tooltip of a variable in the memory editor - WatchModel::tr("%1 %2").arg(type, name); + Tr::tr("%1 %2").arg(type, name); } void WatchModel::grabWidget() @@ -1378,15 +1379,15 @@ void WatchModel::timerEvent(QTimerEvent *event) Qt::KeyboardModifiers mods = QApplication::queryKeyboardModifiers(); QString msg; if (mods == Qt::NoModifier) { - msg = tr("Press Ctrl to select widget at (%1, %2). " + msg = Tr::tr("Press Ctrl to select widget at (%1, %2). " "Press any other keyboard modifier to stop selection.") .arg(pnt.x()).arg(pnt.y()); } else { if (mods == Qt::CTRL) { - msg = tr("Selecting widget at (%1, %2).").arg(pnt.x()).arg(pnt.y()); + msg = Tr::tr("Selecting widget at (%1, %2).").arg(pnt.x()).arg(pnt.y()); m_engine->watchPoint(pnt); } else { - msg = tr("Selection aborted."); + msg = Tr::tr("Selection aborted."); } ungrabWidget(); } @@ -1501,7 +1502,7 @@ MemoryMarkupList WatchModel::variableMemoryMarkup(WatchItem *item, const quint64 offset = it.key() - address; if (offset < size) { ranges[offset] = ColorNumberToolTip(registerColorNumber, - WatchModel::tr("Register %1").arg(it.value())); + Tr::tr("Register %1").arg(it.value())); } else { break; // Sorted. } @@ -1577,8 +1578,8 @@ void WatchModel::addVariableMemoryView(bool separateView, data.separateView = separateView; data.readOnly = separateView; QString pat = atPointerAddress - ? tr("Memory at Pointer's Address \"%1\" (0x%2)") - : tr("Memory at Object's Address \"%1\" (0x%2)"); + ? Tr::tr("Memory at Pointer's Address \"%1\" (0x%2)") + : Tr::tr("Memory at Object's Address \"%1\" (0x%2)"); data.title = pat.arg(item->name).arg(data.startAddress, 0, 16); data.pos = pos; m_engine->openMemoryView(data); @@ -1611,8 +1612,8 @@ void WatchModel::addStackLayoutMemoryView(bool separateView, const QPoint &p) // Anything found and everything in a sensible range (static data in-between)? if (end <= start || end - start > 100 * 1024) { AsynchronousMessageBox::information( - tr("Cannot Display Stack Layout"), - tr("Could not determine a suitable address range.")); + Tr::tr("Cannot Display Stack Layout"), + Tr::tr("Could not determine a suitable address range.")); return; } // Take a look at the register values. Extend the range a bit if suitable @@ -1633,7 +1634,7 @@ void WatchModel::addStackLayoutMemoryView(bool separateView, const QPoint &p) regMap, true); data.separateView = separateView; data.readOnly = separateView; - data.title = tr("Memory Layout of Local Variables at 0x%1").arg(start, 0, 16); + data.title = Tr::tr("Memory Layout of Local Variables at 0x%1").arg(start, 0, 16); data.pos = p; m_engine->openMemoryView(data); } @@ -1642,34 +1643,34 @@ void WatchModel::addStackLayoutMemoryView(bool separateView, const QPoint &p) static QString addWatchActionText(QString exp) { if (exp.isEmpty()) - return WatchModel::tr("Add Expression Evaluator"); + return Tr::tr("Add Expression Evaluator"); if (exp.size() > 30) { exp.truncate(30); exp.append("..."); } - return WatchModel::tr("Add Expression Evaluator for \"%1\"").arg(exp); + return Tr::tr("Add Expression Evaluator for \"%1\"").arg(exp); } // Text for add watch action with truncated expression. static QString removeWatchActionText(QString exp) { if (exp.isEmpty()) - return WatchModel::tr("Remove Expression Evaluator"); + return Tr::tr("Remove Expression Evaluator"); if (exp.size() > 30) { exp.truncate(30); exp.append("..."); } - return WatchModel::tr("Remove Expression Evaluator for \"%1\"").arg(Utils::quoteAmpersands(exp)); + return Tr::tr("Remove Expression Evaluator for \"%1\"").arg(Utils::quoteAmpersands(exp)); } void WatchModel::inputNewExpression() { QDialog dlg; - auto label = new QLabel(tr("Enter an expression to evaluate."), &dlg); + auto label = new QLabel(Tr::tr("Enter an expression to evaluate."), &dlg); auto hint = new QLabel(QString("%1").arg( - tr("Note: Evaluators will be re-evaluated after each step. " + Tr::tr("Note: Evaluators will be re-evaluated after each step. " "For details, see the documentation.")), &dlg); @@ -1688,7 +1689,7 @@ void WatchModel::inputNewExpression() layout->addWidget(buttons); dlg.setLayout(layout); - dlg.setWindowTitle(tr("New Evaluated Expression")); + dlg.setWindowTitle(Tr::tr("New Evaluated Expression")); connect(buttons, &QDialogButtonBox::accepted, lineEdit, &FancyLineEdit::onEditingFinished); connect(buttons, &QDialogButtonBox::accepted, &dlg, &QDialog::accept); @@ -1719,7 +1720,7 @@ bool WatchModel::contextMenuEvent(const ItemViewEvent &ev) auto menu = new QMenu; - addAction(this, menu, tr("Add New Expression Evaluator..."), + addAction(this, menu, Tr::tr("Add New Expression Evaluator..."), canHandleWatches && canInsertWatches, [this] { inputNewExpression(); }); @@ -1732,11 +1733,11 @@ bool WatchModel::contextMenuEvent(const ItemViewEvent &ev) canRemoveWatches && !exp.isEmpty() && item && item->isWatcher(), [this, item] { removeWatchItem(item); }); - addAction(this, menu, tr("Remove All Expression Evaluators"), + addAction(this, menu, Tr::tr("Remove All Expression Evaluators"), canRemoveWatches && !WatchHandler::watchedExpressions().isEmpty(), [this] { clearWatches(); }); - addAction(this, menu, tr("Select Widget to Add into Expression Evaluator"), + addAction(this, menu, Tr::tr("Select Widget to Add into Expression Evaluator"), state == InferiorRunOk && m_engine->hasCapability(WatchWidgetsCapability), [this] { grabWidget(); }); @@ -1756,7 +1757,7 @@ bool WatchModel::contextMenuEvent(const ItemViewEvent &ev) menu->addMenu(createBreakpointMenu(item, menu)); menu->addSeparator(); - addAction(this, menu, tr("Expand All Children"), item, [this, name = item ? item->iname : QString()] { + addAction(this, menu, Tr::tr("Expand All Children"), item, [this, name = item ? item->iname : QString()] { m_expandedINames.insert(name); if (auto item = findItem(name)) { item->forFirstLevelChildren( @@ -1765,7 +1766,7 @@ bool WatchModel::contextMenuEvent(const ItemViewEvent &ev) } }); - addAction(this, menu, tr("Collapse All Children"), item, [this, name = item ? item->iname : QString()] { + addAction(this, menu, Tr::tr("Collapse All Children"), item, [this, name = item ? item->iname : QString()] { if (auto item = findItem(name)) { item->forFirstLevelChildren( [this](WatchItem *child) { m_expandedINames.remove(child->iname); }); @@ -1773,29 +1774,29 @@ bool WatchModel::contextMenuEvent(const ItemViewEvent &ev) } }); - addAction(this, menu, tr("Close Editor Tooltips"), + addAction(this, menu, Tr::tr("Close Editor Tooltips"), m_engine->toolTipManager()->hasToolTips(), [this] { m_engine->toolTipManager()->closeAllToolTips(); }); - addAction(this, menu, tr("Copy View Contents to Clipboard"), + addAction(this, menu, Tr::tr("Copy View Contents to Clipboard"), true, [this] { setClipboardAndSelection(editorContents()); }); addAction(this, menu, - tr("Copy Current Value to Clipboard"), + Tr::tr("Copy Current Value to Clipboard"), item, [this, name = item ? item->iname : QString()] { if (auto item = findItem(name)) setClipboardAndSelection(item->value); }); - // addAction(menu, tr("Copy Selected Rows to Clipboard"), + // addAction(menu, Tr::tr("Copy Selected Rows to Clipboard"), // selectionModel()->hasSelection(), // [this] { setClipboardAndSelection(editorContents(selectionModel()->selectedRows())); }); - addAction(this, menu, tr("Open View Contents in Editor"), + addAction(this, menu, Tr::tr("Open View Contents in Editor"), m_engine->debuggerActionsEnabled(), - [this] { Internal::openTextEditor(tr("Locals & Expressions"), editorContents()); }); + [this] { Internal::openTextEditor(Tr::tr("Locals & Expressions"), editorContents()); }); menu->addSeparator(); @@ -1814,7 +1815,7 @@ bool WatchModel::contextMenuEvent(const ItemViewEvent &ev) QMenu *WatchModel::createBreakpointMenu(WatchItem *item, QWidget *parent) { - auto menu = new QMenu(tr("Add Data Breakpoint"), parent); + auto menu = new QMenu(Tr::tr("Add Data Breakpoint"), parent); if (!item) { menu->setEnabled(false); return menu; @@ -1826,17 +1827,17 @@ QMenu *WatchModel::createBreakpointMenu(WatchItem *item, QWidget *parent) const bool canSetWatchpoint = m_engine->hasCapability(WatchpointByAddressCapability); const bool createPointerActions = item->origaddr && item->origaddr != item->address; - act = addAction(this, menu, tr("Add Data Breakpoint at Object's Address (0x%1)").arg(item->address, 0, 16), - tr("Add Data Breakpoint"), + act = addAction(this, menu, Tr::tr("Add Data Breakpoint at Object's Address (0x%1)").arg(item->address, 0, 16), + Tr::tr("Add Data Breakpoint"), canSetWatchpoint && item->address, [bh, item] { bh->setWatchpointAtAddress(item->address, item->size); }); BreakpointParameters bp(WatchpointAtAddress); bp.address = item->address; act->setChecked(bh->findWatchpoint(bp)); - act->setToolTip(tr("Stop the program when the data at the address is modified.")); + act->setToolTip(Tr::tr("Stop the program when the data at the address is modified.")); - act = addAction(this, menu, tr("Add Data Breakpoint at Pointer's Address (0x%1)").arg(item->origaddr, 0, 16), - tr("Add Data Breakpoint at Pointer's Address"), + act = addAction(this, menu, Tr::tr("Add Data Breakpoint at Pointer's Address (0x%1)").arg(item->origaddr, 0, 16), + Tr::tr("Add Data Breakpoint at Pointer's Address"), canSetWatchpoint && item->address && createPointerActions, // FIXME: an approximation. This should be target's sizeof(void) [bh, item] { bh->setWatchpointAtAddress(item->origaddr, sizeof(void *)); }); @@ -1846,11 +1847,11 @@ QMenu *WatchModel::createBreakpointMenu(WatchItem *item, QWidget *parent) act->setChecked(bh->findWatchpoint(bp)); } - act = addAction(this, menu, tr("Add Data Breakpoint at Expression \"%1\"").arg(item->name), - tr("Add Data Breakpoint at Expression"), + act = addAction(this, menu, Tr::tr("Add Data Breakpoint at Expression \"%1\"").arg(item->name), + Tr::tr("Add Data Breakpoint at Expression"), m_engine->hasCapability(WatchpointByExpressionCapability) && !item->name.isEmpty(), [bh, item] { bh->setWatchpointAtExpression(item->name); }); - act->setToolTip(tr("Stop the program when the data at the address given by the expression " + act->setToolTip(Tr::tr("Stop the program when the data at the address given by the expression " "is modified.")); return menu; @@ -1858,7 +1859,7 @@ QMenu *WatchModel::createBreakpointMenu(WatchItem *item, QWidget *parent) QMenu *WatchModel::createMemoryMenu(WatchItem *item, QWidget *parent) { - auto menu = new QMenu(tr("Open Memory Editor"), parent); + auto menu = new QMenu(Tr::tr("Open Memory Editor"), parent); if (!item || !m_engine->hasCapability(ShowMemoryCapability)) { menu->setEnabled(false); return menu; @@ -1868,37 +1869,37 @@ QMenu *WatchModel::createMemoryMenu(WatchItem *item, QWidget *parent) QPoint pos = QPoint(100, 100); // ev->globalPos - addAction(this, menu, tr("Open Memory View at Object's Address (0x%1)").arg(item->address, 0, 16), - tr("Open Memory View at Object's Address"), + addAction(this, menu, Tr::tr("Open Memory View at Object's Address (0x%1)").arg(item->address, 0, 16), + Tr::tr("Open Memory View at Object's Address"), item->address, [this, item, pos] { addVariableMemoryView(true, item, false, pos); }); - addAction(this, menu, tr("Open Memory View at Pointer's Address (0x%1)").arg(item->origaddr, 0, 16), - tr("Open Memory View at Pointer's Address"), + addAction(this, menu, Tr::tr("Open Memory View at Pointer's Address (0x%1)").arg(item->origaddr, 0, 16), + Tr::tr("Open Memory View at Pointer's Address"), createPointerActions, [this, item, pos] { addVariableMemoryView(true, item, true, pos); }); - addAction(this, menu, tr("Open Memory View Showing Stack Layout"), + addAction(this, menu, Tr::tr("Open Memory View Showing Stack Layout"), true, [this, pos] { addStackLayoutMemoryView(true, pos); }); menu->addSeparator(); - addAction(this, menu, tr("Open Memory Editor at Object's Address (0x%1)").arg(item->address, 0, 16), - tr("Open Memory Editor at Object's Address"), + addAction(this, menu, Tr::tr("Open Memory Editor at Object's Address (0x%1)").arg(item->address, 0, 16), + Tr::tr("Open Memory Editor at Object's Address"), item->address, [this, item, pos] { addVariableMemoryView(false, item, false, pos); }); - addAction(this, menu, tr("Open Memory Editor at Pointer's Address (0x%1)").arg(item->origaddr, 0, 16), - tr("Open Memory Editor at Pointer's Address"), + addAction(this, menu, Tr::tr("Open Memory Editor at Pointer's Address (0x%1)").arg(item->origaddr, 0, 16), + Tr::tr("Open Memory Editor at Pointer's Address"), createPointerActions, [this, item, pos] { addVariableMemoryView(false, item, true, pos); }); - addAction(this, menu, tr("Open Memory Editor Showing Stack Layout"), + addAction(this, menu, Tr::tr("Open Memory Editor Showing Stack Layout"), true, [this, pos] { addStackLayoutMemoryView(false, pos); }); - addAction(this, menu, tr("Open Memory Editor..."), + addAction(this, menu, Tr::tr("Open Memory Editor..."), true, [this, item] { AddressDialog dialog; @@ -1922,10 +1923,10 @@ void WatchModel::addCharsPrintableMenu(QMenu *menu) emit layoutChanged(); // FIXME }); }; - addBaseChangeAction(tr("Treat All Characters as Printable"), 0); - addBaseChangeAction(tr("Show Unprintable Characters as Escape Sequences"), -1); - addBaseChangeAction(tr("Show Unprintable Characters as Octal"), 8); - addBaseChangeAction(tr("Show Unprintable Characters as Hexadecimal"), 16); + addBaseChangeAction(Tr::tr("Treat All Characters as Printable"), 0); + addBaseChangeAction(Tr::tr("Show Unprintable Characters as Escape Sequences"), -1); + addBaseChangeAction(Tr::tr("Show Unprintable Characters as Octal"), 8); + addBaseChangeAction(Tr::tr("Show Unprintable Characters as Hexadecimal"), 16); } void WatchModel::separatedViewTabBarContextMenuRequested(const QPoint &point, const QString &iname) @@ -1936,7 +1937,7 @@ void WatchModel::separatedViewTabBarContextMenuRequested(const QPoint &point, co QMenu *WatchModel::createFormatMenu(WatchItem *item, QWidget *parent) { - auto menu = new QMenu(tr("Change Value Display Format"), parent); + auto menu = new QMenu(Tr::tr("Change Value Display Format"), parent); if (!item) { menu->setEnabled(false); return menu; @@ -1953,11 +1954,11 @@ QMenu *WatchModel::createFormatMenu(WatchItem *item, QWidget *parent) const QString spacer = " "; menu->addSeparator(); - addAction(this, menu, tr("Change Display for Object Named \"%1\":").arg(iname), false); + addAction(this, menu, Tr::tr("Change Display for Object Named \"%1\":").arg(iname), false); QString msg = (individualFormat == AutomaticFormat && typeFormat != AutomaticFormat) - ? tr("Use Format for Type (Currently %1)").arg(nameForFormat(typeFormat)) - : QString(tr("Use Display Format Based on Type") + ' '); + ? Tr::tr("Use Format for Type (Currently %1)").arg(nameForFormat(typeFormat)) + : QString(Tr::tr("Use Display Format Based on Type") + ' '); addCheckableAction(this, menu, spacer + msg, true, individualFormat == AutomaticFormat, [this, iname] { @@ -1977,16 +1978,16 @@ QMenu *WatchModel::createFormatMenu(WatchItem *item, QWidget *parent) }); } - addAction(this, menu, tr("Reset All Individual Formats"), true, [this]() { + addAction(this, menu, Tr::tr("Reset All Individual Formats"), true, [this]() { theIndividualFormats.clear(); saveFormats(); m_engine->updateLocals(); }); menu->addSeparator(); - addAction(this, menu, tr("Change Display for Type \"%1\":").arg(item->type), false); + addAction(this, menu, Tr::tr("Change Display for Type \"%1\":").arg(item->type), false); - addCheckableAction(this, menu, spacer + tr("Automatic"), true, typeFormat == AutomaticFormat, + addCheckableAction(this, menu, spacer + Tr::tr("Automatic"), true, typeFormat == AutomaticFormat, [this, item] { //const QModelIndexList active = activeRows(); //for (const QModelIndex &idx : active) @@ -2003,7 +2004,7 @@ QMenu *WatchModel::createFormatMenu(WatchItem *item, QWidget *parent) }); } - addAction(this, menu, tr("Reset All Formats for Types"), true, [this]() { + addAction(this, menu, Tr::tr("Reset All Formats for Types"), true, [this]() { theTypeFormats.clear(); saveFormats(); m_engine->updateLocals(); @@ -2026,7 +2027,7 @@ void WatchModel::setItemsFormat(const WatchItemSet &items, const DisplayFormat & QMenu *WatchModel::createFormatMenuForManySelected(const WatchItemSet &items, QWidget *parent) { - auto menu = new QMenu(tr("Change Display Format for Selected Values"), parent); + auto menu = new QMenu(Tr::tr("Change Display Format for Selected Values"), parent); addCharsPrintableMenu(menu); @@ -2045,8 +2046,8 @@ QMenu *WatchModel::createFormatMenuForManySelected(const WatchItemSet &items, QW const QString spacer = " "; menu->addSeparator(); - addAction(this, menu, tr("Change Display for Objects"), false); - QString msg = QString(tr("Use Display Format Based on Type")); + addAction(this, menu, Tr::tr("Change Display for Objects"), false); + QString msg = QString(Tr::tr("Use Display Format Based on Type")); addCheckableAction(this, menu, spacer + msg, true, false, [this, items] { setItemsFormat(items, AutomaticFormat); @@ -2073,50 +2074,50 @@ QMenu *WatchModel::createFormatMenuForManySelected(const WatchItemSet &items, QW static inline QString msgArrayFormat(int n) { - return WatchModel::tr("Array of %n items", nullptr, n); + return Tr::tr("Array of %n items", nullptr, n); } QString WatchModel::nameForFormat(int format) { switch (format) { - case AutomaticFormat: return tr("Automatic"); + case AutomaticFormat: return Tr::tr("Automatic"); - case RawFormat: return tr("Raw Data"); - case SimpleFormat: return tr("Normal"); - case EnhancedFormat: return tr("Enhanced"); - case SeparateFormat: return tr("Separate Window"); + case RawFormat: return Tr::tr("Raw Data"); + case SimpleFormat: return Tr::tr("Normal"); + case EnhancedFormat: return Tr::tr("Enhanced"); + case SeparateFormat: return Tr::tr("Separate Window"); - case Latin1StringFormat: return tr("Latin1 String"); - case SeparateLatin1StringFormat: return tr("Latin1 String in Separate Window"); - case Utf8StringFormat: return tr("UTF-8 String"); - case SeparateUtf8StringFormat: return tr("UTF-8 String in Separate Window"); - case Local8BitStringFormat: return tr("Local 8-Bit String"); - case Utf16StringFormat: return tr("UTF-16 String"); - case Ucs4StringFormat: return tr("UCS-4 String"); + case Latin1StringFormat: return Tr::tr("Latin1 String"); + case SeparateLatin1StringFormat: return Tr::tr("Latin1 String in Separate Window"); + case Utf8StringFormat: return Tr::tr("UTF-8 String"); + case SeparateUtf8StringFormat: return Tr::tr("UTF-8 String in Separate Window"); + case Local8BitStringFormat: return Tr::tr("Local 8-Bit String"); + case Utf16StringFormat: return Tr::tr("UTF-16 String"); + case Ucs4StringFormat: return Tr::tr("UCS-4 String"); case Array10Format: return msgArrayFormat(10); case Array100Format: return msgArrayFormat(100); case Array1000Format: return msgArrayFormat(1000); case Array10000Format: return msgArrayFormat(10000); - case ArrayPlotFormat: return tr("Plot in Separate Window"); + case ArrayPlotFormat: return Tr::tr("Plot in Separate Window"); - case CompactMapFormat: return tr("Display Keys and Values Side by Side"); - case DirectQListStorageFormat: return tr("Force Display as Direct Storage Form"); - case IndirectQListStorageFormat: return tr("Force Display as Indirect Storage Form"); + case CompactMapFormat: return Tr::tr("Display Keys and Values Side by Side"); + case DirectQListStorageFormat: return Tr::tr("Force Display as Direct Storage Form"); + case IndirectQListStorageFormat: return Tr::tr("Force Display as Indirect Storage Form"); - case BoolTextFormat: return tr("Display Boolean Values as True or False"); - case BoolIntegerFormat: return tr("Display Boolean Values as 1 or 0"); + case BoolTextFormat: return Tr::tr("Display Boolean Values as True or False"); + case BoolIntegerFormat: return Tr::tr("Display Boolean Values as 1 or 0"); - case DecimalIntegerFormat: return tr("Decimal Integer"); - case HexadecimalIntegerFormat: return tr("Hexadecimal Integer"); - case BinaryIntegerFormat: return tr("Binary Integer"); - case OctalIntegerFormat: return tr("Octal Integer"); - case CharCodeIntegerFormat: return tr("Char Code Integer"); + case DecimalIntegerFormat: return Tr::tr("Decimal Integer"); + case HexadecimalIntegerFormat: return Tr::tr("Hexadecimal Integer"); + case BinaryIntegerFormat: return Tr::tr("Binary Integer"); + case OctalIntegerFormat: return Tr::tr("Octal Integer"); + case CharCodeIntegerFormat: return Tr::tr("Char Code Integer"); - case CompactFloatFormat: return tr("Compact Float"); - case ScientificFloatFormat: return tr("Scientific Float"); - case HexFloatFormat: return tr("Hexadecimal Float"); - case NormalizedTwoFloatFormat: return tr("Normalized, with Power-of-Two Exponent"); + case CompactFloatFormat: return Tr::tr("Compact Float"); + case ScientificFloatFormat: return Tr::tr("Scientific Float"); + case HexFloatFormat: return Tr::tr("Hexadecimal Float"); + case NormalizedTwoFloatFormat: return Tr::tr("Normalized, with Power-of-Two Exponent"); } QTC_CHECK(false); @@ -2469,8 +2470,8 @@ void WatchModel::showEditValue(const WatchItem *item) std::memcpy(im.bits(), bits, nbytes); auto v = m_separatedView->prepareObject(item); v->setInfo(item->address ? - tr("%1 Object at %2").arg(item->type, item->hexAddress()) : - tr("%1 Object at Unknown Address").arg(item->type) + " " + + Tr::tr("%1 Object at %2").arg(item->type, item->hexAddress()) : + Tr::tr("%1 Object at Unknown Address").arg(item->type) + " " + ImageViewer::tr("Size: %1x%2, %3 byte, format: %4, depth: %5") .arg(width).arg(height).arg(nbytes).arg(im.format()).arg(im.depth()) ); @@ -2543,8 +2544,8 @@ void WatchModel::clearWatches() return; const QDialogButtonBox::StandardButton ret = CheckableMessageBox::doNotAskAgainQuestion( - ICore::dialogParent(), tr("Remove All Expression Evaluators"), - tr("Are you sure you want to remove all expression evaluators?"), + ICore::dialogParent(), Tr::tr("Remove All Expression Evaluators"), + Tr::tr("Are you sure you want to remove all expression evaluators?"), ICore::settings(), "RemoveAllWatchers"); if (ret != QDialogButtonBox::Yes) return; diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h index a0591bb5216..f02f3f15951 100644 --- a/src/plugins/debugger/watchhandler.h +++ b/src/plugins/debugger/watchhandler.h @@ -56,13 +56,13 @@ signals: void updateFinished(); }; -class WatchHandler : public QObject +class WatchHandler { - Q_OBJECT + Q_DISABLE_COPY_MOVE(WatchHandler) public: explicit WatchHandler(DebuggerEngine *engine); - ~WatchHandler() override; + ~WatchHandler(); WatchModelBase *model() const; diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp index 3f9971a1e75..b8c39580fcf 100644 --- a/src/plugins/debugger/watchwindow.cpp +++ b/src/plugins/debugger/watchwindow.cpp @@ -27,7 +27,7 @@ #include "debuggeractions.h" #include "debuggerinternalconstants.h" -#include "debuggercore.h" +#include "debuggertr.h" #include "watchhandler.h" #include @@ -44,7 +44,7 @@ WatchTreeView::WatchTreeView(WatchType type) : m_type(type) { setObjectName("WatchWindow"); - setWindowTitle(tr("Locals and Expressions")); + setWindowTitle(Tr::tr("Locals and Expressions")); setIndentation(indentation() * 9/10); setUniformRowHeights(true); setDragEnabled(true); diff --git a/tests/auto/debugger/CMakeLists.txt b/tests/auto/debugger/CMakeLists.txt index 5ab4c63f244..14fc5bf345f 100644 --- a/tests/auto/debugger/CMakeLists.txt +++ b/tests/auto/debugger/CMakeLists.txt @@ -59,6 +59,7 @@ if (WITH_DEBUGGER_DUMPERS) INCLUDES "${DEBUGGERDIR}" SOURCES + "${DEBUGGERDIR}/debuggertr.h" "${DEBUGGERDIR}/debuggerprotocol.cpp" "${DEBUGGERDIR}/debuggerprotocol.h" "${DEBUGGERDIR}/simplifytype.cpp" "${DEBUGGERDIR}/simplifytype.h" "${DEBUGGERDIR}/watchdata.cpp" "${DEBUGGERDIR}/watchdata.h" @@ -72,6 +73,7 @@ add_qtc_test(tst_debugger_gdb INCLUDES "${DEBUGGERDIR}" SOURCES tst_gdb.cpp + "${DEBUGGERDIR}/debuggertr.h" "${DEBUGGERDIR}/debuggerprotocol.cpp" "${DEBUGGERDIR}/debuggerprotocol.h" ) @@ -80,6 +82,7 @@ add_qtc_test(tst_debugger_protocol INCLUDES "${DEBUGGERDIR}" SOURCES + "${DEBUGGERDIR}/debuggertr.h" "${DEBUGGERDIR}/debuggerprotocol.cpp" "${DEBUGGERDIR}/debuggerprotocol.h" tst_protocol.cpp ) @@ -96,5 +99,6 @@ add_qtc_test(tst_debugger_simplifytypes DEFINES DUMPERDIR="${PROJECT_SOURCE_DIR}/share/qtcreator/debugger" SOURCES tst_simplifytypes.cpp + "${DEBUGGERDIR}/debuggertr.h" "${DEBUGGERDIR}/simplifytype.cpp" "${DEBUGGERDIR}/simplifytype.h" ) diff --git a/tests/auto/debugger/dumpers.qbs b/tests/auto/debugger/dumpers.qbs index f524debc2ab..3aaf12cd5d9 100644 --- a/tests/auto/debugger/dumpers.qbs +++ b/tests/auto/debugger/dumpers.qbs @@ -9,6 +9,7 @@ QtcAutotest { name: "Sources from Debugger plugin" prefix: project.debuggerDir files: [ + "debuggertr.h", "debuggerprotocol.h", "debuggerprotocol.cpp", "simplifytype.h", "simplifytype.cpp", "watchdata.h", "watchdata.cpp", diff --git a/tests/auto/debugger/gdb.qbs b/tests/auto/debugger/gdb.qbs index 6618bd59dd7..fa616fba6ef 100644 --- a/tests/auto/debugger/gdb.qbs +++ b/tests/auto/debugger/gdb.qbs @@ -7,7 +7,7 @@ QtcAutotest { Group { name: "Sources from Debugger plugin" prefix: project.debuggerDir - files: "debuggerprotocol.cpp" + files: [ "debuggerprotocol.cpp", "debuggertr.h" ] } Group { name: "Test sources" diff --git a/tests/auto/debugger/protocol.qbs b/tests/auto/debugger/protocol.qbs index ca1b0d8bece..17610139624 100644 --- a/tests/auto/debugger/protocol.qbs +++ b/tests/auto/debugger/protocol.qbs @@ -7,7 +7,7 @@ QtcAutotest { Group { name: "Sources from Debugger plugin" prefix: project.debuggerDir - files: "debuggerprotocol.cpp" + files: ["debuggerprotocol.cpp", "debuggertr.h"] } Group { name: "Test sources"