Changeset View
Changeset View
Standalone View
Standalone View
history.cpp
Show First 20 Lines • Show All 124 Lines • ▼ Show 20 Line(s) | |||||
125 | { | 125 | { | ||
126 | if ( m_entries.isEmpty() ) | 126 | if ( m_entries.isEmpty() ) | ||
127 | return; | 127 | return; | ||
128 | 128 | | |||
129 | QUrl url = view->url(); | 129 | QUrl url = view->url(); | ||
130 | 130 | | |||
131 | Entry *current = *m_entries_current; | 131 | Entry *current = *m_entries_current; | ||
132 | 132 | | |||
133 | QDataStream stream( ¤t->buffer, QIODevice::WriteOnly ); | | |||
134 | view->browserExtension()->saveState( stream ); | | |||
135 | | ||||
136 | current->view = view; | 133 | current->view = view; | ||
137 | 134 | | |||
138 | if ( url.isEmpty() ) { | 135 | if ( url.isEmpty() ) { | ||
139 | qCDebug(KHC_LOG) << "History::updateCurrentEntry(): internal url"; | 136 | qCDebug(KHC_LOG) << "History::updateCurrentEntry(): internal url"; | ||
140 | url = view->internalUrl(); | 137 | url = view->internalUrl(); | ||
141 | } | 138 | } | ||
142 | 139 | | |||
143 | qCDebug(KHC_LOG) << "History::updateCurrentEntry(): " << view->title() | 140 | qCDebug(KHC_LOG) << "History::updateCurrentEntry(): " << view->title() | ||
▲ Show 20 Lines • Show All 94 Lines • ▼ Show 20 Line(s) | 201 | { | |||
238 | 235 | | |||
239 | emit goUrl( current->url ); | 236 | emit goUrl( current->url ); | ||
240 | 237 | | |||
241 | Entry h( *current ); | 238 | Entry h( *current ); | ||
242 | h.buffer.detach(); | 239 | h.buffer.detach(); | ||
243 | 240 | | |||
244 | QDataStream stream( h.buffer ); | 241 | QDataStream stream( h.buffer ); | ||
245 | 242 | | |||
246 | h.view->closeUrl(); | 243 | h.view->stop(); | ||
247 | updateCurrentEntry( h.view ); | 244 | updateCurrentEntry( h.view ); | ||
248 | h.view->browserExtension()->restoreState( stream ); | | |||
249 | 245 | | |||
250 | 246 | | |||
251 | updateActions(); | 247 | updateActions(); | ||
252 | } | 248 | } | ||
253 | 249 | | |||
254 | void History::fillBackMenu() | 250 | void History::fillBackMenu() | ||
255 | { | 251 | { | ||
256 | QMenu *menu = m_backAction->menu(); | 252 | QMenu *menu = m_backAction->menu(); | ||
▲ Show 20 Lines • Show All 125 Lines • Show Last 20 Lines |