SOURCES: kde4-kdebase-branch.diff, kde4-kdebase-runtime-branch.diff, kde4-k...

arekm arekm at pld-linux.org
Fri Mar 6 18:04:27 CET 2009


Author: arekm                        Date: Fri Mar  6 17:04:27 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kde4-kdebase-branch.diff (1.4 -> 1.5) , kde4-kdebase-runtime-branch.diff (1.5 -> 1.6) , kde4-kdebase-workspace-branch.diff (1.4 -> 1.5) , kde4-kdelibs-branch.diff (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/kde4-kdebase-branch.diff
diff -u SOURCES/kde4-kdebase-branch.diff:1.4 SOURCES/kde4-kdebase-branch.diff:1.5
--- SOURCES/kde4-kdebase-branch.diff:1.4	Thu Mar  5 21:58:08 2009
+++ SOURCES/kde4-kdebase-branch.diff	Fri Mar  6 18:04:19 2009
@@ -1,7 +1,7 @@
 Index: apps/kappfinder/apps/System/Terminal/vmstat.desktop
 ===================================================================
---- apps/kappfinder/apps/System/Terminal/vmstat.desktop	(.../tags/KDE/4.2.1/kdebase)	(wersja 935632)
-+++ apps/kappfinder/apps/System/Terminal/vmstat.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 935632)
+--- apps/kappfinder/apps/System/Terminal/vmstat.desktop	(.../tags/KDE/4.2.1/kdebase)	(wersja 935993)
++++ apps/kappfinder/apps/System/Terminal/vmstat.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 935993)
 @@ -43,7 +43,7 @@
  GenericName[gu]=વર્ચ્યુઅલ મેમરી આંકડાઓ
  GenericName[he]=סטטיסטיקה לגבי הזיכרון הווירטואלי
@@ -11,10 +11,40 @@
  GenericName[hr]=Statistike o virtualnoj memoriji
  GenericName[hsb]=Statistika wo wirtuelnym pomjatku
  GenericName[hu]=Memóriastatisztika
+Index: apps/konqueror/src/konqbookmarkbar.cpp
+===================================================================
+--- apps/konqueror/src/konqbookmarkbar.cpp	(.../tags/KDE/4.2.1/kdebase)	(wersja 935993)
++++ apps/konqueror/src/konqbookmarkbar.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 935993)
+@@ -301,10 +301,21 @@
+ {
+     KBookmarkActionInterface * action = dynamic_cast<KBookmarkActionInterface *>( m_toolBar->actionAt(pos) );
+     if(!action)
+-        return;
+-    KMenu * menu = new KonqBookmarkContextMenu(action->bookmark(), m_pManager, m_pOwner);
+-    menu->setAttribute(Qt::WA_DeleteOnClose);
+-    menu->popup(m_toolBar->mapToGlobal(pos));
++    {
++        //Show default (ktoolbar) menu
++        m_toolBar->setContextMenuPolicy( Qt::DefaultContextMenu );
++        //Recreate event with the same position
++        QContextMenuEvent evt( QContextMenuEvent::Other, pos );
++        QCoreApplication::sendEvent( m_toolBar, &evt );
++        //Reassign custom context menu
++        m_toolBar->setContextMenuPolicy( Qt::CustomContextMenu );
++    }
++    else
++    {
++        KMenu * menu = new KonqBookmarkContextMenu(action->bookmark(), m_pManager, m_pOwner);
++        menu->setAttribute(Qt::WA_DeleteOnClose);
++        menu->popup(m_toolBar->mapToGlobal(pos));
++    }
+ }
+ 
+ // TODO    *** drop improvements ***
 Index: apps/kinfocenter/kinfocenter.desktop
 ===================================================================
