diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 752fb912069..ed21bb788e4 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -55609,7 +55609,7 @@ monitor reset - Ios::Internal::IosBuildStep + ::Ios Base arguments: Základní argumenty: @@ -55634,16 +55634,6 @@ monitor reset Configuration is faulty. Check the Issues output pane for details. Nastavení je chybové. Zkontrolujte tabulku s potížemi kvůli podrobnostem. - - - IosDeployStepWidget - - Form - Formulář - - - - IosRunConfiguration Form Formulář @@ -55656,9 +55646,6 @@ monitor reset Executable: Spustitelný soubor: - - - IosSettingsWidget iOS Configuration Nastavení iOS @@ -56680,29 +56667,16 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr - Ios::Internal::IosBuildStepConfigWidget + ::Ios iOS build iOS BuildStep display name. Sestavení iOS - - - Ios::Internal::IosConfigurations %1 %2 %1 %2 - - - ::Ios - - iOS - iOS - - - - Ios::Internal::IosDebugSupport Could not find device specific debug symbols at %1. Debugging initialization will be slow until you open the Organizer window of Xcode with the device connected to have the symbols generated. Symboly pro ladění zvláštní pro zařízení se nepodařilo najít v %1. Spuštění ladění bude pomalé, dokud neotevřete okno organizéru Xcode s připojeným zařízením, abyste měli symboly vytvořeny. @@ -56719,23 +56693,14 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr Run failed unexpectedly. Spuštění se neočekávaně nezdařilo. - - - Ios::Internal::IosDeployConfiguration Deploy to iOS Poslat na iOS - - - Ios::Internal::IosDeployConfigurationFactory Deploy on iOS Poslat na iOS - - - Ios::Internal::IosDeployStep Deploy to %1 Poslat na %1 @@ -56760,34 +56725,18 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr The Info.plist might be incorrect. Info.plist může být nesprávný. - - - Ios::Internal::IosDeployStepFactory Deploy to iOS device or emulator Nasadit na zařízení nebo emulátor iOS - - - Ios::Internal::IosDeployStepWidget <b>Deploy to %1</b> <b>Poslat na %1</b> - - - Ios::Internal::IosDevice - - iOS - iOS - iOS Device Zařízení iOS - - - Ios::Internal::IosDeviceManager Device name Název zařízení @@ -56825,9 +56774,6 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr Do you want to see how to set it up for development? Chcete vidět, jak je nastavit, aby se dalo použít pro vývoj? - - - Ios::Internal::IosQtVersion Failed to detect the ABIs used by the Qt version. ABI(s) verze Qt se nepodařilo určit. @@ -56837,9 +56783,6 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr Qt Version is meant for Ios iOS - - - Ios::Internal::IosRunConfiguration Run on %1 Spustit na %1 @@ -56880,16 +56823,10 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr %1 is not connected. %1 není připojeno. - - - Ios::Internal::IosRunConfigurationWidget iOS run settings Nastavení spuštění na iOS - - - Ios::Internal::IosRunControl Starting remote process. Spouští se vzdálený proces. @@ -56898,9 +56835,6 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr Run ended unexpectedly. Spuštění skončilo neočekávaně. - - - Ios::Internal::IosRunner Run failed. The settings in the Organizer window of Xcode might be incorrect. Spuštění se nezdařilo. Nastavení v okně organizéru Xcode může být nesprávné. @@ -56909,30 +56843,14 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr The device is locked, please unlock. Zařízení je zamknuto. Odemkněte je, prosím. - - - Ios::Internal::IosSettingsPage iOS Configurations Nastavení iOS - - - Ios::Internal::IosSimulator iOS Simulator Simulátor iOS - - - Ios::Internal::IosSimulatorFactory - - iOS Simulator - Simulátor iOS - - - - Ios::IosToolHandler Subprocess Error %1 Chyba podprocesu %1 diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 5b884bfd450..a835baa711c 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -18904,7 +18904,7 @@ Id'er skal begynde med et lille bogstav. - Ios::Internal::CreateSimulatorDialog + ::Ios Create Simulator Opret simulator @@ -18925,9 +18925,6 @@ Id'er skal begynde med et lille bogstav. None Ingen - - - Ios::Internal::IosBuildSettingsWidget Reset Nulstil @@ -18952,10 +18949,6 @@ Id'er skal begynde med et lille bogstav. Default Standard - - None - Ingen - Development team is not selected. Udviklerteam er ikke valgt. @@ -18996,9 +18989,6 @@ Id'er skal begynde med et lille bogstav. Provisioning profile expired. Expiration date: %1 Provisioneringsprofil udløbet. Udløbsdato: %1 - - - Ios::Internal::IosBuildStep Base arguments: Basisargumenter: @@ -19015,24 +19005,15 @@ Id'er skal begynde med et lille bogstav. xcodebuild xcodebuild - - - Ios::Internal::IosBuildStepConfigWidget iOS build iOS BuildStep display name. iOS-byg - - - Ios::Internal::IosConfigurations %1 Simulator %1-simulator - - - Ios::Internal::IosDebugSupport Application not running. Program kører ikke. @@ -19045,16 +19026,10 @@ Id'er skal begynde med et lille bogstav. The dSYM %1 seems to be outdated, it might confuse the debugger. dSYM'en %1 ser ud til at være gammel, det vil måske forvirre fejlretteren. - - - Ios::Internal::IosDeployConfiguration Deploy on iOS Udsend på iOS - - - Ios::Internal::IosDeployStep Deploy to %1 Udsend til %1 @@ -19083,27 +19058,14 @@ Id'er skal begynde med et lille bogstav. The provisioning profile "%1" (%2) used to sign the application does not cover the device %3 (%4). Deployment to it will fail. Provisioneringsprofilen "%1" (%2) brugt til at signere programmet dækker ikke enheden %3 (%4). Udsendelse til den vil mislykkes. - - - Ios::Internal::IosDeployStepFactory Deploy to iOS device or emulator Udsend til iOS-enhed eller emulator - - - Ios::Internal::IosDevice - - iOS - iOS - iOS Device iOS-enhed - - - Ios::Internal::IosDeviceManager Device name Enhedsnavn @@ -19141,9 +19103,6 @@ Id'er skal begynde med et lille bogstav. Do you want to see how to set it up for development? Vil du se hvordan den sættes op til udvikling? - - - Ios::Internal::IosPresetBuildStep Reset to Default Nulstil til standard @@ -19156,16 +19115,10 @@ Id'er skal begynde med et lille bogstav. Arguments: Argumenter: - - - Ios::Internal::IosQmlProfilerSupport Could not get necessary ports for the profiler connection. Kunne ikke få nødvendige porte for profilering-forbindelsen. - - - Ios::Internal::IosQtVersion Failed to detect the ABIs used by the Qt version. Kunne ikke detektere ABI'erne brugt af Qt versionen. @@ -19175,9 +19128,6 @@ Id'er skal begynde med et lille bogstav. Qt Version is meant for Ios iOS - - - Ios::Internal::IosRunConfiguration Run on %1 Kør på %1 @@ -19218,24 +19168,14 @@ Id'er skal begynde med et lille bogstav. %1 is not connected. %1 er ikke forbundet. - - Device type: - Enhedstype: - Executable: Eksekverbar: - - - Ios::Internal::IosRunSupport Starting remote process. Starter fjern-process. - - - Ios::Internal::IosRunner Could not find %1. Kunne ikke finde %1. @@ -19264,16 +19204,6 @@ Id'er skal begynde med et lille bogstav. Run ended with error. Kørsel sluttede med fejl. - - - Ios::Internal::IosSettingsPage - - iOS - iOS - - - - Ios::Internal::IosSettingsWidget iOS Configuration iOS-konfiguration @@ -19310,10 +19240,6 @@ Id'er skal begynde med et lille bogstav. Reset contents and settings of simulator devices. Nulstil indhold og indstillinger af simulatorenheder. - - Reset - Nulstil - Screenshot directory: Skærmbilledmappe: @@ -19444,23 +19370,10 @@ Fejl: %2 simulator screenshot simulator skærmbillede - - - Ios::Internal::IosSimulator iOS Simulator iOS-simulator - - - Ios::Internal::IosSimulatorFactory - - iOS Simulator - iOS-simulator - - - - Ios::Internal::SimulatorInfoModel UDID: %1 UDID: %1 @@ -19477,9 +19390,6 @@ Fejl: %2 Current State Aktuelle tilstand - - - Ios::Internal::SimulatorOperationDialog Simulator Operation Status Simulatorhandlingsstatus @@ -19508,9 +19418,6 @@ Fejl: %5 Done. Færdig. - - - Ios::IosToolHandler iOS tool error %1 iOS-værktøjsfejl %1 diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index eee595ca626..b8e5b12b684 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -29393,7 +29393,7 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen. - Ios::Internal::IosBuildStep + ::Ios Base arguments: Basisargumente: @@ -29631,14 +29631,11 @@ benötigt wird, was meist die Geschwindigkeit erhöht. - Ios::Internal::IosConfigurations + ::Ios %1 Simulator %1 Simulator - - - Ios::Internal::IosDebugSupport Application not running. Anwendung läuft nicht. @@ -29651,9 +29648,6 @@ benötigt wird, was meist die Geschwindigkeit erhöht. The dSYM %1 seems to be outdated, it might confuse the debugger. Der dSYM %1 scheint veraltet zu sein, dies kann den Debugger stören. - - - Ios::Internal::IosDeployStep Deploy to %1 Deployment auf %1 @@ -29690,9 +29684,6 @@ benötigt wird, was meist die Geschwindigkeit erhöht. Deploy to iOS device Deployment auf iOS-Gerät - - - Ios::Internal::IosDevice iOS Device iOS-Gerät @@ -29713,13 +29704,6 @@ benötigt wird, was meist die Geschwindigkeit erhöht. CPU Architecture: CPU-Architektur: - - iOS - iOS - - - - Ios::Internal::IosDeviceManager Device name Gerätename @@ -29757,9 +29741,6 @@ benötigt wird, was meist die Geschwindigkeit erhöht. Do you want to see how to set it up for development? Möchten Sie sehen, wie man es für die Entwicklung einrichtet? - - - Ios::Internal::IosQtVersion Failed to detect the ABIs used by the Qt version. Die von der Qt-Version verwendeten ABIs konnten nicht bestimmt werden. @@ -29769,9 +29750,6 @@ benötigt wird, was meist die Geschwindigkeit erhöht. Qt Version is meant for Ios iOS - - - Ios::Internal::IosRunConfiguration Run on %1 Auf %1 ausführen @@ -29816,16 +29794,10 @@ benötigt wird, was meist die Geschwindigkeit erhöht. Device type: Gerätetyp: - - - Ios::Internal::IosSimulator iOS Simulator iOS-Simulator - - - Ios::IosToolHandler iOS tool error %1 Fehler vom iOS-Tool %1 @@ -30214,7 +30186,7 @@ das beim Drücken unter dem Zeiger oder Berührungspunkt war, unter diesem Punkt - Ios::Internal::IosRunner + ::Ios Could not find %1. %1 konnte nicht gefunden werden. @@ -38966,7 +38938,7 @@ Um eine Variable zu deaktivieren, stellen Sie der Zeile "#" voran. - Ios::Internal::CreateSimulatorDialog + ::Ios Create Simulator Simulator erstellen @@ -38975,21 +38947,10 @@ Um eine Variable zu deaktivieren, stellen Sie der Zeile "#" voran.Simulator name: Name des Simulators: - - Device type: - Gerätetyp: - OS version: Betriebssystemversion: - - None - Keiner - - - - Ios::Internal::IosSettingsWidget iOS Configuration iOS-Konfiguration @@ -39026,10 +38987,6 @@ Um eine Variable zu deaktivieren, stellen Sie der Zeile "#" voran.Reset contents and settings of simulator devices. Inhalte und Einstellungen von Simulator-Geräten zurücksetzen. - - Reset - Zurücksetzen - Screenshot directory: Screenshot-Verzeichnis: @@ -39160,13 +39117,6 @@ Fehler: %2 simulator screenshot Simulator Screenshot - - iOS - iOS - - - - Ios::Internal::SimulatorOperationDialog Simulator Operation Status Simulator-Betriebszustand @@ -40281,21 +40231,15 @@ Ablaufdatum: %3 - Ios::Internal::IosRunSupport + ::Ios Starting remote process. Starte entfernten Prozess. - - - Ios::Internal::IosQmlProfilerSupport Could not get necessary ports for the profiler connection. Auf die für die Profiler-Verbindung notwendigen Ports konnte nicht zugegriffen werden. - - - Ios::Internal::SimulatorInfoModel UDID: %1 UDID: %1 @@ -43723,7 +43667,7 @@ You might find further explanations in the Application Output view. - Ios::Internal + ::Ios Deploy on iOS Deployment auf iOS @@ -53792,7 +53736,7 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe. - Ios::Internal::IosQmakeBuildConfiguration + ::Ios iOS Settings iOS-Einstellungen @@ -53861,9 +53805,6 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe. Provisioning profile expired. Expiration date: %1 Das Provisioning-Profil ist abgelaufen. Ablaufdatum: %1 - - - Ios::Internal::IosDsymBuildStep Command: diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 2199fe91a48..dcb024c67ce 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -53068,7 +53068,7 @@ réinitialisation du moniteur - Ios::Internal::IosBuildStep + ::Ios Base arguments: Arguments de base : @@ -53093,16 +53093,6 @@ réinitialisation du moniteur Configuration is faulty. Check the Issues output pane for details. La configuration est défectueuse. Veuillez vérifier la vue des problèmes pour les détails. - - - IosDeployStepWidget - - Form - Formulaire - - - - IosRunConfiguration Form Formulaire @@ -53115,9 +53105,6 @@ réinitialisation du moniteur Executable: Exécutable : - - - IosSettingsWidget iOS Configuration Configuration iOS @@ -54113,29 +54100,16 @@ réinitialisation du moniteur - Ios::Internal::IosBuildStepConfigWidget + ::Ios iOS build iOS BuildStep display name. Compilation iOS - - - Ios::Internal::IosConfigurations %1 %2 %1 %2 - - - ::Ios - - iOS - iOS - - - - Ios::Internal::IosDebugSupport Could not get debug server file descriptor. Impossible de récupérer le fichier de description du serveur de débogage. @@ -54148,23 +54122,14 @@ réinitialisation du moniteur Run failed unexpectedly. L'exécution a échoué de façon inattendu. - - - Ios::Internal::IosDeployConfiguration Deploy to iOS Déploiement sur iOS - - - Ios::Internal::IosDeployConfigurationFactory Deploy on iOS Déploiement sur iOS - - - Ios::Internal::IosDeployStep Deploy to %1 Déploiement sur %1 @@ -54189,34 +54154,18 @@ réinitialisation du moniteur The Info.plist might be incorrect. Le fichier Info.plist est peut-être incorrecte. - - - Ios::Internal::IosDeployStepFactory Deploy to iOS device or emulator Déploiement sur un périphérique iOS ou un émulateur - - - Ios::Internal::IosDeployStepWidget <b>Deploy to %1</b> <b>Déploiement sur %1</b> - - - Ios::Internal::IosDevice - - iOS - iOS - iOS Device Périphérique iOS - - - Ios::Internal::IosDeviceManager Device name Nom du périphérique @@ -54250,9 +54199,6 @@ réinitialisation du moniteur Do you want to see how to set it up for development? Voulez-vous voir comment l'activer pour le développement ? - - - Ios::Internal::IosQtVersion Failed to detect the ABIs used by the Qt version. Échec de la détection des ABI utilisées par la version de Qt. @@ -54262,23 +54208,14 @@ réinitialisation du moniteur Qt Version is meant for Ios iOS - - - Ios::Internal::IosRunConfiguration Run on %1 Exécuter sur %1 - - - Ios::Internal::IosRunConfigurationWidget iOS run settings Paramètres d'exécution iOS - - - Ios::Internal::IosRunControl Starting remote process. Démarrage des processus distants. @@ -54287,9 +54224,6 @@ réinitialisation du moniteur Run ended unexpectedly. L'exécution s'est terminée de façon inattendu. - - - Ios::Internal::IosRunner Run failed. The settings in the Organizer window of Xcode might be incorrect. Échec lors de l'exécution. Les paramètres dans le fenêtre Organizer de Xcode sont peut-être incorrecte. @@ -54298,30 +54232,14 @@ réinitialisation du moniteur The device is locked, please unlock. Le périphérique est verouillé, veuillez le dévérouiller. - - - Ios::Internal::IosSettingsPage iOS Configurations Configurations iOS - - - Ios::Internal::IosSimulator iOS Simulator Simulateur iOS - - - Ios::Internal::IosSimulatorFactory - - iOS Simulator - Simulateur iOS - - - - Ios::IosToolHandler Subprocess Error %1 Erreur du sous-processus %1 diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index e80f7a0e412..290802b24ad 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -4562,7 +4562,7 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri - Ios::Internal::CreateSimulatorDialog + ::Ios Create Simulator Stvori simulatora @@ -4583,9 +4583,6 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri None Bez - - - Ios::Internal::IosBuildSettingsWidget Reset Resetiraj @@ -4610,10 +4607,6 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri Default Standardno - - None - Bez - Development team is not selected. Ekipa razvijatelja nije odabrana. @@ -4654,9 +4647,6 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri Provisioning profile expired. Expiration date: %1 - - - Ios::Internal::IosBuildStep Base arguments: Osnovni argumenti: @@ -4673,9 +4663,6 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri xcodebuild xcodebuild - - - Ios::Internal::IosPresetBuildStep Reset to Default Vrati na zadane vrijednosti @@ -4688,9 +4675,6 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri Arguments: Argumenti: - - - Ios::Internal::IosSettingsWidget iOS Configuration Konfiguracija za iOS @@ -4727,10 +4711,6 @@ Dodaj, izmijeni i ukloni filtre dokumenata koji određuju skup dokumentacije pri Reset contents and settings of simulator devices. Resetiraj sadržaj i postavke simulatora uređaja. - - Reset - Resetiraj - Screenshot directory: Direktorij za snimke ekrana: @@ -4867,9 +4847,6 @@ UDID: %2 simulator screenshot snimka ekrana simulatora - - - Ios::Internal::SimulatorOperationDialog Simulator Operation Status Stanje operacije simulatora @@ -25628,15 +25605,12 @@ Would you like to overwrite them? - Ios::Internal::IosBuildStepConfigWidget + ::Ios iOS build iOS BuildStep display name. iOS gradnja - - - Ios::Internal::IosConfigurations %1 Simulator %1 simulator @@ -25669,7 +25643,7 @@ Rok upotrebe: %3 - Ios::Internal::IosDeployStep + ::Ios Deploy to %1 Primijeni na %1 @@ -25706,20 +25680,10 @@ Rok upotrebe: %3 Deploy to iOS device or emulator Primijeni na iOS ili emulator - - - Ios::Internal::IosDevice - - iOS - iOS - iOS Device iOS uređaj - - - Ios::Internal::IosDeviceManager Device name Naziv uređaja @@ -25757,16 +25721,10 @@ Rok upotrebe: %3 Do you want to see how to set it up for development? Želiš li vidjeti kako se postavlja za razvoj? - - - Ios::Internal Deploy on iOS Primijeni na iOS - - - Ios::Internal::IosQtVersion Failed to detect the ABIs used by the Qt version. Neuspjelo prepoznavanje ABI-a, korištenog od Qt verzije. @@ -25776,9 +25734,6 @@ Rok upotrebe: %3 Qt Version is meant for Ios iOS - - - Ios::Internal::IosRunConfiguration Run on %1 Pokreni na %1 @@ -25819,13 +25774,6 @@ Rok upotrebe: %3 %1 is not connected. %1 nije povezan. - - Device type: - Vrsta uređaja: - - - - Ios::Internal::IosRunner Could not find %1. Nije bilo moguće naći %1. @@ -25854,23 +25802,14 @@ Rok upotrebe: %3 Run ended with error. Pokretanje prekinuto s greškom. - - - Ios::Internal::IosRunSupport Starting remote process. Započinjanje daljinskog procesa. - - - Ios::Internal::IosQmlProfilerSupport Could not get necessary ports for the profiler connection. Nije bilo moguće dobiti potrebne priključke za vezu s programom za profiliranje. - - - Ios::Internal::IosDebugSupport Application not running. Program nije pokrenut. @@ -25883,30 +25822,10 @@ Rok upotrebe: %3 The dSYM %1 seems to be outdated, it might confuse the debugger. - - - Ios::Internal::IosSettingsPage - - iOS - iOS - - - - Ios::Internal::IosSimulator iOS Simulator iOS simulator - - - Ios::Internal::IosSimulatorFactory - - iOS Simulator - iOS simulator - - - - Ios::IosToolHandler iOS tool error %1 Greška iOS alata %1 @@ -25943,9 +25862,6 @@ Rok upotrebe: %3 Invalid simulator response. Device Id mismatch. Device Id = %1 Response Id = %2 - - - Ios::Internal::SimulatorInfoModel UDID: %1 UDID: %1 diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 7199bdcb9a3..93920e5a735 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -3720,7 +3720,7 @@ Add, modify, and remove document filters, which determine the documentation set - Ios::Internal::IosBuildStep + ::Ios Base arguments: 基本引数: @@ -3742,16 +3742,10 @@ Add, modify, and remove document filters, which determine the documentation set xcodebuild xcodebuild - - - IosDeployStepWidget Form フォーム - - - IosSettingsWidget iOS Configuration iOS 設定 @@ -21608,15 +21602,7 @@ instead of its installation directory when run outside git bash. - Ios::Internal::IosBuildStepConfigWidget - - iOS build - iOS BuildStep display name. - iOS ビルド - - - - Ios::Internal::IosConfigurations + ::Ios %1 %2 %1 %2 @@ -21625,16 +21611,6 @@ instead of its installation directory when run outside git bash. %1 Simulator %1 シミュレータ - - - ::Ios - - iOS - iOS - - - - Ios::Internal::IosDebugSupport Application not running. アプリケーションが実行されていません。 @@ -21667,23 +21643,14 @@ instead of its installation directory when run outside git bash. Run ended. 実行が終了しました。 - - - Ios::Internal::IosDeployConfiguration Deploy to iOS iOS にデプロイ - - - Ios::Internal::IosDeployConfigurationFactory Deploy on iOS iOS にデプロイ - - - Ios::Internal::IosDeployStep Deploy to %1 %1 にデプロイ @@ -21720,20 +21687,10 @@ instead of its installation directory when run outside git bash. Deploy to iOS device iOS デバイスにデプロイ - - - Ios::Internal::IosDeployStepFactory Deploy to iOS device or emulator iOS デバイス、またはエミュレータにデプロイ - - - Ios::Internal::IosDevice - - iOS - iOS - iOS Device iOS デバイス @@ -21754,9 +21711,6 @@ instead of its installation directory when run outside git bash. CPU Architecture: CPU アーキテクチャ: - - - Ios::Internal::IosDeviceManager Device name デバイス名 @@ -21794,9 +21748,6 @@ instead of its installation directory when run outside git bash. Do you want to see how to set it up for development? 開発用にデバイスを設定する方法を確認しますか？ - - - Ios::Internal::IosQtVersion Failed to detect the ABIs used by the Qt version. Qt で使用されている ABI の検出に失敗しました。 @@ -21806,9 +21757,6 @@ instead of its installation directory when run outside git bash. Qt Version is meant for Ios iOS - - - Ios::Internal::IosRunConfiguration Run on %1 %1 で実行 @@ -21861,31 +21809,14 @@ instead of its installation directory when run outside git bash. Executable: 実行ファイル: - - - Ios::Internal::IosRunConfigurationWidget iOS run settings iOS 実行設定 - - - Ios::Internal::IosRunControl Starting remote process. リモートプロセスを起動します。 - - Run ended with error. - エラーが発生しました。 - - - Run ended. - 実行が終了しました。 - - - - Ios::Internal::IosRunner Could not find %1. %1 が見つかりませんでした。 @@ -21906,31 +21837,10 @@ instead of its installation directory when run outside git bash. The device is locked, please unlock. デバイスがロックされています。ロックを解除してください。 - - Run ended. - 実行が終了しました。 - - - Run ended with error. - エラーが発生しました。 - - - - Ios::Internal::IosSettingsPage iOS Configurations iOS 設定 - - - Ios::Internal::IosSimulator - - iOS Simulator - iOS シミュレータ - - - - Ios::Internal::IosSimulatorFactory iOS Simulator iOS シミュレータ @@ -32297,7 +32207,7 @@ When a problem is detected, the application is interrupted and can be debugged.< - Ios::IosToolHandler + ::Ios iOS tool Error %1 iOS ツールエラー %1 @@ -33649,7 +33559,7 @@ kill しますか？ - Ios::Internal::IosPresetBuildStep + ::Ios Reset to Default 既定に戻す @@ -33663,17 +33573,6 @@ kill しますか？ 引数: - - Ios::Internal::IosAnalyzeSupport - - Run ended with error. - エラーが発生しました。 - - - Run ended. - 実行が終了しました。 - - Utils::ProxyCredentialsDialog @@ -44271,26 +44170,11 @@ Output: - Ios::Internal::CreateSimulatorDialog - - Device type: - デバイス種類: - - - - Ios::Internal::IosSettingsWidget - - iOS Configuration - iOS 設定 - + ::Ios Devices デバイス - - Ask about devices not in developer mode - デバイスがデベロッパーモードかどうか確認する - Rename 名前を変更 @@ -44307,13 +44191,6 @@ Output: Start 開始 - - iOS - iOS - - - - Ios::Internal::SimulatorOperationDialog Unknown 不明 @@ -47527,15 +47404,11 @@ Stepping into the module or setting breakpoints by file and line is expected to - Ios::Internal::IosQmakeBuildConfiguration + ::Ios iOS Settings iOS の設定 - - Reset - リセット - Automatically manage signing 署名を自動的に管理する @@ -47605,33 +47478,7 @@ Stepping into the module or setting breakpoints by file and line is expected to - Ios::Internal::IosDsymBuildStep - - Command: - コマンド: - - - Arguments: - 引数: - - - Reset to Default - 既定に戻す - - - - Ios::Internal - - Deploy on iOS - iOS にデプロイ - - - - Ios::Internal::IosRunSupport - - Starting remote process. - リモートプロセスを起動します。 - + ::Ios LanguageClient::DiagnosticManager diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index d3e389cb4a5..6f6252a2109 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -25844,7 +25844,7 @@ Zdalny: %4 - Ios::Internal::IosBuildStep + ::Ios Base arguments: Podstawowe argumenty: @@ -26631,22 +26631,16 @@ Czy odinstalować istniejący pakiet? - Ios::Internal::IosBuildStepConfigWidget + ::Ios iOS build iOS BuildStep display name. Wersja iOS - - - Ios::Internal::IosConfigurations %1 Simulator Symulator %1 - - - Ios::Internal::IosDebugSupport Application not running. Aplikacja nie jest uruchomiona. @@ -26663,23 +26657,14 @@ Czy odinstalować istniejący pakiet? The dSYM %1 seems to be outdated, it might confuse the debugger. dSYM %1 może być nieaktualny i może spowodować nieprawidłową pracę debuggera. - - - Ios::Internal::IosDeployConfiguration Deploy to iOS Zainstaluj na iOS - - - Ios::Internal::IosDeployConfigurationFactory Deploy on iOS Zainstaluj na iOS - - - Ios::Internal::IosDeployStep Deploy to %1 Zainstaluj na %1 @@ -26708,27 +26693,14 @@ Czy odinstalować istniejący pakiet? The provisioning profile "%1" (%2) used to sign the application does not cover the device %3 (%4). Deployment to it will fail. - - - Ios::Internal::IosDeployStepFactory Deploy to iOS device or emulator Zainstaluj na urządzeniu iOS lub emulatorze - - - Ios::Internal::IosDevice - - iOS - iOS - iOS Device Urządzenie iOS - - - Ios::Internal::IosDeviceManager Device name Nazwa urządzenia @@ -26766,9 +26738,6 @@ Czy odinstalować istniejący pakiet? Do you want to see how to set it up for development? Czy chcesz zobaczyć jak przełączyć je do trybu deweloperskiego? - - - Ios::Internal::IosQtVersion Failed to detect the ABIs used by the Qt version. Nie można wykryć ABI użytych przez wersję Qt. @@ -26778,9 +26747,6 @@ Czy odinstalować istniejący pakiet? Qt Version is meant for Ios iOS - - - Ios::Internal::IosRunConfiguration Run on %1 Uruchom na %1 @@ -26837,9 +26803,6 @@ Czy odinstalować istniejący pakiet? iOS run settings Ustawienia uruchamiania iOS - - - Ios::Internal::IosRunner Could not find %1. Nie można odnaleźć %1. @@ -26872,30 +26835,10 @@ Czy odinstalować istniejący pakiet? Run ended with error. Praca zakończona błędem. - - - Ios::Internal::IosSettingsPage - - iOS - iOS - - - - Ios::Internal::IosSimulator iOS Simulator Symulator iOS - - - Ios::Internal::IosSimulatorFactory - - iOS Simulator - iOS Simulator - - - - Ios::IosToolHandler iOS tool error %1 Błąd narzędzia iOS %1 @@ -28626,7 +28569,7 @@ Instalowanie lokalnych bibliotek Qt nie jest kompatybilne z Androidem 5. - Ios::Internal::IosPresetBuildStep + ::Ios Reset to Default Przywróć domyślny @@ -39549,7 +39492,7 @@ Wiersz: %4, kolumna: %5 - Ios::Internal::IosBuildSettingsWidget + ::Ios Form Formularz @@ -39622,16 +39565,6 @@ Wiersz: %4, kolumna: %5 Provisioning profile expired. Expiration date: %1 - - - Ios::Internal::IosDeployStepWidget - - Form - Formularz - - - - Ios::Internal::IosSettingsWidget iOS Configuration Konfiguracja iOS @@ -39668,10 +39601,6 @@ Wiersz: %4, kolumna: %5 Reset contents and settings of simulator devices. Resetuje zawartości i ustawienia symulatorów. - - Reset - Reset - Screenshot directory: Katalog ze zrzutami ekranu: @@ -40869,7 +40798,7 @@ Termin wygaśnięcia: %3 - Ios::Internal::CreateSimulatorDialog + ::Ios Create Simulator Utwórz symulator @@ -40878,21 +40807,10 @@ Termin wygaśnięcia: %3 Simulator name: Nazwa symulatora: - - Device type: - Typ urządzenia: - OS version: Wersja OS: - - None - Brak - - - - Ios::Internal::SimulatorOperationDialog Simulator Operation Status Stan operacji symulatora @@ -41108,21 +41026,15 @@ Błąd: %5 - Ios::Internal::IosRunSupport + ::Ios Starting remote process. Uruchamianie zdalnego procesu. - - - Ios::Internal::IosQmlProfilerSupport Could not get necessary ports for the profiler connection. - - - Ios::Internal::SimulatorInfoModel UDID: %1 UDID: %1 diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index b08252651ed..8c06f11da13 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -23846,14 +23846,11 @@ Ids must begin with a lowercase letter. - Ios::Internal + ::Ios Deploy on iOS Развернуть на iOS - - - Ios::Internal::CreateSimulatorDialog Create Simulator Создание эмулятора @@ -23874,9 +23871,6 @@ Ids must begin with a lowercase letter. None Нет - - - Ios::Internal::IosBuildConfiguration Reset Сбросить @@ -23901,10 +23895,6 @@ Ids must begin with a lowercase letter. Default По умолчанию - - None - Нет - Development team is not selected. Команда разработчиков не выбрана. @@ -23945,9 +23935,6 @@ Ids must begin with a lowercase letter. Provisioning profile expired. Expiration date: %1 Провизионный профиль истёк %1 - - - Ios::Internal::IosBuildStep Base arguments: Базовые параметры: @@ -23969,16 +23956,10 @@ Ids must begin with a lowercase letter. Reset Defaults По умолчанию - - - Ios::Internal::IosConfigurations %1 Simulator Эмулятор %1 - - - Ios::Internal::IosDebugSupport Application not running. Приложение не запущено. @@ -23991,9 +23972,6 @@ Ids must begin with a lowercase letter. The dSYM %1 seems to be outdated, it might confuse the debugger. Видимо dSYM %1 устарел, он может смутить отладчик. - - - Ios::Internal::IosDeployStep Deploy to %1 Развернуть на %1 @@ -24030,9 +24008,6 @@ Ids must begin with a lowercase letter. Deploy to iOS device or emulator Развёртывание на устройство или эмулятор iOS - - - Ios::Internal::IosDevice iOS Device Устройство iOS @@ -24053,13 +24028,6 @@ Ids must begin with a lowercase letter. CPU Architecture: Архитектура ЦПУ: - - iOS - iOS - - - - Ios::Internal::IosDeviceManager Device name Название устройства @@ -24097,9 +24065,6 @@ Ids must begin with a lowercase letter. Do you want to see how to set it up for development? Желаете узнать, как перевести его в режим разработки? - - - Ios::Internal::IosPresetBuildStep Reset to Default По умолчанию @@ -24112,16 +24077,10 @@ Ids must begin with a lowercase letter. Arguments: Параметры: - - - Ios::Internal::IosQmlProfilerSupport Could not get necessary ports for the profiler connection. Не удалось получить необходимые порты для подключения профайлера. - - - Ios::Internal::IosQtVersion Failed to detect the ABIs used by the Qt version. Не удалось определить ABI, используемые профилем Qt. @@ -24131,9 +24090,6 @@ Ids must begin with a lowercase letter. Qt Version is meant for Ios iOS - - - Ios::Internal::IosRunConfiguration Run on %1 Запуск на %1 @@ -24174,20 +24130,10 @@ Ids must begin with a lowercase letter. %1 is not connected. %1 не подключён. - - Device type: - Тип устройства: - - - - Ios::Internal::IosRunSupport Starting remote process. Запуск внешнего процесса. - - - Ios::Internal::IosRunner Could not find %1. Не удалось найти %1. @@ -24216,9 +24162,6 @@ Ids must begin with a lowercase letter. Run ended with error. Выполнение завершилось с ошибкой. - - - Ios::Internal::IosSettingsWidget iOS Configuration Конфигурация iOS @@ -24255,10 +24198,6 @@ Ids must begin with a lowercase letter. Reset contents and settings of simulator devices. Сбросить содержимое и настройки эмулируемых устройств. - - Reset - Сбросить - Screenshot directory: Каталог снимков экрана: @@ -24395,20 +24334,10 @@ Error: %2 simulator screenshot снимок экрана эмулятора - - iOS - iOS - - - - Ios::Internal::IosSimulator iOS Simulator Эмулятор iOS - - - Ios::Internal::SimulatorInfoModel UDID: %1 UDID: %1 @@ -24425,9 +24354,6 @@ Error: %2 Current State Текущее состояние - - - Ios::Internal::SimulatorOperationDialog Simulator Operation Status Состояние эмулятора @@ -24456,9 +24382,6 @@ Error: %5 Done. Готово. - - - Ios::IosToolHandler iOS tool error %1 Ошибка %1 утилиты iOS diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index b840e608e54..863d536cb89 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -35426,7 +35426,7 @@ monitor reset - Ios::Internal::IosBuildStep + ::Ios Base arguments: Базові аргументи: @@ -35451,27 +35451,17 @@ monitor reset Configuration is faulty. Check the Issues output pane for details. Конфігурація збійна. Перевірте вид "Проблеми" для деталей. - - - IosDeployStepWidget Form Форма - - - IosRunConfiguration - - Form - Форма - Arguments: - Аргументи: + Аргументи: Executable: - Виконуваний модуль: + Виконуваний модуль: iPhone 3.5-inch Retina display @@ -35509,9 +35499,6 @@ monitor reset Device type: Тип пристрою: - - - IosSettingsWidget iOS Configuration Конфігурація iOS @@ -36422,29 +36409,16 @@ Do you want to uninstall the existing package next time? - Ios::Internal::IosBuildStepConfigWidget + ::Ios iOS build iOS BuildStep display name. Збірка iOS - - - Ios::Internal::IosConfigurations %1 %2 %1 %2 - - - ::Ios - - iOS - iOS - - - - Ios::Internal::IosDebugSupport Could not find device specific debug symbols at %1. Debugging initialization will be slow until you open the Organizer window of Xcode with the device connected to have the symbols generated. Не вдалось знайти специфічних для пристрою символів зневадження в %1. Ініціалізація зневадження буде повільною, поки ви не відкриєте вікно Organizer в Xcode при підключеному пристрої, щоб символи згенерувались. @@ -36477,23 +36451,14 @@ Do you want to uninstall the existing package next time? Run failed unexpectedly. Несподіваний збій запуску. - - - Ios::Internal::IosDeployConfiguration Deploy to iOS Розгортання на iOS - - - Ios::Internal::IosDeployConfigurationFactory Deploy on iOS Розгортання на iOS - - - Ios::Internal::IosDeployStep Deploy to %1 Розгортання на %1 @@ -36518,34 +36483,22 @@ Do you want to uninstall the existing package next time? The Info.plist might be incorrect. Файл Info.plist може бути неправильним. - - - Ios::Internal::IosDeployStepFactory + + The provisioning profile "%1" (%2) used to sign the application does not cover the device %3 (%4). Deployment to it will fail. + + Deploy to iOS device or emulator Розгортання на пристрій iOS або емулятор - - - Ios::Internal::IosDeployStepWidget <b>Deploy to %1</b> <b>Розгортання на %1</b> - - - Ios::Internal::IosDevice - - iOS - iOS - iOS Device Пристрій iOS - - - Ios::Internal::IosDeviceManager Device name Назва пристрою @@ -36583,9 +36536,6 @@ Do you want to uninstall the existing package next time? Do you want to see how to set it up for development? Бажаєте дізнатись, як перевести його в режим розробника? - - - Ios::Internal::IosQtVersion Failed to detect the ABIs used by the Qt version. Збій визначення ABI, що використовуються версією Qt. @@ -36595,9 +36545,6 @@ Do you want to uninstall the existing package next time? Qt Version is meant for Ios iOS - - - Ios::Internal::IosRunConfiguration Run on %1 Запустити на %1 @@ -36646,43 +36593,18 @@ Do you want to uninstall the existing package next time? %1 is not connected. %1 не підключено. - - Device type: - Тип пристрою: - - - Executable: - Виконуваний модуль: - - - - Ios::Internal::IosRunConfigurationWidget iOS run settings Налаштування запуску iOS - - - Ios::Internal::IosRunControl Starting remote process. Запуск віддаленого процесу. - - Run ended with error. - Виконання закінчилось з помилкою. - - - Run ended. - Виконання закінчилось. - Run ended unexpectedly. Запуск несподівано завершився. - - - Ios::Internal::IosRunner Could not find %1. Не вдалось знайти %1. @@ -36695,30 +36617,14 @@ Do you want to uninstall the existing package next time? The device is locked, please unlock. Пристрій заблоковано, будь ласка, розблокуйте його. - - - Ios::Internal::IosSettingsPage iOS Configurations Конфігурації iOS - - - Ios::Internal::IosSimulator iOS Simulator Симулятор iOS - - - Ios::Internal::IosSimulatorFactory - - iOS Simulator - Симулятор iOS - - - - Ios::IosToolHandler Subprocess Error %1 Помилка підпроцесу %1 @@ -37778,7 +37684,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t - Ios::Internal::IosPresetBuildStep + ::Ios Reset to Default Скинути до типового @@ -37787,10 +37693,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t Command: Команда: - - Arguments: - Аргументи: - PuppetDialog @@ -38801,15 +38703,7 @@ Do you want to kill it? - Ios::Internal::IosAnalyzeSupport - - Run ended with error. - Виконання закінчилось з помилкою. - - - Run ended. - Виконання закінчилось. - + ::Ios ::ProjectExplorer diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 2889678c90d..1e464d54c1c 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -24090,14 +24090,11 @@ Id必须以小写字母开头。 - Ios::Internal + ::Ios Deploy on iOS - - - Ios::Internal::CreateSimulatorDialog Create Simulator @@ -24118,9 +24115,6 @@ Id必须以小写字母开头。 None 无 - - - Ios::Internal::IosBuildStep Base arguments: @@ -24142,16 +24136,10 @@ Id必须以小写字母开头。 xcodebuild - - - Ios::Internal::IosConfigurations %1 Simulator - - - Ios::Internal::IosDebugSupport Application not running. @@ -24164,9 +24152,6 @@ Id必须以小写字母开头。 The dSYM %1 seems to be outdated, it might confuse the debugger. - - - Ios::Internal::IosDeployStep Deploy to %1 @@ -24203,13 +24188,6 @@ Id必须以小写字母开头。 Deploy to iOS device - - - Ios::Internal::IosDevice - - iOS - - iOS Device @@ -24230,9 +24208,6 @@ Id必须以小写字母开头。 CPU Architecture: - - - Ios::Internal::IosDeviceManager Device name @@ -24270,9 +24245,6 @@ Id必须以小写字母开头。 Do you want to see how to set it up for development? - - - Ios::Internal::IosDsymBuildStep Command: 命令: @@ -24285,9 +24257,6 @@ Id必须以小写字母开头。 Reset to Default - - - Ios::Internal::IosQmakeBuildConfiguration iOS Settings @@ -24312,10 +24281,6 @@ Id必须以小写字母开头。 Default 默认 - - None - 无 - Development team is not selected. @@ -24356,16 +24321,10 @@ Id必须以小写字母开头。 Provisioning profile expired. Expiration date: %1 - - - Ios::Internal::IosQmlProfilerSupport Could not get necessary ports for the profiler connection. - - - Ios::Internal::IosQtVersion Failed to detect the ABIs used by the Qt version. 检测Qt版本使用的ABI失败。 @@ -24375,9 +24334,6 @@ Id必须以小写字母开头。 Qt Version is meant for Ios - - - Ios::Internal::IosRunConfiguration Run on %1 @@ -24418,20 +24374,10 @@ Id必须以小写字母开头。 %1 is not connected. - - Device type: - 设备类型: - - - - Ios::Internal::IosRunSupport Starting remote process. 启动远端进程。 - - - Ios::Internal::IosRunner Could not find %1. @@ -24460,13 +24406,6 @@ Id必须以小写字母开头。 Run ended with error. - - - Ios::Internal::IosSettingsWidget - - iOS - - iOS Configuration @@ -24491,10 +24430,6 @@ Id必须以小写字母开头。 Delete simulator devices. - - Reset - 重置 - Reset contents and settings of simulator devices. @@ -24629,16 +24564,10 @@ Error: %2 simulator screenshot - - - Ios::Internal::IosSimulator iOS Simulator - - - Ios::Internal::SimulatorInfoModel UDID: %1 @@ -24655,9 +24584,6 @@ Error: %2 Current State - - - Ios::Internal::SimulatorOperationDialog Simulator Operation Status @@ -24682,9 +24608,6 @@ Error: %5 Done. 完成。 - - - Ios::IosToolHandler iOS tool error %1 @@ -24721,9 +24644,6 @@ Error: %5 Invalid simulator response. Device Id mismatch. Device Id = %1 Response Id = %2 - - - Ios::Relayer iOS Debugging connection to creator failed with error %1 diff --git a/src/plugins/ios/createsimulatordialog.cpp b/src/plugins/ios/createsimulatordialog.cpp index aedda30e232..784c33742ff 100644 --- a/src/plugins/ios/createsimulatordialog.cpp +++ b/src/plugins/ios/createsimulatordialog.cpp @@ -3,6 +3,7 @@ #include "createsimulatordialog.h" +#include "iostr.h" #include "simulatorcontrol.h" #include @@ -22,7 +23,7 @@ CreateSimulatorDialog::CreateSimulatorDialog(QWidget *parent) : QDialog(parent) { resize(320, 160); - setWindowTitle(tr("Create Simulator")); + setWindowTitle(Tr::tr("Create Simulator")); m_nameEdit = new QLineEdit(this); m_deviceTypeCombo = new QComboBox(this); @@ -35,9 +36,9 @@ CreateSimulatorDialog::CreateSimulatorDialog(QWidget *parent) Column { Form { - tr("Simulator name:"), m_nameEdit, br, - tr("Device type:"), m_deviceTypeCombo, br, - tr("OS version:"), m_runtimeCombo, br, + Tr::tr("Simulator name:"), m_nameEdit, br, + Tr::tr("Device type:"), m_deviceTypeCombo, br, + Tr::tr("OS version:"), m_runtimeCombo, br, }, buttonBox }.attachTo(this); @@ -110,7 +111,7 @@ DeviceTypeInfo CreateSimulatorDialog::deviceType() const void CreateSimulatorDialog::populateDeviceTypes(const QList &deviceTypes) { m_deviceTypeCombo->clear(); - m_deviceTypeCombo->addItem(tr("None")); + m_deviceTypeCombo->addItem(Tr::tr("None")); if (deviceTypes.isEmpty()) return; @@ -146,7 +147,7 @@ void CreateSimulatorDialog::populateDeviceTypes(const QList &dev void CreateSimulatorDialog::populateRuntimes(const DeviceTypeInfo &deviceType) { m_runtimeCombo->clear(); - m_runtimeCombo->addItem(tr("None")); + m_runtimeCombo->addItem(Tr::tr("None")); if (deviceType.name.isEmpty()) return; diff --git a/src/plugins/ios/createsimulatordialog.h b/src/plugins/ios/createsimulatordialog.h index 458ba251918..30c862fa584 100644 --- a/src/plugins/ios/createsimulatordialog.h +++ b/src/plugins/ios/createsimulatordialog.h @@ -23,8 +23,6 @@ class RuntimeInfo; */ class CreateSimulatorDialog : public QDialog { - Q_OBJECT - public: explicit CreateSimulatorDialog(QWidget *parent = nullptr); ~CreateSimulatorDialog() override; diff --git a/src/plugins/ios/iosbuildconfiguration.cpp b/src/plugins/ios/iosbuildconfiguration.cpp index ab24323b156..84b58f53022 100644 --- a/src/plugins/ios/iosbuildconfiguration.cpp +++ b/src/plugins/ios/iosbuildconfiguration.cpp @@ -5,6 +5,7 @@ #include "iosconfigurations.h" #include "iosconstants.h" +#include "iostr.h" #include #include @@ -82,7 +83,7 @@ private: IosSigningSettingsWidget::IosSigningSettingsWidget(BuildConfiguration *buildConfiguration, BoolAspect *autoManagedSigning, StringAspect *signingIdentifier) - : NamedWidget(IosQmakeBuildConfiguration::tr("iOS Settings")) + : NamedWidget(Tr::tr("iOS Settings")) , m_autoManagedSigning(autoManagedSigning) , m_signingIdentifier(signingIdentifier) , m_isDevice(DeviceTypeKitAspect::deviceTypeId(buildConfiguration->kit()) @@ -96,7 +97,7 @@ IosSigningSettingsWidget::IosSigningSettingsWidget(BuildConfiguration *buildConf sizePolicy.setHorizontalStretch(0); sizePolicy.setVerticalStretch(0); m_qmakeDefaults->setSizePolicy(sizePolicy); - m_qmakeDefaults->setText(IosQmakeBuildConfiguration::tr("Reset")); + m_qmakeDefaults->setText(Tr::tr("Reset")); m_qmakeDefaults->setEnabled(m_isDevice); m_signEntityCombo = new QComboBox(container); @@ -111,7 +112,7 @@ IosSigningSettingsWidget::IosSigningSettingsWidget(BuildConfiguration *buildConf sizePolicy2.setVerticalStretch(0); m_autoSignCheckbox->setSizePolicy(sizePolicy2); m_autoSignCheckbox->setChecked(true); - m_autoSignCheckbox->setText(IosQmakeBuildConfiguration::tr("Automatically manage signing")); + m_autoSignCheckbox->setText(Tr::tr("Automatically manage signing")); m_autoSignCheckbox->setChecked(m_autoManagedSigning->value()); m_autoSignCheckbox->setEnabled(m_isDevice); @@ -121,7 +122,7 @@ IosSigningSettingsWidget::IosSigningSettingsWidget(BuildConfiguration *buildConf m_warningLabel = new Utils::InfoLabel({}, Utils::InfoLabel::Warning, container); - m_signEntityLabel->setText(IosQmakeBuildConfiguration::tr("Development team:")); + m_signEntityLabel->setText(Tr::tr("Development team:")); connect(m_qmakeDefaults, &QPushButton::clicked, this, &IosSigningSettingsWidget::onReset); @@ -216,8 +217,8 @@ void IosSigningSettingsWidget::onReset() void IosSigningSettingsWidget::configureSigningUi(bool autoManageSigning) { m_signEntityLabel->setText(autoManageSigning - ? IosQmakeBuildConfiguration::tr("Development team:") - : IosQmakeBuildConfiguration::tr("Provisioning profile:")); + ? Tr::tr("Development team:") + : Tr::tr("Provisioning profile:")); if (autoManageSigning) populateDevelopmentTeams(); else @@ -242,7 +243,7 @@ void IosSigningSettingsWidget::populateDevelopmentTeams() QSignalBlocker blocker(m_signEntityCombo); // Populate Team id's m_signEntityCombo->clear(); - m_signEntityCombo->addItem(IosQmakeBuildConfiguration::tr("Default")); + m_signEntityCombo->addItem(Tr::tr("Default")); const auto teams = IosConfigurations::developmentTeams(); for (auto team : teams) { m_signEntityCombo->addItem(team->displayName()); @@ -271,7 +272,7 @@ void IosSigningSettingsWidget::populateProvisioningProfiles() m_signEntityCombo->setItemData(index, profile->details(), Qt::ToolTipRole); } } else { - m_signEntityCombo->addItem(IosQmakeBuildConfiguration::tr("None")); + m_signEntityCombo->addItem(Tr::tr("None")); } } // Maintain previous selection. @@ -302,12 +303,11 @@ void IosSigningSettingsWidget::updateInfoText() if (identifier.isEmpty()) { // No signing entity selection. if (configuringTeams) - addMessage(IosQmakeBuildConfiguration::tr("Development team is not selected.")); + addMessage(Tr::tr("Development team is not selected.")); else - addMessage(IosQmakeBuildConfiguration::tr("Provisioning profile is not selected.")); + addMessage(Tr::tr("Provisioning profile is not selected.")); - addMessage(IosQmakeBuildConfiguration::tr( - "Using default development team and provisioning profile.")); + addMessage(Tr::tr("Using default development team and provisioning profile.")); } else { if (!configuringTeams) { ProvisioningProfilePtr profile = IosConfigurations::provisioningProfile(identifier); @@ -315,17 +315,15 @@ void IosSigningSettingsWidget::updateInfoText() auto team = profile->developmentTeam(); if (team) { // Display corresponding team information. - addMessage(IosQmakeBuildConfiguration::tr("Development team: %1 (%2)") + addMessage(Tr::tr("Development team: %1 (%2)") .arg(team->displayName()) .arg(team->identifier())); - addMessage(IosQmakeBuildConfiguration::tr( - "Settings defined here override the QMake environment.")); + addMessage(Tr::tr("Settings defined here override the QMake environment.")); } else { qCDebug(iosSettingsLog) << "Development team not found for profile" << profile; } } else { - addMessage(IosQmakeBuildConfiguration::tr( - "Settings defined here override the QMake environment.")); + addMessage(Tr::tr("Settings defined here override the QMake environment.")); } } @@ -341,24 +339,23 @@ void IosSigningSettingsWidget::updateWarningText() QString warningText; bool configuringTeams = m_autoSignCheckbox->isChecked(); if (m_signEntityCombo->count() < 2) { - warningText = IosQmakeBuildConfiguration::tr("%1 not configured. Use Xcode and Apple " - "developer account to configure the " - "provisioning profiles and teams.") + warningText = Tr::tr("%1 not configured. Use Xcode and Apple " + "developer account to configure the " + "provisioning profiles and teams.") .arg(configuringTeams - ? IosQmakeBuildConfiguration::tr("Development teams") - : IosQmakeBuildConfiguration::tr("Provisioning profiles")); + ? Tr::tr("Development teams") + : Tr::tr("Provisioning profiles")); } else { QString identifier = selectedIdentifier(); if (configuringTeams) { auto team = IosConfigurations::developmentTeam(identifier); if (team && !team->hasProvisioningProfile()) - warningText = IosQmakeBuildConfiguration::tr( - "No provisioning profile found for the selected team."); + warningText = Tr::tr("No provisioning profile found for the selected team."); } else { auto profile = IosConfigurations::provisioningProfile(identifier); if (profile && QDateTime::currentDateTimeUtc() > profile->expirationDate()) { warningText - = IosQmakeBuildConfiguration::tr( + = Tr::tr( "Provisioning profile expired. Expiration date: %1") .arg(QLocale::system().toString(profile->expirationDate().toLocalTime(), QLocale::LongFormat)); diff --git a/src/plugins/ios/iosbuildconfiguration.h b/src/plugins/ios/iosbuildconfiguration.h index 1bd2bb456a8..5549dfef87a 100644 --- a/src/plugins/ios/iosbuildconfiguration.h +++ b/src/plugins/ios/iosbuildconfiguration.h @@ -2,17 +2,13 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once -#include "qmakeprojectmanager/qmakebuildconfiguration.h" +#include #include -#include -namespace Ios { -namespace Internal { +namespace Ios::Internal { class IosQmakeBuildConfiguration : public QmakeProjectManager::QmakeBuildConfiguration { - Q_OBJECT - public: IosQmakeBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id); @@ -34,8 +30,6 @@ public: class IosCMakeBuildConfiguration : public CMakeProjectManager::CMakeBuildConfiguration { - Q_OBJECT - public: IosCMakeBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id); @@ -55,5 +49,4 @@ public: IosCMakeBuildConfigurationFactory(); }; -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp index 70c0aa74ce5..eb6664c155c 100644 --- a/src/plugins/ios/iosbuildstep.cpp +++ b/src/plugins/ios/iosbuildstep.cpp @@ -2,7 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "iosbuildstep.h" + #include "iosconstants.h" +#include "iostr.h" #include #include @@ -17,7 +19,7 @@ #include #include -#include +#include #include #include @@ -31,8 +33,7 @@ using namespace Core; using namespace ProjectExplorer; using namespace Utils; -namespace Ios { -namespace Internal { +namespace Ios::Internal { const char IOS_BUILD_STEP_ID[] = "Ios.IosBuildStep"; const char BUILD_USE_DEFAULT_ARGS_KEY[] = "Ios.IosBuildStep.XcodeArgumentsUseDefault"; @@ -41,10 +42,8 @@ const char CLEAN_KEY[] = "Ios.IosBuildStep.Clean"; class IosBuildStep final : public AbstractProcessStep { - Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosBuildStep) - public: - IosBuildStep(BuildStepList *stepList, Utils::Id id); + IosBuildStep(BuildStepList *stepList, Id id); private: QWidget *createConfigWidget() final; @@ -69,17 +68,17 @@ QWidget *IosBuildStep::createConfigWidget() { auto widget = new QWidget; - auto buildArgumentsLabel = new QLabel(tr("Base arguments:"), widget); + auto buildArgumentsLabel = new QLabel(Tr::tr("Base arguments:"), widget); auto buildArgumentsTextEdit = new QPlainTextEdit(widget); buildArgumentsTextEdit->setPlainText(ProcessArgs::joinArgs(baseArguments())); auto resetDefaultsButton = new QPushButton(widget); resetDefaultsButton->setLayoutDirection(Qt::RightToLeft); - resetDefaultsButton->setText(tr("Reset Defaults")); + resetDefaultsButton->setText(Tr::tr("Reset Defaults")); resetDefaultsButton->setEnabled(!m_useDefaultArguments); - auto extraArgumentsLabel = new QLabel(tr("Extra arguments:"), widget); + auto extraArgumentsLabel = new QLabel(Tr::tr("Extra arguments:"), widget); auto extraArgumentsLineEdit = new QLineEdit(widget); extraArgumentsLineEdit->setText(ProcessArgs::joinArgs(m_extraArguments)); @@ -91,7 +90,7 @@ QWidget *IosBuildStep::createConfigWidget() gridLayout->addWidget(extraArgumentsLabel, 2, 0, 1, 1); gridLayout->addWidget(extraArgumentsLineEdit, 2, 1, 1, 1); - setDisplayName(tr("iOS build", "iOS BuildStep display name.")); + setDisplayName(Tr::tr("iOS build", "iOS BuildStep display name.")); auto updateDetails = [this] { ProcessParameters param; @@ -255,8 +254,7 @@ IosBuildStepFactory::IosBuildStepFactory() Constants::IOS_SIMULATOR_TYPE}); setSupportedStepLists({ProjectExplorer::Constants::BUILDSTEPS_CLEAN, ProjectExplorer::Constants::BUILDSTEPS_BUILD}); - setDisplayName(IosBuildStep::tr("xcodebuild")); + setDisplayName(Tr::tr("xcodebuild")); } -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/iosbuildstep.h b/src/plugins/ios/iosbuildstep.h index 8ca48e5c9df..b75eee393b2 100644 --- a/src/plugins/ios/iosbuildstep.h +++ b/src/plugins/ios/iosbuildstep.h @@ -5,8 +5,7 @@ #include -namespace Ios { -namespace Internal { +namespace Ios::Internal { class IosBuildStepFactory final : public ProjectExplorer::BuildStepFactory { @@ -14,5 +13,4 @@ public: IosBuildStepFactory(); }; -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index ab7dd2d00af..24c66f60017 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -2,11 +2,13 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "iosconfigurations.h" + #include "iosconstants.h" #include "iosdevice.h" -#include "iossimulator.h" -#include "simulatorcontrol.h" #include "iosprobe.h" +#include "iossimulator.h" +#include "iostr.h" +#include "simulatorcontrol.h" #include @@ -283,7 +285,7 @@ void IosConfigurations::updateAutomaticKitList() const auto init = [&](Kit *k) { k->setAutoDetected(true); const QString baseDisplayName = isSimulatorDeviceId(pDeviceType) - ? tr("%1 Simulator").arg(qtVersion->unexpandedDisplayName()) + ? Tr::tr("%1 Simulator").arg(qtVersion->unexpandedDisplayName()) : qtVersion->unexpandedDisplayName(); k->setUnexpandedDisplayName(baseDisplayName); setupKit(k, pDeviceType, platformToolchains, debuggerId, sdk.path, qtVersion); @@ -616,8 +618,8 @@ QString DevelopmentTeam::displayName() const QString DevelopmentTeam::details() const { - return tr("%1 - Free Provisioning Team : %2") - .arg(m_identifier).arg(m_freeTeam ? tr("Yes") : tr("No")); + return Tr::tr("%1 - Free Provisioning Team : %2") + .arg(m_identifier).arg(m_freeTeam ? Tr::tr("Yes") : Tr::tr("No")); } QDebug &operator<<(QDebug &stream, DevelopmentTeamPtr team) @@ -641,7 +643,7 @@ QString ProvisioningProfile::displayName() const QString ProvisioningProfile::details() const { - return tr("Team: %1\nApp ID: %2\nExpiration date: %3").arg(m_team->identifier()).arg(m_appID) + return Tr::tr("Team: %1\nApp ID: %2\nExpiration date: %3").arg(m_team->identifier()).arg(m_appID) .arg(QLocale::system().toString(m_expirationDate.toLocalTime(), QLocale::ShortFormat)); } diff --git a/src/plugins/ios/iosconfigurations.h b/src/plugins/ios/iosconfigurations.h index d0cacffb228..3b77c6d1959 100644 --- a/src/plugins/ios/iosconfigurations.h +++ b/src/plugins/ios/iosconfigurations.h @@ -5,7 +5,8 @@ #include #include -#include + +#include #include #include @@ -20,14 +21,12 @@ class QSettings; class QFileSystemWatcher; QT_END_NAMESPACE -namespace Ios { -namespace Internal { +namespace Ios::Internal { class DevelopmentTeam; class ProvisioningProfile { - Q_DECLARE_TR_FUNCTIONS(ProvisioningProfile) public: std::shared_ptr developmentTeam() { return m_team; } QString identifier() const; @@ -50,7 +49,6 @@ using ProvisioningProfiles = QList; class DevelopmentTeam { - Q_DECLARE_TR_FUNCTIONS(DevelopmentTeam) public: QString identifier() const; QString displayName() const; @@ -121,7 +119,8 @@ private: ProvisioningProfiles m_provisioningProfiles; DevelopmentTeams m_developerTeams; }; + QDebug &operator<<(QDebug &stream, std::shared_ptr profile); QDebug &operator<<(QDebug &stream, std::shared_ptr team); -} // namespace Internal -} // namespace Ios + +} // Ios::Internal diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp index 0394f2e1361..7bf9d7cbe0d 100644 --- a/src/plugins/ios/iosdeploystep.cpp +++ b/src/plugins/ios/iosdeploystep.cpp @@ -3,13 +3,12 @@ #include "iosdeploystep.h" -#include "iosbuildstep.h" -#include "iosconfigurations.h" #include "iosconstants.h" #include "iosdevice.h" #include "iosrunconfiguration.h" #include "iossimulator.h" #include "iostoolhandler.h" +#include "iostr.h" #include #include @@ -21,20 +20,16 @@ #include -#include #include #include using namespace ProjectExplorer; using namespace Utils; -namespace Ios { -namespace Internal { +namespace Ios::Internal { class IosDeployStep final : public BuildStep { - Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosDeployStep) - public: enum TransferStatus { NoTransfer, @@ -92,7 +87,7 @@ void IosDeployStep::updateDisplayNames() { IDevice::ConstPtr dev = DeviceKitAspect::device(kit()); const QString devName = dev.isNull() ? IosDevice::name() : dev->displayName(); - setDisplayName(tr("Deploy to %1").arg(devName)); + setDisplayName(Tr::tr("Deploy to %1").arg(devName)); } bool IosDeployStep::init() @@ -109,7 +104,7 @@ bool IosDeployStep::init() } else if (iossimulator()) { m_deviceType = runConfig->deviceType(); } else { - emit addOutput(tr("Error: no device available, deploy failed."), + emit addOutput(Tr::tr("Error: no device available, deploy failed."), OutputFormat::ErrorMessage); return false; } @@ -121,14 +116,14 @@ void IosDeployStep::doRun() QTC_CHECK(m_transferStatus == NoTransfer); if (m_device.isNull()) { TaskHub::addTask( - DeploymentTask(Task::Error, tr("Deployment failed. No iOS device found."))); + DeploymentTask(Task::Error, Tr::tr("Deployment failed. No iOS device found."))); emit finished(!iossimulator().isNull()); cleanup(); return; } m_toolHandler = new IosToolHandler(m_deviceType, this); m_transferStatus = TransferInProgress; - emit progress(0, tr("Transferring application")); + emit progress(0, Tr::tr("Transferring application")); connect(m_toolHandler, &IosToolHandler::isTransferringApp, this, &IosDeployStep::handleIsTransferringApp); connect(m_toolHandler, &IosToolHandler::didTransferApp, @@ -176,7 +171,7 @@ void IosDeployStep::handleDidTransferApp(IosToolHandler *handler, const QString m_transferStatus = TransferFailed; if (!m_expectFail) TaskHub::addTask(DeploymentTask(Task::Error, - tr("Deployment failed. The settings in the Devices window of Xcode might be incorrect."))); + Tr::tr("Deployment failed. The settings in the Devices window of Xcode might be incorrect."))); } emit finished(status == IosToolHandler::Success); } @@ -186,7 +181,7 @@ void IosDeployStep::handleFinished(IosToolHandler *handler) switch (m_transferStatus) { case TransferInProgress: m_transferStatus = TransferFailed; - TaskHub::addTask(DeploymentTask(Task::Error, tr("Deployment failed."))); + TaskHub::addTask(DeploymentTask(Task::Error, Tr::tr("Deployment failed."))); emit finished(false); break; case NoTransfer: @@ -203,7 +198,7 @@ void IosDeployStep::handleErrorMsg(IosToolHandler *handler, const QString &msg) { Q_UNUSED(handler) if (msg.contains(QLatin1String("AMDeviceInstallApplication returned -402653103"))) - TaskHub::addTask(DeploymentTask(Task::Warning, tr("The Info.plist might be incorrect."))); + TaskHub::addTask(DeploymentTask(Task::Warning, Tr::tr("The Info.plist might be incorrect."))); emit addOutput(msg, OutputFormat::ErrorMessage); } @@ -269,7 +264,7 @@ void IosDeployStep::checkProvisioningProfile() QString provisioningProfile = provisionPlist.value(QLatin1String("Name")).toString(); QString provisioningUid = provisionPlist.value(QLatin1String("UUID")).toString(); CompileTask task(Task::Warning, - tr("The provisioning profile \"%1\" (%2) used to sign the application " + Tr::tr("The provisioning profile \"%1\" (%2) used to sign the application " "does not cover the device %3 (%4). Deployment to it will fail.") .arg(provisioningProfile, provisioningUid, device->displayName(), targetId)); @@ -291,11 +286,10 @@ IosSimulator::ConstPtr IosDeployStep::iossimulator() const IosDeployStepFactory::IosDeployStepFactory() { registerStep(Constants::IOS_DEPLOY_STEP_ID); - setDisplayName(IosDeployStep::tr("Deploy to iOS device")); + setDisplayName(Tr::tr("Deploy to iOS device")); setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY); setSupportedDeviceTypes({Constants::IOS_DEVICE_TYPE, Constants::IOS_SIMULATOR_TYPE}); setRepeatable(false); } -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/iosdeploystep.h b/src/plugins/ios/iosdeploystep.h index 26f748f5638..4266aedd226 100644 --- a/src/plugins/ios/iosdeploystep.h +++ b/src/plugins/ios/iosdeploystep.h @@ -5,8 +5,7 @@ #include -namespace Ios { -namespace Internal { +namespace Ios::Internal { class IosDeployStepFactory final : public ProjectExplorer::BuildStepFactory { @@ -14,5 +13,4 @@ public: IosDeployStepFactory(); }; -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp index e609b6838de..49a07a2b101 100644 --- a/src/plugins/ios/iosdevice.cpp +++ b/src/plugins/ios/iosdevice.cpp @@ -2,14 +2,19 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "iosdevice.h" + #include "iosconfigurations.h" #include "iosconstants.h" #include "iossimulator.h" #include "iostoolhandler.h" +#include "iostr.h" + #include + #include #include #include + #include #include @@ -38,9 +43,6 @@ using namespace ProjectExplorer; -static const char kDeviceName[] = "deviceName"; -static const char kUniqueDeviceId[] = "uniqueDeviceId"; - namespace { static Q_LOGGING_CATEGORY(detectLog, "qtc.ios.deviceDetect", QtWarningMsg) } @@ -68,8 +70,10 @@ static QString CFStringRef2QString(CFStringRef s) } #endif -namespace Ios { -namespace Internal { +namespace Ios::Internal { + +const char kDeviceName[] = "deviceName"; +const char kUniqueDeviceId[] = "uniqueDeviceId"; class IosDeviceInfoWidget : public IDeviceWidget { @@ -84,7 +88,7 @@ IosDevice::IosDevice(CtorHelper) { setType(Constants::IOS_DEVICE_TYPE); setDefaultDisplayName(IosDevice::name()); - setDisplayType(tr("iOS")); + setDisplayType(Tr::tr("iOS")); setMachineType(IDevice::Hardware); setOsType(Utils::OsTypeMac); setDeviceState(DeviceDisconnected); @@ -160,7 +164,7 @@ QString IosDevice::uniqueInternalDeviceId() const QString IosDevice::name() { - return QCoreApplication::translate("Ios::Internal::IosDevice", "iOS Device"); + return Tr::tr("iOS Device"); } QString IosDevice::osVersion() const @@ -195,15 +199,15 @@ IosDeviceManager::TranslationMap IosDeviceManager::translationMap() if (translationMap) return *translationMap; TranslationMap &tMap = *new TranslationMap; - tMap[kDeviceName] = tr("Device name"); + tMap[kDeviceName] = Tr::tr("Device name"); //: Whether the device is in developer mode. - tMap[QLatin1String("developerStatus")] = tr("Developer status"); - tMap[QLatin1String("deviceConnected")] = tr("Connected"); - tMap[QLatin1String("YES")] = tr("yes"); - tMap[QLatin1String("NO")] = tr("no"); - tMap[QLatin1String("YES")] = tr("yes"); - tMap[QLatin1String("*unknown*")] = tr("unknown"); - tMap[QLatin1String("osVersion")] = tr("OS version"); + tMap[QLatin1String("developerStatus")] = Tr::tr("Developer status"); + tMap[QLatin1String("deviceConnected")] = Tr::tr("Connected"); + tMap[QLatin1String("YES")] = Tr::tr("yes"); + tMap[QLatin1String("NO")] = Tr::tr("no"); + tMap[QLatin1String("YES")] = Tr::tr("yes"); + tMap[QLatin1String("*unknown*")] = Tr::tr("unknown"); + tMap[QLatin1String("osVersion")] = Tr::tr("OS version"); translationMap = &tMap; return tMap; } @@ -307,8 +311,8 @@ void IosDeviceManager::deviceInfo(IosToolHandler *, const QString &uid, if (devStatus == QLatin1String("*off*")) { if (!shouldIgnore && !IosConfigurations::ignoreAllDevices()) { QMessageBox mBox; - mBox.setText(tr("An iOS device in user mode has been detected.")); - mBox.setInformativeText(tr("Do you want to see how to set it up for development?")); + mBox.setText(Tr::tr("An iOS device in user mode has been detected.")); + mBox.setInformativeText(Tr::tr("Do you want to see how to set it up for development?")); mBox.setStandardButtons(QMessageBox::NoAll | QMessageBox::No | QMessageBox::Yes); mBox.setDefaultButton(QMessageBox::Yes); int ret = mBox.exec(); @@ -493,7 +497,6 @@ void IosDeviceManager::monitorAvailableDevices() #endif } - IosDeviceManager::IosDeviceManager(QObject *parent) : QObject(parent) { @@ -563,11 +566,10 @@ IosDeviceInfoWidget::IosDeviceInfoWidget(const IDevice::Ptr &device) formLayout->setContentsMargins(0, 0, 0, 0); setLayout(formLayout); formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); - formLayout->addRow(IosDevice::tr("Device name:"), new QLabel(iosDevice->deviceName())); - formLayout->addRow(IosDevice::tr("Identifier:"), new QLabel(iosDevice->uniqueInternalDeviceId())); - formLayout->addRow(IosDevice::tr("OS Version:"), new QLabel(iosDevice->osVersion())); - formLayout->addRow(IosDevice::tr("CPU Architecture:"), new QLabel(iosDevice->cpuArchitecture())); + formLayout->addRow(Tr::tr("Device name:"), new QLabel(iosDevice->deviceName())); + formLayout->addRow(Tr::tr("Identifier:"), new QLabel(iosDevice->uniqueInternalDeviceId())); + formLayout->addRow(Tr::tr("OS Version:"), new QLabel(iosDevice->osVersion())); + formLayout->addRow(Tr::tr("CPU Architecture:"), new QLabel(iosDevice->cpuArchitecture())); } -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/iosdevice.h b/src/plugins/ios/iosdevice.h index 7f16059d4cf..9f4e66c5025 100644 --- a/src/plugins/ios/iosdevice.h +++ b/src/plugins/ios/iosdevice.h @@ -22,8 +22,6 @@ class IosDeviceManager; class IosDevice final : public ProjectExplorer::IDevice { - Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosDevice) - public: using Dict = QMap; using ConstPtr = QSharedPointer; @@ -69,7 +67,6 @@ public: class IosDeviceManager : public QObject { - Q_OBJECT public: using TranslationMap = QHash; @@ -85,6 +82,7 @@ public: const Ios::IosToolHandler::Dict &info); void infoGathererFinished(Ios::IosToolHandler *gatherer); void monitorAvailableDevices(); + private: void updateUserModeDevices(); IosDeviceManager(QObject *parent = nullptr); diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp index e9110a24bfc..54481ded9b7 100644 --- a/src/plugins/ios/iosdsymbuildstep.cpp +++ b/src/plugins/ios/iosdsymbuildstep.cpp @@ -6,6 +6,7 @@ #include "iosconstants.h" #include "iosconfigurations.h" #include "iosrunconfiguration.h" +#include "iostr.h" #include #include @@ -34,13 +35,39 @@ using namespace Core; using namespace ProjectExplorer; using namespace Utils; -namespace Ios { -namespace Internal { +namespace Ios::Internal { -static const char USE_DEFAULT_ARGS_PARTIAL_KEY[] = ".ArgumentsUseDefault"; -static const char COMMAND_PARTIAL_KEY[] = ".Command"; -static const char ARGUMENTS_PARTIAL_KEY[] = ".Arguments"; -static const char CLEAN_PARTIAL_KEY[] = ".Clean"; +const char USE_DEFAULT_ARGS_PARTIAL_KEY[] = ".ArgumentsUseDefault"; +const char COMMAND_PARTIAL_KEY[] = ".Command"; +const char ARGUMENTS_PARTIAL_KEY[] = ".Arguments"; +const char CLEAN_PARTIAL_KEY[] = ".Clean"; + +class IosDsymBuildStep : public AbstractProcessStep +{ +public: + IosDsymBuildStep(BuildStepList *parent, Id id); + + QWidget *createConfigWidget() override; + void setArguments(const QStringList &args); + QStringList arguments() const; + QStringList defaultArguments() const; + FilePath defaultCommand() const; + FilePath command() const; + void setCommand(const FilePath &command); + bool isDefault() const; + +private: + void setupOutputFormatter(OutputFormatter *formatter) override; + QVariantMap toMap() const override; + bool fromMap(const QVariantMap &map) override; + + QStringList defaultCleanCmdList() const; + QStringList defaultCmdList() const; + + QStringList m_arguments; + FilePath m_command; + bool m_clean; +}; IosDsymBuildStep::IosDsymBuildStep(BuildStepList *parent, Id id) : AbstractProcessStep(parent, id), @@ -180,12 +207,11 @@ QStringList IosDsymBuildStep::arguments() const return m_arguments; } - QWidget *IosDsymBuildStep::createConfigWidget() { auto widget = new QWidget; - auto commandLabel = new QLabel(tr("Command:"), widget); + auto commandLabel = new QLabel(Tr::tr("Command:"), widget); auto commandLineEdit = new QLineEdit(widget); commandLineEdit->setText(command().toString()); @@ -193,9 +219,9 @@ QWidget *IosDsymBuildStep::createConfigWidget() auto argumentsTextEdit = new QPlainTextEdit(widget); argumentsTextEdit->setPlainText(Utils::ProcessArgs::joinArgs(arguments())); - auto argumentsLabel = new QLabel(tr("Arguments:"), widget); + auto argumentsLabel = new QLabel(Tr::tr("Arguments:"), widget); - auto resetDefaultsButton = new QPushButton(tr("Reset to Default"), widget); + auto resetDefaultsButton = new QPushButton(Tr::tr("Reset to Default"), widget); resetDefaultsButton->setLayoutDirection(Qt::RightToLeft); resetDefaultsButton->setEnabled(!isDefault()); @@ -248,9 +274,7 @@ QWidget *IosDsymBuildStep::createConfigWidget() return widget; } -// // IosDsymBuildStepFactory -// IosDsymBuildStepFactory::IosDsymBuildStepFactory() { @@ -260,5 +284,4 @@ IosDsymBuildStepFactory::IosDsymBuildStepFactory() setDisplayName("dsymutil"); } -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h index 23c507be3c3..2808baf0660 100644 --- a/src/plugins/ios/iosdsymbuildstep.h +++ b/src/plugins/ios/iosdsymbuildstep.h @@ -5,37 +5,7 @@ #include -namespace Ios { -namespace Internal { - -class IosDsymBuildStep : public ProjectExplorer::AbstractProcessStep -{ - Q_OBJECT - -public: - IosDsymBuildStep(ProjectExplorer::BuildStepList *parent, Utils::Id id); - - QWidget *createConfigWidget() override; - void setArguments(const QStringList &args); - QStringList arguments() const; - QStringList defaultArguments() const; - Utils::FilePath defaultCommand() const; - Utils::FilePath command() const; - void setCommand(const Utils::FilePath &command); - bool isDefault() const; - -private: - void setupOutputFormatter(Utils::OutputFormatter *formatter) override; - QVariantMap toMap() const override; - bool fromMap(const QVariantMap &map) override; - - QStringList defaultCleanCmdList() const; - QStringList defaultCmdList() const; - - QStringList m_arguments; - Utils::FilePath m_command; - bool m_clean; -}; +namespace Ios::Internal { class IosDsymBuildStepFactory : public ProjectExplorer::BuildStepFactory { @@ -43,5 +13,4 @@ public: explicit IosDsymBuildStepFactory(); }; -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/iosplugin.cpp b/src/plugins/ios/iosplugin.cpp index 420ec42488d..b343fc39965 100644 --- a/src/plugins/ios/iosplugin.cpp +++ b/src/plugins/ios/iosplugin.cpp @@ -15,6 +15,7 @@ #include "iossettingspage.h" #include "iossimulator.h" #include "iostoolhandler.h" +#include "iostr.h" #include "iosrunconfiguration.h" #include @@ -36,7 +37,7 @@ public: setConfigBaseId("Qt4ProjectManager.IosDeployConfiguration"); addSupportedTargetDeviceType(Constants::IOS_DEVICE_TYPE); addSupportedTargetDeviceType(Constants::IOS_SIMULATOR_TYPE); - setDefaultDisplayName(QCoreApplication::translate("Ios::Internal", "Deploy on iOS")); + setDefaultDisplayName(Tr::tr("Deploy on iOS")); addInitialStep(Constants::IOS_DEPLOY_STEP_ID); } }; diff --git a/src/plugins/ios/iosprobe.cpp b/src/plugins/ios/iosprobe.cpp index d33f3bb234a..c835e48390e 100644 --- a/src/plugins/ios/iosprobe.cpp +++ b/src/plugins/ios/iosprobe.cpp @@ -6,9 +6,7 @@ #include #include -#include #include -#include #include static Q_LOGGING_CATEGORY(probeLog, "qtc.ios.probe", QtWarningMsg) diff --git a/src/plugins/ios/iosprobe.h b/src/plugins/ios/iosprobe.h index 65ddceac427..f0bd4bf6609 100644 --- a/src/plugins/ios/iosprobe.h +++ b/src/plugins/ios/iosprobe.h @@ -60,4 +60,5 @@ private: QMap m_platforms; QStringList m_developerPaths; }; + } // namespace Ios diff --git a/src/plugins/ios/iosqtversion.cpp b/src/plugins/ios/iosqtversion.cpp index 1b9fc6ca735..fc772ce72fa 100644 --- a/src/plugins/ios/iosqtversion.cpp +++ b/src/plugins/ios/iosqtversion.cpp @@ -2,12 +2,14 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "iosqtversion.h" + #include "iosconstants.h" -#include "iosconfigurations.h" +#include "iostr.h" #include #include +#include #include #include #include @@ -15,9 +17,26 @@ #include #include -using namespace Ios::Internal; using namespace ProjectExplorer; +namespace Ios::Internal { + +class IosQtVersion : public QtSupport::QtVersion +{ +public: + IosQtVersion(); + + bool isValid() const override; + QString invalidReason() const override; + + Abis detectQtAbis() const override; + + QSet availableFeatures() const override; + QSet targetDeviceTypes() const override; + + QString description() const override; +}; + IosQtVersion::IosQtVersion() = default; bool IosQtVersion::isValid() const @@ -33,7 +52,7 @@ QString IosQtVersion::invalidReason() const { QString tmp = QtVersion::invalidReason(); if (tmp.isEmpty() && qtAbis().isEmpty()) - return tr("Failed to detect the ABIs used by the Qt version."); + return Tr::tr("Failed to detect the ABIs used by the Qt version."); return tmp; } @@ -53,7 +72,7 @@ Abis IosQtVersion::detectQtAbis() const QString IosQtVersion::description() const { //: Qt Version is meant for Ios - return tr("iOS"); + return Tr::tr("iOS"); } QSet IosQtVersion::availableFeatures() const @@ -83,3 +102,5 @@ IosQtVersionFactory::IosQtVersionFactory() return setup.platforms.contains("ios"); }); } + +} // Ios::Internal diff --git a/src/plugins/ios/iosqtversion.h b/src/plugins/ios/iosqtversion.h index 28ffb4fb816..72d460b422d 100644 --- a/src/plugins/ios/iosqtversion.h +++ b/src/plugins/ios/iosqtversion.h @@ -3,31 +3,9 @@ #pragma once -#include #include -#include - -namespace Ios { -namespace Internal { - -class IosQtVersion : public QtSupport::QtVersion -{ - Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosQtVersion) - -public: - IosQtVersion(); - - bool isValid() const override; - QString invalidReason() const override; - - ProjectExplorer::Abis detectQtAbis() const override; - - QSet availableFeatures() const override; - QSet targetDeviceTypes() const override; - - QString description() const override; -}; +namespace Ios::Internal { class IosQtVersionFactory : public QtSupport::QtVersionFactory { @@ -35,5 +13,4 @@ public: IosQtVersionFactory(); }; -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp index 84e0910ca96..8b3a11c66b7 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/src/plugins/ios/iosrunconfiguration.cpp @@ -2,8 +2,10 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "iosrunconfiguration.h" + #include "iosconstants.h" #include "iosdevice.h" +#include "iostr.h" #include "simulatorcontrol.h" #include @@ -18,7 +20,7 @@ #include #include -#include +#include #include #include #include @@ -38,7 +40,7 @@ using namespace Utils; namespace Ios::Internal { -static const QLatin1String deviceTypeKey("Ios.device_type"); +const QLatin1String deviceTypeKey("Ios.device_type"); static QString displayName(const SimulatorInfo &device) { @@ -66,8 +68,8 @@ IosRunConfiguration::IosRunConfiguration(Target *target, Id id) setUpdater([this, target, executableAspect] { IDevice::ConstPtr dev = DeviceKitAspect::device(target->kit()); const QString devName = dev.isNull() ? IosDevice::name() : dev->displayName(); - setDefaultDisplayName(tr("Run on %1").arg(devName)); - setDisplayName(tr("Run %1 on %2").arg(applicationName()).arg(devName)); + setDefaultDisplayName(Tr::tr("Run on %1").arg(devName)); + setDisplayName(Tr::tr("Run %1 on %2").arg(applicationName()).arg(devName)); executableAspect->setExecutable(localExecutable()); @@ -227,7 +229,7 @@ QString IosRunConfiguration::disabledReason() const { Utils::Id devType = DeviceTypeKitAspect::deviceTypeId(kit()); if (devType != Constants::IOS_DEVICE_TYPE && devType != Constants::IOS_SIMULATOR_TYPE) - return tr("Kit has incorrect device type for running on iOS devices."); + return Tr::tr("Kit has incorrect device type for running on iOS devices."); IDevice::ConstPtr dev = DeviceKitAspect::device(kit()); QString validDevName; bool hasConncetedDev = false; @@ -248,27 +250,27 @@ QString IosRunConfiguration::disabledReason() const if (dev.isNull()) { if (!validDevName.isEmpty()) - return tr("No device chosen. Select %1.").arg(validDevName); // should not happen + return Tr::tr("No device chosen. Select %1.").arg(validDevName); // should not happen else if (hasConncetedDev) - return tr("No device chosen. Enable developer mode on a device."); // should not happen + return Tr::tr("No device chosen. Enable developer mode on a device."); // should not happen else - return tr("No device available."); + return Tr::tr("No device available."); } else { switch (dev->deviceState()) { case IDevice::DeviceReadyToUse: break; case IDevice::DeviceConnected: - return tr("To use this device you need to enable developer mode on it."); + return Tr::tr("To use this device you need to enable developer mode on it."); case IDevice::DeviceDisconnected: case IDevice::DeviceStateUnknown: if (!validDevName.isEmpty()) - return tr("%1 is not connected. Select %2?") + return Tr::tr("%1 is not connected. Select %2?") .arg(dev->displayName(), validDevName); else if (hasConncetedDev) - return tr("%1 is not connected. Enable developer mode on a device?") + return Tr::tr("%1 is not connected. Enable developer mode on a device?") .arg(dev->displayName()); else - return tr("%1 is not connected.").arg(dev->displayName()); + return Tr::tr("%1 is not connected.").arg(dev->displayName()); } } return RunConfiguration::disabledReason(); @@ -327,7 +329,7 @@ void IosDeviceTypeAspect::addToLayout(LayoutBuilder &builder) m_deviceTypeComboBox = new QComboBox; m_deviceTypeComboBox->setModel(&m_deviceTypeModel); - m_deviceTypeLabel = new QLabel(IosRunConfiguration::tr("Device type:")); + m_deviceTypeLabel = new QLabel(Tr::tr("Device type:")); builder.addItems({m_deviceTypeLabel, m_deviceTypeComboBox}); diff --git a/src/plugins/ios/iosrunconfiguration.h b/src/plugins/ios/iosrunconfiguration.h index bc083843341..9d9dd6f27df 100644 --- a/src/plugins/ios/iosrunconfiguration.h +++ b/src/plugins/ios/iosrunconfiguration.h @@ -14,8 +14,7 @@ #include #include -namespace Ios { -namespace Internal { +namespace Ios::Internal { class IosRunConfiguration; @@ -61,7 +60,7 @@ private: class IosRunConfiguration : public ProjectExplorer::RunConfiguration { - Q_OBJECT + Q_OBJECT // FIXME: Used in IosDsymBuildStep public: IosRunConfiguration(ProjectExplorer::Target *target, Utils::Id id); @@ -84,5 +83,4 @@ public: IosRunConfigurationFactory(); }; -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp index 58be6d82e07..c01c3c859dc 100644 --- a/src/plugins/ios/iosrunner.cpp +++ b/src/plugins/ios/iosrunner.cpp @@ -9,6 +9,7 @@ #include "iosrunconfiguration.h" #include "iossimulator.h" #include "iostoolhandler.h" +#include "iostr.h" #include #include @@ -73,8 +74,6 @@ static void stopRunningRunControl(RunControl *runControl) class IosRunner : public RunWorker { - Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosRunner) - public: IosRunner(RunControl *runControl); ~IosRunner() override; @@ -194,7 +193,8 @@ void IosRunner::start() m_cleanExit = false; m_qmlServerPort = Port(); if (!QFileInfo::exists(m_bundleDir)) { - TaskHub::addTask(DeploymentTask(Task::Warning, tr("Could not find %1.").arg(m_bundleDir))); + TaskHub::addTask(DeploymentTask(Task::Warning, + Tr::tr("Could not find %1.").arg(m_bundleDir))); reportFailure(); return; } @@ -275,7 +275,7 @@ void IosRunner::handleGotServerPorts(IosToolHandler *handler, const QString &bun if (prerequisiteOk) reportStarted(); else - reportFailure(tr("Could not get necessary ports for the debugger connection.")); + reportFailure(Tr::tr("Could not get necessary ports for the debugger connection.")); } void IosRunner::handleGotInferiorPid(IosToolHandler *handler, const QString &bundlePath, @@ -293,7 +293,7 @@ void IosRunner::handleGotInferiorPid(IosToolHandler *handler, const QString &bun if (m_pid > 0) { prerequisiteOk = true; } else { - reportFailure(tr("Could not get inferior PID.")); + reportFailure(Tr::tr("Could not get inferior PID.")); return; } @@ -303,7 +303,7 @@ void IosRunner::handleGotInferiorPid(IosToolHandler *handler, const QString &bun if (prerequisiteOk) reportStarted(); else - reportFailure(tr("Could not get necessary ports for the debugger connection.")); + reportFailure(Tr::tr("Could not get necessary ports for the debugger connection.")); } void IosRunner::handleAppOutput(IosToolHandler *handler, const QString &output) @@ -324,10 +324,10 @@ void IosRunner::handleErrorMsg(IosToolHandler *handler, const QString &msg) QString res(msg); QString lockedErr ="Unexpected reply: ELocked (454c6f636b6564) vs OK (4f4b)"; if (msg.contains("AMDeviceStartService returned -402653150")) { - TaskHub::addTask(DeploymentTask(Task::Warning, tr("Run failed. " + TaskHub::addTask(DeploymentTask(Task::Warning, Tr::tr("Run failed. " "The settings in the Organizer window of Xcode might be incorrect."))); } else if (res.contains(lockedErr)) { - QString message = tr("The device is locked, please unlock."); + QString message = Tr::tr("The device is locked, please unlock."); TaskHub::addTask(DeploymentTask(Task::Error, message)); res.replace(lockedErr, message); } @@ -350,9 +350,9 @@ void IosRunner::handleFinished(IosToolHandler *handler) { if (m_toolHandler == handler) { if (m_cleanExit) - appendMessage(tr("Run ended."), NormalMessageFormat); + appendMessage(Tr::tr("Run ended."), NormalMessageFormat); else - appendMessage(tr("Run ended with error."), ErrorMessageFormat); + appendMessage(Tr::tr("Run ended with error."), ErrorMessageFormat); m_toolHandler = nullptr; } handler->deleteLater(); @@ -385,13 +385,12 @@ Port IosRunner::qmlServerPort() const class IosRunSupport : public IosRunner { - Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosRunSupport) - public: explicit IosRunSupport(RunControl *runControl); ~IosRunSupport() override; void didStartApp(IosToolHandler::OpStatus status); + private: void start() override; }; @@ -412,7 +411,7 @@ IosRunSupport::~IosRunSupport() void IosRunSupport::start() { - appendMessage(tr("Starting remote process."), NormalMessageFormat); + appendMessage(Tr::tr("Starting remote process."), NormalMessageFormat); IosRunner::start(); } @@ -422,7 +421,6 @@ void IosRunSupport::start() class IosQmlProfilerSupport : public RunWorker { - Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosQmlProfilerSupport) public: IosQmlProfilerSupport(RunControl *runControl); @@ -462,7 +460,7 @@ void IosQmlProfilerSupport::start() if (qmlPort.isValid()) reportStarted(); else - reportFailure(tr("Could not get necessary ports for the profiler connection.")); + reportFailure(Tr::tr("Could not get necessary ports for the profiler connection.")); } // @@ -471,8 +469,6 @@ void IosQmlProfilerSupport::start() class IosDebugSupport : public DebuggerRunTool { - Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosDebugSupport) - public: IosDebugSupport(RunControl *runControl); @@ -498,7 +494,7 @@ IosDebugSupport::IosDebugSupport(RunControl *runControl) void IosDebugSupport::start() { if (!m_runner->isAppRunning()) { - reportFailure(tr("Application not running.")); + reportFailure(Tr::tr("Application not running.")); return; } @@ -520,9 +516,9 @@ void IosDebugSupport::start() if (deviceSdk.isEmpty()) { TaskHub::addTask(DeploymentTask( Task::Warning, - tr("Could not find device specific debug symbols at %1. " - "Debugging initialization will be slow until you open the Organizer window of " - "Xcode with the device connected to have the symbols generated.") + Tr::tr("Could not find device specific debug symbols at %1. " + "Debugging initialization will be slow until you open the Organizer window of " + "Xcode with the device connected to have the symbols generated.") .arg(symbolsPathCandidates.constFirst().toUserOutput()))); } setDeviceSymbolsRoot(deviceSdk.toString()); @@ -553,8 +549,8 @@ void IosDebugSupport::start() if (dsymPath.exists() && dsymPath.lastModified() < data->localExecutable.lastModified()) { TaskHub::addTask(DeploymentTask(Task::Warning, - tr("The dSYM %1 seems to be outdated, it might confuse the debugger.") - .arg(dsymPath.toUserOutput()))); + Tr::tr("The dSYM %1 seems to be outdated, it might confuse the debugger.") + .arg(dsymPath.toUserOutput()))); } } diff --git a/src/plugins/ios/iossettingspage.cpp b/src/plugins/ios/iossettingspage.cpp index 80ab83abce0..7a4f306f659 100644 --- a/src/plugins/ios/iossettingspage.cpp +++ b/src/plugins/ios/iossettingspage.cpp @@ -3,23 +3,20 @@ #include "iossettingspage.h" -#include "iossettingswidget.h" #include "iosconstants.h" +#include "iossettingswidget.h" +#include "iostr.h" #include -#include - -namespace Ios { -namespace Internal { +namespace Ios::Internal { IosSettingsPage::IosSettingsPage() { setId(Constants::IOS_SETTINGS_ID); - setDisplayName(IosSettingsWidget::tr("iOS")); + setDisplayName(Tr::tr("iOS")); setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY); setWidgetCreator([] { return new IosSettingsWidget; }); } -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/iossettingspage.h b/src/plugins/ios/iossettingspage.h index ea4e71a3d07..b58d8bfb8c6 100644 --- a/src/plugins/ios/iossettingspage.h +++ b/src/plugins/ios/iossettingspage.h @@ -5,8 +5,7 @@ #include -namespace Ios { -namespace Internal { +namespace Ios::Internal { class IosSettingsPage final : public Core::IOptionsPage { @@ -14,5 +13,4 @@ public: IosSettingsPage(); }; -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/iossettingswidget.cpp b/src/plugins/ios/iossettingswidget.cpp index 1cd06d2ecef..8c4149a91ba 100644 --- a/src/plugins/ios/iossettingswidget.cpp +++ b/src/plugins/ios/iossettingswidget.cpp @@ -5,8 +5,8 @@ #include "createsimulatordialog.h" #include "iosconfigurations.h" - #include "iosconfigurations.h" +#include "iostr.h" #include "simulatorcontrol.h" #include "simulatorinfomodel.h" #include "simulatoroperationdialog.h" @@ -16,7 +16,6 @@ #include #include -#include #include #include #include @@ -29,11 +28,11 @@ #include #include -static const int simStartWarnCount = 4; +using namespace std::placeholders; namespace Ios::Internal { -using namespace std::placeholders; +const int simStartWarnCount = 4; static SimulatorInfoList selectedSimulators(const QTreeView *deviceTreeView) { @@ -53,29 +52,29 @@ static void onSimOperation(const SimulatorInfo &simInfo, SimulatorOperationDialo IosSettingsWidget::IosSettingsWidget() { resize(622, 456); - setWindowTitle(tr("iOS Configuration")); + setWindowTitle(Tr::tr("iOS Configuration")); - m_deviceAskCheckBox = new QCheckBox(tr("Ask about devices not in developer mode")); + m_deviceAskCheckBox = new QCheckBox(Tr::tr("Ask about devices not in developer mode")); m_deviceAskCheckBox->setChecked(!IosConfigurations::ignoreAllDevices()); - m_renameButton = new QPushButton(tr("Rename")); + m_renameButton = new QPushButton(Tr::tr("Rename")); m_renameButton->setEnabled(false); - m_renameButton->setToolTip(tr("Rename a simulator device.")); + m_renameButton->setToolTip(Tr::tr("Rename a simulator device.")); - m_deleteButton = new QPushButton(tr("Delete")); + m_deleteButton = new QPushButton(Tr::tr("Delete")); m_deleteButton->setEnabled(false); - m_deleteButton->setToolTip(tr("Delete simulator devices.")); + m_deleteButton->setToolTip(Tr::tr("Delete simulator devices.")); - m_resetButton = new QPushButton(tr("Reset")); + m_resetButton = new QPushButton(Tr::tr("Reset")); m_resetButton->setEnabled(false); - m_resetButton->setToolTip(tr("Reset contents and settings of simulator devices.")); + m_resetButton->setToolTip(Tr::tr("Reset contents and settings of simulator devices.")); - auto createButton = new QPushButton(tr("Create")); - createButton->setToolTip(tr("Create a new simulator device.")); + auto createButton = new QPushButton(Tr::tr("Create")); + createButton->setToolTip(Tr::tr("Create a new simulator device.")); - m_startButton = new QPushButton(tr("Start")); + m_startButton = new QPushButton(Tr::tr("Start")); m_startButton->setEnabled(false); - m_startButton->setToolTip(tr("Start simulator devices.")); + m_startButton->setToolTip(Tr::tr("Start simulator devices.")); auto proxyModel = new QSortFilterProxyModel(this); proxyModel->setSourceModel(new SimulatorInfoModel(this)); @@ -92,17 +91,17 @@ IosSettingsWidget::IosSettingsWidget() m_pathWidget->setExpectedKind(Utils::PathChooser::ExistingDirectory); m_pathWidget->lineEdit()->setReadOnly(true); m_pathWidget->setFilePath(IosConfigurations::screenshotDir()); - m_pathWidget->addButton(tr("Screenshot"), this, - std::bind(&IosSettingsWidget::onScreenshot, this)); + m_pathWidget->addButton(Tr::tr("Screenshot"), this, + std::bind(&IosSettingsWidget::onScreenshot, this)); using namespace Utils::Layouting; Column { Group { - title(tr("Devices")), + title(Tr::tr("Devices")), Row { m_deviceAskCheckBox } }, Group { - title(tr("Simulator")), + title(Tr::tr("Simulator")), Column { Row { m_deviceView, @@ -117,7 +116,7 @@ IosSettingsWidget::IosSettingsWidget() }, }, hr, - Row { tr("Screenshot directory:"), m_pathWidget } + Row { Tr::tr("Screenshot directory:"), m_pathWidget } } } }.attachTo(this); @@ -151,10 +150,11 @@ void IosSettingsWidget::onStart() return; if (simulatorInfoList.count() > simStartWarnCount) { - const QString message = tr("You are trying to launch %n simulators simultaneously. This " - "will take significant system resources. Do you really want to " - "continue?", "", simulatorInfoList.count()); - const int buttonCode = QMessageBox::warning(this, tr("Simulator Start"), message, + const QString message = + Tr::tr("You are trying to launch %n simulators simultaneously. This " + "will take significant system resources. Do you really want to " + "continue?", "", simulatorInfoList.count()); + const int buttonCode = QMessageBox::warning(this, Tr::tr("Simulator Start"), message, QMessageBox::Ok | QMessageBox::Abort, QMessageBox::Abort); @@ -164,19 +164,19 @@ void IosSettingsWidget::onStart() QPointer statusDialog = new SimulatorOperationDialog(this); statusDialog->setAttribute(Qt::WA_DeleteOnClose); - statusDialog->addMessage(tr("Starting %n simulator device(s)...", "", simulatorInfoList.count()), + statusDialog->addMessage(Tr::tr("Starting %n simulator device(s)...", "", simulatorInfoList.count()), Utils::NormalMessageFormat); QList> futureList; for (const SimulatorInfo &info : simulatorInfoList) { if (!info.isShutdown()) { - statusDialog->addMessage(tr("Cannot start simulator (%1, %2) in current state: %3") + statusDialog->addMessage(Tr::tr("Cannot start simulator (%1, %2) in current state: %3") .arg(info.name).arg(info.runtimeName).arg(info.state), Utils::StdErrFormat); } else { futureList << QFuture(Utils::onResultReady( SimulatorControl::startSimulator(info.identifier), - std::bind(onSimOperation, info, statusDialog, tr("simulator start"), _1))); + std::bind(onSimOperation, info, statusDialog, Tr::tr("simulator start"), _1))); } } @@ -192,14 +192,14 @@ void IosSettingsWidget::onCreate() { QPointer statusDialog = new SimulatorOperationDialog(this); statusDialog->setAttribute(Qt::WA_DeleteOnClose); - statusDialog->addMessage(tr("Creating simulator device..."), Utils::NormalMessageFormat); + statusDialog->addMessage(Tr::tr("Creating simulator device..."), Utils::NormalMessageFormat); const auto onSimulatorCreate = [statusDialog](const QString &name, const SimulatorControl::ResponseData &response) { if (response.success) { - statusDialog->addMessage(tr("Simulator device (%1) created.\nUDID: %2") + statusDialog->addMessage(Tr::tr("Simulator device (%1) created.\nUDID: %2") .arg(name).arg(response.simUdid), Utils::StdOutFormat); } else { - statusDialog->addMessage(tr("Simulator device (%1) creation failed.\nError: %2"). + statusDialog->addMessage(Tr::tr("Simulator device (%1) creation failed.\nError: %2"). arg(name).arg(response.commandOutput), Utils::StdErrFormat); } @@ -227,8 +227,8 @@ void IosSettingsWidget::onReset() if (simulatorInfoList.isEmpty()) return; - const int userInput = QMessageBox::question(this, tr("Reset"), - tr("Do you really want to reset the contents and settings" + const int userInput = QMessageBox::question(this, Tr::tr("Reset"), + Tr::tr("Do you really want to reset the contents and settings" " of the %n selected device(s)?", "", simulatorInfoList.count())); if (userInput == QMessageBox::No) @@ -236,13 +236,14 @@ void IosSettingsWidget::onReset() QPointer statusDialog = new SimulatorOperationDialog(this); statusDialog->setAttribute(Qt::WA_DeleteOnClose); - statusDialog->addMessage(tr("Resetting contents and settings..."), Utils::NormalMessageFormat); + statusDialog->addMessage(Tr::tr("Resetting contents and settings..."), + Utils::NormalMessageFormat); QList> futureList; for (const SimulatorInfo &info : simulatorInfoList) { futureList << QFuture(Utils::onResultReady( SimulatorControl::resetSimulator(info.identifier), - std::bind(onSimOperation, info, statusDialog, tr("simulator reset"), _1))); + std::bind(onSimOperation, info, statusDialog, Tr::tr("simulator reset"), _1))); } statusDialog->addFutures(futureList); @@ -260,17 +261,17 @@ void IosSettingsWidget::onRename() return; const SimulatorInfo &simInfo = simulatorInfoList.at(0); - const QString newName = QInputDialog::getText(this, tr("Rename %1").arg(simInfo.name), - tr("Enter new name:")); + const QString newName = QInputDialog::getText(this, Tr::tr("Rename %1").arg(simInfo.name), + Tr::tr("Enter new name:")); if (newName.isEmpty()) return; QPointer statusDialog = new SimulatorOperationDialog(this); statusDialog->setAttribute(Qt::WA_DeleteOnClose); - statusDialog->addMessage(tr("Renaming simulator device..."), Utils::NormalMessageFormat); + statusDialog->addMessage(Tr::tr("Renaming simulator device..."), Utils::NormalMessageFormat); QFuture f = QFuture(Utils::onResultReady( SimulatorControl::renameSimulator(simInfo.identifier, newName), - std::bind(onSimOperation, simInfo, statusDialog, tr("simulator rename"), _1))); + std::bind(onSimOperation, simInfo, statusDialog, Tr::tr("simulator rename"), _1))); statusDialog->addFutures({f}); statusDialog->exec(); // Modal dialog returns only when all the operations are done or cancelled. } @@ -285,21 +286,22 @@ void IosSettingsWidget::onDelete() if (simulatorInfoList.isEmpty()) return; - const int userInput = QMessageBox::question(this, tr("Delete Device"), - tr("Do you really want to delete the %n selected " - "device(s)?", "", simulatorInfoList.count())); + const int userInput = + QMessageBox::question(this, Tr::tr("Delete Device"), + Tr::tr("Do you really want to delete the %n selected " + "device(s)?", "", simulatorInfoList.count())); if (userInput == QMessageBox::No) return; QPointer statusDialog = new SimulatorOperationDialog(this); statusDialog->setAttribute(Qt::WA_DeleteOnClose); - statusDialog->addMessage(tr("Deleting %n simulator device(s)...", "", simulatorInfoList.count()), + statusDialog->addMessage(Tr::tr("Deleting %n simulator device(s)...", "", simulatorInfoList.count()), Utils::NormalMessageFormat); QList> futureList; for (const SimulatorInfo &info : simulatorInfoList) { futureList << QFuture(Utils::onResultReady( SimulatorControl::deleteSimulator(info.identifier), - std::bind(onSimOperation, info, statusDialog, tr("simulator delete"), _1))); + std::bind(onSimOperation, info, statusDialog, Tr::tr("simulator delete"), _1))); } statusDialog->addFutures(futureList); @@ -324,13 +326,13 @@ void IosSettingsWidget::onScreenshot() QPointer statusDialog = new SimulatorOperationDialog(this); statusDialog->setAttribute(Qt::WA_DeleteOnClose); - statusDialog->addMessage(tr("Capturing screenshots from %n device(s)...", "", - simulatorInfoList.count()), Utils::NormalMessageFormat); + statusDialog->addMessage(Tr::tr("Capturing screenshots from %n device(s)...", "", + simulatorInfoList.count()), Utils::NormalMessageFormat); QList> futureList; for (const SimulatorInfo &info : simulatorInfoList) { futureList << QFuture(Utils::onResultReady( SimulatorControl::takeSceenshot(info.identifier, generatePath(info)), - std::bind(onSimOperation, info, statusDialog, tr("simulator screenshot"), _1))); + std::bind(onSimOperation, info, statusDialog, Tr::tr("simulator screenshot"), _1))); } statusDialog->addFutures(futureList); diff --git a/src/plugins/ios/iossettingswidget.h b/src/plugins/ios/iossettingswidget.h index ed0e2208af7..6d315db6906 100644 --- a/src/plugins/ios/iossettingswidget.h +++ b/src/plugins/ios/iossettingswidget.h @@ -3,12 +3,8 @@ #pragma once -#include "iosconfigurations.h" - #include -#include - QT_BEGIN_NAMESPACE class QCheckBox; class QPushButton; @@ -21,8 +17,6 @@ namespace Ios::Internal { class IosSettingsWidget final : public Core::IOptionsPageWidget { - Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosSettingsWidget) - public: IosSettingsWidget(); ~IosSettingsWidget() final; diff --git a/src/plugins/ios/iossimulator.cpp b/src/plugins/ios/iossimulator.cpp index 527e9528246..b58e451400d 100644 --- a/src/plugins/ios/iossimulator.cpp +++ b/src/plugins/ios/iossimulator.cpp @@ -3,23 +3,22 @@ #include "iossimulator.h" #include "iosconstants.h" -#include "iostoolhandler.h" +#include "iostr.h" #include + #include #include -#include #include using namespace ProjectExplorer; -namespace Ios { -namespace Internal { +namespace Ios::Internal { -static const QLatin1String iosDeviceTypeDisplayNameKey = QLatin1String("displayName"); -static const QLatin1String iosDeviceTypeTypeKey = QLatin1String("type"); -static const QLatin1String iosDeviceTypeIdentifierKey = QLatin1String("identifier"); +const QLatin1String iosDeviceTypeDisplayNameKey("displayName"); +const QLatin1String iosDeviceTypeTypeKey("type"); +const QLatin1String iosDeviceTypeIdentifierKey("identifier"); IosSimulator::IosSimulator(Utils::Id id) : m_lastPort(Constants::IOS_SIMULATOR_PORT_START) @@ -28,8 +27,8 @@ IosSimulator::IosSimulator(Utils::Id id) setType(Constants::IOS_SIMULATOR_TYPE); setMachineType(IDevice::Emulator); setOsType(Utils::OsTypeMac); - setDefaultDisplayName(tr("iOS Simulator")); - setDisplayType(tr("iOS Simulator")); + setDefaultDisplayName(Tr::tr("iOS Simulator")); + setDisplayType(Tr::tr("iOS Simulator")); setDeviceState(DeviceReadyToUse); } @@ -209,13 +208,12 @@ QDebug operator <<(QDebug debug, const IosDeviceType &deviceType) // Factory IosSimulatorFactory::IosSimulatorFactory() - : ProjectExplorer::IDeviceFactory(Constants::IOS_SIMULATOR_TYPE) + : IDeviceFactory(Constants::IOS_SIMULATOR_TYPE) { - setDisplayName(IosSimulator::tr("iOS Simulator")); + setDisplayName(Tr::tr("iOS Simulator")); setCombinedIcon(":/ios/images/iosdevicesmall.png", ":/ios/images/iosdevice.png"); - setConstructionFunction([] { return ProjectExplorer::IDevice::Ptr(new IosSimulator()); }); + setConstructionFunction([] { return IDevice::Ptr(new IosSimulator()); }); } -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/iossimulator.h b/src/plugins/ios/iossimulator.h index 0a6d13af03c..d2d69f1d0ef 100644 --- a/src/plugins/ios/iossimulator.h +++ b/src/plugins/ios/iossimulator.h @@ -10,8 +10,7 @@ #include -namespace Ios { -namespace Internal { +namespace Ios::Internal { class IosConfigurations; class IosSimulatorFactory; @@ -42,8 +41,6 @@ QDebug operator <<(QDebug debug, const IosDeviceType &deviceType); class IosSimulator final : public ProjectExplorer::IDevice { - Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosSimulator) - public: using ConstPtr = QSharedPointer; using Ptr = QSharedPointer; @@ -69,7 +66,6 @@ public: IosSimulatorFactory(); }; -} // namespace Internal -} // namespace Ios +} // Ios::Internal Q_DECLARE_METATYPE(Ios::Internal::IosDeviceType) diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp index 6320bda9bbd..0cf9fed5cec 100644 --- a/src/plugins/ios/iostoolhandler.cpp +++ b/src/plugins/ios/iostoolhandler.cpp @@ -2,23 +2,23 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "iostoolhandler.h" + #include "iosconfigurations.h" -#include "iosconstants.h" #include "iossimulator.h" +#include "iostr.h" #include "simulatorcontrol.h" #include #include -#include +#include #include #include #include #include #include -#include #include #include #include @@ -373,7 +373,7 @@ void IosToolHandlerPrivate::toolExited(int code) void IosDeviceToolHandlerPrivate::subprocessError(QProcess::ProcessError error) { if (state != Stopped) - errorMsg(IosToolHandler::tr("iOS tool error %1").arg(error)); + errorMsg(Tr::tr("iOS tool error %1").arg(error)); stop(-1); if (error == QProcess::FailedToStart) { qCDebug(toolHandlerLog) << "IosToolHandler::finished(" << this << ")"; @@ -807,7 +807,7 @@ void IosSimulatorToolHandlerPrivate::requestTransferApp(const QString &appBundle if (response.success) { installAppOnSimulator(); } else { - errorMsg(IosToolHandler::tr("Application install on simulator failed. Simulator not running.")); + errorMsg(Tr::tr("Application install on simulator failed. Simulator not running.")); didTransferApp(m_bundlePath, m_deviceId, IosToolHandler::Failure); emit q->finished(q); } @@ -833,7 +833,7 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath, Utils::FilePath appBundle = Utils::FilePath::fromString(m_bundlePath); if (!appBundle.exists()) { - errorMsg(IosToolHandler::tr("Application launch on simulator failed. Invalid bundle path %1") + errorMsg(Tr::tr("Application launch on simulator failed. Invalid bundle path %1") .arg(m_bundlePath)); didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Failure); return; @@ -845,7 +845,7 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath, if (response.success) { launchAppOnSimulator(extraArgs); } else { - errorMsg(IosToolHandler::tr("Application launch on simulator failed. Simulator not running.")); + errorMsg(Tr::tr("Application launch on simulator failed. Simulator not running.")); didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Failure); } }; @@ -896,7 +896,7 @@ void IosSimulatorToolHandlerPrivate::installAppOnSimulator() isTransferringApp(m_bundlePath, m_deviceId, 100, 100, ""); didTransferApp(m_bundlePath, m_deviceId, IosToolHandler::Success); } else { - errorMsg(IosToolHandler::tr("Application install on simulator failed. %1") + errorMsg(Tr::tr("Application install on simulator failed. %1") .arg(response.commandOutput)); didTransferApp(m_bundlePath, m_deviceId, IosToolHandler::Failure); } @@ -925,12 +925,12 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &ext captureConsole = stdoutFile->open() && stderrFile->open(); if (!captureConsole) - errorMsg(IosToolHandler::tr("Cannot capture console output from %1. " - "Error redirecting output to %2.*") + errorMsg(Tr::tr("Cannot capture console output from %1. " + "Error redirecting output to %2.*") .arg(bundleId).arg(fileTemplate)); } else { - errorMsg(IosToolHandler::tr("Cannot capture console output from %1. " - "Install Xcode 8 or later.").arg(bundleId)); + errorMsg(Tr::tr("Cannot capture console output from %1. " + "Install Xcode 8 or later.").arg(bundleId)); } auto monitorPid = [this](QFutureInterface &fi, qint64 pid) { @@ -961,8 +961,8 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &ext stdoutFile, stderrFile)); } else { m_pid = -1; - errorMsg(IosToolHandler::tr("Application launch on simulator failed. %1") - .arg(response.commandOutput)); + errorMsg(Tr::tr("Application launch on simulator failed. %1") + .arg(response.commandOutput)); didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Failure); stop(-1); emit q->finished(q); @@ -984,8 +984,8 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &ext bool IosSimulatorToolHandlerPrivate::isResponseValid(const SimulatorControl::ResponseData &responseData) { if (responseData.simUdid.compare(m_deviceId) != 0) { - errorMsg(IosToolHandler::tr("Invalid simulator response. Device Id mismatch. " - "Device Id = %1 Response Id = %2") + errorMsg(Tr::tr("Invalid simulator response. Device Id mismatch. " + "Device Id = %1 Response Id = %2") .arg(responseData.simUdid) .arg(m_deviceId)); emit q->finished(q); diff --git a/src/plugins/ios/simulatorcontrol.cpp b/src/plugins/ios/simulatorcontrol.cpp index 4e19bf734cc..6e090b61886 100644 --- a/src/plugins/ios/simulatorcontrol.cpp +++ b/src/plugins/ios/simulatorcontrol.cpp @@ -28,8 +28,7 @@ namespace { static Q_LOGGING_CATEGORY(simulatorLog, "qtc.ios.simulator", QtWarningMsg) } -namespace Ios { -namespace Internal { +namespace Ios::Internal { const int simulatorStartTimeout = 60000; @@ -584,5 +583,4 @@ bool SimulatorInfo::operator==(const SimulatorInfo &other) const && runtimeName == other.runtimeName; } -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/simulatorcontrol.h b/src/plugins/ios/simulatorcontrol.h index e2708f93357..15fea7b27bd 100644 --- a/src/plugins/ios/simulatorcontrol.h +++ b/src/plugins/ios/simulatorcontrol.h @@ -1,21 +1,22 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + #pragma once -#include +#include #include #include #include + #include -namespace Ios { -namespace Internal { +namespace Ios::Internal { class SimulatorControlPrivate; - -class SimulatorEntity { +class SimulatorEntity +{ public: QString name; QString identifier; @@ -40,7 +41,8 @@ public: QString runtimeName; }; -class RuntimeInfo : public SimulatorEntity{ +class RuntimeInfo : public SimulatorEntity +{ public: QString version; QString build; @@ -91,8 +93,7 @@ public: static QFuture takeSceenshot(const QString &simUdid, const QString &filePath); }; -} // namespace Internal -} // namespace Ios +} // Ios::Internal Q_DECLARE_METATYPE(Ios::Internal::DeviceTypeInfo) Q_DECLARE_METATYPE(Ios::Internal::RuntimeInfo) diff --git a/src/plugins/ios/simulatorinfomodel.cpp b/src/plugins/ios/simulatorinfomodel.cpp index e17eb2164eb..df58dc98cba 100644 --- a/src/plugins/ios/simulatorinfomodel.cpp +++ b/src/plugins/ios/simulatorinfomodel.cpp @@ -3,13 +3,14 @@ #include "simulatorinfomodel.h" +#include "iostr.h" + #include #include #include -namespace Ios { -namespace Internal { +namespace Ios::Internal { using namespace std::placeholders; @@ -17,7 +18,7 @@ const int colCount = 3; const int nameCol = 0; const int runtimeCol = 1; const int stateCol = 2; -static const int deviceUpdateInterval = 1000; // Update simulator state every 1 sec. +const int deviceUpdateInterval = 1000; // Update simulator state every 1 sec. SimulatorInfoModel::SimulatorInfoModel(QObject *parent) : QAbstractItemModel(parent) @@ -50,7 +51,7 @@ QVariant SimulatorInfoModel::data(const QModelIndex &index, int role) const return ""; } } else if (role == Qt::ToolTipRole) { - return tr("UDID: %1").arg(simInfo.identifier); + return Tr::tr("UDID: %1").arg(simInfo.identifier); } else if (role == Qt::UserRole) { return QVariant::fromValue(simInfo); } @@ -79,13 +80,13 @@ QVariant SimulatorInfoModel::headerData(int section, Qt::Orientation orientation if (role == Qt::DisplayRole) { switch (section) { case nameCol: - return tr("Simulator Name"); + return Tr::tr("Simulator Name"); case runtimeCol: - return tr("Runtime"); + return Tr::tr("Runtime"); case stateCol: - return tr("Current State"); + return Tr::tr("Current State"); default: - return ""; + return {}; } } @@ -140,5 +141,4 @@ void SimulatorInfoModel::populateSimulators(const SimulatorInfoList &simulatorLi } } -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/simulatorinfomodel.h b/src/plugins/ios/simulatorinfomodel.h index 6fa3ae79364..c5769000d32 100644 --- a/src/plugins/ios/simulatorinfomodel.h +++ b/src/plugins/ios/simulatorinfomodel.h @@ -9,16 +9,12 @@ #include - -namespace Ios { -namespace Internal { +namespace Ios::Internal { using SimulatorInfoList = QList; class SimulatorInfoModel : public QAbstractItemModel { - Q_OBJECT - public: SimulatorInfoModel(QObject *parent = nullptr); @@ -34,10 +30,8 @@ private: void requestSimulatorInfo(); void populateSimulators(const SimulatorInfoList &simulatorList); -private: Utils::FutureSynchronizer m_fetchFuture; SimulatorInfoList m_simList; }; -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/simulatoroperationdialog.cpp b/src/plugins/ios/simulatoroperationdialog.cpp index b4a6dd81f5c..56e2d3b69fe 100644 --- a/src/plugins/ios/simulatoroperationdialog.cpp +++ b/src/plugins/ios/simulatoroperationdialog.cpp @@ -3,11 +3,12 @@ #include "simulatoroperationdialog.h" +#include "iostr.h" + #include #include #include -#include #include #include #include @@ -15,19 +16,17 @@ #include #include -namespace { -Q_LOGGING_CATEGORY(iosCommon, "qtc.ios.common", QtWarningMsg) -} - namespace Ios::Internal { +static Q_LOGGING_CATEGORY(iosCommon, "qtc.ios.common", QtWarningMsg) + SimulatorOperationDialog::SimulatorOperationDialog(QWidget *parent) : // TODO: Maximize buttong only because of QTBUG-41932 QDialog(parent,Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMaximizeButtonHint) { resize(580, 320); setModal(true); - setWindowTitle(tr("Simulator Operation Status")); + setWindowTitle(Tr::tr("Simulator Operation Status")); auto messageEdit = new QPlainTextEdit; messageEdit->setReadOnly(true); @@ -100,13 +99,13 @@ void SimulatorOperationDialog::addMessage(const SimulatorInfo &siminfo, { QTC_CHECK(siminfo.identifier == response.simUdid); if (response.success) { - addMessage(tr("%1, %2\nOperation %3 completed successfully.").arg(siminfo.name) + addMessage(Tr::tr("%1, %2\nOperation %3 completed successfully.").arg(siminfo.name) .arg(siminfo.runtimeName).arg(context), Utils::StdOutFormat); } else { QString erroMsg = response.commandOutput.trimmed(); - QString message = tr("%1, %2\nOperation %3 failed.\nUDID: %4\nError: %5").arg(siminfo.name) + QString message = Tr::tr("%1, %2\nOperation %3 failed.\nUDID: %4\nError: %5").arg(siminfo.name) .arg(siminfo.runtimeName).arg(context).arg(siminfo.identifier) - .arg(erroMsg.isEmpty() ? tr("Unknown") : erroMsg); + .arg(erroMsg.isEmpty() ? Tr::tr("Unknown") : erroMsg); addMessage(message, Utils::StdErrFormat); qCDebug(iosCommon) << message; } @@ -118,7 +117,7 @@ void SimulatorOperationDialog::updateInputs() m_buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(!enableOk); m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(enableOk); if (enableOk) { - addMessage(tr("Done."), Utils::NormalMessageFormat); + addMessage(Tr::tr("Done."), Utils::NormalMessageFormat); m_progressBar->setMaximum(1); // Stop progress bar. } } diff --git a/src/plugins/ios/simulatoroperationdialog.h b/src/plugins/ios/simulatoroperationdialog.h index 9c361a484b4..affa0d7c07b 100644 --- a/src/plugins/ios/simulatoroperationdialog.h +++ b/src/plugins/ios/simulatoroperationdialog.h @@ -22,7 +22,7 @@ namespace Ios::Internal { class SimulatorOperationDialog : public QDialog { - Q_OBJECT + public: explicit SimulatorOperationDialog(QWidget *parent = nullptr); ~SimulatorOperationDialog() override;