#include <Q3ValueList>
#include <QCloseEvent>
#include <QSplitter>
+#include <QDockWidget>
#include "urlnavigator.h"
#include "viewpropertiesdialog.h"
#include "undomanager.h"
#include "progressindicator.h"
#include "dolphinsettings.h"
-#include "sidebar.h"
-#include "sidebarsettings.h"
+#include "bookmarkssidebarpage.h"
+#include "infosidebarpage.h"
#include "generalsettings.h"
#include "dolphinapplication.h"
DolphinMainWindow::DolphinMainWindow() :
- KMainWindow(0, "Dolphin"),
+ KMainWindow(0),
m_splitter(0),
- m_sidebar(0),
m_activeView(0),
m_clipboardContainsCutData(false)
{
+ setObjectName("Dolphin");
m_view[PrimaryIdx] = 0;
m_view[SecondaryIdx] = 0;
void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
{
- KAction* action = 0;
+ QAction* action = 0;
switch (sorting) {
case DolphinView::SortByName:
action = actionCollection()->action("by_name");
selectedUrlsCount += m_view[SecondaryIdx]->selectedUrls().count();
}
- KAction* compareFilesAction = actionCollection()->action("compare_files");
+ QAction* compareFilesAction = actionCollection()->action("compare_files");
compareFilesAction->setEnabled(selectedUrlsCount == 2);
m_activeView->updateStatusBar();
emit selectionChanged();
}
+void DolphinMainWindow::slotRedo()
+{
+ UndoManager::instance().redo(this);
+}
+
+void DolphinMainWindow::slotUndo()
+{
+ UndoManager::instance().undo(this);
+}
+
+void DolphinMainWindow::slotNewMainWindow()
+{
+ DolphinApplication::app()->createMainWindow()->show();
+}
+
void DolphinMainWindow::closeEvent(QCloseEvent* event)
{
// KDE4-TODO
GeneralSettings* generalSettings = settings.generalSettings();
generalSettings->setFirstRun(false);
- SidebarSettings* sidebarSettings = settings.sidebarSettings();
- const bool isSidebarVisible = (m_sidebar != 0);
- sidebarSettings->setVisible(isSidebarVisible);
- if (isSidebarVisible) {
- sidebarSettings->setWidth(m_sidebar->width());
- }
-
settings.save();
KMainWindow::closeEvent(event);
statusBar->setMessage(i18n("Created folder %1.",url.path()),
DolphinStatusBar::OperationCompleted);
- DolphinCommand command(DolphinCommand::CreateFolder, KUrl::List(), url, this);
+ DolphinCommand command(DolphinCommand::CreateFolder, KUrl::List(), url);
UndoManager::instance().addCommand(command);
}
else {
KSortableList<CreateFileEntry, QString>::ConstIterator it = m_createFileTemplates.begin();
KSortableList<CreateFileEntry, QString>::ConstIterator end = m_createFileTemplates.end();
- const QString senderName(sender()->name());
+ const QString senderName(sender()->objectName());
bool found = false;
CreateFileEntry entry;
while (!found && (it != end)) {
QString sourcePath(entry.templatePath.left(pos + 1));
sourcePath += KDesktopFile(entry.templatePath, true).readPathEntry("Url");
- QString name(i18n(entry.name.ascii()));
+ QString name(i18n(entry.name.toAscii()));
// Most entry names end with "..." (e. g. "HTML File..."), which is ok for
// menus but no good choice for a new file name -> remove the dots...
name.replace("...", QString::null);
KUrl::List list;
list.append(sourceUrl);
- DolphinCommand command(DolphinCommand::CreateFile, list, destUrl, this);
+ DolphinCommand command(DolphinCommand::CreateFile, list, destUrl);
UndoManager::instance().addCommand(command);
}
void DolphinMainWindow::properties()
{
- const KFileItemList* sourceList = m_activeView->selectedItems();
- if (sourceList == 0) {
- return;
- }
-
- KFileItemList list;
- KFileItemList::const_iterator it = sourceList->begin();
- const KFileItemList::const_iterator end = sourceList->end();
- KFileItem* item = 0;
- while (it != end) {
- list.append(item);
- ++it;
- }
-
+ const KFileItemList list = m_activeView->selectedItems();
new KPropertiesDialog(list, this);
}
void DolphinMainWindow::slotUndoAvailable(bool available)
{
- KAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo));
+ QAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo));
if (undoAction != 0) {
undoAction->setEnabled(available);
}
void DolphinMainWindow::slotUndoTextChanged(const QString& text)
{
- KAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo));
+ QAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo));
if (undoAction != 0) {
undoAction->setText(text);
}
void DolphinMainWindow::slotRedoAvailable(bool available)
{
- KAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo));
+ QAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo));
if (redoAction != 0) {
redoAction->setEnabled(available);
}
void DolphinMainWindow::slotRedoTextChanged(const QString& text)
{
- KAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo));
+ QAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo));
if (redoAction != 0) {
redoAction->setText(text);
}
void DolphinMainWindow::updatePasteAction()
{
- KAction* pasteAction = actionCollection()->action(KStdAction::stdName(KStdAction::Paste));
+ QAction* pasteAction = actionCollection()->action(KStdAction::stdName(KStdAction::Paste));
if (pasteAction == 0) {
return;
}
void DolphinMainWindow::toggleSplitView()
{
if (m_view[SecondaryIdx] == 0) {
+ const int newWidth = (m_view[PrimaryIdx]->width() - m_splitter->handleWidth()) / 2;
// create a secondary view
m_view[SecondaryIdx] = new DolphinView(this,
- m_splitter,
+ 0,
m_view[PrimaryIdx]->url(),
m_view[PrimaryIdx]->mode(),
m_view[PrimaryIdx]->isShowHiddenFilesEnabled());
+ m_splitter->addWidget(m_view[SecondaryIdx]);
+ m_splitter->setSizes(QList<int>() << newWidth << newWidth);
m_view[SecondaryIdx]->show();
}
else {
// From an implementation point of view it is more efficient to close
// the primary view and exchange the internal pointers afterwards.
m_view[PrimaryIdx]->close();
- m_view[PrimaryIdx]->deleteLater();
+ delete m_view[PrimaryIdx];
m_view[PrimaryIdx] = m_view[SecondaryIdx];
m_view[SecondaryIdx] = 0;
setActiveView(m_view[PrimaryIdx]);
}
}
-void DolphinMainWindow::toggleSidebar()
-{
- if (m_sidebar == 0) {
- openSidebar();
- }
- else {
- closeSidebar();
- }
-
- KToggleAction* sidebarAction = static_cast<KToggleAction*>(actionCollection()->action("sidebar"));
- sidebarAction->setChecked(m_sidebar != 0);
-}
-
-void DolphinMainWindow::closeSidebar()
-{
- if (m_sidebar == 0) {
- // the sidebar has already been closed
- return;
- }
-
- // store width of sidebar and remember that the sidebar has been closed
- SidebarSettings* settings = DolphinSettings::instance().sidebarSettings();
- settings->setVisible(false);
- settings->setWidth(m_sidebar->width());
-
- m_sidebar->deleteLater();
- m_sidebar = 0;
-}
-
-
void DolphinMainWindow::init()
{
// Check whether Dolphin runs the first time. If yes then
}
setupActions();
- setupGUI(Keys|Save|Create|ToolBar);
const KUrl& homeUrl = root.first().url();
setCaption(homeUrl.fileName());
homeUrl,
props.viewMode(),
props.isShowHiddenFilesEnabled());
+ m_view[PrimaryIdx]->show();
m_activeView = m_view[PrimaryIdx];
setCentralWidget(m_splitter);
+ setupDockWidgets();
- // open sidebar
- SidebarSettings* sidebarSettings = settings.sidebarSettings();
- assert(sidebarSettings != 0);
- if (sidebarSettings->visible()) {
- openSidebar();
- }
-
+ setupGUI(Keys|Save|Create|ToolBar);
createGUI();
stateChanged("new_file");
void DolphinMainWindow::setupActions()
{
// setup 'File' menu
+ KAction *action = new KAction(KIcon("window_new"), i18n( "New &Window" ), actionCollection(), "new_window" );
+ connect(action, SIGNAL(triggered()), this, SLOT(slotNewMainWindow()));
+
KAction* createFolder = new KAction(i18n("Folder..."), actionCollection(), "create_folder");
createFolder->setIcon(KIcon("folder"));
createFolder->setShortcut(Qt::Key_N);
// setup 'Edit' menu
UndoManager& undoManager = UndoManager::instance();
- KStdAction::undo(&undoManager,
- SLOT(undo()),
+ KStdAction::undo(this,
+ SLOT(slotUndo()),
actionCollection());
connect(&undoManager, SIGNAL(undoAvailable(bool)),
this, SLOT(slotUndoAvailable(bool)));
connect(&undoManager, SIGNAL(undoTextChanged(const QString&)),
this, SLOT(slotUndoTextChanged(const QString&)));
- KStdAction::redo(&undoManager,
- SLOT(redo()),
+ KStdAction::redo(this,
+ SLOT(slotRedo()),
actionCollection());
connect(&undoManager, SIGNAL(redoAvailable(bool)),
this, SLOT(slotRedoAvailable(bool)));
editLocation->setShortcut(Qt::Key_F6);
connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation()));
- KToggleAction* sidebar = new KToggleAction(i18n("Sidebar"), actionCollection(), "sidebar");
- sidebar->setShortcut(Qt::Key_F9);
- connect(sidebar, SIGNAL(triggered()), this, SLOT(toggleSidebar()));
-
KAction* adjustViewProps = new KAction(i18n("Adjust View Properties..."), actionCollection(), "view_properties");
connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(adjustViewProperties()));
int index = 0;
const Q3ValueList<UrlNavigator::HistoryElem> list = m_activeView->urlHistory(index);
- KAction* backAction = actionCollection()->action("go_back");
+ QAction* backAction = actionCollection()->action("go_back");
if (backAction != 0) {
backAction->setEnabled(index < static_cast<int>(list.count()) - 1);
}
- KAction* forwardAction = actionCollection()->action("go_forward");
+ QAction* forwardAction = actionCollection()->action("go_forward");
if (forwardAction != 0) {
forwardAction->setEnabled(index > 0);
}
void DolphinMainWindow::updateEditActions()
{
- const KFileItemList* list = m_activeView->selectedItems();
- if ((list == 0) || (*list).isEmpty()) {
+ const KFileItemList list = m_activeView->selectedItems();
+ if (list.isEmpty()) {
stateChanged("has_no_selection");
}
else {
stateChanged("has_selection");
- KAction* renameAction = actionCollection()->action("rename");
+ QAction* renameAction = actionCollection()->action("rename");
if (renameAction != 0) {
- renameAction->setEnabled(list->count() >= 1);
+ renameAction->setEnabled(list.count() >= 1);
}
bool enableMoveToTrash = true;
- KFileItemList::const_iterator it = list->begin();
- const KFileItemList::const_iterator end = list->end();
+ KFileItemList::const_iterator it = list.begin();
+ const KFileItemList::const_iterator end = list.end();
while (it != end) {
KFileItem* item = *it;
const KUrl& url = item->url();
++it;
}
- KAction* moveToTrashAction = actionCollection()->action("move_to_trash");
+ QAction* moveToTrashAction = actionCollection()->action("move_to_trash");
moveToTrashAction->setEnabled(enableMoveToTrash);
}
updatePasteAction();
void DolphinMainWindow::updateViewActions()
{
- KAction* zoomInAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomIn));
+ QAction* zoomInAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomIn));
if (zoomInAction != 0) {
zoomInAction->setEnabled(m_activeView->isZoomInPossible());
}
- KAction* zoomOutAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomOut));
+ QAction* zoomOutAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomOut));
if (zoomOutAction != 0) {
zoomOutAction->setEnabled(m_activeView->isZoomOutPossible());
}
- KAction* action = 0;
+ QAction* action = 0;
switch (m_activeView->mode()) {
case DolphinView::IconsView:
action = actionCollection()->action("icons");
KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
splitAction->setChecked(m_view[SecondaryIdx] != 0);
-
- KToggleAction* sidebarAction = static_cast<KToggleAction*>(actionCollection()->action("sidebar"));
- sidebarAction->setChecked(m_sidebar != 0);
}
void DolphinMainWindow::updateGoActions()
{
- KAction* goUpAction = actionCollection()->action(KStdAction::stdName(KStdAction::Up));
+ QAction* goUpAction = actionCollection()->action(KStdAction::stdName(KStdAction::Up));
const KUrl& currentUrl = m_activeView->url();
goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
}
UndoInfo undoInfo;
undoInfo.id = job->progressId();
- undoInfo.command = DolphinCommand(commandType, source, dest, this);
+ undoInfo.command = DolphinCommand(commandType, source, dest);
m_pendingUndoJobs.append(undoInfo);
}
m_activeView->statusBar()->clear();
}
-void DolphinMainWindow::openSidebar()
+void DolphinMainWindow::setupDockWidgets()
{
- if (m_sidebar != 0) {
- // the sidebar is already open
- return;
- }
+ QDockWidget *shortcutsDock = new QDockWidget(i18n("Shortcuts"));
+
+ shortcutsDock->setObjectName("shortcutsDock");
+ shortcutsDock->setWidget(new BookmarksSidebarPage(this));
+
+ shortcutsDock->toggleViewAction()->setObjectName("show_shortcuts_pane");
+ shortcutsDock->toggleViewAction()->setText(i18n("Show Shortcuts Panel"));
+ actionCollection()->insert(shortcutsDock->toggleViewAction());
+
+ addDockWidget(Qt::LeftDockWidgetArea, shortcutsDock);
+
+ QDockWidget *infoDock = new QDockWidget(i18n("Information"));
- m_sidebar = new Sidebar(this, m_splitter);
- m_sidebar->show();
+ infoDock->setObjectName("infoDock");
+ infoDock->setWidget(new InfoSidebarPage(this));
- connect(m_sidebar, SIGNAL(urlChanged(const KUrl&)),
- this, SLOT(slotUrlChangeRequest(const KUrl&)));
- m_splitter->setCollapsible(m_sidebar, false);
- m_splitter->setResizeMode(m_sidebar, QSplitter::KeepSize);
- m_splitter->moveToFirst(m_sidebar);
+ infoDock->toggleViewAction()->setObjectName("show_info_pane");
+ infoDock->toggleViewAction()->setText(i18n("Show Information Panel"));
+ actionCollection()->insert(infoDock->toggleViewAction());
- SidebarSettings* settings = DolphinSettings::instance().sidebarSettings();
- settings->setVisible(true);
+ addDockWidget(Qt::RightDockWidgetArea, infoDock);
}
#include "dolphinmainwindow.moc"
projects / dolphin.git / blobdiff