TagSpaces is an offline, open source, document manager with tagging support
feat: added configurable folder color in settings and extconfig
Ilian Sapundshiev09db577aebe0
diff --git a/package-lock.json b/package-lock.jsonindex 1707b090c..d31e682d9 100644--- a/package-lock.json+++ b/package-lock.json@@ -172,7 +172,7 @@"yarn": "please-use-npm"},"optionalDependencies": {- "@tagspacespro/tagspacespro": "5.0.237"+ "@tagspacespro/tagspacespro": "5.0.238"}},"node_modules/@ampproject/remapping": {@@ -18550,9 +18550,9 @@}},"node_modules/@tagspacespro/tagspacespro": {- "version": "5.0.237",- "resolved": "https://npm.pkg.github.com/download/@tagspacespro/tagspacespro/5.0.237/b08845ebf7905fd074ff84d550d32b3ce6acc5bf",- "integrity": "sha512-2zLHtG65MezTOGfMZS4dVOGMfKJE8w46gbrgEsvuHBBYU6FLt/Rx75XEkvbpivsIB0/q/XHGrsclywRdNMzhtw==",+ "version": "5.0.238",+ "resolved": "https://npm.pkg.github.com/download/@tagspacespro/tagspacespro/5.0.238/921f976dbefed6e207f9b16b3274eb92e38aacda",+ "integrity": "sha512-hSSNU+mI7oP6hzhup4Mo+rI+IAYsBp5W8szg77PkdMPjkO60YTfA44xg+rzvrI2RFS5VFxDxtX1QZomAKFlkKQ==","license": "Proprietary","optional": true},diff --git a/package.json b/package.jsonindex 1add4c183..50562f09f 100644--- a/package.json+++ b/package.json@@ -241,7 +241,7 @@"zod-to-json-schema": "3.25.1"},"optionalDependencies": {- "@tagspacespro/tagspacespro": "5.0.237"+ "@tagspacespro/tagspacespro": "5.0.238"},"devDependencies": {"@electron/rebuild": "4.0.3",diff --git a/src/renderer/components/EntryContainerTitle.tsx b/src/renderer/components/EntryContainerTitle.tsxindex a493cd7f1..d929a564a 100644--- a/src/renderer/components/EntryContainerTitle.tsx+++ b/src/renderer/components/EntryContainerTitle.tsx@@ -30,7 +30,11 @@ import TooltipTS from '-/components/Tooltip';import TsIconButton from '-/components/TsIconButton';import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';-import { getSupportedFileTypes, getTagDelimiter } from '-/reducers/settings';+import {+ getDefaultFolderColor,+ getSupportedFileTypes,+ getTagDelimiter,+} from '-/reducers/settings';import { dataTidFormat } from '-/services/test';import { findColorForEntry, getAllTags } from '-/services/utils-io';import Box from '@mui/material/Box';@@ -72,10 +76,12 @@ function EntryContainerTitle(props: Props) {const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);const supportedFileTypes = useSelector(getSupportedFileTypes);+ const defaultFolderColor = useSelector(getDefaultFolderColor);const tagDelimiter: string = useSelector(getTagDelimiter);const fileSystemEntryColor = findColorForEntry(openedEntry,supportedFileTypes,+ defaultFolderColor,);const currentLocation = findLocation(openedEntry.locationID);@@ -200,7 +206,7 @@ function EntryContainerTitle(props: Props) {}}sx={{- backgroundColor: AppConfig.defaultFolderColor,+ backgroundColor: defaultFolderColor,paddingLeft: '10px',WebkitAppRegion: 'no-drag',} as React.CSSProperties & { WebkitAppRegion?: string }diff --git a/src/renderer/components/dialogs/components/SettingsGeneral.tsx b/src/renderer/components/dialogs/components/SettingsGeneral.tsxindex 954716f93..311564d47 100644--- a/src/renderer/components/dialogs/components/SettingsGeneral.tsx+++ b/src/renderer/components/dialogs/components/SettingsGeneral.tsx@@ -73,6 +73,8 @@ function SettingsGeneral() {const [displayColorPicker, setDisplayColorPicker] = useState<boolean>(false);const [displayTextColorPicker, setDisplayTextColorPicker] =useState<boolean>(false);+ const [displayFolderColorPicker, setDisplayFolderColorPicker] =+ useState<boolean>(false);const [filterText, setFilterText] = useState<string>('');const dispatch: AppDispatch = useDispatch();const settings = useSelector(getSettings);@@ -110,6 +112,10 @@ function SettingsGeneral() {setDisplayTextColorPicker(!displayTextColorPicker);};+ const toggleDefaultFolderColorPicker = () => {+ setDisplayFolderColorPicker(!displayFolderColorPicker);+ };+const handleMaxSearchResult = (event) => {dispatch(SettingsActions.setMaxSearchResult(event.target.value));};@@ -654,6 +660,39 @@ function SettingsGeneral() {</ListItem>),},+ {+ label: t('core:defaultFolderColor'),+ jsx: (+ <ListItem>+ <ListItemText primary={t('core:defaultFolderColor')} />+ <TransparentBackground>+ <TooltipTS+ title={+ AppConfig.ExtDefaultFolderColor !== undefined+ ? t('core:settingExternallyConfigured')+ : ''+ }+ >+ <span>+ <TsButton+ data-tid="settingsToggleDefaultFolderColor"+ disabled={AppConfig.ExtDefaultFolderColor !== undefined}+ sx={{+ backgroundColor:+ AppConfig.ExtDefaultFolderColor ??+ settings.defaultFolderColor,+ border: '1px solid lightgray',+ }}+ onClick={toggleDefaultFolderColorPicker}+ >+ + </TsButton>+ </span>+ </TooltipTS>+ </TransparentBackground>+ </ListItem>+ ),+ },AppConfig.isElectron && {label: t('core:useTrashCan'),jsx: (@@ -1050,6 +1089,16 @@ function SettingsGeneral() {color={settings.tagTextColor}/>)}+ {displayFolderColorPicker && (+ <ColorPickerDialog+ open={displayFolderColorPicker}+ setColor={(color) =>+ dispatch(SettingsActions.setDefaultFolderColor(color))+ }+ onClose={() => setDisplayFolderColorPicker(false)}+ color={settings.defaultFolderColor}+ />+ )}{tileServerDialog && (<MapTileServerDialogopen={tileServerDialog !== undefined}diff --git a/src/renderer/locales/bg/core.json b/src/renderer/locales/bg/core.jsonindex f26fdaab4..d0da9e592 100644--- a/src/renderer/locales/bg/core.json+++ b/src/renderer/locales/bg/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "Винаги показвай областта с етикети при стартиране","tagBackgroundColor": "Цвят на фона на етикета по подразбиране","tagForegroundColor": "Цвят на текста на етикета по подразбиране",+ "defaultFolderColor": "Цвят на папката по подразбиране","colorChangesToAllTags": "Приложи промени в цвета на всички етикети от групата","delete": "Изтрий","enableGlobalKeyboardShortcuts": "Активирай глобални клавишни комбинации",diff --git a/src/renderer/locales/ca/core.json b/src/renderer/locales/ca/core.jsonindex 124a6c66f..ed39dc948 100644--- a/src/renderer/locales/ca/core.json+++ b/src/renderer/locales/ca/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "Mostra sempre l'àrea d'etiquetes en iniciar","tagBackgroundColor": "Color de fons predeterminat de l'etiqueta","tagForegroundColor": "Color de text predeterminat de l'etiqueta",+ "defaultFolderColor": "Color de carpeta predeterminat","colorChangesToAllTags": "Aplica els canvis de color a totes les etiquetes del grup","delete": "Elimina","enableGlobalKeyboardShortcuts": "Activa les dreceres de teclat globals",diff --git a/src/renderer/locales/cs/core.json b/src/renderer/locales/cs/core.jsonindex 8b4a30966..619607f53 100644--- a/src/renderer/locales/cs/core.json+++ b/src/renderer/locales/cs/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "Po startu vždy zobrazit oblast štítků","tagBackgroundColor": "Výchozí barva pozadí štítku","tagForegroundColor": "Výchozí barva textu štítku",+ "defaultFolderColor": "Výchozí barva složky","colorChangesToAllTags": "Použít změny barev na všechny štítky ve skupině","delete": "Smazat","enableGlobalKeyboardShortcuts": "Povolit globální klávesové zkratky",diff --git a/src/renderer/locales/da_DK/core.json b/src/renderer/locales/da_DK/core.jsonindex 365942500..c592ddc50 100644--- a/src/renderer/locales/da_DK/core.json+++ b/src/renderer/locales/da_DK/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "Vis altid mærkeområde ved opstart","tagBackgroundColor": "Standard baggrundsfarve for mærker","tagForegroundColor": "Standard tekstfarve for mærker",+ "defaultFolderColor": "Standard mappefarve","colorChangesToAllTags": "Anvend farveændringer på alle mærker i gruppen","delete": "Slet","enableGlobalKeyboardShortcuts": "Aktiver globale tastaturgenveje",diff --git a/src/renderer/locales/de_DE/core.json b/src/renderer/locales/de_DE/core.jsonindex c661480d1..aba0d3499 100644--- a/src/renderer/locales/de_DE/core.json+++ b/src/renderer/locales/de_DE/core.json@@ -145,6 +145,7 @@"showTagAreaOnStartup": "Tag-Bereich beim Start immer anzeigen","tagBackgroundColor": "Standard Tag-Hintergrundfarbe","tagForegroundColor": "Standard Tag-Textfarbe",+ "defaultFolderColor": "Standard Ordnerfarbe","colorChangesToAllTags": "Farbänderungen für alle Tags der Gruppe übernehmen","delete": "Löschen","enableGlobalKeyboardShortcuts": "Globale Tastenkombinationen aktivieren",diff --git a/src/renderer/locales/el/core.json b/src/renderer/locales/el/core.jsonindex ee6837fef..f02d5c026 100644--- a/src/renderer/locales/el/core.json+++ b/src/renderer/locales/el/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "Πάντα εμφάνιση περιοχής ετικετών κατά την εκκίνηση","tagBackgroundColor": "Προεπιλεγμένο χρώμα φόντου ετικέτας","tagForegroundColor": "Προεπιλεγμένο χρώμα κειμένου ετικέτας",+ "defaultFolderColor": "Προεπιλεγμένο χρώμα φακέλου","colorChangesToAllTags": "Εφαρμογή αλλαγών χρώματος σε όλες τις ετικέτες της ομάδας","delete": "Διαγραφή","enableGlobalKeyboardShortcuts": "Ενεργοποίηση καθολικών συντομεύσεων πληκτρολογίου",diff --git a/src/renderer/locales/en/core.json b/src/renderer/locales/en/core.jsonindex 7883ff3c5..b1f4ca46e 100644--- a/src/renderer/locales/en/core.json+++ b/src/renderer/locales/en/core.json@@ -150,6 +150,7 @@"showTagAreaOnStartup": "Always show tag area on startup","tagBackgroundColor": "Default tag background color","tagForegroundColor": "Default tag text color",+ "defaultFolderColor": "Default folder color","colorChangesToAllTags": "Apply color changes to all tags of the group","delete": "Delete","enableGlobalKeyboardShortcuts": "Enable global keyboard shortcuts",diff --git a/src/renderer/locales/es/core.json b/src/renderer/locales/es/core.jsonindex 46440082e..36866ff5c 100644--- a/src/renderer/locales/es/core.json+++ b/src/renderer/locales/es/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "Siempre mostrar el área de etiquetas al iniciar","tagBackgroundColor": "Color de fondo de etiquetas por defecto","tagForegroundColor": "Color de texto de etiquetas por defecto",+ "defaultFolderColor": "Color de carpeta por defecto","colorChangesToAllTags": "Aplicar el cambio de color a todas las etiquetas del grupo","delete": "Eliminar","enableGlobalKeyboardShortcuts": "Activar atajos de teclado globales",diff --git a/src/renderer/locales/es_CL/core.json b/src/renderer/locales/es_CL/core.jsonindex c0333ada1..50b7a08c6 100644--- a/src/renderer/locales/es_CL/core.json+++ b/src/renderer/locales/es_CL/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "Siempre mostrar el área de etiquetas al iniciar","tagBackgroundColor": "Color de fondo predeterminado de etiqueta","tagForegroundColor": "Color de texto predeterminado de etiqueta",+ "defaultFolderColor": "Color de carpeta predeterminado","colorChangesToAllTags": "Aplicar el cambio de color a todas las etiquetas del grupo","delete": "Eliminar","enableGlobalKeyboardShortcuts": "Activar atajos de teclado globales",diff --git a/src/renderer/locales/fr/core.json b/src/renderer/locales/fr/core.jsonindex d9d7406e8..60a2e5252 100644--- a/src/renderer/locales/fr/core.json+++ b/src/renderer/locales/fr/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "Toujours afficher la zone d'étiquette au démarrage","tagBackgroundColor": "Couleur des étiquettes par défaut","tagForegroundColor": "Couleur des textes d'étiquette par défaut ",+ "defaultFolderColor": "Couleur des dossiers par défaut","colorChangesToAllTags": "Appliquer ces couleurs à toutes les étiquettes du groupe","delete": "Supprimer","enableGlobalKeyboardShortcuts": "Activer les raccourcis clavier globaux",diff --git a/src/renderer/locales/fr_CA/core.json b/src/renderer/locales/fr_CA/core.jsonindex 97e4bf626..0e3e7ea46 100644--- a/src/renderer/locales/fr_CA/core.json+++ b/src/renderer/locales/fr_CA/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "Toujours afficher la zone d'étiquette au démarrage","tagBackgroundColor": "Couleur par défaut du fond d'étiquette","tagForegroundColor": "Couleur par défaut du texte d'étiquette ",+ "defaultFolderColor": "Couleur par défaut du dossier","colorChangesToAllTags": "Appliquer les changements de couleur à toutes les étiquettes du groupe","delete": "Supprimer","enableGlobalKeyboardShortcuts": "Activer les raccourcis claviers globaux",diff --git a/src/renderer/locales/he/core.json b/src/renderer/locales/he/core.jsonindex 328713798..9eedee316 100644--- a/src/renderer/locales/he/core.json+++ b/src/renderer/locales/he/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "הצגת אזור התגיות בעת ההפעלה","tagBackgroundColor": "צבע רקע של תגית","tagForegroundColor": "צבע טקסט של תגית",+ "defaultFolderColor": "צבע ברירת מחדל לתיקייה","colorChangesToAllTags": "שינוי צבע לכל התגיות","delete": "מחיקה","enableGlobalKeyboardShortcuts": "הפעלת קיצורי מקשים גלובליים",diff --git a/src/renderer/locales/hu/core.json b/src/renderer/locales/hu/core.jsonindex 8217df710..5e35d69c3 100644--- a/src/renderer/locales/hu/core.json+++ b/src/renderer/locales/hu/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "Mindig mutassa a címke sávot induláskor","tagBackgroundColor": "Alapértelmezett címke háttérszín","tagForegroundColor": "Alapértelmezett címke betűszín",+ "defaultFolderColor": "Alapértelmezett mappaszín","colorChangesToAllTags": "Alkalmazzuk az összes címkére a csoportban a színváltoztatásokat","delete": "Törlés","enableGlobalKeyboardShortcuts": "Rendszerszintű gyorsbillentyűk engedélyezése",diff --git a/src/renderer/locales/hy/core.json b/src/renderer/locales/hy/core.jsonindex ae9aed6d6..db36bb1b4 100644--- a/src/renderer/locales/hy/core.json+++ b/src/renderer/locales/hy/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "Մեկնարկին միշտ ցույց տալ պիտակների տարածքը","tagBackgroundColor": "Պիտակի խորքի լռելյայն գույն","tagForegroundColor": "Պիտակի գրվածքի լռելյայն գույն",+ "defaultFolderColor": "Թղթապանակի լռելյայն գույն","colorChangesToAllTags": "Գույնը գործածել խմբի բոլոր պիտակների համար","delete": "Ջնջել","enableGlobalKeyboardShortcuts": "Միացնել բոլոր ստեղնային կարճատները",diff --git a/src/renderer/locales/id_ID/core.json b/src/renderer/locales/id_ID/core.jsonindex 2667a01bf..2f2a57ce2 100644--- a/src/renderer/locales/id_ID/core.json+++ b/src/renderer/locales/id_ID/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "Selalu tampilkan area tag saat mulai","tagBackgroundColor": "Warna latar belakang tag default","tagForegroundColor": "Warna teks tag default",+ "defaultFolderColor": "Warna folder default","colorChangesToAllTags": "Terapkan perubahan warna ke semua tag dari grup","delete": "Hapus","enableGlobalKeyboardShortcuts": "Aktifkan pintasan keyboard global",diff --git a/src/renderer/locales/it/core.json b/src/renderer/locales/it/core.jsonindex 8c198a4a4..cab5d1431 100644--- a/src/renderer/locales/it/core.json+++ b/src/renderer/locales/it/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "Mostra sempre la sezione etichette all'avvio","tagBackgroundColor": "Colore sfondo etichetta predefinito","tagForegroundColor": "Colore testo etichetta predefinito",+ "defaultFolderColor": "Colore cartella predefinito","colorChangesToAllTags": "Applica le modifiche di colore a tutte le etichette del gruppo","delete": "Elimina","enableGlobalKeyboardShortcuts": "Abilita le combinazioni di tasti globali",diff --git a/src/renderer/locales/ja/core.json b/src/renderer/locales/ja/core.jsonindex 0c43a2c22..c641ae68e 100644--- a/src/renderer/locales/ja/core.json+++ b/src/renderer/locales/ja/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "起動時にタグ領域を常に表示する","tagBackgroundColor": "デフォルトのタグ背景色","tagForegroundColor": "デフォルトのタグテキスト色",+ "defaultFolderColor": "デフォルトのフォルダー色","colorChangesToAllTags": "タググループのすべてのタグに色の変更を適用する","delete": "削除","enableGlobalKeyboardShortcuts": "グローバルキーボードショートカットを有効にする",diff --git a/src/renderer/locales/ko/core.json b/src/renderer/locales/ko/core.jsonindex 93c45d871..0fb69c2e1 100644--- a/src/renderer/locales/ko/core.json+++ b/src/renderer/locales/ko/core.json@@ -145,6 +145,7 @@"showTagAreaOnStartup": "시작시 항상 태그 영역 표시","tagBackgroundColor": "기본 태그 배경 색","tagForegroundColor": "기본 태그 문자 색",+ "defaultFolderColor": "기본 폴더 색","colorChangesToAllTags": "그룹의 모든 태그에 색상 변경 사항 적용","delete": "삭제","enableGlobalKeyboardShortcuts": "전역 키보드 단축키 사용",diff --git a/src/renderer/locales/nb/core.json b/src/renderer/locales/nb/core.jsonindex 86e58f288..d935e59f3 100644--- a/src/renderer/locales/nb/core.json+++ b/src/renderer/locales/nb/core.json@@ -145,6 +145,7 @@"showTagAreaOnStartup": "Alltid vis stikkordsområde på oppstart","tagBackgroundColor": "Standard bakgrunnsfarge på stikkord","tagForegroundColor": "Standard farge på stikkord",+ "defaultFolderColor": "Standard mappefarge","colorChangesToAllTags": "Angi fargeendring til alle stikkord i gruppen","delete": "Slett","enableGlobalKeyboardShortcuts": "Aktiver globale hurtigtaster",diff --git a/src/renderer/locales/nl_NL/core.json b/src/renderer/locales/nl_NL/core.jsonindex d66e774c4..642914995 100644--- a/src/renderer/locales/nl_NL/core.json+++ b/src/renderer/locales/nl_NL/core.json@@ -145,6 +145,7 @@"showTagAreaOnStartup": "Taggebied altijd tonen bij opstarten","tagBackgroundColor": "Standaard achtergrondkleur van tag","tagForegroundColor": "Standaard tekstkleur van tag",+ "defaultFolderColor": "Standaard mapkleur","colorChangesToAllTags": "Kleurwijzigingen toepassen op alle tags van de groep","delete": "Verwijder","enableGlobalKeyboardShortcuts": "Globale sneltoetsen inschakelen",diff --git a/src/renderer/locales/pl/core.json b/src/renderer/locales/pl/core.jsonindex 540401cab..d1ba5a4ce 100644--- a/src/renderer/locales/pl/core.json+++ b/src/renderer/locales/pl/core.json@@ -145,6 +145,7 @@"showTagAreaOnStartup": "Zawsze pokazuj obszar tagów przy starcie","tagBackgroundColor": "Domyślny kolor tła tagów","tagForegroundColor": "Domyślny kolor tekstu tagów",+ "defaultFolderColor": "Domyślny kolor folderu","colorChangesToAllTags": "Zastosuj zmiany kolorów do wszystkich tagów w grupie","delete": "Usuń","enableGlobalKeyboardShortcuts": "Włącz globalne skróty klawiszowe",diff --git a/src/renderer/locales/pt_BR/core.json b/src/renderer/locales/pt_BR/core.jsonindex ecc3a72b8..c79713730 100644--- a/src/renderer/locales/pt_BR/core.json+++ b/src/renderer/locales/pt_BR/core.json@@ -145,6 +145,7 @@"showTagAreaOnStartup": "Sempre mostrar área de tags ao iniciar","tagBackgroundColor": "Cor de fundo padrão das tags","tagForegroundColor": "Cor de texto padrão das tags",+ "defaultFolderColor": "Cor padrão de pasta","colorChangesToAllTags": "Aplicar mudanças de cor para todas as tags do grupo","delete": "Excluir","enableGlobalKeyboardShortcuts": "Habilitar atalhos de teclado globais",diff --git a/src/renderer/locales/pt_PT/core.json b/src/renderer/locales/pt_PT/core.jsonindex 0a9c5c456..172310eba 100644--- a/src/renderer/locales/pt_PT/core.json+++ b/src/renderer/locales/pt_PT/core.json@@ -145,6 +145,7 @@"showTagAreaOnStartup": "Mostrar sempre a área de etiquetas ao arranque","tagBackgroundColor": "Cor de fundo predefinida das etiquetas","tagForegroundColor": "Cor de texto predefinida das etiquetas",+ "defaultFolderColor": "Cor predefinida da pasta","colorChangesToAllTags": "Aplicar alterações de cor a todas as etiquetas do grupo","delete": "Apagar","enableGlobalKeyboardShortcuts": "Activar atalhos de teclado globais",diff --git a/src/renderer/locales/ru/core.json b/src/renderer/locales/ru/core.jsonindex a152e6f4d..3eb129cde 100644--- a/src/renderer/locales/ru/core.json+++ b/src/renderer/locales/ru/core.json@@ -145,6 +145,7 @@"showTagAreaOnStartup": "Всегда показывать область тегов при запуске","tagBackgroundColor": "Цвет фона тега по умолчанию","tagForegroundColor": "Цвет текста тега по-умолчанию",+ "defaultFolderColor": "Цвет папки по умолчанию","colorChangesToAllTags": "Применить изменения цвета ко всем тегам группы","delete": "Удалить","enableGlobalKeyboardShortcuts": "Включить глобальные сочетания клавиш",diff --git a/src/renderer/locales/sk_SK/core.json b/src/renderer/locales/sk_SK/core.jsonindex 4a3b6124b..a9ba470a5 100644--- a/src/renderer/locales/sk_SK/core.json+++ b/src/renderer/locales/sk_SK/core.json@@ -145,6 +145,7 @@"showTagAreaOnStartup": "Vždy zobraziť oblasť značiek pri spustení","tagBackgroundColor": "Predvolená farba pozadia značky","tagForegroundColor": "Predvolená farba textu značky",+ "defaultFolderColor": "Predvolená farba priečinka","colorChangesToAllTags": "Použiť zmeny farieb na všetky značky skupiny","delete": "Odstrániť","enableGlobalKeyboardShortcuts": "Zapnúť globálne klávesové skratky",diff --git a/src/renderer/locales/sv/core.json b/src/renderer/locales/sv/core.jsonindex 27f62d996..c2d8683fb 100644--- a/src/renderer/locales/sv/core.json+++ b/src/renderer/locales/sv/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "Visa alltid taggområdet vid start","tagBackgroundColor": "Standardbakgrundsfärg för taggar","tagForegroundColor": "Standardtextfärg för taggar",+ "defaultFolderColor": "Standardfärg för mapp","colorChangesToAllTags": "Tillämpa färgändringar på alla taggar i gruppen","delete": "Radera","enableGlobalKeyboardShortcuts": "Aktivera globala tangentbordsgenvägar",diff --git a/src/renderer/locales/tr/core.json b/src/renderer/locales/tr/core.jsonindex dcf351b7f..2b1ef3395 100644--- a/src/renderer/locales/tr/core.json+++ b/src/renderer/locales/tr/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "Açılışta etiket alanını her zaman göster","tagBackgroundColor": "Varsayılan etiket arka plan rengi","tagForegroundColor": "Varsayılan etiket metin rengi",+ "defaultFolderColor": "Varsayılan klasör rengi","colorChangesToAllTags": "Renk değişikliklerini grubun tüm etiketlerine uygula","delete": "Sil","enableGlobalKeyboardShortcuts": "Genel klavye kısayollarını etkinleştir",diff --git a/src/renderer/locales/uk/core.json b/src/renderer/locales/uk/core.jsonindex 931dbe9e6..8c10de6f4 100644--- a/src/renderer/locales/uk/core.json+++ b/src/renderer/locales/uk/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "Завжди показувати область міток при запуску","tagBackgroundColor": "Колір фону мітки за замовчуванням","tagForegroundColor": "Колір тексту мітки за замовчуванням",+ "defaultFolderColor": "Колір теки за замовчуванням","colorChangesToAllTags": "Застосувати зміни кольору до всіх міток групи","delete": "Видалити","enableGlobalKeyboardShortcuts": "Увімкнути глобальні гарячі клавіші",diff --git a/src/renderer/locales/vi/core.json b/src/renderer/locales/vi/core.jsonindex 41c942a64..d1773b068 100644--- a/src/renderer/locales/vi/core.json+++ b/src/renderer/locales/vi/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "Luôn hiển thị khu vực quản lý đuôi khi khởi chạy","tagBackgroundColor": "Màu nền mặc định cho đuôi","tagForegroundColor": "Màu chữ mặc định cho đuôi",+ "defaultFolderColor": "Màu thư mục mặc định","colorChangesToAllTags": "Áp dụng thay đổi màu cho tất cả đuôi trong nhóm","delete": "Xoá","enableGlobalKeyboardShortcuts": "Bật phím tắt bàn phím toàn cục",diff --git a/src/renderer/locales/zh-Hant/core.json b/src/renderer/locales/zh-Hant/core.jsonindex 1436fe9f2..58a34b9ac 100644--- a/src/renderer/locales/zh-Hant/core.json+++ b/src/renderer/locales/zh-Hant/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "總是在啟動時顯示標籤庫","tagBackgroundColor": "預設標籤底色","tagForegroundColor": "預設標籤文字顏色",+ "defaultFolderColor": "預設資料夾顏色","colorChangesToAllTags": "應用顏色變更組裡的所有標籤","delete": "刪除","enableGlobalKeyboardShortcuts": "啟用全局快捷鍵",diff --git a/src/renderer/locales/zh_CN/core.json b/src/renderer/locales/zh_CN/core.jsonindex bc0ca8f17..46e235c01 100644--- a/src/renderer/locales/zh_CN/core.json+++ b/src/renderer/locales/zh_CN/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "总是在启动时显示标签库","tagBackgroundColor": "默认标签背景色","tagForegroundColor": "默认标签文本颜色",+ "defaultFolderColor": "默认文件夹颜色","colorChangesToAllTags": "应用颜色更改到组里的所有标签","delete": "删除","enableGlobalKeyboardShortcuts": "启用全局快捷键",diff --git a/src/renderer/locales/zh_HK/core.json b/src/renderer/locales/zh_HK/core.jsonindex b4ba282db..45d9312ca 100644--- a/src/renderer/locales/zh_HK/core.json+++ b/src/renderer/locales/zh_HK/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "總是在啟動時顯示標籤庫","tagBackgroundColor": "預設標籤底色","tagForegroundColor": "預設標籤文字顏色",+ "defaultFolderColor": "預設資料夾顏色","colorChangesToAllTags": "應用顏色變更組裡的所有標籤","delete": "刪除","enableGlobalKeyboardShortcuts": "啟用全局快捷鍵",diff --git a/src/renderer/locales/zh_TW/core.json b/src/renderer/locales/zh_TW/core.jsonindex 63455e420..ca266eb8e 100644--- a/src/renderer/locales/zh_TW/core.json+++ b/src/renderer/locales/zh_TW/core.json@@ -146,6 +146,7 @@"showTagAreaOnStartup": "總是在啟動時顯示標籤庫","tagBackgroundColor": "預設標籤底色","tagForegroundColor": "預設標籤文字顏色",+ "defaultFolderColor": "預設資料夾顏色","colorChangesToAllTags": "應用顏色變更組裡的所有標籤","delete": "刪除","enableGlobalKeyboardShortcuts": "啟用全局快捷鍵",diff --git a/src/renderer/perspectives/grid/components/GridCell.tsx b/src/renderer/perspectives/grid/components/GridCell.tsxindex 1dcb5ae7e..90e92deac 100644--- a/src/renderer/perspectives/grid/components/GridCell.tsx+++ b/src/renderer/perspectives/grid/components/GridCell.tsx@@ -38,6 +38,7 @@ import { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';import { useTaggingActionsContext } from '-/hooks/useTaggingActionsContext';import { useCellVisibility } from '-/perspectives/grid/hooks/CellVisibilityContext';import {+ getDefaultFolderColor,getSupportedFileTypes,getTagDelimiter,isReorderTags,@@ -146,13 +147,14 @@ function GridCell(props: Props) {const { addTag, editTagForEntry } = useTaggingActionsContext();const { findLocation } = useCurrentLocationContext();const supportedFileTypes = useSelector(getSupportedFileTypes);+ const defaultFolderColor = useSelector(getDefaultFolderColor);const reorderTags: boolean = useSelector(isReorderTags);const tagDelimiter: string = useSelector(getTagDelimiter);const firstRender = useFirstRender();const fileSystemEntryColor = useMemo(- () => findColorForEntry(fsEntry, supportedFileTypes),- [fsEntry, supportedFileTypes],+ () => findColorForEntry(fsEntry, supportedFileTypes, defaultFolderColor),+ [fsEntry, supportedFileTypes, defaultFolderColor],);const maxHeight = calculateEntryHeight(entrySize);const entryPath = fsEntry.path;diff --git a/src/renderer/perspectives/list/components/RowCell.tsx b/src/renderer/perspectives/list/components/RowCell.tsxindex 066ec52eb..c7eb8bf7a 100644--- a/src/renderer/perspectives/list/components/RowCell.tsx+++ b/src/renderer/perspectives/list/components/RowCell.tsx@@ -35,6 +35,7 @@ import { usePerspectiveSettingsContext } from '-/hooks/usePerspectiveSettingsConimport { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';import { useTaggingActionsContext } from '-/hooks/useTaggingActionsContext';import {+ getDefaultFolderColor,getSupportedFileTypes,getTagDelimiter,isReorderTags,@@ -121,6 +122,7 @@ function RowCell(props: Props) {const { addTag, editTagForEntry } = useTaggingActionsContext();const { currentLocation } = useCurrentLocationContext();const supportedFileTypes = useSelector(getSupportedFileTypes);+ const defaultFolderColor = useSelector(getDefaultFolderColor);const reorderTags: boolean = useSelector(isReorderTags);const tagDelimiter: string = useSelector(getTagDelimiter);@@ -151,8 +153,8 @@ function RowCell(props: Props) {}, [showEntriesDescription, fsEntry.meta?.description, fsEntry.isFile]);const fileSystemEntryColor = useMemo(- () => findColorForEntry(fsEntry, supportedFileTypes),- [fsEntry, supportedFileTypes],+ () => findColorForEntry(fsEntry, supportedFileTypes, defaultFolderColor),+ [fsEntry, supportedFileTypes, defaultFolderColor],);const fileSystemEntryBgColor = useMemo(() => findBackgroundColorForFolder(fsEntry),diff --git a/src/renderer/reducers/index.ts b/src/renderer/reducers/index.tsindex f3f18123e..aaab93cea 100644--- a/src/renderer/reducers/index.ts+++ b/src/renderer/reducers/index.ts@@ -155,6 +155,8 @@ function configureApp(extConfigObj) {extConfigObj.ExtExtensionsFound ?? AppConfig.ExtExtensionsFound; // not documentedAppConfig.ExtUseGenerateThumbnails =extConfigObj.ExtUseGenerateThumbnails ?? AppConfig.ExtUseGenerateThumbnails; // not documented+ AppConfig.ExtDefaultFolderColor =+ extConfigObj.ExtDefaultFolderColor ?? AppConfig.ExtDefaultFolderColor;AppConfig.ExtSaveLocationsInBrowser =extConfigObj.ExtSaveLocationsInBrowser ?? false;AppConfig.ExtLocationsReadOnly = // computed valuediff --git a/src/renderer/reducers/settings-default.ts b/src/renderer/reducers/settings-default.tsindex ef1af821c..9a642d737 100644--- a/src/renderer/reducers/settings-default.ts+++ b/src/renderer/reducers/settings-default.ts@@ -105,6 +105,7 @@ export default {useOnlyTagsFromTagLibrary,tagTextColor: 'white',tagBackgroundColor: '#61DD61',+ defaultFolderColor: '#a466aa',currentTheme: 'light',currentRegularTheme: 'legacy',currentDarkTheme: 'darklegacy',diff --git a/src/renderer/reducers/settings.ts b/src/renderer/reducers/settings.tsindex 965d5e56c..0d2fd6ee7 100644--- a/src/renderer/reducers/settings.ts+++ b/src/renderer/reducers/settings.ts@@ -77,6 +77,7 @@ export const types = {SET_USEGENERATETHUMBNAILS: 'SETTINGS/SET_USEGENERATETHUMBNAILS',SET_TAGCOLOR: 'SETTINGS/SET_TAGCOLOR',SET_TAGTEXTCOLOR: 'SETTINGS/SET_TAGTEXTCOLOR',+ SET_DEFAULT_FOLDER_COLOR: 'SETTINGS/SET_DEFAULT_FOLDER_COLOR',SET_CURRENTTHEME: 'SETTINGS/SET_CURRENTTHEME',SET_CURRENT_REGULAR_THEME: 'SETTINGS/SET_CURRENT_REGULAR_THEME',SET_CURRENT_DARK_THEME: 'SETTINGS/SET_CURRENT_DARK_THEME',@@ -359,6 +360,9 @@ export default (state: any = defaultSettings, action: any) => {case types.SET_TAGTEXTCOLOR: {return { ...state, tagTextColor: action.tagTextColor };}+ case types.SET_DEFAULT_FOLDER_COLOR: {+ return { ...state, defaultFolderColor: action.color };+ }case types.SET_CURRENTTHEME: {return { ...state, currentTheme: action.currentTheme };}@@ -858,6 +862,10 @@ export const actions = {type: types.SET_TAGTEXTCOLOR,tagTextColor,}),+ setDefaultFolderColor: (color: string) => ({+ type: types.SET_DEFAULT_FOLDER_COLOR,+ color,+ }),setCurrentTheme: (currentTheme: string) => ({type: types.SET_CURRENTTHEME,currentTheme,@@ -1128,6 +1136,8 @@ export const getExtensionsFound = (state: any) =>state.settings.extensionsFound;export const getTagColor = (state: any) => state.settings.tagBackgroundColor;export const getTagTextColor = (state: any) => state.settings.tagTextColor;+export const getDefaultFolderColor = (state: any) =>+ AppConfig.ExtDefaultFolderColor ?? state.settings.defaultFolderColor;export const getCurrentTheme = (state: any) => state.settings.currentTheme;export const getDefaultRegularTheme = (state: any) =>state.settings.currentRegularTheme;diff --git a/src/renderer/services/utils-io.ts b/src/renderer/services/utils-io.tsindex 2472dcefc..7598bc908 100644--- a/src/renderer/services/utils-io.ts+++ b/src/renderer/services/utils-io.ts@@ -329,9 +329,10 @@ export function findBackgroundColorForFolder(fsEntry: TS.FileSystemEntry) {export function findColorForEntry(fsEntry: TS.FileSystemEntry,supportedFileTypes: Array<any>,+ defaultFolderColor: string,): string {if (!fsEntry.isFile) {- return AppConfig.defaultFolderColor;+ return defaultFolderColor;}if (fsEntry.extension !== undefined) {return findColorForFileExt(fsEntry.extension, supportedFileTypes);