Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at Tue May 17 13:17:53 CEST 2011.
-------- --- KDE/kdebase4/kdebase4.changes 2011-04-01 14:11:18.000000000 +0200 +++ kdebase4/kdebase4.changes 2011-04-28 16:12:34.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 28 16:12:28 CEST 2011 - dmuel...@suse.de + +- update to 4.6.3 + * Bugfixes over KDE 4.6.2 + * see http://kde.org/announcements/changelogs/changelog4_6_2to4_6_3.php for details + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdebase-4.6.2.tar.bz2 New: ---- kdebase-4.6.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.xIu1KM/_old 2011-05-17 13:17:22.000000000 +0200 +++ /var/tmp/diff_new_pack.xIu1KM/_new 2011-05-17 13:17:22.000000000 +0200 @@ -18,7 +18,7 @@ Name: kdebase4 -Version: 4.6.2 +Version: 4.6.3 Release: 1 License: GPLv2+ Summary: The Base KDE Apps ++++++ kdebase-4.6.2.tar.bz2 -> kdebase-4.6.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/CMakeLists.txt new/kdebase-4.6.3/CMakeLists.txt --- old/kdebase-4.6.2/CMakeLists.txt 2011-03-04 10:42:37.000000000 +0100 +++ new/kdebase-4.6.3/CMakeLists.txt 2011-04-28 15:24:54.000000000 +0200 @@ -4,9 +4,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ) #search packages used by KDE -set(KDE_MIN_VERSION "4.6.1") +set(KDE_MIN_VERSION "4.6.3") set(SOPRANO_MIN_VERSION "2.5.63") -find_package(KDE4 4.6.1 REQUIRED) +find_package(KDE4 4.6.3 REQUIRED) find_package(Strigi REQUIRED) find_package(ZLIB REQUIRED) include (KDE4Defaults) @@ -32,11 +32,11 @@ if ( Q_WS_MAC ) add_subdirectory( kdepasswd ) - add_subdirectory( konsole ) + macro_optional_add_subdirectory( konsole ) endif ( Q_WS_MAC ) if ( Q_WS_X11 ) - add_subdirectory( konsole ) + macro_optional_add_subdirectory( konsole ) add_subdirectory( nsplugins ) add_subdirectory( kdepasswd ) endif ( Q_WS_X11 ) Files old/kdebase-4.6.2/doc/dolphin/index.cache.bz2 and new/kdebase-4.6.3/doc/dolphin/index.cache.bz2 differ Files old/kdebase-4.6.2/doc/kdepasswd/index.cache.bz2 and new/kdebase-4.6.3/doc/kdepasswd/index.cache.bz2 differ Files old/kdebase-4.6.2/doc/kfind/index.cache.bz2 and new/kdebase-4.6.3/doc/kfind/index.cache.bz2 differ Files old/kdebase-4.6.2/doc/konqueror/index.cache.bz2 and new/kdebase-4.6.3/doc/konqueror/index.cache.bz2 differ Files old/kdebase-4.6.2/doc/kwrite/index.cache.bz2 and new/kdebase-4.6.3/doc/kwrite/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/dolphin/src/dolphinmainwindow.cpp new/kdebase-4.6.3/dolphin/src/dolphinmainwindow.cpp --- old/kdebase-4.6.2/dolphin/src/dolphinmainwindow.cpp 2011-02-25 23:33:12.000000000 +0100 +++ new/kdebase-4.6.3/dolphin/src/dolphinmainwindow.cpp 2011-04-28 15:15:36.000000000 +0200 @@ -1513,7 +1513,7 @@ connect(m_recentTabsMenu->menu(), SIGNAL(triggered(QAction *)), this, SLOT(restoreClosedTab(QAction *))); - QAction* action = new QAction("Empty Recently Closed Tabs", m_recentTabsMenu); + QAction* action = new QAction(i18n("Empty Recently Closed Tabs"), m_recentTabsMenu); action->setIcon(KIcon("edit-clear-list")); action->setData(QVariant::fromValue(true)); m_recentTabsMenu->addAction(action); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/dolphin/src/panels/terminal/terminalpanel.cpp new/kdebase-4.6.3/dolphin/src/panels/terminal/terminalpanel.cpp --- old/kdebase-4.6.2/dolphin/src/panels/terminal/terminalpanel.cpp 2011-02-25 23:33:12.000000000 +0100 +++ new/kdebase-4.6.3/dolphin/src/panels/terminal/terminalpanel.cpp 2011-04-28 15:15:36.000000000 +0200 @@ -19,6 +19,8 @@ #include "terminalpanel.h" +#include <signal.h> + #include <kpluginloader.h> #include <kpluginfactory.h> #include <kde_terminal_interface_v2.h> @@ -115,11 +117,8 @@ // The TerminalV2 interface does not provide a way to delete the // current line before sending a new input. This is mandatory, // otherwise sending a 'cd x' to a existing 'rm -rf *' might - // result in data loss. As workaround Ctrl+C is send. - QString cancel; - cancel.append(QChar(3)); - cancel.append(QChar('c')); - m_terminal->sendInput(cancel); + // result in data loss. As workaround SIGINT is send. + kill(m_terminal->terminalProcessId(), SIGINT); } m_terminal->sendInput("cd " + KShell::quoteArg(dir) + '\n'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/dolphin/src/views/dolphinfileitemdelegate.cpp new/kdebase-4.6.3/dolphin/src/views/dolphinfileitemdelegate.cpp --- old/kdebase-4.6.2/dolphin/src/views/dolphinfileitemdelegate.cpp 2011-03-04 10:42:02.000000000 +0100 +++ new/kdebase-4.6.3/dolphin/src/views/dolphinfileitemdelegate.cpp 2011-04-28 15:15:36.000000000 +0200 @@ -22,6 +22,7 @@ #include "dolphinmodel.h" #include <kcolorscheme.h> #include <kfileitem.h> +#include <kglobalsettings.h> #include <kicon.h> #include <kiconloader.h> #include <kstringhandler.h> @@ -37,9 +38,11 @@ KFileItemDelegate(parent), m_hasMinimizedNameColumn(false), m_cachedSize(), - m_cachedEmblems() + m_cachedEmblems(), + m_cachedInactiveTextColorDirty(true) { setJobTransfersVisible(true); + connect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()), this, SLOT(handleDisplayPaletteChange())); } DolphinFileItemDelegate::~DolphinFileItemDelegate() @@ -63,8 +66,11 @@ // Use the inactive text color for all columns except the name column. This indicates for the user that // hovering other columns does not change the actions context. QPalette palette = opt.palette; - const QColor textColor = KColorScheme(QPalette::Active).foreground(KColorScheme::InactiveText).color(); - palette.setColor(QPalette::Text, textColor); + if (m_cachedInactiveTextColorDirty) { + m_cachedInactiveTextColor = KColorScheme(QPalette::Active).foreground(KColorScheme::InactiveText).color(); + m_cachedInactiveTextColorDirty = false; + } + palette.setColor(QPalette::Text, m_cachedInactiveTextColor); opt.palette = palette; } @@ -102,6 +108,11 @@ return width; } +void DolphinFileItemDelegate::handleDisplayPaletteChange() +{ + m_cachedInactiveTextColorDirty = true; +} + void DolphinFileItemDelegate::adjustOptionWidth(QStyleOptionViewItemV4& option, const QAbstractProxyModel* proxyModel, const DolphinModel* dolphinModel, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/dolphin/src/views/dolphinfileitemdelegate.h new/kdebase-4.6.3/dolphin/src/views/dolphinfileitemdelegate.h --- old/kdebase-4.6.2/dolphin/src/views/dolphinfileitemdelegate.h 2011-02-25 23:33:12.000000000 +0100 +++ new/kdebase-4.6.3/dolphin/src/views/dolphinfileitemdelegate.h 2011-04-28 15:15:36.000000000 +0200 @@ -37,6 +37,7 @@ */ class DolphinFileItemDelegate : public KFileItemDelegate { + Q_OBJECT public: explicit DolphinFileItemDelegate(QObject* parent = 0); virtual ~DolphinFileItemDelegate(); @@ -60,6 +61,9 @@ */ static int nameColumnWidth(const QString& name, const QStyleOptionViewItem& option); +private slots: + void handleDisplayPaletteChange(); + private: static void adjustOptionWidth(QStyleOptionViewItemV4& option, const QAbstractProxyModel* proxyModel, @@ -75,6 +79,8 @@ bool m_hasMinimizedNameColumn; mutable QSize m_cachedSize; mutable QPixmap m_cachedEmblems[KVersionControlPlugin::LocallyModifiedUnstagedVersion + 1]; + mutable QColor m_cachedInactiveTextColor; + mutable bool m_cachedInactiveTextColorDirty; }; inline void DolphinFileItemDelegate::setMinimizedNameColumn(bool minimized) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/kfind/kfind.desktop new/kdebase-4.6.3/kfind/kfind.desktop --- old/kdebase-4.6.2/kfind/kfind.desktop 2011-02-25 23:33:12.000000000 +0100 +++ new/kdebase-4.6.3/kfind/kfind.desktop 2011-04-28 15:15:36.000000000 +0200 @@ -83,7 +83,7 @@ Name[te]=దస్త్రాలు/ఫొల్డర్లను వెతుకు Name[tg]=Ҷустуҷӯи файлҳо/феҳристҳо Name[th]=ค้นหาแฟ้ม/โฟลเดอร์ -Name[tr]=Dosya / Dizin Bul +Name[tr]=Dosya/Klasör Bul Name[uk]=Пошук файлів та тек Name[uz]=Fayl/jildlarni qidirish Name[uz@cyrillic]=Файл/жилдларни қидириш diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/konqueror/Home.desktop new/kdebase-4.6.3/konqueror/Home.desktop --- old/kdebase-4.6.2/konqueror/Home.desktop 2011-02-25 22:55:12.000000000 +0100 +++ new/kdebase-4.6.3/konqueror/Home.desktop 2011-04-28 15:15:36.000000000 +0200 @@ -85,7 +85,7 @@ Name[te]=ఇల్లు Name[tg]=Компютер Name[th]=พื้นที่ส่วนตัว -Name[tr]=Ev Dizini +Name[tr]=Ev Klasörü Name[uk]=Домівка Name[uz]=Uy Name[uz@cyrillic]=Уй diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/konqueror/kttsplugin/khtmlkttsd.cpp new/kdebase-4.6.3/konqueror/kttsplugin/khtmlkttsd.cpp --- old/kdebase-4.6.2/konqueror/kttsplugin/khtmlkttsd.cpp 2011-02-25 23:33:12.000000000 +0100 +++ new/kdebase-4.6.3/konqueror/kttsplugin/khtmlkttsd.cpp 2011-04-28 15:15:36.000000000 +0200 @@ -94,9 +94,9 @@ } K_PLUGIN_FACTORY(KHTMLPluginKTTSDFactory, - const KService::List offers = KServiceTypeTrader::self()->query("DBUS/Text-to-Speech", "Name == 'KTTSD'"); + const KService::Ptr kttsd = KService::serviceByDesktopName("kttsd"); // If KTTSD is not installed, don't create the plugin at all. - if (!offers.isEmpty()) { + if (kttsd) { registerPlugin<KHTMLPluginKTTSD>(); } ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/konqueror/sidebar/default_entries/home.desktop new/kdebase-4.6.3/konqueror/sidebar/default_entries/home.desktop --- old/kdebase-4.6.2/konqueror/sidebar/default_entries/home.desktop 2011-02-25 22:55:12.000000000 +0100 +++ new/kdebase-4.6.3/konqueror/sidebar/default_entries/home.desktop 2011-04-28 15:15:36.000000000 +0200 @@ -83,7 +83,7 @@ Name[te]=ఇంటి ఫొల్డర్ Name[tg]=Феҳристи хонагӣ Name[th]=โฟลเดอร์ส่วนตัว -Name[tr]=Ev Dizini +Name[tr]=Ev Klasörü Name[uk]=Домашня тека Name[uz]=Uy jildi Name[uz@cyrillic]=Уй жилди @@ -171,7 +171,7 @@ Comment[te]=ఈ సంచయం మీ వ్యక్తిగత దస్త్రములను కలిగివుంది Comment[tg]=Ҷузвдони файлҳои шахсӣ Comment[th]=โฟลเดอร์นี้บรรจุแฟ้มส่วนตัวต่าง ๆ ของคุณ -Comment[tr]=Bu dizin kişisel dosyalarınızı içerir +Comment[tr]=Bu klasör kişisel dosyalarınızı içerir Comment[uk]=Ця тека містить ваші особисті файли Comment[uz]=Bu jild sizning shaxsiy fayllaringizdan iborat Comment[uz@cyrillic]=Бу жилд сизнинг шахсий файлларингиздан иборат diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/konqueror/sidebar/default_entries/places.desktop new/kdebase-4.6.3/konqueror/sidebar/default_entries/places.desktop --- old/kdebase-4.6.2/konqueror/sidebar/default_entries/places.desktop 2011-02-25 22:55:12.000000000 +0100 +++ new/kdebase-4.6.3/konqueror/sidebar/default_entries/places.desktop 2011-04-28 15:15:36.000000000 +0200 @@ -99,7 +99,7 @@ Comment[hu]=A helyek listája. Comment[ia]=Isto es le lista de placias Comment[id]=Ini adalah senarai tempat. -Comment[is]=Þetta er listi yfir staði á skráarkerfisinu. +Comment[is]=Þetta er listi yfir staði á skráakerfisinu. Comment[it]=Questo è l'elenco di risorse. Comment[ja]=場所の一覧です。 Comment[kk]=Орындар тізімі. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/konqueror/sidebar/default_entries/root.desktop new/kdebase-4.6.3/konqueror/sidebar/default_entries/root.desktop --- old/kdebase-4.6.2/konqueror/sidebar/default_entries/root.desktop 2011-02-25 22:55:12.000000000 +0100 +++ new/kdebase-4.6.3/konqueror/sidebar/default_entries/root.desktop 2011-04-28 15:15:36.000000000 +0200 @@ -82,7 +82,7 @@ Name[te]=రూట్ ఫొల్డర్ Name[tg]=Феҳристи Root Name[th]=โฟลเดอร์ราก -Name[tr]=Kök Dizini +Name[tr]=Kök Klasörü Name[uk]=Коренева тека Name[uz]=Tub jildi Name[uz@cyrillic]=Туб жилди @@ -129,7 +129,7 @@ Comment[hu]=Ez a fájlrendszer gyökere Comment[ia]=Isto es le radice del systema de file Comment[id]=Ini adalah root sistem berkas -Comment[is]=Þetta er rót skráarkerfisins +Comment[is]=Þetta er rót skráakerfisins Comment[it]=Questa è la radice del filesystem Comment[ja]=ファイルシステムのルートです Comment[ka]=ფაილური სისტემუს ძირეული საქაღალდე diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/konqueror/sidebar/trees/init/dirtree_module.desktop new/kdebase-4.6.3/konqueror/sidebar/trees/init/dirtree_module.desktop --- old/kdebase-4.6.2/konqueror/sidebar/trees/init/dirtree_module.desktop 2011-02-25 22:55:12.000000000 +0100 +++ new/kdebase-4.6.3/konqueror/sidebar/trees/init/dirtree_module.desktop 2011-04-28 15:15:36.000000000 +0200 @@ -83,7 +83,7 @@ Name[te]=ఫొల్డర్ Name[tg]=Феҳрист Name[th]=โฟลเดอร์ -Name[tr]=Dizin +Name[tr]=Klasör Name[uk]=Тека Name[uz]=Jild Name[uz@cyrillic]=Жилд diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/konqueror/sidebar/trees/konqsidebar_tree.desktop new/kdebase-4.6.3/konqueror/sidebar/trees/konqsidebar_tree.desktop --- old/kdebase-4.6.2/konqueror/sidebar/trees/konqsidebar_tree.desktop 2011-02-25 22:55:12.000000000 +0100 +++ new/kdebase-4.6.3/konqueror/sidebar/trees/konqsidebar_tree.desktop 2011-04-28 15:15:36.000000000 +0200 @@ -82,7 +82,7 @@ Name[te]=ఫొల్డర్ Name[tg]=Феҳрист Name[th]=โฟลเดอร์ -Name[tr]=Dizin +Name[tr]=Klasör Name[uk]=Тека Name[uz]=Jild Name[uz@cyrillic]=Жилд diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/konsole/src/Application.cpp new/kdebase-4.6.3/konsole/src/Application.cpp --- old/kdebase-4.6.2/konsole/src/Application.cpp 2011-02-28 13:50:53.000000000 +0100 +++ new/kdebase-4.6.3/konsole/src/Application.cpp 2011-04-28 15:15:31.000000000 +0200 @@ -96,7 +96,7 @@ while ( iter.hasNext() ) { QFileInfo info(iter.next()); - std::cout << info.baseName().toLocal8Bit().data() << std::endl; + std::cout << info.completeBaseName().toLocal8Bit().data() << std::endl; } quit(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/konsole/src/MainWindow.cpp new/kdebase-4.6.3/konsole/src/MainWindow.cpp --- old/kdebase-4.6.2/konsole/src/MainWindow.cpp 2011-02-28 13:50:53.000000000 +0100 +++ new/kdebase-4.6.3/konsole/src/MainWindow.cpp 2011-04-28 15:15:31.000000000 +0200 @@ -346,9 +346,19 @@ QString MainWindow::activeSessionDir() const { if ( _pluggedController ) + { + if ( Session* session = _pluggedController->session() ) + { + // For new tabs to get the correct working directory, + // force the updating of the currentWorkingDirectory. + session->getDynamicTitle(); + } return _pluggedController->currentDir(); + } else + { return QString(); + } } void MainWindow::openUrls(const QList<KUrl>& urls) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/konsole/src/Session.h new/kdebase-4.6.3/konsole/src/Session.h --- old/kdebase-4.6.2/konsole/src/Session.h 2011-04-01 20:35:03.000000000 +0200 +++ new/kdebase-4.6.3/konsole/src/Session.h 2011-04-28 15:15:31.000000000 +0200 @@ -376,7 +376,8 @@ * then the terminal connection (the pty) is closed and Konsole waits for the * process to exit. */ - Q_SCRIPTABLE void close(); + //Q_SCRIPTABLE void close(); // This cause the menu issues bko 185466 + void close(); /** * Changes the session title or other customizable aspects of the terminal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/konsole/src/SessionManager.cpp new/kdebase-4.6.3/konsole/src/SessionManager.cpp --- old/kdebase-4.6.2/konsole/src/SessionManager.cpp 2011-02-28 13:50:53.000000000 +0100 +++ new/kdebase-4.6.3/konsole/src/SessionManager.cpp 2011-04-28 15:15:31.000000000 +0200 @@ -132,7 +132,11 @@ // add a suggested suffix and relative prefix if missing QFileInfo fileInfo(path); - if ( fileInfo.suffix().isEmpty() ) + + if (fileInfo.isDir()) + return Profile::Ptr(); + + if ( fileInfo.suffix() != "profile" ) path.append(".profile"); if ( fileInfo.path().isEmpty() || fileInfo.path() == "." ) path.prepend(QString("konsole")+QDir::separator()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/konsole/src/ViewContainer.cpp new/kdebase-4.6.3/konsole/src/ViewContainer.cpp --- old/kdebase-4.6.2/konsole/src/ViewContainer.cpp 2011-04-01 20:35:03.000000000 +0200 +++ new/kdebase-4.6.3/konsole/src/ViewContainer.cpp 2011-04-28 15:15:31.000000000 +0200 @@ -443,13 +443,11 @@ _closeTabButton->setIcon(KIcon("tab-close")); _closeTabButton->adjustSize(); _closeTabButton->setHidden(true); - _closeTabButton->setEnabled(false); connect( _tabBar , SIGNAL(currentChanged(int)) , this , SLOT(currentTabChanged(int)) ); connect( _tabBar , SIGNAL(tabDoubleClicked(int)) , this , SLOT(tabDoubleClicked(int)) ); connect( _tabBar , SIGNAL(newTabRequest()) , this , SIGNAL(newViewRequest()) ); connect( _tabBar , SIGNAL(wheelDelta(int)) , this , SLOT(wheelScrolled(int)) ); - connect( _tabBar , SIGNAL(tabCloseRequested(int)) , this , SLOT(closeTab(int)) ); connect( _tabBar , SIGNAL(initiateDrag(int)) , this , SLOT(startTabDrag(int)) ); connect( _tabBar, SIGNAL(contextMenu(int, const QPoint&)), this, SLOT(openTabContextMenu(int, const QPoint&)) ); @@ -495,11 +493,11 @@ _contextPopupMenu->addAction(KIcon(), i18nc("@action:inmenu", "&Rename Tab..."), this, SLOT(tabContextMenuRenameTab())); -/* + _contextPopupMenu->addAction(KIcon("tab-close"), i18nc("@action:inmenu", "&Close Tab"), this, SLOT(tabContextMenuCloseTab())); -*/ + } void TabbedViewContainer::setNewViewMenu(QMenu* menu) { @@ -521,16 +519,10 @@ { if (_stackWidget->currentIndex() != -1) { - closeTab(_stackWidget->currentIndex()); + emit closeTab(this, _stackWidget->widget(_stackWidget->currentIndex())); } } -void TabbedViewContainer::closeTab(int tab) -{ - Q_ASSERT(tab >= 0 && tab < _stackWidget->count()); - - if (viewProperties(_stackWidget->widget(tab))->confirmClose()) - removeView(_stackWidget->widget(tab)); -} + void TabbedViewContainer::setTabBarVisible(bool visible) { _tabBar->setVisible(visible); @@ -655,7 +647,8 @@ void TabbedViewContainer::tabContextMenuCloseTab() { - closeTab(_contextMenuTabIndex); + _tabBar->setCurrentIndex(_contextMenuTabIndex);// Required for this to work + emit closeTab(this, _stackWidget->widget(_contextMenuTabIndex)); } void TabbedViewContainer::tabContextMenuDetachTab() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/konsole/src/ViewContainer.h new/kdebase-4.6.3/konsole/src/ViewContainer.h --- old/kdebase-4.6.2/konsole/src/ViewContainer.h 2011-02-28 13:50:53.000000000 +0100 +++ new/kdebase-4.6.3/konsole/src/ViewContainer.h 2011-04-28 15:15:31.000000000 +0200 @@ -427,7 +427,6 @@ void updateIcon(ViewProperties* item); void updateActivity(ViewProperties* item); void currentTabChanged(int index); - void closeTab(int index); void closeCurrentTab(); void wheelScrolled(int delta); @@ -440,6 +439,7 @@ signals: void detachTab(ViewContainer * self, QWidget * activeView); + void closeTab(ViewContainer * self, QWidget * activeView); private: void dynamicTabBarVisibility(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/konsole/src/ViewManager.cpp new/kdebase-4.6.3/konsole/src/ViewManager.cpp --- old/kdebase-4.6.2/konsole/src/ViewManager.cpp 2011-02-28 13:51:30.000000000 +0100 +++ new/kdebase-4.6.3/konsole/src/ViewManager.cpp 2011-04-28 15:15:31.000000000 +0200 @@ -639,6 +639,11 @@ this, SLOT(detachView(ViewContainer*, QWidget*)) ); + connect(container, + SIGNAL(closeTab(ViewContainer*, QWidget*)), + this, + SLOT(closeTabFromContainer(ViewContainer*, QWidget*))); + } break; case NoNavigation: @@ -1084,5 +1089,13 @@ this->moveActiveViewRight(); } +void ViewManager::closeTabFromContainer(ViewContainer *container, QWidget *tab) +{ + SessionController *controller = dynamic_cast<SessionController*>(container->viewProperties(tab)); + Q_ASSERT(controller); + if (controller && controller->confirmClose()) + controller->session()->close(); +} + #include "ViewManager.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/konsole/src/ViewManager.h new/kdebase-4.6.3/konsole/src/ViewManager.h --- old/kdebase-4.6.2/konsole/src/ViewManager.h 2011-02-28 13:50:53.000000000 +0100 +++ new/kdebase-4.6.3/konsole/src/ViewManager.h 2011-04-28 15:15:31.000000000 +0200 @@ -313,6 +313,8 @@ void detachView(ViewContainer* container, QWidget* view); + void closeTabFromContainer(ViewContainer *container, QWidget *view); + private: void createView(Session* session, ViewContainer* container, int index); const ColorScheme* colorSchemeForProfile(const Profile::Ptr profile) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/konsole/src/main.cpp new/kdebase-4.6.3/konsole/src/main.cpp --- old/kdebase-4.6.2/konsole/src/main.cpp 2011-04-01 20:35:03.000000000 +0200 +++ new/kdebase-4.6.3/konsole/src/main.cpp 2011-04-28 15:25:41.000000000 +0200 @@ -30,7 +30,7 @@ #include <KCmdLineArgs> #include <KLocale> -#define KONSOLE_VERSION "2.6.2" +#define KONSOLE_VERSION "2.6.3" using namespace Konsole; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/kwrite/kwritemain.cpp new/kdebase-4.6.3/kwrite/kwritemain.cpp --- old/kdebase-4.6.2/kwrite/kwritemain.cpp 2011-02-25 23:33:12.000000000 +0100 +++ new/kdebase-4.6.3/kwrite/kwritemain.cpp 2011-04-28 15:15:36.000000000 +0200 @@ -119,6 +119,8 @@ KWrite::~KWrite() { + guiFactory()->removeClient(m_view); + winList.removeAll(this); if (m_view->document()->views().count() == 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/lib/konq/Templates/Directory.desktop new/kdebase-4.6.3/lib/konq/Templates/Directory.desktop --- old/kdebase-4.6.2/lib/konq/Templates/Directory.desktop 2011-02-25 22:55:12.000000000 +0100 +++ new/kdebase-4.6.3/lib/konq/Templates/Directory.desktop 2011-04-28 15:15:36.000000000 +0200 @@ -78,7 +78,7 @@ Name[te]=ఫొల్డర్... Name[tg]=Феҳрист... Name[th]=โฟลเดอร์... -Name[tr]=Dizin... +Name[tr]=Klasör... Name[uk]=Теку... Name[uz]=Jild Name[uz@cyrillic]=Жилд @@ -165,7 +165,7 @@ Comment[te]=ఫొల్డర్ పేరును వ్రాయండి: Comment[tg]=Вориди номи феҳрист: Comment[th]=ป้อนชื่อโฟลเดอร์: -Comment[tr]=Dizin adını girin: +Comment[tr]=Klasör adını girin: Comment[uk]=Введіть назву теки: Comment[uz]=Jildning nomini kiriting: Comment[uz@cyrillic]=Жилднинг номини киритинг: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/lib/konq/Templates/TextFile.desktop new/kdebase-4.6.3/lib/konq/Templates/TextFile.desktop --- old/kdebase-4.6.2/lib/konq/Templates/TextFile.desktop 2011-02-25 23:33:12.000000000 +0100 +++ new/kdebase-4.6.3/lib/konq/Templates/TextFile.desktop 2011-04-28 15:15:36.000000000 +0200 @@ -34,7 +34,7 @@ Name[hne]=पाठ फाइल... Name[hr]=Tekstualna datoteka… Name[hsb]=Tekstowa dataja ... -Name[hu]=Szöveges fájl… +Name[hu]=Szövegfájl… Name[ia]=File de texto... Name[id]=Berkas Teks... Name[is]=Textaskrá... @@ -121,7 +121,7 @@ Comment[hne]=पाठ फाइलनाम भरव: Comment[hr]=Upišite naziv tekstualne datoteke: Comment[hsb]=Mjeno tekstoweje dataje zapodać: -Comment[hu]=A szöveges fájl neve: +Comment[hu]=A szövegfájl neve: Comment[ia]=Entra le nomine de file: Comment[id]=Masukkan nama berkas teks: Comment[is]=Sláðu inn nafn á textaskrá: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/lib/konq/Templates/linkPath.desktop new/kdebase-4.6.3/lib/konq/Templates/linkPath.desktop --- old/kdebase-4.6.2/lib/konq/Templates/linkPath.desktop 2011-02-25 23:33:12.000000000 +0100 +++ new/kdebase-4.6.3/lib/konq/Templates/linkPath.desktop 2011-04-28 15:15:36.000000000 +0200 @@ -46,7 +46,7 @@ Name[pa]=ਫਾਇਲ ਜਾਂ ਡਾਇਰੈਕਟਰੀ ਲਈ ਬੇਸਿਕ ਲਿੰਕ... Name[pl]=Podstawowy odnośnik do pliku lub katalogu... Name[pt]=Ligação básica para um ficheiro ou pasta... -Name[pt_BR]=Link básico para o arquivo ou diretório... +Name[pt_BR]=Link básico para o arquivo ou pasta... Name[ro]=Legătură simplă la fișier sau dosar... Name[ru]=Символическую ссылку... Name[si]=ගොනුව හෝ බහාළුමට මූලික ඈඳුතුව diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/plasma/applets/folderview/folderview.cpp new/kdebase-4.6.3/plasma/applets/folderview/folderview.cpp --- old/kdebase-4.6.2/plasma/applets/folderview/folderview.cpp 2011-02-25 23:33:12.000000000 +0100 +++ new/kdebase-4.6.3/plasma/applets/folderview/folderview.cpp 2011-04-28 15:15:36.000000000 +0200 @@ -417,6 +417,7 @@ void FolderView::configChanged() { + Containment::configChanged(); KConfigGroup cg = config(); //Declare some variables that are used afterwards diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.6.2/plasma/applets/folderview/plasma-applet-folderview.desktop new/kdebase-4.6.3/plasma/applets/folderview/plasma-applet-folderview.desktop --- old/kdebase-4.6.2/plasma/applets/folderview/plasma-applet-folderview.desktop 2011-02-25 22:55:12.000000000 +0100 +++ new/kdebase-4.6.3/plasma/applets/folderview/plasma-applet-folderview.desktop 2011-04-28 15:15:36.000000000 +0200 @@ -71,7 +71,7 @@ Name[te]=ఫొల్డర్ వీక్షణం Name[tg]=Намоиши феҳрист Name[th]=มุมมองโฟลเดอร์ -Name[tr]=Dizin Görünümü +Name[tr]=Klasör Görünümü Name[uk]=Перегляд тек Name[uz]=Jildni koʻruvchi Name[uz@cyrillic]=Жилдни кўрувчи @@ -138,7 +138,7 @@ Comment[sv]=Visa innehåll i kataloger (användarens hemkatalog som förval) Comment[tg]=Отображение содержания папок (по умолочанию - рабочего стола) Comment[th]=แสดงเนื้อหาของโฟลเดอร์ (ค่าปริยายคือโฟลเดอร์พื้นที่ส่วนตัวของผู้ใช้) -Comment[tr]=Dizinlerin içeriğini göster (Öntanımlı olarak kullanıcının ev dizinini kullan) +Comment[tr]=Klasörlerin içeriğini göster (Öntanımlı olarak kullanıcının ev klasörünü kullan) Comment[uk]=Показувати вміст тек (типово, домашньої теки користувача) Comment[wa]=Håyner çou k' i gn a dins on ridant (ridant måjhon di l' uzeu prémetou) Comment[x-test]=xxDisplay the contents of folders (User's home folder as default)xx ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
