Jelajahi Sumber

added button tooltip during the upload

Former-commit-id: 59f4a08f0db90dbd6acad994f3e13423727e7458
Gildas 6 tahun lalu
induk
melakukan
47d93774c7

+ 4 - 0
_locales/de/messages.json

@@ -91,6 +91,10 @@
 		"message": "Speicherung aktiviert: ",
 		"description": "Button title during save: 'Save progress: xx%'"
 	},
+	"buttonUploadProgressTooltip": {
+		"message": "Upload aktiviert: ",
+		"description": "Button title during save: 'Upload progress: xx%'"
+	},
 	"buttonOKBadge": {
 		"message": "OK",
 		"description": "Badge label: 'OK'"

+ 4 - 0
_locales/en/messages.json

@@ -91,6 +91,10 @@
 		"message": "Save progress: ",
 		"description": "Button title during save: 'Save progress: xx%'"
 	},
+	"buttonUploadProgressTooltip": {
+		"message": "Upload progress: ",
+		"description": "Button title during save: 'Upload progress: xx%'"
+	},
 	"buttonOKBadge": {
 		"message": "OK",
 		"description": "Badge label: 'OK'"

+ 4 - 0
_locales/es/messages.json

@@ -91,6 +91,10 @@
 		"message": "Progresión del guardado: ",
 		"description": "Button title during save: 'Save progress: xx%'"
 	},
+	"buttonUploadProgressTooltip": {
+		"message": "Progresión del upload: ",
+		"description": "Button title during save: 'Upload progress: xx%'"
+	},
 	"buttonOKBadge": {
 		"message": "OK",
 		"description": "Badge label: 'OK'"

+ 4 - 0
_locales/fr/messages.json

@@ -91,6 +91,10 @@
 		"message": "Progression de la sauvegarde : ",
 		"description": "Button title during save: 'Save progress: xx%'"
 	},
+	"buttonUploadProgressTooltip": {
+		"message": "Progression de l'envoi: ",
+		"description": "Button title during save: 'Upload progress: xx%'"
+	},
 	"buttonOKBadge": {
 		"message": "OK",
 		"description": "Badge label: 'OK'"

+ 4 - 0
_locales/ja/messages.json

@@ -91,6 +91,10 @@
 		"message": "進行状況を保存: ",
 		"description": "Button title during save: 'Save progress: xx%'"
 	},
+	"buttonUploadProgressTooltip": {
+		"message": "Upload progress: ",
+		"description": "Button title during save: 'Upload progress: xx%'"
+	},
 	"buttonOKBadge": {
 		"message": "OK",
 		"description": "Badge label: 'OK'"

+ 4 - 0
_locales/pl/messages.json

@@ -91,6 +91,10 @@
 		"message": "Postęp zapisywania: ",
 		"description": "Button title during save: 'Save progress: xx%'"
 	},
+	"buttonUploadProgressTooltip": {
+		"message": "Upload progress: ",
+		"description": "Button title during save: 'Upload progress: xx%'"
+	},
 	"buttonOKBadge": {
 		"message": "OK",
 		"description": "Badge label: 'OK'"

+ 4 - 0
_locales/ru/messages.json

@@ -91,6 +91,10 @@
 		"message": "Прогресс сохранения: ",
 		"description": "Button title during save: 'Save progress: xx%'"
 	},
+	"buttonUploadProgressTooltip": {
+		"message": "Upload progress: ",
+		"description": "Button title during save: 'Upload progress: xx%'"
+	},
 	"buttonOKBadge": {
 		"message": "OK",
 		"description": "Badge label: 'OK'"

+ 4 - 0
_locales/uk/messages.json

@@ -91,6 +91,10 @@
 		"message": "Прогрес збереження: ",
 		"description": "Button title during save: 'Save progress: xx%'"
 	},
+	"buttonUploadProgressTooltip": {
+		"message": "Upload progress: ",
+		"description": "Button title during save: 'Upload progress: xx%'"
+	},
 	"buttonOKBadge": {
 		"message": "ОК",
 		"description": "Badge label: 'OK'"

+ 4 - 0
_locales/zh_CN/messages.json

@@ -91,6 +91,10 @@
 		"message": "保存进度:",
 		"description": "保存时候的按钮标题: '保存进度:xx%'"
 	},
