* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include "dolphinmainwindow.h"
m_view[PrimaryIdx] = 0;
m_view[SecondaryIdx] = 0;
- m_fileGroupActions.setAutoDelete(true);
-
// TODO: the following members are not used yet. See documentation
// of DolphinMainWindow::linkGroupActions() and DolphinMainWindow::linkToDeviceActions()
// in the header file for details.
- //m_linkGroupActions.setAutoDelete(true);
- //m_linkToDeviceActions.setAutoDelete(true);
}
DolphinMainWindow::~DolphinMainWindow()
{
+ qDeleteAll(m_fileGroupActions);
+ //qDeleteAll(m_linkToDeviceActions);
+ //qDeleteAll(m_linkGroupActions);
+ m_fileGroupActions.clear();
+ //m_linkGroupActions.clear();
+ //m_linkToDeviceActions.clear();
+
/*
* bye, bye managed window
*/
m_splitter,
url,
props.viewMode(),
- props.isShowHiddenFilesEnabled());
+ props.showHiddenFiles());
+ connectViewSignals(i);
m_view[i]->show();
}
}
emit activeViewChanged();
}
-void DolphinMainWindow::slotHistoryChanged()
-{
- updateHistory();
-}
-
-void DolphinMainWindow::slotUrlChanged(const KUrl& url)
-{
- updateEditActions();
- updateGoActions();
- setCaption(url.fileName());
-}
-
-void DolphinMainWindow::slotUrlChangeRequest(const KUrl& url)
-{
- clearStatusBar();
- m_activeView->setUrl(url);
-}
-
void DolphinMainWindow::slotViewModeChanged()
{
updateViewActions();
{
KToggleAction* showHiddenFilesAction =
static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
- showHiddenFilesAction->setChecked(m_activeView->isShowHiddenFilesEnabled());
-}
-
-void DolphinMainWindow::slotShowFilterBarChanged()
-{
- KToggleAction* showFilterBarAction =
- static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
- showFilterBarAction->setChecked(m_activeView->isFilterBarVisible());
+ showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles());
}
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()
+void DolphinMainWindow::slotHistoryChanged()
+{
+ updateHistory();
+}
+
+void DolphinMainWindow::slotUrlChanged(const KUrl& url)
+{
+ updateEditActions();
+ updateGoActions();
+ setCaption(url.fileName());
+}
+
+void DolphinMainWindow::updateFilterBarAction(bool show)
+{
+ KToggleAction* showFilterBarAction =
+ static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
+ showFilterBarAction->setChecked(show);
+}
+
+void DolphinMainWindow::redo()
{
UndoManager::instance().redo(this);
}
-void DolphinMainWindow::slotUndo()
+void DolphinMainWindow::undo()
{
UndoManager::instance().undo(this);
}
-void DolphinMainWindow::slotNewMainWindow()
+void DolphinMainWindow::openNewMainWindow()
{
DolphinApplication::app()->createMainWindow()->show();
}
{
config->setGroup("Primary view");
m_view[PrimaryIdx]->setUrl(config->readEntry("Url"));
- m_view[PrimaryIdx]->setUrlEditable(config->readBoolEntry("Editable Url"));
+ m_view[PrimaryIdx]->setUrlEditable(config->readEntry("Editable Url", false));
if (config->hasGroup("Secondary view")) {
config->setGroup("Secondary view");
if (m_view[SecondaryIdx] == 0) {
toggleSplitView();
}
m_view[SecondaryIdx]->setUrl(config->readEntry("Url"));
- m_view[SecondaryIdx]->setUrlEditable(config->readBoolEntry("Editable Url"));
+ m_view[SecondaryIdx]->setUrlEditable(config->readEntry("Editable Url", false));
}
else if (m_view[SecondaryIdx] != 0) {
toggleSplitView();
bool found = false;
CreateFileEntry entry;
while (!found && (it != end)) {
- if ((*it).index() == senderName) {
+ if ((*it).key() == senderName) {
entry = (*it).value();
found = true;
}
// Get the source path of the template which should be copied.
// The source path is part of the Url entry of the desktop file.
- const int pos = entry.templatePath.findRev('/');
+ const int pos = entry.templatePath.lastIndexOf('/');
QString sourcePath(entry.templatePath.left(pos + 1));
sourcePath += KDesktopFile(entry.templatePath, true).readPathEntry("Url");
name.replace("...", QString::null);
// add the file extension to the name
- name.append(sourcePath.right(sourcePath.length() - sourcePath.findRev('.')));
+ name.append(sourcePath.right(sourcePath.length() - sourcePath.lastIndexOf('.')));
// Check whether a file with the current name already exists. If yes suggest automatically
// a unique file name (e. g. "HTML File" will be replaced by "HTML File_1").
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;
}
QString text(i18n("Paste"));
QClipboard* clipboard = QApplication::clipboard();
- QMimeSource* data = clipboard->data();
+ const QMimeData* data = clipboard->mimeData();
/* KDE4-TODO:
if (KUrlDrag::canDecode(data)) {
pasteAction->setEnabled(true);
m_activeView->setMode(DolphinView::DetailsView);
}
-void DolphinMainWindow::setPreviewsView()
-{
- m_activeView->setMode(DolphinView::PreviewsView);
-}
-
void DolphinMainWindow::sortByName()
{
m_activeView->setSorting(DolphinView::SortByName);
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_view[PrimaryIdx]->showHiddenFiles());
+ connectViewSignals(SecondaryIdx);
+ 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::showHiddenFiles()
+void DolphinMainWindow::togglePreview()
+{
+}
+
+void DolphinMainWindow::toggleShowHiddenFiles()
{
clearStatusBar();
const KToggleAction* showHiddenFilesAction =
static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
const bool show = showHiddenFilesAction->isChecked();
- m_activeView->setShowHiddenFilesEnabled(show);
+ m_activeView->setShowHiddenFiles(show);
}
void DolphinMainWindow::showFilterBar()
while (sourceIt != sourceEnd) {
QMap<QString, QString>::ConstIterator metaIt = metaData.find("trashUrl-" + (*sourceIt).path());
if (metaIt != metaData.end()) {
- newSourceUrls.append(KUrl(metaIt.data()));
+ newSourceUrls.append(KUrl(metaIt.value()));
}
++sourceIt;
}
m_splitter,
homeUrl,
props.viewMode(),
- props.isShowHiddenFilesEnabled());
+ props.showHiddenFiles());
+ connectViewSignals(PrimaryIdx);
+ m_view[PrimaryIdx]->show();
m_activeView = m_view[PrimaryIdx];
{
// setup 'File' menu
KAction *action = new KAction(KIcon("window_new"), i18n( "New &Window" ), actionCollection(), "new_window" );
- connect(action, SIGNAL(triggered()), this, SLOT(slotNewMainWindow()));
+ connect(action, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));
KAction* createFolder = new KAction(i18n("Folder..."), actionCollection(), "create_folder");
createFolder->setIcon(KIcon("folder"));
// setup 'Edit' menu
UndoManager& undoManager = UndoManager::instance();
KStdAction::undo(this,
- SLOT(slotUndo()),
+ SLOT(undo()),
actionCollection());
connect(&undoManager, SIGNAL(undoAvailable(bool)),
this, SLOT(slotUndoAvailable(bool)));
this, SLOT(slotUndoTextChanged(const QString&)));
KStdAction::redo(this,
- SLOT(slotRedo()),
+ SLOT(redo()),
actionCollection());
connect(&undoManager, SIGNAL(redoAvailable(bool)),
this, SLOT(slotRedoAvailable(bool)));
detailsView->setIcon(KIcon("view_text"));
connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView()));
- KToggleAction* previewsView = new KToggleAction(i18n("Previews"), actionCollection(), "previews");
- previewsView->setShortcut(Qt::CTRL | Qt::Key_3);
- previewsView->setIcon(KIcon("gvdirpart"));
- connect(previewsView, SIGNAL(triggered()), this, SLOT(setPreviewsView()));
-
QActionGroup* viewModeGroup = new QActionGroup(this);
viewModeGroup->addAction(iconsView);
viewModeGroup->addAction(detailsView);
- viewModeGroup->addAction(previewsView);
KToggleAction* sortByName = new KToggleAction(i18n("By Name"), actionCollection(), "by_name");
connect(sortByName, SIGNAL(triggered()), this, SLOT(sortByName()));
KToggleAction* sortDescending = new KToggleAction(i18n("Descending"), actionCollection(), "descending");
connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
+ KToggleAction* showPreview = new KToggleAction(i18n("Preview"), actionCollection(), "show_preview");
+ showPreview->setIcon(KIcon("gvdirpart"));
+ connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
+
KToggleAction* showHiddenFiles = new KToggleAction(i18n("Show Hidden Files"), actionCollection(), "show_hidden_files");
//showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_ KDE4-TODO: what Qt-Key represents '.'?
- connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(showHiddenFiles()));
+ connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
KToggleAction* split = new KToggleAction(i18n("Split View"), actionCollection(), "split_view");
split->setShortcut(Qt::Key_F10);
KStdAction::preferences(this, SLOT(editSettings()), actionCollection());
}
+void DolphinMainWindow::setupDockWidgets()
+{
+ 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"));
+
+ infoDock->setObjectName("infoDock");
+ infoDock->setWidget(new InfoSidebarPage(this));
+
+ infoDock->toggleViewAction()->setObjectName("show_info_pane");
+ infoDock->toggleViewAction()->setText(i18n("Show Information Panel"));
+ actionCollection()->insert(infoDock->toggleViewAction());
+
+ addDockWidget(Qt::RightDockWidgetArea, infoDock);
+}
+
void DolphinMainWindow::setupCreateNewMenuActions()
{
// Parts of the following code have been taken
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);
}
else {
stateChanged("has_selection");
- KAction* renameAction = actionCollection()->action("rename");
+ QAction* renameAction = actionCollection()->action("rename");
if (renameAction != 0) {
renameAction->setEnabled(list.count() >= 1);
}
++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");
case DolphinView::DetailsView:
action = actionCollection()->action("details");
break;
- case DolphinView::PreviewsView:
- action = actionCollection()->action("previews");
- break;
+ //case DolphinView::PreviewsView:
+ // action = actionCollection()->action("previews");
+ // break;
default:
break;
}
KToggleAction* showHiddenFilesAction =
static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
- showHiddenFilesAction->setChecked(m_activeView->isShowHiddenFilesEnabled());
+ showHiddenFilesAction->setChecked(m_activeView->showHiddenFiles());
KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
splitAction->setChecked(m_view[SecondaryIdx] != 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);
}
m_activeView->statusBar()->clear();
}
-void DolphinMainWindow::setupDockWidgets()
-{
- QDockWidget *shortcutsDock = new QDockWidget(i18n("Shortcuts"));
- shortcutsDock->setObjectName("shortcutsDock");
- shortcutsDock->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable);
- shortcutsDock->setWidget(new BookmarksSidebarPage(this));
- addDockWidget(Qt::LeftDockWidgetArea, shortcutsDock);
+void DolphinMainWindow::connectViewSignals(int viewIndex)
+{
+ DolphinView* view = m_view[viewIndex];
+ connect(view, SIGNAL(modeChanged()),
+ this, SLOT(slotViewModeChanged()));
+ connect(view, SIGNAL(showHiddenFilesChanged()),
+ this, SLOT(slotShowHiddenFilesChanged()));
+ connect(view, SIGNAL(sortingChanged(DolphinView::Sorting)),
+ this, SLOT(slotSortingChanged(DolphinView::Sorting)));
+ connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),
+ this, SLOT(slotSortOrderChanged(Qt::SortOrder)));
+ connect(view, SIGNAL(selectionChanged()),
+ this, SLOT(slotSelectionChanged()));
+ connect(view, SIGNAL(showFilterBarChanged(bool)),
+ this, SLOT(updateFilterBarAction(bool)));
+
+ const UrlNavigator* navigator = view->urlNavigator();
+ connect(navigator, SIGNAL(urlChanged(const KUrl&)),
+ this, SLOT(slotUrlChanged(const KUrl&)));
+ connect(navigator, SIGNAL(historyChanged()),
+ this, SLOT(slotHistoryChanged()));
- QDockWidget *infoDock = new QDockWidget(i18n("Information"));
- infoDock->setObjectName("infoDock");
- infoDock->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable);
- infoDock->setWidget(new InfoSidebarPage(this));
- addDockWidget(Qt::RightDockWidgetArea, infoDock);
}
#include "dolphinmainwindow.moc"
projects / dolphin.git / blobdiff