[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.1/kdebase/apps/dolphin/src
From:       Peter Penz <peter.penz () gmx ! at>
Date:       2008-07-22 17:37:29
Message-ID: 1216748249.825459.12079.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 836644 by ppenz:

Backport of 836643: fixed issue that the close-action for the split view has been \
applied to the inactive view instead of the active view

CCBUG: 167209

 M  +3 -3      dolphinmainwindow.cpp  


--- branches/KDE/4.1/kdebase/apps/dolphin/src/dolphinmainwindow.cpp #836643:836644
@@ -506,7 +506,7 @@
         m_viewTab[m_tabIndex].secondaryView->show();
 
         setActiveViewContainer(m_viewTab[m_tabIndex].secondaryView);
-    } else if (m_activeViewContainer == m_viewTab[m_tabIndex].primaryView) {
+    } else if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {
         // remove secondary view
         m_viewTab[m_tabIndex].secondaryView->close();
         m_viewTab[m_tabIndex].secondaryView->deleteLater();
@@ -514,7 +514,7 @@
 
         setActiveViewContainer(m_viewTab[m_tabIndex].primaryView);
     } else {
-        // The secondary view is active, hence from a users point of view
+        // The primary view is active and should be closed, Hence from a users point \
                of view
         // the content of the secondary view should be moved to the primary view.
         // From an implementation point of view it is more efficient to close
         // the primary view and exchange the internal pointers afterwards.
@@ -1177,7 +1177,7 @@
 {
     QAction* splitAction = actionCollection()->action("split_view");
     if (m_viewTab[m_tabIndex].secondaryView != 0) {
-        if (m_activeViewContainer == m_viewTab[m_tabIndex].primaryView) {
+        if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {
             splitAction->setText(i18nc("@action:intoolbar Close right view", \
"Close"));  splitAction->setIcon(KIcon("view-right-close"));
         } else {


[prev in list] [next in list] [prev in thread] [next in thread]