From 919d68292f83d3c28dcd9e0b4d72e3bcbf7ce404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 8 Jul 2021 11:38:18 +0200 Subject: Use common twin clients translations catalog for twin styles. Exclude commmon strings of twin cliens from translations. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit fed5a8d5ad6d79254d4f3b4f427038b96034c549) --- twin-styles/CMakeL10n.txt | 6 +++++- twin-styles/cde/cdeclient.cpp | 3 +++ twin-styles/cde/config/config.cpp | 3 ++- twin-styles/glow/config/glowconfigdialog.cpp | 3 ++- twin-styles/glow/glowclient.cpp | 3 +++ twin-styles/icewm/config/config.cpp | 1 + twin-styles/icewm/icewm.cpp | 3 +++ twin-styles/kde1/kde1client.cpp | 3 +++ twin-styles/kstep/nextclient.cpp | 3 +++ twin-styles/openlook/OpenLook.cpp | 3 +++ twin-styles/riscos/Static.cpp | 4 ++++ twin-styles/smooth-blend/client/config/smoothblendconfig.cpp | 3 ++- twin-styles/smooth-blend/client/smoothblend.cpp | 3 +++ twin-styles/system/systemclient.cpp | 3 +++ 14 files changed, 40 insertions(+), 4 deletions(-) (limited to 'twin-styles') diff --git a/twin-styles/CMakeL10n.txt b/twin-styles/CMakeL10n.txt index 17cbbc16..e04891c3 100644 --- a/twin-styles/CMakeL10n.txt +++ b/twin-styles/CMakeL10n.txt @@ -1,6 +1,10 @@ ##### create translation templates ############## -tde_l10n_create_template( "twin_art_clients" ) +tde_l10n_create_template( + CATALOG "twin_art_clients" + SOURCES . + X-POT ${CMAKE_SOURCE_DIR}/../tde-i18n/template/messages/tdebase/twin_clients.pot +) tde_l10n_create_template( CATALOG "desktop_files/twin-styles-desktops/" diff --git a/twin-styles/cde/cdeclient.cpp b/twin-styles/cde/cdeclient.cpp index e439160b..84d98c2b 100644 --- a/twin-styles/cde/cdeclient.cpp +++ b/twin-styles/cde/cdeclient.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -210,6 +211,8 @@ static void readConfig(CdeClientFactory *f) CdeClientFactory::CdeClientFactory() { + TDEGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_art_clients"); CDE::readConfig(this); } diff --git a/twin-styles/cde/config/config.cpp b/twin-styles/cde/config/config.cpp index 1d762c5c..1776df24 100644 --- a/twin-styles/cde/config/config.cpp +++ b/twin-styles/cde/config/config.cpp @@ -24,8 +24,9 @@ CdeConfig::CdeConfig( TDEConfig* conf, TQWidget* parent ) : TQObject( parent ) { cdeConfig = new TDEConfig("twincderc"); + TDEGlobal::locale()->insertCatalogue("twin_clients"); TDEGlobal::locale()->insertCatalogue("twin_art_clients"); - + groupBox = new TQVBox( parent ); bgAlign = new TQButtonGroup( 3, Qt::Horizontal, i18n("Text &Alignment"), groupBox ); diff --git a/twin-styles/glow/config/glowconfigdialog.cpp b/twin-styles/glow/config/glowconfigdialog.cpp index 6a80ed66..3aa1d63a 100644 --- a/twin-styles/glow/config/glowconfigdialog.cpp +++ b/twin-styles/glow/config/glowconfigdialog.cpp @@ -55,7 +55,8 @@ GlowConfigDialog::GlowConfigDialog( TDEConfig * conf, TQWidget * parent ) : TQObject(parent) { _glowConfig = new TDEConfig("twinglowrc"); - TDEGlobal::locale()->insertCatalogue("twin_glow_config"); + TDEGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_art_clients"); _main_group_box = new TQWidget(parent); TQVBoxLayout *main_group_boxLayout = new TQVBoxLayout(_main_group_box); diff --git a/twin-styles/glow/glowclient.cpp b/twin-styles/glow/glowclient.cpp index 41435e8f..bea30b44 100644 --- a/twin-styles/glow/glowclient.cpp +++ b/twin-styles/glow/glowclient.cpp @@ -134,6 +134,9 @@ TQString GlowClientGlobals::getPixmapName(PixmapType type, bool isActive) GlowClientGlobals::GlowClientGlobals() : KDecorationFactory() { + TDEGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_art_clients"); + _button_factory = new GlowButtonFactory(); readConfig(); readTheme (); diff --git a/twin-styles/icewm/config/config.cpp b/twin-styles/icewm/config/config.cpp index 66f12ce0..361e59d3 100644 --- a/twin-styles/icewm/config/config.cpp +++ b/twin-styles/icewm/config/config.cpp @@ -59,6 +59,7 @@ IceWMConfig::IceWMConfig( TDEConfig* conf, TQWidget* parent ) : TQObject( parent ) { icewmConfig = new TDEConfig("twinicewmrc"); + TDEGlobal::locale()->insertCatalogue("twin_clients"); TDEGlobal::locale()->insertCatalogue("twin_art_clients"); mainWidget = new TQVBox( parent ); diff --git a/twin-styles/icewm/icewm.cpp b/twin-styles/icewm/icewm.cpp index 9da97d03..990ce1dc 100644 --- a/twin-styles/icewm/icewm.cpp +++ b/twin-styles/icewm/icewm.cpp @@ -153,6 +153,9 @@ bool validPixmaps( TQPixmap* p[] ) ThemeHandler::ThemeHandler() { + TDEGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_art_clients"); + initialized = false; // Prevent having globals objects (use pointers to objects) diff --git a/twin-styles/kde1/kde1client.cpp b/twin-styles/kde1/kde1client.cpp index 13396487..acb4c0b9 100644 --- a/twin-styles/kde1/kde1client.cpp +++ b/twin-styles/kde1/kde1client.cpp @@ -11,6 +11,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich #include #include #include +#include #include #include #include @@ -739,6 +740,8 @@ void StdToolClient::resize( const TQSize& s ) StdFactory::StdFactory() { + TDEGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_art_clients"); create_pixmaps(); } diff --git a/twin-styles/kstep/nextclient.cpp b/twin-styles/kstep/nextclient.cpp index e69d5932..0a18d552 100644 --- a/twin-styles/kstep/nextclient.cpp +++ b/twin-styles/kstep/nextclient.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -922,6 +923,8 @@ bool NextClient::drawbound(const TQRect& geom, bool /* clear */) NextClientFactory::NextClientFactory() { + TDEGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_art_clients"); create_pixmaps(this); } diff --git a/twin-styles/openlook/OpenLook.cpp b/twin-styles/openlook/OpenLook.cpp index 3cf77eda..0f2eafc0 100644 --- a/twin-styles/openlook/OpenLook.cpp +++ b/twin-styles/openlook/OpenLook.cpp @@ -35,6 +35,7 @@ #include #include +#include #include #include "OpenLook.h" @@ -55,6 +56,8 @@ static uint titleHeight; DecorationFactory::DecorationFactory() { + TDEGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_art_clients"); } DecorationFactory::~DecorationFactory() diff --git a/twin-styles/riscos/Static.cpp b/twin-styles/riscos/Static.cpp index 793d8212..f4374f45 100644 --- a/twin-styles/riscos/Static.cpp +++ b/twin-styles/riscos/Static.cpp @@ -31,6 +31,8 @@ #include #include +#include +#include // #include @@ -62,6 +64,8 @@ Static* Static::instance_ = NULL; Static::Static() { + TDEGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_art_clients"); instance_ = this; _init(); } diff --git a/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp b/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp index a95e2f40..83f0afcf 100644 --- a/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp +++ b/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp @@ -30,7 +30,8 @@ smoothblendConfig::smoothblendConfig(TDEConfig* config, TQWidget* parent) : TQObject(parent), config_(0), dialog_(0) { // create the configuration object config_ = new TDEConfig("twinsmoothblendrc"); - TDEGlobal::locale()->insertCatalogue("twin_smoothblend_config"); + TDEGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_art_clients"); // create and show the configuration dialog dialog_ = new ConfigDialog(parent); diff --git a/twin-styles/smooth-blend/client/smoothblend.cpp b/twin-styles/smooth-blend/client/smoothblend.cpp index c842574d..7c3adddd 100644 --- a/twin-styles/smooth-blend/client/smoothblend.cpp +++ b/twin-styles/smooth-blend/client/smoothblend.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -68,6 +69,8 @@ extern "C" KDecorationFactory* create_factory() { // Constructor smoothblendFactory::smoothblendFactory() { + TDEGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_art_clients"); readConfig(); initialized_ = true; } diff --git a/twin-styles/system/systemclient.cpp b/twin-styles/system/systemclient.cpp index 69e0709e..d1edc611 100644 --- a/twin-styles/system/systemclient.cpp +++ b/twin-styles/system/systemclient.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -684,6 +685,8 @@ void SystemClient::borders(int& left, int& right, int& top, int& bottom) const SystemDecoFactory::SystemDecoFactory() { + TDEGlobal::locale()->insertCatalogue("twin_clients"); + TDEGlobal::locale()->insertCatalogue("twin_art_clients"); create_pixmaps(); } -- cgit v1.2.1