Merge branch 'master' of https://github.com/pop-os/cosmic-term
This commit is contained in:
commit
fbb69fd399
3 changed files with 55 additions and 44 deletions
|
|
@ -1,12 +1,12 @@
|
||||||
cosmic-terminal = COSMIC Terminal
|
cosmic-terminal = COSMIC Terminal
|
||||||
new-terminal = Neues Terminal
|
new-terminal = Neues Terminal
|
||||||
|
|
||||||
# Context Pages
|
# Kontextseiten
|
||||||
|
|
||||||
## About
|
## Über
|
||||||
git-description = Git commit {$hash} vom {$date}
|
git-description = Git-Commit {$hash} am {$date}
|
||||||
|
|
||||||
## Color schemes
|
## Farbschemen
|
||||||
color-schemes = Farbschemen
|
color-schemes = Farbschemen
|
||||||
rename = Umbenennen
|
rename = Umbenennen
|
||||||
export = Exportieren
|
export = Exportieren
|
||||||
|
|
@ -14,20 +14,23 @@ delete = Löschen
|
||||||
import = Importieren
|
import = Importieren
|
||||||
import-errors = Importfehler
|
import-errors = Importfehler
|
||||||
|
|
||||||
## Profiles
|
## Profile
|
||||||
profiles = Profile
|
profiles = Profile
|
||||||
name = Name
|
name = Name
|
||||||
command-line = Startbefehl
|
command-line = Befehlszeile
|
||||||
tab-title = Überschrift
|
tab-title = Tab-Titel
|
||||||
tab-title-description = Standardtitel des Tabs überschreiben
|
tab-title-description = Standardtitel des Tabs überschreiben
|
||||||
add-profile = Profil hinzufügen
|
add-profile = Profil hinzufügen
|
||||||
new-profile = Neues Profil
|
new-profile = Neues Profil
|
||||||
make-default = Als Standard setzen
|
make-default = Als Standard festlegen
|
||||||
|
working-directory = Arbeitsverzeichnis
|
||||||
|
hold = Halten
|
||||||
|
remain-open = Nach Beendigung des Kindprozesses offen bleiben.
|
||||||
|
|
||||||
## Settings
|
## Einstellungen
|
||||||
settings = Einstellungen
|
settings = Einstellungen
|
||||||
|
|
||||||
### Appearance
|
### Aussehen
|
||||||
appearance = Aussehen
|
appearance = Aussehen
|
||||||
theme = Thema
|
theme = Thema
|
||||||
match-desktop = An System anpassen
|
match-desktop = An System anpassen
|
||||||
|
|
@ -38,8 +41,8 @@ syntax-light = Helles Farbschema
|
||||||
default-zoom-step = Zoomstufen
|
default-zoom-step = Zoomstufen
|
||||||
opacity = Deckkraft des Hintergrundes
|
opacity = Deckkraft des Hintergrundes
|
||||||
|
|
||||||
### Font
|
### Schriftart
|
||||||
font = Schrift
|
font = Schriftart
|
||||||
advanced-font-settings = Fortgeschrittene Schrifteinstellungen
|
advanced-font-settings = Fortgeschrittene Schrifteinstellungen
|
||||||
default-font = Schriftart
|
default-font = Schriftart
|
||||||
default-font-size = Schriftgröße
|
default-font-size = Schriftgröße
|
||||||
|
|
@ -49,23 +52,23 @@ default-dim-font-weight = Matte Schriftstärke
|
||||||
default-bold-font-weight = Fette Schriftstärke
|
default-bold-font-weight = Fette Schriftstärke
|
||||||
use-bright-bold = Fetten Text heller darstellen
|
use-bright-bold = Fetten Text heller darstellen
|
||||||
|
|
||||||
### Splits
|
### Aufteilungen
|
||||||
splits = Aufteilungen
|
splits = Aufteilungen
|
||||||
focus-follow-mouse = Tippen folgt Maus
|
focus-follow-mouse = Tippfokus folgt Maus
|
||||||
|
|
||||||
### Advanced
|
### Fortgeschritten
|
||||||
advanced = Fortgeschritten
|
advanced = Fortgeschritten
|
||||||
show-headerbar = Kopfzeile anzeigen
|
show-headerbar = Kopfzeile anzeigen
|
||||||
show-header-description = Kopfzeile kann via Rechtsklickmenü angezeigt werden
|
show-header-description = Kopfzeile über das Rechtsklickmenü einblenden.
|
||||||
|
|
||||||
# Find
|
# Suchen
|
||||||
find-placeholder = Suche...
|
find-placeholder = Suchen...
|
||||||
find-previous = Vorheriges
|
find-previous = Vorherigen suchen
|
||||||
find-next = Nächstes
|
find-next = Nächsten suchen
|
||||||
|
|
||||||
# Menu
|
# Menü
|
||||||
|
|
||||||
## File
|
## Datei
|
||||||
file = Datei
|
file = Datei
|
||||||
new-tab = Neuer Tab
|
new-tab = Neuer Tab
|
||||||
new-window = Neues Fenster
|
new-window = Neues Fenster
|
||||||
|
|
@ -74,23 +77,23 @@ menu-profiles = Profile...
|
||||||
close-tab = Tab schließen
|
close-tab = Tab schließen
|
||||||
quit = Beenden
|
quit = Beenden
|
||||||
|
|
||||||
## Edit
|
## Bearbeiten
|
||||||
edit = Bearbeiten
|
edit = Bearbeiten
|
||||||
copy = Kopieren
|
copy = Kopieren
|
||||||
paste = Einfügen
|
paste = Einfügen
|
||||||
select-all = Alles auswählen
|
select-all = Alles auswählen
|
||||||
find = Suche
|
find = Suchen
|
||||||
|
|
||||||
## View
|
## Ansicht
|
||||||
view = Ansicht
|
view = Ansicht
|
||||||
zoom-in = Schrift vergrößern
|
zoom-in = Größerer Text
|
||||||
zoom-reset = Standardschriftgröße
|
zoom-reset = Standardschriftgröße
|
||||||
zoom-out = Schrift verkleinern
|
zoom-out = Kleinerer Text
|
||||||
next-tab = Nächster Tab
|
next-tab = Nächster Tab
|
||||||
previous-tab = Vorheriger Tab
|
previous-tab = Vorheriger Tab
|
||||||
split-horizontal = Horizontal aufteilen
|
split-horizontal = Horizontal aufteilen
|
||||||
split-vertical = Vertikal aufteilen
|
split-vertical = Vertikal aufteilen
|
||||||
pane-toggle-maximize = Vollbild umschalten
|
pane-toggle-maximize = Vollbild umschalten
|
||||||
menu-color-schemes = Farbthemen...
|
menu-color-schemes = Farbschemen...
|
||||||
menu-settings = Einstellungen...
|
menu-settings = Einstellungen...
|
||||||
menu-about = Über COSMIC Terminal...
|
menu-about = Über COSMIC Terminal...
|
||||||
|
|
|
||||||
|
|
@ -85,10 +85,10 @@ select-all = Minden kijelölése
|
||||||
find = Keresés
|
find = Keresés
|
||||||
|
|
||||||
## View
|
## View
|
||||||
view = Nézed
|
view = Nézet
|
||||||
zoom-in = Nagyobb szöveg
|
zoom-in = Nagyobb szövegméret
|
||||||
zoom-reset = Alapértelmezett szövegméret
|
zoom-reset = Alapértelmezett szövegméret
|
||||||
zoom-out = Kisebb szöveg
|
zoom-out = Kisebb szövegméret
|
||||||
next-tab = Következő lap
|
next-tab = Következő lap
|
||||||
previous-tab = Előző lap
|
previous-tab = Előző lap
|
||||||
split-horizontal = Vízszintes felosztás
|
split-horizontal = Vízszintes felosztás
|
||||||
|
|
|
||||||
|
|
@ -580,31 +580,39 @@ impl Terminal {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO: this is done on every set_config because the changed boolean above does not capture
|
// NOTE: this is done on every set_config because the changed boolean above does not capture
|
||||||
// WINDOW_BG changes
|
// WINDOW_BG changes
|
||||||
self.update_colors(config);
|
let default_colors_updated = self.update_default_colors(config);
|
||||||
|
|
||||||
if update_cell_size {
|
if update_cell_size {
|
||||||
self.update_cell_size();
|
self.update_cell_size();
|
||||||
} else if update {
|
} else if update || default_colors_updated {
|
||||||
self.update();
|
self.update();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update_colors(&mut self, config: &AppConfig) {
|
pub fn update_default_colors(&mut self, config: &AppConfig) -> bool {
|
||||||
self.metadata_set.clear();
|
|
||||||
let default_bg = convert_color(&self.colors, Color::Named(NamedColor::Background));
|
let default_bg = convert_color(&self.colors, Color::Named(NamedColor::Background));
|
||||||
let default_fg = convert_color(&self.colors, Color::Named(NamedColor::Foreground));
|
let default_fg = convert_color(&self.colors, Color::Named(NamedColor::Foreground));
|
||||||
|
|
||||||
let default_metadata = Metadata::new(default_bg, default_fg);
|
let new_default_metadata = Metadata::new(default_bg, default_fg);
|
||||||
let (default_metadata_idx, _) = self.metadata_set.insert_full(default_metadata);
|
let curr_metada_idx = self.default_attrs().metadata;
|
||||||
|
|
||||||
self.default_attrs = Attrs::new()
|
let updated = new_default_metadata != self.metadata_set[curr_metada_idx];
|
||||||
.family(Family::Monospace)
|
|
||||||
.weight(Weight(config.font_weight))
|
if updated {
|
||||||
.stretch(config.typed_font_stretch())
|
self.metadata_set.clear();
|
||||||
.color(default_fg)
|
let (default_metadata_idx, _) = self.metadata_set.insert_full(new_default_metadata);
|
||||||
.metadata(default_metadata_idx);
|
|
||||||
|
self.default_attrs = Attrs::new()
|
||||||
|
.family(Family::Monospace)
|
||||||
|
.weight(Weight(config.font_weight))
|
||||||
|
.stretch(config.typed_font_stretch())
|
||||||
|
.color(default_fg)
|
||||||
|
.metadata(default_metadata_idx);
|
||||||
|
}
|
||||||
|
|
||||||
|
updated
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update_cell_size(&mut self) {
|
pub fn update_cell_size(&mut self) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue