diff -Nru basket-2.0~20091110/CMakeLists.txt basket-2.0~20102801/CMakeLists.txt --- basket-2.0~20091110/CMakeLists.txt 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/CMakeLists.txt 2009-11-24 20:28:01.000000000 +0000 @@ -3,6 +3,7 @@ find_package(KDE4 REQUIRED) find_package(QImageBlitz REQUIRED) #find_package(Gpgme) +#find_package(Gpgmepp) if (BUILD_KPARTS) find_package(KdepimLibs REQUIRED) diff -Nru basket-2.0~20091110/debian/changelog basket-2.0~20102801/debian/changelog --- basket-2.0~20091110/debian/changelog 2010-01-28 10:36:19.000000000 +0000 +++ basket-2.0~20102801/debian/changelog 2010-01-28 10:36:19.000000000 +0000 @@ -1,3 +1,15 @@ +basket (2.0~20102801-0ubuntu1~ppa1) karmic; urgency=low + + * New upstream release + + -- Andreas Wenning Thu, 28 Jan 2010 11:27:38 +0100 + +basket (2.0~20091216-0ubuntu1~ppa1) karmic; urgency=low + + * New upstream release + + -- Andreas Wenning Wed, 16 Dec 2009 21:02:58 +0100 + basket (2.0~20091110-0ubuntu1~ppa1) karmic; urgency=low * New upstream release diff -Nru basket-2.0~20091110/.gitignore basket-2.0~20102801/.gitignore --- basket-2.0~20091110/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ basket-2.0~20102801/.gitignore 2009-11-24 20:28:01.000000000 +0000 @@ -0,0 +1 @@ +.*.swp diff -Nru basket-2.0~20091110/src/archive.cpp basket-2.0~20102801/src/archive.cpp --- basket-2.0~20091110/src/archive.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/archive.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -42,7 +42,7 @@ #include "archive.h" #include "global.h" #include "bnpview.h" -#include "basket.h" +#include "basketview.h" #include "basketlistview.h" #include "basketfactory.h" #include "tag.h" @@ -51,7 +51,7 @@ #include "backgroundmanager.h" #include "formatimporter.h" -void Archive::save(Basket *basket, bool withSubBaskets, const QString &destination) +void Archive::save(BasketView *basket, bool withSubBaskets, const QString &destination) { QDir dir; KProgressDialog dialog(0, i18n("Save as Basket Archive"), i18n("Saving as basket archive. Please wait..."), /*Not modal, for password dialogs!*/false); @@ -86,7 +86,7 @@ QDomElement root = document.createElement("basketTree"); document.appendChild(root); Global::bnpView->saveSubHierarchy(Global::bnpView->listViewItemForBasket(basket), document, root, withSubBaskets); - Basket::safelySaveToFile(tempFolder + "baskets.xml", "\n" + document.toString()); + BasketView::safelySaveToFile(tempFolder + "baskets.xml", "\n" + document.toString()); tar.addLocalFile(tempFolder + "baskets.xml", "baskets/baskets.xml"); dir.remove(tempFolder + "baskets.xml"); @@ -120,7 +120,7 @@ tar.close(); // Computing the File Preview: - Basket *previewBasket = basket; // FIXME: Use the first non-empty basket! + BasketView *previewBasket = basket; // FIXME: Use the first non-empty basket! QPixmap previewPixmap(previewBasket->visibleWidth(), previewBasket->visibleHeight()); QPainter painter(&previewPixmap); // Save old state, and make the look clean ("smile, you are filmed!"): @@ -189,7 +189,7 @@ dir.rmdir(tempFolder); } -void Archive::saveBasketToArchive(Basket *basket, bool recursive, KTar *tar, QStringList &backgrounds, const QString &tempFolder, QProgressBar *progress) +void Archive::saveBasketToArchive(BasketView *basket, bool recursive, KTar *tar, QStringList &backgrounds, const QString &tempFolder, QProgressBar *progress) { // Basket need to be loaded for tags exportation. // We load it NOW so that the progress bar really reflect the state of the exportation: @@ -243,7 +243,7 @@ } } -void Archive::listUsedTags(Basket *basket, bool recursive, QList &list) +void Archive::listUsedTags(BasketView *basket, bool recursive, QList &list) { basket->listUsedTags(list); BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket); @@ -463,7 +463,7 @@ } node = node.nextSibling(); } - Basket::safelySaveToFile(extractionFolder + "tags.xml", document->toString()); + BasketView::safelySaveToFile(extractionFolder + "tags.xml", document->toString()); } void Archive::importArchivedBackgroundImages(const QString &extractionFolder) @@ -548,7 +548,7 @@ QDomElement notes = XMLWork::getElement(docElem, "notes"); if (mergedStates.count() > 0) renameMergedStates(notes, mergedStates); - Basket::safelySaveToFile(fullPath, /*"\n" + */doc->toString()); + BasketView::safelySaveToFile(fullPath, /*"\n" + */doc->toString()); } void Archive::importBasketIcon(QDomElement properties, const QString &extractionFolder) @@ -611,7 +611,7 @@ } } -void Archive::loadExtractedBaskets(const QString &extractionFolder, QDomNode &basketNode, QMap &folderMap, Basket *parent) +void Archive::loadExtractedBaskets(const QString &extractionFolder, QDomNode &basketNode, QMap &folderMap, BasketView *parent) { bool basketSetAsCurrent = (parent != 0); QDomNode n = basketNode; @@ -628,7 +628,7 @@ dir.rmdir(Global::basketsFolder() + newFolderName); copier.moveFolder(extractionFolder + "baskets/" + folderName, Global::basketsFolder() + newFolderName); // Append and load the basket in the tree: - Basket *basket = Global::bnpView->loadBasket(newFolderName); + BasketView *basket = Global::bnpView->loadBasket(newFolderName); BasketListViewItem *basketItem = Global::bnpView->appendBasket(basket, (basket && parent ? Global::bnpView->listViewItemForBasket(parent) : 0)); basketItem->setExpanded(!XMLWork::trueOrFalse(element.attribute("folded", "false"), false)); QDomElement properties = XMLWork::getElement(element, "properties"); diff -Nru basket-2.0~20091110/src/archive.h basket-2.0~20102801/src/archive.h --- basket-2.0~20091110/src/archive.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/archive.h 2009-11-24 20:28:01.000000000 +0000 @@ -24,7 +24,7 @@ #include #include -class Basket; +class BasketView; class Tag; class QString; @@ -39,19 +39,19 @@ class Archive { public: - static void save(Basket *basket, bool withSubBaskets, const QString &destination); + static void save(BasketView *basket, bool withSubBaskets, const QString &destination); static void open(const QString &path); private: // Convenient Methods for Saving: - static void saveBasketToArchive(Basket *basket, bool recursive, KTar *tar, QStringList &backgrounds, const QString &tempFolder, QProgressBar *progress); - static void listUsedTags(Basket *basket, bool recursive, QList &list); + static void saveBasketToArchive(BasketView *basket, bool recursive, KTar *tar, QStringList &backgrounds, const QString &tempFolder, QProgressBar *progress); + static void listUsedTags(BasketView *basket, bool recursive, QList &list); // Convenient Methods for Loading: static void renameBasketFolders(const QString &extractionFolder, QMap &mergedStates); static void renameBasketFolder(const QString &extractionFolder, QDomNode &basketNode, QMap &folderMap, QMap &mergedStates); static void renameMergedStatesAndBasketIcon(const QString &fullPath, QMap &mergedStates, const QString &extractionFolder); static void renameMergedStates(QDomNode notes, QMap &mergedStates); static void importBasketIcon(QDomElement properties, const QString &extractionFolder); - static void loadExtractedBaskets(const QString &extractionFolder, QDomNode &basketNode, QMap &folderMap, Basket *parent); + static void loadExtractedBaskets(const QString &extractionFolder, QDomNode &basketNode, QMap &folderMap, BasketView *parent); static void importTagEmblems(const QString &extractionFolder); static void importArchivedBackgroundImages(const QString &extractionFolder); }; diff -Nru basket-2.0~20091110/src/basket.cpp basket-2.0~20102801/src/basket.cpp --- basket-2.0~20091110/src/basket.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/basket.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,5256 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003 by Sébastien Laoût * - * slaout@linux62.org * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * 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. * - ***************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include // for KStatefulBrush -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include // For sleep() - -#include -#include -#include - -#include - -#include -#include - -#include - -#include // rand() function -#include // seed for rand() - -#include "basket.h" -#include "decoratedbasket.h" -#include "diskerrordialog.h" -#include "note.h" -#include "notedrag.h" -#include "notefactory.h" -#include "noteedit.h" -#include "noteselection.h" -#include "tagsedit.h" -#include "transparentwidget.h" -#include "xmlwork.h" -#include "global.h" -#include "backgroundmanager.h" -#include "settings.h" -#include "tools.h" -#include "debugwindow.h" -#include "exporterdialog.h" -#include "config.h" -#ifdef HAVE_LIBGPGME -#include "kgpgme.h" -#endif - -/** Class Basket: */ - -const int Basket::FRAME_DELAY = 50/*1500*/; // Delay between two animation "frames" in milliseconds - -void debugZone(int zone) -{ - QString s; - switch (zone) { - case Note::Handle: s = "Handle"; break; - case Note::Group: s = "Group"; break; - case Note::TagsArrow: s = "TagsArrow"; break; - case Note::Custom0: s = "Custom0"; break; - case Note::GroupExpander: s = "GroupExpander"; break; - case Note::Content: s = "Content"; break; - case Note::Link: s = "Link"; break; - case Note::TopInsert: s = "TopInsert"; break; - case Note::TopGroup: s = "TopGroup"; break; - case Note::BottomInsert: s = "BottomInsert"; break; - case Note::BottomGroup: s = "BottomGroup"; break; - case Note::BottomColumn: s = "BottomColumn"; break; - case Note::None: s = "None"; break; - default: - if (zone == Note::Emblem0) - s = "Emblem0"; - else - s = "Emblem0+" + QString::number(zone - Note::Emblem0); - break; - } - kDebug() << s; -} - -#define FOR_EACH_NOTE(noteVar) \ - for (Note *noteVar = firstNote(); noteVar; noteVar = noteVar->next()) - -void Basket::prependNoteIn(Note *note, Note *in) -{ - if (!note) - // No note to prepend: - return; - - if (in) { - // The normal case: - preparePlug(note); - - Note *last = note->lastSibling(); - - for (Note *n = note; n; n = n->next()) - n->setParentNote(in); -// note->setPrev(0L); - last->setNext(in->firstChild()); - - if (in->firstChild()) - in->firstChild()->setPrev(last); - - in->setFirstChild(note); - - if (m_loaded) - signalCountsChanged(); - } else - // Prepend it directly in the basket: - appendNoteBefore(note, firstNote()); -} - -void Basket::appendNoteIn(Note *note, Note *in) -{ - if (!note) - // No note to append: - return; - - if (in) { - // The normal case: - preparePlug(note); - -// Note *last = note->lastSibling(); - Note *lastChild = in->lastChild(); - - for (Note *n = note; n; n = n->next()) - n->setParentNote(in); - note->setPrev(lastChild); -// last->setNext(0L); - - if (!in->firstChild()) - in->setFirstChild(note); - - if (lastChild) - lastChild->setNext(note); - - if (m_loaded) - signalCountsChanged(); - } else - // Prepend it directly in the basket: - appendNoteAfter(note, lastNote()); -} - -void Basket::appendNoteAfter(Note *note, Note *after) -{ - if (!note) - // No note to append: - return; - - if (!after) - // By default, insert after the last note: - after = lastNote(); - - if (m_loaded && after && !after->isFree() && !after->isColumn()) - for (Note *n = note; n; n = n->next()) - n->inheritTagsOf(after); - -// if (!alreadyInBasket) - preparePlug(note); - - Note *last = note->lastSibling(); - if (after) { - // The normal case: - for (Note *n = note; n; n = n->next()) - n->setParentNote(after->parentNote()); - note->setPrev(after); - last->setNext(after->next()); - after->setNext(note); - if (last->next()) - last->next()->setPrev(last); - } else { - // There is no note in the basket: - for (Note *n = note; n; n = n->next()) - n->setParentNote(0); - m_firstNote = note; -// note->setPrev(0); -// last->setNext(0); - } - -// if (!alreadyInBasket) - if (m_loaded) - signalCountsChanged(); -} - -void Basket::appendNoteBefore(Note *note, Note *before) -{ - if (!note) - // No note to append: - return; - - if (!before) - // By default, insert before the first note: - before = firstNote(); - - if (m_loaded && before && !before->isFree() && !before->isColumn()) - for (Note *n = note; n; n = n->next()) - n->inheritTagsOf(before); - - preparePlug(note); - - Note *last = note->lastSibling(); - if (before) { - // The normal case: - for (Note *n = note; n; n = n->next()) - n->setParentNote(before->parentNote()); - note->setPrev(before->prev()); - last->setNext(before); - before->setPrev(last); - if (note->prev()) - note->prev()->setNext(note); - else { - if (note->parentNote()) - note->parentNote()->setFirstChild(note); - else - m_firstNote = note; - } - } else { - // There is no note in the basket: - for (Note *n = note; n; n = n->next()) - n->setParentNote(0); - m_firstNote = note; -// note->setPrev(0); -// last->setNext(0); - } - - if (m_loaded) - signalCountsChanged(); -} - -DecoratedBasket* Basket::decoration() -{ - return (DecoratedBasket*)parent(); -} - -void Basket::preparePlug(Note *note) -{ - // Select only the new notes, compute the new notes count and the new number of found notes: - if (m_loaded) - unselectAll(); - int count = 0; - int founds = 0; - Note *last = 0; - for (Note *n = note; n; n = n->next()) { - if (m_loaded) - n->setSelectedRecursively(true); // Notes should have a parent basket (and they have, so that's OK). - count += n->count(); - founds += n->newFilter(decoration()->filterData()); - last = n; - } - m_count += count; - m_countFounds += founds; - - // Focus the last inserted note: - if (m_loaded && last) { - setFocusedNote(last); - m_startOfShiftSelectionNote = (last->isGroup() ? last->lastRealChild() : last); - } - - // If some notes don't match (are hidden), tell it to the user: - if (m_loaded && founds < count) { - if (count == 1) postMessage(i18n("The new note does not match the filter and is hidden.")); - else if (founds == count - 1) postMessage(i18n("A new note does not match the filter and is hidden.")); - else if (founds > 0) postMessage(i18n("Some new notes do not match the filter and are hidden.")); - else postMessage(i18n("The new notes do not match the filter and are hidden.")); - } -} - -void Basket::unplugNote(Note *note) -{ - // If there is nothing to do... - if (!note) - return; - -// if (!willBeReplugged) { - note->setSelectedRecursively(false); // To removeSelectedNote() and decrease the selectedsCount. - m_count -= note->count(); - m_countFounds -= note->newFilter(decoration()->filterData()); - signalCountsChanged(); -// } - - // If it was the first note, change the first note: - if (m_firstNote == note) - m_firstNote = note->next(); - - // Change previous and next notes: - if (note->prev()) - note->prev()->setNext(note->next()); - if (note->next()) - note->next()->setPrev(note->prev()); - - if (note->parentNote()) { - // If it was the first note of a group, change the first note of the group: - if (note->parentNote()->firstChild() == note) - note->parentNote()->setFirstChild(note->next()); - - if (!note->parentNote()->isColumn()) { - // Ungroup if still 0 note inside parent group: - if (! note->parentNote()->firstChild()) - unplugNote(note->parentNote()); // TODO delete - - // Ungroup if still 1 note inside parent group: - else if (! note->parentNote()->firstChild()->next()) - ungroupNote(note->parentNote()); - } - } - - note->setParentNote(0); - note->setPrev(0); - note->setNext(0); - -// recomputeBlankRects(); // FIXME: called too much time. It's here because when dragging and moving a note to another basket and then go back to the original basket, the note is deleted but the note rect is not painter anymore. -} - -void Basket::ungroupNote(Note *group) -{ - Note *note = group->firstChild(); - Note *lastGroupedNote = group; - Note *nextNote; - - // Move all notes after the group (not before, to avoid to change m_firstNote or group->m_firstChild): - while (note) { - nextNote = note->next(); - - if (lastGroupedNote->next()) - lastGroupedNote->next()->setPrev(note); - note->setNext(lastGroupedNote->next()); - lastGroupedNote->setNext(note); - note->setParentNote(group->parentNote()); - note->setPrev(lastGroupedNote); - - note->setGroupWidth(group->groupWidth() - Note::GROUP_WIDTH); - lastGroupedNote = note; - note = nextNote; - } - - // Unplug the group: - group->setFirstChild(0); - unplugNote(group); // TODO: delete - - relayoutNotes(true); -} - -void Basket::groupNoteBefore(Note *note, Note *with) -{ - if (!note || !with) - // No note to group or nowhere to group it: - return; - -// if (m_loaded && before && !with->isFree() && !with->isColumn()) - for (Note *n = note; n; n = n->next()) - n->inheritTagsOf(with); - - preparePlug(note); - - Note *last = note->lastSibling(); - - Note *group = new Note(this); - group->setPrev(with->prev()); - group->setNext(with->next()); - group->setX(with->x()); - group->setY(with->y()); - if (with->parentNote() && with->parentNote()->firstChild() == with) - with->parentNote()->setFirstChild(group); - else if (m_firstNote == with) - m_firstNote = group; - group->setParentNote(with->parentNote()); - group->setFirstChild(note); - group->setGroupWidth(with->groupWidth() + Note::GROUP_WIDTH); - - if (with->prev()) - with->prev()->setNext(group); - if (with->next()) - with->next()->setPrev(group); - with->setParentNote(group); - with->setPrev(last); - with->setNext(0L); - - for (Note *n = note; n; n = n->next()) - n->setParentNote(group); -// note->setPrev(0L); - last->setNext(with); - - if (m_loaded) - signalCountsChanged(); -} - -void Basket::groupNoteAfter(Note *note, Note *with) -{ - if (!note || !with) - // No note to group or nowhere to group it: - return; - -// if (m_loaded && before && !with->isFree() && !with->isColumn()) - for (Note *n = note; n; n = n->next()) - n->inheritTagsOf(with); - - preparePlug(note); - -// Note *last = note->lastSibling(); - - Note *group = new Note(this); - group->setPrev(with->prev()); - group->setNext(with->next()); - group->setX(with->x()); - group->setY(with->y()); - if (with->parentNote() && with->parentNote()->firstChild() == with) - with->parentNote()->setFirstChild(group); - else if (m_firstNote == with) - m_firstNote = group; - group->setParentNote(with->parentNote()); - group->setFirstChild(with); - group->setGroupWidth(with->groupWidth() + Note::GROUP_WIDTH); - - if (with->prev()) - with->prev()->setNext(group); - if (with->next()) - with->next()->setPrev(group); - with->setParentNote(group); - with->setPrev(0L); - with->setNext(note); - - for (Note *n = note; n; n = n->next()) - n->setParentNote(group); - note->setPrev(with); -// last->setNext(0L); - - if (m_loaded) - signalCountsChanged(); -} - -void Basket::loadNotes(const QDomElement ¬es, Note *parent) -{ - Note *note; - for (QDomNode n = notes.firstChild(); !n.isNull(); n = n.nextSibling()) { - QDomElement e = n.toElement(); - if (e.isNull()) // Cannot handle that! - continue; - note = 0; - // Load a Group: - if (e.tagName() == "group") { - note = new Note(this); // 1. Create the group... - loadNotes(e, note); // 3. ... And populate it with child notes. - int noteCount = note->count(); - if (noteCount > 0 || (parent == 0 && !isFreeLayout())) { // But don't remove columns! - appendNoteIn(note, parent); // 2. ... Insert it... FIXME: Initially, the if() the insrtion was the step 2. Was it on purpose? - // The notes in the group are counted two times (it's why appendNoteIn() was called before loadNotes): - m_count -= noteCount;// TODO: Recompute note count every time noteCount() is emitted! - m_countFounds -= noteCount; - } - } - // Load a Content-Based Note: - if (e.tagName() == "note" || e.tagName() == "item") { // Keep compatible with 0.6.0 Alpha 1 - note = new Note(this); // Create the note... - NoteFactory__loadNode(XMLWork::getElement(e, "content"), e.attribute("type"), note, /*lazyLoad=*/m_finishLoadOnFirstShow); // ... Populate it with content... - if (e.attribute("type") == "text") - m_shouldConvertPlainTextNotes = true; // Convert Pre-0.6.0 baskets: plain text notes should be converted to rich text ones once all is loaded! - appendNoteIn(note, parent); // ... And insert it. - // Load dates: - if (e.hasAttribute("added")) - note->setAddedDate(QDateTime::fromString(e.attribute("added"), Qt::ISODate)); - if (e.hasAttribute("lastModification")) - note->setLastModificationDate(QDateTime::fromString(e.attribute("lastModification"), Qt::ISODate)); - } - // If we successfully loaded a note: - if (note) { - // Free Note Properties: - if (note->isFree()) { - int x = e.attribute("x").toInt(); - int y = e.attribute("y").toInt(); - note->setX(x < 0 ? 0 : x); - note->setY(y < 0 ? 0 : y); - } - // Resizeable Note Properties: - if (note->hasResizer() || note->isColumn()) - note->setGroupWidth(e.attribute("width", "200").toInt()); - // Group Properties: - if (note->isGroup() && !note->isColumn() && XMLWork::trueOrFalse(e.attribute("folded", "false"))) - note->toggleFolded(false); - // Tags: - if (note->content()) { - QString tagsString = XMLWork::getElementText(e, "tags", ""); - QStringList tagsId = tagsString.split(";"); - for (QStringList::iterator it = tagsId.begin(); it != tagsId.end(); ++it) { - State *state = Tag::stateForId(*it); - if (state) - note->addState(state, /*orReplace=*/true); - } - } - } -// kapp->processEvents(); - } -} - -void Basket::saveNotes(QDomDocument &document, QDomElement &element, Note *parent) -{ - Note *note = (parent ? parent->firstChild() : firstNote()); - while (note) { - // Create Element: - QDomElement noteElement = document.createElement(note->isGroup() ? "group" : "note"); - element.appendChild(noteElement); - // Free Note Properties: - if (note->isFree()) { - noteElement.setAttribute("x", note->finalX()); - noteElement.setAttribute("y", note->finalY()); - } - // Resizeable Note Properties: - if (note->hasResizer()) - noteElement.setAttribute("width", note->groupWidth()); - // Group Properties: - if (note->isGroup() && !note->isColumn()) - noteElement.setAttribute("folded", XMLWork::trueOrFalse(note->isFolded())); - // Save Content: - if (note->content()) { - // Save Dates: - noteElement.setAttribute("added", note->addedDate().toString(Qt::ISODate)); - noteElement.setAttribute("lastModification", note->lastModificationDate().toString(Qt::ISODate)); - // Save Content: - noteElement.setAttribute("type", note->content()->lowerTypeName()); - QDomElement content = document.createElement("content"); - noteElement.appendChild(content); - note->content()->saveToNode(document, content); - // Save Tags: - if (note->states().count() > 0) { - QString tags; - for (State::List::iterator it = note->states().begin(); it != note->states().end(); ++it) - tags += (tags.isEmpty() ? "" : ";") + (*it)->id(); - XMLWork::addElement(document, noteElement, "tags", tags); - } - } else - // Save Child Notes: - saveNotes(document, noteElement, note); - // Go to the Next One: - note = note->next(); - } -} - -void Basket::loadProperties(const QDomElement &properties) -{ - // Compute Default Values for When Loading the Properties: - QString defaultBackgroundColor = (backgroundColorSetting().isValid() ? backgroundColorSetting().name() : ""); - QString defaultTextColor = (textColorSetting().isValid() ? textColorSetting().name() : ""); - - // Load the Properties: - QString icon = XMLWork::getElementText(properties, "icon", this->icon()); - QString name = XMLWork::getElementText(properties, "name", basketName()); - - QDomElement appearance = XMLWork::getElement(properties, "appearance"); - // In 0.6.0-Alpha versions, there was a typo error: "backround" instead of "background" - QString backgroundImage = appearance.attribute("backgroundImage", appearance.attribute("backroundImage", backgroundImageName())); - QString backgroundColorString = appearance.attribute("backgroundColor", appearance.attribute("backroundColor", defaultBackgroundColor)); - QString textColorString = appearance.attribute("textColor", defaultTextColor); - QColor backgroundColor = (backgroundColorString.isEmpty() ? QColor() : QColor(backgroundColorString)); - QColor textColor = (textColorString.isEmpty() ? QColor() : QColor(textColorString)); - - QDomElement disposition = XMLWork::getElement(properties, "disposition"); - bool free = XMLWork::trueOrFalse(disposition.attribute("free", XMLWork::trueOrFalse(isFreeLayout()))); - int columnCount = disposition.attribute("columnCount", QString::number(this->columnsCount())).toInt(); - bool mindMap = XMLWork::trueOrFalse(disposition.attribute("mindMap", XMLWork::trueOrFalse(isMindMap()))); - - QDomElement shortcut = XMLWork::getElement(properties, "shortcut"); - QString actionStrings[] = { "show", "globalShow", "globalSwitch" }; - KShortcut combination = KShortcut(shortcut.attribute( - "combination", - m_action->shortcut().primary().toString())); - QString actionString = shortcut.attribute("action"); - int action = shortcutAction(); - if (actionString == actionStrings[0]) action = 0; - if (actionString == actionStrings[1]) action = 1; - if (actionString == actionStrings[2]) action = 2; - - QDomElement protection = XMLWork::getElement(properties, "protection"); - m_encryptionType = protection.attribute("type").toInt(); - m_encryptionKey = protection.attribute("key"); - - // Apply the Properties: - setDisposition((free ? (mindMap ? 2 : 1) : 0), columnCount); - setShortcut(combination, action); - setAppearance(icon, name, backgroundImage, backgroundColor, textColor); // Will emit propertiesChanged(this) -} - -void Basket::saveProperties(QDomDocument &document, QDomElement &properties) -{ - XMLWork::addElement(document, properties, "name", basketName()); - XMLWork::addElement(document, properties, "icon", icon()); - - QDomElement appearance = document.createElement("appearance"); - properties.appendChild(appearance); - appearance.setAttribute("backgroundImage", backgroundImageName()); - appearance.setAttribute("backgroundColor", backgroundColorSetting().isValid() ? backgroundColorSetting().name() : ""); - appearance.setAttribute("textColor", textColorSetting().isValid() ? textColorSetting().name() : ""); - - QDomElement disposition = document.createElement("disposition"); - properties.appendChild(disposition); - disposition.setAttribute("free", XMLWork::trueOrFalse(isFreeLayout())); - disposition.setAttribute("columnCount", QString::number(columnsCount())); - disposition.setAttribute("mindMap", XMLWork::trueOrFalse(isMindMap())); - - QDomElement shortcut = document.createElement("shortcut"); - properties.appendChild(shortcut); - QString actionStrings[] = { "show", "globalShow", "globalSwitch" }; - shortcut.setAttribute("combination", m_action->shortcut().primary().toString()); - shortcut.setAttribute("action", actionStrings[shortcutAction()]); - - QDomElement protection = document.createElement("protection"); - properties.appendChild(protection); - protection.setAttribute("type", m_encryptionType); - protection.setAttribute("key", m_encryptionKey); -} - -void Basket::subscribeBackgroundImages() -{ - if (!m_backgroundImageName.isEmpty()) { - Global::backgroundManager->subscribe(m_backgroundImageName); - Global::backgroundManager->subscribe(m_backgroundImageName, this->backgroundColor()); - Global::backgroundManager->subscribe(m_backgroundImageName, selectionRectInsideColor()); - m_backgroundPixmap = Global::backgroundManager->pixmap(m_backgroundImageName); - m_opaqueBackgroundPixmap = Global::backgroundManager->opaquePixmap(m_backgroundImageName, this->backgroundColor()); - m_selectedBackgroundPixmap = Global::backgroundManager->opaquePixmap(m_backgroundImageName, selectionRectInsideColor()); - m_backgroundTiled = Global::backgroundManager->tiled(m_backgroundImageName); - } -} - -void Basket::unsubscribeBackgroundImages() -{ - if (hasBackgroundImage()) { - Global::backgroundManager->unsubscribe(m_backgroundImageName); - Global::backgroundManager->unsubscribe(m_backgroundImageName, this->backgroundColor()); - Global::backgroundManager->unsubscribe(m_backgroundImageName, selectionRectInsideColor()); - m_backgroundPixmap = 0; - m_opaqueBackgroundPixmap = 0; - m_selectedBackgroundPixmap = 0; - } -} - -void Basket::setAppearance(const QString &icon, const QString &name, const QString &backgroundImage, const QColor &backgroundColor, const QColor &textColor) -{ - unsubscribeBackgroundImages(); - - m_icon = icon; - m_basketName = name; - m_backgroundImageName = backgroundImage; - m_backgroundColorSetting = backgroundColor; - m_textColorSetting = textColor; - - // Where is this shown? - m_action->setText("BASKET SHORTCUT: " + name); - - // Basket should ALWAYS have an icon (the "basket" icon by default): - QPixmap iconTest = KIconLoader::global()->loadIcon( - m_icon, KIconLoader::NoGroup, 16, KIconLoader::DefaultState, - QStringList(), 0L, /*canReturnNull=*/true - ); - if (iconTest.isNull()) - m_icon = "basket"; - - // We don't request the background images if it's not loaded yet (to make the application startup fast). - // When the basket is loading (because requested by the user: he/she want to access it) - // it load the properties, subscribe to (and then load) the images, update the "Loading..." message with the image, - // load all the notes and it's done! - if (m_loadingLaunched) - subscribeBackgroundImages(); - - recomputeAllStyles(); // If a note have a tag with the same background color as the basket one, then display a "..." - recomputeBlankRects(); // See the drawing of blank areas in Basket::drawContents() - unbufferizeAll(); - updateContents(); - - if (isDuringEdit() && m_editor->widget()) { - QPalette palette; - palette.setColor(m_editor->widget()->backgroundRole(), m_editor->note()->backgroundColor()); - palette.setColor(m_editor->widget()->foregroundRole(), m_editor->note()->textColor()); - m_editor->widget()->setPalette(palette); - } - - emit propertiesChanged(this); -} - -void Basket::setDisposition(int disposition, int columnCount) -{ - static const int COLUMNS_LAYOUT = 0; - static const int FREE_LAYOUT = 1; - static const int MINDMAPS_LAYOUT = 2; - - int currentDisposition = (isFreeLayout() ? (isMindMap() ? MINDMAPS_LAYOUT : FREE_LAYOUT) : COLUMNS_LAYOUT); - - if (currentDisposition == COLUMNS_LAYOUT && disposition == COLUMNS_LAYOUT) { - if (firstNote() && columnCount > m_columnsCount) { - // Insert each new columns: - for (int i = m_columnsCount; i < columnCount; ++i) { - Note *newColumn = new Note(this); - insertNote(newColumn, /*clicked=*/lastNote(), /*zone=*/Note::BottomInsert, QPoint(), /*animateNewPosition=*/false); - } - } else if (firstNote() && columnCount < m_columnsCount) { - Note *column = firstNote(); - Note *cuttedNotes = 0; - for (int i = 1; i <= m_columnsCount; ++i) { - Note *columnToRemove = column; - column = column->next(); - if (i > columnCount) { - // Remove the columns that are too much: - unplugNote(columnToRemove); - // "Cut" the content in the columns to be deleted: - if (columnToRemove->firstChild()) { - for (Note *it = columnToRemove->firstChild(); it; it = it->next()) - it->setParentNote(0); - if (!cuttedNotes) - cuttedNotes = columnToRemove->firstChild(); - else { - Note *lastCuttedNote = cuttedNotes; - while (lastCuttedNote->next()) - lastCuttedNote = lastCuttedNote->next(); - lastCuttedNote->setNext(columnToRemove->firstChild()); - columnToRemove->firstChild()->setPrev(lastCuttedNote); - } - columnToRemove->setFirstChild(0); - } - } - } - // Paste the content in the last column: - if (cuttedNotes) - insertNote(cuttedNotes, /*clicked=*/lastNote(), /*zone=*/Note::BottomColumn, QPoint(), /*animateNewPosition=*/true); - unselectAll(); - } - if (columnCount != m_columnsCount) { - m_columnsCount = (columnCount <= 0 ? 1 : columnCount); - equalizeColumnSizes(); // Will relayoutNotes() - } - } else if (currentDisposition == COLUMNS_LAYOUT && (disposition == FREE_LAYOUT || disposition == MINDMAPS_LAYOUT)) { - Note *column = firstNote(); - m_columnsCount = 0; // Now, so relayoutNotes() will not relayout the free notes as if they were columns! - while (column) { - // Move all childs on the first level: - Note *nextColumn = column->next(); - ungroupNote(column); - column = nextColumn; - } - unselectAll(); - m_mindMap = (disposition == MINDMAPS_LAYOUT); - relayoutNotes(true); - } else if ((currentDisposition == FREE_LAYOUT || currentDisposition == MINDMAPS_LAYOUT) && disposition == COLUMNS_LAYOUT) { - if (firstNote()) { - // TODO: Reorder notes! - // Remove all notes (but keep a reference to them, we're not crazy ;-) ): - Note *notes = m_firstNote; - m_firstNote = 0; - m_count = 0; - m_countFounds = 0; - // Insert the number of columns that is needed: - Note *lastInsertedColumn = 0; - for (int i = 0; i < columnCount; ++i) { - Note *column = new Note(this); - if (lastInsertedColumn) - insertNote(column, /*clicked=*/lastInsertedColumn, /*zone=*/Note::BottomInsert, QPoint(), /*animateNewPosition=*/false); - else - m_firstNote = column; - lastInsertedColumn = column; - } - // Reinsert the old notes in the first column: - insertNote(notes, /*clicked=*/firstNote(), /*zone=*/Note::BottomColumn, QPoint(), /*animateNewPosition=*/true); - unselectAll(); - } else { - // Insert the number of columns that is needed: - Note *lastInsertedColumn = 0; - for (int i = 0; i < columnCount; ++i) { - Note *column = new Note(this); - if (lastInsertedColumn) - insertNote(column, /*clicked=*/lastInsertedColumn, /*zone=*/Note::BottomInsert, QPoint(), /*animateNewPosition=*/false); - else - m_firstNote = column; - lastInsertedColumn = column; - } - } - m_columnsCount = (columnCount <= 0 ? 1 : columnCount); - equalizeColumnSizes(); // Will relayoutNotes() - } -} - -void Basket::equalizeColumnSizes() -{ - if (!firstNote()) - return; - - // Necessary to know the available space; - relayoutNotes(true); - - int availableSpace = visibleWidth(); - int columnWidth = (visibleWidth() - (columnsCount() - 1) * Note::GROUP_WIDTH) / columnsCount(); - int columnCount = columnsCount(); - Note *column = firstNote(); - while (column) { - int minGroupWidth = column->minRight() - column->x(); - if (minGroupWidth > columnWidth) { - availableSpace -= minGroupWidth; - --columnCount; - } - column = column->next(); - } - columnWidth = (availableSpace - (columnsCount() - 1) * Note::GROUP_WIDTH) / columnCount; - - column = firstNote(); - while (column) { - int minGroupWidth = column->minRight() - column->x(); - if (minGroupWidth > columnWidth) - column->setGroupWidth(minGroupWidth); - else - column->setGroupWidth(columnWidth); - column = column->next(); - } - - relayoutNotes(true); -} - -void Basket::enableActions() -{ - Global::bnpView->enableActions(); - setFocusPolicy(isLocked() ? Qt::NoFocus : Qt::StrongFocus); - if (isLocked()) - viewport()->setCursor(Qt::ArrowCursor); // When locking, the cursor stays the last form it was -} - -bool Basket::save() -{ - if (!m_loaded) - return false; - - DEBUG_WIN << "Basket[" + folderName() + "]: Saving..."; - - // Create Document: - QDomDocument document(/*doctype=*/"basket"); - QDomElement root = document.createElement("basket"); - document.appendChild(root); - - // Create Properties Element and Populate It: - QDomElement properties = document.createElement("properties"); - saveProperties(document, properties); - root.appendChild(properties); - - // Create Notes Element and Populate It: - QDomElement notes = document.createElement("notes"); - saveNotes(document, notes, 0); - root.appendChild(notes); - - // Write to Disk: - if (!saveToFile(fullPath() + ".basket", "\n" + document.toString())) { - DEBUG_WIN << "Basket[" + folderName() + "]: FAILED to save!"; - return false; - } - - Global::bnpView->setUnsavedStatus(false); - return true; -} - -void Basket::aboutToBeActivated() -{ - if (m_finishLoadOnFirstShow) { - FOR_EACH_NOTE(note) - note->finishLazyLoad(); - - //relayoutNotes(/*animate=*/false); - setFocusedNote(0); // So that during the focusInEvent that will come shortly, the FIRST note is focused. - - if (Settings::playAnimations() && !decoration()->filterBar()->filterData().isFiltering && Global::bnpView->currentBasket() == this) // No animation when filtering all! - animateLoad();//QTimer::singleShot( 0, this, SLOT(animateLoad()) ); - - m_finishLoadOnFirstShow = false; - } -} - -void Basket::reload() -{ - closeEditor(); - unbufferizeAll(); // Keep the memory footprint low - - m_firstNote = 0; - - m_loaded = false; - m_loadingLaunched = false; - - updateContents(); -} - -void Basket::load() -{ - // Load only once: - if (m_loadingLaunched) - return; - m_loadingLaunched = true; - - DEBUG_WIN << "Basket[" + folderName() + "]: Loading..."; - QDomDocument *doc = 0; - QString content; - - // Load properties - if (loadFromFile(fullPath() + ".basket", &content)) { - doc = new QDomDocument("basket"); - if (! doc->setContent(content)) { - DEBUG_WIN << "Basket[" + folderName() + "]: FAILED to parse XML!"; - delete doc; - doc = 0; - } - } - if (isEncrypted()) - DEBUG_WIN << "Basket is encrypted."; - if (! doc) { - DEBUG_WIN << "Basket[" + folderName() + "]: FAILED to load!"; - m_loadingLaunched = false; - if (isEncrypted()) - m_locked = true; - Global::bnpView->notesStateChanged(); // Show "Locked" instead of "Loading..." in the statusbar - return; - } - m_locked = false; - - QDomElement docElem = doc->documentElement(); - QDomElement properties = XMLWork::getElement(docElem, "properties"); - - loadProperties(properties); // Since we are loading, this time the background image will also be loaded! - // Now that the background image is loaded and subscribed, we display it during the load process: - delete doc; - updateContents(); -// kapp->processEvents(); - - //BEGIN Compatibility with 0.6.0 Pre-Alpha versions: - QDomElement notes = XMLWork::getElement(docElem, "notes"); - if (notes.isNull()) - notes = XMLWork::getElement(docElem, "items"); - m_watcher->stopScan(); - m_shouldConvertPlainTextNotes = false; // Convert Pre-0.6.0 baskets: plain text notes should be converted to rich text ones once all is loaded! - - - // Load notes - m_finishLoadOnFirstShow = (Global::bnpView->currentBasket() != this); - loadNotes(notes, 0L); - if (m_shouldConvertPlainTextNotes) - convertTexts(); - m_watcher->startScan(); - - signalCountsChanged(); - if (isColumnsLayout()) { - // Count the number of columns: - int columnsCount = 0; - Note *column = firstNote(); - while (column) { - ++columnsCount; - column = column->next(); - } - m_columnsCount = columnsCount; - } - - relayoutNotes(false); - - // On application start, the current basket is not focused yet, so the focus rectangle is not shown when calling focusANote(): - if (Global::bnpView->currentBasket() == this) - setFocus(); - focusANote(); - - if (Settings::playAnimations() && !decoration()->filterBar()->filterData().isFiltering && Global::bnpView->currentBasket() == this) // No animation when filtering all! - animateLoad();//QTimer::singleShot( 0, this, SLOT(animateLoad()) ); - else - m_loaded = true; - enableActions(); -} - -void Basket::filterAgain(bool andEnsureVisible/* = true*/) -{ - newFilter(decoration()->filterData(), andEnsureVisible); -} - -void Basket::filterAgainDelayed() -{ - QTimer::singleShot(0, this, SLOT(filterAgain())); -} - -void Basket::newFilter(const FilterData &data, bool andEnsureVisible/* = true*/) -{ - if (!isLoaded()) - return; - -//StopWatch::start(20); - - m_countFounds = 0; - for (Note *note = firstNote(); note; note = note->next()) - m_countFounds += note->newFilter(data); - - relayoutNotes(true); - signalCountsChanged(); - - if (hasFocus()) // if (!hasFocus()), focusANote() will be called at focusInEvent() - focusANote(); // so, we avoid de-focus a note if it will be re-shown soon - if (andEnsureVisible && m_focusedNote != 0L) - ensureNoteVisible(m_focusedNote); - - Global::bnpView->setFiltering(data.isFiltering); - -//StopWatch::check(20); -} - -bool Basket::isFiltering() -{ - return decoration()->filterBar()->filterData().isFiltering; -} - - - -QString Basket::fullPath() -{ - return Global::basketsFolder() + folderName(); -} - -QString Basket::fullPathForFileName(const QString &fileName) -{ - return fullPath() + fileName; -} - -/*static*/ QString Basket::fullPathForFolderName(const QString &folderName) -{ - return Global::basketsFolder() + folderName; -} - - -void Basket::setShortcut(KShortcut shortcut, int action) -{ - if (action > 0) { - m_action->setGlobalShortcut( - shortcut, - KAction::ActiveShortcut | KAction::DefaultShortcut, - KAction::NoAutoloading - ); - } - m_shortcutAction = action; -} - -void Basket::activatedShortcut() -{ - Global::bnpView->setCurrentBasket(this); - - if (m_shortcutAction == 1) - Global::bnpView->setActive(true); -} - -void Basket::signalCountsChanged() -{ - if (!m_timerCountsChanged.isActive()) { - m_timerCountsChanged.setSingleShot(true); - m_timerCountsChanged.start(0); - } -} - -void Basket::countsChangedTimeOut() -{ - emit countsChanged(this); -} - - -Basket::Basket(QWidget *parent, const QString &folderName) - : Q3ScrollView(parent) - , m_noActionOnMouseRelease(false) - , m_ignoreCloseEditorOnNextMouseRelease(false) - , m_pressPos(-100, -100) - , m_canDrag(false) - , m_firstNote(0) - , m_columnsCount(1) - , m_mindMap(false) - , m_resizingNote(0L) - , m_pickedResizer(0) - , m_movingNote(0L) - , m_pickedHandle(0 , 0) - , m_clickedToInsert(0) - , m_zoneToInsert(0) - , m_posToInsert(-1 , -1) - , m_isInsertPopupMenu(false) - , m_insertMenuTitle(0) - , m_loaded(false) - , m_loadingLaunched(false) - , m_locked(false) - , m_decryptBox(0) - , m_button(0) - , m_encryptionType(NoEncryption) -#ifdef HAVE_LIBGPGME - , m_gpg(0) -#endif - , m_backgroundPixmap(0) - , m_opaqueBackgroundPixmap(0) - , m_selectedBackgroundPixmap(0) - , m_action(0) - , m_shortcutAction(0) - , m_hoveredNote(0) - , m_hoveredZone(Note::None) - , m_lockedHovering(false) - , m_underMouse(false) - , m_inserterRect() - , m_inserterShown(false) - , m_inserterSplit(true) - , m_inserterTop(false) - , m_inserterGroup(false) - , m_isSelecting(false) - , m_selectionStarted(false) - , m_count(0) - , m_countFounds(0) - , m_countSelecteds(0) - , m_folderName(folderName) - , m_editor(0) - , m_leftEditorBorder(0) - , m_rightEditorBorder(0) - , m_redirectEditActions(false) - , m_editorWidth(-1) - , m_editorHeight(-1) - , m_doNotCloseEditor(false) - , m_isDuringDrag(false) - , m_draggedNotes() - , m_focusedNote(0) - , m_startOfShiftSelectionNote(0) - , m_finishLoadOnFirstShow(false) - , m_relayoutOnNextShow(false) -{ - m_action = new KAction(this); - connect(m_action, SIGNAL(triggered()), this, SLOT(activatedShortcut())); - m_action->setGlobalShortcut(KShortcut()); - // We do this in the basket properties dialog (and keep it in sync with the - // global one) - m_action->setShortcutConfigurable(false); - - if (!m_folderName.endsWith("/")) - m_folderName += "/"; - - setFocusPolicy(Qt::StrongFocus); - setDragAutoScroll(true); - - // By default, there is no corner widget: we set one for the corner area to be painted! - // If we don't set one and there are two scrollbars present, slowly resizing up the window show graphical glitches in that area! - m_cornerWidget = new QWidget(this); - setCornerWidget(m_cornerWidget); - - viewport()->setAcceptDrops(true); - viewport()->setMouseTracking(true); - viewport()->setAutoFillBackground(false); // Do not clear the widget before paintEvent() because we always draw every pixels (faster and flicker-free) - - // File Watcher: - m_watcher = new KDirWatch(this); - connect(m_watcher, SIGNAL(dirty(const QString&)), this, SLOT(watchedFileModified(const QString&))); - connect(m_watcher, SIGNAL(deleted(const QString&)), this, SLOT(watchedFileDeleted(const QString&))); - connect(&m_watcherTimer, SIGNAL(timeout()), this, SLOT(updateModifiedNotes())); - - // Various Connections: - connect(&m_animationTimer, SIGNAL(timeout()), this, SLOT(animateObjects())); - connect(&m_autoScrollSelectionTimer, SIGNAL(timeout()), this, SLOT(doAutoScrollSelection())); - connect(&m_timerCountsChanged, SIGNAL(timeout()), this, SLOT(countsChangedTimeOut())); - connect(&m_inactivityAutoSaveTimer, SIGNAL(timeout()), this, SLOT(inactivityAutoSaveTimeout())); - connect(&m_inactivityAutoLockTimer, SIGNAL(timeout()), this, SLOT(inactivityAutoLockTimeout())); - connect(this, SIGNAL(contentsMoving(int, int)), this, SLOT(contentsMoved())); -#ifdef HAVE_LIBGPGME - m_gpg = new KGpgMe(); -#endif - m_locked = isFileEncrypted(); -} - -void Basket::contentsMoved() -{ - // This slot is called BEFORE the content move, so we delay the hover effects: - QTimer::singleShot(0, this, SLOT(doHoverEffects())); -} - -void Basket::enterEvent(QEvent *) -{ - m_underMouse = true; - doHoverEffects(); -} - -void Basket::leaveEvent(QEvent *) -{ - m_underMouse = false; - doHoverEffects(); - - if (m_lockedHovering) - return; - - removeInserter(); - if (m_hoveredNote) { - m_hoveredNote->setHovered(false); - m_hoveredNote->setHoveredZone(Note::None); - updateNote(m_hoveredNote); - } - m_hoveredNote = 0; -} - -void Basket::setFocusIfNotInPopupMenu() -{ - if (!kapp->activePopupWidget()) { - if (isDuringEdit()) - m_editor->widget()->setFocus(); - else - setFocus(); - } -} - -void Basket::contentsMousePressEvent(QMouseEvent *event) -{ - // If user click the basket, focus it! - // The focus is delayed because if the click results in showing a popup menu, - // the interface flicker by showing the focused rectangle (as the basket gets focus) - // and immediatly removing it (because the popup menu now have focus). - if (!isDuringEdit()) - QTimer::singleShot(0, this, SLOT(setFocusIfNotInPopupMenu())); - - // Convenient variables: - bool controlPressed = event->modifiers() & Qt::ControlModifier; - bool shiftPressed = event->modifiers() & Qt::ShiftModifier; - - // Do nothing if we disabled the click some milliseconds sooner. - // For instance when a popup menu has been closed with click, we should not do action: - if (event->button() == Qt::LeftButton && (kapp->activePopupWidget() || m_lastDisableClick.msecsTo(QTime::currentTime()) <= 80)) { - doHoverEffects(); - m_noActionOnMouseRelease = true; - // But we allow to select: - // The code is the same as at the bottom of this method: - if (event->button() == Qt::LeftButton) { - m_selectionStarted = true; - m_selectionBeginPoint = event->pos(); - m_selectionInvert = controlPressed || shiftPressed; - } - return; - } - - // Figure out what is the clicked note and zone: - Note *clicked = noteAt(event->pos().x(), event->pos().y()); - Note::Zone zone = (clicked ? clicked->zoneAt(event->pos() - QPoint(clicked->x(), clicked->y())) : Note::None); - - // Popup Tags menu: - if (zone == Note::TagsArrow && !controlPressed && !shiftPressed && event->button() != Qt::MidButton) { - if (!clicked->isSelected()) - unselectAllBut(clicked); - setFocusedNote(clicked); /// /// /// - m_startOfShiftSelectionNote = clicked; - m_noActionOnMouseRelease = true; - popupTagsMenu(clicked); - return; - } - - if (event->button() == Qt::LeftButton) { - // Prepare to allow drag and drop when moving mouse further: - if ((zone == Note::Handle || zone == Note::Group) || - (clicked && clicked->isSelected() && - (zone == Note::TagsArrow || zone == Note::Custom0 || zone == Note::Content || zone == Note::Link /**/ || zone >= Note::Emblem0 /**/))) { - if (!shiftPressed && !controlPressed) { - m_pressPos = event->pos(); // TODO: Allow to drag emblems to assign them to other notes. Then don't allow drag at Emblem0!! - m_canDrag = true; - // Saving where we were editing, because during a drag, the mouse can fly over the text edit and move the cursor position: - if (m_editor && m_editor->textEdit()) { - KTextEdit *editor = m_editor->textEdit(); - m_textCursor = editor->textCursor(); - } - } - } - - // Initializing Resizer move: - if (zone == Note::Resizer) { - m_resizingNote = clicked; - m_pickedResizer = event->pos().x() - clicked->rightLimit(); - m_noActionOnMouseRelease = true; - m_lockedHovering = true; - return; - } - - // Select note(s): - if (zone == Note::Handle || zone == Note::Group || (zone == Note::GroupExpander && (controlPressed || shiftPressed))) { - Note *end = clicked; - if (clicked->isGroup() && shiftPressed) { - if (clicked->contains(m_startOfShiftSelectionNote)) { - m_startOfShiftSelectionNote = clicked->firstRealChild(); - end = clicked->lastRealChild(); - } else if (clicked->firstRealChild()->isAfter(m_startOfShiftSelectionNote)) - end = clicked->lastRealChild(); - else - end = clicked->firstRealChild(); - } - if (controlPressed && shiftPressed) - selectRange(m_startOfShiftSelectionNote, end, /*unselectOthers=*/false); - else if (shiftPressed) - selectRange(m_startOfShiftSelectionNote, end); - else if (controlPressed) - clicked->setSelectedRecursively(!clicked->allSelected()); - else if (!clicked->allSelected()) - unselectAllBut(clicked); - setFocusedNote(end); /// /// /// - m_startOfShiftSelectionNote = (end->isGroup() ? end->firstRealChild() : end); - //m_noActionOnMouseRelease = false; - m_noActionOnMouseRelease = true; - return; - } - - // Folding/Unfolding group: - if (zone == Note::GroupExpander) { - clicked->toggleFolded(Settings::playAnimations()); - relayoutNotes(true); - m_noActionOnMouseRelease = true; - return; - } - } - - // Popup menu for tag emblems: - if (event->button() == Qt::RightButton && zone >= Note::Emblem0) { - if (!clicked->isSelected()) - unselectAllBut(clicked); - setFocusedNote(clicked); /// /// /// - m_startOfShiftSelectionNote = clicked; - popupEmblemMenu(clicked, zone - Note::Emblem0); - m_noActionOnMouseRelease = true; - return; - } - - // Insertion Popup Menu: - if ((event->button() == Qt::RightButton) - && ((!clicked && isFreeLayout()) - || (clicked - && (zone == Note::TopInsert - || zone == Note::TopGroup - || zone == Note::BottomInsert - || zone == Note::BottomGroup - || zone == Note::BottomColumn)))) { - unselectAll(); - m_clickedToInsert = clicked; - m_zoneToInsert = zone; - m_posToInsert = event->pos(); - - KMenu* menu = Global::bnpView->popupMenu("insert_popup"); - // If we already added a title, remove it because it would be kept and - // then added several times. - if (m_insertMenuTitle && menu->actions().contains(m_insertMenuTitle)) - menu->removeAction(m_insertMenuTitle); - - QAction *first = menu->actions().value(0); - - // i18n: Verbs (for the "insert" menu) - if (zone == Note::TopGroup || zone == Note::BottomGroup) - m_insertMenuTitle = menu->addTitle(i18n("Group"), first); - else - m_insertMenuTitle = menu->addTitle(i18n("Insert"), first); - - setInsertPopupMenu(); - connect(menu, SIGNAL(aboutToHide()), this, SLOT(delayedCancelInsertPopupMenu())); - connect(menu, SIGNAL(aboutToHide()), this, SLOT(unlockHovering())); - connect(menu, SIGNAL(aboutToHide()), this, SLOT(disableNextClick())); - connect(menu, SIGNAL(aboutToHide()), this, SLOT(hideInsertPopupMenu())); - doHoverEffects(clicked, zone); // In the case where another popup menu was open, we should do that manually! - m_lockedHovering = true; - menu->exec(QCursor::pos()); - m_noActionOnMouseRelease = true; - return; - } - - // Note Context Menu: - if (event->button() == Qt::RightButton && clicked && !clicked->isColumn() && zone != Note::Resizer) { - if (!clicked->isSelected()) - unselectAllBut(clicked); - setFocusedNote(clicked); /// /// /// - if (editedNote() == clicked) { - closeEditor(); - clicked->setSelected(true); - } - m_startOfShiftSelectionNote = (clicked->isGroup() ? clicked->firstRealChild() : clicked); - KMenu* menu = Global::bnpView->popupMenu("note_popup"); - connect(menu, SIGNAL(aboutToHide()), this, SLOT(unlockHovering())); - connect(menu, SIGNAL(aboutToHide()), this, SLOT(disableNextClick())); - doHoverEffects(clicked, zone); // In the case where another popup menu was open, we should do that manually! - m_lockedHovering = true; - menu->exec(QCursor::pos()); - m_noActionOnMouseRelease = true; - return; - } - - // Paste selection under cursor (but not "create new primary note under cursor" because this is on moveRelease): - if (event->button() == Qt::MidButton && zone != Note::Resizer && (!isDuringEdit() || clicked != editedNote())) { - if ((Settings::middleAction() != 0) && (event->modifiers() == Qt::ShiftModifier)) { - m_clickedToInsert = clicked; - m_zoneToInsert = zone; - m_posToInsert = event->pos(); - closeEditor(); - removeInserter(); // If clicked at an insertion line and the new note shows a dialog for editing, - NoteType::Id type = (NoteType::Id)0; // hide that inserter before the note edition instead of after the dialog is closed - switch (Settings::middleAction()) { - case 1: - m_isInsertPopupMenu = true; - pasteNote(); - break; - case 2: type = NoteType::Image; break; - case 3: type = NoteType::Link; break; - case 4: type = NoteType::Launcher; break; - default: - m_noActionOnMouseRelease = false; - return; - } - if (type != 0) { - m_ignoreCloseEditorOnNextMouseRelease = true; - Global::bnpView->insertEmpty(type); - } - } else { - if (clicked) - zone = clicked->zoneAt(event->pos() - QPoint(clicked->x(), clicked->y()), true); - closeEditor(); - clickedToInsert(event, clicked, zone); - save(); - } - m_noActionOnMouseRelease = true; - return; - } - - // Finally, no action has been done durint pressEvent, so an action can be done on releaseEvent: - m_noActionOnMouseRelease = false; - - /* Selection scenario: - * On contentsMousePressEvent, put m_selectionStarted to true and init Begin and End selection point. - * On contentsMouseMoveEvent, if m_selectionStarted, update End selection point, update selection rect, - * and if it's larger, switching to m_isSelecting mode: we can draw the selection rectangle. - */ - // Prepare selection: - if (event->button() == Qt::LeftButton) { - m_selectionStarted = true; - m_selectionBeginPoint = event->pos(); - // We usualy invert the selection with the Ctrl key, but some environements (like GNOME or The Gimp) do it with the Shift key. - // Since the Shift key has no specific usage, we allow to invert selection ALSO with Shift for Gimp people - m_selectionInvert = controlPressed || shiftPressed; - } -} - -void Basket::delayedCancelInsertPopupMenu() -{ - QTimer::singleShot(0, this, SLOT(cancelInsertPopupMenu())); -} - -void Basket::contentsContextMenuEvent(QContextMenuEvent *event) -{ - if (event->reason() == QContextMenuEvent::Keyboard) { - if (countFounds/*countShown*/() == 0) { // TODO: Count shown!! - KMenu *menu = Global::bnpView->popupMenu("insert_popup"); - setInsertPopupMenu(); - connect(menu, SIGNAL(aboutToHide()), this, SLOT(delayedCancelInsertPopupMenu())); - connect(menu, SIGNAL(aboutToHide()), this, SLOT(unlockHovering())); - connect(menu, SIGNAL(aboutToHide()), this, SLOT(disableNextClick())); - removeInserter(); - m_lockedHovering = true; - menu->exec(mapToGlobal(QPoint(0, 0))); - } else { - if (! m_focusedNote->isSelected()) - unselectAllBut(m_focusedNote); - setFocusedNote(m_focusedNote); /// /// /// - m_startOfShiftSelectionNote = (m_focusedNote->isGroup() ? m_focusedNote->firstRealChild() : m_focusedNote); - // Popup at bottom (or top) of the focused note, if visible : - KMenu *menu = Global::bnpView->popupMenu("note_popup"); - connect(menu, SIGNAL(aboutToHide()), this, SLOT(unlockHovering())); - connect(menu, SIGNAL(aboutToHide()), this, SLOT(disableNextClick())); - doHoverEffects(m_focusedNote, Note::Content); // In the case where another popup menu was open, we should do that manually! - m_lockedHovering = true; - menu->exec(noteVisibleRect(m_focusedNote).bottomLeft()); - } - } -} - -QRect Basket::noteVisibleRect(Note *note) -{ - QRect rect(contentsToViewport(QPoint(note->x(), note->y())), QSize(note->width(), note->height())); - QPoint basketPoint = mapToGlobal(QPoint(0, 0)); - rect.moveTopLeft(rect.topLeft() + basketPoint + QPoint(frameWidth(), frameWidth())); - - // Now, rect contain the global note rectangle on the screen. - // We have to clip it by the basket widget : - if (rect.bottom() > basketPoint.y() + visibleHeight() + 1) { // Bottom too... bottom - rect.setBottom(basketPoint.y() + visibleHeight() + 1); - if (rect.height() <= 0) // Have at least one visible pixel of height - rect.setTop(rect.bottom()); - } - if (rect.top() < basketPoint.y() + frameWidth()) { // Top too... top - rect.setTop(basketPoint.y() + frameWidth()); - if (rect.height() <= 0) - rect.setBottom(rect.top()); - } - if (rect.right() > basketPoint.x() + visibleWidth() + 1) { // Right too... right - rect.setRight(basketPoint.x() + visibleWidth() + 1); - if (rect.width() <= 0) // Have at least one visible pixel of width - rect.setLeft(rect.right()); - } - if (rect.left() < basketPoint.x() + frameWidth()) { // Left too... left - rect.setLeft(basketPoint.x() + frameWidth()); - if (rect.width() <= 0) - rect.setRight(rect.left()); - } - - return rect; -} - -void Basket::disableNextClick() -{ - m_lastDisableClick = QTime::currentTime(); -} - -void Basket::recomputeAllStyles() -{ - FOR_EACH_NOTE(note) - note->recomputeAllStyles(); -} - -void Basket::removedStates(const QList &deletedStates) -{ - bool modifiedBasket = false; - - FOR_EACH_NOTE(note) - if (note->removedStates(deletedStates)) - modifiedBasket = true; - - if (modifiedBasket) - save(); -} - -void Basket::insertNote(Note *note, Note *clicked, int zone, const QPoint &pos, bool animateNewPosition) -{ - if (!note) { - kDebug() << "Wanted to insert NO note"; - return; - } - - if (clicked && zone == Note::BottomColumn) { - // When inserting at the bottom of a column, it's obvious the new note SHOULD inherit tags. - // We ensure that by changing the insertion point after the last note of the column: - Note *last = clicked->lastChild(); - if (last) { - clicked = last; - zone = Note::BottomInsert; - } - } - - /// Insertion at the bottom of a column: - if (clicked && zone == Note::BottomColumn) { - note->setWidth(clicked->rightLimit() - clicked->x()); - Note *lastChild = clicked->lastChild(); - if (!animateNewPosition || !Settings::playAnimations()) - for (Note *n = note; n; n = n->next()) { - n->setXRecursively(clicked->x()); - n->setYRecursively((lastChild ? lastChild : clicked)->bottom() + 1); - } - appendNoteIn(note, clicked); - - /// Insertion relative to a note (top/bottom, insert/group): - } else if (clicked) { - note->setWidth(clicked->width()); - if (!animateNewPosition || !Settings::playAnimations()) - for (Note *n = note; n; n = n->next()) { - if (zone == Note::TopGroup || zone == Note::BottomGroup) - n->setXRecursively(clicked->x() + Note::GROUP_WIDTH); - else - n->setXRecursively(clicked->x()); - if (zone == Note::TopInsert || zone == Note::TopGroup) - n->setYRecursively(clicked->y()); - else - n->setYRecursively(clicked->bottom() + 1); - } - - if (zone == Note::TopInsert) { - appendNoteBefore(note, clicked); - } else if (zone == Note::BottomInsert) { - appendNoteAfter(note, clicked); - } else if (zone == Note::TopGroup) { - groupNoteBefore(note, clicked); - } else if (zone == Note::BottomGroup) { - groupNoteAfter(note, clicked); - } - - /// Free insertion: - } else if (isFreeLayout()) { - // Group if note have siblings: - if (note->next()) { - Note *group = new Note(this); - for (Note *n = note; n; n = n->next()) - n->setParentNote(group); - group->setFirstChild(note); - note = group; - } - // Insert at cursor position: - const int initialWidth = 250; - note->setWidth(note->isGroup() ? Note::GROUP_WIDTH : initialWidth); - if (note->isGroup() && note->firstChild()) - note->setInitialHeight(note->firstChild()->height()); - //note->setGroupWidth(initialWidth); - if (animateNewPosition && Settings::playAnimations()) - note->setFinalPosition(pos.x(), pos.y()); - else { - note->setXRecursively(pos.x()); - note->setYRecursively(pos.y()); - } - appendNoteAfter(note, lastNote()); - } - - relayoutNotes(true); -} - -void Basket::clickedToInsert(QMouseEvent *event, Note *clicked, /*Note::Zone*/int zone) -{ - Note *note; - if (event->button() == Qt::MidButton) - note = NoteFactory::dropNote(KApplication::clipboard()->mimeData(QClipboard::Selection), this); - else - note = NoteFactory::createNoteText("", this); - - if (!note) - return; - - insertNote(note, clicked, zone, event->pos(), /*animateNewPosition=*/false); - -// ensureNoteVisible(lastInsertedNote()); // TODO: in insertNote() - - if (event->button() != Qt::MidButton) { - removeInserter(); // Case: user clicked below a column to insert, the note is inserted and doHoverEffects() put a new inserter below. We don't want it. - closeEditor(); - noteEdit(note, /*justAdded=*/true); - } -} - -void Basket::contentsDragEnterEvent(QDragEnterEvent *event) -{ - m_isDuringDrag = true; - Global::bnpView->updateStatusBarHint(); - if (NoteDrag::basketOf(event->mimeData()) == this) - m_draggedNotes = NoteDrag::notesOf(event); - event->accept(); -} - -void Basket::contentsDragMoveEvent(QDragMoveEvent *event) -{ -// m_isDuringDrag = true; - -// if (isLocked()) -// return; - -// FIXME: viewportToContents does NOT work !!! -// QPoint pos = viewportToContents(event->pos()); -// QPoint pos( event->pos().x() + contentsX(), event->pos().y() + contentsY() ); - -// if (insertAtCursorPos()) -// computeInsertPlace(pos); - doHoverEffects(event->pos()); - -// showFrameInsertTo(); - if (isFreeLayout() || noteAt(event->pos().x(), event->pos().y())) // Cursor before rightLimit() or hovering the dragged source notes - acceptDropEvent(event); - else { - event->setAccepted(false); - } - - /* Note *hoveredNote = noteAt(event->pos().x(), event->pos().y()); - if ( (isColumnsLayout() && !hoveredNote) || (draggedNotes().contains(hoveredNote)) ) { - event->acceptAction(false); - event->accept(false); - } else - acceptDropEvent(event);*/ - - // A workarround since QScrollView::dragAutoScroll seem to have no effect : -// ensureVisible(event->pos().x() + contentsX(), event->pos().y() + contentsY(), 30, 30); -// QScrollView::dragMoveEvent(event); -} - -void Basket::contentsDragLeaveEvent(QDragLeaveEvent*) -{ -// resetInsertTo(); - m_isDuringDrag = false; - m_draggedNotes.clear(); - m_noActionOnMouseRelease = true; - emit resetStatusBarText(); - doHoverEffects(); -} - -void Basket::contentsDropEvent(QDropEvent *event) -{ - QPoint pos = event->pos(); - kDebug() << "Contents Drop Event at position " << pos.x() << ":" << pos.y(); - - m_isDuringDrag = false; - emit resetStatusBarText(); - -// if (isLocked()) -// return; - - // Do NOT check the bottom&right borders. - // Because imagine someone drag&drop a big note from the top to the bottom of a big basket (with big vertical scrollbars), - // the note is first removed, and relayoutNotes() compute the new height that is smaller - // Then noteAt() is called for the mouse pointer position, because the basket is now smaller, the cursor is out of boundaries!!! - // Should, of course, not return 0: - Note *clicked = noteAt(event->pos().x(), event->pos().y()); - - if (NoteFactory::movingNotesInTheSameBasket(event->mimeData(), this, event->dropAction()) && event->dropAction() == Qt::MoveAction) { - m_doNotCloseEditor = true; - } - - Note *note = NoteFactory::dropNote(event->mimeData(), this, true, event->dropAction(), dynamic_cast(event->source())); - - if (note) { - Note::Zone zone = (clicked ? clicked->zoneAt(event->pos() - QPoint(clicked->x(), clicked->y()), /*toAdd=*/true) : Note::None); - bool animateNewPosition = NoteFactory::movingNotesInTheSameBasket(event->mimeData(), this, event->dropAction()); - if (animateNewPosition) { - FOR_EACH_NOTE(n) - n->setOnTop(false); - // FOR_EACH_NOTE_IN_CHUNK(note) - for (Note *n = note; n; n = n->next()) - n->setOnTop(true); - } - - insertNote(note, clicked, zone, event->pos(), animateNewPosition); - - // If moved a note on bottom, contentsHeight has been disminished, then view scrolled up, and we should re-scroll the view down: - ensureNoteVisible(note); - -// if (event->button() != Qt::MidButton) { -// removeInserter(); // Case: user clicked below a column to insert, the note is inserted and doHoverEffects() put a new inserter below. We don't want it. -// } - -// resetInsertTo(); -// doHoverEffects(); called by insertNote() - save(); - } - - m_draggedNotes.clear(); - - m_doNotCloseEditor = false; - // When starting the drag, we saved where we were editing. - // This is because during a drag, the mouse can fly over the text edit and move the cursor position, and even HIDE the cursor. - // So we re-show the cursor, and re-position it at the right place: - if (m_editor && m_editor->textEdit()) { - KTextEdit *editor = m_editor->textEdit(); - editor->setTextCursor(m_textCursor); - } -} - -// handles dropping of a note to basket that is not shown -// (usually through its entry in the basket list) -void Basket::blindDrop(QDropEvent* event) -{ - if (!m_isInsertPopupMenu && redirectEditActions()) { - if (m_editor->textEdit()) - m_editor->textEdit()->paste(); - else if (m_editor->lineEdit()) - m_editor->lineEdit()->paste(); - } else { - if (!isLoaded()) { - Global::bnpView->showPassiveLoading(this); - load(); - } - closeEditor(); - unselectAll(); - Note *note = NoteFactory::dropNote(event->mimeData(), this, true, event->dropAction(), - dynamic_cast(event->source())); - if (note) { - insertCreatedNote(note); - //unselectAllBut(note); - if (Settings::usePassivePopup()) - Global::bnpView->showPassiveDropped(i18n("Dropped to basket %1")); - } - } - save(); -} - -void Basket::insertEmptyNote(int type) -{ - if (!isLoaded()) - load(); - if (isDuringEdit()) - closeEditor(); - Note *note = NoteFactory::createEmptyNote((NoteType::Id)type, this); - insertCreatedNote(note/*, / *edit=* /true*/); - noteEdit(note, /*justAdded=*/true); -} - -void Basket::insertWizard(int type) -{ - saveInsertionData(); - Note *note = 0; - switch (type) { - default: - case 1: note = NoteFactory::importKMenuLauncher(this); break; - case 2: note = NoteFactory::importIcon(this); break; - case 3: note = NoteFactory::importFileContent(this); break; - } - if (!note) - return; - restoreInsertionData(); - insertCreatedNote(note); - unselectAllBut(note); - resetInsertionData(); -} - -void Basket::insertColor(const QColor &color) -{ - Note *note = NoteFactory::createNoteColor(color, this); - restoreInsertionData(); - insertCreatedNote(note); - unselectAllBut(note); - resetInsertionData(); -} - -void Basket::insertImage(const QPixmap &image) -{ - Note *note = NoteFactory::createNoteImage(image, this); - restoreInsertionData(); - insertCreatedNote(note); - unselectAllBut(note); - resetInsertionData(); -} - -void Basket::pasteNote(QClipboard::Mode mode) -{ - if (!m_isInsertPopupMenu && redirectEditActions()) { - if (m_editor->textEdit()) - m_editor->textEdit()->paste(); - else if (m_editor->lineEdit()) - m_editor->lineEdit()->paste(); - } else { - if (!isLoaded()) { - Global::bnpView->showPassiveLoading(this); - load(); - } - closeEditor(); - unselectAll(); - Note *note = NoteFactory::dropNote(KApplication::clipboard()->mimeData(mode), this); - if (note) { - insertCreatedNote(note); - //unselectAllBut(note); - } - } -} - -void Basket::insertCreatedNote(Note *note) -{ - // Get the insertion data if the user clicked inside the basket: - Note *clicked = m_clickedToInsert; - int zone = m_zoneToInsert; - QPoint pos = m_posToInsert; - - // If it isn't the case, use the default position: - if (!clicked && (pos.x() < 0 || pos.y() < 0)) { - // Insert right after the focused note: - focusANote(); - if (m_focusedNote) { - clicked = m_focusedNote; - zone = (m_focusedNote->isFree() ? Note::BottomGroup : Note::BottomInsert); - pos = QPoint(m_focusedNote->x(), m_focusedNote->finalBottom()); - // Insert at the end of the last column: - } else if (isColumnsLayout()) { - Note *column = /*(Settings::newNotesPlace == 0 ?*/ firstNote() /*: lastNote())*/; - /*if (Settings::newNotesPlace == 0 && column->firstChild()) { // On Top, if at least one child in the column - clicked = column->firstChild(); - zone = Note::TopInsert; - } else { // On Bottom*/ - clicked = column; - zone = Note::BottomColumn; - /*}*/ - // Insert at free position: - } else { - pos = QPoint(0, 0); - } - } - - insertNote(note, clicked, zone, pos); -// ensureNoteVisible(lastInsertedNote()); - removeInserter(); // Case: user clicked below a column to insert, the note is inserted and doHoverEffects() put a new inserter below. We don't want it. -// resetInsertTo(); - save(); -} - -void Basket::saveInsertionData() -{ - m_savedClickedToInsert = m_clickedToInsert; - m_savedZoneToInsert = m_zoneToInsert; - m_savedPosToInsert = m_posToInsert; -} - -void Basket::restoreInsertionData() -{ - m_clickedToInsert = m_savedClickedToInsert; - m_zoneToInsert = m_savedZoneToInsert; - m_posToInsert = m_savedPosToInsert; -} - -void Basket::resetInsertionData() -{ - m_clickedToInsert = 0; - m_zoneToInsert = 0; - m_posToInsert = QPoint(-1, -1); -} - -void Basket::hideInsertPopupMenu() -{ - QTimer::singleShot(50/*ms*/, this, SLOT(timeoutHideInsertPopupMenu())); -} - -void Basket::timeoutHideInsertPopupMenu() -{ - resetInsertionData(); -} - -void Basket::acceptDropEvent(QDropEvent *event, bool preCond) -{ - // FIXME: Should not accept all actions! Or not all actions (link not supported?!) - //event->acceptAction(preCond && 1); - //event->accept(preCond); - event->setAccepted(preCond); -} - -void Basket::contentsMouseReleaseEvent(QMouseEvent *event) -{ - // Now disallow drag: - m_canDrag = false; - - // Cancel Resizer move: - if (m_resizingNote) { - m_resizingNote = 0; - m_pickedResizer = 0; - m_lockedHovering = false; - doHoverEffects(); - save(); - } - - // Cancel Note move: - /* if (m_movingNote) { - m_movingNote = 0; - m_pickedHandle = QPoint(0, 0); - m_lockedHovering = false; - //doHoverEffects(); - save(); - } - */ - - // Cancel Selection rectangle: - if (m_isSelecting) { - m_isSelecting = false; - stopAutoScrollSelection(); - resetWasInLastSelectionRect(); - doHoverEffects(); - updateContents(m_selectionRect); - } - m_selectionStarted = false; - - Note *clicked = noteAt(event->pos().x(), event->pos().y()); - Note::Zone zone = (clicked ? clicked->zoneAt(event->pos() - QPoint(clicked->x(), clicked->y())) : Note::None); - if ((zone == Note::Handle || zone == Note::Group) && editedNote() && editedNote() == clicked) { - if (m_ignoreCloseEditorOnNextMouseRelease) - m_ignoreCloseEditorOnNextMouseRelease = false; - else { - bool editedNoteStillThere = closeEditor(); - if (editedNoteStillThere) - //clicked->setSelected(true); - unselectAllBut(clicked); - } - } - - - if (event->buttons() == 0 && (zone == Note::Group || zone == Note::Handle)) { - closeEditor(); - unselectAllBut(clicked); - } - - - // Do nothing if an action has already been made during mousePressEvent, - // or if user made a selection and canceled it by regressing to a very small rectangle. - if (m_noActionOnMouseRelease) - return; - - // We immediately set it to true, to avoid actions set on mouseRelease if NO mousePress event has been triggered. - // This is the case when a popup menu is shown, and user click to the basket area to close it: - // the menu then receive the mousePress event and the basket area ONLY receive the mouseRelease event. - // Obviously, nothing should be done in this case: - m_noActionOnMouseRelease = true; - - - - if (event->button() == Qt::MidButton && zone != Note::Resizer && (!isDuringEdit() || clicked != editedNote())) { - if ((Settings::middleAction() != 0) && (event->modifiers() == Qt::ShiftModifier)) { - m_clickedToInsert = clicked; - m_zoneToInsert = zone; - m_posToInsert = event->pos(); - closeEditor(); - removeInserter(); // If clicked at an insertion line and the new note shows a dialog for editing, - NoteType::Id type = (NoteType::Id)0; // hide that inserter before the note edition instead of after the dialog is closed - switch (Settings::middleAction()) { - case 5: type = NoteType::Color; break; - case 6: - Global::bnpView->grabScreenshot(); - return; - case 7: - Global::bnpView->slotColorFromScreen(); - return; - case 8: - Global::bnpView->insertWizard(3); // loadFromFile - return; - case 9: - Global::bnpView->insertWizard(1); // importKMenuLauncher - return; - case 10: - Global::bnpView->insertWizard(2); // importIcon - return; - } - if (type != 0) { - m_ignoreCloseEditorOnNextMouseRelease = true; - Global::bnpView->insertEmpty(type); - return; - } - } - } - -// Note *clicked = noteAt(event->pos().x(), event->pos().y()); - if (! clicked) { - if (isFreeLayout() && event->button() == Qt::LeftButton) { - clickedToInsert(event); - save(); - } - return; - } -// Note::Zone zone = clicked->zoneAt( event->pos() - QPoint(clicked->x(), clicked->y()) ); - - // Convenient variables: - bool controlPressed = event->modifiers() & Qt::ControlModifier; - bool shiftPressed = event->modifiers() & Qt::ShiftModifier; - - if (clicked && zone != Note::None && zone != Note::BottomColumn && zone != Note::Resizer && (controlPressed || shiftPressed)) { - if (controlPressed && shiftPressed) - selectRange(m_startOfShiftSelectionNote, clicked, /*unselectOthers=*/false); - else if (shiftPressed) - selectRange(m_startOfShiftSelectionNote, clicked); - else if (controlPressed) - clicked->setSelectedRecursively(!clicked->allSelected()); - setFocusedNote(clicked); /// /// /// - m_startOfShiftSelectionNote = (clicked->isGroup() ? clicked->firstRealChild() : clicked); - m_noActionOnMouseRelease = true; - return; - } - - // Switch tag states: - if (zone >= Note::Emblem0) { - if (event->button() == Qt::LeftButton) { - int icons = -1; - for (State::List::iterator it = clicked->states().begin(); it != clicked->states().end(); ++it) { - if (!(*it)->emblem().isEmpty()) - icons++; - if (icons == zone - Note::Emblem0) { - State *state = (*it)->nextState(); - if (!state) - return; - it = clicked->states().insert(it, state); - ++it; - clicked->states().erase(it); - clicked->recomputeStyle(); - clicked->unbufferize(); - updateNote(clicked); - updateEditorAppearance(); - filterAgain(); - save(); - break; - } - } - return; - }/* else if (event->button() == Qt::RightButton) { - popupEmblemMenu(clicked, zone - Note::Emblem0); - return; - }*/ - } - - // Insert note or past clipboard: - QString text; -// Note *note; - QString link; - //int zone = zone; - if (event->button() == Qt::MidButton && zone == Note::Resizer) - return; //zone = clicked->zoneAt( event->pos() - QPoint(clicked->x(), clicked->y()), true ); - if (event->button() == Qt::RightButton && (clicked->isColumn() || zone == Note::Resizer)) - return; - if (clicked->isGroup() && zone == Note::None) - return; - switch (zone) { - case Note::Handle: - case Note::Group: - // We select note on mousePress if it was unselected or Ctrl is pressed. - // But the user can want to drag select_s_ notes, so it the note is selected, we only select it alone on mouseRelease: - if (event->buttons() == 0) { - kDebug() << "EXEC"; - if (!(event->modifiers() & Qt::ControlModifier) && clicked->allSelected()) - unselectAllBut(clicked); - if (zone == Note::Handle && isDuringEdit() && editedNote() == clicked) { - closeEditor(); - clicked->setSelected(true); - } - } - break; - - case Note::Custom0: - //unselectAllBut(clicked); - setFocusedNote(clicked); - noteOpen(clicked); - break; - - case Note::GroupExpander: - case Note::TagsArrow: - break; - - case Note::Link: - link = clicked->linkAt(event->pos() - QPoint(clicked->x(), clicked->y())); - if (! link.isEmpty()) { - if (link == "basket-internal-remove-basket") { - // TODO: ask confirmation: "Do you really want to delete the welcome baskets?\n You can re-add them at any time in the Help menu." - Global::bnpView->doBasketDeletion(this); - } else if (link == "basket-internal-import") { - KMenu *menu = Global::bnpView->popupMenu("fileimport"); - menu->exec(event->globalPos()); - } else { - KRun *run = new KRun(KUrl(link), window()); // open the URL. - run->setAutoDelete(true); - } - break; - } // If there is no link, edit note content - case Note::Content: - closeEditor(); - unselectAllBut(clicked); - noteEdit(clicked, /*justAdded=*/false, event->pos()); - break; - - case Note::TopInsert: - case Note::TopGroup: - case Note::BottomInsert: - case Note::BottomGroup: - case Note::BottomColumn: - clickedToInsert(event, clicked, zone); - save(); - break; - - case Note::None: - default: - KMessageBox::information(viewport(), - i18n("This message should never appear. If it does, this program is buggy! " - "Please report the bug to the developer.")); - break; - } -} - -void Basket::contentsMouseDoubleClickEvent(QMouseEvent *event) -{ - Note *clicked = noteAt(event->pos().x(), event->pos().y()); - Note::Zone zone = (clicked ? clicked->zoneAt(event->pos() - QPoint(clicked->x(), clicked->y())) : Note::None); - - if (event->button() == Qt::LeftButton && (zone == Note::Group || zone == Note::Handle)) { - doCopy(CopyToSelection); - m_noActionOnMouseRelease = true; - } else - contentsMousePressEvent(event); -} - -void Basket::contentsMouseMoveEvent(QMouseEvent *event) -{ - // Drag the notes: - if (m_canDrag && (m_pressPos - event->pos()).manhattanLength() > KApplication::startDragDistance()) { - m_canDrag = false; - m_isSelecting = false; // Don't draw selection rectangle ater drag! - m_selectionStarted = false; - NoteSelection *selection = selectedNotes(); - if (selection->firstStacked()) { - QDrag *d = NoteDrag::dragObject(selection, /*cutting=*/false, /*source=*/this); // d will be deleted by QT - /*bool shouldRemove = */d->exec(); -// delete selection; - - // Never delete because URL is dragged and the file must be available for the extern appliation -// if (shouldRemove && d->target() == 0) // If target is another application that request to remove the note -// emit wantDelete(this); - } - return; - } - - // Moving a Resizer: - if (m_resizingNote) { - int groupWidth = event->pos().x() - m_resizingNote->x() - m_pickedResizer; - int minRight = m_resizingNote->minRight(); - int maxRight = 100 * contentsWidth(); // A big enough value (+infinity) for free layouts. - Note *nextColumn = m_resizingNote->next(); - if (m_resizingNote->isColumn()) { - if (nextColumn) - maxRight = nextColumn->x() + nextColumn->rightLimit() - nextColumn->minRight() - Note::RESIZER_WIDTH; - else - maxRight = contentsWidth(); - } - if (groupWidth > maxRight - m_resizingNote->x()) - groupWidth = maxRight - m_resizingNote->x(); - if (groupWidth < minRight - m_resizingNote->x()) - groupWidth = minRight - m_resizingNote->x(); - int delta = groupWidth - m_resizingNote->groupWidth(); - m_resizingNote->setGroupWidth(groupWidth); - // If resizing columns: - if (m_resizingNote->isColumn()) { - Note *column = m_resizingNote; - if ((column = column->next())) { - // Next columns should not have them X coordinate animated, because it would flicker: - column->setXRecursively(column->x() + delta); - // And the resizer should resize the TWO sibling columns, and not push the other columns on th right: - column->setGroupWidth(column->groupWidth() - delta); - } - } - relayoutNotes(true); - } - - // Moving a Note: - /* if (m_movingNote) { - int x = event->pos().x() - m_pickedHandle.x(); - int y = event->pos().y() - m_pickedHandle.y(); - if (x < 0) x = 0; - if (y < 0) y = 0; - m_movingNote->setX(x); - m_movingNote->setY(y); - m_movingNote->relayoutAt(x, y, / *animate=* /false); - relayoutNotes(true); - } - */ - - // Dragging the selection rectangle: - if (m_selectionStarted) - doAutoScrollSelection(); - - doHoverEffects(event->pos()); -} - -void Basket::doAutoScrollSelection() -{ - static const int AUTO_SCROLL_MARGIN = 50; // pixels - static const int AUTO_SCROLL_DELAY = 100; // milliseconds - - QPoint pos = viewport()->mapFromGlobal(QCursor::pos()); - - // Do the selection: - - if (m_isSelecting) - updateContents(m_selectionRect); - - m_selectionEndPoint = viewportToContents(pos); - m_selectionRect = QRect(m_selectionBeginPoint, m_selectionEndPoint).normalized(); - if (m_selectionRect.left() < 0) m_selectionRect.setLeft(0); - if (m_selectionRect.top() < 0) m_selectionRect.setTop(0); - if (m_selectionRect.right() >= contentsWidth()) m_selectionRect.setRight(contentsWidth() - 1); - if (m_selectionRect.bottom() >= contentsHeight()) m_selectionRect.setBottom(contentsHeight() - 1); - - if ((m_selectionBeginPoint - m_selectionEndPoint).manhattanLength() > QApplication::startDragDistance()) { - m_isSelecting = true; - selectNotesIn(m_selectionRect, m_selectionInvert); - updateContents(m_selectionRect); - m_noActionOnMouseRelease = true; - } else { - // If the user was selecting but cancel by making the rectangle too small, cancel it really!!! - if (m_isSelecting) { - if (m_selectionInvert) - selectNotesIn(QRect(), m_selectionInvert); - else - unselectAllBut(0); // TODO: unselectAll(); - } - if (m_isSelecting) - resetWasInLastSelectionRect(); - m_isSelecting = false; - stopAutoScrollSelection(); - return; - } - - // Do the auto-scrolling: - // FIXME: It's still flickering - - QRect insideRect(AUTO_SCROLL_MARGIN, AUTO_SCROLL_MARGIN, visibleWidth() - 2*AUTO_SCROLL_MARGIN, visibleHeight() - 2*AUTO_SCROLL_MARGIN); - - int dx = 0; - int dy = 0; - - if (pos.y() < AUTO_SCROLL_MARGIN) - dy = pos.y() - AUTO_SCROLL_MARGIN; - else if (pos.y() > visibleHeight() - AUTO_SCROLL_MARGIN) - dy = pos.y() - visibleHeight() + AUTO_SCROLL_MARGIN; - - if (pos.x() < AUTO_SCROLL_MARGIN) - dx = pos.x() - AUTO_SCROLL_MARGIN; - else if (pos.x() > visibleWidth() - AUTO_SCROLL_MARGIN) - dx = pos.x() - visibleWidth() + AUTO_SCROLL_MARGIN; - - if (dx || dy) { - kapp->sendPostedEvents(); // Do the repaints, because the scrolling will make the area to repaint to be wrong - scrollBy(dx, dy); - if (!m_autoScrollSelectionTimer.isActive()) - m_autoScrollSelectionTimer.start(AUTO_SCROLL_DELAY); - } else - stopAutoScrollSelection(); -} - -void Basket::stopAutoScrollSelection() -{ - m_autoScrollSelectionTimer.stop(); -} - -void Basket::resetWasInLastSelectionRect() -{ - Note *note = m_firstNote; - while (note) { - note->resetWasInLastSelectionRect(); - note = note->next(); - } -} - -void Basket::selectAll() -{ - if (redirectEditActions()) { - if (m_editor->textEdit()) - m_editor->textEdit()->selectAll(); - else if (m_editor->lineEdit()) - m_editor->lineEdit()->selectAll(); - } else { - // First select all in the group, then in the parent group... - Note *child = m_focusedNote; - Note *parent = (m_focusedNote ? m_focusedNote->parentNote() : 0); - while (parent) { - if (!parent->allSelected()) { - parent->setSelectedRecursively(true); - return; - } - child = parent; - parent = parent->parentNote(); - } - // Then, select all: - FOR_EACH_NOTE(note) - note->setSelectedRecursively(true); - } -} - -void Basket::unselectAll() -{ - if (redirectEditActions()) { - if (m_editor->textEdit()) { - QTextCursor cursor = m_editor->textEdit()->textCursor(); - cursor.clearSelection(); - m_editor->textEdit()->setTextCursor(cursor); - selectionChangedInEditor(); // THIS IS NOT EMITED BY Qt!!! - } else if (m_editor->lineEdit()) - m_editor->lineEdit()->deselect(); - } else { - if (countSelecteds() > 0) // Optimisation - FOR_EACH_NOTE(note) - note->setSelectedRecursively(false); - } -} - -void Basket::invertSelection() -{ - FOR_EACH_NOTE(note) - note->invertSelectionRecursively(); -} - -void Basket::unselectAllBut(Note *toSelect) -{ - FOR_EACH_NOTE(note) - note->unselectAllBut(toSelect); -} - -void Basket::invertSelectionOf(Note *toSelect) -{ - FOR_EACH_NOTE(note) - note->invertSelectionOf(toSelect); -} - -void Basket::selectNotesIn(const QRect &rect, bool invertSelection, bool unselectOthers /*= true*/) -{ - FOR_EACH_NOTE(note) - note->selectIn(rect, invertSelection, unselectOthers); -} - -void Basket::doHoverEffects() -{ - doHoverEffects(viewportToContents(viewport()->mapFromGlobal(QCursor::pos()))); -} - -void Basket::doHoverEffects(Note *note, Note::Zone zone, const QPoint &pos) -{ - // Inform the old and new hovered note (if any): - Note *oldHoveredNote = m_hoveredNote; - if (note != m_hoveredNote) { - if (m_hoveredNote) { - m_hoveredNote->setHovered(false); - m_hoveredNote->setHoveredZone(Note::None); - updateNote(m_hoveredNote); - } - m_hoveredNote = note; - if (note) - note->setHovered(true); - } - - // If we are hovering a note, compute which zone is hovered and inform the note: - if (m_hoveredNote) { - if (zone != m_hoveredZone || oldHoveredNote != m_hoveredNote) { - m_hoveredZone = zone; - m_hoveredNote->setCursor(zone); - updateNote(m_hoveredNote); - } - m_hoveredNote->setHoveredZone(zone); - // If we are hovering an insert line zone, update this thing: - if (zone == Note::TopInsert || zone == Note::TopGroup || zone == Note::BottomInsert || zone == Note::BottomGroup || zone == Note::BottomColumn) - placeInserter(m_hoveredNote, zone); - else - removeInserter(); - // If we are hovering an embedded link in a rich text element, show the destination in the statusbar: - if (zone == Note::Link) - emit setStatusBarText(m_hoveredNote->linkAt(pos - QPoint(m_hoveredNote->x(), m_hoveredNote->y()))); - else if (m_hoveredNote->content()) - emit setStatusBarText(m_hoveredNote->content()->statusBarMessage(m_hoveredZone));//resetStatusBarText(); - // If we aren't hovering a note, reset all: - } else { - if (isFreeLayout() && !isSelecting()) - viewport()->setCursor(Qt::CrossCursor); - else - viewport()->unsetCursor(); - m_hoveredZone = Note::None; - removeInserter(); - emit resetStatusBarText(); - } -} - -void Basket::doHoverEffects(const QPoint &pos) -{ -// if (isDuringEdit()) -// viewport()->unsetCursor(); - - // Do we have the right to do hover effects? - if (! m_loaded || m_lockedHovering) - return; - - // enterEvent() (mouse enter in the widget) set m_underMouse to true, and leaveEvent() make it false. - // But some times the enterEvent() is not trigerred: eg. when dragging the scrollbar: - // Ending the drag INSIDE the basket area will make NO hoverEffects() because m_underMouse is false. - // User need to leave the area and re-enter it to get effects. - // This hack solve that by dismissing the m_underMouse variable: - bool underMouse = Global::bnpView->currentBasket() == this && QRect(contentsX(), contentsY(), visibleWidth(), visibleHeight()).contains(pos); - - // Don't do hover effects when a popup menu is opened. - // Primarily because the basket area will only receive mouseEnterEvent and mouveLeaveEvent. - // It willn't be noticed of mouseMoveEvent, which would result in a apparently broken application state: - if (kapp->activePopupWidget()) - underMouse = false; - - // Compute which note is hovered: - Note *note = (m_isSelecting || !underMouse ? 0 : noteAt(pos.x(), pos.y())); - Note::Zone zone = (note ? note->zoneAt(pos - QPoint(note->x(), note->y()), isDuringDrag()) : Note::None); - - // Inform the old and new hovered note (if any) and update the areas: - doHoverEffects(note, zone, pos); -} - -void Basket::mouseEnteredEditorWidget() -{ - if (!m_lockedHovering && !kapp->activePopupWidget()) - doHoverEffects(editedNote(), Note::Content, QPoint()); -} - -void Basket::removeInserter() -{ - if (m_inserterShown) { // Do not hide (and then update/repaint the view) if it is already hidden! - m_inserterShown = false; - updateContents(m_inserterRect); - } -} - -void Basket::placeInserter(Note *note, int zone) -{ - // Remove the inserter: - if (!note) { - removeInserter(); - return; - } - - // Update the old position: - if (inserterShown()) - updateContents(m_inserterRect); - // Some comodities: - m_inserterShown = true; - m_inserterTop = (zone == Note::TopGroup || zone == Note::TopInsert); - m_inserterGroup = (zone == Note::TopGroup || zone == Note::BottomGroup); - // X and width: - int groupIndent = (note->isGroup() ? note->width() : Note::HANDLE_WIDTH); - int x = note->x(); - int width = (note->isGroup() ? note->rightLimit() - note->x() : note->width()); - if (m_inserterGroup) { - x += groupIndent; - width -= groupIndent; - } - m_inserterSplit = (Settings::groupOnInsertionLine() && note && !note->isGroup() && !note->isFree() && !note->isColumn()); -// if (note->isGroup()) -// width = note->rightLimit() - note->x() - (m_inserterGroup ? groupIndent : 0); - // Y: - int y = note->y() - (m_inserterGroup && m_inserterTop ? 1 : 3); - if (!m_inserterTop) - y += (note->isColumn() ? note->finalHeight() : note->height()); - // Assigning result: - m_inserterRect = QRect(x, y, width, 6 - (m_inserterGroup ? 2 : 0)); - // Update the new position: - updateContents(m_inserterRect); -} - -inline void drawLineByRect(QPainter &painter, int x, int y, int width, int height) -{ - painter.drawLine(x, y, x + width - 1, y + height - 1); -} - -void Basket::drawInserter(QPainter &painter, int xPainter, int yPainter) -{ - if (!m_inserterShown) - return; - - QRect rect = m_inserterRect; // For shorter code-lines when drawing! - rect.translate(-xPainter, -yPainter); - int lineY = (m_inserterGroup && m_inserterTop ? 0 : 2); - int roundY = (m_inserterGroup && m_inserterTop ? 0 : 1); - - KStatefulBrush statefulBrush(KColorScheme::View, KColorScheme::HoverColor); - QColor dark = statefulBrush.brush(palette()).color(); - QColor light = dark.lighter().lighter(); - if (m_inserterGroup && Settings::groupOnInsertionLine()) - light = Tools::mixColor(light, palette().color(QPalette::Highlight)); - painter.setPen(dark); - // The horizontal line: - //painter.drawRect( rect.x(), rect.y() + lineY, rect.width(), 2); - int width = rect.width() - 4; - drawGradient(&painter, dark, light, rect.x() + 2, rect.y() + lineY, width / 2, 2, /*sunken=*/false, /*horz=*/false, /*flat=*/false); - drawGradient(&painter, light, dark, rect.x() + 2 + width / 2, rect.y() + lineY, width - width / 2, 2, /*sunken=*/false, /*horz=*/false, /*flat=*/false); - // The left-most and right-most edges (biggest vertical lines): - drawLineByRect(painter, rect.x(), rect.y(), 1, (m_inserterGroup ? 4 : 6)); - drawLineByRect(painter, rect.x() + rect.width() - 1, rect.y(), 1, (m_inserterGroup ? 4 : 6)); - // The left and right mid vertical lines: - drawLineByRect(painter, rect.x() + 1, rect.y() + roundY, 1, (m_inserterGroup ? 3 : 4)); - drawLineByRect(painter, rect.x() + rect.width() - 2, rect.y() + roundY, 1, (m_inserterGroup ? 3 : 4)); - // Draw the split as a feedback to know where is the limit between insert and group: - if (m_inserterSplit) { - int noteWidth = rect.width() + (m_inserterGroup ? Note::HANDLE_WIDTH : 0); - int xSplit = rect.x() - (m_inserterGroup ? Note::HANDLE_WIDTH : 0) + noteWidth / 2; - painter.setPen(Tools::mixColor(dark, light)); - painter.drawRect(xSplit - 2, rect.y() + lineY, 4, 2); - painter.setPen(dark); - painter.drawRect(xSplit - 1, rect.y() + lineY, 2, 2); - } -} - -bool Basket::event(QEvent *event) -{ - // Only take the help events - if (event->type() == QEvent::ToolTip) { - QHelpEvent *helpEvent = static_cast(event); - tooltipEvent(helpEvent); - return true; - } else - return Q3ScrollView::event(event); -} - -void Basket::tooltipEvent(QHelpEvent *event) -{ - QPoint pos = event->globalPos(); - if (!m_loaded || !Settings::showNotesToolTip()) - return; - - QString message; - QRect rect; - - QPoint contentPos = viewportToContents(event->pos()); - Note *note = noteAt(contentPos.x(), contentPos.y()); - - if (!note && isFreeLayout()) { - message = i18n("Insert note here\nRight click for more options"); - QRect itRect; - for (QList::iterator it = m_blankAreas.begin(); it != m_blankAreas.end(); ++it) { - itRect = QRect(0, 0, visibleWidth(), visibleHeight()).intersect(*it); - if (itRect.contains(contentPos)) { - rect = itRect; - rect.moveLeft(rect.left() - contentsX()); - rect.moveTop(rect.top() - contentsY()); - break; - } - } - } else { - if (!note) - return; - - Note::Zone zone = note->zoneAt(contentPos - QPoint(note->x(), note->y())); - switch (zone) { - case Note::Resizer: message = (note->isColumn() ? - i18n("Resize those columns") : - (note->isGroup() ? - i18n("Resize this group") : - i18n("Resize this note"))); break; - case Note::Handle: message = i18n("Select or move this note"); break; - case Note::Group: message = i18n("Select or move this group"); break; - case Note::TagsArrow: message = i18n("Assign or remove tags from this note"); - if (note->states().count() > 0) { - message = "" + message + "
" + i18n("Assigned Tags: %1"); - QString tagsString = ""; - for (State::List::iterator it = note->states().begin(); it != note->states().end(); ++it) { - QString tagName = "" + Tools::textToHTMLWithoutP((*it)->fullName()) + ""; - if (tagsString.isEmpty()) - tagsString = tagName; - else - tagsString = i18n("%1, %2", tagsString, tagName); - } - message = message.arg(tagsString); - } - break; - case Note::Custom0: message = note->content()->zoneTip(zone); break; //"Open this link/Open this file/Open this sound file/Launch this application" - case Note::GroupExpander: message = (note->isFolded() ? - i18n("Expand this group") : - i18n("Collapse this group")); break; - case Note::Link: - case Note::Content: message = note->content()->editToolTipText(); break; - case Note::TopInsert: - case Note::BottomInsert: message = i18n("Insert note here\nRight click for more options"); break; - case Note::TopGroup: message = i18n("Group note with the one below\nRight click for more options"); break; - case Note::BottomGroup: message = i18n("Group note with the one above\nRight click for more options"); break; - case Note::BottomColumn: message = i18n("Insert note here\nRight click for more options"); break; - case Note::None: message = "** Zone NONE: internal error **"; break; - default: - if (zone >= Note::Emblem0) - message = note->stateForEmblemNumber(zone - Note::Emblem0)->fullName(); - else - message = ""; - break; - } - - if (zone == Note::Content || zone == Note::Link || zone == Note::Custom0) { - QStringList keys; - QStringList values; - - note->content()->toolTipInfos(&keys, &values); - keys.append(i18n("Added")); - keys.append(i18n("Last Modification")); - values.append(note->addedStringDate()); - values.append(note->lastModificationStringDate()); - - message = "" + message; - QStringList::iterator key; - QStringList::iterator value; - for (key = keys.begin(), value = values.begin(); key != keys.end() && value != values.end(); ++key, ++value) - message += "
" + i18nc("of the form 'key: value'", "%1: %2", *key, *value); - message += ""; - } else if (m_inserterSplit && (zone == Note::TopInsert || zone == Note::BottomInsert)) - message += "\n" + i18n("Click on the right to group instead of insert"); - else if (m_inserterSplit && (zone == Note::TopGroup || zone == Note::BottomGroup)) - message += "\n" + i18n("Click on the left to insert instead of group"); - - rect = note->zoneRect(zone, contentPos - QPoint(note->x(), note->y())); - - rect.moveLeft(rect.left() - contentsX()); - rect.moveTop(rect.top() - contentsY()); - - rect.moveLeft(rect.left() + note->x()); - rect.moveTop(rect.top() + note->y()); - } - - QToolTip::showText(pos, message, this, rect); -} - -Note* Basket::lastNote() -{ - Note *note = firstNote(); - while (note && note->next()) - note = note->next(); - return note; -} - -void Basket::deleteNotes() -{ - Note *note = m_firstNote; - - while (note) { - Note *tmp = note->next(); - delete note; - note = tmp; - } - m_firstNote = 0; - m_resizingNote = 0; - m_movingNote = 0; - m_focusedNote = 0; - m_startOfShiftSelectionNote = 0; - m_tagPopupNote = 0; - m_clickedToInsert = 0; - m_savedClickedToInsert = 0; - m_hoveredNote = 0; - m_count = 0; - m_countFounds = 0; - m_countSelecteds = 0; - - emit resetStatusBarText(); - emit countsChanged(this); -} - -Note* Basket::noteAt(int x, int y) -{ -//NO: -// // Do NOT check the bottom&right borders. -// // Because imagine someone drag&drop a big note from the top to the bottom of a big basket (with big vertical scrollbars), -// // the note is first removed, and relayoutNotes() compute the new height that is smaller -// // Then noteAt() is called for the mouse pointer position, because the basket is now smaller, the cursor is out of boundaries!!! -// // Should, of course, not return 0: - if (x < 0 || x > contentsWidth() || y < 0 || y > contentsHeight()) - return 0; - - // When resizing a note/group, keep it highlighted: - if (m_resizingNote) - return m_resizingNote; - - // Search and return the hovered note: - Note *note = m_firstNote; - Note *possibleNote; - while (note) { - possibleNote = note->noteAt(x, y); - if (possibleNote) { - if (draggedNotes().contains(possibleNote)) - return 0; - else - return possibleNote; - } - note = note->next(); - } - - // If the basket is layouted in columns, return one of the columns to be able to add notes in them: - if (isColumnsLayout()) { - Note *column = m_firstNote; - while (column) { - if (x >= column->x() && x < column->rightLimit()) - return column; - column = column->next(); - } - } - - // Nothing found, no note is hovered: - return NULL; -} - -Basket::~Basket() -{ - if (m_decryptBox) - delete m_decryptBox; -#ifdef HAVE_LIBGPGME - delete m_gpg; -#endif - deleteNotes(); -} - -void Basket::viewportResizeEvent(QResizeEvent *event) -{ - relayoutNotes(true); - //cornerWidget()->setShown(horizontalScrollBar()->isShown() && verticalScrollBar()->isShown()); - if (horizontalScrollBar()->isVisible() && verticalScrollBar()->isVisible()) { - if (!cornerWidget()) - setCornerWidget(m_cornerWidget); - } else { - if (cornerWidget()) - cornerWidget()->hide(); - } -// if (isDuringEdit()) -// ensureNoteVisible(editedNote()); - Q3ScrollView::viewportResizeEvent(event); -} - -void Basket::animateLoad() -{ - const int viewHeight = contentsY() + visibleHeight(); - - QTime t = QTime::currentTime(); // Set random seed - srand(t.hour()*12 + t.minute()*60 + t.second()*60); - - Note *note = firstNote(); - while (note) { - if ((note->finalY() < viewHeight) && note->matching()) - note->initAnimationLoad(); - note = note->next(); - } - - m_loaded = true; -} - -QColor Basket::selectionRectInsideColor() -{ - return Tools::mixColor(Tools::mixColor(backgroundColor(), - palette().color(QPalette::Highlight)), - backgroundColor()); -} - -QColor alphaBlendColors(const QColor &bgColor, const QColor &fgColor, const int a) -{ - // normal button... - QRgb rgb = bgColor.rgb(); - QRgb rgb_b = fgColor.rgb(); - int alpha = a; - if (alpha > 255) alpha = 255; - if (alpha < 0) alpha = 0; - int inv_alpha = 255 - alpha; - QColor result = QColor(qRgb(qRed(rgb_b) * inv_alpha / 255 + qRed(rgb) * alpha / 255, - qGreen(rgb_b) * inv_alpha / 255 + qGreen(rgb) * alpha / 255, - qBlue(rgb_b) * inv_alpha / 255 + qBlue(rgb) * alpha / 255)); - - return result; -} - -void Basket::unlock() -{ - QTimer::singleShot(0, this, SLOT(load())); -} - -void Basket::inactivityAutoLockTimeout() -{ - lock(); -} - -void Basket::drawContents(QPainter *painter) -{ - drawContents(painter, 0, 0, 0, 0); -} - -void Basket::drawContents(QPainter *painter, int clipX, int clipY, int clipWidth, int clipHeight) -{ - // Start the load the first time the basket is shown: - if (!m_loadingLaunched) { - if (!m_locked) - QTimer::singleShot(0, this, SLOT(load())); - else { - Global::bnpView->notesStateChanged(); // Show "Locked" instead of "Loading..." in the statusbar - } - } - - QBrush brush(backgroundColor()); // FIXME: share it for all the basket? - QRect clipRect(clipX, clipY, clipWidth, clipHeight); - - if (m_locked) { - if (!m_decryptBox) { - m_decryptBox = new QFrame(this); - m_decryptBox->setFrameShape(QFrame::StyledPanel); - m_decryptBox->setFrameShadow(QFrame::Plain); - m_decryptBox->setLineWidth(1); - - //QGridLayout* layout = new QGridLayout( m_decryptBox, 1, 1, 11, 6, "decryptBoxLayout"); - QGridLayout *layout = new QGridLayout(m_decryptBox); - layout->setContentsMargins(11, 11, 11, 11); - layout->setSpacing(6); - -#ifdef HAVE_LIBGPGME - m_button = new QPushButton(m_decryptBox); - m_button->setText(i18n("&Unlock")); - layout->addWidget(m_button, 1, 2); - connect(m_button, SIGNAL(clicked()), this, SLOT(unlock())); -#endif - QLabel* label = new QLabel(m_decryptBox); - QString text = "" + i18n("Password protected basket.") + "
"; -#ifdef HAVE_LIBGPGME - label->setText(text + i18n("Press Unlock to access it.")); -#else - label->setText(text + i18n("Encryption is not supported by
this version of %1.", KGlobal::mainComponent().aboutData()->programName())); -#endif - label->setAlignment(Qt::AlignTop); - layout->addWidget(label, 0, 1, 1, 2); - QLabel* pixmap = new QLabel(m_decryptBox); - pixmap->setPixmap(KIconLoader::global()->loadIcon("encrypted", KIconLoader::NoGroup, KIconLoader::SizeHuge)); - layout->addWidget(pixmap, 0, 0, 2, 0); - - QSpacerItem* spacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - layout->addItem(spacer, 1, 1); - - label = new QLabel("" + - i18n("To make baskets stay unlocked, change the automatic
" - "locking duration in the application settings.") + "", - m_decryptBox); - //label->setFixedWidth(label->sizeHint().width() / 2); - label->setAlignment(Qt::AlignTop); - layout->addWidget(label, 2, 0, 1, 3); - - m_decryptBox->resize(layout->sizeHint()); - } - if (m_decryptBox->isHidden()) { - m_decryptBox->show(); - } -#ifdef HAVE_LIBGPGME - m_button->setFocus(); -#endif - m_decryptBox->move((visibleWidth() - m_decryptBox->width()) / 2, - (visibleHeight() - m_decryptBox->height()) / 2); - } else { - if (m_decryptBox && !m_decryptBox->isHidden()) - m_decryptBox->hide(); - } - - // Draw notes (but not when it's not loaded or locked yet): - Note *note = ((m_loaded || m_locked) ? m_firstNote : 0); - while (note) { - note->draw(painter, clipRect); - note = note->next(); - } - enableActions(); - - // Draw loading message: - if (!m_loaded) { - QPixmap pixmap(visibleWidth(), visibleHeight()); // TODO: Clip it to asked size only! - QPainter painter2(&pixmap); - QTextDocument rt; - rt.setHtml(QString("
%1
").arg(i18n("Loading..."))); - rt.setTextWidth(visibleWidth()); - int hrt = rt.size().height(); - painter2.fillRect(0, 0, visibleWidth(), visibleHeight(), brush); - blendBackground(painter2, QRect(0, 0, visibleWidth(), visibleHeight()), -1, -1, /*opaque=*/true); - QPalette pal = palette(); - pal.setColor(QPalette::WindowText, textColor()); - painter2.translate(0, (visibleHeight() - hrt) / 2); - QAbstractTextDocumentLayout::PaintContext context; - context.palette = pal; - rt.documentLayout()->draw(&painter2, context); - painter2.end(); - painter->drawPixmap(0, 0, pixmap); - return; // TODO: Clip to the wanted rectangle - } - - // We will draw blank areas below. - // For each rectangle to be draw there is three ways to do so: - // - The rectangle is full of the background COLOR => we fill a rect directly on screen - // - The rectangle is full of the background PIXMAP => we draw it directly on screen (we draw m_opaqueBackgroundPixmap that is not transparent) - // - The rectangle contains the resizer => We draw it on an offscreen buffer and then paint the buffer on screen - // If the background image is not tiled, we know that recomputeBlankRects() broken rects so that they are full of either background pixmap or color, but not a mix. - - // Draw blank areas (see the last preparation above): - QPixmap pixmap; - QPainter painter2; - QRect rect; - for (QList::iterator it = m_blankAreas.begin(); it != m_blankAreas.end(); ++it) { - rect = clipRect.intersect(*it); - if (rect.width() > 0 && rect.height() > 0) { - // If there is an inserter to draw, draw the image off screen, - // apply the inserter and then draw the image on screen: - if ((inserterShown() && rect.intersects(inserterRect())) || (m_isSelecting && rect.intersects(m_selectionRect))) { - pixmap = QPixmap(rect.width(), rect.height()); - painter2.begin(&pixmap); - painter2.fillRect(0, 0, rect.width(), rect.height(), backgroundColor()); - blendBackground(painter2, rect, -1, -1, /*opaque=*/true); - // Draw inserter: - if (inserterShown() && rect.intersects(inserterRect())) - drawInserter(painter2, rect.x(), rect.y()); - // Draw selection rect: - if (m_isSelecting && rect.intersects(m_selectionRect)) { - QRect selectionRect = m_selectionRect; - selectionRect.translate(-rect.x(), -rect.y()); - QRect selectionRectInside(selectionRect.x() + 1, selectionRect.y() + 1, selectionRect.width() - 2, selectionRect.height() - 2); - if (selectionRectInside.width() > 0 && selectionRectInside.height() > 0) { - QColor insideColor = selectionRectInsideColor(); - painter2.fillRect(selectionRectInside, insideColor); - selectionRectInside.translate(rect.x(), rect.y()); - blendBackground(painter2, selectionRectInside, rect.x(), rect.y(), true, /*&*/m_selectedBackgroundPixmap); - } - painter2.setPen(palette().color(QPalette::Highlight).darker()); - painter2.drawRect(selectionRect); - painter2.setPen(Tools::mixColor(palette().color(QPalette::Highlight).darker(), backgroundColor())); - painter2.drawPoint(selectionRect.topLeft()); - painter2.drawPoint(selectionRect.topRight()); - painter2.drawPoint(selectionRect.bottomLeft()); - painter2.drawPoint(selectionRect.bottomRight()); - } - painter2.end(); - painter->drawPixmap(rect.x(), rect.y(), pixmap); - // If it's only a blank rectangle to draw, draw it directly on screen (faster!!!): - } else if (! hasBackgroundImage()) { - painter->fillRect(rect, backgroundColor()); - // It's either a background pixmap to draw or a background color to fill: - } else { - if (isTiledBackground() || (rect.x() < backgroundPixmap()->width() && rect.y() < backgroundPixmap()->height())) - blendBackground(*painter, rect, 0, 0, /*opaque=*/true); - else - painter->fillRect(rect, backgroundColor()); - } - } - } -} - -/* rect(x,y,width,height)==(xBackgroundToDraw,yBackgroundToDraw,widthToDraw,heightToDraw) - */ -void Basket::blendBackground(QPainter &painter, const QRect &rect, int xPainter, int yPainter, bool opaque, QPixmap *bg) -{ - if (xPainter == -1 && yPainter == -1) { - xPainter = rect.x(); - yPainter = rect.y(); - } - - if (hasBackgroundImage()) { - const QPixmap *bgPixmap = (bg ? /* * */bg : (opaque ? m_opaqueBackgroundPixmap : m_backgroundPixmap)); - if (isTiledBackground()) - painter.drawTiledPixmap(rect.x() - xPainter, rect.y() - yPainter, rect.width(), rect.height(), *bgPixmap, rect.x(), rect.y()); - else - painter.drawPixmap(rect.x() - xPainter, rect.y() - yPainter, *bgPixmap, rect.x(), rect.y(), rect.width(), rect.height()); - } -} - -void Basket::recomputeBlankRects() -{ - m_blankAreas.clear(); - m_blankAreas.append(QRect(0, 0, contentsWidth(), contentsHeight())); - - FOR_EACH_NOTE(note) - note->recomputeBlankRects(m_blankAreas); - - // See the drawing of blank areas in Basket::drawContents() - if (hasBackgroundImage() && ! isTiledBackground()) - substractRectOnAreas(QRect(0, 0, backgroundPixmap()->width(), backgroundPixmap()->height()), m_blankAreas, false); -} - -void Basket::addAnimatedNote(Note *note) -{ - if (m_animatedNotes.isEmpty()) { - m_animationTimer.start(FRAME_DELAY); - m_lastFrameTime = QTime::currentTime(); - } - - m_animatedNotes.append(note); -} - -void Basket::unsetNotesWidth() -{ - Note *note = m_firstNote; - while (note) { - note->unsetWidth(); - note = note->next(); - } -} - -void Basket::relayoutNotes(bool animate) -{ - if (Global::bnpView->currentBasket() != this) - return; // Optimize load time, and basket will be relaid out when activated, anyway - - if (!Settings::playAnimations()) - animate = false; - - if (!animate) { - m_animatedNotes.clear(); - m_animationTimer.stop(); - } - - int h = 0; - tmpWidth = 0; - tmpHeight = 0; - Note *note = m_firstNote; - while (note) { - if (note->matching()) { - note->relayoutAt(0, h, animate); - if (note->hasResizer()) { - int minGroupWidth = note->minRight() - note->finalX(); - if (note->groupWidth() < minGroupWidth) { - note->setGroupWidth(minGroupWidth); - relayoutNotes(animate); // Redo the thing, but this time it should not recurse - return; - } - } - h += note->finalHeight(); - } - note = note->next(); - } - - if (isFreeLayout()) - tmpHeight += 100; - else - tmpHeight += 15; - - resizeContents(qMax(tmpWidth, visibleWidth()), qMax(tmpHeight, visibleHeight())); - recomputeBlankRects(); - placeEditor(); - doHoverEffects(); - updateContents(); -} - -void Basket::updateNote(Note *note) -{ - updateContents(note->rect()); - if (note->hasResizer()) - updateContents(note->resizerRect()); -} - -void Basket::animateObjects() -{ - QList::iterator it; - for (it = m_animatedNotes.begin(); it != m_animatedNotes.end();) -// if ((*it)->y() >= contentsY() && (*it)->bottom() <= contentsY() + contentsWidth()) -// updateNote(*it); - if ((*it)->advance()) - it = m_animatedNotes.erase(it); - else { -// if ((*it)->y() >= contentsY() && (*it)->bottom() <= contentsY() + contentsWidth()) -// updateNote(*it); - ++it; - } - - if (m_animatedNotes.isEmpty()) { - // Stop animation timer: - m_animationTimer.stop(); - // Reset all onTop notes: - Note* note = m_firstNote; - while (note) { - note->setOnTop(false); - note = note->next(); - } - } - - if (m_focusedNote) - ensureNoteVisible(m_focusedNote); - - // We refresh content if it was the last frame, - // or if the drawing of the last frame was not too long. - if (!m_animationTimer.isActive() || (m_lastFrameTime.msecsTo(QTime::currentTime()) < FRAME_DELAY*11 / 10)) { // *11/10 == *1.1 : We keep a 0.1 security margin - m_lastFrameTime = m_lastFrameTime.addMSecs(FRAME_DELAY); // because timers are not accurate and can trigger late - //m_lastFrameTime = QTime::currentTime(); -//kDebug() << ">>" << m_lastFrameTime.toString("hh:mm:ss.zzz"); - if (m_underMouse) - doHoverEffects(); - recomputeBlankRects(); - //relayoutNotes(true); // In case an animated note was to the contents view boundaries, resize the view! - updateContents(); - // If the drawing of the last frame was too long, we skip the drawing of the current and do the next one: - } else { - m_lastFrameTime = m_lastFrameTime.addMSecs(FRAME_DELAY); -//kDebug() << "+=" << m_lastFrameTime.toString("hh:mm:ss.zzz"); - animateObjects(); - } - - doHoverEffects(); - placeEditor(); - - /* int delta = m_deltaY / 3; - if (delta == 0 && m_deltaY != 0) - delta = (m_deltaY > 0 ? 1 : -1); - m_deltaY -= delta; - resizeContents(contentsWidth(), contentsHeight() + delta); //m_lastNote->y() + m_lastNote->height() - */ -} - -void Basket::popupEmblemMenu(Note *note, int emblemNumber) -{ - m_tagPopupNote = note; - State *state = note->stateForEmblemNumber(emblemNumber); - State *nextState = state->nextState(/*cycle=*/false); - Tag *tag = state->parentTag(); - m_tagPopup = tag; - - QKeySequence sequence = tag->shortcut().primary(); - bool sequenceOnDelete = (nextState == 0 && !tag->shortcut().isEmpty()); - - KMenu menu(this); - if (tag->countStates() == 1) { - menu.addTitle(/*SmallIcon(state->icon()), */tag->name()); - KAction* act; - act = new KAction(KIcon("edit-delete"), i18n("&Remove"), &menu); - act->setData(1); - menu.addAction(act); - act = new KAction(KIcon("configure"), i18n("&Customize..."), &menu); - act->setData(2); - menu.addAction(act); - - menu.addSeparator(); - - act = new KAction(KIcon("search-filter"), i18n("&Filter by this Tag"), &menu); - act->setData(3); - menu.addAction(act); - } else { - menu.addTitle(tag->name()); - QList::iterator it; - State *currentState; - - int i = 10; - // QActionGroup makes the actions exclusive; turns checkboxes into radio - // buttons on some styles. - QActionGroup *emblemGroup = new QActionGroup(&menu); - for (it = tag->states().begin(); it != tag->states().end(); ++it) { - currentState = *it; - QKeySequence sequence; - if (currentState == nextState && !tag->shortcut().isEmpty()) - sequence = tag->shortcut().primary(); - - StateAction *sa = new StateAction(currentState, KShortcut(sequence), false); - sa->setChecked(state == currentState); - sa->setActionGroup(emblemGroup); - sa->setData(i); - - menu.addAction(sa); - if (currentState == nextState && !tag->shortcut().isEmpty()) - sa->setShortcut(sequence); - ++i; - } - - menu.addSeparator(); - - KAction *act = new KAction(&menu); - act->setIcon(KIcon("edit-delete")); - act->setText(i18n("&Remove")); - act->setShortcut(sequenceOnDelete ? sequence : QKeySequence()); - act->setData(1); - menu.addAction(act); - act = new KAction( - KIcon("configure"), - i18n("&Customize..."), - &menu - ); - act->setData(2); - menu.addAction(act); - - menu.addSeparator(); - - act = new KAction(KIcon("search-filter"), - i18n("&Filter by this Tag"), - &menu); - act->setData(3); - menu.addAction(act); - act = new KAction( - KIcon("search-filter"), - i18n("Filter by this &State"), - &menu); - act->setData(4); - menu.addAction(act); - } - if (sequenceOnDelete) { - // Not sure if this is equivalent to menu.setAccel(sequence, 1); - menu.actionAt(QPoint(0, 1))->setShortcut(sequence); - } - - connect(&menu, SIGNAL(triggered(QAction *)), this, SLOT(toggledStateInMenu(QAction *))); - connect(&menu, SIGNAL(aboutToHide()), this, SLOT(unlockHovering())); - connect(&menu, SIGNAL(aboutToHide()), this, SLOT(disableNextClick())); - - m_lockedHovering = true; - menu.exec(QCursor::pos()); -} - -void Basket::toggledStateInMenu(QAction* action) -{ - int id = action->data().toInt(); - if (id == 1) { - removeTagFromSelectedNotes(m_tagPopup); - //m_tagPopupNote->removeTag(m_tagPopup); - //m_tagPopupNote->setWidth(0); // To force a new layout computation - updateEditorAppearance(); - filterAgain(); - save(); - return; - } - if (id == 2) { // Customize this State: - TagsEditDialog dialog(this, m_tagPopupNote->stateOfTag(m_tagPopup)); - dialog.exec(); - return; - } - if (id == 3) { // Filter by this Tag - decoration()->filterBar()->filterTag(m_tagPopup); - return; - } - if (id == 4) { // Filter by this State - decoration()->filterBar()->filterState(m_tagPopupNote->stateOfTag(m_tagPopup)); - return; - } - - /*addStateToSelectedNotes*/changeStateOfSelectedNotes(m_tagPopup->states()[id - 10] /*, orReplace=true*/); - //m_tagPopupNote->addState(m_tagPopup->states()[id - 10], true); - filterAgain(); - save(); -} - -State* Basket::stateForTagFromSelectedNotes(Tag *tag) -{ - State *state = 0; - - FOR_EACH_NOTE(note) - if (note->stateForTagFromSelectedNotes(tag, &state) && state == 0) - return 0; - return state; -} - -void Basket::activatedTagShortcut(Tag *tag) -{ - // Compute the next state to set: - State *state = stateForTagFromSelectedNotes(tag); - if (state) - state = state->nextState(/*cycle=*/false); - else - state = tag->states().first(); - - // Set or unset it: - if (state) { - FOR_EACH_NOTE(note) - note->addStateToSelectedNotes(state, /*orReplace=*/true); - updateEditorAppearance(); - } else - removeTagFromSelectedNotes(tag); - - filterAgain(); - save(); -} - -void Basket::popupTagsMenu(Note *note) -{ - m_tagPopupNote = note; - - KMenu menu(this); - menu.addTitle(i18n("Tags")); - - Global::bnpView->populateTagsMenu(menu, note); - - m_lockedHovering = true; - menu.exec(QCursor::pos()); -} - -void Basket::unlockHovering() -{ - m_lockedHovering = false; - doHoverEffects(); -} - -void Basket::toggledTagInMenu(QAction *act) -{ - int id = act->data().toInt(); - if (id == 1) { // Assign new Tag... - TagsEditDialog dialog(this, /*stateToEdit=*/0, /*addNewTag=*/true); - dialog.exec(); - if (!dialog.addedStates().isEmpty()) { - State::List states = dialog.addedStates(); - for (State::List::iterator itState = states.begin(); itState != states.end(); ++itState) - FOR_EACH_NOTE(note) - note->addStateToSelectedNotes(*itState); - updateEditorAppearance(); - filterAgain(); - save(); - } - return; - } - if (id == 2) { // Remove All - removeAllTagsFromSelectedNotes(); - filterAgain(); - save(); - return; - } - if (id == 3) { // Customize... - TagsEditDialog dialog(this); - dialog.exec(); - return; - } - - Tag *tag = Tag::all[id - 10]; - if (!tag) - return; - - if (m_tagPopupNote->hasTag(tag)) - removeTagFromSelectedNotes(tag); - else - addTagToSelectedNotes(tag); - m_tagPopupNote->setWidth(0); // To force a new layout computation - filterAgain(); - save(); -} - -void Basket::addTagToSelectedNotes(Tag *tag) -{ - FOR_EACH_NOTE(note) - note->addTagToSelectedNotes(tag); - updateEditorAppearance(); -} - -void Basket::removeTagFromSelectedNotes(Tag *tag) -{ - FOR_EACH_NOTE(note) - note->removeTagFromSelectedNotes(tag); - updateEditorAppearance(); -} - -void Basket::addStateToSelectedNotes(State *state) -{ - FOR_EACH_NOTE(note) - note->addStateToSelectedNotes(state); - updateEditorAppearance(); -} - -void Basket::updateEditorAppearance() -{ - if (isDuringEdit() && m_editor->widget()) { - m_editor->widget()->setFont(m_editor->note()->font()); - - QPalette palette; - palette.setColor(m_editor->widget()->backgroundRole(), m_editor->note()->backgroundColor()); - palette.setColor(m_editor->widget()->foregroundRole(), m_editor->note()->textColor()); - m_editor->widget()->setPalette(palette); - - // Uggly Hack arround Qt bugs: placeCursor() don't call any signal: - HtmlEditor *htmlEditor = dynamic_cast(m_editor); - if (htmlEditor) { - if (m_editor->textEdit()->textCursor().atStart()) { - m_editor->textEdit()->moveCursor(QTextCursor::Right); - m_editor->textEdit()->moveCursor(QTextCursor::Left); - } else { - m_editor->textEdit()->moveCursor(QTextCursor::Left); - m_editor->textEdit()->moveCursor(QTextCursor::Right); - } - htmlEditor->cursorPositionChanged(); // Does not work anyway :-( (when clicking on a red bold text, the toolbar still show black normal text) - } - } -} - -void Basket::editorPropertiesChanged() -{ - if (isDuringEdit() && m_editor->note()->content()->type() == NoteType::Html) { - m_editor->textEdit()->setAutoFormatting(Settings::autoBullet() ? QTextEdit::AutoAll : QTextEdit::AutoNone); - } -} - -void Basket::changeStateOfSelectedNotes(State *state) -{ - FOR_EACH_NOTE(note) - note->changeStateOfSelectedNotes(state); - updateEditorAppearance(); -} - -void Basket::removeAllTagsFromSelectedNotes() -{ - FOR_EACH_NOTE(note) - note->removeAllTagsFromSelectedNotes(); - updateEditorAppearance(); -} - -bool Basket::selectedNotesHaveTags() -{ - FOR_EACH_NOTE(note) - if (note->selectedNotesHaveTags()) - return true; - return false; -} - -QColor Basket::backgroundColor() -{ - if (m_backgroundColorSetting.isValid()) - return m_backgroundColorSetting; - else - return palette().color(QPalette::Base); -} - -QColor Basket::textColor() -{ - if (m_textColorSetting.isValid()) - return m_textColorSetting; - else - return palette().color(QPalette::Text); -} - -void Basket::unbufferizeAll() -{ - FOR_EACH_NOTE(note) - note->unbufferizeAll(); -} - -Note* Basket::editedNote() -{ - if (m_editor) - return m_editor->note(); - else - return 0; -} - -bool Basket::hasTextInEditor() -{ - if (!isDuringEdit() || !redirectEditActions()) - return false; - - if (m_editor->textEdit()) - return ! m_editor->textEdit()->document()->isEmpty(); - else if (m_editor->lineEdit()) - return ! m_editor->lineEdit()->displayText().isEmpty(); - else - return false; -} - -bool Basket::hasSelectedTextInEditor() -{ - if (!isDuringEdit() || !redirectEditActions()) - return false; - - if (m_editor->textEdit()) { - // The following line does NOT work if one letter is selected and the user press Shift+Left or Shift+Right to unselect than letter: - // Qt misteriously tell us there is an invisible selection!! - //return m_editor->textEdit()->hasSelectedText(); - return !m_editor->textEdit()->textCursor().selectedText().isEmpty(); - } else if (m_editor->lineEdit()) - return m_editor->lineEdit()->hasSelectedText(); - else - return false; -} - -bool Basket::selectedAllTextInEditor() -{ - if (!isDuringEdit() || !redirectEditActions()) - return false; - - if (m_editor->textEdit()) { - return m_editor->textEdit()->document()->isEmpty() || m_editor->textEdit()->toPlainText() == m_editor->textEdit()->textCursor().selectedText(); - } else if (m_editor->lineEdit()) - return m_editor->lineEdit()->displayText().isEmpty() || m_editor->lineEdit()->displayText() == m_editor->lineEdit()->selectedText(); - else - return false; -} - -void Basket::selectionChangedInEditor() -{ - Global::bnpView->notesStateChanged(); -} - -void Basket::contentChangedInEditor() -{ - // Do not wait 3 seconds, because we need the note to expand as needed (if a line is too wider... the note should grow wider): - if (m_editor->textEdit()) - m_editor->autoSave(/*toFileToo=*/false); -// else { - if (m_inactivityAutoSaveTimer.isActive()) - m_inactivityAutoSaveTimer.stop(); - m_inactivityAutoSaveTimer.setSingleShot(true); - m_inactivityAutoSaveTimer.start(3 * 1000); - Global::bnpView->setUnsavedStatus(true); -// } -} - -void Basket::inactivityAutoSaveTimeout() -{ - if (m_editor) - m_editor->autoSave(/*toFileToo=*/true); -} - -void Basket::placeEditorAndEnsureVisible() -{ - placeEditor(/*andEnsureVisible=*/true); -} - -// TODO: [kw] Oh boy, this will probably require some tweaking. -void Basket::placeEditor(bool /*andEnsureVisible*/ /*= false*/) -{ - if (!isDuringEdit()) - return; - - QFrame *editorQFrame = dynamic_cast(m_editor->widget()); - KTextEdit *textEdit = m_editor->textEdit(); -// QLineEdit *lineEdit = m_editor->lineEdit(); - Note *note = m_editor->note(); - - int frameWidth = (editorQFrame ? editorQFrame->frameWidth() : 0); - int x = note->x() + note->contentX() + note->content()->xEditorIndent() - frameWidth; - int y; - int maxHeight = qMax(visibleHeight(), contentsHeight()); - int height, width; - - if (textEdit) { - x -= 4; - // Need to do it 2 times, because it's wrong overwise - // (sometimes, width depends on height, and sometimes, height depends on with): - for (int i = 0; i < 2; i++) { - // FIXME: CRASH: Select all text, press Del or [<--] and editor->removeSelectedText() is called: - // editor->sync() CRASH!! - // editor->sync(); - y = note->y() + Note::NOTE_MARGIN - frameWidth; - height = note->height() - 2 * frameWidth - 2 * Note::NOTE_MARGIN; -// height = /*qMax(*/height/*, note->height())*/; -// height = qMin(height, visibleHeight()); - width = note->x() + note->width() - x + 1;// /*note->x() + note->width()*/note->rightLimit() - x + 2*frameWidth + 1; -//width=qMax(width,textEdit->contentsWidth()+2*frameWidth); - if (y + height > maxHeight) - y = maxHeight - height; - textEdit->setFixedSize(width, height); - } - } else { - height = note->height() - 2 * Note::NOTE_MARGIN + 2 * frameWidth; - width = note->x() + note->width() - x;//note->rightLimit() - x + 2*frameWidth; - m_editor->widget()->setFixedSize(width, height); - x -= 1; - y = note->y() + Note::NOTE_MARGIN - frameWidth; - } - if ((m_editorWidth > 0 && m_editorWidth != width) || (m_editorHeight > 0 && m_editorHeight != height)) { - m_editorWidth = width; // Avoid infinite recursion!!! - m_editorHeight = height; - m_editor->autoSave(/*toFileToo=*/true); - } - m_editorWidth = width; - m_editorHeight = height; - addChild(m_editor->widget(), x, y); - m_editorX = x; - m_editorY = y; - - m_leftEditorBorder->setFixedSize((m_editor->textEdit() ? 3 : 0), height); -// m_leftEditorBorder->raise(); - addChild(m_leftEditorBorder, x, y); - m_leftEditorBorder->setPosition(x, y); - - m_rightEditorBorder->setFixedSize(3, height); -// m_rightEditorBorder->raise(); -// addChild(m_rightEditorBorder, note->rightLimit() - Note::NOTE_MARGIN, note->y() + Note::NOTE_MARGIN ); -// m_rightEditorBorder->setPosition( note->rightLimit() - Note::NOTE_MARGIN, note->y() + Note::NOTE_MARGIN ); - addChild(m_rightEditorBorder, note->x() + note->width() - Note::NOTE_MARGIN, note->y() + Note::NOTE_MARGIN); - m_rightEditorBorder->setPosition(note->x() + note->width() - Note::NOTE_MARGIN, note->y() + Note::NOTE_MARGIN); - -// if (andEnsureVisible) -// ensureNoteVisible(note); -} - -void Basket::editorCursorPositionChanged() -{ - if (!isDuringEdit()) - return; - - FocusedTextEdit *textEdit = (FocusedTextEdit*) m_editor->textEdit(); - - QPoint cursorPoint = textEdit->viewport()->mapTo( - viewport(), textEdit->cursorRect().center() - ); - ensureVisible(cursorPoint.x(), cursorPoint.y()); -} - -void Basket::closeEditorDelayed() -{ - setFocus(); - QTimer::singleShot(0, this, SLOT(closeEditor())); -} - -bool Basket::closeEditor() -{ - if (!isDuringEdit()) - return true; - - if (m_doNotCloseEditor) - return true; - - if (m_redirectEditActions) { - disconnect(m_editor->widget(), SIGNAL(selectionChanged()), this, SLOT(selectionChangedInEditor())); - if (m_editor->textEdit()) { - disconnect(m_editor->textEdit(), SIGNAL(textChanged()), this, SLOT(selectionChangedInEditor())); - disconnect(m_editor->textEdit(), SIGNAL(textChanged()), this, SLOT(contentChangedInEditor())); - } else if (m_editor->lineEdit()) { - disconnect(m_editor->lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(selectionChangedInEditor())); - disconnect(m_editor->lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(contentChangedInEditor())); - } - } - m_editor->widget()->disconnect(); - m_editor->widget()->hide(); - m_editor->validate(); - - delete m_leftEditorBorder; - delete m_rightEditorBorder; - m_leftEditorBorder = 0; - m_rightEditorBorder = 0; - - Note *note = m_editor->note(); - note->setWidth(0); // For relayoutNotes() to succeed to take care of the change - - // Delete the editor BEFORE unselecting the note because unselecting the note would trigger closeEditor() recursivly: - bool isEmpty = m_editor->isEmpty(); - delete m_editor; - m_editor = 0; - m_redirectEditActions = false; - m_editorWidth = -1; - m_editorHeight = -1; - m_inactivityAutoSaveTimer.stop(); - - // Delete the note if it is now empty: - if (isEmpty) { - focusANonSelectedNoteAboveOrThenBelow(); - note->setSelected(true); - note->deleteSelectedNotes(); - save(); - note = 0; - } - - unlockHovering(); - filterAgain(/*andEnsureVisible=*/false); - -// Does not work: -// if (Settings::playAnimations()) -// note->setOnTop(true); // So if it grew, do not obscure it temporarily while the notes below it are moving - - if (note) - note->setSelected(false);//unselectAll(); - doHoverEffects(); -// save(); - - Global::bnpView->m_actEditNote->setEnabled(!isLocked() && countSelecteds() == 1 /*&& !isDuringEdit()*/); - - emit resetStatusBarText(); // Remove the "Editing. ... to validate." text. - - //if (kapp->activeWindow() == Global::mainContainer) - - // Set focus to the basket, unless the user pressed a letter key in the filter bar and the currently edited note came hidden, then editing closed: - if (!decoration()->filterBar()->lineEdit()->hasFocus()) - setFocus(); - - // Return true if the note is still there: - return (note != 0); -} - -void Basket::closeBasket() -{ - closeEditor(); - unbufferizeAll(); // Keep the memory footprint low - if (isEncrypted()) { - if (Settings::enableReLockTimeout()) { - int seconds = Settings::reLockTimeoutMinutes() * 60; - m_inactivityAutoLockTimer.setSingleShot(true); - m_inactivityAutoLockTimer.start(seconds * 1000); - } - } -} - -void Basket::openBasket() -{ - if (m_inactivityAutoLockTimer.isActive()) - m_inactivityAutoLockTimer.stop(); -} - -Note* Basket::theSelectedNote() -{ - if (countSelecteds() != 1) { - kDebug() << "NO SELECTED NOTE !!!!"; - return 0; - } - - Note *selectedOne; - FOR_EACH_NOTE(note) { - selectedOne = note->theSelectedNote(); - if (selectedOne) - return selectedOne; - } - - kDebug() << "One selected note, BUT NOT FOUND !!!!"; - - return 0; -} - -NoteSelection* Basket::selectedNotes() -{ - NoteSelection selection; - - FOR_EACH_NOTE(note) - selection.append(note->selectedNotes()); - - if (!selection.firstChild) - return 0; - - for (NoteSelection *node = selection.firstChild; node; node = node->next) - node->parent = 0; - - // If the top-most groups are columns, export only childs of those groups - // (because user is not consciencious that columns are groups, and don't care: it's not what she want): - if (selection.firstChild->note->isColumn()) { - NoteSelection tmpSelection; - NoteSelection *nextNode; - NoteSelection *nextSubNode; - for (NoteSelection *node = selection.firstChild; node; node = nextNode) { - nextNode = node->next; - if (node->note->isColumn()) { - for (NoteSelection *subNode = node->firstChild; subNode; subNode = nextSubNode) { - nextSubNode = subNode->next; - tmpSelection.append(subNode); - subNode->parent = 0; - subNode->next = 0; - } - } else { - tmpSelection.append(node); - node->parent = 0; - node->next = 0; - } - } -// debugSel(tmpSelection.firstChild); - return tmpSelection.firstChild; - } else { -// debugSel(selection.firstChild); - return selection.firstChild; - } -} - -void Basket::showEditedNoteWhileFiltering() -{ - if (m_editor) { - Note *note = m_editor->note(); - filterAgain(); - note->setSelected(true); - relayoutNotes(false); - note->setX(note->finalX()); - note->setY(note->finalY()); - filterAgainDelayed(); - } -} - -void Basket::noteEdit(Note *note, bool justAdded, const QPoint &clickedPoint) // TODO: Remove the first parameter!!! -{ - if (!note) - note = theSelectedNote(); // TODO: Or pick the focused note! - if (!note) - return; - - if (isDuringEdit()) { - closeEditor(); // Validate the noteeditors in KLineEdit that does not intercept Enter key press (and edit is triggered with Enter too... Can conflict) - return; - } - - if (note != m_focusedNote) { - setFocusedNote(note); - m_startOfShiftSelectionNote = note; - } - - if (justAdded && isFiltering()) { - QTimer::singleShot(0, this, SLOT(showEditedNoteWhileFiltering())); - } - - doHoverEffects(note, Note::Content); // Be sure (in the case Edit was triggered by menu or Enter key...): better feedback! - //m_lockedHovering = true; - - //m_editorWidget = note->content()->launchEdit(this); - NoteEditor *editor = NoteEditor::editNoteContent(note->content(), this); - - if (editor->widget()) { - m_editor = editor; - m_leftEditorBorder = new TransparentWidget(this); - m_rightEditorBorder = new TransparentWidget(this); - //m_editor->widget()->reparent(viewport(), QPoint(0,0), true); - //m_leftEditorBorder->reparent(viewport(), QPoint(0,0), true); - //m_rightEditorBorder->reparent(viewport(), QPoint(0,0), true); - m_editor->widget()->setParent(viewport()); - m_leftEditorBorder->setParent(viewport()); - m_rightEditorBorder->setParent(viewport()); - addChild(m_editor->widget(), 0, 0); - placeEditorAndEnsureVisible(); // placeEditor(); // FIXME: After? - m_redirectEditActions = m_editor->lineEdit() || m_editor->textEdit(); - if (m_redirectEditActions) { - connect(m_editor->widget(), SIGNAL(selectionChanged()), this, SLOT(selectionChangedInEditor())); - // In case there is NO text, "Select All" is disabled. But if the user press a key the there is now a text: - // selection has not changed but "Select All" should be re-enabled: - if (m_editor->textEdit()) { - connect(m_editor->textEdit(), SIGNAL(textChanged()), this, SLOT(selectionChangedInEditor())); - connect(m_editor->textEdit(), SIGNAL(textChanged()), this, SLOT(contentChangedInEditor())); - } else if (m_editor->lineEdit()) { - connect(m_editor->lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(selectionChangedInEditor())); - connect(m_editor->lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(contentChangedInEditor())); - } - } - m_editor->widget()->show(); - //m_editor->widget()->raise(); - m_editor->widget()->setFocus(); - connect(m_editor, SIGNAL(askValidation()), - this, SLOT(closeEditorDelayed())); - connect(m_editor, SIGNAL(mouseEnteredEditorWidget()), - this, SLOT(mouseEnteredEditorWidget())); - - KTextEdit *textEdit = m_editor->textEdit(); - if (textEdit) { - connect(textEdit, SIGNAL(textChanged()), this, SLOT(placeEditorAndEnsureVisible())); - if (clickedPoint != QPoint()) { - // clickedPoint comes from the QMouseEvent, which is in this - // widget's coordinate system. - QPoint pos = textEdit->mapFrom(this, clickedPoint); - // Do it right before the kapp->processEvents() to not have the - // cursor to quickly flicker at end (and sometimes stay at end - // AND where clicked): - textEdit->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor); - textEdit->ensureCursorVisible(); - textEdit->setTextCursor(textEdit->cursorForPosition(pos)); - updateEditorAppearance(); - } - } - -// kapp->processEvents(); // Show the editor toolbar before ensuring the note is visible - ensureNoteVisible(note); // because toolbar can create a new line and then partially hide the note - m_editor->widget()->setFocus(); // When clicking in the basket, a QTimer::singleShot(0, ...) focus the basket! So we focus the the widget after kapp->processEvents() - emit resetStatusBarText(); // Display "Editing. ... to validate." - } else { - // Delete the note user have canceled the addition: - if ((justAdded && editor->canceled()) || editor->isEmpty() /*) && editor->note()->states().count() <= 0*/) { - focusANonSelectedNoteAboveOrThenBelow(); - editor->note()->setSelected(true); - editor->note()->deleteSelectedNotes(); - save(); - } - editor->deleteLater(); - unlockHovering(); - filterAgain(); - unselectAll(); - } - Global::bnpView->m_actEditNote->setEnabled(false); -} - -void Basket::noteDelete() -{ - if (redirectEditActions()) { - if (m_editor->textEdit()) - m_editor->textEdit()->textCursor().deleteChar(); - else if (m_editor->lineEdit()) - m_editor->lineEdit()->del(); - return; - } - - if (countSelecteds() <= 0) - return; - int really = KMessageBox::Yes; - if (Settings::confirmNoteDeletion()) - really = KMessageBox::questionYesNo(this, - i18np("Do you really want to delete this note?", - "Do you really want to delete these %1 notes?", - countSelecteds()), - i18np("Delete Note", "Delete Notes", countSelecteds()) -#if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x - , KStandardGuiItem::del(), KStandardGuiItem::cancel()); -#else - ); -#endif - if (really == KMessageBox::No) - return; - - noteDeleteWithoutConfirmation(); -} - -void Basket::focusANonSelectedNoteBelow(bool inSameColumn) -{ - // First focus another unselected one below it...: - if (m_focusedNote && m_focusedNote->isSelected()) { - Note *next = m_focusedNote->nextShownInStack(); - while (next && next->isSelected()) - next = next->nextShownInStack(); - if (next) { - if (inSameColumn && isColumnsLayout() && m_focusedNote->parentPrimaryNote() == next->parentPrimaryNote()) { - setFocusedNote(next); - m_startOfShiftSelectionNote = next; - } - } - } -} - -void Basket::focusANonSelectedNoteAbove(bool inSameColumn) -{ - // ... Or above it: - if (m_focusedNote && m_focusedNote->isSelected()) { - Note *prev = m_focusedNote->prevShownInStack(); - while (prev && prev->isSelected()) - prev = prev->prevShownInStack(); - if (prev) { - if (inSameColumn && isColumnsLayout() && m_focusedNote->parentPrimaryNote() == prev->parentPrimaryNote()) { - setFocusedNote(prev); - m_startOfShiftSelectionNote = prev; - } - } - } -} - -void Basket::focusANonSelectedNoteBelowOrThenAbove() -{ - focusANonSelectedNoteBelow(/*inSameColumn=*/true); - focusANonSelectedNoteAbove(/*inSameColumn=*/true); - focusANonSelectedNoteBelow(/*inSameColumn=*/false); - focusANonSelectedNoteAbove(/*inSameColumn=*/false); -} - -void Basket::focusANonSelectedNoteAboveOrThenBelow() -{ - focusANonSelectedNoteAbove(/*inSameColumn=*/true); - focusANonSelectedNoteBelow(/*inSameColumn=*/true); - focusANonSelectedNoteAbove(/*inSameColumn=*/false); - focusANonSelectedNoteBelow(/*inSameColumn=*/false); -} - -void Basket::noteDeleteWithoutConfirmation(bool deleteFilesToo) -{ - // If the currently focused note is selected, it will be deleted. - focusANonSelectedNoteBelowOrThenAbove(); - - // Do the deletion: - Note *note = firstNote(); - Note *next; - while (note) { - next = note->next(); // If we delete 'note' on the next line, note->next() will be 0! - note->deleteSelectedNotes(deleteFilesToo); - note = next; - } - - relayoutNotes(true); // FIXME: filterAgain()? - save(); -} - -void Basket::doCopy(CopyMode copyMode) -{ - QClipboard *cb = KApplication::clipboard(); - QClipboard::Mode mode = (copyMode == CopyToSelection ? QClipboard::Selection : QClipboard::Clipboard); - - NoteSelection *selection = selectedNotes(); - int countCopied = countSelecteds(); - if (selection->firstStacked()) { - QDrag *d = NoteDrag::dragObject(selection, copyMode == CutToClipboard, /*source=*/0); // d will be deleted by QT -// /*bool shouldRemove = */d->drag(); -// delete selection; - cb->setMimeData(d->mimeData(), mode); // NoteMultipleDrag will be deleted by QT -// if (copyMode == CutToClipboard && !note->useFile()) // If useFile(), NoteDrag::dragObject() will delete it TODO -// note->slotDelete(); - - if (copyMode == CutToClipboard) - noteDeleteWithoutConfirmation(/*deleteFilesToo=*/false); - - switch (copyMode) { - default: - case CopyToClipboard: emit postMessage(i18np("Copied note to clipboard.", "Copied notes to clipboard.", countCopied)); break; - case CutToClipboard: emit postMessage(i18np("Cut note to clipboard.", "Cut notes to clipboard.", countCopied)); break; - case CopyToSelection: emit postMessage(i18np("Copied note to selection.", "Copied notes to selection.", countCopied)); break; - } - } -} - -void Basket::noteCopy() -{ - if (redirectEditActions()) { - if (m_editor->textEdit()) - m_editor->textEdit()->copy(); - else if (m_editor->lineEdit()) - m_editor->lineEdit()->copy(); - } else - doCopy(CopyToClipboard); -} - -void Basket::noteCut() -{ - if (redirectEditActions()) { - if (m_editor->textEdit()) - m_editor->textEdit()->cut(); - else if (m_editor->lineEdit()) - m_editor->lineEdit()->cut(); - } else - doCopy(CutToClipboard); -} - -void Basket::noteOpen(Note *note) -{ - /* - GetSelectedNotes - NoSelectedNote || Count == 0 ? return - AllTheSameType ? - Get { url, message(count) } - */ - - // TODO: Open ALL selected notes! - if (!note) - note = theSelectedNote(); - if (!note) - return; - - KUrl url = note->content()->urlToOpen(/*with=*/false); - QString message = note->content()->messageWhenOpening(NoteContent::OpenOne /*NoteContent::OpenSeveral*/); - if (url.isEmpty()) { - if (message.isEmpty()) - emit postMessage(i18n("Unable to open this note.") /*"Unable to open those notes."*/); - else { - int result = KMessageBox::warningContinueCancel(this, message, /*caption=*/QString::null, KGuiItem(i18n("&Edit"), "edit")); - if (result == KMessageBox::Continue) - noteEdit(note); - } - } else { - emit postMessage(message); // "Openning link target..." / "Launching application..." / "Openning note file..." - // Finally do the opening job: - QString customCommand = note->content()->customOpenCommand(); - if (customCommand.isEmpty()) { - KRun *run = new KRun(url, window()); - run->setAutoDelete(true); - } else - KRun::run(customCommand, url, window()); - } -} - -/** Code from bool KRun::displayOpenWithDialog(const KUrl::List& lst, bool tempFiles) - * It does not allow to set a text, so I ripped it to do that: - */ -bool KRun__displayOpenWithDialog(const KUrl::List& lst, QWidget *window, bool tempFiles, const QString &text) -{ - if (kapp && !KAuthorized::authorizeKAction("openwith")) { - KMessageBox::sorry(window, i18n("You are not authorized to open this file.")); // TODO: Better message, i18n freeze :-( - return false; - } - KOpenWithDialog l(lst, text, QString::null, 0L); - if (l.exec()) { - KService::Ptr service = l.service(); - if (!!service) - return KRun::run(*service, lst, window, tempFiles); - //kDebug(250) << "No service set, running " << l.text() << endl; - return KRun::run(l.text(), lst, window); // TODO handle tempFiles - } - return false; -} - -void Basket::noteOpenWith(Note *note) -{ - if (!note) - note = theSelectedNote(); - if (!note) - return; - - KUrl url = note->content()->urlToOpen(/*with=*/true); - QString message = note->content()->messageWhenOpening(NoteContent::OpenOneWith /*NoteContent::OpenSeveralWith*/); - QString text = note->content()->messageWhenOpening(NoteContent::OpenOneWithDialog /*NoteContent::OpenSeveralWithDialog*/); - if (url.isEmpty()) - emit postMessage(i18n("Unable to open this note.") /*"Unable to open those notes."*/); - else if (KRun__displayOpenWithDialog(url, window(), false, text)) - emit postMessage(message); // "Opening link target with..." / "Opening note file with..." -} - -void Basket::noteSaveAs() -{ -// if (!note) -// note = theSelectedNote(); - Note *note = theSelectedNote(); - if (!note) - return; - - KUrl url = note->content()->urlToOpen(/*with=*/false); - if (url.isEmpty()) - return; - - QString fileName = KFileDialog::getSaveFileName(url.fileName(), note->content()->saveAsFilters(), this, i18n("Save to File")); - // TODO: Ask to overwrite ! - if (fileName.isEmpty()) - return; - - // TODO: Convert format, etc. (use NoteContent::saveAs(fileName)) - KIO::copy(url, KUrl(fileName)); -} - -Note* Basket::selectedGroup() -{ - FOR_EACH_NOTE(note) { - Note *selectedGroup = note->selectedGroup(); - if (selectedGroup) { - // If the selected group is one group in a column, then return that group, and not the column, - // because the column is not ungrouppage, and the Ungroup action would be disabled. - if (selectedGroup->isColumn() && selectedGroup->firstChild() && !selectedGroup->firstChild()->next()) { - return selectedGroup->firstChild(); - } - return selectedGroup; - } - } - return 0; -} - -bool Basket::selectionIsOneGroup() -{ - return (selectedGroup() != 0); -} - -Note* Basket::firstSelected() -{ - Note *first = 0; - FOR_EACH_NOTE(note) { - first = note->firstSelected(); - if (first) - return first; - } - return 0; -} - -Note* Basket::lastSelected() -{ - Note *last = 0, *tmp = 0; - FOR_EACH_NOTE(note) { - tmp = note->lastSelected(); - if (tmp) - last = tmp; - } - return last; -} - -bool Basket::convertTexts() -{ - m_watcher->stopScan(); - bool convertedNotes = false; - - if (!isLoaded()) - load(); - - FOR_EACH_NOTE(note) - if (note->convertTexts()) - convertedNotes = true; - - if (convertedNotes) - save(); - m_watcher->startScan(); - return convertedNotes; -} - -void Basket::noteGroup() -{ - /* // Nothing to do? - if (isLocked() || countSelecteds() <= 1) - return; - - // If every selected notes are ALREADY in one group, then don't touch anything: - Note *selectedGroup = this->selectedGroup(); - if (selectedGroup && !selectedGroup->isColumn()) - return; - */ - - // Copied from BNPView::updateNotesActions() - bool severalSelected = countSelecteds() >= 2; - Note *selectedGroup = (severalSelected ? this->selectedGroup() : 0); - bool enabled = !isLocked() && severalSelected && (!selectedGroup || selectedGroup->isColumn()); - if (!enabled) - return; - - // Get the first selected note: we will group selected items just before: - Note *first = firstSelected(); -// if (selectedGroup != 0 || first == 0) -// return; - - m_loaded = false; // Hack to avoid notes to be unselected and new notes to be selected: - - // Create and insert the receiving group: - Note *group = new Note(this); - if (first->isFree()) { - insertNote(group, 0L, Note::BottomColumn, QPoint(first->finalX(), first->finalY()), /*animateNewPosition=*/false); - } else { - insertNote(group, first, Note::TopInsert, QPoint(), /*animateNewPosition=*/false); - } - - // Put a FAKE UNSELECTED note in the new group, so if the new group is inside an allSelected() group, the parent group is not moved inside the new group! - Note *fakeNote = NoteFactory::createNoteColor(Qt::red, this); - insertNote(fakeNote, group, Note::BottomColumn, QPoint(), /*animateNewPosition=*/false); - - // Group the notes: - Note *nextNote; - Note *note = firstNote(); - while (note) { - nextNote = note->next(); - note->groupIn(group); - note = nextNote; - } - - m_loaded = true; // Part 2 / 2 of the workarround! - - // Do cleanup: - unplugNote(fakeNote); - unselectAll(); - group->setSelectedRecursively(true); // Notes were unselected by unplugging - - relayoutNotes(true); - save(); -} - -void Basket::noteUngroup() -{ - Note *group = selectedGroup(); - if (group && !group->isColumn()) - ungroupNote(group); - save(); -} - -void Basket::unplugSelection(NoteSelection *selection) -{ - for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) - unplugNote(toUnplug->note); -} - -void Basket::insertSelection(NoteSelection *selection, Note *after) -{ - for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) { - if (toUnplug->note->isGroup()) { - Note *group = new Note(this); - insertNote(group, after, Note::BottomInsert, QPoint(), /*animateNewPosition=*/false); - Note *fakeNote = NoteFactory::createNoteColor(Qt::red, this); - insertNote(fakeNote, group, Note::BottomColumn, QPoint(), /*animateNewPosition=*/false); - insertSelection(toUnplug->firstChild, fakeNote); - unplugNote(fakeNote); - after = group; - } else { - Note *note = toUnplug->note; - note->setPrev(0); - note->setNext(0); - insertNote(note, after, Note::BottomInsert, QPoint(), /*animateNewPosition=*/true); - after = note; - } - } -} - -void Basket::selectSelection(NoteSelection *selection) -{ - for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) { - if (toUnplug->note->isGroup()) - selectSelection(toUnplug); - else - toUnplug->note->setSelected(true); - } -} - -void Basket::noteMoveOnTop() -{ - // TODO: Get the group containing the selected notes and first move inside the group, then inside parent group, then in the basket - // TODO: Move on top/bottom... of the column or basjet - - NoteSelection *selection = selectedNotes(); - unplugSelection(selection); - // Replug the notes: - Note *fakeNote = NoteFactory::createNoteColor(Qt::red, this); - if (isColumnsLayout()) { - if (firstNote()->firstChild()) - insertNote(fakeNote, firstNote()->firstChild(), Note::TopInsert, QPoint(), /*animateNewPosition=*/false); - else - insertNote(fakeNote, firstNote(), Note::BottomColumn, QPoint(), /*animateNewPosition=*/false); - } else { - // TODO: Also allow to move notes on top of a group!!!!!!! - insertNote(fakeNote, 0, Note::BottomInsert, QPoint(0, 0), /*animateNewPosition=*/false); - } - insertSelection(selection, fakeNote); - unplugNote(fakeNote); - selectSelection(selection); - relayoutNotes(true); - save(); -} - -void Basket::noteMoveOnBottom() -{ - - // TODO: Duplicate code: void noteMoveOn(); - - // TODO: Get the group containing the selected notes and first move inside the group, then inside parent group, then in the basket - // TODO: Move on top/bottom... of the column or basjet - - NoteSelection *selection = selectedNotes(); - unplugSelection(selection); - // Replug the notes: - Note *fakeNote = NoteFactory::createNoteColor(Qt::red, this); - if (isColumnsLayout()) - insertNote(fakeNote, firstNote(), Note::BottomColumn, QPoint(), /*animateNewPosition=*/false); - else { - // TODO: Also allow to move notes on top of a group!!!!!!! - insertNote(fakeNote, 0, Note::BottomInsert, QPoint(0, 0), /*animateNewPosition=*/false); - } - insertSelection(selection, fakeNote); - unplugNote(fakeNote); - selectSelection(selection); - relayoutNotes(true); - save(); -} - -void Basket::moveSelectionTo(Note *here, bool below/* = true*/) -{ - NoteSelection *selection = selectedNotes(); - unplugSelection(selection); - // Replug the notes: - Note *fakeNote = NoteFactory::createNoteColor(Qt::red, this); -// if (isColumnsLayout()) - insertNote(fakeNote, here, (below ? Note::BottomInsert : Note::TopInsert), QPoint(), /*animateNewPosition=*/false); -// else { -// // TODO: Also allow to move notes on top of a group!!!!!!! -// insertNote(fakeNote, 0, Note::BottomInsert, QPoint(0, 0), /*animateNewPosition=*/false); -// } - insertSelection(selection, fakeNote); - unplugNote(fakeNote); - selectSelection(selection); - relayoutNotes(true); - save(); -} - -void Basket::noteMoveNoteUp() -{ - - // TODO: Move between columns, even if they are empty !!!!!!! - - // TODO: if first note of a group, move just above the group! And let that even if there is no note before that group!!! - - Note *first = firstSelected(); - Note *previous = first->prevShownInStack(); - if (previous) - moveSelectionTo(previous, /*below=*/false); -} - -void Basket::noteMoveNoteDown() -{ - Note *first = lastSelected(); - Note *next = first->nextShownInStack(); - if (next) - moveSelectionTo(next, /*below=*/true); -} - -void Basket::wheelEvent(QWheelEvent *event) -{ - Q3ScrollView::wheelEvent(event); -} - -void Basket::linkLookChanged() -{ - Note *note = m_firstNote; - while (note) { - note->linkLookChanged(); - note = note->next(); - } - relayoutNotes(true); -} - -void Basket::slotCopyingDone2(KIO::Job *job, - const KUrl &/*from*/, - const KUrl &to) -{ - if (job->error()) { - DEBUG_WIN << "Copy finished, ERROR"; - return; - } - Note *note = noteForFullPath(to.path()); - DEBUG_WIN << "Copy finished, load note: " + to.path() + (note ? "" : " --- NO CORRESPONDING NOTE"); - if (note != 0L) { - note->content()->loadFromFile(/*lazyLoad=*/false); - if (isEncrypted()) - note->content()->saveToFile(); - if (m_focusedNote == note) // When inserting a new note we ensure it visble - ensureNoteVisible(note); // But after loading it has certainly grown and if it was - } // on bottom of the basket it's not visible entirly anymore -} - -Note* Basket::noteForFullPath(const QString &path) -{ - Note *note = firstNote(); - Note *found; - while (note) { - found = note->noteForFullPath(path); - if (found) - return found; - note = note->next(); - } - return 0; -} - -void Basket::deleteFiles() -{ - m_watcher->stopScan(); - Tools::deleteRecursively(fullPath()); -} - -QList Basket::usedStates() -{ - QList states; - FOR_EACH_NOTE(note) - note->usedStates(states); - return states; -} - -QString Basket::saveGradientBackground(const QColor &color, const QFont &font, const QString &folder) -{ - // Construct file name and return if the file already exists: - QString fileName = "note_background_" + color.name().toLower().mid(1) + ".png"; - QString fullPath = folder + fileName; - if (QFile::exists(fullPath)) - return fileName; - - // Get the gradient top and bottom colors: - QColor topBgColor; - QColor bottomBgColor; - Note::getGradientColors(color, &topBgColor, &bottomBgColor); - - // Draw and save the gradient image: - int sampleTextHeight = QFontMetrics(font) - .boundingRect(0, 0, /*width=*/10000, /*height=*/0, Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, "Test text") - .height(); - QPixmap noteGradient(100, sampleTextHeight + Note::NOTE_MARGIN); - QPainter painter(¬eGradient); - drawGradient(&painter, topBgColor, bottomBgColor, 0, 0, noteGradient.width(), noteGradient.height(), /*sunken=*/false, /*horz=*/true, /*flat=*/false); - painter.end(); - noteGradient.save(fullPath, "PNG"); - - // Return the name of the created file: - return fileName; -} - -void Basket::listUsedTags(QList &list) -{ - if (!isLoaded()) { - load(); - } - - FOR_EACH_NOTE(child) - child->listUsedTags(list); -} - - -/** Unfocus the previously focused note (unless it was null) - * and focus the new @param note (unless it is null) if hasFocus() - * Update m_focusedNote to the new one - */ -void Basket::setFocusedNote(Note *note) // void Basket::changeFocusTo(Note *note) -{ - // Don't focus an hidden note: - if (note != 0L && !note->isShown()) - return; - // When clicking a group, this group gets focused. But only content-based notes should be focused: - if (note && note->isGroup()) - note = note->firstRealChild(); - // The first time a note is focused, it becomes the start of the Shift selection: - if (m_startOfShiftSelectionNote == 0) - m_startOfShiftSelectionNote = note; - // Unfocus the old focused note: - if (m_focusedNote != 0L) - m_focusedNote->setFocused(false); - // Notify the new one to draw a focus rectangle... only if the basket is focused: - if (hasFocus() && note != 0L) - note->setFocused(true); - // Save the new focused note: - m_focusedNote = note; -} - -/** If no shown note is currently focused, try to find a shown note and focus it - * Also update m_focusedNote to the new one (or null if there isn't) - */ -void Basket::focusANote() -{ - if (countFounds() == 0) { // No note to focus - setFocusedNote(0L); -// m_startOfShiftSelectionNote = 0; - return; - } - - if (m_focusedNote == 0L) { // No focused note yet : focus the first shown - Note *toFocus = (isFreeLayout() ? noteOnHome() : firstNoteShownInStack()); - setFocusedNote(toFocus); -// m_startOfShiftSelectionNote = m_focusedNote; - return; - } - - // Search a visible note to focus if the focused one isn't shown : - Note *toFocus = m_focusedNote; - if (toFocus && !toFocus->isShown()) - toFocus = toFocus->nextShownInStack(); - if (!toFocus && m_focusedNote) - toFocus = m_focusedNote->prevShownInStack(); - setFocusedNote(toFocus); -// m_startOfShiftSelectionNote = toFocus; -} - -Note* Basket::firstNoteInStack() -{ - if (!firstNote()) - return 0; - - if (firstNote()->content()) - return firstNote(); - else - return firstNote()->nextInStack(); -} - -Note* Basket::lastNoteInStack() -{ - Note *note = lastNote(); - while (note) { - if (note->content()) - return note; - Note *possibleNote = note->lastRealChild(); - if (possibleNote && possibleNote->content()) - return possibleNote; - note = note->prev(); - } - return 0; -} - -Note* Basket::firstNoteShownInStack() -{ - Note *first = firstNoteInStack(); - while (first && !first->isShown()) - first = first->nextInStack(); - return first; -} - -Note* Basket::lastNoteShownInStack() -{ - Note *last = lastNoteInStack(); - while (last && !last->isShown()) - last = last->prevInStack(); - return last; -} - -inline int abs(int n) -{ - return (n < 0 ? -n : n); -} - -Note* Basket::noteOn(NoteOn side) -{ - Note *bestNote = 0; - int distance = -1; - int bestDistance = contentsWidth() * contentsHeight() * 10; - - Note *note = firstNoteShownInStack(); - Note *primary = m_focusedNote->parentPrimaryNote(); - while (note) { - switch (side) { - case LEFT_SIDE: distance = m_focusedNote->distanceOnLeftRight(note, LEFT_SIDE); break; - case RIGHT_SIDE: distance = m_focusedNote->distanceOnLeftRight(note, RIGHT_SIDE); break; - case TOP_SIDE: distance = m_focusedNote->distanceOnTopBottom(note, TOP_SIDE); break; - case BOTTOM_SIDE: distance = m_focusedNote->distanceOnTopBottom(note, BOTTOM_SIDE); break; - } - if ((side == TOP_SIDE || side == BOTTOM_SIDE || primary != note->parentPrimaryNote()) && note != m_focusedNote && distance > 0 && distance < bestDistance) { - bestNote = note; - bestDistance = distance; - } - note = note ->nextShownInStack(); - } - - return bestNote; -} - -Note* Basket::firstNoteInGroup() -{ - Note *child = m_focusedNote; - Note *parent = (m_focusedNote ? m_focusedNote->parentNote() : 0); - while (parent) { - if (parent->firstChild() != child && !parent->isColumn()) - return parent->firstRealChild(); - child = parent; - parent = parent->parentNote(); - } - return 0; -} - -Note* Basket::noteOnHome() -{ - // First try to find the first note of the group containing the focused note: - Note *child = m_focusedNote; - Note *parent = (m_focusedNote ? m_focusedNote->parentNote() : 0); - while (parent) { - if (parent->nextShownInStack() != m_focusedNote) - return parent->nextShownInStack(); - child = parent; - parent = parent->parentNote(); - } - - // If it was not found, then focus the very first note in the basket: - if (isFreeLayout()) { - Note *first = firstNoteShownInStack(); // The effective first note found - Note *note = first; // The current note, to conpare with the previous first note, if this new note is more on top - if (note) - note = note->nextShownInStack(); - while (note) { - if (note->finalY() < first->finalY() || (note->finalY() == first->finalY() && note->finalX() < first->finalX())) - first = note; - note = note->nextShownInStack(); - } - return first; - } else - return firstNoteShownInStack(); -} - -Note* Basket::noteOnEnd() -{ - Note *child = m_focusedNote; - Note *parent = (m_focusedNote ? m_focusedNote->parentNote() : 0); - Note *lastChild; - while (parent) { - lastChild = parent->lastRealChild(); - if (lastChild && lastChild != m_focusedNote) { - if (lastChild->isShown()) - return lastChild; - lastChild = lastChild->prevShownInStack(); - if (lastChild && lastChild->isShown() && lastChild != m_focusedNote) - return lastChild; - } - child = parent; - parent = parent->parentNote(); - } - if (isFreeLayout()) { - Note *last; - Note *note; - last = note = firstNoteShownInStack(); - note = note->nextShownInStack(); - while (note) { - if (note->finalBottom() > last->finalBottom() || (note->finalBottom() == last->finalBottom() && note->finalX() > last->finalX())) - last = note; - note = note->nextShownInStack(); - } - return last; - } else - return lastNoteShownInStack(); -} - - -void Basket::keyPressEvent(QKeyEvent *event) -{ - if (isDuringEdit() && event->key() == Qt::Key_Return) { - //if (m_editor->lineEdit()) - // closeEditor(); - //else - m_editor->widget()->setFocus(); - } else if (event->key() == Qt::Key_Escape) { - if (isDuringEdit()) - closeEditor(); - else if (decoration()->filterData().isFiltering) - decoration()->filterBar()->reset(); - else - unselectAll(); - } - - if (countFounds() == 0) - return; - - if (!m_focusedNote) - return; - - Note *toFocus = 0L; - - switch (event->key()) { - case Qt::Key_Down: - toFocus = (isFreeLayout() ? noteOn(BOTTOM_SIDE) : m_focusedNote->nextShownInStack()); - if (toFocus) - break; - scrollBy(0, 30); // This cases do not move focus to another note... - return; - case Qt::Key_Up: - toFocus = (isFreeLayout() ? noteOn(TOP_SIDE) : m_focusedNote->prevShownInStack()); - if (toFocus) - break; - scrollBy(0, -30); // This cases do not move focus to another note... - return; - case Qt::Key_PageDown: - if (isFreeLayout()) { - Note *lastFocused = m_focusedNote; - for (int i = 0; i < 10 && m_focusedNote; ++i) - m_focusedNote = noteOn(BOTTOM_SIDE); - toFocus = m_focusedNote; - m_focusedNote = lastFocused; - } else { - toFocus = m_focusedNote; - for (int i = 0; i < 10 && toFocus; ++i) - toFocus = toFocus->nextShownInStack(); - } - if (toFocus == 0L) - toFocus = (isFreeLayout() ? noteOnEnd() : lastNoteShownInStack()); - if (toFocus && toFocus != m_focusedNote) - break; - scrollBy(0, visibleHeight() / 2); // This cases do not move focus to another note... - return; - case Qt::Key_PageUp: - if (isFreeLayout()) { - Note *lastFocused = m_focusedNote; - for (int i = 0; i < 10 && m_focusedNote; ++i) - m_focusedNote = noteOn(TOP_SIDE); - toFocus = m_focusedNote; - m_focusedNote = lastFocused; - } else { - toFocus = m_focusedNote; - for (int i = 0; i < 10 && toFocus; ++i) - toFocus = toFocus->prevShownInStack(); - } - if (toFocus == 0L) - toFocus = (isFreeLayout() ? noteOnHome() : firstNoteShownInStack()); - if (toFocus && toFocus != m_focusedNote) - break; - scrollBy(0, - visibleHeight() / 2); // This cases do not move focus to another note... - return; - case Qt::Key_Home: - toFocus = noteOnHome(); - break; - case Qt::Key_End: - toFocus = noteOnEnd(); - break; - case Qt::Key_Left: - if (m_focusedNote->tryFoldParent()) - return; - if ((toFocus = noteOn(LEFT_SIDE))) - break; - if ((toFocus = firstNoteInGroup())) - break; - scrollBy(-30, 0); // This cases do not move focus to another note... - return; - case Qt::Key_Right: - if (m_focusedNote->tryExpandParent()) - return; - if ((toFocus = noteOn(RIGHT_SIDE))) - break; - scrollBy(30, 0); // This cases do not move focus to another note... - return; - case Qt::Key_Space: // This case do not move focus to another note... - if (m_focusedNote) { - m_focusedNote->setSelected(! m_focusedNote->isSelected()); - event->accept(); - } else - event->ignore(); - return; // ... so we return after the process - default: - return; - } - - if (toFocus == 0L) { // If no direction keys have been pressed OR reached out the begin or end - event->ignore(); // Important !! - return; - } - - if (event->modifiers() & Qt::ShiftModifier) { // Shift+arrowKeys selection - if (m_startOfShiftSelectionNote == 0L) - m_startOfShiftSelectionNote = toFocus; - ensureNoteVisible(toFocus); // Important: this line should be before the other ones because else repaint would be done on the wrong part! - selectRange(m_startOfShiftSelectionNote, toFocus); - setFocusedNote(toFocus); - event->accept(); - return; - } else /*if (toFocus != m_focusedNote)*/ { // Move focus to ANOTHER note... - ensureNoteVisible(toFocus); // Important: this line should be before the other ones because else repaint would be done on the wrong part! - setFocusedNote(toFocus); - m_startOfShiftSelectionNote = toFocus; - if (!(event->modifiers() & Qt::ControlModifier)) // ... select only current note if Control - unselectAllBut(m_focusedNote); - event->accept(); - return; - } - - event->ignore(); // Important !! -} - -/** Select a range of notes and deselect the others. - * The order between start and end has no importance (end could be before start) - */ -void Basket::selectRange(Note *start, Note *end, bool unselectOthers /*= true*/) -{ - Note *cur; - Note *realEnd = 0L; - - // Avoid crash when start (or end) is null - if (start == 0L) - start = end; - else if (end == 0L) - end = start; - // And if *both* are null - if (start == 0L) { - if (unselectOthers) - unselectAll(); - return; - } - // In case there is only one note to select - if (start == end) { - if (unselectOthers) - unselectAllBut(start); - else - start->setSelected(true); - return; - } - - // Free layout baskets should select range as if we were drawing a rectangle between start and end: - if (isFreeLayout()) { - QRect startRect(start->finalX(), start->finalY(), start->width(), start->finalHeight()); - QRect endRect(end->finalX(), end->finalY(), end->width(), end->finalHeight()); - QRect toSelect = startRect.unite(endRect); - selectNotesIn(toSelect, /*invertSelection=*/false, unselectOthers); - return; - } - - // Search the REAL first (and deselect the others before it) : - for (cur = firstNoteInStack(); cur != 0L; cur = cur->nextInStack()) { - if (cur == start || cur == end) - break; - if (unselectOthers) - cur->setSelected(false); - } - - // Select the notes after REAL start, until REAL end : - if (cur == start) - realEnd = end; - else if (cur == end) - realEnd = start; - - for (/*cur = cur*/; cur != 0L; cur = cur->nextInStack()) { - cur->setSelected(cur->isShown()); // Select all notes in the range, but only if they are shown - if (cur == realEnd) - break; - } - - if (!unselectOthers) - return; - - // Deselect the remaining notes : - if (cur) - cur = cur->nextInStack(); - for (/*cur = cur*/; cur != 0L; cur = cur->nextInStack()) - cur->setSelected(false); -} - -void Basket::focusInEvent(QFocusEvent*) -{ - // Focus cannot be get with Tab when locked, but a click can focus the basket! - if (isLocked()) { - if (m_button) - QTimer::singleShot(0, m_button, SLOT(setFocus())); - } else - focusANote(); // hasFocus() is true at this stage, note will be focused -} - -void Basket::focusOutEvent(QFocusEvent*) -{ - if (m_focusedNote != 0L) - m_focusedNote->setFocused(false); -} - -void Basket::ensureNoteVisible(Note *note) -{ - if (!note->isShown()) // Logical! - return; - - if (note == editedNote()) // HACK: When filtering while editing big notes, etc... cause unwanted scrolls - return; - - int finalBottom = note->finalY() + qMin(note->finalHeight(), visibleHeight()); - int finalRight = note->finalX() + qMin(note->width() + (note->hasResizer() ? Note::RESIZER_WIDTH : 0), visibleWidth()); - ensureVisible(finalRight, finalBottom, 0, 0); - ensureVisible(note->finalX(), note->finalY(), 0, 0); -} - -void Basket::addWatchedFile(const QString &fullPath) -{ -// DEBUG_WIN << "Watcher>Add Monitoring Of : " + fullPath + ""; - m_watcher->addFile(fullPath); -} - -void Basket::removeWatchedFile(const QString &fullPath) -{ -// DEBUG_WIN << "Watcher>Remove Monitoring Of : " + fullPath + ""; - m_watcher->removeFile(fullPath); -} - -void Basket::watchedFileModified(const QString &fullPath) -{ - if (!m_modifiedFiles.contains(fullPath)) - m_modifiedFiles.append(fullPath); - // If a big file is saved by an application, notifications are send several times. - // We wait they are not sent anymore to considere the file complete! - m_watcherTimer.setSingleShot(true); - m_watcherTimer.start(200); - DEBUG_WIN << "Watcher>Modified : " + fullPath + ""; -} - -void Basket::watchedFileDeleted(const QString &fullPath) -{ - Note *note = noteForFullPath(fullPath); - removeWatchedFile(fullPath); - if (note) { - NoteSelection *selection = selectedNotes(); - unselectAllBut(note); - noteDeleteWithoutConfirmation(); - while (selection) { - selection->note->setSelected(true); - selection = selection->nextStacked(); - } - } - DEBUG_WIN << "Watcher>Removed : " + fullPath + ""; -} - -void Basket::updateModifiedNotes() -{ - for (QList::iterator it = m_modifiedFiles.begin(); it != m_modifiedFiles.end(); ++it) { - Note *note = noteForFullPath(*it); - if (note) - note->content()->loadFromFile(/*lazyLoad=*/false); - } - m_modifiedFiles.clear(); -} - -bool Basket::setProtection(int type, QString key) -{ -#ifdef HAVE_LIBGPGME - if (type == PasswordEncryption || // Ask a new password - m_encryptionType != type || m_encryptionKey != key) { - int savedType = m_encryptionType; - QString savedKey = m_encryptionKey; - - m_encryptionType = type; - m_encryptionKey = key; - m_gpg->clearCache(); - - if (saveAgain()) { - emit propertiesChanged(this); - } else { - m_encryptionType = savedType; - m_encryptionKey = savedKey; - m_gpg->clearCache(); - return false; - } - } - return true; -#else - m_encryptionType = type; - m_encryptionKey = key; - return false; -#endif -} - -bool Basket::saveAgain() -{ - bool result = false; - - m_watcher->stopScan(); - // Re-encrypt basket file: - result = save(); - // Re-encrypt every note files recursively: - if (result) { - FOR_EACH_NOTE(note) { - result = note->saveAgain(); - if (!result) - break; - } - } - m_watcher->startScan(); - return result; -} - -bool Basket::loadFromFile(const QString &fullPath, QString *string, bool isLocalEncoding) -{ - QByteArray array; - - if (loadFromFile(fullPath, &array)) { - if (isLocalEncoding) - *string = QString::fromLocal8Bit(array.data(), array.size()); - else - *string = QString::fromUtf8(array.data(), array.size()); - return true; - } else - return false; -} - -bool Basket::isEncrypted() -{ - return (m_encryptionType != NoEncryption); -} - -bool Basket::isFileEncrypted() -{ - QFile file(fullPath() + ".basket"); - - if (file.open(QIODevice::ReadOnly)) { - // Should be ASCII anyways - QString line = file.readLine(32); - if (line.startsWith("-----BEGIN PGP MESSAGE-----")) - return true; - } - return false; -} - -bool Basket::loadFromFile(const QString &fullPath, QByteArray *array) -{ - QFile file(fullPath); - bool encrypted = false; - - if (file.open(QIODevice::ReadOnly)) { - *array = file.readAll(); - QByteArray magic = "-----BEGIN PGP MESSAGE-----"; - int i = 0; - - if (array->size() > magic.size()) - for (i = 0; array->at(i) == magic[i]; ++i) - ; - if (i == magic.size()) { - encrypted = true; - } - file.close(); -#ifdef HAVE_LIBGPGME - if (encrypted) { - QByteArray tmp(*array); - - tmp.detach(); - // Only use gpg-agent for private key encryption since it doesn't - // cache password used in symmetric encryption. - m_gpg->setUseGnuPGAgent(Settings::useGnuPGAgent() && m_encryptionType == PrivateKeyEncryption); - if (m_encryptionType == PrivateKeyEncryption) - m_gpg->setText(i18n("Please enter the password for the following private key:"), false); - else - m_gpg->setText(i18n("Please enter the password for the basket %1:", basketName()), false); // Used when decrypting - return m_gpg->decrypt(tmp, array); - } -#else - if (encrypted) { - return false; - } -#endif - return true; - } else - return false; -} - -bool Basket::saveToFile(const QString& fullPath, const QString& string, bool isLocalEncoding) -{ - QByteArray bytes = (isLocalEncoding ? string.toLocal8Bit() : string.toUtf8()); - return saveToFile(fullPath, bytes, bytes.length()); -} - -bool Basket::saveToFile(const QString& fullPath, const QByteArray& array) -{ - return saveToFile(fullPath, array, array.size()); -} - -bool Basket::saveToFile(const QString& fullPath, const QByteArray& array, unsigned long length) -{ - bool success = true; - QByteArray tmp; - -#ifdef HAVE_LIBGPGME - if (isEncrypted()) { - QString key = QString::null; - - // We only use gpg-agent for private key encryption and saving without - // public key doesn't need one. - m_gpg->setUseGnuPGAgent(false); - if (m_encryptionType == PrivateKeyEncryption) { - key = m_encryptionKey; - // public key doesn't need password - m_gpg->setText("", false); - } else - m_gpg->setText(i18n("Please assign a password to the basket %1:", basketName()), true); // Used when defining a new password - - success = m_gpg->encrypt(array, length, &tmp, key); - length = tmp.size(); - } else - tmp = array; - -#else - success = !isEncrypted(); - if (success) - tmp = array; -#endif - /*if (success && (success = file.open(QIODevice::WriteOnly))){ - success = (file.write(tmp) == (Q_LONG)tmp.size()); - file.close(); - }*/ - - if (success) - return safelySaveToFile(fullPath, tmp, length); - else - return false; -} - -/** - * A safer version of saveToFile, that doesn't perform encryption. To save a - * file owned by a basket (i.e. a basket or a note file), use saveToFile(), but - * to save to another file, (e.g. the basket hierarchy), use this function - * instead. - */ -/*static*/ bool Basket::safelySaveToFile(const QString& fullPath, - const QByteArray& array, - unsigned long length) -{ - // Modulus operandi: - // 1. Use KSaveFile to try and save the file - // 2. Show a modal dialog (with the error) when bad things happen - // 3. We keep trying (at increasing intervals, up until every minute) - // until we finally save the file. - - // The error dialog is static to make sure we never show the dialog twice, - static DiskErrorDialog *dialog = 0; - static const uint maxDelay = 60 * 1000; // ms - uint retryDelay = 1000; // ms - bool success = false; - do { - KSaveFile saveFile(fullPath); - if (saveFile.open()) { - saveFile.write(array, length); - if (saveFile.finalize()) - success = true; - } - - if (!success) { - if (!dialog) { - dialog = new DiskErrorDialog(i18n("Error while saving"), - saveFile.errorString(), - kapp->activeWindow()); - } - - if (!dialog->isVisible()) - dialog->show(); - - static const uint sleepDelay = 50; // ms - for (uint i = 0; i < retryDelay / sleepDelay; ++i) { - kapp->processEvents(); - usleep(sleepDelay * 1000); // usec - } - // Double the retry delay, but don't go over the max. - retryDelay = qMin(maxDelay, retryDelay * 2); // ms - } - } while (!success); - - if (dialog) - dialog->deleteLater(); - dialog = NULL; - - return true; // Guess we can't really return a fail -} - -/*static*/ bool Basket::safelySaveToFile(const QString& fullPath, const QString& string, bool isLocalEncoding) -{ - QByteArray bytes = (isLocalEncoding ? string.toLocal8Bit() : string.toUtf8()); - return safelySaveToFile(fullPath, bytes, bytes.length() - 1); -} - -/*static*/ bool Basket::safelySaveToFile(const QString& fullPath, const QByteArray& array) -{ - return safelySaveToFile(fullPath, array, array.size()); -} - -void Basket::lock() -{ -#ifdef HAVE_LIBGPGME - closeEditor(); - m_gpg->clearCache(); - m_locked = true; - enableActions(); - deleteNotes(); - m_loaded = false; - m_loadingLaunched = false; - updateContents(); -#endif -} diff -Nru basket-2.0~20091110/src/basketfactory.cpp basket-2.0~20102801/src/basketfactory.cpp --- basket-2.0~20091110/src/basketfactory.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/basketfactory.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -26,7 +26,7 @@ #include "basketfactory.h" #include "global.h" -#include "basket.h" +#include "basketview.h" #include "xmlwork.h" #include "note.h" // For balanced column width computation #include "bnpview.h" @@ -70,7 +70,7 @@ QTextStream stream(&file); stream.setCodec("UTF-8"); int nbColumns = (templateName == "mindmap" || templateName == "free" ? 0 : templateName.left(1).toInt()); - Basket *currentBasket = Global::bnpView->currentBasket(); + BasketView *currentBasket = Global::bnpView->currentBasket(); int columnWidth = (currentBasket && nbColumns > 0 ? (currentBasket->visibleWidth() - (nbColumns - 1) * Note::RESIZER_WIDTH) / nbColumns : 0); stream << QString("\n" "\n" @@ -100,7 +100,7 @@ const QColor &backgroundColor, const QColor &textColor, const QString &templateName, - Basket *parent) + BasketView *parent) { // Unpack the templateName file to a new basket folder: QString folderName = unpackTemplate(templateName); diff -Nru basket-2.0~20091110/src/basketfactory.h basket-2.0~20102801/src/basketfactory.h --- basket-2.0~20091110/src/basketfactory.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/basketfactory.h 2009-11-24 20:28:01.000000000 +0000 @@ -23,7 +23,7 @@ class QString; -class Basket; +class BasketView; /** Methods to create various baskets (mkdir, init the properties and load it). * @author Sébastien Laoût @@ -37,7 +37,7 @@ const QColor &backgroundColor, const QColor &textColor, const QString &templateName, - Basket *parent); + BasketView *parent); /** Internal tool methods to process the method above: */ QString newFolderName(); QString unpackTemplate(const QString &templateName); diff -Nru basket-2.0~20091110/src/basket.h basket-2.0~20102801/src/basket.h --- basket-2.0~20091110/src/basket.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/basket.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,668 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2003 by Sébastien Laoût * - * slaout@linux62.org * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * 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. * - ***************************************************************************/ - -#ifndef BASKET_H -#define BASKET_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "filter.h" -#include "note.h" // For Note::Zone -#include "config.h" - -class QDomDocument; -class QDomElement; - -class DecoratedBasket; -class Note; -class NoteEditor; -class Tag; -class TransparentWidget; -#ifdef HAVE_LIBGPGME -class KGpgMe; -#endif - -/** - * @author Sébastien Laoût - */ -class Basket : public Q3ScrollView -{ - Q_OBJECT -public: - enum EncryptionTypes { - NoEncryption = 0, - PasswordEncryption = 1, - PrivateKeyEncryption = 2 - }; - -public: -/// CONSTRUCTOR AND DESTRUCTOR: - Basket(QWidget *parent, const QString &folderName); - ~Basket(); - -/// USER INTERACTION: -private: - bool m_noActionOnMouseRelease; - bool m_ignoreCloseEditorOnNextMouseRelease; - QPoint m_pressPos; - bool m_canDrag; - -public: - void viewportResizeEvent(QResizeEvent *); - void drawContents(QPainter *painter); - void drawContents(QPainter *painter, int clipX, int clipY, int clipWidth, int clipHeight); - void enterEvent(QEvent *); - void leaveEvent(QEvent *); - void contentsMouseMoveEvent(QMouseEvent *event); - void contentsMousePressEvent(QMouseEvent *event); - void contentsMouseReleaseEvent(QMouseEvent *event); - void contentsMouseDoubleClickEvent(QMouseEvent *event); - void contentsContextMenuEvent(QContextMenuEvent *event); - void updateNote(Note *note); - void clickedToInsert(QMouseEvent *event, Note *clicked = 0, int zone = 0); -private slots: - void setFocusIfNotInPopupMenu(); - -/// LAYOUT: -private: - Note *m_firstNote; - int m_columnsCount; - bool m_mindMap; - Note *m_resizingNote; - int m_pickedResizer; - Note *m_movingNote; - QPoint m_pickedHandle; -public: - int tmpWidth; - int tmpHeight; -public: - void unsetNotesWidth(); - void relayoutNotes(bool animate); - Note* noteAt(int x, int y); - inline Note* firstNote() { - return m_firstNote; - } - inline int columnsCount() { - return m_columnsCount; - } - inline bool isColumnsLayout() { - return m_columnsCount > 0; - } - inline bool isFreeLayout() { - return m_columnsCount <= 0; - } - inline bool isMindMap() { - return isFreeLayout() && m_mindMap; - } - Note* resizingNote() { - return m_resizingNote; - } - void deleteNotes(); - Note* lastNote(); - void setDisposition(int disposition, int columnCount); - void equalizeColumnSizes(); - -/// NOTES INSERTION AND REMOVAL: -public: - /// The following methods assume that the note(s) to insert already all have 'this' as the parent basket: - void prependNoteIn(Note *note, Note *in); /// << Add @p note (and the next linked notes) as the first note(s) of the group @p in. - void appendNoteIn(Note *note, Note *in); /// << Add @p note (and the next linked notes) as the last note(s) of the group @p in. - void appendNoteAfter(Note *note, Note *after); /// << Add @p note (and the next linked notes) just after (just below) the note @p after. - void appendNoteBefore(Note *note, Note *before); /// << Add @p note (and the next linked notes) just before (just above) the note @p before. - void groupNoteAfter(Note *note, Note *with); /// << Add a group at @p with place, move @p with in it, and add @p note (and the next linked notes) just after the group. - void groupNoteBefore(Note *note, Note *with); /// << Add a group at @p with place, move @p with in it, and add @p note (and the next linked notes) just before the group. - void unplugNote(Note *note); /// << Unplug @p note (and its child notes) from the basket (and also decrease counts...). - /// << After that, you should delete the notes yourself. Do not call prepend/append/group... functions two times: unplug and ok - void ungroupNote(Note *group); /// << Unplug @p group but put child notes at its place. - /// And this one do almost all the above methods depending on the context: - void insertNote(Note *note, Note *clicked, int zone, const QPoint &pos = QPoint(), bool animateNewPosition = false); - void insertCreatedNote(Note *note); - /// And working with selections: - void unplugSelection(NoteSelection *selection); - void insertSelection(NoteSelection *selection, Note *after); - void selectSelection(NoteSelection *selection); -private: - void preparePlug(Note *note); -private: - Note *m_clickedToInsert; - int m_zoneToInsert; - QPoint m_posToInsert; - Note *m_savedClickedToInsert; - int m_savedZoneToInsert; - QPoint m_savedPosToInsert; - bool m_isInsertPopupMenu; - QAction *m_insertMenuTitle; -public: - void saveInsertionData(); - void restoreInsertionData(); - void resetInsertionData(); -public slots: - void insertEmptyNote(int type); - void insertWizard(int type); - void insertColor(const QColor &color); - void insertImage(const QPixmap &image); - void pasteNote(QClipboard::Mode mode = QClipboard::Clipboard); - void delayedCancelInsertPopupMenu(); - void setInsertPopupMenu() { - m_isInsertPopupMenu = true; - } - void cancelInsertPopupMenu() { - m_isInsertPopupMenu = false; - } -private slots: - void hideInsertPopupMenu(); - void timeoutHideInsertPopupMenu(); - -/// TOOL TIPS: -protected: - bool event(QEvent *event); - // TODO: replace with QGraphicsScene::helpEvent() - void tooltipEvent(QHelpEvent *event); - -/// ANIMATIONS: -private: - QList m_animatedNotes; - QTimer m_animationTimer; - int m_deltaY; - QTime m_lastFrameTime; - static const int FRAME_DELAY; -private slots: - void animateObjects(); -public slots: - void animateLoad(); -public: - void addAnimatedNote(Note *note); - -/// LOAD AND SAVE: -private: - bool m_loaded; - bool m_loadingLaunched; - bool m_locked; - bool m_shouldConvertPlainTextNotes; - QFrame* m_decryptBox; - QPushButton* m_button; - int m_encryptionType; - QString m_encryptionKey; -#ifdef HAVE_LIBGPGME - KGpgMe* m_gpg; -#endif - QTimer m_inactivityAutoLockTimer; - void enableActions(); - -private slots: - void loadNotes(const QDomElement ¬es, Note *parent); - void saveNotes(QDomDocument &document, QDomElement &element, Note *parent); - void unlock(); -protected slots: - void inactivityAutoLockTimeout(); -public slots: - void load(); - void loadProperties(const QDomElement &properties); - void saveProperties(QDomDocument &document, QDomElement &properties); - bool save(); - void reload(); -public: - bool isEncrypted(); - bool isFileEncrypted(); - bool isLocked() { - return m_locked; - }; - void lock(); - bool isLoaded() { - return m_loaded; - }; - bool loadingLaunched() { - return m_loadingLaunched; - }; - bool loadFromFile(const QString &fullPath, QString* string, bool isLocalEncoding = false); - bool loadFromFile(const QString &fullPath, QByteArray* array); - bool saveToFile(const QString& fullPath, const QByteArray& array); - bool saveToFile(const QString& fullPath, const QByteArray& array, unsigned long length); - bool saveToFile(const QString& fullPath, const QString& string, bool isLocalEncoding = false); - static bool safelySaveToFile(const QString& fullPath, const QByteArray& array); - static bool safelySaveToFile(const QString& fullPath, const QByteArray& array, unsigned long length); - static bool safelySaveToFile(const QString& fullPath, const QString& string, bool isLocalEncoding = false); - bool setProtection(int type, QString key); - int encryptionType() { - return m_encryptionType; - }; - QString encryptionKey() { - return m_encryptionKey; - }; - bool saveAgain(); - -/// BACKGROUND: -private: - QColor m_backgroundColorSetting; - QString m_backgroundImageName; - QPixmap *m_backgroundPixmap; - QPixmap *m_opaqueBackgroundPixmap; - QPixmap *m_selectedBackgroundPixmap; - bool m_backgroundTiled; - QColor m_textColorSetting; -public: - inline bool hasBackgroundImage() { - return m_backgroundPixmap != 0; - } - inline const QPixmap* backgroundPixmap() { - return m_backgroundPixmap; - } - inline bool isTiledBackground() { - return m_backgroundTiled; - } - inline QString backgroundImageName() { - return m_backgroundImageName; - } - inline QColor backgroundColorSetting() { - return m_backgroundColorSetting; - } - inline QColor textColorSetting() { - return m_textColorSetting; - } - QColor backgroundColor(); - QColor textColor(); - void setAppearance(const QString &icon, const QString &name, const QString &backgroundImage, const QColor &backgroundColor, const QColor &textColor); - void blendBackground(QPainter &painter, const QRect &rect, int xPainter = -1, int yPainter = -1, bool opaque = false, QPixmap *bg = 0); - void unbufferizeAll(); - void subscribeBackgroundImages(); - void unsubscribeBackgroundImages(); - -/// KEYBOARD SHORTCUT: -public: - KAction *m_action; -private: - int m_shortcutAction; -private slots: - void activatedShortcut(); -public: - KShortcut shortcut() { - return m_action->shortcut(); - } - int shortcutAction() { - return m_shortcutAction; - } - void setShortcut(KShortcut shortcut, int action); - -/// USER INTERACTION: -private: - Note *m_hoveredNote; - int m_hoveredZone; - bool m_lockedHovering; - bool m_underMouse; - QRect m_inserterRect; - bool m_inserterShown; - bool m_inserterSplit; - bool m_inserterTop; - bool m_inserterGroup; - void placeInserter(Note *note, int zone); - void removeInserter(); -public: -// bool inserterShown() { return m_inserterShown; } - bool inserterSplit() { - return m_inserterSplit; - } - bool inserterGroup() { - return m_inserterGroup; - } -public slots: - void doHoverEffects(Note *note, Note::Zone zone, const QPoint &pos = QPoint(0, 0)); /// << @p pos is optionnal and only used to show the link target in the statusbar - void doHoverEffects(const QPoint &pos); - void doHoverEffects(); // The same, but using the current cursor position - void mouseEnteredEditorWidget(); -public: - void popupTagsMenu(Note *note); - void popupEmblemMenu(Note *note, int emblemNumber); - void addTagToSelectedNotes(Tag *tag); - void removeTagFromSelectedNotes(Tag *tag); - void removeAllTagsFromSelectedNotes(); - void addStateToSelectedNotes(State *state); - void changeStateOfSelectedNotes(State *state); - bool selectedNotesHaveTags(); - const QRect& inserterRect() { - return m_inserterRect; - } - bool inserterShown() { - return m_inserterShown; - } - void drawInserter(QPainter &painter, int xPainter, int yPainter); - DecoratedBasket* decoration(); - State *stateForTagFromSelectedNotes(Tag *tag); -public slots: - void activatedTagShortcut(Tag *tag); - void recomputeAllStyles(); - void removedStates(const QList &deletedStates); -private slots: - void toggledTagInMenu(QAction *act); - void toggledStateInMenu(QAction *act); - void unlockHovering(); - void disableNextClick(); - void contentsMoved(); -public: - Note *m_tagPopupNote; -private: - Tag *m_tagPopup; - QTime m_lastDisableClick; - -/// SELECTION: -private: - bool m_isSelecting; - bool m_selectionStarted; - bool m_selectionInvert; - QPoint m_selectionBeginPoint; - QPoint m_selectionEndPoint; - QRect m_selectionRect; - QTimer m_autoScrollSelectionTimer; - void stopAutoScrollSelection(); -private slots: - void doAutoScrollSelection(); -public: - inline bool isSelecting() { - return m_isSelecting; - } - inline const QRect& selectionRect() { - return m_selectionRect; - } - void selectNotesIn(const QRect &rect, bool invertSelection, bool unselectOthers = true); - void resetWasInLastSelectionRect(); - void selectAll(); - void unselectAll(); - void invertSelection(); - void unselectAllBut(Note *toSelect); - void invertSelectionOf(Note *toSelect); - QColor selectionRectInsideColor(); - Note* theSelectedNote(); - NoteSelection* selectedNotes(); - -/// BLANK SPACES DRAWING: -private: - QList m_blankAreas; - void recomputeBlankRects(); - QWidget *m_cornerWidget; - -/// COMMUNICATION WITH ITS CONTAINER: -signals: - void postMessage(const QString &message); /// << Post a temporar message in the statusBar. - void setStatusBarText(const QString &message); /// << Set the permanent statusBar text or reset it if message isEmpty(). - void resetStatusBarText(); /// << Equivalent to setStatusBarText(""). - void propertiesChanged(Basket *basket); - void countsChanged(Basket *basket); -public slots: - void linkLookChanged(); - void signalCountsChanged(); -private: - QTimer m_timerCountsChanged; -private slots: - void countsChangedTimeOut(); - -/// NOTES COUNTING: -public: - void addSelectedNote() { - ++m_countSelecteds; signalCountsChanged(); - } - void removeSelectedNote() { - --m_countSelecteds; signalCountsChanged(); - } - void resetSelectedNote() { - m_countSelecteds = 0; signalCountsChanged(); - } // FIXME: Useful ??? - int count() { - return m_count; - } - int countFounds() { - return m_countFounds; - } - int countSelecteds() { - return m_countSelecteds; - } -private: - int m_count; - int m_countFounds; - int m_countSelecteds; - -/// PROPERTIES: -public: - QString basketName() { - return m_basketName; - } - QString icon() { - return m_icon; - } - QString folderName() { - return m_folderName; - } - QString fullPath(); - QString fullPathForFileName(const QString &fileName); // Full path of an [existing or not] note in this basket - static QString fullPathForFolderName(const QString &folderName); -private: - QString m_basketName; - QString m_icon; - QString m_folderName; - -/// ACTIONS ON SELECTED NOTES FROM THE INTERFACE: -public slots: - void noteEdit(Note *note = 0L, bool justAdded = false, const QPoint &clickedPoint = QPoint()); - void showEditedNoteWhileFiltering(); - void noteDelete(); - void noteDeleteWithoutConfirmation(bool deleteFilesToo = true); - void noteCopy(); - void noteCut(); - void noteOpen(Note *note = 0L); - void noteOpenWith(Note *note = 0L); - void noteSaveAs(); - void noteGroup(); - void noteUngroup(); - void noteMoveOnTop(); - void noteMoveOnBottom(); - void noteMoveNoteUp(); - void noteMoveNoteDown(); - void moveSelectionTo(Note *here, bool below); -public: - enum CopyMode { CopyToClipboard, CopyToSelection, CutToClipboard }; - void doCopy(CopyMode copyMode); - bool selectionIsOneGroup(); - Note* selectedGroup(); - Note* firstSelected(); - Note* lastSelected(); - -/// NOTES EDITION: -private: - NoteEditor *m_editor; - //QWidget *m_rightEditorBorder; - TransparentWidget *m_leftEditorBorder; - TransparentWidget *m_rightEditorBorder; - bool m_redirectEditActions; - int m_editorWidth; - int m_editorHeight; - QTimer m_inactivityAutoSaveTimer; - bool m_doNotCloseEditor; - QTextCursor m_textCursor; -public: - bool isDuringEdit() { - return m_editor; - } - bool redirectEditActions() { - return m_redirectEditActions; - } - bool hasTextInEditor(); - bool hasSelectedTextInEditor(); - bool selectedAllTextInEditor(); - Note* editedNote(); -protected slots: - void selectionChangedInEditor(); - void contentChangedInEditor(); - void inactivityAutoSaveTimeout(); -public slots: - void editorCursorPositionChanged(); -private: - int m_editorX; - int m_editorY; -public slots: - void placeEditor(bool andEnsureVisible = false); - void placeEditorAndEnsureVisible(); - bool closeEditor(); - void closeEditorDelayed(); - void updateEditorAppearance(); - void editorPropertiesChanged(); - void openBasket(); - void closeBasket(); - -/// FILTERING: -public slots: - void newFilter(const FilterData &data, bool andEnsureVisible = true); - void filterAgain(bool andEnsureVisible = true); - void filterAgainDelayed(); - bool isFiltering(); - -/// DRAG AND DROP: -private: - bool m_isDuringDrag; - QList m_draggedNotes; -public: - static void acceptDropEvent(QDropEvent *event, bool preCond = true); - void contentsDropEvent(QDropEvent *event); - void blindDrop(QDropEvent* event); - bool isDuringDrag() { - return m_isDuringDrag; - } - QList draggedNotes() { - return m_draggedNotes; - } -protected: - void contentsDragEnterEvent(QDragEnterEvent*); - void contentsDragMoveEvent(QDragMoveEvent *event); - void contentsDragLeaveEvent(QDragLeaveEvent*); -public slots: - void slotCopyingDone2(KIO::Job *job, const KUrl &from, const KUrl &to); -public: - Note* noteForFullPath(const QString &path); - -/// EXPORTATION: -public: - QList usedStates(); - static QString saveGradientBackground(const QColor &color, const QFont &font, const QString &folder); - -public: - void listUsedTags(QList &list); - -/// MANAGE FOCUS: -private: - Note *m_focusedNote; -public: - void setFocusedNote(Note *note); - void focusANote(); - void focusANonSelectedNoteAbove(bool inSameColumn); - void focusANonSelectedNoteBelow(bool inSameColumn); - void focusANonSelectedNoteBelowOrThenAbove(); - void focusANonSelectedNoteAboveOrThenBelow(); - Note* focusedNote() { - return m_focusedNote; - } - Note* firstNoteInStack(); - Note* lastNoteInStack(); - Note* firstNoteShownInStack(); - Note* lastNoteShownInStack(); - void selectRange(Note *start, Note *end, bool unselectOthers = true); /// FIXME: Not really a focus related method! - void ensureNoteVisible(Note *note); - virtual void keyPressEvent(QKeyEvent *event); - virtual void focusInEvent(QFocusEvent*); - virtual void focusOutEvent(QFocusEvent*); - QRect noteVisibleRect(Note *note); // clipped global (desktop as origin) rectangle - Note* firstNoteInGroup(); - Note *noteOnHome(); - Note *noteOnEnd(); - - enum NoteOn { LEFT_SIDE = 1, RIGHT_SIDE, TOP_SIDE, BOTTOM_SIDE }; - Note* noteOn(NoteOn side); - -/// REIMPLEMENTED: -public: - void deleteFiles(); - bool convertTexts(); - - -public: - void wheelEvent(QWheelEvent *event); - - - -public: - Note *m_startOfShiftSelectionNote; - - -/// THE NEW FILE WATCHER: -private: - KDirWatch *m_watcher; - QTimer m_watcherTimer; - QList m_modifiedFiles; -public: - void addWatchedFile(const QString &fullPath); - void removeWatchedFile(const QString &fullPath); -private slots: - void watchedFileModified(const QString &fullPath); - void watchedFileDeleted(const QString &fullPath); - void updateModifiedNotes(); - - -/// FROM OLD ARCHITECTURE ********************** - -public slots: - - void showFrameInsertTo() {} - void resetInsertTo() {} - - void computeInsertPlace(const QPoint &/*cursorPosition*/) { } -public: - - friend class SystemTray; - -/// SPEED OPTIMIZATION -private: - bool m_finishLoadOnFirstShow; - bool m_relayoutOnNextShow; -public: - void aboutToBeActivated(); -}; - -#endif // BASKET_H diff -Nru basket-2.0~20091110/src/basketlistview.cpp basket-2.0~20102801/src/basketlistview.cpp --- basket-2.0~20091110/src/basketlistview.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/basketlistview.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -37,7 +37,7 @@ #include #include "global.h" #include "bnpview.h" -#include "basket.h" +#include "basketview.h" #include "tools.h" #include "settings.h" #include "notedrag.h" @@ -45,28 +45,28 @@ /** class BasketListViewItem: */ -BasketListViewItem::BasketListViewItem(QTreeWidget *parent, Basket *basket) +BasketListViewItem::BasketListViewItem(QTreeWidget *parent, BasketView *basket) : QTreeWidgetItem(parent), m_basket(basket) , m_isUnderDrag(false) , m_isAbbreviated(false) { } -BasketListViewItem::BasketListViewItem(QTreeWidgetItem *parent, Basket *basket) +BasketListViewItem::BasketListViewItem(QTreeWidgetItem *parent, BasketView *basket) : QTreeWidgetItem(parent), m_basket(basket) , m_isUnderDrag(false) , m_isAbbreviated(false) { } -BasketListViewItem::BasketListViewItem(QTreeWidget *parent, QTreeWidgetItem *after, Basket *basket) +BasketListViewItem::BasketListViewItem(QTreeWidget *parent, QTreeWidgetItem *after, BasketView *basket) : QTreeWidgetItem(parent, after), m_basket(basket) , m_isUnderDrag(false) , m_isAbbreviated(false) { } -BasketListViewItem::BasketListViewItem(QTreeWidgetItem *parent, QTreeWidgetItem *after, Basket *basket) +BasketListViewItem::BasketListViewItem(QTreeWidgetItem *parent, QTreeWidgetItem *after, BasketView *basket) : QTreeWidgetItem(parent, after), m_basket(basket) , m_isUnderDrag(false) , m_isAbbreviated(false) @@ -513,7 +513,7 @@ */ void BasketTreeListView::focusInEvent(QFocusEvent*) { - Basket *basket = Global::bnpView->currentBasket(); + BasketView *basket = Global::bnpView->currentBasket(); if (basket) basket->setFocus(); } diff -Nru basket-2.0~20091110/src/basketlistview.h basket-2.0~20102801/src/basketlistview.h --- basket-2.0~20091110/src/basketlistview.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/basketlistview.h 2009-11-24 20:28:01.000000000 +0000 @@ -32,20 +32,20 @@ #include #include -class Basket; +class BasketView; class BasketListViewItem : public QTreeWidgetItem { public: /// CONSTRUCTOR AND DESTRUCTOR: - BasketListViewItem(QTreeWidget *parent, Basket *basket); - BasketListViewItem(QTreeWidgetItem *parent, Basket *basket); - BasketListViewItem(QTreeWidget *parent, QTreeWidgetItem *after, Basket *basket); - BasketListViewItem(QTreeWidgetItem *parent, QTreeWidgetItem *after, Basket *basket); + BasketListViewItem(QTreeWidget *parent, BasketView *basket); + BasketListViewItem(QTreeWidgetItem *parent, BasketView *basket); + BasketListViewItem(QTreeWidget *parent, QTreeWidgetItem *after, BasketView *basket); + BasketListViewItem(QTreeWidgetItem *parent, QTreeWidgetItem *after, BasketView *basket); ~BasketListViewItem(); - Basket *basket() { + BasketView *basket() { return m_basket; } void setup(); @@ -72,7 +72,7 @@ void setAbbreviated(bool b); private: - Basket *m_basket; + BasketView *m_basket; int m_width; bool m_isUnderDrag; bool m_isAbbreviated; diff -Nru basket-2.0~20091110/src/basketproperties.cpp basket-2.0~20102801/src/basketproperties.cpp --- basket-2.0~20091110/src/basketproperties.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/basketproperties.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -40,13 +40,13 @@ #include "KDE/KIconDialog" #include "basketproperties.h" -#include "basket.h" +#include "basketview.h" #include "kcolorcombo2.h" #include "variouswidgets.h" #include "global.h" #include "backgroundmanager.h" -BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, QWidget *parent) +BasketPropertiesDialog::BasketPropertiesDialog(BasketView *basket, QWidget *parent) : KDialog(parent) , m_basket(basket) { diff -Nru basket-2.0~20091110/src/basketproperties.h basket-2.0~20102801/src/basketproperties.h --- basket-2.0~20091110/src/basketproperties.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/basketproperties.h 2009-11-24 20:28:01.000000000 +0000 @@ -35,7 +35,7 @@ class KShortcutWidget; class KShortcut; -class Basket; +class BasketView; class KColorCombo2; /** The dialog that hold basket settings. @@ -45,7 +45,7 @@ { Q_OBJECT public: - BasketPropertiesDialog(Basket *basket, QWidget *parent = 0); + BasketPropertiesDialog(BasketView *basket, QWidget *parent = 0); ~BasketPropertiesDialog(); void ensurePolished(); @@ -56,7 +56,7 @@ void capturedShortcut(const KShortcut &shortcut); void selectColumnsLayout(); private: - Basket *m_basket; + BasketView *m_basket; KIconButton *m_icon; QLineEdit *m_name; QComboBox *m_backgroundImage; diff -Nru basket-2.0~20091110/src/basketstatusbar.cpp basket-2.0~20102801/src/basketstatusbar.cpp --- basket-2.0~20091110/src/basketstatusbar.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/basketstatusbar.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -27,7 +27,7 @@ #include "basketstatusbar.h" #include "global.h" #include "bnpview.h" -#include "basket.h" +#include "basketview.h" #include "tools.h" #include #include diff -Nru basket-2.0~20091110/src/basketview.cpp basket-2.0~20102801/src/basketview.cpp --- basket-2.0~20091110/src/basketview.cpp 1970-01-01 01:00:00.000000000 +0100 +++ basket-2.0~20102801/src/basketview.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -0,0 +1,5256 @@ +/*************************************************************************** + * Copyright (C) 2003 by Sébastien Laoût * + * slaout@linux62.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * 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. * + ***************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // for KStatefulBrush +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include // For sleep() + +#include +#include +#include + +#include + +#include +#include + +#include + +#include // rand() function +#include // seed for rand() + +#include "basketview.h" +#include "decoratedbasket.h" +#include "diskerrordialog.h" +#include "note.h" +#include "notedrag.h" +#include "notefactory.h" +#include "noteedit.h" +#include "noteselection.h" +#include "tagsedit.h" +#include "transparentwidget.h" +#include "xmlwork.h" +#include "global.h" +#include "backgroundmanager.h" +#include "settings.h" +#include "tools.h" +#include "debugwindow.h" +#include "exporterdialog.h" +#include "config.h" +#ifdef HAVE_LIBGPGME +#include "kgpgme.h" +#endif + +/** Class BasketView: */ + +const int BasketView::FRAME_DELAY = 50/*1500*/; // Delay between two animation "frames" in milliseconds + +void debugZone(int zone) +{ + QString s; + switch (zone) { + case Note::Handle: s = "Handle"; break; + case Note::Group: s = "Group"; break; + case Note::TagsArrow: s = "TagsArrow"; break; + case Note::Custom0: s = "Custom0"; break; + case Note::GroupExpander: s = "GroupExpander"; break; + case Note::Content: s = "Content"; break; + case Note::Link: s = "Link"; break; + case Note::TopInsert: s = "TopInsert"; break; + case Note::TopGroup: s = "TopGroup"; break; + case Note::BottomInsert: s = "BottomInsert"; break; + case Note::BottomGroup: s = "BottomGroup"; break; + case Note::BottomColumn: s = "BottomColumn"; break; + case Note::None: s = "None"; break; + default: + if (zone == Note::Emblem0) + s = "Emblem0"; + else + s = "Emblem0+" + QString::number(zone - Note::Emblem0); + break; + } + kDebug() << s; +} + +#define FOR_EACH_NOTE(noteVar) \ + for (Note *noteVar = firstNote(); noteVar; noteVar = noteVar->next()) + +void BasketView::prependNoteIn(Note *note, Note *in) +{ + if (!note) + // No note to prepend: + return; + + if (in) { + // The normal case: + preparePlug(note); + + Note *last = note->lastSibling(); + + for (Note *n = note; n; n = n->next()) + n->setParentNote(in); +// note->setPrev(0L); + last->setNext(in->firstChild()); + + if (in->firstChild()) + in->firstChild()->setPrev(last); + + in->setFirstChild(note); + + if (m_loaded) + signalCountsChanged(); + } else + // Prepend it directly in the basket: + appendNoteBefore(note, firstNote()); +} + +void BasketView::appendNoteIn(Note *note, Note *in) +{ + if (!note) + // No note to append: + return; + + if (in) { + // The normal case: + preparePlug(note); + +// Note *last = note->lastSibling(); + Note *lastChild = in->lastChild(); + + for (Note *n = note; n; n = n->next()) + n->setParentNote(in); + note->setPrev(lastChild); +// last->setNext(0L); + + if (!in->firstChild()) + in->setFirstChild(note); + + if (lastChild) + lastChild->setNext(note); + + if (m_loaded) + signalCountsChanged(); + } else + // Prepend it directly in the basket: + appendNoteAfter(note, lastNote()); +} + +void BasketView::appendNoteAfter(Note *note, Note *after) +{ + if (!note) + // No note to append: + return; + + if (!after) + // By default, insert after the last note: + after = lastNote(); + + if (m_loaded && after && !after->isFree() && !after->isColumn()) + for (Note *n = note; n; n = n->next()) + n->inheritTagsOf(after); + +// if (!alreadyInBasket) + preparePlug(note); + + Note *last = note->lastSibling(); + if (after) { + // The normal case: + for (Note *n = note; n; n = n->next()) + n->setParentNote(after->parentNote()); + note->setPrev(after); + last->setNext(after->next()); + after->setNext(note); + if (last->next()) + last->next()->setPrev(last); + } else { + // There is no note in the basket: + for (Note *n = note; n; n = n->next()) + n->setParentNote(0); + m_firstNote = note; +// note->setPrev(0); +// last->setNext(0); + } + +// if (!alreadyInBasket) + if (m_loaded) + signalCountsChanged(); +} + +void BasketView::appendNoteBefore(Note *note, Note *before) +{ + if (!note) + // No note to append: + return; + + if (!before) + // By default, insert before the first note: + before = firstNote(); + + if (m_loaded && before && !before->isFree() && !before->isColumn()) + for (Note *n = note; n; n = n->next()) + n->inheritTagsOf(before); + + preparePlug(note); + + Note *last = note->lastSibling(); + if (before) { + // The normal case: + for (Note *n = note; n; n = n->next()) + n->setParentNote(before->parentNote()); + note->setPrev(before->prev()); + last->setNext(before); + before->setPrev(last); + if (note->prev()) + note->prev()->setNext(note); + else { + if (note->parentNote()) + note->parentNote()->setFirstChild(note); + else + m_firstNote = note; + } + } else { + // There is no note in the basket: + for (Note *n = note; n; n = n->next()) + n->setParentNote(0); + m_firstNote = note; +// note->setPrev(0); +// last->setNext(0); + } + + if (m_loaded) + signalCountsChanged(); +} + +DecoratedBasket* BasketView::decoration() +{ + return (DecoratedBasket*)parent(); +} + +void BasketView::preparePlug(Note *note) +{ + // Select only the new notes, compute the new notes count and the new number of found notes: + if (m_loaded) + unselectAll(); + int count = 0; + int founds = 0; + Note *last = 0; + for (Note *n = note; n; n = n->next()) { + if (m_loaded) + n->setSelectedRecursively(true); // Notes should have a parent basket (and they have, so that's OK). + count += n->count(); + founds += n->newFilter(decoration()->filterData()); + last = n; + } + m_count += count; + m_countFounds += founds; + + // Focus the last inserted note: + if (m_loaded && last) { + setFocusedNote(last); + m_startOfShiftSelectionNote = (last->isGroup() ? last->lastRealChild() : last); + } + + // If some notes don't match (are hidden), tell it to the user: + if (m_loaded && founds < count) { + if (count == 1) postMessage(i18n("The new note does not match the filter and is hidden.")); + else if (founds == count - 1) postMessage(i18n("A new note does not match the filter and is hidden.")); + else if (founds > 0) postMessage(i18n("Some new notes do not match the filter and are hidden.")); + else postMessage(i18n("The new notes do not match the filter and are hidden.")); + } +} + +void BasketView::unplugNote(Note *note) +{ + // If there is nothing to do... + if (!note) + return; + +// if (!willBeReplugged) { + note->setSelectedRecursively(false); // To removeSelectedNote() and decrease the selectedsCount. + m_count -= note->count(); + m_countFounds -= note->newFilter(decoration()->filterData()); + signalCountsChanged(); +// } + + // If it was the first note, change the first note: + if (m_firstNote == note) + m_firstNote = note->next(); + + // Change previous and next notes: + if (note->prev()) + note->prev()->setNext(note->next()); + if (note->next()) + note->next()->setPrev(note->prev()); + + if (note->parentNote()) { + // If it was the first note of a group, change the first note of the group: + if (note->parentNote()->firstChild() == note) + note->parentNote()->setFirstChild(note->next()); + + if (!note->parentNote()->isColumn()) { + // Ungroup if still 0 note inside parent group: + if (! note->parentNote()->firstChild()) + unplugNote(note->parentNote()); // TODO delete + + // Ungroup if still 1 note inside parent group: + else if (! note->parentNote()->firstChild()->next()) + ungroupNote(note->parentNote()); + } + } + + note->setParentNote(0); + note->setPrev(0); + note->setNext(0); + +// recomputeBlankRects(); // FIXME: called too much time. It's here because when dragging and moving a note to another basket and then go back to the original basket, the note is deleted but the note rect is not painter anymore. +} + +void BasketView::ungroupNote(Note *group) +{ + Note *note = group->firstChild(); + Note *lastGroupedNote = group; + Note *nextNote; + + // Move all notes after the group (not before, to avoid to change m_firstNote or group->m_firstChild): + while (note) { + nextNote = note->next(); + + if (lastGroupedNote->next()) + lastGroupedNote->next()->setPrev(note); + note->setNext(lastGroupedNote->next()); + lastGroupedNote->setNext(note); + note->setParentNote(group->parentNote()); + note->setPrev(lastGroupedNote); + + note->setGroupWidth(group->groupWidth() - Note::GROUP_WIDTH); + lastGroupedNote = note; + note = nextNote; + } + + // Unplug the group: + group->setFirstChild(0); + unplugNote(group); // TODO: delete + + relayoutNotes(true); +} + +void BasketView::groupNoteBefore(Note *note, Note *with) +{ + if (!note || !with) + // No note to group or nowhere to group it: + return; + +// if (m_loaded && before && !with->isFree() && !with->isColumn()) + for (Note *n = note; n; n = n->next()) + n->inheritTagsOf(with); + + preparePlug(note); + + Note *last = note->lastSibling(); + + Note *group = new Note(this); + group->setPrev(with->prev()); + group->setNext(with->next()); + group->setX(with->x()); + group->setY(with->y()); + if (with->parentNote() && with->parentNote()->firstChild() == with) + with->parentNote()->setFirstChild(group); + else if (m_firstNote == with) + m_firstNote = group; + group->setParentNote(with->parentNote()); + group->setFirstChild(note); + group->setGroupWidth(with->groupWidth() + Note::GROUP_WIDTH); + + if (with->prev()) + with->prev()->setNext(group); + if (with->next()) + with->next()->setPrev(group); + with->setParentNote(group); + with->setPrev(last); + with->setNext(0L); + + for (Note *n = note; n; n = n->next()) + n->setParentNote(group); +// note->setPrev(0L); + last->setNext(with); + + if (m_loaded) + signalCountsChanged(); +} + +void BasketView::groupNoteAfter(Note *note, Note *with) +{ + if (!note || !with) + // No note to group or nowhere to group it: + return; + +// if (m_loaded && before && !with->isFree() && !with->isColumn()) + for (Note *n = note; n; n = n->next()) + n->inheritTagsOf(with); + + preparePlug(note); + +// Note *last = note->lastSibling(); + + Note *group = new Note(this); + group->setPrev(with->prev()); + group->setNext(with->next()); + group->setX(with->x()); + group->setY(with->y()); + if (with->parentNote() && with->parentNote()->firstChild() == with) + with->parentNote()->setFirstChild(group); + else if (m_firstNote == with) + m_firstNote = group; + group->setParentNote(with->parentNote()); + group->setFirstChild(with); + group->setGroupWidth(with->groupWidth() + Note::GROUP_WIDTH); + + if (with->prev()) + with->prev()->setNext(group); + if (with->next()) + with->next()->setPrev(group); + with->setParentNote(group); + with->setPrev(0L); + with->setNext(note); + + for (Note *n = note; n; n = n->next()) + n->setParentNote(group); + note->setPrev(with); +// last->setNext(0L); + + if (m_loaded) + signalCountsChanged(); +} + +void BasketView::loadNotes(const QDomElement ¬es, Note *parent) +{ + Note *note; + for (QDomNode n = notes.firstChild(); !n.isNull(); n = n.nextSibling()) { + QDomElement e = n.toElement(); + if (e.isNull()) // Cannot handle that! + continue; + note = 0; + // Load a Group: + if (e.tagName() == "group") { + note = new Note(this); // 1. Create the group... + loadNotes(e, note); // 3. ... And populate it with child notes. + int noteCount = note->count(); + if (noteCount > 0 || (parent == 0 && !isFreeLayout())) { // But don't remove columns! + appendNoteIn(note, parent); // 2. ... Insert it... FIXME: Initially, the if() the insrtion was the step 2. Was it on purpose? + // The notes in the group are counted two times (it's why appendNoteIn() was called before loadNotes): + m_count -= noteCount;// TODO: Recompute note count every time noteCount() is emitted! + m_countFounds -= noteCount; + } + } + // Load a Content-Based Note: + if (e.tagName() == "note" || e.tagName() == "item") { // Keep compatible with 0.6.0 Alpha 1 + note = new Note(this); // Create the note... + NoteFactory__loadNode(XMLWork::getElement(e, "content"), e.attribute("type"), note, /*lazyLoad=*/m_finishLoadOnFirstShow); // ... Populate it with content... + if (e.attribute("type") == "text") + m_shouldConvertPlainTextNotes = true; // Convert Pre-0.6.0 baskets: plain text notes should be converted to rich text ones once all is loaded! + appendNoteIn(note, parent); // ... And insert it. + // Load dates: + if (e.hasAttribute("added")) + note->setAddedDate(QDateTime::fromString(e.attribute("added"), Qt::ISODate)); + if (e.hasAttribute("lastModification")) + note->setLastModificationDate(QDateTime::fromString(e.attribute("lastModification"), Qt::ISODate)); + } + // If we successfully loaded a note: + if (note) { + // Free Note Properties: + if (note->isFree()) { + int x = e.attribute("x").toInt(); + int y = e.attribute("y").toInt(); + note->setX(x < 0 ? 0 : x); + note->setY(y < 0 ? 0 : y); + } + // Resizeable Note Properties: + if (note->hasResizer() || note->isColumn()) + note->setGroupWidth(e.attribute("width", "200").toInt()); + // Group Properties: + if (note->isGroup() && !note->isColumn() && XMLWork::trueOrFalse(e.attribute("folded", "false"))) + note->toggleFolded(false); + // Tags: + if (note->content()) { + QString tagsString = XMLWork::getElementText(e, "tags", ""); + QStringList tagsId = tagsString.split(";"); + for (QStringList::iterator it = tagsId.begin(); it != tagsId.end(); ++it) { + State *state = Tag::stateForId(*it); + if (state) + note->addState(state, /*orReplace=*/true); + } + } + } +// kapp->processEvents(); + } +} + +void BasketView::saveNotes(QDomDocument &document, QDomElement &element, Note *parent) +{ + Note *note = (parent ? parent->firstChild() : firstNote()); + while (note) { + // Create Element: + QDomElement noteElement = document.createElement(note->isGroup() ? "group" : "note"); + element.appendChild(noteElement); + // Free Note Properties: + if (note->isFree()) { + noteElement.setAttribute("x", note->finalX()); + noteElement.setAttribute("y", note->finalY()); + } + // Resizeable Note Properties: + if (note->hasResizer()) + noteElement.setAttribute("width", note->groupWidth()); + // Group Properties: + if (note->isGroup() && !note->isColumn()) + noteElement.setAttribute("folded", XMLWork::trueOrFalse(note->isFolded())); + // Save Content: + if (note->content()) { + // Save Dates: + noteElement.setAttribute("added", note->addedDate().toString(Qt::ISODate)); + noteElement.setAttribute("lastModification", note->lastModificationDate().toString(Qt::ISODate)); + // Save Content: + noteElement.setAttribute("type", note->content()->lowerTypeName()); + QDomElement content = document.createElement("content"); + noteElement.appendChild(content); + note->content()->saveToNode(document, content); + // Save Tags: + if (note->states().count() > 0) { + QString tags; + for (State::List::iterator it = note->states().begin(); it != note->states().end(); ++it) + tags += (tags.isEmpty() ? "" : ";") + (*it)->id(); + XMLWork::addElement(document, noteElement, "tags", tags); + } + } else + // Save Child Notes: + saveNotes(document, noteElement, note); + // Go to the Next One: + note = note->next(); + } +} + +void BasketView::loadProperties(const QDomElement &properties) +{ + // Compute Default Values for When Loading the Properties: + QString defaultBackgroundColor = (backgroundColorSetting().isValid() ? backgroundColorSetting().name() : ""); + QString defaultTextColor = (textColorSetting().isValid() ? textColorSetting().name() : ""); + + // Load the Properties: + QString icon = XMLWork::getElementText(properties, "icon", this->icon()); + QString name = XMLWork::getElementText(properties, "name", basketName()); + + QDomElement appearance = XMLWork::getElement(properties, "appearance"); + // In 0.6.0-Alpha versions, there was a typo error: "backround" instead of "background" + QString backgroundImage = appearance.attribute("backgroundImage", appearance.attribute("backroundImage", backgroundImageName())); + QString backgroundColorString = appearance.attribute("backgroundColor", appearance.attribute("backroundColor", defaultBackgroundColor)); + QString textColorString = appearance.attribute("textColor", defaultTextColor); + QColor backgroundColor = (backgroundColorString.isEmpty() ? QColor() : QColor(backgroundColorString)); + QColor textColor = (textColorString.isEmpty() ? QColor() : QColor(textColorString)); + + QDomElement disposition = XMLWork::getElement(properties, "disposition"); + bool free = XMLWork::trueOrFalse(disposition.attribute("free", XMLWork::trueOrFalse(isFreeLayout()))); + int columnCount = disposition.attribute("columnCount", QString::number(this->columnsCount())).toInt(); + bool mindMap = XMLWork::trueOrFalse(disposition.attribute("mindMap", XMLWork::trueOrFalse(isMindMap()))); + + QDomElement shortcut = XMLWork::getElement(properties, "shortcut"); + QString actionStrings[] = { "show", "globalShow", "globalSwitch" }; + KShortcut combination = KShortcut(shortcut.attribute( + "combination", + m_action->shortcut().primary().toString())); + QString actionString = shortcut.attribute("action"); + int action = shortcutAction(); + if (actionString == actionStrings[0]) action = 0; + if (actionString == actionStrings[1]) action = 1; + if (actionString == actionStrings[2]) action = 2; + + QDomElement protection = XMLWork::getElement(properties, "protection"); + m_encryptionType = protection.attribute("type").toInt(); + m_encryptionKey = protection.attribute("key"); + + // Apply the Properties: + setDisposition((free ? (mindMap ? 2 : 1) : 0), columnCount); + setShortcut(combination, action); + setAppearance(icon, name, backgroundImage, backgroundColor, textColor); // Will emit propertiesChanged(this) +} + +void BasketView::saveProperties(QDomDocument &document, QDomElement &properties) +{ + XMLWork::addElement(document, properties, "name", basketName()); + XMLWork::addElement(document, properties, "icon", icon()); + + QDomElement appearance = document.createElement("appearance"); + properties.appendChild(appearance); + appearance.setAttribute("backgroundImage", backgroundImageName()); + appearance.setAttribute("backgroundColor", backgroundColorSetting().isValid() ? backgroundColorSetting().name() : ""); + appearance.setAttribute("textColor", textColorSetting().isValid() ? textColorSetting().name() : ""); + + QDomElement disposition = document.createElement("disposition"); + properties.appendChild(disposition); + disposition.setAttribute("free", XMLWork::trueOrFalse(isFreeLayout())); + disposition.setAttribute("columnCount", QString::number(columnsCount())); + disposition.setAttribute("mindMap", XMLWork::trueOrFalse(isMindMap())); + + QDomElement shortcut = document.createElement("shortcut"); + properties.appendChild(shortcut); + QString actionStrings[] = { "show", "globalShow", "globalSwitch" }; + shortcut.setAttribute("combination", m_action->shortcut().primary().toString()); + shortcut.setAttribute("action", actionStrings[shortcutAction()]); + + QDomElement protection = document.createElement("protection"); + properties.appendChild(protection); + protection.setAttribute("type", m_encryptionType); + protection.setAttribute("key", m_encryptionKey); +} + +void BasketView::subscribeBackgroundImages() +{ + if (!m_backgroundImageName.isEmpty()) { + Global::backgroundManager->subscribe(m_backgroundImageName); + Global::backgroundManager->subscribe(m_backgroundImageName, this->backgroundColor()); + Global::backgroundManager->subscribe(m_backgroundImageName, selectionRectInsideColor()); + m_backgroundPixmap = Global::backgroundManager->pixmap(m_backgroundImageName); + m_opaqueBackgroundPixmap = Global::backgroundManager->opaquePixmap(m_backgroundImageName, this->backgroundColor()); + m_selectedBackgroundPixmap = Global::backgroundManager->opaquePixmap(m_backgroundImageName, selectionRectInsideColor()); + m_backgroundTiled = Global::backgroundManager->tiled(m_backgroundImageName); + } +} + +void BasketView::unsubscribeBackgroundImages() +{ + if (hasBackgroundImage()) { + Global::backgroundManager->unsubscribe(m_backgroundImageName); + Global::backgroundManager->unsubscribe(m_backgroundImageName, this->backgroundColor()); + Global::backgroundManager->unsubscribe(m_backgroundImageName, selectionRectInsideColor()); + m_backgroundPixmap = 0; + m_opaqueBackgroundPixmap = 0; + m_selectedBackgroundPixmap = 0; + } +} + +void BasketView::setAppearance(const QString &icon, const QString &name, const QString &backgroundImage, const QColor &backgroundColor, const QColor &textColor) +{ + unsubscribeBackgroundImages(); + + m_icon = icon; + m_basketName = name; + m_backgroundImageName = backgroundImage; + m_backgroundColorSetting = backgroundColor; + m_textColorSetting = textColor; + + // Where is this shown? + m_action->setText("BASKET SHORTCUT: " + name); + + // Basket should ALWAYS have an icon (the "basket" icon by default): + QPixmap iconTest = KIconLoader::global()->loadIcon( + m_icon, KIconLoader::NoGroup, 16, KIconLoader::DefaultState, + QStringList(), 0L, /*canReturnNull=*/true + ); + if (iconTest.isNull()) + m_icon = "basket"; + + // We don't request the background images if it's not loaded yet (to make the application startup fast). + // When the basket is loading (because requested by the user: he/she want to access it) + // it load the properties, subscribe to (and then load) the images, update the "Loading..." message with the image, + // load all the notes and it's done! + if (m_loadingLaunched) + subscribeBackgroundImages(); + + recomputeAllStyles(); // If a note have a tag with the same background color as the basket one, then display a "..." + recomputeBlankRects(); // See the drawing of blank areas in BasketView::drawContents() + unbufferizeAll(); + updateContents(); + + if (isDuringEdit() && m_editor->widget()) { + QPalette palette; + palette.setColor(m_editor->widget()->backgroundRole(), m_editor->note()->backgroundColor()); + palette.setColor(m_editor->widget()->foregroundRole(), m_editor->note()->textColor()); + m_editor->widget()->setPalette(palette); + } + + emit propertiesChanged(this); +} + +void BasketView::setDisposition(int disposition, int columnCount) +{ + static const int COLUMNS_LAYOUT = 0; + static const int FREE_LAYOUT = 1; + static const int MINDMAPS_LAYOUT = 2; + + int currentDisposition = (isFreeLayout() ? (isMindMap() ? MINDMAPS_LAYOUT : FREE_LAYOUT) : COLUMNS_LAYOUT); + + if (currentDisposition == COLUMNS_LAYOUT && disposition == COLUMNS_LAYOUT) { + if (firstNote() && columnCount > m_columnsCount) { + // Insert each new columns: + for (int i = m_columnsCount; i < columnCount; ++i) { + Note *newColumn = new Note(this); + insertNote(newColumn, /*clicked=*/lastNote(), /*zone=*/Note::BottomInsert, QPoint(), /*animateNewPosition=*/false); + } + } else if (firstNote() && columnCount < m_columnsCount) { + Note *column = firstNote(); + Note *cuttedNotes = 0; + for (int i = 1; i <= m_columnsCount; ++i) { + Note *columnToRemove = column; + column = column->next(); + if (i > columnCount) { + // Remove the columns that are too much: + unplugNote(columnToRemove); + // "Cut" the content in the columns to be deleted: + if (columnToRemove->firstChild()) { + for (Note *it = columnToRemove->firstChild(); it; it = it->next()) + it->setParentNote(0); + if (!cuttedNotes) + cuttedNotes = columnToRemove->firstChild(); + else { + Note *lastCuttedNote = cuttedNotes; + while (lastCuttedNote->next()) + lastCuttedNote = lastCuttedNote->next(); + lastCuttedNote->setNext(columnToRemove->firstChild()); + columnToRemove->firstChild()->setPrev(lastCuttedNote); + } + columnToRemove->setFirstChild(0); + } + } + } + // Paste the content in the last column: + if (cuttedNotes) + insertNote(cuttedNotes, /*clicked=*/lastNote(), /*zone=*/Note::BottomColumn, QPoint(), /*animateNewPosition=*/true); + unselectAll(); + } + if (columnCount != m_columnsCount) { + m_columnsCount = (columnCount <= 0 ? 1 : columnCount); + equalizeColumnSizes(); // Will relayoutNotes() + } + } else if (currentDisposition == COLUMNS_LAYOUT && (disposition == FREE_LAYOUT || disposition == MINDMAPS_LAYOUT)) { + Note *column = firstNote(); + m_columnsCount = 0; // Now, so relayoutNotes() will not relayout the free notes as if they were columns! + while (column) { + // Move all childs on the first level: + Note *nextColumn = column->next(); + ungroupNote(column); + column = nextColumn; + } + unselectAll(); + m_mindMap = (disposition == MINDMAPS_LAYOUT); + relayoutNotes(true); + } else if ((currentDisposition == FREE_LAYOUT || currentDisposition == MINDMAPS_LAYOUT) && disposition == COLUMNS_LAYOUT) { + if (firstNote()) { + // TODO: Reorder notes! + // Remove all notes (but keep a reference to them, we're not crazy ;-) ): + Note *notes = m_firstNote; + m_firstNote = 0; + m_count = 0; + m_countFounds = 0; + // Insert the number of columns that is needed: + Note *lastInsertedColumn = 0; + for (int i = 0; i < columnCount; ++i) { + Note *column = new Note(this); + if (lastInsertedColumn) + insertNote(column, /*clicked=*/lastInsertedColumn, /*zone=*/Note::BottomInsert, QPoint(), /*animateNewPosition=*/false); + else + m_firstNote = column; + lastInsertedColumn = column; + } + // Reinsert the old notes in the first column: + insertNote(notes, /*clicked=*/firstNote(), /*zone=*/Note::BottomColumn, QPoint(), /*animateNewPosition=*/true); + unselectAll(); + } else { + // Insert the number of columns that is needed: + Note *lastInsertedColumn = 0; + for (int i = 0; i < columnCount; ++i) { + Note *column = new Note(this); + if (lastInsertedColumn) + insertNote(column, /*clicked=*/lastInsertedColumn, /*zone=*/Note::BottomInsert, QPoint(), /*animateNewPosition=*/false); + else + m_firstNote = column; + lastInsertedColumn = column; + } + } + m_columnsCount = (columnCount <= 0 ? 1 : columnCount); + equalizeColumnSizes(); // Will relayoutNotes() + } +} + +void BasketView::equalizeColumnSizes() +{ + if (!firstNote()) + return; + + // Necessary to know the available space; + relayoutNotes(true); + + int availableSpace = visibleWidth(); + int columnWidth = (visibleWidth() - (columnsCount() - 1) * Note::GROUP_WIDTH) / columnsCount(); + int columnCount = columnsCount(); + Note *column = firstNote(); + while (column) { + int minGroupWidth = column->minRight() - column->x(); + if (minGroupWidth > columnWidth) { + availableSpace -= minGroupWidth; + --columnCount; + } + column = column->next(); + } + columnWidth = (availableSpace - (columnsCount() - 1) * Note::GROUP_WIDTH) / columnCount; + + column = firstNote(); + while (column) { + int minGroupWidth = column->minRight() - column->x(); + if (minGroupWidth > columnWidth) + column->setGroupWidth(minGroupWidth); + else + column->setGroupWidth(columnWidth); + column = column->next(); + } + + relayoutNotes(true); +} + +void BasketView::enableActions() +{ + Global::bnpView->enableActions(); + setFocusPolicy(isLocked() ? Qt::NoFocus : Qt::StrongFocus); + if (isLocked()) + viewport()->setCursor(Qt::ArrowCursor); // When locking, the cursor stays the last form it was +} + +bool BasketView::save() +{ + if (!m_loaded) + return false; + + DEBUG_WIN << "Basket[" + folderName() + "]: Saving..."; + + // Create Document: + QDomDocument document(/*doctype=*/"basket"); + QDomElement root = document.createElement("basket"); + document.appendChild(root); + + // Create Properties Element and Populate It: + QDomElement properties = document.createElement("properties"); + saveProperties(document, properties); + root.appendChild(properties); + + // Create Notes Element and Populate It: + QDomElement notes = document.createElement("notes"); + saveNotes(document, notes, 0); + root.appendChild(notes); + + // Write to Disk: + if (!saveToFile(fullPath() + ".basket", "\n" + document.toString())) { + DEBUG_WIN << "Basket[" + folderName() + "]: FAILED to save!"; + return false; + } + + Global::bnpView->setUnsavedStatus(false); + return true; +} + +void BasketView::aboutToBeActivated() +{ + if (m_finishLoadOnFirstShow) { + FOR_EACH_NOTE(note) + note->finishLazyLoad(); + + //relayoutNotes(/*animate=*/false); + setFocusedNote(0); // So that during the focusInEvent that will come shortly, the FIRST note is focused. + + if (Settings::playAnimations() && !decoration()->filterBar()->filterData().isFiltering && Global::bnpView->currentBasket() == this) // No animation when filtering all! + animateLoad();//QTimer::singleShot( 0, this, SLOT(animateLoad()) ); + + m_finishLoadOnFirstShow = false; + } +} + +void BasketView::reload() +{ + closeEditor(); + unbufferizeAll(); // Keep the memory footprint low + + m_firstNote = 0; + + m_loaded = false; + m_loadingLaunched = false; + + updateContents(); +} + +void BasketView::load() +{ + // Load only once: + if (m_loadingLaunched) + return; + m_loadingLaunched = true; + + DEBUG_WIN << "Basket[" + folderName() + "]: Loading..."; + QDomDocument *doc = 0; + QString content; + + // Load properties + if (loadFromFile(fullPath() + ".basket", &content)) { + doc = new QDomDocument("basket"); + if (! doc->setContent(content)) { + DEBUG_WIN << "Basket[" + folderName() + "]: FAILED to parse XML!"; + delete doc; + doc = 0; + } + } + if (isEncrypted()) + DEBUG_WIN << "Basket is encrypted."; + if (! doc) { + DEBUG_WIN << "Basket[" + folderName() + "]: FAILED to load!"; + m_loadingLaunched = false; + if (isEncrypted()) + m_locked = true; + Global::bnpView->notesStateChanged(); // Show "Locked" instead of "Loading..." in the statusbar + return; + } + m_locked = false; + + QDomElement docElem = doc->documentElement(); + QDomElement properties = XMLWork::getElement(docElem, "properties"); + + loadProperties(properties); // Since we are loading, this time the background image will also be loaded! + // Now that the background image is loaded and subscribed, we display it during the load process: + delete doc; + updateContents(); +// kapp->processEvents(); + + //BEGIN Compatibility with 0.6.0 Pre-Alpha versions: + QDomElement notes = XMLWork::getElement(docElem, "notes"); + if (notes.isNull()) + notes = XMLWork::getElement(docElem, "items"); + m_watcher->stopScan(); + m_shouldConvertPlainTextNotes = false; // Convert Pre-0.6.0 baskets: plain text notes should be converted to rich text ones once all is loaded! + + + // Load notes + m_finishLoadOnFirstShow = (Global::bnpView->currentBasket() != this); + loadNotes(notes, 0L); + if (m_shouldConvertPlainTextNotes) + convertTexts(); + m_watcher->startScan(); + + signalCountsChanged(); + if (isColumnsLayout()) { + // Count the number of columns: + int columnsCount = 0; + Note *column = firstNote(); + while (column) { + ++columnsCount; + column = column->next(); + } + m_columnsCount = columnsCount; + } + + relayoutNotes(false); + + // On application start, the current basket is not focused yet, so the focus rectangle is not shown when calling focusANote(): + if (Global::bnpView->currentBasket() == this) + setFocus(); + focusANote(); + + if (Settings::playAnimations() && !decoration()->filterBar()->filterData().isFiltering && Global::bnpView->currentBasket() == this) // No animation when filtering all! + animateLoad();//QTimer::singleShot( 0, this, SLOT(animateLoad()) ); + else + m_loaded = true; + enableActions(); +} + +void BasketView::filterAgain(bool andEnsureVisible/* = true*/) +{ + newFilter(decoration()->filterData(), andEnsureVisible); +} + +void BasketView::filterAgainDelayed() +{ + QTimer::singleShot(0, this, SLOT(filterAgain())); +} + +void BasketView::newFilter(const FilterData &data, bool andEnsureVisible/* = true*/) +{ + if (!isLoaded()) + return; + +//StopWatch::start(20); + + m_countFounds = 0; + for (Note *note = firstNote(); note; note = note->next()) + m_countFounds += note->newFilter(data); + + relayoutNotes(true); + signalCountsChanged(); + + if (hasFocus()) // if (!hasFocus()), focusANote() will be called at focusInEvent() + focusANote(); // so, we avoid de-focus a note if it will be re-shown soon + if (andEnsureVisible && m_focusedNote != 0L) + ensureNoteVisible(m_focusedNote); + + Global::bnpView->setFiltering(data.isFiltering); + +//StopWatch::check(20); +} + +bool BasketView::isFiltering() +{ + return decoration()->filterBar()->filterData().isFiltering; +} + + + +QString BasketView::fullPath() +{ + return Global::basketsFolder() + folderName(); +} + +QString BasketView::fullPathForFileName(const QString &fileName) +{ + return fullPath() + fileName; +} + +/*static*/ QString BasketView::fullPathForFolderName(const QString &folderName) +{ + return Global::basketsFolder() + folderName; +} + + +void BasketView::setShortcut(KShortcut shortcut, int action) +{ + if (action > 0) { + m_action->setGlobalShortcut( + shortcut, + KAction::ActiveShortcut | KAction::DefaultShortcut, + KAction::NoAutoloading + ); + } + m_shortcutAction = action; +} + +void BasketView::activatedShortcut() +{ + Global::bnpView->setCurrentBasket(this); + + if (m_shortcutAction == 1) + Global::bnpView->setActive(true); +} + +void BasketView::signalCountsChanged() +{ + if (!m_timerCountsChanged.isActive()) { + m_timerCountsChanged.setSingleShot(true); + m_timerCountsChanged.start(0); + } +} + +void BasketView::countsChangedTimeOut() +{ + emit countsChanged(this); +} + + +BasketView::BasketView(QWidget *parent, const QString &folderName) + : Q3ScrollView(parent) + , m_noActionOnMouseRelease(false) + , m_ignoreCloseEditorOnNextMouseRelease(false) + , m_pressPos(-100, -100) + , m_canDrag(false) + , m_firstNote(0) + , m_columnsCount(1) + , m_mindMap(false) + , m_resizingNote(0L) + , m_pickedResizer(0) + , m_movingNote(0L) + , m_pickedHandle(0 , 0) + , m_clickedToInsert(0) + , m_zoneToInsert(0) + , m_posToInsert(-1 , -1) + , m_isInsertPopupMenu(false) + , m_insertMenuTitle(0) + , m_loaded(false) + , m_loadingLaunched(false) + , m_locked(false) + , m_decryptBox(0) + , m_button(0) + , m_encryptionType(NoEncryption) +#ifdef HAVE_LIBGPGME + , m_gpg(0) +#endif + , m_backgroundPixmap(0) + , m_opaqueBackgroundPixmap(0) + , m_selectedBackgroundPixmap(0) + , m_action(0) + , m_shortcutAction(0) + , m_hoveredNote(0) + , m_hoveredZone(Note::None) + , m_lockedHovering(false) + , m_underMouse(false) + , m_inserterRect() + , m_inserterShown(false) + , m_inserterSplit(true) + , m_inserterTop(false) + , m_inserterGroup(false) + , m_isSelecting(false) + , m_selectionStarted(false) + , m_count(0) + , m_countFounds(0) + , m_countSelecteds(0) + , m_folderName(folderName) + , m_editor(0) + , m_leftEditorBorder(0) + , m_rightEditorBorder(0) + , m_redirectEditActions(false) + , m_editorWidth(-1) + , m_editorHeight(-1) + , m_doNotCloseEditor(false) + , m_isDuringDrag(false) + , m_draggedNotes() + , m_focusedNote(0) + , m_startOfShiftSelectionNote(0) + , m_finishLoadOnFirstShow(false) + , m_relayoutOnNextShow(false) +{ + m_action = new KAction(this); + connect(m_action, SIGNAL(triggered()), this, SLOT(activatedShortcut())); + m_action->setGlobalShortcut(KShortcut()); + // We do this in the basket properties dialog (and keep it in sync with the + // global one) + m_action->setShortcutConfigurable(false); + + if (!m_folderName.endsWith("/")) + m_folderName += "/"; + + setFocusPolicy(Qt::StrongFocus); + setDragAutoScroll(true); + + // By default, there is no corner widget: we set one for the corner area to be painted! + // If we don't set one and there are two scrollbars present, slowly resizing up the window show graphical glitches in that area! + m_cornerWidget = new QWidget(this); + setCornerWidget(m_cornerWidget); + + viewport()->setAcceptDrops(true); + viewport()->setMouseTracking(true); + viewport()->setAutoFillBackground(false); // Do not clear the widget before paintEvent() because we always draw every pixels (faster and flicker-free) + + // File Watcher: + m_watcher = new KDirWatch(this); + connect(m_watcher, SIGNAL(dirty(const QString&)), this, SLOT(watchedFileModified(const QString&))); + connect(m_watcher, SIGNAL(deleted(const QString&)), this, SLOT(watchedFileDeleted(const QString&))); + connect(&m_watcherTimer, SIGNAL(timeout()), this, SLOT(updateModifiedNotes())); + + // Various Connections: + connect(&m_animationTimer, SIGNAL(timeout()), this, SLOT(animateObjects())); + connect(&m_autoScrollSelectionTimer, SIGNAL(timeout()), this, SLOT(doAutoScrollSelection())); + connect(&m_timerCountsChanged, SIGNAL(timeout()), this, SLOT(countsChangedTimeOut())); + connect(&m_inactivityAutoSaveTimer, SIGNAL(timeout()), this, SLOT(inactivityAutoSaveTimeout())); + connect(&m_inactivityAutoLockTimer, SIGNAL(timeout()), this, SLOT(inactivityAutoLockTimeout())); + connect(this, SIGNAL(contentsMoving(int, int)), this, SLOT(contentsMoved())); +#ifdef HAVE_LIBGPGME + m_gpg = new KGpgMe(); +#endif + m_locked = isFileEncrypted(); +} + +void BasketView::contentsMoved() +{ + // This slot is called BEFORE the content move, so we delay the hover effects: + QTimer::singleShot(0, this, SLOT(doHoverEffects())); +} + +void BasketView::enterEvent(QEvent *) +{ + m_underMouse = true; + doHoverEffects(); +} + +void BasketView::leaveEvent(QEvent *) +{ + m_underMouse = false; + doHoverEffects(); + + if (m_lockedHovering) + return; + + removeInserter(); + if (m_hoveredNote) { + m_hoveredNote->setHovered(false); + m_hoveredNote->setHoveredZone(Note::None); + updateNote(m_hoveredNote); + } + m_hoveredNote = 0; +} + +void BasketView::setFocusIfNotInPopupMenu() +{ + if (!kapp->activePopupWidget()) { + if (isDuringEdit()) + m_editor->widget()->setFocus(); + else + setFocus(); + } +} + +void BasketView::contentsMousePressEvent(QMouseEvent *event) +{ + // If user click the basket, focus it! + // The focus is delayed because if the click results in showing a popup menu, + // the interface flicker by showing the focused rectangle (as the basket gets focus) + // and immediatly removing it (because the popup menu now have focus). + if (!isDuringEdit()) + QTimer::singleShot(0, this, SLOT(setFocusIfNotInPopupMenu())); + + // Convenient variables: + bool controlPressed = event->modifiers() & Qt::ControlModifier; + bool shiftPressed = event->modifiers() & Qt::ShiftModifier; + + // Do nothing if we disabled the click some milliseconds sooner. + // For instance when a popup menu has been closed with click, we should not do action: + if (event->button() == Qt::LeftButton && (kapp->activePopupWidget() || m_lastDisableClick.msecsTo(QTime::currentTime()) <= 80)) { + doHoverEffects(); + m_noActionOnMouseRelease = true; + // But we allow to select: + // The code is the same as at the bottom of this method: + if (event->button() == Qt::LeftButton) { + m_selectionStarted = true; + m_selectionBeginPoint = event->pos(); + m_selectionInvert = controlPressed || shiftPressed; + } + return; + } + + // Figure out what is the clicked note and zone: + Note *clicked = noteAt(event->pos().x(), event->pos().y()); + Note::Zone zone = (clicked ? clicked->zoneAt(event->pos() - QPoint(clicked->x(), clicked->y())) : Note::None); + + // Popup Tags menu: + if (zone == Note::TagsArrow && !controlPressed && !shiftPressed && event->button() != Qt::MidButton) { + if (!clicked->isSelected()) + unselectAllBut(clicked); + setFocusedNote(clicked); /// /// /// + m_startOfShiftSelectionNote = clicked; + m_noActionOnMouseRelease = true; + popupTagsMenu(clicked); + return; + } + + if (event->button() == Qt::LeftButton) { + // Prepare to allow drag and drop when moving mouse further: + if ((zone == Note::Handle || zone == Note::Group) || + (clicked && clicked->isSelected() && + (zone == Note::TagsArrow || zone == Note::Custom0 || zone == Note::Content || zone == Note::Link /**/ || zone >= Note::Emblem0 /**/))) { + if (!shiftPressed && !controlPressed) { + m_pressPos = event->pos(); // TODO: Allow to drag emblems to assign them to other notes. Then don't allow drag at Emblem0!! + m_canDrag = true; + // Saving where we were editing, because during a drag, the mouse can fly over the text edit and move the cursor position: + if (m_editor && m_editor->textEdit()) { + KTextEdit *editor = m_editor->textEdit(); + m_textCursor = editor->textCursor(); + } + } + } + + // Initializing Resizer move: + if (zone == Note::Resizer) { + m_resizingNote = clicked; + m_pickedResizer = event->pos().x() - clicked->rightLimit(); + m_noActionOnMouseRelease = true; + m_lockedHovering = true; + return; + } + + // Select note(s): + if (zone == Note::Handle || zone == Note::Group || (zone == Note::GroupExpander && (controlPressed || shiftPressed))) { + Note *end = clicked; + if (clicked->isGroup() && shiftPressed) { + if (clicked->contains(m_startOfShiftSelectionNote)) { + m_startOfShiftSelectionNote = clicked->firstRealChild(); + end = clicked->lastRealChild(); + } else if (clicked->firstRealChild()->isAfter(m_startOfShiftSelectionNote)) + end = clicked->lastRealChild(); + else + end = clicked->firstRealChild(); + } + if (controlPressed && shiftPressed) + selectRange(m_startOfShiftSelectionNote, end, /*unselectOthers=*/false); + else if (shiftPressed) + selectRange(m_startOfShiftSelectionNote, end); + else if (controlPressed) + clicked->setSelectedRecursively(!clicked->allSelected()); + else if (!clicked->allSelected()) + unselectAllBut(clicked); + setFocusedNote(end); /// /// /// + m_startOfShiftSelectionNote = (end->isGroup() ? end->firstRealChild() : end); + //m_noActionOnMouseRelease = false; + m_noActionOnMouseRelease = true; + return; + } + + // Folding/Unfolding group: + if (zone == Note::GroupExpander) { + clicked->toggleFolded(Settings::playAnimations()); + relayoutNotes(true); + m_noActionOnMouseRelease = true; + return; + } + } + + // Popup menu for tag emblems: + if (event->button() == Qt::RightButton && zone >= Note::Emblem0) { + if (!clicked->isSelected()) + unselectAllBut(clicked); + setFocusedNote(clicked); /// /// /// + m_startOfShiftSelectionNote = clicked; + popupEmblemMenu(clicked, zone - Note::Emblem0); + m_noActionOnMouseRelease = true; + return; + } + + // Insertion Popup Menu: + if ((event->button() == Qt::RightButton) + && ((!clicked && isFreeLayout()) + || (clicked + && (zone == Note::TopInsert + || zone == Note::TopGroup + || zone == Note::BottomInsert + || zone == Note::BottomGroup + || zone == Note::BottomColumn)))) { + unselectAll(); + m_clickedToInsert = clicked; + m_zoneToInsert = zone; + m_posToInsert = event->pos(); + + KMenu* menu = Global::bnpView->popupMenu("insert_popup"); + // If we already added a title, remove it because it would be kept and + // then added several times. + if (m_insertMenuTitle && menu->actions().contains(m_insertMenuTitle)) + menu->removeAction(m_insertMenuTitle); + + QAction *first = menu->actions().value(0); + + // i18n: Verbs (for the "insert" menu) + if (zone == Note::TopGroup || zone == Note::BottomGroup) + m_insertMenuTitle = menu->addTitle(i18n("Group"), first); + else + m_insertMenuTitle = menu->addTitle(i18n("Insert"), first); + + setInsertPopupMenu(); + connect(menu, SIGNAL(aboutToHide()), this, SLOT(delayedCancelInsertPopupMenu())); + connect(menu, SIGNAL(aboutToHide()), this, SLOT(unlockHovering())); + connect(menu, SIGNAL(aboutToHide()), this, SLOT(disableNextClick())); + connect(menu, SIGNAL(aboutToHide()), this, SLOT(hideInsertPopupMenu())); + doHoverEffects(clicked, zone); // In the case where another popup menu was open, we should do that manually! + m_lockedHovering = true; + menu->exec(QCursor::pos()); + m_noActionOnMouseRelease = true; + return; + } + + // Note Context Menu: + if (event->button() == Qt::RightButton && clicked && !clicked->isColumn() && zone != Note::Resizer) { + if (!clicked->isSelected()) + unselectAllBut(clicked); + setFocusedNote(clicked); /// /// /// + if (editedNote() == clicked) { + closeEditor(); + clicked->setSelected(true); + } + m_startOfShiftSelectionNote = (clicked->isGroup() ? clicked->firstRealChild() : clicked); + KMenu* menu = Global::bnpView->popupMenu("note_popup"); + connect(menu, SIGNAL(aboutToHide()), this, SLOT(unlockHovering())); + connect(menu, SIGNAL(aboutToHide()), this, SLOT(disableNextClick())); + doHoverEffects(clicked, zone); // In the case where another popup menu was open, we should do that manually! + m_lockedHovering = true; + menu->exec(QCursor::pos()); + m_noActionOnMouseRelease = true; + return; + } + + // Paste selection under cursor (but not "create new primary note under cursor" because this is on moveRelease): + if (event->button() == Qt::MidButton && zone != Note::Resizer && (!isDuringEdit() || clicked != editedNote())) { + if ((Settings::middleAction() != 0) && (event->modifiers() == Qt::ShiftModifier)) { + m_clickedToInsert = clicked; + m_zoneToInsert = zone; + m_posToInsert = event->pos(); + closeEditor(); + removeInserter(); // If clicked at an insertion line and the new note shows a dialog for editing, + NoteType::Id type = (NoteType::Id)0; // hide that inserter before the note edition instead of after the dialog is closed + switch (Settings::middleAction()) { + case 1: + m_isInsertPopupMenu = true; + pasteNote(); + break; + case 2: type = NoteType::Image; break; + case 3: type = NoteType::Link; break; + case 4: type = NoteType::Launcher; break; + default: + m_noActionOnMouseRelease = false; + return; + } + if (type != 0) { + m_ignoreCloseEditorOnNextMouseRelease = true; + Global::bnpView->insertEmpty(type); + } + } else { + if (clicked) + zone = clicked->zoneAt(event->pos() - QPoint(clicked->x(), clicked->y()), true); + closeEditor(); + clickedToInsert(event, clicked, zone); + save(); + } + m_noActionOnMouseRelease = true; + return; + } + + // Finally, no action has been done durint pressEvent, so an action can be done on releaseEvent: + m_noActionOnMouseRelease = false; + + /* Selection scenario: + * On contentsMousePressEvent, put m_selectionStarted to true and init Begin and End selection point. + * On contentsMouseMoveEvent, if m_selectionStarted, update End selection point, update selection rect, + * and if it's larger, switching to m_isSelecting mode: we can draw the selection rectangle. + */ + // Prepare selection: + if (event->button() == Qt::LeftButton) { + m_selectionStarted = true; + m_selectionBeginPoint = event->pos(); + // We usualy invert the selection with the Ctrl key, but some environements (like GNOME or The Gimp) do it with the Shift key. + // Since the Shift key has no specific usage, we allow to invert selection ALSO with Shift for Gimp people + m_selectionInvert = controlPressed || shiftPressed; + } +} + +void BasketView::delayedCancelInsertPopupMenu() +{ + QTimer::singleShot(0, this, SLOT(cancelInsertPopupMenu())); +} + +void BasketView::contentsContextMenuEvent(QContextMenuEvent *event) +{ + if (event->reason() == QContextMenuEvent::Keyboard) { + if (countFounds/*countShown*/() == 0) { // TODO: Count shown!! + KMenu *menu = Global::bnpView->popupMenu("insert_popup"); + setInsertPopupMenu(); + connect(menu, SIGNAL(aboutToHide()), this, SLOT(delayedCancelInsertPopupMenu())); + connect(menu, SIGNAL(aboutToHide()), this, SLOT(unlockHovering())); + connect(menu, SIGNAL(aboutToHide()), this, SLOT(disableNextClick())); + removeInserter(); + m_lockedHovering = true; + menu->exec(mapToGlobal(QPoint(0, 0))); + } else { + if (! m_focusedNote->isSelected()) + unselectAllBut(m_focusedNote); + setFocusedNote(m_focusedNote); /// /// /// + m_startOfShiftSelectionNote = (m_focusedNote->isGroup() ? m_focusedNote->firstRealChild() : m_focusedNote); + // Popup at bottom (or top) of the focused note, if visible : + KMenu *menu = Global::bnpView->popupMenu("note_popup"); + connect(menu, SIGNAL(aboutToHide()), this, SLOT(unlockHovering())); + connect(menu, SIGNAL(aboutToHide()), this, SLOT(disableNextClick())); + doHoverEffects(m_focusedNote, Note::Content); // In the case where another popup menu was open, we should do that manually! + m_lockedHovering = true; + menu->exec(noteVisibleRect(m_focusedNote).bottomLeft()); + } + } +} + +QRect BasketView::noteVisibleRect(Note *note) +{ + QRect rect(contentsToViewport(QPoint(note->x(), note->y())), QSize(note->width(), note->height())); + QPoint basketPoint = mapToGlobal(QPoint(0, 0)); + rect.moveTopLeft(rect.topLeft() + basketPoint + QPoint(frameWidth(), frameWidth())); + + // Now, rect contain the global note rectangle on the screen. + // We have to clip it by the basket widget : + if (rect.bottom() > basketPoint.y() + visibleHeight() + 1) { // Bottom too... bottom + rect.setBottom(basketPoint.y() + visibleHeight() + 1); + if (rect.height() <= 0) // Have at least one visible pixel of height + rect.setTop(rect.bottom()); + } + if (rect.top() < basketPoint.y() + frameWidth()) { // Top too... top + rect.setTop(basketPoint.y() + frameWidth()); + if (rect.height() <= 0) + rect.setBottom(rect.top()); + } + if (rect.right() > basketPoint.x() + visibleWidth() + 1) { // Right too... right + rect.setRight(basketPoint.x() + visibleWidth() + 1); + if (rect.width() <= 0) // Have at least one visible pixel of width + rect.setLeft(rect.right()); + } + if (rect.left() < basketPoint.x() + frameWidth()) { // Left too... left + rect.setLeft(basketPoint.x() + frameWidth()); + if (rect.width() <= 0) + rect.setRight(rect.left()); + } + + return rect; +} + +void BasketView::disableNextClick() +{ + m_lastDisableClick = QTime::currentTime(); +} + +void BasketView::recomputeAllStyles() +{ + FOR_EACH_NOTE(note) + note->recomputeAllStyles(); +} + +void BasketView::removedStates(const QList &deletedStates) +{ + bool modifiedBasket = false; + + FOR_EACH_NOTE(note) + if (note->removedStates(deletedStates)) + modifiedBasket = true; + + if (modifiedBasket) + save(); +} + +void BasketView::insertNote(Note *note, Note *clicked, int zone, const QPoint &pos, bool animateNewPosition) +{ + if (!note) { + kDebug() << "Wanted to insert NO note"; + return; + } + + if (clicked && zone == Note::BottomColumn) { + // When inserting at the bottom of a column, it's obvious the new note SHOULD inherit tags. + // We ensure that by changing the insertion point after the last note of the column: + Note *last = clicked->lastChild(); + if (last) { + clicked = last; + zone = Note::BottomInsert; + } + } + + /// Insertion at the bottom of a column: + if (clicked && zone == Note::BottomColumn) { + note->setWidth(clicked->rightLimit() - clicked->x()); + Note *lastChild = clicked->lastChild(); + if (!animateNewPosition || !Settings::playAnimations()) + for (Note *n = note; n; n = n->next()) { + n->setXRecursively(clicked->x()); + n->setYRecursively((lastChild ? lastChild : clicked)->bottom() + 1); + } + appendNoteIn(note, clicked); + + /// Insertion relative to a note (top/bottom, insert/group): + } else if (clicked) { + note->setWidth(clicked->width()); + if (!animateNewPosition || !Settings::playAnimations()) + for (Note *n = note; n; n = n->next()) { + if (zone == Note::TopGroup || zone == Note::BottomGroup) + n->setXRecursively(clicked->x() + Note::GROUP_WIDTH); + else + n->setXRecursively(clicked->x()); + if (zone == Note::TopInsert || zone == Note::TopGroup) + n->setYRecursively(clicked->y()); + else + n->setYRecursively(clicked->bottom() + 1); + } + + if (zone == Note::TopInsert) { + appendNoteBefore(note, clicked); + } else if (zone == Note::BottomInsert) { + appendNoteAfter(note, clicked); + } else if (zone == Note::TopGroup) { + groupNoteBefore(note, clicked); + } else if (zone == Note::BottomGroup) { + groupNoteAfter(note, clicked); + } + + /// Free insertion: + } else if (isFreeLayout()) { + // Group if note have siblings: + if (note->next()) { + Note *group = new Note(this); + for (Note *n = note; n; n = n->next()) + n->setParentNote(group); + group->setFirstChild(note); + note = group; + } + // Insert at cursor position: + const int initialWidth = 250; + note->setWidth(note->isGroup() ? Note::GROUP_WIDTH : initialWidth); + if (note->isGroup() && note->firstChild()) + note->setInitialHeight(note->firstChild()->height()); + //note->setGroupWidth(initialWidth); + if (animateNewPosition && Settings::playAnimations()) + note->setFinalPosition(pos.x(), pos.y()); + else { + note->setXRecursively(pos.x()); + note->setYRecursively(pos.y()); + } + appendNoteAfter(note, lastNote()); + } + + relayoutNotes(true); +} + +void BasketView::clickedToInsert(QMouseEvent *event, Note *clicked, /*Note::Zone*/int zone) +{ + Note *note; + if (event->button() == Qt::MidButton) + note = NoteFactory::dropNote(KApplication::clipboard()->mimeData(QClipboard::Selection), this); + else + note = NoteFactory::createNoteText("", this); + + if (!note) + return; + + insertNote(note, clicked, zone, event->pos(), /*animateNewPosition=*/false); + +// ensureNoteVisible(lastInsertedNote()); // TODO: in insertNote() + + if (event->button() != Qt::MidButton) { + removeInserter(); // Case: user clicked below a column to insert, the note is inserted and doHoverEffects() put a new inserter below. We don't want it. + closeEditor(); + noteEdit(note, /*justAdded=*/true); + } +} + +void BasketView::contentsDragEnterEvent(QDragEnterEvent *event) +{ + m_isDuringDrag = true; + Global::bnpView->updateStatusBarHint(); + if (NoteDrag::basketOf(event->mimeData()) == this) + m_draggedNotes = NoteDrag::notesOf(event); + event->accept(); +} + +void BasketView::contentsDragMoveEvent(QDragMoveEvent *event) +{ +// m_isDuringDrag = true; + +// if (isLocked()) +// return; + +// FIXME: viewportToContents does NOT work !!! +// QPoint pos = viewportToContents(event->pos()); +// QPoint pos( event->pos().x() + contentsX(), event->pos().y() + contentsY() ); + +// if (insertAtCursorPos()) +// computeInsertPlace(pos); + doHoverEffects(event->pos()); + +// showFrameInsertTo(); + if (isFreeLayout() || noteAt(event->pos().x(), event->pos().y())) // Cursor before rightLimit() or hovering the dragged source notes + acceptDropEvent(event); + else { + event->setAccepted(false); + } + + /* Note *hoveredNote = noteAt(event->pos().x(), event->pos().y()); + if ( (isColumnsLayout() && !hoveredNote) || (draggedNotes().contains(hoveredNote)) ) { + event->acceptAction(false); + event->accept(false); + } else + acceptDropEvent(event);*/ + + // A workarround since QScrollView::dragAutoScroll seem to have no effect : +// ensureVisible(event->pos().x() + contentsX(), event->pos().y() + contentsY(), 30, 30); +// QScrollView::dragMoveEvent(event); +} + +void BasketView::contentsDragLeaveEvent(QDragLeaveEvent*) +{ +// resetInsertTo(); + m_isDuringDrag = false; + m_draggedNotes.clear(); + m_noActionOnMouseRelease = true; + emit resetStatusBarText(); + doHoverEffects(); +} + +void BasketView::contentsDropEvent(QDropEvent *event) +{ + QPoint pos = event->pos(); + kDebug() << "Contents Drop Event at position " << pos.x() << ":" << pos.y(); + + m_isDuringDrag = false; + emit resetStatusBarText(); + +// if (isLocked()) +// return; + + // Do NOT check the bottom&right borders. + // Because imagine someone drag&drop a big note from the top to the bottom of a big basket (with big vertical scrollbars), + // the note is first removed, and relayoutNotes() compute the new height that is smaller + // Then noteAt() is called for the mouse pointer position, because the basket is now smaller, the cursor is out of boundaries!!! + // Should, of course, not return 0: + Note *clicked = noteAt(event->pos().x(), event->pos().y()); + + if (NoteFactory::movingNotesInTheSameBasket(event->mimeData(), this, event->dropAction()) && event->dropAction() == Qt::MoveAction) { + m_doNotCloseEditor = true; + } + + Note *note = NoteFactory::dropNote(event->mimeData(), this, true, event->dropAction(), dynamic_cast(event->source())); + + if (note) { + Note::Zone zone = (clicked ? clicked->zoneAt(event->pos() - QPoint(clicked->x(), clicked->y()), /*toAdd=*/true) : Note::None); + bool animateNewPosition = NoteFactory::movingNotesInTheSameBasket(event->mimeData(), this, event->dropAction()); + if (animateNewPosition) { + FOR_EACH_NOTE(n) + n->setOnTop(false); + // FOR_EACH_NOTE_IN_CHUNK(note) + for (Note *n = note; n; n = n->next()) + n->setOnTop(true); + } + + insertNote(note, clicked, zone, event->pos(), animateNewPosition); + + // If moved a note on bottom, contentsHeight has been disminished, then view scrolled up, and we should re-scroll the view down: + ensureNoteVisible(note); + +// if (event->button() != Qt::MidButton) { +// removeInserter(); // Case: user clicked below a column to insert, the note is inserted and doHoverEffects() put a new inserter below. We don't want it. +// } + +// resetInsertTo(); +// doHoverEffects(); called by insertNote() + save(); + } + + m_draggedNotes.clear(); + + m_doNotCloseEditor = false; + // When starting the drag, we saved where we were editing. + // This is because during a drag, the mouse can fly over the text edit and move the cursor position, and even HIDE the cursor. + // So we re-show the cursor, and re-position it at the right place: + if (m_editor && m_editor->textEdit()) { + KTextEdit *editor = m_editor->textEdit(); + editor->setTextCursor(m_textCursor); + } +} + +// handles dropping of a note to basket that is not shown +// (usually through its entry in the basket list) +void BasketView::blindDrop(QDropEvent* event) +{ + if (!m_isInsertPopupMenu && redirectEditActions()) { + if (m_editor->textEdit()) + m_editor->textEdit()->paste(); + else if (m_editor->lineEdit()) + m_editor->lineEdit()->paste(); + } else { + if (!isLoaded()) { + Global::bnpView->showPassiveLoading(this); + load(); + } + closeEditor(); + unselectAll(); + Note *note = NoteFactory::dropNote(event->mimeData(), this, true, event->dropAction(), + dynamic_cast(event->source())); + if (note) { + insertCreatedNote(note); + //unselectAllBut(note); + if (Settings::usePassivePopup()) + Global::bnpView->showPassiveDropped(i18n("Dropped to basket %1")); + } + } + save(); +} + +void BasketView::insertEmptyNote(int type) +{ + if (!isLoaded()) + load(); + if (isDuringEdit()) + closeEditor(); + Note *note = NoteFactory::createEmptyNote((NoteType::Id)type, this); + insertCreatedNote(note/*, / *edit=* /true*/); + noteEdit(note, /*justAdded=*/true); +} + +void BasketView::insertWizard(int type) +{ + saveInsertionData(); + Note *note = 0; + switch (type) { + default: + case 1: note = NoteFactory::importKMenuLauncher(this); break; + case 2: note = NoteFactory::importIcon(this); break; + case 3: note = NoteFactory::importFileContent(this); break; + } + if (!note) + return; + restoreInsertionData(); + insertCreatedNote(note); + unselectAllBut(note); + resetInsertionData(); +} + +void BasketView::insertColor(const QColor &color) +{ + Note *note = NoteFactory::createNoteColor(color, this); + restoreInsertionData(); + insertCreatedNote(note); + unselectAllBut(note); + resetInsertionData(); +} + +void BasketView::insertImage(const QPixmap &image) +{ + Note *note = NoteFactory::createNoteImage(image, this); + restoreInsertionData(); + insertCreatedNote(note); + unselectAllBut(note); + resetInsertionData(); +} + +void BasketView::pasteNote(QClipboard::Mode mode) +{ + if (!m_isInsertPopupMenu && redirectEditActions()) { + if (m_editor->textEdit()) + m_editor->textEdit()->paste(); + else if (m_editor->lineEdit()) + m_editor->lineEdit()->paste(); + } else { + if (!isLoaded()) { + Global::bnpView->showPassiveLoading(this); + load(); + } + closeEditor(); + unselectAll(); + Note *note = NoteFactory::dropNote(KApplication::clipboard()->mimeData(mode), this); + if (note) { + insertCreatedNote(note); + //unselectAllBut(note); + } + } +} + +void BasketView::insertCreatedNote(Note *note) +{ + // Get the insertion data if the user clicked inside the basket: + Note *clicked = m_clickedToInsert; + int zone = m_zoneToInsert; + QPoint pos = m_posToInsert; + + // If it isn't the case, use the default position: + if (!clicked && (pos.x() < 0 || pos.y() < 0)) { + // Insert right after the focused note: + focusANote(); + if (m_focusedNote) { + clicked = m_focusedNote; + zone = (m_focusedNote->isFree() ? Note::BottomGroup : Note::BottomInsert); + pos = QPoint(m_focusedNote->x(), m_focusedNote->finalBottom()); + // Insert at the end of the last column: + } else if (isColumnsLayout()) { + Note *column = /*(Settings::newNotesPlace == 0 ?*/ firstNote() /*: lastNote())*/; + /*if (Settings::newNotesPlace == 0 && column->firstChild()) { // On Top, if at least one child in the column + clicked = column->firstChild(); + zone = Note::TopInsert; + } else { // On Bottom*/ + clicked = column; + zone = Note::BottomColumn; + /*}*/ + // Insert at free position: + } else { + pos = QPoint(0, 0); + } + } + + insertNote(note, clicked, zone, pos); +// ensureNoteVisible(lastInsertedNote()); + removeInserter(); // Case: user clicked below a column to insert, the note is inserted and doHoverEffects() put a new inserter below. We don't want it. +// resetInsertTo(); + save(); +} + +void BasketView::saveInsertionData() +{ + m_savedClickedToInsert = m_clickedToInsert; + m_savedZoneToInsert = m_zoneToInsert; + m_savedPosToInsert = m_posToInsert; +} + +void BasketView::restoreInsertionData() +{ + m_clickedToInsert = m_savedClickedToInsert; + m_zoneToInsert = m_savedZoneToInsert; + m_posToInsert = m_savedPosToInsert; +} + +void BasketView::resetInsertionData() +{ + m_clickedToInsert = 0; + m_zoneToInsert = 0; + m_posToInsert = QPoint(-1, -1); +} + +void BasketView::hideInsertPopupMenu() +{ + QTimer::singleShot(50/*ms*/, this, SLOT(timeoutHideInsertPopupMenu())); +} + +void BasketView::timeoutHideInsertPopupMenu() +{ + resetInsertionData(); +} + +void BasketView::acceptDropEvent(QDropEvent *event, bool preCond) +{ + // FIXME: Should not accept all actions! Or not all actions (link not supported?!) + //event->acceptAction(preCond && 1); + //event->accept(preCond); + event->setAccepted(preCond); +} + +void BasketView::contentsMouseReleaseEvent(QMouseEvent *event) +{ + // Now disallow drag: + m_canDrag = false; + + // Cancel Resizer move: + if (m_resizingNote) { + m_resizingNote = 0; + m_pickedResizer = 0; + m_lockedHovering = false; + doHoverEffects(); + save(); + } + + // Cancel Note move: + /* if (m_movingNote) { + m_movingNote = 0; + m_pickedHandle = QPoint(0, 0); + m_lockedHovering = false; + //doHoverEffects(); + save(); + } + */ + + // Cancel Selection rectangle: + if (m_isSelecting) { + m_isSelecting = false; + stopAutoScrollSelection(); + resetWasInLastSelectionRect(); + doHoverEffects(); + updateContents(m_selectionRect); + } + m_selectionStarted = false; + + Note *clicked = noteAt(event->pos().x(), event->pos().y()); + Note::Zone zone = (clicked ? clicked->zoneAt(event->pos() - QPoint(clicked->x(), clicked->y())) : Note::None); + if ((zone == Note::Handle || zone == Note::Group) && editedNote() && editedNote() == clicked) { + if (m_ignoreCloseEditorOnNextMouseRelease) + m_ignoreCloseEditorOnNextMouseRelease = false; + else { + bool editedNoteStillThere = closeEditor(); + if (editedNoteStillThere) + //clicked->setSelected(true); + unselectAllBut(clicked); + } + } + + + if (event->buttons() == 0 && (zone == Note::Group || zone == Note::Handle)) { + closeEditor(); + unselectAllBut(clicked); + } + + + // Do nothing if an action has already been made during mousePressEvent, + // or if user made a selection and canceled it by regressing to a very small rectangle. + if (m_noActionOnMouseRelease) + return; + + // We immediately set it to true, to avoid actions set on mouseRelease if NO mousePress event has been triggered. + // This is the case when a popup menu is shown, and user click to the basket area to close it: + // the menu then receive the mousePress event and the basket area ONLY receive the mouseRelease event. + // Obviously, nothing should be done in this case: + m_noActionOnMouseRelease = true; + + + + if (event->button() == Qt::MidButton && zone != Note::Resizer && (!isDuringEdit() || clicked != editedNote())) { + if ((Settings::middleAction() != 0) && (event->modifiers() == Qt::ShiftModifier)) { + m_clickedToInsert = clicked; + m_zoneToInsert = zone; + m_posToInsert = event->pos(); + closeEditor(); + removeInserter(); // If clicked at an insertion line and the new note shows a dialog for editing, + NoteType::Id type = (NoteType::Id)0; // hide that inserter before the note edition instead of after the dialog is closed + switch (Settings::middleAction()) { + case 5: type = NoteType::Color; break; + case 6: + Global::bnpView->grabScreenshot(); + return; + case 7: + Global::bnpView->slotColorFromScreen(); + return; + case 8: + Global::bnpView->insertWizard(3); // loadFromFile + return; + case 9: + Global::bnpView->insertWizard(1); // importKMenuLauncher + return; + case 10: + Global::bnpView->insertWizard(2); // importIcon + return; + } + if (type != 0) { + m_ignoreCloseEditorOnNextMouseRelease = true; + Global::bnpView->insertEmpty(type); + return; + } + } + } + +// Note *clicked = noteAt(event->pos().x(), event->pos().y()); + if (! clicked) { + if (isFreeLayout() && event->button() == Qt::LeftButton) { + clickedToInsert(event); + save(); + } + return; + } +// Note::Zone zone = clicked->zoneAt( event->pos() - QPoint(clicked->x(), clicked->y()) ); + + // Convenient variables: + bool controlPressed = event->modifiers() & Qt::ControlModifier; + bool shiftPressed = event->modifiers() & Qt::ShiftModifier; + + if (clicked && zone != Note::None && zone != Note::BottomColumn && zone != Note::Resizer && (controlPressed || shiftPressed)) { + if (controlPressed && shiftPressed) + selectRange(m_startOfShiftSelectionNote, clicked, /*unselectOthers=*/false); + else if (shiftPressed) + selectRange(m_startOfShiftSelectionNote, clicked); + else if (controlPressed) + clicked->setSelectedRecursively(!clicked->allSelected()); + setFocusedNote(clicked); /// /// /// + m_startOfShiftSelectionNote = (clicked->isGroup() ? clicked->firstRealChild() : clicked); + m_noActionOnMouseRelease = true; + return; + } + + // Switch tag states: + if (zone >= Note::Emblem0) { + if (event->button() == Qt::LeftButton) { + int icons = -1; + for (State::List::iterator it = clicked->states().begin(); it != clicked->states().end(); ++it) { + if (!(*it)->emblem().isEmpty()) + icons++; + if (icons == zone - Note::Emblem0) { + State *state = (*it)->nextState(); + if (!state) + return; + it = clicked->states().insert(it, state); + ++it; + clicked->states().erase(it); + clicked->recomputeStyle(); + clicked->unbufferize(); + updateNote(clicked); + updateEditorAppearance(); + filterAgain(); + save(); + break; + } + } + return; + }/* else if (event->button() == Qt::RightButton) { + popupEmblemMenu(clicked, zone - Note::Emblem0); + return; + }*/ + } + + // Insert note or past clipboard: + QString text; +// Note *note; + QString link; + //int zone = zone; + if (event->button() == Qt::MidButton && zone == Note::Resizer) + return; //zone = clicked->zoneAt( event->pos() - QPoint(clicked->x(), clicked->y()), true ); + if (event->button() == Qt::RightButton && (clicked->isColumn() || zone == Note::Resizer)) + return; + if (clicked->isGroup() && zone == Note::None) + return; + switch (zone) { + case Note::Handle: + case Note::Group: + // We select note on mousePress if it was unselected or Ctrl is pressed. + // But the user can want to drag select_s_ notes, so it the note is selected, we only select it alone on mouseRelease: + if (event->buttons() == 0) { + kDebug() << "EXEC"; + if (!(event->modifiers() & Qt::ControlModifier) && clicked->allSelected()) + unselectAllBut(clicked); + if (zone == Note::Handle && isDuringEdit() && editedNote() == clicked) { + closeEditor(); + clicked->setSelected(true); + } + } + break; + + case Note::Custom0: + //unselectAllBut(clicked); + setFocusedNote(clicked); + noteOpen(clicked); + break; + + case Note::GroupExpander: + case Note::TagsArrow: + break; + + case Note::Link: + link = clicked->linkAt(event->pos() - QPoint(clicked->x(), clicked->y())); + if (! link.isEmpty()) { + if (link == "basket-internal-remove-basket") { + // TODO: ask confirmation: "Do you really want to delete the welcome baskets?\n You can re-add them at any time in the Help menu." + Global::bnpView->doBasketDeletion(this); + } else if (link == "basket-internal-import") { + KMenu *menu = Global::bnpView->popupMenu("fileimport"); + menu->exec(event->globalPos()); + } else { + KRun *run = new KRun(KUrl(link), window()); // open the URL. + run->setAutoDelete(true); + } + break; + } // If there is no link, edit note content + case Note::Content: + closeEditor(); + unselectAllBut(clicked); + noteEdit(clicked, /*justAdded=*/false, event->pos()); + break; + + case Note::TopInsert: + case Note::TopGroup: + case Note::BottomInsert: + case Note::BottomGroup: + case Note::BottomColumn: + clickedToInsert(event, clicked, zone); + save(); + break; + + case Note::None: + default: + KMessageBox::information(viewport(), + i18n("This message should never appear. If it does, this program is buggy! " + "Please report the bug to the developer.")); + break; + } +} + +void BasketView::contentsMouseDoubleClickEvent(QMouseEvent *event) +{ + Note *clicked = noteAt(event->pos().x(), event->pos().y()); + Note::Zone zone = (clicked ? clicked->zoneAt(event->pos() - QPoint(clicked->x(), clicked->y())) : Note::None); + + if (event->button() == Qt::LeftButton && (zone == Note::Group || zone == Note::Handle)) { + doCopy(CopyToSelection); + m_noActionOnMouseRelease = true; + } else + contentsMousePressEvent(event); +} + +void BasketView::contentsMouseMoveEvent(QMouseEvent *event) +{ + // Drag the notes: + if (m_canDrag && (m_pressPos - event->pos()).manhattanLength() > KApplication::startDragDistance()) { + m_canDrag = false; + m_isSelecting = false; // Don't draw selection rectangle ater drag! + m_selectionStarted = false; + NoteSelection *selection = selectedNotes(); + if (selection->firstStacked()) { + QDrag *d = NoteDrag::dragObject(selection, /*cutting=*/false, /*source=*/this); // d will be deleted by QT + /*bool shouldRemove = */d->exec(); +// delete selection; + + // Never delete because URL is dragged and the file must be available for the extern appliation +// if (shouldRemove && d->target() == 0) // If target is another application that request to remove the note +// emit wantDelete(this); + } + return; + } + + // Moving a Resizer: + if (m_resizingNote) { + int groupWidth = event->pos().x() - m_resizingNote->x() - m_pickedResizer; + int minRight = m_resizingNote->minRight(); + int maxRight = 100 * contentsWidth(); // A big enough value (+infinity) for free layouts. + Note *nextColumn = m_resizingNote->next(); + if (m_resizingNote->isColumn()) { + if (nextColumn) + maxRight = nextColumn->x() + nextColumn->rightLimit() - nextColumn->minRight() - Note::RESIZER_WIDTH; + else + maxRight = contentsWidth(); + } + if (groupWidth > maxRight - m_resizingNote->x()) + groupWidth = maxRight - m_resizingNote->x(); + if (groupWidth < minRight - m_resizingNote->x()) + groupWidth = minRight - m_resizingNote->x(); + int delta = groupWidth - m_resizingNote->groupWidth(); + m_resizingNote->setGroupWidth(groupWidth); + // If resizing columns: + if (m_resizingNote->isColumn()) { + Note *column = m_resizingNote; + if ((column = column->next())) { + // Next columns should not have them X coordinate animated, because it would flicker: + column->setXRecursively(column->x() + delta); + // And the resizer should resize the TWO sibling columns, and not push the other columns on th right: + column->setGroupWidth(column->groupWidth() - delta); + } + } + relayoutNotes(true); + } + + // Moving a Note: + /* if (m_movingNote) { + int x = event->pos().x() - m_pickedHandle.x(); + int y = event->pos().y() - m_pickedHandle.y(); + if (x < 0) x = 0; + if (y < 0) y = 0; + m_movingNote->setX(x); + m_movingNote->setY(y); + m_movingNote->relayoutAt(x, y, / *animate=* /false); + relayoutNotes(true); + } + */ + + // Dragging the selection rectangle: + if (m_selectionStarted) + doAutoScrollSelection(); + + doHoverEffects(event->pos()); +} + +void BasketView::doAutoScrollSelection() +{ + static const int AUTO_SCROLL_MARGIN = 50; // pixels + static const int AUTO_SCROLL_DELAY = 100; // milliseconds + + QPoint pos = viewport()->mapFromGlobal(QCursor::pos()); + + // Do the selection: + + if (m_isSelecting) + updateContents(m_selectionRect); + + m_selectionEndPoint = viewportToContents(pos); + m_selectionRect = QRect(m_selectionBeginPoint, m_selectionEndPoint).normalized(); + if (m_selectionRect.left() < 0) m_selectionRect.setLeft(0); + if (m_selectionRect.top() < 0) m_selectionRect.setTop(0); + if (m_selectionRect.right() >= contentsWidth()) m_selectionRect.setRight(contentsWidth() - 1); + if (m_selectionRect.bottom() >= contentsHeight()) m_selectionRect.setBottom(contentsHeight() - 1); + + if ((m_selectionBeginPoint - m_selectionEndPoint).manhattanLength() > QApplication::startDragDistance()) { + m_isSelecting = true; + selectNotesIn(m_selectionRect, m_selectionInvert); + updateContents(m_selectionRect); + m_noActionOnMouseRelease = true; + } else { + // If the user was selecting but cancel by making the rectangle too small, cancel it really!!! + if (m_isSelecting) { + if (m_selectionInvert) + selectNotesIn(QRect(), m_selectionInvert); + else + unselectAllBut(0); // TODO: unselectAll(); + } + if (m_isSelecting) + resetWasInLastSelectionRect(); + m_isSelecting = false; + stopAutoScrollSelection(); + return; + } + + // Do the auto-scrolling: + // FIXME: It's still flickering + + QRect insideRect(AUTO_SCROLL_MARGIN, AUTO_SCROLL_MARGIN, visibleWidth() - 2*AUTO_SCROLL_MARGIN, visibleHeight() - 2*AUTO_SCROLL_MARGIN); + + int dx = 0; + int dy = 0; + + if (pos.y() < AUTO_SCROLL_MARGIN) + dy = pos.y() - AUTO_SCROLL_MARGIN; + else if (pos.y() > visibleHeight() - AUTO_SCROLL_MARGIN) + dy = pos.y() - visibleHeight() + AUTO_SCROLL_MARGIN; + + if (pos.x() < AUTO_SCROLL_MARGIN) + dx = pos.x() - AUTO_SCROLL_MARGIN; + else if (pos.x() > visibleWidth() - AUTO_SCROLL_MARGIN) + dx = pos.x() - visibleWidth() + AUTO_SCROLL_MARGIN; + + if (dx || dy) { + kapp->sendPostedEvents(); // Do the repaints, because the scrolling will make the area to repaint to be wrong + scrollBy(dx, dy); + if (!m_autoScrollSelectionTimer.isActive()) + m_autoScrollSelectionTimer.start(AUTO_SCROLL_DELAY); + } else + stopAutoScrollSelection(); +} + +void BasketView::stopAutoScrollSelection() +{ + m_autoScrollSelectionTimer.stop(); +} + +void BasketView::resetWasInLastSelectionRect() +{ + Note *note = m_firstNote; + while (note) { + note->resetWasInLastSelectionRect(); + note = note->next(); + } +} + +void BasketView::selectAll() +{ + if (redirectEditActions()) { + if (m_editor->textEdit()) + m_editor->textEdit()->selectAll(); + else if (m_editor->lineEdit()) + m_editor->lineEdit()->selectAll(); + } else { + // First select all in the group, then in the parent group... + Note *child = m_focusedNote; + Note *parent = (m_focusedNote ? m_focusedNote->parentNote() : 0); + while (parent) { + if (!parent->allSelected()) { + parent->setSelectedRecursively(true); + return; + } + child = parent; + parent = parent->parentNote(); + } + // Then, select all: + FOR_EACH_NOTE(note) + note->setSelectedRecursively(true); + } +} + +void BasketView::unselectAll() +{ + if (redirectEditActions()) { + if (m_editor->textEdit()) { + QTextCursor cursor = m_editor->textEdit()->textCursor(); + cursor.clearSelection(); + m_editor->textEdit()->setTextCursor(cursor); + selectionChangedInEditor(); // THIS IS NOT EMITED BY Qt!!! + } else if (m_editor->lineEdit()) + m_editor->lineEdit()->deselect(); + } else { + if (countSelecteds() > 0) // Optimisation + FOR_EACH_NOTE(note) + note->setSelectedRecursively(false); + } +} + +void BasketView::invertSelection() +{ + FOR_EACH_NOTE(note) + note->invertSelectionRecursively(); +} + +void BasketView::unselectAllBut(Note *toSelect) +{ + FOR_EACH_NOTE(note) + note->unselectAllBut(toSelect); +} + +void BasketView::invertSelectionOf(Note *toSelect) +{ + FOR_EACH_NOTE(note) + note->invertSelectionOf(toSelect); +} + +void BasketView::selectNotesIn(const QRect &rect, bool invertSelection, bool unselectOthers /*= true*/) +{ + FOR_EACH_NOTE(note) + note->selectIn(rect, invertSelection, unselectOthers); +} + +void BasketView::doHoverEffects() +{ + doHoverEffects(viewportToContents(viewport()->mapFromGlobal(QCursor::pos()))); +} + +void BasketView::doHoverEffects(Note *note, Note::Zone zone, const QPoint &pos) +{ + // Inform the old and new hovered note (if any): + Note *oldHoveredNote = m_hoveredNote; + if (note != m_hoveredNote) { + if (m_hoveredNote) { + m_hoveredNote->setHovered(false); + m_hoveredNote->setHoveredZone(Note::None); + updateNote(m_hoveredNote); + } + m_hoveredNote = note; + if (note) + note->setHovered(true); + } + + // If we are hovering a note, compute which zone is hovered and inform the note: + if (m_hoveredNote) { + if (zone != m_hoveredZone || oldHoveredNote != m_hoveredNote) { + m_hoveredZone = zone; + m_hoveredNote->setCursor(zone); + updateNote(m_hoveredNote); + } + m_hoveredNote->setHoveredZone(zone); + // If we are hovering an insert line zone, update this thing: + if (zone == Note::TopInsert || zone == Note::TopGroup || zone == Note::BottomInsert || zone == Note::BottomGroup || zone == Note::BottomColumn) + placeInserter(m_hoveredNote, zone); + else + removeInserter(); + // If we are hovering an embedded link in a rich text element, show the destination in the statusbar: + if (zone == Note::Link) + emit setStatusBarText(m_hoveredNote->linkAt(pos - QPoint(m_hoveredNote->x(), m_hoveredNote->y()))); + else if (m_hoveredNote->content()) + emit setStatusBarText(m_hoveredNote->content()->statusBarMessage(m_hoveredZone));//resetStatusBarText(); + // If we aren't hovering a note, reset all: + } else { + if (isFreeLayout() && !isSelecting()) + viewport()->setCursor(Qt::CrossCursor); + else + viewport()->unsetCursor(); + m_hoveredZone = Note::None; + removeInserter(); + emit resetStatusBarText(); + } +} + +void BasketView::doHoverEffects(const QPoint &pos) +{ +// if (isDuringEdit()) +// viewport()->unsetCursor(); + + // Do we have the right to do hover effects? + if (! m_loaded || m_lockedHovering) + return; + + // enterEvent() (mouse enter in the widget) set m_underMouse to true, and leaveEvent() make it false. + // But some times the enterEvent() is not trigerred: eg. when dragging the scrollbar: + // Ending the drag INSIDE the basket area will make NO hoverEffects() because m_underMouse is false. + // User need to leave the area and re-enter it to get effects. + // This hack solve that by dismissing the m_underMouse variable: + bool underMouse = Global::bnpView->currentBasket() == this && QRect(contentsX(), contentsY(), visibleWidth(), visibleHeight()).contains(pos); + + // Don't do hover effects when a popup menu is opened. + // Primarily because the basket area will only receive mouseEnterEvent and mouveLeaveEvent. + // It willn't be noticed of mouseMoveEvent, which would result in a apparently broken application state: + if (kapp->activePopupWidget()) + underMouse = false; + + // Compute which note is hovered: + Note *note = (m_isSelecting || !underMouse ? 0 : noteAt(pos.x(), pos.y())); + Note::Zone zone = (note ? note->zoneAt(pos - QPoint(note->x(), note->y()), isDuringDrag()) : Note::None); + + // Inform the old and new hovered note (if any) and update the areas: + doHoverEffects(note, zone, pos); +} + +void BasketView::mouseEnteredEditorWidget() +{ + if (!m_lockedHovering && !kapp->activePopupWidget()) + doHoverEffects(editedNote(), Note::Content, QPoint()); +} + +void BasketView::removeInserter() +{ + if (m_inserterShown) { // Do not hide (and then update/repaint the view) if it is already hidden! + m_inserterShown = false; + updateContents(m_inserterRect); + } +} + +void BasketView::placeInserter(Note *note, int zone) +{ + // Remove the inserter: + if (!note) { + removeInserter(); + return; + } + + // Update the old position: + if (inserterShown()) + updateContents(m_inserterRect); + // Some comodities: + m_inserterShown = true; + m_inserterTop = (zone == Note::TopGroup || zone == Note::TopInsert); + m_inserterGroup = (zone == Note::TopGroup || zone == Note::BottomGroup); + // X and width: + int groupIndent = (note->isGroup() ? note->width() : Note::HANDLE_WIDTH); + int x = note->x(); + int width = (note->isGroup() ? note->rightLimit() - note->x() : note->width()); + if (m_inserterGroup) { + x += groupIndent; + width -= groupIndent; + } + m_inserterSplit = (Settings::groupOnInsertionLine() && note && !note->isGroup() && !note->isFree() && !note->isColumn()); +// if (note->isGroup()) +// width = note->rightLimit() - note->x() - (m_inserterGroup ? groupIndent : 0); + // Y: + int y = note->y() - (m_inserterGroup && m_inserterTop ? 1 : 3); + if (!m_inserterTop) + y += (note->isColumn() ? note->finalHeight() : note->height()); + // Assigning result: + m_inserterRect = QRect(x, y, width, 6 - (m_inserterGroup ? 2 : 0)); + // Update the new position: + updateContents(m_inserterRect); +} + +inline void drawLineByRect(QPainter &painter, int x, int y, int width, int height) +{ + painter.drawLine(x, y, x + width - 1, y + height - 1); +} + +void BasketView::drawInserter(QPainter &painter, int xPainter, int yPainter) +{ + if (!m_inserterShown) + return; + + QRect rect = m_inserterRect; // For shorter code-lines when drawing! + rect.translate(-xPainter, -yPainter); + int lineY = (m_inserterGroup && m_inserterTop ? 0 : 2); + int roundY = (m_inserterGroup && m_inserterTop ? 0 : 1); + + KStatefulBrush statefulBrush(KColorScheme::View, KColorScheme::HoverColor); + QColor dark = statefulBrush.brush(palette()).color(); + QColor light = dark.lighter().lighter(); + if (m_inserterGroup && Settings::groupOnInsertionLine()) + light = Tools::mixColor(light, palette().color(QPalette::Highlight)); + painter.setPen(dark); + // The horizontal line: + //painter.drawRect( rect.x(), rect.y() + lineY, rect.width(), 2); + int width = rect.width() - 4; + drawGradient(&painter, dark, light, rect.x() + 2, rect.y() + lineY, width / 2, 2, /*sunken=*/false, /*horz=*/false, /*flat=*/false); + drawGradient(&painter, light, dark, rect.x() + 2 + width / 2, rect.y() + lineY, width - width / 2, 2, /*sunken=*/false, /*horz=*/false, /*flat=*/false); + // The left-most and right-most edges (biggest vertical lines): + drawLineByRect(painter, rect.x(), rect.y(), 1, (m_inserterGroup ? 4 : 6)); + drawLineByRect(painter, rect.x() + rect.width() - 1, rect.y(), 1, (m_inserterGroup ? 4 : 6)); + // The left and right mid vertical lines: + drawLineByRect(painter, rect.x() + 1, rect.y() + roundY, 1, (m_inserterGroup ? 3 : 4)); + drawLineByRect(painter, rect.x() + rect.width() - 2, rect.y() + roundY, 1, (m_inserterGroup ? 3 : 4)); + // Draw the split as a feedback to know where is the limit between insert and group: + if (m_inserterSplit) { + int noteWidth = rect.width() + (m_inserterGroup ? Note::HANDLE_WIDTH : 0); + int xSplit = rect.x() - (m_inserterGroup ? Note::HANDLE_WIDTH : 0) + noteWidth / 2; + painter.setPen(Tools::mixColor(dark, light)); + painter.drawRect(xSplit - 2, rect.y() + lineY, 4, 2); + painter.setPen(dark); + painter.drawRect(xSplit - 1, rect.y() + lineY, 2, 2); + } +} + +bool BasketView::event(QEvent *event) +{ + // Only take the help events + if (event->type() == QEvent::ToolTip) { + QHelpEvent *helpEvent = static_cast(event); + tooltipEvent(helpEvent); + return true; + } else + return Q3ScrollView::event(event); +} + +void BasketView::tooltipEvent(QHelpEvent *event) +{ + QPoint pos = event->globalPos(); + if (!m_loaded || !Settings::showNotesToolTip()) + return; + + QString message; + QRect rect; + + QPoint contentPos = viewportToContents(event->pos()); + Note *note = noteAt(contentPos.x(), contentPos.y()); + + if (!note && isFreeLayout()) { + message = i18n("Insert note here\nRight click for more options"); + QRect itRect; + for (QList::iterator it = m_blankAreas.begin(); it != m_blankAreas.end(); ++it) { + itRect = QRect(0, 0, visibleWidth(), visibleHeight()).intersect(*it); + if (itRect.contains(contentPos)) { + rect = itRect; + rect.moveLeft(rect.left() - contentsX()); + rect.moveTop(rect.top() - contentsY()); + break; + } + } + } else { + if (!note) + return; + + Note::Zone zone = note->zoneAt(contentPos - QPoint(note->x(), note->y())); + switch (zone) { + case Note::Resizer: message = (note->isColumn() ? + i18n("Resize those columns") : + (note->isGroup() ? + i18n("Resize this group") : + i18n("Resize this note"))); break; + case Note::Handle: message = i18n("Select or move this note"); break; + case Note::Group: message = i18n("Select or move this group"); break; + case Note::TagsArrow: message = i18n("Assign or remove tags from this note"); + if (note->states().count() > 0) { + message = "" + message + "
" + i18n("Assigned Tags: %1"); + QString tagsString = ""; + for (State::List::iterator it = note->states().begin(); it != note->states().end(); ++it) { + QString tagName = "" + Tools::textToHTMLWithoutP((*it)->fullName()) + ""; + if (tagsString.isEmpty()) + tagsString = tagName; + else + tagsString = i18n("%1, %2", tagsString, tagName); + } + message = message.arg(tagsString); + } + break; + case Note::Custom0: message = note->content()->zoneTip(zone); break; //"Open this link/Open this file/Open this sound file/Launch this application" + case Note::GroupExpander: message = (note->isFolded() ? + i18n("Expand this group") : + i18n("Collapse this group")); break; + case Note::Link: + case Note::Content: message = note->content()->editToolTipText(); break; + case Note::TopInsert: + case Note::BottomInsert: message = i18n("Insert note here\nRight click for more options"); break; + case Note::TopGroup: message = i18n("Group note with the one below\nRight click for more options"); break; + case Note::BottomGroup: message = i18n("Group note with the one above\nRight click for more options"); break; + case Note::BottomColumn: message = i18n("Insert note here\nRight click for more options"); break; + case Note::None: message = "** Zone NONE: internal error **"; break; + default: + if (zone >= Note::Emblem0) + message = note->stateForEmblemNumber(zone - Note::Emblem0)->fullName(); + else + message = ""; + break; + } + + if (zone == Note::Content || zone == Note::Link || zone == Note::Custom0) { + QStringList keys; + QStringList values; + + note->content()->toolTipInfos(&keys, &values); + keys.append(i18n("Added")); + keys.append(i18n("Last Modification")); + values.append(note->addedStringDate()); + values.append(note->lastModificationStringDate()); + + message = "" + message; + QStringList::iterator key; + QStringList::iterator value; + for (key = keys.begin(), value = values.begin(); key != keys.end() && value != values.end(); ++key, ++value) + message += "
" + i18nc("of the form 'key: value'", "%1: %2", *key, *value); + message += ""; + } else if (m_inserterSplit && (zone == Note::TopInsert || zone == Note::BottomInsert)) + message += "\n" + i18n("Click on the right to group instead of insert"); + else if (m_inserterSplit && (zone == Note::TopGroup || zone == Note::BottomGroup)) + message += "\n" + i18n("Click on the left to insert instead of group"); + + rect = note->zoneRect(zone, contentPos - QPoint(note->x(), note->y())); + + rect.moveLeft(rect.left() - contentsX()); + rect.moveTop(rect.top() - contentsY()); + + rect.moveLeft(rect.left() + note->x()); + rect.moveTop(rect.top() + note->y()); + } + + QToolTip::showText(pos, message, this, rect); +} + +Note* BasketView::lastNote() +{ + Note *note = firstNote(); + while (note && note->next()) + note = note->next(); + return note; +} + +void BasketView::deleteNotes() +{ + Note *note = m_firstNote; + + while (note) { + Note *tmp = note->next(); + delete note; + note = tmp; + } + m_firstNote = 0; + m_resizingNote = 0; + m_movingNote = 0; + m_focusedNote = 0; + m_startOfShiftSelectionNote = 0; + m_tagPopupNote = 0; + m_clickedToInsert = 0; + m_savedClickedToInsert = 0; + m_hoveredNote = 0; + m_count = 0; + m_countFounds = 0; + m_countSelecteds = 0; + + emit resetStatusBarText(); + emit countsChanged(this); +} + +Note* BasketView::noteAt(int x, int y) +{ +//NO: +// // Do NOT check the bottom&right borders. +// // Because imagine someone drag&drop a big note from the top to the bottom of a big basket (with big vertical scrollbars), +// // the note is first removed, and relayoutNotes() compute the new height that is smaller +// // Then noteAt() is called for the mouse pointer position, because the basket is now smaller, the cursor is out of boundaries!!! +// // Should, of course, not return 0: + if (x < 0 || x > contentsWidth() || y < 0 || y > contentsHeight()) + return 0; + + // When resizing a note/group, keep it highlighted: + if (m_resizingNote) + return m_resizingNote; + + // Search and return the hovered note: + Note *note = m_firstNote; + Note *possibleNote; + while (note) { + possibleNote = note->noteAt(x, y); + if (possibleNote) { + if (draggedNotes().contains(possibleNote)) + return 0; + else + return possibleNote; + } + note = note->next(); + } + + // If the basket is layouted in columns, return one of the columns to be able to add notes in them: + if (isColumnsLayout()) { + Note *column = m_firstNote; + while (column) { + if (x >= column->x() && x < column->rightLimit()) + return column; + column = column->next(); + } + } + + // Nothing found, no note is hovered: + return NULL; +} + +BasketView::~BasketView() +{ + if (m_decryptBox) + delete m_decryptBox; +#ifdef HAVE_LIBGPGME + delete m_gpg; +#endif + deleteNotes(); +} + +void BasketView::viewportResizeEvent(QResizeEvent *event) +{ + relayoutNotes(true); + //cornerWidget()->setShown(horizontalScrollBar()->isShown() && verticalScrollBar()->isShown()); + if (horizontalScrollBar()->isVisible() && verticalScrollBar()->isVisible()) { + if (!cornerWidget()) + setCornerWidget(m_cornerWidget); + } else { + if (cornerWidget()) + cornerWidget()->hide(); + } +// if (isDuringEdit()) +// ensureNoteVisible(editedNote()); + Q3ScrollView::viewportResizeEvent(event); +} + +void BasketView::animateLoad() +{ + const int viewHeight = contentsY() + visibleHeight(); + + QTime t = QTime::currentTime(); // Set random seed + srand(t.hour()*12 + t.minute()*60 + t.second()*60); + + Note *note = firstNote(); + while (note) { + if ((note->finalY() < viewHeight) && note->matching()) + note->initAnimationLoad(); + note = note->next(); + } + + m_loaded = true; +} + +QColor BasketView::selectionRectInsideColor() +{ + return Tools::mixColor(Tools::mixColor(backgroundColor(), + palette().color(QPalette::Highlight)), + backgroundColor()); +} + +QColor alphaBlendColors(const QColor &bgColor, const QColor &fgColor, const int a) +{ + // normal button... + QRgb rgb = bgColor.rgb(); + QRgb rgb_b = fgColor.rgb(); + int alpha = a; + if (alpha > 255) alpha = 255; + if (alpha < 0) alpha = 0; + int inv_alpha = 255 - alpha; + QColor result = QColor(qRgb(qRed(rgb_b) * inv_alpha / 255 + qRed(rgb) * alpha / 255, + qGreen(rgb_b) * inv_alpha / 255 + qGreen(rgb) * alpha / 255, + qBlue(rgb_b) * inv_alpha / 255 + qBlue(rgb) * alpha / 255)); + + return result; +} + +void BasketView::unlock() +{ + QTimer::singleShot(0, this, SLOT(load())); +} + +void BasketView::inactivityAutoLockTimeout() +{ + lock(); +} + +void BasketView::drawContents(QPainter *painter) +{ + drawContents(painter, 0, 0, 0, 0); +} + +void BasketView::drawContents(QPainter *painter, int clipX, int clipY, int clipWidth, int clipHeight) +{ + // Start the load the first time the basket is shown: + if (!m_loadingLaunched) { + if (!m_locked) + QTimer::singleShot(0, this, SLOT(load())); + else { + Global::bnpView->notesStateChanged(); // Show "Locked" instead of "Loading..." in the statusbar + } + } + + QBrush brush(backgroundColor()); // FIXME: share it for all the basket? + QRect clipRect(clipX, clipY, clipWidth, clipHeight); + + if (m_locked) { + if (!m_decryptBox) { + m_decryptBox = new QFrame(this); + m_decryptBox->setFrameShape(QFrame::StyledPanel); + m_decryptBox->setFrameShadow(QFrame::Plain); + m_decryptBox->setLineWidth(1); + + //QGridLayout* layout = new QGridLayout( m_decryptBox, 1, 1, 11, 6, "decryptBoxLayout"); + QGridLayout *layout = new QGridLayout(m_decryptBox); + layout->setContentsMargins(11, 11, 11, 11); + layout->setSpacing(6); + +#ifdef HAVE_LIBGPGME + m_button = new QPushButton(m_decryptBox); + m_button->setText(i18n("&Unlock")); + layout->addWidget(m_button, 1, 2); + connect(m_button, SIGNAL(clicked()), this, SLOT(unlock())); +#endif + QLabel* label = new QLabel(m_decryptBox); + QString text = "" + i18n("Password protected basket.") + "
"; +#ifdef HAVE_LIBGPGME + label->setText(text + i18n("Press Unlock to access it.")); +#else + label->setText(text + i18n("Encryption is not supported by
this version of %1.", KGlobal::mainComponent().aboutData()->programName())); +#endif + label->setAlignment(Qt::AlignTop); + layout->addWidget(label, 0, 1, 1, 2); + QLabel* pixmap = new QLabel(m_decryptBox); + pixmap->setPixmap(KIconLoader::global()->loadIcon("encrypted", KIconLoader::NoGroup, KIconLoader::SizeHuge)); + layout->addWidget(pixmap, 0, 0, 2, 1); + + QSpacerItem* spacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + layout->addItem(spacer, 1, 1); + + label = new QLabel("" + + i18n("To make baskets stay unlocked, change the automatic
" + "locking duration in the application settings.") + "", + m_decryptBox); + //label->setFixedWidth(label->sizeHint().width() / 2); + label->setAlignment(Qt::AlignTop); + layout->addWidget(label, 2, 0, 1, 3); + + m_decryptBox->resize(layout->sizeHint()); + } + if (m_decryptBox->isHidden()) { + m_decryptBox->show(); + } +#ifdef HAVE_LIBGPGME + m_button->setFocus(); +#endif + m_decryptBox->move((visibleWidth() - m_decryptBox->width()) / 2, + (visibleHeight() - m_decryptBox->height()) / 2); + } else { + if (m_decryptBox && !m_decryptBox->isHidden()) + m_decryptBox->hide(); + } + + // Draw notes (but not when it's not loaded or locked yet): + Note *note = ((m_loaded || m_locked) ? m_firstNote : 0); + while (note) { + note->draw(painter, clipRect); + note = note->next(); + } + enableActions(); + + // Draw loading message: + if (!m_loaded) { + QPixmap pixmap(visibleWidth(), visibleHeight()); // TODO: Clip it to asked size only! + QPainter painter2(&pixmap); + QTextDocument rt; + rt.setHtml(QString("
%1
").arg(i18n("Loading..."))); + rt.setTextWidth(visibleWidth()); + int hrt = rt.size().height(); + painter2.fillRect(0, 0, visibleWidth(), visibleHeight(), brush); + blendBackground(painter2, QRect(0, 0, visibleWidth(), visibleHeight()), -1, -1, /*opaque=*/true); + QPalette pal = palette(); + pal.setColor(QPalette::WindowText, textColor()); + painter2.translate(0, (visibleHeight() - hrt) / 2); + QAbstractTextDocumentLayout::PaintContext context; + context.palette = pal; + rt.documentLayout()->draw(&painter2, context); + painter2.end(); + painter->drawPixmap(0, 0, pixmap); + return; // TODO: Clip to the wanted rectangle + } + + // We will draw blank areas below. + // For each rectangle to be draw there is three ways to do so: + // - The rectangle is full of the background COLOR => we fill a rect directly on screen + // - The rectangle is full of the background PIXMAP => we draw it directly on screen (we draw m_opaqueBackgroundPixmap that is not transparent) + // - The rectangle contains the resizer => We draw it on an offscreen buffer and then paint the buffer on screen + // If the background image is not tiled, we know that recomputeBlankRects() broken rects so that they are full of either background pixmap or color, but not a mix. + + // Draw blank areas (see the last preparation above): + QPixmap pixmap; + QPainter painter2; + QRect rect; + for (QList::iterator it = m_blankAreas.begin(); it != m_blankAreas.end(); ++it) { + rect = clipRect.intersect(*it); + if (rect.width() > 0 && rect.height() > 0) { + // If there is an inserter to draw, draw the image off screen, + // apply the inserter and then draw the image on screen: + if ((inserterShown() && rect.intersects(inserterRect())) || (m_isSelecting && rect.intersects(m_selectionRect))) { + pixmap = QPixmap(rect.width(), rect.height()); + painter2.begin(&pixmap); + painter2.fillRect(0, 0, rect.width(), rect.height(), backgroundColor()); + blendBackground(painter2, rect, -1, -1, /*opaque=*/true); + // Draw inserter: + if (inserterShown() && rect.intersects(inserterRect())) + drawInserter(painter2, rect.x(), rect.y()); + // Draw selection rect: + if (m_isSelecting && rect.intersects(m_selectionRect)) { + QRect selectionRect = m_selectionRect; + selectionRect.translate(-rect.x(), -rect.y()); + QRect selectionRectInside(selectionRect.x() + 1, selectionRect.y() + 1, selectionRect.width() - 2, selectionRect.height() - 2); + if (selectionRectInside.width() > 0 && selectionRectInside.height() > 0) { + QColor insideColor = selectionRectInsideColor(); + painter2.fillRect(selectionRectInside, insideColor); + selectionRectInside.translate(rect.x(), rect.y()); + blendBackground(painter2, selectionRectInside, rect.x(), rect.y(), true, /*&*/m_selectedBackgroundPixmap); + } + painter2.setPen(palette().color(QPalette::Highlight).darker()); + painter2.drawRect(selectionRect); + painter2.setPen(Tools::mixColor(palette().color(QPalette::Highlight).darker(), backgroundColor())); + painter2.drawPoint(selectionRect.topLeft()); + painter2.drawPoint(selectionRect.topRight()); + painter2.drawPoint(selectionRect.bottomLeft()); + painter2.drawPoint(selectionRect.bottomRight()); + } + painter2.end(); + painter->drawPixmap(rect.x(), rect.y(), pixmap); + // If it's only a blank rectangle to draw, draw it directly on screen (faster!!!): + } else if (! hasBackgroundImage()) { + painter->fillRect(rect, backgroundColor()); + // It's either a background pixmap to draw or a background color to fill: + } else { + if (isTiledBackground() || (rect.x() < backgroundPixmap()->width() && rect.y() < backgroundPixmap()->height())) + blendBackground(*painter, rect, 0, 0, /*opaque=*/true); + else + painter->fillRect(rect, backgroundColor()); + } + } + } +} + +/* rect(x,y,width,height)==(xBackgroundToDraw,yBackgroundToDraw,widthToDraw,heightToDraw) + */ +void BasketView::blendBackground(QPainter &painter, const QRect &rect, int xPainter, int yPainter, bool opaque, QPixmap *bg) +{ + if (xPainter == -1 && yPainter == -1) { + xPainter = rect.x(); + yPainter = rect.y(); + } + + if (hasBackgroundImage()) { + const QPixmap *bgPixmap = (bg ? /* * */bg : (opaque ? m_opaqueBackgroundPixmap : m_backgroundPixmap)); + if (isTiledBackground()) + painter.drawTiledPixmap(rect.x() - xPainter, rect.y() - yPainter, rect.width(), rect.height(), *bgPixmap, rect.x(), rect.y()); + else + painter.drawPixmap(rect.x() - xPainter, rect.y() - yPainter, *bgPixmap, rect.x(), rect.y(), rect.width(), rect.height()); + } +} + +void BasketView::recomputeBlankRects() +{ + m_blankAreas.clear(); + m_blankAreas.append(QRect(0, 0, contentsWidth(), contentsHeight())); + + FOR_EACH_NOTE(note) + note->recomputeBlankRects(m_blankAreas); + + // See the drawing of blank areas in BasketView::drawContents() + if (hasBackgroundImage() && ! isTiledBackground()) + substractRectOnAreas(QRect(0, 0, backgroundPixmap()->width(), backgroundPixmap()->height()), m_blankAreas, false); +} + +void BasketView::addAnimatedNote(Note *note) +{ + if (m_animatedNotes.isEmpty()) { + m_animationTimer.start(FRAME_DELAY); + m_lastFrameTime = QTime::currentTime(); + } + + m_animatedNotes.append(note); +} + +void BasketView::unsetNotesWidth() +{ + Note *note = m_firstNote; + while (note) { + note->unsetWidth(); + note = note->next(); + } +} + +void BasketView::relayoutNotes(bool animate) +{ + if (Global::bnpView->currentBasket() != this) + return; // Optimize load time, and basket will be relaid out when activated, anyway + + if (!Settings::playAnimations()) + animate = false; + + if (!animate) { + m_animatedNotes.clear(); + m_animationTimer.stop(); + } + + int h = 0; + tmpWidth = 0; + tmpHeight = 0; + Note *note = m_firstNote; + while (note) { + if (note->matching()) { + note->relayoutAt(0, h, animate); + if (note->hasResizer()) { + int minGroupWidth = note->minRight() - note->finalX(); + if (note->groupWidth() < minGroupWidth) { + note->setGroupWidth(minGroupWidth); + relayoutNotes(animate); // Redo the thing, but this time it should not recurse + return; + } + } + h += note->finalHeight(); + } + note = note->next(); + } + + if (isFreeLayout()) + tmpHeight += 100; + else + tmpHeight += 15; + + resizeContents(qMax(tmpWidth, visibleWidth()), qMax(tmpHeight, visibleHeight())); + recomputeBlankRects(); + placeEditor(); + doHoverEffects(); + updateContents(); +} + +void BasketView::updateNote(Note *note) +{ + updateContents(note->rect()); + if (note->hasResizer()) + updateContents(note->resizerRect()); +} + +void BasketView::animateObjects() +{ + QList::iterator it; + for (it = m_animatedNotes.begin(); it != m_animatedNotes.end();) +// if ((*it)->y() >= contentsY() && (*it)->bottom() <= contentsY() + contentsWidth()) +// updateNote(*it); + if ((*it)->advance()) + it = m_animatedNotes.erase(it); + else { +// if ((*it)->y() >= contentsY() && (*it)->bottom() <= contentsY() + contentsWidth()) +// updateNote(*it); + ++it; + } + + if (m_animatedNotes.isEmpty()) { + // Stop animation timer: + m_animationTimer.stop(); + // Reset all onTop notes: + Note* note = m_firstNote; + while (note) { + note->setOnTop(false); + note = note->next(); + } + } + + if (m_focusedNote) + ensureNoteVisible(m_focusedNote); + + // We refresh content if it was the last frame, + // or if the drawing of the last frame was not too long. + if (!m_animationTimer.isActive() || (m_lastFrameTime.msecsTo(QTime::currentTime()) < FRAME_DELAY*11 / 10)) { // *11/10 == *1.1 : We keep a 0.1 security margin + m_lastFrameTime = m_lastFrameTime.addMSecs(FRAME_DELAY); // because timers are not accurate and can trigger late + //m_lastFrameTime = QTime::currentTime(); +//kDebug() << ">>" << m_lastFrameTime.toString("hh:mm:ss.zzz"); + if (m_underMouse) + doHoverEffects(); + recomputeBlankRects(); + //relayoutNotes(true); // In case an animated note was to the contents view boundaries, resize the view! + updateContents(); + // If the drawing of the last frame was too long, we skip the drawing of the current and do the next one: + } else { + m_lastFrameTime = m_lastFrameTime.addMSecs(FRAME_DELAY); +//kDebug() << "+=" << m_lastFrameTime.toString("hh:mm:ss.zzz"); + animateObjects(); + } + + doHoverEffects(); + placeEditor(); + + /* int delta = m_deltaY / 3; + if (delta == 0 && m_deltaY != 0) + delta = (m_deltaY > 0 ? 1 : -1); + m_deltaY -= delta; + resizeContents(contentsWidth(), contentsHeight() + delta); //m_lastNote->y() + m_lastNote->height() + */ +} + +void BasketView::popupEmblemMenu(Note *note, int emblemNumber) +{ + m_tagPopupNote = note; + State *state = note->stateForEmblemNumber(emblemNumber); + State *nextState = state->nextState(/*cycle=*/false); + Tag *tag = state->parentTag(); + m_tagPopup = tag; + + QKeySequence sequence = tag->shortcut().primary(); + bool sequenceOnDelete = (nextState == 0 && !tag->shortcut().isEmpty()); + + KMenu menu(this); + if (tag->countStates() == 1) { + menu.addTitle(/*SmallIcon(state->icon()), */tag->name()); + KAction* act; + act = new KAction(KIcon("edit-delete"), i18n("&Remove"), &menu); + act->setData(1); + menu.addAction(act); + act = new KAction(KIcon("configure"), i18n("&Customize..."), &menu); + act->setData(2); + menu.addAction(act); + + menu.addSeparator(); + + act = new KAction(KIcon("search-filter"), i18n("&Filter by this Tag"), &menu); + act->setData(3); + menu.addAction(act); + } else { + menu.addTitle(tag->name()); + QList::iterator it; + State *currentState; + + int i = 10; + // QActionGroup makes the actions exclusive; turns checkboxes into radio + // buttons on some styles. + QActionGroup *emblemGroup = new QActionGroup(&menu); + for (it = tag->states().begin(); it != tag->states().end(); ++it) { + currentState = *it; + QKeySequence sequence; + if (currentState == nextState && !tag->shortcut().isEmpty()) + sequence = tag->shortcut().primary(); + + StateAction *sa = new StateAction(currentState, KShortcut(sequence), false); + sa->setChecked(state == currentState); + sa->setActionGroup(emblemGroup); + sa->setData(i); + + menu.addAction(sa); + if (currentState == nextState && !tag->shortcut().isEmpty()) + sa->setShortcut(sequence); + ++i; + } + + menu.addSeparator(); + + KAction *act = new KAction(&menu); + act->setIcon(KIcon("edit-delete")); + act->setText(i18n("&Remove")); + act->setShortcut(sequenceOnDelete ? sequence : QKeySequence()); + act->setData(1); + menu.addAction(act); + act = new KAction( + KIcon("configure"), + i18n("&Customize..."), + &menu + ); + act->setData(2); + menu.addAction(act); + + menu.addSeparator(); + + act = new KAction(KIcon("search-filter"), + i18n("&Filter by this Tag"), + &menu); + act->setData(3); + menu.addAction(act); + act = new KAction( + KIcon("search-filter"), + i18n("Filter by this &State"), + &menu); + act->setData(4); + menu.addAction(act); + } + if (sequenceOnDelete) { + // Not sure if this is equivalent to menu.setAccel(sequence, 1); + menu.actionAt(QPoint(0, 1))->setShortcut(sequence); + } + + connect(&menu, SIGNAL(triggered(QAction *)), this, SLOT(toggledStateInMenu(QAction *))); + connect(&menu, SIGNAL(aboutToHide()), this, SLOT(unlockHovering())); + connect(&menu, SIGNAL(aboutToHide()), this, SLOT(disableNextClick())); + + m_lockedHovering = true; + menu.exec(QCursor::pos()); +} + +void BasketView::toggledStateInMenu(QAction* action) +{ + int id = action->data().toInt(); + if (id == 1) { + removeTagFromSelectedNotes(m_tagPopup); + //m_tagPopupNote->removeTag(m_tagPopup); + //m_tagPopupNote->setWidth(0); // To force a new layout computation + updateEditorAppearance(); + filterAgain(); + save(); + return; + } + if (id == 2) { // Customize this State: + TagsEditDialog dialog(this, m_tagPopupNote->stateOfTag(m_tagPopup)); + dialog.exec(); + return; + } + if (id == 3) { // Filter by this Tag + decoration()->filterBar()->filterTag(m_tagPopup); + return; + } + if (id == 4) { // Filter by this State + decoration()->filterBar()->filterState(m_tagPopupNote->stateOfTag(m_tagPopup)); + return; + } + + /*addStateToSelectedNotes*/changeStateOfSelectedNotes(m_tagPopup->states()[id - 10] /*, orReplace=true*/); + //m_tagPopupNote->addState(m_tagPopup->states()[id - 10], true); + filterAgain(); + save(); +} + +State* BasketView::stateForTagFromSelectedNotes(Tag *tag) +{ + State *state = 0; + + FOR_EACH_NOTE(note) + if (note->stateForTagFromSelectedNotes(tag, &state) && state == 0) + return 0; + return state; +} + +void BasketView::activatedTagShortcut(Tag *tag) +{ + // Compute the next state to set: + State *state = stateForTagFromSelectedNotes(tag); + if (state) + state = state->nextState(/*cycle=*/false); + else + state = tag->states().first(); + + // Set or unset it: + if (state) { + FOR_EACH_NOTE(note) + note->addStateToSelectedNotes(state, /*orReplace=*/true); + updateEditorAppearance(); + } else + removeTagFromSelectedNotes(tag); + + filterAgain(); + save(); +} + +void BasketView::popupTagsMenu(Note *note) +{ + m_tagPopupNote = note; + + KMenu menu(this); + menu.addTitle(i18n("Tags")); + + Global::bnpView->populateTagsMenu(menu, note); + + m_lockedHovering = true; + menu.exec(QCursor::pos()); +} + +void BasketView::unlockHovering() +{ + m_lockedHovering = false; + doHoverEffects(); +} + +void BasketView::toggledTagInMenu(QAction *act) +{ + int id = act->data().toInt(); + if (id == 1) { // Assign new Tag... + TagsEditDialog dialog(this, /*stateToEdit=*/0, /*addNewTag=*/true); + dialog.exec(); + if (!dialog.addedStates().isEmpty()) { + State::List states = dialog.addedStates(); + for (State::List::iterator itState = states.begin(); itState != states.end(); ++itState) + FOR_EACH_NOTE(note) + note->addStateToSelectedNotes(*itState); + updateEditorAppearance(); + filterAgain(); + save(); + } + return; + } + if (id == 2) { // Remove All + removeAllTagsFromSelectedNotes(); + filterAgain(); + save(); + return; + } + if (id == 3) { // Customize... + TagsEditDialog dialog(this); + dialog.exec(); + return; + } + + Tag *tag = Tag::all[id - 10]; + if (!tag) + return; + + if (m_tagPopupNote->hasTag(tag)) + removeTagFromSelectedNotes(tag); + else + addTagToSelectedNotes(tag); + m_tagPopupNote->setWidth(0); // To force a new layout computation + filterAgain(); + save(); +} + +void BasketView::addTagToSelectedNotes(Tag *tag) +{ + FOR_EACH_NOTE(note) + note->addTagToSelectedNotes(tag); + updateEditorAppearance(); +} + +void BasketView::removeTagFromSelectedNotes(Tag *tag) +{ + FOR_EACH_NOTE(note) + note->removeTagFromSelectedNotes(tag); + updateEditorAppearance(); +} + +void BasketView::addStateToSelectedNotes(State *state) +{ + FOR_EACH_NOTE(note) + note->addStateToSelectedNotes(state); + updateEditorAppearance(); +} + +void BasketView::updateEditorAppearance() +{ + if (isDuringEdit() && m_editor->widget()) { + m_editor->widget()->setFont(m_editor->note()->font()); + + QPalette palette; + palette.setColor(m_editor->widget()->backgroundRole(), m_editor->note()->backgroundColor()); + palette.setColor(m_editor->widget()->foregroundRole(), m_editor->note()->textColor()); + m_editor->widget()->setPalette(palette); + + // Uggly Hack arround Qt bugs: placeCursor() don't call any signal: + HtmlEditor *htmlEditor = dynamic_cast(m_editor); + if (htmlEditor) { + if (m_editor->textEdit()->textCursor().atStart()) { + m_editor->textEdit()->moveCursor(QTextCursor::Right); + m_editor->textEdit()->moveCursor(QTextCursor::Left); + } else { + m_editor->textEdit()->moveCursor(QTextCursor::Left); + m_editor->textEdit()->moveCursor(QTextCursor::Right); + } + htmlEditor->cursorPositionChanged(); // Does not work anyway :-( (when clicking on a red bold text, the toolbar still show black normal text) + } + } +} + +void BasketView::editorPropertiesChanged() +{ + if (isDuringEdit() && m_editor->note()->content()->type() == NoteType::Html) { + m_editor->textEdit()->setAutoFormatting(Settings::autoBullet() ? QTextEdit::AutoAll : QTextEdit::AutoNone); + } +} + +void BasketView::changeStateOfSelectedNotes(State *state) +{ + FOR_EACH_NOTE(note) + note->changeStateOfSelectedNotes(state); + updateEditorAppearance(); +} + +void BasketView::removeAllTagsFromSelectedNotes() +{ + FOR_EACH_NOTE(note) + note->removeAllTagsFromSelectedNotes(); + updateEditorAppearance(); +} + +bool BasketView::selectedNotesHaveTags() +{ + FOR_EACH_NOTE(note) + if (note->selectedNotesHaveTags()) + return true; + return false; +} + +QColor BasketView::backgroundColor() +{ + if (m_backgroundColorSetting.isValid()) + return m_backgroundColorSetting; + else + return palette().color(QPalette::Base); +} + +QColor BasketView::textColor() +{ + if (m_textColorSetting.isValid()) + return m_textColorSetting; + else + return palette().color(QPalette::Text); +} + +void BasketView::unbufferizeAll() +{ + FOR_EACH_NOTE(note) + note->unbufferizeAll(); +} + +Note* BasketView::editedNote() +{ + if (m_editor) + return m_editor->note(); + else + return 0; +} + +bool BasketView::hasTextInEditor() +{ + if (!isDuringEdit() || !redirectEditActions()) + return false; + + if (m_editor->textEdit()) + return ! m_editor->textEdit()->document()->isEmpty(); + else if (m_editor->lineEdit()) + return ! m_editor->lineEdit()->displayText().isEmpty(); + else + return false; +} + +bool BasketView::hasSelectedTextInEditor() +{ + if (!isDuringEdit() || !redirectEditActions()) + return false; + + if (m_editor->textEdit()) { + // The following line does NOT work if one letter is selected and the user press Shift+Left or Shift+Right to unselect than letter: + // Qt misteriously tell us there is an invisible selection!! + //return m_editor->textEdit()->hasSelectedText(); + return !m_editor->textEdit()->textCursor().selectedText().isEmpty(); + } else if (m_editor->lineEdit()) + return m_editor->lineEdit()->hasSelectedText(); + else + return false; +} + +bool BasketView::selectedAllTextInEditor() +{ + if (!isDuringEdit() || !redirectEditActions()) + return false; + + if (m_editor->textEdit()) { + return m_editor->textEdit()->document()->isEmpty() || m_editor->textEdit()->toPlainText() == m_editor->textEdit()->textCursor().selectedText(); + } else if (m_editor->lineEdit()) + return m_editor->lineEdit()->displayText().isEmpty() || m_editor->lineEdit()->displayText() == m_editor->lineEdit()->selectedText(); + else + return false; +} + +void BasketView::selectionChangedInEditor() +{ + Global::bnpView->notesStateChanged(); +} + +void BasketView::contentChangedInEditor() +{ + // Do not wait 3 seconds, because we need the note to expand as needed (if a line is too wider... the note should grow wider): + if (m_editor->textEdit()) + m_editor->autoSave(/*toFileToo=*/false); +// else { + if (m_inactivityAutoSaveTimer.isActive()) + m_inactivityAutoSaveTimer.stop(); + m_inactivityAutoSaveTimer.setSingleShot(true); + m_inactivityAutoSaveTimer.start(3 * 1000); + Global::bnpView->setUnsavedStatus(true); +// } +} + +void BasketView::inactivityAutoSaveTimeout() +{ + if (m_editor) + m_editor->autoSave(/*toFileToo=*/true); +} + +void BasketView::placeEditorAndEnsureVisible() +{ + placeEditor(/*andEnsureVisible=*/true); +} + +// TODO: [kw] Oh boy, this will probably require some tweaking. +void BasketView::placeEditor(bool /*andEnsureVisible*/ /*= false*/) +{ + if (!isDuringEdit()) + return; + + QFrame *editorQFrame = dynamic_cast(m_editor->widget()); + KTextEdit *textEdit = m_editor->textEdit(); +// QLineEdit *lineEdit = m_editor->lineEdit(); + Note *note = m_editor->note(); + + int frameWidth = (editorQFrame ? editorQFrame->frameWidth() : 0); + int x = note->x() + note->contentX() + note->content()->xEditorIndent() - frameWidth; + int y; + int maxHeight = qMax(visibleHeight(), contentsHeight()); + int height, width; + + if (textEdit) { + x -= 4; + // Need to do it 2 times, because it's wrong overwise + // (sometimes, width depends on height, and sometimes, height depends on with): + for (int i = 0; i < 2; i++) { + // FIXME: CRASH: Select all text, press Del or [<--] and editor->removeSelectedText() is called: + // editor->sync() CRASH!! + // editor->sync(); + y = note->y() + Note::NOTE_MARGIN - frameWidth; + height = note->height() - 2 * frameWidth - 2 * Note::NOTE_MARGIN; +// height = /*qMax(*/height/*, note->height())*/; +// height = qMin(height, visibleHeight()); + width = note->x() + note->width() - x + 1;// /*note->x() + note->width()*/note->rightLimit() - x + 2*frameWidth + 1; +//width=qMax(width,textEdit->contentsWidth()+2*frameWidth); + if (y + height > maxHeight) + y = maxHeight - height; + textEdit->setFixedSize(width, height); + } + } else { + height = note->height() - 2 * Note::NOTE_MARGIN + 2 * frameWidth; + width = note->x() + note->width() - x;//note->rightLimit() - x + 2*frameWidth; + m_editor->widget()->setFixedSize(width, height); + x -= 1; + y = note->y() + Note::NOTE_MARGIN - frameWidth; + } + if ((m_editorWidth > 0 && m_editorWidth != width) || (m_editorHeight > 0 && m_editorHeight != height)) { + m_editorWidth = width; // Avoid infinite recursion!!! + m_editorHeight = height; + m_editor->autoSave(/*toFileToo=*/true); + } + m_editorWidth = width; + m_editorHeight = height; + addChild(m_editor->widget(), x, y); + m_editorX = x; + m_editorY = y; + + m_leftEditorBorder->setFixedSize((m_editor->textEdit() ? 3 : 0), height); +// m_leftEditorBorder->raise(); + addChild(m_leftEditorBorder, x, y); + m_leftEditorBorder->setPosition(x, y); + + m_rightEditorBorder->setFixedSize(3, height); +// m_rightEditorBorder->raise(); +// addChild(m_rightEditorBorder, note->rightLimit() - Note::NOTE_MARGIN, note->y() + Note::NOTE_MARGIN ); +// m_rightEditorBorder->setPosition( note->rightLimit() - Note::NOTE_MARGIN, note->y() + Note::NOTE_MARGIN ); + addChild(m_rightEditorBorder, note->x() + note->width() - Note::NOTE_MARGIN, note->y() + Note::NOTE_MARGIN); + m_rightEditorBorder->setPosition(note->x() + note->width() - Note::NOTE_MARGIN, note->y() + Note::NOTE_MARGIN); + +// if (andEnsureVisible) +// ensureNoteVisible(note); +} + +void BasketView::editorCursorPositionChanged() +{ + if (!isDuringEdit()) + return; + + FocusedTextEdit *textEdit = (FocusedTextEdit*) m_editor->textEdit(); + + QPoint cursorPoint = textEdit->viewport()->mapTo( + viewport(), textEdit->cursorRect().center() + ); + ensureVisible(cursorPoint.x(), cursorPoint.y()); +} + +void BasketView::closeEditorDelayed() +{ + setFocus(); + QTimer::singleShot(0, this, SLOT(closeEditor())); +} + +bool BasketView::closeEditor() +{ + if (!isDuringEdit()) + return true; + + if (m_doNotCloseEditor) + return true; + + if (m_redirectEditActions) { + disconnect(m_editor->widget(), SIGNAL(selectionChanged()), this, SLOT(selectionChangedInEditor())); + if (m_editor->textEdit()) { + disconnect(m_editor->textEdit(), SIGNAL(textChanged()), this, SLOT(selectionChangedInEditor())); + disconnect(m_editor->textEdit(), SIGNAL(textChanged()), this, SLOT(contentChangedInEditor())); + } else if (m_editor->lineEdit()) { + disconnect(m_editor->lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(selectionChangedInEditor())); + disconnect(m_editor->lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(contentChangedInEditor())); + } + } + m_editor->widget()->disconnect(); + m_editor->widget()->hide(); + m_editor->validate(); + + delete m_leftEditorBorder; + delete m_rightEditorBorder; + m_leftEditorBorder = 0; + m_rightEditorBorder = 0; + + Note *note = m_editor->note(); + note->setWidth(0); // For relayoutNotes() to succeed to take care of the change + + // Delete the editor BEFORE unselecting the note because unselecting the note would trigger closeEditor() recursivly: + bool isEmpty = m_editor->isEmpty(); + delete m_editor; + m_editor = 0; + m_redirectEditActions = false; + m_editorWidth = -1; + m_editorHeight = -1; + m_inactivityAutoSaveTimer.stop(); + + // Delete the note if it is now empty: + if (isEmpty) { + focusANonSelectedNoteAboveOrThenBelow(); + note->setSelected(true); + note->deleteSelectedNotes(); + save(); + note = 0; + } + + unlockHovering(); + filterAgain(/*andEnsureVisible=*/false); + +// Does not work: +// if (Settings::playAnimations()) +// note->setOnTop(true); // So if it grew, do not obscure it temporarily while the notes below it are moving + + if (note) + note->setSelected(false);//unselectAll(); + doHoverEffects(); +// save(); + + Global::bnpView->m_actEditNote->setEnabled(!isLocked() && countSelecteds() == 1 /*&& !isDuringEdit()*/); + + emit resetStatusBarText(); // Remove the "Editing. ... to validate." text. + + //if (kapp->activeWindow() == Global::mainContainer) + + // Set focus to the basket, unless the user pressed a letter key in the filter bar and the currently edited note came hidden, then editing closed: + if (!decoration()->filterBar()->lineEdit()->hasFocus()) + setFocus(); + + // Return true if the note is still there: + return (note != 0); +} + +void BasketView::closeBasket() +{ + closeEditor(); + unbufferizeAll(); // Keep the memory footprint low + if (isEncrypted()) { + if (Settings::enableReLockTimeout()) { + int seconds = Settings::reLockTimeoutMinutes() * 60; + m_inactivityAutoLockTimer.setSingleShot(true); + m_inactivityAutoLockTimer.start(seconds * 1000); + } + } +} + +void BasketView::openBasket() +{ + if (m_inactivityAutoLockTimer.isActive()) + m_inactivityAutoLockTimer.stop(); +} + +Note* BasketView::theSelectedNote() +{ + if (countSelecteds() != 1) { + kDebug() << "NO SELECTED NOTE !!!!"; + return 0; + } + + Note *selectedOne; + FOR_EACH_NOTE(note) { + selectedOne = note->theSelectedNote(); + if (selectedOne) + return selectedOne; + } + + kDebug() << "One selected note, BUT NOT FOUND !!!!"; + + return 0; +} + +NoteSelection* BasketView::selectedNotes() +{ + NoteSelection selection; + + FOR_EACH_NOTE(note) + selection.append(note->selectedNotes()); + + if (!selection.firstChild) + return 0; + + for (NoteSelection *node = selection.firstChild; node; node = node->next) + node->parent = 0; + + // If the top-most groups are columns, export only childs of those groups + // (because user is not consciencious that columns are groups, and don't care: it's not what she want): + if (selection.firstChild->note->isColumn()) { + NoteSelection tmpSelection; + NoteSelection *nextNode; + NoteSelection *nextSubNode; + for (NoteSelection *node = selection.firstChild; node; node = nextNode) { + nextNode = node->next; + if (node->note->isColumn()) { + for (NoteSelection *subNode = node->firstChild; subNode; subNode = nextSubNode) { + nextSubNode = subNode->next; + tmpSelection.append(subNode); + subNode->parent = 0; + subNode->next = 0; + } + } else { + tmpSelection.append(node); + node->parent = 0; + node->next = 0; + } + } +// debugSel(tmpSelection.firstChild); + return tmpSelection.firstChild; + } else { +// debugSel(selection.firstChild); + return selection.firstChild; + } +} + +void BasketView::showEditedNoteWhileFiltering() +{ + if (m_editor) { + Note *note = m_editor->note(); + filterAgain(); + note->setSelected(true); + relayoutNotes(false); + note->setX(note->finalX()); + note->setY(note->finalY()); + filterAgainDelayed(); + } +} + +void BasketView::noteEdit(Note *note, bool justAdded, const QPoint &clickedPoint) // TODO: Remove the first parameter!!! +{ + if (!note) + note = theSelectedNote(); // TODO: Or pick the focused note! + if (!note) + return; + + if (isDuringEdit()) { + closeEditor(); // Validate the noteeditors in KLineEdit that does not intercept Enter key press (and edit is triggered with Enter too... Can conflict) + return; + } + + if (note != m_focusedNote) { + setFocusedNote(note); + m_startOfShiftSelectionNote = note; + } + + if (justAdded && isFiltering()) { + QTimer::singleShot(0, this, SLOT(showEditedNoteWhileFiltering())); + } + + doHoverEffects(note, Note::Content); // Be sure (in the case Edit was triggered by menu or Enter key...): better feedback! + //m_lockedHovering = true; + + //m_editorWidget = note->content()->launchEdit(this); + NoteEditor *editor = NoteEditor::editNoteContent(note->content(), this); + + if (editor->widget()) { + m_editor = editor; + m_leftEditorBorder = new TransparentWidget(this); + m_rightEditorBorder = new TransparentWidget(this); + //m_editor->widget()->reparent(viewport(), QPoint(0,0), true); + //m_leftEditorBorder->reparent(viewport(), QPoint(0,0), true); + //m_rightEditorBorder->reparent(viewport(), QPoint(0,0), true); + m_editor->widget()->setParent(viewport()); + m_leftEditorBorder->setParent(viewport()); + m_rightEditorBorder->setParent(viewport()); + addChild(m_editor->widget(), 0, 0); + placeEditorAndEnsureVisible(); // placeEditor(); // FIXME: After? + m_redirectEditActions = m_editor->lineEdit() || m_editor->textEdit(); + if (m_redirectEditActions) { + connect(m_editor->widget(), SIGNAL(selectionChanged()), this, SLOT(selectionChangedInEditor())); + // In case there is NO text, "Select All" is disabled. But if the user press a key the there is now a text: + // selection has not changed but "Select All" should be re-enabled: + if (m_editor->textEdit()) { + connect(m_editor->textEdit(), SIGNAL(textChanged()), this, SLOT(selectionChangedInEditor())); + connect(m_editor->textEdit(), SIGNAL(textChanged()), this, SLOT(contentChangedInEditor())); + } else if (m_editor->lineEdit()) { + connect(m_editor->lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(selectionChangedInEditor())); + connect(m_editor->lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(contentChangedInEditor())); + } + } + m_editor->widget()->show(); + //m_editor->widget()->raise(); + m_editor->widget()->setFocus(); + connect(m_editor, SIGNAL(askValidation()), + this, SLOT(closeEditorDelayed())); + connect(m_editor, SIGNAL(mouseEnteredEditorWidget()), + this, SLOT(mouseEnteredEditorWidget())); + + KTextEdit *textEdit = m_editor->textEdit(); + if (textEdit) { + connect(textEdit, SIGNAL(textChanged()), this, SLOT(placeEditorAndEnsureVisible())); + if (clickedPoint != QPoint()) { + // clickedPoint comes from the QMouseEvent, which is in this + // widget's coordinate system. + QPoint pos = textEdit->mapFrom(this, clickedPoint); + // Do it right before the kapp->processEvents() to not have the + // cursor to quickly flicker at end (and sometimes stay at end + // AND where clicked): + textEdit->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor); + textEdit->ensureCursorVisible(); + textEdit->setTextCursor(textEdit->cursorForPosition(pos)); + updateEditorAppearance(); + } + } + +// kapp->processEvents(); // Show the editor toolbar before ensuring the note is visible + ensureNoteVisible(note); // because toolbar can create a new line and then partially hide the note + m_editor->widget()->setFocus(); // When clicking in the basket, a QTimer::singleShot(0, ...) focus the basket! So we focus the the widget after kapp->processEvents() + emit resetStatusBarText(); // Display "Editing. ... to validate." + } else { + // Delete the note user have canceled the addition: + if ((justAdded && editor->canceled()) || editor->isEmpty() /*) && editor->note()->states().count() <= 0*/) { + focusANonSelectedNoteAboveOrThenBelow(); + editor->note()->setSelected(true); + editor->note()->deleteSelectedNotes(); + save(); + } + editor->deleteLater(); + unlockHovering(); + filterAgain(); + unselectAll(); + } + Global::bnpView->m_actEditNote->setEnabled(false); +} + +void BasketView::noteDelete() +{ + if (redirectEditActions()) { + if (m_editor->textEdit()) + m_editor->textEdit()->textCursor().deleteChar(); + else if (m_editor->lineEdit()) + m_editor->lineEdit()->del(); + return; + } + + if (countSelecteds() <= 0) + return; + int really = KMessageBox::Yes; + if (Settings::confirmNoteDeletion()) + really = KMessageBox::questionYesNo(this, + i18np("Do you really want to delete this note?", + "Do you really want to delete these %1 notes?", + countSelecteds()), + i18np("Delete Note", "Delete Notes", countSelecteds()) +#if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x + , KStandardGuiItem::del(), KStandardGuiItem::cancel()); +#else + ); +#endif + if (really == KMessageBox::No) + return; + + noteDeleteWithoutConfirmation(); +} + +void BasketView::focusANonSelectedNoteBelow(bool inSameColumn) +{ + // First focus another unselected one below it...: + if (m_focusedNote && m_focusedNote->isSelected()) { + Note *next = m_focusedNote->nextShownInStack(); + while (next && next->isSelected()) + next = next->nextShownInStack(); + if (next) { + if (inSameColumn && isColumnsLayout() && m_focusedNote->parentPrimaryNote() == next->parentPrimaryNote()) { + setFocusedNote(next); + m_startOfShiftSelectionNote = next; + } + } + } +} + +void BasketView::focusANonSelectedNoteAbove(bool inSameColumn) +{ + // ... Or above it: + if (m_focusedNote && m_focusedNote->isSelected()) { + Note *prev = m_focusedNote->prevShownInStack(); + while (prev && prev->isSelected()) + prev = prev->prevShownInStack(); + if (prev) { + if (inSameColumn && isColumnsLayout() && m_focusedNote->parentPrimaryNote() == prev->parentPrimaryNote()) { + setFocusedNote(prev); + m_startOfShiftSelectionNote = prev; + } + } + } +} + +void BasketView::focusANonSelectedNoteBelowOrThenAbove() +{ + focusANonSelectedNoteBelow(/*inSameColumn=*/true); + focusANonSelectedNoteAbove(/*inSameColumn=*/true); + focusANonSelectedNoteBelow(/*inSameColumn=*/false); + focusANonSelectedNoteAbove(/*inSameColumn=*/false); +} + +void BasketView::focusANonSelectedNoteAboveOrThenBelow() +{ + focusANonSelectedNoteAbove(/*inSameColumn=*/true); + focusANonSelectedNoteBelow(/*inSameColumn=*/true); + focusANonSelectedNoteAbove(/*inSameColumn=*/false); + focusANonSelectedNoteBelow(/*inSameColumn=*/false); +} + +void BasketView::noteDeleteWithoutConfirmation(bool deleteFilesToo) +{ + // If the currently focused note is selected, it will be deleted. + focusANonSelectedNoteBelowOrThenAbove(); + + // Do the deletion: + Note *note = firstNote(); + Note *next; + while (note) { + next = note->next(); // If we delete 'note' on the next line, note->next() will be 0! + note->deleteSelectedNotes(deleteFilesToo); + note = next; + } + + relayoutNotes(true); // FIXME: filterAgain()? + save(); +} + +void BasketView::doCopy(CopyMode copyMode) +{ + QClipboard *cb = KApplication::clipboard(); + QClipboard::Mode mode = (copyMode == CopyToSelection ? QClipboard::Selection : QClipboard::Clipboard); + + NoteSelection *selection = selectedNotes(); + int countCopied = countSelecteds(); + if (selection->firstStacked()) { + QDrag *d = NoteDrag::dragObject(selection, copyMode == CutToClipboard, /*source=*/0); // d will be deleted by QT +// /*bool shouldRemove = */d->drag(); +// delete selection; + cb->setMimeData(d->mimeData(), mode); // NoteMultipleDrag will be deleted by QT +// if (copyMode == CutToClipboard && !note->useFile()) // If useFile(), NoteDrag::dragObject() will delete it TODO +// note->slotDelete(); + + if (copyMode == CutToClipboard) + noteDeleteWithoutConfirmation(/*deleteFilesToo=*/false); + + switch (copyMode) { + default: + case CopyToClipboard: emit postMessage(i18np("Copied note to clipboard.", "Copied notes to clipboard.", countCopied)); break; + case CutToClipboard: emit postMessage(i18np("Cut note to clipboard.", "Cut notes to clipboard.", countCopied)); break; + case CopyToSelection: emit postMessage(i18np("Copied note to selection.", "Copied notes to selection.", countCopied)); break; + } + } +} + +void BasketView::noteCopy() +{ + if (redirectEditActions()) { + if (m_editor->textEdit()) + m_editor->textEdit()->copy(); + else if (m_editor->lineEdit()) + m_editor->lineEdit()->copy(); + } else + doCopy(CopyToClipboard); +} + +void BasketView::noteCut() +{ + if (redirectEditActions()) { + if (m_editor->textEdit()) + m_editor->textEdit()->cut(); + else if (m_editor->lineEdit()) + m_editor->lineEdit()->cut(); + } else + doCopy(CutToClipboard); +} + +void BasketView::noteOpen(Note *note) +{ + /* + GetSelectedNotes + NoSelectedNote || Count == 0 ? return + AllTheSameType ? + Get { url, message(count) } + */ + + // TODO: Open ALL selected notes! + if (!note) + note = theSelectedNote(); + if (!note) + return; + + KUrl url = note->content()->urlToOpen(/*with=*/false); + QString message = note->content()->messageWhenOpening(NoteContent::OpenOne /*NoteContent::OpenSeveral*/); + if (url.isEmpty()) { + if (message.isEmpty()) + emit postMessage(i18n("Unable to open this note.") /*"Unable to open those notes."*/); + else { + int result = KMessageBox::warningContinueCancel(this, message, /*caption=*/QString::null, KGuiItem(i18n("&Edit"), "edit")); + if (result == KMessageBox::Continue) + noteEdit(note); + } + } else { + emit postMessage(message); // "Openning link target..." / "Launching application..." / "Openning note file..." + // Finally do the opening job: + QString customCommand = note->content()->customOpenCommand(); + if (customCommand.isEmpty()) { + KRun *run = new KRun(url, window()); + run->setAutoDelete(true); + } else + KRun::run(customCommand, url, window()); + } +} + +/** Code from bool KRun::displayOpenWithDialog(const KUrl::List& lst, bool tempFiles) + * It does not allow to set a text, so I ripped it to do that: + */ +bool KRun__displayOpenWithDialog(const KUrl::List& lst, QWidget *window, bool tempFiles, const QString &text) +{ + if (kapp && !KAuthorized::authorizeKAction("openwith")) { + KMessageBox::sorry(window, i18n("You are not authorized to open this file.")); // TODO: Better message, i18n freeze :-( + return false; + } + KOpenWithDialog l(lst, text, QString::null, 0L); + if (l.exec()) { + KService::Ptr service = l.service(); + if (!!service) + return KRun::run(*service, lst, window, tempFiles); + //kDebug(250) << "No service set, running " << l.text() << endl; + return KRun::run(l.text(), lst, window); // TODO handle tempFiles + } + return false; +} + +void BasketView::noteOpenWith(Note *note) +{ + if (!note) + note = theSelectedNote(); + if (!note) + return; + + KUrl url = note->content()->urlToOpen(/*with=*/true); + QString message = note->content()->messageWhenOpening(NoteContent::OpenOneWith /*NoteContent::OpenSeveralWith*/); + QString text = note->content()->messageWhenOpening(NoteContent::OpenOneWithDialog /*NoteContent::OpenSeveralWithDialog*/); + if (url.isEmpty()) + emit postMessage(i18n("Unable to open this note.") /*"Unable to open those notes."*/); + else if (KRun__displayOpenWithDialog(url, window(), false, text)) + emit postMessage(message); // "Opening link target with..." / "Opening note file with..." +} + +void BasketView::noteSaveAs() +{ +// if (!note) +// note = theSelectedNote(); + Note *note = theSelectedNote(); + if (!note) + return; + + KUrl url = note->content()->urlToOpen(/*with=*/false); + if (url.isEmpty()) + return; + + QString fileName = KFileDialog::getSaveFileName(url.fileName(), note->content()->saveAsFilters(), this, i18n("Save to File")); + // TODO: Ask to overwrite ! + if (fileName.isEmpty()) + return; + + // TODO: Convert format, etc. (use NoteContent::saveAs(fileName)) + KIO::copy(url, KUrl(fileName)); +} + +Note* BasketView::selectedGroup() +{ + FOR_EACH_NOTE(note) { + Note *selectedGroup = note->selectedGroup(); + if (selectedGroup) { + // If the selected group is one group in a column, then return that group, and not the column, + // because the column is not ungrouppage, and the Ungroup action would be disabled. + if (selectedGroup->isColumn() && selectedGroup->firstChild() && !selectedGroup->firstChild()->next()) { + return selectedGroup->firstChild(); + } + return selectedGroup; + } + } + return 0; +} + +bool BasketView::selectionIsOneGroup() +{ + return (selectedGroup() != 0); +} + +Note* BasketView::firstSelected() +{ + Note *first = 0; + FOR_EACH_NOTE(note) { + first = note->firstSelected(); + if (first) + return first; + } + return 0; +} + +Note* BasketView::lastSelected() +{ + Note *last = 0, *tmp = 0; + FOR_EACH_NOTE(note) { + tmp = note->lastSelected(); + if (tmp) + last = tmp; + } + return last; +} + +bool BasketView::convertTexts() +{ + m_watcher->stopScan(); + bool convertedNotes = false; + + if (!isLoaded()) + load(); + + FOR_EACH_NOTE(note) + if (note->convertTexts()) + convertedNotes = true; + + if (convertedNotes) + save(); + m_watcher->startScan(); + return convertedNotes; +} + +void BasketView::noteGroup() +{ + /* // Nothing to do? + if (isLocked() || countSelecteds() <= 1) + return; + + // If every selected notes are ALREADY in one group, then don't touch anything: + Note *selectedGroup = this->selectedGroup(); + if (selectedGroup && !selectedGroup->isColumn()) + return; + */ + + // Copied from BNPView::updateNotesActions() + bool severalSelected = countSelecteds() >= 2; + Note *selectedGroup = (severalSelected ? this->selectedGroup() : 0); + bool enabled = !isLocked() && severalSelected && (!selectedGroup || selectedGroup->isColumn()); + if (!enabled) + return; + + // Get the first selected note: we will group selected items just before: + Note *first = firstSelected(); +// if (selectedGroup != 0 || first == 0) +// return; + + m_loaded = false; // Hack to avoid notes to be unselected and new notes to be selected: + + // Create and insert the receiving group: + Note *group = new Note(this); + if (first->isFree()) { + insertNote(group, 0L, Note::BottomColumn, QPoint(first->finalX(), first->finalY()), /*animateNewPosition=*/false); + } else { + insertNote(group, first, Note::TopInsert, QPoint(), /*animateNewPosition=*/false); + } + + // Put a FAKE UNSELECTED note in the new group, so if the new group is inside an allSelected() group, the parent group is not moved inside the new group! + Note *fakeNote = NoteFactory::createNoteColor(Qt::red, this); + insertNote(fakeNote, group, Note::BottomColumn, QPoint(), /*animateNewPosition=*/false); + + // Group the notes: + Note *nextNote; + Note *note = firstNote(); + while (note) { + nextNote = note->next(); + note->groupIn(group); + note = nextNote; + } + + m_loaded = true; // Part 2 / 2 of the workarround! + + // Do cleanup: + unplugNote(fakeNote); + unselectAll(); + group->setSelectedRecursively(true); // Notes were unselected by unplugging + + relayoutNotes(true); + save(); +} + +void BasketView::noteUngroup() +{ + Note *group = selectedGroup(); + if (group && !group->isColumn()) + ungroupNote(group); + save(); +} + +void BasketView::unplugSelection(NoteSelection *selection) +{ + for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) + unplugNote(toUnplug->note); +} + +void BasketView::insertSelection(NoteSelection *selection, Note *after) +{ + for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) { + if (toUnplug->note->isGroup()) { + Note *group = new Note(this); + insertNote(group, after, Note::BottomInsert, QPoint(), /*animateNewPosition=*/false); + Note *fakeNote = NoteFactory::createNoteColor(Qt::red, this); + insertNote(fakeNote, group, Note::BottomColumn, QPoint(), /*animateNewPosition=*/false); + insertSelection(toUnplug->firstChild, fakeNote); + unplugNote(fakeNote); + after = group; + } else { + Note *note = toUnplug->note; + note->setPrev(0); + note->setNext(0); + insertNote(note, after, Note::BottomInsert, QPoint(), /*animateNewPosition=*/true); + after = note; + } + } +} + +void BasketView::selectSelection(NoteSelection *selection) +{ + for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) { + if (toUnplug->note->isGroup()) + selectSelection(toUnplug); + else + toUnplug->note->setSelected(true); + } +} + +void BasketView::noteMoveOnTop() +{ + // TODO: Get the group containing the selected notes and first move inside the group, then inside parent group, then in the basket + // TODO: Move on top/bottom... of the column or basjet + + NoteSelection *selection = selectedNotes(); + unplugSelection(selection); + // Replug the notes: + Note *fakeNote = NoteFactory::createNoteColor(Qt::red, this); + if (isColumnsLayout()) { + if (firstNote()->firstChild()) + insertNote(fakeNote, firstNote()->firstChild(), Note::TopInsert, QPoint(), /*animateNewPosition=*/false); + else + insertNote(fakeNote, firstNote(), Note::BottomColumn, QPoint(), /*animateNewPosition=*/false); + } else { + // TODO: Also allow to move notes on top of a group!!!!!!! + insertNote(fakeNote, 0, Note::BottomInsert, QPoint(0, 0), /*animateNewPosition=*/false); + } + insertSelection(selection, fakeNote); + unplugNote(fakeNote); + selectSelection(selection); + relayoutNotes(true); + save(); +} + +void BasketView::noteMoveOnBottom() +{ + + // TODO: Duplicate code: void noteMoveOn(); + + // TODO: Get the group containing the selected notes and first move inside the group, then inside parent group, then in the basket + // TODO: Move on top/bottom... of the column or basjet + + NoteSelection *selection = selectedNotes(); + unplugSelection(selection); + // Replug the notes: + Note *fakeNote = NoteFactory::createNoteColor(Qt::red, this); + if (isColumnsLayout()) + insertNote(fakeNote, firstNote(), Note::BottomColumn, QPoint(), /*animateNewPosition=*/false); + else { + // TODO: Also allow to move notes on top of a group!!!!!!! + insertNote(fakeNote, 0, Note::BottomInsert, QPoint(0, 0), /*animateNewPosition=*/false); + } + insertSelection(selection, fakeNote); + unplugNote(fakeNote); + selectSelection(selection); + relayoutNotes(true); + save(); +} + +void BasketView::moveSelectionTo(Note *here, bool below/* = true*/) +{ + NoteSelection *selection = selectedNotes(); + unplugSelection(selection); + // Replug the notes: + Note *fakeNote = NoteFactory::createNoteColor(Qt::red, this); +// if (isColumnsLayout()) + insertNote(fakeNote, here, (below ? Note::BottomInsert : Note::TopInsert), QPoint(), /*animateNewPosition=*/false); +// else { +// // TODO: Also allow to move notes on top of a group!!!!!!! +// insertNote(fakeNote, 0, Note::BottomInsert, QPoint(0, 0), /*animateNewPosition=*/false); +// } + insertSelection(selection, fakeNote); + unplugNote(fakeNote); + selectSelection(selection); + relayoutNotes(true); + save(); +} + +void BasketView::noteMoveNoteUp() +{ + + // TODO: Move between columns, even if they are empty !!!!!!! + + // TODO: if first note of a group, move just above the group! And let that even if there is no note before that group!!! + + Note *first = firstSelected(); + Note *previous = first->prevShownInStack(); + if (previous) + moveSelectionTo(previous, /*below=*/false); +} + +void BasketView::noteMoveNoteDown() +{ + Note *first = lastSelected(); + Note *next = first->nextShownInStack(); + if (next) + moveSelectionTo(next, /*below=*/true); +} + +void BasketView::wheelEvent(QWheelEvent *event) +{ + Q3ScrollView::wheelEvent(event); +} + +void BasketView::linkLookChanged() +{ + Note *note = m_firstNote; + while (note) { + note->linkLookChanged(); + note = note->next(); + } + relayoutNotes(true); +} + +void BasketView::slotCopyingDone2(KIO::Job *job, + const KUrl &/*from*/, + const KUrl &to) +{ + if (job->error()) { + DEBUG_WIN << "Copy finished, ERROR"; + return; + } + Note *note = noteForFullPath(to.path()); + DEBUG_WIN << "Copy finished, load note: " + to.path() + (note ? "" : " --- NO CORRESPONDING NOTE"); + if (note != 0L) { + note->content()->loadFromFile(/*lazyLoad=*/false); + if (isEncrypted()) + note->content()->saveToFile(); + if (m_focusedNote == note) // When inserting a new note we ensure it visble + ensureNoteVisible(note); // But after loading it has certainly grown and if it was + } // on bottom of the basket it's not visible entirly anymore +} + +Note* BasketView::noteForFullPath(const QString &path) +{ + Note *note = firstNote(); + Note *found; + while (note) { + found = note->noteForFullPath(path); + if (found) + return found; + note = note->next(); + } + return 0; +} + +void BasketView::deleteFiles() +{ + m_watcher->stopScan(); + Tools::deleteRecursively(fullPath()); +} + +QList BasketView::usedStates() +{ + QList states; + FOR_EACH_NOTE(note) + note->usedStates(states); + return states; +} + +QString BasketView::saveGradientBackground(const QColor &color, const QFont &font, const QString &folder) +{ + // Construct file name and return if the file already exists: + QString fileName = "note_background_" + color.name().toLower().mid(1) + ".png"; + QString fullPath = folder + fileName; + if (QFile::exists(fullPath)) + return fileName; + + // Get the gradient top and bottom colors: + QColor topBgColor; + QColor bottomBgColor; + Note::getGradientColors(color, &topBgColor, &bottomBgColor); + + // Draw and save the gradient image: + int sampleTextHeight = QFontMetrics(font) + .boundingRect(0, 0, /*width=*/10000, /*height=*/0, Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, "Test text") + .height(); + QPixmap noteGradient(100, sampleTextHeight + Note::NOTE_MARGIN); + QPainter painter(¬eGradient); + drawGradient(&painter, topBgColor, bottomBgColor, 0, 0, noteGradient.width(), noteGradient.height(), /*sunken=*/false, /*horz=*/true, /*flat=*/false); + painter.end(); + noteGradient.save(fullPath, "PNG"); + + // Return the name of the created file: + return fileName; +} + +void BasketView::listUsedTags(QList &list) +{ + if (!isLoaded()) { + load(); + } + + FOR_EACH_NOTE(child) + child->listUsedTags(list); +} + + +/** Unfocus the previously focused note (unless it was null) + * and focus the new @param note (unless it is null) if hasFocus() + * Update m_focusedNote to the new one + */ +void BasketView::setFocusedNote(Note *note) // void BasketView::changeFocusTo(Note *note) +{ + // Don't focus an hidden note: + if (note != 0L && !note->isShown()) + return; + // When clicking a group, this group gets focused. But only content-based notes should be focused: + if (note && note->isGroup()) + note = note->firstRealChild(); + // The first time a note is focused, it becomes the start of the Shift selection: + if (m_startOfShiftSelectionNote == 0) + m_startOfShiftSelectionNote = note; + // Unfocus the old focused note: + if (m_focusedNote != 0L) + m_focusedNote->setFocused(false); + // Notify the new one to draw a focus rectangle... only if the basket is focused: + if (hasFocus() && note != 0L) + note->setFocused(true); + // Save the new focused note: + m_focusedNote = note; +} + +/** If no shown note is currently focused, try to find a shown note and focus it + * Also update m_focusedNote to the new one (or null if there isn't) + */ +void BasketView::focusANote() +{ + if (countFounds() == 0) { // No note to focus + setFocusedNote(0L); +// m_startOfShiftSelectionNote = 0; + return; + } + + if (m_focusedNote == 0L) { // No focused note yet : focus the first shown + Note *toFocus = (isFreeLayout() ? noteOnHome() : firstNoteShownInStack()); + setFocusedNote(toFocus); +// m_startOfShiftSelectionNote = m_focusedNote; + return; + } + + // Search a visible note to focus if the focused one isn't shown : + Note *toFocus = m_focusedNote; + if (toFocus && !toFocus->isShown()) + toFocus = toFocus->nextShownInStack(); + if (!toFocus && m_focusedNote) + toFocus = m_focusedNote->prevShownInStack(); + setFocusedNote(toFocus); +// m_startOfShiftSelectionNote = toFocus; +} + +Note* BasketView::firstNoteInStack() +{ + if (!firstNote()) + return 0; + + if (firstNote()->content()) + return firstNote(); + else + return firstNote()->nextInStack(); +} + +Note* BasketView::lastNoteInStack() +{ + Note *note = lastNote(); + while (note) { + if (note->content()) + return note; + Note *possibleNote = note->lastRealChild(); + if (possibleNote && possibleNote->content()) + return possibleNote; + note = note->prev(); + } + return 0; +} + +Note* BasketView::firstNoteShownInStack() +{ + Note *first = firstNoteInStack(); + while (first && !first->isShown()) + first = first->nextInStack(); + return first; +} + +Note* BasketView::lastNoteShownInStack() +{ + Note *last = lastNoteInStack(); + while (last && !last->isShown()) + last = last->prevInStack(); + return last; +} + +inline int abs(int n) +{ + return (n < 0 ? -n : n); +} + +Note* BasketView::noteOn(NoteOn side) +{ + Note *bestNote = 0; + int distance = -1; + int bestDistance = contentsWidth() * contentsHeight() * 10; + + Note *note = firstNoteShownInStack(); + Note *primary = m_focusedNote->parentPrimaryNote(); + while (note) { + switch (side) { + case LEFT_SIDE: distance = m_focusedNote->distanceOnLeftRight(note, LEFT_SIDE); break; + case RIGHT_SIDE: distance = m_focusedNote->distanceOnLeftRight(note, RIGHT_SIDE); break; + case TOP_SIDE: distance = m_focusedNote->distanceOnTopBottom(note, TOP_SIDE); break; + case BOTTOM_SIDE: distance = m_focusedNote->distanceOnTopBottom(note, BOTTOM_SIDE); break; + } + if ((side == TOP_SIDE || side == BOTTOM_SIDE || primary != note->parentPrimaryNote()) && note != m_focusedNote && distance > 0 && distance < bestDistance) { + bestNote = note; + bestDistance = distance; + } + note = note ->nextShownInStack(); + } + + return bestNote; +} + +Note* BasketView::firstNoteInGroup() +{ + Note *child = m_focusedNote; + Note *parent = (m_focusedNote ? m_focusedNote->parentNote() : 0); + while (parent) { + if (parent->firstChild() != child && !parent->isColumn()) + return parent->firstRealChild(); + child = parent; + parent = parent->parentNote(); + } + return 0; +} + +Note* BasketView::noteOnHome() +{ + // First try to find the first note of the group containing the focused note: + Note *child = m_focusedNote; + Note *parent = (m_focusedNote ? m_focusedNote->parentNote() : 0); + while (parent) { + if (parent->nextShownInStack() != m_focusedNote) + return parent->nextShownInStack(); + child = parent; + parent = parent->parentNote(); + } + + // If it was not found, then focus the very first note in the basket: + if (isFreeLayout()) { + Note *first = firstNoteShownInStack(); // The effective first note found + Note *note = first; // The current note, to conpare with the previous first note, if this new note is more on top + if (note) + note = note->nextShownInStack(); + while (note) { + if (note->finalY() < first->finalY() || (note->finalY() == first->finalY() && note->finalX() < first->finalX())) + first = note; + note = note->nextShownInStack(); + } + return first; + } else + return firstNoteShownInStack(); +} + +Note* BasketView::noteOnEnd() +{ + Note *child = m_focusedNote; + Note *parent = (m_focusedNote ? m_focusedNote->parentNote() : 0); + Note *lastChild; + while (parent) { + lastChild = parent->lastRealChild(); + if (lastChild && lastChild != m_focusedNote) { + if (lastChild->isShown()) + return lastChild; + lastChild = lastChild->prevShownInStack(); + if (lastChild && lastChild->isShown() && lastChild != m_focusedNote) + return lastChild; + } + child = parent; + parent = parent->parentNote(); + } + if (isFreeLayout()) { + Note *last; + Note *note; + last = note = firstNoteShownInStack(); + note = note->nextShownInStack(); + while (note) { + if (note->finalBottom() > last->finalBottom() || (note->finalBottom() == last->finalBottom() && note->finalX() > last->finalX())) + last = note; + note = note->nextShownInStack(); + } + return last; + } else + return lastNoteShownInStack(); +} + + +void BasketView::keyPressEvent(QKeyEvent *event) +{ + if (isDuringEdit() && event->key() == Qt::Key_Return) { + //if (m_editor->lineEdit()) + // closeEditor(); + //else + m_editor->widget()->setFocus(); + } else if (event->key() == Qt::Key_Escape) { + if (isDuringEdit()) + closeEditor(); + else if (decoration()->filterData().isFiltering) + decoration()->filterBar()->reset(); + else + unselectAll(); + } + + if (countFounds() == 0) + return; + + if (!m_focusedNote) + return; + + Note *toFocus = 0L; + + switch (event->key()) { + case Qt::Key_Down: + toFocus = (isFreeLayout() ? noteOn(BOTTOM_SIDE) : m_focusedNote->nextShownInStack()); + if (toFocus) + break; + scrollBy(0, 30); // This cases do not move focus to another note... + return; + case Qt::Key_Up: + toFocus = (isFreeLayout() ? noteOn(TOP_SIDE) : m_focusedNote->prevShownInStack()); + if (toFocus) + break; + scrollBy(0, -30); // This cases do not move focus to another note... + return; + case Qt::Key_PageDown: + if (isFreeLayout()) { + Note *lastFocused = m_focusedNote; + for (int i = 0; i < 10 && m_focusedNote; ++i) + m_focusedNote = noteOn(BOTTOM_SIDE); + toFocus = m_focusedNote; + m_focusedNote = lastFocused; + } else { + toFocus = m_focusedNote; + for (int i = 0; i < 10 && toFocus; ++i) + toFocus = toFocus->nextShownInStack(); + } + if (toFocus == 0L) + toFocus = (isFreeLayout() ? noteOnEnd() : lastNoteShownInStack()); + if (toFocus && toFocus != m_focusedNote) + break; + scrollBy(0, visibleHeight() / 2); // This cases do not move focus to another note... + return; + case Qt::Key_PageUp: + if (isFreeLayout()) { + Note *lastFocused = m_focusedNote; + for (int i = 0; i < 10 && m_focusedNote; ++i) + m_focusedNote = noteOn(TOP_SIDE); + toFocus = m_focusedNote; + m_focusedNote = lastFocused; + } else { + toFocus = m_focusedNote; + for (int i = 0; i < 10 && toFocus; ++i) + toFocus = toFocus->prevShownInStack(); + } + if (toFocus == 0L) + toFocus = (isFreeLayout() ? noteOnHome() : firstNoteShownInStack()); + if (toFocus && toFocus != m_focusedNote) + break; + scrollBy(0, - visibleHeight() / 2); // This cases do not move focus to another note... + return; + case Qt::Key_Home: + toFocus = noteOnHome(); + break; + case Qt::Key_End: + toFocus = noteOnEnd(); + break; + case Qt::Key_Left: + if (m_focusedNote->tryFoldParent()) + return; + if ((toFocus = noteOn(LEFT_SIDE))) + break; + if ((toFocus = firstNoteInGroup())) + break; + scrollBy(-30, 0); // This cases do not move focus to another note... + return; + case Qt::Key_Right: + if (m_focusedNote->tryExpandParent()) + return; + if ((toFocus = noteOn(RIGHT_SIDE))) + break; + scrollBy(30, 0); // This cases do not move focus to another note... + return; + case Qt::Key_Space: // This case do not move focus to another note... + if (m_focusedNote) { + m_focusedNote->setSelected(! m_focusedNote->isSelected()); + event->accept(); + } else + event->ignore(); + return; // ... so we return after the process + default: + return; + } + + if (toFocus == 0L) { // If no direction keys have been pressed OR reached out the begin or end + event->ignore(); // Important !! + return; + } + + if (event->modifiers() & Qt::ShiftModifier) { // Shift+arrowKeys selection + if (m_startOfShiftSelectionNote == 0L) + m_startOfShiftSelectionNote = toFocus; + ensureNoteVisible(toFocus); // Important: this line should be before the other ones because else repaint would be done on the wrong part! + selectRange(m_startOfShiftSelectionNote, toFocus); + setFocusedNote(toFocus); + event->accept(); + return; + } else /*if (toFocus != m_focusedNote)*/ { // Move focus to ANOTHER note... + ensureNoteVisible(toFocus); // Important: this line should be before the other ones because else repaint would be done on the wrong part! + setFocusedNote(toFocus); + m_startOfShiftSelectionNote = toFocus; + if (!(event->modifiers() & Qt::ControlModifier)) // ... select only current note if Control + unselectAllBut(m_focusedNote); + event->accept(); + return; + } + + event->ignore(); // Important !! +} + +/** Select a range of notes and deselect the others. + * The order between start and end has no importance (end could be before start) + */ +void BasketView::selectRange(Note *start, Note *end, bool unselectOthers /*= true*/) +{ + Note *cur; + Note *realEnd = 0L; + + // Avoid crash when start (or end) is null + if (start == 0L) + start = end; + else if (end == 0L) + end = start; + // And if *both* are null + if (start == 0L) { + if (unselectOthers) + unselectAll(); + return; + } + // In case there is only one note to select + if (start == end) { + if (unselectOthers) + unselectAllBut(start); + else + start->setSelected(true); + return; + } + + // Free layout baskets should select range as if we were drawing a rectangle between start and end: + if (isFreeLayout()) { + QRect startRect(start->finalX(), start->finalY(), start->width(), start->finalHeight()); + QRect endRect(end->finalX(), end->finalY(), end->width(), end->finalHeight()); + QRect toSelect = startRect.unite(endRect); + selectNotesIn(toSelect, /*invertSelection=*/false, unselectOthers); + return; + } + + // Search the REAL first (and deselect the others before it) : + for (cur = firstNoteInStack(); cur != 0L; cur = cur->nextInStack()) { + if (cur == start || cur == end) + break; + if (unselectOthers) + cur->setSelected(false); + } + + // Select the notes after REAL start, until REAL end : + if (cur == start) + realEnd = end; + else if (cur == end) + realEnd = start; + + for (/*cur = cur*/; cur != 0L; cur = cur->nextInStack()) { + cur->setSelected(cur->isShown()); // Select all notes in the range, but only if they are shown + if (cur == realEnd) + break; + } + + if (!unselectOthers) + return; + + // Deselect the remaining notes : + if (cur) + cur = cur->nextInStack(); + for (/*cur = cur*/; cur != 0L; cur = cur->nextInStack()) + cur->setSelected(false); +} + +void BasketView::focusInEvent(QFocusEvent*) +{ + // Focus cannot be get with Tab when locked, but a click can focus the basket! + if (isLocked()) { + if (m_button) + QTimer::singleShot(0, m_button, SLOT(setFocus())); + } else + focusANote(); // hasFocus() is true at this stage, note will be focused +} + +void BasketView::focusOutEvent(QFocusEvent*) +{ + if (m_focusedNote != 0L) + m_focusedNote->setFocused(false); +} + +void BasketView::ensureNoteVisible(Note *note) +{ + if (!note->isShown()) // Logical! + return; + + if (note == editedNote()) // HACK: When filtering while editing big notes, etc... cause unwanted scrolls + return; + + int finalBottom = note->finalY() + qMin(note->finalHeight(), visibleHeight()); + int finalRight = note->finalX() + qMin(note->width() + (note->hasResizer() ? Note::RESIZER_WIDTH : 0), visibleWidth()); + ensureVisible(finalRight, finalBottom, 0, 0); + ensureVisible(note->finalX(), note->finalY(), 0, 0); +} + +void BasketView::addWatchedFile(const QString &fullPath) +{ +// DEBUG_WIN << "Watcher>Add Monitoring Of : " + fullPath + ""; + m_watcher->addFile(fullPath); +} + +void BasketView::removeWatchedFile(const QString &fullPath) +{ +// DEBUG_WIN << "Watcher>Remove Monitoring Of : " + fullPath + ""; + m_watcher->removeFile(fullPath); +} + +void BasketView::watchedFileModified(const QString &fullPath) +{ + if (!m_modifiedFiles.contains(fullPath)) + m_modifiedFiles.append(fullPath); + // If a big file is saved by an application, notifications are send several times. + // We wait they are not sent anymore to considere the file complete! + m_watcherTimer.setSingleShot(true); + m_watcherTimer.start(200); + DEBUG_WIN << "Watcher>Modified : " + fullPath + ""; +} + +void BasketView::watchedFileDeleted(const QString &fullPath) +{ + Note *note = noteForFullPath(fullPath); + removeWatchedFile(fullPath); + if (note) { + NoteSelection *selection = selectedNotes(); + unselectAllBut(note); + noteDeleteWithoutConfirmation(); + while (selection) { + selection->note->setSelected(true); + selection = selection->nextStacked(); + } + } + DEBUG_WIN << "Watcher>Removed : " + fullPath + ""; +} + +void BasketView::updateModifiedNotes() +{ + for (QList::iterator it = m_modifiedFiles.begin(); it != m_modifiedFiles.end(); ++it) { + Note *note = noteForFullPath(*it); + if (note) + note->content()->loadFromFile(/*lazyLoad=*/false); + } + m_modifiedFiles.clear(); +} + +bool BasketView::setProtection(int type, QString key) +{ +#ifdef HAVE_LIBGPGME + if (type == PasswordEncryption || // Ask a new password + m_encryptionType != type || m_encryptionKey != key) { + int savedType = m_encryptionType; + QString savedKey = m_encryptionKey; + + m_encryptionType = type; + m_encryptionKey = key; + m_gpg->clearCache(); + + if (saveAgain()) { + emit propertiesChanged(this); + } else { + m_encryptionType = savedType; + m_encryptionKey = savedKey; + m_gpg->clearCache(); + return false; + } + } + return true; +#else + m_encryptionType = type; + m_encryptionKey = key; + return false; +#endif +} + +bool BasketView::saveAgain() +{ + bool result = false; + + m_watcher->stopScan(); + // Re-encrypt basket file: + result = save(); + // Re-encrypt every note files recursively: + if (result) { + FOR_EACH_NOTE(note) { + result = note->saveAgain(); + if (!result) + break; + } + } + m_watcher->startScan(); + return result; +} + +bool BasketView::loadFromFile(const QString &fullPath, QString *string, bool isLocalEncoding) +{ + QByteArray array; + + if (loadFromFile(fullPath, &array)) { + if (isLocalEncoding) + *string = QString::fromLocal8Bit(array.data(), array.size()); + else + *string = QString::fromUtf8(array.data(), array.size()); + return true; + } else + return false; +} + +bool BasketView::isEncrypted() +{ + return (m_encryptionType != NoEncryption); +} + +bool BasketView::isFileEncrypted() +{ + QFile file(fullPath() + ".basket"); + + if (file.open(QIODevice::ReadOnly)) { + // Should be ASCII anyways + QString line = file.readLine(32); + if (line.startsWith("-----BEGIN PGP MESSAGE-----")) + return true; + } + return false; +} + +bool BasketView::loadFromFile(const QString &fullPath, QByteArray *array) +{ + QFile file(fullPath); + bool encrypted = false; + + if (file.open(QIODevice::ReadOnly)) { + *array = file.readAll(); + QByteArray magic = "-----BEGIN PGP MESSAGE-----"; + int i = 0; + + if (array->size() > magic.size()) + for (i = 0; array->at(i) == magic[i]; ++i) + ; + if (i == magic.size()) { + encrypted = true; + } + file.close(); +#ifdef HAVE_LIBGPGME + if (encrypted) { + QByteArray tmp(*array); + + tmp.detach(); + // Only use gpg-agent for private key encryption since it doesn't + // cache password used in symmetric encryption. + m_gpg->setUseGnuPGAgent(Settings::useGnuPGAgent() && m_encryptionType == PrivateKeyEncryption); + if (m_encryptionType == PrivateKeyEncryption) + m_gpg->setText(i18n("Please enter the password for the following private key:"), false); + else + m_gpg->setText(i18n("Please enter the password for the basket %1:", basketName()), false); // Used when decrypting + return m_gpg->decrypt(tmp, array); + } +#else + if (encrypted) { + return false; + } +#endif + return true; + } else + return false; +} + +bool BasketView::saveToFile(const QString& fullPath, const QString& string, bool isLocalEncoding) +{ + QByteArray bytes = (isLocalEncoding ? string.toLocal8Bit() : string.toUtf8()); + return saveToFile(fullPath, bytes, bytes.length()); +} + +bool BasketView::saveToFile(const QString& fullPath, const QByteArray& array) +{ + return saveToFile(fullPath, array, array.size()); +} + +bool BasketView::saveToFile(const QString& fullPath, const QByteArray& array, unsigned long length) +{ + bool success = true; + QByteArray tmp; + +#ifdef HAVE_LIBGPGME + if (isEncrypted()) { + QString key = QString::null; + + // We only use gpg-agent for private key encryption and saving without + // public key doesn't need one. + m_gpg->setUseGnuPGAgent(false); + if (m_encryptionType == PrivateKeyEncryption) { + key = m_encryptionKey; + // public key doesn't need password + m_gpg->setText("", false); + } else + m_gpg->setText(i18n("Please assign a password to the basket %1:", basketName()), true); // Used when defining a new password + + success = m_gpg->encrypt(array, length, &tmp, key); + length = tmp.size(); + } else + tmp = array; + +#else + success = !isEncrypted(); + if (success) + tmp = array; +#endif + /*if (success && (success = file.open(QIODevice::WriteOnly))){ + success = (file.write(tmp) == (Q_LONG)tmp.size()); + file.close(); + }*/ + + if (success) + return safelySaveToFile(fullPath, tmp, length); + else + return false; +} + +/** + * A safer version of saveToFile, that doesn't perform encryption. To save a + * file owned by a basket (i.e. a basket or a note file), use saveToFile(), but + * to save to another file, (e.g. the basket hierarchy), use this function + * instead. + */ +/*static*/ bool BasketView::safelySaveToFile(const QString& fullPath, + const QByteArray& array, + unsigned long length) +{ + // Modulus operandi: + // 1. Use KSaveFile to try and save the file + // 2. Show a modal dialog (with the error) when bad things happen + // 3. We keep trying (at increasing intervals, up until every minute) + // until we finally save the file. + + // The error dialog is static to make sure we never show the dialog twice, + static DiskErrorDialog *dialog = 0; + static const uint maxDelay = 60 * 1000; // ms + uint retryDelay = 1000; // ms + bool success = false; + do { + KSaveFile saveFile(fullPath); + if (saveFile.open()) { + saveFile.write(array, length); + if (saveFile.finalize()) + success = true; + } + + if (!success) { + if (!dialog) { + dialog = new DiskErrorDialog(i18n("Error while saving"), + saveFile.errorString(), + kapp->activeWindow()); + } + + if (!dialog->isVisible()) + dialog->show(); + + static const uint sleepDelay = 50; // ms + for (uint i = 0; i < retryDelay / sleepDelay; ++i) { + kapp->processEvents(); + usleep(sleepDelay * 1000); // usec + } + // Double the retry delay, but don't go over the max. + retryDelay = qMin(maxDelay, retryDelay * 2); // ms + } + } while (!success); + + if (dialog) + dialog->deleteLater(); + dialog = NULL; + + return true; // Guess we can't really return a fail +} + +/*static*/ bool BasketView::safelySaveToFile(const QString& fullPath, const QString& string, bool isLocalEncoding) +{ + QByteArray bytes = (isLocalEncoding ? string.toLocal8Bit() : string.toUtf8()); + return safelySaveToFile(fullPath, bytes, bytes.length() - 1); +} + +/*static*/ bool BasketView::safelySaveToFile(const QString& fullPath, const QByteArray& array) +{ + return safelySaveToFile(fullPath, array, array.size()); +} + +void BasketView::lock() +{ +#ifdef HAVE_LIBGPGME + closeEditor(); + m_gpg->clearCache(); + m_locked = true; + enableActions(); + deleteNotes(); + m_loaded = false; + m_loadingLaunched = false; + updateContents(); +#endif +} diff -Nru basket-2.0~20091110/src/basketview.h basket-2.0~20102801/src/basketview.h --- basket-2.0~20091110/src/basketview.h 1970-01-01 01:00:00.000000000 +0100 +++ basket-2.0~20102801/src/basketview.h 2009-11-24 20:28:01.000000000 +0000 @@ -0,0 +1,668 @@ +/*************************************************************************** + * Copyright (C) 2003 by Sébastien Laoût * + * slaout@linux62.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * 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. * + ***************************************************************************/ + +#ifndef BASKET_H +#define BASKET_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "filter.h" +#include "note.h" // For Note::Zone +#include "config.h" + +class QDomDocument; +class QDomElement; + +class DecoratedBasket; +class Note; +class NoteEditor; +class Tag; +class TransparentWidget; +#ifdef HAVE_LIBGPGME +class KGpgMe; +#endif + +/** + * @author Sébastien Laoût + */ +class BasketView : public Q3ScrollView +{ + Q_OBJECT +public: + enum EncryptionTypes { + NoEncryption = 0, + PasswordEncryption = 1, + PrivateKeyEncryption = 2 + }; + +public: +/// CONSTRUCTOR AND DESTRUCTOR: + BasketView(QWidget *parent, const QString &folderName); + ~BasketView(); + +/// USER INTERACTION: +private: + bool m_noActionOnMouseRelease; + bool m_ignoreCloseEditorOnNextMouseRelease; + QPoint m_pressPos; + bool m_canDrag; + +public: + void viewportResizeEvent(QResizeEvent *); + void drawContents(QPainter *painter); + void drawContents(QPainter *painter, int clipX, int clipY, int clipWidth, int clipHeight); + void enterEvent(QEvent *); + void leaveEvent(QEvent *); + void contentsMouseMoveEvent(QMouseEvent *event); + void contentsMousePressEvent(QMouseEvent *event); + void contentsMouseReleaseEvent(QMouseEvent *event); + void contentsMouseDoubleClickEvent(QMouseEvent *event); + void contentsContextMenuEvent(QContextMenuEvent *event); + void updateNote(Note *note); + void clickedToInsert(QMouseEvent *event, Note *clicked = 0, int zone = 0); +private slots: + void setFocusIfNotInPopupMenu(); + +/// LAYOUT: +private: + Note *m_firstNote; + int m_columnsCount; + bool m_mindMap; + Note *m_resizingNote; + int m_pickedResizer; + Note *m_movingNote; + QPoint m_pickedHandle; +public: + int tmpWidth; + int tmpHeight; +public: + void unsetNotesWidth(); + void relayoutNotes(bool animate); + Note* noteAt(int x, int y); + inline Note* firstNote() { + return m_firstNote; + } + inline int columnsCount() { + return m_columnsCount; + } + inline bool isColumnsLayout() { + return m_columnsCount > 0; + } + inline bool isFreeLayout() { + return m_columnsCount <= 0; + } + inline bool isMindMap() { + return isFreeLayout() && m_mindMap; + } + Note* resizingNote() { + return m_resizingNote; + } + void deleteNotes(); + Note* lastNote(); + void setDisposition(int disposition, int columnCount); + void equalizeColumnSizes(); + +/// NOTES INSERTION AND REMOVAL: +public: + /// The following methods assume that the note(s) to insert already all have 'this' as the parent basket: + void prependNoteIn(Note *note, Note *in); /// << Add @p note (and the next linked notes) as the first note(s) of the group @p in. + void appendNoteIn(Note *note, Note *in); /// << Add @p note (and the next linked notes) as the last note(s) of the group @p in. + void appendNoteAfter(Note *note, Note *after); /// << Add @p note (and the next linked notes) just after (just below) the note @p after. + void appendNoteBefore(Note *note, Note *before); /// << Add @p note (and the next linked notes) just before (just above) the note @p before. + void groupNoteAfter(Note *note, Note *with); /// << Add a group at @p with place, move @p with in it, and add @p note (and the next linked notes) just after the group. + void groupNoteBefore(Note *note, Note *with); /// << Add a group at @p with place, move @p with in it, and add @p note (and the next linked notes) just before the group. + void unplugNote(Note *note); /// << Unplug @p note (and its child notes) from the basket (and also decrease counts...). + /// << After that, you should delete the notes yourself. Do not call prepend/append/group... functions two times: unplug and ok + void ungroupNote(Note *group); /// << Unplug @p group but put child notes at its place. + /// And this one do almost all the above methods depending on the context: + void insertNote(Note *note, Note *clicked, int zone, const QPoint &pos = QPoint(), bool animateNewPosition = false); + void insertCreatedNote(Note *note); + /// And working with selections: + void unplugSelection(NoteSelection *selection); + void insertSelection(NoteSelection *selection, Note *after); + void selectSelection(NoteSelection *selection); +private: + void preparePlug(Note *note); +private: + Note *m_clickedToInsert; + int m_zoneToInsert; + QPoint m_posToInsert; + Note *m_savedClickedToInsert; + int m_savedZoneToInsert; + QPoint m_savedPosToInsert; + bool m_isInsertPopupMenu; + QAction *m_insertMenuTitle; +public: + void saveInsertionData(); + void restoreInsertionData(); + void resetInsertionData(); +public slots: + void insertEmptyNote(int type); + void insertWizard(int type); + void insertColor(const QColor &color); + void insertImage(const QPixmap &image); + void pasteNote(QClipboard::Mode mode = QClipboard::Clipboard); + void delayedCancelInsertPopupMenu(); + void setInsertPopupMenu() { + m_isInsertPopupMenu = true; + } + void cancelInsertPopupMenu() { + m_isInsertPopupMenu = false; + } +private slots: + void hideInsertPopupMenu(); + void timeoutHideInsertPopupMenu(); + +/// TOOL TIPS: +protected: + bool event(QEvent *event); + // TODO: replace with QGraphicsScene::helpEvent() + void tooltipEvent(QHelpEvent *event); + +/// ANIMATIONS: +private: + QList m_animatedNotes; + QTimer m_animationTimer; + int m_deltaY; + QTime m_lastFrameTime; + static const int FRAME_DELAY; +private slots: + void animateObjects(); +public slots: + void animateLoad(); +public: + void addAnimatedNote(Note *note); + +/// LOAD AND SAVE: +private: + bool m_loaded; + bool m_loadingLaunched; + bool m_locked; + bool m_shouldConvertPlainTextNotes; + QFrame* m_decryptBox; + QPushButton* m_button; + int m_encryptionType; + QString m_encryptionKey; +#ifdef HAVE_LIBGPGME + KGpgMe* m_gpg; +#endif + QTimer m_inactivityAutoLockTimer; + void enableActions(); + +private slots: + void loadNotes(const QDomElement ¬es, Note *parent); + void saveNotes(QDomDocument &document, QDomElement &element, Note *parent); + void unlock(); +protected slots: + void inactivityAutoLockTimeout(); +public slots: + void load(); + void loadProperties(const QDomElement &properties); + void saveProperties(QDomDocument &document, QDomElement &properties); + bool save(); + void reload(); +public: + bool isEncrypted(); + bool isFileEncrypted(); + bool isLocked() { + return m_locked; + }; + void lock(); + bool isLoaded() { + return m_loaded; + }; + bool loadingLaunched() { + return m_loadingLaunched; + }; + bool loadFromFile(const QString &fullPath, QString* string, bool isLocalEncoding = false); + bool loadFromFile(const QString &fullPath, QByteArray* array); + bool saveToFile(const QString& fullPath, const QByteArray& array); + bool saveToFile(const QString& fullPath, const QByteArray& array, unsigned long length); + bool saveToFile(const QString& fullPath, const QString& string, bool isLocalEncoding = false); + static bool safelySaveToFile(const QString& fullPath, const QByteArray& array); + static bool safelySaveToFile(const QString& fullPath, const QByteArray& array, unsigned long length); + static bool safelySaveToFile(const QString& fullPath, const QString& string, bool isLocalEncoding = false); + bool setProtection(int type, QString key); + int encryptionType() { + return m_encryptionType; + }; + QString encryptionKey() { + return m_encryptionKey; + }; + bool saveAgain(); + +/// BACKGROUND: +private: + QColor m_backgroundColorSetting; + QString m_backgroundImageName; + QPixmap *m_backgroundPixmap; + QPixmap *m_opaqueBackgroundPixmap; + QPixmap *m_selectedBackgroundPixmap; + bool m_backgroundTiled; + QColor m_textColorSetting; +public: + inline bool hasBackgroundImage() { + return m_backgroundPixmap != 0; + } + inline const QPixmap* backgroundPixmap() { + return m_backgroundPixmap; + } + inline bool isTiledBackground() { + return m_backgroundTiled; + } + inline QString backgroundImageName() { + return m_backgroundImageName; + } + inline QColor backgroundColorSetting() { + return m_backgroundColorSetting; + } + inline QColor textColorSetting() { + return m_textColorSetting; + } + QColor backgroundColor(); + QColor textColor(); + void setAppearance(const QString &icon, const QString &name, const QString &backgroundImage, const QColor &backgroundColor, const QColor &textColor); + void blendBackground(QPainter &painter, const QRect &rect, int xPainter = -1, int yPainter = -1, bool opaque = false, QPixmap *bg = 0); + void unbufferizeAll(); + void subscribeBackgroundImages(); + void unsubscribeBackgroundImages(); + +/// KEYBOARD SHORTCUT: +public: + KAction *m_action; +private: + int m_shortcutAction; +private slots: + void activatedShortcut(); +public: + KShortcut shortcut() { + return m_action->shortcut(); + } + int shortcutAction() { + return m_shortcutAction; + } + void setShortcut(KShortcut shortcut, int action); + +/// USER INTERACTION: +private: + Note *m_hoveredNote; + int m_hoveredZone; + bool m_lockedHovering; + bool m_underMouse; + QRect m_inserterRect; + bool m_inserterShown; + bool m_inserterSplit; + bool m_inserterTop; + bool m_inserterGroup; + void placeInserter(Note *note, int zone); + void removeInserter(); +public: +// bool inserterShown() { return m_inserterShown; } + bool inserterSplit() { + return m_inserterSplit; + } + bool inserterGroup() { + return m_inserterGroup; + } +public slots: + void doHoverEffects(Note *note, Note::Zone zone, const QPoint &pos = QPoint(0, 0)); /// << @p pos is optionnal and only used to show the link target in the statusbar + void doHoverEffects(const QPoint &pos); + void doHoverEffects(); // The same, but using the current cursor position + void mouseEnteredEditorWidget(); +public: + void popupTagsMenu(Note *note); + void popupEmblemMenu(Note *note, int emblemNumber); + void addTagToSelectedNotes(Tag *tag); + void removeTagFromSelectedNotes(Tag *tag); + void removeAllTagsFromSelectedNotes(); + void addStateToSelectedNotes(State *state); + void changeStateOfSelectedNotes(State *state); + bool selectedNotesHaveTags(); + const QRect& inserterRect() { + return m_inserterRect; + } + bool inserterShown() { + return m_inserterShown; + } + void drawInserter(QPainter &painter, int xPainter, int yPainter); + DecoratedBasket* decoration(); + State *stateForTagFromSelectedNotes(Tag *tag); +public slots: + void activatedTagShortcut(Tag *tag); + void recomputeAllStyles(); + void removedStates(const QList &deletedStates); +private slots: + void toggledTagInMenu(QAction *act); + void toggledStateInMenu(QAction *act); + void unlockHovering(); + void disableNextClick(); + void contentsMoved(); +public: + Note *m_tagPopupNote; +private: + Tag *m_tagPopup; + QTime m_lastDisableClick; + +/// SELECTION: +private: + bool m_isSelecting; + bool m_selectionStarted; + bool m_selectionInvert; + QPoint m_selectionBeginPoint; + QPoint m_selectionEndPoint; + QRect m_selectionRect; + QTimer m_autoScrollSelectionTimer; + void stopAutoScrollSelection(); +private slots: + void doAutoScrollSelection(); +public: + inline bool isSelecting() { + return m_isSelecting; + } + inline const QRect& selectionRect() { + return m_selectionRect; + } + void selectNotesIn(const QRect &rect, bool invertSelection, bool unselectOthers = true); + void resetWasInLastSelectionRect(); + void selectAll(); + void unselectAll(); + void invertSelection(); + void unselectAllBut(Note *toSelect); + void invertSelectionOf(Note *toSelect); + QColor selectionRectInsideColor(); + Note* theSelectedNote(); + NoteSelection* selectedNotes(); + +/// BLANK SPACES DRAWING: +private: + QList m_blankAreas; + void recomputeBlankRects(); + QWidget *m_cornerWidget; + +/// COMMUNICATION WITH ITS CONTAINER: +signals: + void postMessage(const QString &message); /// << Post a temporar message in the statusBar. + void setStatusBarText(const QString &message); /// << Set the permanent statusBar text or reset it if message isEmpty(). + void resetStatusBarText(); /// << Equivalent to setStatusBarText(""). + void propertiesChanged(BasketView *basket); + void countsChanged(BasketView *basket); +public slots: + void linkLookChanged(); + void signalCountsChanged(); +private: + QTimer m_timerCountsChanged; +private slots: + void countsChangedTimeOut(); + +/// NOTES COUNTING: +public: + void addSelectedNote() { + ++m_countSelecteds; signalCountsChanged(); + } + void removeSelectedNote() { + --m_countSelecteds; signalCountsChanged(); + } + void resetSelectedNote() { + m_countSelecteds = 0; signalCountsChanged(); + } // FIXME: Useful ??? + int count() { + return m_count; + } + int countFounds() { + return m_countFounds; + } + int countSelecteds() { + return m_countSelecteds; + } +private: + int m_count; + int m_countFounds; + int m_countSelecteds; + +/// PROPERTIES: +public: + QString basketName() { + return m_basketName; + } + QString icon() { + return m_icon; + } + QString folderName() { + return m_folderName; + } + QString fullPath(); + QString fullPathForFileName(const QString &fileName); // Full path of an [existing or not] note in this basket + static QString fullPathForFolderName(const QString &folderName); +private: + QString m_basketName; + QString m_icon; + QString m_folderName; + +/// ACTIONS ON SELECTED NOTES FROM THE INTERFACE: +public slots: + void noteEdit(Note *note = 0L, bool justAdded = false, const QPoint &clickedPoint = QPoint()); + void showEditedNoteWhileFiltering(); + void noteDelete(); + void noteDeleteWithoutConfirmation(bool deleteFilesToo = true); + void noteCopy(); + void noteCut(); + void noteOpen(Note *note = 0L); + void noteOpenWith(Note *note = 0L); + void noteSaveAs(); + void noteGroup(); + void noteUngroup(); + void noteMoveOnTop(); + void noteMoveOnBottom(); + void noteMoveNoteUp(); + void noteMoveNoteDown(); + void moveSelectionTo(Note *here, bool below); +public: + enum CopyMode { CopyToClipboard, CopyToSelection, CutToClipboard }; + void doCopy(CopyMode copyMode); + bool selectionIsOneGroup(); + Note* selectedGroup(); + Note* firstSelected(); + Note* lastSelected(); + +/// NOTES EDITION: +private: + NoteEditor *m_editor; + //QWidget *m_rightEditorBorder; + TransparentWidget *m_leftEditorBorder; + TransparentWidget *m_rightEditorBorder; + bool m_redirectEditActions; + int m_editorWidth; + int m_editorHeight; + QTimer m_inactivityAutoSaveTimer; + bool m_doNotCloseEditor; + QTextCursor m_textCursor; +public: + bool isDuringEdit() { + return m_editor; + } + bool redirectEditActions() { + return m_redirectEditActions; + } + bool hasTextInEditor(); + bool hasSelectedTextInEditor(); + bool selectedAllTextInEditor(); + Note* editedNote(); +protected slots: + void selectionChangedInEditor(); + void contentChangedInEditor(); + void inactivityAutoSaveTimeout(); +public slots: + void editorCursorPositionChanged(); +private: + int m_editorX; + int m_editorY; +public slots: + void placeEditor(bool andEnsureVisible = false); + void placeEditorAndEnsureVisible(); + bool closeEditor(); + void closeEditorDelayed(); + void updateEditorAppearance(); + void editorPropertiesChanged(); + void openBasket(); + void closeBasket(); + +/// FILTERING: +public slots: + void newFilter(const FilterData &data, bool andEnsureVisible = true); + void filterAgain(bool andEnsureVisible = true); + void filterAgainDelayed(); + bool isFiltering(); + +/// DRAG AND DROP: +private: + bool m_isDuringDrag; + QList m_draggedNotes; +public: + static void acceptDropEvent(QDropEvent *event, bool preCond = true); + void contentsDropEvent(QDropEvent *event); + void blindDrop(QDropEvent* event); + bool isDuringDrag() { + return m_isDuringDrag; + } + QList draggedNotes() { + return m_draggedNotes; + } +protected: + void contentsDragEnterEvent(QDragEnterEvent*); + void contentsDragMoveEvent(QDragMoveEvent *event); + void contentsDragLeaveEvent(QDragLeaveEvent*); +public slots: + void slotCopyingDone2(KIO::Job *job, const KUrl &from, const KUrl &to); +public: + Note* noteForFullPath(const QString &path); + +/// EXPORTATION: +public: + QList usedStates(); + static QString saveGradientBackground(const QColor &color, const QFont &font, const QString &folder); + +public: + void listUsedTags(QList &list); + +/// MANAGE FOCUS: +private: + Note *m_focusedNote; +public: + void setFocusedNote(Note *note); + void focusANote(); + void focusANonSelectedNoteAbove(bool inSameColumn); + void focusANonSelectedNoteBelow(bool inSameColumn); + void focusANonSelectedNoteBelowOrThenAbove(); + void focusANonSelectedNoteAboveOrThenBelow(); + Note* focusedNote() { + return m_focusedNote; + } + Note* firstNoteInStack(); + Note* lastNoteInStack(); + Note* firstNoteShownInStack(); + Note* lastNoteShownInStack(); + void selectRange(Note *start, Note *end, bool unselectOthers = true); /// FIXME: Not really a focus related method! + void ensureNoteVisible(Note *note); + virtual void keyPressEvent(QKeyEvent *event); + virtual void focusInEvent(QFocusEvent*); + virtual void focusOutEvent(QFocusEvent*); + QRect noteVisibleRect(Note *note); // clipped global (desktop as origin) rectangle + Note* firstNoteInGroup(); + Note *noteOnHome(); + Note *noteOnEnd(); + + enum NoteOn { LEFT_SIDE = 1, RIGHT_SIDE, TOP_SIDE, BOTTOM_SIDE }; + Note* noteOn(NoteOn side); + +/// REIMPLEMENTED: +public: + void deleteFiles(); + bool convertTexts(); + + +public: + void wheelEvent(QWheelEvent *event); + + + +public: + Note *m_startOfShiftSelectionNote; + + +/// THE NEW FILE WATCHER: +private: + KDirWatch *m_watcher; + QTimer m_watcherTimer; + QList m_modifiedFiles; +public: + void addWatchedFile(const QString &fullPath); + void removeWatchedFile(const QString &fullPath); +private slots: + void watchedFileModified(const QString &fullPath); + void watchedFileDeleted(const QString &fullPath); + void updateModifiedNotes(); + + +/// FROM OLD ARCHITECTURE ********************** + +public slots: + + void showFrameInsertTo() {} + void resetInsertTo() {} + + void computeInsertPlace(const QPoint &/*cursorPosition*/) { } +public: + + friend class SystemTray; + +/// SPEED OPTIMIZATION +private: + bool m_finishLoadOnFirstShow; + bool m_relayoutOnNextShow; +public: + void aboutToBeActivated(); +}; + +#endif // BASKET_H diff -Nru basket-2.0~20091110/src/bnpview.cpp basket-2.0~20102801/src/bnpview.cpp --- basket-2.0~20091110/src/bnpview.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/bnpview.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -61,7 +61,7 @@ #include #include "bnpview.h" -#include "basket.h" +#include "basketview.h" #include "decoratedbasket.h" #include "tools.h" #include "settings.h" @@ -903,7 +903,7 @@ item = m_tree->itemAt(pos); QString menuName; if (item) { - Basket* basket = ((BasketListViewItem*)item)->basket(); + BasketView* basket = ((BasketListViewItem*)item)->basket(); setCurrentBasket(basket); menuName = "basket_popup"; @@ -937,7 +937,7 @@ save(m_tree, 0, document, root); // Write to Disk: - Basket::safelySaveToFile(Global::basketsFolder() + "baskets.xml", "\n" + document.toString()); + BasketView::safelySaveToFile(Global::basketsFolder() + "baskets.xml", "\n" + document.toString()); // QFile file(Global::basketsFolder() + "baskets.xml"); // if (file.open(QIODevice::WriteOnly)) { // QTextStream stream(&file); @@ -956,7 +956,7 @@ // For each basket: for (int i = 0; i < listView->topLevelItemCount(); i++) { item = listView->topLevelItem(i); - Basket* basket = ((BasketListViewItem *)item)->basket(); + BasketView* basket = ((BasketListViewItem *)item)->basket(); QDomElement basketElement = document.createElement("basket"); parentElement.appendChild(basketElement); @@ -981,7 +981,7 @@ } } } else { - Basket* basket = ((BasketListViewItem *)item)->basket(); + BasketView* basket = ((BasketListViewItem *)item)->basket(); QDomElement basketElement = document.createElement("basket"); parentElement.appendChild(basketElement); @@ -1009,7 +1009,7 @@ QDomElement BNPView::basketElement(QTreeWidgetItem *item, QDomDocument &document, QDomElement &parentElement) { - Basket *basket = ((BasketListViewItem*)item)->basket(); + BasketView *basket = ((BasketListViewItem*)item)->basket(); QDomElement basketElement = document.createElement("basket"); parentElement.appendChild(basketElement); // Save Attributes: @@ -1054,7 +1054,7 @@ if ((!element.isNull()) && element.tagName() == "basket") { QString folderName = element.attribute("folderName"); if (!folderName.isEmpty()) { - Basket *basket = loadBasket(folderName); + BasketView *basket = loadBasket(folderName); BasketListViewItem *basketItem = appendBasket(basket, item); basketItem->setExpanded(!XMLWork::trueOrFalse(element.attribute("folded", "false"), false)); basket->loadProperties(XMLWork::getElement(element, "properties")); @@ -1068,17 +1068,17 @@ } } -Basket* BNPView::loadBasket(const QString &folderName) +BasketView* BNPView::loadBasket(const QString &folderName) { if (folderName.isEmpty()) return 0; DecoratedBasket *decoBasket = new DecoratedBasket(m_stack, folderName); - Basket *basket = decoBasket->basket(); + BasketView *basket = decoBasket->basket(); m_stack->addWidget(decoBasket); - connect(basket, SIGNAL(countsChanged(Basket*)), this, SLOT(countsChanged(Basket*))); + connect(basket, SIGNAL(countsChanged(BasketView*)), this, SLOT(countsChanged(BasketView*))); // Important: Create listViewItem and connect signal BEFORE loadProperties(), so we get the listViewItem updated without extra work: - connect(basket, SIGNAL(propertiesChanged(Basket*)), this, SLOT(updateBasketListViewItem(Basket*))); + connect(basket, SIGNAL(propertiesChanged(BasketView*)), this, SLOT(updateBasketListViewItem(BasketView*))); connect(basket->decoration()->filterBar(), SIGNAL(newFilter(const FilterData&)), this, SLOT(newFilterFromFilterBar())); @@ -1114,7 +1114,7 @@ return item->childCount() > 0; } -BasketListViewItem* BNPView::appendBasket(Basket *basket, QTreeWidgetItem *parentItem) +BasketListViewItem* BNPView::appendBasket(BasketView *basket, QTreeWidgetItem *parentItem) { BasketListViewItem *newBasketItem; if (parentItem) @@ -1128,9 +1128,9 @@ return newBasketItem; } -void BNPView::loadNewBasket(const QString &folderName, const QDomElement &properties, Basket *parent) +void BNPView::loadNewBasket(const QString &folderName, const QDomElement &properties, BasketView *parent) { - Basket *basket = loadBasket(folderName); + BasketView *basket = loadBasket(folderName); appendBasket(basket, (basket ? listViewItemForBasket(parent) : 0)); basket->loadProperties(properties); setCurrentBasket(basket); @@ -1266,7 +1266,7 @@ //currentBasket()->decoration()->filterBar()->setFilterAll(doFilter); -// Basket *current = currentBasket(); +// BasketView *current = currentBasket(); QTreeWidgetItemIterator it(m_tree); while (*it) { BasketListViewItem *item = ((BasketListViewItem*) * it); @@ -1299,7 +1299,7 @@ alreadyEntered = true; shouldRestart = false; - Basket *current = currentBasket(); + BasketView *current = currentBasket(); const FilterData &filterData = current->decoration()->filterBar()->filterData(); // Set the filter data for every other baskets, or reset the filter for every other baskets if we just disabled the filterInAllBaskets: @@ -1321,12 +1321,12 @@ // Load every baskets for filtering, if they are not already loaded, and if necessary: if (filterData.isFiltering) { - Basket *current = currentBasket(); + BasketView *current = currentBasket(); QTreeWidgetItemIterator it(m_tree); while (*it) { BasketListViewItem *item = ((BasketListViewItem*) * it); if (item->basket() != current) { - Basket *basket = item->basket(); + BasketView *basket = item->basket(); if (!basket->loadingLaunched() && !basket->isLocked()) basket->load(); basket->filterAgain(); @@ -1360,7 +1360,7 @@ } -BasketListViewItem* BNPView::listViewItemForBasket(Basket *basket) +BasketListViewItem* BNPView::listViewItemForBasket(BasketView *basket) { QTreeWidgetItemIterator it(m_tree); while (*it) { @@ -1372,7 +1372,7 @@ return 0L; } -Basket* BNPView::currentBasket() +BasketView* BNPView::currentBasket() { DecoratedBasket *decoBasket = (DecoratedBasket*)m_stack->currentWidget(); if (decoBasket) @@ -1381,7 +1381,7 @@ return 0; } -Basket* BNPView::parentBasketOf(Basket *basket) +BasketView* BNPView::parentBasketOf(BasketView *basket) { BasketListViewItem *item = (BasketListViewItem*)(listViewItemForBasket(basket)->parent()); if (item) @@ -1390,7 +1390,7 @@ return 0; } -void BNPView::setCurrentBasket(Basket *basket) +void BNPView::setCurrentBasket(BasketView *basket) { if (currentBasket() == basket) return; @@ -1423,7 +1423,7 @@ emit basketChanged(); } -void BNPView::removeBasket(Basket *basket) +void BNPView::removeBasket(BasketView *basket) { if (basket->isDuringEdit()) basket->closeEditor(); @@ -1522,7 +1522,7 @@ } } -void BNPView::updateBasketListViewItem(Basket *basket) +void BNPView::updateBasketListViewItem(BasketView *basket) { BasketListViewItem *item = listViewItemForBasket(basket); if (item) @@ -1548,7 +1548,7 @@ void BNPView::slotPressed(QTreeWidgetItem *item, int column) { - Basket *basket = currentBasket(); + BasketView *basket = currentBasket(); if (basket == 0) return; @@ -1682,7 +1682,7 @@ dialog.exec(); } -void BNPView::countsChanged(Basket *basket) +void BNPView::countsChanged(BasketView *basket) { if (basket == currentBasket()) notesStateChanged(); @@ -1690,7 +1690,7 @@ void BNPView::notesStateChanged() { - Basket *basket = currentBasket(); + BasketView *basket = currentBasket(); // Update statusbar message : if (currentBasket()->isLocked()) @@ -1729,7 +1729,7 @@ bool severalSelected = currentBasket()->countSelecteds() >= 2; // FIXME: m_actCheckNotes is also modified in void BNPView::areSelectedNotesCheckedChanged(bool checked) - // bool Basket::areSelectedNotesChecked() should return false if bool Basket::showCheckBoxes() is false + // bool BasketView::areSelectedNotesChecked() should return false if bool BasketView::showCheckBoxes() is false // m_actCheckNotes->setChecked( oneOrSeveralSelected && // currentBasket()->areSelectedNotesChecked() && // currentBasket()->showCheckBoxes() ); @@ -1989,10 +1989,10 @@ showPassiveDropped(i18n("Grabbed screen zone to basket %1")); } -Basket* BNPView::basketForFolderName(const QString &folderName) +BasketView* BNPView::basketForFolderName(const QString &folderName) { /* QPtrList basketsList = listBaskets(); - Basket *basket; + BasketView *basket; for (basket = basketsList.first(); basket; basket = basketsList.next()) if (basket->folderName() == folderName) return basket; @@ -2014,7 +2014,7 @@ return 0; } -Note* BNPView::noteForFileName(const QString &fileName, Basket &basket, Note* note) +Note* BNPView::noteForFileName(const QString &fileName, BasketView &basket, Note* note) { if (!note) note = basket.firstNote(); @@ -2064,7 +2064,7 @@ void BNPView::delBasket() { // DecoratedBasket *decoBasket = currentDecoratedBasket(); - Basket *basket = currentBasket(); + BasketView *basket = currentBasket(); int really = KMessageBox::questionYesNo(this, i18n("Do you really want to remove the basket %1 and its contents?", @@ -2102,7 +2102,7 @@ // rebuildBasketsMenu(); } -void BNPView::doBasketDeletion(Basket *basket) +void BNPView::doBasketDeletion(BasketView *basket) { basket->closeEditor(); @@ -2125,13 +2125,13 @@ { #ifdef HAVE_LIBGPGME PasswordDlg dlg(kapp->activeWindow()); - Basket *cur = currentBasket(); + BasketView *cur = currentBasket(); dlg.setType(cur->encryptionType()); dlg.setKey(cur->encryptionKey()); if (dlg.exec()) { cur->setProtection(dlg.type(), dlg.key()); - if (cur->encryptionType() != Basket::NoEncryption) + if (cur->encryptionType() != BasketView::NoEncryption) cur->lock(); } #endif @@ -2140,7 +2140,7 @@ void BNPView::lockBasket() { #ifdef HAVE_LIBGPGME - Basket *cur = currentBasket(); + BasketView *cur = currentBasket(); cur->lock(); #endif @@ -2148,7 +2148,7 @@ void BNPView::saveAsArchive() { - Basket *basket = currentBasket(); + BasketView *basket = currentBasket(); QDir dir; @@ -2241,7 +2241,7 @@ askNewBasket(0, 0); } -void BNPView::askNewBasket(Basket *parent, Basket *pickProperties) +void BNPView::askNewBasket(BasketView *parent, BasketView *pickProperties) { NewBasketDefaultProperties properties; if (pickProperties) { @@ -2370,7 +2370,7 @@ m_passivePopup->show(); } -void BNPView::showPassiveLoading(Basket *basket) +void BNPView::showPassiveLoading(BasketView *basket) { if (isMainWindowActive()) return; @@ -2497,7 +2497,7 @@ bool BNPView::createNoteHtml(const QString content, const QString basket) { - Basket* b = basketForFolderName(basket); + BasketView* b = basketForFolderName(basket); if (!b) return false; Note* note = NoteFactory::createNoteHtml(content, b); @@ -2509,7 +2509,7 @@ bool BNPView::changeNoteHtml(const QString content, const QString basket, const QString noteName) { - Basket* b = basketForFolderName(basket); + BasketView* b = basketForFolderName(basket); if (!b) return false; Note* note = noteForFileName(noteName , *b); @@ -2523,7 +2523,7 @@ bool BNPView::createNoteFromFile(const QString url, const QString basket) { - Basket* b = basketForFolderName(basket); + BasketView* b = basketForFolderName(basket); if (!b) return false; KUrl kurl(url); @@ -2651,7 +2651,7 @@ void BNPView::enableActions() { - Basket *basket = currentBasket(); + BasketView *basket = currentBasket(); if (!basket) return; if (m_actLockBasket) diff -Nru basket-2.0~20091110/src/bnpview.h basket-2.0~20102801/src/bnpview.h --- basket-2.0~20091110/src/bnpview.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/bnpview.h 2009-11-24 20:28:01.000000000 +0000 @@ -51,7 +51,7 @@ class DesktopColorPicker; class RegionGrabber; -class Basket; +class BasketView; class DecoratedBasket; class BasketListViewItem; class NoteSelection; @@ -77,11 +77,11 @@ void linkLookChanged(); void filterPlacementChanged(bool onTop); /// MANAGE BASKETS: - BasketListViewItem* listViewItemForBasket(Basket *basket); - Basket* currentBasket(); - Basket* parentBasketOf(Basket *basket); - void setCurrentBasket(Basket *basket); - void removeBasket(Basket *basket); + BasketListViewItem* listViewItemForBasket(BasketView *basket); + BasketView* currentBasket(); + BasketView* parentBasketOf(BasketView *basket); + void setCurrentBasket(BasketView *basket); + void removeBasket(BasketView *basket); /// For NewBasketDialog (and later some other classes): int topLevelItemCount(); /// @@ -94,17 +94,17 @@ private: QDomElement basketElement(QTreeWidgetItem *item, QDomDocument &document, QDomElement &parentElement); public slots: - void countsChanged(Basket *basket); + void countsChanged(BasketView *basket); void notesStateChanged(); bool convertTexts(); - void updateBasketListViewItem(Basket *basket); + void updateBasketListViewItem(BasketView *basket); void save(); void save(QTreeWidget* listView, QTreeWidgetItem *firstItem, QDomDocument &document, QDomElement &parentElement); void saveSubHierarchy(QTreeWidgetItem *item, QDomDocument &document, QDomElement &parentElement, bool recursive); void load(); void load(QTreeWidget *listView, QTreeWidgetItem *item, const QDomElement &baskets); - void loadNewBasket(const QString &folderName, const QDomElement &properties, Basket *parent); + void loadNewBasket(const QString &folderName, const QDomElement &properties, BasketView *parent); void goToPreviousBasket(); void goToNextBasket(); void foldBasket(); @@ -164,7 +164,7 @@ void showPassiveContent(bool forceShow = false); void showPassiveContentForced(); void showPassiveImpossible(const QString &message); - void showPassiveLoading(Basket *basket); + void showPassiveLoading(BasketView *basket); // For GUI : void setFiltering(bool filtering); /** Edit */ @@ -181,9 +181,9 @@ void grabScreenshot(bool global = false); void grabScreenshotGlobal(); void screenshotGrabbed(const QPixmap &pixmap); - /** Basket */ + /** BasketView */ void askNewBasket(); - void askNewBasket(Basket *parent, Basket *pickProperties); + void askNewBasket(BasketView *parent, BasketView *pickProperties); void askNewSubBasket(); void askNewSiblingBasket(); void aboutToHideNewBasketPopup(); @@ -191,7 +191,7 @@ void cancelNewBasketPopup(); void propBasket(); void delBasket(); - void doBasketDeletion(Basket *basket); + void doBasketDeletion(BasketView *basket); void password(); void saveAsArchive(); void openArchive(); @@ -282,11 +282,11 @@ DecoratedBasket* currentDecoratedBasket(); public: - Basket* loadBasket(const QString &folderName); // Public only for class Archive - BasketListViewItem* appendBasket(Basket *basket, QTreeWidgetItem *parentItem); // Public only for class Archive + BasketView* loadBasket(const QString &folderName); // Public only for class Archive + BasketListViewItem* appendBasket(BasketView *basket, QTreeWidgetItem *parentItem); // Public only for class Archive - Basket* basketForFolderName(const QString &folderName); - Note* noteForFileName(const QString &fileName, Basket &basket, Note* note = 0); + BasketView* basketForFolderName(const QString &folderName); + Note* noteForFileName(const QString &fileName, BasketView &basket, Note* note = 0); KMenu* popupMenu(const QString &menuName); bool isPart(); bool isMainWindowActive(); diff -Nru basket-2.0~20091110/src/CMakeLists.txt basket-2.0~20102801/src/CMakeLists.txt --- basket-2.0~20091110/src/CMakeLists.txt 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/CMakeLists.txt 2009-11-24 20:28:01.000000000 +0000 @@ -8,7 +8,7 @@ archive.cpp backgroundmanager.cpp backup.cpp - basket.cpp + basketview.cpp basketfactory.cpp basketlistview.cpp basketproperties.cpp diff -Nru basket-2.0~20091110/src/decoratedbasket.cpp basket-2.0~20102801/src/decoratedbasket.cpp --- basket-2.0~20091110/src/decoratedbasket.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/decoratedbasket.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "basket.h" +#include "basketview.h" #include "decoratedbasket.h" #include "filter.h" #include "settings.h" @@ -32,7 +32,7 @@ { m_layout = new QVBoxLayout(this); m_filter = new FilterBar(this); - m_basket = new Basket(this, folderName); + m_basket = new BasketView(this, folderName); m_layout->addWidget(m_basket); setFilterBarPosition(Settings::filterOnTop()); diff -Nru basket-2.0~20091110/src/decoratedbasket.h basket-2.0~20102801/src/decoratedbasket.h --- basket-2.0~20091110/src/decoratedbasket.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/decoratedbasket.h 2009-11-24 20:28:01.000000000 +0000 @@ -22,7 +22,7 @@ #define DECORATEDBASKET_H class QString; -class Basket; +class BasketView; class QVBoxLayout; #include @@ -49,12 +49,12 @@ FilterBar* filterBar() { return m_filter; } - Basket* basket() { + BasketView* basket() { return m_basket; } private: QVBoxLayout *m_layout; FilterBar *m_filter; - Basket *m_basket; + BasketView *m_basket; }; #endif // DECORATEDBASKET_H diff -Nru basket-2.0~20091110/src/exporterdialog.cpp basket-2.0~20102801/src/exporterdialog.cpp --- basket-2.0~20091110/src/exporterdialog.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/exporterdialog.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -31,10 +31,10 @@ #include #include "exporterdialog.h" -#include "basket.h" +#include "basketview.h" #include "global.h" -ExporterDialog::ExporterDialog(Basket *basket, QWidget *parent, const char *name) +ExporterDialog::ExporterDialog(BasketView *basket, QWidget *parent, const char *name) : KDialog(parent) , m_basket(basket) { diff -Nru basket-2.0~20091110/src/exporterdialog.h basket-2.0~20102801/src/exporterdialog.h --- basket-2.0~20091110/src/exporterdialog.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/exporterdialog.h 2009-11-24 20:28:01.000000000 +0000 @@ -27,7 +27,7 @@ class QCheckBox; class QString; -class Basket; +class BasketView; /** * @author Sébastien Laoût @@ -36,7 +36,7 @@ { Q_OBJECT public: - ExporterDialog(Basket *basket, QWidget *parent = 0, const char *name = 0); + ExporterDialog(BasketView *basket, QWidget *parent = 0, const char *name = 0); ~ExporterDialog(); QString filePath(); bool embedLinkedFiles(); @@ -50,7 +50,7 @@ void save(); void accept(); private: - Basket *m_basket; + BasketView *m_basket; KUrlRequester *m_url; QCheckBox *m_embedLinkedFiles; QCheckBox *m_embedLinkedFolders; diff -Nru basket-2.0~20091110/src/focusedwidgets.cpp basket-2.0~20102801/src/focusedwidgets.cpp --- basket-2.0~20091110/src/focusedwidgets.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/focusedwidgets.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -25,7 +25,7 @@ #include "focusedwidgets.h" #include "bnpview.h" #include "global.h" -#include "basket.h" +#include "basketview.h" #ifdef KeyPress #undef KeyPress diff -Nru basket-2.0~20091110/src/formatimporter.cpp basket-2.0~20102801/src/formatimporter.cpp --- basket-2.0~20091110/src/formatimporter.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/formatimporter.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -34,7 +34,7 @@ #include "notecontent.h" #include "notefactory.h" #include "bnpview.h" -#include "basket.h" +#include "basketview.h" #include "global.h" #include "xmlwork.h" #include "tools.h" @@ -234,8 +234,8 @@ QDomElement annotNote = document->createElement("note"); annotNote.setAttribute("type", "text"); annotGroup.appendChild(annotNote); - QString annotFileName = Tools::fileNameForNewFile("annotations1.txt", Basket::fullPathForFolderName(folderName)); - QString annotFullPath = Basket::fullPathForFolderName(folderName) + "/" + annotFileName; + QString annotFileName = Tools::fileNameForNewFile("annotations1.txt", BasketView::fullPathForFolderName(folderName)); + QString annotFullPath = BasketView::fullPathForFolderName(folderName) + "/" + annotFileName; QFile file(annotFullPath); if (file.open(QIODevice::WriteOnly)) { QTextStream stream(&file); diff -Nru basket-2.0~20091110/src/htmlexporter.cpp basket-2.0~20102801/src/htmlexporter.cpp --- basket-2.0~20091110/src/htmlexporter.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/htmlexporter.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -21,7 +21,7 @@ #include "htmlexporter.h" #include "bnpview.h" #include "basketlistview.h" -#include "basket.h" +#include "basketview.h" #include "note.h" #include "tools.h" #include "config.h" @@ -45,7 +45,7 @@ #include #include -HTMLExporter::HTMLExporter(Basket *basket) +HTMLExporter::HTMLExporter(BasketView *basket) { QDir dir; @@ -92,7 +92,7 @@ config.sync(); prepareExport(basket, destination); - exportBasket(basket, /*isSubBasket*/false); + exportBasket(basket, /*isSubBasketView*/false); progress->setValue(progress->value() + 1); // Finishing finished } @@ -101,7 +101,7 @@ { } -void HTMLExporter::prepareExport(Basket *basket, const QString &fullPath) +void HTMLExporter::prepareExport(BasketView *basket, const QString &fullPath) { progress->setRange(0,/*Preparation:*/1 + /*Finishing:*/1 + /*Basket:*/1 + /*SubBaskets:*/Global::bnpView->basketCount(Global::bnpView->listViewItemForBasket(basket))); progress->setValue(0); @@ -132,7 +132,7 @@ progress->setValue(progress->value() + 1); // Preparation finished } -void HTMLExporter::exportBasket(Basket *basket, bool isSubBasket) +void HTMLExporter::exportBasket(BasketView *basket, bool isSubBasket) { if (!basket->isLoaded()) { basket->load(); @@ -208,7 +208,7 @@ QColor bottomBgColor; Note::getGradientColors(basket->backgroundColor(), &topBgColor, &bottomBgColor); // Compute the gradient image for notes: - QString gradientImageFileName = Basket::saveGradientBackground(basket->backgroundColor(), basket->Q3ScrollView::font(), imagesFolderPath); + QString gradientImageFileName = BasketView::saveGradientBackground(basket->backgroundColor(), basket->Q3ScrollView::font(), imagesFolderPath); // Output the header: QString borderColor = Tools::mixColor(basket->backgroundColor(), basket->textColor()).name(); @@ -467,14 +467,14 @@ } } -void HTMLExporter::writeBasketTree(Basket *currentBasket) +void HTMLExporter::writeBasketTree(BasketView *currentBasket) { stream << "
    \n"; writeBasketTree(currentBasket, exportedBasket, 3); stream << "
\n"; } -void HTMLExporter::writeBasketTree(Basket *currentBasket, Basket *basket, int indent) +void HTMLExporter::writeBasketTree(BasketView *currentBasket, BasketView *basket, int indent) { // Compute variable HTML code: QString spaces; diff -Nru basket-2.0~20091110/src/htmlexporter.h basket-2.0~20102801/src/htmlexporter.h --- basket-2.0~20091110/src/htmlexporter.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/htmlexporter.h 2009-11-24 20:28:01.000000000 +0000 @@ -26,7 +26,7 @@ class QProgressBar; -class Basket; +class BasketView; class Note; /** @@ -35,14 +35,14 @@ class HTMLExporter { public: - HTMLExporter(Basket *basket); + HTMLExporter(BasketView *basket); ~HTMLExporter(); private: - void prepareExport(Basket *basket, const QString &fullPath); - void exportBasket(Basket *basket, bool isSubBasket); + void prepareExport(BasketView *basket, const QString &fullPath); + void exportBasket(BasketView *basket, bool isSubBasket); void exportNote(Note *note, int indent); - void writeBasketTree(Basket *currentBasket); - void writeBasketTree(Basket *currentBasket, Basket *basket, int indent); + void writeBasketTree(BasketView *currentBasket); + void writeBasketTree(BasketView *currentBasket, BasketView *basket, int indent); public: QString copyIcon(const QString &iconName, int size); @@ -71,7 +71,7 @@ // Variables used by every export methods: QTextStream stream; - Basket *exportedBasket; + BasketView *exportedBasket; bool withBasketTree; QProgressBar *progress; }; diff -Nru basket-2.0~20091110/src/main.cpp basket-2.0~20102801/src/main.cpp --- basket-2.0~20091110/src/main.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/main.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -41,7 +41,7 @@ #include "global.h" #include "debugwindow.h" #include "notedrag.h" -#include "basket.h" +#include "basketview.h" #include "aboutdata.h" #include "basket_options.h" #include "backup.h" diff -Nru basket-2.0~20091110/src/mainwindow.cpp basket-2.0~20102801/src/mainwindow.cpp --- basket-2.0~20091110/src/mainwindow.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/mainwindow.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -69,7 +69,7 @@ #include #include "mainwindow.h" -#include "basket.h" +#include "basketview.h" #include "basketproperties.h" #include "note.h" #include "noteedit.h" diff -Nru basket-2.0~20091110/src/mainwindow.h basket-2.0~20102801/src/mainwindow.h --- basket-2.0~20091110/src/mainwindow.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/mainwindow.h 2009-11-24 20:28:01.000000000 +0000 @@ -45,7 +45,7 @@ class QStringList; class QToolTipGroup; class KPassivePopup; -class Basket; +class BasketView; class DecoratedBasket; class Container; class RegionGrabber; diff -Nru basket-2.0~20091110/src/newbasketdialog.cpp basket-2.0~20102801/src/newbasketdialog.cpp --- basket-2.0~20091110/src/newbasketdialog.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/newbasketdialog.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -38,7 +38,7 @@ #include "kicondialog.h" #include "newbasketdialog.h" #include "basketfactory.h" -#include "basket.h" +#include "basketview.h" #include "basketlistview.h" #include "variouswidgets.h" #include "kcolorcombo2.h" @@ -80,7 +80,7 @@ /** class NewBasketDialog: */ -NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultProperties &defaultProperties, QWidget *parent) +NewBasketDialog::NewBasketDialog(BasketView *parentBasket, const NewBasketDefaultProperties &defaultProperties, QWidget *parent) : KDialog(parent) , m_defaultProperties(defaultProperties) { @@ -242,7 +242,7 @@ if (parentBasket) { int index = 0; - for (QMap::Iterator it = m_basketsMap.begin(); it != m_basketsMap.end(); ++it) { + for (QMap::Iterator it = m_basketsMap.begin(); it != m_basketsMap.end(); ++it) { if (it.value() == parentBasket) { index = it.key(); break; @@ -268,7 +268,7 @@ { static const int ICON_SIZE = 16; // Get the basket data: - Basket* basket = ((BasketListViewItem *)item)->basket(); + BasketView* basket = ((BasketListViewItem *)item)->basket(); QPixmap icon = KIconLoader::global()->loadIcon( basket->icon(), KIconLoader::NoGroup, ICON_SIZE, KIconLoader::DefaultState, QStringList(), 0L, diff -Nru basket-2.0~20091110/src/newbasketdialog.h basket-2.0~20102801/src/newbasketdialog.h --- basket-2.0~20091110/src/newbasketdialog.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/newbasketdialog.h 2009-11-24 20:28:01.000000000 +0000 @@ -31,7 +31,7 @@ class QMimeData; class QComboBox; -class Basket; +class BasketView; class KColorCombo2; @@ -79,7 +79,7 @@ { Q_OBJECT public: - NewBasketDialog(Basket *parentBasket, const NewBasketDefaultProperties &defaultProperties, QWidget *parent = 0); + NewBasketDialog(BasketView *parentBasket, const NewBasketDefaultProperties &defaultProperties, QWidget *parent = 0); ~NewBasketDialog(); void ensurePolished(); protected slots: @@ -95,7 +95,7 @@ KColorCombo2 *m_backgroundColor; QListWidget *m_templates; QComboBox *m_createIn; - QMap m_basketsMap; + QMap m_basketsMap; }; #endif // NEWBASKETDIALOG_H diff -Nru basket-2.0~20091110/src/notecontent.cpp basket-2.0~20102801/src/notecontent.cpp --- basket-2.0~20091110/src/notecontent.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/notecontent.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -51,7 +51,7 @@ #include "note.h" #include "noteedit.h" #include "tag.h" -#include "basket.h" +#include "basketview.h" #include "filter.h" #include "xmlwork.h" #include "tools.h" @@ -135,7 +135,7 @@ } } -Basket* NoteContent::basket() +BasketView* NoteContent::basket() { if (note()) return note()->basket(); @@ -1786,10 +1786,10 @@ // << "IsDir:" + QString::number(fInfo.isDir()); if (exportData.embedLinkedFiles && fInfo.isFile()) { // DEBUG_WIN << "Embed file"; - linkURL = exportData.dataFolderName + Basket::copyFile(url().path(), exportData.dataFolderPath, true); + linkURL = exportData.dataFolderName + BasketView::copyFile(url().path(), exportData.dataFolderPath, true); } else if (exportData.embedLinkedFolders && fInfo.isDir()) { // DEBUG_WIN << "Embed folder"; - linkURL = exportData.dataFolderName + Basket::copyFile(url().path(), exportData.dataFolderPath, true); + linkURL = exportData.dataFolderName + BasketView::copyFile(url().path(), exportData.dataFolderPath, true); } else { // DEBUG_WIN << "Embed LINK"; */ diff -Nru basket-2.0~20091110/src/notecontent.h basket-2.0~20102801/src/notecontent.h --- basket-2.0~20091110/src/notecontent.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/notecontent.h 2009-11-24 20:28:01.000000000 +0000 @@ -54,7 +54,7 @@ } class Note; -class Basket; +class BasketView; class FilterData; class HtmlExporter; @@ -169,7 +169,7 @@ Note *note() { return m_note; } /// << Get the note managing this content. - Basket *basket(); /// << Get the basket containing the note managing this content. + BasketView *basket(); /// << Get the basket containing the note managing this content. public: void setEdited(); /// << Mark the note as edited NOW: change the "last modification time and time" AND save the basket to XML file. protected: diff -Nru basket-2.0~20091110/src/note.cpp basket-2.0~20102801/src/note.cpp --- basket-2.0~20091110/src/note.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/note.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -39,7 +39,7 @@ #undef None #endif -#include "basket.h" +#include "basketview.h" #include "tag.h" #include "note.h" #include "noteselection.h" @@ -56,9 +56,21 @@ #define FOR_EACH_CHILD(childVar) \ for (Note *childVar = firstChild(); childVar; childVar = childVar->next()) -// TODO: -#define FOR_EACH_VISIBLE_CHILD(childVar) \ - for (...) +class NotePrivate +{ +public: + NotePrivate() + : prev(0), next(0), x(0), y(-1), + width(-1), height(-1) + { + } + Note* prev; + Note* next; + int x; + int y; + int width; + int height; +}; int Note::NOTE_MARGIN = 2; int Note::INSERTION_HEIGHT = 5; @@ -71,9 +83,8 @@ int Note::EMBLEM_SIZE = 16; int Note::MIN_HEIGHT = 2 * NOTE_MARGIN + EMBLEM_SIZE; -Note::Note(Basket *parent) - : m_prev(0), m_next(0), - m_x(0), m_y(-1), m_width(-1), m_height(-1), +Note::Note(BasketView *parent) + : d(new NotePrivate), m_groupWidth(250), m_isFolded(false), m_firstChild(0L), m_parentNote(0), m_basket(parent), m_content(0), m_addedDate(QDateTime::currentDateTime()), m_lastModificationDate(QDateTime::currentDateTime()), @@ -91,6 +102,51 @@ deleteChilds(); } +void Note::setNext(Note* next) +{ + d->next = next; +} + +Note* Note::next() const +{ + return d->next; +} + +void Note::setPrev(Note* prev) +{ + d->prev = prev; +} + +Note* Note::prev() const +{ + return d->prev; +} + +int Note::y() const +{ + return d->y; +} + +int Note::x() const +{ + return d->x; +} + +int Note::bottom() const +{ + return d->y + d->height - 1; +} + +int Note::finalX() const +{ + return d->x + m_deltaX; +} + +int Note::finalY() const +{ + return d->y + m_deltaY; +} + QString Note::addedStringDate() { return KGlobal::locale()->formatDateTime(m_addedDate); @@ -524,18 +580,18 @@ bool Note::isFree() { - return parentNote() == 0 && basket()->isFreeLayout(); + return parentNote() == 0 && basket() && basket()->isFreeLayout(); } -bool Note::isColumn() +bool Note::isColumn() const { - return parentNote() == 0 && basket()->isColumnsLayout(); + return parentNote() == 0 && basket() && basket()->isColumnsLayout(); } bool Note::hasResizer() { // "isFree" || "isColmun but not the last" - return parentNote() == 0 && (basket()->isFreeLayout() || m_next != 0L); + return parentNote() == 0 && ((basket() && basket()->isFreeLayout()) || d->next != 0L); } int Note::resizerHeight() @@ -817,7 +873,7 @@ int deltaX = m_deltaX / 3; if (deltaX == 0) deltaX = (m_deltaX > 0 ? 1 : -1); - setX(m_x + deltaX); + setX(d->x + deltaX); m_deltaX -= deltaX; } @@ -826,7 +882,7 @@ int deltaY = m_deltaY / 3; if (deltaY == 0) deltaY = (m_deltaY > 0 ? 1 : -1); - setY(m_y + deltaY); + setY(d->y + deltaY); m_deltaY -= deltaY; } @@ -835,7 +891,7 @@ int deltaHeight = m_deltaHeight / 3; if (deltaHeight == 0) deltaHeight = (m_deltaHeight > 0 ? 1 : -1); - m_height += deltaHeight; + d->height += deltaHeight; unbufferize(); m_deltaHeight -= deltaHeight; } @@ -849,41 +905,61 @@ return (m_deltaX == 0 && m_deltaY == 0 && m_deltaHeight == 0); } +void Note::setHeight(int height) +{ + setInitialHeight(height); +} + +void Note::setInitialHeight(int height) +{ + d->height = height; +} + +int Note::height() const +{ + return d->height; +} + void Note::unsetWidth() { - m_width = 0; + d->width = 0; unbufferize(); FOR_EACH_CHILD(child) child->unsetWidth(); } +int Note::width() const +{ + return (isGroup() ? (isColumn() ? 0 : GROUP_WIDTH) : d->width); +} + void Note::requestRelayout() { - m_width = 0; + d->width = 0; unbufferize(); basket()->relayoutNotes(true); // TODO: A signal that will relayout ONCE and DELAYED if called several times } void Note::setWidth(int width) // TODO: inline ? { - if (m_width != width) + if (d->width != width) setWidthForceRelayout(width); } void Note::setWidthForceRelayout(int width) { unbufferize(); - m_width = (width < minWidth() ? minWidth() : width); + d->width = (width < minWidth() ? minWidth() : width); int contentWidth = width - contentX() - NOTE_MARGIN; if (m_content) { ///// FIXME: is this OK? if (contentWidth < 1) contentWidth = 1; if (contentWidth < m_content->minWidth()) contentWidth = m_content->minWidth(); - m_height = m_content->setWidthAndGetHeight(contentWidth/* < 1 ? 1 : contentWidth*/) + 2 * NOTE_MARGIN; - if (m_height < 3 * INSERTION_HEIGHT) // Assure a minimal size... - m_height = 3 * INSERTION_HEIGHT; + d->height = m_content->setWidthAndGetHeight(contentWidth/* < 1 ? 1 : contentWidth*/) + 2 * NOTE_MARGIN; + if (d->height < 3 * INSERTION_HEIGHT) // Assure a minimal size... + d->height = 3 * INSERTION_HEIGHT; } } @@ -919,7 +995,7 @@ void Note::setX(int x) { - if (m_x == x) + if (d->x == x) return; if (isBufferized() && basket()->hasBackgroundImage()) { @@ -928,19 +1004,19 @@ unbufferize(); else { int bgw = basket()->backgroundPixmap()->width(); - if (m_x >= bgw && x < bgw) // Was not in the background image and is now inside it: + if (d->x >= bgw && x < bgw) // Was not in the background image and is now inside it: unbufferize(); - else if (m_x < bgw) // Was in the background image and is now at another position of the background image or is now outside: + else if (d->x < bgw) // Was in the background image and is now at another position of the background image or is now outside: unbufferize(); } } - m_x = x; + d->x = x; } void Note::setY(int y) { - if (m_y == y) + if (d->y == y) return; if (isBufferized() && basket()->hasBackgroundImage()) { @@ -949,14 +1025,14 @@ unbufferize(); else { int bgh = basket()->backgroundPixmap()->height(); - if (m_y >= bgh && y < bgh) // Was not in the background image and is now inside it: + if (d->y >= bgh && y < bgh) // Was not in the background image and is now inside it: unbufferize(); - else if (m_y < bgh) // Was in the background image and is now at another position of the background image or is now outside: + else if (d->y < bgh) // Was in the background image and is now at another position of the background image or is now outside: unbufferize(); } } - m_y = y; + d->y = y; } @@ -1031,7 +1107,7 @@ if (matching() && hasResizer()) { int right = rightLimit(); // TODO: This code is dupliacted 3 times: !!!! - if ((x >= right) && (x < right + RESIZER_WIDTH) && (y >= m_y) && (y < m_y + resizerHeight())) { + if ((x >= right) && (x < right + RESIZER_WIDTH) && (y >= d->y) && (y < d->y + resizerHeight())) { if (! m_computedAreas) recomputeAreas(); for (QList::iterator it = m_areas.begin(); it != m_areas.end(); ++it) { @@ -1043,7 +1119,7 @@ } if (isGroup()) { - if ((x >= m_x) && (x < m_x + width()) && (y >= m_y) && (y < m_y + m_height)) { + if ((x >= d->x) && (x < d->x + width()) && (y >= d->y) && (y < d->y + d->height)) { if (! m_computedAreas) recomputeAreas(); for (QList::iterator it = m_areas.begin(); it != m_areas.end(); ++it) { @@ -1065,7 +1141,7 @@ child = child->next(); first = false; } - } else if (matching() && y >= m_y && y < m_y + m_height && x >= m_x && x < m_x + m_width) { + } else if (matching() && y >= d->y && y < d->y + d->height && x >= d->x && x < d->x + d->width) { if (! m_computedAreas) recomputeAreas(); for (QList::iterator it = m_areas.begin(); it != m_areas.end(); ++it) { @@ -1143,12 +1219,12 @@ child = child->next(); first = false; } - if (finalHeight() != h || m_height != h) { + if (finalHeight() != h || d->height != h) { unbufferize(); if (animate) addAnimation(0, 0, h - finalHeight()); else { - m_height = h; + d->height = h; unbufferize(); } } @@ -1206,17 +1282,17 @@ int Note::rightLimit() { - if (isColumn() && m_next == 0L) // The last column + if (isColumn() && d->next == 0L) // The last column return qMax(x() + minWidth(), basket()->visibleWidth()); else if (parentNote()) return parentNote()->rightLimit(); else - return m_x + m_groupWidth; + return d->x + m_groupWidth; } int Note::finalRightLimit() { - if (isColumn() && m_next == 0L) // The last column + if (isColumn() && d->next == 0L) // The last column return qMax(finalX() + minWidth(), basket()->visibleWidth()); else if (parentNote()) return parentNote()->finalRightLimit(); @@ -1286,7 +1362,7 @@ void Note::drawExpander(QPainter *painter, int x, int y, const QColor &background, bool expand, - Basket *basket) + BasketView *basket) { QStyleOption opt; opt.state = (expand ? QStyle::State_On : QStyle::State_Off); @@ -1297,8 +1373,14 @@ painter->fillRect(opt.rect, background); QStyle *style = basket->style(); - style->drawPrimitive(QStyle::PE_IndicatorBranch, &opt, painter, - basket->viewport()); + if (!expand){ + style->drawPrimitive(QStyle::PE_IndicatorArrowDown, &opt, painter, + basket->viewport()); + } + else{ + style->drawPrimitive(QStyle::PE_IndicatorArrowRight, &opt, painter, + basket->viewport()); + } } QColor expanderBackground(int height, int y, const QColor &foreground) @@ -2236,7 +2318,7 @@ addState(state, orReplace); FOR_EACH_CHILD(child) - child->addStateToSelectedNotes(state, orReplace); // TODO: Basket::addStateToSelectedNotes() does not have orReplace + child->addStateToSelectedNotes(state, orReplace); // TODO: BasketView::addStateToSelectedNotes() does not have orReplace } void Note::changeStateOfSelectedNotes(State *state) @@ -2674,7 +2756,7 @@ int Note::distanceOnLeftRight(Note *note, int side) { - if (side == Basket::RIGHT_SIDE) { + if (side == BasketView::RIGHT_SIDE) { // If 'note' is on left of 'this': cannot switch from this to note by pressing Right key: if (finalX() > note->finalX() || finalRightLimit() > note->finalRightLimit()) return -1; @@ -2686,7 +2768,7 @@ if (finalX() == note->finalX() && finalRightLimit() == note->finalRightLimit()) return -1; - float thisCenterX = finalX() + (side == Basket::LEFT_SIDE ? width() : /*RIGHT_SIDE:*/ 0); + float thisCenterX = finalX() + (side == BasketView::LEFT_SIDE ? width() : /*RIGHT_SIDE:*/ 0); float thisCenterY = finalY() + finalHeight() / 2; float noteCenterX = note->finalX() + note->width() / 2; float noteCenterY = note->finalY() + note->finalHeight() / 2; @@ -2709,7 +2791,7 @@ int Note::distanceOnTopBottom(Note *note, int side) { - if (side == Basket::BOTTOM_SIDE) { + if (side == BasketView::BOTTOM_SIDE) { // If 'note' is on left of 'this': cannot switch from this to note by pressing Right key: if (finalY() > note->finalY() || finalBottom() > note->finalBottom()) return -1; @@ -2722,7 +2804,7 @@ return -1; float thisCenterX = finalX() + width() / 2; - float thisCenterY = finalY() + (side == Basket::TOP_SIDE ? finalHeight() : /*BOTTOM_SIDE:*/ 0); + float thisCenterY = finalY() + (side == BasketView::TOP_SIDE ? finalHeight() : /*BOTTOM_SIDE:*/ 0); float noteCenterX = note->finalX() + note->width() / 2; float noteCenterY = note->finalY() + note->finalHeight() / 2; @@ -2792,3 +2874,6 @@ return convertedNotes; } + +/* vim: set et sts=4 sw=4 ts=16 tw=78 : */ + diff -Nru basket-2.0~20091110/src/notedrag.cpp basket-2.0~20102801/src/notedrag.cpp --- basket-2.0~20091110/src/notedrag.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/notedrag.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -29,7 +29,7 @@ #include #include -#include "basket.h" +#include "basketview.h" #include "notedrag.h" #include "notefactory.h" #include "noteselection.h" @@ -375,7 +375,7 @@ return source->hasFormat(NOTE_MIME_STRING); } -Basket* NoteDrag::basketOf(const QMimeData *source) +BasketView* NoteDrag::basketOf(const QMimeData *source) { QByteArray srcData = source->data(NOTE_MIME_STRING); QBuffer buffer(&srcData); @@ -384,7 +384,7 @@ // Get the parent basket: quint64 basketPointer; stream >> (quint64&)basketPointer; - return (Basket*)basketPointer; + return (BasketView*)basketPointer; } else return 0; } @@ -412,7 +412,7 @@ return QList(); } -Note* NoteDrag::decode(const QMimeData *source, Basket *parent, bool moveFiles, bool moveNotes) +Note* NoteDrag::decode(const QMimeData *source, BasketView *parent, bool moveFiles, bool moveNotes) { QByteArray srcData = source->data(NOTE_MIME_STRING); QBuffer buffer(&srcData); @@ -421,7 +421,7 @@ // Get the parent basket: quint64 basketPointer; stream >> (quint64&)basketPointer; - Basket *basket = (Basket*)basketPointer; + BasketView *basket = (BasketView*)basketPointer; // Get the note list: quint64 notePointer; QList notes; @@ -440,7 +440,7 @@ return 0; } -Note* NoteDrag::decodeHierarchy(QDataStream &stream, Basket *parent, bool moveFiles, bool moveNotes, Basket *originalBasket) +Note* NoteDrag::decodeHierarchy(QDataStream &stream, BasketView *parent, bool moveFiles, bool moveNotes, BasketView *originalBasket) { quint64 notePointer; quint64 type; diff -Nru basket-2.0~20091110/src/notedrag.h basket-2.0~20102801/src/notedrag.h --- basket-2.0~20091110/src/notedrag.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/notedrag.h 2009-11-24 20:28:01.000000000 +0000 @@ -30,13 +30,13 @@ class QDataStream; -class Basket; +class BasketView; class Note; class NoteSelection; /** Dragging/Copying/Cutting Scenario: * - User select some notes and cut them; - * - NoteDrag::toMultipleDrag() is called with a tree of the selected notes (see Basket::toSelectionTree()): + * - NoteDrag::toMultipleDrag() is called with a tree of the selected notes (see BasketView::toSelectionTree()): * - This method create a new QDrag object, create a stream, * - And then browse all notes and call the virtual Note::serialize() with the stream as parameter for them to serialize theire content in the "native format". * - This give the MIME type "application/x-basket-note" that will be used by the application to paste the notes exactly as they were. @@ -60,13 +60,13 @@ static void serializeImage(NoteSelection *noteList, QDrag *multipleDrag); static void serializeLinks(NoteSelection *noteList, QDrag *multipleDrag, bool cutting); static void setFeedbackPixmap(NoteSelection *noteList, QDrag *multipleDrag); - static Note* decodeHierarchy(QDataStream &stream, Basket *parent, bool moveFiles, bool moveNotes, Basket *originalBasket); + static Note* decodeHierarchy(QDataStream &stream, BasketView *parent, bool moveFiles, bool moveNotes, BasketView *originalBasket); public: static QPixmap feedbackPixmap(NoteSelection *noteList); static QDrag* dragObject(NoteSelection *noteList, bool cutting, QWidget *source = 0); static bool canDecode(const QMimeData *source); - static Note* decode(const QMimeData *source, Basket *parent, bool moveFiles, bool moveNotes); - static Basket* basketOf(const QMimeData *source); + static Note* decode(const QMimeData *source, BasketView *parent, bool moveFiles, bool moveNotes); + static BasketView* basketOf(const QMimeData *source); static QList notesOf(QDragEnterEvent *source); static void createAndEmptyCuttingTmpFolder(); diff -Nru basket-2.0~20091110/src/noteedit.cpp basket-2.0~20102801/src/noteedit.cpp --- basket-2.0~20091110/src/noteedit.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/noteedit.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -44,7 +44,7 @@ // Use Tools:: #include "notefactory.h" #include "note.h" -#include "basket.h" +#include "basketview.h" #include "settings.h" #include "tools.h" #include "variouswidgets.h" diff -Nru basket-2.0~20091110/src/notefactory.cpp basket-2.0~20102801/src/notefactory.cpp --- basket-2.0~20091110/src/notefactory.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/notefactory.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -45,7 +45,7 @@ #include #include -#include "basket.h" +#include "basketview.h" #include "note.h" #include "notefactory.h" #include "notedrag.h" @@ -64,7 +64,7 @@ /** Create notes from scratch (just a content) */ -Note* NoteFactory::createNoteText(const QString &text, Basket *parent, bool reallyPlainText/* = false*/) +Note* NoteFactory::createNoteText(const QString &text, BasketView *parent, bool reallyPlainText/* = false*/) { Note *note = new Note(parent); if (reallyPlainText) { @@ -80,7 +80,7 @@ return note; } -Note* NoteFactory::createNoteHtml(const QString &html, Basket *parent) +Note* NoteFactory::createNoteHtml(const QString &html, BasketView *parent) { Note *note = new Note(parent); HtmlContent *content = new HtmlContent(note, createFileForNewNote(parent, "html")); @@ -89,21 +89,21 @@ return note; } -Note* NoteFactory::createNoteLink(const KUrl &url, Basket *parent) +Note* NoteFactory::createNoteLink(const KUrl &url, BasketView *parent) { Note *note = new Note(parent); new LinkContent(note, url, titleForURL(url), iconForURL(url), /*autoTitle=*/true, /*autoIcon=*/true); return note; } -Note* NoteFactory::createNoteLink(const KUrl &url, const QString &title, Basket *parent) +Note* NoteFactory::createNoteLink(const KUrl &url, const QString &title, BasketView *parent) { Note *note = new Note(parent); new LinkContent(note, url, title, iconForURL(url), /*autoTitle=*/false, /*autoIcon=*/true); return note; } -Note* NoteFactory::createNoteImage(const QPixmap &image, Basket *parent) +Note* NoteFactory::createNoteImage(const QPixmap &image, BasketView *parent) { Note *note = new Note(parent); ImageContent *content = new ImageContent(note, createFileForNewNote(parent, "png")); @@ -112,7 +112,7 @@ return note; } -Note* NoteFactory::createNoteColor(const QColor &color, Basket *parent) +Note* NoteFactory::createNoteColor(const QColor &color, BasketView *parent) { Note *note = new Note(parent); new ColorContent(note, color); @@ -192,7 +192,7 @@ return list; } -Note* NoteFactory::createNoteFromText(const QString &text, Basket *parent) +Note* NoteFactory::createNoteFromText(const QString &text, BasketView *parent) { /* Search for a color (#RGB , #RRGGBB , #RRRGGGBBB , #RRRRGGGGBBBB) and create a color note */ QRegExp exp("^#(?:[a-fA-F\\d]{3}){1,4}$"); @@ -240,7 +240,7 @@ return createNoteText(/*newT*/text, parent); } -Note* NoteFactory::createNoteLauncher(const KUrl &url, Basket *parent) +Note* NoteFactory::createNoteLauncher(const KUrl &url, BasketView *parent) { if (url.isEmpty()) return createNoteLauncher("", "", "", parent); @@ -248,7 +248,7 @@ return copyFileAndLoad(url, parent); } -Note* NoteFactory::createNoteLauncher(const QString &command, const QString &name, const QString &icon, Basket *parent) +Note* NoteFactory::createNoteLauncher(const QString &command, const QString &name, const QString &icon, BasketView *parent) { QString fileName = createNoteLauncherFile(command, name, icon, parent); if (fileName.isEmpty()) @@ -257,7 +257,7 @@ return loadFile(fileName, parent); } -QString NoteFactory::createNoteLauncherFile(const QString &command, const QString &name, const QString &icon, Basket *parent) +QString NoteFactory::createNoteLauncherFile(const QString &command, const QString &name, const QString &icon, BasketView *parent) { QString content = QString( "[Desktop Entry]\n" @@ -280,7 +280,7 @@ return QString(); } -Note* NoteFactory::createNoteLinkOrLauncher(const KUrl &url, Basket *parent) +Note* NoteFactory::createNoteLinkOrLauncher(const KUrl &url, BasketView *parent) { // IMPORTANT: we create the service ONLY if the extension is ".desktop". // Otherwise, KService take a long time to analyse all the file @@ -299,7 +299,7 @@ } -bool NoteFactory::movingNotesInTheSameBasket(const QMimeData *source, Basket *parent, Qt::DropAction action) +bool NoteFactory::movingNotesInTheSameBasket(const QMimeData *source, BasketView *parent, Qt::DropAction action) { if (NoteDrag::canDecode(source)) return action == Qt::MoveAction && NoteDrag::basketOf(source) == parent; @@ -307,7 +307,7 @@ return false; } -Note* NoteFactory::dropNote(const QMimeData *source, Basket *parent, bool fromDrop, Qt::DropAction action, Note */*noteSource*/) +Note* NoteFactory::dropNote(const QMimeData *source, BasketView *parent, bool fromDrop, Qt::DropAction action, Note */*noteSource*/) { Note *note = 0L; @@ -446,7 +446,7 @@ return note; } -Note* NoteFactory::createNoteUnknown(const QMimeData *source, Basket *parent/*, const QString &annotations*/) +Note* NoteFactory::createNoteUnknown(const QMimeData *source, BasketView *parent/*, const QString &annotations*/) { // Save the MimeSource in a file: create and open the file: QString fileName = createFileForNewNote(parent, "unknown"); @@ -476,7 +476,7 @@ return note; } -Note* NoteFactory::dropURLs(KUrl::List urls, Basket *parent, Qt::DropAction action, bool fromDrop) +Note* NoteFactory::dropURLs(KUrl::List urls, BasketView *parent, Qt::DropAction action, bool fromDrop) { int shouldAsk = 0; // shouldAsk==0: don't ask ; shouldAsk==1: ask for "file" ; shouldAsk>=2: ask for "files" bool shiftPressed = Keyboard::shiftPressed(); @@ -592,7 +592,7 @@ } } -Note* NoteFactory::decodeContent(QDataStream &stream, NoteType::Id type, Basket *parent) +Note* NoteFactory::decodeContent(QDataStream &stream, NoteType::Id type, BasketView *parent) { /* if (type == NoteType::Text) { QString text; @@ -684,7 +684,7 @@ ////////////// NEW: -Note* NoteFactory::copyFileAndLoad(const KUrl &url, Basket *parent) +Note* NoteFactory::copyFileAndLoad(const KUrl &url, BasketView *parent) { QString fileName = fileNameForNewNote(parent, url.fileName()); QString fullPath = parent->fullPathForFileName(fileName); @@ -704,7 +704,7 @@ return loadFile(fileName, type, parent); } -Note* NoteFactory::moveFileAndLoad(const KUrl &url, Basket *parent) +Note* NoteFactory::moveFileAndLoad(const KUrl &url, BasketView *parent) { // Globally the same as copyFileAndLoad() but move instead of copy (KIO::move()) QString fileName = fileNameForNewNote(parent, url.fileName()); @@ -727,7 +727,7 @@ return loadFile(fileName, type, parent); } -Note* NoteFactory::loadFile(const QString &fileName, Basket *parent) +Note* NoteFactory::loadFile(const QString &fileName, BasketView *parent) { // The file MUST exists QFileInfo file(KUrl(parent->fullPathForFileName(fileName)).path()); @@ -739,7 +739,7 @@ return note; } -Note* NoteFactory::loadFile(const QString &fileName, NoteType::Id type, Basket *parent) +Note* NoteFactory::loadFile(const QString &fileName, NoteType::Id type, BasketView *parent) { Note *note = new Note(parent); switch (type) { @@ -761,7 +761,7 @@ return note; } -NoteType::Id NoteFactory::typeForURL(const KUrl &url, Basket */*parent*/) +NoteType::Id NoteFactory::typeForURL(const KUrl &url, BasketView */*parent*/) { /* KMimeType::Ptr kMimeType = KMimeType::findByUrl(url); if (Global::debugWindow) @@ -798,7 +798,7 @@ else return NoteType::File; } -QString NoteFactory::fileNameForNewNote(Basket *parent, const QString &wantedName) +QString NoteFactory::fileNameForNewNote(BasketView *parent, const QString &wantedName) { return Tools::fileNameForNewFile(wantedName, parent->fullPath()); } @@ -806,7 +806,7 @@ // Create a file to store a new note in Basket parent and with extension extension. // If wantedName is provided, the function will first try to use this file name, or derive it if it's impossible // (extension willn't be used for that case) -QString NoteFactory::createFileForNewNote(Basket *parent, const QString &extension, const QString &wantedName) +QString NoteFactory::createFileForNewNote(BasketView *parent, const QString &extension, const QString &wantedName) { static int nb = 1; @@ -941,7 +941,7 @@ ).isNull(); } -Note* NoteFactory::createEmptyNote(NoteType::Id type, Basket *parent) +Note* NoteFactory::createEmptyNote(NoteType::Id type, BasketView *parent) { QPixmap *pixmap; switch (type) { @@ -969,7 +969,7 @@ } } -Note* NoteFactory::importKMenuLauncher(Basket *parent) +Note* NoteFactory::importKMenuLauncher(BasketView *parent) { KOpenWithDialog dialog(parent); dialog.setSaveNewApplications(true); // To create temp file, needed by createNoteLauncher() @@ -985,7 +985,7 @@ return 0; } -Note* NoteFactory::importIcon(Basket *parent) +Note* NoteFactory::importIcon(BasketView *parent) { QString iconName = KIconDialog::getIcon(KIconLoader::Desktop, KIconLoader::Application, false, Settings::defIconSize()); if (! iconName.isEmpty()) { @@ -1000,7 +1000,7 @@ return 0; } -Note* NoteFactory::importFileContent(Basket *parent) +Note* NoteFactory::importFileContent(BasketView *parent) { KUrl url = KFileDialog::getOpenUrl(KUrl(), "", parent, i18n("Load File Content into a Note")); diff -Nru basket-2.0~20091110/src/notefactory.h basket-2.0~20102801/src/notefactory.h --- basket-2.0~20091110/src/notefactory.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/notefactory.h 2009-11-24 20:28:01.000000000 +0000 @@ -31,7 +31,7 @@ class QPixmap; class QColor; -class Basket; +class BasketView; class Note; /** Factory class to create (new, drop, paste) or load BasketIem, and eventually save them (?) @@ -43,43 +43,43 @@ * Content, if any, is saved to file but the note is not insterted in the basket, and the basket is not saved. * Return 0 if the note has not been successfully created. * In some cases, the returned note can be a group containing several notes or the first note of a chained list. - * The method Basket::TODO() can insert several grouped or chained notes without problem. + * The method BasketView::TODO() can insert several grouped or chained notes without problem. */ -Note* createNoteText(const QString &text, Basket *parent, bool reallyPlainText = false); -Note* createNoteHtml(const QString &html, Basket *parent); -Note* createNoteLink(const KUrl &url, Basket *parent); -Note* createNoteLink(const KUrl &url, const QString &title, Basket *parent); -Note* createNoteImage(const QPixmap &image, Basket *parent); -Note* createNoteColor(const QColor &color, Basket *parent); -Note* createNoteFromText(const QString &content, Basket *parent); // Find automatically the type from the text meaning // TODO: Return Note::List? -Note* createNoteLauncher(const KUrl &url, Basket *parent); -Note* createNoteLauncher(const QString &command, const QString &name, const QString &icon, Basket *parent); -Note* createNoteUnknown(const QMimeData *source, Basket *parent); +Note* createNoteText(const QString &text, BasketView *parent, bool reallyPlainText = false); +Note* createNoteHtml(const QString &html, BasketView *parent); +Note* createNoteLink(const KUrl &url, BasketView *parent); +Note* createNoteLink(const KUrl &url, const QString &title, BasketView *parent); +Note* createNoteImage(const QPixmap &image, BasketView *parent); +Note* createNoteColor(const QColor &color, BasketView *parent); +Note* createNoteFromText(const QString &content, BasketView *parent); // Find automatically the type from the text meaning // TODO: Return Note::List? +Note* createNoteLauncher(const KUrl &url, BasketView *parent); +Note* createNoteLauncher(const QString &command, const QString &name, const QString &icon, BasketView *parent); +Note* createNoteUnknown(const QMimeData *source, BasketView *parent); /** Functions to create derived notes from a content */ -Note* createNoteLinkOrLauncher(const KUrl &url, Basket *parent); -Note* copyFileAndLoad(const KUrl &url, Basket *parent); -Note* moveFileAndLoad(const KUrl &url, Basket *parent); -Note* loadFile(const QString &fileName, Basket *parent); /// << Determine the content of the file (the file SHOULD exists) and return a note of the good type. -Note* loadFile(const QString &fileName, NoteType::Id type, Basket *parent); /// << Create a note of type @p type. The file is not obliged to exist. +Note* createNoteLinkOrLauncher(const KUrl &url, BasketView *parent); +Note* copyFileAndLoad(const KUrl &url, BasketView *parent); +Note* moveFileAndLoad(const KUrl &url, BasketView *parent); +Note* loadFile(const QString &fileName, BasketView *parent); /// << Determine the content of the file (the file SHOULD exists) and return a note of the good type. +Note* loadFile(const QString &fileName, NoteType::Id type, BasketView *parent); /// << Create a note of type @p type. The file is not obliged to exist. /** Functions to create a new note from a drop or paste event */ -Note* dropNote(const QMimeData *source, Basket *parent, +Note* dropNote(const QMimeData *source, BasketView *parent, bool fromDrop = false, Qt::DropAction action = Qt::CopyAction, Note *noteSource = 0); -bool movingNotesInTheSameBasket(const QMimeData *source, Basket *parent, Qt::DropAction action); -Note* dropURLs(KUrl::List urls, Basket *parent, Qt::DropAction action, bool fromDrop); -Note* decodeContent(QDataStream &stream, NoteType::Id type, Basket *parent); /// << Decode the @p stream to a note or return 0 if a general loadFile() is sufficient. +bool movingNotesInTheSameBasket(const QMimeData *source, BasketView *parent, Qt::DropAction action); +Note* dropURLs(KUrl::List urls, BasketView *parent, Qt::DropAction action, bool fromDrop); +Note* decodeContent(QDataStream &stream, NoteType::Id type, BasketView *parent); /// << Decode the @p stream to a note or return 0 if a general loadFile() is sufficient. void consumeContent(QDataStream &stream, NoteType::Id type); /// << Decode the @p stream to a note or return 0 if a general loadFile() is sufficient. /** Functions to create a note file but not load it in a note object */ -QString createNoteLauncherFile(const QString &command, const QString &name, const QString &icon, Basket *parent); +QString createNoteLauncherFile(const QString &command, const QString &name, const QString &icon, BasketView *parent); /** Other useful functions */ -NoteType::Id typeForURL(const KUrl &url, Basket *parent); +NoteType::Id typeForURL(const KUrl &url, BasketView *parent); bool maybeText(const KUrl &url); bool maybeHtml(const KUrl &url); bool maybeImageOrAnimation(const KUrl &url); bool maybeAnimation(const KUrl &url); bool maybeSound(const KUrl &url); bool maybeLauncher(const KUrl &url); -QString fileNameForNewNote(Basket *parent, const QString &wantedName); -QString createFileForNewNote(Basket *parent, const QString &extension, const QString &wantedName = ""); +QString fileNameForNewNote(BasketView *parent, const QString &wantedName); +QString createFileForNewNote(BasketView *parent, const QString &extension, const QString &wantedName = ""); KUrl filteredURL(const KUrl &url); QString titleForURL(const KUrl &url); QString iconForURL(const KUrl &url); @@ -87,10 +87,10 @@ bool isIconExist(const QString &icon); QStringList textToURLList(const QString &text); // @Return { url1, title1, url2, title2, url3, title3... } /** Insert GUI menu */ -Note* createEmptyNote(NoteType::Id type, Basket *parent); // Insert empty if of type Note::Type -Note* importKMenuLauncher(Basket *parent); -Note* importIcon(Basket *parent); -Note* importFileContent(Basket *parent); +Note* createEmptyNote(NoteType::Id type, BasketView *parent); // Insert empty if of type Note::Type +Note* importKMenuLauncher(BasketView *parent); +Note* importIcon(BasketView *parent); +Note* importFileContent(BasketView *parent); } #endif // NOTEFACTORY_H diff -Nru basket-2.0~20091110/src/note.h basket-2.0~20102801/src/note.h --- basket-2.0~20091110/src/note.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/note.h 2009-11-24 20:28:01.000000000 +0000 @@ -32,13 +32,15 @@ #include "tag.h" -class Basket; +class BasketView; class FilterData; class NoteSelection; class QPainter; +class NotePrivate; + /** Handle basket notes and groups!\n * After creation, the note is a group. You should create a NoteContent with this Note * as constructor parameter to transform it to a note with content. eg: @@ -53,59 +55,34 @@ { /// CONSTRUCTOR AND DESTRUCTOR: public: - Note(Basket *parent = 0); + Note(BasketView *parent = 0); ~Note(); -/// DOUBLY LINKED LIST: private: - Note *m_prev; - Note *m_next; + NotePrivate* d; + +/// DOUBLY LINKED LIST: public: - inline void setNext(Note *next) { - m_next = next; - } - inline void setPrev(Note *prev) { - m_prev = prev; - } - inline Note* next() { - return m_next; - } - inline Note* prev() { - return m_prev; - } + void setNext(Note *next); + void setPrev(Note *prev); + Note* next() const; + Note* prev() const; -/// GEOMETRY MANAGEMENT: -private: - int m_x; - int m_y; - int m_width; - int m_height; -// int m_minContentWidth; public: void setWidth(int width); void setWidthForceRelayout(int width); - void setInitialHeight(int height) { - m_height = height; - } /// << Do NEVER use it unless you know what you do! + //! Do not use it unless you know what you do! + void setInitialHeight(int height); + int x() const; void setX(int x); + + int y() const; void setY(int y); void setXRecursively(int x); void setYRecursively(int y); - inline int x() { - return m_x; - } - inline int y() { - return m_y; - } - inline int width() { - return (isGroup() ? (isColumn() ? 0 : GROUP_WIDTH) : m_width); - } - inline int height() { - return m_height; - } - inline int bottom() { - return m_y + m_height - 1; - } + int width() const; + int height() const; + int bottom() const; QRect rect(); QRect resizerRect(); QRect visibleRect(); @@ -115,9 +92,8 @@ int minRight(); void unsetWidth(); void requestRelayout(); - void setHeight(int height) { - m_height = height; - } /// << DO NEVER USE IT!!! Only available when moving notes, groups should be recreated with the exact same state as before! + /** << DO NEVER USE IT!!! Only available when moving notes, groups should be recreated with the exact same state as before! */ + void setHeight(int height); /// FREE AND COLUMN LAYOUTS MANAGEMENT: private: @@ -128,7 +104,7 @@ int rightLimit(); int finalRightLimit(); bool isFree(); - bool isColumn(); + bool isColumn() const; bool hasResizer(); int resizerHeight(); @@ -138,7 +114,7 @@ Note *m_firstChild; Note *m_parentNote; public: - inline bool isGroup() { + inline bool isGroup() const { return m_content == 0L; } inline bool isFolded() { @@ -147,7 +123,7 @@ inline Note* firstChild() { return m_firstChild; } - inline Note* parentNote() { + inline Note* parentNote() const { return m_parentNote; } /*inline*/ bool showSubNotes();// { return !m_isFolded || !m_collapseFinished; } @@ -170,12 +146,12 @@ /// NOTES VARIOUS PROPERTIES: // CONTENT MANAGEMENT? private: - Basket *m_basket; + BasketView *m_basket; NoteContent *m_content; QDateTime m_addedDate; QDateTime m_lastModificationDate; public: - inline Basket* basket() { + inline BasketView* basket() const { return m_basket; } inline NoteContent* content() { @@ -187,7 +163,7 @@ inline void setLastModificationDate(const QDateTime &dateTime) { m_lastModificationDate = dateTime; } - inline void setParentBasket(Basket *basket) { + inline void setParentBasket(BasketView *basket) { m_basket = basket; } QDateTime addedDate() { @@ -215,7 +191,7 @@ void draw(QPainter *painter, const QRect &clipRect); void drawBufferOnScreen(QPainter *painter, const QPixmap &contentPixmap); static void getGradientColors(const QColor &originalBackground, QColor *colorTop, QColor *colorBottom); - static void drawExpander(QPainter *painter, int x, int y, const QColor &background, bool expand, Basket *basket); + static void drawExpander(QPainter *painter, int x, int y, const QColor &background, bool expand, BasketView *basket); void drawHandle(QPainter *painter, int x, int y, int width, int height, const QColor &background, const QColor &foreground); void drawResizer(QPainter *painter, int x, int y, int width, int height, const QColor &background, const QColor &foreground, bool rounded); void drawRoundings(QPainter *painter, int x, int y, int type, int width = 0, int height = 0); @@ -262,14 +238,10 @@ inline int deltaHeight() { return m_deltaHeight; } - inline int finalX() { - return m_x + m_deltaX; - } - inline int finalY() { - return m_y + m_deltaY; - } + int finalX() const; + int finalY() const; inline int finalHeight() { - return m_height + m_deltaHeight; + return height() + m_deltaHeight; } inline int finalBottom() { return finalY() + finalHeight() - 1; diff -Nru basket-2.0~20091110/src/password.cpp basket-2.0~20102801/src/password.cpp --- basket-2.0~20091110/src/password.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/password.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -32,7 +32,7 @@ #include -#include "basket.h" +#include "basketview.h" #include "kgpgme.h" PasswordDlg::PasswordDlg(QWidget *parent) @@ -60,7 +60,7 @@ void PasswordDlg::accept() { int n = type(); - if (n == Basket::PrivateKeyEncryption && key().isEmpty()) + if (n == BasketView::PrivateKeyEncryption && key().isEmpty()) KMessageBox::error(w, i18n("No private key selected.")); else KDialog::accept(); @@ -80,11 +80,11 @@ int PasswordDlg::type() const { if (w->noPasswordRadioButton->isChecked()) - return Basket::NoEncryption; + return BasketView::NoEncryption; else if (w->passwordRadioButton->isChecked()) - return Basket::PasswordEncryption; + return BasketView::PasswordEncryption; else if (w->publicPrivateRadioButton->isChecked()) - return Basket::PrivateKeyEncryption; + return BasketView::PrivateKeyEncryption; return -1; } @@ -100,11 +100,11 @@ void PasswordDlg::setType(int type) { - if (type == Basket::NoEncryption) + if (type == BasketView::NoEncryption) w->noPasswordRadioButton->setChecked(true); - else if (type == Basket::PasswordEncryption) + else if (type == BasketView::PasswordEncryption) w->passwordRadioButton->setChecked(true); - else if (type == Basket::PrivateKeyEncryption) + else if (type == BasketView::PrivateKeyEncryption) w->publicPrivateRadioButton->setChecked(true); } diff -Nru basket-2.0~20091110/src/settings.cpp basket-2.0~20102801/src/settings.cpp --- basket-2.0~20091110/src/settings.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/settings.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -46,7 +46,7 @@ #include #include "kgpgme.h" -#include "basket.h" +#include "basketview.h" #include "linklabel.h" #include "settings.h" #include "variouswidgets.h" diff -Nru basket-2.0~20091110/src/softwareimporters.cpp basket-2.0~20102801/src/softwareimporters.cpp --- basket-2.0~20091110/src/softwareimporters.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/softwareimporters.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -34,7 +34,7 @@ #include #include "softwareimporters.h" -#include "basket.h" +#include "basketview.h" #include "basketfactory.h" #include "notefactory.h" #include "global.h" @@ -234,7 +234,7 @@ return "" + tomboy + ""; } -Note* SoftwareImporters::insertTitledNote(Basket *parent, const QString &title, const QString &content, Qt::TextFormat format/* = Qt::PlainText*/, Note *parentNote/* = 0*/) +Note* SoftwareImporters::insertTitledNote(BasketView *parent, const QString &title, const QString &content, Qt::TextFormat format/* = Qt::PlainText*/, Note *parentNote/* = 0*/) { Note *nGroup = new Note(parent); @@ -256,7 +256,7 @@ return nGroup; } -void SoftwareImporters::finishImport(Basket *basket) +void SoftwareImporters::finishImport(BasketView *basket) { // Unselect the last inserted group: basket->unselectAll(); @@ -283,7 +283,7 @@ return; BasketFactory::newBasket(/*icon=*/"kjots", /*name=*/i18n("From KJots"), /*backgroundImage=*/"", /*backgroundColor=*/QColor(), /*textColor=*/QColor(), /*templateName=*/"1column", /*createIn=*/0); - Basket *kjotsBasket = Global::bnpView->currentBasket(); + BasketView *kjotsBasket = Global::bnpView->currentBasket(); for (QStringList::Iterator it = list.begin(); it != list.end(); ++it) { // For each file QFile file(dirPath + *it); @@ -296,7 +296,7 @@ // First create a basket for it: BasketFactory::newBasket(/*icon=*/"kjots", /*name=*/KUrl(file.fileName()).fileName(), /*backgroundImage=*/"", /*backgroundColor=*/QColor(), /*textColor=*/QColor(), /*templateName=*/"1column", /*createIn=*/kjotsBasket); - Basket *basket = Global::bnpView->currentBasket(); + BasketView *basket = Global::bnpView->currentBasket(); basket->load(); QString title, body; @@ -336,7 +336,7 @@ // First create a basket for it: BasketFactory::newBasket(/*icon=*/"kjots", /*name=*/bookTitle, /*backgroundImage=*/"", /*backgroundColor=*/QColor(), /*textColor=*/QColor(), /*templateName=*/"1column", /*createIn=*/kjotsBasket); - Basket *basket = Global::bnpView->currentBasket(); + BasketView *basket = Global::bnpView->currentBasket(); basket->load(); QDomElement docElem = XMLWork::getElement(doc->documentElement(), "KJotsBook"); @@ -370,7 +370,7 @@ // First create a basket for it: BasketFactory::newBasket(/*icon=*/"knotes", /*name=*/i18n("From KNotes"), /*backgroundImage=*/"", /*backgroundColor=*/QColor(), /*textColor=*/QColor(), /*templateName=*/"1column", /*createIn=*/0); - Basket *basket = Global::bnpView->currentBasket(); + BasketView *basket = Global::bnpView->currentBasket(); basket->load(); bool inVJournal = false; @@ -441,7 +441,7 @@ // First create a basket for it: BasketFactory::newBasket(/*icon=*/"gnome", /*name=*/i18n("From Sticky Notes"), /*backgroundImage=*/"", /*backgroundColor=*/QColor(), /*textColor=*/QColor(), /*templateName=*/"1column", /*createIn=*/0); - Basket *basket = Global::bnpView->currentBasket(); + BasketView *basket = Global::bnpView->currentBasket(); basket->load(); QDomElement docElem = doc->documentElement(); @@ -478,7 +478,7 @@ QString dirPath = QDir::home().absolutePath() + "/.tomboy/"; // I thing the assumption is good QDir dir(dirPath, QString::null, QDir::Name | QDir::IgnoreCase, QDir::Files | QDir::NoSymLinks); - Basket *basket = 0; // Create the basket ONLY if we found at least one note to add! + BasketView *basket = 0; // Create the basket ONLY if we found at least one note to add! QStringList list = dir.entryList(); for (QStringList::Iterator it = list.begin(); it != list.end(); ++it) { // For each file @@ -540,7 +540,7 @@ // First create a basket for it: QString title = i18nc("From TextFile.txt", "From %1", KUrl(fileName).fileName()); BasketFactory::newBasket(/*icon=*/"txt", title, /*backgroundImage=*/"", /*backgroundColor=*/QColor(), /*textColor=*/QColor(), /*templateName=*/"1column", /*createIn=*/0); - Basket *basket = Global::bnpView->currentBasket(); + BasketView *basket = Global::bnpView->currentBasket(); basket->load(); // Import every notes: @@ -563,8 +563,8 @@ if (!url.isEmpty()) { QFile file(url.path()); QFileInfo info(url.path()); - Basket* basket = 0; - QStack baskets; + BasketView* basket = 0; + QStack baskets; QString text; int hierarchy = 0; @@ -684,7 +684,7 @@ // TODO: 0) { BasketFactory::newBasket(icon, name, /*backgroundImage=*/"", /*backgroundColor=*/QColor(), /*textColor=*/QColor(), /*templateName=*/"1column", parentBasket); - Basket *basket = Global::bnpView->currentBasket(); + BasketView *basket = Global::bnpView->currentBasket(); basket->load(); if (isRichText) diff -Nru basket-2.0~20091110/src/softwareimporters.h basket-2.0~20102801/src/softwareimporters.h --- basket-2.0~20091110/src/softwareimporters.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/softwareimporters.h 2009-11-24 20:28:01.000000000 +0000 @@ -31,7 +31,7 @@ class QTextEdit; class QVBoxLayout; -class Basket; +class BasketView; class Note; /** The dialog to ask how to import hierarchical data. @@ -84,8 +84,8 @@ // Useful methods to design importers: QString fromICS(const QString &ics); QString fromTomboy(QString tomboy); -Note* insertTitledNote(Basket *parent, const QString &title, const QString &content, Qt::TextFormat format = Qt::PlainText, Note *parentNote = 0); -void finishImport(Basket *basket); +Note* insertTitledNote(BasketView *parent, const QString &title, const QString &content, Qt::TextFormat format = Qt::PlainText, Note *parentNote = 0); +void finishImport(BasketView *basket); // The importers in themselves: void importKNotes(); @@ -97,7 +97,7 @@ void importTextFile(); // -void importTuxCardsNode(const QDomElement &element, Basket *parentBasket, Note *parentNote, int remainingHierarchy); +void importTuxCardsNode(const QDomElement &element, BasketView *parentBasket, Note *parentNote, int remainingHierarchy); } #endif // SOFTWAREIMPORTERS_H diff -Nru basket-2.0~20091110/src/systemtray.cpp basket-2.0~20102801/src/systemtray.cpp --- basket-2.0~20091110/src/systemtray.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/systemtray.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -29,7 +29,7 @@ #include // Local -#include "basket.h" +#include "basketview.h" #include "settings.h" #include "global.h" #include "tools.h" @@ -109,7 +109,7 @@ /** Updates the icon and tooltip in the system tray */ void SystemTray::updateDisplay() { - Basket *basket = Global::bnpView->currentBasket(); + BasketView *basket = Global::bnpView->currentBasket(); if (!basket) return; @@ -263,13 +263,13 @@ { m_showTimer->start(Settings::dropTimeToShow() * 100, true); Global::bnpView->currentBasket()->showFrameInsertTo(); -/// m_parentContainer->setStatusBarDrag(); // FIXME: move this line in Basket::showFrameInsertTo() ? - Basket::acceptDropEvent(event); +/// m_parentContainer->setStatusBarDrag(); // FIXME: move this line in BasketView::showFrameInsertTo() ? + BasketView::acceptDropEvent(event); } void SystemTray::dragMoveEvent(QDragMoveEvent *event) { - Basket::acceptDropEvent(event); + BasketView::acceptDropEvent(event); } void SystemTray::dragLeaveEvent(QDragLeaveEvent*) @@ -288,7 +288,7 @@ Global::bnpView->currentBasket()->blindDrop(event); - /* Basket *basket = Global::bnpView->currentBasket(); + /* BasketView *basket = Global::bnpView->currentBasket(); if (!basket->isLoaded()) { Global::bnpView->showPassiveLoading(basket); basket->load(); @@ -304,7 +304,7 @@ { // return; ///////////////////////////////////////////////////// - Basket *basket = Global::bnpView->currentBasket(); + BasketView *basket = Global::bnpView->currentBasket(); if (!basket) return; @@ -336,7 +336,7 @@ void SystemTray::updateToolTipDelayed() { - Basket *basket = Global::bnpView->currentBasket(); + BasketView *basket = Global::bnpView->currentBasket(); QString tip = "

" + (basket->isLocked() ? KDialog::makeStandardCaption(i18n("%1 (Locked)")) : KDialog::makeStandardCaption("%1")) diff -Nru basket-2.0~20091110/src/tag.cpp basket-2.0~20102801/src/tag.cpp --- basket-2.0~20091110/src/tag.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/tag.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -37,7 +37,7 @@ #include "debugwindow.h" #include "bnpview.h" #include "tools.h" -#include "basket.h" +#include "basketview.h" /** class State: */ @@ -126,7 +126,7 @@ QColor bottomBgColor; Note::getGradientColors(backgroundColor(), &topBgColor, &bottomBgColor); // Produce the CSS code: - QString gradientFileName = Basket::saveGradientBackground(backgroundColor(), font(baseFont), gradientFolderPath); + QString gradientFileName = BasketView::saveGradientBackground(backgroundColor(), font(baseFont), gradientFolderPath); css += " background: " + bottomBgColor.name() + " url('" + gradientFolderName + gradientFileName + "') repeat-x;"; css += " border-top: solid " + topBgColor.name() + " 1px;"; css += " border-bottom: solid " + Tools::mixColor(topBgColor, bottomBgColor).name() + " 1px;"; @@ -502,7 +502,7 @@ } // Write to Disk: - if (!Basket::safelySaveToFile(fullPath, "\n" + document.toString())) + if (!BasketView::safelySaveToFile(fullPath, "\n" + document.toString())) DEBUG_WIN << "FAILED to save tags!"; } diff -Nru basket-2.0~20091110/src/tests/baskettest.cpp basket-2.0~20102801/src/tests/baskettest.cpp --- basket-2.0~20091110/src/tests/baskettest.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/tests/baskettest.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2009 by Matt Rogers - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - */ - -#include -#include -#include - -#include "note.h" -#include "basket.h" - -class BasketTest: public QObject -{ -Q_OBJECT -private Q_SLOTS: - void testCreation(); -}; - -QTEST_KDEMAIN(BasketTest, GUI) - -void BasketTest::testCreation() -{ - -} -#include "baskettest.moc" -/* vim: set et sts=4 sw=4 ts=8 tw=0 : */ diff -Nru basket-2.0~20091110/src/tests/basketviewtest.cpp basket-2.0~20102801/src/tests/basketviewtest.cpp --- basket-2.0~20091110/src/tests/basketviewtest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ basket-2.0~20102801/src/tests/basketviewtest.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2009 by Matt Rogers + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * 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. + */ + +#include +#include +#include + +#include "note.h" +#include "basketview.h" + +class BasketViewTest: public QObject +{ +Q_OBJECT +private Q_SLOTS: + void testCreation(); +}; + +QTEST_KDEMAIN(BasketViewTest, GUI) + +void BasketViewTest::testCreation() +{ + +} +#include "basketviewtest.moc" +/* vim: set et sts=4 sw=4 ts=8 tw=0 : */ diff -Nru basket-2.0~20091110/src/tests/CMakeLists.txt basket-2.0~20102801/src/tests/CMakeLists.txt --- basket-2.0~20091110/src/tests/CMakeLists.txt 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/tests/CMakeLists.txt 2009-11-24 20:28:01.000000000 +0000 @@ -11,4 +11,4 @@ endmacro(basket_standalone_unit_test) basket_standalone_unit_test(notetest) -basket_standalone_unit_test(baskettest) +basket_standalone_unit_test(basketviewtest) diff -Nru basket-2.0~20091110/src/tests/notetest.cpp basket-2.0~20102801/src/tests/notetest.cpp --- basket-2.0~20091110/src/tests/notetest.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/tests/notetest.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -22,7 +22,7 @@ #include #include "note.h" -#include "basket.h" +#include "basketview.h" class NoteTest: public QObject { @@ -42,7 +42,7 @@ QVERIFY(n->content() == 0); QCOMPARE(n->x(), 0); QCOMPARE(n->y(), -1); - QCOMPARE(n->width(), -1); + QCOMPARE(n->width(), Note::GROUP_WIDTH); QCOMPARE(n->height(), -1); delete n; } diff -Nru basket-2.0~20091110/src/transparentwidget.cpp basket-2.0~20102801/src/transparentwidget.cpp --- basket-2.0~20091110/src/transparentwidget.cpp 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/transparentwidget.cpp 2009-11-24 20:28:01.000000000 +0000 @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ -#include "basket.h" +#include "basketview.h" #include "transparentwidget.h" #include @@ -28,7 +28,7 @@ /** Class TransparentWidget */ //TODO: Why was Qt::WNoAutoErase used here? -TransparentWidget::TransparentWidget(Basket *basket) +TransparentWidget::TransparentWidget(BasketView *basket) : QWidget(basket->viewport()), m_basket(basket) { setFocusPolicy(Qt::NoFocus); diff -Nru basket-2.0~20091110/src/transparentwidget.h basket-2.0~20102801/src/transparentwidget.h --- basket-2.0~20091110/src/transparentwidget.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/transparentwidget.h 2009-11-24 20:28:01.000000000 +0000 @@ -23,7 +23,7 @@ #include -class Basket; +class BasketView; class QPaintEvent; class QMouseEvent; class QObject; @@ -32,7 +32,7 @@ { Q_OBJECT public: - TransparentWidget(Basket *basket); + TransparentWidget(BasketView *basket); void setPosition(int x, int y); //void reparent(QWidget *parent, Qt::WFlags f, const QPoint &p, bool showIt = FALSE); protected: @@ -40,7 +40,7 @@ void mouseMoveEvent(QMouseEvent *event); bool eventFilter(QObject *object, QEvent *event); private: - Basket *m_basket; + BasketView *m_basket; int m_x; int m_y; }; diff -Nru basket-2.0~20091110/src/variouswidgets.h basket-2.0~20102801/src/variouswidgets.h --- basket-2.0~20091110/src/variouswidgets.h 2009-10-23 05:57:31.000000000 +0100 +++ basket-2.0~20102801/src/variouswidgets.h 2009-11-24 20:28:01.000000000 +0000 @@ -33,7 +33,7 @@ class QLineEdit; class QListWidgetItem; -class Basket; +class BasketView; /** A widget to select a command to run, * with a QLineEdit and a QPushButton.