Move the pasteIntoFolder() method from the contextmenu into DolphinView. This allows...

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index e91e8afeccf2a2eee2d1b5e78f54ff10e6f66fae..126591b6c9e486616b5d2eeb87a491a6add4873f 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -87,9 +87,11 @@ DolphinMainWindow::DolphinMainWindow(int id) :
     m_showMenuBar(0),
     m_splitter(0),
     m_activeViewContainer(0),
-    m_id(id)
+    m_id(id),
+    m_viewContainer(),
+    m_actionHandler(0)
 {
-    setObjectName("Dolphin");
+    setObjectName("Dolphin#");
     m_viewContainer[PrimaryView] = 0;
     m_viewContainer[SecondaryView] = 0;
 
@@ -162,6 +164,11 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
     dropController.dropUrls(urls, destination);
 }
 
+void DolphinMainWindow::pasteIntoFolder()
+{
+    m_activeViewContainer->view()->pasteIntoFolder();
+}
+
 void DolphinMainWindow::changeUrl(const KUrl& url)
 {
     DolphinViewContainer* view = activeViewContainer();
@@ -678,7 +685,7 @@ void DolphinMainWindow::init()
 
     if (firstRun) {
         // assure a proper default size if Dolphin runs the first time
-        resize(700, 500);
+        resize(750, 500);
     }
 
     emit urlChanged(homeUrl);
@@ -886,7 +893,6 @@ void DolphinMainWindow::setupDockWidgets()
 
     const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
     if (firstRun) {
-        infoDock->hide();
         treeViewDock->hide();
 #ifndef Q_OS_WIN
         terminalDock->hide();