diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/debian/changelog /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/debian/changelog --- kde-nightly-kdenetwork-20091006+svn1032120/debian/changelog 2009-10-07 05:14:11.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/debian/changelog 2009-10-10 08:04:50.000000000 +0100 @@ -1,8 +1,8 @@ -kde-nightly-kdenetwork (20091006+svn1032120-0neon1) jaunty; urgency=low +kde-nightly-kdenetwork (20091009+svn1033338-0neon1) jaunty; urgency=low * Nightly Build - -- Project Neon Wed, 07 Oct 2009 00:14:11 -0400 + -- Project Neon Sat, 10 Oct 2009 03:04:51 -0400 kde-nightly-kdenetwork (20080303-0amarok1) gutsy; urgency=low diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop --- kde-nightly-kdenetwork-20091006+svn1032120/filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop 2009-10-06 23:29:16.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop 2009-10-09 23:33:38.000000000 +0100 @@ -19,7 +19,7 @@ Name[fi]=Konquerorin tiedostojakojen ominaisuussivu Name[fr]=Page des propriétés d'un dossier de partage de Konqueror Name[ga]=Leathanach Airíonna Konqueror: Comhroinnt Comhadlainne -Name[gl]=Páxina coas propiedades do cartafol de ficheiros compartidos de Konqueror +Name[gl]=Páxina coas propiedades do directorio de ficheiros compartidos de Konqueror Name[he]=דף מאפייני ספרית קבצים משותפת של Konqueror Name[hi]=फ़ाइलशेयर कॉन्करर डिरेक्ट्रीज़ गुण पृष्ठ Name[hne]=फाइलसेयर कान्करर डिरेक्टरीज गुन पेज @@ -77,7 +77,7 @@ Comment[fi]=Konquerorin laajennus, jolla voi jakaa kansioita lähiverkossa Comment[fr]=Module de Konqueror pour le partage d'un dossier sur le réseau local Comment[ga]=Breiseán dialóige airíonna Konqueror lenar féidir comhadlann a chomhroinnt leis an líonra logánta -Comment[gl]=Diálogo de propiedades do engadido de Konqueror para compartir un cartafol pola rede local +Comment[gl]=Diálogo de propiedades do engadido de Konqueror para compartir un directorio pola rede local Comment[he]=תוסף מאפייני דו-שיח של Konqueror כדי לשתף סיפריה עם רשת מקומית Comment[hi]=स्थानीय नेटवर्क के साथ डिरेक्ट्री साझा करने के लिए कॉन्करर गुण संवाद प्लगइन Comment[hne]=लोकल नेटवर्क के साथ डिरेक्टरी साझा करे बर कान्करर गुन गोठ प्लगइन diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/filesharing/simple/fileshare.desktop /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/filesharing/simple/fileshare.desktop --- kde-nightly-kdenetwork-20091006+svn1032120/filesharing/simple/fileshare.desktop 2009-10-06 23:29:16.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/filesharing/simple/fileshare.desktop 2009-10-09 23:33:38.000000000 +0100 @@ -91,7 +91,7 @@ Comment[fi]=Ota tiedostojako käyttöön tai poista se käytöstä Comment[fr]=Activer ou désactiver le partage de fichiers Comment[ga]=Cumasaigh nó díchumasaigh comhroinnt comhad -Comment[gl]=Activa ou desactiva a compartición de ficheiros +Comment[gl]=Activar ou desactivar a compartición de ficheiros Comment[he]=אפשר או מנע שיתוף קבצים Comment[hi]=फ़ाइल साझेदारी सक्षम या अक्षम करें Comment[hne]=फाइल साझेदारी सक्छम या अक्छम करव diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/conf/dlgappearance.ui /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/conf/dlgappearance.ui --- kde-nightly-kdenetwork-20091006+svn1032120/kget/conf/dlgappearance.ui 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/conf/dlgappearance.ui 2009-10-09 23:33:32.000000000 +0100 @@ -1,27 +1,25 @@ - + + DlgAppearance - - + + 0 0 - 508 + 507 381 - - - 0 - - - - + + + + Startup - - - - + + + + Show splashscreen @@ -29,38 +27,45 @@ - - - + + + Drop Target - - - - - Show drop target + + + + + Enable animations - - - - Enable animations + + + + Enable popup tooltip + + + + + + + Show drop target - - - + + + Transfer List - - - - + + + + Expandable transfer details instead of separate tabs @@ -68,15 +73,15 @@ - + - + Qt::Vertical - + QSizePolicy::Expanding - + 349 70 @@ -86,7 +91,7 @@ - + kcfg_ShowDropTarget @@ -94,11 +99,11 @@ kcfg_AnimateDropTarget setEnabled(bool) - + 20 20 - + 20 20 diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/conf/kget.kcfg /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/conf/kget.kcfg --- kde-nightly-kdenetwork-20091006+svn1032120/kget/conf/kget.kcfg 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/conf/kget.kcfg 2009-10-09 23:33:32.000000000 +0100 @@ -27,6 +27,9 @@ true + + true + false diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/core/datasourcefactory.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/core/datasourcefactory.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/core/datasourcefactory.cpp 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/core/datasourcefactory.cpp 2009-10-09 23:33:32.000000000 +0100 @@ -156,6 +156,15 @@ dir.mkpath(m_dest.directory()); } +void DataSourceFactory::deinit() +{ + if (m_dest.isLocalFile()) + { + KIO::Job *del = KIO::del(m_dest, KIO::HideProgressInfo); + KIO::NetAccess::synchronousRun(del, 0); + } +} + void DataSourceFactory::findFileSize() { kDebug(5001) << "Find the filesize"; @@ -259,15 +268,6 @@ return true; } -void DataSourceFactory::postDeleteEvent() -{ - if (m_dest.isLocalFile()) - { - KIO::Job *del = KIO::del(m_dest, KIO::HideProgressInfo); - KIO::NetAccess::synchronousRun(del, 0); - } -} - void DataSourceFactory::start() { kDebug(5001) << "Start DataSourceFactory"; diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/core/datasourcefactory.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/core/datasourcefactory.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/core/datasourcefactory.h 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/core/datasourcefactory.h 2009-10-09 23:33:32.000000000 +0100 @@ -94,6 +94,8 @@ DataSourceFactory(QObject* parent); ~DataSourceFactory(); + + void deinit(); /** * @return true if the DataSourceFactory has enough information to start a download @@ -180,8 +182,6 @@ */ void setDoDownload(bool doDownload); - void postDeleteEvent(); - bool setNewDestination(const KUrl &newDest); Job::Status status() const; diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/core/job.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/core/job.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/core/job.h 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/core/job.h 2009-10-09 23:33:32.000000000 +0100 @@ -71,8 +71,6 @@ virtual void setDelay(int seconds)=0; virtual void delayTimerEvent()=0; - virtual void postDeleteEvent() {} - JobQueue * jobQueue() {return m_jobQueue;} //Job properties diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/core/kget.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/core/kget.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/core/kget.cpp 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/core/kget.cpp 2009-10-09 23:33:32.000000000 +0100 @@ -165,7 +165,7 @@ } TransferHandler * KGet::addTransfer(KUrl srcUrl, QString destDir, QString suggestedFileName, // krazy:exclude=passbyvalue - const QString& groupName, bool start) + QString groupName, bool start) { // Note: destDir may actually be a full path to a file :-( kDebug(5001) << "Source:" << srcUrl.url() << ", dest: " << destDir << ", sugg file: " << suggestedFileName << endl; @@ -190,15 +190,17 @@ { confirmDestination = true; QList list = groupsFromExceptions(srcUrl); - if (!list.isEmpty()) + if (!list.isEmpty()) { destDir = list.first()->defaultFolder(); + groupName = list.first()->name(); + } + } else { // check whether destDir is actually already the path to a file KUrl targetUrl = KUrl(destDir); QString directory = targetUrl.directory(KUrl::ObeyTrailingSlash); QString fileName = targetUrl.fileName(KUrl::ObeyTrailingSlash); - if (QFileInfo(directory).isDir() && !fileName.isEmpty()) - { + if (QFileInfo(directory).isDir() && !fileName.isEmpty()) { destDir = directory; suggestedFileName = fileName; } @@ -290,7 +292,7 @@ return createTransfer(srcUrl, destUrl, groupName, false, &e); } -const QList KGet::addTransfer(KUrl::List srcUrls, QString destDir, const QString& groupName, bool start) +const QList KGet::addTransfer(KUrl::List srcUrls, QString destDir, QString groupName, bool start) { KUrl::List urlsToDownload; @@ -331,8 +333,10 @@ if (destDir.isEmpty()) { QList list = groupsFromExceptions(*it); - if (!list.isEmpty()) + if (!list.isEmpty()) { destDir = list.first()->defaultFolder(); + groupName = list.first()->name(); + } } destUrl = getValidDestUrl(destDir, *it); @@ -355,11 +359,11 @@ t->stop(); TransferHistoryStore::getStore()->saveItem(TransferHistoryItem(*t)); - //Here I delete the Transfer. The other possibility is to move it to a list - //and to delete all these transfers when kget gets closed. Obviously, after - //the notification to the views that the transfer has been removed, all the - //pointers to it are invalid. - transfer->postDeleteEvent(); + // TransferHandler deinitializations + transfer->destroy(); + // Transfer deinitializations (the deinit function is called by the destroy() function) + t->destroy(); + m_transferTreeModel->delTransfer(t); delete t; return true; @@ -377,12 +381,9 @@ QString src = transfer->source().url(); QString dest = transfer->dest().url(); QString destFile = transfer->dest().fileName(); - bool running = false; - if (transfer->status() == Job::Running) - running = true; KGet::delTransfer(transfer); - KGet::addTransfer(src, dest, destFile, group, running); + KGet::addTransfer(src, dest, destFile, group, true); } QList KGet::selectedTransfers() @@ -800,7 +801,7 @@ if((newTransfer = factory->createTransfer(src, dest, group, m_scheduler, e))) { // kDebug(5001) << "KGet::createTransfer -> CREATING NEW TRANSFER ON GROUP: _" << group->name() << "_"; - newTransfer->init(); + newTransfer->create(); newTransfer->load(e); m_transferTreeModel->addTransfer(newTransfer, group); diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/core/kget.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/core/kget.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/core/kget.h 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/core/kget.h 2009-10-09 23:33:32.000000000 +0100 @@ -123,7 +123,7 @@ * If the group queue is already in a running state, this flag does nothing */ static TransferHandler * addTransfer(KUrl srcUrl, QString destDir = QString(), QString suggestedFileName = QString(), - const QString& groupName = QString(), bool start = false); + QString groupName = QString(), bool start = false); /** * Adds a new transfer to the KGet @@ -144,7 +144,7 @@ * If the group queue is already in a running state, this flag does nothing */ static const QList addTransfer(KUrl::List srcUrls, QString destDir = QString(), - const QString& groupName = QString(), bool start=false); + QString groupName = QString(), bool start=false); /** * Removes a transfer from the KGet diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/core/kiodownload.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/core/kiodownload.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/core/kiodownload.cpp 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/core/kiodownload.cpp 2009-10-09 23:33:32.000000000 +0100 @@ -113,7 +113,7 @@ return true; } -// void KioDownload::postDeleteEvent() +// void KioDownload::deinit() // { // if (status() != Job::Finished)//if the transfer is not finished, we delete the *.part-file // { diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/core/kiodownload.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/core/kiodownload.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/core/kiodownload.h 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/core/kiodownload.h 2009-10-09 23:33:32.000000000 +0100 @@ -42,7 +42,7 @@ bool isResumable() const; -// void postDeleteEvent(); +// void deinit(); Q_SIGNALS: void processedSize(KIO::filesize_t size); diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/core/nepomukhandler.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/core/nepomukhandler.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/core/nepomukhandler.cpp 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/core/nepomukhandler.cpp 2009-10-09 23:33:32.000000000 +0100 @@ -111,7 +111,7 @@ return valid; } -void NepomukHandler::postDeleteEvent() +void NepomukHandler::deinit() { if (!isValid()) { diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/core/nepomukhandler.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/core/nepomukhandler.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/core/nepomukhandler.h 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/core/nepomukhandler.h 2009-10-09 23:33:32.000000000 +0100 @@ -49,10 +49,10 @@ /** * Removes the resource if the isValid() is false - * @note call this method at the end of the postDeleteEvent of the transfer, + * @note call this method at the end of the deinit of the transfer, * otherwise it might not work correctly */ - virtual void postDeleteEvent(); + virtual void deinit(); protected: bool isValid() const; diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/core/transfer.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/core/transfer.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/core/transfer.cpp 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/core/transfer.cpp 2009-10-09 23:33:32.000000000 +0100 @@ -49,18 +49,33 @@ Transfer::~Transfer() { - if(status() == Job::Delayed) - m_scheduler->stopDelayTimer(this); } -void Transfer::init()//TODO think about e, maybe not have it at all in the constructor? +void Transfer::create() { #ifdef HAVE_NEPOMUK if (!m_nepomukHandler) - { m_nepomukHandler = new NepomukHandler(this); - } #endif + + init(); +} + +void Transfer::destroy() +{ + deinit(); + + if(status() == Job::Delayed) + m_scheduler->stopDelayTimer(this); + +#ifdef HAVE_NEPOMUK + nepomukHandler()->deinit(); +#endif //HAVE_NEPOMUK +} + +void Transfer::init()//TODO think about e, maybe not have it at all in the constructor? +{ + } #ifdef HAVE_NEPOMUK diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/core/transfer.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/core/transfer.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/core/transfer.h 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/core/transfer.h 2009-10-09 23:33:32.000000000 +0100 @@ -86,12 +86,33 @@ virtual ~Transfer(); /** - * Call this function after creating a Transfer + * This functions gets called whenever a Transfer gets created. As opposed + * to init(), this isn't a virtual function and is not meant to be used in + * transfer plugins + */ + void create(); + + /** + * This functions gets called whenever a Transfer is going to be deleted. As opposed + * to deinit(), this isn't a virtual function and is not meant to be used in + * transfer plugins + */ + void destroy(); + + /** + * This function is called after the creation of a Transfer + * In transfer plugins you can put here whatever needs to be initialized * @note this function creates a NepomukHandler */ virtual void init(); /** + * This function is called before the deletion of a Transfer + * In transfer plugins you can put here whatever needs to be deinitialized + */ + virtual void deinit() {} + + /** * Tries to repair file * @param file the file of a download that should be repaired, * if not defined all files of a download are going to be repaird diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/core/transferhandler.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/core/transferhandler.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/core/transferhandler.cpp 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/core/transferhandler.cpp 2009-10-09 23:33:32.000000000 +0100 @@ -180,6 +180,16 @@ m_changesFlags = 0; } +void TransferHandler::destroy() +{ + kDebug(5001) << "TransferHandler::destroy() ENTERING"; + + if (m_kjobAdapter) + KGet::unregisterKJob(m_kjobAdapter); + + kDebug(5001) << "TransferHandler::destroy() LEAVING"; +} + void TransferHandler::setTransferChange(ChangesFlags change, bool notifyModel) { m_changesFlags |= change; @@ -203,17 +213,6 @@ } } -void TransferHandler::postDeleteEvent() -{ - kDebug(5001) << "TransferHandler::postDeleteEvent() ENTERING"; - - m_transfer->postDeleteEvent();//First inform the transfer itself - - if (m_kjobAdapter) - KGet::unregisterKJob(m_kjobAdapter); - kDebug(5001) << "TransferHandler::postDeleteEvent() LEAVING"; -} - QList TransferHandler::contextActions() { QList actions; diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/core/transferhandler.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/core/transferhandler.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/core/transferhandler.h 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/core/transferhandler.h 2009-10-09 23:33:32.000000000 +0100 @@ -285,11 +285,13 @@ signals: void transferChangedEvent(TransferHandler * transfer, TransferHandler::ChangesFlags flags); - private slots: - void postDeleteEvent(); - private: /** + * This functions gets called just before the handler is deleted + */ + void destroy(); + + /** * Sets a change flag in the ChangesFlags variable. * * @param change The TransferChange flag to be set diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/core/transfertreemodel.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/core/transfertreemodel.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/core/transfertreemodel.cpp 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/core/transfertreemodel.cpp 2009-10-09 23:33:32.000000000 +0100 @@ -376,6 +376,16 @@ return 0; } +Transfer * TransferTreeModel::findTransferByDBusObjectPath(const QString & dbusObjectPath) +{ + foreach (TransferModelItem * transfer, m_transfers) + { + if (transfer->transferHandler()->dBusObjectPath() == dbusObjectPath) + return transfer->transferHandler()->m_transfer; + } + return 0; +} + void TransferTreeModel::postDataChangedEvent(TransferHandler * transfer) { if(m_timerId == -1) @@ -594,46 +604,41 @@ foreach (TransferHandler * transfer, m_changedTransfers) { - if (!updatedTransfers.contains(transfer)) - { + if (!updatedTransfers.contains(transfer)) { TransferGroupHandler * group = transfer->group(); ModelItem * item = itemFromHandler(group); Transfer::ChangesFlags changesFlags = transfer->changesFlags(); emit transfer->transferChangedEvent(transfer, changesFlags); - + int row = group->indexOf(transfer); - if (changesFlags & Transfer::Tc_FileName) - static_cast(item->child(row, column(Transfer::Tc_FileName)))->emitDataChanged(); - if (changesFlags & Transfer::Tc_Status) - static_cast(item->child(row, column(Transfer::Tc_Status)))->emitDataChanged(); - if (changesFlags & Transfer::Tc_TotalSize) - static_cast(item->child(row, column(Transfer::Tc_TotalSize)))->emitDataChanged(); - if (changesFlags & Transfer::Tc_Percent) - static_cast(item->child(row, column(Transfer::Tc_Percent)))->emitDataChanged(); - if (changesFlags & Transfer::Tc_DownloadSpeed) - static_cast(item->child(row, column(Transfer::Tc_DownloadSpeed)))->emitDataChanged(); - if (changesFlags & Transfer::Tc_RemainingTime) - static_cast(item->child(row, column(Transfer::Tc_RemainingTime)))->emitDataChanged(); + kDebug(5001) << "CHILD = " << item->child(row, column(Transfer::Tc_FileName)); - /*for(int i=0; i<8; i++)//Check the 8 most right bits of the flag - { - if (((changesFlags >> i) & 0x00000001))//remove the ith bit(s) from the right and check if the rest is 0x00000001... - { - QStandardItem *transferItem = item->child(group->indexOf(transfer), i); - dynamic_cast(transferItem)->emitDataChanged(); - //QModelIndex index = createIndex(group->indexOf(transfer), i, transfer); - //emit dataChanged(index,index); - } - }*/ - - transfer->resetChangesFlags(); - updatedTransfers.insert(transfer, changesFlags); + // Now, check that model child items already exist (there are some cases when the transfer + // can notify for changes before the gui has been correctly initialized) + if(item->child(row, 0)) { + if (changesFlags & Transfer::Tc_FileName) + static_cast(item->child(row, column(Transfer::Tc_FileName)))->emitDataChanged(); + if (changesFlags & Transfer::Tc_Status) + static_cast(item->child(row, column(Transfer::Tc_Status)))->emitDataChanged(); + if (changesFlags & Transfer::Tc_TotalSize) + static_cast(item->child(row, column(Transfer::Tc_TotalSize)))->emitDataChanged(); + if (changesFlags & Transfer::Tc_Percent) + static_cast(item->child(row, column(Transfer::Tc_Percent)))->emitDataChanged(); + if (changesFlags & Transfer::Tc_DownloadSpeed) + static_cast(item->child(row, column(Transfer::Tc_DownloadSpeed)))->emitDataChanged(); + if (changesFlags & Transfer::Tc_RemainingTime) + static_cast(item->child(row, column(Transfer::Tc_RemainingTime)))->emitDataChanged(); + + transfer->resetChangesFlags(); + updatedTransfers.insert(transfer,changesFlags); + } } } - emit transfersChangedEvent(updatedTransfers); + if(!updatedTransfers.isEmpty()) + emit transfersChangedEvent(updatedTransfers); foreach(TransferGroupHandler * group, m_changedGroups) { @@ -672,7 +677,8 @@ } } - emit groupsChangedEvent(updatedGroups); + if(!updatedGroups.isEmpty()) + emit groupsChangedEvent(updatedGroups); m_changedTransfers.clear(); m_changedGroups.clear(); diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/core/transfertreemodel.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/core/transfertreemodel.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/core/transfertreemodel.h 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/core/transfertreemodel.h 2009-10-09 23:33:32.000000000 +0100 @@ -117,7 +117,8 @@ TransferGroup * findGroup(const QString & groupName); Transfer * findTransfer(const KUrl &src); - Transfer *findTransferByDestination(const KUrl &dest); + Transfer * findTransferByDestination(const KUrl &dest); + Transfer * findTransferByDBusObjectPath(const QString & dbusObjectPath); void postDataChangedEvent(TransferHandler * transfer); void postDataChangedEvent(TransferGroupHandler * group); diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/mainwindow.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/mainwindow.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/mainwindow.cpp 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/mainwindow.cpp 2009-10-09 23:33:34.000000000 +0100 @@ -54,6 +54,7 @@ #include #include #include +#include #include #include @@ -231,13 +232,13 @@ // Transfer related actions KAction *deleteSelectedAction = actionCollection()->addAction("delete_selected_download"); - deleteSelectedAction->setText(i18nc("delete selected transfer item", "Delete Selected")); + deleteSelectedAction->setText(i18nc("delete selected transfer item", "Remove Selected")); deleteSelectedAction->setIcon(KIcon("edit-delete")); deleteSelectedAction->setShortcuts(KShortcut("Del")); connect(deleteSelectedAction, SIGNAL(triggered()), SLOT(slotDeleteSelected())); KAction *deleteAllFinishedAction = actionCollection()->addAction("delete_all_finished"); - deleteAllFinishedAction->setText(i18nc("delete all finished transfers", "Delete All Finished")); + deleteAllFinishedAction->setText(i18nc("delete all finished transfers", "Remove All Finished")); deleteAllFinishedAction->setIcon(KIcon("edit-clear-list")); connect(deleteAllFinishedAction, SIGNAL(triggered()), SLOT(slotDeleteFinished())); @@ -284,6 +285,14 @@ stopActionMenu->addAction(stopSelectedAction); connect(stopActionMenu, SIGNAL(triggered()), SLOT(slotStopDownload())); + KActionMenu *deleteActionMenu = new KActionMenu(KIcon("edit-delete"), i18n("Remove"), + actionCollection()); + actionCollection()->addAction("delete_menu", deleteActionMenu); + deleteActionMenu->setDelayed(true); + deleteActionMenu->addAction(deleteSelectedAction); + deleteActionMenu->addAction(deleteAllFinishedAction); + connect(deleteActionMenu, SIGNAL(triggered()), SLOT(slotDeleteSelected())); + KAction *openDestAction = actionCollection()->addAction("transfer_open_dest"); openDestAction->setText(i18n("Open Destination")); openDestAction->setIcon(KIcon("document-open")); @@ -462,15 +471,34 @@ void MainWindow::slotTransfersChanged(QMap transfers) { - bool update = false; - foreach (Transfer::ChangesFlags transferFlags, transfers) - { - if (transferFlags & Transfer::Tc_Percent || transferFlags & Transfer::Tc_Status) - { + QMapIterator it(transfers); + + //QList finishedTransfers; + bool update = false; + + while (it.hasNext()) { + it.next(); + + TransferHandler * transfer = it.key(); + Transfer::ChangesFlags transferFlags = it.value(); + + if ( (KWindowSystem::activeWindow() != winId()) && (transferFlags & Transfer::Tc_Status) + && (transfer->status() == Job::Finished) && (transfer->startStatus() != Job::Finished)) { + KNotification::event(KNotification::Notification, + i18n("Downloads completed"), + i18n("

The following file has finished downloading:

\ + %1

", transfer->source().fileName()), + KIcon("kget").pixmap(KIconLoader::SizeMedium), this); + } + + if (transferFlags & Transfer::Tc_Percent || transferFlags & Transfer::Tc_Status) { update = true; break; } + + kDebug(5001) << it.key() << ": " << it.value() << endl; } + if (update) slotUpdateTitlePercent(); } @@ -992,6 +1020,16 @@ return dBusPaths; } +bool MainWindow::delTransfer(const QString& dbusObjectPath) +{ + kDebug(5001) << "deleting Transfer"; + + Transfer * transfer = KGet::model()->findTransferByDBusObjectPath(dbusObjectPath); + + if(transfer) + return KGet::delTransfer(transfer->handler()); +} + void MainWindow::showNewTransferDialog(const QStringList &urls) { NewTransferDialog::showNewTransferDialog(urls, this); diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/mainwindow.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/mainwindow.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/mainwindow.h 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/mainwindow.h 2009-10-09 23:33:32.000000000 +0100 @@ -43,6 +43,7 @@ // from the DBUS interface virtual QStringList addTransfer(const QString& src, const QString& destDir = QString(), bool start = false); + virtual bool delTransfer(const QString& dbusObjectPath); virtual void showNewTransferDialog(const QStringList &urls); virtual bool dropTargetVisible() const; virtual void setDropTargetVisible( bool setVisible ); diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/org.kde.kget.main.xml /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/org.kde.kget.main.xml --- kde-nightly-kdenetwork-20091006+svn1032120/kget/org.kde.kget.main.xml 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/org.kde.kget.main.xml 2009-10-09 23:33:34.000000000 +0100 @@ -20,6 +20,10 @@ + + + + diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/plasma/applet/barapplet/kgetbarapplet-default.desktop /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/plasma/applet/barapplet/kgetbarapplet-default.desktop --- kde-nightly-kdenetwork-20091006+svn1032120/kget/plasma/applet/barapplet/kgetbarapplet-default.desktop 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/plasma/applet/barapplet/kgetbarapplet-default.desktop 2009-10-09 23:33:33.000000000 +0100 @@ -12,6 +12,7 @@ Name[gl]=Applet de diagrama de barras de KGet Name[hr]=Applet za stupčasti dijagram za KGet Name[km]=អាប់ភ្លេត​គំនូស​តាង​របស់ KGet +Name[ko]=KGet 막대 그래프 애플릿 Name[lv]=KGet stabiņu tabulas sīkrīks Name[nb]=Miniprogram for KGet-stolpediagram Name[nds]=KGet-Balkengrafik-Lüttprogramm diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/plasma/applet/panelbar/kgetpanelbarapplet-default.desktop /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/plasma/applet/panelbar/kgetpanelbarapplet-default.desktop --- kde-nightly-kdenetwork-20091006+svn1032120/kget/plasma/applet/panelbar/kgetpanelbarapplet-default.desktop 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/plasma/applet/panelbar/kgetpanelbarapplet-default.desktop 2009-10-09 23:33:33.000000000 +0100 @@ -12,6 +12,7 @@ Name[gl]=Applet de panel de KGet Name[hr]=Applet za panelnu traku za KGet Name[km]=អាប់ភ្លេត​របារ​បន្ទះ​របស់ KGet +Name[ko]=KGet 패널 막대 애플릿 Name[lv]=KGet paneļa sīkrīks Name[nb]=Miniprogram for KGet-panelstolpe Name[nds]=KGet-Paneelbalken-Lüttprogramm diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/plasma/applet/piechart/kgetpiechartapplet-default.desktop /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/plasma/applet/piechart/kgetpiechartapplet-default.desktop --- kde-nightly-kdenetwork-20091006+svn1032120/kget/plasma/applet/piechart/kgetpiechartapplet-default.desktop 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/plasma/applet/piechart/kgetpiechartapplet-default.desktop 2009-10-09 23:33:33.000000000 +0100 @@ -12,6 +12,7 @@ Name[gl]=Applet de diagrama de sectores de KGet Name[hr]=Applet za tortni dijagram za KGet Name[km]=អាប់ភ្លេត​គំនូស​តាង​ចំណិច​របស់ KGet +Name[ko]=KGet 원 그래프 애플릿 Name[lv]=KGet rinķa grafika sīkrīks Name[nb]=Miniprogram for KGet-kakediagram Name[nds]=KGet-Kokengrafik-Lüttprogramm diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/plasma/runner/plasma-runner-kget.desktop /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/plasma/runner/plasma-runner-kget.desktop --- kde-nightly-kdenetwork-20091006+svn1032120/kget/plasma/runner/plasma-runner-kget.desktop 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/plasma/runner/plasma-runner-kget.desktop 2009-10-09 23:33:33.000000000 +0100 @@ -65,6 +65,8 @@ Name[zh_HK]=KGet Name[zh_TW]=KGet Comment=Download links with KGet +Comment[gl]=Obter ligazóns co KGet +Comment[ko]=KGet으로 링크 다운로드 Comment[nb]=Last ned lenker med KGet Comment[nl]=Koppelingen met KGet downloaden Comment[pt]=Obter as ligações com o KGet diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/bittorrent/btdetailswidget.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/bittorrent/btdetailswidget.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/bittorrent/btdetailswidget.cpp 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/bittorrent/btdetailswidget.cpp 2009-10-09 23:33:33.000000000 +0100 @@ -21,8 +21,8 @@ setupUi(this); // Update the view with the correct values - srcEdit->setText(transfer->source().url()); - destEdit->setText(transfer->dest().url()); + srcEdit->setText(transfer->source().prettyUrl()); + destEdit->setText(transfer->dest().prettyUrl()); seederLabel->setText(i18nc("not available", "n/a")); leecherLabel->setText(i18nc("not available", "n/a")); diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/bittorrent/btnepomukhandler.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/bittorrent/btnepomukhandler.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/bittorrent/btnepomukhandler.cpp 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/bittorrent/btnepomukhandler.cpp 2009-10-09 23:33:33.000000000 +0100 @@ -25,7 +25,7 @@ #include #include #include -//TODO postDeleteEvent +//TODO deinit BtNepomukHandler::BtNepomukHandler(Transfer *transfer) : NepomukHandler(transfer), m_tempResource(Nepomuk::Resource("KGet::Transfer::" + m_transfer->source().url())) @@ -172,7 +172,7 @@ //NOTE do something here? } -void BtNepomukHandler::postDeleteEvent() +void BtNepomukHandler::deinit() { m_tempResource.remove(); diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/bittorrent/btnepomukhandler.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/bittorrent/btnepomukhandler.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/bittorrent/btnepomukhandler.h 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/bittorrent/btnepomukhandler.h 2009-10-09 23:33:33.000000000 +0100 @@ -53,7 +53,7 @@ void addTags(const QStringList &newTags); void removeTag(const QString &oldTag); void saveFileProperties(); - void postDeleteEvent(); + void deinit(); private: QList m_newDestinations; diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/bittorrent/bttransfer.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/bittorrent/bttransfer.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/bittorrent/bttransfer.cpp 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/bittorrent/bttransfer.cpp 2009-10-09 23:33:33.000000000 +0100 @@ -88,6 +88,26 @@ Transfer::init(); } +void BTTransfer::deinit() +{ + QDir tmpDir(m_tmp); + kDebug(5001) << m_tmp + m_source.fileName().remove(".torrent"); + tmpDir.rmdir(m_source.fileName().remove(".torrent") + "/dnd"); + tmpDir.cd(m_source.fileName().remove(".torrent")); + QStringList list = tmpDir.entryList(); + + foreach (const QString &file, list) + { + tmpDir.remove(file); + } + tmpDir.cdUp(); + tmpDir.rmdir(m_source.fileName().remove(".torrent")); + + kDebug(5001) << m_source.url(); + QFile torrentFile(m_source.path()); + torrentFile.remove(); +} + /** Reimplemented functions from Transfer-Class **/ bool BTTransfer::isResumable() const { @@ -191,30 +211,6 @@ timer.stop(); } -void BTTransfer::postDeleteEvent() -{ - QDir tmpDir(m_tmp); - kDebug(5001) << m_tmp + m_source.fileName().remove(".torrent"); - tmpDir.rmdir(m_source.fileName().remove(".torrent") + "/dnd"); - tmpDir.cd(m_source.fileName().remove(".torrent")); - QStringList list = tmpDir.entryList(); - - foreach (const QString &file, list) - { - tmpDir.remove(file); - } - tmpDir.cdUp(); - tmpDir.rmdir(m_source.fileName().remove(".torrent")); - - kDebug(5001) << m_source.url(); - QFile torrentFile(m_source.path()); - torrentFile.remove(); - -#ifdef HAVE_NEPOMUK - m_nepHandler->postDeleteEvent(); -#endif //HAVE_NEPOMUK -} - /**void BTTransfer::load(const QDomElement &e) { kDebug(5001); diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/bittorrent/bttransfer.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/bittorrent/bttransfer.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/bittorrent/bttransfer.h 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/bittorrent/bttransfer.h 2009-10-09 23:33:33.000000000 +0100 @@ -59,15 +59,17 @@ const QDomElement * e = 0); ~BTTransfer(); - //Job virtual functions + virtual void init(); + void deinit(); + + //Job virtual functions void start(); void stop(); virtual int elapsedTime() const; virtual int remainingTime() const; bool isResumable() const; bool supportsSpeedLimits() const {return true;} - void postDeleteEvent(); /** * @returns the directory the Transfer will be stored to diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/bittorrent/bttransferhandler.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/bittorrent/bttransferhandler.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/bittorrent/bttransferhandler.cpp 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/bittorrent/bttransferhandler.cpp 2009-10-09 23:33:33.000000000 +0100 @@ -27,6 +27,12 @@ scanDlg = 0; } +BTTransferHandler::~BTTransferHandler() +{ + if(advancedDetails) + delete(advancedDetails); +} + void BTTransferHandler::createAdvancedDetails() { kDebug(5001); diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/bittorrent/bttransferhandler.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/bittorrent/bttransferhandler.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/bittorrent/bttransferhandler.h 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/bittorrent/bttransferhandler.h 2009-10-09 23:33:33.000000000 +0100 @@ -30,6 +30,7 @@ Q_OBJECT public: BTTransferHandler(BTTransfer * transfer, Scheduler * scheduler); + virtual ~BTTransferHandler(); int chunksTotal() const {return m_transfer->chunksTotal();} int chunksDownloaded() const {return m_transfer->chunksDownloaded();} diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/checksumsearch/kget_checksumsearchfactory_config.desktop /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/checksumsearch/kget_checksumsearchfactory_config.desktop --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/checksumsearch/kget_checksumsearchfactory_config.desktop 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/checksumsearch/kget_checksumsearchfactory_config.desktop 2009-10-09 23:33:33.000000000 +0100 @@ -8,6 +8,7 @@ Name=ChecksumSearch Name[et]=Kontrollsumma otsing Name[gl]=Procura de suma de comprobación +Name[ko]=ChecksumSearch Name[nb]=Sjekksumsøk Name[nds]=Pröövsumm-Söök Name[nl]=ChecksumSearch diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/checksumsearch/kget_checksumsearchfactory.desktop /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/checksumsearch/kget_checksumsearchfactory.desktop --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/checksumsearch/kget_checksumsearchfactory.desktop 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/checksumsearch/kget_checksumsearchfactory.desktop 2009-10-09 23:33:33.000000000 +0100 @@ -8,6 +8,7 @@ Name=Checksum Search Name[et]=Kontrollsumma otsing Name[gl]=Procura de suma de comprobación +Name[ko]=체크섬 검색 Name[nb]=Sjekksum-søk Name[nds]=Pröövsumm-Söök Name[nl]=Controlesom zoeken @@ -23,6 +24,7 @@ Comment=Tries to find checksums for a specified url Comment[et]=Kontrollsumma otsimine määratud URL-ilt Comment[gl]=Tenta atopar sumas de comprobación para un url que se especifique +Comment[ko]=지정한 URL의 체크섬을 검색합니다 Comment[nb]=Forsøker å finne sjekksummer for en gitt URL Comment[nds]=Söcht na en Pröövsumm för en angeven URL Comment[nl]=Probeert controlesommen voor een gespecificeerde URL te vinden diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/contentfetch/contentfetch.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/contentfetch/contentfetch.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/contentfetch/contentfetch.cpp 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/contentfetch/contentfetch.cpp 2009-10-09 23:33:34.000000000 +0100 @@ -41,6 +41,11 @@ connect(m_p_script, SIGNAL(textStatusUpdated(const QString&)), this, SLOT(slotSetTextStatus(const QString&))); } +void ContentFetch::deinit() +{ + return; +} + void ContentFetch::start() { kDebug(5001) << "ContentFetch::start"; @@ -104,11 +109,6 @@ return false; } -void ContentFetch::postDeleteEvent() -{ - return; -} - void ContentFetch::setPercent(int percent) { m_percent = percent; diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/contentfetch/contentfetch.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/contentfetch/contentfetch.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/contentfetch/contentfetch.h 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/contentfetch/contentfetch.h 2009-10-09 23:33:34.000000000 +0100 @@ -27,12 +27,13 @@ const QDomElement * e = 0); public slots: + void deinit(); + // --- Job virtual functions --- void start(); void stop(); bool isResumable() const; - void postDeleteEvent(); void setPercent(int percent); diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/kio/transferKio.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/kio/transferKio.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/kio/transferKio.cpp 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/kio/transferKio.cpp 2009-10-09 23:33:33.000000000 +0100 @@ -123,16 +123,13 @@ return true; } -void TransferKio::postDeleteEvent() +void TransferKio::deinit() { if (status() != Job::Finished)//if the transfer is not finished, we delete the *.part-file { KIO::Job *del = KIO::del(m_dest.path() + ".part", KIO::HideProgressInfo); KIO::NetAccess::synchronousRun(del, 0); }//TODO: Ask the user if he/she wants to delete the *.part-file? To discuss (boom1992) -#ifdef HAVE_NEPOMUK - nepomukHandler()->postDeleteEvent(); -#endif //HAVE_NEPOMUK } //NOTE: INTERNAL METHODS diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/kio/transferKio.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/kio/transferKio.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/kio/transferKio.h 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/kio/transferKio.h 2009-10-09 23:33:33.000000000 +0100 @@ -51,7 +51,7 @@ void stop(); bool isResumable() const; - void postDeleteEvent(); + void deinit(); private: void createJob(); diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/metalink/metalink.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/metalink/metalink.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/metalink/metalink.cpp 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/metalink/metalink.cpp 2009-10-09 23:33:33.000000000 +0100 @@ -275,13 +275,13 @@ } } -void Metalink::postDeleteEvent() +void Metalink::deinit() { if (status() != Job::Finished)//if the transfer is not finished, we delete the written files { foreach (DataSourceFactory *factory, m_dataSourceFactory) { - factory->postDeleteEvent(); + factory->deinit(); } }//TODO: Ask the user if he/she wants to delete the *.part-file? To discuss (boom1992) else @@ -291,7 +291,7 @@ { if (!factory->doDownload()) { - factory->postDeleteEvent(); + factory->deinit(); } } } @@ -303,7 +303,7 @@ } #ifdef HAVE_NEPOMUK - m_nepHandler->postDeleteEvent(); + m_nepHandler->deinit(); #endif //HAVE_NEPOMUK } diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/metalink/metalink.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/metalink/metalink.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/metalink/metalink.h 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/metalink/metalink.h 2009-10-09 23:33:33.000000000 +0100 @@ -69,7 +69,7 @@ void start(); void stop(); - void postDeleteEvent(); + void deinit(); bool isResumable() const; diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/metalink/metanepomukhandler.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/metalink/metanepomukhandler.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/metalink/metanepomukhandler.cpp 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/metalink/metanepomukhandler.cpp 2009-10-09 23:33:33.000000000 +0100 @@ -192,7 +192,7 @@ } -void MetaNepomukHandler::postDeleteEvent() +void MetaNepomukHandler::deinit() { m_tempResource.remove(); diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/metalink/metanepomukhandler.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/metalink/metanepomukhandler.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/metalink/metanepomukhandler.h 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/metalink/metanepomukhandler.h 2009-10-09 23:33:33.000000000 +0100 @@ -62,7 +62,7 @@ void addTags(const QStringList &newTags); void removeTag(const QString &oldTag); void setProperty(const QUrl &uri, const Nepomuk::Variant &value); - void postDeleteEvent(); + void deinit(); void saveFileProperties(); private: diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/mms/mmsTransfer.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/mms/mmsTransfer.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/mms/mmsTransfer.cpp 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/mms/mmsTransfer.cpp 2009-10-09 23:33:33.000000000 +0100 @@ -59,7 +59,7 @@ return true; } -void MmsTransfer::postDeleteEvent() +void MmsTransfer::deinit() { /**if (status() != Job::Finished)//if the transfer is not finished, we delete the *.part-file { diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/mms/mmsTransfer.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/mms/mmsTransfer.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/mms/mmsTransfer.h 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/mms/mmsTransfer.h 2009-10-09 23:33:33.000000000 +0100 @@ -39,7 +39,7 @@ void stop(); bool isResumable() const; - void postDeleteEvent(); + void deinit(); private slots: void read(); diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/multisegmentkio/transfermultisegkio.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/multisegmentkio/transfermultisegkio.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/multisegmentkio/transfermultisegkio.cpp 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/multisegmentkio/transfermultisegkio.cpp 2009-10-09 23:33:33.000000000 +0100 @@ -61,6 +61,14 @@ } } +void TransferMultiSegKio::deinit() +{ + if (status() != Job::Finished)//if the transfer is not finished, we delete the *.part-file + { + m_dataSourceFactory->deinit(); + }//TODO: Ask the user if he/she wants to delete the *.part-file? To discuss (boom1992) +} + void TransferMultiSegKio::start() { kDebug(5001) << "Start TransferMultiSegKio"; @@ -169,17 +177,6 @@ return false; } -void TransferMultiSegKio::postDeleteEvent() -{ - if (status() != Job::Finished)//if the transfer is not finished, we delete the *.part-file - { - m_dataSourceFactory->postDeleteEvent(); - }//TODO: Ask the user if he/she wants to delete the *.part-file? To discuss (boom1992) -#ifdef HAVE_NEPOMUK - nepomukHandler()->postDeleteEvent(); -#endif //HAVE_NEPOMU -} - void TransferMultiSegKio::load(const QDomElement *element) { kDebug(5001); diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/multisegmentkio/transfermultisegkio.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/multisegmentkio/transfermultisegkio.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/transfer-plugins/multisegmentkio/transfermultisegkio.h 2009-10-06 23:29:15.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/transfer-plugins/multisegmentkio/transfermultisegkio.h 2009-10-09 23:33:33.000000000 +0100 @@ -44,6 +44,7 @@ virtual bool setDirectory(const KUrl &newDirectory); void init(); + void deinit(); QHash > availableMirrors(const KUrl &file) const; void setAvailableMirrors(const KUrl &file, const QHash > &mirrors); @@ -63,7 +64,6 @@ void stop(); bool isResumable() const; - void postDeleteEvent(); void save(const QDomElement &element); void load(const QDomElement *e); diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/ui/droptarget.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/ui/droptarget.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/ui/droptarget.cpp 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/ui/droptarget.cpp 2009-10-09 23:33:32.000000000 +0100 @@ -106,11 +106,15 @@ } animTimer = new QTimer(this); + popupTimer = new QTimer(this); setMouseTracking(true); connect(KGet::model(), SIGNAL(transfersChangedEvent(QMap)), this, SLOT(slotToolTipUpdate())); + + connect(popupTimer, SIGNAL(timeout()), + this, SLOT(slotToolTipTimer())); } @@ -306,8 +310,16 @@ move( QCursor::pos().x() - dx, QCursor::pos().y() - dy ); e->accept(); } - if (isVisible() && mask().contains(mapFromGlobal(QCursor::pos()))) - QToolTip::showText(QCursor::pos(),tooltipText,this,rect()); +} + +void DropTarget::enterEvent(QEvent * event) +{ + popupTimer->start(2000); +} + +void DropTarget::leaveEvent(QEvent * event) +{ + popupTimer->stop(); } void DropTarget::paintEvent( QPaintEvent * ) @@ -332,6 +344,10 @@ bool nextState = parentWidget->isHidden(); Settings::setShowMain( nextState ); parentWidget->setVisible( nextState ); + if(nextState) + { + KWindowSystem::activateWindow(static_cast(parentWidget)->winId()); + } } /** widget animations */ @@ -425,7 +441,11 @@ tooltipText = dataList.join("\n"); else tooltipText = i18n("Ready"); - if (isVisible() && mask().contains(mapFromGlobal(QCursor::pos()))) +} + +void DropTarget::slotToolTipTimer() +{ + if (Settings::enablePopupTooltip() && !popupMenu->isVisible() && isVisible() && mask().contains(mapFromGlobal(QCursor::pos()))) QToolTip::showText(QCursor::pos(),tooltipText,this,rect()); } diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/ui/droptarget.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/ui/droptarget.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/ui/droptarget.h 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/ui/droptarget.h 2009-10-09 23:33:32.000000000 +0100 @@ -54,6 +54,8 @@ void mouseReleaseEvent(QMouseEvent * e); void mouseDoubleClickEvent(QMouseEvent * e); void mouseMoveEvent(QMouseEvent * e); + void enterEvent(QEvent * event); + void leaveEvent(QEvent * event); // paint the drop target void paintEvent(QPaintEvent*); @@ -66,12 +68,14 @@ void slotAnimateHide(); void slotAnimateSync(); void slotToolTipUpdate(); + void slotToolTipTimer(); void slotClose(); private: KMenu * popupMenu; MainWindow * parentWidget; QTimer * animTimer; + QTimer * popupTimer; QPixmap cachedPixmap; QAction * pop_sticky; diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/ui/kgetui.rc /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/ui/kgetui.rc --- kde-nightly-kdenetwork-20091006+svn1032120/kget/ui/kgetui.rc 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/ui/kgetui.rc 2009-10-09 23:33:32.000000000 +0100 @@ -17,8 +17,10 @@ &Downloads + + @@ -36,6 +38,6 @@ - + diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/ui/transfersview.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/ui/transfersview.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/ui/transfersview.cpp 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/ui/transfersview.cpp 2009-10-09 23:33:32.000000000 +0100 @@ -11,7 +11,9 @@ #include "transfersview.h" #include "settings.h" #include "transfersviewdelegate.h" +#include "transferdetails.h" #include "core/transfertreemodel.h" +#include "core/kget.h" #include #include @@ -21,11 +23,14 @@ #include #include #include +#include +#include TransfersView::TransfersView(QWidget * parent) : QTreeView(parent), m_headerMenu(0) { +// setItemsExpandable(false); setRootIsDecorated(false); setAnimated(true); setAllColumnsShowFocus(true); @@ -45,6 +50,11 @@ populateHeaderActions(); connect(header(), SIGNAL(customContextMenuRequested(const QPoint &)), SLOT(slotShowHeaderMenu(const QPoint &))); + connect(this, SIGNAL(doubleClicked(const QModelIndex &)), + this, SLOT(slotItemActivated(const QModelIndex &))); + connect(KGet::model(), SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), + this, SLOT(closeExpandableDetails(QModelIndex,int,int))); + } TransfersView::~TransfersView() @@ -155,12 +165,47 @@ void TransfersView::dragMoveEvent ( QDragMoveEvent * event ) { Q_UNUSED(event); - TransfersViewDelegate *view_delegate = static_cast (itemDelegate()); - view_delegate->closeExpandableDetails(); + closeExpandableDetails(); QTreeView::dragMoveEvent(event); } +void TransfersView::slotItemActivated(const QModelIndex & index) +{ + if (!index.isValid()) + return; + + TransferTreeModel * transferTreeModel = KGet::model(); + ModelItem * item = transferTreeModel->itemFromIndex(index); + TransfersViewDelegate *view_delegate = static_cast (itemDelegate()); + + if(!item) + return; + + if(!item->isGroup() && Settings::showExpandableTransferDetails() && index.column() == 0) { + if(!view_delegate->isExtended(index)) { + TransferHandler *handler = item->asTransfer()->transferHandler(); + QWidget *widget = getDetailsWidgetForTransfer(handler); + + m_editingIndexes.append(index); + view_delegate->extendItem(widget, index); + } + else { + m_editingIndexes.removeAll(index); + view_delegate->contractItem(index); + } + } + else if(item->isGroup() && isExpanded(index)) { + TransferGroupHandler * groupHandler = item->asGroup()->groupHandler(); + QList transfers = groupHandler->transfers(); + + foreach(TransferHandler * transfer, transfers) { + kDebug(5001) << "Transfer = " << transfer->source().prettyUrl(); + view_delegate->contractItem(KGet::model()->itemFromTransferHandler(transfer)->index()); + } + } +} + void TransfersView::toggleMainGroup() { // show or hide the first group header if there's only one download group @@ -180,8 +225,8 @@ Q_UNUSED(parent); Q_UNUSED(start); Q_UNUSED(end); - TransfersViewDelegate *view_delegate = static_cast (itemDelegate()); - view_delegate->closeExpandableDetails(currentIndex()); + + closeExpandableDetails(currentIndex()); } void TransfersView::slotSetColumnVisible(int column) @@ -206,4 +251,42 @@ m_headerMenu->popup(header()->mapToGlobal(point)); } +void TransfersView::closeExpandableDetails(const QModelIndex &transferIndex) +{ + TransfersViewDelegate *view_delegate = static_cast (itemDelegate()); + + if(transferIndex.isValid()) { + view_delegate->contractItem(transferIndex); + m_editingIndexes.removeAll(transferIndex); + } + else { + view_delegate->contractAll(); + m_editingIndexes.clear(); + } +} + +void TransfersView::closeExpandableDetails(const QModelIndex &parent, int rowStart, int rowEnd) +{ + Q_UNUSED(parent) + Q_UNUSED(rowStart) + Q_UNUSED(rowEnd) + + TransfersViewDelegate *view_delegate = static_cast (itemDelegate()); + + view_delegate->contractAll(); + m_editingIndexes.clear(); +} + +QWidget *TransfersView::getDetailsWidgetForTransfer(TransferHandler *handler) +{ + QGroupBox *groupBox = new QGroupBox(i18n("Transfer Details")); + + QVBoxLayout *layout = new QVBoxLayout(groupBox); + QWidget *detailsWidget = TransferDetails::detailsWidget(handler); + layout->addWidget(detailsWidget); + + return groupBox; +} + + #include "transfersview.moc" diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/ui/transfersviewdelegate.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/ui/transfersviewdelegate.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/ui/transfersviewdelegate.cpp 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/ui/transfersviewdelegate.cpp 2009-10-09 23:33:32.000000000 +0100 @@ -276,8 +276,6 @@ Q_ASSERT(qobject_cast(parent)); setExtendPixmap(SmallIcon("arrow-right")); setContractPixmap(SmallIcon("arrow-down")); - connect(parent, SIGNAL(activated(QModelIndex)), this, SLOT(itemActivated(QModelIndex))); - connect(KGet::model(), SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), this, SLOT(closeExpandableDetails(QModelIndex,int,int))); } void TransfersViewDelegate::paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const @@ -475,63 +473,4 @@ groupHandler->stop(); } -void TransfersViewDelegate::closeExpandableDetails(const QModelIndex &transferIndex) -{ - if(transferIndex.isValid()) { - contractItem(transferIndex); - m_editingIndexes.removeAll(transferIndex); - } - else { - contractAll(); - m_editingIndexes.clear(); - } -} - -void TransfersViewDelegate::closeExpandableDetails(const QModelIndex &parent, int rowStart, int rowEnd) -{ - Q_UNUSED(parent) - Q_UNUSED(rowStart) - Q_UNUSED(rowEnd) - - contractAll(); - m_editingIndexes.clear(); -} - -QWidget *TransfersViewDelegate::getDetailsWidgetForTransfer(TransferHandler *handler) -{ - QGroupBox *groupBox = new QGroupBox(i18n("Transfer Details")); - - QVBoxLayout *layout = new QVBoxLayout(groupBox); - QWidget *detailsWidget = TransferDetails::detailsWidget(handler); - layout->addWidget(detailsWidget); - - return groupBox; -} - -void TransfersViewDelegate::itemActivated(const QModelIndex &index) -{ - if (!index.isValid()) - { - return; - } - - TransferTreeModel * transferTreeModel = KGet::model(); - - ModelItem * item = transferTreeModel->itemFromIndex(index); - - if(item && !item->isGroup() && Settings::showExpandableTransferDetails() && index.column() == 0) { - if(!isExtended(index)) { - TransferHandler *handler = item->asTransfer()->transferHandler(); - QWidget *widget = getDetailsWidgetForTransfer(handler); - - m_editingIndexes.append(index); - extendItem(widget, index); - } - else { - m_editingIndexes.removeAll(index); - contractItem(index); - } - } -} - #include "transfersviewdelegate.moc" diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/ui/transfersviewdelegate.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/ui/transfersviewdelegate.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/ui/transfersviewdelegate.h 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/ui/transfersviewdelegate.h 2009-10-09 23:33:32.000000000 +0100 @@ -94,16 +94,6 @@ void setEditorData(QWidget * editor, const QModelIndex & index) const; void setModelData(QWidget * editor, QAbstractItemModel * model, const QModelIndex & index) const; - - public slots: - void closeExpandableDetails(const QModelIndex &index = QModelIndex()); - void closeExpandableDetails(const QModelIndex &parent, int rowStart, int rowEnd); - void itemActivated(const QModelIndex &index); - - private: - QWidget *getDetailsWidgetForTransfer(TransferHandler *handler); - - QList m_editingIndexes; }; #endif diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/ui/transfersview.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/ui/transfersview.h --- kde-nightly-kdenetwork-20091006+svn1032120/kget/ui/transfersview.h 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/ui/transfersview.h 2009-10-09 23:33:32.000000000 +0100 @@ -35,12 +35,20 @@ void dragMoveEvent ( QDragMoveEvent * event ); void rowsAboutToBeRemoved(const QModelIndex & parent, int start, int end); + public slots: + void closeExpandableDetails(const QModelIndex &index = QModelIndex()); + void closeExpandableDetails(const QModelIndex &parent, int rowStart, int rowEnd); + void slotItemActivated(const QModelIndex & index); + private slots: void toggleMainGroup();// show or hide the first group header if there's only one download group void slotSetColumnVisible(int column); void slotShowHeaderMenu(const QPoint &point); private: + QWidget *getDetailsWidgetForTransfer(TransferHandler *handler); + + QList m_editingIndexes; KMenu *m_headerMenu; }; diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kget/ui/viewscontainer.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kget/ui/viewscontainer.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kget/ui/viewscontainer.cpp 2009-10-06 23:29:14.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kget/ui/viewscontainer.cpp 2009-10-09 23:33:32.000000000 +0100 @@ -246,7 +246,7 @@ showDownloadsWindow(); } else { - m_transfersViewDelegate->closeExpandableDetails(); + m_transfersView->closeExpandableDetails(); } } @@ -254,7 +254,7 @@ { if(Settings::showExpandableTransferDetails()) { TransferTreeModel * model = KGet::model(); - m_transfersViewDelegate->itemActivated(model->itemFromHandler(transfer)->index()); + m_transfersView->slotItemActivated(model->itemFromHandler(transfer)->index()); } else { //First check if we already inserted this widget @@ -283,7 +283,7 @@ { if(Settings::showExpandableTransferDetails()) { TransferTreeModel * model = KGet::model(); - m_transfersViewDelegate->closeExpandableDetails(model->itemFromHandler(transfer)->index()); + m_transfersView->closeExpandableDetails(model->itemFromHandler(transfer)->index()); } else { m_transfersBt->removeTransfer(transfer); diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kopete/kopete/kopete.notifyrc /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kopete/kopete/kopete.notifyrc --- kde-nightly-kdenetwork-20091006+svn1032120/kopete/kopete/kopete.notifyrc 2009-10-06 23:29:17.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kopete/kopete/kopete.notifyrc 2009-10-09 23:33:41.000000000 +0100 @@ -1567,7 +1567,7 @@ Name[bn]=আই-আর-সি ঘটনা Name[ca]=Esdeveniment IRC Name[cs]=IRC událost -Name[da]=IRC-begivenhed +Name[da]=IRC-hændelse Name[de]=IRC-Ereignis Name[el]=Γεγονός IRC Name[en_GB]=IRC Event @@ -1620,7 +1620,7 @@ Comment[bn]=একটি আই-আর-সি ঘটনা ঘটেছে Comment[ca]=Ha ocorregut un esdeveniment d'IRC Comment[cs]=Nastala IRC událost -Comment[da]=En IRC=begivenhed er opstået +Comment[da]=En IRC-hændelse er forekommet Comment[de]=Ein IRC-Ereignis ist aufgetreten Comment[el]=Συνέβη ένα γεγονός IRC Comment[en_GB]=An IRC event has occurred @@ -2589,6 +2589,8 @@ [Event/kopete_gadu_contactslist] Name=GaduGadu contacts list Name[et]=GaduGadu kontaktide nimekiri +Name[gl]=Lista de contactos de GaduGadu +Name[ko]=GaduGadu 연락처 목록 Name[nb]=GaduGadu kontaktliste Name[nds]=GaduGadu-Kontaktenlist Name[nl]=GaduGadu contactenlijst @@ -2600,6 +2602,8 @@ Name[x-test]=xxGaduGadu contacts listxx Comment=Contacts list have been received/exported/deleted Comment[et]=Kontaktide nimekiri saadi/eksporditi/kustutati +Comment[gl]=Recibíronse/Exportáronse/Elimináronse listas de contactos +Comment[ko]=연락처 목록을 추가/내보냄/삭제함 Comment[nb]=Kontaktlister er blitt mottatt/eksportert/slettet Comment[nds]=Kontaktenlist wöör annahmen/exporteert/wegdaan Comment[nl]=Contactenlijst die is ontvangen/geëxporteerd/verwijderd diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kopete/plugins/otr/authenticationwizard.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kopete/plugins/otr/authenticationwizard.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kopete/plugins/otr/authenticationwizard.cpp 2009-10-06 23:29:17.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kopete/plugins/otr/authenticationwizard.cpp 2009-10-09 23:33:42.000000000 +0100 @@ -27,9 +27,12 @@ #include #include #include +#include +#include #include #include +#include QList wizardList; @@ -66,6 +69,17 @@ updateInfoBox(); show(); + + if ( !session->view()->mainWidget() || !session->view()->mainWidget()->isActiveWindow() ) { + KNotification *notification = new KNotification( "kopete_info_event", KNotification::CloseWhenWidgetActivated | KNotification::CloseOnTimeout ); + notification->setText( i18n( "Incoming authentication request from %1", OtrlChatInterface::self()->formatContact( session->members().first()->contactId() ) ) ); + notification->setPixmap( SmallIcon( "kopete" ) ); + notification->setWidget( this ); + notification->setActions( QStringList() << i18n( "View" ) << i18n( "Ignore" ) ); + connect( notification, SIGNAL( activated( unsigned int ) ), SLOT( notificationActivated( unsigned int ) ) ); + notification->sendEvent(); + } + } @@ -141,6 +155,7 @@ layout->addWidget(leAnswer); page->setLayout(layout); + page->setCommitPage(true); return page; } @@ -160,6 +175,7 @@ layout->addWidget(leSecret); page->setLayout(layout); + page->setCommitPage(true); return page; } @@ -239,7 +255,7 @@ } bool AuthenticationWizard::validateCurrentPage(){ - kDebug() << "currentId:" << currentId(); + kDebug(14318) << "currentId:" << currentId(); switch(currentId()){ case 1: if(initiate){ @@ -268,7 +284,7 @@ } void AuthenticationWizard::cancelVerification(){ - kDebug() << "cancelVerification..."; + kDebug(14318) << "cancelVerification..."; if(!initiate){ OtrlChatInterface::self()->abortSMP(context, session); } @@ -282,20 +298,20 @@ } void AuthenticationWizard::finished(bool success, bool trust){ - kDebug() << "****************"; + kDebug(14318) << "authWizard finished"; if(currentId() == Page_Wait2){ - kDebug() << "Yes, in wait_page2"; + kDebug(14318) << "Yes, in wait_page2"; ((WaitPage*)currentPage())->ready(); next(); if(success){ - kDebug() << "auth succeeded"; + kDebug(14318) << "auth succeeded"; currentPage()->setTitle(i18n("Authentication successful")); if(question != NULL || rbQA->isChecked()){ if(initiate){ - kDebug() << "initiate"; + kDebug(14318) << "initiate"; lFinal->setText(i18n("The authentication with %1 was completed successfully. The conversation is now secure.", OtrlChatInterface::self()->formatContact(session->members().first()->contactId()))); } else { - kDebug() << "not initiate"; + kDebug(14318) << "not initiate"; if(trust){ lFinal->setText(i18n("The authentication with %1 was completed successfully. The conversation is now secure.", OtrlChatInterface::self()->formatContact(session->members().first()->contactId()))); } else { @@ -310,6 +326,25 @@ lFinal->setText(i18n("The authentication with %1 failed. To make sure you are not talking to an imposter, try again using the manual fingerprint verification method. Note that the conversation is now insecure.", OtrlChatInterface::self()->formatContact(session->members().first()->contactId()))); } } + + setOption(QWizard::NoCancelButton, true); + +} + +void AuthenticationWizard::aborted(){ + if(currentId() == Page_SharedSecret || currentId() == Page_QuestionAnswer){ + next(); + } + if(currentId() == Page_Wait1){ + next(); + } + if(currentId() == Page_Wait2){ + next(); + } + currentPage()->setTitle(i18n("Authentication aborted")); + lFinal->setText(i18n("%1 has aborted the authentication process. To make sure you are not talking to an imposter, try again using the manual fingerprint verification method.", OtrlChatInterface::self()->formatContact(session->members().first()->contactId()))); + + setOption(QWizard::NoCancelButton, true); } void AuthenticationWizard::updateInfoBox(){ @@ -322,6 +357,17 @@ } } +void AuthenticationWizard::notificationActivated( unsigned int id){ + kDebug(14318) << "notificationActivated. ButtonId" << id; + if( id == 1 ){ + // raise the view to bring the chatwindow + authwizard to current desktop and on top + session->view()->raise( true ); + // now grab focus and keyboard again to the auth-wizard + setFocus(Qt::ActiveWindowFocusReason); + leAnswer->grabKeyboard(); + } +} + WaitPage::WaitPage(const QString &text){ canContinue = false; setTitle(i18nc("@title","Authenticating contact...")); @@ -333,5 +379,6 @@ progressBar->setMaximum(0); layout->addWidget(progressBar); layout->addStretch(); + setCommitPage(true); setLayout(layout); } diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kopete/plugins/otr/authenticationwizard.h /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kopete/plugins/otr/authenticationwizard.h --- kde-nightly-kdenetwork-20091006+svn1032120/kopete/plugins/otr/authenticationwizard.h 2009-10-06 23:29:17.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kopete/plugins/otr/authenticationwizard.h 2009-10-09 23:33:42.000000000 +0100 @@ -50,7 +50,8 @@ static AuthenticationWizard *findWizard(Kopete::ChatSession *session); void nextState(); void finished(bool success, bool trust); - + void aborted(); + protected: virtual int nextId() const; @@ -89,6 +90,7 @@ private slots: void cancelVerification(); void updateInfoBox(); + void notificationActivated( unsigned int ); }; diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kopete/plugins/otr/otrlchatinterface.cpp /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kopete/plugins/otr/otrlchatinterface.cpp --- kde-nightly-kdenetwork-20091006+svn1032120/kopete/plugins/otr/otrlchatinterface.cpp 2009-10-06 23:29:17.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kopete/plugins/otr/otrlchatinterface.cpp 2009-10-09 23:33:42.000000000 +0100 @@ -413,7 +413,7 @@ abortSMP( context, chatSession ); } else { kDebug(14318) << "Update SMP state: 1Q"; - new AuthenticationWizard( chatSession->view()->mainWidget(), context, chatSession, false, QString((char*)tlvs->data) ); + new AuthenticationWizard( chatSession->view(true)->mainWidget(), context, chatSession, false, QString((char*)tlvs->data) ); } } @@ -424,7 +424,7 @@ abortSMP( context, chatSession ); } else { kDebug(14318) << "Update SMP state: 1 "; - new AuthenticationWizard( chatSession->view()->mainWidget(), context, chatSession, false ); + new AuthenticationWizard( chatSession->view(true)->mainWidget(), context, chatSession, false ); } } tlv = otrl_tlv_find(tlvs, OTRL_TLV_SMP2); @@ -505,10 +505,15 @@ } tlv = otrl_tlv_find(tlvs, OTRL_TLV_SMP_ABORT); if (tlv) { + kDebug(14318) << "other end aborted SMP"; Kopete::Message msg( chatSession->members().first(), chatSession->account()->myself() ); msg.setHtmlBody( i18n("Authentication error.") ); msg.setDirection( Kopete::Message::Internal ); chatSession->appendMessage( msg ); + AuthenticationWizard *currentWizard = AuthenticationWizard::findWizard(chatSession); + if(currentWizard){ + currentWizard->aborted(); + } context->smstate->nextExpected = OTRL_SMP_EXPECT1; } diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kopete/plugins/urlpicpreview/kopete_urlpicpreview.desktop /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kopete/plugins/urlpicpreview/kopete_urlpicpreview.desktop --- kde-nightly-kdenetwork-20091006+svn1032120/kopete/plugins/urlpicpreview/kopete_urlpicpreview.desktop 2009-10-06 23:29:17.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kopete/plugins/urlpicpreview/kopete_urlpicpreview.desktop 2009-10-09 23:33:43.000000000 +0100 @@ -26,6 +26,7 @@ Name[hr]=Pregled slika u razgovorima Name[it]=Anteprima di immagini in chat Name[km]=មើល​រូបភាព​​ជា​មុន​នៅ​ក្នុង​គំនូស​តាង +Name[ko]=대화하면서 그림 보기 Name[lv]=Attēlu priekšskatījumi tērzēšanā Name[nb]=Forhåndsvis bilder i pratevinduer Name[nds]=Vöransichten vun Biller bi't Klönen diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/kopete/protocols/skype/skypebuttons/CMakeLists.txt /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/kopete/protocols/skype/skypebuttons/CMakeLists.txt --- kde-nightly-kdenetwork-20091006+svn1032120/kopete/protocols/skype/skypebuttons/CMakeLists.txt 2009-10-06 23:29:17.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/kopete/protocols/skype/skypebuttons/CMakeLists.txt 2009-10-09 23:33:45.000000000 +0100 @@ -30,13 +30,13 @@ set( MOZPLUGIN_INSTALL_DIR $ENV{HOME}/.mozilla/plugins ) endif( IS_HOME AND NOT IS_USR AND NOT IS_LOCAL ) if( NOT IS_HOME AND IS_USR AND NOT IS_LOCAL ) - set( MOZPLUGIN_INSTALL_DIR /usr/lib/mozilla/plugins ) + set( MOZPLUGIN_INSTALL_DIR /usr/lib${LIB_SUFFIX}/mozilla/plugins ) endif( NOT IS_HOME AND IS_USR AND NOT IS_LOCAL ) if( NOT IS_HOME AND NOT IS_USR AND IS_LOCAL ) set( MOZPLUGIN_INSTALL_DIR /usr/local/netscape/plugins ) endif( NOT IS_HOME AND NOT IS_USR AND IS_LOCAL ) if( NOT IS_HOME AND NOT IS_USR AND NOT IS_LOCAL ) - set( MOZPLUGIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/mozilla/plugins ) + set( MOZPLUGIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/mozilla/plugins ) endif( NOT IS_HOME AND NOT IS_USR AND NOT IS_LOCAL ) endif( NOT MOZPLUGIN_INSTALL_DIR ) diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/krdc/krdc_approver/krdc_rfb_approver.notifyrc /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/krdc/krdc_approver/krdc_rfb_approver.notifyrc --- kde-nightly-kdenetwork-20091006+svn1032120/krdc/krdc_approver/krdc_rfb_approver.notifyrc 2009-10-06 23:29:16.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/krdc/krdc_approver/krdc_rfb_approver.notifyrc 2009-10-09 23:33:38.000000000 +0100 @@ -1,6 +1,12 @@ [Global] IconName=krdc Comment=KRDC +Comment[gl]=KRDC +Comment[ko]=KRDC +Comment[pt]=KRDC +Comment[pt_BR]=KRDC +Comment[uk]=KRDC +Comment[x-test]=xxKRDCxx Name=KRDC Name[ar]=KRDC Name[ca]=KRDC @@ -47,5 +53,11 @@ [Event/newrfb] Name=Incoming RFB Tube +Name[gl]=Tubo RFB entrante +Name[ko]=들어오는 RFB Tube +Name[pt]=Ligação de RFB Recebida +Name[pt_BR]=Ligação de RFB recebida +Name[uk]=Вхідний канал RFB +Name[x-test]=xxIncoming RFB Tubexx Action=Popup Flags=Persistent diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/krdc/krdc.desktop /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/krdc/krdc.desktop --- kde-nightly-kdenetwork-20091006+svn1032120/krdc/krdc.desktop 2009-10-06 23:29:16.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/krdc/krdc.desktop 2009-10-09 23:33:38.000000000 +0100 @@ -61,7 +61,7 @@ GenericName[fi]=Etätyöpöytäasiakas GenericName[fr]=Connexion à un bureau distant GenericName[ga]=Cliant Deisce Cianda -GenericName[gl]=Axente de conexión remota ao escritorio +GenericName[gl]=Cliente de conexión remota ao escritorio GenericName[hne]=रिमोट डेस्कटाप क्लाएंट GenericName[hr]=Klijent za udaljeno povezivanje GenericName[hu]=Távoli asztal diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/krfb/framebuffers/qt/krfb_framebuffer_qt.desktop /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/krfb/framebuffers/qt/krfb_framebuffer_qt.desktop --- kde-nightly-kdenetwork-20091006+svn1032120/krfb/framebuffers/qt/krfb_framebuffer_qt.desktop 2009-10-06 23:29:16.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/krfb/framebuffers/qt/krfb_framebuffer_qt.desktop 2009-10-09 23:33:38.000000000 +0100 @@ -2,6 +2,8 @@ Encoding=UTF-8 Comment=Qt based Framebuffer for KRfb. Comment[et]=KRfb Qt põhine kaadripuhver +Comment[gl]=Framebuffer baseado en Qt para KRfb. +Comment[ko]=KRfb를 위한 Qt 기반 프레임버퍼. Comment[nb]=Qt-basert rammebuffer for KRfb. Comment[nds]=Op Qt opbuut Bildpuffer för KRfb Comment[nl]=Op Qt gebaseerd framebuffer voor KRfb. @@ -13,6 +15,8 @@ Comment[x-test]=xxQt based Framebuffer for KRfb.xx Name=Qt Framebuffer for KRfb Name[et]=KRfb Qt kaadripuhver +Name[gl]=Framebuffer de Qt para KRfb +Name[ko]=KRfb를 위한 Qt 프레임버퍼 Name[nb]=Qt rammebuffer for KRfb Name[nds]=Qt-Bildpuffer för KRfb Name[nl]=Qt-framebuffer voor KRfb diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/krfb/framebuffers/x11/krfb_framebuffer_x11.desktop /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/krfb/framebuffers/x11/krfb_framebuffer_x11.desktop --- kde-nightly-kdenetwork-20091006+svn1032120/krfb/framebuffers/x11/krfb_framebuffer_x11.desktop 2009-10-06 23:29:16.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/krfb/framebuffers/x11/krfb_framebuffer_x11.desktop 2009-10-09 23:33:38.000000000 +0100 @@ -2,6 +2,8 @@ Encoding=UTF-8 Comment=X11 XDamage/XShm based Framebuffer for KRfb. Comment[et]=KRfb X11 XDamage/XShm põhine kaadripuhver +Comment[gl]=Framebuffer baseado en Xll XDamage/Xshm para XRfb. +Comment[ko]=KRfb를 위한 X11 XDamage/XShm 기반 프레임버퍼. Comment[nb]=Rammebuffer for KRfb basert på X11 XDamage/XShm. Comment[nds]=Op X11-XDamage/-XShm opbuut Bildpuffer för KRfb Comment[nl]=Op X11 XDamage/XShm gebaseerd framebuffer voor KRfb. @@ -13,6 +15,8 @@ Comment[x-test]=xxX11 XDamage/XShm based Framebuffer for KRfb.xx Name=X11 Framebuffer for KRfb Name[et]=KRfb X11 kaadripuhver +Name[gl]=Framebuffer de X11 para KRfb +Name[ko]=KRfb를 위한 X11 프레임버퍼 Name[nb]=X11 rammebuffer for KRfb Name[nds]=X11-Bildpuffer för KRfb Name[nl]=X11 framebuffer voor KRfb diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/krfb/krfb-framebuffer.desktop /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/krfb/krfb-framebuffer.desktop --- kde-nightly-kdenetwork-20091006+svn1032120/krfb/krfb-framebuffer.desktop 2009-10-06 23:29:16.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/krfb/krfb-framebuffer.desktop 2009-10-09 23:33:38.000000000 +0100 @@ -4,6 +4,8 @@ Comment=Frame Buffer plugins for KRfb Comment[et]=KRfb kaadripuhvri plugin +Comment[gl]=Engadido de frame buffer para KRfb +Comment[ko]=KRfb 프레임버퍼 플러그인 Comment[nb]=Rammebuffer-programtillegg for KRfb Comment[nds]=Bildpuffer-Modulen för KRfb Comment[nl]=Framebuffer-plugins voor KRfb diff -Nru /tmp/yuinHqOf1z/kde-nightly-kdenetwork-20091006+svn1032120/krfb/krfb.notifyrc /tmp/hirzc1vg4q/kde-nightly-kdenetwork-20091009+svn1033338/krfb/krfb.notifyrc --- kde-nightly-kdenetwork-20091006+svn1032120/krfb/krfb.notifyrc 2009-10-06 23:29:16.000000000 +0100 +++ kde-nightly-kdenetwork-20091009+svn1033338/krfb/krfb.notifyrc 2009-10-09 23:33:38.000000000 +0100 @@ -455,7 +455,7 @@ Comment[fi]=Virheellinen salasana Comment[fr]=Mot de passe non valable Comment[ga]=Focal faire neamhbhailí -Comment[gl]=O contrasinal non é válido +Comment[gl]=Este contrasinal non é válido Comment[he]=הסיסמה שגויה Comment[hi]=अवैध पासवर्ड Comment[hne]=अवैध पासवर्ड @@ -892,7 +892,7 @@ Comment[fi]=Varattu, yhteys hylättiin Comment[fr]=Occupé, connexion refusée Comment[ga]=Gnóthach; ceangal diúltaithe -Comment[gl]=Ocupado, a conexión foi rexeitada +Comment[gl]=Ocupado; a conexión foi rexeitada Comment[he]=תפוס, החיבור נדחה Comment[hi]=व्यस्त, कनेक्शन अस्वीकृत Comment[hne]=व्यस्त, कनेक्सन अस्वीकृत