Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Improve contrast of job queue items count #1678

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/components/panels/StatusPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,11 @@
<v-tabs v-model="activeTab" fixed-tabs dark>
<v-tab v-if="current_filename" href="#status">{{ $t('Panels.StatusPanel.Status') }}</v-tab>
<v-tab href="#files">{{ $t('Panels.StatusPanel.Files') }}</v-tab>
<v-tab href="#jobqueue">{{ $t('Panels.StatusPanel.Jobqueue', { count: jobsCount }) }}</v-tab>
<v-tab href="#jobqueue">
<v-badge :color="jobQueueBadgeColor" :content="jobsCount.toString()" :inline="true">
{{ $t('Panels.StatusPanel.Jobqueue') }}
</v-badge>
</v-tab>
</v-tabs>
<v-divider class="my-0"></v-divider>
<v-tabs-items v-model="activeTab" class="_border-radius">
Expand Down Expand Up @@ -173,7 +177,11 @@ export default class StatusPanel extends Mixins(BaseMixin) {
}

get jobsCount() {
return this.$store.getters['server/jobQueue/getJobsCount'] ?? 0
return this.jobs.length ?? 0
}

get jobQueueBadgeColor() {
return this.jobsCount > 0 ? 'primary darken-2' : 'grey darken-2'
}

get current_filename() {
Expand Down
2 changes: 1 addition & 1 deletion src/locales/cz.json
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@
"Files": "Soubory",
"Flow": "Průtok",
"Headline": "Stav",
"Jobqueue": "Seznam úloh ({count})",
"Jobqueue": "Seznam úloh",
"JobqueueMoreFiles": "žádné další úlohy | jedna další úloha | {count} dalších úloh",
"Layer": "Vrstva",
"Max": "max",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@
"Files": "Filer",
"Flow": "Flow",
"Headline": "Status",
"Jobqueue": "Jobkø: ({count})",
"Jobqueue": "Jobkø",
"JobqueueMoreFiles": "Ikke flere jobs | Et job til | {count} jobs tilbage",
"Layer": "Lag",
"Max": "maks",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@
"Files": "Dateien",
"Flow": "Fluss",
"Headline": "Status",
"Jobqueue": "Warteschlange ({count})",
"Jobqueue": "Warteschlange",
"JobqueueMoreFiles": "keine weiteren Aufträge | einen weiteren Auftrag | {count} weitere Aufträge",
"Layer": "Schicht",
"Max": "max",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@
"Files": "Files",
"Flow": "Flow",
"Headline": "Status",
"Jobqueue": "Job Queue ({count})",
"Jobqueue": "Job Queue",
"JobqueueMoreFiles": "no more jobs | one more job | {count} more jobs",
"Layer": "Layer",
"Max": "max",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@
"Files": "Archivos",
"Flow": "Flujo",
"Headline": "Estado",
"Jobqueue": "Cola de trabajo ({count})",
"Jobqueue": "Cola de trabajo",
"JobqueueMoreFiles": "no mas trabajos | un trabajo mas | {count} trabajos mas",
"Layer": "Capa",
"Max": "max",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@
"Files": "Fichiers",
"Flow": "Débit",
"Headline": "Statut",
"Jobqueue": "File d'attente ({count})",
"Jobqueue": "File d'attente",
"JobqueueMoreFiles": "pas de travaux | un travail | {count} travaux",
"Layer": "Couche",
"Max": "max",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@
"Files": "Fájlok",
"Flow": "Anyagáramlás",
"Headline": "Állapot",
"Jobqueue": "Várólista ({count})",
"Jobqueue": "Várólista",
"JobqueueMoreFiles": "Nincs több munka | Még egy munka | {count} munka hátra",
"Layer": "Réteg",
"Max": "max",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@
"Files": "Files",
"Flow": "Flusso",
"Headline": "Stato",
"Jobqueue": "Coda di lavoro ({count})",
"Jobqueue": "Coda di lavoro",
"JobqueueMoreFiles": "niente più lavori | resta un lavoro | restano {count} lavori",
"Layer": "Layer",
"Max": "max",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@
"Files": "ファイル",
"Flow": "フロー",
"Headline": "状態",
"Jobqueue": "ジョブキュー ({count})",
"Jobqueue": "ジョブキュー",
"JobqueueMoreFiles": "ジョブなし | あとひとつのジョブ | あと {count}個のジョブ",
"Layer": "層",
"Max": "最大",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@
"Files": "파일",
"Flow": "유량",
"Headline": "출력 상태",
"Jobqueue": "작업 대기열({count})",
"Jobqueue": "작업 대기열",
"JobqueueMoreFiles": "더 이상 작업 없음 | 1개 이상의 작업 | {count}개 이상의 작업",
"Layer": "레이어",
"Max": "최대",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@
"Files": "Bestanden",
"Flow": "Flow",
"Headline": "Status",
"Jobqueue": "Wachtrij ({count})",
"Jobqueue": "Wachtrij",
"JobqueueMoreFiles": "geen jobs meer | nog een job | {count} jobs",
"Layer": "Laag",
"Max": "max",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@
"Files": "Pliki",
"Flow": "Przepływ",
"Headline": "Status",
"Jobqueue": "W kolejce ({count})",
"Jobqueue": "W kolejce",
"JobqueueMoreFiles": "brak więcej wydruków | jeszcze jeden wydruk | {count} więcej wydruków",
"Layer": "Warstwa",
"Max": "Maks.",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@
"Files": "Arquivos",
"Flow": "Fluxo",
"Headline": "Status",
"Jobqueue": "Fila de trabalhos ({count})",
"Jobqueue": "Fila de trabalhos",
"JobqueueMoreFiles": "nenhum trabalho | mais um trabalho | {count} mais trabalhos",
"Layer": "Camada",
"Max": "max",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@
"Files": "Файлы",
"Flow": "Поток",
"Headline": "Статус",
"Jobqueue": "Очередь ({count})",
"Jobqueue": "Очередь",
"JobqueueMoreFiles": "Нет больше задач | Еще одна задача | Еще {count} задач(и)",
"Layer": "Слой",
"Max": "макс.",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@
"Files": "Dosyalar",
"Flow": "Akış",
"Headline": "Durum",
"Jobqueue": "İş Kuyruğu ({count})",
"Jobqueue": "İş Kuyruğu",
"JobqueueMoreFiles": "daha fazla iş yok | bir iş daha var | {count} iş daha var",
"Layer": "Katman",
"Max": "maks.",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/uk.json
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@
"Files": "Файли",
"Flow": "Потік",
"Headline": "Статус",
"Jobqueue": "Черга робіт ({count})",
"Jobqueue": "Черга робіт",
"JobqueueMoreFiles": "більше нема робіт | ще одна робота | {count} більше робіт",
"Layer": "Шар",
"Max": "макс",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@
"Files": "文件",
"Flow": "流量",
"Headline": "状态",
"Jobqueue": "任务队列({count})",
"Jobqueue": "任务队列",
"JobqueueMoreFiles": "没有任务 | 一个任务 | {count}个任务",
"Layer": "打印层",
"Max": "最高",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/zh_TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@
"Files": "檔案",
"Flow": "流量",
"Headline": "狀態",
"Jobqueue": "任務隊列({count})",
"Jobqueue": "任務隊列",
"JobqueueMoreFiles": "沒有任務 | 一個任務 | {count}個任務",
"Layer": "層",
"Max": "最高",
Expand Down
Loading