diff options
Diffstat (limited to 'kcontrol/tdefontinst')
36 files changed, 139 insertions, 996 deletions
diff --git a/kcontrol/tdefontinst/CMakeLists.txt b/kcontrol/tdefontinst/CMakeLists.txt index 42f3f497d..d4cc59646 100644 --- a/kcontrol/tdefontinst/CMakeLists.txt +++ b/kcontrol/tdefontinst/CMakeLists.txt @@ -17,4 +17,8 @@ add_subdirectory( tdefile-plugin ) add_subdirectory( tdefontinst ) add_subdirectory( tdeio ) -install( FILES installfont.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus ) +tde_create_translated_desktop( + SOURCE installfont.desktop + DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus + PO_DIR kcontrol-desktops +) diff --git a/kcontrol/tdefontinst/installfont.desktop b/kcontrol/tdefontinst/installfont.desktop index 3485605df..6353f9fec 100644 --- a/kcontrol/tdefontinst/installfont.desktop +++ b/kcontrol/tdefontinst/installfont.desktop @@ -4,76 +4,5 @@ Actions=installFont; [Desktop Action installFont] Name=Install -Name[af]=Installeer -Name[ar]=ثبت -Name[be]=Устанавіць -Name[bg]=Инсталиране -Name[bn]=ইনস্টল -Name[br]=Staliañ -Name[bs]=Instaliraj -Name[ca]=Instal·la -Name[cs]=Instalovat -Name[csb]=Instalëjë -Name[cy]=Gosod -Name[da]=Installér -Name[de]=Installieren -Name[el]=Εγκατάσταση -Name[eo]=Instali -Name[es]=Instalar -Name[et]=Paigaldamine -Name[eu]=Instalatu -Name[fa]=نصب -Name[fi]=Asenna -Name[fr]=Installer -Name[fy]=Ynstallearje -Name[ga]=Suiteáil -Name[gl]=Instalar -Name[he]=התקנה -Name[hi]=संस्थापित -Name[hr]=Instaliraj -Name[hu]=Telepítő -Name[is]=Setja upp -Name[it]=Installa -Name[ja]=インストール -Name[ka]=ინსტალაცია -Name[kk]=Орнату -Name[km]=ដំឡើង -Name[ko]=설치... -Name[lt]=Įdiegti -Name[lv]=Instalēt -Name[mk]=Инсталирај -Name[ms]=Pasang -Name[mt]=Installa -Name[nb]=Installer -Name[nds]=Installeren -Name[ne]=स्थापना गर्नुहोस् -Name[nl]=Installeren -Name[nn]=Installer -Name[pa]=ਇੰਸਟਾਲ -Name[pl]=Instaluj -Name[pt]=Instalar -Name[pt_BR]=Instalar -Name[ro]=Instalare -Name[ru]=Установка -Name[rw]=Kwinjizaporogaramu -Name[se]=Sajáiduhte -Name[sk]=Inštalácia -Name[sl]=Namesti -Name[sr]=Инсталирај -Name[sr@Latn]=Instaliraj -Name[sv]=Installera -Name[ta]=நிறுவி -Name[te]=స్థాపించు -Name[tg]=Гузоштан -Name[th]=ติดตั้ง -Name[tr]=Kur -Name[tt]=Quyu -Name[uk]=Встановлення -Name[uz]=Oʻrnatish -Name[uz@cyrillic]=Ўрнатиш -Name[vi]=Cài đặt -Name[wa]=Astaler -Name[zh_CN]=安装 -Name[zh_TW]=安裝 Icon=font-x-generic Exec=kfmclient copy %U fonts:/ diff --git a/kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt b/kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt index e3b89dfba..0e5c17bfd 100644 --- a/kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt +++ b/kcontrol/tdefontinst/kcmfontinst/CMakeLists.txt @@ -26,7 +26,10 @@ link_directories( ##### other data ################################ tde_install_icons() -install( FILES kcmfontinst.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE kcmfontinst.desktop + PO_DIR kcontrol-desktops +) ##### kcm_fontinst (module) ##################### diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp index 920326f0a..1298677b6 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp @@ -113,7 +113,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) { itsSplitter=new TQSplitter(this); fontsFrame=new TQFrame(itsSplitter), - itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(itsSplitter), "kcmfontinst", "KParts::ReadOnlyPart"); + itsPreview=(KParts::ReadOnlyPart *)factory->create(itsSplitter, "kcmfontinst", "KParts::ReadOnlyPart"); itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES)); @@ -156,10 +156,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) fontsLayout->addMultiCellWidget(itsDirOp, 0, 0, 0, 1); KPushButton *button=new KPushButton(KGuiItem(i18n("Add Fonts..."), "newfont"), fontsFrame); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(addFonts())); button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); fontsLayout->addWidget(button, 1, 0); - TQT_TQLAYOUT(fontsLayout)->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); layout->addWidget(toolbar); #ifdef HAVE_XFT @@ -182,15 +182,15 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsViewMenuAct=dynamic_cast<TDEActionMenu *>(itsDirOp->actionCollection()->action("view menu")); topMnu->popupMenu()->clear(); - connect(topMnu->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupMenu())); + connect(topMnu->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(setupMenu())); if((act=itsDirOp->actionCollection()->action("up"))) - act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(cdUp())); + act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(cdUp())); if((act=itsDirOp->actionCollection()->action("home"))) - act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(home())); + act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(home())); if((act=itsDirOp->actionCollection()->action("back"))) - act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(back())); + act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(back())); if((act=itsDirOp->actionCollection()->action("forward"))) - act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(forward())); + act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(forward())); if((act=itsDirOp->actionCollection()->action("reload"))) act->plug(toolbar); @@ -199,26 +199,26 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) if((itsIconAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("short view")))) { - disconnect(itsIconAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotSimpleView())); - connect(itsIconAct, TQT_SIGNAL(activated()), TQT_SLOT(iconView())); + disconnect(itsIconAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(slotSimpleView())); + connect(itsIconAct, TQ_SIGNAL(activated()), TQ_SLOT(iconView())); itsIconAct->plug(toolbar); } if((itsListAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("detailed view")))) { - disconnect(itsListAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotDetailedView())); - connect(itsListAct, TQT_SIGNAL(activated()), TQT_SLOT(listView())); + disconnect(itsListAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(slotDetailedView())); + connect(itsListAct, TQ_SIGNAL(activated()), TQ_SLOT(listView())); itsListAct->plug(toolbar); } - itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "application-x-font-snf", 0, TQT_TQOBJECT(this), TQT_SLOT(filterFonts()), + itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "application-x-font-snf", 0, this, TQ_SLOT(filterFonts()), itsDirOp->actionCollection(), "showbitmap"); itsShowBitmapAct->setChecked(showBitmap); itsShowBitmapAct->plug(toolbar); toolbar->insertLineSeparator(); - act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, TQT_TQOBJECT(this), TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts"); + act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, this, TQ_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts"); act->plug(toolbar); topMnu->insert(act); @@ -227,24 +227,24 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsDeleteAct->plug(toolbar); itsDeleteAct->setEnabled(false); topMnu->insert(itsDeleteAct); - disconnect(itsDeleteAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(deleteSelected())); - connect(itsDeleteAct, TQT_SIGNAL(activated()), this, TQT_SLOT(removeFonts())); + disconnect(itsDeleteAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(deleteSelected())); + connect(itsDeleteAct, TQ_SIGNAL(activated()), this, TQ_SLOT(removeFonts())); } toolbar->insertLineSeparator(); - act=new TDEAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure"); + act=new TDEAction(i18n("Configure..."), "configure", 0, this, TQ_SLOT(configure()), itsDirOp->actionCollection(), "configure"); act->plug(toolbar); #ifdef HAVE_XFT toolbar->insertLineSeparator(); - act=new TDEAction(i18n("Print..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print"); + act=new TDEAction(i18n("Print..."), "document-print", 0, this, TQ_SLOT(print()), itsDirOp->actionCollection(), "print"); act->plug(toolbar); #endif if( (itsSepDirsAct=itsDirOp->actionCollection()->action("separate dirs")) && (itsShowHiddenAct=itsDirOp->actionCollection()->action("show hidden"))) { - //disconnect(itsViewMenuAct->popupMenu(), TQT_SIGNAL(aboutToShow()), itsDirOp, TQT_SLOT(insertViewDependentActions())); - connect(itsViewMenuAct->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupViewMenu())); + //disconnect(itsViewMenuAct->popupMenu(), TQ_SIGNAL(aboutToShow()), itsDirOp, TQ_SLOT(insertViewDependentActions())); + connect(itsViewMenuAct->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(setupViewMenu())); setupViewMenu(); } @@ -267,12 +267,12 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsDirOp->dirLister()->setShowingDotFiles(true); - connect(itsDirOp, TQT_SIGNAL(fileHighlighted(const KFileItem *)), TQT_SLOT(fileHighlighted(const KFileItem *))); - connect(itsDirOp, TQT_SIGNAL(finishedLoading()), TQT_SLOT(loadingFinished())); - connect(itsDirOp, TQT_SIGNAL(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)), - TQT_SLOT(dropped(const KFileItem *, TQDropEvent *, const KURL::List &))); - connect(itsDirOp->dirLister(), TQT_SIGNAL(infoMessage(const TQString &)), TQT_SLOT(infoMessage(const TQString &))); - connect(itsDirOp, TQT_SIGNAL(updateInformation(int, int)), TQT_SLOT(updateInformation(int, int))); + connect(itsDirOp, TQ_SIGNAL(fileHighlighted(const KFileItem *)), TQ_SLOT(fileHighlighted(const KFileItem *))); + connect(itsDirOp, TQ_SIGNAL(finishedLoading()), TQ_SLOT(loadingFinished())); + connect(itsDirOp, TQ_SIGNAL(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)), + TQ_SLOT(dropped(const KFileItem *, TQDropEvent *, const KURL::List &))); + connect(itsDirOp->dirLister(), TQ_SIGNAL(infoMessage(const TQString &)), TQ_SLOT(infoMessage(const TQString &))); + connect(itsDirOp, TQ_SIGNAL(updateInformation(int, int)), TQ_SLOT(updateInformation(int, int))); } CKCmFontInst::~CKCmFontInst() @@ -465,7 +465,7 @@ void CKCmFontInst::removeFonts() if(doIt) { TDEIO::DeleteJob *job = TDEIO::del(urls, false, true); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(delResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(delResult(TDEIO::Job *))); job->setWindow(this); job->setAutoErrorHandlingEnabled(true, this); } @@ -637,7 +637,7 @@ void CKCmFontInst::addFonts(const KURL::List &src, const KURL &dest) } TDEIO::CopyJob *job=TDEIO::copy(copy, dest, true); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(jobResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(jobResult(TDEIO::Job *))); job->setWindow(this); job->setAutoErrorHandlingEnabled(true, this); } diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h index a5dccb161..8708ef1c0 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h +++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h @@ -58,7 +58,7 @@ namespace KFI class CKCmFontInst : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp index 559c8c4c5..e9f5b7dae 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp @@ -79,15 +79,15 @@ CKFileFontView::CKFileFontView(TQWidget *parent, const char *name) setAllColumnsShowFocus(true); setDragEnabled(false); - connect(header(), TQT_SIGNAL(sectionClicked(int)), TQT_SLOT(slotSortingChanged(int))); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(slotActivate(TQListViewItem *))); - connect(this, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), TQT_SLOT(selected( TQListViewItem *))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), TQT_SLOT(slotActivate(TQListViewItem *))); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotActivateMenu(TQListViewItem *, const TQPoint &))); + connect(header(), TQ_SIGNAL(sectionClicked(int)), TQ_SLOT(slotSortingChanged(int))); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), TQ_SLOT(slotActivate(TQListViewItem *))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), TQ_SLOT(selected( TQListViewItem *))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), TQ_SLOT(slotActivate(TQListViewItem *))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotActivateMenu(TQListViewItem *, const TQPoint &))); // DND - connect(&(d->itsAutoOpenTimer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoOpen())); + connect(&(d->itsAutoOpenTimer), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoOpen())); setSelectionMode(KFileView::selectionMode()); itsResolver = new KMimeTypeResolver<CFontListViewItem, CKFileFontView>(this); } @@ -211,8 +211,8 @@ void CKFileFontView::highlighted( TQListViewItem *item ) void CKFileFontView::setSelectionMode(KFile::SelectionMode sm) { - disconnect(TQT_SIGNAL(selectionChanged()), this); - disconnect(TQT_SIGNAL(selectionChanged(TQListViewItem *)), this); + disconnect(TQ_SIGNAL(selectionChanged()), this); + disconnect(TQ_SIGNAL(selectionChanged(TQListViewItem *)), this); switch (sm) { @@ -233,9 +233,9 @@ void CKFileFontView::setSelectionMode(KFile::SelectionMode sm) // for highlighting if (KFile::Multi==sm || KFile::Extended==sm) - connect(this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); else - connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem *)), TQT_SLOT(highlighted(TQListViewItem * ))); + connect(this, TQ_SIGNAL(selectionChanged(TQListViewItem *)), TQ_SLOT(highlighted(TQListViewItem * ))); } bool CKFileFontView::isSelected(const KFileItem *i) const diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h index 646359280..a741fead8 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h +++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h @@ -115,7 +115,7 @@ class CFontListViewItem : public TDEListViewItem */ class CKFileFontView : public TDEListView, public KFileView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop b/kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop index 6363a33ad..856efcd6d 100644 --- a/kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop +++ b/kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop @@ -12,224 +12,9 @@ X-TDE-RootOnly=true X-TDE-ParentApp=kcontrol Name=Font Installer -Name[af]=Skrif tipe Installeerder -Name[ar]=مثبت المحارف -Name[az]=Yazı Növü Qurucusu -Name[be]=Устаноўка шрыфтоў -Name[bg]=Шрифтове -Name[bn]=ফন্ট ইনস্টলার -Name[br]=Stalianer an nodrezhoù -Name[bs]=Dodavanje fontova -Name[ca]=Instal·lador de lletres -Name[cs]=Instalátor písem -Name[csb]=Instalownik fòntów -Name[cy]=Gosodydd Ffontiau -Name[da]=Skrifttype-installering -Name[de]=Schriftarteninstallation -Name[el]=Εγκαταστάτης γραμματοσειρών -Name[eo]=Tiparinstalilo -Name[es]=Instalador de tipos de letra -Name[et]=Fontide paigaldaja -Name[eu]=Letra tipoak instalatzeko tresna -Name[fa]=نصبکنندۀ قلم -Name[fi]=Kirjasinasentaja -Name[fr]=Installateur de polices -Name[fy]=Lettertype-Ynstalaasje -Name[ga]=Suiteálaí Clófhoirne -Name[gl]=Instalador de Fontes -Name[he]=מתקין הגופנים -Name[hi]=फ़ॉन्ट संस्थापक -Name[hr]=Instaliranje fontova -Name[hu]=Betűtípus-telepítő -Name[is]=TDE letursækir -Name[it]=Installatore dei tipi di carattere -Name[ja]=フォントインストーラ -Name[ka]=ფონტების დაყენება -Name[kk]=Қаріптерді орнату -Name[km]=កម្មវិធីដំឡើងពុម្ពអក្សរ -Name[ko]=글꼴 설치기 -Name[lo]=ຕິດຕັ້ງຮູບແບບຕົວອັກສອນ -Name[lt]=Šriftų diegiklis -Name[lv]=Fontu Instalators -Name[mk]=Инсталатор на фонтови -Name[mn]=Бичиг-Суулгалт -Name[ms]=Pemasang Fon -Name[mt]=Installatur ta' fonts -Name[nb]=Skriftinstallering -Name[nds]=Schriftoorden installeren -Name[ne]=फन्ट स्थापक -Name[nl]=Lettertype-installatie -Name[nn]=Skriftinstallering -Name[nso]=Motsenyi wa Fonto -Name[pa]=ਫੋਂਟ ਇੰਸਟਾਲਰ -Name[pl]=Instalator czcionek -Name[pt]=Instalador de Tipos de Letra -Name[pt_BR]=Instalador de Fontes -Name[ro]=Instalare fonturi -Name[ru]=Установка шрифтов -Name[rw]=Mwinjizaporogaramu Imyandikire -Name[se]=Fontasajáiduhttejeaddji -Name[sk]=Inštalátor písiem -Name[sl]=Namestilnik pisav -Name[sr]=Инсталатор фонтова -Name[sr@Latn]=Instalator fontova -Name[sv]=Installation av teckensnitt -Name[ta]=எழுத்துரு நிறுவுதல் -Name[tg]=Барпо кардани ҳарфҳо -Name[th]=ตัวติดตั้งแบบอักษร -Name[tr]=Yazıtipi Kurucusu -Name[tt]=Yazu Quydırğıç -Name[uk]=Встановлення шрифтів -Name[uz]=Shrift oʻrnatgich -Name[uz@cyrillic]=Шрифт ўрнатгич -Name[ven]=Mudzhenisi wa Fontu -Name[vi]=Cài đặt Phông chữ -Name[wa]=Astaleu di fontes -Name[xh]=Umfaki Wohlobo lwegama -Name[zh_CN]=字体安装程序 -Name[zh_TW]=字型安裝程式 -Name[zu]=Umfakeli Wohlobo lwamagama Comment=Install & preview fonts -Comment[af]=Installeer & voorskou skriftipes -Comment[ar]=تثبيت و معاينة المحارف -Comment[az]=Yazı növü qur & nümayiş et -Comment[be]=Устаноўка і прагляд шрыфтоў -Comment[bg]=Инсталиране и преглед на шрифтове -Comment[bn]=ফন্ট ইনস্টল এবং প্রাক্দর্শন করুন -Comment[br]=Staliañ ha rakgwel an nodrezhoù -Comment[bs]=Dodavanje i pregledanje fontova -Comment[ca]=Instal·la i previsualitza lletres -Comment[cs]=Instalace a náhled písem -Comment[csb]=Instalacëjô ë pòdzérk fòntów -Comment[cy]=Gosod a rhagolygu ffontiau -Comment[da]=Installér og forhåndsvis skrifttyper -Comment[de]=Schriftarten installieren und betrachten -Comment[el]=Εγκατάσταση & προεπισκόπηση γραμματοσειρών -Comment[eo]=Instalas kaj prezentas tiparojn -Comment[es]=Instalar y previsualizar tipos de letra -Comment[et]=Fontide paigaldamine ja eelvaatlus -Comment[eu]=Instalatu eta aurreikusi letra tipoak -Comment[fa]=نصب و پیشنمایش قلمها -Comment[fi]=Asenna ja esikatsele kirjasimia -Comment[fr]=Pour installer et afficher des polices de caractères -Comment[fy]=Lettertypen ynstallearje en besjen -Comment[ga]=Suiteáil & Réamhamharc na gClónna -Comment[gl]=Instalar e antever fontes -Comment[he]=התקנה ותצוגה מקדימה של גופנים -Comment[hi]=फ़ॉन्ट्स संस्थापित व पूर्वावलोकन करें -Comment[hr]=Instaliranje i pregled fontova -Comment[hu]=Betűtípusok telepítése, áttekintése -Comment[is]=Setja inn & forskoða letur -Comment[it]=Installa e mostra anteprime dei caratteri -Comment[ja]=フォントのインストールとプレビュー -Comment[ka]=ფონტების დაყენება და დათვალიერება -Comment[kk]=Қаріптерді орнату және қарап-шығу -Comment[km]=ដំឡើង & មើលពុម្ពអក្សរជាមុន -Comment[ko]=글꼴 설치, 미리보기, 관리 -Comment[lo]=ຕິດຕັ້ງແລະສະແດງຕົວຢ່າງຮູບແບບຕົວອັກສອນ -Comment[lt]=Instaliuoja ir peržiūri šriftus -Comment[lv]=Instalē un apskata fontus -Comment[mk]=Инсталирај и прегледај фонтови -Comment[mn]=Бичиг суулгах ба харах -Comment[ms]=Pasang & prapapar fon -Comment[mt]=Installa u ara fonts -Comment[nb]=Installer og forhåndsvis skrifttyper -Comment[nds]=Schriftoorden installeren & ankieken -Comment[ne]=फन्ट स्थापना र पूर्वावलोकन गर्नुहोस् -Comment[nl]=Lettertypen installeren en bekijken -Comment[nn]=Installer og vis skrifter -Comment[nso]=Tsenya & Bonelapele difonto -Comment[pa]=ਫੋਂਟ ਝਲਕ ਤੇ ਇੰਸਟਾਲ -Comment[pl]=Instalacja i podgląd czcionek -Comment[pt]=Instalar e antever tipos de letra -Comment[pt_BR]=Instalar & pré-visualizar fontes -Comment[ro]=Instalează și previzualizează fonturi -Comment[ru]=Установка и просмотр шрифтов -Comment[rw]=Kwinjiza & kugaragazambere imyandikire -Comment[se]=Sajáiduhtte ja čájet fonttaid -Comment[sk]=Inštaluje a zobrazuje písma -Comment[sl]=Namesti in prikaže pisave -Comment[sr]=Инсталација и преглед фонтова -Comment[sr@Latn]=Instalacija i pregled fontova -Comment[sv]=Installera och förhandsgranska teckensnitt -Comment[ta]=எழுத்துருக்களை நிறுவி காட்டு -Comment[tg]=Барпо кардан ва тамошои ҳарфҳо -Comment[th]=ติดตั้งและแสดงตัวอย่างแบบอักษร -Comment[tr]=Yazıtiplerini kur ve önizle -Comment[tt]=Yazu şäkellären quyu/tikşerü urını -Comment[uk]=Встановлення та перегляд шрифтів -Comment[uz]=Shriftlarni oʻrnatish va koʻrib chiqish -Comment[uz@cyrillic]=Шрифтларни ўрнатиш ва кўриб чиқиш -Comment[ven]=Dzhenisani & vhonelani phanda dzifontu -Comment[vi]=Cài đặt & xem trước phông chữ -Comment[wa]=Astalaedje et håynaedje des fontes -Comment[xh]=Faka & yenza imboniso yohlobo lwamagama -Comment[zh_CN]=安装和预览字体 -Comment[zh_TW]=安裝並預覽字型 -Comment[zu]=Fakela & buka ngaphambili izinhlobo zamagama Keywords=font;fonts;installer;truetype;type1;speedo;bitmap; -Keywords[be]=Шрыфт;Шрыфты;Устаноўка;font;fonts;installer;truetype;type1;speedo;bitmap; -Keywords[bg]=шрифт; шрифтове; преглед; печат; font; fonts; installer; truetype; type1; speedo; bitmap; -Keywords[br]=nodrezh;nodrezhoù;stalier;truetype;type1;speedo;bitmap; -Keywords[bs]=font;fonts;installer;truetype;type1;speedo;bitmap;fontovi;instalacija; -Keywords[ca]=lletra;lletres;instal·lador;truetype;type1;speedo;bitmap; -Keywords[cs]=písmo;písma;instalátor;truetype;type1;speedo;bitmap; -Keywords[csb]=fòntë;font;instalownik;truetype;type1;speedo; -Keywords[cy]=ffont;ffontiau;wynebfath; wynebfathau;arsefydlydd;truetype;type1;math 1;speedo;didfap; -Keywords[da]=skrifttype;skrifttyper;installatør;truetype;type1;speedo;bitmap; -Keywords[de]=Fonts;Schriftarten;Installation;TrueType;Type1;Speedo;Bitmapschriften; -Keywords[el]=γραμματοσειρά;γραμματοσειρές;εγκαταστάτης;truetype;type1;speedo;bitmap; -Keywords[eo]=tiparo;tiparoj;instalilo;ŝangebla;neŝangebla; -Keywords[es]=tipo de letra;tipos de letra;instalador;truetype;type1;speedo;bitmap; -Keywords[et]=font;fondid;paigaldaja;truetype;type1;speedo;bitmap; -Keywords[eu]=letra-tipoa;letra-tipoak;instalatzailea;truetype;type1;speedo;bitmap; -Keywords[fa]=قلم، قلمها، نصبکننده، قلم حقیقی، نوع۱ ،speedo، نگاشت بیت،; -Keywords[fi]=kirjasin;kirjasimet;fontti;fontit;asentaja;truetype;type1;speedo;bitmap; -Keywords[fr]=police;polices;installeur;installateur;truetype;type1;speedo;bitmap; -Keywords[fy]=letters;lettertypen;fonts;Ynstalaasje;truetype;type1;speedo;bitmap; -Keywords[ga]=cló;clónna;clófhoirne;suiteálaí;truetype;type1;speedo;mapa giotán;giotánmhapach; -Keywords[gl]=fonte;fontes;instalador;truetype;type1;speedo;bitmap; -Keywords[he]=גופנים;גופן; מתקין; TrueType; Type1; speedo; מפת סיביות; bitmap; font;fonts;installer;truetype;type1;speedo;bitmap; -Keywords[hi]=फ़ॉन्ट;फ़ॉन्ट्स;संस्थापक;ट्रू-टाइप;टाइप-1;स्पीडो;बिटमैप; -Keywords[hr]=font;fonts;installer;truetype;type1;speedo;bitmap;fontovi;instaliranje;TTF; -Keywords[hu]=betűtípus;betűtípusok;telepítő;TrueType;Type1;Speedo;bittérkép; -Keywords[is]=font;fonts;installer;truetype;type1;speedo;bitmap;letur; -Keywords[it]=font;caratteri;installatore;truetype;type1;speedo;bitmap;tipi di carattere; -Keywords[ja]=フォント;インストーラ;truetype;type1;speedo;bitmap;ビットマップ; -Keywords[ka]=ფონტი;ფონტები;დასაყენებელი;truetype;type1;speedo;bitmap; -Keywords[km]=ពុម្ពអក្សរ;កម្មវិធីដំឡើង;truetype;type1;speedo;bitmap; -Keywords[lt]=šriftas;šriftai;įdiegimas;truetype;type1;speedo;bitmap; -Keywords[lv]=fonti;fonts;instalēt;truetype;type1;speedo;bitmap; -Keywords[mk]=font;fonts;installer;truetype;type1;speedo;bitmap;фонт;фонтови;инсталатор; -Keywords[nb]=skrift;skrifter;skrifttype;skrifttyper;installer;truetype;type1;speedo;bitmap; -Keywords[nds]=Schriftoort;Schriftoorden;Installeren;TrueType;Type1;Speedo;Bitmap; -Keywords[ne]=फन्ट; फन्टहरू; स्थापक; ट्रु टाइप; टाइप १; स्पेडो; बिटम्याप; -Keywords[nl]=letters;lettertypen;fonts;installatie;truetype;type1;speedo;bitmap; -Keywords[nn]=skrift;skrifter;installering;truetype;type1;speedo;bitmap; -Keywords[pa]=font;fonts;installer;truetype;type1;speedo;bitmap; ਫੋਂਟ; ਇੰਸਟਾਲਰ; -Keywords[pl]=czcionka;czcionki;font;instalator;truetype;type1;speedo; -Keywords[pt]=tipo de letra;tipos de letra;instalador;truetype;type1;speedo;imagem; -Keywords[pt_BR]=fonte;fontes;instalador;truetype;type1;speedo;bitmap; -Keywords[ro]=font;fonturi;instalator;truetype;type1;speedo;bitmap; -Keywords[ru]=font;fonts;installer;truetype;type1;speedo;bitmap;шрифты; -Keywords[rw]=Imyandikire;imyandikire;mwinjiza;ubwokonyabwo;ubwoko1;umuvuduko;bitimapu; -Keywords[se]=fonta;fonttat;sajáiduhttejeaddji;truetype;type1;speedo;bitmap; -Keywords[sk]=písmo;písma;inštalátor;truetype;type1;speedo;bitmap; -Keywords[sl]=pisava;pisave;namestilnik;truetype;type1;speedo;bitmap; -Keywords[sr]=font;fonts;installer;truetype;type1;speedo;bitmap;фонт;фонтови;инсталер;битмапа; -Keywords[sr@Latn]=font;fonts;installer;truetype;type1;speedo;bitmap;font;fontovi;instaler;bitmapa; -Keywords[sv]=teckensnitt;installation;truetype;type1;speedo;bitmap; -Keywords[ta]=எழுத்துரு;எழுத்துருக்கள்;அமர்வர்;மெய்வகை;வகை1;speedo;பிட்படம்; -Keywords[th]=แบบอักษร;ตัวติดตั้ง;ทรูไทป์;ไทป์1;speedo;บิตแมป; -Keywords[tr]=yazıtipi;yazıtipleri;kurucu;truetype;type1;speedo;bitmap; -Keywords[uk]=шрифт; шрифти;встановлення;векторний;растровий;truetype;type1;speedo; -Keywords[uz]=shrift;shriftlar;oʻrnatuvchi;bitmap;truetype;type1;speedo; -Keywords[uz@cyrillic]=шрифт;шрифтлар;ўрнатувчи;битмап;truetype;type1;speedo; -Keywords[vi]=phông chữ;các phông chữ;trình cài đặt;truetype;kiểu 1;tốc độ gõ;mảng ảnh; -Keywords[wa]=fonte;fontes;astaleu;truetype;type1;speedo;bitmap; -Keywords[zh_CN]=font;fonts;installer;truetype;type1;speedo;bitmap;字体;安装程序;位图字体; -Keywords[zh_TW]=font;fonts;installer;truetype;type1;speedo;bitmap;字型;安裝程式;點陣; Categories=Qt;TDE;X-TDE-settings-system; diff --git a/kcontrol/tdefontinst/lib/CMakeLists.txt b/kcontrol/tdefontinst/lib/CMakeLists.txt index 411307aba..1076cb03c 100644 --- a/kcontrol/tdefontinst/lib/CMakeLists.txt +++ b/kcontrol/tdefontinst/lib/CMakeLists.txt @@ -26,6 +26,6 @@ link_directories( tde_add_library( tdefontinst SHARED SOURCES Misc.cpp FcEngine.cpp VERSION 0.0.0 - LINK tdeio-shared ${XFT_LIBRARIES} + LINK tdeio-shared ${FONTCONFIG_LIBRARIES} ${XFT_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp index 1956a34a6..987a44174 100644 --- a/kcontrol/tdefontinst/lib/FcEngine.cpp +++ b/kcontrol/tdefontinst/lib/FcEngine.cpp @@ -491,7 +491,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b x=offset, y=offset; pix.resize(w, h); - pix.fill(Qt::white); + pix.fill(TQt::white); TQPainter painter(&pix); @@ -580,7 +580,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b title=i18n("%1 [1 pixel]", "%1 [%n pixels]", itsSizes[0]).arg(title); painter.setFont(TDEGlobalSettings::generalFont()); - painter.setPen(Qt::black); + painter.setPen(TQt::black); y=painter.fontMetrics().height(); drawText(painter, x, y, w-offset, title); y+=4; diff --git a/kcontrol/tdefontinst/lib/FcEngine.h b/kcontrol/tdefontinst/lib/FcEngine.h index 535baa6e1..5db48b0c3 100644 --- a/kcontrol/tdefontinst/lib/FcEngine.h +++ b/kcontrol/tdefontinst/lib/FcEngine.h @@ -45,7 +45,7 @@ typedef struct _XftFont XftFont; namespace KFI { -class KDE_EXPORT CFcEngine +class TDE_EXPORT CFcEngine { public: diff --git a/kcontrol/tdefontinst/lib/Misc.cpp b/kcontrol/tdefontinst/lib/Misc.cpp index 1a5952ce4..7f21abf0b 100644 --- a/kcontrol/tdefontinst/lib/Misc.cpp +++ b/kcontrol/tdefontinst/lib/Misc.cpp @@ -28,8 +28,8 @@ #include "Misc.h" #include <tqfile.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <klargefile.h> #include <tdeio/netaccess.h> #include <unistd.h> diff --git a/kcontrol/tdefontinst/lib/Misc.h b/kcontrol/tdefontinst/lib/Misc.h index ee8de5445..3fd49d34a 100644 --- a/kcontrol/tdefontinst/lib/Misc.h +++ b/kcontrol/tdefontinst/lib/Misc.h @@ -50,25 +50,25 @@ namespace Misc DIR_PERMS = 0755 }; - extern KDE_EXPORT bool check(const TQString &path, unsigned int fmt, bool checkW=false); - inline KDE_EXPORT bool fExists(const TQString &p) { return check(p, S_IFREG, false); } - inline KDE_EXPORT bool dExists(const TQString &p) { return check(p, S_IFDIR, false); } - inline KDE_EXPORT bool fWritable(const TQString &p) { return check(p, S_IFREG, true); } - inline KDE_EXPORT bool dWritable(const TQString &p) { return check(p, S_IFDIR, true); } - inline KDE_EXPORT bool isLink(const TQString &i) { return check(i, S_IFLNK, false); } - extern KDE_EXPORT TQString linkedTo(const TQString &i); - extern KDE_EXPORT TQString dirSyntax(const TQString &d); // Has trailing slash: /file/path/ - extern KDE_EXPORT TQString xDirSyntax(const TQString &d); // No trailing slash: /file/path - inline KDE_EXPORT TQString fileSyntax(const TQString &f) { return xDirSyntax(f); } - extern KDE_EXPORT TQString getDir(const TQString &f); - extern KDE_EXPORT TQString getFile(const TQString &f); - extern KDE_EXPORT bool createDir(const TQString &dir); - extern KDE_EXPORT TQString changeExt(const TQString &f, const TQString &newExt); - extern KDE_EXPORT bool doCmd(const TQString &cmd, const TQString &p1=TQString::null, const TQString &p2=TQString::null, const TQString &p3=TQString::null); - inline KDE_EXPORT bool root() { return 0==getuid(); } - extern KDE_EXPORT void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm=true, TQWidget *widget=NULL); - extern KDE_EXPORT void createBackup(const TQString &f); - extern KDE_EXPORT time_t getTimeStamp(const TQString &item); + extern TDE_EXPORT bool check(const TQString &path, unsigned int fmt, bool checkW=false); + inline TDE_EXPORT bool fExists(const TQString &p) { return check(p, S_IFREG, false); } + inline TDE_EXPORT bool dExists(const TQString &p) { return check(p, S_IFDIR, false); } + inline TDE_EXPORT bool fWritable(const TQString &p) { return check(p, S_IFREG, true); } + inline TDE_EXPORT bool dWritable(const TQString &p) { return check(p, S_IFDIR, true); } + inline TDE_EXPORT bool isLink(const TQString &i) { return check(i, S_IFLNK, false); } + extern TDE_EXPORT TQString linkedTo(const TQString &i); + extern TDE_EXPORT TQString dirSyntax(const TQString &d); // Has trailing slash: /file/path/ + extern TDE_EXPORT TQString xDirSyntax(const TQString &d); // No trailing slash: /file/path + inline TDE_EXPORT TQString fileSyntax(const TQString &f) { return xDirSyntax(f); } + extern TDE_EXPORT TQString getDir(const TQString &f); + extern TDE_EXPORT TQString getFile(const TQString &f); + extern TDE_EXPORT bool createDir(const TQString &dir); + extern TDE_EXPORT TQString changeExt(const TQString &f, const TQString &newExt); + extern TDE_EXPORT bool doCmd(const TQString &cmd, const TQString &p1=TQString::null, const TQString &p2=TQString::null, const TQString &p3=TQString::null); + inline TDE_EXPORT bool root() { return 0==getuid(); } + extern TDE_EXPORT void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm=true, TQWidget *widget=NULL); + extern TDE_EXPORT void createBackup(const TQString &f); + extern TDE_EXPORT time_t getTimeStamp(const TQString &item); } } diff --git a/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt b/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt index 37fab1445..eb554cde8 100644 --- a/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt +++ b/kcontrol/tdefontinst/tdefile-plugin/CMakeLists.txt @@ -24,7 +24,11 @@ link_directories( ##### other data ################################ -install( FILES tdefile_font.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE tdefile_font.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR kcontrol-desktops +) ##### tdefile_font (module) ####################### diff --git a/kcontrol/tdefontinst/tdefile-plugin/tdefile_font.desktop b/kcontrol/tdefontinst/tdefile-plugin/tdefile_font.desktop index 7ccb1b745..03b4516c7 100644 --- a/kcontrol/tdefontinst/tdefile-plugin/tdefile_font.desktop +++ b/kcontrol/tdefontinst/tdefile-plugin/tdefile_font.desktop @@ -1,84 +1,6 @@ [Desktop Entry] Type=Service Name=Font Information -Name[af]=Skrif tipe Informasie -Name[ar]=معلومات المحرف -Name[az]=Yazı Növü Mə'lumatı -Name[be]=Інфармацыя аб шрыфце -Name[bg]=Информация за шрифт -Name[bn]=ফন্ট তথ্য -Name[br]=Titouroù diwar-benn ar font -Name[bs]=Informacije o fontu -Name[ca]=Informació de la lletra -Name[cs]=Informace o písmu -Name[csb]=Wëdowiédzô ò fòntach -Name[cy]=Gwybodaeth Ffont -Name[da]=Skrifttypeinformation -Name[de]=Schriftarteninformation -Name[el]=Πληροφορίες γραμματοσειράς -Name[eo]=Tiparinformo -Name[es]=Información del tipo de letra -Name[et]=Fondi info -Name[eu]=Letra-tipoei buruzko informazioa -Name[fa]=اطلاعات قلم -Name[fi]=Kirjasintiedot -Name[fr]=Informations sur les polices -Name[fy]=Lettertype-Ynformaasje -Name[ga]=Eolas Clófhoirne -Name[gl]=Información da Fonte -Name[he]=מידע גופנים -Name[hi]=फ़ॉन्ट जानकारी -Name[hr]=Podaci o fontu -Name[hu]=Betűtípus-jellemzők -Name[id]=Informasi Font -Name[is]=Leturupplýsingar -Name[it]=Informazioni caratteri -Name[ja]=フォント情報 -Name[ka]=ინფორმაცია ფონტის შესახებ -Name[kk]=Қаріп мәліметі -Name[km]=ព័ត៌មានពុម្ពអក្សរ -Name[ko]=연락처 정보 -Name[lo]=ຂໍ້ມູນຕ່າງໆ -Name[lt]=Šrifto(-ų) informacija -Name[lv]=Fontu Informācija -Name[mk]=Информации за фонтовите -Name[mn]=Бичиг-Мэдээлэл -Name[ms]=Maklumat Fon -Name[mt]=Informazzjoni dwar font -Name[nb]=Skriftinformasjon -Name[nds]=Schriftoort-Informatschoon -Name[ne]=फन्ट सूचना -Name[nl]=Lettertype-informatie -Name[nn]=Skriftinformasjon -Name[nso]=Tshedimoso ya Fonto -Name[pa]=ਫੋਂਟ ਜਾਣਕਾਰੀ -Name[pl]=Informacje o czcionkach -Name[pt]=Informação do Tipo de Letra -Name[pt_BR]=Informações sobre a Fonte -Name[ro]=Informații font -Name[ru]=Сведения о шрифте -Name[rw]=Amakuru y'Imyandikire -Name[se]=Fontadieđut -Name[sk]=Informácie o písmach -Name[sl]=Informacije o pisavi -Name[sr]=Информације о фонту -Name[sr@Latn]=Informacije o fontu -Name[sv]=Teckensnittsinformation -Name[ta]=எழுத்துரு தகவல் -Name[tg]=Иттилооти ҳарфҳо -Name[th]=ข้อมูลแบบอักษร -Name[tr]=Yazıtipi Bilgisi -Name[tt]=Yazu Turında -Name[uk]=Інформація про шрифти -Name[uz]=Shrift haqida maʼlumot -Name[uz@cyrillic]=Шрифт ҳақида маълумот -Name[ven]=Mafhungo a fontu -Name[vi]=Thông tin về Phông chữ -Name[wa]=Informåcion sol fonte -Name[xh]=Ulwazi Lohlobo lwamagama -Name[zh_CN]=字体信息 -Name[zh_TW]=字型資訊 -Name[zu]=Ulwazi lohlobo lwamagama X-TDE-ServiceTypes=KFilePlugin X-TDE-Library=tdefile_font MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;application/x-font-otf;application/x-font-ttc;application/x-afm diff --git a/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt b/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt index b1f541f05..20bc97c23 100644 --- a/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt +++ b/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt @@ -31,6 +31,6 @@ tde_add_executable( tdefontinst SOURCES Main.cpp FontEngine.cpp Fontmap.cpp GetPid.c XConfig.cpp - LINK kxftconfig-static tdefontinst-shared tdeio-shared + LINK kxftconfig-static tdefontinst-shared tdeio-shared ${FREETYPE_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kcontrol/tdefontinst/tdeio/CMakeLists.txt b/kcontrol/tdefontinst/tdeio/CMakeLists.txt index ac2429162..becd8c15a 100644 --- a/kcontrol/tdefontinst/tdeio/CMakeLists.txt +++ b/kcontrol/tdefontinst/tdeio/CMakeLists.txt @@ -26,8 +26,18 @@ link_directories( ##### other data ################################ install( FILES fonts.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES fonts.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/services ) -install( FILES folder.desktop system-folder.desktop package.desktop DESTINATION ${MIME_INSTALL_DIR}/fonts ) + +tde_create_translated_desktop( + SOURCE fonts.desktop + DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/services + PO_DIR kcontrol-desktops +) + +tde_create_translated_desktop( + SOURCE folder.desktop system-folder.desktop package.desktop + DESTINATION ${MIME_INSTALL_DIR}/fonts + PO_DIR kcontrol-desktops +) ##### tdeio_fonts (module) ####################### diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp index 54de7bdcf..753e412cd 100644 --- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp +++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp @@ -52,15 +52,15 @@ #include <tqtextstream.h> #include <kmimetype.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqdir.h> #include <tqdatastream.h> #include <tqregexp.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <klargefile.h> #include <tdetempfile.h> #include <tdesu/su.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> #include <ktar.h> #include <kxftconfig.h> @@ -97,7 +97,7 @@ static const int constMaxFcCheckTime=10; extern "C" { - KDE_EXPORT int kdemain(int argc, char **argv); + TDE_EXPORT int kdemain(int argc, char **argv); } int kdemain(int argc, char **argv) diff --git a/kcontrol/tdefontinst/tdeio/folder.desktop b/kcontrol/tdefontinst/tdeio/folder.desktop index 848feabe5..d705ece9c 100644 --- a/kcontrol/tdefontinst/tdeio/folder.desktop +++ b/kcontrol/tdefontinst/tdeio/folder.desktop @@ -1,75 +1,5 @@ [Desktop Entry] Comment=Fonts Folder -Comment[af]=Skrif tipe Gids -Comment[ar]=مجلد المحارف -Comment[be]=Тэчка шрыфтоў -Comment[bg]=Директория за шрифтове -Comment[bn]=ফন্ট ফোল্ডার -Comment[br]=Renkell ar fontoù -Comment[bs]=Direktorij sa fontovima -Comment[ca]=Carpeta de lletres -Comment[cs]=Složka písem -Comment[csb]=Katalog fòntów -Comment[da]=Skrifttypemappe -Comment[de]=Ordner für Schriftarten -Comment[el]=Φάκελος γραμματοσειρών -Comment[eo]=Tipardosierujo -Comment[es]=Carpeta de tipos de letra -Comment[et]=Fontide kataloog -Comment[eu]=Letra-tipoen karpeta -Comment[fa]=پوشۀ قلم -Comment[fi]=Kirjasinkansio -Comment[fr]=Dossier de polices de caractères -Comment[fy]=Lettertypenmap -Comment[ga]=Fillteán na gClónna -Comment[gl]=Cartafol das Fontes -Comment[he]=תיקיית גופנים -Comment[hi]=फ़ॉन्ट्स फ़ोल्डर -Comment[hr]=Mapa fontova -Comment[hu]=Betűtípuskönyvtár -Comment[id]=Folder Fonts -Comment[is]=Leturmappa -Comment[it]=Cartella dei caratteri -Comment[ja]=フォントフォルダ -Comment[ka]=ფონტების საქაღალდე -Comment[kk]=Қаріп қапшығы -Comment[km]=ថតពុម្ពអក្សរ -Comment[ko]=홈 폴더 -Comment[lt]=Šriftų aplankas -Comment[lv]=Fontu mape -Comment[mk]=Папка со фонтови -Comment[ms]=Folder Fon -Comment[mt]=Direttorju tal-fonts -Comment[nb]=Mappe for skrifttyper -Comment[nds]=Schriftoorden-Orner -Comment[ne]=फन्ट फोल्डर -Comment[nl]=Lettertypenmap -Comment[nn]=Skriftmappe -Comment[pa]=ਫੋਂਟ ਫੋਲਡਰ -Comment[pl]=Katalog czcionek -Comment[pt]=Pasta de Tipos de Letra -Comment[pt_BR]=Pasta de Fontes -Comment[ro]=Folder de fonturi -Comment[ru]=Папка шрифтов -Comment[rw]=Ububiko bw'Imyandikire -Comment[se]=Fontamáhppa -Comment[sk]=Priečinok písiem -Comment[sl]=Mapa za pisave -Comment[sr]=Фасцикла за фонтове -Comment[sr@Latn]=Fascikla za fontove -Comment[sv]=Teckensnittskatalog -Comment[ta]=எழுத்துருக்கள் அடைவு -Comment[tg]=Феҳристи ҳарфҳо -Comment[th]=โฟลเดอร์แฟ้มแบบอักษร -Comment[tr]=Yazıtipi Klasörü -Comment[tt]=Yazu lar Törgäge -Comment[uk]=Тека шрифтів -Comment[uz]=Shriftlarning jildi -Comment[uz@cyrillic]=Шрифтларнинг жилди -Comment[vi]=Thư mục Phông chữ -Comment[wa]=Ridant di fontes -Comment[zh_CN]=字体文件夹 -Comment[zh_TW]=字型資料夾 Icon=folder Type=MimeType MimeType=fonts/folder @@ -77,4 +7,3 @@ Patterns= X-TDE-AutoEmbed=true X-TDE-IsAlso=inode/directory - diff --git a/kcontrol/tdefontinst/tdeio/fonts.desktop b/kcontrol/tdefontinst/tdeio/fonts.desktop index 43ec96dac..3b6a5b4cb 100644 --- a/kcontrol/tdefontinst/tdeio/fonts.desktop +++ b/kcontrol/tdefontinst/tdeio/fonts.desktop @@ -3,83 +3,6 @@ Type=Link URL=fonts:/ Icon=font-x-generic 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 Open=false X-TDE-TreeModule=Directory X-TDE-KonqSidebarModule=konqsidebar_tree diff --git a/kcontrol/tdefontinst/tdeio/package.desktop b/kcontrol/tdefontinst/tdeio/package.desktop index 0084c97bd..fae1f3aa5 100644 --- a/kcontrol/tdefontinst/tdeio/package.desktop +++ b/kcontrol/tdefontinst/tdeio/package.desktop @@ -4,70 +4,6 @@ MimeType=application/vnd.tde.fontspackage Icon=font-x-generic Patterns=*.fonts.tar.gz Comment=Fonts Package -Comment[af]=Skriftipes Paket -Comment[ar]=حزمة المحارف -Comment[be]=Пакет шрыфтоў -Comment[bg]=Пакет с шрифтове -Comment[bn]=ফন্ট প্যাকেজ -Comment[bs]=Paket fontova -Comment[ca]=Paquet de lletres -Comment[cs]=Balík písem -Comment[csb]=Paczét fòntów -Comment[da]=Skrifttypepakke -Comment[de]=Schriftartenpaket -Comment[el]=Πακέτο γραμματοσειρών -Comment[eo]=Tiparpakaĵo -Comment[es]=Paquete de tipos de letra -Comment[et]=Fondipakett -Comment[eu]=Letra-tipoen paketea -Comment[fa]=بستۀ قلمها -Comment[fi]=Kirjasinpaketti -Comment[fr]=Paquet de polices -Comment[fy]=Lettertypenpakket -Comment[ga]=Pacáiste na gClónna -Comment[gl]=Pacote das Fontes -Comment[he]=חבילת גופנים -Comment[hr]=Paket fontova -Comment[hu]=Betűtípuscsomag -Comment[id]=Paket Font -Comment[is]=Leturpakki -Comment[it]=Pacchetto tipi di caratteri -Comment[ja]=フォントパッケージ -Comment[ka]=შრიფტების პაკეტი -Comment[kk]=Қаріп дестесі -Comment[km]=កញ្ចប់ពុម្ពអក្សរ -Comment[lt]=Šriftų paketas -Comment[mk]=Пакет со фонтови -Comment[ms]=Pakej Fon -Comment[nb]=Pakke for skrifttyper -Comment[nds]=Schriftoorden-Paket -Comment[ne]=फन्ट प्याकेज -Comment[nl]=Lettertypenpakket -Comment[nn]=Pakke for skrifter -Comment[pa]=ਫੋਂਟ ਪੈਕੇਜ -Comment[pl]=Pakiet czcionek -Comment[pt]=Pacote de Tipos de Letra -Comment[pt_BR]=Pacote de Fontes -Comment[ro]=Pachet de fonturi -Comment[ru]=Пакет шрифтов -Comment[rw]=Rukomatanya y'Imyandikire -Comment[se]=Fontapáhkka -Comment[sk]=Balík písiem -Comment[sl]=Paket pisav -Comment[sr]=Пакет фонтова -Comment[sr@Latn]=Paket fontova -Comment[sv]=Teckensnittspaket -Comment[tg]=Бастаи ҳарфҳо -Comment[th]=แพคเกจแบบอักษร -Comment[tr]=Yazıtipi Paketi -Comment[tt]=Yazular Tuplaması -Comment[uk]=Пакунок шрифтів -Comment[uz]=Shrift -Comment[uz@cyrillic]=Шрифт -Comment[vi]=Gói Phông chữ -Comment[wa]=Paket di fontes -Comment[zh_CN]=字体包 -Comment[zh_TW]=字型套件 [Property::X-TDE-LocalProtocol] Type=TQString diff --git a/kcontrol/tdefontinst/tdeio/system-folder.desktop b/kcontrol/tdefontinst/tdeio/system-folder.desktop index d2500c295..9ff192811 100644 --- a/kcontrol/tdefontinst/tdeio/system-folder.desktop +++ b/kcontrol/tdefontinst/tdeio/system-folder.desktop @@ -1,74 +1,5 @@ [Desktop Entry] Comment=System Fonts Folder -Comment[af]=Stelsel Skrif tipe Gids -Comment[ar]=مجلد محارف النظام -Comment[be]=Тэчка сістэмных шрыфтоў -Comment[bg]=Директория за системните шрифтове -Comment[bn]=সিস্টেম ফন্ট ফোল্ডার -Comment[br]=Renkell fontoù ar reizhiad -Comment[bs]=Sistemski direktorij sa fontovima -Comment[ca]=Carpeta de lletres del sistema -Comment[cs]=Složka se systémovými písmy -Comment[csb]=Katalog systemòwëch fòntów -Comment[da]=Mappe til systemets skrifttyper -Comment[de]=Ordner für Systemschriften -Comment[el]=Φάκελος γραμματοσειρών συστήματος -Comment[eo]=Sistema tipardosierujo -Comment[es]=Carpeta de tipos de letra del sistema -Comment[et]=Süsteemi fontide kataloog -Comment[eu]=Sistemaren letra-tipoen karpeta -Comment[fa]=پوشۀ قلمهای سیستم -Comment[fi]=Järjestelmän kirjasinkansio -Comment[fr]=Dossier système de polices de caractères -Comment[fy]=Systeemlettertypenmap -Comment[ga]=Fillteán Clónna an Chórais -Comment[gl]=Cartafol das Fontes do Sistema -Comment[he]=תיקיית גופני מערכת -Comment[hi]=तंत्र फ़ॉन्ट्स फ़ोल्डर -Comment[hr]=Mapa sistemskih fontova -Comment[hu]=A rendszer betűtípusainak könyvtára -Comment[id]=Folder Font Sistem -Comment[is]=Kerfisleturmappa -Comment[it]=Cartella dei caratteri di sistema -Comment[ja]=システムフォントフォルダ -Comment[ka]=სისტემური ფონტების საქაღალდე -Comment[kk]=Жүйелік қаріптер қапшығы -Comment[km]=ថតពុម្ពអក្សរប្រព័ន្ធ -Comment[lt]=Sistemos šriftų aplankas -Comment[lv]=Sistēmas fontu mape -Comment[mk]=Папка со системски фонтови -Comment[ms]=Folder Fon Sistem -Comment[mt]=Direttorju tal-fonts tas-sistema -Comment[nb]=Mappe for systemskrifttyper -Comment[nds]=Orner för de Systeemschriftoorden -Comment[ne]=फन्ट फोल्डर प्रणाली -Comment[nl]=Systeemlettertypenmap -Comment[nn]=Systemskriftmappe -Comment[pa]=ਸਿਸਟਮ ਫੋਂਟ ਫੋਲਡਰ -Comment[pl]=Katalog czcionek systemowych -Comment[pt]=Pasta de Tipos de Letra do Sistema -Comment[pt_BR]=Pasta de Fontes do Sistema -Comment[ro]=Folder fonturi de sistem -Comment[ru]=Папка системных шрифтов -Comment[rw]=Ububiko bw'Imyandikire Sisitemu -Comment[se]=Vuogádatfontamáhppa -Comment[sk]=Priečinok systémových písiem -Comment[sl]=Mapa za sistemske pisave -Comment[sr]=Фасцикла за системске фонтове -Comment[sr@Latn]=Fascikla za sistemske fontove -Comment[sv]=Systemteckensnittskatalog -Comment[ta]=அமைப்பு எழுத்துருக்கள் அடைவு -Comment[tg]=Системаи феҳристи ҳарфҳо -Comment[th]=โฟลเดอร์แฟ้มแบบอักษรของระบบ -Comment[tr]=Sistem Yazı Tipi Klasörü -Comment[tt]=Sistem Yazular Törgäge -Comment[uk]=Тека системних шрифтів -Comment[uz]=Tizim shriftlarining jildi -Comment[uz@cyrillic]=Тизим шрифтларининг жилди -Comment[vi]=Thư mục Phông chữ Hệ thống -Comment[wa]=Ridant di fontes do sistinme -Comment[zh_CN]=系统字体文件夹 -Comment[zh_TW]=系統字型資料夾 Icon=folder_red Type=MimeType MimeType=fonts/system-folder @@ -76,4 +7,3 @@ Patterns= X-TDE-AutoEmbed=true X-TDE-IsAlso=inode/directory - diff --git a/kcontrol/tdefontinst/thumbnail/CMakeLists.txt b/kcontrol/tdefontinst/thumbnail/CMakeLists.txt index 7d4ce2fb5..1adef578c 100644 --- a/kcontrol/tdefontinst/thumbnail/CMakeLists.txt +++ b/kcontrol/tdefontinst/thumbnail/CMakeLists.txt @@ -23,7 +23,11 @@ link_directories( ##### other data ################################ -install( FILES fontthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE fontthumbnail.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR kcontrol-desktops +) ##### fontthumbnail (module) #################### diff --git a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp index a053393f4..c7c00ef0f 100644 --- a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp +++ b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp @@ -38,7 +38,7 @@ extern "C" { - KDE_EXPORT ThumbCreator *new_creator() + TDE_EXPORT ThumbCreator *new_creator() { return new KFI::CFontThumbnail; } diff --git a/kcontrol/tdefontinst/thumbnail/fontthumbnail.desktop b/kcontrol/tdefontinst/thumbnail/fontthumbnail.desktop index 5d0bdf46a..ef07b4510 100644 --- a/kcontrol/tdefontinst/thumbnail/fontthumbnail.desktop +++ b/kcontrol/tdefontinst/thumbnail/fontthumbnail.desktop @@ -1,84 +1,6 @@ [Desktop Entry] Type=Service Name=Font Files -Name[af]=Skrif tipe Lêers -Name[ar]=ملفات المحرف -Name[az]=Yazı Növü Faylları -Name[be]=Файлы шрыфтоў -Name[bg]=Файлове с шрифтове -Name[bn]=ফন্ট ফাইল -Name[br]=Restroù Nodrezhoù -Name[bs]=Datoteke sa fontovima -Name[ca]=Fitxers de lletres -Name[cs]=Soubory s písmy -Name[csb]=Lopczi fòntów -Name[cy]=Ffeiliau Ffont -Name[da]=Skrifttypefiler -Name[de]=Schriftdatei -Name[el]=Αρχεία γραμματοσειρών -Name[eo]=Tipardosierojn -Name[es]=Archivos de tipos de letra -Name[et]=Fondifailid -Name[eu]=Letra-tipo fitxategiak -Name[fa]=پروندۀ قلمها -Name[fi]=Kirjasintiedostot -Name[fr]=Fichiers de polices -Name[fy]=Lettertypetriemmen -Name[ga]=Comhaid Chlófhoirne -Name[gl]=Ficheiros de Tipografias -Name[he]=קבצי גופנים -Name[hi]=फ़ॉन्ट फ़ाइलें -Name[hr]=Datoteke fontova -Name[hu]=Betűtípusfájlok -Name[id]=Berkas Font -Name[is]=Leturskrár -Name[it]=File dei tipi di carattere -Name[ja]=フォントファイル -Name[ka]=ფონტების ფაილები -Name[kk]=Қаріп файлдары -Name[km]=ឯកសារពុម្ពអក្សរ -Name[ko]=글꼴 파일 -Name[lo]=ຄົ້ນຫາແຟ້ມ -Name[lt]=Šriftų bylos -Name[lv]=Fontu faili -Name[mk]=Датотеки со фонтови -Name[mn]=Бичгийн файл -Name[ms]=Fail Fon -Name[mt]=Fajls tal-fonts -Name[nb]=Skrifttypefiler -Name[nds]=Schriftoortdateien -Name[ne]=फन्ट फाइल -Name[nl]=Lettertypebestanden -Name[nn]=Skriftfiler -Name[nso]=Difaele tsa Fonto -Name[pa]=ਫੋਂਟ ਫਾਇਲਾਂ -Name[pl]=Pliki czcionek -Name[pt]=Ficheiros de Tipos de Letra -Name[pt_BR]=Arquivos de fonte -Name[ro]=Fișiere font -Name[ru]=Файлы шрифтов -Name[rw]=Amadosiye y'Imyandikire -Name[se]=Fontafiillat -Name[sk]=Súbory písiem -Name[sl]=Datoteke s pisavami -Name[sr]=Фајлови фонтова -Name[sr@Latn]=Fajlovi fontova -Name[sv]=Teckensnittsfiler -Name[ta]=எழுத்துரு கோப்புகள் -Name[tg]=Файлҳои ҳарф -Name[th]=แฟ้มแบบอักษร -Name[tr]=Yazıtipi Dosyaları -Name[tt]=Yazu Biremnäre -Name[uk]=Файли шрифтів -Name[uz]=Shrift-fayllari -Name[uz@cyrillic]=Шрифт-файллари -Name[ven]=Dzifaela dza Fontu -Name[vi]=Tập tin Phông chữ -Name[wa]=Fitchîs fontes -Name[xh]=Iifayile Zohlobo lwamagama -Name[zh_CN]=字体文件 -Name[zh_TW]=字型檔案 -Name[zu]=Amafayela ohlobo lwamagama X-TDE-ServiceTypes=ThumbCreator MimeTypes=application/x-font-ttf,application/x-font-type1,application/x-font-bdf,application/x-font-pcf,application/x-font-otf,application/x-font-ttc X-TDE-Library=fontthumbnail diff --git a/kcontrol/tdefontinst/viewpart/CMakeLists.txt b/kcontrol/tdefontinst/viewpart/CMakeLists.txt index 5dd3ddc63..7aa960dda 100644 --- a/kcontrol/tdefontinst/viewpart/CMakeLists.txt +++ b/kcontrol/tdefontinst/viewpart/CMakeLists.txt @@ -24,8 +24,17 @@ link_directories( ##### other data ################################ -install( FILES tdefontviewpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdefontview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE tdefontviewpart.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR kcontrol-desktops +) + +tde_create_translated_desktop( + SOURCE tdefontview.desktop + PO_DIR kcontrol-desktops +) + install( FILES tdefontviewpart.rc tdefontviewui.rc DESTINATION ${DATA_INSTALL_DIR}/tdefontview ) diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.cpp b/kcontrol/tdefontinst/viewpart/FontPreview.cpp index 41367d586..7b5a7a5bf 100644 --- a/kcontrol/tdefontinst/viewpart/FontPreview.cpp +++ b/kcontrol/tdefontinst/viewpart/FontPreview.cpp @@ -65,7 +65,7 @@ void CFontPreview::showFont() if(!itsCurrentUrl.isEmpty() && itsEngine.draw(itsCurrentUrl, itsLastWidth, itsLastHeight, itsPixmap, itsCurrentFace-1, false)) { - setEraseColor(Qt::white); + setEraseColor(TQt::white); update(); emit status(true); } @@ -88,7 +88,7 @@ void CFontPreview::paintEvent(TQPaintEvent *) { if(!itsCurrentUrl.isEmpty()) { - paint.setPen(kapp->palette().active().text()); + paint.setPen(tdeApp->palette().active().text()); paint.drawText(rect(), AlignCenter, i18n(" No preview available")); } } diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.h b/kcontrol/tdefontinst/viewpart/FontPreview.h index 71916479e..f6ebd8dbd 100644 --- a/kcontrol/tdefontinst/viewpart/FontPreview.h +++ b/kcontrol/tdefontinst/viewpart/FontPreview.h @@ -42,7 +42,7 @@ namespace KFI class CFontPreview : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp index e31510ad3..b3f3b1c94 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp @@ -45,7 +45,7 @@ #include <tqstringlist.h> #include <tqtimer.h> #include <tdeio/netaccess.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdemessagebox.h> #include <knuminput.h> #include <kstdaction.h> @@ -81,7 +81,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) TQHBoxLayout *toolsLayout=new TQHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint()); itsFrame->setFrameShape(TQFrame::NoFrame); - itsFrame->setFocusPolicy(TQ_ClickFocus); + itsFrame->setFocusPolicy(TQWidget::ClickFocus); itsToolsFrame->setFrameShape(TQFrame::NoFrame); previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised); previewFrame->setFrameShape(TQFrame::Panel); @@ -103,14 +103,14 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) toolsLayout->addItem(new TQSpacerItem(5, 5, TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum)); toolsLayout->addWidget(itsInstallButton); itsToolsFrame->hide(); - connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewStatus(bool))); - connect(itsInstallButton, TQT_SIGNAL(clicked()), TQT_SLOT(install())); - connect(itsFaceSelector, TQT_SIGNAL(valueChanged(int)), itsPreview, TQT_SLOT(showFace(int))); + connect(itsPreview, TQ_SIGNAL(status(bool)), TQ_SLOT(previewStatus(bool))); + connect(itsInstallButton, TQ_SIGNAL(clicked()), TQ_SLOT(install())); + connect(itsFaceSelector, TQ_SIGNAL(valueChanged(int)), itsPreview, TQ_SLOT(showFace(int))); itsChangeTextAction=new TDEAction(i18n("Change Text..."), "text", TDEShortcut(), - this, TQT_SLOT(changeText()), actionCollection(), "changeText"); + this, TQ_SLOT(changeText()), actionCollection(), "changeText"); itsChangeTextAction->setEnabled(false); - itsPrintAction=KStdAction::print(this, TQT_SLOT(print()), actionCollection(), "print"); + itsPrintAction=KStdAction::print(this, TQ_SLOT(print()), actionCollection(), "print"); itsPrintAction->setEnabled(false); setXMLFile("tdefontviewpart.rc"); @@ -143,7 +143,7 @@ bool CFontViewPart::openFile() { // NOTE: Cant do the real open here, as dont seem to be able to use TDEIO::NetAccess functions during initial start-up. // Bug report 111535 indicates that calling "konqueror <font>" crashes. - TQTimer::singleShot(0, this, TQT_SLOT(timeout())); + TQTimer::singleShot(0, this, TQ_SLOT(timeout())); return true; } diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.h b/kcontrol/tdefontinst/viewpart/FontViewPart.h index 24f6d8d8b..62a380f85 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPart.h +++ b/kcontrol/tdefontinst/viewpart/FontViewPart.h @@ -45,7 +45,7 @@ class CFontPreview; class CFontViewPart : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp index a43f9d1d2..a2ea58602 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp @@ -30,12 +30,12 @@ #include "FontViewPart.h" #include <kdebug.h> #include <tdeaboutdata.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <assert.h> extern "C" { - KDE_EXPORT void* init_libtdefontviewpart() + TDE_EXPORT void* init_libtdefontviewpart() { TDEGlobal::locale()->insertCatalogue("tdefontinst"); return new KFI::CFontViewPartFactory; diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h index 7ac96e9c8..a584d0888 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h +++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h @@ -39,13 +39,13 @@ namespace KFI class CFontViewPartFactory : public KLibFactory { - Q_OBJECT + TQ_OBJECT public: CFontViewPartFactory(); virtual ~CFontViewPartFactory(); - virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); + virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList()); static TDEInstance * instance(); diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp index df1fa92d2..057b54831 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp @@ -49,10 +49,10 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() if(factory) { - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); - itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(this), "fontvier", "KParts::ReadOnlyPart"); + itsPreview=(KParts::ReadOnlyPart *)factory->create(this, "fontvier", "KParts::ReadOnlyPart"); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KURL openURL; @@ -72,9 +72,9 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() itsPreview->openURL(openURL); TQSize defSize(450, 380); - TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP); + TDEConfigGroupSaver saver(tdeApp->config(), CFG_GROUP); - resize(kapp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize)); + resize(tdeApp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize)); show(); } else @@ -83,9 +83,9 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() CFontViewerAppMainWindow::~CFontViewerAppMainWindow() { - TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP); - kapp->config()->writeEntry(CFG_SIZE_KEY, size()); - kapp->config()->sync(); + TDEConfigGroupSaver saver(tdeApp->config(), CFG_GROUP); + tdeApp->config()->writeEntry(CFG_SIZE_KEY, size()); + tdeApp->config()->sync(); } void CFontViewerAppMainWindow::fileOpen() diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.h b/kcontrol/tdefontinst/viewpart/FontViewerApp.h index cc9a5981b..3b297a197 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewerApp.h +++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.h @@ -38,7 +38,7 @@ namespace KFI class CFontViewerAppMainWindow : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/tdefontinst/viewpart/tdefontview.desktop b/kcontrol/tdefontinst/viewpart/tdefontview.desktop index 91121be2f..f253145b0 100644 --- a/kcontrol/tdefontinst/viewpart/tdefontview.desktop +++ b/kcontrol/tdefontinst/viewpart/tdefontview.desktop @@ -1,100 +1,11 @@ [Desktop Entry] Name=TDEFontView -Name[be]=Прагляд шрыфтоў -Name[bn]=কে-ফন্ট-ভিউ -Name[cs]=Prohlížeč písem -Name[eo]=Tiparorigardilo -Name[eu]=TDEFontWiew -Name[he]=מציג גופנים -Name[hi]=के-फ़ॉन्ट-व्यू -Name[mk]=КФонтПреглед -Name[nb]=Skriftviser -Name[nds]=Schriftoortkieker -Name[ne]=K फन्ट दृश्य -Name[nn]=Skriftvisar -Name[rw]=K-IgaragazaImyandikire -Name[se]=Fontačájeheaddji -Name[sk]=Prehliadač písiem -Name[sv]=Kfontview -Name[tg]=Намоишгари КҲарф -Name[vi]=Trình xem phông chữ TDE -Name[wa]=Håyneu di fontes (TDEFontView) -Name[zh_CN]=字体预览 Exec=tdefontview %i %u Icon=font-x-generic X-TDE-StartupNotify=true Type=Application MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-ttc;application/x-font-pcf;application/x-font-bdf;application/vnd.tde.fontspackage GenericName=Font Viewer -GenericName[af]=Skriftipe Besigter -GenericName[ar]=معاين المحرف -GenericName[be]=Праглядальнік шрыфтоў -GenericName[bg]=Преглед на шрифтове -GenericName[bn]=ফন্ট প্রদর্শক -GenericName[br]=Gweler Nodrezhoù -GenericName[bs]=Preglednik fontova -GenericName[ca]=Visor de lletres -GenericName[cs]=Prohlížeč písem -GenericName[csb]=Przezérnik fòntów -GenericName[cy]=Gwelydd Wynebfathau -GenericName[da]=Skrifttype-fremviser -GenericName[de]=Schriftartenbetrachter -GenericName[el]=Προβολέας γραμματοσειρών -GenericName[eo]=Tipara rigardilo -GenericName[es]=Visor de tipos de letra -GenericName[et]=Fontide vaataja -GenericName[eu]=Letra-tipoen ikusgailua -GenericName[fa]=مشاهدهگر قلم -GenericName[fi]=Kirjasinten näytin -GenericName[fr]=Afficheur de polices -GenericName[fy]=Lettertypewerjefte -GenericName[ga]=Amharcán Clófhoirne -GenericName[gl]=Visor de Fontes -GenericName[he]=מציג גופנים -GenericName[hr]=Preglednik fontova -GenericName[hu]=Betűtípusböngésző -GenericName[id]=Penampil Font -GenericName[is]=Leturskoðari -GenericName[it]=Visualizzatore di caratteri -GenericName[ja]=フォントビューア -GenericName[ka]=პროგრამა ფონტების სანახავად -GenericName[kk]=Қаріпті қарап-шығу -GenericName[km]=កម្មវិធីមើលពុម្ពអក្សរ -GenericName[ko]=글꼴 뷰어 -GenericName[lt]=Šriftų žiūryklė -GenericName[lv]=Fontu Skatītājs -GenericName[mk]=Прегледувач на фонтови -GenericName[ms]=Pemapar Fon -GenericName[mt]=Werrej tal-fonts -GenericName[nb]=Skrifttypeviser -GenericName[nds]=Schriftoortkieker -GenericName[ne]=फन्ट दर्शक -GenericName[nl]=Lettertypeweergave -GenericName[nn]=Skriftvisar -GenericName[pa]=ਫੋਂਟ ਦਰਸ਼ਕ -GenericName[pl]=Przeglądarka czcionek -GenericName[pt]=Visualizador de Tipos de Letra -GenericName[pt_BR]=Visualizador de fontes -GenericName[ro]=Vizualizor de fonturi -GenericName[ru]=Программа просмотра шрифтов -GenericName[rw]=Ikigaragaza Imyandikire -GenericName[se]=Fontačájeheaddji -GenericName[sk]=Prehliadač písiem -GenericName[sl]=Pregledovalnik pisav -GenericName[sr]=Приказивач фонтова -GenericName[sr@Latn]=Prikazivač fontova -GenericName[sv]=Teckensnittsvisning -GenericName[tg]=Намоишгари ҳарфҳо -GenericName[th]=โปรแกรมดูแบบอักษร -GenericName[tr]=Yazıtipi Görüntüleyici -GenericName[tt]=Yazu Kürsätkeç -GenericName[uk]=Переглядач шрифтів -GenericName[uz]=Shrift koʻruvchi -GenericName[uz@cyrillic]=Шрифт кўрувчи -GenericName[vi]=Trình xem Phông chữ -GenericName[wa]=Håyneu di fontes -GenericName[zh_CN]=字体查看器 -GenericName[zh_TW]=字型檢視器 Terminal=false X-TDE-InitialPreference=1 Categories=Qt;TDE;Graphics; diff --git a/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop b/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop index cdb11f1c9..a0f8dbecb 100644 --- a/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop +++ b/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop @@ -1,83 +1,5 @@ [Desktop Entry] Name=Font Viewer -Name[af]=Skriftipe Besigter -Name[ar]=معاين المحرف -Name[az]=Yazı Növü Nümayişçisi -Name[be]=Праглядальнік шрыфтоў -Name[bg]=Преглед на шрифт -Name[bn]=ফন্ট প্রদর্শক -Name[br]=Gweler Nodrezhoù -Name[bs]=Preglednik fontova -Name[ca]=Visor de lletres -Name[cs]=Prohlížeč písem -Name[csb]=Przezérnik fòntów -Name[cy]=Gwelydd Ffont -Name[da]=Skrifttypevisning -Name[de]=Schriftartenbetrachter -Name[el]=Προβολέας γραμματοσειρών -Name[eo]=Tiparorigardilo -Name[es]=Visor de tipos de letra -Name[et]=Fontide vaataja -Name[eu]=Letra-tipo ikustailea -Name[fa]=مشاهدهگر قلم -Name[fi]=Kirjasinten näytin -Name[fr]=Afficheur de polices -Name[fy]=Lettertypewerjefteprogramma -Name[ga]=Amharcán Clófhoirne -Name[gl]=Visor de Fontes -Name[he]=מציג גופנים -Name[hi]=फ़ॉन्ट प्रदर्शक -Name[hr]=Preglednik fontova -Name[hu]=A betűtípusok áttekintése -Name[id]=Penampil Font -Name[is]=Leturskoðari -Name[it]=Vista caratteri -Name[ja]=フォントビューア -Name[ka]=პროგრამა ფონტების სანახავად -Name[kk]=Қаріпті қарап-шығу -Name[km]=កម្មវិធីមើលពុម្ពអក្សរ -Name[ko]=글꼴 뷰어 -Name[lo]=ມຸມມອງແບບໄອຄອນ -Name[lt]=Šrifto žiūriklis -Name[lv]=Fontu Skatītājs -Name[mk]=Прегледувач на фонтови -Name[mn]=Бичиг харагч -Name[ms]=Pemapar Fon -Name[mt]=Werrej tal-fonts -Name[nb]=Skrifttypeviser -Name[nds]=Schriftoortkieker -Name[ne]=फन्ट दर्शक -Name[nl]=Lettertypeweergaveprogramma -Name[nn]=Skriftvisar -Name[nso]=Molebeledi wa Fonto -Name[pa]=ਫੋਂਟ ਦਰਸ਼ਕ -Name[pl]=Przeglądarka czcionek -Name[pt]=Visualizador do Tipo de Letra -Name[pt_BR]=Visualizador de Fontes -Name[ro]=Vizualizor de fonturi -Name[ru]=Просмотр шрифтов -Name[rw]=Ikigaragaza Imyandikire -Name[se]=Fontačájeheaddji -Name[sk]=Prehliadač písiem -Name[sl]=Prikazovalnik pisav -Name[sr]=Приказивач фонтова -Name[sr@Latn]=Prikazivač fontova -Name[sv]=Teckensnittsvisning -Name[ta]=எழுத்துரு காட்சி -Name[tg]=Намоишгари ҳарф -Name[th]=โปรแกรมดูแบบอักษร -Name[tr]=Yazıtipi İzleyici -Name[tt]=Yazu Kürsätkeç -Name[uk]=Переглядач шрифтів -Name[uz]=Shrift koʻruvchi -Name[uz@cyrillic]=Шрифт кўрувчи -Name[ven]=Muvhoni wa Fontu -Name[vi]=Trình xem Phông chữ -Name[wa]=Håyneu di fontes -Name[xh]=Imboniselo Yohlobo lwegama -Name[zh_CN]=字体查看器 -Name[zh_TW]=字型檢視器 -Name[zu]=Umbukisi Wohlobo lwamagama MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-ttc;application/x-font-pcf;application/x-font-bdf;application/vnd.tde.fontspackage X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View X-TDE-Library=libtdefontviewpart |