diff options
Diffstat (limited to 'kcontrol/fonts')
| -rw-r--r-- | kcontrol/fonts/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | kcontrol/fonts/fonts.cpp | 100 | ||||
| -rw-r--r-- | kcontrol/fonts/fonts.desktop | 221 | ||||
| -rw-r--r-- | kcontrol/fonts/fonts.h | 12 |
4 files changed, 72 insertions, 269 deletions
diff --git a/kcontrol/fonts/CMakeLists.txt b/kcontrol/fonts/CMakeLists.txt index 8e82c01a8..614e87034 100644 --- a/kcontrol/fonts/CMakeLists.txt +++ b/kcontrol/fonts/CMakeLists.txt @@ -44,14 +44,17 @@ link_directories( ##### other data ################################ -install( FILES fonts.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE fonts.desktop + PO_DIR kcontrol-desktops +) ##### kcm_fonts (module) ######################## tde_add_kpart( kcm_fonts AUTOMOC SOURCES fonts.cpp - LINK kxftconfig-static krdb-static tdeui-shared + LINK kxftconfig-static krdb-static tdeui-shared ${FREETYPE_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -60,4 +63,5 @@ tde_add_kpart( kcm_fonts AUTOMOC tde_add_library( kxftconfig STATIC_PIC SOURCES kxftconfig.cpp + LINK ${FONTCONFIG_LIBRARIES} ) diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index c5b4c3353..6236ad49f 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -28,9 +28,9 @@ #include <kipc.h> #include <tdemessagebox.h> #include <knuminput.h> -#include <kprocio.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdeprocio.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <stdlib.h> #ifdef HAVE_FREETYPE2 @@ -186,7 +186,7 @@ void FontUseItem::writeFont() config->setGroup(_rcgroup); config->writeEntry(_rckey, font(), true, true); } else { - config = new KSimpleConfig(locateLocal("config", _rcfile)); + config = new TDESimpleConfig(locateLocal("config", _rcfile)); config->setGroup(_rcgroup); config->writeEntry(_rckey, font()); config->sync(); @@ -270,13 +270,13 @@ FontAASettings::FontAASettings(TQWidget *parent) enableWidgets(); setMainWidget(mw); - connect(excludeRange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(useSubPixel, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(excludeFrom, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(changed())); - connect(excludeTo, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(changed())); - connect(subPixelType, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed())); + connect(excludeRange, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(useSubPixel, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(excludeFrom, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(changed())); + connect(excludeTo, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(changed())); + connect(subPixelType, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(changed())); #ifdef HAVE_FONTCONFIG - connect(hintingStyle, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed())); + connect(hintingStyle, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(changed())); #endif } @@ -596,7 +596,7 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &) ); fontUseList.append(i); - connect(i, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(fontSelected())); + connect(i, TQ_SIGNAL(fontSelected(const TQFont &)), TQ_SLOT(fontSelected())); TQLabel * fontUse = new TQLabel(name+":", this); TQWhatsThis::add(fontUse, *quickHelpIt++); @@ -612,7 +612,7 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &) TQPushButton * fontAdjustButton = new TQPushButton(i18n("Ad&just All Fonts..."), this); TQWhatsThis::add(fontAdjustButton, i18n("Click to change all fonts")); hblay->addWidget( fontAdjustButton ); - connect(fontAdjustButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyFontDiff())); + connect(fontAdjustButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotApplyFontDiff())); layout->addSpacing(KDialog::spacingHint()); @@ -627,33 +627,30 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &) TQWhatsThis::add(cbAA, i18n("If this option is selected, TDE will smooth the edges of curves in " "fonts.")); aaSettingsButton = new TQPushButton( i18n( "Configure..." ), this); - connect(aaSettingsButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotCfgAa())); + connect(aaSettingsButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotCfgAa())); label->setBuddy( cbAA ); lay->addWidget( cbAA, 0, 1 ); lay->addWidget( aaSettingsButton, 0, 2 ); - connect(cbAA, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUseAntiAliasing())); + connect(cbAA, TQ_SIGNAL(activated(int)), TQ_SLOT(slotUseAntiAliasing())); label = new TQLabel( i18n( "Force fonts DPI:" ), this ); lay->addWidget( label, 1, 0 ); comboForceDpi = new TQComboBox( this ); label->setBuddy( comboForceDpi ); - comboForceDpi->insertItem( i18n( "Disabled" )); // change DPISetti ng type if order changes - comboForceDpi->insertItem( i18n( "96 DPI" )); - comboForceDpi->insertItem( i18n( "120 DPI" )); + comboForceDpi->insertItem( i18n( "Disabled" )); + comboForceDpi->insertItem( i18n( "Enabled" )); TQString whatsthis = i18n( "<p>This option forces a specific DPI value for fonts. It may be useful" " when the real DPI of the hardware is not detected properly and it" " is also often misused when poor quality fonts are used that do not" - " look well with DPI values other than 96 or 120 DPI.</p>" - "<p>The use of this option is generally discouraged. For selecting proper DPI" - " value a better option is explicitly configuring it for the whole X server if" - " possible (e.g. DisplaySize in xorg.conf or adding <i>-dpi value</i> to" - " ServerLocalArgs= in $TDEDIR/share/config/tdm/tdmrc). When fonts do not render" - " properly with real DPI value better fonts should be used or configuration" - " of font hinting should be checked.</p>" ); + " look well with DPI values other than 96 or 120 DPI.</p>"); TQWhatsThis::add(comboForceDpi, whatsthis); - connect( comboForceDpi, TQT_SIGNAL( activated( int )), TQT_SLOT( changed())); + connect(comboForceDpi, TQ_SIGNAL(activated(int)), TQ_SLOT(slotUseFontDPI())); + sbDpiValue = new KIntSpinBox(64, 512, 1, 96, 10, this); + TQWhatsThis::add(sbDpiValue, whatsthis); + connect(sbDpiValue, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); lay->addWidget( comboForceDpi, 1, 1 ); + lay->addWidget( sbDpiValue, 1, 2 ); layout->addStretch(1); @@ -695,10 +692,22 @@ void TDEFonts::load( bool useDefaults ) TDEConfig cfgfonts("kcmfonts", true); cfgfonts.setGroup("General"); - int dpicfg = cfgfonts.readNumEntry( "forceFontDPI", 0 ); - DPISetting dpi = dpicfg == 120 ? DPI120 : dpicfg == 96 ? DPI96 : DPINone; - comboForceDpi->setCurrentItem( dpi ); - dpi_original = dpi; + int dpicfg = cfgfonts.readNumEntry("forceFontDPI", 0); + // "forceFontDPIEnable" must be read after "forceFontDPI" to make sure it is + // correctly initialized on the first run when upgrading to the new format, + // without the user even noticying it. The first time "forceFontDPIEnable" + // will not exist and its correct value will be deduced by the existing value + // of "forceFontDPI", which contains the value prior to the update. + bool dpiEnable = cfgfonts.readBoolEntry("forceFontDPIEnable", dpicfg > 0); + dpi_original = dpiEnable ? DPIValue : DPINone; + dpi_value_original = dpicfg; + if (dpi_value_original < 64 || dpi_value_original > 512) + { + dpi_value_original = 96; + } + comboForceDpi->setCurrentItem(dpi_original); + sbDpiValue->setValue(dpi_value_original); + sbDpiValue->setEnabled(dpi_original != DPINone); if( cfgfonts.readBoolEntry( "dontChangeAASettings", true )) { useAA_original = useAA = AASystem; cbAA->setCurrentItem( useAA ); @@ -717,15 +726,17 @@ void TDEFonts::save() TDEConfig cfgfonts("kcmfonts"); cfgfonts.setGroup("General"); - DPISetting dpi = static_cast< DPISetting >( comboForceDpi->currentItem()); - const int dpi2value[] = { 0, 96, 120 }; - cfgfonts.writeEntry( "forceFontDPI", dpi2value[ dpi ] ); + DPISetting dpi = (DPISetting)comboForceDpi->currentItem(); + int dpival = sbDpiValue->value(); + cfgfonts.writeEntry( "forceFontDPIEnable", dpi != DPINone ); + cfgfonts.writeEntry( "forceFontDPI", dpival ); cfgfonts.writeEntry( "dontChangeAASettings", cbAA->currentItem() == AASystem ); cfgfonts.sync(); // if the setting is reset in the module, remove the dpi value, // otherwise don't explicitly remove it and leave any possible system-wide value - if( dpi == DPINone && dpi_original != DPINone ) { - KProcIO proc; + if(dpi == DPINone) + { + TDEProcIO proc; proc << "xrdb" << "-quiet" << "-remove" << "-nocpp"; proc.writeStdin( TQCString( "Xft.dpi" ), true ); proc.closeWhenDone(); @@ -733,7 +744,7 @@ void TDEFonts::save() } // KDE-1.x support - KSimpleConfig* config = new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" ); + TDESimpleConfig* config = new TDESimpleConfig( TQDir::homeDirPath() + "/.tderc" ); config->setGroup( "General" ); for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() ) { if("font"==i->rcKey()) @@ -746,7 +757,7 @@ void TDEFonts::save() KIPC::sendMessageAll(KIPC::FontChanged); - kapp->processEvents(); // Process font change ourselves + tdeApp->processEvents(); // Process font change ourselves bool aaSave = false; // Don't overwrite global settings unless explicitly asked for - e.g. the system @@ -755,11 +766,11 @@ void TDEFonts::save() if( cbAA->currentItem() != AASystem ) aaSave = aaSettings->save( useAA == AAEnabled ); - if( aaSave || (useAA != useAA_original) || dpi != dpi_original) { + if( aaSave || (useAA != useAA_original) || dpival != dpi_value_original || dpi != dpi_original) + { KMessageBox::information(this, - i18n( - "<p>Some changes such as anti-aliasing will only affect newly started applications.</p>" - ), i18n("Font Settings Changed"), "FontSettingsChanged", false); + i18n( "<p>Some changes such as anti-aliasing will only affect newly started applications.</p>"), + i18n("Font Settings Changed"), "FontSettingsChanged", false); useAA_original = useAA; dpi_original = dpi; } @@ -791,6 +802,13 @@ void TDEFonts::slotUseAntiAliasing() emit changed(true); } +void TDEFonts::slotUseFontDPI() +{ + DPISetting dpi = (DPISetting)(comboForceDpi->currentItem()); + sbDpiValue->setEnabled(dpi != DPINone); + emit changed(true); +} + void TDEFonts::slotCfgAa() { if(aaSettings->exec()) @@ -798,5 +816,3 @@ void TDEFonts::slotCfgAa() emit changed(true); } } - -// vim:ts=2:sw=2:tw=78 diff --git a/kcontrol/fonts/fonts.desktop b/kcontrol/fonts/fonts.desktop index 1c4d3ed69..37ab60feb 100644 --- a/kcontrol/fonts/fonts.desktop +++ b/kcontrol/fonts/fonts.desktop @@ -10,230 +10,9 @@ X-TDE-FactoryName=fonts X-TDE-ParentApp=kcontrol Name=Fonts -Name[af]=Skriftipes -Name[ar]=المحارف -Name[az]=Yazı növləri -Name[be]=Шрыфты -Name[bg]=Шрифтове -Name[bn]=ফন্ট -Name[br]=Fontoù -Name[bs]=Fontovi -Name[ca]=Lletres -Name[cs]=Písma -Name[csb]=Fòntë -Name[cy]=Ffontiau -Name[da]=Skrifttyper -Name[de]=Schriftarten -Name[el]=Γραμματοσειρές -Name[eo]=Tiparoj -Name[es]=Tipos de letra -Name[et]=Fondid -Name[eu]=Letra-tipoak -Name[fa]=قلمها -Name[fi]=Kirjasimet -Name[fr]=Polices -Name[fy]=Lettertypen -Name[ga]=Clónna -Name[gl]=Fontes -Name[he]=גופנים -Name[hi]=फ़ॉन्ट्स -Name[hr]=Fontovi -Name[hu]=Betűtípusok -Name[is]=Letur -Name[it]=Tipi di carattere -Name[ja]=フォント -Name[ka]=ფონტები -Name[kk]=Қаріптер -Name[km]=ពុម្ពអក្សរ -Name[ko]=글꼴 -Name[lo]=ຮູບແບບຕົວອັກສອນ -Name[lt]=Šriftai -Name[lv]=Fonti -Name[mk]=Фонтови -Name[mn]=Бичгүүд -Name[ms]=Fon -Name[nb]=Skrifttype -Name[nds]=Schriftoorden -Name[ne]=फन्ट -Name[nl]=Lettertypen -Name[nn]=Skrifttypar -Name[nso]=Difonto -Name[pa]=ਫੋਂਟ -Name[pl]=Czcionki -Name[pt]=Tipos de Letra -Name[pt_BR]=Fontes -Name[ro]=Fonturi -Name[ru]=Шрифты -Name[rw]=Imyandikire -Name[se]=Fonttat -Name[sk]=Písma -Name[sl]=Pisave -Name[sr]=Фонтови -Name[sr@Latn]=Fontovi -Name[ss]=Timo tetinhlamvu temagama -Name[sv]=Teckensnitt -Name[ta]=எழுத்துருக்கள் -Name[tg]=Ҳарфҳо -Name[th]=แบบอักษร -Name[tr]=Yazıtipleri -Name[tt]=Yazu -Name[uk]=Шрифти -Name[uz]=Shriftlar -Name[uz@cyrillic]=Шрифтлар -Name[ven]=Fontu -Name[vi]=Phông chữ -Name[wa]=Fontes -Name[xh]=Uhlobo lwamagama -Name[zh_CN]=字体 -Name[zh_TW]=字型 -Name[zu]=Izinhlobo zamagama Comment=Font settings -Comment[af]=Skrif tipe instellings -Comment[ar]=تعيينات المحرف -Comment[az]=Yazı növü qurğuları -Comment[be]=Настаўленні шрыфтоў -Comment[bg]=Настройване шрифтовете на системата -Comment[bn]=ফন্ট সেটিংস -Comment[br]=Kefluniañ ar fontoù -Comment[bs]=Postavke fontova -Comment[ca]=Arranjament de les lletres -Comment[cs]=Nastavení písem -Comment[csb]=Nastôw fòntów -Comment[cy]=Gosodiadau Ffontiau -Comment[da]=Skrifttypeindstillinger -Comment[de]=Zu verwendende Schriftarten festlegen -Comment[el]=Ρυθμίσεις γραμματοσειρών -Comment[eo]=Tiparagordo -Comment[es]=Opciones de los tipos de letra -Comment[et]=Fontide seadistused -Comment[eu]=Letra-tipoen konfigurazioa -Comment[fa]=تنظیمات قلم -Comment[fi]=Kirjasinten asetukset -Comment[fr]=Configuration des police de caractères -Comment[fy]=Lettertypen ynstellings -Comment[ga]=Socruithe na gclónna -Comment[gl]=Configuración das fontes -Comment[he]=שינוי הגדרות הגופנים -Comment[hi]=फ़ॉन्ट्स विन्यास -Comment[hr]=Postavke fontova -Comment[hu]=Betűtípus-beállítások -Comment[id]=Seting font -Comment[is]=Stillingar leturs -Comment[it]=Impostazioni tipi di carattere -Comment[ja]=フォントの設定 -Comment[ka]=ფონტების კონფიგურაცია -Comment[kk]=Қаріптерді орнату -Comment[km]=ការកំណត់ពុម្ពអក្សរ -Comment[ko]=글꼴 설정 -Comment[lo]=ຕັ້ງຄ່າຮູບແບບຕົວອັກສອນ -Comment[lt]=Šriftų nustatymai -Comment[lv]=Fontu parametri -Comment[mk]=Поставувања на фонтовите -Comment[mn]=Бичиг тохируулах -Comment[ms]=Seting Fon -Comment[mt]=Konfigurazzjoni tal-fonts -Comment[nb]=Skriftinnstillinger -Comment[nds]=Schriftoorden instellen -Comment[ne]=फन्ट सेटिङ -Comment[nl]=Lettertypeninstellingen -Comment[nn]=Skriftinnstillingar -Comment[nso]=Dipeakanyo tsa difonto -Comment[oc]=Arranjament de les fonts -Comment[pa]=ਫੋਂਟ ਸੈਟਿੰਗ -Comment[pl]=Ustawienia czcionek -Comment[pt]=Configuração dos tipos de letra -Comment[pt_BR]=Configuraçõess de Fontes -Comment[ro]=Configurează fonturile de sistem -Comment[ru]=Настройка шрифтов -Comment[rw]=Amagenamiterere y'imyandikire -Comment[se]=Fontaheivehusat -Comment[sk]=Nastavenie písiem -Comment[sl]=Nastavitve pisav -Comment[sr]=Поставке фонта -Comment[sr@Latn]=Postavke fonta -Comment[sv]=Anpassa teckensnitt -Comment[ta]=எழுத்துரு அமைப்புகள் -Comment[tg]=Танзимоти ҳарфҳо -Comment[th]=ตั้งค่าแบบอักษร -Comment[tr]=Yazıtipi ayarları -Comment[tt]=Yazu şäkellären caylaw -Comment[uk]=Налаштування шрифтів -Comment[uz]=Shriftlarni moslash -Comment[uz@cyrillic]=Шрифтларни мослаш -Comment[ven]=Mavhekanyele a fontu -Comment[vi]=Thiết lập phông chữ -Comment[wa]=Apontiaedje des fontes -Comment[xh]=Izicwangciso zohlobo lwamagama -Comment[zh_CN]=字体设置 -Comment[zh_TW]=字型設定 -Comment[zu]=Izilungiselelo Zohlobo lwamagama Keywords=fonts;font size;styles;charsets;character sets;panel;kicker;control panel;desktops;FileManager;Toolbars;Menu;Window Title;Title; -Keywords[ar]=fonts;font size;styles;charsets;character sets;panel;kicker;control panel;desktops;FileManager;Toolbars;Menu;Window Title;Title;خطوط;حجم الخط;لوحة التحكم;محارف;المحارف;أسطح المكتب;مدير الملفات;أشرطة الأدوات;قائمة;عنوان النافذة;عنوان; -Keywords[az]=yazı növləri;yazı böyüklüyü;tərz;hərf köməsi;panel;kicker;idarə masası;masa üstü;masa üstləri;Vasitə Çubuğu;Menyu;Pəncərə Başlığı;Başlıq; -Keywords[be]=шрыфты;памер шрыфту;стылі;знаказборы;знакавыя зборы;панэль;панэль кіравання;працоўныя сталы;працоўны стол;кіраўнік файлаў;панэлі начынняў;панэль начыння;меню;загаловак акна;загаловак;назва;fonts;font size;styles;charsets;character sets;panel;kicker;control panel;desktops;FileManager;Toolbars;Menu;Window Title;Title; -Keywords[bg]=шрифт; шрифтове; размер; символи; знаци; системен панел; fonts; font size; styles; charsets; character sets; panel; kicker; control panel; desktops; FileManager; Toolbars; Menu; Window Title; Title; -Keywords[ca]=lletres;mida de lletra;estils;jocs de caràcters;plafó;kicker;plafó de control;escriptoris;Gestor de fitxers;Barres d'eines;Menú;Títol de finestra;Títol; -Keywords[cs]=Písma;Velikost písem;Styly;Znaková sada;Panel;Kicker;Ovládací centrum;Plocha;Správce souborů;Nástrojová lišta;Nabídka;Titulek okna;Titulek; -Keywords[csb]=fòntë;miara fòntu;sztél;zestôw znaków;panel;kicker;panel sterowaniô;pùltë;biurka;menedżera lopków;lëstwë nôrzãdzów;menu;titel òkna;titel; -Keywords[cy]=ffontiau;maint ffontiau;arddulliau;setiau nodau;panel;ciciwr;rheolydd panel;penbyrddau;Rheolwr Ffeiliau;Barrau Offer;Dewislen;Teitl Ffenestr;Teitl; -Keywords[da]=skrifttyper;skriftstørrelse;stil;tegnsæt;panel;kicker;kontrolpanel;desktoppe;Filhåndtering;Værktøjslinje;Menu;Vinduestitel;Titel; -Keywords[de]=Schriftarten;Schriftgrößen;Zeichensätze;Kontrollleiste;Panel;Kicker;Stile;Dateimanager;Arbeitsflächen;Werkzeugleisten;Menüs;Fenstertitel;Titel; -Keywords[el]=γραμματοσειρές;μέγεθος γραμματοσειράς;στυλ;σύνολα χαρακτήρων;σύνολα χαρακτήρων;πίνακας;kicker;πίνακας ελέγχου;επιφάνειες εργασίας;Διαχειριστής αρχείων;Γραμμές εργαλείων;Μενού;Τίτλος παραθύρου;Τίτλος; -Keywords[eo]=tiparo;grandeco;stilo;signaro;panelo;lanĉilo;stirpanelo;tabuloj;dosieradministrilo;ilobretoj;menuo;fenestrotitolo;titolo; -Keywords[es]=tipos de letra;tamaño del tipo de letra;estilos;mapas de caracteres;panel;kicker;panel de control;escritorios;Gestor de archivos;Barras de herramientas;Menú;Título de la ventana;Título; -Keywords[et]=fondid;font;fondi suurus;stiil;kooditabel;paneel;kicker;juhtimiskeskus;töölauad;failihaldur;tööriistaribad;menüü;akna pealdis;pealdis; -Keywords[eu]=letra-tipoak;letra-tipoa;neurria;estiloak;karaktere-multzoak;karactere ezarpenak ;panela;kicker;kontrol panela;mahaigainak;Fitxategi kudeatzailea;Tresna-barrak; Menua;Leihoaren titulua;Titulua ; -Keywords[fa]=قلمها، اندازۀ قلم، سبکها، نویسهگان، نویسهگان، تابلو، kicker، تابلوی کنترل، رومیزیها، مدیر پرونده، میله ابزارها، گزینگان، عنوان پنجره، عنوان; -Keywords[fi]=kirjasimet;kirjasin;kirjasimen koko;tyyli;merkistö;paneeli;kicker;ohjauspaneeli;työpöydät;Tiedostonhallinta;Työkalurivit;Valikko;Ikkunan otsikko;Otsikko; -Keywords[fr]=polices;police;taille de police;jeu de caractères;tableau de bord;kicker;bureau;bureaux;gestionnaire de fichiers;gestion de fichiers;barre d'outils;menu;titre de fenêtre;titre;fenêtre;barre de menus;barres de menus;barres d'outils; -Keywords[fy]=fonts;font;letters;lettertypen;lettertypes;tekenset;karakterferzamling;paniel;kicker;Konfiguraasjesintrum;styl;triembehearder;wurkbalke;menu;Finster;titel;finstertitel;desktops;buroblêden; -Keywords[ga]=clónna;clófhoirne;clómhéid;stíleanna;tacair charachtair;painéal;kicker;painéal rialaithe;deasca;Bainisteoir Comhad;Barraí Uirlisí;Roghchlár;Teideal Fuinneoige;Teideal; -Keywords[gl]=fontes;tamaño da fonte;estilos;codificación;conxunto de carácteres;painel;kicker;painel de control;escritórios;Xestor de Ficheiros;Barras de ferramentas;Menu;Título da Fiestra;Título; -Keywords[he]=לוח הבקרה;שולחנות עבודה;מנהל קבצים;סרגלי כלים;תפריט;כותרת; חלון;כותרת;גופנים;גודל גופן;סגנונות;מערכי תווים;לוח; fonts;font size;styles;charsets;character sets;panel;kicker;control panel;desktops;FileManager;Toolbars;Menu;Window Title;Title; -Keywords[hi]=फ़ॉन्ट्स; फ़ॉन्ट्स आकार;शैली;कैरसेट;कैरेक्टर सेट्स;फलक;किकर; नियंत्रण फलक;डेस्कटॉप;फ़ाइल प्रबंधक;औज़ार पट्टी;मेन्यू;विंडो शीर्षक;शीर्षक; -Keywords[hr]=fonts;font size;styles;charsets;character sets;panel;kicker;control panel;desktops;FileManager;Toolbars;Menu;Window Title;Title;fontovi;veličina fonta;stilovi;znakovi;ploča;radna površina;alatne trake;izbornik;naslov prozora;naslov;upravljanje datotekama; -Keywords[hu]=betűtípusok;betűméret;stílusok;karakterkészletek;panel;Kicker;vezérlőközpont;asztalok;fájlkezelő;eszköztár;menü;ablakcím;címsor; -Keywords[id]=fonts;font;ukuran font;gaya;charset;panel;kicker;panel kontroldesktops;FileManager;Toolbars;Menu;Window Title;Title; -Keywords[is]=letur;leturstærð;leturgerð;stafatafla;spjald;stillingar;spjald;kicker;gluggar;titill;titilrönd; -Keywords[it]=tipi di carattere;caratteri;dimensione carattere;stile;insieme di caratteri;pannello;kicker;pannello di controllo;desktop;file manager;barre degli strumenti;menu;finestre;titolo finestra;titolo; -Keywords[ja]=フォント;フォントサイズ;スタイル;文字セットパネル;kicker;コントロールパネル;デスクトップ;ファイルマネージャ;ツールバー;メニュー;ウィンドウタイトル;タイトル; -Keywords[ka]=ფონტები;ფონტების ზომა;სტილები;სიმბოლოების რუქა;სიმბოლოების რუქა;პანელი;kicker;კონტროლის პანელი;სამუშაო მაგიდები;ფაილის მენეჯერი;ინსტრუმენტთა პანელი;მენიუ;ფანჯრის სათაური;სათაური; -Keywords[km]=ពុម្ពអក្សរ;ទំហំពុម្ពអក្សរ;រចនាប័ទ្ម;តួអក្សរ;សំណុំតួអក្សរ;បន្ទះ;kicker;ស្លាបព្រិលបញ្ជា;ផ្ទៃតុ;កម្មវិធីគ្រប់គ្រងឯកសារ;របារឧបករណ៍;ម៉ឺនុយ;ចំណងជើងបង្អួច;ចំណងជើង; -Keywords[lt]=fonts;šriftai;font size;šrifto dydis;styles;stiliai;charsets;kodavimas;koduotė;simbolių rinkinys;panel;pultas;kicker;control panel;Valdymo Centras;desktops;darbastaliai;FileManager;failų tvarkyklė;Toolbars;įrankinės;įrankių juostos;Menu;meniu;Window Title;Title;antraštė; -Keywords[lv]=fonti;fonta izmērs;stili;čārseti;simbolu komplekti;panelis;kikers;vadības panelis;darbvirsmas;FailuMenedžeris;Rīkjoslas;Izvēlne;Loga Titli;Titli; -Keywords[mk]=fonts;font size;styles;charsets;character sets;panel;kicker;control panel;desktops;FileManager;Toolbars;Menu;Window Title;Title;фонтови;големина на фонтови;стилови;знаковно множество;знаковни множества;панел;контролен панел;површини;лентасо алатки;алатки;Мени;Наслов на прозорец;Наслов; -Keywords[mn]=Бичгүүд;Бичгийн хэмжээ;Тэмдэгтүүд;Удирдах самбар;Самбар;Дамжуулагч;Хэлбэр;Файл удирдагч;Ажлын тавцан;Багаж самбар;Цэс;Цонхны толгой;Гарчиг; -Keywords[nb]=skrift;skrifttyper;skriftstørrelse;stil;tegnsett;panel;kicker;kontrollpanel;skrivebord;filbehandler;verktøylinjer;meny;vindustittel;tittel; -Keywords[nds]=Schriftoorden;Schriftgrött;Stilen;Tekensetten;Paneel;kicker;Kuntrullbalken;Schriefdischen;Dateimanager;Dateipleger;Warktüüchbalken;Menü;Finstertitel;Titel; -Keywords[nl]=fonts;font;letters;lettertypen;lettertypes;tekenset;tekenverzamelingen;paneel;kicker;configuratiecentrum;stijl;bestandsbeheerder;werkbalk;menu;venster;titel;venstertitel;desktops;bureaubladen; -Keywords[nn]=skrift;skrift;skriftstorleik;stil;teiknsett;panel;kicker;kontrollpanel;skrivebord;filhandsamar;verktøylinjer;meny;vindaugstittel;tittel; -Keywords[nso]=difonto;bogolo bja difonto;mokgwa;charsets;dipeakanyo tsa dihlaka; panel;seragi;panel ya taolo;di-desktop;Molaodi wa Faele;Di-bar tsa Dibereka;Menu; Sehlogo sa Window;Sehlogo; -Keywords[pa]=fonts;font size;styles;charsets;character sets;panel;kicker;control panel;desktops;FileManager;Toolbars;Menu;Window Title;Title;ਫੋਂਟ;ਫੋਂਟ ਅਕਾਰ;ਕੰਟਰੋਲ ਪੈਨਲ;ਵੇਹੜਾ;ਫਾਇਲ ਮੈਨੇਜਰ;ਮੇਨੂ;ਟਾਇਟਲ; -Keywords[pl]=czcionki;rozmiar czcionki;styl;zestaw znaków;panel;kicker;panel sterowania;pulpity;biurka;menedżer plików;paski narzędzi;menu;tytuł okna;tytuł; -Keywords[pt]=tipo de letra;tipos de letra;fontes;fonte;tamanho de fonte;estilo;mapa de caracteres;painel;kicker;painel de controlo;ecrãs;gestor de ficheiros;barras de ferramentas;menu;título da janela;título; -Keywords[pt_BR]=fontes;letras;tipos de letra;tamanho de fonte;tamanho de letra;estilo;conjunto de caracteres;painel;gerenciador de janelas;painel de controle;áreas de trabalho;Gerenciador de arquivos;barras de ferramentas;título da janela;título; -Keywords[ro]=fonturi;font;mărime;stil;set de caractere;panou;kicker;panou de control;ecrane;manager de fișiere;bară de unelte;meniu;titlu fereastră;titlu; -Keywords[rw]=Imyandikire;ingano y'imyandikire;imisusire;itsinda-nyuguti;amatsinday'inyuguti;umwanya;igitera;umwanya w'igenzura;ibiro;Mucungadosiye; Imyanyabikoresho;ibikubiyemo;Umutwe w'idirishya;Umutwe; -Keywords[se]=fonttat;fontasturrodat;stiila;charsets;character sets;panela;kicker;stivrenpanela; čállinbeavddit;fiilagieđahalli;neavvoholggat;fálut;lásenamahusat;namahus; -Keywords[sk]=písma;písmo;veľkosť písma;panel;ovládací panel;znakové sady;kódovanie;štýly;kicker;plochy;Správca súborov;Panely nástrojov;Ponuka;menu;titulok;titulok okna; -Keywords[sl]=pisava;pisave;velikost pisave;slog;stil;znakovni nabor;pult;kicker;nadzorna plošča;upravitelj datotek;upravitelj;orodna vrstica;naslov okna;naslov; -Keywords[sr]=fonts;фонт size;styles;charsets;character sets;панел;kicker;control панел;desktops;FileManager;Toolbars;Menu;Window Title;Title;стилови;мени;прозор;трака са алатима;менаџер фајлова;радна површина;скуп знакова; -Keywords[sr@Latn]=fonts;font size;styles;charsets;character sets;panel;kicker;control panel;desktops;FileManager;Toolbars;Menu;Window Title;Title;stilovi;meni;prozor;traka sa alatima;menadžer fajlova;radna površina;skup znakova; -Keywords[sv]=typsnitt;teckensnitt;typsnittstorlek;teckensnittstorlek;stil;teckenkodning;panel;kicker;kontrollpanel;inställningscentral;Filhanterare;Verktygsrader;Meny;Fönstertitel;Titel; -Keywords[ta]=எழுத்துருக்கள்;எழுத்துரு அளவு;பாணிகள்;எழுத்து அமைப்பு;எழுத்து அமைப்புகள்;பலகம்;கிக்கர்;கட்டுப்பாட்டு பலகம்;மேல்மேசைகள்;கோப்பு மேலாளர்;கருவிப்பட்டிகள்;பட்டியல்;சாளர தலைப்பு;தலைப்பு; -Keywords[th]=แบบอักษร;ขนาดแบบอักษร;ลักษณะ;ชุดรหัสอักขระ;ชุดอักขระ;พาเนล;คิกเกอร์;ถาดควบคุม;พื้นที่ทำงาน;จัดการแฟ้ม;แถบเครื่องมือ;เมนู;แถบหัวเรื่องหน้าต่าง;แถบหัวเรื่อง; -Keywords[tr]=yazıtipleri;yazı boyutu;stil;karakter kümesi;panel;kicker;denetim masası;masaüstü;masaüstleri;Araç Çubuğu;Menü;Pencere Başlığı;Başlık; -Keywords[uk]=шрифти;шрифт;розмір шрифту;стиль;набір символів;панель;kicker;панель керування;стільниці;панель інструментів;меню;заголовок вікна;заголовок; -Keywords[uz]=shriftlar;shriftning oʻlchami;uslublar;belgi toʻplami;kodlash usuli;panel;boshqaruv paneli;ish stollari;Fayl boshqaruvchisi;Asboblar paneli;Menyu;Oynaning sarlavhasi;Sarlavha; -Keywords[uz@cyrillic]=шрифтлар;шрифтнинг ўлчами;услублар;белги тўплами;кодлаш усули;панел;бошқарув панели;иш столлари;Файл бошқарувчиси;Асбоблар панели;Меню;Ойнанинг сарлавҳаси;Сарлавҳа; -Keywords[ven]=Dzifontu;saizi ya Fontu;Zwitaela;Tshasete;Mubvumbedzhwa;Phanele;Murahi;Phanele yau langula;desikithopo;Mulanguli wa faela;bara ya tshishumiswa;Menu;thoho ya windo;Thoho; -Keywords[vi]=Phông chữ;cỡ;kiểu;bảng mã;bộ ký tự;bảng;thanh đẩy;bảng điều khiển;màn hình nền;Trình quản lý Tập tin;Thanh công cụ;Thực đơn;Tên Cửa sổ;Tên; -Keywords[wa]=fonte;fontes;grandeu del fonte;stîle;miernowes;cråsses;clintcheyes;ecôdaedjes;djeu di caracteres;scriftôr;kicker;cinte di contrôle;scribannes;Manaedjeu di fitchîs;Bår d' usteyes;Menu;Dressêye;Tite do purnea;Bår di tite;Tite; -Keywords[xh]=ubungakanani bamagama;ubungakanani begama;iintlobo;iicharset;amaqela abasebenzi;iqela labantu benjongo ethile;umkhabi;iqela labantu abalawulayo benjongo ethile;desktops;Umphathi wefayile iibar zesixhobo;Menu;Umxholo we Window;Umxholo; -Keywords[zh_CN]=fonts;font size;styles;charsets;character sets;panel;kicker;control panel;desktops;FileManager;Toolbars;Menu;Window Title;Title;字体;字体大小;风格;字符集;面板;控制面板;桌面;文件管理器;工具条;菜单;窗口标题;标题; -Keywords[zh_TW]=fonts;font size;styles;charsets;character sets;panel;kicker;control panel;desktops;FileManager;Toolbars;Menu;Window Title;Title;字型;字型大小;風格;字元;字元集;面板;控制面板;桌面;檔案管理程式;工具列;選單;視窗標題;標題; -Keywords[zu]=Izinhlobo zamagama;uhlobo lwamagama;izitayela;charsets; amaqoqo ezaimpawu;kicker;lawula;iwindi lemininingwane;ama-desktop;Imenenja yefayela;amabha amathuluzi;Imenu;Isihloko se-Window;Isihloko; Categories=Qt;TDE;X-TDE-settings-looknfeel; diff --git a/kcontrol/fonts/fonts.h b/kcontrol/fonts/fonts.h index 65a1266cb..c8b3f9919 100644 --- a/kcontrol/fonts/fonts.h +++ b/kcontrol/fonts/fonts.h @@ -20,11 +20,12 @@ class TQCheckBox; class TQComboBox; class KDoubleNumInput; +class KIntSpinBox; class FontAASettings; class FontUseItem : public TDEFontRequester { - Q_OBJECT + TQ_OBJECT public: FontUseItem(TQWidget * parent, const TQString &name, const TQString &grp, @@ -49,7 +50,7 @@ private: class FontAASettings : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -91,7 +92,7 @@ private: */ class TDEFonts : public TDECModule { - Q_OBJECT + TQ_OBJECT public: TDEFonts(TQWidget *parent, const char *name, const TQStringList &); @@ -107,15 +108,18 @@ protected slots: void slotApplyFontDiff(); void slotUseAntiAliasing(); void slotCfgAa(); + void slotUseFontDPI(); private: enum AASetting { AAEnabled, AASystem, AADisabled }; - enum DPISetting { DPINone, DPI96, DPI120 }; + enum DPISetting { DPINone, DPIValue }; AASetting useAA, useAA_original; DPISetting dpi_original; + int dpi_value_original; TQComboBox *cbAA; TQComboBox* comboForceDpi; TQPushButton *aaSettingsButton; + KIntSpinBox *sbDpiValue; TQPtrList <FontUseItem> fontUseList; FontAASettings *aaSettings; }; |