---- apps/kinfocenter/kinfocenter.desktop	(.../tags/KDE/4.2.1/kdebase)	(wersja 935632)
-+++ apps/kinfocenter/kinfocenter.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 935632)
+--- apps/kinfocenter/kinfocenter.desktop	(.../tags/KDE/4.2.1/kdebase)	(wersja 935993)
++++ apps/kinfocenter/kinfocenter.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 935993)
 @@ -103,7 +103,7 @@
  GenericName[pt]=Centro de Informações
  GenericName[pt_BR]=Centro de informações
@@ -26,8 +56,8 @@
  GenericName[sl]=Informacijsko središče
 Index: apps/konsole/src/TerminalDisplay.h
 ===================================================================
---- apps/konsole/src/TerminalDisplay.h	(.../tags/KDE/4.2.1/kdebase)	(wersja 935632)
-+++ apps/konsole/src/TerminalDisplay.h	(.../branches/KDE/4.2/kdebase)	(wersja 935632)
+--- apps/konsole/src/TerminalDisplay.h	(.../tags/KDE/4.2.1/kdebase)	(wersja 935993)
++++ apps/konsole/src/TerminalDisplay.h	(.../branches/KDE/4.2/kdebase)	(wersja 935993)
 @@ -563,9 +563,6 @@
      //     - Other characters (returns the input character)
      QChar charClass(QChar ch) const;
@@ -40,8 +70,8 @@
      void mouseTripleClickEvent(QMouseEvent* ev);
 Index: apps/konsole/src/TerminalDisplay.cpp
 ===================================================================
---- apps/konsole/src/TerminalDisplay.cpp	(.../tags/KDE/4.2.1/kdebase)	(wersja 935632)
-+++ apps/konsole/src/TerminalDisplay.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 935632)
+--- apps/konsole/src/TerminalDisplay.cpp	(.../tags/KDE/4.2.1/kdebase)	(wersja 935993)
++++ apps/konsole/src/TerminalDisplay.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 935993)
 @@ -2155,11 +2155,12 @@
    _wordSelectionMode = true;
  

================================================================
Index: SOURCES/kde4-kdebase-runtime-branch.diff
diff -u SOURCES/kde4-kdebase-runtime-branch.diff:1.5 SOURCES/kde4-kdebase-runtime-branch.diff:1.6
--- SOURCES/kde4-kdebase-runtime-branch.diff:1.5	Thu Mar  5 21:58:09 2009
+++ SOURCES/kde4-kdebase-runtime-branch.diff	Fri Mar  6 18:04:20 2009
@@ -1,5 +1,5 @@
---- runtime/cmake/modules/FindPulseAudio.cmake	(.../tags/KDE/4.2.1/kdebase)	(wersja 935632)
-+++ runtime/cmake/modules/FindPulseAudio.cmake	(.../branches/KDE/4.2/kdebase)	(wersja 935632)
+--- runtime/cmake/modules/FindPulseAudio.cmake	(.../tags/KDE/4.2.1/kdebase)	(wersja 935993)
++++ runtime/cmake/modules/FindPulseAudio.cmake	(.../branches/KDE/4.2/kdebase)	(wersja 935993)
 @@ -30,8 +30,8 @@
  
  FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h
@@ -11,8 +11,8 @@
     )
  
  FIND_LIBRARY(PULSEAUDIO_LIBRARY NAMES pulse libpulse 
---- runtime/knotify/kde.notifyrc	(.../tags/KDE/4.2.1/kdebase)	(wersja 935632)
-+++ runtime/knotify/kde.notifyrc	(.../branches/KDE/4.2/kdebase)	(wersja 935632)
+--- runtime/knotify/kde.notifyrc	(.../tags/KDE/4.2.1/kdebase)	(wersja 935993)
++++ runtime/knotify/kde.notifyrc	(.../branches/KDE/4.2/kdebase)	(wersja 935993)
 @@ -752,7 +752,7 @@
  Comment[pt]=Ocorreu um erro sério que fez com que o programa saísse
  Comment[pt_BR]=Houve um erro sério, que fez com que o programa fosse fechado
@@ -31,8 +31,8 @@
  Comment[sk]=Stala sa veľmi vážna chyba, ktorá zapríčinila minimálne ukončenie programu
  Comment[sl]=Prišlo je do zelo resne napake, zaradi katere se je program končal
  Comment[sr]=Дошло је до врло озбиљне грешке, због које је бар програм обустављен
---- runtime/desktoptheme/metadata.desktop	(.../tags/KDE/4.2.1/kdebase)	(wersja 935632)
-+++ runtime/desktoptheme/metadata.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 935632)
+--- runtime/desktoptheme/metadata.desktop	(.../tags/KDE/4.2.1/kdebase)	(wersja 935993)
++++ runtime/desktoptheme/metadata.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 935993)
 @@ -50,7 +50,7 @@
  Comment[gu]=થીમ ઓક્સિજન શૈલીમાં બનાવાઇ છે
  Comment[he]=ערכת נושא שמשתמשת בסגנון Oxygen
