kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-20 08:51:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

- history works again! :-)

Browse source 
BUT: I couldn't test it with html-links, because this is broken either in
      KHTML or KonqHTMLView (following links doesn't work)
    plus: I had to disable the saveState/restoreState stuff because it
    doesn't seem to work with KHTML (but it used to)

svn path=/trunk/kdebase/konqueror/; revision=23974
This commit is contained in:
Simon Hausmann 1999-06-19 16:01:08 +00:00
parent a08e225f4c
commit ae7ba72811
2 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
konqueror/konq_childview.cc
View file

@ -86,7 +86,6 @@ KonqChildView::KonqChildView( Konqueror::View_ptr view,
attach( view );
m_sLastServiceType = serviceTypes.first();
m_lstServiceTypes = serviceTypes;
}
@ -330,16 +329,19 @@ void KonqChildView::makeHistory( bool bCompleted, QString url )
if ( m_bBack )
{
m_bBack = false;
kdebug(0,1202,"pushing into forward history : %s", m_tmpInternalHistoryEntry.strURL.ascii() );
m_lstForward.push_front( m_tmpInternalHistoryEntry );
}
else if ( m_bForward )
{
m_bForward = false;
kdebug(0,1202,"pushing into backward history : %s", m_tmpInternalHistoryEntry.strURL.ascii() );
m_lstBack.push_back( m_tmpInternalHistoryEntry );
}
else
{
m_lstForward.clear();
kdebug(0,1202,"pushing into backward history : %s", m_tmpInternalHistoryEntry.strURL.ascii() );
m_lstBack.push_back( m_tmpInternalHistoryEntry );
}
}
@ -347,22 +349,22 @@ void KonqChildView::makeHistory( bool bCompleted, QString url )
m_bHistoryLock = false;
h.bHasHistoryEntry = false;
h.strURL = m_sLastURL; // use url from last call
h.strServiceType = m_sLastServiceType;
h.strURL = url;
h.strServiceType = m_lstServiceTypes.first();
m_tmpInternalHistoryEntry = h;
m_sLastURL = url; // remember for next call
m_sLastServiceType = m_lstServiceTypes.first();
}
else
{
h = m_tmpInternalHistoryEntry;
h.bHasHistoryEntry = true;
Konqueror::View::HistoryEntry_var state = m_vView->saveState();
h.entry = state;
m_tmpInternalHistoryEntry = h;
// DISABLED because it's broken in KHTML (Simon)
// let's try again later ;-)
// h = m_tmpInternalHistoryEntry;
//
// h.bHasHistoryEntry = true;
// Konqueror::View::HistoryEntry_var state = m_vView->saveState();
// h.entry = state;
//
// m_tmpInternalHistoryEntry = h;
}
}

7
konqueror/konq_childview.h
View file

@ -120,7 +120,7 @@ public:
/**
* Fills m_lstBack and m_lstForward - better comment needed, I'm clueless here (David)
* @param bCompleted true if view has finished loading - hum.
* @param url the current url. Will be used on NEXT call to makeHistory. @see m_strLastURL
* @param url the current url.
*/
void makeHistory( bool bCompleted, QString url );
@ -219,11 +219,6 @@ protected:
QString strServiceType;
};
/** Used by makeHistory, to store the URL and ServiceType
* _previously_ opened in this view */
QString m_sLastURL;
QString m_sLastServiceType;
Konqueror::View_var m_vView;
QString m_sLocationBarURL;