SOURCES: kde4-kdebase-workspace-branch.diff - updated
shadzik
shadzik at pld-linux.org
Wed Mar 11 00:36:15 CET 2009
Author: shadzik Date: Tue Mar 10 23:36:15 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kde4-kdebase-workspace-branch.diff (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SOURCES/kde4-kdebase-workspace-branch.diff
diff -u SOURCES/kde4-kdebase-workspace-branch.diff:1.6 SOURCES/kde4-kdebase-workspace-branch.diff:1.7
--- SOURCES/kde4-kdebase-workspace-branch.diff:1.6 Sat Mar 7 16:03:44 2009
+++ SOURCES/kde4-kdebase-workspace-branch.diff Wed Mar 11 00:36:09 2009
@@ -1,167 +1,13415 @@
---- workspace/ConfigureChecks.cmake (.../tags/KDE/4.2.1/kdebase) (wersja 936422)
-+++ workspace/ConfigureChecks.cmake (.../branches/KDE/4.2/kdebase) (wersja 936422)
+--- workspace/ksmserver/shutdowndlg.cpp (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/ksmserver/shutdowndlg.cpp (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -604,6 +604,8 @@
+ m_svg->paint(&p, QRect(0, 0, width(), height()), "background");
+ setMask(mask);
+ }
++
++ KDialog::centerOnScreen(this);
+ }
+
+ void KSMShutdownDlg::slotLogout()
+--- workspace/ksmserver/KSMServerInterface.h (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/ksmserver/KSMServerInterface.h (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -42,6 +42,10 @@
+ Q_SCRIPTABLE void suspendStartup( QString );
+ Q_SCRIPTABLE void resumeStartup( QString );
+ Q_SCRIPTABLE void wmChanged();
++
++Q_SIGNALS:
++ Q_SCRIPTABLE void loggingOut( int, int, int );
++
+ };
+
+ #endif
+--- workspace/ksmserver/org.kde.KSMServerInterface.xml (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/ksmserver/org.kde.KSMServerInterface.xml (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -27,5 +27,11 @@
+ <arg type="s" direction="in"/>
+ </method>
+ <method name="wmChanged"/>
++
++ <signal name="loggingOut">
++ <arg type="i" direction="out"/>
++ <arg type="i" direction="out"/>
++ <arg type="i" direction="out"/>
++ </signal>
+ </interface>
+ </node>
+--- workspace/ksmserver/shutdown.cpp (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/ksmserver/shutdown.cpp (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -82,6 +82,8 @@
+
+ void KSMServer::logout( int confirm, int sdtype, int sdmode )
+ {
++ emit loggingOut( confirm, sdtype, sdmode );
++
+ shutdown( (KWorkSpace::ShutdownConfirm)confirm,
+ (KWorkSpace::ShutdownType)sdtype,
+ (KWorkSpace::ShutdownMode)sdmode );
+--- workspace/ksmserver/server.h (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/ksmserver/server.h (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -193,6 +193,10 @@
+ void saveCurrentSessionAs( const QString & );
+ QStringList sessionList();
+ void wmChanged();
++
++ Q_SIGNALS:
++ void loggingOut( int, int, int );
++
+ private:
+ QList<KSMListener*> listener;
+ QList<KSMClient*> clients;
+--- workspace/ksmserver/kcm/kcmsmserver.desktop (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/ksmserver/kcm/kcmsmserver.desktop (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -39,6 +39,7 @@
+ Name[gu]=સત્ર વ્યવસ્થાપક
+ Name[he]=מנהל ההפעלה
+ Name[hi]=सत्र प्रबंधक
++Name[hne]=सत्र प्रबंधक
+ Name[hr]=Upravitelj sesijama
+ Name[hsb]=Rjadowar posedźenjow
+ Name[hu]=Munkafolyamatok
+@@ -68,8 +69,9 @@
+ Name[pt]=Gestor de Sessões
+ Name[pt_BR]=Gerenciador de sessão
+ Name[ro]=Administratorul de sesiune
+-Name[ru]=Диспетчер сеанса
++Name[ru]=Диспетчер сеансов
+ Name[se]=Bargovuorrogieđahalli
++Name[si]=සැසි කළමණාකරු
+ Name[sk]=Správca sedenia
+ Name[sl]=Upravitelj sej
+ Name[sr]=Менаџер сесија
+@@ -119,6 +121,7 @@
+ Comment[gu]=સત્ર વ્યવસ્થાપક અને બહાર નીકળવાની ગોઠવણીઓ રૂપરેખાંકિત કરો
+ Comment[he]=שינוי הגדרות מנהל ההפעלה והיציאה מהמערכת
+ Comment[hi]=सत्र प्रबंधक तथा लॉगआउट विन्यास कॉन्फ़िगर करें
++Comment[hne]=सत्र प्रबंधक अउ लागआउट सेटिंग कान्फिगर करव
+ Comment[hr]=Konfiguriranje upravitelja sesijama i postavkama odjavljivanja
+ Comment[hsb]=Rjadowar posedźenjow a nastajenjow za wotzjewjenje připrawić
+ Comment[hu]=A KDE munkafolyamat és a kijelentkezési mód beállításai
+@@ -147,7 +150,7 @@
+ Comment[pt]=Configuração do gestor de sessões e das opções de encerramento
+ Comment[pt_BR]=Configurar o gerenciador de sessão e definições de encerramento de sessão
+ Comment[ro]=Configurează managerul de sesiune și setările de ieșire
+-Comment[ru]=Настройка менеджера сеансов
++Comment[ru]=Настройка диспетчера сеансов
+ Comment[se]=Heivet bargovuorrogieđahalli ja olggosčáliheami
+ Comment[sk]=Nastavenie správcu sedení a odhlásenia
+ Comment[sl]=Tu lahko nastavite upravljalnik sej in nastavitve odjav
+--- workspace/ConfigureChecks.cmake (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/ConfigureChecks.cmake (.../branches/KDE/4.2/kdebase) (wersja 938006)
@@ -85,3 +85,4 @@
- pkg_check_modules (XRANDR_1_2 xrandr>=1.2)
- macro_bool_to_01(XRANDR_1_2_FOUND HAS_RANDR_1_2)
+ pkg_check_modules (XRANDR_1_2 xrandr>=1.2)
+ macro_bool_to_01(XRANDR_1_2_FOUND HAS_RANDR_1_2)
++
+--- workspace/kcontrol/dateandtime/clock.desktop (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/kcontrol/dateandtime/clock.desktop (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -40,6 +40,7 @@
+ Name[gu]=તારીખ & સમય
+ Name[he]=תאריך ושעה
+ Name[hi]=तारीख़ व समय
++Name[hne]=तारीक अउ समय
+ Name[hr]=Datum i vrijeme
+ Name[hsb]=Datum & čas
+ Name[hu]=Dátum és idő
+@@ -73,6 +74,7 @@
+ Name[ro]=Data și ora
+ Name[ru]=Дата и время
+ Name[se]=Dáhton ja áigi
++Name[si]=දිනය සහ වේලාව
+ Name[sk]=Dátum a čas
+ Name[sl]=Datum in čas
+ Name[sr]=Датум и време
+@@ -122,6 +124,7 @@
+ Comment[gu]=તારીખ અને સમય ગોઠવણીઓ
+ Comment[he]=שינוי הגדרות התאריך והשעה
+ Comment[hi]=तारीख़ तथा समय का विन्यास
++Comment[hne]=तारीक अउ समय के सेटिंग
+ Comment[hr]=Postavke datuma i vremena
+ Comment[hsb]=Nastajenja za datum a čas
+ Comment[hu]=A dátum és az idő beállításai
+@@ -154,6 +157,7 @@
+ Comment[ro]=Configurări dată și oră
+ Comment[ru]=Настройка даты и времени
+ Comment[se]=Dáhton- ja áigeheivehusat
++Comment[si]=දිනය සහ වේලා සැකසුම්
+ Comment[sk]=Nastavenia dátumu a času
+ Comment[sl]=Nastavitve datuma in časa
+ Comment[sr]=Поставке за датум и време
+--- workspace/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -285,7 +285,6 @@
+ previewFrameLayout->addWidget(itsPreview);
+
+ itsPreview->engine()->readConfig(itsConfig);
+- CFcEngine::setTextCol(QApplication::palette().color(QPalette::Active, QPalette::Text));
+ connect(itsPreview, SIGNAL(doZoomIn()), SLOT(zoomIn()));
+ connect(itsPreview, SIGNAL(doZoomOut()), SLOT(zoomOut()));
+
+--- workspace/kcontrol/kfontinst/kcmfontinst/FontList.cpp (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/kcontrol/kfontinst/kcmfontinst/FontList.cpp (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -196,8 +196,8 @@
+ #endif
+
+ static QString thumbKey(const QString &family, quint32 style, int height, const QColor &col);
+- QPixmap * getPixmap(const QString &family, const QString &name, const QString &fileName,
+- int height, quint32 stlye, bool selected, bool force=false);
++ QImage getImage(const QString &family, const QString &name, const QString &fileName,
++ int height, quint32 stlye, bool selected, bool force=false);
+ #ifdef KFI_SAVE_PIXMAPS
+ void clearOld();
+ #endif
+@@ -205,10 +205,10 @@
+
+ private:
+
+- CFcEngine *itsFcEngine;
+- QMap<QString, QPixmap> itsMap;
++ CFcEngine *itsFcEngine;
++ QMap<QString, QImage> itsMap;
+ #ifdef KFI_SAVE_PIXMAPS
+- QString itsPath;
++ QString itsPath;
+ #endif
+ };
+
+@@ -295,30 +295,34 @@
+ col.red(), col.green(), col.blue());
+ }
+
+-QPixmap * CPreviewCache::getPixmap(const QString &family, const QString &name, const QString &fileName,
+- int height, quint32 style, bool selected, bool force)
++QImage CPreviewCache::getImage(const QString &family, const QString &name, const QString &fileName,
++ int height, quint32 style, bool selected, bool force)
+ {
+ #ifdef KFI_SAVE_PIXMAPS
+ static const char *constFileType="PNG";
+ #endif
+
+- QColor col(QApplication::palette().color(selected ? QPalette::HighlightedText : QPalette::Text));
++ QColor col(QApplication::palette().color(selected ? QPalette::HighlightedText : QPalette::Text)),
++ bgnd(Qt::black);
+ QString thumbName(thumbKey(family, style, height, col));
+
+ if(!force && !itsMap[thumbName].isNull())
+- return &(itsMap[thumbName]);
++ return itsMap[thumbName];
+
+ #ifdef KFI_SAVE_PIXMAPS
+ QString thumbFile(itsPath+thumbName);
+
+ if(!force && itsMap[thumbName].load(thumbFile, constFileType))
+- return &(itsMap[thumbName]);
++ return itsMap[thumbName];
+ #endif
+
+- itsMap[thumbName]=QPixmap();
++ itsMap[thumbName]=QImage();
+
+- if(itsFcEngine->drawPreview(fileName.isEmpty() ? name : fileName, itsMap[thumbName], col,
+- height, style)) // CPD:TODO face???
++ bgnd.setAlpha(0);
++ itsMap[thumbName]=itsFcEngine->drawPreview(fileName.isEmpty() ? name : fileName, col, bgnd,
++ height, style); // CPD:TODO face???
++
++ if(!itsMap[thumbName].isNull())
+ {
+ #ifdef KFI_SAVE_PIXMAPS
+ QFile pngFile(thumbFile);
+@@ -326,22 +330,17 @@
+ if(pngFile.open(QIODevice::WriteOnly))
+ {
+ #endif
+- QImage thumb=itsMap[thumbName].toImage();
+-
+ #ifdef KFI_SAVE_PIXMAPS
+- thumb.save(&pngFile, constFileType);
++ itsMap[thumbName].save(&pngFile, constFileType);
+ pngFile.close();
+ #endif
+- itsMap[thumbName]=QPixmap::fromImage(thumb);
+- return &(itsMap[thumbName]);
++ return itsMap[thumbName];
+ #ifdef KFI_SAVE_PIXMAPS
+ }
+ #endif
+ }
+- else
+- itsMap[thumbName]=QPixmap(1, 1);
+
+- return NULL;
++ return QImage();
+ }
+
+ #ifdef KFI_SAVE_PIXMAPS
+@@ -411,7 +410,7 @@
+ {
+ const KIO::UDSEntry &udsEntry(item.entry());
+
+- itsPixmap[0]=itsPixmap[1]=0L;
++ clearImage();
+ setUrl(item.url());
+ itsName=udsEntry.stringValue(KIO::UDSEntry::UDS_NAME);
+ itsFileName=udsEntry.stringValue((uint)UDS_EXTRA_FILE_NAME);
+@@ -468,19 +467,19 @@
+ }
+ }
+
+-const QPixmap * CFontItem::pixmap(bool selected, bool force)
++const QImage & CFontItem::image(bool selected, bool force)
+ {
+ int idx(selected ? 1 : 0);
+
+ if(parent() &&
+- (!itsPixmap[idx] || itsPixmap[idx]->isNull() || force ||
+- itsPixmap[idx]->height()!=CFontList::previewSize()))
+- itsPixmap[idx]=theCache->getPixmap(family(), name(), isEnabled()
++ (itsImage[idx].isNull() || force ||
++ itsImage[idx].height()!=CFontList::previewSize()))
++ itsImage[idx]=theCache->getImage(family(), name(), isEnabled()
+ ? QString()
+ : itsFileName,
+- CFontList::previewSize(), itsStyleInfo, selected, force);
++ CFontList::previewSize(), itsStyleInfo, selected, force);
+
+- return itsPixmap[idx];
++ return itsImage[idx];
+ }
+
+ CFamilyItem::CFamilyItem(CFontList &p, const QString &n)
+@@ -862,7 +861,7 @@
+ fend((*it)->fonts().end());
+
+ for(; fit!=fend; ++fit)
+- (*fit)->clearPixmap();
++ (*fit)->clearImage();
+ }
+
+ theCache->empty();
+@@ -1552,14 +1551,14 @@
+
+ if(fam->regularFont())
+ {
+- const QPixmap *pix=fam->regularFont()->pixmap(option.state&QStyle::State_Selected);
++ const QImage &img=fam->regularFont()->image(option.state&QStyle::State_Selected);
+
+- if(pix)
++ if(!img.isNull())
+ if(Qt::RightToLeft==QApplication::layoutDirection())
+- painter->drawPixmap(option.rect.x()-(pix->width()-option.rect.width()),
+- option.rect.y(), *pix);
++ painter->drawImage(option.rect.x()-(img.width()-option.rect.width()),
++ option.rect.y(), img);
+ else
+- painter->drawPixmap(option.rect.x(), option.rect.y(), *pix);
++ painter->drawImage(option.rect.x(), option.rect.y(), img);
+ }
+ }
+ }
+--- workspace/kcontrol/kfontinst/kcmfontinst/FontList.h (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/kcontrol/kfontinst/kcmfontinst/FontList.h (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -36,6 +36,7 @@
+ #include <QtCore/QVariant>
+ #include <QtGui/QSortFilterProxyModel>
+ #include <QtGui/QFontDatabase>
++#include <QtGui/QImage>
+ #include "Misc.h"
+ #include "FontLister.h"
+ #include "JobRunner.h"
+@@ -47,7 +48,6 @@
+ class KFileItem;
+ class KFileItemList;
+ class QMenu;
+-class QPixmap;
+ class QMimeData;
+ class QTimer;
+
+@@ -238,8 +238,8 @@
+ quint32 styleInfo() const { return itsStyleInfo; }
+ int index() const { return itsIndex; }
+ const QString & family() const { return (static_cast<CFamilyItem *>(parent()))->name(); }
+- const QPixmap * pixmap(bool selected, bool force=false);
+- void clearPixmap() { itsPixmap[0]=itsPixmap[1]=NULL; }
++ const QImage & image(bool selected, bool force=false);
++ void clearImage() { itsImage[0]=itsImage[1]=QImage(); }
+ int rowNumber() const { return (static_cast<CFamilyItem *>(parent()))->row(this); }
+ const CDisabledFonts::TFileList & files() const { return itsFiles; }
+ KIO::filesize_t size() const { return itsSize; }
+@@ -253,7 +253,7 @@
+ itsStyle,
+ itsMimeType;
+ int itsIndex;
+- QPixmap *itsPixmap[2];
++ QImage itsImage[2];
+ quint32 itsStyleInfo;
+ bool itsBitmap,
+ itsEnabled;
+--- workspace/kcontrol/kfontinst/kcmfontinst/fontinst.desktop (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/kcontrol/kfontinst/kcmfontinst/fontinst.desktop (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -37,6 +37,7 @@
+ Name[gu]=ફોન્ટ સ્થાપક
+ Name[he]=מתקין הגופנים
+ Name[hi]=फ़ॉन्ट संस्थापक
++Name[hne]=फोंट इंस्टालर
+ Name[hr]=Instaliranje fontova
+ Name[hsb]=Instalowar za pisma
+ Name[hu]=Betűtípus-telepítő
+@@ -70,6 +71,7 @@
+ Name[ro]=Instalare fonturi
+ Name[ru]=Установка шрифтов
+ Name[se]=Fontasajáiduhttejeaddji
++Name[si]=අකුරු ස්ථාපකය
+ Name[sk]=Inštalátor písiem
+ Name[sl]=Namestilnik pisav
+ Name[sr]=Инсталатер фонтова
+@@ -116,6 +118,7 @@
+ Comment[gu]=ફોન્ટ્સનું સ્થાપન કરો, વ્યવસ્થા કરો અને પૂર્વદર્શન કરો
+ Comment[he]=התקנה, ניהול ותצוגה מקדימה של גופנים
+ Comment[hi]=फ़ॉन्ट संस्थापित, प्रदर्शित व प्रबंधित करना
++Comment[hne]=फोंट ल इंस्टाल, प्रबंध करव अउ देखव
+ Comment[hr]=Instaliranje, upravljanje i pregledavanje fontova
+ Comment[hsb]=Instaluje, rjaduje a pokazuje pisma
+ Comment[hu]=Betűtípusok telepítése, áttekintése
+@@ -127,6 +130,7 @@
+ Comment[kn]=ಅಕ್ಷರಶೈಲಿಗಳ ಮುನ್ನೋಟವನ್ನು ನೋಡು, ಅನುಸ್ಥಾಪಿಸು ಹಾಗೂ ವ್ಯವಸ್ಥಾಪಿಸು
+ Comment[ko]=글꼴 설치, 미리보기, 관리
+ Comment[ku]=Sazkirin, rêvebirin û pêşdîtina fontan
++Comment[lt]=Šriftų diegimas, tvarkymas ir peržiūra
+ Comment[lv]=Instalē, pārvalda un apskata fontus
+ Comment[mk]=Инсталирање, менаџирање и преглед на фонтови
+ Comment[ml]=അക്ഷരസഞ്ചയങ്ങള് ഇന്സ്റ്റോള് ചെയ്യുക, നോക്കി നടത്തുക അല്ലെങ്കില് കണ്ടുനോക്കുക
+@@ -142,8 +146,9 @@
+ Comment[pt]=Instalar, gerir e antever tipos de letra
+ Comment[pt_BR]=Instalar, gerenciar e visualizar fontes
+ Comment[ro]=Instalează, gestionează și previzualizează fonturi
+-Comment[ru]=Установка, управление и просмотр шрифтов
++Comment[ru]=Установка и просмотр шрифтов
+ Comment[se]=Sajáiduhtte, gieđahala ja čájet fonttaid
++Comment[si]=අකුරු ස්ථාපනය, කළමණාරනය සහ පුර්වදසුන
+ Comment[sk]=Inštalovanie, správa a náhľady písiem
+ Comment[sl]=Namesti, upravljaj in prikaži pisave
+ Comment[sr]=Инсталација, управљање и преглед фонтова
+--- workspace/kcontrol/kfontinst/viewpart/FontPreview.cpp (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/kcontrol/kfontinst/viewpart/FontPreview.cpp (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -73,11 +73,15 @@
+ {
+ itsLastWidth=width()+constStepSize;
+ itsLastHeight=height()+constStepSize;
++ itsImage=QImage();
+
+- if(!itsCurrentUrl.isEmpty() &&
+- itsEngine->draw(itsCurrentUrl, itsLastWidth, itsLastHeight, itsPixmap,
+- itsCurrentFace, false, itsRange, &itsChars, itsFontName,
+- itsStyleInfo))
++ if(!itsCurrentUrl.isEmpty())
++ itsImage=itsEngine->draw(itsCurrentUrl, itsLastWidth, itsLastHeight,
++ palette().text().color(), palette().base().color(),
++ itsCurrentFace, false, itsRange, &itsChars, itsFontName,
++ itsStyleInfo);
++
++ if(!itsImage.isNull())
+ {
+ itsLastChar=CFcEngine::TChar();
+ setMouseTracking(itsChars.count()>0);
+@@ -86,9 +90,6 @@
+ }
+ else
+ {
+- QPixmap nullPix;
+-
+- itsPixmap=nullPix;
+ itsLastChar=CFcEngine::TChar();
+ setMouseTracking(false);
+ update();
+@@ -119,14 +120,14 @@
+ QPainter paint(this);
+
+ paint.fillRect(rect(), palette().base());
+- if(!itsPixmap.isNull())
++ if(!itsImage.isNull())
+ {
+
+ if(abs(width()-itsLastWidth)>constStepSize || abs(height()-itsLastHeight)>constStepSize)
+ showFont();
+ else
+- paint.drawPixmap(QPoint(constBorder, constBorder), itsPixmap,
+- QRect(0, 0, width()-(constBorder*2), height()-(constBorder*2)));
++ paint.drawImage(QPoint(constBorder, constBorder), itsImage,
++ QRect(0, 0, width()-(constBorder*2), height()-(constBorder*2)));
+ }
+ }
+
+--- workspace/kcontrol/kfontinst/viewpart/FontPreview.h (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/kcontrol/kfontinst/viewpart/FontPreview.h (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -24,7 +24,7 @@
+ * Boston, MA 02110-1301, USA.
+ */
+
+-#include <QtGui/QPixmap>
++#include <QtGui/QImage>
+ #include <QtCore/QSize>
+ #include <QtGui/QWidget>
+ #include <QtGui/QColor>
+@@ -77,7 +77,7 @@
+
+ private:
+
+- QPixmap itsPixmap;
++ QImage itsImage;
+ KUrl itsCurrentUrl;
+ int itsCurrentFace,
+ itsLastWidth,
+--- workspace/kcontrol/kfontinst/viewpart/FontViewPart.cpp (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/kcontrol/kfontinst/viewpart/FontViewPart.cpp (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -126,7 +126,6 @@
+ itsFaceWidget->hide();
+
+ itsPreview->engine()->readConfig(*itsConfig);
+- CFcEngine::setTextCol(QApplication::palette().color(QPalette::Active, QPalette::Text));
+ connect(itsPreview, SIGNAL(doZoomIn()), SLOT(zoomIn()));
+ connect(itsPreview, SIGNAL(doZoomOut()), SLOT(zoomOut()));
+
+--- workspace/kcontrol/kfontinst/viewpart/CharTip.cpp (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/kcontrol/kfontinst/viewpart/CharTip.cpp (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -209,14 +209,19 @@
+ details+="</table>";
+ itsLabel->setText(details);
+
+- QPixmap pix((int)(itsItem.width()*2.5), (int)(itsItem.height()*2.5));
+ QList<CFcEngine::TRange> range;
+ range.append(CFcEngine::TRange(itsItem.ucs4, 0));
+
+- if(itsParent->engine()->draw(itsParent->itsCurrentUrl, pix.width(), pix.height(), pix,
+- itsParent->itsCurrentFace-1, false, range,
+- NULL, itsParent->itsFontName, itsParent->itsStyleInfo))
+- itsPixmapLabel->setPixmap(pix);
++ QColor bgnd(Qt::white);
++ bgnd.setAlpha(0);
++
++ QImage img=itsParent->engine()->draw(itsParent->itsCurrentUrl, (int)(itsItem.width()*2.5),
++ (int)(itsItem.height()*2.5),
++ palette().text().color(), bgnd,
++ itsParent->itsCurrentFace-1, false, range,
++ NULL, itsParent->itsFontName, itsParent->itsStyleInfo);
++ if(!img.isNull())
++ itsPixmapLabel->setPixmap(QPixmap::fromImage(img));
+ else
+ itsPixmapLabel->setPixmap(QPixmap());
+ itsTimer->disconnect(this);
+--- workspace/kcontrol/kfontinst/viewpart/kfontviewpart.desktop (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/kcontrol/kfontinst/viewpart/kfontviewpart.desktop (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -28,6 +28,7 @@
+ Name[gu]=ફોન્ટ દર્શક
+ Name[he]=מציג הגופנים
+ Name[hi]=फ़ॉन्ट प्रदर्शक
++Name[hne]=फोंट प्रदर्सक
+ Name[hr]=Preglednik fontova
+ Name[hsb]=Přehladowar pisma
+ Name[hu]=A betűtípusok áttekintése
+@@ -60,6 +61,7 @@
+ Name[ro]=Vizualizator de fonturi
+ Name[ru]=Просмотр шрифтов
+ Name[se]=Fontačájeheaddji
++Name[si]=අකුරු දසුන
+ Name[sk]=Prehliadač písiem
+ Name[sl]=Prikazovalnik pisav
+ Name[sr]=Приказивач фонтова
+--- workspace/kcontrol/kfontinst/kio/fonts.desktop (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/kcontrol/kfontinst/kio/fonts.desktop (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -31,6 +31,7 @@
+ Name[gu]=ફોન્ટ્સ
+ Name[he]=גופנים
+ Name[hi]=फ़ॉन्ट्स
++Name[hne]=फोंट
+ Name[hr]=Fontovi
+ Name[hsb]=Pisma
+ Name[hu]=Betűtípusok
+@@ -64,6 +65,7 @@
+ Name[ro]=Fonturi
+ Name[ru]=Шрифты
+ Name[se]=Fonttat
++Name[si]=අකුරු
+ Name[sk]=Písma
+ Name[sl]=Pisave
+ Name[sr]=Фонтови
+--- workspace/kcontrol/kfontinst/apps/kfontview.desktop (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/kcontrol/kfontinst/apps/kfontview.desktop (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -6,6 +6,7 @@
+ Name[cs]=Prohlížeč písem
+ Name[eu]=KFontWiew
+ Name[hi]=के-फ़ॉन्ट-व्यू
++Name[hne]=के-फोंट-व्यू
+ Name[kn]=ಕೆಫಾಂಟ್ ವ್ಯೂ
+ Name[mai]=के-फान्ट-व्यू
+ Name[mk]=КФонтПреглед
+@@ -56,6 +57,7 @@
+ GenericName[gu]=ફોન્ટ દર્શક
+ GenericName[he]=מציג גופנים
+ GenericName[hi]=फ़ॉन्ट प्रदर्शक
++GenericName[hne]=फोंट प्रदर्सक
+ GenericName[hr]=Preglednik fontova
+ GenericName[hsb]=Přehladowar za pisma
+ GenericName[hu]=Betűtípusböngésző
+@@ -86,8 +88,9 @@
+ GenericName[pt]=Visualizador do Tipo de Letra
+ GenericName[pt_BR]=Visualizador de fontes
+ GenericName[ro]=Vizualizator de fonturi
+-GenericName[ru]=Программа просмотра шрифтов
++GenericName[ru]=Просмотр шрифтов
+ GenericName[se]=Fontačájeheaddji
++GenericName[si]=අකුරු දසුන
+ GenericName[sk]=Prehliadač písiem
+ GenericName[sl]=Pregledovalnik pisav
+ GenericName[sr]=Приказивач фонтова
+--- workspace/kcontrol/kfontinst/apps/installfont.desktop (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/kcontrol/kfontinst/apps/installfont.desktop (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -31,6 +31,7 @@
+ Name[gu]=સ્થાપન...
+ Name[he]=התקנה...
+ Name[hi]=संस्थापित करें...
++Name[hne]=इंस्टाल करव...
+ Name[hr]=Instaliraj...
+ Name[hsb]=instalować...
+ Name[hu]=Telepítés...
+@@ -62,6 +63,7 @@
+ Name[ro]=Instalare...
+ Name[ru]=Установить...
+ Name[se]=Sajáiduhte …
++Name[si]=ස්ථාපනය...
+ Name[sk]=Inštalácia...
+ Name[sl]=Namesti ...
+ Name[sr]=Инсталирај...
+--- workspace/kcontrol/kfontinst/thumbnail/fontthumbnail.desktop (.../tags/KDE/4.2.0/kdebase) (wersja 938006)
++++ workspace/kcontrol/kfontinst/thumbnail/fontthumbnail.desktop (.../branches/KDE/4.2/kdebase) (wersja 938006)
+@@ -29,6 +29,7 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdebase-workspace-branch.diff?r1=1.6&r2=1.7&f=u
More information about the pld-cvs-commit
mailing list