diff --git a/kcms/ksmserver/kcmsmserver.cpp b/kcms/ksmserver/kcmsmserver.cpp index f1338e1d7..79790056a 100644 --- a/kcms/ksmserver/kcmsmserver.cpp +++ b/kcms/ksmserver/kcmsmserver.cpp @@ -1,167 +1,167 @@ /* * kcmsmserver.cpp * Copyright (c) 2000,2002 Oswald Buddenhagen * * based on kcmtaskbar.cpp * Copyright (c) 2000 Kurt Granroth * * Copyright (c) 2019 Kevin Ottens * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "kcmsmserver.h" #include "smserversettings.h" #include "ui_smserverconfigdlg.h" #include #include #include #include #include "login1_manager.h" K_PLUGIN_FACTORY(SMSFactory, registerPlugin();) SMServerConfig::SMServerConfig(QWidget *parent, const QVariantList &args) : KCModule(parent, args) , ui(new Ui::SMServerConfigDlg) , m_settings(new SMServerSettings(this)) , m_login1Manager(new OrgFreedesktopLogin1ManagerInterface(QStringLiteral("org.freedesktop.login1"), QStringLiteral("/org/freedesktop/login1"), QDBusConnection::systemBus(), this)) { ui->setupUi(this); setQuickHelp( i18n("

Session Manager

" " You can configure the session manager here." " This includes options such as whether or not the session exit (logout)" " should be confirmed, whether the session should be restored again when logging in" " and whether the computer should be automatically shut down after session" " exit by default.")); - initFirmwareSetup(); - checkFirmwareSetupRequested(); - ui->firmwareSetupBox->hide(); ui->firmwareSetupMessageWidget->hide(); + initFirmwareSetup(); + checkFirmwareSetupRequested(); + addConfig(m_settings, this); } SMServerConfig::~SMServerConfig() = default; void SMServerConfig::initFirmwareSetup() { m_rebootNowAction = new QAction(QIcon::fromTheme(QStringLiteral("system-reboot")), i18n("Restart Now")); connect(m_rebootNowAction, &QAction::triggered, this, [this] { auto sm = new SessionManagement(this); auto doShutdown=[sm]() { sm->requestReboot(); delete sm; }; if (sm->state() == SessionManagement::State::Loading) { connect(sm, &SessionManagement::stateChanged, this, doShutdown); } else { doShutdown(); } }); connect(ui->firmwareSetupCheck, &QCheckBox::clicked, this, [this](bool enable) { ui->firmwareSetupMessageWidget->removeAction(m_rebootNowAction); ui->firmwareSetupMessageWidget->animatedHide(); QDBusMessage message = QDBusMessage::createMethodCall(m_login1Manager->service(), m_login1Manager->path(), m_login1Manager->interface(), QStringLiteral("SetRebootToFirmwareSetup")); message.setArguments({enable}); // This cannot be set through a generated DBus interface, so we have to create the message ourself. message.setInteractiveAuthorizationAllowed(true); QDBusPendingReply call = m_login1Manager->connection().asyncCall(message); QDBusPendingCallWatcher *callWatcher = new QDBusPendingCallWatcher(call, this); connect(callWatcher, &QDBusPendingCallWatcher::finished, this, [this, enable](QDBusPendingCallWatcher *watcher) { QDBusPendingReply reply = *watcher; watcher->deleteLater(); checkFirmwareSetupRequested(); KMessageWidget *message = ui->firmwareSetupMessageWidget; if (reply.isError()) { // User likely canceled the PolKit prompt, don't show an error in this case if (reply.error().type() != QDBusError::AccessDenied) { message->setMessageType(KMessageWidget::Error); message->setText(i18n("Failed to request restart to firmware setup: %1", reply.error().message())); message->animatedShow(); } return; } if (!enable) { return; } message->setMessageType(KMessageWidget::Information); if (m_isUefi) { message->setText(i18n("Next time the computer is restarted, it will enter the UEFI setup screen.")); } else { message->setText(i18n("Next time the computer is restarted, it will enter the firmware setup screen.")); } message->addAction(m_rebootNowAction); message->animatedShow(); }); }); const QString canFirmareSetup = m_login1Manager->CanRebootToFirmwareSetup().value(); if (canFirmareSetup == QLatin1String("yes") || canFirmareSetup == QLatin1String("challenge")) { // now check whether we're UEFI to provide a more descriptive button label if (QFileInfo(QStringLiteral("/sys/firmware/efi")).isDir()) { m_isUefi = true; ui->firmwareSetupBox->setTitle(i18n("UEFI Setup")); ui->firmwareSetupCheck->setText(i18n("Enter UEFI setup on next restart")); } ui->firmwareSetupBox->setVisible(true); } } void SMServerConfig::checkFirmwareSetupRequested() { ui->firmwareSetupCheck->setChecked(m_login1Manager->property("RebootToFirmwareSetup").toBool()); } #include "kcmsmserver.moc" diff --git a/kcms/style/gtk2_themes.knsrc b/kcms/style/gtk2_themes.knsrc index 35009c0c7..6c58b4db5 100644 --- a/kcms/style/gtk2_themes.knsrc +++ b/kcms/style/gtk2_themes.knsrc @@ -1,25 +1,26 @@ [KNewStuff3] Name=GTK 2.x Themes Name[ca]=Temes GTK 2.x Name[cs]=Motivy GTK 2.x Name[da]=GTK 2.x-temaer +Name[de]=GTK 2.x-Designs Name[es]=Temas de GTK 2.x Name[et]=GTK 2.x teemad Name[eu]=GTK 2.x gaiak Name[fr]=Thèmes GTK 2.x Name[it]=Temi GTK 2.x Name[ko]=GTK 2.x 테마 Name[lt]=GTK 2.x apipavidalinimai Name[nl]=GTK 2.x thema's Name[pt]=Temas do GTK 2.x Name[pt_BR]=Temas GTK 2.x Name[ru]=Темы GTK 2.x Name[sk]=GTK 3.x Témy Name[sv]=GTK 2.x-teman Name[uk]=Теми GTK 2.x Name[x-test]=xxGTK 2.x Themesxx Name[zh_TW]=GTK 2.x 主題 Categories=GTK 2.x Theme/Style Uncompress=always InstallPath=.themes diff --git a/kcms/style/gtk3_themes.knsrc b/kcms/style/gtk3_themes.knsrc index 6fbf1f8ec..6d80a75a0 100644 --- a/kcms/style/gtk3_themes.knsrc +++ b/kcms/style/gtk3_themes.knsrc @@ -1,25 +1,26 @@ [KNewStuff3] Name=GTK 3.x Themes Name[ca]=Temes GTK 3.x Name[cs]=Motivy GTK 3.x Name[da]=GTK 3.x-temaer +Name[de]=GTK 3.x-Designs Name[es]=Temas de GTK 3.x Name[et]=GTK 3.x teemad Name[eu]=GTK 3.x gaiak Name[fr]=Thèmes GTK 3.x Name[it]=Temi GTK 3.x Name[ko]=GTK 3.x 테마 Name[lt]=GTK 3.x apipavidalinimai Name[nl]=GTK 3.x thema's Name[pt]=Temas do GTK 3.x Name[pt_BR]=Temas GTK 3.x Name[ru]=Темы GTK 3.x Name[sk]=GTK 2.x Témy Name[sv]=GTK 3.x-teman Name[uk]=Теми GTK 3.x Name[x-test]=xxGTK 3.x Themesxx Name[zh_TW]=GTK 3.x 主題 Categories=GTK 3.x Theme/Style Uncompress=always InstallPath=.themes diff --git a/kcms/workspaceoptions/kcm_workspace.desktop b/kcms/workspaceoptions/kcm_workspace.desktop index a7cea304b..492c8d20f 100644 --- a/kcms/workspaceoptions/kcm_workspace.desktop +++ b/kcms/workspaceoptions/kcm_workspace.desktop @@ -1,95 +1,96 @@ [Desktop Entry] Icon=preferences-desktop Exec=kcmshell5 kcm_workspace Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kcm_workspace X-KDE-ParentApp=kcontrol X-KDE-System-Settings-Parent-Category=desktopbehavior X-KDE-Weight=40 X-DocPath=kcontrol/workspaceoptions/index.html Name=General Behavior Name[ast]=Comportamientu xeneral Name[ca]=Comportament general Name[cs]=Obecné chování Name[da]=Generel opførsel Name[de]=Allgemeines Verhalten Name[en_GB]=General Behaviour Name[es]=Comportamiento general Name[et]=Üldine käitumine Name[eu]=Jokabide orokorra Name[fi]=Yleinen toiminta Name[fr]=Comportement général Name[gl]=Comportamento xeral Name[hu]=Általános működés Name[id]=Perilaku Umum Name[it]=Comportamento generale Name[ja]=全般的な挙動 Name[ko]=일반 행동 Name[lt]=Bendra elgsena Name[nl]=Algemeen gedrag Name[nn]=Generell åtferd Name[pa]=ਆਮ ਰਵੱਈਆ Name[pl]=Zachowanie ogólne Name[pt]=Comportamento Geral Name[pt_BR]=Comportamento geral Name[ru]=Основные параметры Name[sk]=Všeobecné správanie Name[sv]=Allmänt beteende Name[tg]=Рафтори умумӣ Name[uk]=Загальна поведінка Name[x-test]=xxGeneral Behaviorxx Name[zh_CN]=常规行为 Name[zh_TW]=一般行為 Comment=Configure general workspace behavior Comment[ast]=Configura'l comportamientu xeneral de la estaya de trabayu Comment[ca]=Configura el comportament general de l'espai de treball Comment[cs]=Nastavení obecného chování pracovního prostředí Comment[da]=Indstil arbejdsområdets generelle opførsel Comment[de]=Allgemeines Verhalten des Arbeitsbereichs einrichten Comment[en_GB]=Configure general workspace behaviour Comment[es]=Configurar el comportamiento general del espacio de trabajo Comment[et]=Töötsooni üldise käitumise seadistamine Comment[eu]=Konfiguratu langunearen jokabide orokorra Comment[fi]=Työpöydän yleisen toiminnan asetukset Comment[fr]=Configurer le comportement général de l'espace de travail Comment[gl]=Configurar o comportamento xeral do espazo de traballo Comment[hu]=A munkaterület általános működésének beállítása Comment[id]=Konfigurasikan perilaku ruang-kerja umum Comment[it]=Configura il comportamento generale dello spazio di lavoro Comment[ja]=全般的なワークスペースの挙動を設定 Comment[ko]=일반 작업 공간 행동 설정 Comment[lt]=Konfigūruoti bendra darbo srities elgseną Comment[nl]=Algemeen gedrag in werkruimte configureren Comment[nn]=Set opp generelle åtferdsinnstillingar for arbeidsområdet Comment[pa]=ਆਮ ਵਰਕਸਪੇਸ ਰਵੱਈਏ ਦੀ ਸੰਰਚਨਾ Comment[pl]=Ustawienia ogólnego zachowania przestrzeni pracy Comment[pt]=Configurar o comportamento geral da área de trabalho Comment[pt_BR]=Configurar o comportamento geral do espaço de trabalho Comment[ru]=Настройка основных параметров поведения рабочей среды Comment[sk]=Nastavte všeobecný štýl a správanie plochy Comment[sv]=Anpassa arbetsytans allmänna beteende Comment[uk]=Налаштовування загальної поведінки робочого простору Comment[x-test]=xxConfigure general workspace behaviorxx Comment[zh_CN]=配置工作空间的常规行为 Comment[zh_TW]=設定一般工作空間行為 X-KDE-Keywords=plasma,workspace,shell,formfactor,dashboard,tooltips,informational tips,tooltips,click,single click,double click,animation speed X-KDE-Keywords[ca]=plasma,espai de treball,àrea de treball,factor de format,tauler,consells d'eines,consells informatius,consells d'eines,clic normal,doble clic,velocitat d'animació X-KDE-Keywords[da]=plasma,arbejdsområde,skal,formfaktor,dashboard,instrumentbræt,værktøjstips,informationstip,klik,enkeltklik,dobbeltklik,animationshastighed +X-KDE-Keywords[de]=Plasma,Arbeitsbereich,Shell,Formfaktor,Format,Dashboard,Übersichtsseite,Kurzinfo,Tipps, Klick, Einfachklick, Doppelklick,Animationsgeschwindigkeit X-KDE-Keywords[es]=plasma,espacio de trabajo,consola,factor de forma,tablero de mandos,ayudas emergentes,ayudas informativas,clic,clic sencillo,doble clic,velocidad de animación X-KDE-Keywords[et]=plasma,töötsoon,shell,dashboard,vidinavaade,konteiner,kohtspikrid,klõps,ühekordne klõps,topeltklõps,animatsiooni kiirus X-KDE-Keywords[eu]=plasma,langunea,shell,forma faktorea,aginte-mahaia,tresnen argibideak,informatzeko argibideak,klik, klik bakuna,klik bikoitza,animazio-abiadura X-KDE-Keywords[fr]=plasma, espace de travail, environnement, facteur de forme, tableau de bord, astuces d'informations, infobulles, clic, simple clic, double clic, vitesse d'animation X-KDE-Keywords[it]=plasma,spazio di lavoro,shell,fattore di forma,cruscotto,suggerimenti,suggerimenti informativi,clic,singolo clic,doppio clic,velocità animazione X-KDE-Keywords[ko]=plasma,workspace,shell,formfactor,dashboard,tooltips,informational tips,animation speed,작업 공간,셸,대시보드,풍선 도움말,클릭,더블 클릭,두 번 누르기,누르기,애니메이션 속도 X-KDE-Keywords[lt]=plasma,darbo sritis,darbo erdvė,darbo erdve,apvalkalas,formos faktorius,skydelis,paaiškinimai,paaiskinimai,informaciniai paaiškinimai,informaciniai paaiskinimai,patarimai,spustelėjimas,spustelejimas,spragtelėjimas,spragtelejimas,vienkartis spustelėjimas,vienkartis spustelejimas,vienkartis spragtelėjimas,vienkartis spragtelejimas,dvikartis spustelėjimas,dvikartis spustelejimas,dvikartis spragtelėjimas,dvikartis spragtelejimas,animacijos greitis,animacijos sparta X-KDE-Keywords[nl]=plasma,werkruimte,shell,vormfactor,dashboard,tekstballonnen,informatieve tips,tekstballonnen,klik,dubbelklik,animatiesnelheid X-KDE-Keywords[pt]=plasma,área de trabalho,consola,formato de ecrã,painel,dicas,dicas informativas,click,click simples,duplo-click,velocidade da animação X-KDE-Keywords[pt_BR]=plasma,área de trabalho,shell,formato de tela,painel,dicas,dicas informativas,clique simples,clique duplo,velocidade de animação X-KDE-Keywords[ru]=plasma,workspace,shell,formfactor,dashboard,tooltips,informational tips,tooltips,click,single click,double click,плазма,рабочий стол,рабочая среда,рабочее окружение,окружение рабочего стола,среда рабочего стола,приборная доска,подсказки,всплывающие подсказки,информационные подсказки,оболочка рабочего стола,щелчок,одиночный клик,одиночный щелчок,двойной клик,двойной щелчок,скорость анимации X-KDE-Keywords[sk]=plasma,pracovná plocha,shell,formfactor,nástenka,nástrojové tipy,informačné tipy,klik,jeden klik,dvojitý klik,rýchlosť animácií X-KDE-Keywords[sv]=plasma,arbetsyta,skal,formfaktor,instrumentpanel,verktygstips,informationstips,klick,enkelklick,dubbelklick,animeringshastighet X-KDE-Keywords[uk]=plasma,workspace,shell,formfactor,dashboard,tooltips,informational tips,tooltips,click,single click,double click,animation speed,плазма,робочий простір,оболонка,форм-фактор,панель,підказки,інформація,відомості,клацання,одинарне клацання,подвійне клацання,швидкість анімації X-KDE-Keywords[x-test]=xxplasmaxx,xxworkspacexx,xxshellxx,xxformfactorxx,xxdashboardxx,xxtooltipsxx,xxinformational tipsxx,xxtooltipsxx,xxclickxx,xxsingle clickxx,xxdouble clickxx,xxanimation speedxx X-KDE-Keywords[zh_TW]=plasma,workspace,shell,formfactor,dashboard,tooltips,informational tips,tooltips,click,single click,double click,animation speed,工作區,殼層,儀表板,工具提示,提示,按,點擊,點按,點選,單點,單擊,按一下,按兩下,雙擊,動畫速度 Categories=Qt;KDE;X-KDE-settings-system;