Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at Tue Aug 4 22:40:18 CEST 2009. -------- --- KDE/kdebase4/kdebase4.changes 2009-07-25 18:27:31.000000000 +0200 +++ kdebase4/kdebase4.changes 2009-07-29 18:06:06.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 29 18:06:02 CEST 2009 - dmueller@suse.de + +- update to 4.3.0 + * see http://kde.org/announcements/4.3 for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdebase-4.2.98.tar.bz2 New: ---- kdebase-4.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.rQn0uD/_old 2009-08-04 22:39:57.000000000 +0200 +++ /var/tmp/diff_new_pack.rQn0uD/_new 2009-08-04 22:39:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4 (Version 4.2.98) +# spec file for package kdebase4 (Version 4.3.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -32,8 +32,8 @@ Group: System/GUI/KDE Summary: The Base KDE Apps Url: http://www.kde.org/ -Version: 4.2.98 -Release: 2 +Version: 4.3.0 +Release: 1 Source0: kdebase-%version.tar.bz2 Source2: rpmlintrc Source4: konsolesu.desktop ++++++ kdebase-4.2.98.tar.bz2 -> kdebase-4.3.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/CMakeLists.txt new/kdebase-4.3.0/apps/CMakeLists.txt --- old/kdebase-4.2.98/apps/CMakeLists.txt 2009-07-21 17:18:25.000000000 +0200 +++ new/kdebase-4.3.0/apps/CMakeLists.txt 2009-07-29 13:10:36.000000000 +0200 @@ -4,8 +4,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ) #search packages used by KDE -set(KDE_MIN_VERSION "4.2.98") # for the < 4.2 macro -find_package(KDE4 4.2.98 REQUIRED) +set(KDE_MIN_VERSION "4.3.0") # for the < 4.2 macro +find_package(KDE4 4.3.0 REQUIRED) find_package(Strigi REQUIRED) find_package(ZLIB REQUIRED) include (KDE4Defaults) Files old/kdebase-4.2.98/apps/doc/dolphin/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/dolphin/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kinfocenter/devices/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kinfocenter/devices/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kinfocenter/dma/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kinfocenter/dma/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kinfocenter/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kinfocenter/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kinfocenter/interrupts/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kinfocenter/interrupts/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kinfocenter/ioports/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kinfocenter/ioports/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kinfocenter/memory/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kinfocenter/memory/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kinfocenter/nics/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kinfocenter/nics/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kinfocenter/opengl/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kinfocenter/opengl/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kinfocenter/partitions/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kinfocenter/partitions/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kinfocenter/pci/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kinfocenter/pci/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kinfocenter/processor/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kinfocenter/processor/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kinfocenter/protocols/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kinfocenter/protocols/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kinfocenter/samba/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kinfocenter/samba/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kinfocenter/scsi/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kinfocenter/scsi/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kinfocenter/sound/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kinfocenter/sound/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kinfocenter/usb/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kinfocenter/usb/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kinfocenter/xserver/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kinfocenter/xserver/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/konqueror/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/konqueror/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/konsole/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/konsole/index.cache.bz2 differ Files old/kdebase-4.2.98/apps/doc/kwrite/index.cache.bz2 and new/kdebase-4.3.0/apps/doc/kwrite/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/dolphin/src/dolphin.desktop new/kdebase-4.3.0/apps/dolphin/src/dolphin.desktop --- old/kdebase-4.2.98/apps/dolphin/src/dolphin.desktop 2009-07-08 16:44:42.000000000 +0200 +++ new/kdebase-4.3.0/apps/dolphin/src/dolphin.desktop 2009-07-29 21:44:51.000000000 +0200 @@ -10,6 +10,7 @@ Name[mai]=डाल्फिन Name[mk]=Делфин Name[ml]=ഡോള്ഫിന് +Name[nb]='Dolphin Name[ne]=डल्फिन Name[or]=ଡଲଫିନ Name[pa]=ਡਾਲਫਿਨ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/dolphin/src/dolphincontextmenu.cpp new/kdebase-4.3.0/apps/dolphin/src/dolphincontextmenu.cpp --- old/kdebase-4.2.98/apps/dolphin/src/dolphincontextmenu.cpp 2009-05-27 21:53:20.000000000 +0200 +++ new/kdebase-4.3.0/apps/dolphin/src/dolphincontextmenu.cpp 2009-07-29 21:56:11.000000000 +0200 @@ -265,7 +265,7 @@ popup->addAction(pasteAction); // setup 'View Mode' menu - KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode")); + KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode"), popup); QAction* iconsMode = m_mainWindow->actionCollection()->action("icons"); viewModeMenu->addAction(iconsMode); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/kappfinder/apps/Games/Arcade/FrozenBubble.desktop new/kdebase-4.3.0/apps/kappfinder/apps/Games/Arcade/FrozenBubble.desktop --- old/kdebase-4.2.98/apps/kappfinder/apps/Games/Arcade/FrozenBubble.desktop 2009-07-21 17:18:13.000000000 +0200 +++ new/kdebase-4.3.0/apps/kappfinder/apps/Games/Arcade/FrozenBubble.desktop 2009-07-29 13:10:36.000000000 +0200 @@ -67,8 +67,8 @@ GenericName[si]=Tetris-Like ක්රීඩාව GenericName[sk]=Hra v štýle Tetris GenericName[sl]=Igra podobna Tetrisu -GenericName[sr]=Игра налик на Тетрис -GenericName[sr@latin]=Igra nalik na Tetris +GenericName[sr]=Игра налик на тетрис +GenericName[sr@latin]=Igra nalik na tetris GenericName[sv]=Tetrisliknande spel GenericName[ta]=டெட்ரிஸ்-போன்ற விளையாட்டு GenericName[te]=టెట్రిస్ లాంటి ఆట diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/konqueror/kfmclient.desktop new/kdebase-4.3.0/apps/konqueror/kfmclient.desktop --- old/kdebase-4.2.98/apps/konqueror/kfmclient.desktop 2009-03-10 13:24:09.000000000 +0100 +++ new/kdebase-4.3.0/apps/konqueror/kfmclient.desktop 2009-07-29 13:10:36.000000000 +0200 @@ -6,6 +6,7 @@ Terminal=false InitialPreference=9 NoDisplay=true +StartupNotificaton=false Name=Konqueror Name[ar]=كونكيور Name[bn]=কনকরার diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/konqueror/settings/kio/uasproviders/android10.desktop new/kdebase-4.3.0/apps/konqueror/settings/kio/uasproviders/android10.desktop --- old/kdebase-4.2.98/apps/konqueror/settings/kio/uasproviders/android10.desktop 2009-07-21 17:18:19.000000000 +0200 +++ new/kdebase-4.3.0/apps/konqueror/settings/kio/uasproviders/android10.desktop 2009-07-29 13:10:36.000000000 +0200 @@ -8,6 +8,7 @@ Name[da]=Brugeragentbeskrivelse (Android Phone 1.0) Name[de]=Programmkennung (Android Phone 1.0) Name[el]=Περιγραφή UA (Android Phone 1.0) +Name[es]=UADescription (Android Phone< 1.0) Name[et]=UADescription (Android telefon 1.0) Name[fi]=Käyttäjäagenttikuvaus (Android Phone 1.0) Name[fy]=UA-beskriuwing (Android Phone 1.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/konqueror/settings/kio/uasproviders/chrome10onwinnt51.desktop new/kdebase-4.3.0/apps/konqueror/settings/kio/uasproviders/chrome10onwinnt51.desktop --- old/kdebase-4.2.98/apps/konqueror/settings/kio/uasproviders/chrome10onwinnt51.desktop 2009-07-21 17:18:19.000000000 +0200 +++ new/kdebase-4.3.0/apps/konqueror/settings/kio/uasproviders/chrome10onwinnt51.desktop 2009-07-29 13:10:36.000000000 +0200 @@ -10,6 +10,7 @@ Name[da]=Brugeragentbeskrivelse (Google Chrome 1.0 på Windows XP) Name[de]=Browserkennung (Google Chrome 1.0 unter Windows XP) Name[el]=Περιγραφή UA (Google Chrome 1.0 σε Windows XP) +Name[es]=UADescription (Google Chrome 1.0 en Windows XP) Name[et]=UADescription (Google Chrome 1.0 Windows XP platvormil) Name[eu]=UADescription (Google Chrome 1.0 Windows XPn) Name[fi]=Käyttäjäagenttikuvaus (Google Chrome 1.0 Windows XP:llä) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop new/kdebase-4.3.0/apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop --- old/kdebase-4.2.98/apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop 2009-07-21 17:18:19.000000000 +0200 +++ new/kdebase-4.3.0/apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop 2009-07-29 13:10:36.000000000 +0200 @@ -10,6 +10,7 @@ Name[da]=Brugeragentbeskrivelse (Firefox 3.0 på nuværende) Name[de]=Browserkennung (Firefox 3.0 unter aktuellem Betriebssystem) Name[el]=Περιγραφή UA (Firefox 3.0 στο τρέχον σύστημα) +Name[es]=UADescription (Firefox 3.0 en actual) Name[et]=UADescription (Selles masinas töötav Firefox 3.0) Name[eu]=UADescription (Firefox 3.0 unekoan) Name[fi]=Käyttäjäagenttikuvaus (Firefox 3.0 nykyisellä) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/konqueror/settings/kio/uasproviders/ie70onwinnt51.desktop new/kdebase-4.3.0/apps/konqueror/settings/kio/uasproviders/ie70onwinnt51.desktop --- old/kdebase-4.2.98/apps/konqueror/settings/kio/uasproviders/ie70onwinnt51.desktop 2009-07-21 17:18:19.000000000 +0200 +++ new/kdebase-4.3.0/apps/konqueror/settings/kio/uasproviders/ie70onwinnt51.desktop 2009-07-29 13:10:36.000000000 +0200 @@ -10,6 +10,7 @@ Name[da]=Brugeragentbeskrivelse (IE 7.0 på Win XP) Name[de]=Browserkennung (IE 7.0 unter Windows XP) Name[el]=Περιγραφή UA (IE 7.0 σε Win XP) +Name[es]=UADescription (IE 7.0 en Win XP) Name[et]=UADescription (IE 7.0 Win XP platvormil) Name[eu]=UADescription (IE 7.0 Win XP-n) Name[fi]=Käyttäjäagenttikuvaus (IE 7.0 Win XP:llä) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/konqueror/settings/kio/uasproviders/op962oncurrent.desktop new/kdebase-4.3.0/apps/konqueror/settings/kio/uasproviders/op962oncurrent.desktop --- old/kdebase-4.2.98/apps/konqueror/settings/kio/uasproviders/op962oncurrent.desktop 2009-07-21 17:18:19.000000000 +0200 +++ new/kdebase-4.3.0/apps/konqueror/settings/kio/uasproviders/op962oncurrent.desktop 2009-07-29 13:10:36.000000000 +0200 @@ -10,6 +10,7 @@ Name[da]=Brugeragentbeskrivelse (Opera 9.62 på nuværende) Name[de]=Browserkennung (Opera 9.62 unter aktuellem Betriebssystem) Name[el]=Περιγραφή UA (Opera 9.62 στο τρέχον σύστημα) +Name[es]=UADescription (Opera 9.62 en actual) Name[et]=UADescription (Selles masinas töötav Opera 9.62) Name[eu]=UADescription (Opera 9.62 unekoan) Name[fi]=Käyttäjäagenttikuvaus (Opera 9.62 nykyisellä) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/konqueror/settings/kio/uasproviders/safari30oniphone.desktop new/kdebase-4.3.0/apps/konqueror/settings/kio/uasproviders/safari30oniphone.desktop --- old/kdebase-4.2.98/apps/konqueror/settings/kio/uasproviders/safari30oniphone.desktop 2009-07-21 17:18:19.000000000 +0200 +++ new/kdebase-4.3.0/apps/konqueror/settings/kio/uasproviders/safari30oniphone.desktop 2009-07-29 13:10:36.000000000 +0200 @@ -10,6 +10,7 @@ Name[da]=Brugeragentbeskrivelse (Safari 3.0 på iPhone) Name[de]=Browserkennung (Safari 3.0 auf dem iPhone) Name[el]=Περιγραφή UA (Safari 3.0 σε iPhone) +Name[es]=UADescription (Safari 3.0 en iPhone) Name[et]=UADescription (Safari 3.0 iPhone platvormil) Name[eu]=UADescription (Safari 3.0 iPhonen) Name[fi]=Käyttäjäagenttikuvaus (Safari 3.0 iPhonella) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/konqueror/settings/kio/uasproviders/safari32.desktop new/kdebase-4.3.0/apps/konqueror/settings/kio/uasproviders/safari32.desktop --- old/kdebase-4.2.98/apps/konqueror/settings/kio/uasproviders/safari32.desktop 2009-07-21 17:18:19.000000000 +0200 +++ new/kdebase-4.3.0/apps/konqueror/settings/kio/uasproviders/safari32.desktop 2009-07-29 13:10:36.000000000 +0200 @@ -10,6 +10,7 @@ Name[da]=Brugeragentbeskrivelse (Safari 3.2 på MacOS X) Name[de]=Browserkennung (Safari 3.2 unter MacOS X) Name[el]=Περιγραφή UA (Safari 3.2 σε MacOS X) +Name[es]=UADescription (Safari 3.2 en MacOS X) Name[et]=UADescription (Safari 3.2 MacOS X platvormil) Name[eu]=UADescription (Safari 3.2 MacOS Xn) Name[fi]=Käyttäjäagenttikuvaus (Safari 3.2 MacOS X:llä) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/konqueror/settings/konqhtml/generalopts.cpp new/kdebase-4.3.0/apps/konqueror/settings/konqhtml/generalopts.cpp --- old/kdebase-4.2.98/apps/konqueror/settings/konqhtml/generalopts.cpp 2009-01-16 16:05:02.000000000 +0100 +++ new/kdebase-4.3.0/apps/konqueror/settings/konqhtml/generalopts.cpp 2009-07-29 13:10:36.000000000 +0200 @@ -169,7 +169,7 @@ tabOptions->m_pNewTabsInBackground->setChecked( ! (cg.readEntry( "NewTabsInFront", false)) ); tabOptions->m_pOpenAfterCurrentPage->setChecked( cg.readEntry( "OpenAfterCurrentPage", false) ); - tabOptions->m_pPermanentCloseButton->setChecked( cg.readEntry( "PermanentCloseButton", false) ); + tabOptions->m_pPermanentCloseButton->setChecked( cg.readEntry( "PermanentCloseButton", true) ); tabOptions->m_pKonquerorTabforExternalURL->setChecked( cg.readEntry( "KonquerorTabforExternalURL", false) ); tabOptions->m_pPopupsWithinTabs->setChecked( cg.readEntry( "PopupsWithinTabs", false) ); tabOptions->m_pTabCloseActivatePrevious->setChecked( cg.readEntry( "TabCloseActivatePrevious", false) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/kwrite/kwritemain.cpp new/kdebase-4.3.0/apps/kwrite/kwritemain.cpp --- old/kdebase-4.2.98/apps/kwrite/kwritemain.cpp 2009-05-06 12:13:38.000000000 +0200 +++ new/kdebase-4.3.0/apps/kwrite/kwritemain.cpp 2009-07-29 13:10:36.000000000 +0200 @@ -196,9 +196,12 @@ void KWrite::setupStatusBar() { // statusbar stuff + QString lineColText = i18nc("@info:status Statusbar label for cursor line and column position", + " Line: %1 Col: %2 ", 4444, 44); + m_lineColLabel = new QLabel( statusBar() ); + m_lineColLabel->setMinimumWidth( m_lineColLabel->fontMetrics().width( lineColText ) ); statusBar()->addWidget( m_lineColLabel, 0 ); - m_lineColLabel->setAlignment( Qt::AlignCenter ); m_modifiedLabel = new QLabel( statusBar() ); m_modifiedLabel->setFixedSize( 16, 16 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/lib/konq/konqdndpopupmenuplugin.desktop new/kdebase-4.3.0/apps/lib/konq/konqdndpopupmenuplugin.desktop --- old/kdebase-4.2.98/apps/lib/konq/konqdndpopupmenuplugin.desktop 2009-07-21 17:18:24.000000000 +0200 +++ new/kdebase-4.3.0/apps/lib/konq/konqdndpopupmenuplugin.desktop 2009-07-29 13:10:36.000000000 +0200 @@ -12,6 +12,7 @@ Comment[da]=Træk og slip-plugin til Konquerors popop-menu. Comment[de]=Erweiterung für Ziehen und Ablegen im Aufklapp-Menü von Konqueror Comment[el]=Πρόσθετο συρσίματος και ελευθέρωσης για το αναδυόμενο μενού του Konqueror. +Comment[es]=Complemento de pulsar y arrastrar para el menú emergente de Konqueror. Comment[et]=Konquerori hüpikmenüü lohistamisplugin. Comment[fr]=Module externe de glisser-déposer pour le menu de contexte de Konqueror Comment[fy]=Sleep plugin foar de Konqueror popup menu. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/plasma/applets/folderview/folderview.cpp new/kdebase-4.3.0/apps/plasma/applets/folderview/folderview.cpp --- old/kdebase-4.2.98/apps/plasma/applets/folderview/folderview.cpp 2009-06-23 13:14:28.000000000 +0200 +++ new/kdebase-4.3.0/apps/plasma/applets/folderview/folderview.cpp 2009-07-29 21:56:11.000000000 +0200 @@ -1602,16 +1602,21 @@ #endif } -KUrl::List FolderView::selectedUrls() const +KUrl::List FolderView::selectedUrls(bool forTrash) const { KUrl::List urls; foreach (const QModelIndex &index, m_selectionModel->selectedIndexes()) { KFileItem item = m_model->itemForIndex(index); - // Prefer the local URL if there is one, since we can't trash remote URL's - const QString path = item.localPath(); - if (!path.isEmpty()) { - urls.append(path); + + if (forTrash) { + // Prefer the local URL if there is one, since we can't trash remote URL's + const QString path = item.localPath(); + if (!path.isEmpty()) { + urls.append(path); + } else { + urls.append(item.url()); + } } else { urls.append(item.url()); } @@ -1639,7 +1644,7 @@ void FolderView::pasteTo() { - const KUrl::List urls = selectedUrls(); + const KUrl::List urls = selectedUrls(false); Q_ASSERT(urls.count() == 1); KonqOperations::doPaste(view(), urls.first()); } @@ -1745,7 +1750,7 @@ KonqOperations::Operation op = (modifiers & Qt::ShiftModifier) ? KonqOperations::DEL : KonqOperations::TRASH; - KonqOperations::del(view(), op, selectedUrls()); + KonqOperations::del(view(), op, selectedUrls(op == KonqOperations::TRASH)); } void FolderView::deleteSelectedIcons() @@ -1754,7 +1759,7 @@ return; } - KonqOperations::del(view(), KonqOperations::DEL, selectedUrls()); + KonqOperations::del(view(), KonqOperations::DEL, selectedUrls(false)); } void FolderView::renameSelectedIcon() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/plasma/applets/folderview/folderview.h new/kdebase-4.3.0/apps/plasma/applets/folderview/folderview.h --- old/kdebase-4.2.98/apps/plasma/applets/folderview/folderview.h 2009-06-03 13:54:12.000000000 +0200 +++ new/kdebase-4.3.0/apps/plasma/applets/folderview/folderview.h 2009-07-29 21:56:11.000000000 +0200 @@ -161,7 +161,7 @@ void updateListViewState(); void updateIconViewState(); void saveIconPositions() const; - KUrl::List selectedUrls() const; + KUrl::List selectedUrls(bool forTrash) const; void showContextMenu(QWidget *widget, const QPoint &pos, const QModelIndexList &indexes); void timerEvent(QTimerEvent *event); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/plasma/applets/folderview/iconview.cpp new/kdebase-4.3.0/apps/plasma/applets/folderview/iconview.cpp --- old/kdebase-4.2.98/apps/plasma/applets/folderview/iconview.cpp 2009-06-09 18:07:31.000000000 +0200 +++ new/kdebase-4.3.0/apps/plasma/applets/folderview/iconview.cpp 2009-07-29 13:10:36.000000000 +0200 @@ -82,7 +82,8 @@ m_flow(layoutDirection() == Qt::LeftToRight ? LeftToRight : RightToLeft), m_popupCausedWidget(0), m_dropOperation(0), - m_dropActions(0) + m_dropActions(0), + m_editorProxy(0) { setAcceptHoverEvents(true); setAcceptDrops(true); @@ -90,6 +91,7 @@ setFocusPolicy(Qt::StrongFocus); m_scrollBar->hide(); + connect(m_scrollBar, SIGNAL(valueChanged(int)), SLOT(repositionWidgetsManually())); int size = style()->pixelMetric(QStyle::PM_LargeIconSize); m_iconSize = QSize(size, size); @@ -1172,11 +1174,12 @@ QWidget *editor = m_delegate->createEditor(0, option, index); editor->setAttribute(Qt::WA_NoSystemBackground); editor->installEventFilter(m_delegate); + m_delegate->updateEditorGeometry(editor, option, index); - QGraphicsProxyWidget *proxy = new QGraphicsProxyWidget(this); - proxy->setWidget(editor); + m_editorProxy = new QGraphicsProxyWidget(this); + m_editorProxy->setWidget(editor); + m_editorProxy->setPos(mapFromViewport(editor->pos())); - m_delegate->updateEditorGeometry(editor, option, index); m_delegate->setEditorData(editor, index); editor->show(); @@ -1263,6 +1266,19 @@ } } +void IconView::repositionWidgetsManually() +{ + if (m_editorProxy) { + QWidget *editor = m_editorProxy->widget(); + QModelIndex index = m_selectionModel->currentIndex(); + const QRect rect = visualRect(index); + QStyleOptionViewItemV4 option = viewOptions(); + option.rect = rect; + m_delegate->updateEditorGeometry(editor, option, index); + m_editorProxy->setPos(mapFromViewport(editor->pos())); + } +} + void IconView::focusInEvent(QFocusEvent *event) { Q_UNUSED(event) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/plasma/applets/folderview/iconview.h new/kdebase-4.3.0/apps/plasma/applets/folderview/iconview.h --- old/kdebase-4.2.98/apps/plasma/applets/folderview/iconview.h 2009-06-03 13:54:12.000000000 +0200 +++ new/kdebase-4.3.0/apps/plasma/applets/folderview/iconview.h 2009-07-29 13:10:36.000000000 +0200 @@ -174,6 +174,7 @@ void dropActionTriggered(QAction *action); void dropCompleted(); void statResult(KJob *job); + void repositionWidgetsManually(); private: void paintErrorMessage(QPainter *painter, const QRect &rect, const QString &message) const; @@ -235,6 +236,7 @@ KonqOperations *m_dropOperation; QActionGroup *m_dropActions; QPersistentModelIndex m_popupIndex; + QPointer<QGraphicsProxyWidget> m_editorProxy; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.2.98/apps/plasma/applets/folderview/plasma-applet-folderview.desktop new/kdebase-4.3.0/apps/plasma/applets/folderview/plasma-applet-folderview.desktop --- old/kdebase-4.2.98/apps/plasma/applets/folderview/plasma-applet-folderview.desktop 2009-07-21 17:18:25.000000000 +0200 +++ new/kdebase-4.3.0/apps/plasma/applets/folderview/plasma-applet-folderview.desktop 2009-07-29 13:10:36.000000000 +0200 @@ -83,6 +83,7 @@ Comment[da]=Vis indholdet af mapper (brugerens hjemmemappe som standard) Comment[de]=Ordnerinhalte anzeigen (Voreinstellung: Persönlicher Ordner) Comment[el]=Εμφάνιση περιεχομένων φακέλων (προκαθορισμένα ο προσωπικός φάκελος) +Comment[es]=Mostrar el contenido de las carpetas (Carpeta de usuario como predeterminado) Comment[et]=Kataloogide sisu näitamine (vaikimisi kasutaja kodukataloog) Comment[eu]=Bistaratu karpeten edukia (Erabiltzaileen etxe karpeta lehenetsi gisa) Comment[fi]=Näytä kansion sisällön (Oletuksena työpöytäkansio) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org