+	"buttonUploadProgressTooltip": {
+		"message": "Upload progress: ",
+		"description": "Button title during save: 'Upload progress: xx%'"
+	},
 	"buttonOKBadge": {
 		"message": "完成",
 		"description": "徽标标签: 'OK'"

+ 4 - 0
_locales/zh_TW/messages.json

@@ -91,6 +91,10 @@
 		"message": "保存進度:",
 		"description": "保存時候的按鈕標題: '保存進度:xx%'"
 	},
+	"buttonUploadProgressTooltip": {
+		"message": "Upload progress: ",
+		"description": "Button title during save: 'Upload progress: xx%'"
+	},
 	"buttonOKBadge": {
 		"message": "完成",
 		"description": "徽標標籤: 'OK'"

+ 1 - 1
extension/core/bg/downloads.js

@@ -90,7 +90,7 @@ singlefile.extension.core.bg.downloads = (() => {
 									forceWebAuthFlow: message.forceWebAuthFlow,
 									extractAuthCode: message.extractAuthCode
 								}, {
-									onProgress: (offset, size) => singlefile.extension.ui.bg.button.onProgress(sender.tab.id, offset, size)
+									onProgress: (offset, size) => singlefile.extension.ui.bg.button.onUploadProgress(sender.tab.id, offset, size)
 								});
 							} else {
 								message.url = URL.createObjectURL(blob);

+ 14 - 4
extension/ui/bg/ui-button.js

@@ -36,6 +36,7 @@ singlefile.extension.ui.bg.button = (() => {
 	const BUTTON_BLOCKED_BADGE_MESSAGE = browser.i18n.getMessage("buttonBlockedBadge");
 	const BUTTON_OK_BADGE_MESSAGE = browser.i18n.getMessage("buttonOKBadge");
 	const BUTTON_SAVE_PROGRESS_TOOLTIP_MESSAGE = browser.i18n.getMessage("buttonSaveProgressTooltip");
+	const BUTTON_UPLOAD_PROGRESS_TOOLTIP_MESSAGE = browser.i18n.getMessage("buttonUploadProgressTooltip");
 	const BUTTON_AUTOSAVE_ACTIVE_BADGE_MESSAGE = browser.i18n.getMessage("buttonAutoSaveActiveBadge");
 	const BUTTON_AUTOSAVE_ACTIVE_TOOLTIP_MESSAGE = browser.i18n.getMessage("buttonAutoSaveActiveTooltip");
 	const DEFAULT_COLOR = [2, 147, 20, 192];
@@ -132,7 +133,8 @@ singlefile.extension.ui.bg.button = (() => {
 	return {
 		onMessage,
 		onStart,
-		onProgress,
+		onSaveProgress,
+		onUploadProgress,
 		onForbiddenDomain,
 		onUpload,
 		onError,
@@ -149,7 +151,7 @@ singlefile.extension.ui.bg.button = (() => {
 		}
 		if (message.method.endsWith(".processProgress")) {
 			if (message.maxIndex) {
-				onProgress(sender.tab.id, message.index, message.maxIndex);
+				onSaveProgress(sender.tab.id, message.index, message.maxIndex);
 			}
 		}
 		if (message.method.endsWith(".processEnd")) {
@@ -203,12 +205,20 @@ singlefile.extension.ui.bg.button = (() => {
 		refreshTab(tab);
 	}
 
-	function onProgress(tabId, index, maxIndex) {
+	function onSaveProgress(tabId, index, maxIndex) {
+		onProgress(tabId, index, maxIndex, BUTTON_SAVE_PROGRESS_TOOLTIP_MESSAGE);
+	}
+
+	function onUploadProgress(tabId, index, maxIndex) {
+		onProgress(tabId, index, maxIndex, BUTTON_UPLOAD_PROGRESS_TOOLTIP_MESSAGE);
+	}
+
+	function onProgress(tabId, index, maxIndex, tooltipMessage) {
 		const progress = Math.max(Math.min(20, Math.floor((index / maxIndex) * 20)), 0);
 		const barProgress = Math.min(Math.floor((index / maxIndex) * 8), 8);
 		const path = WAIT_ICON_PATH_PREFIX + barProgress + ".png";
 		const state = getButtonState("progress");
-		state.setTitle = { title: BUTTON_SAVE_PROGRESS_TOOLTIP_MESSAGE + (progress * 5) + "%" };
+		state.setTitle = { title: tooltipMessage + (progress * 5) + "%" };
 		state.setIcon = { path };
 		refresh(tabId, state);
 	}