@@ -42,8 +42,8 @@
  Comment[hu]=Oxygen-stílusú téma
  Comment[is]=Þema sem gert er í 'Oxygen' stíl
  Comment[it]=Tema in stile Oxygen
---- runtime/khelpcenter/kcmhelpcenter.desktop	(.../tags/KDE/4.2.1/kdebase)	(wersja 935632)
-+++ runtime/khelpcenter/kcmhelpcenter.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 935632)
+--- runtime/khelpcenter/kcmhelpcenter.desktop	(.../tags/KDE/4.2.1/kdebase)	(wersja 935993)
++++ runtime/khelpcenter/kcmhelpcenter.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 935993)
 @@ -120,7 +120,7 @@
  Comment[gu]=મદદ કેન્દ્ર શોધ અનુક્રમણિકા રૂપરેખાંકન અને બનાવટ
  Comment[he]=שינוי הגדרות ויצירת אינדקס החיפוש של מרכז העזרה
@@ -53,8 +53,8 @@
  Comment[hr]=Konfiguriranje i generiranje indeksa za pretraživanje pomoći
  Comment[hsb]=Připrawjenje a stworjenje pytanskeho indeksa za pomhanišćo
  Comment[hu]=A dokumentáció keresési indexének beállításai
---- runtime/kioslave/trash/trash.protocol	(.../tags/KDE/4.2.1/kdebase)	(wersja 935632)
-+++ runtime/kioslave/trash/trash.protocol	(.../branches/KDE/4.2/kdebase)	(wersja 935632)
+--- runtime/kioslave/trash/trash.protocol	(.../tags/KDE/4.2.1/kdebase)	(wersja 935993)
++++ runtime/kioslave/trash/trash.protocol	(.../branches/KDE/4.2/kdebase)	(wersja 935993)
 @@ -49,7 +49,7 @@
  ExtraNames[gu]=મૂળભૂત પાથ,દૂર કરવાની તારીખ
  ExtraNames[he]=נתיב מקורי,תאריך מחיקה
@@ -64,8 +64,8 @@
  ExtraNames[hr]=Izvorna putanja,Datum brisanja
  ExtraNames[hsb]=Originalny puć, datum zničenja
  ExtraNames[hu]=Eredeti elérési út,Törlési dátum
---- runtime/l10n/ae/entry.desktop	(.../tags/KDE/4.2.1/kdebase)	(wersja 935632)
-+++ runtime/l10n/ae/entry.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 935632)
+--- runtime/l10n/ae/entry.desktop	(.../tags/KDE/4.2.1/kdebase)	(wersja 935993)
++++ runtime/l10n/ae/entry.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 935993)
 @@ -60,7 +60,7 @@
  Name[pt]=Emiratos Árabes Unidos
  Name[pt_BR]=Emirados Árabes Unidos
@@ -75,8 +75,8 @@
  Name[se]=Ovttastuvvon arábalaš emiráhtat
  Name[si]=එක්සත් අරාඹි එමීර් රාජ්‍ය
  Name[sk]=Spojené arabské emiráty
