Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at Wed May 6 18:45:34 CEST 2009. -------- --- KDE/kdebase4/kdebase4.changes 2009-03-27 00:38:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4/kdebase4.changes 2009-04-30 21:15:59.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 30 21:15:49 CEST 2009 - dmueller@suse.de + +- update to 4.2.3 + * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdebase-4.2.2.tar.bz2 New: ---- kdebase-4.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.l15536/_old 2009-05-06 18:44:06.000000000 +0200 +++ /var/tmp/diff_new_pack.l15536/_new 2009-05-06 18:44:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4 (Version 4.2.2) +# spec file for package kdebase4 (Version 4.2.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -32,7 +32,7 @@ Group: System/GUI/KDE Summary: The Base KDE Apps Url: http://www.kde.org/ -Version: 4.2.2 +Version: 4.2.3 Release: 1 Source0: kdebase-%version.tar.bz2 Source1: _upstream @@ -482,6 +482,9 @@ /usr/share/kde4/services/plasma-applet-folderview.desktop %changelog +* Thu Apr 30 2009 dmueller@suse.de +- update to 4.2.3 + * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php * Fri Mar 27 2009 dmueller@suse.de - update to 4.2.2 * see http://kde.org/announcements/changelogs/changelog4_2_1to4_2_2.php @@ -601,7 +604,7 @@ - fix nspluginscan hang (#362522) * Fri Feb 15 2008 dmueller@suse.de - update 4_0_BRANCH.diff -* Wed Feb 06 2008 stbinner@suse.de +* Thu Feb 07 2008 stbinner@suse.de - don't mark kwrite.desktop as unimportant * Mon Feb 04 2008 stbinner@suse.de - add 4_0_BRANCH.diff (install kinfocenter handbook from here) @@ -635,7 +638,7 @@ - update to 3.96.0 * Wed Nov 07 2007 dmueller@suse.de - update to 3.95.2 -* Fri Nov 02 2007 dmueller@suse.de +* Sat Nov 03 2007 dmueller@suse.de - filelist updates * Thu Nov 01 2007 dmueller@suse.de - update to 3.95.1 @@ -643,7 +646,7 @@ - update to KDE 4.0 beta4 * Thu Oct 18 2007 dmueller@suse.de - update to 3.94.1 -* Wed Oct 17 2007 ro@suse.de +* Thu Oct 18 2007 ro@suse.de - fix build: add directory to filelist * Mon Oct 08 2007 dmueller@suse.de - update to KDE 4.0 Beta3 ++++++ kdebase-4.2.2.tar.bz2 -> kdebase-4.2.3.tar.bz2 ++++++ Files old/kdebase-4.2.2/apps/doc/dolphin/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/dolphin/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kfind/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kfind/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/devices/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/devices/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/dma/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/dma/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/interrupts/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/interrupts/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/ioports/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/ioports/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/memory/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/memory/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/nics/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/nics/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/opengl/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/opengl/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/partitions/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/partitions/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/pci/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/pci/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/pcmcia/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/pcmcia/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/processor/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/processor/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/protocols/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/protocols/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/samba/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/samba/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/scsi/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/scsi/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/sound/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/sound/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/usb/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/usb/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kinfocenter/xserver/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kinfocenter/xserver/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/konqueror/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/konqueror/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/konsole/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/konsole/index.cache.bz2 differ Files old/kdebase-4.2.2/apps/doc/kwrite/index.cache.bz2 and new/kdebase-4.2.3/apps/doc/kwrite/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/dolphin/src/columnviewsettingspage.cpp new/kdebase-4.2.3/apps/dolphin/src/columnviewsettingspage.cpp --- old/kdebase-4.2.2/apps/dolphin/src/columnviewsettingspage.cpp 2009-03-26 15:42:39.000000000 +0100 +++ new/kdebase-4.2.3/apps/dolphin/src/columnviewsettingspage.cpp 2009-04-30 11:11:49.000000000 +0200 @@ -113,9 +113,8 @@ settings->setItalicFont(font.italic()); settings->setFontWeight(font.weight()); - // TODO: - //const int columnWidth = 150 + (m_columnWidthSlider->value() * 50); - //settings->setColumnWidth(columnWidth); + const int columnWidth = BaseTextWidth + (m_textWidthBox->currentIndex() * TextInc); + settings->setColumnWidth(columnWidth); settings->writeConfig(); } @@ -150,8 +149,7 @@ m_fontRequester->setCustomFont(font); } - // TODO: - //m_columnWidthSlider->setValue((settings->columnWidth() - 150) / 50); + m_textWidthBox->setCurrentIndex((settings->columnWidth() - BaseTextWidth) / TextInc); } #include "columnviewsettingspage.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/dolphin/src/columnviewsettingspage.h new/kdebase-4.2.3/apps/dolphin/src/columnviewsettingspage.h --- old/kdebase-4.2.2/apps/dolphin/src/columnviewsettingspage.h 2008-11-12 17:37:09.000000000 +0100 +++ new/kdebase-4.2.3/apps/dolphin/src/columnviewsettingspage.h 2009-04-30 11:11:49.000000000 +0200 @@ -53,6 +53,12 @@ void loadSettings(); private: + enum + { + BaseTextWidth = 200, + TextInc = 50 + }; + IconSizeGroupBox* m_iconSizeGroupBox; DolphinFontRequester* m_fontRequester; KComboBox* m_textWidthBox; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/dolphin/src/dolphincolumnwidget.cpp new/kdebase-4.2.3/apps/dolphin/src/dolphincolumnwidget.cpp --- old/kdebase-4.2.2/apps/dolphin/src/dolphincolumnwidget.cpp 2009-02-26 15:16:32.000000000 +0100 +++ new/kdebase-4.2.3/apps/dolphin/src/dolphincolumnwidget.cpp 2009-04-30 11:11:49.000000000 +0200 @@ -517,6 +517,8 @@ void DolphinColumnWidget::deactivate() { clearFocus(); + disconnect(this, SIGNAL(clicked(const QModelIndex&)), + m_view->m_controller, SLOT(requestTab(const QModelIndex&))); // TODO: Connecting to the signal 'activated()' is not possible, as kstyle // does not forward the single vs. doubleclick to it yet (KDE 4.1?). Hence it is diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/dolphin/src/dolphinmainwindow.cpp new/kdebase-4.2.3/apps/dolphin/src/dolphinmainwindow.cpp --- old/kdebase-4.2.2/apps/dolphin/src/dolphinmainwindow.cpp 2009-02-26 15:16:32.000000000 +0100 +++ new/kdebase-4.2.3/apps/dolphin/src/dolphinmainwindow.cpp 2009-04-30 11:11:49.000000000 +0200 @@ -320,6 +320,7 @@ ViewTab viewTab; viewTab.splitter = new QSplitter(this); + viewTab.splitter->setChildrenCollapsible(false); viewTab.primaryView = new DolphinViewContainer(this, viewTab.splitter, url); viewTab.primaryView->setActive(false); connectViewSignals(viewTab.primaryView); @@ -854,6 +855,7 @@ setAcceptDrops(true); m_viewTab[m_tabIndex].splitter = new QSplitter(this); + m_viewTab[m_tabIndex].splitter->setChildrenCollapsible(false); setupActions(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/dolphin/src/dolphinmodel.cpp new/kdebase-4.2.3/apps/dolphin/src/dolphinmodel.cpp --- old/kdebase-4.2.2/apps/dolphin/src/dolphinmodel.cpp 2009-01-01 17:24:56.000000000 +0100 +++ new/kdebase-4.2.3/apps/dolphin/src/dolphinmodel.cpp 2009-04-30 11:11:49.000000000 +0200 @@ -248,7 +248,8 @@ Q_ASSERT(false); } } else { - if (daysDistance <= (currentDate.day() + modifiedDate.daysInMonth())) { + const QDate lastMonthDate = currentDate.addMonths(-1); + if (lastMonthDate.year() == modifiedDate.year() && lastMonthDate.month() == modifiedDate.month()) { if (daysDistance == 1) { retString = i18nc("@title:group Date: %B is full month name in current locale, and %Y is full year number", "Yesterday (%B, %Y)"); } else if (daysDistance <= 7) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/dolphin/src/dolphinpart.cpp new/kdebase-4.2.3/apps/dolphin/src/dolphinpart.cpp --- old/kdebase-4.2.2/apps/dolphin/src/dolphinpart.cpp 2009-03-26 15:42:39.000000000 +0100 +++ new/kdebase-4.2.3/apps/dolphin/src/dolphinpart.cpp 2009-04-30 11:11:49.000000000 +0200 @@ -331,10 +331,7 @@ { // TODO: Check issue N176832 for the missing QAIV signal; task 177399 - maybe this code // should be moved into DolphinPart::slotItemTriggered() - KFileItem item(S_IFDIR, (mode_t)-1, url); - KParts::OpenUrlArguments args; - args.setMimeType(item.mimetype()); - emit m_extension->createNewWindow(url, args); + emit m_extension->createNewWindow(url); } void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/dolphin/src/dolphinpart.desktop new/kdebase-4.2.3/apps/dolphin/src/dolphinpart.desktop --- old/kdebase-4.2.2/apps/dolphin/src/dolphinpart.desktop 2009-02-26 15:16:32.000000000 +0100 +++ new/kdebase-4.2.3/apps/dolphin/src/dolphinpart.desktop 2009-04-30 11:11:49.000000000 +0200 @@ -178,7 +178,7 @@ Name[ar]=تفاصيل Name[as]=বিৱৰণ Name[be@latin]=Detali -Name[bg]=Подробности +Name[bg]=Подробно Name[bn]=বিস্তারিত Name[bn_IN]=বিবরণ Name[ca]=Detalls diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/dolphin/src/dolphinview.cpp new/kdebase-4.2.3/apps/dolphin/src/dolphinview.cpp --- old/kdebase-4.2.2/apps/dolphin/src/dolphinview.cpp 2008-12-21 21:19:38.000000000 +0100 +++ new/kdebase-4.2.3/apps/dolphin/src/dolphinview.cpp 2009-04-30 11:11:49.000000000 +0200 @@ -1095,18 +1095,20 @@ void DolphinView::restoreCurrentItem() { - const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_currentItemUrl); - if (dirIndex.isValid()) { - const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); - QAbstractItemView* view = itemView(); - const bool clearSelection = !hasSelection(); - view->setCurrentIndex(proxyIndex); - if (clearSelection) { - view->clearSelection(); + if (!m_currentItemUrl.isEmpty()) { + const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_currentItemUrl); + if (dirIndex.isValid()) { + const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); + QAbstractItemView* view = itemView(); + const bool clearSelection = !hasSelection(); + view->setCurrentIndex(proxyIndex); + if (clearSelection) { + view->clearSelection(); + } } + m_currentItemUrl.clear(); } } - void DolphinView::enterDir(const QModelIndex& index, QAbstractItemView* view) { // Deleting a view that is the root of a drag operation is not allowed, otherwise @@ -1397,7 +1399,12 @@ QClipboard* clipboard = QApplication::clipboard(); const QMimeData* mimeData = clipboard->mimeData(); +#ifdef KURL_HAS_DECODEOPTIONS + // Prefer local urls if possible, to avoid problems with desktop:/ urls from other users (#184403) + const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData, KUrl::List::PreferLocalUrls); +#else const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData); +#endif if (KonqMimeData::decodeIsCutSelection(mimeData)) { KonqOperations::copy(this, KonqOperations::MOVE, sourceUrls, url); clipboard->clear(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/dolphin/src/infosidebarpage.cpp new/kdebase-4.2.3/apps/dolphin/src/infosidebarpage.cpp --- old/kdebase-4.2.2/apps/dolphin/src/infosidebarpage.cpp 2009-01-06 18:20:10.000000000 +0100 +++ new/kdebase-4.2.3/apps/dolphin/src/infosidebarpage.cpp 2009-04-30 11:11:49.000000000 +0200 @@ -541,7 +541,8 @@ m_nameLabel->setFont(font); m_nameLabel->setAlignment(Qt::AlignHCenter); m_nameLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); - + m_nameLabel->setMaximumWidth(KIconLoader::SizeEnormous); + // preview m_preview = new PixmapViewer(this); m_preview->setMinimumWidth(KIconLoader::SizeEnormous + KIconLoader::SizeMedium); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/dolphin/src/treeviewcontextmenu.cpp new/kdebase-4.2.3/apps/dolphin/src/treeviewcontextmenu.cpp --- old/kdebase-4.2.2/apps/dolphin/src/treeviewcontextmenu.cpp 2008-12-04 09:34:28.000000000 +0100 +++ new/kdebase-4.2.3/apps/dolphin/src/treeviewcontextmenu.cpp 2009-04-30 11:11:49.000000000 +0200 @@ -155,13 +155,18 @@ QClipboard* clipboard = QApplication::clipboard(); const QMimeData* mimeData = clipboard->mimeData(); - const KUrl::List source = KUrl::List::fromMimeData(mimeData); +#ifdef KURL_HAS_DECODEOPTIONS + // Prefer local urls if possible, to avoid problems with desktop:/ urls from other users (#184403) + const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData, KUrl::List::PreferLocalUrls); +#else + const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData); +#endif const KUrl& dest = m_fileInfo.url(); if (KonqMimeData::decodeIsCutSelection(mimeData)) { - KonqOperations::copy(m_parent, KonqOperations::MOVE, source, dest); + KonqOperations::copy(m_parent, KonqOperations::MOVE, sourceUrls, dest); clipboard->clear(); } else { - KonqOperations::copy(m_parent, KonqOperations::COPY, source, dest); + KonqOperations::copy(m_parent, KonqOperations::COPY, sourceUrls, dest); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/kfind/kfinddlg.cpp new/kdebase-4.2.3/apps/kfind/kfinddlg.cpp --- old/kdebase-4.2.2/apps/kfind/kfinddlg.cpp 2009-03-26 15:42:39.000000000 +0100 +++ new/kdebase-4.2.3/apps/kfind/kfinddlg.cpp 2009-04-30 11:11:49.000000000 +0200 @@ -74,7 +74,9 @@ connect(win ,SIGNAL(resultSelected(bool)), this,SIGNAL(resultSelected(bool))); - + + connect( this, SIGNAL(closeClicked()), this, SLOT(finishAndClose()) ); + query = new KQuery(frame); connect(query, SIGNAL(addFile(const KFileItem&,const QString&)), SLOT(addFile(const KFileItem&,const QString&))); @@ -88,9 +90,11 @@ stopSearch(); } -void KfindDlg::closeEvent(QCloseEvent *) +void KfindDlg::finishAndClose() { - slotButtonClicked(KDialog::Close); + //Stop the current search and closes the dialog + stopSearch(); + close(); } void KfindDlg::setProgressMsg(const QString &msg) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/kfind/kfinddlg.h new/kdebase-4.2.3/apps/kfind/kfinddlg.h --- old/kdebase-4.2.2/apps/kfind/kfinddlg.h 2008-01-05 00:53:59.000000000 +0100 +++ new/kdebase-4.2.3/apps/kfind/kfinddlg.h 2009-04-30 11:11:49.000000000 +0200 @@ -34,7 +34,6 @@ void setProgressMsg(const QString &); private: - void closeEvent(QCloseEvent *); /*Return a QStringList of all subdirs of d*/ QStringList getAllSubdirs(QDir d); @@ -50,6 +49,8 @@ void slotDeleteItem(const QString&); void slotNewItems( const QString& ); + void finishAndClose(); + Q_SIGNALS: void haveResults(bool); void resultSelected(bool); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/kfind/kfwin.cpp new/kdebase-4.2.3/apps/kfind/kfwin.cpp --- old/kdebase-4.2.2/apps/kfind/kfwin.cpp 2008-02-21 10:27:52.000000000 +0100 +++ new/kdebase-4.2.3/apps/kfind/kfwin.cpp 2009-04-30 11:11:49.000000000 +0200 @@ -80,7 +80,7 @@ setText(5, matchingLine); // put the icon into the leftmost column - setPixmap(0, item.pixmap(16)); + setPixmap(0, KIcon(item.iconName()).pixmap(16,16) ); } KfFileLVI::~KfFileLVI() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/kfind/kquery.cpp new/kdebase-4.2.3/apps/kfind/kquery.cpp --- old/kdebase-4.2.2/apps/kfind/kquery.cpp 2009-03-26 15:42:39.000000000 +0100 +++ new/kdebase-4.2.3/apps/kfind/kquery.cpp 2009-04-30 11:11:49.000000000 +0200 @@ -79,11 +79,9 @@ if(m_useLocate) //use "locate" instead of the internal search method { m_url.cleanPath(); - processLocate->clearProgram(); - *processLocate << "locate"; - *processLocate << m_url.path( KUrl::AddTrailingSlash ).toLatin1(); bufferLocate.clear(); - processLocate->setNextOpenMode(QIODevice::Text); + processLocate->clearProgram(); + processLocate->setProgram( "locate", QStringList() << m_url.path( KUrl::AddTrailingSlash ) ); processLocate->setOutputChannelMode(KProcess::SeparateChannels); processLocate->start(); return; @@ -501,7 +499,7 @@ QString str = QString::fromLocal8Bit(bufferLocate); bufferLocate.clear(); - slotListEntries(str.split('\n')); + slotListEntries(str.split('\n',QString::SkipEmptyParts)); emit result(0); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/kinfocenter/base/info_fbsd.cpp new/kdebase-4.2.3/apps/kinfocenter/base/info_fbsd.cpp --- old/kdebase-4.2.2/apps/kinfocenter/base/info_fbsd.cpp 2008-08-07 17:21:00.000000000 +0200 +++ new/kdebase-4.2.3/apps/kinfocenter/base/info_fbsd.cpp 2009-04-30 11:11:50.000000000 +0200 @@ -89,7 +89,7 @@ new QTreeWidgetItem(tree, list); /* Clean up after ourselves, this time I mean it ;-) */ - delete buf; + delete[] buf; } return true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/kinfocenter/pci/kcm_pci.cpp new/kdebase-4.2.3/apps/kinfocenter/pci/kcm_pci.cpp --- old/kdebase-4.2.2/apps/kinfocenter/pci/kcm_pci.cpp 2008-04-23 17:51:22.000000000 +0200 +++ new/kdebase-4.2.3/apps/kinfocenter/pci/kcm_pci.cpp 2009-04-30 11:11:50.000000000 +0200 @@ -80,6 +80,11 @@ void KCMPci::load() { kDebug() << "Loading PCI information..." << endl; GetInfo_PCI(tree); + + //Resize the column width to the maximum needed + tree->expandAll(); + tree->resizeColumnToContents( 0 ); + tree->collapseAll(); } QString KCMPci::quickHelp() const { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/konqueror/settings/ebrowsing/ebrowsing.desktop new/kdebase-4.2.3/apps/konqueror/settings/ebrowsing/ebrowsing.desktop --- old/kdebase-4.2.2/apps/konqueror/settings/ebrowsing/ebrowsing.desktop 2009-02-26 15:16:26.000000000 +0100 +++ new/kdebase-4.2.3/apps/konqueror/settings/ebrowsing/ebrowsing.desktop 2009-04-30 11:11:49.000000000 +0200 @@ -73,8 +73,8 @@ Name[se]=Fierpmádatlávkestagat Name[sk]=Internetové skratky Name[sl]=Spletne bližnjice -Name[sr]=веб пречице -Name[sr@latin]=veb prečice +Name[sr]=Веб пречице +Name[sr@latin]=Veb prečice Name[sv]=Webbgenvägar Name[ta]=இணைய சுருக்கு வழிகள் Name[te]=వెబ్ లఘువులు diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/konqueror/settings/kio/kcookiespolicies.cpp new/kdebase-4.2.3/apps/konqueror/settings/kio/kcookiespolicies.cpp --- old/kdebase-4.2.2/apps/konqueror/settings/kio/kcookiespolicies.cpp 2009-03-26 15:42:36.000000000 +0100 +++ new/kdebase-4.2.3/apps/konqueror/settings/kio/kcookiespolicies.cpp 2009-04-30 11:11:49.000000000 +0200 @@ -327,8 +327,9 @@ dlg->cbEnableCookies->setChecked (enableCookies); cookiesEnabled( enableCookies ); + // Warning: the default values are duplicated in kcookiejar.cpp KCookieAdvice::Value advice = KCookieAdvice::strToAdvice (group.readEntry( - "CookieGlobalAdvice", "Ask")); + "CookieGlobalAdvice", "Accept")); switch (advice) { case KCookieAdvice::Accept: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/konqueror/settings/kio/lanbrowser.desktop new/kdebase-4.2.3/apps/konqueror/settings/kio/lanbrowser.desktop --- old/kdebase-4.2.2/apps/konqueror/settings/kio/lanbrowser.desktop 2009-03-26 15:42:36.000000000 +0100 +++ new/kdebase-4.2.3/apps/konqueror/settings/kio/lanbrowser.desktop 2009-04-30 11:11:49.000000000 +0200 @@ -139,7 +139,7 @@ Comment[pl]=Konfiguracja przeglądania sieci lokalnej (współdzielone pliki i drukarki) Comment[pt]=Configurar a navegação na rede local para as pastas e impressoras partilhadas Comment[pt_BR]=Configurar a rede local navegando por pastas compartilhadas e impressoras -Comment[ro]=Configurează răsfoirea rețelei locale pentru dosare și imprimante pertajate +Comment[ro]=Configurează răsfoirea rețelei locale pentru dosare și imprimante partajate Comment[ru]=Настройка обзора общих папок и принтеров в локальной сети Comment[sk]=Konfigurácia prehliadania zdieľaných priečinkov a tlačiarní v lokálnej sieti Comment[sl]=Nastavitev brskanja po mapah in tiskalnikih, ki so v souporabi v krajevnem omrežju diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/konqueror/settings/konqhtml/khtml_appearance.desktop new/kdebase-4.2.3/apps/konqueror/settings/konqhtml/khtml_appearance.desktop --- old/kdebase-4.2.2/apps/konqueror/settings/konqhtml/khtml_appearance.desktop 2009-03-26 15:42:37.000000000 +0100 +++ new/kdebase-4.2.3/apps/konqueror/settings/konqhtml/khtml_appearance.desktop 2009-04-30 11:11:49.000000000 +0200 @@ -96,6 +96,7 @@ Comment=Configure how to display web pages +Comment[bg]=Настройване как да се показват уеб страниците Comment[ca]=Configura com visualitzar les pàgines web Comment[cs]=Nastavit zobrazení webových stránek Comment[da]=Indstil hvordan netsider skal vises @@ -112,6 +113,7 @@ Comment[ja]=ウェブページをどのように表示するかを設定 Comment[lt]=Konfigūruoti žiniatinklio puslapių rodymą Comment[lv]=Šeit varat konfigurēt kā attēlot tīmekļa lapas +Comment[mai]=बिन्यस्त करू जे कहिना वेब पृष्ठ केँ देखाएल जएनाइ अछि Comment[nb]=Tilpass hvordan nettsider vises Comment[nds]=Instellen, wodennig Nettsieden wiest warrt Comment[nl]=Hier kunt u instellen hoe webpagina's te tonen diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/konqueror/sidebar/trees/init/services/settings.desktop new/kdebase-4.2.3/apps/konqueror/sidebar/trees/init/services/settings.desktop --- old/kdebase-4.2.2/apps/konqueror/sidebar/trees/init/services/settings.desktop 2009-03-26 15:42:38.000000000 +0100 +++ new/kdebase-4.2.3/apps/konqueror/sidebar/trees/init/services/settings.desktop 2009-04-30 11:11:49.000000000 +0200 @@ -63,7 +63,7 @@ Name[pl]=Ustawienia Name[pt]=Configuração Name[pt_BR]=Configurações -Name[ro]=Setări +Name[ro]=Configurări Name[ru]=Настройка Name[se]=Heivehusat Name[sk]=Nastavenia diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/konqueror/src/delayedinitializer.cpp new/kdebase-4.2.3/apps/konqueror/src/delayedinitializer.cpp --- old/kdebase-4.2.2/apps/konqueror/src/delayedinitializer.cpp 2008-01-05 00:53:58.000000000 +0100 +++ new/kdebase-4.2.3/apps/konqueror/src/delayedinitializer.cpp 2009-04-30 11:11:49.000000000 +0200 @@ -20,13 +20,12 @@ #include "delayedinitializer.h" #include <QtCore/QTimer> -//Added by qt3to4: +#include <kdebug.h> #include <QtCore/QEvent> -DelayedInitializer::DelayedInitializer( int eventType, QObject *parent, const char *name ) +DelayedInitializer::DelayedInitializer( int eventType, QObject *parent ) : QObject( parent ), m_eventType( eventType ), m_signalEmitted( false ) { - setObjectName( name ); parent->installEventFilter( this ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/konqueror/src/delayedinitializer.h new/kdebase-4.2.3/apps/konqueror/src/delayedinitializer.h --- old/kdebase-4.2.2/apps/konqueror/src/delayedinitializer.h 2008-01-05 00:53:58.000000000 +0100 +++ new/kdebase-4.2.3/apps/konqueror/src/delayedinitializer.h 2009-04-30 11:11:49.000000000 +0200 @@ -27,7 +27,7 @@ { Q_OBJECT public: - DelayedInitializer( int eventType, QObject *parent, const char *name = 0 ); + DelayedInitializer(int eventType, QObject *parent); protected: virtual bool eventFilter( QObject *receiver, QEvent *event ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/konqueror/src/konqmainwindow.cpp new/kdebase-4.2.3/apps/konqueror/src/konqmainwindow.cpp --- old/kdebase-4.2.2/apps/konqueror/src/konqmainwindow.cpp 2009-02-26 15:16:26.000000000 +0100 +++ new/kdebase-4.2.3/apps/konqueror/src/konqmainwindow.cpp 2009-04-30 11:11:49.000000000 +0200 @@ -1174,10 +1174,12 @@ if ( windowArgs.lowerWindow() || (QApplication::keyboardModifiers() & Qt::ShiftModifier)) newtabsinfront = !newtabsinfront; const bool aftercurrentpage = KonqSettings::openAfterCurrentPage(); + KonqOpenURLRequest req; + req.args = args; + req.browserArgs = browserArgs; // Can we use the standard way (openUrl), or do we need the part pointer immediately? if (!part) { - KonqOpenURLRequest req; req.newTab = true; req.newTabInFront = newtabsinfront; req.openAfterCurrentPage = aftercurrentpage; @@ -1189,7 +1191,7 @@ if (newtabsinfront) m_pViewManager->showTab( newView ); - openUrl( newView, url.isEmpty() ? KUrl("about:blank") : url, QString() ); + openUrl( newView, url.isEmpty() ? KUrl("about:blank") : url, QString(), req ); newView->setViewName( browserArgs.frameName ); *part = newView->part(); @@ -2175,12 +2177,15 @@ KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension *&hostExtension, KParts::ReadOnlyPart **part ) { //kDebug() << "this=" << this << "looking for" << name; + QList<KonqView *> views = m_mapViews.values(); + KonqView* callingView = m_mapViews.value(callingPart); + if (callingView) { + // Move the callingView in front of the list, in case of duplicate frame names (#133967) + if (views.removeAll(callingView)) + views.prepend(callingView); + } - MapViews::ConstIterator it = m_mapViews.constBegin(); - MapViews::ConstIterator end = m_mapViews.constEnd(); - for (; it != end; ++it ) - { - KonqView* view = it.value(); + Q_FOREACH(KonqView* view, views) { QString viewName = view->viewName(); //kDebug() << " - viewName=" << viewName // << "frame names:" << view->frameNames(); @@ -3029,7 +3034,7 @@ if ( !bookmarkCompletionInitialized ) { bookmarkCompletionInitialized = true; - DelayedInitializer *initializer = new DelayedInitializer( QEvent::KeyPress, m_combo->lineEdit() ); + DelayedInitializer *initializer = new DelayedInitializer( QEvent::KeyPress, m_combo ); connect( initializer, SIGNAL( initialize() ), this, SLOT( bookmarksIntoCompletion() ) ); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/konqueror/src/konqtabs.cpp new/kdebase-4.2.3/apps/konqueror/src/konqtabs.cpp --- old/kdebase-4.2.2/apps/konqueror/src/konqtabs.cpp 2008-12-10 17:13:05.000000000 +0100 +++ new/kdebase-4.2.3/apps/konqueror/src/konqtabs.cpp 2009-04-30 11:11:49.000000000 +0200 @@ -266,7 +266,9 @@ void KonqFrameTabs::setTitle( const QString &title , QWidget* sender) { // kDebug(1202) << "KonqFrameTabs::setTitle( " << title << " , " << sender << " )"; - setTabText( indexOf( sender ), title ); + // Make sure that '&' is displayed correctly + QString tabText( title ); + setTabText( indexOf( sender ), tabText.replace('&', "&&") ); } void KonqFrameTabs::setTabIcon( const KUrl &url, QWidget* sender ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/konqueror/src/konqviewmanager.cpp new/kdebase-4.2.3/apps/konqueror/src/konqviewmanager.cpp --- old/kdebase-4.2.2/apps/konqueror/src/konqviewmanager.cpp 2008-12-04 09:34:23.000000000 +0100 +++ new/kdebase-4.2.3/apps/konqueror/src/konqviewmanager.cpp 2009-04-30 11:11:49.000000000 +0200 @@ -118,6 +118,15 @@ KonqFrameContainerBase* parentContainer = splitFrame->parentContainer(); + // We need the sizes of the views in the parentContainer to restore these after the new container is inserted. + // To access the sizes via QSplitter::sizes(), a pointer to a KonqFrameContainerBase is not sufficient. + // We need a pointer to a KonqFrameContainer which is derived from QSplitter. + KonqFrameContainer* parentKonqFrameContainer = dynamic_cast<KonqFrameContainer*> ( parentContainer ); + QList<int> parentSplitterSizes; + if ( parentKonqFrameContainer ) { + parentSplitterSizes = parentKonqFrameContainer->sizes(); + } + KonqFrameContainer* newContainer = parentContainer->splitChildFrame(splitFrame, orientation); connect(newContainer, SIGNAL(ctrlTabPressed()), m_pMainWindow, SLOT(slotCtrlTabPressed())); @@ -140,6 +149,10 @@ splitFrame->show(); newContainer->show(); + if ( parentKonqFrameContainer ) { + parentKonqFrameContainer->setSizes( parentSplitterSizes ); + } + assert( newView->frame() ); assert( newView->part() ); newContainer->setActiveChild( newView->frame() ); @@ -537,6 +550,15 @@ static_cast<KonqFrameContainer*>(parentContainer)->setAboutToBeDeleted(); + // If the grand parent is a KonqFrameContainer, we need the sizes of the views inside it to restore these after + // the parent is replaced. To access the sizes via QSplitter::sizes(), a pointer to a KonqFrameContainerBase + // is not sufficient. We need a pointer to a KonqFrameContainer which is derived from QSplitter. + KonqFrameContainer* grandParentKonqFrameContainer = dynamic_cast<KonqFrameContainer*> ( grandParentContainer ); + QList<int> grandParentSplitterSizes; + if ( grandParentKonqFrameContainer ) { + grandParentSplitterSizes = grandParentKonqFrameContainer->sizes(); + } + grandParentContainer->replaceChildFrame(parentContainer, otherFrame); //kDebug(1202) << "--- Removing otherFrame from parentContainer"; @@ -548,6 +570,10 @@ delete parentContainer; + if ( grandParentKonqFrameContainer ) { + grandParentKonqFrameContainer->setSizes( grandParentSplitterSizes ); + } + grandParentContainer->setActiveChild( otherFrame ); grandParentContainer->activateChild(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/konsole/src/main.cpp new/kdebase-4.2.3/apps/konsole/src/main.cpp --- old/kdebase-4.2.2/apps/konsole/src/main.cpp 2009-03-26 15:42:41.000000000 +0100 +++ new/kdebase-4.2.3/apps/konsole/src/main.cpp 2009-04-30 11:11:50.000000000 +0200 @@ -37,7 +37,7 @@ #include <KLocale> #include <KWindowSystem> -#define KONSOLE_VERSION "2.2.2" +#define KONSOLE_VERSION "2.2.3" using namespace Konsole; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/konsole/src/Screen.cpp new/kdebase-4.2.3/apps/konsole/src/Screen.cpp --- old/kdebase-4.2.2/apps/konsole/src/Screen.cpp 2009-03-26 15:42:41.000000000 +0100 +++ new/kdebase-4.2.3/apps/konsole/src/Screen.cpp 2009-04-30 11:11:50.000000000 +0200 @@ -1229,14 +1229,18 @@ Character* data = screenLines[screenLine].data(); int length = screenLines[screenLine].count(); - // ignore trailing white space at the end of the line - for (int i = length-1; i >= 0; i--) + // Don't remove end spaces in lines that wrap + if (!(lineProperties[screenLine] & LINE_WRAPPED)) { - if (data[i].character == ' ') - length--; - else - break; - } + // ignore trailing white space at the end of the line + for (int i = length-1; i >= 0; i--) + { + if (data[i].character == ' ') + length--; + else + break; + } + } //retrieve line from screen image for (int i=start;i < qMin(start+count,length);i++) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/konsole/src/SessionController.cpp new/kdebase-4.2.3/apps/konsole/src/SessionController.cpp --- old/kdebase-4.2.2/apps/konsole/src/SessionController.cpp 2009-02-26 15:16:35.000000000 +0100 +++ new/kdebase-4.2.3/apps/konsole/src/SessionController.cpp 2009-04-30 11:11:50.000000000 +0200 @@ -251,6 +251,18 @@ if ( url.hasHost() ) _session->emulation()->sendText(url.host() + '\r'); } + else if ( url.protocol() == "telnet" ) + { + _session->emulation()->sendText("telnet "); + + if ( url.hasUser() ) + _session->emulation()->sendText("-l " + url.user() + ' '); + if ( url.hasHost() ) + _session->emulation()->sendText(url.host() + ' '); + if ( url.port() > -1 ) + _session->emulation()->sendText(QString::number(url.port())); + _session->emulation()->sendText("\r"); + } else { //TODO Implement handling for other Url types diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/kwrite/kwritemain.cpp new/kdebase-4.2.3/apps/kwrite/kwritemain.cpp --- old/kdebase-4.2.2/apps/kwrite/kwritemain.cpp 2008-11-28 16:33:34.000000000 +0100 +++ new/kdebase-4.2.3/apps/kwrite/kwritemain.cpp 2009-04-30 11:11:49.000000000 +0200 @@ -627,7 +627,7 @@ void KWrite::modeChanged ( KTextEditor::Document *document ) { - m_modeLabel->setText (document->mode()); + m_modeLabel->setText (i18nc("Language", document->mode().toUtf8())); } extern "C" KDE_EXPORT int kdemain(int argc, char **argv) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/lib/konq/konq_menuactions.cpp new/kdebase-4.2.3/apps/lib/konq/konq_menuactions.cpp --- old/kdebase-4.2.2/apps/lib/konq/konq_menuactions.cpp 2008-12-21 21:19:39.000000000 +0100 +++ new/kdebase-4.2.3/apps/lib/konq/konq_menuactions.cpp 2009-04-30 11:11:50.000000000 +0200 @@ -185,7 +185,7 @@ const KFileItemList items = d->m_info.items(); const KFileItem firstItem = items.first(); const QString protocol = firstItem.url().protocol(); // assumed to be the same for all items - const bool isLocal = firstItem.url().isLocalFile(); + const bool isLocal = !firstItem.localPath().isEmpty(); const bool isSingleLocal = items.count() == 1 && isLocal; const KUrl::List urlList = d->m_info.urlList(); @@ -195,8 +195,8 @@ if (isSingleLocal && d->m_info.mimeType() == "application/x-desktop") // .desktop file { // get builtin services, like mount/unmount - s.builtin = KDesktopFileActions::builtinServices(firstItem.url()); - const QString path = firstItem.url().path(); + const QString path = firstItem.localPath(); + s.builtin = KDesktopFileActions::builtinServices(path); KDesktopFile desktopFile(path); KConfigGroup cfg = desktopFile.desktopGroup(); const QString priority = cfg.readEntry("X-KDE-Priority"); @@ -216,7 +216,7 @@ // first check the .directory if this is a directory if (d->m_info.isDirectory() && isSingleLocal) { - QString dotDirectoryFile = firstItem.url().path(KUrl::AddTrailingSlash).append(".directory"); + QString dotDirectoryFile = KUrl::fromPath(firstItem.localPath()).path(KUrl::AddTrailingSlash).append(".directory"); if (QFile::exists(dotDirectoryFile)) { const KDesktopFile desktopFile( dotDirectoryFile ); const KConfigGroup cfg = desktopFile.desktopGroup(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/lib/konq/konq_operations.cpp new/kdebase-4.2.3/apps/lib/konq/konq_operations.cpp --- old/kdebase-4.2.2/apps/lib/konq/konq_operations.cpp 2009-02-26 15:16:33.000000000 +0100 +++ new/kdebase-4.2.3/apps/lib/konq/konq_operations.cpp 2009-04-30 11:11:50.000000000 +0200 @@ -247,7 +247,12 @@ { kDebug(1203) << "doDrop: dest:" << dest; QMap<QString, QString> metaData; +#ifdef KURL_HAS_DECODEOPTIONS + // Prefer local urls if possible, to avoid problems with desktop:/ urls from other users (#184403) + const KUrl::List lst = KUrl::List::fromMimeData(ev->mimeData(), KUrl::List::PreferLocalUrls, &metaData); +#else const KUrl::List lst = KUrl::List::fromMimeData(ev->mimeData(), &metaData); +#endif if (!lst.isEmpty()) { // Are they urls ? //kDebug(1203) << "metaData:" << metaData.count() << "entries."; //QMap<QString,QString>::ConstIterator mit; @@ -526,7 +531,7 @@ break; } } - + if ( !equalDestination ) popup.addAction(popupMoveAction); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/lib/konq/konqpopupmenuplugin.desktop new/kdebase-4.2.3/apps/lib/konq/konqpopupmenuplugin.desktop --- old/kdebase-4.2.2/apps/lib/konq/konqpopupmenuplugin.desktop 2009-03-26 15:42:40.000000000 +0100 +++ new/kdebase-4.2.3/apps/lib/konq/konqpopupmenuplugin.desktop 2009-04-30 11:11:50.000000000 +0200 @@ -60,7 +60,7 @@ Comment[pl]=Wtyczka do menu (otwieranego przyciskiem myszy) Konquerora Comment[pt]='Plugin' para o Menu do Konqueror Comment[pt_BR]=Plug-in do Konqueror para menus de contexto -Comment[ro]=Modul pentru meniuri popup Konqueror +Comment[ro]=Modul pentru meniul popup Konqueror Comment[ru]=Расширение контекстного меню Konqueror Comment[se]=Lassemoduvla Konquerora báhccanfállui Comment[sk]=Modul pre kontextové menu Konquerora diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/lib/konq/Templates/HTMLFile.desktop new/kdebase-4.2.3/apps/lib/konq/Templates/HTMLFile.desktop --- old/kdebase-4.2.2/apps/lib/konq/Templates/HTMLFile.desktop 2009-03-26 15:42:40.000000000 +0100 +++ new/kdebase-4.2.3/apps/lib/konq/Templates/HTMLFile.desktop 2009-04-30 11:11:49.000000000 +0200 @@ -64,8 +64,8 @@ Name[si]=HTML ගොනුව... Name[sk]=Súbor HTML... Name[sl]=Datoteka HTML ... -Name[sr]=ХТМЛ фајлови... -Name[sr@latin]=HTML fajlovi... +Name[sr]=ХТМЛ фајл... +Name[sr@latin]=HTML fajl... Name[sv]=HTML-fil... Name[ta]=HTML கோப்பு... Name[te]=హెచ్ టి ఎం ఎల్ దస్త్రం... diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/lib/konq/Templates/linkHD.desktop new/kdebase-4.2.3/apps/lib/konq/Templates/linkHD.desktop --- old/kdebase-4.2.2/apps/lib/konq/Templates/linkHD.desktop 2009-03-26 15:42:40.000000000 +0100 +++ new/kdebase-4.2.3/apps/lib/konq/Templates/linkHD.desktop 2009-04-30 11:11:49.000000000 +0200 @@ -61,8 +61,8 @@ Name[se]=Garraskearroovttadat … Name[sk]=Zariadenie pevného disku... Name[sl]=Naprava trdega diska ... -Name[sr]=Уређај: хард диск... -Name[sr@latin]=Uređaj: hard disk... +Name[sr]=Уређај: хард‑диск... +Name[sr@latin]=Uređaj: hard‑disk... Name[sv]=Hårddiskenhet... Name[ta]=வட்டு Name[te]=హార్డ్ డిస్క్ పరికరం... @@ -140,8 +140,8 @@ Comment[se]=Ođđa garraskearroovttadat Comment[sk]=Nový pevný disk Comment[sl]=Nov trdi disk -Comment[sr]=Нови уређај, хард диск -Comment[sr@latin]=Novi uređaj, hard disk +Comment[sr]=Нови уређај, хард‑диск +Comment[sr@latin]=Novi uređaj, hard‑disk Comment[sv]=Ny hårddisk Comment[ta]=புது வன் தகடு Comment[te]=కొత్త హార్డ్ డిస్క్ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/plasma/applets/folderview/dialog.cpp new/kdebase-4.2.3/apps/plasma/applets/folderview/dialog.cpp --- old/kdebase-4.2.2/apps/plasma/applets/folderview/dialog.cpp 2009-02-26 15:16:39.000000000 +0100 +++ new/kdebase-4.2.3/apps/plasma/applets/folderview/dialog.cpp 2009-04-30 11:11:50.000000000 +0200 @@ -36,12 +36,12 @@ #endif -Dialog::Dialog(QWidget *parent, Qt::WindowFlags f) - : QWidget(parent, f), m_widget(0) +Dialog::Dialog(QWidget *parent) + : QWidget(parent, Qt::Popup), m_widget(0) { - setWindowFlags(Qt::Popup | Qt::WindowStaysOnTopHint); - #ifdef Q_WS_X11 + setAttribute(Qt::WA_X11NetWmWindowTypeDropDownMenu); + if (!QX11Info::isCompositingManagerRunning()) { setAttribute(Qt::WA_NoSystemBackground); } @@ -168,9 +168,10 @@ m_background->paintFrame(&p); } -void Dialog::focusOutEvent(QFocusEvent *event) +void Dialog::mousePressEvent(QMouseEvent *event) { - Q_UNUSED(event) - hide(); + if (!rect().contains(event->pos())) { + hide(); + } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/plasma/applets/folderview/dialog.h new/kdebase-4.2.3/apps/plasma/applets/folderview/dialog.h --- old/kdebase-4.2.2/apps/plasma/applets/folderview/dialog.h 2008-12-21 21:19:39.000000000 +0100 +++ new/kdebase-4.2.3/apps/plasma/applets/folderview/dialog.h 2009-04-30 11:11:50.000000000 +0200 @@ -35,14 +35,14 @@ class Dialog : public QWidget { public: - Dialog(QWidget *parent = 0, Qt::WindowFlags f = Qt::Window); + Dialog(QWidget *parent = 0); ~Dialog(); void setGraphicsWidget(QGraphicsWidget *widget); void show(Plasma::Applet *applet); protected: - void focusOutEvent(QFocusEvent *event); + void mousePressEvent(QMouseEvent *event); void resizeEvent(QResizeEvent *event); void paintEvent(QPaintEvent *event); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-4.2.2/apps/plasma/applets/folderview/proxymodel.cpp new/kdebase-4.2.3/apps/plasma/applets/folderview/proxymodel.cpp --- old/kdebase-4.2.2/apps/plasma/applets/folderview/proxymodel.cpp 2009-01-01 17:24:58.000000000 +0100 +++ new/kdebase-4.2.3/apps/plasma/applets/folderview/proxymodel.cpp 2009-04-30 11:11:50.000000000 +0200 @@ -25,7 +25,7 @@ ProxyModel::ProxyModel(QObject *parent) - : QSortFilterProxyModel(parent), m_sortDirsFirst(true) + : QSortFilterProxyModel(parent), m_filterMode(NoFilter), m_sortDirsFirst(true) { setSupportedDragActions(Qt::CopyAction | Qt::MoveAction | Qt::LinkAction); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠Hilbert.suse.de