Game screen: Add button to copy CRC to clipboard

Common/System/System.h

@@ -146,6 +146,7 @@ enum SystemProperty {
 	SYSPROP_HAS_ACCELEROMETER,  // Used to enable/disable tilt input settings
 	SYSPROP_HAS_OPEN_DIRECTORY,
 	SYSPROP_HAS_LOGIN_DIALOG,
+	SYSPROP_HAS_TEXT_CLIPBOARD,
 	SYSPROP_HAS_TEXT_INPUT_DIALOG,  // Indicates that System_InputBoxGetString is available.
 
 	SYSPROP_CAN_CREATE_SHORTCUT,

Qt/QtMain.cpp

@@ -247,6 +247,8 @@ float System_GetPropertyFloat(SystemProperty prop) {
 
 bool System_GetPropertyBool(SystemProperty prop) {
 	switch (prop) {
+	case SYSPROP_HAS_TEXT_CLIPBOARD:
+		return true;
 	case SYSPROP_HAS_BACK_BUTTON:
 		return true;
 	case SYSPROP_HAS_IMAGE_BROWSER:

SDL/SDLMain.cpp

@@ -543,6 +543,7 @@ float System_GetPropertyFloat(SystemProperty prop) {
 
 bool System_GetPropertyBool(SystemProperty prop) {
 	switch (prop) {
+	case SYSPROP_HAS_TEXT_CLIPBOARD:
 	case SYSPROP_CAN_SHOW_FILE:
 #if PPSSPP_PLATFORM(WINDOWS) || PPSSPP_PLATFORM(MAC) || (PPSSPP_PLATFORM(LINUX) && !PPSSPP_PLATFORM(ANDROID))
 		return true;

UI/GameScreen.cpp

@@ -30,6 +30,7 @@
 #include "Common/File/FileUtil.h"
 #include "Common/StringUtils.h"
 #include "Common/System/System.h"
+#include "Common/System/OSD.h"
 #include "Common/System/Request.h"
 #include "Common/System/NativeApp.h"
 #include "Core/Config.h"
@@ -81,6 +82,9 @@ void GameScreen::update() {
 			CRC32string = int2hexstr(crcvalue);
 			tvCRC_->SetVisibility(UI::V_VISIBLE);
 			tvCRC_->SetText(CRC32string);
+			if (tvCRCCopy_) {
+				tvCRCCopy_->SetVisibility(UI::V_VISIBLE);
+			}
 			if (btnCalcCRC_) {
 				btnCalcCRC_->SetVisibility(UI::V_GONE);
 			}
@@ -145,9 +149,29 @@ void GameScreen::CreateViews() {
 		tvPlayTime_ = infoLayout->Add(new TextView("", ALIGN_LEFT, true, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)));
 		tvPlayTime_->SetShadow(true);
 		tvPlayTime_->SetVisibility(V_GONE);
-		tvCRC_ = infoLayout->Add(new TextView("", ALIGN_LEFT, true, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)));
+
+		LinearLayout *crcHoriz = infoLayout->Add(new LinearLayout(ORIENT_HORIZONTAL));
+		tvCRC_ = crcHoriz->Add(new TextView("", ALIGN_LEFT, true, new LinearLayoutParams(0.0, G_VCENTER)));
 		tvCRC_->SetShadow(true);
-		tvCRC_->SetVisibility(Reporting::HasCRC(gamePath_) ? V_VISIBLE : V_GONE);
+		Visibility crcVisibility = Reporting::HasCRC(gamePath_) ? V_VISIBLE : V_GONE;
+		tvCRC_->SetVisibility(crcVisibility);
+		if (System_GetPropertyBool(SYSPROP_HAS_TEXT_CLIPBOARD)) {
+			tvCRCCopy_ = crcHoriz->Add(new Button(di->T("Copy to clipboard"), new LinearLayoutParams(0.0, G_VCENTER)));
+			tvCRCCopy_->OnClick.Add([this](UI::EventParams &) {
+				u32 crc = Reporting::RetrieveCRC(gamePath_);
+				char buffer[16];
+				snprintf(buffer, sizeof(buffer), "%08X", crc);
+				System_CopyStringToClipboard(buffer);
+				// Success indication. Not worth a translatable string.
+				g_OSD.Show(OSDType::MESSAGE_SUCCESS, buffer, 1.0f);
+				return UI::EVENT_DONE;
+			});
+			tvCRCCopy_->SetVisibility(crcVisibility);
+			tvCRCCopy_->SetScale(0.82f);
+		} else {
+			tvCRCCopy_ = nullptr;
+		}
+
 		tvVerified_ = infoLayout->Add(new NoticeView(NoticeLevel::INFO, ga->T("Click \"Calculate CRC\" to verify ISO"), "", new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)));
 		tvVerified_->SetVisibility(UI::V_GONE);
 		tvVerified_->SetSquishy(true);
@@ -170,6 +194,7 @@ void GameScreen::CreateViews() {
 		tvRegion_ = nullptr;
 		tvPlayTime_ = nullptr;
 		tvCRC_ = nullptr;
+		tvCRCCopy_ = nullptr;
 		tvVerified_ = nullptr;
 	}
 
@@ -360,6 +385,9 @@ ScreenRenderFlags GameScreen::render(ScreenRenderMode mode) {
 		std::string crc = StringFromFormat("%08X", crcVal);
 		tvCRC_->SetText(ReplaceAll(rp->T("FeedbackCRCValue", "Disc CRC: %1"), "%1", crc));
 		tvCRC_->SetVisibility(UI::V_VISIBLE);
+		if (tvCRCCopy_) {
+			tvCRCCopy_->SetVisibility(UI::V_VISIBLE);
+		}
 
 		// Let's check the CRC in the game database, looking up the ID and also matching the crc.
 		std::vector<GameDBInfo> dbInfos;

UI/GameScreen.h

@@ -75,6 +75,7 @@ class GameScreen : public UIDialogScreenWithGameBackground {
 	UI::TextView *tvPlayTime_ = nullptr;
 	UI::TextView *tvCRC_ = nullptr;
 	UI::TextView *tvID_ = nullptr;
+	UI::Button *tvCRCCopy_ = nullptr;
 	NoticeView *tvVerified_ = nullptr;
 
 	UI::Choice *btnGameSettings_ = nullptr;

UWP/PPSSPP_UWPMain.cpp

@@ -408,6 +408,7 @@ void System_Toast(std::string_view str) {}
 
 bool System_GetPropertyBool(SystemProperty prop) {
 	switch (prop) {
+	case SYSPROP_HAS_TEXT_CLIPBOARD:
 	case SYSPROP_HAS_OPEN_DIRECTORY:
 	{
 		return !IsXBox();

Windows/main.cpp

@@ -355,6 +355,7 @@ float System_GetPropertyFloat(SystemProperty prop) {
 
 bool System_GetPropertyBool(SystemProperty prop) {
 	switch (prop) {
+	case SYSPROP_HAS_TEXT_CLIPBOARD:
 	case SYSPROP_HAS_DEBUGGER:
 	case SYSPROP_HAS_FILE_BROWSER:
 	case SYSPROP_HAS_FOLDER_BROWSER:
@@ -910,7 +911,6 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
 	std::string controlsConfigFilename = "";
 	const std::wstring controlsOption = L"--controlconfig=";
 
-
 	for (size_t i = 1; i < wideArgs.size(); ++i) {
 		if (wideArgs[i][0] == L'\0')
 			continue;

android/jni/app-android.cpp

@@ -499,6 +499,8 @@ bool System_GetPropertyBool(SystemProperty prop) {
 	case SYSPROP_SUPPORTS_SUSTAINED_PERF_MODE:
 		return sustainedPerfSupported;  // 7.0 introduced sustained performance mode as an optional feature.
 	case SYSPROP_HAS_TEXT_INPUT_DIALOG:
+		return androidVersion >= 11;  // honeycomb
+	case SYSPROP_HAS_TEXT_CLIPBOARD:
 		return true;
 	case SYSPROP_HAS_OPEN_DIRECTORY:
 		return false;  // We have this implemented but it may or may not work depending on if a file explorer is installed.
@@ -1114,6 +1116,9 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string
 	case SystemRequestType::RECREATE_ACTIVITY:
 		PushCommand("recreate", param1);
 		return true;
+	case SystemRequestType::COPY_TO_CLIPBOARD:
+		PushCommand("copy_to_clipboard", param1);
+		return true;
 	case SystemRequestType::INPUT_TEXT_MODAL:
 	{
 		std::string serialized = StringFromFormat("%d:@:%s:@:%s", requestId, param1.c_str(), param2.c_str());

android/src/org/ppsspp/ppsspp/NativeActivity.java

@@ -7,6 +7,8 @@
 import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.UiModeManager;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -1666,10 +1668,23 @@ public boolean processCommand(String command, String params) {
 				NativeApp.reportException(e, params);
 				return false;
 			}
+		} else if (command.equals("copy_to_clipboard")) {
+			if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+				copyStringToClipboard(params);
+			}
+		} else {
+			Log.w(TAG, "Unknown string command " + command);
 		}
 		return false;
 	}
 
+	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
+	private void copyStringToClipboard(String text) {
+		ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+		ClipData clip = ClipData.newPlainText("Copied Text", text);
+		clipboard.setPrimaryClip(clip);
+	}
+
 	@SuppressLint("NewApi")
 	@Override
 	public void recreate() {

assets/lang/ar_AE.ini

@@ -381,6 +381,7 @@ ConfirmLoad = ‎تحميل هذه البيانات?
 ConnectingAP = Connecting to the access point.\nPlease wait...
 ConnectingPleaseWait = Connecting.\nPlease wait...
 ConnectionName = Connection name
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Corrupted data
 Delete = ‎مسح
 Delete all = ‎مسح الكل

assets/lang/az_AZ.ini

@@ -373,6 +373,7 @@ ConfirmLoad = Load this data?
 ConnectingAP = Connecting to the access point.\nPlease wait...
 ConnectingPleaseWait = Connecting.\nPlease wait...
 ConnectionName = Connection name
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Corrupted data
 Delete = Sil
 Delete all = Delete all

assets/lang/bg_BG.ini

@@ -373,6 +373,7 @@ ConfirmLoad = Зареди тези данни?
 ConnectingAP = Connecting to the access point.\nPlease wait...
 ConnectingPleaseWait = Connecting.\nPlease wait...
 ConnectionName = Connection name
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Corrupted data
 Delete = Изтрий
 Delete all = Delete all

assets/lang/ca_ES.ini

@@ -373,6 +373,7 @@ ConfirmLoad = Vols carregar les dades?
 ConnectingAP = Connectant al punt d'accés.\nPer favor espera...
 ConnectingPleaseWait = Connectant.\nPer favor espera...
 ConnectionName = Nom de la connexió
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Dades corruptes
 Delete = Eliminar
 Delete all = Eliminar tot

assets/lang/cz_CZ.ini

@@ -373,6 +373,7 @@ ConfirmLoad = Načíst tyto data?
 ConnectingAP = Connecting to the access point.\nPlease wait...
 ConnectingPleaseWait = Connecting.\nPlease wait...
 ConnectionName = Connection name
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Corrupted data
 Delete = Smazat
 Delete all = Smazat vše

assets/lang/da_DK.ini

@@ -373,6 +373,7 @@ ConfirmLoad = Hent dette data?
 ConnectingAP = Connecting to the access point.\nPlease wait...
 ConnectingPleaseWait = Connecting.\nPlease wait...
 ConnectionName = Connection name
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Corrupted data
 Delete = Slet
 Delete all = Slet alt

assets/lang/de_DE.ini

@@ -373,6 +373,7 @@ ConfirmLoad = Wollen Sie diese Daten laden?
 ConnectingAP = Verbinde zu dem Access Point.\nBitte warten...
 ConnectingPleaseWait = Verbinde.\nBitte warten...
 ConnectionName = Connection name
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Corrupted data
 Delete = Löschen
 Delete all = Alle löschen

assets/lang/dr_ID.ini

@@ -373,6 +373,7 @@ ConfirmLoad = Bukka'mi te' data?
 ConnectingAP = Connecting to the access point.\nPlease wait...
 ConnectingPleaseWait = Connecting.\nPlease wait...
 ConnectionName = Connection name
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Corrupted data
 Delete = Hapusi
 Delete all = Delete all

assets/lang/en_US.ini

@@ -397,6 +397,7 @@ ConfirmLoad = Load this data?
 ConnectingAP = Connecting to the access point.\nPlease wait...
 ConnectingPleaseWait = Connecting.\nPlease wait...
 ConnectionName = Connection name
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Corrupted data
 Delete = Delete
 Delete all = Delete all

assets/lang/es_ES.ini

@@ -373,6 +373,7 @@ ConfirmLoad = ¿Deseas cargar estos datos guardados?
 ConnectingAP = Conectando al punto de acceso.\nPor favor espera...
 ConnectingPleaseWait = Conectando.\nPor favor espera...
 ConnectionName = Nombre de la conexión
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Datos corruptos
 Delete = Borrar
 Delete all = Borrar todo

assets/lang/es_LA.ini

@@ -373,6 +373,7 @@ ConfirmLoad = ¿Deseas cargar estos datos guardados?
 ConnectingAP = Conectando a un punto de acceso.\nEspere un momento...
 ConnectingPleaseWait = Conectando \nEspere un momento...
 ConnectionName = Nombre de conexión
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Datos dañados
 Delete = Borrar
 Delete all = Borrar todos

assets/lang/fa_IR.ini

@@ -373,6 +373,7 @@ ConfirmLoad = ‎بارگیری این داده؟
 ConnectingAP = Connecting to the access point.\nPlease wait...
 ConnectingPleaseWait = Connecting.\nPlease wait...
 ConnectionName = نام اتصال
+Copy to clipboard = Copy to clipboard
 Corrupted Data = داده‌ها خراب شده
 Delete = ‎حذف
 Delete all = حذف همه

assets/lang/fi_FI.ini

@@ -373,6 +373,7 @@ ConfirmLoad = Load this data?
 ConnectingAP = Connecting to the access point.\nPlease wait...
 ConnectingPleaseWait = Connecting.\nPlease wait...
 ConnectionName = Connection name
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Corrupted data
 Delete = Poista
 Delete all = Poista kaikki

assets/lang/fr_FR.ini

@@ -373,6 +373,7 @@ ConfirmLoad = Charger ces données ?
 ConnectingAP = Connexion au point d'accès\nVeuillez patienter...
 ConnectingPleaseWait = Connexion en cours\nVeuillez patienter...
 ConnectionName = Nom de la connexion
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Données corrompues
 Delete = Supprimer
 Delete all = Tout supprimer

assets/lang/gl_ES.ini

@@ -373,6 +373,7 @@ ConfirmLoad = Desexas cargar estes datos gardados?
 ConnectingAP = Connecting to the access point.\nPlease wait...
 ConnectingPleaseWait = Connecting.\nPlease wait...
 ConnectionName = Connection name
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Corrupted data
 Delete = Borrar
 Delete all = Borrar todo

assets/lang/gr_EL.ini

@@ -373,6 +373,7 @@ ConfirmLoad = ΦΟΡΤΩΣΗ ΔΕΔΟΜΕΝΩΝ;
 ConnectingAP = Connecting to the access point.\nPlease wait...
 ConnectingPleaseWait = Connecting.\nPlease wait...
 ConnectionName = Connection name
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Corrupted data
 Delete = ΔΙΑΓΡΑΦΗ
 Delete all = ΔΙΑΓΡΑΦΗ ΟΛΩΝ

assets/lang/he_IL.ini

@@ -373,6 +373,7 @@ ConfirmLoad = ?ולא םינותנ ןועטל הצור
 ConnectingAP = Connecting to the access point.\nPlease wait...
 ConnectingPleaseWait = Connecting.\nPlease wait...
 ConnectionName = Connection name
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Corrupted data
 Delete = קחמ
 Delete all = Delete all

assets/lang/he_IL_invert.ini

@@ -373,6 +373,7 @@ ConfirmLoad = ?ולא םינותנ ןועטל הצור
 ConnectingAP = Connecting to the access point.\nPlease wait...
 ConnectingPleaseWait = Connecting.\nPlease wait...
 ConnectionName = Connection name
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Corrupted data
 Delete = קחמ
 Delete all = Delete all

assets/lang/hr_HR.ini

@@ -373,6 +373,7 @@ ConfirmLoad = Učitaj ovu datu?
 ConnectingAP = Connecting to the access point.\nPlease wait...
 ConnectingPleaseWait = Connecting.\nPlease wait...
 ConnectionName = Connection name
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Corrupted data
 Delete = Izbriši
 Delete all = Izbriši sve

assets/lang/hu_HU.ini

@@ -373,6 +373,7 @@ ConfirmLoad = Betöltöd ezt a mentést?
 ConnectingAP = Connecting to the access point.\nPlease wait...
 ConnectingPleaseWait = Connecting.\nPlease wait...
 ConnectionName = Connection name
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Corrupted data
 Delete = Töröl
 Delete all = Mindet töröl

assets/lang/id_ID.ini

@@ -373,6 +373,7 @@ ConfirmLoad = Muat data ini?
 ConnectingAP = Menghubungkan ke titik akses.\nHarap tunggu...
 ConnectingPleaseWait = Menghubungkan.\nHarap tunggu...
 ConnectionName = Nama koneksi
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Data rusak
 Delete = Hapus
 Delete all = Hapus semua

assets/lang/it_IT.ini

@@ -373,6 +373,7 @@ ConfirmLoad = Caricare questi dati?
 ConnectingAP = Connessione in corso dal punto di accesso.\nAttendere, prego...
 ConnectingPleaseWait = Connessione in corso.\nAttendere, prego...
 ConnectionName = Nome connessione
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Dati corrotti
 Delete = Elimina
 Delete all = Elimina tutto

assets/lang/ja_JP.ini

@@ -373,6 +373,7 @@ ConfirmLoad = データをロードしますか？
 ConnectingAP = アクセスポイントに接続中.\nしばらくお待ちください...
 ConnectingPleaseWait = 接続中.\nしばらくお待ちください...
 ConnectionName = 接続名
+Copy to clipboard = Copy to clipboard
 Corrupted Data = 破損したデータ
 Delete = 削除
 Delete all = 全て削除

assets/lang/jv_ID.ini

@@ -373,6 +373,7 @@ ConfirmLoad = Mbukak data iki?
 ConnectingAP = Connecting to the access point.\nPlease wait...
 ConnectingPleaseWait = Connecting.\nPlease wait...
 ConnectionName = Connection name
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Corrupted data
 Delete = Mbusek
 Delete all = Mbusek Kabeh

assets/lang/ko_KR.ini

@@ -373,6 +373,7 @@ ConfirmLoad = 이 데이터를 불러오겠습니까?
 ConnectingAP = 접속 포인트에 연결하는 중입니다.\n잠시만 기다려 주세요...
 ConnectingPleaseWait = 연결 중입니다.\n잠시만 기다려 주세요...
 ConnectionName = 연결 이름
+Copy to clipboard = Copy to clipboard
 Corrupted Data = 손상된 데이터
 Delete = 삭제
 Delete all = 모두 삭제

assets/lang/ku_SO.ini

@@ -387,6 +387,7 @@ ConfirmLoad = ئەم زانیاریانا لۆد ئەکەیت؟
 ConnectingAP = پەیوەندی ئەکەین بە خاڵی دەست بە یەک گەستن.\nتکایە بووەستە...
 ConnectingPleaseWait = پەیوەندی ئەکەین.\nتکایە بووەستە...
 ConnectionName = ناوی پەیوەندی
+Copy to clipboard = Copy to clipboard
 Corrupted Data = زانیاریەکە تێکچووە
 Delete = سڕینەوە
 Delete all = سڕینەوەی هەمووی

assets/lang/lo_LA.ini

@@ -373,6 +373,7 @@ ConfirmLoad = ຕ້ອງການໂຫຼດຂໍ້ມູນນີ້ຫຼ
 ConnectingAP = Connecting to the access point.\nPlease wait...
 ConnectingPleaseWait = Connecting.\nPlease wait...
 ConnectionName = Connection name
+Copy to clipboard = Copy to clipboard
 Corrupted Data = Corrupted data
 Delete = ລຶບ
 Delete all = ລຶບທັງໝົດ