---- runtime/l10n/au/entry.desktop	(.../tags/KDE/4.2.1/kdebase)	(wersja 935632)
-+++ runtime/l10n/au/entry.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 935632)
+--- runtime/l10n/au/entry.desktop	(.../tags/KDE/4.2.1/kdebase)	(wersja 935993)
++++ runtime/l10n/au/entry.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 935993)
 @@ -25,7 +25,7 @@
  Name[gu]=ઓસ્ટ્રેલિઆ
  Name[he]=אוסטרליה

================================================================
Index: SOURCES/kde4-kdebase-workspace-branch.diff
diff -u SOURCES/kde4-kdebase-workspace-branch.diff:1.4 SOURCES/kde4-kdebase-workspace-branch.diff:1.5
--- SOURCES/kde4-kdebase-workspace-branch.diff:1.4	Tue Feb 24 02:46:49 2009
+++ SOURCES/kde4-kdebase-workspace-branch.diff	Fri Mar  6 18:04:20 2009
@@ -1,20349 +1,889 @@
---- workspace/ksmserver/shutdowndlg.cpp	(.../tags/KDE/4.2.0/kdebase)	(wersja 930691)
-+++ workspace/ksmserver/shutdowndlg.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 930691)
-@@ -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 930691)
-+++ workspace/ksmserver/KSMServerInterface.h	(.../branches/KDE/4.2/kdebase)	(wersja 930691)
-@@ -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 930691)
-+++ workspace/ksmserver/org.kde.KSMServerInterface.xml	(.../branches/KDE/4.2/kdebase)	(wersja 930691)
-@@ -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 930691)
-+++ workspace/ksmserver/shutdown.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 930691)
-@@ -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 930691)
-+++ workspace/ksmserver/server.h	(.../branches/KDE/4.2/kdebase)	(wersja 930691)
-@@ -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 930691)
-+++ workspace/ksmserver/kcm/kcmsmserver.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 930691)
-@@ -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,7 +69,7 @@
- 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[sk]=Správca sedenia
- Name[sl]=Upravitelj sej
-@@ -119,6 +120,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 +149,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/kcontrol/dateandtime/clock.desktop	(.../tags/KDE/4.2.0/kdebase)	(wersja 930691)
-+++ workspace/kcontrol/dateandtime/clock.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 930691)
-@@ -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ő
-@@ -122,6 +123,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
---- workspace/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp	(.../tags/KDE/4.2.0/kdebase)	(wersja 930691)
-+++ workspace/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 930691)
-@@ -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 930691)
-+++ workspace/kcontrol/kfontinst/kcmfontinst/FontList.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 930691)
-@@ -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 930691)
-+++ workspace/kcontrol/kfontinst/kcmfontinst/FontList.h	(.../branches/KDE/4.2/kdebase)	(wersja 930691)
-@@ -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 930691)
-+++ workspace/kcontrol/kfontinst/kcmfontinst/fontinst.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 930691)
-@@ -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ő
-@@ -116,6 +117,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 +129,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,7 +145,7 @@
- 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[sk]=Inštalovanie, správa a náhľady písiem
- Comment[sl]=Namesti, upravljaj in prikaži pisave
---- workspace/kcontrol/kfontinst/viewpart/FontPreview.cpp	(.../tags/KDE/4.2.0/kdebase)	(wersja 930691)
-+++ workspace/kcontrol/kfontinst/viewpart/FontPreview.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 930691)
-@@ -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 930691)
-+++ workspace/kcontrol/kfontinst/viewpart/FontPreview.h	(.../branches/KDE/4.2/kdebase)	(wersja 930691)
-@@ -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 930691)
-+++ workspace/kcontrol/kfontinst/viewpart/FontViewPart.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 930691)
-@@ -126,7 +126,6 @@
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdebase-branch.diff?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdebase-runtime-branch.diff?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdebase-workspace-branch.diff?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdelibs-branch.diff?r1=1.6&r2=1.7&f=u



More information about the pld-cvs-commit mailing list