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

List:       kde-commits
Subject:    KDE/kdebase/konqueror
From:       David Faure <faure () kde ! org>
Date:       2006-12-13 23:00:54
Message-ID: 1166050854.593882.8203.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 613533 by dfaure:

untested forwardports


 M  +21 -0     KonqMainWindowAdaptor.cpp  
 M  +4 -0      KonqMainWindowAdaptor.h  
 M  +5 -0      KonqViewAdaptor.cpp  
 M  +5 -0      KonqViewAdaptor.h  


--- trunk/KDE/kdebase/konqueror/KonqMainWindowAdaptor.cpp #613532:613533
@@ -78,7 +78,28 @@
   return QDBusObjectPath( view->partObjectPath() );
 }
 
+QDBusObjectPath KonqMainWindowAdaptor::view(int viewNumber)
+{
+  KonqMainWindow::MapViews viewMap = m_pMainWindow->viewMap();
+  KonqMainWindow::MapViews::const_iterator it = viewMap.begin();
+  for ( int i = 0; it != viewMap.end() && i < viewNumber; ++i )
+      ++it;
+  if ( it == viewMap.end() )
+      return QDBusObjectPath();
+  return QDBusObjectPath( (*it)->dbusObjectPath() );
+}
 
+QDBusObjectPath KonqMainWindowAdaptor::part(int partNumber)
+{
+  KonqMainWindow::MapViews viewMap = m_pMainWindow->viewMap();
+  KonqMainWindow::MapViews::const_iterator it = viewMap.begin();
+  for ( int i = 0; it != viewMap.end() && i < partNumber; ++i )
+      ++it;
+  if ( it == viewMap.end() )
+      return QDBusObjectPath();
+  return QDBusObjectPath( (*it)->partObjectPath() );
+}
+
 void KonqMainWindowAdaptor::splitViewHorizontally()
 {
     m_pMainWindow->slotSplitViewHorizontal();
--- trunk/KDE/kdebase/konqueror/KonqMainWindowAdaptor.h #613532:613533
@@ -76,6 +76,10 @@
      */
     QDBusObjectPath currentPart();
 
+    QDBusObjectPath view(int viewNumber);
+
+    QDBusObjectPath part(int partNumber);
+
 private:
 
     KonqMainWindow * m_pMainWindow;
--- trunk/KDE/kdebase/konqueror/KonqViewAdaptor.cpp #613532:613533
@@ -117,4 +117,9 @@
     return m_pView->canGoForward();
 }
 
+void KonqViewAdaptor::reload()
+{
+    return m_pView->mainWindow()->slotReload( m_pView );
+}
+
 #include "KonqViewAdaptor.moc"
--- trunk/KDE/kdebase/konqueror/KonqViewAdaptor.h #613532:613533
@@ -50,6 +50,11 @@
                   const QString& nameFilter );
 
     /**
+     * Reload
+     */
+    void reload();
+
+    /**
      * Change the type of view (i.e. loads a new konqueror view)
      * @param serviceType the service type we want to show
      * @param serviceName allows to enforce a particular service to be chosen,
[prev in list] [next in list] [prev in thread] [next in thread]