Hello community,
here is the log from the commit of package kdebase4 for openSUSE:11.4
checked in at Sun Feb 20 19:15:58 CET 2011.
--------
--- old-versions/11.4/all/kdebase4/kdebase4.changes 2011-02-03 22:10:40.000000000 +0100
+++ /mounts/work_src_done/11.4/kdebase4/kdebase4.changes 2011-02-11 16:24:52.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Feb 11 15:24:12 UTC 2011 - wstephenson@novell.com
+
+- Fix Konsole context menu disappearing after tab close (bko#185466)
+
+-------------------------------------------------------------------
calling whatdependson for 11.4-i586
New:
----
changeset_r18dd5bd012dae86b118c7b7a132866c0c7781297.diff
changeset_re52b6b0ac0292abdf654e4fb408fd501542c02fa.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.8TcS8u/_old 2011-02-20 19:15:30.000000000 +0100
+++ /var/tmp/diff_new_pack.8TcS8u/_new 2011-02-20 19:15:30.000000000 +0100
@@ -19,7 +19,7 @@
Name: kdebase4
Version: 4.6.0
-Release: 2
+Release: 6.<RELEASE2>
License: GPLv2+
Summary: The Base KDE Apps
Url: http://www.kde.org/
@@ -60,6 +60,8 @@
Patch7: dolphin-go_up.diff
Patch8: plasma-new-default-panel.diff
Patch9: bko#259335-plasma-doubleclick-dnd.diff
+Patch10: changeset_r18dd5bd012dae86b118c7b7a132866c0c7781297.diff
+Patch11: changeset_re52b6b0ac0292abdf654e4fb408fd501542c02fa.diff
Suggests: dolphin
Suggests: kdebase4-libkonq
Suggests: kdebase4-nsplugin
@@ -88,6 +90,10 @@
#%patch8
pushd apps
%patch9 -p1
+pushd konsole
+%patch10 -p1
+%patch11 -p1
+popd
popd
%build
++++++ changeset_r18dd5bd012dae86b118c7b7a132866c0c7781297.diff ++++++
commit 18dd5bd012dae86b118c7b7a132866c0c7781297
Author: Kurt Hindenburg
Date: Sat Feb 5 15:58:42 2011 -0500
Fix issue where the context menu popup no longer appeared after closing
a tab.
Backport to 4.6 branch.
CCBUG: 185466
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 49f1bb4..39727fc 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -86,6 +86,8 @@ MainWindow::MainWindow()
connect( _viewManager , SIGNAL(empty()) , this , SLOT(close()) );
connect( _viewManager , SIGNAL(activeViewChanged(SessionController*)) , this ,
SLOT(activeViewChanged(SessionController*)) );
+ connect( _viewManager , SIGNAL(unplugController(SessionController*)) , this ,
+ SLOT(disconnectController(SessionController*)) );
connect( _viewManager , SIGNAL(viewPropertiesChanged(const QList&)) ,
bookmarkHandler() , SLOT(setViews(const QList&)) );
diff --git a/src/MainWindow.h b/src/MainWindow.h
index 98ca2a0..2e4276d 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -161,6 +161,7 @@ class MainWindow : public KXmlGuiWindow
void showShortcutsDialog();
void newFromProfile(Profile::Ptr profile);
void activeViewChanged(SessionController* controller);
+ void disconnectController(SessionController* controller);
void activeViewTitleChanged(ViewProperties*);
void sessionListChanged(const QList& actions);
@@ -181,7 +182,6 @@ class MainWindow : public KXmlGuiWindow
void setupActions();
void setupWidgets();
QString activeSessionDir() const;
- void disconnectController(SessionController* controller);
// sets the active shortcuts of actions in 'dest' to the shortcuts of actions
// with the same name in 'source' (see KAction::ActiveShortcut)
diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
index 3c5db04..a846a38 100644
--- a/src/ViewManager.cpp
+++ b/src/ViewManager.cpp
@@ -377,6 +377,10 @@ void ViewManager::sessionFinished()
}
}
+ // This is needed to remove this controller from factory() in
+ // order to prevent BUG: 185466 - disappearing menu popup
+ if (_pluggedController)
+ emit unplugController(_pluggedController);
}
void ViewManager::focusActiveView()
diff --git a/src/ViewManager.h b/src/ViewManager.h
index 3a1a796..bf17b4d 100644
--- a/src/ViewManager.h
+++ b/src/ViewManager.h
@@ -175,6 +175,12 @@ signals:
*/
void activeViewChanged(SessionController* controller);
+ /**
+ * Emitted when the current session needs unplugged from factory().
+ * @param controller The controller associated with the active view
+ */
+ void unplugController(SessionController* controller);
+
/**
* Emitted when the list of view properties ( as returned by viewProperties() ) changes.
* This occurs when views are added to or removed from the active container, or
++++++ changeset_re52b6b0ac0292abdf654e4fb408fd501542c02fa.diff ++++++
commit e52b6b0ac0292abdf654e4fb408fd501542c02fa
Author: Kurt Hindenburg
Date: Sat Feb 5 16:00:23 2011 -0500
Disable tab close methods until the issue of menu being trashed can be
resolved.
Backport to 4.6 branch.
CCBUG: 185466
diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp
index 79993ed..3e3cb35 100644
--- a/src/ViewContainer.cpp
+++ b/src/ViewContainer.cpp
@@ -443,6 +443,7 @@ TabbedViewContainer::TabbedViewContainer(NavigationPosition position , QObject*
_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)) );
@@ -494,11 +495,11 @@ TabbedViewContainer::TabbedViewContainer(NavigationPosition position , QObject*
_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)
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
