#include <config-nepomuk.h>
#include <kfileitemdelegate.h>
-#include <konq_fileundomanager.h>
+#include <kio/fileundomanager.h>
#include <ksortablelist.h>
#include <kxmlguiwindow.h>
class DolphinApplication;
class DolphinViewContainer;
class KNewMenu;
+class KTabBar;
class KUrl;
class QSplitter;
void dropUrls(const KUrl::List& urls,
const KUrl& destination);
+ /**
+ * Pastes the clipboard data into the currently selected folder
+ * of the active view. If not exactly one folder is selected,
+ * no pasting is done at all.
+ */
+ void pasteIntoFolder();
+
/**
* Returns the main window ID used through DBus.
*/
void quit();
signals:
- /**
- * Is send if the active view has been changed in
- * the split view mode.
- */
- void activeViewChanged();
-
/**
* Is sent if the selection of the currently active view has
* been changed.
void toggleFilterBarVisibility(bool show);
/**
- * Toggles between edit and brose mode of the navigation bar.
+ * Toggles between edit and browse mode of the navigation bar.
*/
void toggleEditLocation();
*/
void editLocation();
- /**
- * Opens the view properties dialog, which allows to modify the properties
- * of the currently active view.
- */
- void adjustViewProperties();
-
/** Goes back on step of the URL history. */
void goBack();
/** Opens the settings dialog for Dolphin. */
void editSettings();
+ /** Updates the state of the 'Show Full Location' action. */
+ void slotEditableStateChanged(bool editable);
+
/**
* Updates the state of the 'Edit' menu actions and emits
* the signal selectionChanged().
* Updates the state of the 'Back' and 'Forward' menu
* actions corresponding the the current history.
*/
- void slotHistoryChanged();
+ void updateHistory();
/** Updates the state of the 'Show filter bar' menu action. */
void updateFilterBarAction(bool show);
/** Open a new main window. */
void openNewMainWindow();
+ /** Opens a new view with the current URL that is part of a tab. */
+ void openNewTab();
+
+ /**
+ * Opens a new tab showing the URL \a url.
+ */
+ void openNewTab(const KUrl& url);
+
/** Toggles the active view if two views are shown within the main window. */
void toggleActiveView();
/** Called when the view is doing a file operation, like renaming, copying, moving etc. */
- void slotDoingOperation(KonqFileUndoManager::CommandType type);
+ void slotDoingOperation(KIO::FileUndoManager::CommandType type);
+
+ /**
+ * Activates the tab with the index \a index, which means that the current view
+ * is replaced by the view of the given tab.
+ */
+ void setActiveTab(int index);
+
+ /** Closes the currently active tab. */
+ void closeTab();
+
+ /**
+ * Closes the tab with the index \index and activates the tab with index - 1.
+ */
+ void closeTab(int index);
+
+ /**
+ * Opens a context menu for the tab with the index \a index
+ * on the position \a pos.
+ */
+ void openTabContextMenu(int index, const QPoint& pos);
+
+ /**
+ * Handles a click on a places item: if the middle mouse button is
+ * clicked, a new tab is opened for \a url, otherwise the current
+ * view is replaced by \a url.
+ */
+ void handlePlacesClick(const KUrl& url, Qt::MouseButtons buttons);
private:
DolphinMainWindow(int id);
void setupActions();
void setupDockWidgets();
- void updateHistory();
void updateEditActions();
void updateViewActions();
void updateGoActions();
/**
* Connects the signals from the created DolphinView with
- * the index \a viewIndex with the corresponding slots of
+ * the DolphinViewContainer \a container with the corresponding slots of
* the DolphinMainWindow. This method must be invoked each
* time a DolphinView has been created.
*/
- void connectViewSignals(int viewIndex);
+ void connectViewSignals(DolphinViewContainer* container);
/**
* Updates the text of the split action:
*/
void updateSplitAction();
-private:
- /**
- * DolphinMainWindow supports up to two views beside each other.
- */
- enum ViewIndex
- {
- PrimaryView = 0, ///< View shown on the left side of the main window.
- SecondaryView = 1 ///< View shown on the left side of the main window.
- };
+ /** Returns the name of the tab for the URL \a url. */
+ QString tabName(const KUrl& url) const;
+private:
/**
* Implements a custom error handling for the undo manager. This
* assures that all errors are shown in the status bar of Dolphin
* instead as modal error dialog with an OK button.
*/
- class UndoUiInterface : public KonqFileUndoManager::UiInterface
+ class UndoUiInterface : public KIO::FileUndoManager::UiInterface
{
public:
- UndoUiInterface(DolphinMainWindow* mainWin);
+ UndoUiInterface();
virtual ~UndoUiInterface();
virtual void jobError(KIO::Job* job);
-
- private:
- DolphinMainWindow* m_mainWin;
};
KNewMenu* m_newMenu;
KAction* m_showMenuBar;
- QSplitter* m_splitter;
+ KTabBar* m_tabBar;
DolphinViewContainer* m_activeViewContainer;
+ QVBoxLayout* m_centralWidgetLayout;
int m_id;
- DolphinViewContainer* m_viewContainer[SecondaryView + 1];
+ struct ViewTab
+ {
+ ViewTab() : isPrimaryViewActive(true), primaryView(0), secondaryView(0), splitter(0) {}
+ bool isPrimaryViewActive;
+ DolphinViewContainer* primaryView;
+ DolphinViewContainer* secondaryView;
+ QSplitter* splitter;
+ };
+
+ int m_tabIndex;
+ QList<ViewTab> m_viewTab;
DolphinViewActionHandler* m_actionHandler;
/// remember pending undo operations until they are finished
- QList<KonqFileUndoManager::CommandType> m_undoCommandTypes;
+ QList<KIO::FileUndoManager::CommandType> m_undoCommandTypes;
};
inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const
inline bool DolphinMainWindow::isSplit() const
{
- return m_viewContainer[SecondaryView] != 0;
+ return m_viewTab[m_tabIndex].secondaryView != 0;
}
inline KNewMenu* DolphinMainWindow::newMenu() const
projects / dolphin.git / blobdiff