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

List:       kde-bugs-dist
Subject:    [Bug 52161] "Show file in separate viewer" broken when terminal
From:       John Firebaugh <jfirebaugh () kde ! org>
Date:       2003-07-13 21:28:03
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
     
http://bugs.kde.org/show_bug.cgi?id=52161     




------- Additional Comments From jfirebaugh@kde.org  2003-07-13 23:28 -------
Subject: kdebase/konqueror

CVS commit by firebaugh: 

Revert revision 1.1029 of konq_mainwindow.cc, which broke "Show file in separate \
viewer" when the terminal emulator view was active. Instead, in \
KonqView::changeViewMode(), handle the case where we try to change the view mode of \
the sidebar. Needs some testing before backporting.

CCMAIL: 52161@bugs.kde.org
CCMAIL: faure@kde.org


  M +1 -3      konq_mainwindow.cc   1.1201
  M +51 -49    konq_view.cc   1.336


--- kdebase/konqueror/konq_mainwindow.cc  #1.1200:1.1201
@@ -802,6 +802,4 @@ bool KonqMainWindow::openView( QString s
   else // We know the child view
   {
-      //childView->stop();
-      if ( !childView->isLockedViewMode() )
           ok = childView->changeViewMode( serviceType, serviceName );
   }

--- kdebase/konqueror/konq_view.cc  #1.335:1.336
@@ -289,13 +289,15 @@ bool KonqView::changeViewMode( const QSt
                 << " current service name is " << m_service->desktopEntryName() << \
endl;  
-  if ( m_serviceType != serviceType ||
-       ( !serviceName.isEmpty() && serviceName != m_service->desktopEntryName() ) )
-  {
+  if ( m_serviceType == serviceType && (serviceName.isEmpty() || serviceName == \
m_service->desktopEntryName()) ) +    return true;
+
+  // Special hack for sidebar views. They are isLockedViewMode(), but we want
+  // to be able to follow directory changes. So, pretend we changed the view
+  // mode instead of returning false.
+  if ( isLockedViewMode() && m_serviceType == "Browser/View" && serviceType == \
"inode/directory" ) +    return true;
 
     if ( isLockedViewMode() )
-    {
-      kdDebug(1202) << "This view's mode is locked - can't change" << endl;
       return false; // we can't do that if our view mode is locked
-    }
 
     kdDebug(1202) << "Switching view modes..." << endl;
@@ -340,5 +342,5 @@ bool KonqView::changeViewMode( const QSt
       m_pMainWindow->viewManager()->setActivePart( m_pPart );
     }
-  }
+
   return true;
 }


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