@@ -22,36 +22,36 @@ #include <config.h> static const char description[] = I18N_NOOP( - "Taking care of your ideas." - "A note-taking application that makes it easy to record ideas as you think, and quickly find them later. " - "Organizing your notes has never been so easy."); + "Taking care of your ideas." + "A note-taking application that makes it easy to record ideas as you think, and quickly find them later. " + "Organizing your notes has never been so easy."); - // Or how to make order of disorganized toughts. +// Or how to make order of disorganized toughts. AboutData::AboutData() - : KAboutData( "basket", "", ki18n("BasKet Note Pads"), - VERSION, ki18n(description), KAboutData::License_GPL_V2, - ki18n("(c) 2003-2007, S\303\251bastien Lao\303\273t"), KLocalizedString(), - "http://basket.kde.org/", - "http://basket.kde.org/bugs/" ) + : KAboutData("basket", "", ki18n("BasKet Note Pads"), + VERSION, ki18n(description), KAboutData::License_GPL_V2, + ki18n("(c) 2003-2007, S\303\251bastien Lao\303\273t"), KLocalizedString(), + "http://basket.kde.org/", + "http://basket.kde.org/bugs/") { - addAuthor( ki18n("Kelvie Wong"), - ki18n("Maintainer"), - "kelvie@ieee.org" ); + addAuthor(ki18n("Kelvie Wong"), + ki18n("Maintainer"), + "kelvie@ieee.org"); - addAuthor( ki18n("S\303\251bastien Lao\303\273t"), - ki18n("Original Author"), - "slaout@linux62.org" ); + addAuthor(ki18n("S\303\251bastien Lao\303\273t"), + ki18n("Original Author"), + "slaout@linux62.org"); - addAuthor( ki18n("Petri Damst\303\251n"), - ki18n("Basket encryption, Kontact integration, KnowIt importer"), - "damu@iki.fi" ); + addAuthor(ki18n("Petri Damst\303\251n"), + ki18n("Basket encryption, Kontact integration, KnowIt importer"), + "damu@iki.fi"); - addAuthor( ki18n("Alex Gontmakher"), - ki18n("Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, drop to basket name"), - "gsasha@cs.technion.ac.il" ); + addAuthor(ki18n("Alex Gontmakher"), + ki18n("Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, drop to basket name"), + "gsasha@cs.technion.ac.il"); - addAuthor( ki18n("Marco Martin"), - ki18n("Icon"), - "m4rt@libero.it" ); + addAuthor(ki18n("Marco Martin"), + ki18n("Icon"), + "m4rt@libero.it"); } src/aboutdata.cpp @@ -24,13 +24,13 @@ #include <basket_export.h> /** - @author Sébastien Laoût <slaout@linux62.org> + @author Sébastien Laoût <slaout@linux62.org> */ class BASKET_EXPORT AboutData : public KAboutData { - public: - AboutData(); +public: + AboutData(); }; #endif src/aboutdata.h @@ -29,7 +29,7 @@ #include "bnpview.h" Application::Application() - : KUniqueApplication() + : KUniqueApplication() { } @@ -39,23 +39,23 @@ Application::~Application() int Application::newInstance() { - KUniqueApplication::newInstance(); + KUniqueApplication::newInstance(); - // Open the basket archive or template file supplied as argument: - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - if (args && args->count() >= 1) { - QString fileName = args->arg(args->count() - 1); - if (QFile::exists(fileName)) { - QFileInfo fileInfo(fileName); - if (!fileInfo.isDir()) { // Do not mis-interpret data-folder param! - // Tags are not loaded until Global::bnpView::lateInit() is called. - // It is called 0ms after the application start. - BNPView::s_fileToOpen = fileName; - QTimer::singleShot( 100, Global::bnpView, SLOT(delayedOpenArchive()) ); -// Global::bnpView->openArchive(fileName); - args->clear(); - } - } - } - return 0; + // Open the basket archive or template file supplied as argument: + KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + if (args && args->count() >= 1) { + QString fileName = args->arg(args->count() - 1); + if (QFile::exists(fileName)) { + QFileInfo fileInfo(fileName); + if (!fileInfo.isDir()) { // Do not mis-interpret data-folder param! + // Tags are not loaded until Global::bnpView::lateInit() is called. + // It is called 0ms after the application start. + BNPView::s_fileToOpen = fileName; + QTimer::singleShot(100, Global::bnpView, SLOT(delayedOpenArchive())); +// Global::bnpView->openArchive(fileName); + args->clear(); + } + } + } + return 0; } src/application.cpp @@ -29,10 +29,10 @@ */ class Application : public KUniqueApplication { - public: - Application(); - ~Application(); - int newInstance(); +public: + Application(); + ~Application(); + int newInstance(); }; #endif // APPLICATION_H src/application.h @@ -54,361 +54,361 @@ void Archive::save(Basket *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); - dialog.showCancelButton(false); - dialog.setAutoClose(true); - dialog.show(); - QProgressBar *progress = dialog.progressBar(); - + QDir dir; + KProgressDialog dialog(0, i18n("Save as Basket Archive"), i18n("Saving as basket archive. Please wait..."), /*Not modal, for password dialogs!*/false); + dialog.showCancelButton(false); + dialog.setAutoClose(true); + dialog.show(); + QProgressBar *progress = dialog.progressBar(); + progress->setRange(0,/*Preparation:*/1 + /*Finishing:*/1 + /*Basket:*/1 + /*SubBaskets:*/(withSubBaskets ? Global::bnpView->basketCount(Global::bnpView->listViewItemForBasket(basket)) : 0)); - progress->setValue(0); - - // Create the temporary folder: - QString tempFolder = Global::savesFolder() + "temp-archive/"; - dir.mkdir(tempFolder); - - // Create the temporary archive file: - QString tempDestination = tempFolder + "temp-archive.tar.gz"; - KTar tar(tempDestination, "application/x-gzip"); - tar.open(QIODevice::WriteOnly); - tar.writeDir("baskets", "", ""); - - progress->setValue(progress->value()+1); // Preparation finished - - kDebug() << "Preparation finished out of " << progress->maximum(); - - // Copy the baskets data into the archive: - QStringList backgrounds; - Archive::saveBasketToArchive(basket, withSubBaskets, &tar, backgrounds, tempFolder, progress); - - // Create a Small baskets.xml Document: - QDomDocument document("basketTree"); - QDomElement root = document.createElement("basketTree"); - document.appendChild(root); - Global::bnpView->saveSubHierarchy(Global::bnpView->listViewItemForBasket(basket), document, root, withSubBaskets); - Basket::safelySaveToFile(tempFolder + "baskets.xml", "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + document.toString()); - tar.addLocalFile(tempFolder + "baskets.xml", "baskets/baskets.xml"); - dir.remove(tempFolder + "baskets.xml"); - - // Save a Small tags.xml Document: - QList<Tag*> tags; - listUsedTags(basket, withSubBaskets, tags); - Tag::saveTagsTo(tags, tempFolder + "tags.xml"); - tar.addLocalFile(tempFolder + "tags.xml", "tags.xml"); - dir.remove(tempFolder + "tags.xml"); - - // Save Tag Emblems (in case they are loaded on a computer that do not have those icons): - QString tempIconFile = tempFolder + "icon.png"; - for (Tag::List::iterator it = tags.begin(); it != tags.end(); ++it) { - State::List states = (*it)->states(); - for (State::List::iterator it2 = states.begin(); it2 != states.end(); ++it2) { - State *state = (*it2); - QPixmap icon = KIconLoader::global()->loadIcon( - state->emblem(), KIconLoader::Small, 16, KIconLoader::DefaultState, - QStringList(), 0L, true - ); - if (!icon.isNull()) { - icon.save(tempIconFile, "PNG"); - QString iconFileName = state->emblem().replace('/', '_'); - tar.addLocalFile(tempIconFile, "tag-emblems/" + iconFileName); - } - } - } - dir.remove(tempIconFile); - - // Finish Tar.Gz Exportation: - tar.close(); - - // Computing the File Preview: - Basket *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!"): - NoteSelection *selection = previewBasket->selectedNotes(); - previewBasket->unselectAll(); - Note *focusedNote = previewBasket->focusedNote(); - previewBasket->setFocusedNote(0); - previewBasket->doHoverEffects(0, Note::None); - // Take the screenshot: - previewBasket->drawContents(&painter, 0, 0, previewPixmap.width(), previewPixmap.height()); - // Go back to the old look: - previewBasket->selectSelection(selection); - previewBasket->setFocusedNote(focusedNote); - previewBasket->doHoverEffects(); - // End and save our splandid painting: - painter.end(); - QImage previewImage = previewPixmap.toImage(); - const int PREVIEW_SIZE = 256; - previewImage = previewImage.scaled(PREVIEW_SIZE, PREVIEW_SIZE, Qt::KeepAspectRatio); - previewImage.save(tempFolder + "preview.png", "PNG"); - - // Finaly Save to the Real Destination file: - QFile file(destination); - if (file.open(QIODevice::WriteOnly)) { - ulong previewSize = QFile(tempFolder + "preview.png").size(); - ulong archiveSize = QFile(tempDestination).size(); - QTextStream stream(&file); - stream.setCodec("ISO-8859-1"); - stream << "BasKetNP:archive\n" - << "version:0.6.1\n" -// << "read-compatible:0.6.1\n" -// << "write-compatible:0.6.1\n" - << "preview*:" << previewSize << "\n"; - - stream.flush(); - // Copy the Preview File: - const unsigned long BUFFER_SIZE = 1024; - char *buffer = new char[BUFFER_SIZE]; - long sizeRead; - QFile previewFile(tempFolder + "preview.png"); - if (previewFile.open(QIODevice::ReadOnly)) { - while ((sizeRead = previewFile.read(buffer, BUFFER_SIZE)) > 0) - file.write(buffer, sizeRead); - } - stream << "archive*:" << archiveSize << "\n"; - stream.flush(); - - // Copy the Archive File: - QFile archiveFile(tempDestination); - if (archiveFile.open(QIODevice::ReadOnly)) { - while ((sizeRead = archiveFile.read(buffer, BUFFER_SIZE)) > 0) - file.write(buffer, sizeRead); - } - // Clean Up: - delete buffer; - buffer = 0; - file.close(); - } - - progress->setValue(progress->value()+1); // Finishing finished - kDebug() << "Finishing finished"; - - // Clean Up Everything: - dir.remove(tempFolder + "preview.png"); - dir.remove(tempDestination); - dir.rmdir(tempFolder); + progress->setValue(0); + + // Create the temporary folder: + QString tempFolder = Global::savesFolder() + "temp-archive/"; + dir.mkdir(tempFolder); + + // Create the temporary archive file: + QString tempDestination = tempFolder + "temp-archive.tar.gz"; + KTar tar(tempDestination, "application/x-gzip"); + tar.open(QIODevice::WriteOnly); + tar.writeDir("baskets", "", ""); + + progress->setValue(progress->value() + 1); // Preparation finished + + kDebug() << "Preparation finished out of " << progress->maximum(); + + // Copy the baskets data into the archive: + QStringList backgrounds; + Archive::saveBasketToArchive(basket, withSubBaskets, &tar, backgrounds, tempFolder, progress); + + // Create a Small baskets.xml Document: + QDomDocument document("basketTree"); + QDomElement root = document.createElement("basketTree"); + document.appendChild(root); + Global::bnpView->saveSubHierarchy(Global::bnpView->listViewItemForBasket(basket), document, root, withSubBaskets); + Basket::safelySaveToFile(tempFolder + "baskets.xml", "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + document.toString()); + tar.addLocalFile(tempFolder + "baskets.xml", "baskets/baskets.xml"); + dir.remove(tempFolder + "baskets.xml"); + + // Save a Small tags.xml Document: + QList<Tag*> tags; + listUsedTags(basket, withSubBaskets, tags); + Tag::saveTagsTo(tags, tempFolder + "tags.xml"); + tar.addLocalFile(tempFolder + "tags.xml", "tags.xml"); + dir.remove(tempFolder + "tags.xml"); + + // Save Tag Emblems (in case they are loaded on a computer that do not have those icons): + QString tempIconFile = tempFolder + "icon.png"; + for (Tag::List::iterator it = tags.begin(); it != tags.end(); ++it) { + State::List states = (*it)->states(); + for (State::List::iterator it2 = states.begin(); it2 != states.end(); ++it2) { + State *state = (*it2); + QPixmap icon = KIconLoader::global()->loadIcon( + state->emblem(), KIconLoader::Small, 16, KIconLoader::DefaultState, + QStringList(), 0L, true + ); + if (!icon.isNull()) { + icon.save(tempIconFile, "PNG"); + QString iconFileName = state->emblem().replace('/', '_'); + tar.addLocalFile(tempIconFile, "tag-emblems/" + iconFileName); + } + } + } + dir.remove(tempIconFile); + + // Finish Tar.Gz Exportation: + tar.close(); + + // Computing the File Preview: + Basket *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!"): + NoteSelection *selection = previewBasket->selectedNotes(); + previewBasket->unselectAll(); + Note *focusedNote = previewBasket->focusedNote(); + previewBasket->setFocusedNote(0); + previewBasket->doHoverEffects(0, Note::None); + // Take the screenshot: + previewBasket->drawContents(&painter, 0, 0, previewPixmap.width(), previewPixmap.height()); + // Go back to the old look: + previewBasket->selectSelection(selection); + previewBasket->setFocusedNote(focusedNote); + previewBasket->doHoverEffects(); + // End and save our splandid painting: + painter.end(); + QImage previewImage = previewPixmap.toImage(); + const int PREVIEW_SIZE = 256; + previewImage = previewImage.scaled(PREVIEW_SIZE, PREVIEW_SIZE, Qt::KeepAspectRatio); + previewImage.save(tempFolder + "preview.png", "PNG"); + + // Finaly Save to the Real Destination file: + QFile file(destination); + if (file.open(QIODevice::WriteOnly)) { + ulong previewSize = QFile(tempFolder + "preview.png").size(); + ulong archiveSize = QFile(tempDestination).size(); + QTextStream stream(&file); + stream.setCodec("ISO-8859-1"); + stream << "BasKetNP:archive\n" + << "version:0.6.1\n" +// << "read-compatible:0.6.1\n" +// << "write-compatible:0.6.1\n" + << "preview*:" << previewSize << "\n"; + + stream.flush(); + // Copy the Preview File: + const unsigned long BUFFER_SIZE = 1024; + char *buffer = new char[BUFFER_SIZE]; + long sizeRead; + QFile previewFile(tempFolder + "preview.png"); + if (previewFile.open(QIODevice::ReadOnly)) { + while ((sizeRead = previewFile.read(buffer, BUFFER_SIZE)) > 0) + file.write(buffer, sizeRead); + } + stream << "archive*:" << archiveSize << "\n"; + stream.flush(); + + // Copy the Archive File: + QFile archiveFile(tempDestination); + if (archiveFile.open(QIODevice::ReadOnly)) { + while ((sizeRead = archiveFile.read(buffer, BUFFER_SIZE)) > 0) + file.write(buffer, sizeRead); + } + // Clean Up: + delete buffer; + buffer = 0; + file.close(); + } + + progress->setValue(progress->value() + 1); // Finishing finished + kDebug() << "Finishing finished"; + + // Clean Up Everything: + dir.remove(tempFolder + "preview.png"); + dir.remove(tempDestination); + dir.rmdir(tempFolder); } void Archive::saveBasketToArchive(Basket *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: - if (!basket->isLoaded()) { - basket->load(); - } - - QDir dir; - // Save basket data: - tar->addLocalDirectory(basket->fullPath(), "baskets/" + basket->folderName()); - tar->addLocalFile(basket->fullPath() + ".basket", "baskets/" + basket->folderName() + ".basket"); // The hidden files were not added - // Save basket icon: - QString tempIconFile = tempFolder + "icon.png"; - if (!basket->icon().isEmpty() && basket->icon() != "basket") { - QPixmap icon = KIconLoader::global()->loadIcon(basket->icon(), KIconLoader::Small, 16, KIconLoader::DefaultState, - QStringList(), /*path_store=*/0L, /*canReturnNull=*/true); - if (!icon.isNull()) { - icon.save(tempIconFile, "PNG"); - QString iconFileName = basket->icon().replace('/', '_'); - tar->addLocalFile(tempIconFile, "basket-icons/" + iconFileName); - } - } - // Save basket backgorund image: - QString imageName = basket->backgroundImageName(); - if (!basket->backgroundImageName().isEmpty() && !backgrounds.contains(imageName)) { - QString backgroundPath = Global::backgroundManager->pathForImageName(imageName); - if (!backgroundPath.isEmpty()) { - // Save the background image: - tar->addLocalFile(backgroundPath, "backgrounds/" + imageName); - // Save the preview image: - QString previewPath = Global::backgroundManager->previewPathForImageName(imageName); - if (!previewPath.isEmpty()) - tar->addLocalFile(previewPath, "backgrounds/previews/" + imageName); - // Save the configuration file: - QString configPath = backgroundPath + ".config"; - if (dir.exists(configPath)) - tar->addLocalFile(configPath, "backgrounds/" + imageName + ".config"); - } - backgrounds.append(imageName); - } - - progress->setValue(progress->value()+1); // Basket exportation finished - kDebug() << basket->basketName() << " finished"; - - // Recursively save child baskets: - BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket); - if (recursive) { - for (int i=0;i<item->childCount();i++){ - saveBasketToArchive(((BasketListViewItem *)item->child(i))->basket(), recursive, tar, backgrounds, tempFolder, 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: + if (!basket->isLoaded()) { + basket->load(); + } + + QDir dir; + // Save basket data: + tar->addLocalDirectory(basket->fullPath(), "baskets/" + basket->folderName()); + tar->addLocalFile(basket->fullPath() + ".basket", "baskets/" + basket->folderName() + ".basket"); // The hidden files were not added + // Save basket icon: + QString tempIconFile = tempFolder + "icon.png"; + if (!basket->icon().isEmpty() && basket->icon() != "basket") { + QPixmap icon = KIconLoader::global()->loadIcon(basket->icon(), KIconLoader::Small, 16, KIconLoader::DefaultState, + QStringList(), /*path_store=*/0L, /*canReturnNull=*/true); + if (!icon.isNull()) { + icon.save(tempIconFile, "PNG"); + QString iconFileName = basket->icon().replace('/', '_'); + tar->addLocalFile(tempIconFile, "basket-icons/" + iconFileName); + } + } + // Save basket backgorund image: + QString imageName = basket->backgroundImageName(); + if (!basket->backgroundImageName().isEmpty() && !backgrounds.contains(imageName)) { + QString backgroundPath = Global::backgroundManager->pathForImageName(imageName); + if (!backgroundPath.isEmpty()) { + // Save the background image: + tar->addLocalFile(backgroundPath, "backgrounds/" + imageName); + // Save the preview image: + QString previewPath = Global::backgroundManager->previewPathForImageName(imageName); + if (!previewPath.isEmpty()) + tar->addLocalFile(previewPath, "backgrounds/previews/" + imageName); + // Save the configuration file: + QString configPath = backgroundPath + ".config"; + if (dir.exists(configPath)) + tar->addLocalFile(configPath, "backgrounds/" + imageName + ".config"); + } + backgrounds.append(imageName); + } + + progress->setValue(progress->value() + 1); // Basket exportation finished + kDebug() << basket->basketName() << " finished"; + + // Recursively save child baskets: + BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket); + if (recursive) { + for (int i = 0; i < item->childCount(); i++) { + saveBasketToArchive(((BasketListViewItem *)item->child(i))->basket(), recursive, tar, backgrounds, tempFolder, progress); + } + } } void Archive::listUsedTags(Basket *basket, bool recursive, QList<Tag*> &list) { - basket->listUsedTags(list); - BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket); - if (recursive) { - for (int i=0;i<item->childCount();i++){ - listUsedTags(((BasketListViewItem *)item->child(i))->basket(), recursive, list); - } - } + basket->listUsedTags(list); + BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket); + if (recursive) { + for (int i = 0; i < item->childCount(); i++) { + listUsedTags(((BasketListViewItem *)item->child(i))->basket(), recursive, list); + } + } } void Archive::open(const QString &path) { - // Create the temporar folder: - QString tempFolder = Global::savesFolder() + "temp-archive/"; - QDir dir; - dir.mkdir(tempFolder); - const qint64 BUFFER_SIZE = 1024; - - QFile file(path); - if (file.open(QIODevice::ReadOnly)) { - QTextStream stream(&file); - stream.setCodec("ISO-8859-1"); - QString line = stream.readLine(); - if (line != "BasKetNP:archive") { - KMessageBox::error(0, i18n("This file is not a basket archive."), i18n("Basket Archive Error")); - file.close(); - Tools::deleteRecursively(tempFolder); - return; - } - QString version; - QStringList readCompatibleVersions; - QStringList writeCompatibleVersions; - while (!stream.atEnd()) { - // Get Key/Value Pair From the Line to Read: - line = stream.readLine(); - int index = line.indexOf(':'); - QString key; - QString value; - if (index >= 0) { - key = line.left(index); - value = line.right(line.length() - index - 1); - } else { - key = line; - value = ""; - } - if (key == "version") { - version = value; - } else if (key == "read-compatible") { - readCompatibleVersions = value.split(";"); - } else if (key == "write-compatible") { - writeCompatibleVersions = value.split(";"); - } else if (key == "preview*") { - bool ok; - qint64 size = value.toULong(&ok); - if (!ok) { - KMessageBox::error(0, i18n("This file is corrupted. It can not be opened."), i18n("Basket Archive Error")); - file.close(); - Tools::deleteRecursively(tempFolder); - return; - } - // Get the preview file: + // Create the temporar folder: + QString tempFolder = Global::savesFolder() + "temp-archive/"; + QDir dir; + dir.mkdir(tempFolder); + const qint64 BUFFER_SIZE = 1024; + + QFile file(path); + if (file.open(QIODevice::ReadOnly)) { + QTextStream stream(&file); + stream.setCodec("ISO-8859-1"); + QString line = stream.readLine(); + if (line != "BasKetNP:archive") { + KMessageBox::error(0, i18n("This file is not a basket archive."), i18n("Basket Archive Error")); + file.close(); + Tools::deleteRecursively(tempFolder); + return; + } + QString version; + QStringList readCompatibleVersions; + QStringList writeCompatibleVersions; + while (!stream.atEnd()) { + // Get Key/Value Pair From the Line to Read: + line = stream.readLine(); + int index = line.indexOf(':'); + QString key; + QString value; + if (index >= 0) { + key = line.left(index); + value = line.right(line.length() - index - 1); + } else { + key = line; + value = ""; + } + if (key == "version") { + version = value; + } else if (key == "read-compatible") { + readCompatibleVersions = value.split(";"); + } else if (key == "write-compatible") { + writeCompatibleVersions = value.split(";"); + } else if (key == "preview*") { + bool ok; + qint64 size = value.toULong(&ok); + if (!ok) { + KMessageBox::error(0, i18n("This file is corrupted. It can not be opened."), i18n("Basket Archive Error")); + file.close(); + Tools::deleteRecursively(tempFolder); + return; + } + // Get the preview file: //FIXME: We do not need the preview for now -// QFile previewFile(tempFolder + "preview.png"); -// if (previewFile.open(QIODevice::WriteOnly)) { - stream.seek(stream.pos()+size); - } else if (key == "archive*") { - if (version != "0.6.1" && readCompatibleVersions.contains("0.6.1") && !writeCompatibleVersions.contains("0.6.1")) { - KMessageBox::information( - 0, - i18n("This file was created with a recent version of %1. " - "It can be opened but not every information will be available to you. " - "For instance, some notes may be missing because they are of a type only available in new versions. " - "When saving the file back, consider to save it to another file, to preserve the original one.", - KGlobal::mainComponent().aboutData()->programName()), - i18n("Basket Archive Error") - ); - } - if (version != "0.6.1" && !readCompatibleVersions.contains("0.6.1") && !writeCompatibleVersions.contains("0.6.1")) { - KMessageBox::error( - 0, - i18n("This file was created with a recent version of %1. Please upgrade to a newer version to be able to open that file.", - KGlobal::mainComponent().aboutData()->programName()), - i18n("Basket Archive Error") - ); - file.close(); - Tools::deleteRecursively(tempFolder); - return; - } - - bool ok; - qint64 size = value.toULong(&ok); - if (!ok) { - KMessageBox::error(0, i18n("This file is corrupted. It can not be opened."), i18n("Basket Archive Error")); - file.close(); - Tools::deleteRecursively(tempFolder); - return; - } - - Global::mainWindow()->raise(); - - // Get the archive file: - QString tempArchive = tempFolder + "temp-archive.tar.gz"; - QFile archiveFile(tempArchive); - file.seek(stream.pos()); - if (archiveFile.open(QIODevice::WriteOnly)) { - char *buffer = new char[BUFFER_SIZE]; - qint64 sizeRead; - while ((sizeRead = file.read(buffer, qMin(BUFFER_SIZE, size))) > 0) { - archiveFile.write(buffer, sizeRead); - size -= sizeRead; - } - archiveFile.close(); - delete buffer; - - // Extract the Archive: - QString extractionFolder = tempFolder + "extraction/"; - QDir dir; - dir.mkdir(extractionFolder); - KTar tar(tempArchive, "application/x-gzip"); - tar.open(QIODevice::ReadOnly); - tar.directory()->copyTo(extractionFolder); - tar.close(); - - // Import the Tags: - importTagEmblems(extractionFolder); // Import and rename tag emblems BEFORE loading them! - QMap<QString, QString> mergedStates = Tag::loadTags(extractionFolder + "tags.xml"); - QMap<QString, QString>::Iterator it; - if (mergedStates.count() > 0) { - Tag::saveTags(); - } - - // Import the Background Images: - importArchivedBackgroundImages(extractionFolder); - - // Import the Baskets: - renameBasketFolders(extractionFolder, mergedStates); - stream.seek(file.pos()); - - } - } else if (key.endsWith("*")) { - // We do not know what it is, but we should read the embedded-file in order to discard it: - bool ok; - qint64 size = value.toULong(&ok); - if (!ok) { - KMessageBox::error(0, i18n("This file is corrupted. It can not be opened."), i18n("Basket Archive Error")); - file.close(); - Tools::deleteRecursively(tempFolder); - return; - } - // Get the archive file: - char *buffer = new char[BUFFER_SIZE]; - qint64 sizeRead; - while ((sizeRead = file.read(buffer, qMin(BUFFER_SIZE, size))) > 0) { - size -= sizeRead; - } - delete buffer; - } else { - // We do not know what it is, and we do not care. - } - // Analyse the Value, if Understood: - } - file.close(); - } - Tools::deleteRecursively(tempFolder); +// QFile previewFile(tempFolder + "preview.png"); +// if (previewFile.open(QIODevice::WriteOnly)) { + stream.seek(stream.pos() + size); + } else if (key == "archive*") { + if (version != "0.6.1" && readCompatibleVersions.contains("0.6.1") && !writeCompatibleVersions.contains("0.6.1")) { + KMessageBox::information( + 0, + i18n("This file was created with a recent version of %1. " + "It can be opened but not every information will be available to you. " + "For instance, some notes may be missing because they are of a type only available in new versions. " + "When saving the file back, consider to save it to another file, to preserve the original one.", + KGlobal::mainComponent().aboutData()->programName()), + i18n("Basket Archive Error") + ); + } + if (version != "0.6.1" && !readCompatibleVersions.contains("0.6.1") && !writeCompatibleVersions.contains("0.6.1")) { + KMessageBox::error( + 0, + i18n("This file was created with a recent version of %1. Please upgrade to a newer version to be able to open that file.", + KGlobal::mainComponent().aboutData()->programName()), + i18n("Basket Archive Error") + ); + file.close(); + Tools::deleteRecursively(tempFolder); + return; + } + + bool ok; + qint64 size = value.toULong(&ok); + if (!ok) { + KMessageBox::error(0, i18n("This file is corrupted. It can not be opened."), i18n("Basket Archive Error")); + file.close(); + Tools::deleteRecursively(tempFolder); + return; + } + + Global::mainWindow()->raise(); + + // Get the archive file: + QString tempArchive = tempFolder + "temp-archive.tar.gz"; + QFile archiveFile(tempArchive); + file.seek(stream.pos()); + if (archiveFile.open(QIODevice::WriteOnly)) { + char *buffer = new char[BUFFER_SIZE]; + qint64 sizeRead; + while ((sizeRead = file.read(buffer, qMin(BUFFER_SIZE, size))) > 0) { + archiveFile.write(buffer, sizeRead); + size -= sizeRead; + } + archiveFile.close(); + delete buffer; + + // Extract the Archive: + QString extractionFolder = tempFolder + "extraction/"; + QDir dir; + dir.mkdir(extractionFolder); + KTar tar(tempArchive, "application/x-gzip"); + tar.open(QIODevice::ReadOnly); + tar.directory()->copyTo(extractionFolder); + tar.close(); + + // Import the Tags: + importTagEmblems(extractionFolder); // Import and rename tag emblems BEFORE loading them! + QMap<QString, QString> mergedStates = Tag::loadTags(extractionFolder + "tags.xml"); + QMap<QString, QString>::Iterator it; + if (mergedStates.count() > 0) { + Tag::saveTags(); + } + + // Import the Background Images: + importArchivedBackgroundImages(extractionFolder); + + // Import the Baskets: + renameBasketFolders(extractionFolder, mergedStates); + stream.seek(file.pos()); + + } + } else if (key.endsWith("*")) { + // We do not know what it is, but we should read the embedded-file in order to discard it: + bool ok; + qint64 size = value.toULong(&ok); + if (!ok) { + KMessageBox::error(0, i18n("This file is corrupted. It can not be opened."), i18n("Basket Archive Error")); + file.close(); + Tools::deleteRecursively(tempFolder); + return; + } + // Get the archive file: + char *buffer = new char[BUFFER_SIZE]; + qint64 sizeRead; + while ((sizeRead = file.read(buffer, qMin(BUFFER_SIZE, size))) > 0) { + size -= sizeRead; + } + delete buffer; + } else { + // We do not know what it is, and we do not care. + } + // Analyse the Value, if Understood: + } + file.close(); + } + Tools::deleteRecursively(tempFolder); } /** @@ -420,228 +420,228 @@ void Archive::open(const QString &path) */ void Archive::importTagEmblems(const QString &extractionFolder) { - QDomDocument *document = XMLWork::openFile("basketTags", extractionFolder + "tags.xml"); - if (document == 0) - return; - QDomElement docElem = document->documentElement(); - - QDir dir; - dir.mkdir(Global::savesFolder() + "tag-emblems/"); - FormatImporter copier; // Only used to copy files synchronously - - QDomNode node = docElem.firstChild(); - while (!node.isNull()) { - QDomElement element = node.toElement(); - if ( (!element.isNull()) && element.tagName() == "tag" ) { - QDomNode subNode = element.firstChild(); - while (!subNode.isNull()) { - QDomElement subElement = subNode.toElement(); - if ( (!subElement.isNull()) && subElement.tagName() == "state" ) { - QString emblemName = XMLWork::getElementText(subElement, "emblem"); - if (!emblemName.isEmpty()) { - QPixmap emblem = KIconLoader::global()->loadIcon(emblemName, KIconLoader::NoGroup, 16, KIconLoader::DefaultState, QStringList(), 0L, /*canReturnNull=*/true); - // The icon does not exists on that computer, import it: - if (emblem.isNull()) { - // Of the emblem path was eg. "/home/seb/emblem.png", it was exported as "tag-emblems/_home_seb_emblem.png". - // So we need to copy that image to "~/.kde/share/apps/basket/tag-emblems/emblem.png": - int slashIndex = emblemName.lastIndexOf('/'); - QString emblemFileName = (slashIndex < 0 ? emblemName : emblemName.right(slashIndex - 2)); - QString source = extractionFolder + "tag-emblems/" + emblemName.replace('/', '_'); - QString destination = Global::savesFolder() + "tag-emblems/" + emblemFileName; - if (!dir.exists(destination) && dir.exists(source)) - copier.copyFolder(source, destination); - // Replace the emblem path in the tags.xml copy: - QDomElement emblemElement = XMLWork::getElement(subElement, "emblem"); - subElement.removeChild(emblemElement); - XMLWork::addElement(*document, subElement, "emblem", destination); - } - } - } - subNode = subNode.nextSibling(); - } - } - node = node.nextSibling(); - } - Basket::safelySaveToFile(extractionFolder + "tags.xml", document->toString()); + QDomDocument *document = XMLWork::openFile("basketTags", extractionFolder + "tags.xml"); + if (document == 0) + return; + QDomElement docElem = document->documentElement(); + + QDir dir; + dir.mkdir(Global::savesFolder() + "tag-emblems/"); + FormatImporter copier; // Only used to copy files synchronously + + QDomNode node = docElem.firstChild(); + while (!node.isNull()) { + QDomElement element = node.toElement(); + if ((!element.isNull()) && element.tagName() == "tag") { + QDomNode subNode = element.firstChild(); + while (!subNode.isNull()) { + QDomElement subElement = subNode.toElement(); + if ((!subElement.isNull()) && subElement.tagName() == "state") { + QString emblemName = XMLWork::getElementText(subElement, "emblem"); + if (!emblemName.isEmpty()) { + QPixmap emblem = KIconLoader::global()->loadIcon(emblemName, KIconLoader::NoGroup, 16, KIconLoader::DefaultState, QStringList(), 0L, /*canReturnNull=*/true); + // The icon does not exists on that computer, import it: + if (emblem.isNull()) { + // Of the emblem path was eg. "/home/seb/emblem.png", it was exported as "tag-emblems/_home_seb_emblem.png". + // So we need to copy that image to "~/.kde/share/apps/basket/tag-emblems/emblem.png": + int slashIndex = emblemName.lastIndexOf('/'); + QString emblemFileName = (slashIndex < 0 ? emblemName : emblemName.right(slashIndex - 2)); + QString source = extractionFolder + "tag-emblems/" + emblemName.replace('/', '_'); + QString destination = Global::savesFolder() + "tag-emblems/" + emblemFileName; + if (!dir.exists(destination) && dir.exists(source)) + copier.copyFolder(source, destination); + // Replace the emblem path in the tags.xml copy: + QDomElement emblemElement = XMLWork::getElement(subElement, "emblem"); + subElement.removeChild(emblemElement); + XMLWork::addElement(*document, subElement, "emblem", destination); + } + } + } + subNode = subNode.nextSibling(); + } + } + node = node.nextSibling(); + } + Basket::safelySaveToFile(extractionFolder + "tags.xml", document->toString()); } void Archive::importArchivedBackgroundImages(const QString &extractionFolder) { - FormatImporter copier; // Only used to copy files synchronously - QString destFolder = KGlobal::dirs()->saveLocation("data", "basket/backgrounds/"); - - QDir dir(extractionFolder + "backgrounds/", /*nameFilder=*/"*.png", /*sortSpec=*/QDir::Name | QDir::IgnoreCase, /*filterSpec=*/QDir::Files | QDir::NoSymLinks); - QStringList files = dir.entryList(); - for (QStringList::Iterator it = files.begin(); it != files.end(); ++it) { - QString image = *it; - if (!Global::backgroundManager->exists(image)) { - // Copy images: - QString imageSource = extractionFolder + "backgrounds/" + image; - QString imageDest = destFolder + image; - copier.copyFolder(imageSource, imageDest); - // Copy configuration file: - QString configSource = extractionFolder + "backgrounds/" + image + ".config"; - QString configDest = destFolder + image; - if (dir.exists(configSource)) - copier.copyFolder(configSource, configDest); - // Copy preview: - QString previewSource = extractionFolder + "backgrounds/previews/" + image; - QString previewDest = destFolder + "previews/" + image; - if (dir.exists(previewSource)) { - dir.mkdir(destFolder + "previews/"); // Make sure the folder exists! - copier.copyFolder(previewSource, previewDest); - } - // Append image to database: - Global::backgroundManager->addImage(imageDest); - } - } + FormatImporter copier; // Only used to copy files synchronously + QString destFolder = KGlobal::dirs()->saveLocation("data", "basket/backgrounds/"); + + QDir dir(extractionFolder + "backgrounds/", /*nameFilder=*/"*.png", /*sortSpec=*/QDir::Name | QDir::IgnoreCase, /*filterSpec=*/QDir::Files | QDir::NoSymLinks); + QStringList files = dir.entryList(); + for (QStringList::Iterator it = files.begin(); it != files.end(); ++it) { + QString image = *it; + if (!Global::backgroundManager->exists(image)) { + // Copy images: + QString imageSource = extractionFolder + "backgrounds/" + image; + QString imageDest = destFolder + image; + copier.copyFolder(imageSource, imageDest); + // Copy configuration file: + QString configSource = extractionFolder + "backgrounds/" + image + ".config"; + QString configDest = destFolder + image; + if (dir.exists(configSource)) + copier.copyFolder(configSource, configDest); + // Copy preview: + QString previewSource = extractionFolder + "backgrounds/previews/" + image; + QString previewDest = destFolder + "previews/" + image; + if (dir.exists(previewSource)) { + dir.mkdir(destFolder + "previews/"); // Make sure the folder exists! + copier.copyFolder(previewSource, previewDest); + } + // Append image to database: + Global::backgroundManager->addImage(imageDest); + } + } } void Archive::renameBasketFolders(const QString &extractionFolder, QMap<QString, QString> &mergedStates) { - QDomDocument *doc = XMLWork::openFile("basketTree", extractionFolder + "baskets/baskets.xml"); - if (doc != 0) { - QMap<QString, QString> folderMap; - QDomElement docElem = doc->documentElement(); - QDomNode node = docElem.firstChild(); - renameBasketFolder(extractionFolder, node, folderMap, mergedStates); - loadExtractedBaskets(extractionFolder, node, folderMap, 0); - } + QDomDocument *doc = XMLWork::openFile("basketTree", extractionFolder + "baskets/baskets.xml"); + if (doc != 0) { + QMap<QString, QString> folderMap; + QDomElement docElem = doc->documentElement(); + QDomNode node = docElem.firstChild(); + renameBasketFolder(extractionFolder, node, folderMap, mergedStates); + loadExtractedBaskets(extractionFolder, node, folderMap, 0); + } } void Archive::renameBasketFolder(const QString &extractionFolder, QDomNode &basketNode, QMap<QString, QString> &folderMap, QMap<QString, QString> &mergedStates) { - QDomNode n = basketNode; - while ( ! n.isNull() ) { - QDomElement element = n.toElement(); - if ( (!element.isNull()) && element.tagName() == "basket" ) { - QString folderName = element.attribute("folderName"); - if (!folderName.isEmpty()) { - // Find a folder name: - QString newFolderName = BasketFactory::newFolderName(); - folderMap[folderName] = newFolderName; - // Reserve the folder name: - QDir dir; - dir.mkdir(Global::basketsFolder() + newFolderName); - // Rename the merged tag ids: -// if (mergedStates.count() > 0) { - renameMergedStatesAndBasketIcon(extractionFolder + "baskets/" + folderName + ".basket", mergedStates, extractionFolder); -// } - // Child baskets: - QDomNode node = element.firstChild(); - renameBasketFolder(extractionFolder, node, folderMap, mergedStates); - } - } - n = n.nextSibling(); - } + QDomNode n = basketNode; + while (! n.isNull()) { + QDomElement element = n.toElement(); + if ((!element.isNull()) && element.tagName() == "basket") { + QString folderName = element.attribute("folderName"); + if (!folderName.isEmpty()) { + // Find a folder name: + QString newFolderName = BasketFactory::newFolderName(); + folderMap[folderName] = newFolderName; + // Reserve the folder name: + QDir dir; + dir.mkdir(Global::basketsFolder() + newFolderName); + // Rename the merged tag ids: +// if (mergedStates.count() > 0) { + renameMergedStatesAndBasketIcon(extractionFolder + "baskets/" + folderName + ".basket", mergedStates, extractionFolder); +// } + // Child baskets: + QDomNode node = element.firstChild(); + renameBasketFolder(extractionFolder, node, folderMap, mergedStates); + } + } + n = n.nextSibling(); + } } void Archive::renameMergedStatesAndBasketIcon(const QString &fullPath, QMap<QString, QString> &mergedStates, const QString &extractionFolder) { - QDomDocument *doc = XMLWork::openFile("basket", fullPath); - if (doc == 0) - return; - QDomElement docElem = doc->documentElement(); - QDomElement properties = XMLWork::getElement(docElem, "properties"); - importBasketIcon(properties, extractionFolder); - QDomElement notes = XMLWork::getElement(docElem, "notes"); - if (mergedStates.count() > 0) - renameMergedStates(notes, mergedStates); - Basket::safelySaveToFile(fullPath, /*"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + */doc->toString()); + QDomDocument *doc = XMLWork::openFile("basket", fullPath); + if (doc == 0) + return; + QDomElement docElem = doc->documentElement(); + QDomElement properties = XMLWork::getElement(docElem, "properties"); + importBasketIcon(properties, extractionFolder); + QDomElement notes = XMLWork::getElement(docElem, "notes"); + if (mergedStates.count() > 0) + renameMergedStates(notes, mergedStates); + Basket::safelySaveToFile(fullPath, /*"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + */doc->toString()); } void Archive::importBasketIcon(QDomElement properties, const QString &extractionFolder) { - QString iconName = XMLWork::getElementText(properties, "icon"); - if (!iconName.isEmpty() && iconName != "basket") { - QPixmap icon = KIconLoader::global()->loadIcon( - iconName, KIconLoader::NoGroup, 16, KIconLoader::DefaultState, - QStringList(), 0L, /*canReturnNull=*/true - ); - // The icon does not exists on that computer, import it: - if (icon.isNull()) { - QDir dir; - dir.mkdir(Global::savesFolder() + "basket-icons/"); - FormatImporter copier; // Only used to copy files synchronously - // Of the icon path was eg. "/home/seb/icon.png", it was exported as "basket-icons/_home_seb_icon.png". - // So we need to copy that image to "~/.kde/share/apps/basket/basket-icons/icon.png": - int slashIndex = iconName.lastIndexOf('/'); - QString iconFileName = (slashIndex < 0 ? iconName : iconName.right(slashIndex - 2)); - QString source = extractionFolder + "basket-icons/" + iconName.replace('/', '_'); - QString destination = Global::savesFolder() + "basket-icons/" + iconFileName; - if (!dir.exists(destination)) - copier.copyFolder(source, destination); - // Replace the emblem path in the tags.xml copy: - QDomElement iconElement = XMLWork::getElement(properties, "icon"); - properties.removeChild(iconElement); - QDomDocument document = properties.ownerDocument(); - XMLWork::addElement(document, properties, "icon", destination); - } - } + QString iconName = XMLWork::getElementText(properties, "icon"); + if (!iconName.isEmpty() && iconName != "basket") { + QPixmap icon = KIconLoader::global()->loadIcon( + iconName, KIconLoader::NoGroup, 16, KIconLoader::DefaultState, + QStringList(), 0L, /*canReturnNull=*/true + ); + // The icon does not exists on that computer, import it: + if (icon.isNull()) { + QDir dir; + dir.mkdir(Global::savesFolder() + "basket-icons/"); + FormatImporter copier; // Only used to copy files synchronously + // Of the icon path was eg. "/home/seb/icon.png", it was exported as "basket-icons/_home_seb_icon.png". + // So we need to copy that image to "~/.kde/share/apps/basket/basket-icons/icon.png": + int slashIndex = iconName.lastIndexOf('/'); + QString iconFileName = (slashIndex < 0 ? iconName : iconName.right(slashIndex - 2)); + QString source = extractionFolder + "basket-icons/" + iconName.replace('/', '_'); + QString destination = Global::savesFolder() + "basket-icons/" + iconFileName; + if (!dir.exists(destination)) + copier.copyFolder(source, destination); + // Replace the emblem path in the tags.xml copy: + QDomElement iconElement = XMLWork::getElement(properties, "icon"); + properties.removeChild(iconElement); + QDomDocument document = properties.ownerDocument(); + XMLWork::addElement(document, properties, "icon", destination); + } + } } void Archive::renameMergedStates(QDomNode notes, QMap<QString, QString> &mergedStates) { - QDomNode n = notes.firstChild(); - while ( ! n.isNull() ) { - QDomElement element = n.toElement(); - if (!element.isNull()) { - if (element.tagName() == "group" ) { - renameMergedStates(n, mergedStates); - } else if (element.tagName() == "note") { - QString tags = XMLWork::getElementText(element, "tags"); - if (!tags.isEmpty()) { - QStringList tagNames = tags.split(";"); - for (QStringList::Iterator it = tagNames.begin(); it != tagNames.end(); ++it) { - QString &tag = *it; - if (mergedStates.contains(tag)) { - tag = mergedStates[tag]; - } - } - QString newTags = tagNames.join(";"); - QDomElement tagsElement = XMLWork::getElement(element, "tags"); - element.removeChild(tagsElement); - QDomDocument document = element.ownerDocument(); - XMLWork::addElement(document, element, "tags", newTags); - } - } - } - n = n.nextSibling(); - } + QDomNode n = notes.firstChild(); + while (! n.isNull()) { + QDomElement element = n.toElement(); + if (!element.isNull()) { + if (element.tagName() == "group") { + renameMergedStates(n, mergedStates); + } else if (element.tagName() == "note") { + QString tags = XMLWork::getElementText(element, "tags"); + if (!tags.isEmpty()) { + QStringList tagNames = tags.split(";"); + for (QStringList::Iterator it = tagNames.begin(); it != tagNames.end(); ++it) { + QString &tag = *it; + if (mergedStates.contains(tag)) { + tag = mergedStates[tag]; + } + } + QString newTags = tagNames.join(";"); + QDomElement tagsElement = XMLWork::getElement(element, "tags"); + element.removeChild(tagsElement); + QDomDocument document = element.ownerDocument(); + XMLWork::addElement(document, element, "tags", newTags); + } + } + } + n = n.nextSibling(); + } } void Archive::loadExtractedBaskets(const QString &extractionFolder, QDomNode &basketNode, QMap<QString, QString> &folderMap, Basket *parent) { - bool basketSetAsCurrent = (parent != 0); - QDomNode n = basketNode; - while ( ! n.isNull() ) { - QDomElement element = n.toElement(); - if ( (!element.isNull()) && element.tagName() == "basket" ) { - QString folderName = element.attribute("folderName"); - if (!folderName.isEmpty()) { - // Move the basket folder to its destination, while renaming it uniquely: - QString newFolderName = folderMap[folderName]; - FormatImporter copier; - // The folder has been "reserved" by creating it. Avoid asking the user to override: - QDir dir; - 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); - 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"); - importBasketIcon(properties, extractionFolder); // Rename the icon fileName if necessary - basket->loadProperties(properties); - // Open the first basket of the archive: - if (!basketSetAsCurrent) { - Global::bnpView->setCurrentBasket(basket); - basketSetAsCurrent = true; - } - QDomNode node = element.firstChild(); - loadExtractedBaskets(extractionFolder, node, folderMap, basket); - } - } - n = n.nextSibling(); - } + bool basketSetAsCurrent = (parent != 0); + QDomNode n = basketNode; + while (! n.isNull()) { + QDomElement element = n.toElement(); + if ((!element.isNull()) && element.tagName() == "basket") { + QString folderName = element.attribute("folderName"); + if (!folderName.isEmpty()) { + // Move the basket folder to its destination, while renaming it uniquely: + QString newFolderName = folderMap[folderName]; + FormatImporter copier; + // The folder has been "reserved" by creating it. Avoid asking the user to override: + QDir dir; + 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); + 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"); + importBasketIcon(properties, extractionFolder); // Rename the icon fileName if necessary + basket->loadProperties(properties); + // Open the first basket of the archive: + if (!basketSetAsCurrent) { + Global::bnpView->setCurrentBasket(basket); + basketSetAsCurrent = true; + } + QDomNode node = element.firstChild(); + loadExtractedBaskets(extractionFolder, node, folderMap, basket); + } + } + n = n.nextSibling(); + } } src/archive.cpp @@ -38,22 +38,22 @@ class KProgress; */ class Archive { - public: - static void save(Basket *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<Tag*> &list); - // Convenient Methods for Loading: - static void renameBasketFolders(const QString &extractionFolder, QMap<QString, QString> &mergedStates); - static void renameBasketFolder(const QString &extractionFolder, QDomNode &basketNode, QMap<QString, QString> &folderMap, QMap<QString, QString> &mergedStates); - static void renameMergedStatesAndBasketIcon(const QString &fullPath, QMap<QString, QString> &mergedStates, const QString &extractionFolder); - static void renameMergedStates(QDomNode notes, QMap<QString, QString> &mergedStates); - static void importBasketIcon(QDomElement properties, const QString &extractionFolder); - static void loadExtractedBaskets(const QString &extractionFolder, QDomNode &basketNode, QMap<QString, QString> &folderMap, Basket *parent); - static void importTagEmblems(const QString &extractionFolder); - static void importArchivedBackgroundImages(const QString &extractionFolder); +public: + static void save(Basket *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<Tag*> &list); + // Convenient Methods for Loading: + static void renameBasketFolders(const QString &extractionFolder, QMap<QString, QString> &mergedStates); + static void renameBasketFolder(const QString &extractionFolder, QDomNode &basketNode, QMap<QString, QString> &folderMap, QMap<QString, QString> &mergedStates); + static void renameMergedStatesAndBasketIcon(const QString &fullPath, QMap<QString, QString> &mergedStates, const QString &extractionFolder); + static void renameMergedStates(QDomNode notes, QMap<QString, QString> &mergedStates); + static void importBasketIcon(QDomElement properties, const QString &extractionFolder); + static void loadExtractedBaskets(const QString &extractionFolder, QDomNode &basketNode, QMap<QString, QString> &folderMap, Basket *parent); + static void importTagEmblems(const QString &extractionFolder); + static void importArchivedBackgroundImages(const QString &extractionFolder); }; #endif src/archive.h @@ -35,56 +35,56 @@ BackgroundEntry::BackgroundEntry(const QString &location) { - this->location = location; - name = KUrl(location).fileName(); - tiled = false; - pixmap = 0; - preview = 0; - customersCount = 0; + this->location = location; + name = KUrl(location).fileName(); + tiled = false; + pixmap = 0; + preview = 0; + customersCount = 0; } BackgroundEntry::~BackgroundEntry() { - delete pixmap; - delete preview; + delete pixmap; + delete preview; } /** class OpaqueBackgroundEntry: */ OpaqueBackgroundEntry::OpaqueBackgroundEntry(const QString &name, const QColor &color) { - this->name = name; - this->color = color; - pixmap = 0; - customersCount = 0; + this->name = name; + this->color = color; + pixmap = 0; + customersCount = 0; } OpaqueBackgroundEntry::~OpaqueBackgroundEntry() { - delete pixmap; + delete pixmap; } /** class BackgroundManager: */ BackgroundManager::BackgroundManager() { -/// kDebug() << "BackgroundManager: Found the following background images in "; - QStringList directories = KGlobal::dirs()->resourceDirs("data"); // eg. { "/home/seb/.kde/share/apps/", "/usr/share/apps/" } - // For each folder: - for (QStringList::Iterator it = directories.begin(); it != directories.end(); ++it) { - // For each file in those directories: - QDir dir(*it + "basket/backgrounds/", /*nameFilder=*/"*.png", /*sortSpec=*/QDir::Name | QDir::IgnoreCase, /*filterSpec=*/QDir::Files | QDir::NoSymLinks); -/// kDebug() << *it + "basket/backgrounds/ "; - QStringList files = dir.entryList(); - for (QStringList::Iterator it2 = files.begin(); it2 != files.end(); ++it2) // TODO: If an image name is present in two folders? - addImage(*it + "basket/backgrounds/" + *it2); - } - -/// kDebug() << ":"; -/// for (BackgroundsList::Iterator it = m_backgroundsList.begin(); it != m_backgroundsList.end(); ++it) -/// kDebug() << "* " << (*it)->location << " [ref: " << (*it)->name << "]"; - - connect( &m_garbageTimer, SIGNAL(timeout()), this, SLOT(doGarbage()) ); +/// kDebug() << "BackgroundManager: Found the following background images in "; + QStringList directories = KGlobal::dirs()->resourceDirs("data"); // eg. { "/home/seb/.kde/share/apps/", "/usr/share/apps/" } + // For each folder: + for (QStringList::Iterator it = directories.begin(); it != directories.end(); ++it) { + // For each file in those directories: + QDir dir(*it + "basket/backgrounds/", /*nameFilder=*/"*.png", /*sortSpec=*/QDir::Name | QDir::IgnoreCase, /*filterSpec=*/QDir::Files | QDir::NoSymLinks); +/// kDebug() << *it + "basket/backgrounds/ "; + QStringList files = dir.entryList(); + for (QStringList::Iterator it2 = files.begin(); it2 != files.end(); ++it2) // TODO: If an image name is present in two folders? + addImage(*it + "basket/backgrounds/" + *it2); + } + +/// kDebug() << ":"; +/// for (BackgroundsList::Iterator it = m_backgroundsList.begin(); it != m_backgroundsList.end(); ++it) +/// kDebug() << "* " << (*it)->location << " [ref: " << (*it)->name << "]"; + + connect(&m_garbageTimer, SIGNAL(timeout()), this, SLOT(doGarbage())); } BackgroundManager::~BackgroundManager() @@ -93,303 +93,303 @@ BackgroundManager::~BackgroundManager() void BackgroundManager::addImage(const QString &fullPath) { - m_backgroundsList.append(new BackgroundEntry(fullPath)); + m_backgroundsList.append(new BackgroundEntry(fullPath)); } BackgroundEntry* BackgroundManager::backgroundEntryFor(const QString &image) { - for (BackgroundsList::Iterator it = m_backgroundsList.begin(); it != m_backgroundsList.end(); ++it) - if ((*it)->name == image) - return *it; - return 0; + for (BackgroundsList::Iterator it = m_backgroundsList.begin(); it != m_backgroundsList.end(); ++it) + if ((*it)->name == image) + return *it; + return 0; } OpaqueBackgroundEntry* BackgroundManager::opaqueBackgroundEntryFor(const QString &image, const QColor &color) { - for (OpaqueBackgroundsList::Iterator it = m_opaqueBackgroundsList.begin(); it != m_opaqueBackgroundsList.end(); ++it) - if ((*it)->name == image && (*it)->color == color) - return *it; - return 0; + for (OpaqueBackgroundsList::Iterator it = m_opaqueBackgroundsList.begin(); it != m_opaqueBackgroundsList.end(); ++it) + if ((*it)->name == image && (*it)->color == color) + return *it; + return 0; } bool BackgroundManager::subscribe(const QString &image) { - BackgroundEntry *entry = backgroundEntryFor(image); - if (entry) { - // If it's the first time something subscribe to this image: - if (!entry->pixmap) { - // Try to load the pixmap: - entry->pixmap = new QPixmap(entry->location); - // Try to figure out if it's a tiled background image or not (default to NO): - KConfig config(entry->location + ".config", KConfig::SimpleConfig); - KConfigGroup configGroup = config.group("BasKet Background Image Configuration"); - entry->tiled = configGroup.readEntry("tiled", false); - } - // Return if the image loading has failed: - if (entry->pixmap->isNull()) { -/// kDebug() << "BackgroundManager: Failed to load " << entry->location; - return false; - } - // Success: effectively subscribe: - ++entry->customersCount; - return true; - } else { - // Don't exist: subscription failed: -/// kDebug() << "BackgroundManager: Requested unexisting image: " << image; - return false; - } + BackgroundEntry *entry = backgroundEntryFor(image); + if (entry) { + // If it's the first time something subscribe to this image: + if (!entry->pixmap) { + // Try to load the pixmap: + entry->pixmap = new QPixmap(entry->location); + // Try to figure out if it's a tiled background image or not (default to NO): + KConfig config(entry->location + ".config", KConfig::SimpleConfig); + KConfigGroup configGroup = config.group("BasKet Background Image Configuration"); + entry->tiled = configGroup.readEntry("tiled", false); + } + // Return if the image loading has failed: + if (entry->pixmap->isNull()) { +/// kDebug() << "BackgroundManager: Failed to load " << entry->location; + return false; + } + // Success: effectively subscribe: + ++entry->customersCount; + return true; + } else { + // Don't exist: subscription failed: +/// kDebug() << "BackgroundManager: Requested unexisting image: " << image; + return false; + } } bool BackgroundManager::subscribe(const QString &image, const QColor &color) { - BackgroundEntry *backgroundEntry = backgroundEntryFor(image); - - // First, if the image doesn't exist, isn't subscribed, or failed to load then we don't go further: - if (!backgroundEntry || !backgroundEntry->pixmap || backgroundEntry->pixmap->isNull()) { -/// kDebug() << "BackgroundManager: Requested an unexisting or unsubscribed image: (" << image << "," << color.name() << ")..."; - return false; - } - - OpaqueBackgroundEntry *opaqueBackgroundEntry = opaqueBackgroundEntryFor(image, color); - - // If this couple is requested for the first time or it haven't been subscribed for a long time enough, create it: - if (!opaqueBackgroundEntry) { -/// kDebug() << "BackgroundManager: Computing (" << image << "," << color.name() << ")..."; - opaqueBackgroundEntry = new OpaqueBackgroundEntry(image, color); - opaqueBackgroundEntry->pixmap = new QPixmap(backgroundEntry->pixmap->size()); - opaqueBackgroundEntry->pixmap->fill(color); - QPainter painter(opaqueBackgroundEntry->pixmap); - painter.drawPixmap(0, 0, *(backgroundEntry->pixmap)); - painter.end(); - m_opaqueBackgroundsList.append(opaqueBackgroundEntry); - } - - // We are now sure the entry exist, do the subscription: - ++opaqueBackgroundEntry->customersCount; - return true; + BackgroundEntry *backgroundEntry = backgroundEntryFor(image); + + // First, if the image doesn't exist, isn't subscribed, or failed to load then we don't go further: + if (!backgroundEntry || !backgroundEntry->pixmap || backgroundEntry->pixmap->isNull()) { +/// kDebug() << "BackgroundManager: Requested an unexisting or unsubscribed image: (" << image << "," << color.name() << ")..."; + return false; + } + + OpaqueBackgroundEntry *opaqueBackgroundEntry = opaqueBackgroundEntryFor(image, color); + + // If this couple is requested for the first time or it haven't been subscribed for a long time enough, create it: + if (!opaqueBackgroundEntry) { +/// kDebug() << "BackgroundManager: Computing (" << image << "," << color.name() << ")..."; + opaqueBackgroundEntry = new OpaqueBackgroundEntry(image, color); + opaqueBackgroundEntry->pixmap = new QPixmap(backgroundEntry->pixmap->size()); + opaqueBackgroundEntry->pixmap->fill(color); + QPainter painter(opaqueBackgroundEntry->pixmap); + painter.drawPixmap(0, 0, *(backgroundEntry->pixmap)); + painter.end(); + m_opaqueBackgroundsList.append(opaqueBackgroundEntry); + } + + // We are now sure the entry exist, do the subscription: + ++opaqueBackgroundEntry->customersCount; + return true; } void BackgroundManager::unsubscribe(const QString &image) { - BackgroundEntry *entry = backgroundEntryFor(image); + BackgroundEntry *entry = backgroundEntryFor(image); - if (!entry) { -/// kDebug() << "BackgroundManager: Wanted to unsuscribe a not subscribed image: " << image; - return; - } + if (!entry) { +/// kDebug() << "BackgroundManager: Wanted to unsuscribe a not subscribed image: " << image; + return; + } - --entry->customersCount; - if (entry->customersCount <= 0) - requestDelayedGarbage(); + --entry->customersCount; + if (entry->customersCount <= 0) + requestDelayedGarbage(); } void BackgroundManager::unsubscribe(const QString &image, const QColor &color) { - OpaqueBackgroundEntry *entry = opaqueBackgroundEntryFor(image, color); + OpaqueBackgroundEntry *entry = opaqueBackgroundEntryFor(image, color); - if (!entry) { -/// kDebug() << "BackgroundManager: Wanted to unsuscribe a not subscribed colored image: (" << image << "," << color.name() << ")"; - return; - } + if (!entry) { +/// kDebug() << "BackgroundManager: Wanted to unsuscribe a not subscribed colored image: (" << image << "," << color.name() << ")"; + return; + } - --entry->customersCount; - if (entry->customersCount <= 0) - requestDelayedGarbage(); + --entry->customersCount; + if (entry->customersCount <= 0) + requestDelayedGarbage(); } QPixmap* BackgroundManager::pixmap(const QString &image) { - BackgroundEntry *entry = backgroundEntryFor(image); + BackgroundEntry *entry = backgroundEntryFor(image); - if (!entry || !entry->pixmap || entry->pixmap->isNull()) { -/// kDebug() << "BackgroundManager: Requested an unexisting or unsubscribed image: " << image; - return 0; - } + if (!entry || !entry->pixmap || entry->pixmap->isNull()) { +/// kDebug() << "BackgroundManager: Requested an unexisting or unsubscribed image: " << image; + return 0; + } - return entry->pixmap; + return entry->pixmap; } QPixmap* BackgroundManager::opaquePixmap(const QString &image, const QColor &color) { - OpaqueBackgroundEntry *entry = opaqueBackgroundEntryFor(image, color); + OpaqueBackgroundEntry *entry = opaqueBackgroundEntryFor(image, color); - if (!entry || !entry->pixmap || entry->pixmap->isNull()) { -/// kDebug() << "BackgroundManager: Requested an unexisting or unsubscribed colored image: (" << image << "," << color.name() << ")"; - return 0; - } + if (!entry || !entry->pixmap || entry->pixmap->isNull()) { +/// kDebug() << "BackgroundManager: Requested an unexisting or unsubscribed colored image: (" << image << "," << color.name() << ")"; + return 0; + } - return entry->pixmap; + return entry->pixmap; } bool BackgroundManager::tiled(const QString &image) { - BackgroundEntry *entry = backgroundEntryFor(image); + BackgroundEntry *entry = backgroundEntryFor(image); - if (!entry || !entry->pixmap || entry->pixmap->isNull()) { -/// kDebug() << "BackgroundManager: Requested an unexisting or unsubscribed image: " << image; - return false; - } + if (!entry || !entry->pixmap || entry->pixmap->isNull()) { +/// kDebug() << "BackgroundManager: Requested an unexisting or unsubscribed image: " << image; + return false; + } - return entry->tiled; + return entry->tiled; } bool BackgroundManager::exists(const QString &image) { - for (BackgroundsList::iterator it = m_backgroundsList.begin(); it != m_backgroundsList.end(); ++it) - if ((*it)->name == image) - return true; - return false; + for (BackgroundsList::iterator it = m_backgroundsList.begin(); it != m_backgroundsList.end(); ++it) + if ((*it)->name == image) + return true; + return false; } QStringList BackgroundManager::imageNames() { - QStringList list; - for (BackgroundsList::iterator it = m_backgroundsList.begin(); it != m_backgroundsList.end(); ++it) - list.append((*it)->name); - return list; + QStringList list; + for (BackgroundsList::iterator it = m_backgroundsList.begin(); it != m_backgroundsList.end(); ++it) + list.append((*it)->name); + return list; } QPixmap* BackgroundManager::preview(const QString &image) { - static const int MAX_WIDTH = 100; - static const int MAX_HEIGHT = 75; - static const QColor PREVIEW_BG = Qt::white; - - BackgroundEntry *entry = backgroundEntryFor(image); - - if (!entry) { -/// kDebug() << "BackgroundManager: Requested the preview of an unexisting image: " << image; - return false; - } - - // The easiest way: already computed: - if (entry->preview) - return entry->preview; - - // Then, try to load the preview from file: - QString previewPath = KGlobal::dirs()->findResource("data", "basket/backgrounds/previews/" + entry->name); - QPixmap *previewPixmap = new QPixmap(previewPath); - // Success: - if (!previewPixmap->isNull()) { -/// kDebug() << "BackgroundManager: Loaded image preview for " << entry->location << " from file " << previewPath; - entry->preview = previewPixmap; - return entry->preview; - } - - // We failed? Then construct it: - // Note: if a preview is requested, it's because the user is currently choosing an image. - // Since we need that image to create the preview, we keep the image in memory. - // Then, it will already be loaded when user press [OK] in the background image chooser. - // BUT we also delay a garbage because we don't want EVERY images to be loaded if the user use only a few of them, of course: - - // Already used? Good: we don't have to load it... - if (!entry->pixmap) { - // Note: it's a code duplication from BackgroundManager::subscribe(const QString &image), - // Because, as we are loading the pixmap we ALSO need to know if it's a tile or not, in case that image will soon be used (and not destroyed by the garbager): - entry->pixmap = new QPixmap(entry->location); - // Try to figure out if it's a tiled background image or not (default to NO): - KConfig config(entry->location + ".config"); - KConfigGroup configGroup = config.group("BasKet Background Image Configuration"); - entry->tiled = configGroup.readEntry("tiled", false); - } - - // The image cannot be loaded, we failed: - if (entry->pixmap->isNull()) - return 0; - - // Good that we are still alive: entry->pixmap contains the pixmap to rescale down for the preview: - // Compute new size: - int width = entry->pixmap->width(); - int height = entry->pixmap->height(); - if (width > MAX_WIDTH) { - height = height * MAX_WIDTH / width; - width = MAX_WIDTH; - } - if (height > MAX_HEIGHT) { - width = width * MAX_HEIGHT / height; - height = MAX_HEIGHT; - } - // And create the resulting pixmap: - QPixmap *result = new QPixmap(width, height); - result->fill(PREVIEW_BG); - QImage imageToScale = entry->pixmap->toImage(); - QPixmap pmScaled = QPixmap::fromImage(imageToScale.scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); - QPainter painter(result); - painter.drawPixmap(0, 0, pmScaled); - painter.end(); - - // Saving it to file for later: - QString folder = KGlobal::dirs()->saveLocation("data", "basket/backgrounds/previews/"); - result->save(folder + entry->name, "PNG"); - - // Ouf! That's done: - entry->preview = result; - requestDelayedGarbage(); - return entry->preview; + static const int MAX_WIDTH = 100; + static const int MAX_HEIGHT = 75; + static const QColor PREVIEW_BG = Qt::white; + + BackgroundEntry *entry = backgroundEntryFor(image); + + if (!entry) { +/// kDebug() << "BackgroundManager: Requested the preview of an unexisting image: " << image; + return false; + } + + // The easiest way: already computed: + if (entry->preview) + return entry->preview; + + // Then, try to load the preview from file: + QString previewPath = KGlobal::dirs()->findResource("data", "basket/backgrounds/previews/" + entry->name); + QPixmap *previewPixmap = new QPixmap(previewPath); + // Success: + if (!previewPixmap->isNull()) { +/// kDebug() << "BackgroundManager: Loaded image preview for " << entry->location << " from file " << previewPath; + entry->preview = previewPixmap; + return entry->preview; + } + + // We failed? Then construct it: + // Note: if a preview is requested, it's because the user is currently choosing an image. + // Since we need that image to create the preview, we keep the image in memory. + // Then, it will already be loaded when user press [OK] in the background image chooser. + // BUT we also delay a garbage because we don't want EVERY images to be loaded if the user use only a few of them, of course: + + // Already used? Good: we don't have to load it... + if (!entry->pixmap) { + // Note: it's a code duplication from BackgroundManager::subscribe(const QString &image), + // Because, as we are loading the pixmap we ALSO need to know if it's a tile or not, in case that image will soon be used (and not destroyed by the garbager): + entry->pixmap = new QPixmap(entry->location); + // Try to figure out if it's a tiled background image or not (default to NO): + KConfig config(entry->location + ".config"); + KConfigGroup configGroup = config.group("BasKet Background Image Configuration"); + entry->tiled = configGroup.readEntry("tiled", false); + } + + // The image cannot be loaded, we failed: + if (entry->pixmap->isNull()) + return 0; + + // Good that we are still alive: entry->pixmap contains the pixmap to rescale down for the preview: + // Compute new size: + int width = entry->pixmap->width(); + int height = entry->pixmap->height(); + if (width > MAX_WIDTH) { + height = height * MAX_WIDTH / width; + width = MAX_WIDTH; + } + if (height > MAX_HEIGHT) { + width = width * MAX_HEIGHT / height; + height = MAX_HEIGHT; + } + // And create the resulting pixmap: + QPixmap *result = new QPixmap(width, height); + result->fill(PREVIEW_BG); + QImage imageToScale = entry->pixmap->toImage(); + QPixmap pmScaled = QPixmap::fromImage(imageToScale.scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); + QPainter painter(result); + painter.drawPixmap(0, 0, pmScaled); + painter.end(); + + // Saving it to file for later: + QString folder = KGlobal::dirs()->saveLocation("data", "basket/backgrounds/previews/"); + result->save(folder + entry->name, "PNG"); + + // Ouf! That's done: + entry->preview = result; + requestDelayedGarbage(); + return entry->preview; } QString BackgroundManager::pathForImageName(const QString &image) { - BackgroundEntry *entry = backgroundEntryFor(image); - if (entry == 0) - return ""; - else - return entry->location; + BackgroundEntry *entry = backgroundEntryFor(image); + if (entry == 0) + return ""; + else + return entry->location; } QString BackgroundManager::previewPathForImageName(const QString &image) { - BackgroundEntry *entry = backgroundEntryFor(image); - if (entry == 0) - return ""; - else { - QString previewPath = KGlobal::dirs()->findResource("data", "basket/backgrounds/previews/" + entry->name); - QDir dir; - if (!dir.exists(previewPath)) - return ""; - else - return previewPath; - } + BackgroundEntry *entry = backgroundEntryFor(image); + if (entry == 0) + return ""; + else { + QString previewPath = KGlobal::dirs()->findResource("data", "basket/backgrounds/previews/" + entry->name); + QDir dir; + if (!dir.exists(previewPath)) + return ""; + else + return previewPath; + } } void BackgroundManager::requestDelayedGarbage() { - static const int DELAY = 60/*seconds*/; + static const int DELAY = 60/*seconds*/; - if (!m_garbageTimer.isActive()) { - m_garbageTimer.setSingleShot(true); - m_garbageTimer.start(DELAY * 1000/*ms*/); - } + if (!m_garbageTimer.isActive()) { + m_garbageTimer.setSingleShot(true); + m_garbageTimer.start(DELAY * 1000/*ms*/); + } } void BackgroundManager::doGarbage() { -/// kDebug() << "BackgroundManager: Doing garbage..."; - -/// kDebug() << "BackgroundManager: Images:"; - for (BackgroundsList::Iterator it = m_backgroundsList.begin(); it != m_backgroundsList.end(); ++it) { - BackgroundEntry *entry = *it; -/// kDebug() << "* " << entry->name << ": used " << entry->customersCount << " times"; - if (entry->customersCount <= 0 && entry->pixmap) { -/// kDebug() << " [Deleted cached pixmap]"; - delete entry->pixmap; - entry->pixmap = 0; - } -/// kDebug(); - } - -/// kDebug() << "BackgroundManager: Opaque Cached Images:"; - for (OpaqueBackgroundsList::Iterator it = m_opaqueBackgroundsList.begin(); it != m_opaqueBackgroundsList.end(); ) { - OpaqueBackgroundEntry *entry = *it; -/// kDebug() << "* " << entry->name << "," << entry->color.name() << ": used " << entry->customersCount << " times"; - if (entry->customersCount <= 0) { -/// kDebug() << " [Deleted entry]"; - delete entry->pixmap; - entry->pixmap = 0; - it = m_opaqueBackgroundsList.erase(it); - } else - ++it; -/// kDebug(); - } +/// kDebug() << "BackgroundManager: Doing garbage..."; + +/// kDebug() << "BackgroundManager: Images:"; + for (BackgroundsList::Iterator it = m_backgroundsList.begin(); it != m_backgroundsList.end(); ++it) { + BackgroundEntry *entry = *it; +/// kDebug() << "* " << entry->name << ": used " << entry->customersCount << " times"; + if (entry->customersCount <= 0 && entry->pixmap) { +/// kDebug() << " [Deleted cached pixmap]"; + delete entry->pixmap; + entry->pixmap = 0; + } +/// kDebug(); + } + +/// kDebug() << "BackgroundManager: Opaque Cached Images:"; + for (OpaqueBackgroundsList::Iterator it = m_opaqueBackgroundsList.begin(); it != m_opaqueBackgroundsList.end();) { + OpaqueBackgroundEntry *entry = *it; +/// kDebug() << "* " << entry->name << "," << entry->color.name() << ": used " << entry->customersCount << " times"; + if (entry->customersCount <= 0) { +/// kDebug() << " [Deleted entry]"; + delete entry->pixmap; + entry->pixmap = 0; + it = m_opaqueBackgroundsList.erase(it); + } else + ++it; +/// kDebug(); + } } src/backgroundmanager.cpp @@ -34,18 +34,18 @@ */ class BackgroundEntry { - friend class BackgroundManager; + friend class BackgroundManager; - protected: - BackgroundEntry(const QString &location); - ~BackgroundEntry(); +protected: + BackgroundEntry(const QString &location); + ~BackgroundEntry(); - QString name; - QString location; - bool tiled; /// << Only valid after some object subscribed to this image! Because it's only read at this time. - QPixmap *pixmap; /// << Only valid (non-null) after some object subscribed to this image! Because it's only read at this time. - QPixmap *preview; /// << Only valid (non-null) after some object requested the preview. - int customersCount; + QString name; + QString location; + bool tiled; /// << Only valid after some object subscribed to this image! Because it's only read at this time. + QPixmap *pixmap; /// << Only valid (non-null) after some object subscribed to this image! Because it's only read at this time. + QPixmap *preview; /// << Only valid (non-null) after some object requested the preview. + int customersCount; }; /** A node in the list of opaque background images (with a background color applyed to an image) of BackgroundManager. @@ -54,16 +54,16 @@ class BackgroundEntry */ class OpaqueBackgroundEntry { - friend class BackgroundManager; + friend class BackgroundManager; - protected: - OpaqueBackgroundEntry(const QString &name, const QColor &color); - ~OpaqueBackgroundEntry(); +protected: + OpaqueBackgroundEntry(const QString &name, const QColor &color); + ~OpaqueBackgroundEntry(); - QString name; - QColor color; - QPixmap *pixmap; - int customersCount; + QString name; + QColor color; + QPixmap *pixmap; + int customersCount; }; /** Manage the list of background images. @@ -87,46 +87,46 @@ class OpaqueBackgroundEntry */ class BackgroundManager : private QObject { - Q_OBJECT - private: - /// LIST OF IMAGES: - typedef QList<BackgroundEntry*> BackgroundsList; - typedef QList<OpaqueBackgroundEntry*> OpaqueBackgroundsList; + Q_OBJECT +private: + /// LIST OF IMAGES: + typedef QList<BackgroundEntry*> BackgroundsList; + typedef QList<OpaqueBackgroundEntry*> OpaqueBackgroundsList; - public: - /// CONTRUCTOR AND DESTRUCTOR: - BackgroundManager(); - ~BackgroundManager(); - /// SUBSCRIPTION TO IMAGES: - bool subscribe(const QString &image); /// << @Return true if the loading is a success. In the counter-case, calling methods below is unsafe with this @p image name. - bool subscribe(const QString &image, const QColor &color); /// << Idem. - void unsubscribe(const QString &image); - void unsubscribe(const QString &image, const QColor &color); - /// GETTING THE IMAGES AND PROPERTIES: - QPixmap* pixmap(const QString &image); - QPixmap* opaquePixmap(const QString &image, const QColor &color); - bool tiled(const QString &image); - /// LIST OF IMAGES AND PREVIEWS: - bool exists(const QString &image); - QStringList imageNames(); - QPixmap* preview(const QString &image); - /// USED FOR EXPORTATION: - QString pathForImageName(const QString &image); /// << It is STRONGLY advised to not use those two methods unless it's to copy (export) the images or something like that... - QString previewPathForImageName(const QString &image); - /// USED FOR IMPORTATION: - void addImage(const QString &fullPath); +public: + /// CONTRUCTOR AND DESTRUCTOR: + BackgroundManager(); + ~BackgroundManager(); + /// SUBSCRIPTION TO IMAGES: + bool subscribe(const QString &image); /// << @Return true if the loading is a success. In the counter-case, calling methods below is unsafe with this @p image name. + bool subscribe(const QString &image, const QColor &color); /// << Idem. + void unsubscribe(const QString &image); + void unsubscribe(const QString &image, const QColor &color); + /// GETTING THE IMAGES AND PROPERTIES: + QPixmap* pixmap(const QString &image); + QPixmap* opaquePixmap(const QString &image, const QColor &color); + bool tiled(const QString &image); + /// LIST OF IMAGES AND PREVIEWS: + bool exists(const QString &image); + QStringList imageNames(); + QPixmap* preview(const QString &image); + /// USED FOR EXPORTATION: + QString pathForImageName(const QString &image); /// << It is STRONGLY advised to not use those two methods unless it's to copy (export) the images or something like that... + QString previewPathForImageName(const QString &image); + /// USED FOR IMPORTATION: + void addImage(const QString &fullPath); - private: - BackgroundEntry* backgroundEntryFor(const QString &image); - OpaqueBackgroundEntry* opaqueBackgroundEntryFor(const QString &image, const QColor &color); +private: + BackgroundEntry* backgroundEntryFor(const QString &image); + OpaqueBackgroundEntry* opaqueBackgroundEntryFor(const QString &image, const QColor &color); - private: - BackgroundsList m_backgroundsList; - OpaqueBackgroundsList m_opaqueBackgroundsList; - QTimer m_garbageTimer; - private slots: - void requestDelayedGarbage(); - void doGarbage(); +private: + BackgroundsList m_backgroundsList; + OpaqueBackgroundsList m_opaqueBackgroundsList; + QTimer m_garbageTimer; +private slots: + void requestDelayedGarbage(); + void doGarbage(); }; #endif // BACKGROUNDMANAGER_H src/backgroundmanager.h @@ -58,73 +58,73 @@ const QString backupMagicFolder = "BasKet-Note-Pads_Backup"; /** class BackupDialog: */ BackupDialog::BackupDialog(QWidget *parent, const char *name) - : KDialog(parent) + : KDialog(parent) { - setObjectName(name); - setModal(true); - setCaption(i18n("Backup & Restore")); - setButtons(KDialog::Close); - setDefaultButton(KDialog::Close); - showButtonSeparator(false); - - KVBox *page = new KVBox(this); - setMainWidget(page); - -// page->setSpacing(spacingHint()); - - QString savesFolder = Global::savesFolder(); - savesFolder = savesFolder.left(savesFolder.length() - 1); // savesFolder ends with "/" - - QGroupBox *folderGroup = new QGroupBox(i18n("Save Folder"), page); - QVBoxLayout* folderGroupLayout = new QVBoxLayout; - folderGroup->setLayout(folderGroupLayout); - folderGroupLayout->addWidget(new QLabel("<qt>" + i18n("Your baskets are currently stored in that folder: %1",savesFolder), folderGroup)); - QWidget *folderWidget = new QWidget; - folderGroupLayout->addWidget(folderWidget); - - QHBoxLayout *folderLayout = new QHBoxLayout(folderWidget); - folderLayout->setContentsMargins(0, 0, 0, 0); - - QPushButton *moveFolder = new QPushButton(i18n("&Move to Another Folder..."), folderWidget); - QPushButton *useFolder = new QPushButton(i18n("&Use Another Existing Folder..."), folderWidget); - HelpLabel *helpLabel = new HelpLabel(i18n("Why to do that?"), i18n( - "You can move the folder where %1 store your baskets to:<ul>" - "<li>Store your baskets in a visible place in your home folder, like ~/Notes or ~/Baskets, so you can manually backup them when you want.</li>" - "<li>Store your baskets on a server to share them between two computers. " - "In this case, mount the shared-folder to the local file system and ask %1 to use that mount point. " - "Warning: you should not run %1 at the same time on both computers, or you risk to loss data while the two applications are desynced.</li>" - "</ul>Please remember that you should not change the content of that folder manually (eg. adding a file in a basket folder will not add that file to the basket).", - KGlobal::mainComponent().aboutData()->programName()), - folderWidget); - folderLayout->addWidget(moveFolder); - folderLayout->addWidget(useFolder); - folderLayout->addWidget(helpLabel); - folderLayout->addStretch(); - connect( moveFolder, SIGNAL(clicked()), this, SLOT(moveToAnotherFolder()) ); - connect( useFolder, SIGNAL(clicked()), this, SLOT(useAnotherExistingFolder()) ); - - QGroupBox *backupGroup = new QGroupBox(i18n("Backups"), page); - QVBoxLayout* backupGroupLayout = new QVBoxLayout; - backupGroup->setLayout(backupGroupLayout); - QWidget *backupWidget = new QWidget; - backupGroupLayout->addWidget(backupWidget); - - QHBoxLayout *backupLayout = new QHBoxLayout(backupWidget); - backupLayout->setContentsMargins(0, 0, 0, 0); - - QPushButton *backupButton = new QPushButton(i18n("&Backup..."), backupWidget); - QPushButton *restoreButton = new QPushButton(i18n("&Restore a Backup..."), backupWidget); - m_lastBackup = new QLabel("", backupWidget); - backupLayout->addWidget(backupButton); - backupLayout->addWidget(restoreButton); - backupLayout->addWidget(m_lastBackup); - backupLayout->addStretch(); - connect( backupButton, SIGNAL(clicked()), this, SLOT(backup()) ); - connect( restoreButton, SIGNAL(clicked()), this, SLOT(restore()) ); - - populateLastBackup(); - - (new QWidget(page))->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + setObjectName(name); + setModal(true); + setCaption(i18n("Backup & Restore")); + setButtons(KDialog::Close); + setDefaultButton(KDialog::Close); + showButtonSeparator(false); + + KVBox *page = new KVBox(this); + setMainWidget(page); + +// page->setSpacing(spacingHint()); + + QString savesFolder = Global::savesFolder(); + savesFolder = savesFolder.left(savesFolder.length() - 1); // savesFolder ends with "/" + + QGroupBox *folderGroup = new QGroupBox(i18n("Save Folder"), page); + QVBoxLayout* folderGroupLayout = new QVBoxLayout; + folderGroup->setLayout(folderGroupLayout); + folderGroupLayout->addWidget(new QLabel("<qt>" + i18n("Your baskets are currently stored in that folder: %1", savesFolder), folderGroup)); + QWidget *folderWidget = new QWidget; + folderGroupLayout->addWidget(folderWidget); + + QHBoxLayout *folderLayout = new QHBoxLayout(folderWidget); + folderLayout->setContentsMargins(0, 0, 0, 0); + + QPushButton *moveFolder = new QPushButton(i18n("&Move to Another Folder..."), folderWidget); + QPushButton *useFolder = new QPushButton(i18n("&Use Another Existing Folder..."), folderWidget); + HelpLabel *helpLabel = new HelpLabel(i18n("Why to do that?"), i18n( + "You can move the folder where %1 store your baskets to:<ul>" + "<li>Store your baskets in a visible place in your home folder, like ~/Notes or ~/Baskets, so you can manually backup them when you want.</li>" + "<li>Store your baskets on a server to share them between two computers. " + "In this case, mount the shared-folder to the local file system and ask %1 to use that mount point. " + "Warning: you should not run %1 at the same time on both computers, or you risk to loss data while the two applications are desynced.</li>" + "</ul>Please remember that you should not change the content of that folder manually (eg. adding a file in a basket folder will not add that file to the basket).", + KGlobal::mainComponent().aboutData()->programName()), + folderWidget); + folderLayout->addWidget(moveFolder); + folderLayout->addWidget(useFolder); + folderLayout->addWidget(helpLabel); + folderLayout->addStretch(); + connect(moveFolder, SIGNAL(clicked()), this, SLOT(moveToAnotherFolder())); + connect(useFolder, SIGNAL(clicked()), this, SLOT(useAnotherExistingFolder())); + + QGroupBox *backupGroup = new QGroupBox(i18n("Backups"), page); + QVBoxLayout* backupGroupLayout = new QVBoxLayout; + backupGroup->setLayout(backupGroupLayout); + QWidget *backupWidget = new QWidget; + backupGroupLayout->addWidget(backupWidget); + + QHBoxLayout *backupLayout = new QHBoxLayout(backupWidget); + backupLayout->setContentsMargins(0, 0, 0, 0); + + QPushButton *backupButton = new QPushButton(i18n("&Backup..."), backupWidget); + QPushButton *restoreButton = new QPushButton(i18n("&Restore a Backup..."), backupWidget); + m_lastBackup = new QLabel("", backupWidget); + backupLayout->addWidget(backupButton); + backupLayout->addWidget(restoreButton); + backupLayout->addWidget(m_lastBackup); + backupLayout->addStretch(); + connect(backupButton, SIGNAL(clicked()), this, SLOT(backup())); + connect(restoreButton, SIGNAL(clicked()), this, SLOT(restore())); + + populateLastBackup(); + + (new QWidget(page))->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); } BackupDialog::~BackupDialog() @@ -133,190 +133,190 @@ BackupDialog::~BackupDialog() void BackupDialog::populateLastBackup() { - QString lastBackupText = i18n("Last backup: never"); - if (Settings::lastBackup().isValid()) - lastBackupText = i18n("Last backup: %1",Settings::lastBackup().toString(Qt::LocalDate)); + QString lastBackupText = i18n("Last backup: never"); + if (Settings::lastBackup().isValid()) + lastBackupText = i18n("Last backup: %1", Settings::lastBackup().toString(Qt::LocalDate)); - m_lastBackup->setText(lastBackupText); + m_lastBackup->setText(lastBackupText); } void BackupDialog::moveToAnotherFolder() { - KUrl selectedURL = KDirSelectDialog::selectDirectory( - /*startDir=*/Global::savesFolder(), /*localOnly=*/true, /*parent=*/0, - /*caption=*/i18n("Choose a Folder Where to Move Baskets")); - - if (!selectedURL.isEmpty()) { - QString folder = selectedURL.path(); - QDir dir(folder); - // The folder should not exists, or be empty (because KDirSelectDialog will likely create it anyway): - if (dir.exists()) { - // Get the content of the folder: - QStringList content = dir.entryList(); - if (content.count() > 2) { // "." and ".." - int result = KMessageBox::questionYesNo( - 0, - "<qt>" + i18n("The folder %1 is not empty. Do you want to override it?", folder), - i18n("Override Folder?"), - KGuiItem(i18n("&Override"), "document-save") - ); - if (result == KMessageBox::No) - return; - } - Tools::deleteRecursively(folder); - } - FormatImporter copier; - copier.moveFolder(Global::savesFolder(), folder); - Backup::setFolderAndRestart(folder, i18n("Your baskets have been successfully moved to %1. %2 is going to be restarted to take this change into account.")); - } + KUrl selectedURL = KDirSelectDialog::selectDirectory( + /*startDir=*/Global::savesFolder(), /*localOnly=*/true, /*parent=*/0, + /*caption=*/i18n("Choose a Folder Where to Move Baskets")); + + if (!selectedURL.isEmpty()) { + QString folder = selectedURL.path(); + QDir dir(folder); + // The folder should not exists, or be empty (because KDirSelectDialog will likely create it anyway): + if (dir.exists()) { + // Get the content of the folder: + QStringList content = dir.entryList(); + if (content.count() > 2) { // "." and ".." + int result = KMessageBox::questionYesNo( + 0, + "<qt>" + i18n("The folder %1 is not empty. Do you want to override it?", folder), + i18n("Override Folder?"), + KGuiItem(i18n("&Override"), "document-save") + ); + if (result == KMessageBox::No) + return; + } + Tools::deleteRecursively(folder); + } + FormatImporter copier; + copier.moveFolder(Global::savesFolder(), folder); + Backup::setFolderAndRestart(folder, i18n("Your baskets have been successfully moved to %1. %2 is going to be restarted to take this change into account.")); + } } void BackupDialog::useAnotherExistingFolder() { - KUrl selectedURL = KDirSelectDialog::selectDirectory( - /*startDir=*/Global::savesFolder(), /*localOnly=*/true, /*parent=*/0, - /*caption=*/i18n("Choose an Existing Folder to Store Baskets")); + KUrl selectedURL = KDirSelectDialog::selectDirectory( + /*startDir=*/Global::savesFolder(), /*localOnly=*/true, /*parent=*/0, + /*caption=*/i18n("Choose an Existing Folder to Store Baskets")); - if (!selectedURL.isEmpty()) { - Backup::setFolderAndRestart(selectedURL.path(), i18n("Your basket save folder has been successfuly changed to %1. %2 is going to be restarted to take this change into account.")); - } + if (!selectedURL.isEmpty()) { + Backup::setFolderAndRestart(selectedURL.path(), i18n("Your basket save folder has been successfuly changed to %1. %2 is going to be restarted to take this change into account.")); + } } void BackupDialog::backup() { - QDir dir; - - // Compute a default file name & path (eg. "Baskets_2007-01-31.tar.gz"): - KConfig *config = KGlobal::config().data(); - KConfigGroup configGroup(config,"Backups"); - QString folder = configGroup.readEntry("lastFolder", QDir::homePath()) + "/"; - QString fileName = i18np("Backup filename (without extension), %1 is the date", "Baskets_%1",QDate::currentDate().toString(Qt::ISODate)); - QString url = folder + fileName; - - // Ask a file name & path to the user: - QString filter = "*.tar.gz|" + i18n("Tar Archives Compressed by Gzip") + "\n*|" + i18n("All Files"); - QString destination = url; - for (bool askAgain = true; askAgain; ) { - // Ask: - destination = KFileDialog::getSaveFileName(destination, filter, 0, i18n("Backup Baskets")); - // User canceled? - if (destination.isEmpty()) - return; - // File already existing? Ask for overriding: - if (dir.exists(destination)) { - int result = KMessageBox::questionYesNoCancel( - 0, - "<qt>" + i18n("The file %1 already exists. Do you really want to override it?", - KUrl(destination).fileName()), - i18n("Override File?"), - KGuiItem(i18n("&Override"), "document-save") - ); - if (result == KMessageBox::Cancel) - return; - else if (result == KMessageBox::Yes) - askAgain = false; - } else - askAgain = false; - } - - KProgressDialog dialog(0, i18n("Backup Baskets"), i18n("Backing up baskets. Please wait...")); - dialog.setModal( true ); - dialog.setAllowCancel(false); - dialog.setAutoClose(true); - dialog.show(); - QProgressBar *progress = dialog.progressBar(); - progress->setRange(0, 0/*Busy/Undefined*/); - progress->setValue(0); - progress->setTextVisible(false); - - BackupThread thread(destination, Global::savesFolder()); - thread.start(); - while (thread.isRunning()) { - progress->setValue(progress->value()+1); // Or else, the animation is not played! - kapp->processEvents(); - usleep(300); // Not too long because if the backup process is finished, we wait for nothing - } - - Settings::setLastBackup(QDate::currentDate()); - Settings::saveConfig(); - populateLastBackup(); + QDir dir; + + // Compute a default file name & path (eg. "Baskets_2007-01-31.tar.gz"): + KConfig *config = KGlobal::config().data(); + KConfigGroup configGroup(config, "Backups"); + QString folder = configGroup.readEntry("lastFolder", QDir::homePath()) + "/"; + QString fileName = i18np("Backup filename (without extension), %1 is the date", "Baskets_%1", QDate::currentDate().toString(Qt::ISODate)); + QString url = folder + fileName; + + // Ask a file name & path to the user: + QString filter = "*.tar.gz|" + i18n("Tar Archives Compressed by Gzip") + "\n*|" + i18n("All Files"); + QString destination = url; + for (bool askAgain = true; askAgain;) { + // Ask: + destination = KFileDialog::getSaveFileName(destination, filter, 0, i18n("Backup Baskets")); + // User canceled? + if (destination.isEmpty()) + return; + // File already existing? Ask for overriding: + if (dir.exists(destination)) { + int result = KMessageBox::questionYesNoCancel( + 0, + "<qt>" + i18n("The file %1 already exists. Do you really want to override it?", + KUrl(destination).fileName()), + i18n("Override File?"), + KGuiItem(i18n("&Override"), "document-save") + ); + if (result == KMessageBox::Cancel) + return; + else if (result == KMessageBox::Yes) + askAgain = false; + } else + askAgain = false; + } + + KProgressDialog dialog(0, i18n("Backup Baskets"), i18n("Backing up baskets. Please wait...")); + dialog.setModal(true); + dialog.setAllowCancel(false); + dialog.setAutoClose(true); + dialog.show(); + QProgressBar *progress = dialog.progressBar(); + progress->setRange(0, 0/*Busy/Undefined*/); + progress->setValue(0); + progress->setTextVisible(false); + + BackupThread thread(destination, Global::savesFolder()); + thread.start(); + while (thread.isRunning()) { + progress->setValue(progress->value() + 1); // Or else, the animation is not played! + kapp->processEvents(); + usleep(300); // Not too long because if the backup process is finished, we wait for nothing + } + + Settings::setLastBackup(QDate::currentDate()); + Settings::saveConfig(); + populateLastBackup(); } void BackupDialog::restore() { - // Get last backup folder: - KConfig *config = KGlobal::config().data(); - KConfigGroup configGroup(config,"Backups"); - QString folder = configGroup.readEntry("lastFolder", QDir::homePath()) + "/"; - - // Ask a file name to the user: - QString filter = "*.tar.gz|" + i18n("Tar Archives Compressed by Gzip") + "\n*|" + i18n("All Files"); - QString path = KFileDialog::getOpenFileName(folder, filter, this, i18n("Open Basket Archive")); - if (path.isEmpty()) // User has canceled - return; - - // Before replacing the basket data folder with the backup content, we safely backup the current baskets to the home folder. - // So if the backup is corrupted or something goes wrong while restoring (power cut...) the user will be able to restore the old working data: - QString safetyPath = Backup::newSafetyFolder(); - FormatImporter copier; - copier.moveFolder(Global::savesFolder(), safetyPath); - - // Add the README file for user to cancel a bad restoration: - QString readmePath = safetyPath + i18n("README.txt"); - QFile file(readmePath); - if (file.open(QIODevice::WriteOnly)) { - QTextStream stream(&file); - stream << i18n("This is a safety copy of your baskets like they were before you started to restore the backup %1.", KUrl(path).fileName()) + "\n\n" - << i18n("If the restoration was a success and you restored what you wanted to restore, you can remove this folder.") + "\n\n" - << i18n("If something went wrong during the restoration process, you can re-use this folder to store your baskets and nothing will be lost.") + "\n\n" - << i18n("Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing Folder...\" and select that folder.") + "\n"; - file.close(); - } - - QString message = - "" + i18n("Restoring %1. Please wait...", KUrl(path).fileName()) + "" + - i18n("If something goes wrong during the restoration process, read the file %1.", readmePath); - - KProgressDialog *dialog = new KProgressDialog(0, i18n("Restore Baskets"), message); - dialog->setModal(/*modal=*/true); - dialog->setAllowCancel(false); - dialog->setAutoClose(true); - dialog->show(); - QProgressBar *progress = dialog->progressBar(); - progress->setRange(0, 0/*Busy/Undefined*/); - progress->setValue(0); - progress->setTextVisible(false); - - // Uncompress: - RestoreThread thread(path, Global::savesFolder()); - thread.start(); - while (thread.isRunning()) { - progress->setValue(progress->value()+1); // Or else, the animation is not played! - kapp->processEvents(); - usleep(300); // Not too long because if the restore process is finished, we wait for nothing - } - - dialog->hide(); // The restore is finished, do not continue to show it while telling the user the application is going to be restarted - delete dialog; // If we only hidden it, it reappeared just after having restored a small backup... Very strange. - dialog = 0; // This was annoying since it is modal and the "BasKet Note Pads is going to be restarted" message was not reachable. - //kapp->processEvents(); - - // Check for errors: - if (!thread.success()) { - // Restore the old baskets: - QDir dir; - dir.remove(readmePath); - copier.moveFolder(safetyPath, Global::savesFolder()); - // Tell the user: - KMessageBox::error(0, i18n("This archive is either not a backup of baskets or is corrupted. It cannot be imported. Your old baskets have been preserved instead."), i18n("Restore Error")); - return; - } - - // Note: The safety backup is not removed now because the code can has been wrong, somehow, or the user perhapse restored an older backup by error... - // The restore process will not be called very often (it is possible it will only be called once or twice arround the world during the next years). - // So it is rare enough to force the user to remove the safety folder, but keep him in control and let him safely recover from restoration errors. - - Backup::setFolderAndRestart(Global::savesFolder()/*No change*/, i18n("Your backup has been successfuly restored to %1. %2 is going to be restarted to take this change into account.")); + // Get last backup folder: + KConfig *config = KGlobal::config().data(); + KConfigGroup configGroup(config, "Backups"); + QString folder = configGroup.readEntry("lastFolder", QDir::homePath()) + "/"; + + // Ask a file name to the user: + QString filter = "*.tar.gz|" + i18n("Tar Archives Compressed by Gzip") + "\n*|" + i18n("All Files"); + QString path = KFileDialog::getOpenFileName(folder, filter, this, i18n("Open Basket Archive")); + if (path.isEmpty()) // User has canceled + return; + + // Before replacing the basket data folder with the backup content, we safely backup the current baskets to the home folder. + // So if the backup is corrupted or something goes wrong while restoring (power cut...) the user will be able to restore the old working data: + QString safetyPath = Backup::newSafetyFolder(); + FormatImporter copier; + copier.moveFolder(Global::savesFolder(), safetyPath); + + // Add the README file for user to cancel a bad restoration: + QString readmePath = safetyPath + i18n("README.txt"); + QFile file(readmePath); + if (file.open(QIODevice::WriteOnly)) { + QTextStream stream(&file); + stream << i18n("This is a safety copy of your baskets like they were before you started to restore the backup %1.", KUrl(path).fileName()) + "\n\n" + << i18n("If the restoration was a success and you restored what you wanted to restore, you can remove this folder.") + "\n\n" + << i18n("If something went wrong during the restoration process, you can re-use this folder to store your baskets and nothing will be lost.") + "\n\n" + << i18n("Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing Folder...\" and select that folder.") + "\n"; + file.close(); + } + + QString message = + "" + i18n("Restoring %1. Please wait...", KUrl(path).fileName()) + "" + + i18n("If something goes wrong during the restoration process, read the file %1.", readmePath); + + KProgressDialog *dialog = new KProgressDialog(0, i18n("Restore Baskets"), message); + dialog->setModal(/*modal=*/true); + dialog->setAllowCancel(false); + dialog->setAutoClose(true); + dialog->show(); + QProgressBar *progress = dialog->progressBar(); + progress->setRange(0, 0/*Busy/Undefined*/); + progress->setValue(0); + progress->setTextVisible(false); + + // Uncompress: + RestoreThread thread(path, Global::savesFolder()); + thread.start(); + while (thread.isRunning()) { + progress->setValue(progress->value() + 1); // Or else, the animation is not played! + kapp->processEvents(); + usleep(300); // Not too long because if the restore process is finished, we wait for nothing + } + + dialog->hide(); // The restore is finished, do not continue to show it while telling the user the application is going to be restarted + delete dialog; // If we only hidden it, it reappeared just after having restored a small backup... Very strange. + dialog = 0; // This was annoying since it is modal and the "BasKet Note Pads is going to be restarted" message was not reachable. + //kapp->processEvents(); + + // Check for errors: + if (!thread.success()) { + // Restore the old baskets: + QDir dir; + dir.remove(readmePath); + copier.moveFolder(safetyPath, Global::savesFolder()); + // Tell the user: + KMessageBox::error(0, i18n("This archive is either not a backup of baskets or is corrupted. It cannot be imported. Your old baskets have been preserved instead."), i18n("Restore Error")); + return; + } + + // Note: The safety backup is not removed now because the code can has been wrong, somehow, or the user perhapse restored an older backup by error... + // The restore process will not be called very often (it is possible it will only be called once or twice arround the world during the next years). + // So it is rare enough to force the user to remove the safety folder, but keep him in control and let him safely recover from restoration errors. + + Backup::setFolderAndRestart(Global::savesFolder()/*No change*/, i18n("Your backup has been successfuly restored to %1. %2 is going to be restarted to take this change into account.")); } /** class Backup: */ @@ -327,109 +327,109 @@ QString Backup::binaryPath = ""; void Backup::figureOutBinaryPath(const char *argv0, QApplication &app) { - /* - The application can be launched by two ways: - - Globaly (app.applicationFilePath() is good) - - In KDevelop or with an absolute path (app.applicationFilePath() is wrong) - This function is called at the very start of main() so that the current directory has not been changed yet. - - Command line (argv[0]) QDir(argv[0]).canonicalPath() app.applicationFilePath() - ====================== ============================================= ========================= - "basket" "" "/opt/kde3/bin/basket" - "./src/.libs/basket" "/home/seb/prog/basket/debug/src/.lib/basket" "/opt/kde3/bin/basket" - */ - - binaryPath = QDir(argv0).canonicalPath(); - if (binaryPath.isEmpty()) - binaryPath = app.applicationFilePath(); + /* + The application can be launched by two ways: + - Globaly (app.applicationFilePath() is good) + - In KDevelop or with an absolute path (app.applicationFilePath() is wrong) + This function is called at the very start of main() so that the current directory has not been changed yet. + + Command line (argv[0]) QDir(argv[0]).canonicalPath() app.applicationFilePath() + ====================== ============================================= ========================= + "basket" "" "/opt/kde3/bin/basket" + "./src/.libs/basket" "/home/seb/prog/basket/debug/src/.lib/basket" "/opt/kde3/bin/basket" + */ + + binaryPath = QDir(argv0).canonicalPath(); + if (binaryPath.isEmpty()) + binaryPath = app.applicationFilePath(); } void Backup::setFolderAndRestart(const QString &folder, const QString &message) { - // Set the folder: - Settings::setDataFolder(folder); - Settings::saveConfig(); - - // Rassure the user that the application main window disapearition is not a crash, but a normal restart. - // This is important for users to trust the application in such a critical phase and understands what's happening: - KMessageBox::information( - 0, - "<qt>" + message.arg( - (folder.endsWith("/") ? folder.left(folder.length() - 1) : folder), - KGlobal::mainComponent().aboutData()->programName()), - i18n("Restart") - ); - - // Restart the application: - KRun::runCommand(binaryPath, KGlobal::mainComponent().aboutData()->programName(), KGlobal::mainComponent().aboutData()->programName(),0); - exit(0); + // Set the folder: + Settings::setDataFolder(folder); + Settings::saveConfig(); + + // Rassure the user that the application main window disapearition is not a crash, but a normal restart. + // This is important for users to trust the application in such a critical phase and understands what's happening: + KMessageBox::information( + 0, + "<qt>" + message.arg( + (folder.endsWith("/") ? folder.left(folder.length() - 1) : folder), + KGlobal::mainComponent().aboutData()->programName()), + i18n("Restart") + ); + + // Restart the application: + KRun::runCommand(binaryPath, KGlobal::mainComponent().aboutData()->programName(), KGlobal::mainComponent().aboutData()->programName(), 0); + exit(0); } QString Backup::newSafetyFolder() { - QDir dir; - QString fullPath; + QDir dir; + QString fullPath; - fullPath = QDir::homePath() + "/" + i18nc("Safety folder name before restoring a basket data archive", "Baskets Before Restoration") + "/"; - if (!dir.exists(fullPath)) - return fullPath; + fullPath = QDir::homePath() + "/" + i18nc("Safety folder name before restoring a basket data archive", "Baskets Before Restoration") + "/"; + if (!dir.exists(fullPath)) + return fullPath; - for (int i = 2; ; ++i) { - fullPath = QDir::homePath() + "/" + i18nc("Safety folder name before restoring a basket data archive", "Baskets Before Restoration (%1)", i) + "/"; - if (!dir.exists(fullPath)) - return fullPath; - } + for (int i = 2; ; ++i) { + fullPath = QDir::homePath() + "/" + i18nc("Safety folder name before restoring a basket data archive", "Baskets Before Restoration (%1)", i) + "/"; + if (!dir.exists(fullPath)) + return fullPath; + } - return ""; + return ""; } /** class BackupThread: */ BackupThread::BackupThread(const QString &tarFile, const QString &folderToBackup) - : m_tarFile(tarFile), m_folderToBackup(folderToBackup) + : m_tarFile(tarFile), m_folderToBackup(folderToBackup) { } void BackupThread::run() { - KTar tar(m_tarFile, "application/x-gzip"); - tar.open(QIODevice::WriteOnly); - tar.addLocalDirectory(m_folderToBackup, backupMagicFolder); - // KArchive does not add hidden files. Basket description files (".basket") are hidden, we add them manually: - QDir dir(m_folderToBackup + "baskets/"); - QStringList baskets = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); - for (QStringList::Iterator it = baskets.begin(); it != baskets.end(); ++it) { - tar.addLocalFile( - m_folderToBackup + "baskets/" + *it + "/.basket", - backupMagicFolder + "/baskets/" + *it + "/.basket" - ); - } - // We finished: - tar.close(); + KTar tar(m_tarFile, "application/x-gzip"); + tar.open(QIODevice::WriteOnly); + tar.addLocalDirectory(m_folderToBackup, backupMagicFolder); + // KArchive does not add hidden files. Basket description files (".basket") are hidden, we add them manually: + QDir dir(m_folderToBackup + "baskets/"); + QStringList baskets = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); + for (QStringList::Iterator it = baskets.begin(); it != baskets.end(); ++it) { + tar.addLocalFile( + m_folderToBackup + "baskets/" + *it + "/.basket", + backupMagicFolder + "/baskets/" + *it + "/.basket" + ); + } + // We finished: + tar.close(); } /** class RestoreThread: */ RestoreThread::RestoreThread(const QString &tarFile, const QString &destFolder) - : m_tarFile(tarFile), m_destFolder(destFolder) + : m_tarFile(tarFile), m_destFolder(destFolder) { } void RestoreThread::run() { - m_success = false; - KTar tar(m_tarFile, "application/x-gzip"); - tar.open(QIODevice::ReadOnly); - if (tar.isOpen()) { - const KArchiveDirectory *directory = tar.directory(); - if (directory->entries().contains(backupMagicFolder)) { - const KArchiveEntry *entry = directory->entry(backupMagicFolder); - if (entry->isDirectory()) { - ((const KArchiveDirectory*) entry)->copyTo(m_destFolder); - m_success = true; - } - } - tar.close(); - } + m_success = false; + KTar tar(m_tarFile, "application/x-gzip"); + tar.open(QIODevice::ReadOnly); + if (tar.isOpen()) { + const KArchiveDirectory *directory = tar.directory(); + if (directory->entries().contains(backupMagicFolder)) { + const KArchiveEntry *entry = directory->entry(backupMagicFolder); + if (entry->isDirectory()) { + ((const KArchiveDirectory*) entry)->copyTo(m_destFolder); + m_success = true; + } + } + tar.close(); + } } src/backup.cpp @@ -34,18 +34,18 @@ */ class BackupDialog : public KDialog { - Q_OBJECT - public: - BackupDialog(QWidget *parent = 0, const char *name = 0); - ~BackupDialog(); - private slots: - void moveToAnotherFolder(); - void useAnotherExistingFolder(); - void backup(); - void restore(); - void populateLastBackup(); - private: - QLabel *m_lastBackup; + Q_OBJECT +public: + BackupDialog(QWidget *parent = 0, const char *name = 0); + ~BackupDialog(); +private slots: + void moveToAnotherFolder(); + void useAnotherExistingFolder(); + void backup(); + void restore(); + void populateLastBackup(); +private: + QLabel *m_lastBackup; }; /** @@ -53,37 +53,39 @@ class BackupDialog : public KDialog */ class BASKET_EXPORT Backup { - public: - static void figureOutBinaryPath(const char *argv0, QApplication &app); - static void setFolderAndRestart(const QString &folder, const QString &message); - static QString newSafetyFolder(); +public: + static void figureOutBinaryPath(const char *argv0, QApplication &app); + static void setFolderAndRestart(const QString &folder, const QString &message); + static QString newSafetyFolder(); - private: - static QString binaryPath; +private: + static QString binaryPath; }; class BackupThread : public QThread { - public: - BackupThread(const QString &tarFile, const QString &folderToBackup); - protected: - virtual void run(); - private: - QString m_tarFile; - QString m_folderToBackup; +public: + BackupThread(const QString &tarFile, const QString &folderToBackup); +protected: + virtual void run(); +private: + QString m_tarFile; + QString m_folderToBackup; }; class RestoreThread : public QThread { - public: - RestoreThread(const QString &tarFile, const QString &destFolder); - inline bool success() { return m_success; } - protected: - virtual void run(); - private: - QString m_tarFile; - QString m_destFolder; - bool m_success; +public: + RestoreThread(const QString &tarFile, const QString &destFolder); + inline bool success() { + return m_success; + } +protected: + virtual void run(); +private: + QString m_tarFile; + QString m_destFolder; + bool m_success; }; #endif // BACKUP_H src/backup.h @@ -105,116 +105,115 @@ NoteSelection* NoteSelection::nextStacked() { - // First, search in the childs: - if (firstChild){ - if (firstChild->note && firstChild->note->content()) - return firstChild; - else - return firstChild->nextStacked(); - } - // Then, in the next: - if (next){ - if (next->note && next->note->content()) - return next; - else - return next->nextStacked(); - } - // And finally, in the parent: - NoteSelection *node = parent; - while (node){ - if (node->next){ - if (node->next->note && node->next->note->content()) - return node->next; - else - return node->next->nextStacked(); - } - else - node = node->parent; - } - // Not found: - return 0; + // First, search in the childs: + if (firstChild) { + if (firstChild->note && firstChild->note->content()) + return firstChild; + else + return firstChild->nextStacked(); + } + // Then, in the next: + if (next) { + if (next->note && next->note->content()) + return next; + else + return next->nextStacked(); + } + // And finally, in the parent: + NoteSelection *node = parent; + while (node) { + if (node->next) { + if (node->next->note && node->next->note->content()) + return node->next; + else + return node->next->nextStacked(); + } else + node = node->parent; + } + // Not found: + return 0; } NoteSelection* NoteSelection::firstStacked() { - if (!this) - return 0; + if (!this) + return 0; - if (note && note->content()) - return this; - else - return nextStacked(); + if (note && note->content()) + return this; + else + return nextStacked(); } void NoteSelection::append(NoteSelection *node) { - if (!this || !node) - return; + if (!this || !node) + return; - if (firstChild) { - NoteSelection *last = firstChild; - while (last->next) - last = last->next; - last->next = node; - } else - firstChild = node; + if (firstChild) { + NoteSelection *last = firstChild; + while (last->next) + last = last->next; + last->next = node; + } else + firstChild = node; - while (node) { - node->parent = this; - node = node->next; - } + while (node) { + node->parent = this; + node = node->next; + } } int NoteSelection::count() { - if (!this) - return 0; + if (!this) + return 0; - int count = 0; + int count = 0; - for (NoteSelection *node = this; node; node = node->next) - if (node->note && node->note->content()) - ++count; - else - count += node->firstChild->count(); + for (NoteSelection *node = this; node; node = node->next) + if (node->note && node->note->content()) + ++count; + else + count += node->firstChild->count(); - return count; + return count; } QList<Note*> NoteSelection::parentGroups() { - QList<Note*> groups; + QList<Note*> groups; - // For each note: - for (NoteSelection *node = firstStacked(); node; node = node->nextStacked()) - // For each parent groups of the note: - for (Note *note = node->note->parentNote(); note; note = note->parentNote()) - // Add it (if it was not already in the list): - if (!note->isColumn() && !groups.contains(note)) - groups.append(note); + // For each note: + for (NoteSelection *node = firstStacked(); node; node = node->nextStacked()) + // For each parent groups of the note: + for (Note * note = node->note->parentNote(); note; note = note->parentNote()) + // Add it (if it was not already in the list): + if (!note->isColumn() && !groups.contains(note)) + groups.append(note); - return groups; + return groups; } /** Class DecoratedBasket: */ DecoratedBasket::DecoratedBasket(QWidget *parent, const QString &folderName, Qt::WFlags fl) - : QWidget(parent, fl) + : QWidget(parent, fl) { - m_layout = new QVBoxLayout(this); - m_filter = new FilterBar(this); - m_basket = new Basket(this, folderName); - m_layout->addWidget(m_basket); - setFilterBarPosition(Settings::filterOnTop()); + m_layout = new QVBoxLayout(this); + m_filter = new FilterBar(this); + m_basket = new Basket(this, folderName); + m_layout->addWidget(m_basket); + setFilterBarPosition(Settings::filterOnTop()); - m_filter->hide(); - m_basket->setFocus(); // To avoid the filter bar have focus on load + m_filter->hide(); + m_basket->setFocus(); // To avoid the filter bar have focus on load - connect( m_filter, SIGNAL(newFilter(const FilterData&)), m_basket, SLOT(newFilter(const FilterData&)) ); + connect(m_filter, SIGNAL(newFilter(const FilterData&)), m_basket, SLOT(newFilter(const FilterData&))); - connect( m_basket, SIGNAL(postMessage(const QString&)), Global::bnpView, SLOT(postStatusbarMessage(const QString&)) ); - connect( m_basket, SIGNAL(setStatusBarText(const QString&)), Global::bnpView, SLOT(setStatusBarHint(const QString&)) ); - connect( m_basket, SIGNAL(resetStatusBarText()), Global::bnpView, SLOT(updateStatusBarHint()) ); + connect(m_basket, SIGNAL(postMessage(const QString&)), Global::bnpView, SLOT(postStatusbarMessage(const QString&))); + connect(m_basket, SIGNAL(setStatusBarText(const QString&)), Global::bnpView, SLOT(setStatusBarHint(const QString&))); + connect(m_basket, SIGNAL(resetStatusBarText()), Global::bnpView, SLOT(updateStatusBarHint())); } DecoratedBasket::~DecoratedBasket() @@ -223,92 +222,92 @@ DecoratedBasket::~DecoratedBasket() void DecoratedBasket::setFilterBarPosition(bool onTop) { - m_layout->removeWidget(m_filter); - if (onTop) { - m_layout->insertWidget(0, m_filter); - setTabOrder(this/*(QWidget*)parent()*/, m_filter); - setTabOrder(m_filter, m_basket); - setTabOrder(m_basket, (QWidget*)parent()); - } else { - m_layout->addWidget(m_filter); - setTabOrder(this/*(QWidget*)parent()*/, m_basket); - setTabOrder(m_basket, m_filter); - setTabOrder(m_filter, (QWidget*)parent()); - } + m_layout->removeWidget(m_filter); + if (onTop) { + m_layout->insertWidget(0, m_filter); + setTabOrder(this/*(QWidget*)parent()*/, m_filter); + setTabOrder(m_filter, m_basket); + setTabOrder(m_basket, (QWidget*)parent()); + } else { + m_layout->addWidget(m_filter); + setTabOrder(this/*(QWidget*)parent()*/, m_basket); + setTabOrder(m_basket, m_filter); + setTabOrder(m_filter, (QWidget*)parent()); + } } void DecoratedBasket::setFilterBarVisible(bool show, bool switchFocus) { -// m_basket->setShowFilterBar(true);//show); -// m_basket->save(); - // In this order (m_basket and then m_filter) because setShown(false) - // will call resetFilter() that will update actions, and then check the - // Ctrl+F action whereas it should be unchecked - // FIXME: It's very uggly all those things - m_filter->setVisible(show); - if (show) { - if (switchFocus) - m_filter->setEditFocus(); - } else if (m_filter->hasEditFocus()) - m_basket->setFocus(); +// m_basket->setShowFilterBar(true);//show); +// m_basket->save(); + // In this order (m_basket and then m_filter) because setShown(false) + // will call resetFilter() that will update actions, and then check the + // Ctrl+F action whereas it should be unchecked + // FIXME: It's very uggly all those things + m_filter->setVisible(show); + if (show) { + if (switchFocus) + m_filter->setEditFocus(); + } else if (m_filter->hasEditFocus()) + m_basket->setFocus(); } void DecoratedBasket::resetFilter() { - m_filter->reset(); + m_filter->reset(); } /** Class TransparentWidget */ //TODO: Why was Qt::WNoAutoErase used here? TransparentWidget::TransparentWidget(Basket *basket) - : QWidget(basket->viewport()), m_basket(basket) + : QWidget(basket->viewport()), m_basket(basket) { - setFocusPolicy(Qt::NoFocus); - setMouseTracking(true); // To receive mouseMoveEvents + setFocusPolicy(Qt::NoFocus); + setMouseTracking(true); // To receive mouseMoveEvents - basket->viewport()->installEventFilter(this); + basket->viewport()->installEventFilter(this); } /*void TransparentWidget::reparent(QWidget *parent, Qt::WFlags f, const QPoint &p, bool showIt) { - QWidget::reparent(parent, Qt::WNoAutoErase, p, showIt); + QWidget::reparent(parent, Qt::WNoAutoErase, p, showIt); }*/ void TransparentWidget::setPosition(int x, int y) { - m_x = x; - m_y = y; + m_x = x; + m_y = y; } void TransparentWidget::paintEvent(QPaintEvent*event) { - QWidget::paintEvent(event); - QPainter painter(this); + QWidget::paintEvent(event); + QPainter painter(this); -// painter.save(); - painter.translate(-m_x, -m_y); - m_basket->drawContents(&painter, m_x, m_y, width(), height()); +// painter.save(); + painter.translate(-m_x, -m_y); + m_basket->drawContents(&painter, m_x, m_y, width(), height()); -// painter.restore(); -// painter.setPen(Qt::blue); -// painter.drawRect(0, 0, width(), height()); +// painter.restore(); +// painter.setPen(Qt::blue); +// painter.drawRect(0, 0, width(), height()); } void TransparentWidget::mouseMoveEvent(QMouseEvent *event) { - QMouseEvent *translated = new QMouseEvent(QEvent::MouseMove, event->pos() + QPoint(m_x, m_y), event->button(), event->buttons(), event->modifiers()); - m_basket->contentsMouseMoveEvent(translated); - delete translated; + QMouseEvent *translated = new QMouseEvent(QEvent::MouseMove, event->pos() + QPoint(m_x, m_y), event->button(), event->buttons(), event->modifiers()); + m_basket->contentsMouseMoveEvent(translated); + delete translated; } bool TransparentWidget::eventFilter(QObject */*object*/, QEvent *event) { - // If the parent basket viewport has changed, we should change too: - if (event->type() == QEvent::Paint) - update(); + // If the parent basket viewport has changed, we should change too: + if (event->type() == QEvent::Paint) + update(); - return false; // Event not consumed, in every cases (because it's only a notification)! + return false; // Event not consumed, in every cases (because it's only a notification)! } /** Class Basket: */ @@ -318,9 +317,9 @@ const int Basket::FRAME_DELAY = 50/*1500*/; // Delay between two animation "fram /* * Convenient function (defined in note.cpp !): */ -void drawGradient( QPainter *p, const QColor &colorTop, const QColor & colorBottom, - int x, int y, int w, int h, - bool sunken, bool horz, bool flat ); +void drawGradient(QPainter *p, const QColor &colorTop, const QColor & colorBottom, + int x, int y, int w, int h, + bool sunken, bool horz, bool flat); /* * Defined in note.cpp: @@ -329,969 +328,968 @@ extern void substractRectOnAreas(const QRect &rectToSubstract, QList<QRect> &are 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; + 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()) + for (Note *noteVar = firstNote(); noteVar; noteVar = noteVar->next()) void Basket::prependNoteIn(Note *note, Note *in) { - if (!note) - // No note to prepend: - return; + if (!note) + // No note to prepend: + return; - if (in) { - // The normal case: - preparePlug(note); + if (in) { + // The normal case: + preparePlug(note); - Note *last = note->lastSibling(); + Note *last = note->lastSibling(); - for (Note *n = note; n; n = n->next()) - n->setParentNote(in); -// note->setPrev(0L); - last->setNext(in->firstChild()); + 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); + if (in->firstChild()) + in->firstChild()->setPrev(last); - in->setFirstChild(note); + in->setFirstChild(note); - if (m_loaded) - signalCountsChanged(); - } else - // Prepend it directly in the basket: - appendNoteBefore(note, firstNote()); + 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 (!note) + // No note to append: + return; - if (in) { - // The normal case: - preparePlug(note); + if (in) { + // The normal case: + preparePlug(note); -// Note *last = note->lastSibling(); - Note *lastChild = in->lastChild(); +// 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); + for (Note *n = note; n; n = n->next()) + n->setParentNote(in); + note->setPrev(lastChild); +// last->setNext(0L); - if (!in->firstChild()) - in->setFirstChild(note); + if (!in->firstChild()) + in->setFirstChild(note); - if (lastChild) - lastChild->setNext(note); + if (lastChild) + lastChild->setNext(note); - if (m_loaded) - signalCountsChanged(); - } else - // Prepend it directly in the basket: - appendNoteAfter(note, lastNote()); + 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(); + 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(); + 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(); + 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.") ); - } + // 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()); - } - } + // 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); + 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. +// 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; + 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(); + // 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); + 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; - } + note->setGroupWidth(group->groupWidth() - Note::GROUP_WIDTH); + lastGroupedNote = note; + note = nextNote; + } - // Unplug the group: - group->setFirstChild(0); - unplugNote(group); // TODO: delete + // Unplug the group: + group->setFirstChild(0); + unplugNote(group); // TODO: delete - relayoutNotes(true); + relayoutNotes(true); } void Basket::groupNoteBefore(Note *note, Note *with) { - if (!note || !with) - // No note to group or nowhere to group it: - return; + 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); +// if (m_loaded && before && !with->isFree() && !with->isColumn()) + for (Note *n = note; n; n = n->next()) + n->inheritTagsOf(with); - preparePlug(note); + preparePlug(note); - Note *last = note->lastSibling(); + 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); + 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); + 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); + for (Note *n = note; n; n = n->next()) + n->setParentNote(group); +// note->setPrev(0L); + last->setNext(with); - if (m_loaded) - signalCountsChanged(); + 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 (!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); +// if (m_loaded && before && !with->isFree() && !with->isColumn()) + for (Note *n = note; n; n = n->next()) + n->inheritTagsOf(with); - preparePlug(note); + preparePlug(note); -// Note *last = note->lastSibling(); +// 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); + 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); + 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); + for (Note *n = note; n; n = n->next()) + n->setParentNote(group); + note->setPrev(with); +// last->setNext(0L); - if (m_loaded) - signalCountsChanged(); + if (m_loaded) + signalCountsChanged(); } void Basket::loadNotes(const QDomElement &notes, 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(); - } + 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(); - } + 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) + // 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() ); + 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 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 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 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 ); + 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); - } + 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; - } + 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(); + unsubscribeBackgroundImages(); - m_icon = icon; - m_basketName = name; - m_backgroundImageName = backgroundImage; - m_backgroundColorSetting = backgroundColor; - m_textColorSetting = textColor; + 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); + // Where is this shown? + m_action->setText("BASKET SHORTCUT: " + name); - // Basket should ALWAYS have an icon (the "basket" icon by default): + // 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); - } + 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); + 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() - } + 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); + 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 + 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; + if (!m_loaded) + return false; - DEBUG_WIN << "Basket[" + folderName() + "]: Saving..."; + DEBUG_WIN << "Basket[" + folderName() + "]: Saving..."; - // Create Document: - QDomDocument document(/*doctype=*/"basket"); - QDomElement root = document.createElement("basket"); - document.appendChild(root); + // 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 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); + // 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", "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + document.toString())) - { - DEBUG_WIN << "Basket[" + folderName() + "]: FAILED to save!"; - return false; - } + // Write to Disk: + if (!saveToFile(fullPath() + ".basket", "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + document.toString())) { + DEBUG_WIN << "Basket[" + folderName() + "]: FAILED to save!"; + return false; + } - Global::bnpView->setUnsavedStatus(false); - return true; + Global::bnpView->setUnsavedStatus(false); + return true; } void Basket::aboutToBeActivated() { - if (m_finishLoadOnFirstShow) { - FOR_EACH_NOTE (note) - note->finishLazyLoad(); + 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. + //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()) ); + 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; - } + m_finishLoadOnFirstShow = false; + } } void Basket::reload() { - closeEditor(); - unbufferizeAll(); // Keep the memory footprint low + closeEditor(); + unbufferizeAll(); // Keep the memory footprint low - m_firstNote = 0; + m_firstNote = 0; - m_loaded = false; - m_loadingLaunched = false; + m_loaded = false; + m_loadingLaunched = false; - updateContents(); + updateContents(); } void Basket::load() { - // Load only once: - if (m_loadingLaunched) - return; - m_loadingLaunched = true; + // Load only once: + if (m_loadingLaunched) + return; + m_loadingLaunched = true; - DEBUG_WIN << "Basket[" + folderName() + "]: Loading..."; - QDomDocument *doc = 0; - QString content; + 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! + 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(); + 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); + newFilter(decoration()->filterData(), andEnsureVisible); } void Basket::filterAgainDelayed() { - QTimer::singleShot( 0, this, SLOT(filterAgain()) ); + QTimer::singleShot(0, this, SLOT(filterAgain())); } void Basket::newFilter(const FilterData &data, bool andEnsureVisible/* = true*/) { - if (!isLoaded()) - return; + if (!isLoaded()) + return; //StopWatch::start(20); - m_countFounds = 0; - for (Note *note = firstNote(); note; note = note->next()) - m_countFounds += note->newFilter(data); + m_countFounds = 0; + for (Note *note = firstNote(); note; note = note->next()) + m_countFounds += note->newFilter(data); - relayoutNotes(true); - signalCountsChanged(); + 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); + 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); + Global::bnpView->setFiltering(data.isFiltering); //StopWatch::check(20); } bool Basket::isFiltering() { - return decoration()->filterBar()->filterData().isFiltering; + return decoration()->filterBar()->filterData().isFiltering; } QString Basket::fullPath() { - return Global::basketsFolder() + folderName(); + return Global::basketsFolder() + folderName(); } QString Basket::fullPathForFileName(const QString &fileName) { - return fullPath() + fileName; + return fullPath() + fileName; } /*static*/ QString Basket::fullPathForFolderName(const QString &folderName) { - return Global::basketsFolder() + folderName; + return Global::basketsFolder() + folderName; } @@ -1299,96 +1297,96 @@ void Basket::setShortcut(KShortcut shortcut, int action) { if (action > 0) { m_action->setGlobalShortcut( - shortcut, + shortcut, KAction::ActiveShortcut | KAction::DefaultShortcut, KAction::NoAutoloading - ); + ); } m_shortcutAction = action; } void Basket::activatedShortcut() { - Global::bnpView->setCurrentBasket(this); + Global::bnpView->setCurrentBasket(this); - if (m_shortcutAction == 1) - Global::bnpView->setActive(true); + if (m_shortcutAction == 1) + Global::bnpView->setActive(true); } void Basket::signalCountsChanged() { - if (!m_timerCountsChanged.isActive()) { - m_timerCountsChanged.setSingleShot(true); - m_timerCountsChanged.start(0); - } + if (!m_timerCountsChanged.isActive()) { + m_timerCountsChanged.setSingleShot(true); + m_timerCountsChanged.start(0); + } } void Basket::countsChangedTimeOut() { - emit countsChanged(this); + 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) + : 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) + , 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_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())); @@ -1397,209 +1395,209 @@ Basket::Basket(QWidget *parent, const QString &folderName) // 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()) ); + 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(); + m_gpg = new KGpgMe(); #endif - m_locked = isFileEncrypted(); + 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())); + // 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(); + m_underMouse = true; + doHoverEffects(); } void Basket::leaveEvent(QEvent *) { - m_underMouse = false; - doHoverEffects(); + m_underMouse = false; + doHoverEffects(); - if (m_lockedHovering) - return; + if (m_lockedHovering) + return; - removeInserter(); - if (m_hoveredNote) { - m_hoveredNote->setHovered(false); - m_hoveredNote->setHoveredZone(Note::None); - updateNote(m_hoveredNote); - } - m_hoveredNote = 0; + 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(); - } + 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 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)) @@ -1613,1199 +1611,1204 @@ void Basket::contentsMousePressEvent(QMouseEvent *event) 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; - } + 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()) ); + 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()); - } - } + 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; + 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(); + m_lastDisableClick = QTime::currentTime(); } void Basket::recomputeAllStyles() { - FOR_EACH_NOTE (note) - note->recomputeAllStyles(); + FOR_EACH_NOTE(note) + note->recomputeAllStyles(); } void Basket::removedStates(const QList<State*> &deletedStates) { - bool modifiedBasket = false; + bool modifiedBasket = false; - FOR_EACH_NOTE (note) - if (note->removedStates(deletedStates)) - modifiedBasket = true; + FOR_EACH_NOTE(note) + if (note->removedStates(deletedStates)) + modifiedBasket = true; - if (modifiedBasket) - save(); + 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); + 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); + Note *note; + if (event->button() == Qt::MidButton) + note = NoteFactory::dropNote(KApplication::clipboard()->mimeData(QClipboard::Selection), this); + else + note = NoteFactory::createNoteText("", this); - if (!note) - return; + if (!note) + return; - insertNote(note, clicked, zone, event->pos(), /*animateNewPosition=*/false); + insertNote(note, clicked, zone, event->pos(), /*animateNewPosition=*/false); -// ensureNoteVisible(lastInsertedNote()); // TODO: in insertNote() +// 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); - } + 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(); + 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; +// m_isDuringDrag = true; -// if (isLocked()) -// return; +// if (isLocked()) +// return; -// FIXME: viewportToContents does NOT work !!! -// QPoint pos = viewportToContents(event->pos()); -// QPoint pos( event->pos().x() + contentsX(), event->pos().y() + contentsY() ); +// 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()); +// 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); - } +// 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);*/ + /* 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); + // 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(); +// 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(); + QPoint pos = event->pos(); + kDebug() << "Contents Drop Event at position " << pos.x() << ":" << pos.y(); -// if (isLocked()) -// return; + m_isDuringDrag = false; + emit resetStatusBarText(); - // 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 (isLocked()) +// return; - if (NoteFactory::movingNotesInTheSameBasket(event->mimeData(), this, event->dropAction()) && event->dropAction() == Qt::MoveAction) { - m_doNotCloseEditor = true; - } + // 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()); - Note *note = NoteFactory::dropNote( event->mimeData(), this, true, event->dropAction(), dynamic_cast<Note*>(event->source()) ); + if (NoteFactory::movingNotesInTheSameBasket(event->mimeData(), this, event->dropAction()) && event->dropAction() == Qt::MoveAction) { + m_doNotCloseEditor = true; + } - 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); - } + Note *note = NoteFactory::dropNote(event->mimeData(), this, true, event->dropAction(), dynamic_cast<Note*>(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); + 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 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. -// } +// 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(); - } +// resetInsertTo(); +// doHoverEffects(); called by insertNote() + save(); + } - m_draggedNotes.clear(); + 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); - } + 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<Note*>(event->source()) ); - if (note) { - insertCreatedNote(note); - //unselectAllBut(note); - if (Settings::usePassivePopup()) - Global::bnpView->showPassiveDropped(i18n("Dropped to basket %1")); - } - } - save(); + 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<Note*>(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); + 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(); + 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(); + 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(); + 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); - } - } + 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(); + // 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; + 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; + 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); + m_clickedToInsert = 0; + m_zoneToInsert = 0; + m_posToInsert = QPoint(-1, -1); } void Basket::hideInsertPopupMenu() { - QTimer::singleShot( 50/*ms*/, this, SLOT(timeoutHideInsertPopupMenu()) ); + QTimer::singleShot(50/*ms*/, this, SLOT(timeoutHideInsertPopupMenu())); } void Basket::timeoutHideInsertPopupMenu() { - resetInsertionData(); + 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); + // 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 immediatly 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; - } + // 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 immediatly 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); + 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); + 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()); + // 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(); + 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(); + m_autoScrollSelectionTimer.stop(); } void Basket::resetWasInLastSelectionRect() { - Note *note = m_firstNote; - while (note) { - note->resetWasInLastSelectionRect(); - note = note->next(); - } + 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); - } + 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()) { + 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); - } + 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(); + FOR_EACH_NOTE(note) + note->invertSelectionRecursively(); } void Basket::unselectAllBut(Note *toSelect) { - FOR_EACH_NOTE (note) - note->unselectAllBut(toSelect); + FOR_EACH_NOTE(note) + note->unselectAllBut(toSelect); } void Basket::invertSelectionOf(Note *toSelect) { - FOR_EACH_NOTE (note) - note->invertSelectionOf(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); + FOR_EACH_NOTE(note) + note->selectIn(rect, invertSelection, unselectOthers); } void Basket::doHoverEffects() { - doHoverEffects( viewportToContents( viewport()->mapFromGlobal(QCursor::pos()) ) ); + 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(); - } + // 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(); +// if (isDuringEdit()) +// viewport()->unsetCursor(); - // Do we have the right to do hover effects? - if ( ! m_loaded || m_lockedHovering) - return; + // 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); + // 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; + // 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); + // 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); + // 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()); + 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); - } + 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); + // 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); + painter.drawLine(x, y, x + width - 1, y + height - 1); } void Basket::drawInserter(QPainter &painter, int xPainter, int yPainter) { - if (!m_inserterShown) - return; + 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); + 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); - } + 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) @@ -2822,1307 +2825,1301 @@ bool Basket::event(QEvent *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<QRect>::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 = "<qt>" + 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 = "<qt>" + 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 += "</qt>"; - } 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); + 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<QRect>::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 = "<qt>" + 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 = "<qt>" + 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 += "</qt>"; + } 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; + 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 *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; +// // 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; + if (m_decryptBox) + delete m_decryptBox; #ifdef HAVE_LIBGPGME - delete m_gpg; + delete m_gpg; #endif - deleteNotes(); + 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); + 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(); + const int viewHeight = contentsY() + visibleHeight(); - QTime t = QTime::currentTime(); // Set random seed - srand(t.hour()*12 + t.minute()*60 + t.second()*60); + 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(); - } + Note *note = firstNote(); + while (note) { + if ((note->finalY() < viewHeight) && note->matching()) + note->initAnimationLoad(); + note = note->next(); + } - m_loaded = true; + m_loaded = true; } QColor Basket::selectionRectInsideColor() { - return Tools::mixColor(Tools::mixColor(backgroundColor(), + 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) ); + // 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; + return result; } void Basket::unlock() { - QTimer::singleShot( 0, this, SLOT(load()) ); + QTimer::singleShot(0, this, SLOT(load())); } void Basket::inactivityAutoLockTimeout() { - lock(); + lock(); } void Basket::drawContents(QPainter *painter) { - drawContents(painter, 0, 0, 0, 0); + 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); + // 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() ) ); + 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.") + " "; + QLabel* label = new QLabel(m_decryptBox); + QString text = "" + i18n("Password protected basket.") + " "; #ifdef HAVE_LIBGPGME - label->setText( text + i18n("Press Unlock to access it.") ); + 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())); + 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(); - } + 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(); + 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("<center>%1</center>").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<QRect>::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()); - } - } - } + 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("<center>%1</center>").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<QRect>::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 (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()); - } + 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()) ); + m_blankAreas.clear(); + m_blankAreas.append(QRect(0, 0, contentsWidth(), contentsHeight())); - FOR_EACH_NOTE (note) - note->recomputeBlankRects(m_blankAreas); + 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 ); + // 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(); - } + if (m_animatedNotes.isEmpty()) { + m_animationTimer.start(FRAME_DELAY); + m_lastFrameTime = QTime::currentTime(); + } - m_animatedNotes.append(note); + m_animatedNotes.append(note); } void Basket::unsetNotesWidth() { - Note *note = m_firstNote; - while (note) { - note->unsetWidth(); - note = note->next(); - } + 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(); + 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()); + updateContents(note->rect()); + if (note->hasResizer()) + updateContents(note->resizerRect()); } void Basket::animateObjects() { - QList<Note*>::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(); + QList<Note*>::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); + 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(); - } + animateObjects(); + } - doHoverEffects(); - placeEditor(); + 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() -*/ + /* 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<State*>::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()); + 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<State*>::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(); + 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; + State *state = 0; - FOR_EACH_NOTE (note) - if (note->stateForTagFromSelectedNotes(tag, &state) && state == 0) - return 0; - return state; + 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); + // 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(); + filterAgain(); + save(); } void Basket::popupTagsMenu(Note *note) { - m_tagPopupNote = note; + m_tagPopupNote = note; - KMenu menu(this); - menu.addTitle(i18n("Tags")); + KMenu menu(this); + menu.addTitle(i18n("Tags")); - Global::bnpView->populateTagsMenu(menu, note); + Global::bnpView->populateTagsMenu(menu, note); - m_lockedHovering = true; - menu.exec(QCursor::pos()); + m_lockedHovering = true; + menu.exec(QCursor::pos()); } void Basket::unlockHovering() { - m_lockedHovering = false; - doHoverEffects(); + 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(); + 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(); + FOR_EACH_NOTE(note) + note->addTagToSelectedNotes(tag); + updateEditorAppearance(); } void Basket::removeTagFromSelectedNotes(Tag *tag) { - FOR_EACH_NOTE (note) - note->removeTagFromSelectedNotes(tag); - updateEditorAppearance(); + FOR_EACH_NOTE(note) + note->removeTagFromSelectedNotes(tag); + updateEditorAppearance(); } void Basket::addStateToSelectedNotes(State *state) { - FOR_EACH_NOTE (note) - note->addStateToSelectedNotes(state); - updateEditorAppearance(); + 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<HtmlEditor*>(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) - } - } + 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<HtmlEditor*>(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); - } + 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(); + FOR_EACH_NOTE(note) + note->changeStateOfSelectedNotes(state); + updateEditorAppearance(); } void Basket::removeAllTagsFromSelectedNotes() { - FOR_EACH_NOTE (note) - note->removeAllTagsFromSelectedNotes(); - updateEditorAppearance(); + FOR_EACH_NOTE(note) + note->removeAllTagsFromSelectedNotes(); + updateEditorAppearance(); } bool Basket::selectedNotesHaveTags() { - FOR_EACH_NOTE (note) - if (note->selectedNotesHaveTags()) - return true; - return false; + 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); + 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); + if (m_textColorSetting.isValid()) + return m_textColorSetting; + else + return palette().color(QPalette::Text); } void Basket::unbufferizeAll() { - FOR_EACH_NOTE (note) - note->unbufferizeAll(); + FOR_EACH_NOTE(note) + note->unbufferizeAll(); } Note* Basket::editedNote() { - if (m_editor) - return m_editor->note(); - else - return 0; + if (m_editor) + return m_editor->note(); + else + return 0; } bool Basket::hasTextInEditor() { - if (!isDuringEdit() || !redirectEditActions()) - return false; + 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; + 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 (!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; + 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 (!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; + 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(); + 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); -// } + // 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); + if (m_editor) + m_editor->autoSave(/*toFileToo=*/true); } void Basket::placeEditorAndEnsureVisible() { - placeEditor(/*andEnsureVisible=*/true); + 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<QFrame*>(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; + if (!isDuringEdit()) + return; + + QFrame *editorQFrame = dynamic_cast<QFrame*>(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); + 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; + if (!isDuringEdit()) + return; - FocusedTextEdit *textEdit = (FocusedTextEdit*) m_editor->textEdit(); + FocusedTextEdit *textEdit = (FocusedTextEdit*) m_editor->textEdit(); - QPoint cursorPoint = textEdit->viewport()->mapTo( - viewport(), textEdit->cursorRect().center() - ); - ensureVisible(cursorPoint.x(), cursorPoint.y()); + QPoint cursorPoint = textEdit->viewport()->mapTo( + viewport(), textEdit->cursorRect().center() + ); + ensureVisible(cursorPoint.x(), cursorPoint.y()); } void Basket::closeEditorDelayed() { - setFocus(); - QTimer::singleShot( 0, this, SLOT(closeEditor()) ); + 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); + 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 (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(); + if (note) + note->setSelected(false);//unselectAll(); + doHoverEffects(); +// save(); - Global::bnpView->m_actEditNote->setEnabled( !isLocked() && countSelecteds() == 1 /*&& !isDuringEdit()*/ ); + Global::bnpView->m_actEditNote->setEnabled(!isLocked() && countSelecteds() == 1 /*&& !isDuringEdit()*/); - emit resetStatusBarText(); // Remove the "Editing. ... to validate." text. + emit resetStatusBarText(); // Remove the "Editing. ... to validate." text. - //if (kapp->activeWindow() == Global::mainContainer) + //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(); + // 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); + // 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); - } - } + 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(); + if (m_inactivityAutoLockTimer.isActive()) + m_inactivityAutoLockTimer.stop(); } Note* Basket::theSelectedNote() { - if (countSelecteds() != 1) { - kDebug() << "NO SELECTED NOTE !!!!"; - return 0; - } + if (countSelecteds() != 1) { + kDebug() << "NO SELECTED NOTE !!!!"; + return 0; + } - Note *selectedOne; - FOR_EACH_NOTE (note) { - selectedOne = note->theSelectedNote(); - if (selectedOne) - return selectedOne; - } + Note *selectedOne; + FOR_EACH_NOTE(note) { + selectedOne = note->theSelectedNote(); + if (selectedOne) + return selectedOne; + } - kDebug() << "One selected note, BUT NOT FOUND !!!!"; + kDebug() << "One selected note, BUT NOT FOUND !!!!"; - return 0; + return 0; } void debugSel(NoteSelection* sel, int n = 0) { - for (NoteSelection *node = sel; node; node = node->next) { - for (int i = 0; i < n; i++) - kDebug() << "-"; - kDebug() << (node->firstChild ? "Group" : node->note->content()->toText("")); - if (node->firstChild) - debugSel(node->firstChild, n+1); - } + for (NoteSelection *node = sel; node; node = node->next) { + for (int i = 0; i < n; i++) + kDebug() << "-"; + kDebug() << (node->firstChild ? "Group" : node->note->content()->toText("")); + if (node->firstChild) + debugSel(node->firstChild, n + 1); + } } 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; - } + 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(); - } + 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(); + 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()), @@ -4145,206 +4142,206 @@ void Basket::noteEdit(Note *note, bool justAdded, const QPoint &clickedPoint) // } } -// 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); +// 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("<qt>Do you really want to delete this note?</qt>", - "<qt>Do you really want to delete these %1 notes?</qt>", - countSelecteds()), - i18np("Delete Note", "Delete Notes", countSelecteds()) + 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("<qt>Do you really want to delete this note?</qt>", + "<qt>Do you really want to delete these %1 notes?</qt>", + countSelecteds()), + i18np("Delete Note", "Delete Notes", countSelecteds()) #if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x - , KStandardGuiItem::del(), KStandardGuiItem::cancel()); + , KStandardGuiItem::del(), KStandardGuiItem::cancel()); #else - ); + ); #endif - if (really == KMessageBox::No) - return; + if (really == KMessageBox::No) + return; - noteDeleteWithoutConfirmation(); + 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; - } - } - } + // 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; - } - } - } + // ... 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); + 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); + 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(); + // 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; - } + // 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(); + 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; - } - } + 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); + 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); + 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()); - } + /* + 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) @@ -4352,408 +4349,408 @@ void Basket::noteOpen(Note *note) */ 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; + 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; + 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..." + 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; +// if (!note) +// note = theSelectedNote(); + Note *note = theSelectedNote(); + if (!note) + return; - KUrl url = note->content()->urlToOpen(/*with=*/false); - if (url.isEmpty()) - 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; + 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)); + // 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; + 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); + return (selectedGroup() != 0); } Note* Basket::firstSelected() { - Note *first = 0; - FOR_EACH_NOTE (note) { - first = note->firstSelected(); - if (first) - return first; - } - return 0; + 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; + 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; + m_watcher->stopScan(); + bool convertedNotes = false; - if (!isLoaded()) - load(); + if (!isLoaded()) + load(); - FOR_EACH_NOTE (note) - if (note->convertTexts()) - convertedNotes = true; + FOR_EACH_NOTE(note) + if (note->convertTexts()) + convertedNotes = true; - if (convertedNotes) - save(); - m_watcher->startScan(); - return convertedNotes; + 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(); + /* // 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(); + 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); + 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; - } - } + 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); - } + 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(); + // 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: 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 + // 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(); + 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(); + 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: 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!!! + // 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); + 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); + Note *first = lastSelected(); + Note *next = first->nextShownInStack(); + if (next) + moveSelectionTo(next, /*below=*/true); } void Basket::wheelEvent(QWheelEvent *event) { - Q3ScrollView::wheelEvent(event); + Q3ScrollView::wheelEvent(event); } void Basket::linkLookChanged() { - Note *note = m_firstNote; - while (note) { - note->linkLookChanged(); - note = note->next(); - } - relayoutNotes(true); + 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 + 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; + 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()); + m_watcher->stopScan(); + Tools::deleteRecursively(fullPath()); } QList<State*> Basket::usedStates() { - QList<State*> states; - FOR_EACH_NOTE (note) - note->usedStates(states); - return states; + QList<State*> 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; + // 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); + // 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(&noteGradient); - drawGradient(&painter, topBgColor, bottomBgColor, 0, 0, noteGradient.width(), noteGradient.height(), /*sunken=*/false, /*horz=*/true, /*flat=*/false); - painter.end(); - noteGradient.save(fullPath, "PNG"); + // 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(&noteGradient); + 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; + // Return the name of the created file: + return fileName; } void Basket::listUsedTags(QList<Tag*> &list) { - if (!isLoaded()) { - load(); - } + if (!isLoaded()) { + load(); + } - FOR_EACH_NOTE (child) - child->listUsedTags(list); + FOR_EACH_NOTE(child) + child->listUsedTags(list); } @@ -4763,23 +4760,23 @@ void Basket::listUsedTags(QList<Tag*> &list) */ 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; + // 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 @@ -4787,304 +4784,304 @@ void Basket::setFocusedNote(Note *note) // void Basket::changeFocusTo(Note *note */ 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; + 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()) + return 0; - if (firstNote()->content()) - return firstNote(); - else - return firstNote()->nextInStack(); + 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 *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 *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; + Note *last = lastNoteInStack(); + while (last && !last->isShown()) + last = last->prevInStack(); + return last; } inline int abs(int n) { - return (n < 0 ? -n : 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 *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 *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(); + // 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(); + 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 !! + 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. @@ -5092,226 +5089,219 @@ void Basket::keyPressEvent(QKeyEvent *event) */ 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); + 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 + // 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); + if (m_focusedNote != 0L) + m_focusedNote->setFocused(false); } void Basket::ensureNoteVisible(Note *note) { - if (!note->isShown()) // Logical! - return; + if (!note->isShown()) // Logical! + return; - if (note == editedNote()) // HACK: When filtering while editing big notes, etc... cause unwanted scrolls - 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 ); + 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); +// 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); +// 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 + ""; + 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 + ""; + 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<QString>::iterator it = m_modifiedFiles.begin(); it != m_modifiedFiles.end(); ++it) { - Note *note = noteForFullPath(*it); - if (note) - note->content()->loadFromFile(/*lazyLoad=*/false); - } - m_modifiedFiles.clear(); + for (QList<QString>::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; + 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; + 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 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; + 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; + 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); + return (m_encryptionType != NoEncryption); } bool Basket::isFileEncrypted() { QFile file(fullPath() + ".basket"); - if (file.open(QIODevice::ReadOnly)){ + if (file.open(QIODevice::ReadOnly)) { // Should be ASCII anyways QString line = file.readLine(32); if (line.startsWith("-----BEGIN PGP MESSAGE-----")) @@ -5322,101 +5312,94 @@ bool Basket::isFileEncrypted() 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(); + 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); - } + 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; - } + if (encrypted) { + return false; + } #endif - return true; - } else - return false; + 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()); + 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()); + return saveToFile(fullPath, array, array.size()); } bool Basket::saveToFile(const QString& fullPath, const QByteArray& array, unsigned long length) { - bool success = true; - QByteArray tmp; + 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; + 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; + 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 && (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; + if (success) + return safelySaveToFile(fullPath, tmp, length); + else + return false; } /** @@ -5426,8 +5409,8 @@ bool Basket::saveToFile(const QString& fullPath, const QByteArray& array, unsign * instead. */ /*static*/ bool Basket::safelySaveToFile(const QString& fullPath, - const QByteArray& array, - unsigned long length) + const QByteArray& array, + unsigned long length) { // Modulus operandi: // 1. Use KSaveFile to try and save the file @@ -5476,39 +5459,39 @@ bool Basket::saveToFile(const QString& fullPath, const QByteArray& array, unsign /*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); + 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()); + return safelySaveToFile(fullPath, array, array.size()); } DiskErrorDialog::DiskErrorDialog(const QString &titleMessage, const QString &message, QWidget *parent) - : KDialog(parent) -{ - setObjectName("DiskError"); - setCaption(i18n("Save Error")); - setMainWidget(new QWidget(this)); - //enableButtonCancel(false); - //enableButtonClose(false); - //enableButton(Close, false); - //enableButtonOk(false); - setModal(true); - //QHBoxLayout *layout = new QHBoxLayout(mainWidget(), /*margin=*/0, spacingHint()); - QHBoxLayout *layout = new QHBoxLayout(mainWidget()); - QPixmap icon = KIconLoader::global()->loadIcon( - "hdd_unmount", KIconLoader::NoGroup, 64, KIconLoader::DefaultState, - QStringList(), /*path_store=*/0L, /*canReturnNull=*/true - ); - QLabel *iconLabel = new QLabel(mainWidget()); - iconLabel->setPixmap(icon); - iconLabel->setFixedSize(iconLabel->sizeHint()); - QLabel *label = new QLabel("" + titleMessage + "" + message + "", mainWidget()); - if (!icon.isNull()) - layout->addWidget(iconLabel); - layout->addWidget(label); + : KDialog(parent) +{ + setObjectName("DiskError"); + setCaption(i18n("Save Error")); + setMainWidget(new QWidget(this)); + //enableButtonCancel(false); + //enableButtonClose(false); + //enableButton(Close, false); + //enableButtonOk(false); + setModal(true); + //QHBoxLayout *layout = new QHBoxLayout(mainWidget(), /*margin=*/0, spacingHint()); + QHBoxLayout *layout = new QHBoxLayout(mainWidget()); + QPixmap icon = KIconLoader::global()->loadIcon( + "hdd_unmount", KIconLoader::NoGroup, 64, KIconLoader::DefaultState, + QStringList(), /*path_store=*/0L, /*canReturnNull=*/true + ); + QLabel *iconLabel = new QLabel(mainWidget()); + iconLabel->setPixmap(icon); + iconLabel->setFixedSize(iconLabel->sizeHint()); + QLabel *label = new QLabel("" + titleMessage + "" + message + "", mainWidget()); + if (!icon.isNull()) + layout->addWidget(iconLabel); + layout->addWidget(label); } DiskErrorDialog::~DiskErrorDialog() @@ -5517,24 +5500,24 @@ DiskErrorDialog::~DiskErrorDialog() void DiskErrorDialog::closeEvent(QCloseEvent *event) { - event->ignore(); + event->ignore(); } void DiskErrorDialog::keyPressEvent(QKeyEvent*) { - // Escape should not close the window... + // Escape should not close the window... } void Basket::lock() { #ifdef HAVE_LIBGPGME - closeEditor(); - m_gpg->clearCache(); - m_locked = true; - enableActions(); - deleteNotes(); - m_loaded = false; - m_loadingLaunched = false; - updateContents(); + closeEditor(); + m_gpg->clearCache(); + m_locked = true; + enableActions(); + deleteNotes(); + m_loaded = false; + m_loadingLaunched = false; + updateContents(); #endif } src/basket.cpp @@ -74,13 +74,13 @@ class KGpgMe; */ class DiskErrorDialog : public KDialog { - Q_OBJECT - public: - DiskErrorDialog(const QString &titleMessage, const QString &message, QWidget *parent = 0); - ~DiskErrorDialog(); - protected: - void closeEvent(QCloseEvent *event); - void keyPressEvent(QKeyEvent*); + Q_OBJECT +public: + DiskErrorDialog(const QString &titleMessage, const QString &message, QWidget *parent = 0); + ~DiskErrorDialog(); +protected: + void closeEvent(QCloseEvent *event); + void keyPressEvent(QKeyEvent*); }; @@ -90,12 +90,12 @@ class DiskErrorDialog : public KDialog */ namespace PlugOptions { - enum Flags { - SelectOnlyNewNotes = 0x01, /// << Unselect every notes in the basket and select the newly inserted ones - DoTagsInheriting = 0x02 /// << The new notes inherit the tags of the sibbling note - }; - // TODO: FocusLastInsertedNote (last visible!), EnsureVisibleAddedNotes, PopupFeebackBaloon (if not called by hand), AnimateNewPosition, FeedbackUnmatched - // TODO: moveNoteInTree(bool animate); +enum Flags { + SelectOnlyNewNotes = 0x01, /// << Unselect every notes in the basket and select the newly inserted ones + DoTagsInheriting = 0x02 /// << The new notes inherit the tags of the sibbling note +}; +// TODO: FocusLastInsertedNote (last visible!), EnsureVisibleAddedNotes, PopupFeebackBaloon (if not called by hand), AnimateNewPosition, FeedbackUnmatched +// TODO: moveNoteInTree(bool animate); } /** This represent a hierarchy of the selected classes. @@ -103,38 +103,38 @@ namespace PlugOptions */ class NoteSelection { - public: - NoteSelection() : note(0), parent(0), firstChild(0), next(0), fullPath() {} - NoteSelection(Note *n) : note(n), parent(0), firstChild(0), next(0), fullPath() {} - - Note *note; - NoteSelection *parent; - NoteSelection *firstChild; - NoteSelection *next; - QString fullPath; // Needeed for 'Cut' code to store temporary path of the cutted note. - - NoteSelection* firstStacked(); - NoteSelection* nextStacked(); - void append(NoteSelection *node); - int count(); - - QList<Note*> parentGroups(); +public: + NoteSelection() : note(0), parent(0), firstChild(0), next(0), fullPath() {} + NoteSelection(Note *n) : note(n), parent(0), firstChild(0), next(0), fullPath() {} + + Note *note; + NoteSelection *parent; + NoteSelection *firstChild; + NoteSelection *next; + QString fullPath; // Needeed for 'Cut' code to store temporary path of the cutted note. + + NoteSelection* firstStacked(); + NoteSelection* nextStacked(); + void append(NoteSelection *node); + int count(); + + QList<Note*> parentGroups(); }; /** This store all needed information when exporting to HTML */ class HtmlExportData { - public: - QString iconsFolderPath; - QString iconsFolderName; - QString imagesFolderPath; - QString imagesFolderName; - QString dataFolderPath; - QString dataFolderName; - bool formatForImpression; - bool embedLinkedFiles; - bool embedLinkedFolders; +public: + QString iconsFolderPath; + QString iconsFolderName; + QString imagesFolderPath; + QString imagesFolderName; + QString dataFolderPath; + QString dataFolderName; + bool formatForImpression; + bool embedLinkedFiles; + bool embedLinkedFolders; }; /** This class handle Basket and add a FilterWidget on top of it. @@ -142,38 +142,46 @@ class HtmlExportData */ class DecoratedBasket : public QWidget { - Q_OBJECT - public: - DecoratedBasket(QWidget *parent, const QString &folderName, Qt::WFlags fl = 0); - ~DecoratedBasket(); - void setFilterBarPosition(bool onTop); - void resetFilter(); - void setFilterBarVisible(bool show, bool switchFocus = true); - bool isFilterBarVisible() { return m_filter->isVisible(); } - const FilterData& filterData() { return m_filter->filterData(); } - FilterBar* filterBar() { return m_filter; } - Basket* basket() { return m_basket; } - private: - QVBoxLayout *m_layout; - FilterBar *m_filter; - Basket *m_basket; + Q_OBJECT +public: + DecoratedBasket(QWidget *parent, const QString &folderName, Qt::WFlags fl = 0); + ~DecoratedBasket(); + void setFilterBarPosition(bool onTop); + void resetFilter(); + void setFilterBarVisible(bool show, bool switchFocus = true); + bool isFilterBarVisible() { + return m_filter->isVisible(); + } + const FilterData& filterData() { + return m_filter->filterData(); + } + FilterBar* filterBar() { + return m_filter; + } + Basket* basket() { + return m_basket; + } +private: + QVBoxLayout *m_layout; + FilterBar *m_filter; + Basket *m_basket; }; class TransparentWidget : public QWidget { - Q_OBJECT - public: - TransparentWidget(Basket *basket); - void setPosition(int x, int y); - //void reparent(QWidget *parent, Qt::WFlags f, const QPoint &p, bool showIt = FALSE); - protected: - void paintEvent(QPaintEvent*); - void mouseMoveEvent(QMouseEvent *event); - bool eventFilter(QObject *object, QEvent *event); - private: - Basket *m_basket; - int m_x; - int m_y; + Q_OBJECT +public: + TransparentWidget(Basket *basket); + void setPosition(int x, int y); + //void reparent(QWidget *parent, Qt::WFlags f, const QPoint &p, bool showIt = FALSE); +protected: + void paintEvent(QPaintEvent*); + void mouseMoveEvent(QMouseEvent *event); + bool eventFilter(QObject *object, QEvent *event); +private: + Basket *m_basket; + int m_x; + int m_y; }; /** @@ -182,516 +190,598 @@ class TransparentWidget : public QWidget class Basket : public Q3ScrollView { /// CONSTRUCTOR AND DESTRUCTOR: - Q_OBJECT - public: - enum EncryptionTypes { - NoEncryption = 0, - PasswordEncryption = 1, - PrivateKeyEncryption = 2 - }; - - public: - Basket(QWidget *parent, const QString &folderName); - ~Basket(); + Q_OBJECT +public: + enum EncryptionTypes { + NoEncryption = 0, + PasswordEncryption = 1, + PrivateKeyEncryption = 2 + }; + +public: + 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(); +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(); +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; +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(); +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: +protected: bool event(QEvent *event); // TODO: replace with QGraphicsScene::helpEvent() void tooltipEvent(QHelpEvent *event); /// ANIMATIONS: - private: - QList<Note*> 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); +private: + QList<Note*> 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; +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; + KGpgMe* m_gpg; #endif - QTimer m_inactivityAutoLockTimer; - void enableActions(); + QTimer m_inactivityAutoLockTimer; + void enableActions(); - private slots: - void loadNotes(const QDomElement &notes, Note *parent); - void saveNotes(QDomDocument &document, QDomElement &element, Note *parent); - void unlock(); +private slots: + void loadNotes(const QDomElement &notes, Note *parent); + void saveNotes(QDomDocument &document, QDomElement &element, Note *parent); + void unlock(); protected slots: - void inactivityAutoLockTimeout(); + 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(); + 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(); +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); +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<State*> &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; +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<State*> &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(); +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<QRect> m_blankAreas; - void recomputeBlankRects(); - QWidget *m_cornerWidget; +private: + QList<QRect> 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(); +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; +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; +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(); +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; +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(); +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(); +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<Note*> 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<Note*> 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); +private: + bool m_isDuringDrag; + QList<Note*> 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<Note*> 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<State*> usedStates(); - static QString saveGradientBackground(const QColor &color, const QFont &font, const QString &folder); +public: + QList<State*> usedStates(); + static QString saveGradientBackground(const QColor &color, const QFont &font, const QString &folder); - public: - void listUsedTags(QList<Tag*> &list); +public: + void listUsedTags(QList<Tag*> &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); +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 deleteFiles(); + bool convertTexts(); - public: - void wheelEvent(QWheelEvent *event); +public: + void wheelEvent(QWheelEvent *event); - public: - Note *m_startOfShiftSelectionNote; +public: + Note *m_startOfShiftSelectionNote; /// THE NEW FILE WATCHER: - private: - KDirWatch *m_watcher; - QTimer m_watcherTimer; - QList<QString> 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(); +private: + KDirWatch *m_watcher; + QTimer m_watcherTimer; + QList<QString> 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 showFrameInsertTo() {} + void resetInsertTo() {} - void computeInsertPlace(const QPoint &/*cursorPosition*/) { } - public: + void computeInsertPlace(const QPoint &/*cursorPosition*/) { } +public: - friend class SystemTray; + friend class SystemTray; /// SPEED OPTIMIZATION - private: - bool m_finishLoadOnFirstShow; - bool m_relayoutOnNextShow; - public: - void aboutToBeActivated(); +private: + bool m_finishLoadOnFirstShow; + bool m_relayoutOnNextShow; +public: + void aboutToBeActivated(); }; #endif // BASKET_H src/basket.h @@ -24,10 +24,10 @@ #ifndef BASKET_EXPORT # if defined(MAKE_BASKETCOMMON_LIB) - /* We are building this library */ +/* We are building this library */ # define BASKET_EXPORT KDE_EXPORT # else - /* We are using this library */ +/* We are using this library */ # define BASKET_EXPORT KDE_IMPORT # endif #endif src/basket_export.h @@ -31,15 +31,15 @@ void setupCmdLineOptions(KCmdLineOptions *opts) opts->add("f"); opts->add("data-folder \\<folder>", ki18n("Custom folder to load and save baskets and other " - "application data.")); + "application data.")); opts->add("h"); opts->add("start-hidden", ki18n("Automatically hide the main window in the system tray on " - "startup.")); + "startup.")); opts->add("k"); opts->add("use-drkonqi", ki18n("On crash, use the standard KDE crash handler rather than " - "send an email.")); + "send an email.")); opts->add("+[file]", ki18n("Open a basket archive or template.")); } src/basket_options.h @@ -36,35 +36,35 @@ //typedef KParts::GenericFactory< BasketPart > BasketFactory; //K_EXPORT_COMPONENT_FACTORY( libbasketpart, BasketFactory ); -K_PLUGIN_FACTORY( BasketFactory, registerPlugin<BasketPart>();) -K_EXPORT_PLUGIN( BasketFactory("basket", "basket") ) +K_PLUGIN_FACTORY(BasketFactory, registerPlugin<BasketPart>();) +K_EXPORT_PLUGIN(BasketFactory("basket", "basket")) -BasketPart::BasketPart( QWidget *parentWidget, QObject *parent, const QList<QVariant> & ) - : KParts::ReadWritePart(parent) +BasketPart::BasketPart(QWidget *parentWidget, QObject *parent, const QList<QVariant> &) + : KParts::ReadWritePart(parent) { - // we need an instance - //setInstance( BasketFactory::instance() ); + // we need an instance + //setInstance( BasketFactory::instance() ); - BasketStatusBar* bar = new BasketStatusBar(new KParts::StatusBarExtension(this)); - // this should be your custom internal widget - m_view = new BNPView(parentWidget, "BNPViewPart", this, actionCollection(), bar); - connect(m_view, SIGNAL(setWindowCaption(const QString &)), this, SLOT(setCaption(const QString &))); - connect(m_view, SIGNAL(showPart()), this, SIGNAL(showPart())); - m_view->setFocusPolicy(Qt::ClickFocus); + BasketStatusBar* bar = new BasketStatusBar(new KParts::StatusBarExtension(this)); + // this should be your custom internal widget + m_view = new BNPView(parentWidget, "BNPViewPart", this, actionCollection(), bar); + connect(m_view, SIGNAL(setWindowCaption(const QString &)), this, SLOT(setCaption(const QString &))); + connect(m_view, SIGNAL(showPart()), this, SIGNAL(showPart())); + m_view->setFocusPolicy(Qt::ClickFocus); - // notify the part that this is our internal widget - setWidget(m_view); + // notify the part that this is our internal widget + setWidget(m_view); - setComponentData( BasketFactory::componentData() ); + setComponentData(BasketFactory::componentData()); - // set our XML-UI resource file - setXMLFile("basket_part.rc", true); + // set our XML-UI resource file + setXMLFile("basket_part.rc", true); - // we are read-write by default - setReadWrite(true); + // we are read-write by default + setReadWrite(true); - // we are not modified since we haven't done anything yet - setModified(false); + // we are not modified since we haven't done anything yet + setModified(false); } BasketPart::~BasketPart() @@ -72,35 +72,35 @@ BasketPart::~BasketPart() void BasketPart::setReadWrite(bool rw) { - // TODO: notify your internal widget of the read-write state - ReadWritePart::setReadWrite(rw); + // TODO: notify your internal widget of the read-write state + ReadWritePart::setReadWrite(rw); } void BasketPart::setModified(bool modified) { - // in any event, we want our parent to do it's thing - ReadWritePart::setModified(modified); + // in any event, we want our parent to do it's thing + ReadWritePart::setModified(modified); } bool BasketPart::openFile() { - // TODO - return false; + // TODO + return false; } bool BasketPart::saveFile() { - //TODO - return false; + //TODO + return false; } KAboutData *BasketPart::createAboutData() { - return new AboutData(); + return new AboutData(); } void BasketPart::setCaption(const QString &caption) { - emit setWindowCaption(caption); + emit setWindowCaption(caption); } src/basket_part.cpp @@ -63,26 +63,26 @@ public: */ virtual void setModified(bool modified); - static KAboutData *createAboutData(); + static KAboutData *createAboutData(); - signals: - void showPart(); +signals: + void showPart(); - protected: +protected: /** - * This must be implemented by each part - */ - virtual bool openFile(); + * This must be implemented by each part + */ + virtual bool openFile(); /** - * This must be implemented by each read-write part - */ - virtual bool saveFile(); + * This must be implemented by each read-write part + */ + virtual bool saveFile(); - protected slots: - void setCaption(const QString &caption); +protected slots: + void setCaption(const QString &caption); - private: +private: BNPView *m_view; }; src/basket_part.h @@ -11,13 +11,13 @@ #include <kicon.h> #include <kparts/componentfactory.h> -EXPORT_KONTACT_PLUGIN( BasketPlugin, basket ) +EXPORT_KONTACT_PLUGIN(BasketPlugin, basket) -BasketPlugin::BasketPlugin( Kontact::Core *core, const QVariantList & ) - : Kontact::Plugin( core, core, "Basket" ) +BasketPlugin::BasketPlugin(Kontact::Core *core, const QVariantList &) + : Kontact::Plugin(core, core, "Basket") { - setComponentData( KontactPluginFactory::componentData() ); - Global::basketConfig = KSharedConfig::openConfig("basketrc"); + setComponentData(KontactPluginFactory::componentData()); + Global::basketConfig = KSharedConfig::openConfig("basketrc"); } BasketPlugin::~BasketPlugin() @@ -26,32 +26,30 @@ BasketPlugin::~BasketPlugin() KParts::ReadOnlyPart *BasketPlugin::createPart() { - KParts::ReadOnlyPart *part = loadPart(); + KParts::ReadOnlyPart *part = loadPart(); - connect( part, SIGNAL(showPart()), this, SLOT(showPart()) ); + connect(part, SIGNAL(showPart()), this, SLOT(showPart())); - return part; + return part; } -void BasketPlugin::readProperties( const KConfigGroup &config ) +void BasketPlugin::readProperties(const KConfigGroup &config) { - if ( part() ) - { - BasketPart *myPart = static_cast<BasketPart*>( part() ); - } + if (part()) { + BasketPart *myPart = static_cast<BasketPart*>(part()); + } } -void BasketPlugin::saveProperties( KConfigGroup &config ) +void BasketPlugin::saveProperties(KConfigGroup &config) { - if ( part() ) - { - BasketPart *myPart = static_cast<BasketPart*>( part() ); - } + if (part()) { + BasketPart *myPart = static_cast<BasketPart*>(part()); + } } void BasketPlugin::showPart() { - core()->selectPlugin( this ); + core()->selectPlugin(this); } #include "basket_plugin.moc" src/basket_plugin.cpp @@ -1,4 +1,4 @@ -#ifndef BASKET_PLUGIN_H +#ifndef BASKET_PLUGIN_H #define BASKET_PLUGIN_H #include <kontactinterfaces/plugin.h> @@ -6,19 +6,19 @@ class BasketPlugin : public Kontact::Plugin { - Q_OBJECT + Q_OBJECT - public: - BasketPlugin( Kontact::Core *core, const QVariantList & ); +public: + BasketPlugin(Kontact::Core *core, const QVariantList &); ~BasketPlugin(); - virtual void readProperties( const KConfigGroup &config ); - virtual void saveProperties( KConfigGroup &config ); + virtual void readProperties(const KConfigGroup &config); + virtual void saveProperties(KConfigGroup &config); - private slots: +private slots: void showPart(); - protected: +protected: KParts::ReadOnlyPart *createPart(); }; src/basket_plugin.h @@ -38,61 +38,61 @@ QString BasketFactory::newFolderName() { - QString folderName; - QString fullPath; - QDir dir; - - for (int i = 1; ; ++i) { - folderName = "basket" + QString::number(i) + "/"; - fullPath = Global::basketsFolder() + folderName; - dir = QDir(fullPath); - if ( ! dir.exists() ) // OK : The folder do not yet exists : - break; // We've found one ! - } - - return folderName; + QString folderName; + QString fullPath; + QDir dir; + + for (int i = 1; ; ++i) { + folderName = "basket" + QString::number(i) + "/"; + fullPath = Global::basketsFolder() + folderName; + dir = QDir(fullPath); + if (! dir.exists()) // OK : The folder do not yet exists : + break; // We've found one ! + } + + return folderName; } QString BasketFactory::unpackTemplate(const QString &templateName) { - // Find a name for a new folder and create it: - QString folderName = newFolderName(); - QString fullPath = Global::basketsFolder() + folderName; - QDir dir; - if (!dir.mkdir(fullPath)) { - KMessageBox::error(/*parent=*/0, i18n("Sorry, but the folder creation for this new basket has failed."), i18n("Basket Creation Failed")); - return ""; - } - - // Unpack the template file to that folder: - // TODO: REALLY unpack (this hand-creation is temporary, or it could be used in case the template can't be found) - QFile file(fullPath + "/.basket"); - if (file.open(QIODevice::WriteOnly)) { - QTextStream stream(&file); - stream.setCodec("UTF-8"); - int nbColumns = (templateName == "mindmap" || templateName == "free" ? 0 : templateName.left(1).toInt()); - Basket *currentBasket = Global::bnpView->currentBasket(); - int columnWidth = (currentBasket && nbColumns > 0 ? (currentBasket->visibleWidth() - (nbColumns-1)*Note::RESIZER_WIDTH) / nbColumns : 0); - stream << QString( "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" - "<!DOCTYPE basket>\n" - "<basket>\n" - " <properties>\n" - " <disposition mindMap=\"%1\" columnCount=\"%2\" free=\"%3\" />\n" - " </properties>\n" - " <notes>\n" ).arg( (templateName == "mindmap" ? "true" : "false"), - QString::number(nbColumns), - (templateName == "free" || templateName == "mindmap" ? "true" : "false") ); - if (nbColumns > 0) - for (int i = 0; i < nbColumns; ++i) - stream << QString(" <group width=\"%1\"></group>\n").arg(columnWidth); - stream << " </notes>\n" - "</basket>\n"; - file.close(); - return folderName; - } else { - KMessageBox::error(/*parent=*/0, i18n("Sorry, but the template copying for this new basket has failed."), i18n("Basket Creation Failed")); - return ""; - } + // Find a name for a new folder and create it: + QString folderName = newFolderName(); + QString fullPath = Global::basketsFolder() + folderName; + QDir dir; + if (!dir.mkdir(fullPath)) { + KMessageBox::error(/*parent=*/0, i18n("Sorry, but the folder creation for this new basket has failed."), i18n("Basket Creation Failed")); + return ""; + } + + // Unpack the template file to that folder: + // TODO: REALLY unpack (this hand-creation is temporary, or it could be used in case the template can't be found) + QFile file(fullPath + "/.basket"); + if (file.open(QIODevice::WriteOnly)) { + QTextStream stream(&file); + stream.setCodec("UTF-8"); + int nbColumns = (templateName == "mindmap" || templateName == "free" ? 0 : templateName.left(1).toInt()); + Basket *currentBasket = Global::bnpView->currentBasket(); + int columnWidth = (currentBasket && nbColumns > 0 ? (currentBasket->visibleWidth() - (nbColumns - 1) * Note::RESIZER_WIDTH) / nbColumns : 0); + stream << QString("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + "<!DOCTYPE basket>\n" + "<basket>\n" + " <properties>\n" + " <disposition mindMap=\"%1\" columnCount=\"%2\" free=\"%3\" />\n" + " </properties>\n" + " <notes>\n").arg((templateName == "mindmap" ? "true" : "false"), + QString::number(nbColumns), + (templateName == "free" || templateName == "mindmap" ? "true" : "false")); + if (nbColumns > 0) + for (int i = 0; i < nbColumns; ++i) + stream << QString(" <group width=\"%1\"></group>\n").arg(columnWidth); + stream << " </notes>\n" + "</basket>\n"; + file.close(); + return folderName; + } else { + KMessageBox::error(/*parent=*/0, i18n("Sorry, but the template copying for this new basket has failed."), i18n("Basket Creation Failed")); + return ""; + } } void BasketFactory::newBasket(const QString &icon, @@ -103,60 +103,60 @@ void BasketFactory::newBasket(const QString &icon, const QString &templateName, Basket *parent) { - // Unpack the templateName file to a new basket folder: - QString folderName = unpackTemplate(templateName); - if (folderName.isEmpty()) - return; - - // Read the properties, change those that should be customized and save the result: - QDomDocument *document = XMLWork::openFile("basket", Global::basketsFolder() + folderName + "/.basket"); - if (!document) { - KMessageBox::error(/*parent=*/0, i18n("Sorry, but the template customization for this new basket has failed."), i18n("Basket Creation Failed")); - return; - } - QDomElement properties = XMLWork::getElement(document->documentElement(), "properties"); - - if (!icon.isEmpty()) { - QDomElement iconElement = XMLWork::getElement(properties, "icon"); - if (!iconElement.tagName().isEmpty()) // If there is already an icon, remove it since we will add our own value below - iconElement.removeChild(iconElement.firstChild()); - XMLWork::addElement(*document, properties, "icon", icon); - } - - if (!name.isEmpty()) { - QDomElement nameElement = XMLWork::getElement(properties, "name"); - if (!nameElement.tagName().isEmpty()) // If there is already a name, remove it since we will add our own value below - nameElement.removeChild(nameElement.firstChild()); - XMLWork::addElement(*document, properties, "name", name); - } - - if (backgroundColor.isValid()) { - QDomElement appearanceElement = XMLWork::getElement(properties, "appearance"); - if (appearanceElement.tagName().isEmpty()) { // If there is not already an appearance tag, add it since we will access it below - appearanceElement = document->createElement("appearance"); - properties.appendChild(appearanceElement); - } - appearanceElement.setAttribute("backgroundColor", backgroundColor.name()); - } - - if (!backgroundImage.isEmpty()) { - QDomElement appearanceElement = XMLWork::getElement(properties, "appearance"); - if (appearanceElement.tagName().isEmpty()) { // If there is not already an appearance tag, add it since we will access it below - appearanceElement = document->createElement("appearance"); - properties.appendChild(appearanceElement); - } - appearanceElement.setAttribute("backgroundImage", backgroundImage); - } - - if (textColor.isValid()) { - QDomElement appearanceElement = XMLWork::getElement(properties, "appearance"); - if (appearanceElement.tagName().isEmpty()) { // If there is not already an appearance tag, add it since we will access it below - appearanceElement = document->createElement("appearance"); - properties.appendChild(appearanceElement); - } - appearanceElement.setAttribute("textColor", textColor.name()); - } - - // Load it in the parent basket (it will save the tree and switch to this new basket): - Global::bnpView->loadNewBasket(folderName, properties, parent); + // Unpack the templateName file to a new basket folder: + QString folderName = unpackTemplate(templateName); + if (folderName.isEmpty()) + return; + + // Read the properties, change those that should be customized and save the result: + QDomDocument *document = XMLWork::openFile("basket", Global::basketsFolder() + folderName + "/.basket"); + if (!document) { + KMessageBox::error(/*parent=*/0, i18n("Sorry, but the template customization for this new basket has failed."), i18n("Basket Creation Failed")); + return; + } + QDomElement properties = XMLWork::getElement(document->documentElement(), "properties"); + + if (!icon.isEmpty()) { + QDomElement iconElement = XMLWork::getElement(properties, "icon"); + if (!iconElement.tagName().isEmpty()) // If there is already an icon, remove it since we will add our own value below + iconElement.removeChild(iconElement.firstChild()); + XMLWork::addElement(*document, properties, "icon", icon); + } + + if (!name.isEmpty()) { + QDomElement nameElement = XMLWork::getElement(properties, "name"); + if (!nameElement.tagName().isEmpty()) // If there is already a name, remove it since we will add our own value below + nameElement.removeChild(nameElement.firstChild()); + XMLWork::addElement(*document, properties, "name", name); + } + + if (backgroundColor.isValid()) { + QDomElement appearanceElement = XMLWork::getElement(properties, "appearance"); + if (appearanceElement.tagName().isEmpty()) { // If there is not already an appearance tag, add it since we will access it below + appearanceElement = document->createElement("appearance"); + properties.appendChild(appearanceElement); + } + appearanceElement.setAttribute("backgroundColor", backgroundColor.name()); + } + + if (!backgroundImage.isEmpty()) { + QDomElement appearanceElement = XMLWork::getElement(properties, "appearance"); + if (appearanceElement.tagName().isEmpty()) { // If there is not already an appearance tag, add it since we will access it below + appearanceElement = document->createElement("appearance"); + properties.appendChild(appearanceElement); + } + appearanceElement.setAttribute("backgroundImage", backgroundImage); + } + + if (textColor.isValid()) { + QDomElement appearanceElement = XMLWork::getElement(properties, "appearance"); + if (appearanceElement.tagName().isEmpty()) { // If there is not already an appearance tag, add it since we will access it below + appearanceElement = document->createElement("appearance"); + properties.appendChild(appearanceElement); + } + appearanceElement.setAttribute("textColor", textColor.name()); + } + + // Load it in the parent basket (it will save the tree and switch to this new basket): + Global::bnpView->loadNewBasket(folderName, properties, parent); } src/basketfactory.cpp @@ -30,17 +30,17 @@ class Basket; */ namespace BasketFactory { - /** You should use this method to create a new basket: */ - void newBasket(const QString &icon, - const QString &name, - const QString &backgroundImage, - const QColor &backgroundColor, - const QColor &textColor, - const QString &templateName, - Basket *parent); - /** Internal tool methods to process the method above: */ - QString newFolderName(); - QString unpackTemplate(const QString &templateName); +/** You should use this method to create a new basket: */ +void newBasket(const QString &icon, + const QString &name, + const QString &backgroundImage, + const QColor &backgroundColor, + const QColor &textColor, + const QString &templateName, + Basket *parent); +/** Internal tool methods to process the method above: */ +QString newFolderName(); +QString unpackTemplate(const QString &templateName); } #endif // BASKETFACTORY_H src/basketfactory.h @@ -47,30 +47,30 @@ /** class BasketListViewItem: */ BasketListViewItem::BasketListViewItem(QTreeWidget *parent, Basket *basket) - : QTreeWidgetItem(parent), m_basket(basket) - , m_isUnderDrag(false) - , m_isAbbreviated(false) + : QTreeWidgetItem(parent), m_basket(basket) + , m_isUnderDrag(false) + , m_isAbbreviated(false) { } BasketListViewItem::BasketListViewItem(QTreeWidgetItem *parent, Basket *basket) - : QTreeWidgetItem(parent), m_basket(basket) - , m_isUnderDrag(false) - , m_isAbbreviated(false) + : QTreeWidgetItem(parent), m_basket(basket) + , m_isUnderDrag(false) + , m_isAbbreviated(false) { } BasketListViewItem::BasketListViewItem(QTreeWidget *parent, QTreeWidgetItem *after, Basket *basket) - : QTreeWidgetItem(parent, after), m_basket(basket) - , m_isUnderDrag(false) - , m_isAbbreviated(false) + : QTreeWidgetItem(parent, after), m_basket(basket) + , m_isUnderDrag(false) + , m_isAbbreviated(false) { } BasketListViewItem::BasketListViewItem(QTreeWidgetItem *parent, QTreeWidgetItem *after, Basket *basket) - : QTreeWidgetItem(parent, after), m_basket(basket) - , m_isUnderDrag(false) - , m_isAbbreviated(false) + : QTreeWidgetItem(parent, after), m_basket(basket) + , m_isUnderDrag(false) + , m_isAbbreviated(false) { } @@ -99,412 +99,412 @@ QString BasketListViewItem::escapedName(const QString &string) void BasketListViewItem::setup() { - setText(/*column=*/0, escapedName(m_basket->basketName())); + setText(/*column=*/0, escapedName(m_basket->basketName())); - QPixmap icon = KIconLoader::global()->loadIcon( - m_basket->icon(), KIconLoader::NoGroup, 16, KIconLoader::DefaultState, - QStringList(), 0L, /*canReturnNull=*/false - ); + QPixmap icon = KIconLoader::global()->loadIcon( + m_basket->icon(), KIconLoader::NoGroup, 16, KIconLoader::DefaultState, + QStringList(), 0L, /*canReturnNull=*/false + ); - setIcon(/*column=*/0, icon); -/* - QBrush brush; + setIcon(/*column=*/0, icon); + /* + QBrush brush; - bool withIcon = m_stateCopy || (m_tagCopy && !m_tagCopy->isMultiState()); - State* state = (m_tagCopy ? m_tagCopy->stateCopies[0]->newState : m_stateCopy->newState); - brush.setColor(isSelected() ? kapp->palette().color(QPalette::Highlight) : (withIcon && state->backgroundColor().isValid() ? state->backgroundColor() : viewport->palette().color(viewwport->backgroundRole()))); - setBackground(brush); - */ + bool withIcon = m_stateCopy || (m_tagCopy && !m_tagCopy->isMultiState()); + State* state = (m_tagCopy ? m_tagCopy->stateCopies[0]->newState : m_stateCopy->newState); + brush.setColor(isSelected() ? kapp->palette().color(QPalette::Highlight) : (withIcon && state->backgroundColor().isValid() ? state->backgroundColor() : viewport->palette().color(viewwport->backgroundRole()))); + setBackground(brush); + */ } BasketListViewItem* BasketListViewItem::lastChild() { - int count = childCount(); - if (count <= 0) - return 0; - return (BasketListViewItem*)(child(count-1)); + int count = childCount(); + if (count <= 0) + return 0; + return (BasketListViewItem*)(child(count - 1)); } QStringList BasketListViewItem::childNamesTree(int deep) { - QStringList result; + QStringList result; - // Compute indentation spaces: - QString spaces; - for (int j = 0; j < deep; ++j) - spaces += " "; + // Compute indentation spaces: + QString spaces; + for (int j = 0; j < deep; ++j) + spaces += " "; - // Append the name: - result.append(spaces + basket()->basketName()); + // Append the name: + result.append(spaces + basket()->basketName()); - // Append the children: - for (int i=0;i<childCount();i++){ - QStringList children = ((BasketListViewItem *)child(i))->childNamesTree(deep + 1); - for (QStringList::iterator it = children.begin(); it != children.end(); ++it) - result.append(*it); - } - return result; + // Append the children: + for (int i = 0; i < childCount(); i++) { + QStringList children = ((BasketListViewItem *)child(i))->childNamesTree(deep + 1); + for (QStringList::iterator it = children.begin(); it != children.end(); ++it) + result.append(*it); + } + return result; } void BasketListViewItem::moveChildsBaskets() { - int insertAfterThis = 0; - if (!parent()) - insertAfterThis = treeWidget()->indexOfTopLevelItem(this); - for (int i=0;i<childCount();i++){ - // Re-insert the item with the good parent: - if (parent()) - parent()->insertChild(insertAfterThis, child(i)); - else - treeWidget()->insertTopLevelItem(insertAfterThis, child(i)); - // And move it at the good place: - insertAfterThis++; - } + int insertAfterThis = 0; + if (!parent()) + insertAfterThis = treeWidget()->indexOfTopLevelItem(this); + for (int i = 0; i < childCount(); i++) { + // Re-insert the item with the good parent: + if (parent()) + parent()->insertChild(insertAfterThis, child(i)); + else + treeWidget()->insertTopLevelItem(insertAfterThis, child(i)); + // And move it at the good place: + insertAfterThis++; + } } void BasketListViewItem::ensureVisible() { - BasketListViewItem *item = this; - while (item->parent()) { - item = (BasketListViewItem*)(item->parent()); - item->setExpanded(true); - } + BasketListViewItem *item = this; + while (item->parent()) { + item = (BasketListViewItem*)(item->parent()); + item->setExpanded(true); + } } bool BasketListViewItem::isShown() { - QTreeWidgetItem *item = parent(); - while (item) { - if (!item->isExpanded()) - return false; - item = item->parent(); - } - return true; + QTreeWidgetItem *item = parent(); + while (item) { + if (!item->isExpanded()) + return false; + item = item->parent(); + } + return true; } bool BasketListViewItem::isCurrentBasket() { - return basket() == Global::bnpView->currentBasket(); + return basket() == Global::bnpView->currentBasket(); } -bool BasketListViewItem::isUnderDrag(){ - return m_isUnderDrag; +bool BasketListViewItem::isUnderDrag() +{ + return m_isUnderDrag; } // TODO: Move this function from item.cpp to class Tools: -extern void drawGradient( QPainter *p, const QColor &colorTop, const QColor & colorBottom, - int x, int y, int w, int h, - bool sunken, bool horz, bool flat ); /*const*/ +extern void drawGradient(QPainter *p, const QColor &colorTop, const QColor & colorBottom, + int x, int y, int w, int h, + bool sunken, bool horz, bool flat); /*const*/ QPixmap BasketListViewItem::circledTextPixmap(const QString &text, int height, const QFont &font, const QColor &color) { - QString key = QString("BLI-%1.%2.%3.%4") - .arg(text).arg(height).arg(font.toString()).arg(color.rgb()); - if (QPixmap* cached=QPixmapCache::find(key)) { - return *cached; - } + QString key = QString("BLI-%1.%2.%3.%4") + .arg(text).arg(height).arg(font.toString()).arg(color.rgb()); + if (QPixmap* cached = QPixmapCache::find(key)) { + return *cached; + } - // Compute the sizes of the image components: - QRect textRect = QFontMetrics(font).boundingRect(0, 0, /*width=*/1, height, Qt::AlignLeft | Qt::AlignTop, text); - int xMargin = height / 6; - int width = xMargin + textRect.width() + xMargin; + // Compute the sizes of the image components: + QRect textRect = QFontMetrics(font).boundingRect(0, 0, /*width=*/1, height, Qt::AlignLeft | Qt::AlignTop, text); + int xMargin = height / 6; + int width = xMargin + textRect.width() + xMargin; - // Create the gradient image: - QPixmap gradient(3 * width, 3 * height); // We double the size to be able to smooth scale down it (== antialiased curves) - QPainter gradientPainter(&gradient); + // Create the gradient image: + QPixmap gradient(3 * width, 3 * height); // We double the size to be able to smooth scale down it (== antialiased curves) + QPainter gradientPainter(&gradient); #if 1 // Enable the new look of the gradient: - QColor topColor = treeWidget()->palette().color(QPalette::Highlight).lighter(130); //120 - QColor topMidColor = treeWidget()->palette().color(QPalette::Highlight).lighter(105); //105 - QColor bottomMidColor = treeWidget()->palette().color(QPalette::Highlight).darker(130); //120 - QColor bottomColor = treeWidget()->palette().color(QPalette::Highlight); - drawGradient(&gradientPainter, topColor, topMidColor, - 0, 0, gradient.width(), gradient.height() / 2, /*sunken=*/false, /*horz=*/true, /*flat=*/false); - drawGradient(&gradientPainter, bottomMidColor, bottomColor, - 0, gradient.height() / 2, gradient.width(), gradient.height() - gradient.height() / 2, /*sunken=*/false, /*horz=*/true, /*flat=*/false); - gradientPainter.fillRect(0, 0, gradient.width(), 3, treeWidget()->palette().color(QPalette::Highlight)); + QColor topColor = treeWidget()->palette().color(QPalette::Highlight).lighter(130); //120 + QColor topMidColor = treeWidget()->palette().color(QPalette::Highlight).lighter(105); //105 + QColor bottomMidColor = treeWidget()->palette().color(QPalette::Highlight).darker(130); //120 + QColor bottomColor = treeWidget()->palette().color(QPalette::Highlight); + drawGradient(&gradientPainter, topColor, topMidColor, + 0, 0, gradient.width(), gradient.height() / 2, /*sunken=*/false, /*horz=*/true, /*flat=*/false); + drawGradient(&gradientPainter, bottomMidColor, bottomColor, + 0, gradient.height() / 2, gradient.width(), gradient.height() - gradient.height() / 2, /*sunken=*/false, /*horz=*/true, /*flat=*/false); + gradientPainter.fillRect(0, 0, gradient.width(), 3, treeWidget()->palette().color(QPalette::Highlight)); #else - drawGradient(&gradientPainter, palette().color(QPalette::Highlight), palette().color(QPalette::Highlight).darker(), - 0, 0, gradient.width(), gradient.height(), /*sunken=*/false, /*horz=*/true, /*flat=*/false); + drawGradient(&gradientPainter, palette().color(QPalette::Highlight), palette().color(QPalette::Highlight).darker(), + 0, 0, gradient.width(), gradient.height(), /*sunken=*/false, /*horz=*/true, /*flat=*/false); #endif - gradientPainter.end(); + gradientPainter.end(); - // Draw the curved rectangle: - QBitmap curvedRectangle(3 * width, 3 * height); - curvedRectangle.fill(Qt::color0); - QPainter curvePainter(&curvedRectangle); - curvePainter.setPen(Qt::color1); - curvePainter.setBrush(Qt::color1); - curvePainter.setClipRect(0, 0, 3*(height / 5), 3*(height)); // If the width is small, don't fill the right part of the pixmap - curvePainter.drawEllipse(0, 3*(-height / 4), 3*(height), 3*(height * 3 / 2)); // Don't forget we double the sizes - curvePainter.setClipRect(3*(width - height / 5), 0, 3*(height / 5), 3*(height)); - curvePainter.drawEllipse(3*(width - height), 3*(-height / 4), 3*(height), 3*(height * 3 / 2)); - curvePainter.setClipping(false); - curvePainter.fillRect(3*(height / 6), 0, 3*(width - 2 * height / 6), 3*(height), curvePainter.brush()); - curvePainter.end(); + // Draw the curved rectangle: + QBitmap curvedRectangle(3 * width, 3 * height); + curvedRectangle.fill(Qt::color0); + QPainter curvePainter(&curvedRectangle); + curvePainter.setPen(Qt::color1); + curvePainter.setBrush(Qt::color1); + curvePainter.setClipRect(0, 0, 3*(height / 5), 3*(height)); // If the width is small, don't fill the right part of the pixmap + curvePainter.drawEllipse(0, 3*(-height / 4), 3*(height), 3*(height * 3 / 2)); // Don't forget we double the sizes + curvePainter.setClipRect(3*(width - height / 5), 0, 3*(height / 5), 3*(height)); + curvePainter.drawEllipse(3*(width - height), 3*(-height / 4), 3*(height), 3*(height * 3 / 2)); + curvePainter.setClipping(false); + curvePainter.fillRect(3*(height / 6), 0, 3*(width - 2 * height / 6), 3*(height), curvePainter.brush()); + curvePainter.end(); - // Apply the curved rectangle as the mask of the gradient: - gradient.setMask(curvedRectangle); - QImage resultImage = gradient.toImage(); + // Apply the curved rectangle as the mask of the gradient: + gradient.setMask(curvedRectangle); + QImage resultImage = gradient.toImage(); - //resultImage.setAlphaBuffer(true); - resultImage.convertToFormat(QImage::Format_ARGB32); + //resultImage.setAlphaBuffer(true); + resultImage.convertToFormat(QImage::Format_ARGB32); - // Scale down the image smoothly to get anti-aliasing: - QPixmap pmScaled = QPixmap::fromImage(resultImage.scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); + // Scale down the image smoothly to get anti-aliasing: + QPixmap pmScaled = QPixmap::fromImage(resultImage.scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); - // Draw the text, and return the result: - QPainter painter(&pmScaled); - painter.setPen(color); - painter.setFont(font); - painter.drawText(0+1, 0, width, height, Qt::AlignHCenter | Qt::AlignVCenter, text); - painter.end(); + // Draw the text, and return the result: + QPainter painter(&pmScaled); + painter.setPen(color); + painter.setFont(font); + painter.drawText(0 + 1, 0, width, height, Qt::AlignHCenter | Qt::AlignVCenter, text); + painter.end(); - QPixmapCache::insert(key, pmScaled); + QPixmapCache::insert(key, pmScaled); - return pmScaled; + return pmScaled; } QPixmap BasketListViewItem::foundCountPixmap(bool isLoading, int countFound, bool childsAreLoading, int countChildsFound, const QFont &font, int height) { - if (isLoading) - return QPixmap(); - - QFont boldFont(font); - boldFont.setBold(true); - - QString text; - if (childsAreLoading) { - if (countChildsFound > 0) - text = i18n("%1+%2+", QString::number(countFound), QString::number(countChildsFound)); - else - text = i18n("%1+", QString::number(countFound)); - } else { - if (countChildsFound > 0) - text = i18n("%1+%2", QString::number(countFound), QString::number(countChildsFound)); - else if (countFound > 0) - text = QString::number(countFound); - else - return QPixmap(); - } + if (isLoading) + return QPixmap(); + + QFont boldFont(font); + boldFont.setBold(true); + + QString text; + if (childsAreLoading) { + if (countChildsFound > 0) + text = i18n("%1+%2+", QString::number(countFound), QString::number(countChildsFound)); + else + text = i18n("%1+", QString::number(countFound)); + } else { + if (countChildsFound > 0) + text = i18n("%1+%2", QString::number(countFound), QString::number(countChildsFound)); + else if (countFound > 0) + text = QString::number(countFound); + else + return QPixmap(); + } - return circledTextPixmap(text, height, boldFont, treeWidget()->palette().color(QPalette::HighlightedText)); + return circledTextPixmap(text, height, boldFont, treeWidget()->palette().color(QPalette::HighlightedText)); } bool BasketListViewItem::haveChildsLoading() { - for (int i=0;i<childCount();i++){ - BasketListViewItem *childItem = (BasketListViewItem*)child(i); - if (!childItem->basket()->isLoaded() && !childItem->basket()->isLocked()) - return true; - if (childItem->haveChildsLoading()) - return true; - } - return false; + for (int i = 0; i < childCount(); i++) { + BasketListViewItem *childItem = (BasketListViewItem*)child(i); + if (!childItem->basket()->isLoaded() && !childItem->basket()->isLocked()) + return true; + if (childItem->haveChildsLoading()) + return true; + } + return false; } bool BasketListViewItem::haveHiddenChildsLoading() { - if (isExpanded()) - return false; - return haveChildsLoading(); + if (isExpanded()) + return false; + return haveChildsLoading(); } bool BasketListViewItem::haveChildsLocked() { - for (int i=0; i<childCount(); i++){ - BasketListViewItem *childItem = (BasketListViewItem*)child(i); - if (/*!*/childItem->basket()->isLocked()) - return true; - if (childItem->haveChildsLocked()) - return true; - } - return false; + for (int i = 0; i < childCount(); i++) { + BasketListViewItem *childItem = (BasketListViewItem*)child(i); + if (/*!*/childItem->basket()->isLocked()) + return true; + if (childItem->haveChildsLocked()) + return true; + } + return false; } bool BasketListViewItem::haveHiddenChildsLocked() { - if (isExpanded()) - return false; - return haveChildsLocked(); + if (isExpanded()) + return false; + return haveChildsLocked(); } int BasketListViewItem::countChildsFound() { - int count = 0; - for (int i=0;i<childCount();i++){ - BasketListViewItem *childItem = (BasketListViewItem*)child(i); - count += childItem->basket()->countFounds(); - count += childItem->countChildsFound(); - } - return count; + int count = 0; + for (int i = 0; i < childCount(); i++) { + BasketListViewItem *childItem = (BasketListViewItem*)child(i); + count += childItem->basket()->countFounds(); + count += childItem->countChildsFound(); + } + return count; } int BasketListViewItem::countHiddenChildsFound() { - if (isExpanded()) - return 0; - return countChildsFound(); + if (isExpanded()) + return 0; + return countChildsFound(); } void BasketListViewItem::setUnderDrag(bool underDrag) { - m_isUnderDrag = underDrag; + m_isUnderDrag = underDrag; } bool BasketListViewItem::isAbbreviated() { - return m_isAbbreviated; + return m_isAbbreviated; } -void BasketListViewItem::setAbbreviated(bool b){ - m_isAbbreviated = b; +void BasketListViewItem::setAbbreviated(bool b) +{ + m_isAbbreviated = b; } /** class BasketTreeListView: */ BasketTreeListView::BasketTreeListView(QWidget *parent) - : QTreeWidget(parent), m_autoOpenItem(0) - , m_itemUnderDrag(0) + : QTreeWidget(parent), m_autoOpenItem(0) + , m_itemUnderDrag(0) { - connect( &m_autoOpenTimer, SIGNAL(timeout()), this, SLOT(autoOpen()) ); + connect(&m_autoOpenTimer, SIGNAL(timeout()), this, SLOT(autoOpen())); } -void BasketTreeListView::contextMenuEvent(QContextMenuEvent *e){ - emit contextMenuRequested(e->pos()); +void BasketTreeListView::contextMenuEvent(QContextMenuEvent *e) +{ + emit contextMenuRequested(e->pos()); } bool BasketTreeListView::event(QEvent *e) { - if (e->type() == QEvent::ToolTip) { - QHelpEvent *he = static_cast<QHelpEvent *>(e); - QTreeWidgetItem *item = itemAt(he->pos()); - BasketListViewItem* bitem = dynamic_cast<BasketListViewItem*>(item); - if (bitem && bitem->isAbbreviated()) { - QRect rect = visualItemRect(bitem); - QToolTip::showText(rect.topLeft(), bitem->basket()->basketName(), - viewport(), rect); - } - return true; - } - return QTreeWidget::event(e); + if (e->type() == QEvent::ToolTip) { + QHelpEvent *he = static_cast<QHelpEvent *>(e); + QTreeWidgetItem *item = itemAt(he->pos()); + BasketListViewItem* bitem = dynamic_cast<BasketListViewItem*>(item); + if (bitem && bitem->isAbbreviated()) { + QRect rect = visualItemRect(bitem); + QToolTip::showText(rect.topLeft(), bitem->basket()->basketName(), + viewport(), rect); + } + return true; + } + return QTreeWidget::event(e); } void BasketTreeListView::dragEnterEvent(QDragEnterEvent *event) { - if (event->provides("application/x-qabstractitemmodeldatalist")){ - QTreeWidgetItemIterator it(this); // TODO: Don't show expanders if it's not a basket drag... - while (*it) { - QTreeWidgetItem *item = *it; - if (item->childCount() <= 0) { - item->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator); - item->setExpanded(true); - } - ++it; - } - update(); - } + if (event->provides("application/x-qabstractitemmodeldatalist")) { + QTreeWidgetItemIterator it(this); // TODO: Don't show expanders if it's not a basket drag... + while (*it) { + QTreeWidgetItem *item = *it; + if (item->childCount() <= 0) { + item->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator); + item->setExpanded(true); + } + ++it; + } + update(); + } - QTreeWidget::dragEnterEvent(event); + QTreeWidget::dragEnterEvent(event); } void BasketTreeListView::removeExpands() { - QTreeWidgetItemIterator it(this); - while (*it) { - QTreeWidgetItem *item = *it; - if (item->childCount() <= 0) - item->setChildIndicatorPolicy(QTreeWidgetItem::DontShowIndicatorWhenChildless); - ++it; - } + QTreeWidgetItemIterator it(this); + while (*it) { + QTreeWidgetItem *item = *it; + if (item->childCount() <= 0) + item->setChildIndicatorPolicy(QTreeWidgetItem::DontShowIndicatorWhenChildless); + ++it; + } } void BasketTreeListView::dragLeaveEvent(QDragLeaveEvent *event) { - kDebug() << "BasketTreeListView::dragLeaveEvent"; - m_autoOpenItem = 0; - m_autoOpenTimer.stop(); - setItemUnderDrag(0); - removeExpands(); - QTreeWidget::dragLeaveEvent(event); + kDebug() << "BasketTreeListView::dragLeaveEvent"; + m_autoOpenItem = 0; + m_autoOpenTimer.stop(); + setItemUnderDrag(0); + removeExpands(); + QTreeWidget::dragLeaveEvent(event); } void BasketTreeListView::dropEvent(QDropEvent *event) { - kDebug() << "BasketTreeListView::dropEvent()"; - if (event->provides("application/x-qabstractitemmodeldatalist")) - { - QTreeWidget::dropEvent(event); - } - else { - kDebug() << "Forwarding dropped data to the basket"; - QTreeWidgetItem *item = itemAt(event->pos()); - BasketListViewItem* bitem = dynamic_cast<BasketListViewItem*>(item); - if (bitem) { - bitem->basket()->blindDrop(event); - } - else { - kDebug() << "Forwarding failed: no bitem found"; - } + kDebug() << "BasketTreeListView::dropEvent()"; + if (event->provides("application/x-qabstractitemmodeldatalist")) { + QTreeWidget::dropEvent(event); + } else { + kDebug() << "Forwarding dropped data to the basket"; + QTreeWidgetItem *item = itemAt(event->pos()); + BasketListViewItem* bitem = dynamic_cast<BasketListViewItem*>(item); + if (bitem) { + bitem->basket()->blindDrop(event); + } else { + kDebug() << "Forwarding failed: no bitem found"; } + } - m_autoOpenItem = 0; - m_autoOpenTimer.stop(); - setItemUnderDrag(0); - removeExpands(); + m_autoOpenItem = 0; + m_autoOpenTimer.stop(); + setItemUnderDrag(0); + removeExpands(); - Global::bnpView->save(); // TODO: Don't save if it was not a basket drop... + Global::bnpView->save(); // TODO: Don't save if it was not a basket drop... } void BasketTreeListView::dragMoveEvent(QDragMoveEvent *event) { - kDebug() << "BasketTreeListView::dragMoveEvent"; - if (event->provides("application/x-qabstractitemmodeldatalist")) - QTreeWidget::dragMoveEvent(event); - else { - QTreeWidgetItem *item = itemAt(event->pos()); - BasketListViewItem* bitem = dynamic_cast<BasketListViewItem*>(item); - if (m_autoOpenItem != item) { - m_autoOpenItem = item; - m_autoOpenTimer.setSingleShot(true); - m_autoOpenTimer.start(1700); - } - if (item) { - event->accept(); - } - setItemUnderDrag(bitem); - - QTreeWidget::dragMoveEvent(event); // FIXME: ADDED - } + kDebug() << "BasketTreeListView::dragMoveEvent"; + if (event->provides("application/x-qabstractitemmodeldatalist")) + QTreeWidget::dragMoveEvent(event); + else { + QTreeWidgetItem *item = itemAt(event->pos()); + BasketListViewItem* bitem = dynamic_cast<BasketListViewItem*>(item); + if (m_autoOpenItem != item) { + m_autoOpenItem = item; + m_autoOpenTimer.setSingleShot(true); + m_autoOpenTimer.start(1700); + } + if (item) { + event->accept(); + } + setItemUnderDrag(bitem); + + QTreeWidget::dragMoveEvent(event); // FIXME: ADDED + } } void BasketTreeListView::setItemUnderDrag(BasketListViewItem* item) { - if (m_itemUnderDrag != item) { - if (m_itemUnderDrag) { - // Remove drag status from the old item - m_itemUnderDrag->setUnderDrag(false); - } + if (m_itemUnderDrag != item) { + if (m_itemUnderDrag) { + // Remove drag status from the old item + m_itemUnderDrag->setUnderDrag(false); + } - m_itemUnderDrag = item; + m_itemUnderDrag = item; - if (m_itemUnderDrag) { - // add drag status to the new item - m_itemUnderDrag->setUnderDrag(true); - } - } + if (m_itemUnderDrag) { + // add drag status to the new item + m_itemUnderDrag->setUnderDrag(true); + } + } } void BasketTreeListView::autoOpen() { - BasketListViewItem *item = (BasketListViewItem*)m_autoOpenItem; - if (item) - Global::bnpView->setCurrentBasket(item->basket()); + BasketListViewItem *item = (BasketListViewItem*)m_autoOpenItem; + if (item) + Global::bnpView->setCurrentBasket(item->basket()); } void BasketTreeListView::resizeEvent(QResizeEvent *event) { - QTreeWidget::resizeEvent(event); + QTreeWidget::resizeEvent(event); } /** We should NEVER get focus (because of QWidget::NoFocus focusPolicy()) @@ -513,12 +513,12 @@ void BasketTreeListView::resizeEvent(QResizeEvent *event) */ void BasketTreeListView::focusInEvent(QFocusEvent*) { - Basket *basket = Global::bnpView->currentBasket(); - if (basket) - basket->setFocus(); + Basket *basket = Global::bnpView->currentBasket(); + if (basket) + basket->setFocus(); } -Qt::DropActions BasketTreeListView::supportedDropActions () const +Qt::DropActions BasketTreeListView::supportedDropActions() const { - return Qt::MoveAction | Qt::IgnoreAction; + return Qt::MoveAction | Qt::IgnoreAction; } src/basketlistview.cpp @@ -38,75 +38,77 @@ class Basket; 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(); +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(); - Basket *basket() { return m_basket; } - void setup(); - BasketListViewItem* lastChild(); - QStringList childNamesTree(int deep = 0); - void moveChildsBaskets(); - void ensureVisible(); - bool isShown(); - bool isCurrentBasket(); - bool isUnderDrag(); - QString escapedName(const QString &string); + Basket *basket() { + return m_basket; + } + void setup(); + BasketListViewItem* lastChild(); + QStringList childNamesTree(int deep = 0); + void moveChildsBaskets(); + void ensureVisible(); + bool isShown(); + bool isCurrentBasket(); + bool isUnderDrag(); + QString escapedName(const QString &string); - QPixmap circledTextPixmap(const QString &text, int height, const QFont &font, const QColor &color); - QPixmap foundCountPixmap(bool isLoading, int countFound, bool childsAreLoading, int countChildsFound, const QFont &font, int height); - bool haveChildsLoading(); - bool haveHiddenChildsLoading(); - bool haveChildsLocked(); - bool haveHiddenChildsLocked(); - int countChildsFound(); - int countHiddenChildsFound(); + QPixmap circledTextPixmap(const QString &text, int height, const QFont &font, const QColor &color); + QPixmap foundCountPixmap(bool isLoading, int countFound, bool childsAreLoading, int countChildsFound, const QFont &font, int height); + bool haveChildsLoading(); + bool haveHiddenChildsLoading(); + bool haveChildsLocked(); + bool haveHiddenChildsLocked(); + int countChildsFound(); + int countHiddenChildsFound(); - void setUnderDrag(bool); - bool isAbbreviated(); - void setAbbreviated(bool b); + void setUnderDrag(bool); + bool isAbbreviated(); + void setAbbreviated(bool b); - private: - Basket *m_basket; - int m_width; - bool m_isUnderDrag; - bool m_isAbbreviated; +private: + Basket *m_basket; + int m_width; + bool m_isUnderDrag; + bool m_isAbbreviated; }; Q_DECLARE_METATYPE(BasketListViewItem *); class BasketTreeListView : public QTreeWidget { - Q_OBJECT - public: - BasketTreeListView(QWidget *parent = 0); - void dragEnterEvent(QDragEnterEvent *event); - void removeExpands(); - void dragLeaveEvent(QDragLeaveEvent *event); - void dragMoveEvent(QDragMoveEvent *event); - void dropEvent(QDropEvent *event); - void resizeEvent(QResizeEvent *event); - void contextMenuEvent(QContextMenuEvent *event); - Qt::DropActions supportedDropActions() const; - protected: - bool event(QEvent *e); - void focusInEvent(QFocusEvent*); - private: - QTimer m_autoOpenTimer; - QTreeWidgetItem *m_autoOpenItem; - signals: - void itemActivated(QTreeWidgetItem *, int column); - void itemPressed(QTreeWidgetItem *, int column); - void contextMenuRequested(const QPoint &); - private slots: - void autoOpen(); - private: - void setItemUnderDrag(BasketListViewItem* item); - BasketListViewItem* m_itemUnderDrag; + Q_OBJECT +public: + BasketTreeListView(QWidget *parent = 0); + void dragEnterEvent(QDragEnterEvent *event); + void removeExpands(); + void dragLeaveEvent(QDragLeaveEvent *event); + void dragMoveEvent(QDragMoveEvent *event); + void dropEvent(QDropEvent *event); + void resizeEvent(QResizeEvent *event); + void contextMenuEvent(QContextMenuEvent *event); + Qt::DropActions supportedDropActions() const; +protected: + bool event(QEvent *e); + void focusInEvent(QFocusEvent*); +private: + QTimer m_autoOpenTimer; + QTreeWidgetItem *m_autoOpenItem; +signals: + void itemActivated(QTreeWidgetItem *, int column); + void itemPressed(QTreeWidgetItem *, int column); + void contextMenuRequested(const QPoint &); +private slots: + void autoOpen(); +private: + void setItemUnderDrag(BasketListViewItem* item); + BasketListViewItem* m_itemUnderDrag; }; #endif // BASKETLISTVIEW_H src/basketlistview.h @@ -47,178 +47,178 @@ #include "backgroundmanager.h" BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, QWidget *parent) - : KDialog(parent) - , m_basket(basket) + : KDialog(parent) + , m_basket(basket) { - // Set up dialog options - setCaption(i18n("Basket Properties")); - setButtons(Ok | Apply | Cancel); - setDefaultButton(Ok); - setObjectName("BasketProperties"); - setModal(true); - showButtonSeparator(false); - - QWidget *page = new QWidget(this); - QVBoxLayout *topLayout = new QVBoxLayout(page); - - // Icon and Name: - QHBoxLayout *nameLayout = new QHBoxLayout(0); - int margin = marginHint()*2/3; - nameLayout->setContentsMargins(margin, margin, margin, margin); - m_icon = new KIconButton(page); - m_icon->setIconType(KIconLoader::NoGroup, KIconLoader::Action); - m_icon->setIconSize(16); - m_icon->setIcon(m_basket->icon()); - int size = qMax(m_icon->sizeHint().width(), m_icon->sizeHint().height()); - m_icon->setFixedSize(size, size); // Make it square! - m_icon->setToolTip(i18n("Icon")); - m_name = new QLineEdit(m_basket->basketName(), page); - m_name->setMinimumWidth(m_name->fontMetrics().maxWidth()*20); - m_name->setToolTip(i18n("Name")); - nameLayout->addWidget(m_icon); - nameLayout->addWidget(m_name); - topLayout->addLayout(nameLayout); - - // Appearance: - QGroupBox *appearance = new QGroupBox(i18n("Appearance"), page); - QVBoxLayout* appearanceLayout = new QVBoxLayout; - appearance->setLayout(appearanceLayout); - QWidget *appearanceWidget = new QWidget; - appearanceLayout->addWidget(appearanceWidget); - - //QGridLayout *grid = new QGridLayout(appearanceWidget, /*nRows=*/3, /*nCols=*/2, /*margin=*/0, spacingHint()); - QGridLayout *grid = new QGridLayout(appearanceWidget); - - m_backgroundImage = new QComboBox(appearanceWidget); - m_backgroundColor = new KColorCombo2(m_basket->backgroundColorSetting(), palette().color(QPalette::Base), appearanceWidget); - m_textColor = new KColorCombo2(m_basket->textColorSetting(), palette().color(QPalette::Text), appearanceWidget); - - QLabel *label1 = new QLabel(appearanceWidget); - label1->setBuddy(m_backgroundImage); - label1->setText(i18n("Background &image:")); - - QLabel *label2 = new QLabel(appearanceWidget); - label2->setBuddy(m_backgroundColor); - label2->setText(i18n("&Background color:")); - - QLabel *label3 = new QLabel(appearanceWidget); - label3->setBuddy(m_textColor); - label3->setText(i18n("&Text color:")); - - grid->addWidget(label1, 0, 0, Qt::AlignVCenter); - grid->addWidget(label2, 1, 0, Qt::AlignVCenter); - grid->addWidget(label3, 2, 0, Qt::AlignVCenter); - grid->addWidget(m_backgroundImage, 0, 1, Qt::AlignVCenter); - grid->addWidget(m_backgroundColor, 1, 1, Qt::AlignVCenter); - grid->addWidget(m_textColor, 2, 1, Qt::AlignVCenter); - topLayout->addWidget(appearance); - - m_backgroundImage->addItem(i18n("(None)")); - m_backgroundImagesMap.insert(0, ""); - m_backgroundImage->setIconSize ( QSize(100,75)); - QStringList backgrounds = Global::backgroundManager->imageNames(); - int index = 1; - for (QStringList::Iterator it = backgrounds.begin(); it != backgrounds.end(); ++it) { - QPixmap *preview = Global::backgroundManager->preview(*it); - if (preview) { - m_backgroundImagesMap.insert(index, *it); - m_backgroundImage->insertItem(index, *it); - m_backgroundImage->setItemData(index,*preview,Qt::DecorationRole); - if (m_basket->backgroundImageName() == *it) - m_backgroundImage->setCurrentIndex(index); - index++; - } - } -// m_backgroundImage->insertItem(i18n("Other..."), -1); - int BUTTON_MARGIN = kapp->style()->pixelMetric(QStyle::PM_ButtonMargin); - m_backgroundImage->setMaxVisibleItems(50/*75 * 6 / m_backgroundImage->sizeHint().height()*/); - m_backgroundImage->setMinimumHeight(75 + 2 * BUTTON_MARGIN); - - // Disposition: - m_disposition = new QGroupBox(i18n("Disposition"), page); - QButtonGroup* bg = new QButtonGroup(m_disposition); - - QVBoxLayout* dispLayout = new QVBoxLayout; - m_disposition->setLayout(dispLayout); - - columnForm = new QRadioButton(i18n("Col&umns:"), m_disposition); - dispLayout->addWidget(columnForm); - bg->addButton(columnForm); - - m_columnCount = new KIntNumInput(m_basket->columnsCount(), m_disposition); - m_columnCount->setRange(1, 20, /*step=*/1); - m_columnCount->setSliderEnabled(false); - m_columnCount->setValue(m_basket->columnsCount()); - connect( m_columnCount, SIGNAL(valueChanged(int)), this, SLOT(selectColumnsLayout()) ); - dispLayout->addWidget(m_columnCount); - - freeForm = new QRadioButton(i18n("&Free-form"), m_disposition); - dispLayout->addWidget(freeForm); - bg->addButton(freeForm); - - mindMap = new QRadioButton(i18n("&Mind map"), m_disposition); // TODO: "Learn more..." - dispLayout->addWidget(mindMap); - bg->addButton(mindMap); - - int height = qMax(mindMap->sizeHint().height(), m_columnCount->sizeHint().height()); // Make all radioButtons vertically equaly-spaced! - mindMap->setMinimumSize(mindMap->sizeHint().width(), height); // Because the m_columnCount can be heigher, and make radio1 and radio2 more spaced than radio2 and radio3. - if (!m_basket->isFreeLayout()) - columnForm->setChecked(true); - else if (m_basket->isMindMap()) - mindMap->setChecked(true); - else - freeForm->setChecked(true); - topLayout->addWidget(m_disposition); - - mindMap->hide(); - - // Keyboard Shortcut: - m_shortcutRole = new QGroupBox(i18n("&Keyboard Shortcut"), page); - m_shortcutRoleLayout = new QVBoxLayout; - m_shortcutRole->setLayout(m_shortcutRoleLayout); - QWidget *shortcutWidget = new QWidget; - m_shortcutRoleLayout->addWidget(shortcutWidget); - QHBoxLayout *shortcutLayout = new QHBoxLayout(shortcutWidget); - m_shortcut = new KShortcutWidget(shortcutWidget); - m_shortcut->setShortcut(m_basket->shortcut()); - HelpLabel *helpLabel = new HelpLabel(i18n("Learn some tips..."), i18n( - "Easily Remember your Shortcuts: " - "With the first option, giving the basket a shortcut of the form Alt+Letter will underline that letter in the basket tree. " - "For instance, if you are assigning the shortcut Alt+T to a basket named Tips, the basket will be displayed as Tips in the tree. " - "It helps you visualize the shortcuts to remember them more quickly." - "Local vs Global: " - "The first option allows to show the basket while the main window is active. " - "Global shortcuts are valid from anywhere, even if the window is hidden." - "Show vs Switch: " - "The last option makes this basket the current one without opening the main window. " - "It is useful in addition to the configurable global shortcuts, eg. to paste the clipboard or the selection into the current basket from anywhere."), - shortcutWidget); - shortcutLayout->addWidget(m_shortcut); - shortcutLayout->addStretch(); - shortcutLayout->addWidget(helpLabel); - connect( m_shortcut, SIGNAL(shortcutChanged(const KShortcut&)), this, SLOT(capturedShortcut(const KShortcut&)) ); - m_showButton = new QRadioButton(i18n("S&how this basket")); - m_globalButton = new QRadioButton(i18n("Show this basket (&global shortcut)")); - m_switchButton = new QRadioButton(i18n("S&witch to this basket (global shortcut)")); - m_shortcutRoleLayout->addWidget(m_showButton); - m_shortcutRoleLayout->addWidget(m_globalButton); - m_shortcutRoleLayout->addWidget(m_switchButton); - switch (m_basket->shortcutAction()){ - default: - case 0: m_showButton->setChecked(true); break; - case 1: m_globalButton->setChecked(true); break; - case 2: m_switchButton->setChecked(true); break; - } - topLayout->addWidget(m_shortcutRole); - - topLayout->addSpacing(marginHint()); - topLayout->addStretch(10); - - // Connect the Ok and Apply buttons to actually apply the changes - connect(this, SIGNAL(okClicked()), this, SLOT(applyChanges())); - connect(this, SIGNAL(applyClicked()), this, SLOT(applyChanges())); - - setMainWidget(page); + // Set up dialog options + setCaption(i18n("Basket Properties")); + setButtons(Ok | Apply | Cancel); + setDefaultButton(Ok); + setObjectName("BasketProperties"); + setModal(true); + showButtonSeparator(false); + + QWidget *page = new QWidget(this); + QVBoxLayout *topLayout = new QVBoxLayout(page); + + // Icon and Name: + QHBoxLayout *nameLayout = new QHBoxLayout(0); + int margin = marginHint() * 2 / 3; + nameLayout->setContentsMargins(margin, margin, margin, margin); + m_icon = new KIconButton(page); + m_icon->setIconType(KIconLoader::NoGroup, KIconLoader::Action); + m_icon->setIconSize(16); + m_icon->setIcon(m_basket->icon()); + int size = qMax(m_icon->sizeHint().width(), m_icon->sizeHint().height()); + m_icon->setFixedSize(size, size); // Make it square! + m_icon->setToolTip(i18n("Icon")); + m_name = new QLineEdit(m_basket->basketName(), page); + m_name->setMinimumWidth(m_name->fontMetrics().maxWidth()*20); + m_name->setToolTip(i18n("Name")); + nameLayout->addWidget(m_icon); + nameLayout->addWidget(m_name); + topLayout->addLayout(nameLayout); + + // Appearance: + QGroupBox *appearance = new QGroupBox(i18n("Appearance"), page); + QVBoxLayout* appearanceLayout = new QVBoxLayout; + appearance->setLayout(appearanceLayout); + QWidget *appearanceWidget = new QWidget; + appearanceLayout->addWidget(appearanceWidget); + + //QGridLayout *grid = new QGridLayout(appearanceWidget, /*nRows=*/3, /*nCols=*/2, /*margin=*/0, spacingHint()); + QGridLayout *grid = new QGridLayout(appearanceWidget); + + m_backgroundImage = new QComboBox(appearanceWidget); + m_backgroundColor = new KColorCombo2(m_basket->backgroundColorSetting(), palette().color(QPalette::Base), appearanceWidget); + m_textColor = new KColorCombo2(m_basket->textColorSetting(), palette().color(QPalette::Text), appearanceWidget); + + QLabel *label1 = new QLabel(appearanceWidget); + label1->setBuddy(m_backgroundImage); + label1->setText(i18n("Background &image:")); + + QLabel *label2 = new QLabel(appearanceWidget); + label2->setBuddy(m_backgroundColor); + label2->setText(i18n("&Background color:")); + + QLabel *label3 = new QLabel(appearanceWidget); + label3->setBuddy(m_textColor); + label3->setText(i18n("&Text color:")); + + grid->addWidget(label1, 0, 0, Qt::AlignVCenter); + grid->addWidget(label2, 1, 0, Qt::AlignVCenter); + grid->addWidget(label3, 2, 0, Qt::AlignVCenter); + grid->addWidget(m_backgroundImage, 0, 1, Qt::AlignVCenter); + grid->addWidget(m_backgroundColor, 1, 1, Qt::AlignVCenter); + grid->addWidget(m_textColor, 2, 1, Qt::AlignVCenter); + topLayout->addWidget(appearance); + + m_backgroundImage->addItem(i18n("(None)")); + m_backgroundImagesMap.insert(0, ""); + m_backgroundImage->setIconSize(QSize(100, 75)); + QStringList backgrounds = Global::backgroundManager->imageNames(); + int index = 1; + for (QStringList::Iterator it = backgrounds.begin(); it != backgrounds.end(); ++it) { + QPixmap *preview = Global::backgroundManager->preview(*it); + if (preview) { + m_backgroundImagesMap.insert(index, *it); + m_backgroundImage->insertItem(index, *it); + m_backgroundImage->setItemData(index, *preview, Qt::DecorationRole); + if (m_basket->backgroundImageName() == *it) + m_backgroundImage->setCurrentIndex(index); + index++; + } + } +// m_backgroundImage->insertItem(i18n("Other..."), -1); + int BUTTON_MARGIN = kapp->style()->pixelMetric(QStyle::PM_ButtonMargin); + m_backgroundImage->setMaxVisibleItems(50/*75 * 6 / m_backgroundImage->sizeHint().height()*/); + m_backgroundImage->setMinimumHeight(75 + 2 * BUTTON_MARGIN); + + // Disposition: + m_disposition = new QGroupBox(i18n("Disposition"), page); + QButtonGroup* bg = new QButtonGroup(m_disposition); + + QVBoxLayout* dispLayout = new QVBoxLayout; + m_disposition->setLayout(dispLayout); + + columnForm = new QRadioButton(i18n("Col&umns:"), m_disposition); + dispLayout->addWidget(columnForm); + bg->addButton(columnForm); + + m_columnCount = new KIntNumInput(m_basket->columnsCount(), m_disposition); + m_columnCount->setRange(1, 20, /*step=*/1); + m_columnCount->setSliderEnabled(false); + m_columnCount->setValue(m_basket->columnsCount()); + connect(m_columnCount, SIGNAL(valueChanged(int)), this, SLOT(selectColumnsLayout())); + dispLayout->addWidget(m_columnCount); + + freeForm = new QRadioButton(i18n("&Free-form"), m_disposition); + dispLayout->addWidget(freeForm); + bg->addButton(freeForm); + + mindMap = new QRadioButton(i18n("&Mind map"), m_disposition); // TODO: "Learn more..." + dispLayout->addWidget(mindMap); + bg->addButton(mindMap); + + int height = qMax(mindMap->sizeHint().height(), m_columnCount->sizeHint().height()); // Make all radioButtons vertically equaly-spaced! + mindMap->setMinimumSize(mindMap->sizeHint().width(), height); // Because the m_columnCount can be heigher, and make radio1 and radio2 more spaced than radio2 and radio3. + if (!m_basket->isFreeLayout()) + columnForm->setChecked(true); + else if (m_basket->isMindMap()) + mindMap->setChecked(true); + else + freeForm->setChecked(true); + topLayout->addWidget(m_disposition); + + mindMap->hide(); + + // Keyboard Shortcut: + m_shortcutRole = new QGroupBox(i18n("&Keyboard Shortcut"), page); + m_shortcutRoleLayout = new QVBoxLayout; + m_shortcutRole->setLayout(m_shortcutRoleLayout); + QWidget *shortcutWidget = new QWidget; + m_shortcutRoleLayout->addWidget(shortcutWidget); + QHBoxLayout *shortcutLayout = new QHBoxLayout(shortcutWidget); + m_shortcut = new KShortcutWidget(shortcutWidget); + m_shortcut->setShortcut(m_basket->shortcut()); + HelpLabel *helpLabel = new HelpLabel(i18n("Learn some tips..."), i18n( + "Easily Remember your Shortcuts: " + "With the first option, giving the basket a shortcut of the form Alt+Letter will underline that letter in the basket tree. " + "For instance, if you are assigning the shortcut Alt+T to a basket named Tips, the basket will be displayed as Tips in the tree. " + "It helps you visualize the shortcuts to remember them more quickly." + "Local vs Global: " + "The first option allows to show the basket while the main window is active. " + "Global shortcuts are valid from anywhere, even if the window is hidden." + "Show vs Switch: " + "The last option makes this basket the current one without opening the main window. " + "It is useful in addition to the configurable global shortcuts, eg. to paste the clipboard or the selection into the current basket from anywhere."), + shortcutWidget); + shortcutLayout->addWidget(m_shortcut); + shortcutLayout->addStretch(); + shortcutLayout->addWidget(helpLabel); + connect(m_shortcut, SIGNAL(shortcutChanged(const KShortcut&)), this, SLOT(capturedShortcut(const KShortcut&))); + m_showButton = new QRadioButton(i18n("S&how this basket")); + m_globalButton = new QRadioButton(i18n("Show this basket (&global shortcut)")); + m_switchButton = new QRadioButton(i18n("S&witch to this basket (global shortcut)")); + m_shortcutRoleLayout->addWidget(m_showButton); + m_shortcutRoleLayout->addWidget(m_globalButton); + m_shortcutRoleLayout->addWidget(m_switchButton); + switch (m_basket->shortcutAction()) { + default: + case 0: m_showButton->setChecked(true); break; + case 1: m_globalButton->setChecked(true); break; + case 2: m_switchButton->setChecked(true); break; + } + topLayout->addWidget(m_shortcutRole); + + topLayout->addSpacing(marginHint()); + topLayout->addStretch(10); + + // Connect the Ok and Apply buttons to actually apply the changes + connect(this, SIGNAL(okClicked()), this, SLOT(applyChanges())); + connect(this, SIGNAL(applyClicked()), this, SLOT(applyChanges())); + + setMainWidget(page); } BasketPropertiesDialog::~BasketPropertiesDialog() @@ -227,45 +227,41 @@ BasketPropertiesDialog::~BasketPropertiesDialog() void BasketPropertiesDialog::ensurePolished() { - ensurePolished(); - m_name->setFocus(); + ensurePolished(); + m_name->setFocus(); } void BasketPropertiesDialog::applyChanges() { - if (columnForm->isChecked()){ - m_basket->setDisposition(0, m_columnCount->value()); - } - else if(freeForm->isChecked()){ - m_basket->setDisposition(1, m_columnCount->value()); - } - else{ - m_basket->setDisposition(2, m_columnCount->value()); - } - - if (m_showButton->isChecked()){ - m_basket->setShortcut(m_shortcut->shortcut(), 0); - } - else if (m_globalButton->isChecked()){ - m_basket->setShortcut(m_shortcut->shortcut(), 1); - } - else if (m_switchButton->isChecked()){ - m_basket->setShortcut(m_shortcut->shortcut(), 2); - } - - // Should be called LAST, because it will emit the propertiesChanged() signal and the tree will be able to show the newly set Alt+Letter shortcut: - m_basket->setAppearance(m_icon->icon(), m_name->text(), m_backgroundImagesMap[m_backgroundImage->currentIndex()], m_backgroundColor->color(), m_textColor->color()); - m_basket->save(); + if (columnForm->isChecked()) { + m_basket->setDisposition(0, m_columnCount->value()); + } else if (freeForm->isChecked()) { + m_basket->setDisposition(1, m_columnCount->value()); + } else { + m_basket->setDisposition(2, m_columnCount->value()); + } + + if (m_showButton->isChecked()) { + m_basket->setShortcut(m_shortcut->shortcut(), 0); + } else if (m_globalButton->isChecked()) { + m_basket->setShortcut(m_shortcut->shortcut(), 1); + } else if (m_switchButton->isChecked()) { + m_basket->setShortcut(m_shortcut->shortcut(), 2); + } + + // Should be called LAST, because it will emit the propertiesChanged() signal and the tree will be able to show the newly set Alt+Letter shortcut: + m_basket->setAppearance(m_icon->icon(), m_name->text(), m_backgroundImagesMap[m_backgroundImage->currentIndex()], m_backgroundColor->color(), m_textColor->color()); + m_basket->save(); } void BasketPropertiesDialog::capturedShortcut(const KShortcut &shortcut) { - // TODO: Validate it! - m_shortcut->setShortcut(shortcut); + // TODO: Validate it! + m_shortcut->setShortcut(shortcut); } void BasketPropertiesDialog::selectColumnsLayout() { - columnForm->setChecked(true); + columnForm->setChecked(true); } src/basketproperties.cpp @@ -43,37 +43,37 @@ class KColorCombo2; */ class BasketPropertiesDialog : public KDialog { - Q_OBJECT - public: - BasketPropertiesDialog(Basket *basket, QWidget *parent = 0); - ~BasketPropertiesDialog(); - void ensurePolished(); + Q_OBJECT +public: + BasketPropertiesDialog(Basket *basket, QWidget *parent = 0); + ~BasketPropertiesDialog(); + void ensurePolished(); - public slots: - void applyChanges(); +public slots: + void applyChanges(); - protected slots: - void capturedShortcut(const KShortcut &shortcut); - void selectColumnsLayout(); - private: - Basket *m_basket; - KIconButton *m_icon; - QLineEdit *m_name; - QComboBox *m_backgroundImage; - KColorCombo2 *m_backgroundColor; - KColorCombo2 *m_textColor; - QGroupBox *m_disposition; - QRadioButton *columnForm; - QRadioButton *mindMap; - QRadioButton *freeForm; - KIntNumInput *m_columnCount; - KShortcutWidget *m_shortcut; - QGroupBox *m_shortcutRole; - QVBoxLayout *m_shortcutRoleLayout; - QRadioButton * m_showButton; - QRadioButton * m_globalButton; - QRadioButton * m_switchButton; - QMap<int, QString> m_backgroundImagesMap; +protected slots: + void capturedShortcut(const KShortcut &shortcut); + void selectColumnsLayout(); +private: + Basket *m_basket; + KIconButton *m_icon; + QLineEdit *m_name; + QComboBox *m_backgroundImage; + KColorCombo2 *m_backgroundColor; + KColorCombo2 *m_textColor; + QGroupBox *m_disposition; + QRadioButton *columnForm; + QRadioButton *mindMap; + QRadioButton *freeForm; + KIntNumInput *m_columnCount; + KShortcutWidget *m_shortcut; + QGroupBox *m_shortcutRole; + QVBoxLayout *m_shortcutRoleLayout; + QRadioButton * m_showButton; + QRadioButton * m_globalButton; + QRadioButton * m_switchButton; + QMap<int, QString> m_backgroundImagesMap; }; #endif // BASKETPROPERTIES_H src/basketproperties.h @@ -33,157 +33,156 @@ #include <qtooltip.h> BasketStatusBar::BasketStatusBar(KStatusBar *bar) - : m_bar(bar), m_extension(0), m_selectionStatus(0), m_lockStatus(0), m_basketStatus(0), m_savedStatus(0) + : m_bar(bar), m_extension(0), m_selectionStatus(0), m_lockStatus(0), m_basketStatus(0), m_savedStatus(0) { } BasketStatusBar::BasketStatusBar(KParts::StatusBarExtension *extension) - : m_bar(0), m_extension(extension), m_selectionStatus(0), m_lockStatus(0), m_basketStatus(0), m_savedStatus(0) + : m_bar(0), m_extension(extension), m_selectionStatus(0), m_lockStatus(0), m_basketStatus(0), m_savedStatus(0) { } BasketStatusBar::~BasketStatusBar() { - //delete m_extension; + //delete m_extension; } -KStatusBar *BasketStatusBar::statusBar () const +KStatusBar *BasketStatusBar::statusBar() const { - if(m_extension) - return m_extension->statusBar(); - else - return m_bar; + if (m_extension) + return m_extension->statusBar(); + else + return m_bar; } void BasketStatusBar::addWidget(QWidget * widget, int stretch, bool permanent) { - if(m_extension) - m_extension->addStatusBarItem(widget, stretch, permanent); - else if (permanent) - m_bar->addPermanentWidget(widget, stretch); - else - m_bar->addWidget(widget, stretch); + if (m_extension) + m_extension->addStatusBarItem(widget, stretch, permanent); + else if (permanent) + m_bar->addPermanentWidget(widget, stretch); + else + m_bar->addWidget(widget, stretch); } void BasketStatusBar::setupStatusBar() { - QWidget* parent = statusBar(); - QObjectList lst = parent->findChildren<QObject*>("KRSqueezedTextLabel"); - - //Tools::printChildren(parent); - if(lst.count() == 0) - { - m_basketStatus = new QLabel(parent); - QSizePolicy policy(QSizePolicy::Ignored, QSizePolicy::Ignored); - policy.setHorizontalStretch(0); - policy.setVerticalStretch(0); - policy.setHeightForWidth(false); - m_basketStatus->setSizePolicy(policy); - addWidget( m_basketStatus, 1, false); // Fit all extra space and is hiddable - } - else + QWidget* parent = statusBar(); + QObjectList lst = parent->findChildren<QObject*>("KRSqueezedTextLabel"); + + //Tools::printChildren(parent); + if (lst.count() == 0) { + m_basketStatus = new QLabel(parent); + QSizePolicy policy(QSizePolicy::Ignored, QSizePolicy::Ignored); + policy.setHorizontalStretch(0); + policy.setVerticalStretch(0); + policy.setHeightForWidth(false); + m_basketStatus->setSizePolicy(policy); + addWidget(m_basketStatus, 1, false); // Fit all extra space and is hiddable + } else m_basketStatus = static_cast<QLabel*>(lst.at(0)); lst.clear(); - m_selectionStatus = new QLabel(i18n("Loading..."), parent); - addWidget( m_selectionStatus, 0, true ); + m_selectionStatus = new QLabel(i18n("Loading..."), parent); + addWidget(m_selectionStatus, 0, true); - m_lockStatus = new QLabel(0/*this*/); - m_lockStatus->setMinimumSize(18, 18); - m_lockStatus->setAlignment(Qt::AlignCenter); -// addWidget( m_lockStatus, 0, true ); + m_lockStatus = new QLabel(0/*this*/); + m_lockStatus->setMinimumSize(18, 18); + m_lockStatus->setAlignment(Qt::AlignCenter); +// addWidget( m_lockStatus, 0, true ); m_lockStatus->installEventFilter(this); - m_savedStatusPixmap = SmallIcon("document-save"); - m_savedStatus = new QLabel(parent); - m_savedStatus->setPixmap(m_savedStatusPixmap); - m_savedStatus->setFixedSize(m_savedStatus->sizeHint()); - m_savedStatus->clear(); - //m_savedStatus->setPixmap(m_savedStatusIconSet.pixmap(QIconSet::Small, QIconSet::Disabled)); - //m_savedStatus->setEnabled(false); - addWidget( m_savedStatus, 0, true); - m_savedStatus->setToolTip("" + i18n("Shows if there are changes that have not yet been saved.")); + m_savedStatusPixmap = SmallIcon("document-save"); + m_savedStatus = new QLabel(parent); + m_savedStatus->setPixmap(m_savedStatusPixmap); + m_savedStatus->setFixedSize(m_savedStatus->sizeHint()); + m_savedStatus->clear(); + //m_savedStatus->setPixmap(m_savedStatusIconSet.pixmap(QIconSet::Small, QIconSet::Disabled)); + //m_savedStatus->setEnabled(false); + addWidget(m_savedStatus, 0, true); + m_savedStatus->setToolTip("" + i18n("Shows if there are changes that have not yet been saved.")); } void BasketStatusBar::postStatusbarMessage(const QString& text) { - if(statusBar()) - statusBar()->showMessage(text, 2000); + if (statusBar()) + statusBar()->showMessage(text, 2000); } void BasketStatusBar::setStatusText(const QString &txt) { - if(m_basketStatus && m_basketStatus->text() != txt) - m_basketStatus->setText(txt); + if (m_basketStatus && m_basketStatus->text() != txt) + m_basketStatus->setText(txt); } void BasketStatusBar::setStatusBarHint(const QString &hint) { - if (hint.isEmpty()) - updateStatusBarHint(); - else - setStatusText(hint); + if (hint.isEmpty()) + updateStatusBarHint(); + else + setStatusText(hint); } void BasketStatusBar::updateStatusBarHint() { - QString message = ""; + QString message = ""; - if (Global::bnpView->currentBasket()->isDuringDrag()) - message = i18n("Ctrl+drop: copy, Shift+drop: move, Shift+Ctrl+drop: link."); + if (Global::bnpView->currentBasket()->isDuringDrag()) + message = i18n("Ctrl+drop: copy, Shift+drop: move, Shift+Ctrl+drop: link."); // Too much noise information: -// else if (currentBasket()->inserterShown() && currentBasket()->inserterSplit() && !currentBasket()->inserterGroup()) -// message = i18n("Click to insert a note, right click for more options. Click on the right of the line to group instead of insert."); -// else if (currentBasket()->inserterShown() && currentBasket()->inserterSplit() && currentBasket()->inserterGroup()) -// message = i18n("Click to group a note, right click for more options. Click on the left of the line to group instead of insert."); - else if (Global::debugWindow) - message = "DEBUG: " + Global::bnpView->currentBasket()->folderName(); - - setStatusText(message); +// else if (currentBasket()->inserterShown() && currentBasket()->inserterSplit() && !currentBasket()->inserterGroup()) +// message = i18n("Click to insert a note, right click for more options. Click on the right of the line to group instead of insert."); +// else if (currentBasket()->inserterShown() && currentBasket()->inserterSplit() && currentBasket()->inserterGroup()) +// message = i18n("Click to group a note, right click for more options. Click on the left of the line to group instead of insert."); + else if (Global::debugWindow) + message = "DEBUG: " + Global::bnpView->currentBasket()->folderName(); + + setStatusText(message); } void BasketStatusBar::setLockStatus(bool isLocked) { - if(!m_lockStatus) - return; - - if (isLocked) { - m_lockStatus->setPixmap(SmallIcon("encrypted.png")); - m_lockStatus->setToolTip(i18n( - "This basket is locked. Click to unlock it.").replace(" ", " ") ); -// QToolTip::add(m_lockStatus, i18n("This basket is locked.\nClick to unlock it.")); - } else { - m_lockStatus->clear(); - m_lockStatus->setToolTip(i18n( - "This basket is unlocked. Click to lock it.").replace(" ", " ") ); -// QToolTip::add(m_lockStatus, i18n("This basket is unlocked.\nClick to lock it.")); - } + if (!m_lockStatus) + return; + + if (isLocked) { + m_lockStatus->setPixmap(SmallIcon("encrypted.png")); + m_lockStatus->setToolTip(i18n( + "This basket is locked. Click to unlock it.").replace(" ", " ")); +// QToolTip::add(m_lockStatus, i18n("This basket is locked.\nClick to unlock it.")); + } else { + m_lockStatus->clear(); + m_lockStatus->setToolTip(i18n( + "This basket is unlocked. Click to lock it.").replace(" ", " ")); +// QToolTip::add(m_lockStatus, i18n("This basket is unlocked.\nClick to lock it.")); + } } void BasketStatusBar::setSelectionStatus(const QString &s) { - if (m_selectionStatus) - m_selectionStatus->setText(s); + if (m_selectionStatus) + m_selectionStatus->setText(s); } void BasketStatusBar::setUnsavedStatus(bool isUnsaved) { - if (!m_savedStatus) - return; - - if (isUnsaved) { - if (m_savedStatus->pixmap() == 0) - m_savedStatus->setPixmap(m_savedStatusPixmap); - } else - m_savedStatus->clear(); + if (!m_savedStatus) + return; + + if (isUnsaved) { + if (m_savedStatus->pixmap() == 0) + m_savedStatus->setPixmap(m_savedStatusPixmap); + } else + m_savedStatus->clear(); } -bool BasketStatusBar::eventFilter(QObject * obj, QEvent * event) { +bool BasketStatusBar::eventFilter(QObject * obj, QEvent * event) +{ if (obj == m_lockStatus && event->type() == QEvent::MouseButtonPress) { QMouseEvent * mevent = dynamic_cast<QMouseEvent *>(event); - if(mevent->button() & Qt::LeftButton) { + if (mevent->button() & Qt::LeftButton) { Global::bnpView->lockBasket(); return true; } else { src/basketstatusbar.cpp @@ -28,44 +28,47 @@ #include "basket_export.h" class KStatusBar; -namespace KParts { class StatusBarExtension; } +namespace KParts +{ +class StatusBarExtension; +} class QWidget; class QLabel; /** - @author Sébastien Laoût <slaout@linux62.org> + @author Sébastien Laoût <slaout@linux62.org> */ class BASKET_EXPORT BasketStatusBar : public QObject { - Q_OBJECT - public: + Q_OBJECT +public: BasketStatusBar(KStatusBar *bar); - BasketStatusBar(KParts::StatusBarExtension *extension); - ~BasketStatusBar(); + BasketStatusBar(KParts::StatusBarExtension *extension); + ~BasketStatusBar(); - public slots: - /** GUI Main Window actions **/ - void setStatusBarHint(const QString &hint); /// << Set a specific message or update if hint is empty - void updateStatusBarHint(); /// << Display the current state message (dragging, editing) or reset the startsbar message - void postStatusbarMessage(const QString &text); - void setSelectionStatus(const QString &s); - void setLockStatus(bool isLocked); - void setupStatusBar(); - void setUnsavedStatus(bool isUnsaved); +public slots: + /** GUI Main Window actions **/ + void setStatusBarHint(const QString &hint); /// << Set a specific message or update if hint is empty + void updateStatusBarHint(); /// << Display the current state message (dragging, editing) or reset the startsbar message + void postStatusbarMessage(const QString &text); + void setSelectionStatus(const QString &s); + void setLockStatus(bool isLocked); + void setupStatusBar(); + void setUnsavedStatus(bool isUnsaved); - protected: - KStatusBar *statusBar () const; +protected: + KStatusBar *statusBar() const; void addWidget(QWidget * widget, int stretch = 0, bool permanent = false); void setStatusText(const QString &txt); bool eventFilter(QObject * obj, QEvent * event); - private: - KStatusBar *m_bar; - KParts::StatusBarExtension *m_extension; - QLabel *m_selectionStatus; - QLabel *m_lockStatus; - QLabel *m_basketStatus; - QLabel *m_savedStatus; - QPixmap m_savedStatusPixmap; +private: + KStatusBar *m_bar; + KParts::StatusBarExtension *m_extension; + QLabel *m_selectionStatus; + QLabel *m_lockStatus; + QLabel *m_basketStatus; + QLabel *m_savedStatus; + QPixmap m_savedStatusPixmap; }; #endif src/basketstatusbar.h @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ - /// NEW: +/// NEW: #include <QStackedWidget> #include <qregexp.h> @@ -95,40 +95,40 @@ const int BNPView::c_delayTooltipTime = 275; BNPView::BNPView(QWidget *parent, const char *name, KXMLGUIClient *aGUIClient, - KActionCollection *actionCollection, BasketStatusBar *bar) - : QSplitter(Qt::Horizontal, parent) - , m_actLockBasket(0) - , m_actPassBasket(0) - , m_loading(true) - , m_newBasketPopup(false) - , m_firstShow(true) - , m_regionGrabber(0) - , m_passiveDroppedSelection(0) - , m_passivePopup(0) - , m_actionCollection(actionCollection) - , m_guiClient(aGUIClient) - , m_statusbar(bar) - , m_tryHideTimer(0) - , m_hideTimer(0) + KActionCollection *actionCollection, BasketStatusBar *bar) + : QSplitter(Qt::Horizontal, parent) + , m_actLockBasket(0) + , m_actPassBasket(0) + , m_loading(true) + , m_newBasketPopup(false) + , m_firstShow(true) + , m_regionGrabber(0) + , m_passiveDroppedSelection(0) + , m_passivePopup(0) + , m_actionCollection(actionCollection) + , m_guiClient(aGUIClient) + , m_statusbar(bar) + , m_tryHideTimer(0) + , m_hideTimer(0) { - new BNPViewAdaptor(this); - QDBusConnection dbus = QDBusConnection::sessionBus(); - dbus.registerObject("/BNPView",this); + new BNPViewAdaptor(this); + QDBusConnection dbus = QDBusConnection::sessionBus(); + dbus.registerObject("/BNPView", this); - setObjectName(name); + setObjectName(name); - /* Settings */ - Settings::loadConfig(); + /* Settings */ + Settings::loadConfig(); - Global::bnpView = this; + Global::bnpView = this; - // Needed when loading the baskets: - Global::backgroundManager = new BackgroundManager(); + // Needed when loading the baskets: + Global::backgroundManager = new BackgroundManager(); - setupGlobalShortcuts(); - initialize(); - QTimer::singleShot(0, this, SLOT(lateInit())); + setupGlobalShortcuts(); + initialize(); + QTimer::singleShot(0, this, SLOT(lateInit())); } BNPView::~BNPView() @@ -138,155 +138,153 @@ BNPView::~BNPView() Settings::setBasketTreeWidth(treeWidth); if (currentBasket() && currentBasket()->isDuringEdit()) - currentBasket()->closeEditor(); + currentBasket()->closeEditor(); - Settings::saveConfig(); + Settings::saveConfig(); - Global::bnpView = 0; + Global::bnpView = 0; - delete Global::systemTray; - Global::systemTray = 0; - delete m_colorPicker; - delete m_statusbar; + delete Global::systemTray; + Global::systemTray = 0; + delete m_colorPicker; + delete m_statusbar; - NoteDrag::createAndEmptyCuttingTmpFolder(); // Clean the temporary folder we used + NoteDrag::createAndEmptyCuttingTmpFolder(); // Clean the temporary folder we used } void BNPView::lateInit() { -/* - InlineEditors* instance = InlineEditors::instance(); - - if(instance) - { - KToolBar* toolbar = instance->richTextToolBar(); - - if(toolbar) - toolbar->hide(); - } -*/ - if(!isPart()) - { - if (Settings::useSystray() && KCmdLineArgs::parsedArgs() && KCmdLineArgs::parsedArgs()->isSet("start-hidden")){ - if(Global::mainWindow()) Global::mainWindow()->hide(); - } - else if (Settings::useSystray() && kapp->isSessionRestored()){ - if(Global::mainWindow()) Global::mainWindow()->setShown(!Settings::startDocked()); - } - } - - // If the main window is hidden when session is saved, Container::queryClose() - // isn't called and the last value would be kept - Settings::setStartDocked(true); - Settings::saveConfig(); - - /* System tray icon */ - Global::systemTray = new SystemTray(Global::mainWindow()); - connect( Global::systemTray, SIGNAL(showPart()), this, SIGNAL(showPart()) ); - if (Settings::useSystray()) - Global::systemTray->show(); - - // Load baskets - DEBUG_WIN << "Baskets are loaded from " + Global::basketsFolder(); - - NoteDrag::createAndEmptyCuttingTmpFolder(); // If last exec hasn't done it: clean the temporary folder we will use - Tag::loadTags(); // Tags should be ready before loading baskets, but tags need the mainContainer to be ready to create KActions! - load(); - - // If no basket has been found, try to import from an older version, - if (topLevelItemCount() <= 0 ) { - QDir dir; - dir.mkdir(Global::basketsFolder()); - if (FormatImporter::shouldImportBaskets()) { - FormatImporter::importBaskets(); - load(); - } - if (topLevelItemCount() <= 0 ) { - // Create first basket: - BasketFactory::newBasket(/*icon=*/"", /*name=*/i18n("General"), /*backgroundImage=*/"", /*backgroundColor=*/QColor(), /*textColor=*/QColor(), /*templateName=*/"1column", /*createIn=*/0); - } - } - - // Load the Welcome Baskets if it is the First Time: - if (!Settings::welcomeBasketsAdded()) { - addWelcomeBaskets(); - Settings::setWelcomeBasketsAdded(true); - Settings::saveConfig(); - } - - m_tryHideTimer = new QTimer(this); - m_hideTimer = new QTimer(this); - connect( m_tryHideTimer, SIGNAL(timeout()), this, SLOT(timeoutTryHide()) ); - connect( m_hideTimer, SIGNAL(timeout()), this, SLOT(timeoutHide()) ); - - // Preload every baskets for instant filtering: -/*StopWatch::start(100); - QListViewItemIterator it(m_tree); - while (it.current()) { - BasketListViewItem *item = ((BasketListViewItem*)it.current()); - item->basket()->load(); - kapp->processEvents(); - ++it; - } -StopWatch::check(100);*/ + /* + InlineEditors* instance = InlineEditors::instance(); + + if(instance) + { + KToolBar* toolbar = instance->richTextToolBar(); + + if(toolbar) + toolbar->hide(); + } + */ + if (!isPart()) { + if (Settings::useSystray() && KCmdLineArgs::parsedArgs() && KCmdLineArgs::parsedArgs()->isSet("start-hidden")) { + if (Global::mainWindow()) Global::mainWindow()->hide(); + } else if (Settings::useSystray() && kapp->isSessionRestored()) { + if (Global::mainWindow()) Global::mainWindow()->setShown(!Settings::startDocked()); + } + } + + // If the main window is hidden when session is saved, Container::queryClose() + // isn't called and the last value would be kept + Settings::setStartDocked(true); + Settings::saveConfig(); + + /* System tray icon */ + Global::systemTray = new SystemTray(Global::mainWindow()); + connect(Global::systemTray, SIGNAL(showPart()), this, SIGNAL(showPart())); + if (Settings::useSystray()) + Global::systemTray->show(); + + // Load baskets + DEBUG_WIN << "Baskets are loaded from " + Global::basketsFolder(); + + NoteDrag::createAndEmptyCuttingTmpFolder(); // If last exec hasn't done it: clean the temporary folder we will use + Tag::loadTags(); // Tags should be ready before loading baskets, but tags need the mainContainer to be ready to create KActions! + load(); + + // If no basket has been found, try to import from an older version, + if (topLevelItemCount() <= 0) { + QDir dir; + dir.mkdir(Global::basketsFolder()); + if (FormatImporter::shouldImportBaskets()) { + FormatImporter::importBaskets(); + load(); + } + if (topLevelItemCount() <= 0) { + // Create first basket: + BasketFactory::newBasket(/*icon=*/"", /*name=*/i18n("General"), /*backgroundImage=*/"", /*backgroundColor=*/QColor(), /*textColor=*/QColor(), /*templateName=*/"1column", /*createIn=*/0); + } + } + + // Load the Welcome Baskets if it is the First Time: + if (!Settings::welcomeBasketsAdded()) { + addWelcomeBaskets(); + Settings::setWelcomeBasketsAdded(true); + Settings::saveConfig(); + } + + m_tryHideTimer = new QTimer(this); + m_hideTimer = new QTimer(this); + connect(m_tryHideTimer, SIGNAL(timeout()), this, SLOT(timeoutTryHide())); + connect(m_hideTimer, SIGNAL(timeout()), this, SLOT(timeoutHide())); + + // Preload every baskets for instant filtering: + /*StopWatch::start(100); + QListViewItemIterator it(m_tree); + while (it.current()) { + BasketListViewItem *item = ((BasketListViewItem*)it.current()); + item->basket()->load(); + kapp->processEvents(); + ++it; + } + StopWatch::check(100);*/ } void BNPView::addWelcomeBaskets() { - // Possible paths where to find the welcome basket archive, trying the translated one, and falling back to the English one: - QStringList possiblePaths; - if (QString(KGlobal::locale()->encoding()) == QString("UTF-8")) { // Welcome baskets are encoded in UTF-8. If the system is not, then use the English version: - possiblePaths.append(KGlobal::dirs()->findResource("data", "basket/welcome/Welcome_" + KGlobal::locale()->language() + ".baskets")); - possiblePaths.append(KGlobal::dirs()->findResource("data", "basket/welcome/Welcome_" + KGlobal::locale()->language().split("_")[0] + ".baskets")); - } - possiblePaths.append(KGlobal::dirs()->findResource("data", "basket/welcome/Welcome_en_US.baskets")); - - // Take the first EXISTING basket archive found: - QDir dir; - QString path; - for (QStringList::Iterator it = possiblePaths.begin(); it != possiblePaths.end(); ++it) { - if (dir.exists(*it)) { - path = *it; - break; - } - } - - // Extract: - if (!path.isEmpty()) - Archive::open(path); + // Possible paths where to find the welcome basket archive, trying the translated one, and falling back to the English one: + QStringList possiblePaths; + if (QString(KGlobal::locale()->encoding()) == QString("UTF-8")) { // Welcome baskets are encoded in UTF-8. If the system is not, then use the English version: + possiblePaths.append(KGlobal::dirs()->findResource("data", "basket/welcome/Welcome_" + KGlobal::locale()->language() + ".baskets")); + possiblePaths.append(KGlobal::dirs()->findResource("data", "basket/welcome/Welcome_" + KGlobal::locale()->language().split("_")[0] + ".baskets")); + } + possiblePaths.append(KGlobal::dirs()->findResource("data", "basket/welcome/Welcome_en_US.baskets")); + + // Take the first EXISTING basket archive found: + QDir dir; + QString path; + for (QStringList::Iterator it = possiblePaths.begin(); it != possiblePaths.end(); ++it) { + if (dir.exists(*it)) { + path = *it; + break; + } + } + + // Extract: + if (!path.isEmpty()) + Archive::open(path); } void BNPView::onFirstShow() { - // Don't enable LikeBack until bnpview is shown. This way it works better with kontact. - /* LikeBack */ -/* Global::likeBack = new LikeBack(LikeBack::AllButtons, / *showBarByDefault=* /true, Global::config(), Global::about()); - Global::likeBack->setServer("basket.linux62.org", "/likeback/send.php"); - Global:likeBack->setAcceptedLanguages(QStringList::split(";", "en;fr"), i18n("Only english and french languages are accepted.")); - if (isPart()) - Global::likeBack->disableBar(); // See BNPView::shown() and BNPView::hide(). -*/ + // Don't enable LikeBack until bnpview is shown. This way it works better with kontact. + /* LikeBack */ + /* Global::likeBack = new LikeBack(LikeBack::AllButtons, / *showBarByDefault=* /true, Global::config(), Global::about()); + Global::likeBack->setServer("basket.linux62.org", "/likeback/send.php"); + Global:likeBack->setAcceptedLanguages(QStringList::split(";", "en;fr"), i18n("Only english and french languages are accepted.")); + if (isPart()) + Global::likeBack->disableBar(); // See BNPView::shown() and BNPView::hide(). + */ - if (isPart()) - Global::likeBack->disableBar(); // See BNPView::shown() and BNPView::hide(). + if (isPart()) + Global::likeBack->disableBar(); // See BNPView::shown() and BNPView::hide(). -/* - LikeBack::init(Global::config(), Global::about(), LikeBack::AllButtons); - LikeBack::setServer("basket.linux62.org", "/likeback/send.php"); -// LikeBack::setServer("localhost", "/~seb/basket/likeback/send.php"); - LikeBack::setCustomLanguageMessage(i18n("Only english and french languages are accepted.")); -// LikeBack::setWindowNamesListing(LikeBack:: / *NoListing* / / *WarnUnnamedWindows* / AllWindows); -*/ + /* + LikeBack::init(Global::config(), Global::about(), LikeBack::AllButtons); + LikeBack::setServer("basket.linux62.org", "/likeback/send.php"); + // LikeBack::setServer("localhost", "/~seb/basket/likeback/send.php"); + LikeBack::setCustomLanguageMessage(i18n("Only english and french languages are accepted.")); + // LikeBack::setWindowNamesListing(LikeBack:: / *NoListing* / / *WarnUnnamedWindows* / AllWindows); + */ - // In late init, because we need kapp->mainWidget() to be set! - if (!isPart()) - connectTagsMenu(); + // In late init, because we need kapp->mainWidget() to be set! + if (!isPart()) + connectTagsMenu(); - m_statusbar->setupStatusBar(); + m_statusbar->setupStatusBar(); int treeWidth = Settings::basketTreeWidth(); if (treeWidth < 0) - treeWidth = m_tree->fontMetrics().maxWidth() * 11; + treeWidth = m_tree->fontMetrics().maxWidth() * 11; QList<int> splitterSizes; splitterSizes.append(treeWidth); setSizes(splitterSizes); @@ -299,186 +297,186 @@ void BNPView::setupGlobalShortcuts() // Ctrl+Shift+W only works when started standalone: QWidget *basketMainWindow = - qobject_cast<KMainWindow *>(Global::bnpView->parent()); + qobject_cast<KMainWindow *>(Global::bnpView->parent()); int modifier = Qt::CTRL + Qt::ALT + Qt::SHIFT; if (basketMainWindow) { - a = ac->addAction("global_show_hide_main_window", Global::systemTray, - SLOT(toggleActive())); - a->setText(i18n("Show/hide main window")); - a->setStatusTip( - i18n("Allows you to show main Window if it is hidden, and to hide " - "it if it is shown.") ); - a->setGlobalShortcut(KShortcut(modifier + Qt::Key_W)); + a = ac->addAction("global_show_hide_main_window", Global::systemTray, + SLOT(toggleActive())); + a->setText(i18n("Show/hide main window")); + a->setStatusTip( + i18n("Allows you to show main Window if it is hidden, and to hide " + "it if it is shown.")); + a->setGlobalShortcut(KShortcut(modifier + Qt::Key_W)); } a = ac->addAction("global_paste", Global::bnpView, - SLOT(globalPasteInCurrentBasket())); + SLOT(globalPasteInCurrentBasket())); a->setText(i18n("Paste clipboard contents in current basket")); a->setStatusTip( - i18n("Allows you to paste clipboard contents in the current basket " - "without having to open the main window.") ); + i18n("Allows you to paste clipboard contents in the current basket " + "without having to open the main window.")); a->setGlobalShortcut(KShortcut(modifier + Qt::Key_V)); a = ac->addAction("global_show_current_basket", Global::bnpView, - SLOT(showPassiveContentForced())); + SLOT(showPassiveContentForced())); a->setText(i18n("Show current basket name")); a->setStatusTip(i18n("Allows you to know basket is current without opening " - "the main window.")); + "the main window.")); a = ac->addAction("global_paste_selection", Global::bnpView, - SLOT(pasteSelInCurrentBasket())); + SLOT(pasteSelInCurrentBasket())); a->setText(i18n("Paste selection in current basket")); a->setStatusTip( - i18n("Allows you to paste clipboard selection in the current basket " - "without having to open the main window.") ); + i18n("Allows you to paste clipboard selection in the current basket " + "without having to open the main window.")); a->setGlobalShortcut(KShortcut(Qt::CTRL + Qt::ALT + Qt::SHIFT + Qt::Key_S)); a = ac->addAction("global_new_basket", Global::bnpView, - SLOT(askNewBasket())); + SLOT(askNewBasket())); a->setText(i18n("Create a new basket")); a->setStatusTip( - i18n("Allows you to create a new basket without having to open the " - "main window (you then can use the other global shortcuts to add " - "a note, paste clipboard or paste selection in this new basket).") - ); + i18n("Allows you to create a new basket without having to open the " + "main window (you then can use the other global shortcuts to add " + "a note, paste clipboard or paste selection in this new basket).") + ); a = ac->addAction("global_previous_basket", Global::bnpView, - SLOT(goToPreviousBasket())); + SLOT(goToPreviousBasket())); a->setText(i18n("Go to previous basket")); a->setStatusTip( - i18n("Allows you to change current basket to the previous one without " - "having to open the main window.") ); + i18n("Allows you to change current basket to the previous one without " + "having to open the main window.")); a = ac->addAction("global_next_basket", Global::bnpView, - SLOT(goToNextBasket())); + SLOT(goToNextBasket())); a->setText(i18n("Go to next basket")); a->setStatusTip(i18n("Allows you to change current basket to the next one " - "without having to open the main window.")); + "without having to open the main window.")); a = ac->addAction("global_note_add_html", Global::bnpView, - SLOT(addNoteHtml())); + SLOT(addNoteHtml())); a->setText(i18n("Insert text note")); a->setStatusTip( - i18n("Add a text note to the current basket without having to open " - "the main window.") ); + i18n("Add a text note to the current basket without having to open " + "the main window.")); a->setGlobalShortcut(KShortcut(modifier + Qt::Key_T)); a = ac->addAction("global_note_add_image", Global::bnpView, - SLOT(addNoteImage())); + SLOT(addNoteImage())); a->setText(i18n("Insert image note")); a->setStatusTip( - i18n("Add an image note to the current basket without having to open " - "the main window.") ); + i18n("Add an image note to the current basket without having to open " + "the main window.")); a = ac->addAction("global_note_add_link", Global::bnpView, - SLOT(addNoteLink())); + SLOT(addNoteLink())); a->setText(i18n("Insert link note")); a->setStatusTip( - i18n("Add a link note to the current basket without having " - "to open the main window.")); + i18n("Add a link note to the current basket without having " + "to open the main window.")); a = ac->addAction("global_note_add_color", Global::bnpView, - SLOT(addNoteColor())); + SLOT(addNoteColor())); a->setText(i18n("Insert color note")); a->setStatusTip( - i18n("Add a color note to the current basket without having to open " - "the main window.")); + i18n("Add a color note to the current basket without having to open " + "the main window.")); a = ac->addAction("global_note_pick_color", Global::bnpView, - SLOT(slotColorFromScreenGlobal())); + SLOT(slotColorFromScreenGlobal())); a->setText(i18n("Pick color from screen")); a->setStatusTip( - i18n("Add a color note picked from one pixel on screen to the current " - "basket without " "having to open the main window.") ); + i18n("Add a color note picked from one pixel on screen to the current " + "basket without " "having to open the main window.")); a = ac->addAction("global_note_grab_screenshot", Global::bnpView, - SLOT(grabScreenshotGlobal())); + SLOT(grabScreenshotGlobal())); a->setText(i18n("Grab screen zone")); a->setStatusTip( - i18n("Grab a screen zone as an image in the current basket without " - "having to open the main window.")); + i18n("Grab a screen zone as an image in the current basket without " + "having to open the main window.")); #if 0 a = ac->addAction("global_note_add_text", Global::bnpView, - SLOT(addNoteText())); + SLOT(addNoteText())); a->setText(i18n("Insert plain text note")); a->setStatusTip( - i18n("Add a plain text note to the current basket without having to " - "open the main window.")); + i18n("Add a plain text note to the current basket without having to " + "open the main window.")); #endif } void BNPView::initialize() { - /// Configure the List View Columns: - m_tree = new BasketTreeListView(this); - m_tree->setHeaderLabel(i18n("Baskets")); - m_tree->setSortingEnabled(false/*Disabled*/); - m_tree->setRootIsDecorated(true); - m_tree->setLineWidth(1); - m_tree->setMidLineWidth(0); - m_tree->setFocusPolicy(Qt::NoFocus); + /// Configure the List View Columns: + m_tree = new BasketTreeListView(this); + m_tree->setHeaderLabel(i18n("Baskets")); + m_tree->setSortingEnabled(false/*Disabled*/); + m_tree->setRootIsDecorated(true); + m_tree->setLineWidth(1); + m_tree->setMidLineWidth(0); + m_tree->setFocusPolicy(Qt::NoFocus); - /// Configure the List View Drag and Drop: - m_tree->setDragEnabled(true); - m_tree->setAcceptDrops(true); + /// Configure the List View Drag and Drop: + m_tree->setDragEnabled(true); + m_tree->setAcceptDrops(true); - /// Configure the Splitter: - m_stack = new QStackedWidget(this); + /// Configure the Splitter: + m_stack = new QStackedWidget(this); - setOpaqueResize(true); + setOpaqueResize(true); - setCollapsible(indexOf(m_tree), true); - setCollapsible(indexOf(m_stack), false); - setStretchFactor(indexOf(m_tree), 0); - setStretchFactor(indexOf(m_stack), 1); + setCollapsible(indexOf(m_tree), true); + setCollapsible(indexOf(m_stack), false); + setStretchFactor(indexOf(m_tree), 0); + setStretchFactor(indexOf(m_stack), 1); - /// Configure the List View Signals: - connect( m_tree, SIGNAL(itemActivated(QTreeWidgetItem*, int)), this, SLOT(slotPressed(QTreeWidgetItem*, int)) ); - connect( m_tree, SIGNAL(itemPressed(QTreeWidgetItem*, int)), this, SLOT(slotPressed(QTreeWidgetItem*, int)) ); - connect( m_tree, SIGNAL(itemClicked(QTreeWidgetItem*, int)), this, SLOT(slotPressed(QTreeWidgetItem*, int)) ); + /// Configure the List View Signals: + connect(m_tree, SIGNAL(itemActivated(QTreeWidgetItem*, int)), this, SLOT(slotPressed(QTreeWidgetItem*, int))); + connect(m_tree, SIGNAL(itemPressed(QTreeWidgetItem*, int)), this, SLOT(slotPressed(QTreeWidgetItem*, int))); + connect(m_tree, SIGNAL(itemClicked(QTreeWidgetItem*, int)), this, SLOT(slotPressed(QTreeWidgetItem*, int))); - connect( m_tree, SIGNAL(itemExpanded(QTreeWidgetItem*)), this, SLOT(needSave(QTreeWidgetItem*)) ); - connect( m_tree, SIGNAL(itemCollapsed(QTreeWidgetItem*)), this, SLOT(needSave(QTreeWidgetItem*)) ); - connect( m_tree, SIGNAL(contextMenuRequested(const QPoint&)), this, SLOT(slotContextMenu(const QPoint &)) ); - connect( m_tree, SIGNAL(mouseButtonPressed(int, QTreeWidgetItem*, const QPoint&, int)), this, - SLOT(slotMouseButtonPressed(int, QTreeWidgetItem*, const QPoint&, int)) ); - connect( m_tree, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)), this, SLOT(slotShowProperties(QTreeWidgetItem*)) ); + connect(m_tree, SIGNAL(itemExpanded(QTreeWidgetItem*)), this, SLOT(needSave(QTreeWidgetItem*))); + connect(m_tree, SIGNAL(itemCollapsed(QTreeWidgetItem*)), this, SLOT(needSave(QTreeWidgetItem*))); + connect(m_tree, SIGNAL(contextMenuRequested(const QPoint&)), this, SLOT(slotContextMenu(const QPoint &))); + connect(m_tree, SIGNAL(mouseButtonPressed(int, QTreeWidgetItem*, const QPoint&, int)), this, + SLOT(slotMouseButtonPressed(int, QTreeWidgetItem*, const QPoint&, int))); + connect(m_tree, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)), this, SLOT(slotShowProperties(QTreeWidgetItem*))); - connect( m_tree, SIGNAL(itemExpanded(QTreeWidgetItem*)), this, SIGNAL(basketChanged()) ); - connect( m_tree, SIGNAL(itemCollapsed(QTreeWidgetItem*)), this, SIGNAL(basketChanged()) ); - connect( this, SIGNAL(basketNumberChanged(int)), this, SIGNAL(basketChanged()) ); + connect(m_tree, SIGNAL(itemExpanded(QTreeWidgetItem*)), this, SIGNAL(basketChanged())); + connect(m_tree, SIGNAL(itemCollapsed(QTreeWidgetItem*)), this, SIGNAL(basketChanged())); + connect(this, SIGNAL(basketNumberChanged(int)), this, SIGNAL(basketChanged())); - connect( this, SIGNAL(basketNumberChanged(int)), this, SLOT(slotBasketNumberChanged(int)) ); - connect( this, SIGNAL(basketChanged()), this, SLOT(slotBasketChanged()) ); + connect(this, SIGNAL(basketNumberChanged(int)), this, SLOT(slotBasketNumberChanged(int))); + connect(this, SIGNAL(basketChanged()), this, SLOT(slotBasketChanged())); - /* LikeBack */ - Global::likeBack = new LikeBack(LikeBack::AllButtons, /*showBarByDefault=*/false, Global::config(), Global::about()); - Global::likeBack->setServer("basket.linux62.org", "/likeback/send.php"); + /* LikeBack */ + Global::likeBack = new LikeBack(LikeBack::AllButtons, /*showBarByDefault=*/false, Global::config(), Global::about()); + Global::likeBack->setServer("basket.linux62.org", "/likeback/send.php"); // There are too much comments, and people reading comments are more and more international, so we accept only English: -// Global::likeBack->setAcceptedLanguages(QStringList::split(";", "en;fr"), i18n("Please write in English or French.")); +// Global::likeBack->setAcceptedLanguages(QStringList::split(";", "en;fr"), i18n("Please write in English or French.")); -// if (isPart()) -// Global::likeBack->disableBar(); // See BNPView::shown() and BNPView::hide(). +// if (isPart()) +// Global::likeBack->disableBar(); // See BNPView::shown() and BNPView::hide(). - Global::likeBack->sendACommentAction(actionCollection()); // Just create it! - setupActions(); + Global::likeBack->sendACommentAction(actionCollection()); // Just create it! + setupActions(); - /// What's This Help for the tree: - m_tree->setWhatsThis(i18n( - "<h2>Basket Tree</h2>" - "Here is the list of your baskets. " - "You can organize your data by putting them in different baskets. " - "You can group baskets by subject by creating new baskets inside others. " - "You can browse between them by clicking a basket to open it, or reorganize them using drag and drop.")); + /// What's This Help for the tree: + m_tree->setWhatsThis(i18n( + "<h2>Basket Tree</h2>" + "Here is the list of your baskets. " + "You can organize your data by putting them in different baskets. " + "You can group baskets by subject by creating new baskets inside others. " + "You can browse between them by clicking a basket to open it, or reorganize them using drag and drop.")); - setTreePlacement(Settings::treeOnLeft()); + setTreePlacement(Settings::treeOnLeft()); } void BNPView::setupActions() @@ -487,14 +485,14 @@ void BNPView::setupActions() KActionCollection *ac = actionCollection(); a = ac->addAction("basket_export_basket_archive", this, - SLOT(saveAsArchive())); + SLOT(saveAsArchive())); a->setText(i18n("&Basket Archive...")); a->setIcon(KIcon("baskets")); a->setShortcut(0); m_actSaveAsArchive = a; a = ac->addAction("basket_import_basket_archive", this, - SLOT(openArchive())); + SLOT(openArchive())); a->setText(i18n("&Basket Archive...")); a->setIcon(KIcon("baskets")); a->setShortcut(0); @@ -534,7 +532,7 @@ void BNPView::setupActions() a->setShortcut(0); a = ac->addAction("basket_import_sticky_notes", this, - SLOT(importStickyNotes())); + SLOT(importStickyNotes())); a->setText(i18n("&Sticky Notes")); a->setIcon(KIcon("gnome")); a->setShortcut(0); @@ -565,23 +563,23 @@ void BNPView::setupActions() m_actCopyNote = ac->addAction(KStandardAction::Copy, this, SLOT(copyNote())); m_actSelectAll = ac->addAction(KStandardAction::SelectAll, this, - SLOT(slotSelectAll())); - m_actSelectAll->setStatusTip( i18n( "Selects all notes" ) ); + SLOT(slotSelectAll())); + m_actSelectAll->setStatusTip(i18n("Selects all notes")); - a = ac->addAction("edit_unselect_all", this, SLOT( slotUnselectAll() )); - a->setText(i18n( "U&nselect All" )); + a = ac->addAction("edit_unselect_all", this, SLOT(slotUnselectAll())); + a->setText(i18n("U&nselect All")); m_actUnselectAll = a; - m_actUnselectAll->setStatusTip( i18n( "Unselects all selected notes" ) ); + m_actUnselectAll->setStatusTip(i18n("Unselects all selected notes")); a = ac->addAction("edit_invert_selection", this, - SLOT( slotInvertSelection() )); - a->setText(i18n( "&Invert Selection" )); - a->setShortcut(Qt::CTRL+Qt::Key_Asterisk); + SLOT(slotInvertSelection())); + a->setText(i18n("&Invert Selection")); + a->setShortcut(Qt::CTRL + Qt::Key_Asterisk); m_actInvertSelection = a; m_actInvertSelection->setStatusTip( - i18n( "Inverts the current selection of notes" ) - ); + i18n("Inverts the current selection of notes") + ); a = ac->addAction("note_edit", this, SLOT(editNote())); a->setText(i18nc("Verb; not Menu", "&Edit...")); @@ -590,7 +588,7 @@ void BNPView::setupActions() m_actEditNote = a; m_actOpenNote = ac->addAction(KStandardAction::Open, "note_open", - this, SLOT(openNote())); + this, SLOT(openNote())); m_actOpenNote->setIcon(KIcon("window-new")); m_actOpenNote->setText(i18n("&Open")); m_actOpenNote->setShortcut(KShortcut("F9")); @@ -601,8 +599,8 @@ void BNPView::setupActions() m_actOpenNoteWith = a; m_actSaveNoteAs = ac->addAction(KStandardAction::SaveAs, - "note_save_to_file", - this, SLOT(saveNoteAs())); + "note_save_to_file", + this, SLOT(saveNoteAs())); m_actSaveNoteAs->setText(i18n("&Save to File...")); m_actSaveNoteAs->setShortcut(KShortcut("F10")); @@ -642,14 +640,14 @@ void BNPView::setupActions() m_actMoveOnBottom = a; m_actPaste = ac->addAction(KStandardAction::Paste, this, - SLOT(pasteInCurrentBasket())); + SLOT(pasteInCurrentBasket())); /** Insert : **************************************************************/ QSignalMapper *insertEmptyMapper = new QSignalMapper(this); QSignalMapper *insertWizardMapper = new QSignalMapper(this); - connect( insertEmptyMapper, SIGNAL(mapped(int)), this, SLOT(insertEmpty(int)) ); - connect( insertWizardMapper, SIGNAL(mapped(int)), this, SLOT(insertWizard(int)) ); + connect(insertEmptyMapper, SIGNAL(mapped(int)), this, SLOT(insertEmpty(int))); + connect(insertWizardMapper, SIGNAL(mapped(int)), this, SLOT(insertWizard(int))); #if 0 a = ac->addAction("insert_text"); @@ -701,25 +699,25 @@ void BNPView::setupActions() a->setIcon(KIcon("document-import")); m_actLoadFile = a; -// connect( m_actInsertText, SIGNAL(activated()), insertEmptyMapper, SLOT(map()) ); - connect( m_actInsertHtml, SIGNAL(activated()), insertEmptyMapper, SLOT(map()) ); - connect( m_actInsertImage, SIGNAL(activated()), insertEmptyMapper, SLOT(map()) ); - connect( m_actInsertLink, SIGNAL(activated()), insertEmptyMapper, SLOT(map()) ); - connect( m_actInsertColor, SIGNAL(activated()), insertEmptyMapper, SLOT(map()) ); - connect( m_actInsertLauncher, SIGNAL(activated()), insertEmptyMapper, SLOT(map()) ); -// insertEmptyMapper->setMapping(m_actInsertText, NoteType::Text ); - insertEmptyMapper->setMapping(m_actInsertHtml, NoteType::Html ); - insertEmptyMapper->setMapping(m_actInsertImage, NoteType::Image ); - insertEmptyMapper->setMapping(m_actInsertLink, NoteType::Link ); - insertEmptyMapper->setMapping(m_actInsertColor, NoteType::Color ); +// connect( m_actInsertText, SIGNAL(activated()), insertEmptyMapper, SLOT(map()) ); + connect(m_actInsertHtml, SIGNAL(activated()), insertEmptyMapper, SLOT(map())); + connect(m_actInsertImage, SIGNAL(activated()), insertEmptyMapper, SLOT(map())); + connect(m_actInsertLink, SIGNAL(activated()), insertEmptyMapper, SLOT(map())); + connect(m_actInsertColor, SIGNAL(activated()), insertEmptyMapper, SLOT(map())); + connect(m_actInsertLauncher, SIGNAL(activated()), insertEmptyMapper, SLOT(map())); +// insertEmptyMapper->setMapping(m_actInsertText, NoteType::Text ); + insertEmptyMapper->setMapping(m_actInsertHtml, NoteType::Html); + insertEmptyMapper->setMapping(m_actInsertImage, NoteType::Image); + insertEmptyMapper->setMapping(m_actInsertLink, NoteType::Link); + insertEmptyMapper->setMapping(m_actInsertColor, NoteType::Color); insertEmptyMapper->setMapping(m_actInsertLauncher, NoteType::Launcher); - connect( m_actImportKMenu, SIGNAL(activated()), insertWizardMapper, SLOT(map()) ); - connect( m_actImportIcon, SIGNAL(activated()), insertWizardMapper, SLOT(map()) ); - connect( m_actLoadFile, SIGNAL(activated()), insertWizardMapper, SLOT(map()) ); - insertWizardMapper->setMapping(m_actImportKMenu, 1 ); - insertWizardMapper->setMapping(m_actImportIcon, 2 ); - insertWizardMapper->setMapping(m_actLoadFile, 3 ); + connect(m_actImportKMenu, SIGNAL(activated()), insertWizardMapper, SLOT(map())); + connect(m_actImportIcon, SIGNAL(activated()), insertWizardMapper, SLOT(map())); + connect(m_actLoadFile, SIGNAL(activated()), insertWizardMapper, SLOT(map())); + insertWizardMapper->setMapping(m_actImportKMenu, 1); + insertWizardMapper->setMapping(m_actImportIcon, 2); + insertWizardMapper->setMapping(m_actLoadFile, 3); m_colorPicker = new DesktopColorPicker(); @@ -729,9 +727,9 @@ void BNPView::setupActions() m_actColorPicker = a; connect(m_colorPicker, SIGNAL(pickedColor(const QColor&)), - this, SLOT(colorPicked(const QColor&))); + this, SLOT(colorPicked(const QColor&))); connect(m_colorPicker, SIGNAL(canceledPick()), - this, SLOT(colorPickingCanceled())); + this, SLOT(colorPickingCanceled())); a = ac->addAction("insert_screen_capture", this, SLOT(grabScreenshot())); a->setText(i18n("Grab Screen &Zone")); @@ -741,17 +739,17 @@ void BNPView::setupActions() //connect( m_actGrabScreenshot, SIGNAL(regionGrabbed(const QPixmap&)), this, SLOT(screenshotGrabbed(const QPixmap&)) ); //connect( m_colorPicker, SIGNAL(canceledPick()), this, SLOT(colorPickingCanceled()) ); -// m_insertActions.append( m_actInsertText ); - m_insertActions.append( m_actInsertHtml ); - m_insertActions.append( m_actInsertLink ); - m_insertActions.append( m_actInsertImage ); - m_insertActions.append( m_actInsertColor ); - m_insertActions.append( m_actImportKMenu ); - m_insertActions.append( m_actInsertLauncher ); - m_insertActions.append( m_actImportIcon ); - m_insertActions.append( m_actLoadFile ); - m_insertActions.append( m_actColorPicker ); - m_insertActions.append( m_actGrabScreenshot ); +// m_insertActions.append( m_actInsertText ); + m_insertActions.append(m_actInsertHtml); + m_insertActions.append(m_actInsertLink); + m_insertActions.append(m_actInsertImage); + m_insertActions.append(m_actInsertColor); + m_insertActions.append(m_actImportKMenu); + m_insertActions.append(m_actInsertLauncher); + m_insertActions.append(m_actImportIcon); + m_insertActions.append(m_actLoadFile); + m_insertActions.append(m_actColorPicker); + m_insertActions.append(m_actGrabScreenshot); /** Basket : **************************************************************/ @@ -760,9 +758,9 @@ void BNPView::setupActions() bool runInsideKontact = true; QWidget *parentWidget = (QWidget*) parent(); while (parentWidget) { - if (parentWidget->inherits("MainWindow")) - runInsideKontact = false; - parentWidget = (QWidget*) parentWidget->parent(); + if (parentWidget->inherits("MainWindow")) + runInsideKontact = false; + parentWidget = (QWidget*) parentWidget->parent(); } // Use the "basket" incon in Kontact so it is consistent with the Kontact "New..." icon @@ -789,7 +787,7 @@ void BNPView::setupActions() newBasketMenu->addAction(actNewBasket); newBasketMenu->addAction(actNewSubBasket); newBasketMenu->addAction(actNewSiblingBasket); - connect( newBasketMenu, SIGNAL(activated()), this, SLOT(askNewBasket()) ); + connect(newBasketMenu, SIGNAL(activated()), this, SLOT(askNewBasket())); a = ac->addAction("basket_properties", this, SLOT(propBasket())); a->setText(i18n("&Properties...")); @@ -829,7 +827,7 @@ void BNPView::setupActions() m_actShowFilter = toggleAct; connect(m_actShowFilter, SIGNAL(toggled(bool)), - this, SLOT(showHideFilterBar(bool)) ); + this, SLOT(showHideFilterBar(bool))); toggleAct = new KToggleAction(ac); ac->addAction("edit_filter_all_baskets", toggleAct); @@ -839,10 +837,10 @@ void BNPView::setupActions() m_actFilterAllBaskets = toggleAct; connect(m_actFilterAllBaskets, SIGNAL(toggled(bool)), - this, SLOT(toggleFilterAllBaskets(bool))); + this, SLOT(toggleFilterAllBaskets(bool))); - a = ac->addAction("edit_filter_reset", this, SLOT( slotResetFilter() )); - a->setText(i18n( "&Reset Filter" )); + a = ac->addAction("edit_filter_reset", this, SLOT(slotResetFilter())); + a->setText(i18n("&Reset Filter")); a->setIcon(KIcon("edit-clear-locationbar-rtl")); a->setShortcut(KShortcut("Ctrl+R")); m_actResetFilter = a; @@ -850,31 +848,31 @@ void BNPView::setupActions() /** Go : ******************************************************************/ a = ac->addAction("go_basket_previous", this, SLOT(goToPreviousBasket())); - a->setText(i18n( "&Previous Basket" )); + a->setText(i18n("&Previous Basket")); a->setIcon(KIcon("go-up")); a->setShortcut(KShortcut("Alt+Up")); m_actPreviousBasket = a; a = ac->addAction("go_basket_next", this, SLOT(goToNextBasket())); - a->setText(i18n( "&Next Basket" )); + a->setText(i18n("&Next Basket")); a->setIcon(KIcon("go-down")); a->setShortcut(KShortcut("Alt+Down")); m_actNextBasket = a; a = ac->addAction("go_basket_fold", this, SLOT(foldBasket())); - a->setText(i18n( "&Fold Basket" )); + a->setText(i18n("&Fold Basket")); a->setIcon(KIcon("go-previous")); a->setShortcut(KShortcut("Alt+Left")); m_actFoldBasket = a; a = ac->addAction("go_basket_expand", this, SLOT(expandBasket())); - a->setText(i18n( "&Expand Basket" )); + a->setText(i18n("&Expand Basket")); a->setIcon(KIcon("go-next")); a->setShortcut(KShortcut("Alt+Right")); m_actExpandBasket = a; #if 0 - // FOR_BETA_PURPOSE: + // FOR_BETA_PURPOSE: a = ac->addAction("beta_convert_texts", this, SLOT(convertTexts())); a->setText(i18n("Convert text notes to rich text notes")); a->setIcon(KIcon("run-build-file")); @@ -890,405 +888,404 @@ void BNPView::setupActions() BasketListViewItem* BNPView::topLevelItem(int i) { - return (BasketListViewItem *)m_tree->topLevelItem(i); + return (BasketListViewItem *)m_tree->topLevelItem(i); } void BNPView::slotShowProperties(QTreeWidgetItem *item) { - if (item) - propBasket(); + if (item) + propBasket(); } void BNPView::slotMouseButtonPressed(int button, QTreeWidgetItem *item, const QPoint &/*pos*/, int /*column*/) { - if (item && (button & Qt::MidButton)) { - // TODO: Paste into ((BasketListViewItem*)listViewItem)->basket() - } + if (item && (button & Qt::MidButton)) { + // TODO: Paste into ((BasketListViewItem*)listViewItem)->basket() + } } void BNPView::slotContextMenu(const QPoint &pos) { - QTreeWidgetItem *item; - item = m_tree->itemAt(pos); - QString menuName; - if (item) { - Basket* basket = ((BasketListViewItem*)item)->basket(); - - setCurrentBasket(basket); - menuName = "basket_popup"; - } else { - menuName = "tab_bar_popup"; - /* - * "File -> New" create a new basket with the same parent basket as the the current one. - * But when invoked when right-clicking the empty area at the bottom of the basket tree, - * it is obvious the user want to create a new basket at the bottom of the tree (with no parent). - * So we set a temporary variable during the time the popup menu is shown, - * so the slot askNewBasket() will do the right thing: - */ - setNewBasketPopup(); - } - - KMenu *menu = popupMenu(menuName); - connect( menu, SIGNAL(aboutToHide()), this, SLOT(aboutToHideNewBasketPopup()) ); - menu->exec(m_tree->mapToGlobal(pos)); + QTreeWidgetItem *item; + item = m_tree->itemAt(pos); + QString menuName; + if (item) { + Basket* basket = ((BasketListViewItem*)item)->basket(); + + setCurrentBasket(basket); + menuName = "basket_popup"; + } else { + menuName = "tab_bar_popup"; + /* + * "File -> New" create a new basket with the same parent basket as the the current one. + * But when invoked when right-clicking the empty area at the bottom of the basket tree, + * it is obvious the user want to create a new basket at the bottom of the tree (with no parent). + * So we set a temporary variable during the time the popup menu is shown, + * so the slot askNewBasket() will do the right thing: + */ + setNewBasketPopup(); + } + + KMenu *menu = popupMenu(menuName); + connect(menu, SIGNAL(aboutToHide()), this, SLOT(aboutToHideNewBasketPopup())); + menu->exec(m_tree->mapToGlobal(pos)); } void BNPView::save() { - DEBUG_WIN << "Basket Tree: Saving..."; + DEBUG_WIN << "Basket Tree: Saving..."; - // Create Document: - QDomDocument document("basketTree"); - QDomElement root = document.createElement("basketTree"); - document.appendChild(root); + // Create Document: + QDomDocument document("basketTree"); + QDomElement root = document.createElement("basketTree"); + document.appendChild(root); - // Save Basket Tree: - save(m_tree, 0, document, root); + // Save Basket Tree: + save(m_tree, 0, document, root); - // Write to Disk: - Basket::safelySaveToFile(Global::basketsFolder() + "baskets.xml", "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + document.toString()); -// QFile file(Global::basketsFolder() + "baskets.xml"); -// if (file.open(QIODevice::WriteOnly)) { -// QTextStream stream(&file); -// stream.setEncoding(QTextStream::UnicodeUTF8); -// QString xml = document.toString(); -// stream << "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"; -// stream << xml; -// file.close(); -// } + // Write to Disk: + Basket::safelySaveToFile(Global::basketsFolder() + "baskets.xml", "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + document.toString()); +// QFile file(Global::basketsFolder() + "baskets.xml"); +// if (file.open(QIODevice::WriteOnly)) { +// QTextStream stream(&file); +// stream.setEncoding(QTextStream::UnicodeUTF8); +// QString xml = document.toString(); +// stream << "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"; +// stream << xml; +// file.close(); +// } } void BNPView::save(QTreeWidget *listView, QTreeWidgetItem* item, QDomDocument &document, QDomElement &parentElement) { - if (item == 0){ - // For each basket: - for (int i=0; i< listView->topLevelItemCount(); i++){ - item = listView->topLevelItem(i); - Basket* basket = ((BasketListViewItem *)item)->basket(); - - QDomElement basketElement = document.createElement("basket"); - parentElement.appendChild(basketElement); - - // Save Attributes: - basketElement.setAttribute("folderName", basket->folderName()); - if (item->childCount() >=0 ) // If it can be expanded/folded: - basketElement.setAttribute("folded", XMLWork::trueOrFalse(!item->isExpanded())); - - if (((BasketListViewItem*)item)->isCurrentBasket()) - basketElement.setAttribute("lastOpened", "true"); - - // Save Properties: - QDomElement properties = document.createElement("properties"); - basketElement.appendChild(properties); - basket->saveProperties(document, properties); - - // Save Child Basket: - if (item->childCount() >=0){ - for (int i=0; i < item->childCount(); i++) - save(0, item->child(i), document, basketElement); - } - } - } - else{ - Basket* basket = ((BasketListViewItem *)item)->basket(); - - QDomElement basketElement = document.createElement("basket"); - parentElement.appendChild(basketElement); - - // Save Attributes: - basketElement.setAttribute("folderName", basket->folderName()); - if (item->childCount() >=0 ) // If it can be expanded/folded: - basketElement.setAttribute("folded", XMLWork::trueOrFalse(!item->isExpanded())); - - if (((BasketListViewItem*)item)->isCurrentBasket()) - basketElement.setAttribute("lastOpened", "true"); - - // Save Properties: - QDomElement properties = document.createElement("properties"); - basketElement.appendChild(properties); - basket->saveProperties(document, properties); - - // Save Child Basket: - if (item->childCount() >=0){ - for (int i=0; i < item->childCount(); i++) - save(0, item->child(i), document, basketElement); - } - } + if (item == 0) { + // For each basket: + for (int i = 0; i < listView->topLevelItemCount(); i++) { + item = listView->topLevelItem(i); + Basket* basket = ((BasketListViewItem *)item)->basket(); + + QDomElement basketElement = document.createElement("basket"); + parentElement.appendChild(basketElement); + + // Save Attributes: + basketElement.setAttribute("folderName", basket->folderName()); + if (item->childCount() >= 0) // If it can be expanded/folded: + basketElement.setAttribute("folded", XMLWork::trueOrFalse(!item->isExpanded())); + + if (((BasketListViewItem*)item)->isCurrentBasket()) + basketElement.setAttribute("lastOpened", "true"); + + // Save Properties: + QDomElement properties = document.createElement("properties"); + basketElement.appendChild(properties); + basket->saveProperties(document, properties); + + // Save Child Basket: + if (item->childCount() >= 0) { + for (int i = 0; i < item->childCount(); i++) + save(0, item->child(i), document, basketElement); + } + } + } else { + Basket* basket = ((BasketListViewItem *)item)->basket(); + + QDomElement basketElement = document.createElement("basket"); + parentElement.appendChild(basketElement); + + // Save Attributes: + basketElement.setAttribute("folderName", basket->folderName()); + if (item->childCount() >= 0) // If it can be expanded/folded: + basketElement.setAttribute("folded", XMLWork::trueOrFalse(!item->isExpanded())); + + if (((BasketListViewItem*)item)->isCurrentBasket()) + basketElement.setAttribute("lastOpened", "true"); + + // Save Properties: + QDomElement properties = document.createElement("properties"); + basketElement.appendChild(properties); + basket->saveProperties(document, properties); + + // Save Child Basket: + if (item->childCount() >= 0) { + for (int i = 0; i < item->childCount(); i++) + save(0, item->child(i), document, basketElement); + } + } } QDomElement BNPView::basketElement(QTreeWidgetItem *item, QDomDocument &document, QDomElement &parentElement) { - Basket *basket = ((BasketListViewItem*)item)->basket(); - QDomElement basketElement = document.createElement("basket"); - parentElement.appendChild(basketElement); - // Save Attributes: - basketElement.setAttribute("folderName", basket->folderName()); - if (item->child(0)) // If it can be expanded/folded: - basketElement.setAttribute("folded", XMLWork::trueOrFalse(!item->isExpanded())); - if (((BasketListViewItem*)item)->isCurrentBasket()) - basketElement.setAttribute("lastOpened", "true"); - // Save Properties: - QDomElement properties = document.createElement("properties"); - basketElement.appendChild(properties); - basket->saveProperties(document, properties); - return basketElement; + Basket *basket = ((BasketListViewItem*)item)->basket(); + QDomElement basketElement = document.createElement("basket"); + parentElement.appendChild(basketElement); + // Save Attributes: + basketElement.setAttribute("folderName", basket->folderName()); + if (item->child(0)) // If it can be expanded/folded: + basketElement.setAttribute("folded", XMLWork::trueOrFalse(!item->isExpanded())); + if (((BasketListViewItem*)item)->isCurrentBasket()) + basketElement.setAttribute("lastOpened", "true"); + // Save Properties: + QDomElement properties = document.createElement("properties"); + basketElement.appendChild(properties); + basket->saveProperties(document, properties); + return basketElement; } void BNPView::saveSubHierarchy(QTreeWidgetItem *item, QDomDocument &document, QDomElement &parentElement, bool recursive) { - QDomElement element = basketElement(item, document, parentElement); - if (recursive && item->child(0)) - save(0,item->child(0), document, element); + QDomElement element = basketElement(item, document, parentElement); + if (recursive && item->child(0)) + save(0, item->child(0), document, element); } void BNPView::load() { - QDomDocument *doc = XMLWork::openFile("basketTree", Global::basketsFolder() + "baskets.xml"); - //BEGIN Compatibility with 0.6.0 Pre-Alpha versions: - if (!doc) - doc = XMLWork::openFile("basketsTree", Global::basketsFolder() + "baskets.xml"); - //END - if (doc != 0) { - QDomElement docElem = doc->documentElement(); - load(m_tree, 0L, docElem); - } - m_loading = false; + QDomDocument *doc = XMLWork::openFile("basketTree", Global::basketsFolder() + "baskets.xml"); + //BEGIN Compatibility with 0.6.0 Pre-Alpha versions: + if (!doc) + doc = XMLWork::openFile("basketsTree", Global::basketsFolder() + "baskets.xml"); + //END + if (doc != 0) { + QDomElement docElem = doc->documentElement(); + load(m_tree, 0L, docElem); + } + m_loading = false; } void BNPView::load(QTreeWidget *listView, QTreeWidgetItem *item, const QDomElement &baskets) { - QDomNode n = baskets.firstChild(); - while ( ! n.isNull() ) { - QDomElement element = n.toElement(); - if ( (!element.isNull()) && element.tagName() == "basket" ) { - QString folderName = element.attribute("folderName"); - if (!folderName.isEmpty()) { - Basket *basket = loadBasket(folderName); - BasketListViewItem *basketItem = appendBasket(basket, item); - basketItem->setExpanded(!XMLWork::trueOrFalse(element.attribute("folded", "false"), false)); - basket->loadProperties(XMLWork::getElement(element, "properties")); - if (XMLWork::trueOrFalse(element.attribute("lastOpened", element.attribute("lastOpened", "false")), false)) // Compat with 0.6.0-Alphas - setCurrentBasket(basket); - // Load Sub-baskets: - load(/*(QListView*)*/0L, basketItem, element); - } - } - n = n.nextSibling(); - } + QDomNode n = baskets.firstChild(); + while (! n.isNull()) { + QDomElement element = n.toElement(); + if ((!element.isNull()) && element.tagName() == "basket") { + QString folderName = element.attribute("folderName"); + if (!folderName.isEmpty()) { + Basket *basket = loadBasket(folderName); + BasketListViewItem *basketItem = appendBasket(basket, item); + basketItem->setExpanded(!XMLWork::trueOrFalse(element.attribute("folded", "false"), false)); + basket->loadProperties(XMLWork::getElement(element, "properties")); + if (XMLWork::trueOrFalse(element.attribute("lastOpened", element.attribute("lastOpened", "false")), false)) // Compat with 0.6.0-Alphas + setCurrentBasket(basket); + // Load Sub-baskets: + load(/*(QListView*)*/0L, basketItem, element); + } + } + n = n.nextSibling(); + } } Basket* BNPView::loadBasket(const QString &folderName) { - if (folderName.isEmpty()) - return 0; + if (folderName.isEmpty()) + return 0; - DecoratedBasket *decoBasket = new DecoratedBasket(m_stack, folderName); - Basket *basket = decoBasket->basket(); - m_stack->addWidget(decoBasket); - connect( basket, SIGNAL(countsChanged(Basket*)), this, SLOT(countsChanged(Basket*)) ); - // 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*)) ); + DecoratedBasket *decoBasket = new DecoratedBasket(m_stack, folderName); + Basket *basket = decoBasket->basket(); + m_stack->addWidget(decoBasket); + connect(basket, SIGNAL(countsChanged(Basket*)), this, SLOT(countsChanged(Basket*))); + // 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->decoration()->filterBar(), SIGNAL(newFilter(const FilterData&)), this, SLOT(newFilterFromFilterBar()) ); + connect(basket->decoration()->filterBar(), SIGNAL(newFilter(const FilterData&)), this, SLOT(newFilterFromFilterBar())); - return basket; + return basket; } int BNPView::basketCount(QTreeWidgetItem *parent) { - int count = 1; - if (parent == NULL) - return 0; + int count = 1; + if (parent == NULL) + return 0; - for (int i=0;i<parent->childCount();i++){ - count += basketCount(parent->child(i)); - } + for (int i = 0; i < parent->childCount(); i++) { + count += basketCount(parent->child(i)); + } - return count; + return count; } bool BNPView::canFold() { - BasketListViewItem *item = listViewItemForBasket(currentBasket()); - if (!item) - return false; - return item->parent() || (item->childCount()>0 && item->isExpanded()); + BasketListViewItem *item = listViewItemForBasket(currentBasket()); + if (!item) + return false; + return item->parent() || (item->childCount() > 0 && item->isExpanded()); } bool BNPView::canExpand() { - BasketListViewItem *item = listViewItemForBasket(currentBasket()); - if (!item) - return false; - return item->childCount() > 0; + BasketListViewItem *item = listViewItemForBasket(currentBasket()); + if (!item) + return false; + return item->childCount() > 0; } BasketListViewItem* BNPView::appendBasket(Basket *basket, QTreeWidgetItem *parentItem) { - BasketListViewItem *newBasketItem; - if (parentItem) - newBasketItem = new BasketListViewItem(parentItem, parentItem->child(parentItem->childCount()-1), basket); - else { - newBasketItem = new BasketListViewItem(m_tree, m_tree->topLevelItem(m_tree->topLevelItemCount()-1), basket); - } + BasketListViewItem *newBasketItem; + if (parentItem) + newBasketItem = new BasketListViewItem(parentItem, parentItem->child(parentItem->childCount() - 1), basket); + else { + newBasketItem = new BasketListViewItem(m_tree, m_tree->topLevelItem(m_tree->topLevelItemCount() - 1), basket); + } - emit basketNumberChanged(basketCount()); + emit basketNumberChanged(basketCount()); - return newBasketItem; + return newBasketItem; } void BNPView::loadNewBasket(const QString &folderName, const QDomElement &properties, Basket *parent) { - Basket *basket = loadBasket(folderName); - appendBasket(basket, (basket ? listViewItemForBasket(parent) : 0)); - basket->loadProperties(properties); - setCurrentBasket(basket); -// save(); + Basket *basket = loadBasket(folderName); + appendBasket(basket, (basket ? listViewItemForBasket(parent) : 0)); + basket->loadProperties(properties); + setCurrentBasket(basket); +// save(); } int BNPView::topLevelItemCount() { - return m_tree->topLevelItemCount(); + return m_tree->topLevelItemCount(); } void BNPView::goToPreviousBasket() { - if (m_tree->topLevelItemCount()<=0) - return; + if (m_tree->topLevelItemCount() <= 0) + return; - BasketListViewItem *item = listViewItemForBasket(currentBasket()); - BasketListViewItem *toSwitch = (BasketListViewItem *)m_tree->itemAbove(item); + BasketListViewItem *item = listViewItemForBasket(currentBasket()); + BasketListViewItem *toSwitch = (BasketListViewItem *)m_tree->itemAbove(item); - while (toSwitch && !toSwitch->isShown()){ - toSwitch = (BasketListViewItem *)m_tree->itemAbove(toSwitch); - } + while (toSwitch && !toSwitch->isShown()) { + toSwitch = (BasketListViewItem *)m_tree->itemAbove(toSwitch); + } - if (!toSwitch) { - toSwitch = (BasketListViewItem *)m_tree->topLevelItem(m_tree->topLevelItemCount()-1); - while (toSwitch->childCount() >=0){ - toSwitch = (BasketListViewItem *)toSwitch->child(toSwitch->childCount()-1); - } - } + if (!toSwitch) { + toSwitch = (BasketListViewItem *)m_tree->topLevelItem(m_tree->topLevelItemCount() - 1); + while (toSwitch->childCount() >= 0) { + toSwitch = (BasketListViewItem *)toSwitch->child(toSwitch->childCount() - 1); + } + } - while (toSwitch && !toSwitch->isShown()){ - toSwitch = (BasketListViewItem *)m_tree->itemAbove(toSwitch); - } + while (toSwitch && !toSwitch->isShown()) { + toSwitch = (BasketListViewItem *)m_tree->itemAbove(toSwitch); + } - if (toSwitch) - setCurrentBasket(toSwitch->basket()); + if (toSwitch) + setCurrentBasket(toSwitch->basket()); - if (Settings::usePassivePopup()) - showPassiveContent(); + if (Settings::usePassivePopup()) + showPassiveContent(); } void BNPView::goToNextBasket() { - if (m_tree->topLevelItemCount()<=0) - return; + if (m_tree->topLevelItemCount() <= 0) + return; - BasketListViewItem *item = listViewItemForBasket(currentBasket()); - BasketListViewItem *toSwitch = (BasketListViewItem *)m_tree->itemBelow(item); + BasketListViewItem *item = listViewItemForBasket(currentBasket()); + BasketListViewItem *toSwitch = (BasketListViewItem *)m_tree->itemBelow(item); - while (toSwitch && !toSwitch->isShown()){ - toSwitch = (BasketListViewItem *)m_tree->itemBelow(toSwitch); - } + while (toSwitch && !toSwitch->isShown()) { + toSwitch = (BasketListViewItem *)m_tree->itemBelow(toSwitch); + } - if (!toSwitch) { - //toSwitch = (BasketListViewItem*)m_tree->child(0); - toSwitch = (BasketListViewItem*)m_tree->itemAt(0, 0); - } + if (!toSwitch) { + //toSwitch = (BasketListViewItem*)m_tree->child(0); + toSwitch = (BasketListViewItem*)m_tree->itemAt(0, 0); + } - while (toSwitch && !toSwitch->isShown()){ - toSwitch = (BasketListViewItem *)m_tree->itemBelow(toSwitch); - } + while (toSwitch && !toSwitch->isShown()) { + toSwitch = (BasketListViewItem *)m_tree->itemBelow(toSwitch); + } - if (toSwitch) - setCurrentBasket(toSwitch->basket()); + if (toSwitch) + setCurrentBasket(toSwitch->basket()); - if (Settings::usePassivePopup()) - showPassiveContent(); + if (Settings::usePassivePopup()) + showPassiveContent(); } void BNPView::foldBasket() { - BasketListViewItem *item = listViewItemForBasket(currentBasket()); - if (item && item->childCount()<=0) - item->setExpanded(false); // If Alt+Left is hitted and there is nothing to close, make sure the focus will go to the parent basket + BasketListViewItem *item = listViewItemForBasket(currentBasket()); + if (item && item->childCount() <= 0) + item->setExpanded(false); // If Alt+Left is hitted and there is nothing to close, make sure the focus will go to the parent basket - QKeyEvent* keyEvent = new QKeyEvent(QEvent::KeyPress, Qt::Key_Left, 0, 0); - QApplication::postEvent(m_tree, keyEvent); + QKeyEvent* keyEvent = new QKeyEvent(QEvent::KeyPress, Qt::Key_Left, 0, 0); + QApplication::postEvent(m_tree, keyEvent); } void BNPView::expandBasket() { - QKeyEvent* keyEvent = new QKeyEvent(QEvent::KeyPress, Qt::Key_Right, 0, 0); - QApplication::postEvent(m_tree, keyEvent); + QKeyEvent* keyEvent = new QKeyEvent(QEvent::KeyPress, Qt::Key_Right, 0, 0); + QApplication::postEvent(m_tree, keyEvent); } void BNPView::closeAllEditors() { - QTreeWidgetItemIterator it(m_tree); - while (*it) { - BasketListViewItem *item = (BasketListViewItem*)(*it); - item->basket()->closeEditor(); - ++it; - } + QTreeWidgetItemIterator it(m_tree); + while (*it) { + BasketListViewItem *item = (BasketListViewItem*)(*it); + item->basket()->closeEditor(); + ++it; + } } bool BNPView::convertTexts() { - bool convertedNotes = false; - KProgressDialog dialog( - /*parent=*/0, - /*caption=*/i18n("Plain Text Notes Conversion"), - /*text=*/i18n("Converting plain text notes to rich text ones...") - ); - dialog.setModal(true); - dialog.progressBar()->setRange(0, basketCount()); - dialog.show(); //setMinimumDuration(50/*ms*/); - - QTreeWidgetItemIterator it(m_tree); - while (*it) { - BasketListViewItem *item = (BasketListViewItem*)(*it); - if (item->basket()->convertTexts()) - convertedNotes = true; - - QProgressBar *pb = dialog.progressBar(); - pb->setValue(pb->value() + 1); - - if (dialog.wasCancelled()) - break; - ++it; - } + bool convertedNotes = false; + KProgressDialog dialog( + /*parent=*/0, + /*caption=*/i18n("Plain Text Notes Conversion"), + /*text=*/i18n("Converting plain text notes to rich text ones...") + ); + dialog.setModal(true); + dialog.progressBar()->setRange(0, basketCount()); + dialog.show(); //setMinimumDuration(50/*ms*/); + + QTreeWidgetItemIterator it(m_tree); + while (*it) { + BasketListViewItem *item = (BasketListViewItem*)(*it); + if (item->basket()->convertTexts()) + convertedNotes = true; + + QProgressBar *pb = dialog.progressBar(); + pb->setValue(pb->value() + 1); + + if (dialog.wasCancelled()) + break; + ++it; + } - return convertedNotes; + return convertedNotes; } void BNPView::toggleFilterAllBaskets(bool doFilter) { - // Set the state: - m_actFilterAllBaskets->setChecked(doFilter); + // Set the state: + m_actFilterAllBaskets->setChecked(doFilter); - // If the filter isn't already showing, we make sure it does. - if (doFilter) - m_actShowFilter->setChecked(true); + // If the filter isn't already showing, we make sure it does. + if (doFilter) + m_actShowFilter->setChecked(true); - //currentBasket()->decoration()->filterBar()->setFilterAll(doFilter); + //currentBasket()->decoration()->filterBar()->setFilterAll(doFilter); -// Basket *current = currentBasket(); - QTreeWidgetItemIterator it(m_tree); - while (*it) { - BasketListViewItem *item = ((BasketListViewItem*)*it); - item->basket()->decoration()->filterBar()->setFilterAll(doFilter); - ++it; - } +// Basket *current = currentBasket(); + QTreeWidgetItemIterator it(m_tree); + while (*it) { + BasketListViewItem *item = ((BasketListViewItem*) * it); + item->basket()->decoration()->filterBar()->setFilterAll(doFilter); + ++it; + } - if (doFilter) - currentBasket()->decoration()->filterBar()->setEditFocus(); + if (doFilter) + currentBasket()->decoration()->filterBar()->setEditFocus(); - // Filter every baskets: - newFilter(); + // Filter every baskets: + newFilter(); } /** This function can be called recursively because we call kapp->processEvents(). @@ -1299,421 +1296,496 @@ void BNPView::toggleFilterAllBaskets(bool doFilter) */ void BNPView::newFilter() { - static bool alreadyEntered = false; - static bool shouldRestart = false; - - if (alreadyEntered) { - shouldRestart = true; - return; - } - alreadyEntered = true; - shouldRestart = false; - - Basket *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: - QTreeWidgetItemIterator it(m_tree); - while (*it) { - BasketListViewItem *item = ((BasketListViewItem*)*it); - if (item->basket() != current){ - if (isFilteringAllBaskets()) - item->basket()->decoration()->filterBar()->setFilterData(filterData); // Set the new FilterData for every other baskets - else - item->basket()->decoration()->filterBar()->setFilterData(FilterData()); // We just disabled the global filtering: remove the FilterData - } - ++it; - } - - // Show/hide the "little filter icons" (during basket load) - // or the "little numbers" (to show number of found notes in the baskets) is the tree: - kapp->processEvents(); - - // Load every baskets for filtering, if they are not already loaded, and if necessary: - if (filterData.isFiltering) { - Basket *current = currentBasket(); - QTreeWidgetItemIterator it(m_tree); - while (*it) { - BasketListViewItem *item = ((BasketListViewItem*)*it); - if (item->basket() != current) { - Basket *basket = item->basket(); - if (!basket->loadingLaunched() && !basket->isLocked()) - basket->load(); - basket->filterAgain(); - kapp->processEvents(); - if (shouldRestart) { - alreadyEntered = false; - shouldRestart = false; - newFilter(); - return; - } - } - ++it; - } - } - -// kapp->processEvents(); - - alreadyEntered = false; - shouldRestart = false; + static bool alreadyEntered = false; + static bool shouldRestart = false; + + if (alreadyEntered) { + shouldRestart = true; + return; + } + alreadyEntered = true; + shouldRestart = false; + + Basket *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: + QTreeWidgetItemIterator it(m_tree); + while (*it) { + BasketListViewItem *item = ((BasketListViewItem*) * it); + if (item->basket() != current) { + if (isFilteringAllBaskets()) + item->basket()->decoration()->filterBar()->setFilterData(filterData); // Set the new FilterData for every other baskets + else + item->basket()->decoration()->filterBar()->setFilterData(FilterData()); // We just disabled the global filtering: remove the FilterData + } + ++it; + } + + // Show/hide the "little filter icons" (during basket load) + // or the "little numbers" (to show number of found notes in the baskets) is the tree: + kapp->processEvents(); + + // Load every baskets for filtering, if they are not already loaded, and if necessary: + if (filterData.isFiltering) { + Basket *current = currentBasket(); + QTreeWidgetItemIterator it(m_tree); + while (*it) { + BasketListViewItem *item = ((BasketListViewItem*) * it); + if (item->basket() != current) { + Basket *basket = item->basket(); + if (!basket->loadingLaunched() && !basket->isLocked()) + basket->load(); + basket->filterAgain(); + kapp->processEvents(); + if (shouldRestart) { + alreadyEntered = false; + shouldRestart = false; + newFilter(); + return; + } + } + ++it; + } + } + +// kapp->processEvents(); + + alreadyEntered = false; + shouldRestart = false; } void BNPView::newFilterFromFilterBar() { - if (isFilteringAllBaskets()) - QTimer::singleShot(0, this, SLOT(newFilter())); // Keep time for the QLineEdit to display the filtered character and refresh correctly! + if (isFilteringAllBaskets()) + QTimer::singleShot(0, this, SLOT(newFilter())); // Keep time for the QLineEdit to display the filtered character and refresh correctly! } bool BNPView::isFilteringAllBaskets() { - return m_actFilterAllBaskets->isChecked(); + return m_actFilterAllBaskets->isChecked(); } BasketListViewItem* BNPView::listViewItemForBasket(Basket *basket) { - QTreeWidgetItemIterator it(m_tree); - while (*it) { - BasketListViewItem *item = ((BasketListViewItem*)*it); - if (item->basket() == basket) - return item; - ++it; - } - return 0L; + QTreeWidgetItemIterator it(m_tree); + while (*it) { + BasketListViewItem *item = ((BasketListViewItem*) * it); + if (item->basket() == basket) + return item; + ++it; + } + return 0L; } Basket* BNPView::currentBasket() { - DecoratedBasket *decoBasket = (DecoratedBasket*)m_stack->currentWidget(); - if (decoBasket) - return decoBasket->basket(); - else - return 0; + DecoratedBasket *decoBasket = (DecoratedBasket*)m_stack->currentWidget(); + if (decoBasket) + return decoBasket->basket(); + else + return 0; } Basket* BNPView::parentBasketOf(Basket *basket) { - BasketListViewItem *item = (BasketListViewItem*)(listViewItemForBasket(basket)->parent()); - if (item) - return item->basket(); - else - return 0; + BasketListViewItem *item = (BasketListViewItem*)(listViewItemForBasket(basket)->parent()); + if (item) + return item->basket(); + else + return 0; } void BNPView::setCurrentBasket(Basket *basket) { - if (currentBasket() == basket) - return; - - if (currentBasket()) - currentBasket()->closeBasket(); - - if (basket) - basket->aboutToBeActivated(); - - BasketListViewItem *item = listViewItemForBasket(basket); - if (item) { - m_tree->setCurrentItem(item); - item->ensureVisible(); - m_stack->setCurrentWidget(basket->decoration()); - // If the window has changed size, only the current basket receive the event, - // the others will receive ony one just before they are shown. - // But this triggers unwanted animations, so we eliminate it: - basket->relayoutNotes(/*animate=*/false); - basket->openBasket(); - setCaption(item->basket()->basketName()); - countsChanged(basket); - updateStatusBarHint(); - if (Global::systemTray) - Global::systemTray->updateDisplay(); - m_tree->scrollToItem(m_tree->currentItem()); - item->basket()->setFocus(); - } - m_tree->viewport()->update(); - emit basketChanged(); + if (currentBasket() == basket) + return; + + if (currentBasket()) + currentBasket()->closeBasket(); + + if (basket) + basket->aboutToBeActivated(); + + BasketListViewItem *item = listViewItemForBasket(basket); + if (item) { + m_tree->setCurrentItem(item); + item->ensureVisible(); + m_stack->setCurrentWidget(basket->decoration()); + // If the window has changed size, only the current basket receive the event, + // the others will receive ony one just before they are shown. + // But this triggers unwanted animations, so we eliminate it: + basket->relayoutNotes(/*animate=*/false); + basket->openBasket(); + setCaption(item->basket()->basketName()); + countsChanged(basket); + updateStatusBarHint(); + if (Global::systemTray) + Global::systemTray->updateDisplay(); + m_tree->scrollToItem(m_tree->currentItem()); + item->basket()->setFocus(); + } + m_tree->viewport()->update(); + emit basketChanged(); } void BNPView::removeBasket(Basket *basket) { - if (basket->isDuringEdit()) - basket->closeEditor(); + if (basket->isDuringEdit()) + basket->closeEditor(); - // Find a new basket to switch to and select it. - // Strategy: get the next sibling, or the previous one if not found. - // If there is no such one, get the parent basket: - BasketListViewItem *basketItem = listViewItemForBasket(basket); - BasketListViewItem *nextBasketItem = (BasketListViewItem*)(m_tree->itemBelow(basketItem)); - if (!nextBasketItem) - nextBasketItem = (BasketListViewItem*)m_tree->itemAbove(basketItem); - if (!nextBasketItem) - nextBasketItem = (BasketListViewItem*)(basketItem->parent()); + // Find a new basket to switch to and select it. + // Strategy: get the next sibling, or the previous one if not found. + // If there is no such one, get the parent basket: + BasketListViewItem *basketItem = listViewItemForBasket(basket); + BasketListViewItem *nextBasketItem = (BasketListViewItem*)(m_tree->itemBelow(basketItem)); + if (!nextBasketItem) + nextBasketItem = (BasketListViewItem*)m_tree->itemAbove(basketItem); + if (!nextBasketItem) + nextBasketItem = (BasketListViewItem*)(basketItem->parent()); - if (nextBasketItem) - setCurrentBasket(nextBasketItem->basket()); + if (nextBasketItem) + setCurrentBasket(nextBasketItem->basket()); - // Remove from the view: - basket->unsubscribeBackgroundImages(); - m_stack->removeWidget(basket->decoration()); -// delete basket->decoration(); - delete basketItem; -// delete basket; + // Remove from the view: + basket->unsubscribeBackgroundImages(); + m_stack->removeWidget(basket->decoration()); +// delete basket->decoration(); + delete basketItem; +// delete basket; - // If there is no basket anymore, add a new one: - if (!nextBasketItem) - BasketFactory::newBasket(/*icon=*/"", /*name=*/i18n("General"), /*backgroundImage=*/"", /*backgroundColor=*/QColor(), /*textColor=*/QColor(), /*templateName=*/"1column", /*createIn=*/0); - else // No need to save two times if we add a basket - save(); + // If there is no basket anymore, add a new one: + if (!nextBasketItem) + BasketFactory::newBasket(/*icon=*/"", /*name=*/i18n("General"), /*backgroundImage=*/"", /*backgroundColor=*/QColor(), /*textColor=*/QColor(), /*templateName=*/"1column", /*createIn=*/0); + else // No need to save two times if we add a basket + save(); - emit basketNumberChanged(basketCount()); + emit basketNumberChanged(basketCount()); } void BNPView::setTreePlacement(bool onLeft) { - if (onLeft) - insertWidget(0, m_tree); - else - addWidget(m_tree); - //updateGeometry(); - kapp->postEvent( this, new QResizeEvent(size(), size()) ); + if (onLeft) + insertWidget(0, m_tree); + else + addWidget(m_tree); + //updateGeometry(); + kapp->postEvent(this, new QResizeEvent(size(), size())); } void BNPView::relayoutAllBaskets() { - QTreeWidgetItemIterator it(m_tree); - while (*it) { - BasketListViewItem *item = ((BasketListViewItem*)*it); - //item->basket()->unbufferizeAll(); - item->basket()->unsetNotesWidth(); - item->basket()->relayoutNotes(true); - ++it; - } + QTreeWidgetItemIterator it(m_tree); + while (*it) { + BasketListViewItem *item = ((BasketListViewItem*) * it); + //item->basket()->unbufferizeAll(); + item->basket()->unsetNotesWidth(); + item->basket()->relayoutNotes(true); + ++it; + } } void BNPView::recomputeAllStyles() { - QTreeWidgetItemIterator it(m_tree); - while (*it) { - BasketListViewItem *item = ((BasketListViewItem*)*it); - item->basket()->recomputeAllStyles(); - item->basket()->unsetNotesWidth(); - item->basket()->relayoutNotes(true); - ++it; - } + QTreeWidgetItemIterator it(m_tree); + while (*it) { + BasketListViewItem *item = ((BasketListViewItem*) * it); + item->basket()->recomputeAllStyles(); + item->basket()->unsetNotesWidth(); + item->basket()->relayoutNotes(true); + ++it; + } } void BNPView::removedStates(const QList<State*> &deletedStates) { - QTreeWidgetItemIterator it(m_tree); - while (*it) { - BasketListViewItem *item = ((BasketListViewItem*)*it); - item->basket()->removedStates(deletedStates); - ++it; - } + QTreeWidgetItemIterator it(m_tree); + while (*it) { + BasketListViewItem *item = ((BasketListViewItem*) * it); + item->basket()->removedStates(deletedStates); + ++it; + } } void BNPView::linkLookChanged() { - QTreeWidgetItemIterator it(m_tree); - while (*it) { - BasketListViewItem *item = ((BasketListViewItem*)*it); - item->basket()->linkLookChanged(); - ++it; - } + QTreeWidgetItemIterator it(m_tree); + while (*it) { + BasketListViewItem *item = ((BasketListViewItem*) * it); + item->basket()->linkLookChanged(); + ++it; + } } void BNPView::filterPlacementChanged(bool onTop) { - QTreeWidgetItemIterator it(m_tree); - while (*it) { - BasketListViewItem *item = static_cast<BasketListViewItem*>(*it); - DecoratedBasket *decoration = static_cast<DecoratedBasket*>(item->basket()->parent()); - decoration->setFilterBarPosition(onTop); - ++it; - } + QTreeWidgetItemIterator it(m_tree); + while (*it) { + BasketListViewItem *item = static_cast<BasketListViewItem*>(*it); + DecoratedBasket *decoration = static_cast<DecoratedBasket*>(item->basket()->parent()); + decoration->setFilterBarPosition(onTop); + ++it; + } } void BNPView::updateBasketListViewItem(Basket *basket) { - BasketListViewItem *item = listViewItemForBasket(basket); - if (item) - item->setup(); + BasketListViewItem *item = listViewItemForBasket(basket); + if (item) + item->setup(); - if (basket == currentBasket()) { - setCaption(basket->basketName()); - if (Global::systemTray) - Global::systemTray->updateDisplay(); - } + if (basket == currentBasket()) { + setCaption(basket->basketName()); + if (Global::systemTray) + Global::systemTray->updateDisplay(); + } - // Don't save if we are loading! - if (!m_loading) - save(); + // Don't save if we are loading! + if (!m_loading) + save(); } void BNPView::needSave(QTreeWidgetItem *) { - if (!m_loading) - // A basket has been collapsed/expanded or a new one is select: this is not urgent: - QTimer::singleShot(500/*ms*/, this, SLOT(save())); + if (!m_loading) + // A basket has been collapsed/expanded or a new one is select: this is not urgent: + QTimer::singleShot(500/*ms*/, this, SLOT(save())); } void BNPView::slotPressed(QTreeWidgetItem *item, int column) { - Basket *basket = currentBasket(); + Basket *basket = currentBasket(); - if (basket == 0) - return; + if (basket == 0) + return; - // Impossible to Select no Basket: - if (!item) - m_tree->setCurrentItem(listViewItemForBasket(basket), true); + // Impossible to Select no Basket: + if (!item) + m_tree->setCurrentItem(listViewItemForBasket(basket), true); - else if (dynamic_cast<BasketListViewItem*>(item) != 0 && currentBasket() != ((BasketListViewItem*)item)->basket()) { - setCurrentBasket( ((BasketListViewItem*)item)->basket() ); - needSave(0); - } - basket->setFocus(); + else if (dynamic_cast<BasketListViewItem*>(item) != 0 && currentBasket() != ((BasketListViewItem*)item)->basket()) { + setCurrentBasket(((BasketListViewItem*)item)->basket()); + needSave(0); + } + basket->setFocus(); } DecoratedBasket* BNPView::currentDecoratedBasket() { - if (currentBasket()) - return currentBasket()->decoration(); - else - return 0; + if (currentBasket()) + return currentBasket()->decoration(); + else + return 0; } // Redirected actions : -void BNPView::exportToHTML() { HTMLExporter exporter(currentBasket()); } -void BNPView::editNote() { currentBasket()->noteEdit(); } -void BNPView::cutNote() { currentBasket()->noteCut(); } -void BNPView::copyNote() { currentBasket()->noteCopy(); } -void BNPView::delNote() { currentBasket()->noteDelete(); } -void BNPView::openNote() { currentBasket()->noteOpen(); } -void BNPView::openNoteWith() { currentBasket()->noteOpenWith(); } -void BNPView::saveNoteAs() { currentBasket()->noteSaveAs(); } -void BNPView::noteGroup() { currentBasket()->noteGroup(); } -void BNPView::noteUngroup() { currentBasket()->noteUngroup(); } -void BNPView::moveOnTop() { currentBasket()->noteMoveOnTop(); } -void BNPView::moveOnBottom() { currentBasket()->noteMoveOnBottom(); } -void BNPView::moveNoteUp() { currentBasket()->noteMoveNoteUp(); } -void BNPView::moveNoteDown() { currentBasket()->noteMoveNoteDown(); } -void BNPView::slotSelectAll() { currentBasket()->selectAll(); } -void BNPView::slotUnselectAll() { currentBasket()->unselectAll(); } -void BNPView::slotInvertSelection() { currentBasket()->invertSelection(); } -void BNPView::slotResetFilter() { currentDecoratedBasket()->resetFilter(); } - -void BNPView::importKJots() { SoftwareImporters::importKJots(); } -void BNPView::importKNotes() { SoftwareImporters::importKNotes(); } -void BNPView::importKnowIt() { SoftwareImporters::importKnowIt(); } -void BNPView::importTuxCards() { SoftwareImporters::importTuxCards(); } -void BNPView::importStickyNotes() { SoftwareImporters::importStickyNotes(); } -void BNPView::importTomboy() { SoftwareImporters::importTomboy(); } -void BNPView::importTextFile() { SoftwareImporters::importTextFile(); } +void BNPView::exportToHTML() +{ + HTMLExporter exporter(currentBasket()); +} +void BNPView::editNote() +{ + currentBasket()->noteEdit(); +} +void BNPView::cutNote() +{ + currentBasket()->noteCut(); +} +void BNPView::copyNote() +{ + currentBasket()->noteCopy(); +} +void BNPView::delNote() +{ + currentBasket()->noteDelete(); +} +void BNPView::openNote() +{ + currentBasket()->noteOpen(); +} +void BNPView::openNoteWith() +{ + currentBasket()->noteOpenWith(); +} +void BNPView::saveNoteAs() +{ + currentBasket()->noteSaveAs(); +} +void BNPView::noteGroup() +{ + currentBasket()->noteGroup(); +} +void BNPView::noteUngroup() +{ + currentBasket()->noteUngroup(); +} +void BNPView::moveOnTop() +{ + currentBasket()->noteMoveOnTop(); +} +void BNPView::moveOnBottom() +{ + currentBasket()->noteMoveOnBottom(); +} +void BNPView::moveNoteUp() +{ + currentBasket()->noteMoveNoteUp(); +} +void BNPView::moveNoteDown() +{ + currentBasket()->noteMoveNoteDown(); +} +void BNPView::slotSelectAll() +{ + currentBasket()->selectAll(); +} +void BNPView::slotUnselectAll() +{ + currentBasket()->unselectAll(); +} +void BNPView::slotInvertSelection() +{ + currentBasket()->invertSelection(); +} +void BNPView::slotResetFilter() +{ + currentDecoratedBasket()->resetFilter(); +} + +void BNPView::importKJots() +{ + SoftwareImporters::importKJots(); +} +void BNPView::importKNotes() +{ + SoftwareImporters::importKNotes(); +} +void BNPView::importKnowIt() +{ + SoftwareImporters::importKnowIt(); +} +void BNPView::importTuxCards() +{ + SoftwareImporters::importTuxCards(); +} +void BNPView::importStickyNotes() +{ + SoftwareImporters::importStickyNotes(); +} +void BNPView::importTomboy() +{ + SoftwareImporters::importTomboy(); +} +void BNPView::importTextFile() +{ + SoftwareImporters::importTextFile(); +} void BNPView::backupRestore() { - BackupDialog dialog; - dialog.exec(); + BackupDialog dialog; + dialog.exec(); } void BNPView::countsChanged(Basket *basket) { - if (basket == currentBasket()) - notesStateChanged(); + if (basket == currentBasket()) + notesStateChanged(); } void BNPView::notesStateChanged() { - Basket *basket = currentBasket(); - - // Update statusbar message : - if (currentBasket()->isLocked()) - setSelectionStatus(i18n("Locked")); - else if (!basket->isLoaded()) - setSelectionStatus(i18n("Loading...")); - else if (basket->count() == 0) - setSelectionStatus(i18n("No notes")); - else { - QString count = i18np("%1 note", "%1 notes", basket->count() ); - QString selecteds = i18np("%1 selected", "%1 selected", basket->countSelecteds()); - QString showns = (currentDecoratedBasket()->filterData().isFiltering ? i18n("all matches") : i18n("no filter")); - if (basket->countFounds() != basket->count()) - showns = i18np("%1 match", "%1 matches", basket->countFounds()); - setSelectionStatus( - i18nc("e.g. '18 notes, 10 matches, 5 selected'", "%1, %2, %3",count, showns, selecteds)); - } - - if (currentBasket()->redirectEditActions()) { - m_actSelectAll ->setEnabled( !currentBasket()->selectedAllTextInEditor() ); - m_actUnselectAll ->setEnabled( currentBasket()->hasSelectedTextInEditor() ); - } else { - m_actSelectAll ->setEnabled( basket->countSelecteds() < basket->countFounds() ); - m_actUnselectAll ->setEnabled( basket->countSelecteds() > 0 ); - } - m_actInvertSelection ->setEnabled( basket->countFounds() > 0 ); - - updateNotesActions(); + Basket *basket = currentBasket(); + + // Update statusbar message : + if (currentBasket()->isLocked()) + setSelectionStatus(i18n("Locked")); + else if (!basket->isLoaded()) + setSelectionStatus(i18n("Loading...")); + else if (basket->count() == 0) + setSelectionStatus(i18n("No notes")); + else { + QString count = i18np("%1 note", "%1 notes", basket->count()); + QString selecteds = i18np("%1 selected", "%1 selected", basket->countSelecteds()); + QString showns = (currentDecoratedBasket()->filterData().isFiltering ? i18n("all matches") : i18n("no filter")); + if (basket->countFounds() != basket->count()) + showns = i18np("%1 match", "%1 matches", basket->countFounds()); + setSelectionStatus( + i18nc("e.g. '18 notes, 10 matches, 5 selected'", "%1, %2, %3", count, showns, selecteds)); + } + + if (currentBasket()->redirectEditActions()) { + m_actSelectAll ->setEnabled(!currentBasket()->selectedAllTextInEditor()); + m_actUnselectAll ->setEnabled(currentBasket()->hasSelectedTextInEditor()); + } else { + m_actSelectAll ->setEnabled(basket->countSelecteds() < basket->countFounds()); + m_actUnselectAll ->setEnabled(basket->countSelecteds() > 0); + } + m_actInvertSelection ->setEnabled(basket->countFounds() > 0); + + updateNotesActions(); } void BNPView::updateNotesActions() { - bool isLocked = currentBasket()->isLocked(); - bool oneSelected = currentBasket()->countSelecteds() == 1; - bool oneOrSeveralSelected = currentBasket()->countSelecteds() >= 1; - 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 -// m_actCheckNotes->setChecked( oneOrSeveralSelected && -// currentBasket()->areSelectedNotesChecked() && -// currentBasket()->showCheckBoxes() ); - - Note *selectedGroup = (severalSelected ? currentBasket()->selectedGroup() : 0); - - m_actEditNote ->setEnabled( !isLocked && oneSelected && !currentBasket()->isDuringEdit() ); - if (currentBasket()->redirectEditActions()) { - m_actCutNote ->setEnabled( currentBasket()->hasSelectedTextInEditor() ); - m_actCopyNote ->setEnabled( currentBasket()->hasSelectedTextInEditor() ); - m_actPaste ->setEnabled( true ); - m_actDelNote ->setEnabled( currentBasket()->hasSelectedTextInEditor() ); - } else { - m_actCutNote ->setEnabled( !isLocked && oneOrSeveralSelected ); - m_actCopyNote ->setEnabled( oneOrSeveralSelected ); - m_actPaste ->setEnabled( !isLocked ); - m_actDelNote ->setEnabled( !isLocked && oneOrSeveralSelected ); - } - m_actOpenNote ->setEnabled( oneOrSeveralSelected ); - m_actOpenNoteWith ->setEnabled( oneSelected ); // TODO: oneOrSeveralSelected IF SAME TYPE - m_actSaveNoteAs ->setEnabled( oneSelected ); // IDEM? - m_actGroup ->setEnabled( !isLocked && severalSelected && (!selectedGroup || selectedGroup->isColumn()) ); - m_actUngroup ->setEnabled( !isLocked && selectedGroup && !selectedGroup->isColumn() ); - m_actMoveOnTop ->setEnabled( !isLocked && oneOrSeveralSelected && !currentBasket()->isFreeLayout() ); - m_actMoveNoteUp ->setEnabled( !isLocked && oneOrSeveralSelected ); // TODO: Disable when unavailable! - m_actMoveNoteDown ->setEnabled( !isLocked && oneOrSeveralSelected ); - m_actMoveOnBottom ->setEnabled( !isLocked && oneOrSeveralSelected && !currentBasket()->isFreeLayout() ); - - for (QList<KAction *>::const_iterator action = m_insertActions.constBegin(); action != m_insertActions.constEnd(); ++action) - (*action)->setEnabled( !isLocked ); - - // From the old Note::contextMenuEvent(...) : -/* if (useFile() || m_type == Link) { - m_type == Link ? i18n("&Open target") : i18n("&Open") - m_type == Link ? i18n("Open target &with...") : i18n("Open &with...") - m_type == Link ? i18n("&Save target as...") : i18n("&Save a copy as...") - // If useFile() theire is always a file to open / open with / save, but : - if (m_type == Link) { - if (url().prettyUrl().isEmpty() && runCommand().isEmpty()) // no URL nor runCommand : - popupMenu->setItemEnabled(7, false); // no possible Open ! - if (url().prettyUrl().isEmpty()) // no URL : - popupMenu->setItemEnabled(8, false); // no possible Open with ! - if (url().prettyUrl().isEmpty() || url().path().endsWith("/")) // no URL or target a folder : - popupMenu->setItemEnabled(9, false); // not possible to save target file -} -} else if (m_type != Color) { - popupMenu->insertSeparator(); - popupMenu->insertItem( KIcon("document-save-as"), i18n("&Save a copy as..."), this, SLOT(slotSaveAs()), 0, 10 ); -}*/ + bool isLocked = currentBasket()->isLocked(); + bool oneSelected = currentBasket()->countSelecteds() == 1; + bool oneOrSeveralSelected = currentBasket()->countSelecteds() >= 1; + 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 +// m_actCheckNotes->setChecked( oneOrSeveralSelected && +// currentBasket()->areSelectedNotesChecked() && +// currentBasket()->showCheckBoxes() ); + + Note *selectedGroup = (severalSelected ? currentBasket()->selectedGroup() : 0); + + m_actEditNote ->setEnabled(!isLocked && oneSelected && !currentBasket()->isDuringEdit()); + if (currentBasket()->redirectEditActions()) { + m_actCutNote ->setEnabled(currentBasket()->hasSelectedTextInEditor()); + m_actCopyNote ->setEnabled(currentBasket()->hasSelectedTextInEditor()); + m_actPaste ->setEnabled(true); + m_actDelNote ->setEnabled(currentBasket()->hasSelectedTextInEditor()); + } else { + m_actCutNote ->setEnabled(!isLocked && oneOrSeveralSelected); + m_actCopyNote ->setEnabled(oneOrSeveralSelected); + m_actPaste ->setEnabled(!isLocked); + m_actDelNote ->setEnabled(!isLocked && oneOrSeveralSelected); + } + m_actOpenNote ->setEnabled(oneOrSeveralSelected); + m_actOpenNoteWith ->setEnabled(oneSelected); // TODO: oneOrSeveralSelected IF SAME TYPE + m_actSaveNoteAs ->setEnabled(oneSelected); // IDEM? + m_actGroup ->setEnabled(!isLocked && severalSelected && (!selectedGroup || selectedGroup->isColumn())); + m_actUngroup ->setEnabled(!isLocked && selectedGroup && !selectedGroup->isColumn()); + m_actMoveOnTop ->setEnabled(!isLocked && oneOrSeveralSelected && !currentBasket()->isFreeLayout()); + m_actMoveNoteUp ->setEnabled(!isLocked && oneOrSeveralSelected); // TODO: Disable when unavailable! + m_actMoveNoteDown ->setEnabled(!isLocked && oneOrSeveralSelected); + m_actMoveOnBottom ->setEnabled(!isLocked && oneOrSeveralSelected && !currentBasket()->isFreeLayout()); + + for (QList<KAction *>::const_iterator action = m_insertActions.constBegin(); action != m_insertActions.constEnd(); ++action) + (*action)->setEnabled(!isLocked); + + // From the old Note::contextMenuEvent(...) : + /* if (useFile() || m_type == Link) { + m_type == Link ? i18n("&Open target") : i18n("&Open") + m_type == Link ? i18n("Open target &with...") : i18n("Open &with...") + m_type == Link ? i18n("&Save target as...") : i18n("&Save a copy as...") + // If useFile() theire is always a file to open / open with / save, but : + if (m_type == Link) { + if (url().prettyUrl().isEmpty() && runCommand().isEmpty()) // no URL nor runCommand : + popupMenu->setItemEnabled(7, false); // no possible Open ! + if (url().prettyUrl().isEmpty()) // no URL : + popupMenu->setItemEnabled(8, false); // no possible Open with ! + if (url().prettyUrl().isEmpty() || url().path().endsWith("/")) // no URL or target a folder : + popupMenu->setItemEnabled(9, false); // not possible to save target file + } + } else if (m_type != Color) { + popupMenu->insertSeparator(); + popupMenu->insertItem( KIcon("document-save-as"), i18n("&Save a copy as..."), this, SLOT(slotSaveAs()), 0, 10 ); + }*/ } // BEGIN Color picker (code from KColorEdit): @@ -1722,442 +1794,437 @@ void BNPView::updateNotesActions() */ void BNPView::slotColorFromScreen(bool global) { - m_colorPickWasGlobal = global; - if (isMainWindowActive()) { - if(Global::mainWindow()) Global::mainWindow()->hide(); - m_colorPickWasShown = true; - } else - m_colorPickWasShown = false; + m_colorPickWasGlobal = global; + if (isMainWindowActive()) { + if (Global::mainWindow()) Global::mainWindow()->hide(); + m_colorPickWasShown = true; + } else + m_colorPickWasShown = false; - currentBasket()->saveInsertionData(); - m_colorPicker->pickColor(); + currentBasket()->saveInsertionData(); + m_colorPicker->pickColor(); -/* m_gettingColorFromScreen = true; - kapp->processEvents(); - QTimer::singleShot( 100, this, SLOT(grabColorFromScreen()) );*/ + /* m_gettingColorFromScreen = true; + kapp->processEvents(); + QTimer::singleShot( 100, this, SLOT(grabColorFromScreen()) );*/ } void BNPView::slotColorFromScreenGlobal() { - slotColorFromScreen(true); + slotColorFromScreen(true); } void BNPView::colorPicked(const QColor &color) { - if (!currentBasket()->isLoaded()) { - showPassiveLoading(currentBasket()); - currentBasket()->load(); - } - currentBasket()->insertColor(color); + if (!currentBasket()->isLoaded()) { + showPassiveLoading(currentBasket()); + currentBasket()->load(); + } + currentBasket()->insertColor(color); - if (m_colorPickWasShown) - showMainWindow(); + if (m_colorPickWasShown) + showMainWindow(); - if (Settings::usePassivePopup()) - showPassiveDropped(i18n("Picked color to basket %1")); + if (Settings::usePassivePopup()) + showPassiveDropped(i18n("Picked color to basket %1")); } void BNPView::colorPickingCanceled() { - if (m_colorPickWasShown) - showMainWindow(); + if (m_colorPickWasShown) + showMainWindow(); } void BNPView::slotConvertTexts() { -/* - int result = KMessageBox::questionYesNoCancel( - this, - i18n( - "This will convert every text notes into rich text notes. " - "The content of the notes will not change and you will be able to apply formating to those notes." - "This process cannot be reverted back: you will not be able to convert the rich text notes to plain text ones later." - "As a beta-tester, you are strongly encouraged to do the convert process because it is to test if plain text notes are still needed. " - "If nobody complain about not having plain text notes anymore, then the final version is likely to not support plain text notes anymore." - "Which basket notes do you want to convert?" - ), - i18n("Convert Text Notes"), - KGuiItem(i18n("Only in the Current Basket")), - KGuiItem(i18n("In Every Baskets")) - ); - if (result == KMessageBox::Cancel) - return; -*/ - - bool conversionsDone; -// if (result == KMessageBox::Yes) -// conversionsDone = currentBasket()->convertTexts(); -// else - conversionsDone = convertTexts(); - - if (conversionsDone) - KMessageBox::information(this, i18n("The plain text notes have been converted to rich text."), i18n("Conversion Finished")); - else - KMessageBox::information(this, i18n("There are no plain text notes to convert."), i18n("Conversion Finished")); + /* + int result = KMessageBox::questionYesNoCancel( + this, + i18n( + "This will convert every text notes into rich text notes. " + "The content of the notes will not change and you will be able to apply formating to those notes." + "This process cannot be reverted back: you will not be able to convert the rich text notes to plain text ones later." + "As a beta-tester, you are strongly encouraged to do the convert process because it is to test if plain text notes are still needed. " + "If nobody complain about not having plain text notes anymore, then the final version is likely to not support plain text notes anymore." + "Which basket notes do you want to convert?" + ), + i18n("Convert Text Notes"), + KGuiItem(i18n("Only in the Current Basket")), + KGuiItem(i18n("In Every Baskets")) + ); + if (result == KMessageBox::Cancel) + return; + */ + + bool conversionsDone; +// if (result == KMessageBox::Yes) +// conversionsDone = currentBasket()->convertTexts(); +// else + conversionsDone = convertTexts(); + + if (conversionsDone) + KMessageBox::information(this, i18n("The plain text notes have been converted to rich text."), i18n("Conversion Finished")); + else + KMessageBox::information(this, i18n("There are no plain text notes to convert."), i18n("Conversion Finished")); } KMenu* BNPView::popupMenu(const QString &menuName) { - KMenu *menu = 0; - bool hack = false; // TODO fix this - // When running in kontact and likeback Information message is shown - // factory is 0. Don't show error then and don't crash either :-) - - if(m_guiClient) - { - KXMLGUIFactory* factory = m_guiClient->factory(); - if(factory) - { - menu = (KMenu *)factory->container(menuName, m_guiClient); - } - else - hack = isPart(); - } - if (menu == 0) { - if(!hack) - { - KStandardDirs stdDirs; - const KAboutData *aboutData = KGlobal::mainComponent().aboutData(); - KMessageBox::error( this, i18n( - "The file basketui.rc seems to not exist or is too old. " - "%1 cannot run without it and will stop." - "Please check your installation of %2." - "If you do not have administrator access to install the application " - "system wide, you can copy the file basketui.rc from the installation " - "archive to the folder <a href='file://%3'>%4</a>." - "As last ressort, if you are sure the application is correctly installed " - "but you had a preview version of it, try to remove the " - "file %5basketui.rc", - aboutData->programName(), aboutData->programName(), - stdDirs.saveLocation("data", "basket/"),stdDirs.saveLocation("data", "basket/"), stdDirs.saveLocation("data", "basket/")), - i18n("Ressource not Found"), KMessageBox::AllowLink ); - } - if(!isPart()) - exit(1); // We SHOULD exit right now and abord everything because the caller except menu != 0 to not crash. - else - menu = new KMenu; // When running in kpart we cannot exit - } - return menu; + KMenu *menu = 0; + bool hack = false; // TODO fix this + // When running in kontact and likeback Information message is shown + // factory is 0. Don't show error then and don't crash either :-) + + if (m_guiClient) { + KXMLGUIFactory* factory = m_guiClient->factory(); + if (factory) { + menu = (KMenu *)factory->container(menuName, m_guiClient); + } else + hack = isPart(); + } + if (menu == 0) { + if (!hack) { + KStandardDirs stdDirs; + const KAboutData *aboutData = KGlobal::mainComponent().aboutData(); + KMessageBox::error(this, i18n( + "The file basketui.rc seems to not exist or is too old. " + "%1 cannot run without it and will stop." + "Please check your installation of %2." + "If you do not have administrator access to install the application " + "system wide, you can copy the file basketui.rc from the installation " + "archive to the folder <a href='file://%3'>%4</a>." + "As last ressort, if you are sure the application is correctly installed " + "but you had a preview version of it, try to remove the " + "file %5basketui.rc", + aboutData->programName(), aboutData->programName(), + stdDirs.saveLocation("data", "basket/"), stdDirs.saveLocation("data", "basket/"), stdDirs.saveLocation("data", "basket/")), + i18n("Ressource not Found"), KMessageBox::AllowLink); + } + if (!isPart()) + exit(1); // We SHOULD exit right now and abord everything because the caller except menu != 0 to not crash. + else + menu = new KMenu; // When running in kpart we cannot exit + } + return menu; } void BNPView::showHideFilterBar(bool show, bool switchFocus) { -// if (show != m_actShowFilter->isChecked()) -// m_actShowFilter->setChecked(show); - m_actShowFilter->setChecked(show); +// if (show != m_actShowFilter->isChecked()) +// m_actShowFilter->setChecked(show); + m_actShowFilter->setChecked(show); - currentDecoratedBasket()->setFilterBarVisible(show, switchFocus); - if (!show) - currentDecoratedBasket()->resetFilter(); + currentDecoratedBasket()->setFilterBarVisible(show, switchFocus); + if (!show) + currentDecoratedBasket()->resetFilter(); } void BNPView::insertEmpty(int type) { - if (currentBasket()->isLocked()) { - showPassiveImpossible(i18n("Cannot add note.")); - return; - } - currentBasket()->insertEmptyNote(type); + if (currentBasket()->isLocked()) { + showPassiveImpossible(i18n("Cannot add note.")); + return; + } + currentBasket()->insertEmptyNote(type); } void BNPView::insertWizard(int type) { - if (currentBasket()->isLocked()) { - showPassiveImpossible(i18n("Cannot add note.")); - return; - } - currentBasket()->insertWizard(type); + if (currentBasket()->isLocked()) { + showPassiveImpossible(i18n("Cannot add note.")); + return; + } + currentBasket()->insertWizard(type); } // BEGIN Screen Grabbing: void BNPView::grabScreenshot(bool global) { - if (m_regionGrabber) { - KWindowSystem::activateWindow(m_regionGrabber->winId()); - return; - } + if (m_regionGrabber) { + KWindowSystem::activateWindow(m_regionGrabber->winId()); + return; + } - // Delay before to take a screenshot because if we hide the main window OR the systray popup menu, - // we should wait the windows below to be repainted!!! - // A special case is where the action is triggered with the global keyboard shortcut. - // In this case, global is true, and we don't wait. - // In the future, if global is also defined for other cases, check for - // enum KAction::ActivationReason { UnknownActivation, EmulatedActivation, AccelActivation, PopupMenuActivation, ToolBarActivation }; - int delay = (isMainWindowActive() ? 500 : (global/*kapp->activePopupWidget()*/ ? 0 : 200)); + // Delay before to take a screenshot because if we hide the main window OR the systray popup menu, + // we should wait the windows below to be repainted!!! + // A special case is where the action is triggered with the global keyboard shortcut. + // In this case, global is true, and we don't wait. + // In the future, if global is also defined for other cases, check for + // enum KAction::ActivationReason { UnknownActivation, EmulatedActivation, AccelActivation, PopupMenuActivation, ToolBarActivation }; + int delay = (isMainWindowActive() ? 500 : (global/*kapp->activePopupWidget()*/ ? 0 : 200)); - m_colorPickWasGlobal = global; - if (isMainWindowActive()) { - if(Global::mainWindow()) Global::mainWindow()->hide(); - m_colorPickWasShown = true; - } else - m_colorPickWasShown = false; + m_colorPickWasGlobal = global; + if (isMainWindowActive()) { + if (Global::mainWindow()) Global::mainWindow()->hide(); + m_colorPickWasShown = true; + } else + m_colorPickWasShown = false; - currentBasket()->saveInsertionData(); - usleep(delay * 1000); - m_regionGrabber = new RegionGrabber; - connect( m_regionGrabber, SIGNAL(regionGrabbed(const QPixmap&)), this, SLOT(screenshotGrabbed(const QPixmap&)) ); + currentBasket()->saveInsertionData(); + usleep(delay * 1000); + m_regionGrabber = new RegionGrabber; + connect(m_regionGrabber, SIGNAL(regionGrabbed(const QPixmap&)), this, SLOT(screenshotGrabbed(const QPixmap&))); } void BNPView::grabScreenshotGlobal() { - grabScreenshot(true); + grabScreenshot(true); } void BNPView::screenshotGrabbed(const QPixmap &pixmap) { - delete m_regionGrabber; - m_regionGrabber = 0; + delete m_regionGrabber; + m_regionGrabber = 0; - // Cancelled (pressed Escape): - if (pixmap.isNull()) { - if (m_colorPickWasShown) - showMainWindow(); - return; - } + // Cancelled (pressed Escape): + if (pixmap.isNull()) { + if (m_colorPickWasShown) + showMainWindow(); + return; + } - if (!currentBasket()->isLoaded()) { - showPassiveLoading(currentBasket()); - currentBasket()->load(); - } - currentBasket()->insertImage(pixmap); + if (!currentBasket()->isLoaded()) { + showPassiveLoading(currentBasket()); + currentBasket()->load(); + } + currentBasket()->insertImage(pixmap); - if (m_colorPickWasShown) - showMainWindow(); + if (m_colorPickWasShown) + showMainWindow(); - if (Settings::usePassivePopup()) - showPassiveDropped(i18n("Grabbed screen zone to basket %1")); + if (Settings::usePassivePopup()) + showPassiveDropped(i18n("Grabbed screen zone to basket %1")); } Basket* BNPView::basketForFolderName(const QString &folderName) { -/* QPtrList<Basket> basketsList = listBaskets(); - Basket *basket; - for (basket = basketsList.first(); basket; basket = basketsList.next()) - if (basket->folderName() == folderName) - return basket; -*/ - - QString name = folderName; - if (!name.endsWith("/")) - name += "/"; - - QTreeWidgetItemIterator it(m_tree); - while (*it) { - BasketListViewItem *item = ((BasketListViewItem*)*it); - if (item->basket()->folderName() == name) - return item->basket(); - ++it; - } + /* QPtrList<Basket> basketsList = listBaskets(); + Basket *basket; + for (basket = basketsList.first(); basket; basket = basketsList.next()) + if (basket->folderName() == folderName) + return basket; + */ + + QString name = folderName; + if (!name.endsWith("/")) + name += "/"; + + QTreeWidgetItemIterator it(m_tree); + while (*it) { + BasketListViewItem *item = ((BasketListViewItem*) * it); + if (item->basket()->folderName() == name) + return item->basket(); + ++it; + } - return 0; + return 0; } Note* BNPView::noteForFileName(const QString &fileName, Basket &basket, Note* note) { - if (!note) - note = basket.firstNote(); - if (note->fullPath().endsWith(fileName)) - return note; - Note* child = note->firstChild(); - Note* found; - while(child) - { - found = noteForFileName(fileName, basket, child); - if (found) - return found; - child = child->next(); - } - return 0; + if (!note) + note = basket.firstNote(); + if (note->fullPath().endsWith(fileName)) + return note; + Note* child = note->firstChild(); + Note* found; + while (child) { + found = noteForFileName(fileName, basket, child); + if (found) + return found; + child = child->next(); + } + return 0; } void BNPView::setFiltering(bool filtering) { - m_actShowFilter->setChecked(filtering); - m_actResetFilter->setEnabled(filtering); - if (!filtering) - m_actFilterAllBaskets->setEnabled(false); + m_actShowFilter->setChecked(filtering); + m_actResetFilter->setEnabled(filtering); + if (!filtering) + m_actFilterAllBaskets->setEnabled(false); } void BNPView::undo() { - // TODO + // TODO } void BNPView::redo() { - // TODO + // TODO } void BNPView::pasteToBasket(int /*index*/, QClipboard::Mode /*mode*/) { - //TODO: REMOVE! - //basketAt(index)->pasteNote(mode); + //TODO: REMOVE! + //basketAt(index)->pasteNote(mode); } void BNPView::propBasket() { - BasketPropertiesDialog dialog(currentBasket(), this); - dialog.exec(); + BasketPropertiesDialog dialog(currentBasket(), this); + dialog.exec(); } void BNPView::delBasket() { -// DecoratedBasket *decoBasket = currentDecoratedBasket(); - Basket *basket = currentBasket(); +// DecoratedBasket *decoBasket = currentDecoratedBasket(); + Basket *basket = currentBasket(); - int really = KMessageBox::questionYesNo( this, - i18n("<qt>Do you really want to remove the basket %1 and its contents?</qt>", - Tools::textToHTMLWithoutP(basket->basketName())), - i18n("Remove Basket") + int really = KMessageBox::questionYesNo(this, + i18n("<qt>Do you really want to remove the basket %1 and its contents?</qt>", + Tools::textToHTMLWithoutP(basket->basketName())), + i18n("Remove Basket") #if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x - , KGuiItem(i18n("&Remove Basket"), "edit-delete"), KStandardGuiItem::cancel()); + , KGuiItem(i18n("&Remove Basket"), "edit-delete"), KStandardGuiItem::cancel()); #else - ); + ); #endif - if (really == KMessageBox::No) - return; + if (really == KMessageBox::No) + return; - QStringList basketsList = listViewItemForBasket(basket)->childNamesTree(0); - if (basketsList.count() > 0) { - int deleteChilds = KMessageBox::questionYesNoList( this, - i18n("<qt>%1 have the following children baskets. Do you want to remove them too?</qt>", - Tools::textToHTMLWithoutP(basket->basketName())), - basketsList, - i18n("Remove Children Baskets") + QStringList basketsList = listViewItemForBasket(basket)->childNamesTree(0); + if (basketsList.count() > 0) { + int deleteChilds = KMessageBox::questionYesNoList(this, + i18n("<qt>%1 have the following children baskets. Do you want to remove them too?</qt>", + Tools::textToHTMLWithoutP(basket->basketName())), + basketsList, + i18n("Remove Children Baskets") #if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x - , KGuiItem(i18n("&Remove Children Baskets"), "edit-delete")); + , KGuiItem(i18n("&Remove Children Baskets"), "edit-delete")); #else - ); + ); #endif - if (deleteChilds == KMessageBox::No) - listViewItemForBasket(basket)->moveChildsBaskets(); - } + if (deleteChilds == KMessageBox::No) + listViewItemForBasket(basket)->moveChildsBaskets(); + } - doBasketDeletion(basket); + doBasketDeletion(basket); -// basketNumberChanged(); -// rebuildBasketsMenu(); +// basketNumberChanged(); +// rebuildBasketsMenu(); } void BNPView::doBasketDeletion(Basket *basket) { - basket->closeEditor(); + basket->closeEditor(); - QTreeWidgetItem *basketItem = listViewItemForBasket(basket); - for (int i=0;i<basketItem->childCount();i++){ - // First delete the child baskets: - doBasketDeletion(((BasketListViewItem*)basketItem->child(i))->basket()); - } - // Then, basket have no child anymore, delete it: - DecoratedBasket *decoBasket = basket->decoration(); - basket->deleteFiles(); - removeBasket(basket); - // Remove the action to avoir keyboard-shortcut clashes: - delete basket->m_action; // FIXME: It's quick&dirty. In the future, the Basket should be deleted, and then the KAction deleted in the Basket destructor. - delete decoBasket; -// delete basket; + QTreeWidgetItem *basketItem = listViewItemForBasket(basket); + for (int i = 0; i < basketItem->childCount(); i++) { + // First delete the child baskets: + doBasketDeletion(((BasketListViewItem*)basketItem->child(i))->basket()); + } + // Then, basket have no child anymore, delete it: + DecoratedBasket *decoBasket = basket->decoration(); + basket->deleteFiles(); + removeBasket(basket); + // Remove the action to avoir keyboard-shortcut clashes: + delete basket->m_action; // FIXME: It's quick&dirty. In the future, the Basket should be deleted, and then the KAction deleted in the Basket destructor. + delete decoBasket; +// delete basket; } void BNPView::password() { #ifdef HAVE_LIBGPGME - PasswordDlg dlg(kapp->activeWindow()); - Basket *cur = currentBasket(); - - dlg.setType(cur->encryptionType()); - dlg.setKey(cur->encryptionKey()); - if(dlg.exec()) { - cur->setProtection(dlg.type(), dlg.key()); - if (cur->encryptionType() != Basket::NoEncryption) - cur->lock(); - } + PasswordDlg dlg(kapp->activeWindow()); + Basket *cur = currentBasket(); + + dlg.setType(cur->encryptionType()); + dlg.setKey(cur->encryptionKey()); + if (dlg.exec()) { + cur->setProtection(dlg.type(), dlg.key()); + if (cur->encryptionType() != Basket::NoEncryption) + cur->lock(); + } #endif } void BNPView::lockBasket() { #ifdef HAVE_LIBGPGME - Basket *cur = currentBasket(); + Basket *cur = currentBasket(); - cur->lock(); + cur->lock(); #endif } void BNPView::saveAsArchive() { - Basket *basket = currentBasket(); - - QDir dir; - - KConfigGroup config = KGlobal::config()->group("Basket Archive"); - QString folder = config.readEntry("lastFolder", QDir::homePath()) + "/"; - QString url = folder + QString(basket->basketName()).replace("/", "_") + ".baskets"; - - QString filter = "*.baskets|" + i18n("Basket Archives") + "\n*|" + i18n("All Files"); - QString destination = url; - for (bool askAgain = true; askAgain; ) { - destination = KFileDialog::getSaveFileName(destination, filter, this, i18n("Save as Basket Archive")); - if (destination.isEmpty()) // User canceled - return; - if (dir.exists(destination)) { - int result = KMessageBox::questionYesNoCancel( - this, - "<qt>" + i18n("The file %1 already exists. Do you really want to override it?", - KUrl(destination).fileName()), - i18n("Override File?"), - KGuiItem(i18n("&Override"), "document-save") - ); - if (result == KMessageBox::Cancel) - return; - else if (result == KMessageBox::Yes) - askAgain = false; - } else - askAgain = false; - } - bool withSubBaskets = true;//KMessageBox::questionYesNo(this, i18n("Do you want to export sub-baskets too?"), i18n("Save as Basket Archive")) == KMessageBox::Yes; - - config.writeEntry("lastFolder", KUrl(destination).directory()); - config.sync(); - - Archive::save(basket, withSubBaskets, destination); + Basket *basket = currentBasket(); + + QDir dir; + + KConfigGroup config = KGlobal::config()->group("Basket Archive"); + QString folder = config.readEntry("lastFolder", QDir::homePath()) + "/"; + QString url = folder + QString(basket->basketName()).replace("/", "_") + ".baskets"; + + QString filter = "*.baskets|" + i18n("Basket Archives") + "\n*|" + i18n("All Files"); + QString destination = url; + for (bool askAgain = true; askAgain;) { + destination = KFileDialog::getSaveFileName(destination, filter, this, i18n("Save as Basket Archive")); + if (destination.isEmpty()) // User canceled + return; + if (dir.exists(destination)) { + int result = KMessageBox::questionYesNoCancel( + this, + "<qt>" + i18n("The file %1 already exists. Do you really want to override it?", + KUrl(destination).fileName()), + i18n("Override File?"), + KGuiItem(i18n("&Override"), "document-save") + ); + if (result == KMessageBox::Cancel) + return; + else if (result == KMessageBox::Yes) + askAgain = false; + } else + askAgain = false; + } + bool withSubBaskets = true;//KMessageBox::questionYesNo(this, i18n("Do you want to export sub-baskets too?"), i18n("Save as Basket Archive")) == KMessageBox::Yes; + + config.writeEntry("lastFolder", KUrl(destination).directory()); + config.sync(); + + Archive::save(basket, withSubBaskets, destination); } QString BNPView::s_fileToOpen = ""; void BNPView::delayedOpenArchive() { - Archive::open(s_fileToOpen); + Archive::open(s_fileToOpen); } void BNPView::openArchive() { - QString filter = "*.baskets|" + i18n("Basket Archives") + "\n*|" + i18n("All Files"); - QString path = KFileDialog::getOpenFileName(KUrl(), filter, this, i18n("Open Basket Archive")); - if (!path.isEmpty()) // User has not canceled - Archive::open(path); + QString filter = "*.baskets|" + i18n("Basket Archives") + "\n*|" + i18n("All Files"); + QString path = KFileDialog::getOpenFileName(KUrl(), filter, this, i18n("Open Basket Archive")); + if (!path.isEmpty()) // User has not canceled + Archive::open(path); } void BNPView::activatedTagShortcut() { - Tag *tag = Tag::tagForKAction((KAction*)sender()); - currentBasket()->activatedTagShortcut(tag); + Tag *tag = Tag::tagForKAction((KAction*)sender()); + currentBasket()->activatedTagShortcut(tag); } void BNPView::slotBasketNumberChanged(int number) { - m_actPreviousBasket->setEnabled(number > 1); - m_actNextBasket ->setEnabled(number > 1); + m_actPreviousBasket->setEnabled(number > 1); + m_actNextBasket ->setEnabled(number > 1); } void BNPView::slotBasketChanged() { - m_actFoldBasket->setEnabled(canFold()); - m_actExpandBasket->setEnabled(canExpand()); - setFiltering(currentBasket() && currentBasket()->decoration()->filterData().isFiltering); + m_actFoldBasket->setEnabled(canFold()); + m_actExpandBasket->setEnabled(canExpand()); + setFiltering(currentBasket() && currentBasket()->decoration()->filterData().isFiltering); } void BNPView::currentBasketChanged() @@ -2166,341 +2233,355 @@ void BNPView::currentBasketChanged() void BNPView::isLockedChanged() { - bool isLocked = currentBasket()->isLocked(); + bool isLocked = currentBasket()->isLocked(); - setLockStatus(isLocked); + setLockStatus(isLocked); -// m_actLockBasket->setChecked(isLocked); - m_actPropBasket->setEnabled(!isLocked); - m_actDelBasket ->setEnabled(!isLocked); - updateNotesActions(); +// m_actLockBasket->setChecked(isLocked); + m_actPropBasket->setEnabled(!isLocked); + m_actDelBasket ->setEnabled(!isLocked); + updateNotesActions(); } void BNPView::askNewBasket() { - askNewBasket(0, 0); + askNewBasket(0, 0); } void BNPView::askNewBasket(Basket *parent, Basket *pickProperties) { - NewBasketDefaultProperties properties; - if (pickProperties) { - properties.icon = pickProperties->icon(); - properties.backgroundImage = pickProperties->backgroundImageName(); - properties.backgroundColor = pickProperties->backgroundColorSetting(); - properties.textColor = pickProperties->textColorSetting(); - properties.freeLayout = pickProperties->isFreeLayout(); - properties.columnCount = pickProperties->columnsCount(); - } + NewBasketDefaultProperties properties; + if (pickProperties) { + properties.icon = pickProperties->icon(); + properties.backgroundImage = pickProperties->backgroundImageName(); + properties.backgroundColor = pickProperties->backgroundColorSetting(); + properties.textColor = pickProperties->textColorSetting(); + properties.freeLayout = pickProperties->isFreeLayout(); + properties.columnCount = pickProperties->columnsCount(); + } - NewBasketDialog(parent, properties, this).exec(); + NewBasketDialog(parent, properties, this).exec(); } void BNPView::askNewSubBasket() { - askNewBasket( /*parent=*/currentBasket(), /*pickPropertiesOf=*/currentBasket() ); + askNewBasket(/*parent=*/currentBasket(), /*pickPropertiesOf=*/currentBasket()); } void BNPView::askNewSiblingBasket() { - askNewBasket( /*parent=*/parentBasketOf(currentBasket()), /*pickPropertiesOf=*/currentBasket() ); + askNewBasket(/*parent=*/parentBasketOf(currentBasket()), /*pickPropertiesOf=*/currentBasket()); } void BNPView::globalPasteInCurrentBasket() { - currentBasket()->setInsertPopupMenu(); - pasteInCurrentBasket(); - currentBasket()->cancelInsertPopupMenu(); + currentBasket()->setInsertPopupMenu(); + pasteInCurrentBasket(); + currentBasket()->cancelInsertPopupMenu(); } void BNPView::pasteInCurrentBasket() { - currentBasket()->pasteNote(); + currentBasket()->pasteNote(); - if (Settings::usePassivePopup()) - showPassiveDropped(i18n("Clipboard content pasted to basket %1")); + if (Settings::usePassivePopup()) + showPassiveDropped(i18n("Clipboard content pasted to basket %1")); } void BNPView::pasteSelInCurrentBasket() { - currentBasket()->pasteNote(QClipboard::Selection); + currentBasket()->pasteNote(QClipboard::Selection); - if (Settings::usePassivePopup()) - showPassiveDropped(i18n("Selection pasted to basket %1")); + if (Settings::usePassivePopup()) + showPassiveDropped(i18n("Selection pasted to basket %1")); } void BNPView::showPassiveDropped(const QString &title) { - if ( ! currentBasket()->isLocked() ) { - // TODO: Keep basket, so that we show the message only if something was added to a NOT visible basket - m_passiveDroppedTitle = title; - m_passiveDroppedSelection = currentBasket()->selectedNotes(); - QTimer::singleShot( c_delayTooltipTime, this, SLOT(showPassiveDroppedDelayed()) ); - // DELAY IT BELOW: - } else - showPassiveImpossible(i18n("No note was added.")); + if (! currentBasket()->isLocked()) { + // TODO: Keep basket, so that we show the message only if something was added to a NOT visible basket + m_passiveDroppedTitle = title; + m_passiveDroppedSelection = currentBasket()->selectedNotes(); + QTimer::singleShot(c_delayTooltipTime, this, SLOT(showPassiveDroppedDelayed())); + // DELAY IT BELOW: + } else + showPassiveImpossible(i18n("No note was added.")); } void BNPView::showPassiveDroppedDelayed() { - if (isMainWindowActive() || m_passiveDroppedSelection == 0) - return; + if (isMainWindowActive() || m_passiveDroppedSelection == 0) + return; - QString title = m_passiveDroppedTitle; + QString title = m_passiveDroppedTitle; - delete m_passivePopup; // Delete previous one (if exists): it will then hide it (only one at a time) - m_passivePopup = new KPassivePopup(Settings::useSystray() ? (QWidget*)Global::systemTray : this); - QImage contentsImage = NoteDrag::feedbackPixmap(m_passiveDroppedSelection).toImage(); - QResource::registerResource(contentsImage.bits(), ":/images/passivepopup_image"); - m_passivePopup->setView( - title.arg(Tools::textToHTMLWithoutP(currentBasket()->basketName())), - (contentsImage.isNull() ? "" : "<img src=\":/images/passivepopup_image\">"), - KIconLoader::global()->loadIcon( - currentBasket()->icon(), KIconLoader::NoGroup, 16, - KIconLoader::DefaultState, QStringList(), 0L, true - ) - ); - m_passivePopup->show(); + delete m_passivePopup; // Delete previous one (if exists): it will then hide it (only one at a time) + m_passivePopup = new KPassivePopup(Settings::useSystray() ? (QWidget*)Global::systemTray : this); + QImage contentsImage = NoteDrag::feedbackPixmap(m_passiveDroppedSelection).toImage(); + QResource::registerResource(contentsImage.bits(), ":/images/passivepopup_image"); + m_passivePopup->setView( + title.arg(Tools::textToHTMLWithoutP(currentBasket()->basketName())), + (contentsImage.isNull() ? "" : "<img src=\":/images/passivepopup_image\">"), + KIconLoader::global()->loadIcon( + currentBasket()->icon(), KIconLoader::NoGroup, 16, + KIconLoader::DefaultState, QStringList(), 0L, true + ) + ); + m_passivePopup->show(); } void BNPView::showPassiveImpossible(const QString &message) { - delete m_passivePopup; // Delete previous one (if exists): it will then hide it (only one at a time) - m_passivePopup = new KPassivePopup(Settings::useSystray() ? (QWidget*)Global::systemTray : (QWidget*)this); - m_passivePopup->setView( - QString("%1") - .arg(i18n("Basket %1 is locked")) - .arg(Tools::textToHTMLWithoutP(currentBasket()->basketName())), - message, - KIconLoader::global()->loadIcon( - currentBasket()->icon(), KIconLoader::NoGroup, 16, - KIconLoader::DefaultState, QStringList(), 0L, true - ) - ); - m_passivePopup->show(); + delete m_passivePopup; // Delete previous one (if exists): it will then hide it (only one at a time) + m_passivePopup = new KPassivePopup(Settings::useSystray() ? (QWidget*)Global::systemTray : (QWidget*)this); + m_passivePopup->setView( + QString("%1") + .arg(i18n("Basket %1 is locked")) + .arg(Tools::textToHTMLWithoutP(currentBasket()->basketName())), + message, + KIconLoader::global()->loadIcon( + currentBasket()->icon(), KIconLoader::NoGroup, 16, + KIconLoader::DefaultState, QStringList(), 0L, true + ) + ); + m_passivePopup->show(); } void BNPView::showPassiveContentForced() { - showPassiveContent(/*forceShow=*/true); + showPassiveContent(/*forceShow=*/true); } void BNPView::showPassiveContent(bool forceShow/* = false*/) { - if (!forceShow && isMainWindowActive()) - return; - - // FIXME: Duplicate code (2 times) - QString message; - - delete m_passivePopup; // Delete previous one (if exists): it will then hide it (only one at a time) - m_passivePopup = new KPassivePopup(Settings::useSystray() ? (QWidget*)Global::systemTray : (QWidget*)this); - m_passivePopup->setView( - "<qt>" + KDialog::makeStandardCaption( - currentBasket()->isLocked() ? QString("%1 %2") - .arg(Tools::textToHTMLWithoutP(currentBasket()->basketName()), i18n("(Locked)")) - : Tools::textToHTMLWithoutP(currentBasket()->basketName()) - ), - message, - KIconLoader::global()->loadIcon( - currentBasket()->icon(), KIconLoader::NoGroup, 16, - KIconLoader::DefaultState, QStringList(), 0L, true - ) - ); - m_passivePopup->show(); + if (!forceShow && isMainWindowActive()) + return; + + // FIXME: Duplicate code (2 times) + QString message; + + delete m_passivePopup; // Delete previous one (if exists): it will then hide it (only one at a time) + m_passivePopup = new KPassivePopup(Settings::useSystray() ? (QWidget*)Global::systemTray : (QWidget*)this); + m_passivePopup->setView( + "<qt>" + KDialog::makeStandardCaption( + currentBasket()->isLocked() ? QString("%1 %2") + .arg(Tools::textToHTMLWithoutP(currentBasket()->basketName()), i18n("(Locked)")) + : Tools::textToHTMLWithoutP(currentBasket()->basketName()) + ), + message, + KIconLoader::global()->loadIcon( + currentBasket()->icon(), KIconLoader::NoGroup, 16, + KIconLoader::DefaultState, QStringList(), 0L, true + ) + ); + m_passivePopup->show(); } void BNPView::showPassiveLoading(Basket *basket) { - if (isMainWindowActive()) - return; + if (isMainWindowActive()) + return; - delete m_passivePopup; // Delete previous one (if exists): it will then hide it (only one at a time) - m_passivePopup = new KPassivePopup(Settings::useSystray() ? (QWidget*)Global::systemTray : (QWidget*)this); - m_passivePopup->setView( - Tools::textToHTMLWithoutP(basket->basketName()), - i18n("Loading..."), - KIconLoader::global()->loadIcon( - basket->icon(), KIconLoader::NoGroup, 16, KIconLoader::DefaultState, - QStringList(), 0L, true - ) - ); - m_passivePopup->show(); + delete m_passivePopup; // Delete previous one (if exists): it will then hide it (only one at a time) + m_passivePopup = new KPassivePopup(Settings::useSystray() ? (QWidget*)Global::systemTray : (QWidget*)this); + m_passivePopup->setView( + Tools::textToHTMLWithoutP(basket->basketName()), + i18n("Loading..."), + KIconLoader::global()->loadIcon( + basket->icon(), KIconLoader::NoGroup, 16, KIconLoader::DefaultState, + QStringList(), 0L, true + ) + ); + m_passivePopup->show(); } -void BNPView::addNoteText() { showMainWindow(); currentBasket()->insertEmptyNote(NoteType::Text); } -void BNPView::addNoteHtml() { showMainWindow(); currentBasket()->insertEmptyNote(NoteType::Html); } -void BNPView::addNoteImage() { showMainWindow(); currentBasket()->insertEmptyNote(NoteType::Image); } -void BNPView::addNoteLink() { showMainWindow(); currentBasket()->insertEmptyNote(NoteType::Link); } -void BNPView::addNoteColor() { showMainWindow(); currentBasket()->insertEmptyNote(NoteType::Color); } +void BNPView::addNoteText() +{ + showMainWindow(); currentBasket()->insertEmptyNote(NoteType::Text); +} +void BNPView::addNoteHtml() +{ + showMainWindow(); currentBasket()->insertEmptyNote(NoteType::Html); +} +void BNPView::addNoteImage() +{ + showMainWindow(); currentBasket()->insertEmptyNote(NoteType::Image); +} +void BNPView::addNoteLink() +{ + showMainWindow(); currentBasket()->insertEmptyNote(NoteType::Link); +} +void BNPView::addNoteColor() +{ + showMainWindow(); currentBasket()->insertEmptyNote(NoteType::Color); +} void BNPView::aboutToHideNewBasketPopup() { - QTimer::singleShot(0, this, SLOT(cancelNewBasketPopup())); + QTimer::singleShot(0, this, SLOT(cancelNewBasketPopup())); } void BNPView::cancelNewBasketPopup() { - m_newBasketPopup = false; + m_newBasketPopup = false; } void BNPView::setNewBasketPopup() { - m_newBasketPopup = true; + m_newBasketPopup = true; } void BNPView::setCaption(QString s) { - emit setWindowCaption(s); + emit setWindowCaption(s); } void BNPView::updateStatusBarHint() { - m_statusbar->updateStatusBarHint(); + m_statusbar->updateStatusBarHint(); } void BNPView::setSelectionStatus(QString s) { - m_statusbar->setSelectionStatus(s); + m_statusbar->setSelectionStatus(s); } void BNPView::setLockStatus(bool isLocked) { - m_statusbar->setLockStatus(isLocked); + m_statusbar->setLockStatus(isLocked); } void BNPView::postStatusbarMessage(const QString& msg) { - m_statusbar->postStatusbarMessage(msg); + m_statusbar->postStatusbarMessage(msg); } void BNPView::setStatusBarHint(const QString &hint) { - m_statusbar->setStatusBarHint(hint); + m_statusbar->setStatusBarHint(hint); } void BNPView::setUnsavedStatus(bool isUnsaved) { - m_statusbar->setUnsavedStatus(isUnsaved); + m_statusbar->setUnsavedStatus(isUnsaved); } void BNPView::setActive(bool active) { KMainWindow* win = Global::mainWindow(); - if(!win) - return; + if (!win) + return; if (active == isMainWindowActive()) - return; + return; kapp->updateUserTimestamp(); // If "activate on mouse hovering systray", or "on drag throught systray" Global::systemTray->toggleActive(); } void BNPView::hideOnEscape() { - if (Settings::useSystray()) - setActive(false); + if (Settings::useSystray()) + setActive(false); } bool BNPView::isPart() { - return objectName() == "BNPViewPart"; + return objectName() == "BNPViewPart"; } bool BNPView::isMainWindowActive() { - KMainWindow* main = Global::mainWindow(); - if (main && main->isActiveWindow()) - return true; - return false; + KMainWindow* main = Global::mainWindow(); + if (main && main->isActiveWindow()) + return true; + return false; } void BNPView::newBasket() { - askNewBasket(); + askNewBasket(); } bool BNPView::createNoteHtml(const QString content, const QString basket) { - Basket* b = basketForFolderName(basket); - if (!b) - return false; - Note* note = NoteFactory::createNoteHtml(content, b); - if (!note) - return false; - b -> insertCreatedNote(note); - return true; + Basket* b = basketForFolderName(basket); + if (!b) + return false; + Note* note = NoteFactory::createNoteHtml(content, b); + if (!note) + return false; + b -> insertCreatedNote(note); + return true; } bool BNPView::changeNoteHtml(const QString content, const QString basket, const QString noteName) { - Basket* b = basketForFolderName(basket); - if (!b) - return false; - Note* note = noteForFileName(noteName , *b); - if (!note || note->content()->type()!=NoteType::Html) - return false; - HtmlContent* noteContent = (HtmlContent*)note->content(); - noteContent->setHtml(content); - note->saveAgain(); - return true; + Basket* b = basketForFolderName(basket); + if (!b) + return false; + Note* note = noteForFileName(noteName , *b); + if (!note || note->content()->type() != NoteType::Html) + return false; + HtmlContent* noteContent = (HtmlContent*)note->content(); + noteContent->setHtml(content); + note->saveAgain(); + return true; } bool BNPView::createNoteFromFile(const QString url, const QString basket) { - Basket* b = basketForFolderName(basket); - if (!b) - return false; - KUrl kurl(url); - if ( url.isEmpty() ) - return false; - Note* n = NoteFactory::copyFileAndLoad(kurl, b); - if (!n) - return false; - b->insertCreatedNote(n); - return true; + Basket* b = basketForFolderName(basket); + if (!b) + return false; + KUrl kurl(url); + if (url.isEmpty()) + return false; + Note* n = NoteFactory::copyFileAndLoad(kurl, b); + if (!n) + return false; + b->insertCreatedNote(n); + return true; } QStringList BNPView::listBaskets() { - QStringList basketList; + QStringList basketList; - QTreeWidgetItemIterator it(m_tree); - while (*it) { - BasketListViewItem *item = ((BasketListViewItem*)*it); - basketList.append(item->basket()->basketName()); - basketList.append(item->basket()->folderName()); - ++it; - } - return basketList; + QTreeWidgetItemIterator it(m_tree); + while (*it) { + BasketListViewItem *item = ((BasketListViewItem*) * it); + basketList.append(item->basket()->basketName()); + basketList.append(item->basket()->folderName()); + ++it; + } + return basketList; } void BNPView::handleCommandLine() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - - /* Custom data folder */ - QString customDataFolder = args->getOption("data-folder"); - if (!customDataFolder.isNull() && !customDataFolder.isEmpty()) - { - Global::setCustomSavesFolder(customDataFolder); - } - /* Debug window */ - if (args->isSet("debug")) { - new DebugWindow(); - Global::debugWindow->show(); - } - - /* Crash Handler to Mail Developers when Crashing: */ + KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + + /* Custom data folder */ + QString customDataFolder = args->getOption("data-folder"); + if (!customDataFolder.isNull() && !customDataFolder.isEmpty()) { + Global::setCustomSavesFolder(customDataFolder); + } + /* Debug window */ + if (args->isSet("debug")) { + new DebugWindow(); + Global::debugWindow->show(); + } + + /* Crash Handler to Mail Developers when Crashing: */ #ifndef BASKET_USE_DRKONQI - if (!args->isSet("use-drkonqi")) - KCrash::setCrashHandler(Crash::crashHandler); + if (!args->isSet("use-drkonqi")) + KCrash::setCrashHandler(Crash::crashHandler); #endif } void BNPView::reloadBasket(const QString &folderName) { - basketForFolderName(folderName)->reload(); + basketForFolderName(folderName)->reload(); } /** Scenario of "Hide main window to system tray icon when mouse move out of the window" : @@ -2527,170 +2608,169 @@ void BNPView::reloadBasket(const QString &folderName) void BNPView::enterEvent(QEvent*) { - if(m_tryHideTimer) - m_tryHideTimer->stop(); - if(m_hideTimer) - m_hideTimer->stop(); + if (m_tryHideTimer) + m_tryHideTimer->stop(); + if (m_hideTimer) + m_hideTimer->stop(); } void BNPView::leaveEvent(QEvent*) { - if (Settings::useSystray() && Settings::hideOnMouseOut() && m_tryHideTimer) - m_tryHideTimer->start(50); + if (Settings::useSystray() && Settings::hideOnMouseOut() && m_tryHideTimer) + m_tryHideTimer->start(50); } void BNPView::timeoutTryHide() { - // If a menu is displayed, do nothing for the moment - if (kapp->activePopupWidget() != 0L) - return; + // If a menu is displayed, do nothing for the moment + if (kapp->activePopupWidget() != 0L) + return; - if (kapp->widgetAt(QCursor::pos()) != 0L) - m_hideTimer->stop(); - else if ( ! m_hideTimer->isActive() ) { // Start only one time - m_hideTimer->setSingleShot(true); - m_hideTimer->start(Settings::timeToHideOnMouseOut() * 100); - } + if (kapp->widgetAt(QCursor::pos()) != 0L) + m_hideTimer->stop(); + else if (! m_hideTimer->isActive()) { // Start only one time + m_hideTimer->setSingleShot(true); + m_hideTimer->start(Settings::timeToHideOnMouseOut() * 100); + } - // If a sub-dialog is oppened, we musn't hide the main window: - if (kapp->activeWindow() != 0L && kapp->activeWindow() != Global::mainWindow()) - m_hideTimer->stop(); + // If a sub-dialog is oppened, we musn't hide the main window: + if (kapp->activeWindow() != 0L && kapp->activeWindow() != Global::mainWindow()) + m_hideTimer->stop(); } void BNPView::timeoutHide() { - // We check that because the setting can have been set to off - if (Settings::useSystray() && Settings::hideOnMouseOut()) - setActive(false); - m_tryHideTimer->stop(); + // We check that because the setting can have been set to off + if (Settings::useSystray() && Settings::hideOnMouseOut()) + setActive(false); + m_tryHideTimer->stop(); } void BNPView::changedSelectedNotes() { -// tabChanged(0); // FIXME: NOT OPTIMIZED +// tabChanged(0); // FIXME: NOT OPTIMIZED } /*void BNPView::areSelectedNotesCheckedChanged(bool checked) { - m_actCheckNotes->setChecked(checked && currentBasket()->showCheckBoxes()); + m_actCheckNotes->setChecked(checked && currentBasket()->showCheckBoxes()); }*/ void BNPView::enableActions() { - Basket *basket = currentBasket(); - if(!basket) - return; - if(m_actLockBasket) - m_actLockBasket->setEnabled(!basket->isLocked() && basket->isEncrypted()); - if(m_actPassBasket) - m_actPassBasket->setEnabled(!basket->isLocked()); - m_actPropBasket->setEnabled(!basket->isLocked()); - m_actDelBasket->setEnabled(!basket->isLocked()); - m_actExportToHtml->setEnabled(!basket->isLocked()); - m_actShowFilter->setEnabled(!basket->isLocked()); - m_actFilterAllBaskets->setEnabled(!basket->isLocked()); - m_actResetFilter->setEnabled(!basket->isLocked()); - basket->decoration()->filterBar()->setEnabled(!basket->isLocked()); + Basket *basket = currentBasket(); + if (!basket) + return; + if (m_actLockBasket) + m_actLockBasket->setEnabled(!basket->isLocked() && basket->isEncrypted()); + if (m_actPassBasket) + m_actPassBasket->setEnabled(!basket->isLocked()); + m_actPropBasket->setEnabled(!basket->isLocked()); + m_actDelBasket->setEnabled(!basket->isLocked()); + m_actExportToHtml->setEnabled(!basket->isLocked()); + m_actShowFilter->setEnabled(!basket->isLocked()); + m_actFilterAllBaskets->setEnabled(!basket->isLocked()); + m_actResetFilter->setEnabled(!basket->isLocked()); + basket->decoration()->filterBar()->setEnabled(!basket->isLocked()); } void BNPView::showMainWindow() { - KMainWindow *win = Global::mainWindow(); + KMainWindow *win = Global::mainWindow(); - if (win) - { - win->show(); - } - setActive(true); - emit showPart(); + if (win) { + win->show(); + } + setActive(true); + emit showPart(); } void BNPView::populateTagsMenu() { - KMenu *menu = (KMenu*)(popupMenu("tags")); - if (menu == 0 || currentBasket() == 0) // TODO: Display a messagebox. [menu is 0, surely because on first launch, the XMLGUI does not work!] - return; - menu->clear(); + KMenu *menu = (KMenu*)(popupMenu("tags")); + if (menu == 0 || currentBasket() == 0) // TODO: Display a messagebox. [menu is 0, surely because on first launch, the XMLGUI does not work!] + return; + menu->clear(); - Note *referenceNote; - if (currentBasket()->focusedNote() && currentBasket()->focusedNote()->isSelected()) - referenceNote = currentBasket()->focusedNote(); - else - referenceNote = currentBasket()->firstSelected(); + Note *referenceNote; + if (currentBasket()->focusedNote() && currentBasket()->focusedNote()->isSelected()) + referenceNote = currentBasket()->focusedNote(); + else + referenceNote = currentBasket()->firstSelected(); - populateTagsMenu(*menu, referenceNote); + populateTagsMenu(*menu, referenceNote); - m_lastOpenedTagsMenu = menu; -// connect( menu, SIGNAL(aboutToHide()), this, SLOT(disconnectTagsMenu()) ); + m_lastOpenedTagsMenu = menu; +// connect( menu, SIGNAL(aboutToHide()), this, SLOT(disconnectTagsMenu()) ); } void BNPView::populateTagsMenu(KMenu &menu, Note *referenceNote) { - if (currentBasket() == 0) - return; + if (currentBasket() == 0) + return; - currentBasket()->m_tagPopupNote = referenceNote; - bool enable = currentBasket()->countSelecteds() > 0; + currentBasket()->m_tagPopupNote = referenceNote; + bool enable = currentBasket()->countSelecteds() > 0; - QList<Tag*>::iterator it; - Tag *currentTag; - State *currentState; - int i = 10; - for (it = Tag::all.begin(); it != Tag::all.end(); ++it) { - // Current tag and first state of it: - currentTag = *it; - currentState = currentTag->states().first(); + QList<Tag*>::iterator it; + Tag *currentTag; + State *currentState; + int i = 10; + for (it = Tag::all.begin(); it != Tag::all.end(); ++it) { + // Current tag and first state of it: + currentTag = *it; + currentState = currentTag->states().first(); - QKeySequence sequence; - if (!currentTag->shortcut().isEmpty()) - sequence = currentTag->shortcut().primary(); + QKeySequence sequence; + if (!currentTag->shortcut().isEmpty()) + sequence = currentTag->shortcut().primary(); - StateAction *mi = new StateAction(currentState, KShortcut(sequence), this, true); + StateAction *mi = new StateAction(currentState, KShortcut(sequence), this, true); - // The previously set ID will be set in the actions themselves as data. - mi->setData(i); + // The previously set ID will be set in the actions themselves as data. + mi->setData(i); - if (referenceNote && referenceNote->hasTag(currentTag)) - mi->setChecked(true); + if (referenceNote && referenceNote->hasTag(currentTag)) + mi->setChecked(true); - menu.addAction(mi); + menu.addAction(mi); - if (!currentTag->shortcut().isEmpty()) - mi->setShortcut(sequence); + if (!currentTag->shortcut().isEmpty()) + mi->setShortcut(sequence); - mi->setEnabled(enable); - ++i; - } + mi->setEnabled(enable); + ++i; + } - menu.addSeparator(); + menu.addSeparator(); - // I don't like how this is implemented; but I can't think of a better way - // to do this, so I will have to leave it for now - KAction *act = new KAction(i18n("&Assign new Tag..."), &menu); - act->setData(1); - menu.addAction(act); + // I don't like how this is implemented; but I can't think of a better way + // to do this, so I will have to leave it for now + KAction *act = new KAction(i18n("&Assign new Tag..."), &menu); + act->setData(1); + menu.addAction(act); - act = new KAction(KIcon("edit-delete"), i18n("&Remove All"), &menu); - act->setData(2); - menu.addAction(act); + act = new KAction(KIcon("edit-delete"), i18n("&Remove All"), &menu); + act->setData(2); + menu.addAction(act); - act = new KAction(KIcon("configure"), i18n("&Customize..."), &menu); - act->setData(3); - menu.addAction(act); + act = new KAction(KIcon("configure"), i18n("&Customize..."), &menu); + act->setData(3); + menu.addAction(act); - act->setEnabled(enable); - if (!currentBasket()->selectedNotesHaveTags()) - act->setEnabled(false); + act->setEnabled(enable); + if (!currentBasket()->selectedNotesHaveTags()) + act->setEnabled(false); - connect( &menu, SIGNAL(triggered(QAction *)), currentBasket(), SLOT(toggledTagInMenu(QAction *)) ); - connect( &menu, SIGNAL(aboutToHide()), currentBasket(), SLOT(unlockHovering()) ); - connect( &menu, SIGNAL(aboutToHide()), currentBasket(), SLOT(disableNextClick()) ); + connect(&menu, SIGNAL(triggered(QAction *)), currentBasket(), SLOT(toggledTagInMenu(QAction *))); + connect(&menu, SIGNAL(aboutToHide()), currentBasket(), SLOT(unlockHovering())); + connect(&menu, SIGNAL(aboutToHide()), currentBasket(), SLOT(disableNextClick())); } void BNPView::connectTagsMenu() { - connect( popupMenu("tags"), SIGNAL(aboutToShow()), this, SLOT(populateTagsMenu()) ); - connect( popupMenu("tags"), SIGNAL(aboutToHide()), this, SLOT(disconnectTagsMenu()) ); + connect(popupMenu("tags"), SIGNAL(aboutToShow()), this, SLOT(populateTagsMenu())); + connect(popupMenu("tags"), SIGNAL(aboutToHide()), this, SLOT(disconnectTagsMenu())); } /* @@ -2704,37 +2784,37 @@ void BNPView::connectTagsMenu() void BNPView::showEvent(QShowEvent*) { - if (isPart()) - QTimer::singleShot( 0, this, SLOT(connectTagsMenu()) ); + if (isPart()) + QTimer::singleShot(0, this, SLOT(connectTagsMenu())); - if (m_firstShow) { - m_firstShow = false; - onFirstShow(); - } - if (isPart()/*TODO: && !LikeBack::enabledBar()*/) { - Global::likeBack->enableBar(); - } + if (m_firstShow) { + m_firstShow = false; + onFirstShow(); + } + if (isPart()/*TODO: && !LikeBack::enabledBar()*/) { + Global::likeBack->enableBar(); + } } void BNPView::hideEvent(QHideEvent*) { - if (isPart()) { - disconnect( popupMenu("tags"), SIGNAL(aboutToShow()), this, SLOT(populateTagsMenu()) ); - disconnect( popupMenu("tags"), SIGNAL(aboutToHide()), this, SLOT(disconnectTagsMenu()) ); - } + if (isPart()) { + disconnect(popupMenu("tags"), SIGNAL(aboutToShow()), this, SLOT(populateTagsMenu())); + disconnect(popupMenu("tags"), SIGNAL(aboutToHide()), this, SLOT(disconnectTagsMenu())); + } - if (isPart()) - Global::likeBack->disableBar(); + if (isPart()) + Global::likeBack->disableBar(); } void BNPView::disconnectTagsMenu() { - QTimer::singleShot( 0, this, SLOT(disconnectTagsMenuDelayed()) ); + QTimer::singleShot(0, this, SLOT(disconnectTagsMenuDelayed())); } void BNPView::disconnectTagsMenuDelayed() { - disconnect( m_lastOpenedTagsMenu, SIGNAL(triggered(QAction *)), currentBasket(), SLOT(toggledTagInMenu(QAction *)) ); - disconnect( m_lastOpenedTagsMenu, SIGNAL(aboutToHide()), currentBasket(), SLOT(unlockHovering()) ); - disconnect( m_lastOpenedTagsMenu, SIGNAL(aboutToHide()), currentBasket(), SLOT(disableNextClick()) ); + disconnect(m_lastOpenedTagsMenu, SIGNAL(triggered(QAction *)), currentBasket(), SLOT(toggledTagInMenu(QAction *))); + disconnect(m_lastOpenedTagsMenu, SIGNAL(aboutToHide()), currentBasket(), SLOT(unlockHovering())); + disconnect(m_lastOpenedTagsMenu, SIGNAL(aboutToHide()), currentBasket(), SLOT(disableNextClick())); } src/bnpview.cpp @@ -38,7 +38,7 @@ #include "basket_export.h" #include "basketlistview.h" - /// NEW: +/// NEW: class QStackedWidget; class QDomDocument; @@ -63,305 +63,307 @@ class Note; class BASKET_EXPORT BNPView : public QSplitter { - Q_OBJECT - Q_CLASSINFO("D Bus Interface", "org.basket.dbus"); - public: - /// CONSTRUCTOR AND DESTRUCTOR: - BNPView(QWidget *parent, const char *name, KXMLGUIClient *aGUIClient, - KActionCollection *actionCollection, BasketStatusBar *bar); - ~BNPView(); - /// MANAGE CONFIGURATION EVENTS!: - void setTreePlacement(bool onLeft); - void relayoutAllBaskets(); - void recomputeAllStyles(); - void removedStates(const QList<State*> &deletedStates); - 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); - /// For NewBasketDialog (and later some other classes): - int topLevelItemCount(); - /// - BasketListViewItem* topLevelItem(int i); - int basketCount(QTreeWidgetItem *parent = 0); - bool canFold(); - bool canExpand(); - void enableActions(); + Q_OBJECT + Q_CLASSINFO("D Bus Interface", "org.basket.dbus"); +public: + /// CONSTRUCTOR AND DESTRUCTOR: + BNPView(QWidget *parent, const char *name, KXMLGUIClient *aGUIClient, + KActionCollection *actionCollection, BasketStatusBar *bar); + ~BNPView(); + /// MANAGE CONFIGURATION EVENTS!: + void setTreePlacement(bool onLeft); + void relayoutAllBaskets(); + void recomputeAllStyles(); + void removedStates(const QList<State*> &deletedStates); + 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); + /// For NewBasketDialog (and later some other classes): + int topLevelItemCount(); + /// + BasketListViewItem* topLevelItem(int i); + int basketCount(QTreeWidgetItem *parent = 0); + bool canFold(); + bool canExpand(); + void enableActions(); - private: - QDomElement basketElement(QTreeWidgetItem *item, QDomDocument &document, QDomElement &parentElement); - public slots: - void countsChanged(Basket *basket); - void notesStateChanged(); - bool convertTexts(); +private: + QDomElement basketElement(QTreeWidgetItem *item, QDomDocument &document, QDomElement &parentElement); +public slots: + void countsChanged(Basket *basket); + void notesStateChanged(); + bool convertTexts(); - void updateBasketListViewItem(Basket *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 goToPreviousBasket(); - void goToNextBasket(); - void foldBasket(); - void expandBasket(); - void closeAllEditors(); - /// - void toggleFilterAllBaskets(bool doFilter); - void newFilter(); - void newFilterFromFilterBar(); - bool isFilteringAllBaskets(); - // From main window - void importKNotes(); - void importKJots(); - void importKnowIt(); - void importTuxCards(); - void importStickyNotes(); - void importTomboy(); - void importTextFile(); - void backupRestore(); + void updateBasketListViewItem(Basket *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 goToPreviousBasket(); + void goToNextBasket(); + void foldBasket(); + void expandBasket(); + void closeAllEditors(); + /// + void toggleFilterAllBaskets(bool doFilter); + void newFilter(); + void newFilterFromFilterBar(); + bool isFilteringAllBaskets(); + // From main window + void importKNotes(); + void importKJots(); + void importKnowIt(); + void importTuxCards(); + void importStickyNotes(); + void importTomboy(); + void importTextFile(); + void backupRestore(); - /** Note */ - void activatedTagShortcut(); - void exportToHTML(); - void editNote(); - void cutNote(); - void copyNote(); - void delNote(); - void openNote(); - void openNoteWith(); - void saveNoteAs(); - void noteGroup(); - void noteUngroup(); - void moveOnTop(); - void moveOnBottom(); - void moveNoteUp(); - void moveNoteDown(); - void slotSelectAll(); - void slotUnselectAll(); - void slotInvertSelection(); - void slotResetFilter(); + /** Note */ + void activatedTagShortcut(); + void exportToHTML(); + void editNote(); + void cutNote(); + void copyNote(); + void delNote(); + void openNote(); + void openNoteWith(); + void saveNoteAs(); + void noteGroup(); + void noteUngroup(); + void moveOnTop(); + void moveOnBottom(); + void moveNoteUp(); + void moveNoteDown(); + void slotSelectAll(); + void slotUnselectAll(); + void slotInvertSelection(); + void slotResetFilter(); - void slotColorFromScreen(bool global = false); - void slotColorFromScreenGlobal(); - void colorPicked(const QColor &color); - void colorPickingCanceled(); - void slotConvertTexts(); + void slotColorFromScreen(bool global = false); + void slotColorFromScreenGlobal(); + void colorPicked(const QColor &color); + void colorPickingCanceled(); + void slotConvertTexts(); - /** Global shortcuts */ - void addNoteText(); - void addNoteHtml(); - void addNoteImage(); - void addNoteLink(); - void addNoteColor(); - /** Passive Popups for Global Actions */ - void showPassiveDropped(const QString &title); - void showPassiveDroppedDelayed(); // Do showPassiveDropped(), but delayed - void showPassiveContent(bool forceShow = false); - void showPassiveContentForced(); - void showPassiveImpossible(const QString &message); - void showPassiveLoading(Basket *basket); - // For GUI : - void setFiltering(bool filtering); - /** Edit */ - void undo(); - void redo(); - void globalPasteInCurrentBasket(); - void pasteInCurrentBasket(); - void pasteSelInCurrentBasket(); - void pasteToBasket(int index, QClipboard::Mode mode = QClipboard::Clipboard); - void showHideFilterBar(bool show, bool switchFocus = true); - /** Insert **/ - void insertEmpty(int type); - void insertWizard(int type); - void grabScreenshot(bool global = false); - void grabScreenshotGlobal(); - void screenshotGrabbed(const QPixmap &pixmap); - /** Basket */ - void askNewBasket(); - void askNewBasket(Basket *parent, Basket *pickProperties); - void askNewSubBasket(); - void askNewSiblingBasket(); - void aboutToHideNewBasketPopup(); - void setNewBasketPopup(); - void cancelNewBasketPopup(); - void propBasket(); - void delBasket(); - void doBasketDeletion(Basket *basket); - void password(); - void saveAsArchive(); - void openArchive(); - void delayedOpenArchive(); - void lockBasket(); - void hideOnEscape(); + /** Global shortcuts */ + void addNoteText(); + void addNoteHtml(); + void addNoteImage(); + void addNoteLink(); + void addNoteColor(); + /** Passive Popups for Global Actions */ + void showPassiveDropped(const QString &title); + void showPassiveDroppedDelayed(); // Do showPassiveDropped(), but delayed + void showPassiveContent(bool forceShow = false); + void showPassiveContentForced(); + void showPassiveImpossible(const QString &message); + void showPassiveLoading(Basket *basket); + // For GUI : + void setFiltering(bool filtering); + /** Edit */ + void undo(); + void redo(); + void globalPasteInCurrentBasket(); + void pasteInCurrentBasket(); + void pasteSelInCurrentBasket(); + void pasteToBasket(int index, QClipboard::Mode mode = QClipboard::Clipboard); + void showHideFilterBar(bool show, bool switchFocus = true); + /** Insert **/ + void insertEmpty(int type); + void insertWizard(int type); + void grabScreenshot(bool global = false); + void grabScreenshotGlobal(); + void screenshotGrabbed(const QPixmap &pixmap); + /** Basket */ + void askNewBasket(); + void askNewBasket(Basket *parent, Basket *pickProperties); + void askNewSubBasket(); + void askNewSiblingBasket(); + void aboutToHideNewBasketPopup(); + void setNewBasketPopup(); + void cancelNewBasketPopup(); + void propBasket(); + void delBasket(); + void doBasketDeletion(Basket *basket); + void password(); + void saveAsArchive(); + void openArchive(); + void delayedOpenArchive(); + void lockBasket(); + void hideOnEscape(); - void changedSelectedNotes(); - void timeoutTryHide(); - void timeoutHide(); + void changedSelectedNotes(); + void timeoutTryHide(); + void timeoutHide(); - public: - static QString s_fileToOpen; +public: + static QString s_fileToOpen; - public slots: - void addWelcomeBaskets(); - private slots: - void updateNotesActions(); - void slotBasketNumberChanged(int number); - void slotBasketChanged(); - void currentBasketChanged(); - void isLockedChanged(); - void lateInit(); - void onFirstShow(); +public slots: + void addWelcomeBaskets(); +private slots: + void updateNotesActions(); + void slotBasketNumberChanged(int number); + void slotBasketChanged(); + void currentBasketChanged(); + void isLockedChanged(); + void lateInit(); + void onFirstShow(); - public: - KAction *m_actEditNote; - KAction *m_actOpenNote; - KAction *m_actPaste; - KAction *m_actGrabScreenshot; - KAction *m_actColorPicker; - KAction *m_actLockBasket; - KAction *m_actPassBasket; - KAction *actNewBasket; - KAction *actNewSubBasket; - KAction *actNewSiblingBasket; - KAction *m_actHideWindow; - KAction *m_actExportToHtml; - KAction *m_actPropBasket; - KAction *m_actDelBasket; - KToggleAction *m_actFilterAllBaskets; +public: + KAction *m_actEditNote; + KAction *m_actOpenNote; + KAction *m_actPaste; + KAction *m_actGrabScreenshot; + KAction *m_actColorPicker; + KAction *m_actLockBasket; + KAction *m_actPassBasket; + KAction *actNewBasket; + KAction *actNewSubBasket; + KAction *actNewSiblingBasket; + KAction *m_actHideWindow; + KAction *m_actExportToHtml; + KAction *m_actPropBasket; + KAction *m_actDelBasket; + KToggleAction *m_actFilterAllBaskets; - private: - // Basket actions: - KAction *m_actSaveAsArchive; - KAction *m_actOpenArchive; - // Notes actions : - KAction *m_actOpenNoteWith; - KAction *m_actSaveNoteAs; - KAction *m_actGroup; - KAction *m_actUngroup; - KAction *m_actMoveOnTop; - KAction *m_actMoveNoteUp; - KAction *m_actMoveNoteDown; - KAction *m_actMoveOnBottom; - // Edit actions : - KAction *m_actUndo; - KAction *m_actRedo; - KAction *m_actCutNote; - KAction *m_actCopyNote; - KAction *m_actDelNote; - KAction *m_actSelectAll; - KAction *m_actUnselectAll; - KAction *m_actInvertSelection; - // Insert actions : -// KAction *m_actInsertText; - KAction *m_actInsertHtml; - KAction *m_actInsertLink; - KAction *m_actInsertImage; - KAction *m_actInsertColor; - KAction *m_actImportKMenu; - KAction *m_actInsertLauncher; - KAction *m_actImportIcon; - KAction *m_actLoadFile; - QList<KAction*> m_insertActions; - // Basket actions : - KToggleAction *m_actShowFilter; - KAction *m_actResetFilter; - // Go actions : - KAction *m_actPreviousBasket; - KAction *m_actNextBasket; - KAction *m_actFoldBasket; - KAction *m_actExpandBasket; -// KAction *m_convertTexts; // FOR_BETA_PURPOSE +private: + // Basket actions: + KAction *m_actSaveAsArchive; + KAction *m_actOpenArchive; + // Notes actions : + KAction *m_actOpenNoteWith; + KAction *m_actSaveNoteAs; + KAction *m_actGroup; + KAction *m_actUngroup; + KAction *m_actMoveOnTop; + KAction *m_actMoveNoteUp; + KAction *m_actMoveNoteDown; + KAction *m_actMoveOnBottom; + // Edit actions : + KAction *m_actUndo; + KAction *m_actRedo; + KAction *m_actCutNote; + KAction *m_actCopyNote; + KAction *m_actDelNote; + KAction *m_actSelectAll; + KAction *m_actUnselectAll; + KAction *m_actInvertSelection; + // Insert actions : +// KAction *m_actInsertText; + KAction *m_actInsertHtml; + KAction *m_actInsertLink; + KAction *m_actInsertImage; + KAction *m_actInsertColor; + KAction *m_actImportKMenu; + KAction *m_actInsertLauncher; + KAction *m_actImportIcon; + KAction *m_actLoadFile; + QList<KAction*> m_insertActions; + // Basket actions : + KToggleAction *m_actShowFilter; + KAction *m_actResetFilter; + // Go actions : + KAction *m_actPreviousBasket; + KAction *m_actNextBasket; + KAction *m_actFoldBasket; + KAction *m_actExpandBasket; +// KAction *m_convertTexts; // FOR_BETA_PURPOSE - void setupActions(); - void setupGlobalShortcuts(); - DecoratedBasket* currentDecoratedBasket(); + void setupActions(); + void setupGlobalShortcuts(); + DecoratedBasket* currentDecoratedBasket(); - public: - Basket* loadBasket(const QString &folderName); // Public only for class Archive - BasketListViewItem* appendBasket(Basket *basket, QTreeWidgetItem *parentItem); // Public only for class Archive +public: + Basket* loadBasket(const QString &folderName); // Public only for class Archive + BasketListViewItem* appendBasket(Basket *basket, QTreeWidgetItem *parentItem); // Public only for class Archive - Basket* basketForFolderName(const QString &folderName); - Note* noteForFileName(const QString &fileName, Basket &basket, Note* note = 0); - KMenu* popupMenu(const QString &menuName); - bool isPart(); - bool isMainWindowActive(); - void showMainWindow(); + Basket* basketForFolderName(const QString &folderName); + Note* noteForFileName(const QString &fileName, Basket &basket, Note* note = 0); + KMenu* popupMenu(const QString &menuName); + bool isPart(); + bool isMainWindowActive(); + void showMainWindow(); - // TODO: dcop calls -- dbus these - public Q_SLOTS: - Q_SCRIPTABLE void newBasket(); - Q_SCRIPTABLE void handleCommandLine(); - Q_SCRIPTABLE void reloadBasket(const QString &folderName); - Q_SCRIPTABLE bool createNoteHtml(const QString content, const QString basket); - Q_SCRIPTABLE QStringList listBaskets(); - Q_SCRIPTABLE bool createNoteFromFile(const QString url, const QString basket); - Q_SCRIPTABLE bool changeNoteHtml(const QString content, const QString basket, const QString noteName); + // TODO: dcop calls -- dbus these +public Q_SLOTS: + Q_SCRIPTABLE void newBasket(); + Q_SCRIPTABLE void handleCommandLine(); + Q_SCRIPTABLE void reloadBasket(const QString &folderName); + Q_SCRIPTABLE bool createNoteHtml(const QString content, const QString basket); + Q_SCRIPTABLE QStringList listBaskets(); + Q_SCRIPTABLE bool createNoteFromFile(const QString url, const QString basket); + Q_SCRIPTABLE bool changeNoteHtml(const QString content, const QString basket, const QString noteName); - public slots: - void setCaption(QString s); - void updateStatusBarHint(); - void setSelectionStatus(QString s); - void setLockStatus(bool isLocked); - void postStatusbarMessage(const QString&); - void setStatusBarHint(const QString&); - void setUnsavedStatus(bool isUnsaved); - void setActive(bool active = true); - KActionCollection *actionCollection() { return m_actionCollection; }; +public slots: + void setCaption(QString s); + void updateStatusBarHint(); + void setSelectionStatus(QString s); + void setLockStatus(bool isLocked); + void postStatusbarMessage(const QString&); + void setStatusBarHint(const QString&); + void setUnsavedStatus(bool isUnsaved); + void setActive(bool active = true); + KActionCollection *actionCollection() { + return m_actionCollection; + }; - void populateTagsMenu(); - void populateTagsMenu(KMenu &menu, Note *referenceNote); - void connectTagsMenu(); - void disconnectTagsMenu(); - void disconnectTagsMenuDelayed(); - protected: - void showEvent(QShowEvent*); - void hideEvent(QHideEvent*); - private: - KMenu *m_lastOpenedTagsMenu; + void populateTagsMenu(); + void populateTagsMenu(KMenu &menu, Note *referenceNote); + void connectTagsMenu(); + void disconnectTagsMenu(); + void disconnectTagsMenuDelayed(); +protected: + void showEvent(QShowEvent*); + void hideEvent(QHideEvent*); +private: + KMenu *m_lastOpenedTagsMenu; - private slots: - void slotPressed(QTreeWidgetItem *item, int column); - void needSave(QTreeWidgetItem*); - void slotContextMenu(const QPoint &pos); - void slotMouseButtonPressed(int button, QTreeWidgetItem *item, const QPoint &pos, int column); - void slotShowProperties(QTreeWidgetItem *item); - void initialize(); +private slots: + void slotPressed(QTreeWidgetItem *item, int column); + void needSave(QTreeWidgetItem*); + void slotContextMenu(const QPoint &pos); + void slotMouseButtonPressed(int button, QTreeWidgetItem *item, const QPoint &pos, int column); + void slotShowProperties(QTreeWidgetItem *item); + void initialize(); - signals: - void basketNumberChanged(int number); - void basketChanged(); - void setWindowCaption(const QString &s); - void showPart(); +signals: + void basketNumberChanged(int number); + void basketChanged(); + void setWindowCaption(const QString &s); + void showPart(); - protected: - void enterEvent(QEvent*); - void leaveEvent(QEvent*); +protected: + void enterEvent(QEvent*); + void leaveEvent(QEvent*); - private: - BasketTreeListView *m_tree; - QStackedWidget *m_stack; - bool m_loading; - bool m_newBasketPopup; - bool m_firstShow; - DesktopColorPicker *m_colorPicker; - bool m_colorPickWasShown; - bool m_colorPickWasGlobal; - RegionGrabber *m_regionGrabber; - QString m_passiveDroppedTitle; - NoteSelection *m_passiveDroppedSelection; - KPassivePopup *m_passivePopup; - static const int c_delayTooltipTime; - KActionCollection *m_actionCollection; - KXMLGUIClient *m_guiClient; - BasketStatusBar *m_statusbar; - QTimer *m_tryHideTimer; - QTimer *m_hideTimer; +private: + BasketTreeListView *m_tree; + QStackedWidget *m_stack; + bool m_loading; + bool m_newBasketPopup; + bool m_firstShow; + DesktopColorPicker *m_colorPicker; + bool m_colorPickWasShown; + bool m_colorPickWasGlobal; + RegionGrabber *m_regionGrabber; + QString m_passiveDroppedTitle; + NoteSelection *m_passiveDroppedSelection; + KPassivePopup *m_passivePopup; + static const int c_delayTooltipTime; + KActionCollection *m_actionCollection; + KXMLGUIClient *m_guiClient; + BasketStatusBar *m_statusbar; + QTimer *m_tryHideTimer; + QTimer *m_hideTimer; }; #endif // BNPVIEW_H src/bnpview.h @@ -38,10 +38,10 @@ */ DesktopColorPicker::DesktopColorPicker() - : QDesktopWidget() + : QDesktopWidget() { - setObjectName("DesktopColorPicker"); - m_gettingColorFromScreen = false; + setObjectName("DesktopColorPicker"); + m_gettingColorFromScreen = false; } DesktopColorPicker::~DesktopColorPicker() @@ -50,9 +50,9 @@ DesktopColorPicker::~DesktopColorPicker() void DesktopColorPicker::pickColor() { - m_gettingColorFromScreen = true; -// Global::mainContainer->setActive(false); - QTimer::singleShot( 50, this, SLOT(slotDelayedPick()) ); + m_gettingColorFromScreen = true; +// Global::mainContainer->setActive(false); + QTimer::singleShot(50, this, SLOT(slotDelayedPick())); } /* When firered from basket context menu, and not from menu, grabMouse doesn't work! @@ -64,35 +64,35 @@ void DesktopColorPicker::pickColor() */ void DesktopColorPicker::slotDelayedPick() { - grabKeyboard(); - grabMouse(Qt::CrossCursor); + grabKeyboard(); + grabMouse(Qt::CrossCursor); } /* Validate the color */ void DesktopColorPicker::mouseReleaseEvent(QMouseEvent *event) { - if (m_gettingColorFromScreen) { - m_gettingColorFromScreen = false; - releaseMouse(); - releaseKeyboard(); - QColor color = KColorDialog::grabColor(event->globalPos()); - emit pickedColor(color); - } else - QDesktopWidget::mouseReleaseEvent(event); + if (m_gettingColorFromScreen) { + m_gettingColorFromScreen = false; + releaseMouse(); + releaseKeyboard(); + QColor color = KColorDialog::grabColor(event->globalPos()); + emit pickedColor(color); + } else + QDesktopWidget::mouseReleaseEvent(event); } /* Cancel the mode */ void DesktopColorPicker::keyPressEvent(QKeyEvent *event) { - if (m_gettingColorFromScreen) - if (event->key() == Qt::Key_Escape) { - m_gettingColorFromScreen = false; - releaseMouse(); - releaseKeyboard(); - emit canceledPick(); - } - QDesktopWidget::keyPressEvent(event); + if (m_gettingColorFromScreen) + if (event->key() == Qt::Key_Escape) { + m_gettingColorFromScreen = false; + releaseMouse(); + releaseKeyboard(); + emit canceledPick(); + } + QDesktopWidget::keyPressEvent(event); } src/colorpicker.cpp @@ -31,30 +31,30 @@ */ class DesktopColorPicker : public QDesktopWidget { - Q_OBJECT - public: - /** Construtor, initializer and destructor */ - DesktopColorPicker(); - ~DesktopColorPicker(); - public slots: - /** Begin color picking. - * This function returns immediatly, and pickedColor() is emitted if user has - * choosen a color, and not canceled the process (by pressing Escape). - */ - void pickColor(); - signals: - /** When user picked a color, this signal is emitted. - */ - void pickedColor(const QColor &color); - /** When user cancel a picking (by pressing Escape), this signal is emitted. - */ - void canceledPick(); - protected slots: - void slotDelayedPick(); - protected: - void mouseReleaseEvent(QMouseEvent *event); - void keyPressEvent(QKeyEvent *event); - bool m_gettingColorFromScreen; + Q_OBJECT +public: + /** Construtor, initializer and destructor */ + DesktopColorPicker(); + ~DesktopColorPicker(); +public slots: + /** Begin color picking. + * This function returns immediatly, and pickedColor() is emitted if user has + * choosen a color, and not canceled the process (by pressing Escape). + */ + void pickColor(); +signals: + /** When user picked a color, this signal is emitted. + */ + void pickedColor(const QColor &color); + /** When user cancel a picking (by pressing Escape), this signal is emitted. + */ + void canceledPick(); +protected slots: + void slotDelayedPick(); +protected: + void mouseReleaseEvent(QMouseEvent *event); + void keyPressEvent(QKeyEvent *event); + bool m_gettingColorFromScreen; }; #endif // COLORPICKER_H src/colorpicker.h @@ -43,76 +43,76 @@ //#endif - #if 0 - class CrashHandlerWidget : public KDialog { - public: - CrashHandlerWidget(); - }; - #endif - - static QString - runCommand( const QByteArray &command ) - { - static const uint SIZE = 40960; //40 KiB - static char stdoutBuf[ SIZE ]; +#if 0 +class CrashHandlerWidget : public KDialog +{ +public: + CrashHandlerWidget(); +}; +#endif + +static QString +runCommand(const QByteArray &command) +{ + static const uint SIZE = 40960; //40 KiB + static char stdoutBuf[ SIZE ]; // debug() << "Running: " << command << endl; - FILE *process = ::popen( command, "r" ); - stdoutBuf[ std::fread( static_cast<void*>( stdoutBuf ), sizeof(char), SIZE-1, process ) ] = '\0'; - ::pclose( process ); + FILE *process = ::popen(command, "r"); + stdoutBuf[ std::fread(static_cast<void*>(stdoutBuf), sizeof(char), SIZE-1, process)] = '\0'; + ::pclose(process); - return QString::fromLocal8Bit( stdoutBuf ); - } + return QString::fromLocal8Bit(stdoutBuf); +} - void - Crash::crashHandler( int /*signal*/ ) - { - // we need to fork to be able to get a - // semi-decent bt - I dunno why - const pid_t pid = ::fork(); +void +Crash::crashHandler(int /*signal*/) +{ + // we need to fork to be able to get a + // semi-decent bt - I dunno why + const pid_t pid = ::fork(); - if( pid <= 0 ) - { - // we are the child process (the result of the fork) + if (pid <= 0) { + // we are the child process (the result of the fork) // debug() << "amaroK is crashing...\n"; - QString subject = "[basket-crash] " VERSION " "; - QString body = i18n( - "%1 has crashed! We're sorry about this.\n" - "\n" - "But, all is not lost! You could potentially help us fix the crash. " - "Information describing the crash is below, so just click send, " - "or if you have time, write a brief description of how the crash happened first.\n\n" - "Many thanks.", KGlobal::mainComponent().aboutData()->programName()) + "\n\n"; - body += "\n\n\n\n\n\n" + i18n( + QString subject = "[basket-crash] " VERSION " "; + QString body = i18n( + "%1 has crashed! We're sorry about this.\n" + "\n" + "But, all is not lost! You could potentially help us fix the crash. " + "Information describing the crash is below, so just click send, " + "or if you have time, write a brief description of how the crash happened first.\n\n" + "Many thanks.", KGlobal::mainComponent().aboutData()->programName()) + "\n\n"; + body += "\n\n\n\n\n\n" + i18n( "The information below is to help the developers identify the problem, " - "please do not modify it." ) + "\n\n\n\n"; + "please do not modify it.") + "\n\n\n\n"; - body += "======== DEBUG INFORMATION =======\n" - "Version: " VERSION "\n" - "Build date: " __DATE__ "\n" - "CC version: " __VERSION__ "\n" //assuming we're using GCC - "KDElibs: " KDE_VERSION_STRING "\n" -;// "TagLib: %2.%3.%4\n"; + body += "======== DEBUG INFORMATION =======\n" + "Version: " VERSION "\n" + "Build date: " __DATE__ "\n" + "CC version: " __VERSION__ "\n" //assuming we're using GCC + "KDElibs: " KDE_VERSION_STRING "\n" + ;// "TagLib: %2.%3.%4\n"; -/* body = body - .arg( TAGLIB_MAJOR_VERSION ) - .arg( TAGLIB_MINOR_VERSION ) - .arg( TAGLIB_PATCH_VERSION );*/ + /* body = body + .arg( TAGLIB_MAJOR_VERSION ) + .arg( TAGLIB_MINOR_VERSION ) + .arg( TAGLIB_PATCH_VERSION );*/ - #ifdef NDEBUG - body += "NDEBUG: true"; - #endif - body += "\n"; +#ifdef NDEBUG + body += "NDEBUG: true"; +#endif + body += "\n"; - /// obtain the backtrace with gdb + /// obtain the backtrace with gdb - KTemporaryFile temp; - temp.setAutoRemove( true ); + KTemporaryFile temp; + temp.setAutoRemove(true); - const int handle = temp.handle(); + const int handle = temp.handle(); // QCString gdb_command_string = // "file amarokapp\n" @@ -120,109 +120,107 @@ // "bt\n" "echo \\n\n" // "thread apply all bt\n"; - const QByteArray gdb_batch = - "bt\n" - "echo \\n\\n\n" - "bt full\n" - "echo \\n\\n\n" - "echo ==== (gdb) thread apply all bt ====\\n\n" - "thread apply all bt\n"; - - ::write( handle, gdb_batch, gdb_batch.length() ); - ::fsync( handle ); - - // so we can read stderr too - ::dup2( fileno( stdout ), fileno( stderr ) ); - - - QByteArray gdb; - gdb = "gdb --nw -n --batch -x "; - gdb += temp.fileName().toLatin1(); - gdb += " basket "; - gdb += QByteArray().setNum( ::getppid() ); - - QString bt = runCommand( gdb ); - - /// clean up - bt.remove( "(no debugging symbols found)..." ); - bt.remove( "(no debugging symbols found)\n" ); - bt.replace( QRegExp("\n{2,}"), "\n" ); //clean up multiple \n characters - bt.trimmed(); - - /// analyze usefulness - bool useful = true; - const QString fileCommandOutput = runCommand( "file `which basket`" ); - - if( fileCommandOutput.indexOf("not stripped") == -1 ) - subject += "[___stripped]"; //same length as below - else - subject += "[NOTstripped]"; - - if( !bt.isEmpty() ) { - const int invalidFrames = bt.count( QRegExp("\n#[0-9]+\\s+0x[0-9A-Fa-f]+ in \\?\\?") ); - const int validFrames = bt.count( QRegExp("\n#[0-9]+\\s+0x[0-9A-Fa-f]+ in [^?]") ); - const int totalFrames = invalidFrames + validFrames; - - if( totalFrames > 0 ) { - const double validity = double(validFrames) / totalFrames; - subject += QString("[validity: %1]").arg( validity, 0, 'f', 2 ); - if( validity <= 0.5 ) useful = false; - } - subject += QString("[frames: %1]").arg( totalFrames, 3 /*padding*/ ); - - if( bt.indexOf( QRegExp(" at \\w*\\.cpp:\\d+\n") ) != -1 ) - subject += "[line numbers]"; + const QByteArray gdb_batch = + "bt\n" + "echo \\n\\n\n" + "bt full\n" + "echo \\n\\n\n" + "echo ==== (gdb) thread apply all bt ====\\n\n" + "thread apply all bt\n"; + + ::write(handle, gdb_batch, gdb_batch.length()); + ::fsync(handle); + + // so we can read stderr too + ::dup2(fileno(stdout), fileno(stderr)); + + + QByteArray gdb; + gdb = "gdb --nw -n --batch -x "; + gdb += temp.fileName().toLatin1(); + gdb += " basket "; + gdb += QByteArray().setNum(::getppid()); + + QString bt = runCommand(gdb); + + /// clean up + bt.remove("(no debugging symbols found)..."); + bt.remove("(no debugging symbols found)\n"); + bt.replace(QRegExp("\n{2,}"), "\n"); //clean up multiple \n characters + bt.trimmed(); + + /// analyze usefulness + bool useful = true; + const QString fileCommandOutput = runCommand("file `which basket`"); + + if (fileCommandOutput.indexOf("not stripped") == -1) + subject += "[___stripped]"; //same length as below + else + subject += "[NOTstripped]"; + + if (!bt.isEmpty()) { + const int invalidFrames = bt.count(QRegExp("\n#[0-9]+\\s+0x[0-9A-Fa-f]+ in \\?\\?")); + const int validFrames = bt.count(QRegExp("\n#[0-9]+\\s+0x[0-9A-Fa-f]+ in [^?]")); + const int totalFrames = invalidFrames + validFrames; + + if (totalFrames > 0) { + const double validity = double(validFrames) / totalFrames; + subject += QString("[validity: %1]").arg(validity, 0, 'f', 2); + if (validity <= 0.5) useful = false; } - else - useful = false; + subject += QString("[frames: %1]").arg(totalFrames, 3 /*padding*/); + + if (bt.indexOf(QRegExp(" at \\w*\\.cpp:\\d+\n")) != -1) + subject += "[line numbers]"; + } else + useful = false; // subject += QString("[%1]").arg( AmarokConfig::soundSystem().remove( QRegExp("-?engine") ) ); // debug() << subject << endl; - //TODO -fomit-frame-pointer buggers up the backtrace, so detect it - //TODO -O optimization can rearrange execution and stuff so show a warning for the developer - //TODO pass the CXXFLAGS used with the email + //TODO -fomit-frame-pointer buggers up the backtrace, so detect it + //TODO -O optimization can rearrange execution and stuff so show a warning for the developer + //TODO pass the CXXFLAGS used with the email - if( useful ) { - body += "==== file `which basket` ==========\n"; - body += fileCommandOutput + "\n"; - body += "==== (gdb) bt =====================\n"; - body += bt;//+ "\n\n"; + if (useful) { + body += "==== file `which basket` ==========\n"; + body += fileCommandOutput + "\n"; + body += "==== (gdb) bt =====================\n"; + body += bt;//+ "\n\n"; // body += "==== kBacktrace() ================\n"; // body += kBacktrace(); - //TODO startup notification - KToolInvocation::invokeMailer( - /*to*/ "kelvie@ieee.org", - /*cc*/ QString(), - /*bcc*/ QString(), - /*subject*/ subject, - /*body*/ body, - /*messageFile*/ QString(), - /*attachURLs*/ QStringList(), - /*startup_id*/ "" ); - } - else { - kDebug() << "\n" + i18n( "%1 has crashed! We're sorry about this.\n\n" - "But, all is not lost! Perhaps an upgrade is already available " - "which fixes the problem. Please check your distribution's software repository.", - KGlobal::mainComponent().aboutData()->programName()); - } - - //_exit() exits immediately, otherwise this - //function is called repeatedly ad finitum - ::_exit( 255 ); + //TODO startup notification + KToolInvocation::invokeMailer( + /*to*/ "kelvie@ieee.org", + /*cc*/ QString(), + /*bcc*/ QString(), + /*subject*/ subject, + /*body*/ body, + /*messageFile*/ QString(), + /*attachURLs*/ QStringList(), + /*startup_id*/ ""); + } else { + kDebug() << "\n" + i18n("%1 has crashed! We're sorry about this.\n\n" + "But, all is not lost! Perhaps an upgrade is already available " + "which fixes the problem. Please check your distribution's software repository.", + KGlobal::mainComponent().aboutData()->programName()); } - else { - // we are the process that crashed + //_exit() exits immediately, otherwise this + //function is called repeatedly ad finitum + ::_exit(255); + } + + else { + // we are the process that crashed - ::alarm( 0 ); + ::alarm(0); - // wait for child to exit - ::waitpid( pid, NULL, 0 ); - ::_exit( 253 ); - } + // wait for child to exit + ::waitpid(pid, NULL, 0); + ::_exit(253); } +} src/crashhandler.cpp @@ -15,17 +15,17 @@ #include <kcrash.h> //for main.cpp - /** - * @author Max Howell - * @short The amaroK crash-handler - * - * I'm not entirely sure why this had to be inside a class, but it - * wouldn't work otherwise *shrug* - */ - class Crash - { - public: - static void crashHandler( int signal ); - }; +/** + * @author Max Howell + * @short The amaroK crash-handler + * + * I'm not entirely sure why this had to be inside a class, but it + * wouldn't work otherwise *shrug* + */ +class Crash +{ +public: + static void crashHandler(int signal); +}; #endif src/crashhandler.h @@ -31,45 +31,45 @@ #include "debugwindow.h" DebugWindow::DebugWindow(QWidget *parent) - : QWidget(parent) + : QWidget(parent) { - Global::debugWindow = this; - setWindowTitle(i18n("Debug Window")); + Global::debugWindow = this; + setWindowTitle(i18n("Debug Window")); - layout = new QVBoxLayout(this); - textBrowser = new QTextBrowser(this); + layout = new QVBoxLayout(this); + textBrowser = new QTextBrowser(this); - textBrowser->setWordWrapMode(QTextOption::NoWrap); + textBrowser->setWordWrapMode(QTextOption::NoWrap); - layout->addWidget(textBrowser); - textBrowser->show(); + layout->addWidget(textBrowser); + textBrowser->show(); } DebugWindow::~DebugWindow() { - delete textBrowser; - delete layout; + delete textBrowser; + delete layout; } void DebugWindow::postMessage(const QString msg) { - textBrowser->append(msg); + textBrowser->append(msg); } DebugWindow& DebugWindow::operator<<(const QString msg) { - textBrowser->append(msg); - return *this; + textBrowser->append(msg); + return *this; } void DebugWindow::insertHLine() { - textBrowser->append("<hr>"); + textBrowser->append("<hr>"); } void DebugWindow::closeEvent(QCloseEvent *event) { - Global::debugWindow = 0L; - QWidget::closeEvent(event); + Global::debugWindow = 0L; + QWidget::closeEvent(event); } src/debugwindow.cpp @@ -35,21 +35,22 @@ class QCloseEvent; *@author Sébastien Laoût */ -class DebugWindow : public QWidget { - Q_OBJECT - public: - /** Construtor and destructor */ - DebugWindow(QWidget *parent = 0); - ~DebugWindow(); - /** Methods to post a message to the debug window */ - void postMessage(const QString msg); - DebugWindow& operator<<(const QString msg); - void insertHLine(); - protected: - virtual void closeEvent(QCloseEvent *event); - private: - QVBoxLayout *layout; - QTextBrowser *textBrowser; +class DebugWindow : public QWidget +{ + Q_OBJECT +public: + /** Construtor and destructor */ + DebugWindow(QWidget *parent = 0); + ~DebugWindow(); + /** Methods to post a message to the debug window */ + void postMessage(const QString msg); + DebugWindow& operator<<(const QString msg); + void insertHLine(); +protected: + virtual void closeEvent(QCloseEvent *event); +private: + QVBoxLayout *layout; + QTextBrowser *textBrowser; }; #define DEBUG_WIN if (Global::debugWindow) *Global::debugWindow src/debugwindow.h @@ -37,55 +37,55 @@ #include "global.h" ExporterDialog::ExporterDialog(Basket *basket, QWidget *parent, const char *name) - : KDialog(parent) - , m_basket(basket) + : KDialog(parent) + , m_basket(basket) { - // Dialog options - setObjectName(name); - setModal(true); - setCaption(i18n("Export Basket to HTML")); - setButtons(Ok | Cancel); - setDefaultButton(Ok); - showButtonSeparator(true); - connect(this, SIGNAL(okClicked()), SLOT(save())); - - KVBox *page = new KVBox(this); - QWidget *wid = new QWidget(page); + // Dialog options + setObjectName(name); + setModal(true); + setCaption(i18n("Export Basket to HTML")); + setButtons(Ok | Cancel); + setDefaultButton(Ok); + showButtonSeparator(true); + connect(this, SIGNAL(okClicked()), SLOT(save())); + + KVBox *page = new KVBox(this); + QWidget *wid = new QWidget(page); setMainWidget(wid); - //QHBoxLayout *hLay = new QHBoxLayout(wid, /*margin=*/0, spacingHint()); - QHBoxLayout *hLay = new QHBoxLayout(wid); - m_url = new KUrlRequester(KUrl(""), wid); - m_url->setWindowTitle(i18n("HTML Page Filename")); - m_url->setFilter("text/html"); - m_url->fileDialog()->setOperationMode(KFileDialog::Saving); - QLabel *fileLabel = new QLabel(wid); - fileLabel->setText(i18n("&Filename:")); - fileLabel->setBuddy(m_url); - hLay->addWidget( fileLabel ); - hLay->addWidget( m_url ); - - m_embedLinkedFiles = new QCheckBox(i18n("&Embed linked local files"), page); - m_embedLinkedFolders = new QCheckBox(i18n("Embed &linked local folders"), page); - m_erasePreviousFiles = new QCheckBox(i18n("Erase &previous files in target folder"), page); - m_formatForImpression = new QCheckBox(i18n("For&mat for impression"), page); - m_formatForImpression->hide(); - - load(); - m_url->lineEdit()->setFocus(); - - //showTile(true); - // Add a stretch at the bottom: - // Duplicated code from AddBasketWizard::addStretch(QWidget *parent): - (new QWidget(page))->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - - // Double the width, because the filename should be visible - QSize size(sizeHint()); - resize(QSize(size.width() * 2, size.height())); -/* -========================== -+ [00000000000 ] Progress bar! -+ newBasket -> name folder as the basket -*/ + //QHBoxLayout *hLay = new QHBoxLayout(wid, /*margin=*/0, spacingHint()); + QHBoxLayout *hLay = new QHBoxLayout(wid); + m_url = new KUrlRequester(KUrl(""), wid); + m_url->setWindowTitle(i18n("HTML Page Filename")); + m_url->setFilter("text/html"); + m_url->fileDialog()->setOperationMode(KFileDialog::Saving); + QLabel *fileLabel = new QLabel(wid); + fileLabel->setText(i18n("&Filename:")); + fileLabel->setBuddy(m_url); + hLay->addWidget(fileLabel); + hLay->addWidget(m_url); + + m_embedLinkedFiles = new QCheckBox(i18n("&Embed linked local files"), page); + m_embedLinkedFolders = new QCheckBox(i18n("Embed &linked local folders"), page); + m_erasePreviousFiles = new QCheckBox(i18n("Erase &previous files in target folder"), page); + m_formatForImpression = new QCheckBox(i18n("For&mat for impression"), page); + m_formatForImpression->hide(); + + load(); + m_url->lineEdit()->setFocus(); + + //showTile(true); + // Add a stretch at the bottom: + // Duplicated code from AddBasketWizard::addStretch(QWidget *parent): + (new QWidget(page))->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + + // Double the width, because the filename should be visible + QSize size(sizeHint()); + resize(QSize(size.width() * 2, size.height())); + /* + ========================== + + [00000000000 ] Progress bar! + + newBasket -> name folder as the basket + */ } ExporterDialog::~ExporterDialog() @@ -94,66 +94,66 @@ ExporterDialog::~ExporterDialog() void ExporterDialog::show() { - KDialog::show(); + KDialog::show(); - QString lineEditText = m_url->lineEdit()->text(); - int selectionStart = lineEditText.lastIndexOf("/") + 1; - m_url->lineEdit()->setSelection(selectionStart, lineEditText.length() - selectionStart - QString(".html").length()); + QString lineEditText = m_url->lineEdit()->text(); + int selectionStart = lineEditText.lastIndexOf("/") + 1; + m_url->lineEdit()->setSelection(selectionStart, lineEditText.length() - selectionStart - QString(".html").length()); } void ExporterDialog::load() { KConfigGroup config = Global::config()->group("HTML Export"); - QString folder = config.readEntry("lastFolder", QDir::homePath()) + "/"; - QString url = folder + QString(m_basket->basketName()).replace("/", "_") + ".html"; - m_url->setUrl(KUrl(url)); + QString folder = config.readEntry("lastFolder", QDir::homePath()) + "/"; + QString url = folder + QString(m_basket->basketName()).replace("/", "_") + ".html"; + m_url->setUrl(KUrl(url)); - m_embedLinkedFiles->setChecked( config.readEntry("embedLinkedFiles", true) ); - m_embedLinkedFolders->setChecked( config.readEntry("embedLinkedFolders", false) ); - m_erasePreviousFiles->setChecked( config.readEntry("erasePreviousFiles", true) ); - m_formatForImpression->setChecked( config.readEntry("formatForImpression", false) ); + m_embedLinkedFiles->setChecked(config.readEntry("embedLinkedFiles", true)); + m_embedLinkedFolders->setChecked(config.readEntry("embedLinkedFolders", false)); + m_erasePreviousFiles->setChecked(config.readEntry("erasePreviousFiles", true)); + m_formatForImpression->setChecked(config.readEntry("formatForImpression", false)); } void ExporterDialog::save() { KConfigGroup config = Global::config()->group("HTML Export"); - QString folder = KUrl(m_url->url()).directory(); - config.writeEntry( "lastFolder", folder ); - config.writeEntry( "embedLinkedFiles", m_embedLinkedFiles->isChecked() ); - config.writeEntry( "embedLinkedFolders", m_embedLinkedFolders->isChecked() ); - config.writeEntry( "erasePreviousFiles", m_erasePreviousFiles->isChecked() ); - config.writeEntry( "formatForImpression", m_formatForImpression->isChecked() ); + QString folder = KUrl(m_url->url()).directory(); + config.writeEntry("lastFolder", folder); + config.writeEntry("embedLinkedFiles", m_embedLinkedFiles->isChecked()); + config.writeEntry("embedLinkedFolders", m_embedLinkedFolders->isChecked()); + config.writeEntry("erasePreviousFiles", m_erasePreviousFiles->isChecked()); + config.writeEntry("formatForImpression", m_formatForImpression->isChecked()); } void ExporterDialog::accept() { - save(); + save(); } QString ExporterDialog::filePath() { - return m_url->url().url(); + return m_url->url().url(); } bool ExporterDialog::embedLinkedFiles() { - return m_embedLinkedFiles->isChecked(); + return m_embedLinkedFiles->isChecked(); } bool ExporterDialog::embedLinkedFolders() { - return m_embedLinkedFolders->isChecked(); + return m_embedLinkedFolders->isChecked(); } bool ExporterDialog::erasePreviousFiles() { - return m_erasePreviousFiles->isChecked(); + return m_erasePreviousFiles->isChecked(); } bool ExporterDialog::formatForImpression() { - return m_formatForImpression->isChecked(); + return m_formatForImpression->isChecked(); } src/exporterdialog.cpp @@ -34,28 +34,28 @@ class Basket; */ class ExporterDialog : public KDialog { - Q_OBJECT - public: - ExporterDialog(Basket *basket, QWidget *parent = 0, const char *name = 0); - ~ExporterDialog(); - QString filePath(); - bool embedLinkedFiles(); - bool embedLinkedFolders(); - bool erasePreviousFiles(); - bool formatForImpression(); - void show(); + Q_OBJECT +public: + ExporterDialog(Basket *basket, QWidget *parent = 0, const char *name = 0); + ~ExporterDialog(); + QString filePath(); + bool embedLinkedFiles(); + bool embedLinkedFolders(); + bool erasePreviousFiles(); + bool formatForImpression(); + void show(); - protected slots: - void load(); - void save(); +protected slots: + void load(); + void save(); void accept(); - private: - Basket *m_basket; - KUrlRequester *m_url; - QCheckBox *m_embedLinkedFiles; - QCheckBox *m_embedLinkedFolders; - QCheckBox *m_erasePreviousFiles; - QCheckBox *m_formatForImpression; +private: + Basket *m_basket; + KUrlRequester *m_url; + QCheckBox *m_embedLinkedFiles; + QCheckBox *m_embedLinkedFolders; + QCheckBox *m_erasePreviousFiles; + QCheckBox *m_formatForImpression; }; #endif // EXPORTERDIALOG_H src/exporterdialog.h @@ -48,72 +48,72 @@ /** FilterBar */ FilterBar::FilterBar(QWidget *parent) - : QWidget(parent)/*, m_blinkTimer(this), m_blinkedTimes(0)*/ + : QWidget(parent)/*, m_blinkTimer(this), m_blinkedTimes(0)*/ { - QHBoxLayout *hBox = new QHBoxLayout(this); - - // Create every widgets: - // (Aaron Seigo says we don't need to worry about the - // "Toolbar group" stuff anymore.) - - QIcon resetIcon = KIcon("dialog-close", KIconLoader::global()); - QIcon inAllIcon = KIcon("edit-find", KIconLoader::global()); - - m_resetButton = new QToolButton(this); - m_resetButton->setIcon(resetIcon); - m_resetButton->setText(i18n("Reset Filter"));//, /*groupText=*/"", this, SLOT(reset()), 0); - m_resetButton->setAutoRaise(true); - //new KToolBarButton("locationbar_erase", /*id=*/1230, this, /*name=*/0, i18n("Reset Filter")); - m_lineEdit = new KLineEdit(this); - QLabel *label = new QLabel(this); - label->setText(i18n("&Filter: ")); - label->setBuddy(m_lineEdit); - m_tagsBox = new KComboBox(this); - QLabel *label2 = new QLabel(this); - label2->setText(i18n("T&ag: ")); - label2->setBuddy(m_tagsBox); - m_inAllBasketsButton = new QToolButton(this); - m_inAllBasketsButton->setIcon(inAllIcon); - m_inAllBasketsButton->setText(i18n("Filter All Baskets"));//, /*groupText=*/"", this, SLOT(inAllBaskets()), 0); - m_inAllBasketsButton->setAutoRaise(true); - - // Configure the Tags combobox: - repopulateTagsCombo(); - - // Configure the Search in all Baskets button: - m_inAllBasketsButton->setCheckable(true); -// m_inAllBasketsButton->setChecked(true); -// Global::bnpView->toggleFilterAllBaskets(true); - -// m_lineEdit->setMaximumWidth(150); - m_lineEdit->setClearButtonShown(true); - - // Layout all those widgets: -// hBox->addStretch(); - hBox->addWidget(m_resetButton); - hBox->addSpacing(KDialog::spacingHint()); - hBox->addWidget(label); - hBox->addWidget(m_lineEdit); - hBox->addSpacing(KDialog::spacingHint()); - hBox->addWidget(label2); - hBox->addWidget(m_tagsBox); - hBox->addSpacing(KDialog::spacingHint()); - hBox->addWidget(m_inAllBasketsButton); - - m_data = new FilterData(); // TODO: Not a pointer! and return a const & !! - -// connect( &m_blinkTimer, SIGNAL(timeout()), this, SLOT(blinkBar()) ); - connect( m_resetButton, SIGNAL(clicked()), this, SLOT(reset()) ); - connect( m_lineEdit, SIGNAL(textChanged(const QString&)), this, SLOT(changeFilter()) ); - connect( m_tagsBox, SIGNAL(activated(int)), this, SLOT(tagChanged(int)) ); - -// connect( m_inAllBasketsButton, SIGNAL(clicked()), this, SLOT(inAllBaskets()) ); - connect( m_inAllBasketsButton, SIGNAL(toggled(bool)), Global::bnpView, SLOT(toggleFilterAllBaskets(bool)) ); - - FocusWidgetFilter *lineEditF = new FocusWidgetFilter(m_lineEdit); - m_tagsBox->installEventFilter(lineEditF); - connect(lineEditF, SIGNAL(escapePressed()), SLOT(reset())); - connect(lineEditF, SIGNAL(returnPressed()), SLOT(changeFilter())); + QHBoxLayout *hBox = new QHBoxLayout(this); + + // Create every widgets: + // (Aaron Seigo says we don't need to worry about the + // "Toolbar group" stuff anymore.) + + QIcon resetIcon = KIcon("dialog-close", KIconLoader::global()); + QIcon inAllIcon = KIcon("edit-find", KIconLoader::global()); + + m_resetButton = new QToolButton(this); + m_resetButton->setIcon(resetIcon); + m_resetButton->setText(i18n("Reset Filter"));//, /*groupText=*/"", this, SLOT(reset()), 0); + m_resetButton->setAutoRaise(true); + //new KToolBarButton("locationbar_erase", /*id=*/1230, this, /*name=*/0, i18n("Reset Filter")); + m_lineEdit = new KLineEdit(this); + QLabel *label = new QLabel(this); + label->setText(i18n("&Filter: ")); + label->setBuddy(m_lineEdit); + m_tagsBox = new KComboBox(this); + QLabel *label2 = new QLabel(this); + label2->setText(i18n("T&ag: ")); + label2->setBuddy(m_tagsBox); + m_inAllBasketsButton = new QToolButton(this); + m_inAllBasketsButton->setIcon(inAllIcon); + m_inAllBasketsButton->setText(i18n("Filter All Baskets"));//, /*groupText=*/"", this, SLOT(inAllBaskets()), 0); + m_inAllBasketsButton->setAutoRaise(true); + + // Configure the Tags combobox: + repopulateTagsCombo(); + + // Configure the Search in all Baskets button: + m_inAllBasketsButton->setCheckable(true); +// m_inAllBasketsButton->setChecked(true); +// Global::bnpView->toggleFilterAllBaskets(true); + +// m_lineEdit->setMaximumWidth(150); + m_lineEdit->setClearButtonShown(true); + + // Layout all those widgets: +// hBox->addStretch(); + hBox->addWidget(m_resetButton); + hBox->addSpacing(KDialog::spacingHint()); + hBox->addWidget(label); + hBox->addWidget(m_lineEdit); + hBox->addSpacing(KDialog::spacingHint()); + hBox->addWidget(label2); + hBox->addWidget(m_tagsBox); + hBox->addSpacing(KDialog::spacingHint()); + hBox->addWidget(m_inAllBasketsButton); + + m_data = new FilterData(); // TODO: Not a pointer! and return a const & !! + +// connect( &m_blinkTimer, SIGNAL(timeout()), this, SLOT(blinkBar()) ); + connect(m_resetButton, SIGNAL(clicked()), this, SLOT(reset())); + connect(m_lineEdit, SIGNAL(textChanged(const QString&)), this, SLOT(changeFilter())); + connect(m_tagsBox, SIGNAL(activated(int)), this, SLOT(tagChanged(int))); + +// connect( m_inAllBasketsButton, SIGNAL(clicked()), this, SLOT(inAllBaskets()) ); + connect(m_inAllBasketsButton, SIGNAL(toggled(bool)), Global::bnpView, SLOT(toggleFilterAllBaskets(bool))); + + FocusWidgetFilter *lineEditF = new FocusWidgetFilter(m_lineEdit); + m_tagsBox->installEventFilter(lineEditF); + connect(lineEditF, SIGNAL(escapePressed()), SLOT(reset())); + connect(lineEditF, SIGNAL(returnPressed()), SLOT(changeFilter())); } FilterBar::~FilterBar() @@ -122,204 +122,204 @@ FilterBar::~FilterBar() void FilterBar::setFilterAll(bool filterAll) { - m_inAllBasketsButton->setChecked(filterAll); + m_inAllBasketsButton->setChecked(filterAll); } void FilterBar::setFilterData(const FilterData &data) { - m_lineEdit->setText(data.string); - - int index = 0; - switch (data.tagFilterType) { - default: - case FilterData::DontCareTagsFilter: index = 0; break; - case FilterData::NotTaggedFilter: index = 1; break; - case FilterData::TaggedFilter: index = 2; break; - case FilterData::TagFilter: filterTag(data.tag); return; - case FilterData::StateFilter: filterState(data.state); return; - } - - if (m_tagsBox->currentIndex() != index) { - m_tagsBox->setCurrentIndex(index); - tagChanged(index); - } + m_lineEdit->setText(data.string); + + int index = 0; + switch (data.tagFilterType) { + default: + case FilterData::DontCareTagsFilter: index = 0; break; + case FilterData::NotTaggedFilter: index = 1; break; + case FilterData::TaggedFilter: index = 2; break; + case FilterData::TagFilter: filterTag(data.tag); return; + case FilterData::StateFilter: filterState(data.state); return; + } + + if (m_tagsBox->currentIndex() != index) { + m_tagsBox->setCurrentIndex(index); + tagChanged(index); + } } void FilterBar::repopulateTagsCombo() { - static const int ICON_SIZE = 16; - - m_tagsBox->clear(); - m_tagsMap.clear(); - m_statesMap.clear(); - - m_tagsBox->addItem(""); - m_tagsBox->addItem(i18n("(Not tagged)")); - m_tagsBox->addItem(i18n("(Tagged)")); - - int index = 3; - Tag *tag; - State *state; - QString icon; - QString text; - QPixmap emblem; - for (Tag::List::iterator it = Tag::all.begin(); it != Tag::all.end(); ++it) { - tag = *it; - state = tag->states().first(); - // Insert the tag in the combo-box: - if (tag->countStates() > 1) { - text = tag->name(); - icon = ""; - } else { - text = state->name(); - icon = state->emblem(); - } - emblem = KIconLoader::global()->loadIcon( - icon, KIconLoader::Desktop, ICON_SIZE, KIconLoader::DefaultState, - QStringList(), 0L, /*canReturnNull=*/true - ); - m_tagsBox->insertItem(index, emblem, text); - // Update the mapping: - m_tagsMap.insert(index, tag); - ++index; - // Insert sub-states, if needed: - if (tag->countStates() > 1) { - for (State::List::iterator it2 = tag->states().begin(); it2 != tag->states().end(); ++it2) { - state = *it2; - // Insert the state: - text = state->name(); - icon = state->emblem(); - emblem = KIconLoader::global()->loadIcon( - icon, KIconLoader::Desktop, ICON_SIZE, - KIconLoader::DefaultState, QStringList(), 0L, - /*canReturnNull=*/true - ); - // Indent the emblem to show the hierarchy relation: - if (!emblem.isNull()) - emblem = Tools::indentPixmap(emblem, /*depth=*/1, /*deltaX=*/2 * ICON_SIZE / 3); - m_tagsBox->insertItem(index, emblem, text); - // Update the mapping: - m_statesMap.insert(index, state); - ++index; - } - } - } + static const int ICON_SIZE = 16; + + m_tagsBox->clear(); + m_tagsMap.clear(); + m_statesMap.clear(); + + m_tagsBox->addItem(""); + m_tagsBox->addItem(i18n("(Not tagged)")); + m_tagsBox->addItem(i18n("(Tagged)")); + + int index = 3; + Tag *tag; + State *state; + QString icon; + QString text; + QPixmap emblem; + for (Tag::List::iterator it = Tag::all.begin(); it != Tag::all.end(); ++it) { + tag = *it; + state = tag->states().first(); + // Insert the tag in the combo-box: + if (tag->countStates() > 1) { + text = tag->name(); + icon = ""; + } else { + text = state->name(); + icon = state->emblem(); + } + emblem = KIconLoader::global()->loadIcon( + icon, KIconLoader::Desktop, ICON_SIZE, KIconLoader::DefaultState, + QStringList(), 0L, /*canReturnNull=*/true + ); + m_tagsBox->insertItem(index, emblem, text); + // Update the mapping: + m_tagsMap.insert(index, tag); + ++index; + // Insert sub-states, if needed: + if (tag->countStates() > 1) { + for (State::List::iterator it2 = tag->states().begin(); it2 != tag->states().end(); ++it2) { + state = *it2; + // Insert the state: + text = state->name(); + icon = state->emblem(); + emblem = KIconLoader::global()->loadIcon( + icon, KIconLoader::Desktop, ICON_SIZE, + KIconLoader::DefaultState, QStringList(), 0L, + /*canReturnNull=*/true + ); + // Indent the emblem to show the hierarchy relation: + if (!emblem.isNull()) + emblem = Tools::indentPixmap(emblem, /*depth=*/1, /*deltaX=*/2 * ICON_SIZE / 3); + m_tagsBox->insertItem(index, emblem, text); + // Update the mapping: + m_statesMap.insert(index, state); + ++index; + } + } + } } void FilterBar::reset() { - m_lineEdit->setText(""); // m_data->isFiltering will be set to false; - m_lineEdit->clearFocus(); - changeFilter(); - if (m_tagsBox->currentIndex() != 0) { - m_tagsBox->setCurrentIndex(0); - tagChanged(0); - } - hide(); - emit newFilter(*m_data); + m_lineEdit->setText(""); // m_data->isFiltering will be set to false; + m_lineEdit->clearFocus(); + changeFilter(); + if (m_tagsBox->currentIndex() != 0) { + m_tagsBox->setCurrentIndex(0); + tagChanged(0); + } + hide(); + emit newFilter(*m_data); } void FilterBar::filterTag(Tag *tag) { - int index = 0; - - for (QMap<int, Tag*>::Iterator it = m_tagsMap.begin(); it != m_tagsMap.end(); ++it) - if (it.value() == tag) { - index = it.key(); - break; - } - if (index <= 0) - return; - - if (m_tagsBox->currentIndex() != index) { - m_tagsBox->setCurrentIndex(index); - tagChanged(index); - } + int index = 0; + + for (QMap<int, Tag*>::Iterator it = m_tagsMap.begin(); it != m_tagsMap.end(); ++it) + if (it.value() == tag) { + index = it.key(); + break; + } + if (index <= 0) + return; + + if (m_tagsBox->currentIndex() != index) { + m_tagsBox->setCurrentIndex(index); + tagChanged(index); + } } void FilterBar::filterState(State *state) { - int index = 0; - - for (QMap<int, State*>::Iterator it = m_statesMap.begin(); it != m_statesMap.end(); ++it) - if (it.value() == state) { - index = it.key(); - break; - } - if (index <= 0) - return; - - if (m_tagsBox->currentIndex() != index) { - m_tagsBox->setCurrentIndex(index); - tagChanged(index); - } + int index = 0; + + for (QMap<int, State*>::Iterator it = m_statesMap.begin(); it != m_statesMap.end(); ++it) + if (it.value() == state) { + index = it.key(); + break; + } + if (index <= 0) + return; + + if (m_tagsBox->currentIndex() != index) { + m_tagsBox->setCurrentIndex(index); + tagChanged(index); + } } void FilterBar::inAllBaskets() { - // TODO! + // TODO! } void FilterBar::setEditFocus() { - m_lineEdit->setFocus(); + m_lineEdit->setFocus(); } bool FilterBar::hasEditFocus() { - return m_lineEdit->hasFocus() || m_tagsBox->hasFocus(); + return m_lineEdit->hasFocus() || m_tagsBox->hasFocus(); } const FilterData& FilterBar::filterData() { - return *m_data; + return *m_data; } void FilterBar::changeFilter() { - m_data->string = m_lineEdit->text(); - m_data->isFiltering = (!m_data->string.isEmpty() || m_data->tagFilterType != FilterData::DontCareTagsFilter); - if (hasEditFocus()) - m_data->isFiltering = true; - emit newFilter(*m_data); + m_data->string = m_lineEdit->text(); + m_data->isFiltering = (!m_data->string.isEmpty() || m_data->tagFilterType != FilterData::DontCareTagsFilter); + if (hasEditFocus()) + m_data->isFiltering = true; + emit newFilter(*m_data); } void FilterBar::tagChanged(int index) { - m_data->tag = 0; - m_data->state = 0; - switch (index) { - case 0: - m_data->tagFilterType = FilterData::DontCareTagsFilter; - break; - case 1: - m_data->tagFilterType = FilterData::NotTaggedFilter; - break; - case 2: - m_data->tagFilterType = FilterData::TaggedFilter; - break; - default: - // Try to find if we are filtering a tag: - QMap<int, Tag*>::iterator it = m_tagsMap.find(index); - if (it != m_tagsMap.end()) { - m_data->tagFilterType = FilterData::TagFilter; - m_data->tag = *it; - } else { - // If not, try to find if we are filtering a state: - QMap<int, State*>::iterator it2 = m_statesMap.find(index); - if (it2 != m_statesMap.end()) { - m_data->tagFilterType = FilterData::StateFilter; - m_data->state = *it2; - } else { - // If not (should never happens), do as if the tags filter was reseted: - m_data->tagFilterType = FilterData::DontCareTagsFilter; - } - } - break; - } - m_data->isFiltering = (!m_data->string.isEmpty() || m_data->tagFilterType != FilterData::DontCareTagsFilter); - if (hasEditFocus()) - m_data->isFiltering = true; - emit newFilter(*m_data); + m_data->tag = 0; + m_data->state = 0; + switch (index) { + case 0: + m_data->tagFilterType = FilterData::DontCareTagsFilter; + break; + case 1: + m_data->tagFilterType = FilterData::NotTaggedFilter; + break; + case 2: + m_data->tagFilterType = FilterData::TaggedFilter; + break; + default: + // Try to find if we are filtering a tag: + QMap<int, Tag*>::iterator it = m_tagsMap.find(index); + if (it != m_tagsMap.end()) { + m_data->tagFilterType = FilterData::TagFilter; + m_data->tag = *it; + } else { + // If not, try to find if we are filtering a state: + QMap<int, State*>::iterator it2 = m_statesMap.find(index); + if (it2 != m_statesMap.end()) { + m_data->tagFilterType = FilterData::StateFilter; + m_data->state = *it2; + } else { + // If not (should never happens), do as if the tags filter was reseted: + m_data->tagFilterType = FilterData::DontCareTagsFilter; + } + } + break; + } + m_data->isFiltering = (!m_data->string.isEmpty() || m_data->tagFilterType != FilterData::DontCareTagsFilter); + if (hasEditFocus()) + m_data->isFiltering = true; + emit newFilter(*m_data); } src/filter.cpp @@ -36,18 +36,20 @@ class State; */ class FilterData { - public: - // Useful Enum for tagFilterType: - enum TagFilterType { DontCareTagsFilter = 0, NotTaggedFilter, TaggedFilter, TagFilter, StateFilter }; - // Constructor and Destructor: - FilterData() { isFiltering = false; tagFilterType = DontCareTagsFilter; tag = 0; state = 0; } - ~FilterData() {} - // Filter data: - QString string; - int tagFilterType; - Tag *tag; - State *state; - bool isFiltering; +public: + // Useful Enum for tagFilterType: + enum TagFilterType { DontCareTagsFilter = 0, NotTaggedFilter, TaggedFilter, TagFilter, StateFilter }; + // Constructor and Destructor: + FilterData() { + isFiltering = false; tagFilterType = DontCareTagsFilter; tag = 0; state = 0; + } + ~FilterData() {} + // Filter data: + QString string; + int tagFilterType; + Tag *tag; + State *state; + bool isFiltering; }; /** A QWidget that allow user to enter terms to filter in a Basket. @@ -55,37 +57,39 @@ class FilterData */ class FilterBar : public QWidget { - Q_OBJECT - public: - FilterBar(QWidget *parent = 0); - ~FilterBar(); - const FilterData& filterData(); - signals: - void newFilter(const FilterData &data); - public slots: - void repopulateTagsCombo(); - void reset(); - void inAllBaskets(); - void setEditFocus(); - void filterTag(Tag *tag); - void filterState(State *state); - void setFilterAll(bool filterAll); - void setFilterData(const FilterData &data); - public: - bool hasEditFocus(); - KLineEdit* lineEdit() { return m_lineEdit; } - private slots: - void changeFilter(); - void tagChanged(int index); - private: - FilterData *m_data; - KLineEdit *m_lineEdit; - QToolButton *m_resetButton; - KComboBox *m_tagsBox; - QToolButton *m_inAllBasketsButton; + Q_OBJECT +public: + FilterBar(QWidget *parent = 0); + ~FilterBar(); + const FilterData& filterData(); +signals: + void newFilter(const FilterData &data); +public slots: + void repopulateTagsCombo(); + void reset(); + void inAllBaskets(); + void setEditFocus(); + void filterTag(Tag *tag); + void filterState(State *state); + void setFilterAll(bool filterAll); + void setFilterData(const FilterData &data); +public: + bool hasEditFocus(); + KLineEdit* lineEdit() { + return m_lineEdit; + } +private slots: + void changeFilter(); + void tagChanged(int index); +private: + FilterData *m_data; + KLineEdit *m_lineEdit; + QToolButton *m_resetButton; + KComboBox *m_tagsBox; + QToolButton *m_inAllBasketsButton; - QMap<int, Tag*> m_tagsMap; - QMap<int, State*> m_statesMap; + QMap<int, Tag*> m_tagsMap; + QMap<int, State*> m_statesMap; }; #endif // FILTER_H src/filter.h @@ -36,8 +36,8 @@ FocusedTextEdit::FocusedTextEdit(bool disableUpdatesOnKeyPress, QWidget *parent) - : KTextEdit(parent), - m_disableUpdatesOnKeyPress(disableUpdatesOnKeyPress) + : KTextEdit(parent), + m_disableUpdatesOnKeyPress(disableUpdatesOnKeyPress) { // pass } @@ -60,9 +60,9 @@ void FocusedTextEdit::keyPressEvent(QKeyEvent *event) // Workaround (for ensuring the cursor to be visible): signal not emited when pressing those keys: if (event->key() == Qt::Key_Home - || event->key() == Qt::Key_End - || event->key() == Qt::Key_PageUp - || event->key() == Qt::Key_PageDown) + || event->key() == Qt::Key_End + || event->key() == Qt::Key_PageUp + || event->key() == Qt::Key_PageDown) emit cursorPositionChanged(); @@ -79,7 +79,7 @@ void FocusedTextEdit::wheelEvent(QWheelEvent *event) // wheel event onto the basket. QScrollBar *sb = verticalScrollBar(); if ((event->delta() > 0 && sb->value() > sb->minimum()) - || (event->delta() < 0 && sb->value() < sb->maximum())) + || (event->delta() < 0 && sb->value() < sb->maximum())) KTextEdit::wheelEvent(event); else Global::bnpView->currentBasket()->wheelEvent(event); @@ -87,23 +87,22 @@ void FocusedTextEdit::wheelEvent(QWheelEvent *event) void FocusedTextEdit::enterEvent(QEvent *event) { - emit mouseEntered(); - KTextEdit::enterEvent(event); + emit mouseEntered(); + KTextEdit::enterEvent(event); } /** class FocusWidgetFilter */ FocusWidgetFilter::FocusWidgetFilter(QWidget *parent) - : QObject(parent) + : QObject(parent) { if (parent) - parent->installEventFilter(this); + parent->installEventFilter(this); } bool FocusWidgetFilter::eventFilter(QObject *, QEvent *e) { switch (e->type()) { - case QEvent::KeyPress: - { + case QEvent::KeyPress: { QKeyEvent *ke = static_cast<QKeyEvent*>(e); switch (ke->key()) { case Qt::Key_Return: @@ -117,9 +116,9 @@ bool FocusWidgetFilter::eventFilter(QObject *, QEvent *e) }; } case QEvent::Enter: - emit mouseEntered(); - // pass through + emit mouseEntered(); + // pass through default: - return false; + return false; }; } src/focusedwidgets.cpp @@ -37,19 +37,19 @@ class KMenu; class FocusedTextEdit : public KTextEdit { - Q_OBJECT - public: - FocusedTextEdit(bool disableUpdatesOnKeyPress, QWidget *parent = 0); - ~FocusedTextEdit(); - protected: - void keyPressEvent(QKeyEvent *event); - void wheelEvent(QWheelEvent *event); - void enterEvent(QEvent *event); - signals: - void escapePressed(); - void mouseEntered(); - private: - bool m_disableUpdatesOnKeyPress; + Q_OBJECT +public: + FocusedTextEdit(bool disableUpdatesOnKeyPress, QWidget *parent = 0); + ~FocusedTextEdit(); +protected: + void keyPressEvent(QKeyEvent *event); + void wheelEvent(QWheelEvent *event); + void enterEvent(QEvent *event); +signals: + void escapePressed(); + void mouseEntered(); +private: + bool m_disableUpdatesOnKeyPress; }; @@ -73,7 +73,7 @@ public: /** Constructor * @param watched The widget to install the event filter on; also becomes * the parent of this object. */ - FocusWidgetFilter(QWidget *watched=0); + FocusWidgetFilter(QWidget *watched = 0); ~FocusWidgetFilter() {} protected: src/focusedwidgets.h @@ -44,267 +44,267 @@ bool FormatImporter::shouldImportBaskets() { - // We should import if the application have not successfully loaded any basket... - if (Global::bnpView->topLevelItemCount()>=0) - return false; + // We should import if the application have not successfully loaded any basket... + if (Global::bnpView->topLevelItemCount() >= 0) + return false; - // ... And there is at least one folder in the save folder, with a ".basket" file inside that folder. - QDir dir(Global::savesFolder(), QString::null, QDir::Name | QDir::IgnoreCase, QDir::Dirs | QDir::NoSymLinks); - QStringList list = dir.entryList(); - for (QStringList::Iterator it = list.begin(); it != list.end(); ++it) - if (*it != "." && *it != ".." && dir.exists(Global::savesFolder() + *it + "/.basket")) - return true; + // ... And there is at least one folder in the save folder, with a ".basket" file inside that folder. + QDir dir(Global::savesFolder(), QString::null, QDir::Name | QDir::IgnoreCase, QDir::Dirs | QDir::NoSymLinks); + QStringList list = dir.entryList(); + for (QStringList::Iterator it = list.begin(); it != list.end(); ++it) + if (*it != "." && *it != ".." && dir.exists(Global::savesFolder() + *it + "/.basket")) + return true; - return false; + return false; } void FormatImporter::copyFolder(const QString &folder, const QString &newFolder) { - copyFinished = false; - KIO::CopyJob *copyJob = KIO::copyAs(KUrl(folder), KUrl(newFolder), /*showProgressInfo=*/false); - connect(copyJob, SIGNAL(copyingDone(KIO::Job *, KUrl, KUrl, time_t, bool, bool)), - this, SLOT(slotCopyingDone(KIO::Job*))); - while (!copyFinished) - kapp->processEvents(); + copyFinished = false; + KIO::CopyJob *copyJob = KIO::copyAs(KUrl(folder), KUrl(newFolder), /*showProgressInfo=*/false); + connect(copyJob, SIGNAL(copyingDone(KIO::Job *, KUrl, KUrl, time_t, bool, bool)), + this, SLOT(slotCopyingDone(KIO::Job*))); + while (!copyFinished) + kapp->processEvents(); } void FormatImporter::moveFolder(const QString &folder, const QString &newFolder) { - copyFinished = false; - KIO::CopyJob *copyJob = KIO::moveAs(KUrl(folder), KUrl(newFolder), /*showProgressInfo=*/false); - connect(copyJob, SIGNAL(copyingDone(KIO::Job *, KUrl, KUrl, time_t, bool, bool)), - this, SLOT(slotCopyingDone(KIO::Job*))); - while (!copyFinished) - kapp->processEvents(); + copyFinished = false; + KIO::CopyJob *copyJob = KIO::moveAs(KUrl(folder), KUrl(newFolder), /*showProgressInfo=*/false); + connect(copyJob, SIGNAL(copyingDone(KIO::Job *, KUrl, KUrl, time_t, bool, bool)), + this, SLOT(slotCopyingDone(KIO::Job*))); + while (!copyFinished) + kapp->processEvents(); } void FormatImporter::slotCopyingDone(KIO::Job *) { -// kDebug() << "Copy finished of " + from.path() + " to " + to.path(); - copyFinished = true; +// kDebug() << "Copy finished of " + from.path() + " to " + to.path(); + copyFinished = true; } void FormatImporter::importBaskets() { - kDebug() << "Import Baskets: Preparing..."; + kDebug() << "Import Baskets: Preparing..."; - // Some preliminary preparations (create the destination folders and the basket tree file): - QDir dirPrep; - dirPrep.mkdir(Global::savesFolder()); - dirPrep.mkdir(Global::basketsFolder()); - QDomDocument document("basketTree"); - QDomElement root = document.createElement("basketTree"); - document.appendChild(root); + // Some preliminary preparations (create the destination folders and the basket tree file): + QDir dirPrep; + dirPrep.mkdir(Global::savesFolder()); + dirPrep.mkdir(Global::basketsFolder()); + QDomDocument document("basketTree"); + QDomElement root = document.createElement("basketTree"); + document.appendChild(root); - // First up, establish a list of every baskets, ensure the old order (if any), and count them. - QStringList baskets; + // First up, establish a list of every baskets, ensure the old order (if any), and count them. + QStringList baskets; - // Read the 0.5.0 baskets order: - QDomDocument *doc = XMLWork::openFile("container", Global::savesFolder() + "container.baskets"); - if (doc != 0) { - QDomElement docElem = doc->documentElement(); - QDomElement basketsElem = XMLWork::getElement(docElem, "baskets"); - QDomNode n = basketsElem.firstChild(); - while (!n.isNull()) { - QDomElement e = n.toElement(); - if ((!e.isNull()) && e.tagName() == "basket") - baskets.append(e.text()); - n = n.nextSibling(); - } - } + // Read the 0.5.0 baskets order: + QDomDocument *doc = XMLWork::openFile("container", Global::savesFolder() + "container.baskets"); + if (doc != 0) { + QDomElement docElem = doc->documentElement(); + QDomElement basketsElem = XMLWork::getElement(docElem, "baskets"); + QDomNode n = basketsElem.firstChild(); + while (!n.isNull()) { + QDomElement e = n.toElement(); + if ((!e.isNull()) && e.tagName() == "basket") + baskets.append(e.text()); + n = n.nextSibling(); + } + } - // Then load the baskets that weren't loaded (import < 0.5.0 ones): - QDir dir(Global::savesFolder(), QString::null, QDir::Name | QDir::IgnoreCase, QDir::Dirs | QDir::NoSymLinks); - QStringList list = dir.entryList(); - if (list.count() > 2) // Pass "." and ".." - for (QStringList::Iterator it = list.begin(); it != list.end(); ++it) // For each folder - if (*it != "." && *it != ".." && dir.exists(Global::savesFolder() + *it + "/.basket")) // If it can be a basket folder - if (! (baskets.contains((*it) + "/")) && baskets.contains(*it) ) // And if it is not already in the imported baskets list - baskets.append(*it); + // Then load the baskets that weren't loaded (import < 0.5.0 ones): + QDir dir(Global::savesFolder(), QString::null, QDir::Name | QDir::IgnoreCase, QDir::Dirs | QDir::NoSymLinks); + QStringList list = dir.entryList(); + if (list.count() > 2) // Pass "." and ".." + for (QStringList::Iterator it = list.begin(); it != list.end(); ++it) // For each folder + if (*it != "." && *it != ".." && dir.exists(Global::savesFolder() + *it + "/.basket")) // If it can be a basket folder + if (!(baskets.contains((*it) + "/")) && baskets.contains(*it)) // And if it is not already in the imported baskets list + baskets.append(*it); - kDebug() << "Import Baskets: Found " << baskets.count() << " baskets to import."; + kDebug() << "Import Baskets: Found " << baskets.count() << " baskets to import."; - // Import every baskets: - int i = 0; - for (QStringList::iterator it = baskets.begin(); it != baskets.end(); ++it) { - ++i; - kDebug() << "Import Baskets: Importing basket " << i << " of " << baskets.count() << "..."; + // Import every baskets: + int i = 0; + for (QStringList::iterator it = baskets.begin(); it != baskets.end(); ++it) { + ++i; + kDebug() << "Import Baskets: Importing basket " << i << " of " << baskets.count() << "..."; - // Move the folder to the new repository (normal basket) or copy the folder (mirorred folder): - QString folderName = *it; - if (folderName.startsWith("/")) { // It was a folder mirror: - KMessageBox::information(0, i18n("Folder mirroring is not possible anymore (see <a href='http://basket.kde.org/'>basket.kde.org</a> for more information)." - "The folder %1 has been copied for the basket needs. You can either delete this folder or delete the basket, or use both. But remember that " - "modifying one will not modify the other anymore as they are now separate entities.", folderName), i18n("Folder Mirror Import"), - "", KMessageBox::AllowLink); - // Also modify folderName to be only the folder name and not the full path anymore: - QString newFolderName = folderName; - if (newFolderName.endsWith("/")) - newFolderName = newFolderName.left(newFolderName.length() - 1); - newFolderName = newFolderName.mid(newFolderName.lastIndexOf('/') + 1); - newFolderName = Tools::fileNameForNewFile(newFolderName, Global::basketsFolder()); - FormatImporter f; - f.copyFolder(folderName, Global::basketsFolder() + newFolderName); - folderName = newFolderName; - } else - dir.rename(Global::savesFolder() + folderName, Global::basketsFolder() + folderName); // Move the folder + // Move the folder to the new repository (normal basket) or copy the folder (mirorred folder): + QString folderName = *it; + if (folderName.startsWith("/")) { // It was a folder mirror: + KMessageBox::information(0, i18n("Folder mirroring is not possible anymore (see <a href='http://basket.kde.org/'>basket.kde.org</a> for more information)." + "The folder %1 has been copied for the basket needs. You can either delete this folder or delete the basket, or use both. But remember that " + "modifying one will not modify the other anymore as they are now separate entities.", folderName), i18n("Folder Mirror Import"), + "", KMessageBox::AllowLink); + // Also modify folderName to be only the folder name and not the full path anymore: + QString newFolderName = folderName; + if (newFolderName.endsWith("/")) + newFolderName = newFolderName.left(newFolderName.length() - 1); + newFolderName = newFolderName.mid(newFolderName.lastIndexOf('/') + 1); + newFolderName = Tools::fileNameForNewFile(newFolderName, Global::basketsFolder()); + FormatImporter f; + f.copyFolder(folderName, Global::basketsFolder() + newFolderName); + folderName = newFolderName; + } else + dir.rename(Global::savesFolder() + folderName, Global::basketsFolder() + folderName); // Move the folder - // Import the basket structure file and get the properties (to add them in the tree basket-properties cache): - QDomElement properties = importBasket(folderName); + // Import the basket structure file and get the properties (to add them in the tree basket-properties cache): + QDomElement properties = importBasket(folderName); - // Add it to the XML document: - QDomElement basketElement = document.createElement("basket"); - root.appendChild(basketElement); - basketElement.setAttribute("folderName", folderName); - basketElement.appendChild(properties); - } + // Add it to the XML document: + QDomElement basketElement = document.createElement("basket"); + root.appendChild(basketElement); + basketElement.setAttribute("folderName", folderName); + basketElement.appendChild(properties); + } - // Finalize (write to disk and delete now useless files): - kDebug() << "Import Baskets: Finalizing..."; + // Finalize (write to disk and delete now useless files): + kDebug() << "Import Baskets: Finalizing..."; - QFile file(Global::basketsFolder() + "baskets.xml"); - if (file.open(QIODevice::WriteOnly)) { - QTextStream stream(&file); - stream.setCodec("UTF-8"); - QString xml = document.toString(); - stream << "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"; - stream << xml; - file.close(); - } + QFile file(Global::basketsFolder() + "baskets.xml"); + if (file.open(QIODevice::WriteOnly)) { + QTextStream stream(&file); + stream.setCodec("UTF-8"); + QString xml = document.toString(); + stream << "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"; + stream << xml; + file.close(); + } - Tools::deleteRecursively(Global::savesFolder() + ".tmp"); - dir.remove(Global::savesFolder() + "container.baskets"); + Tools::deleteRecursively(Global::savesFolder() + ".tmp"); + dir.remove(Global::savesFolder() + "container.baskets"); - kDebug() << "Import Baskets: Finished."; + kDebug() << "Import Baskets: Finished."; } QDomElement FormatImporter::importBasket(const QString &folderName) { - // Load the XML file: - QDomDocument *document = XMLWork::openFile("basket", Global::basketsFolder() + folderName + "/.basket"); - if (!document) { - kDebug() << "Import Baskets: Failed to read the basket file!"; - return QDomElement(); - } - QDomElement docElem = document->documentElement(); + // Load the XML file: + QDomDocument *document = XMLWork::openFile("basket", Global::basketsFolder() + folderName + "/.basket"); + if (!document) { + kDebug() << "Import Baskets: Failed to read the basket file!"; + return QDomElement(); + } + QDomElement docElem = document->documentElement(); - // Import properties (change <background color=""> to <appearance backgroundColor="">, and figure out if is a checklist or not): - QDomElement properties = XMLWork::getElement(docElem, "properties"); - QDomElement background = XMLWork::getElement(properties, "background"); - QColor backgroundColor = QColor(background.attribute("color")); - if (backgroundColor.isValid() && (backgroundColor != kapp->palette().color(QPalette::Base))) { // Use the default color if it was already that color: - QDomElement appearance = document->createElement("appearance"); - appearance.setAttribute("backgroundColor", backgroundColor.name()); - properties.appendChild(appearance); - } - QDomElement disposition = document->createElement("disposition"); - disposition.setAttribute("mindMap", "false"); - disposition.setAttribute("columnCount", "1"); - disposition.setAttribute("free", "false"); - bool isCheckList = XMLWork::trueOrFalse( XMLWork::getElementText(properties, "showCheckBoxes", false) ); + // Import properties (change <background color=""> to <appearance backgroundColor="">, and figure out if is a checklist or not): + QDomElement properties = XMLWork::getElement(docElem, "properties"); + QDomElement background = XMLWork::getElement(properties, "background"); + QColor backgroundColor = QColor(background.attribute("color")); + if (backgroundColor.isValid() && (backgroundColor != kapp->palette().color(QPalette::Base))) { // Use the default color if it was already that color: + QDomElement appearance = document->createElement("appearance"); + appearance.setAttribute("backgroundColor", backgroundColor.name()); + properties.appendChild(appearance); + } + QDomElement disposition = document->createElement("disposition"); + disposition.setAttribute("mindMap", "false"); + disposition.setAttribute("columnCount", "1"); + disposition.setAttribute("free", "false"); + bool isCheckList = XMLWork::trueOrFalse(XMLWork::getElementText(properties, "showCheckBoxes", false)); - // Insert all notes in a group (column): 1/ rename "items" to "group", 2/ add "notes" to root, 3/ move "group" into "notes" - QDomElement column = XMLWork::getElement(docElem, "items"); - column.setTagName("group"); - QDomElement notes = document->createElement("notes"); - notes.appendChild(column); - docElem.appendChild(notes); + // Insert all notes in a group (column): 1/ rename "items" to "group", 2/ add "notes" to root, 3/ move "group" into "notes" + QDomElement column = XMLWork::getElement(docElem, "items"); + column.setTagName("group"); + QDomElement notes = document->createElement("notes"); + notes.appendChild(column); + docElem.appendChild(notes); - // Import notes from older representations: - QDomNode n = column.firstChild(); - while ( ! n.isNull() ) { - QDomElement e = n.toElement(); - if (!e.isNull()) { - e.setTagName("note"); - QDomElement content = XMLWork::getElement(e, "content"); - // Add Check tag: - if (isCheckList) { - bool isChecked = XMLWork::trueOrFalse(e.attribute("checked", "false")); - XMLWork::addElement(*document, e, "tags", (isChecked ? "todo_done" : "todo_unchecked")); - } - // Import annotations as folded groups: - QDomElement parentE = column; - QString annotations = XMLWork::getElementText(e, "annotations", ""); - if (!annotations.isEmpty()) { - QDomElement annotGroup = document->createElement("group"); - column.insertBefore(annotGroup, e); - annotGroup.setAttribute("folded", "true"); - annotGroup.appendChild(e); - parentE = annotGroup; - // Create the text note and add it to the DOM tree: - 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; - QFile file(annotFullPath); - if (file.open(QIODevice::WriteOnly)) { - QTextStream stream(&file); - stream << annotations; - file.close(); - } - XMLWork::addElement(*document, annotNote, "content", annotFileName); - n = annotGroup; - } - // Import Launchers from 0.3.x, 0.4.0 and 0.5.0-alphas: - QString runCommand = e.attribute("runcommand"); // Keep compatibility with 0.4.0 and 0.5.0-alphas versions - runCommand = XMLWork::getElementText(e, "action", runCommand); // Keep compatibility with 0.3.x versions - if ( ! runCommand.isEmpty() ) { // An import should be done - // Prepare the launcher note: - QString title = content.attribute("title", ""); - QString icon = content.attribute("icon", ""); - if (title.isEmpty()) title = runCommand; - if (icon.isEmpty()) icon = NoteFactory::iconForCommand(runCommand); - // Import the launcher note: - // Adapted version of "QString launcherName = NoteFactory::createNoteLauncherFile(runCommand, title, icon, this)": - QString launcherContent = QString( - "[Desktop Entry]\n" - "Exec=%1\n" - "Name=%2\n" - "Icon=%3\n" - "Encoding=UTF-8\n" - "Type=Application\n").arg(runCommand, title, icon.isEmpty() ? QString("exec") : icon); - QString launcherFileName = Tools::fileNameForNewFile("launcher.desktop", Global::basketsFolder() + folderName /*+ "/"*/); - QString launcherFullPath = Global::basketsFolder() + folderName /*+ "/"*/ + launcherFileName; - QFile file(launcherFullPath); - if (file.open(QIODevice::WriteOnly)) { - QTextStream stream(&file); - stream.setCodec("UTF-8"); - stream << launcherContent; - file.close(); - } - // Add the element to the DOM: - QDomElement launcherElem = document->createElement("note"); - parentE.insertBefore(launcherElem, e); - launcherElem.setAttribute("type", "launcher"); - XMLWork::addElement(*document, launcherElem, "content", launcherFileName); - } - // Import unknown ns to 0.6.0: - if (e.attribute("type") == "unknow") - e.setAttribute("type", "unknown"); - // Import links from version < 0.5.0: - if (!content.attribute("autotitle").isEmpty() && content.attribute("autoTitle").isEmpty()) - content.setAttribute("autoTitle", content.attribute("autotitle")); - if (!content.attribute("autoicon").isEmpty() && content.attribute("autoIcon").isEmpty()) - content.setAttribute("autoIcon", content.attribute("autoicon")); - } - n = n.nextSibling(); - } + // Import notes from older representations: + QDomNode n = column.firstChild(); + while (! n.isNull()) { + QDomElement e = n.toElement(); + if (!e.isNull()) { + e.setTagName("note"); + QDomElement content = XMLWork::getElement(e, "content"); + // Add Check tag: + if (isCheckList) { + bool isChecked = XMLWork::trueOrFalse(e.attribute("checked", "false")); + XMLWork::addElement(*document, e, "tags", (isChecked ? "todo_done" : "todo_unchecked")); + } + // Import annotations as folded groups: + QDomElement parentE = column; + QString annotations = XMLWork::getElementText(e, "annotations", ""); + if (!annotations.isEmpty()) { + QDomElement annotGroup = document->createElement("group"); + column.insertBefore(annotGroup, e); + annotGroup.setAttribute("folded", "true"); + annotGroup.appendChild(e); + parentE = annotGroup; + // Create the text note and add it to the DOM tree: + 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; + QFile file(annotFullPath); + if (file.open(QIODevice::WriteOnly)) { + QTextStream stream(&file); + stream << annotations; + file.close(); + } + XMLWork::addElement(*document, annotNote, "content", annotFileName); + n = annotGroup; + } + // Import Launchers from 0.3.x, 0.4.0 and 0.5.0-alphas: + QString runCommand = e.attribute("runcommand"); // Keep compatibility with 0.4.0 and 0.5.0-alphas versions + runCommand = XMLWork::getElementText(e, "action", runCommand); // Keep compatibility with 0.3.x versions + if (! runCommand.isEmpty()) { // An import should be done + // Prepare the launcher note: + QString title = content.attribute("title", ""); + QString icon = content.attribute("icon", ""); + if (title.isEmpty()) title = runCommand; + if (icon.isEmpty()) icon = NoteFactory::iconForCommand(runCommand); + // Import the launcher note: + // Adapted version of "QString launcherName = NoteFactory::createNoteLauncherFile(runCommand, title, icon, this)": + QString launcherContent = QString( + "[Desktop Entry]\n" + "Exec=%1\n" + "Name=%2\n" + "Icon=%3\n" + "Encoding=UTF-8\n" + "Type=Application\n").arg(runCommand, title, icon.isEmpty() ? QString("exec") : icon); + QString launcherFileName = Tools::fileNameForNewFile("launcher.desktop", Global::basketsFolder() + folderName /*+ "/"*/); + QString launcherFullPath = Global::basketsFolder() + folderName /*+ "/"*/ + launcherFileName; + QFile file(launcherFullPath); + if (file.open(QIODevice::WriteOnly)) { + QTextStream stream(&file); + stream.setCodec("UTF-8"); + stream << launcherContent; + file.close(); + } + // Add the element to the DOM: + QDomElement launcherElem = document->createElement("note"); + parentE.insertBefore(launcherElem, e); + launcherElem.setAttribute("type", "launcher"); + XMLWork::addElement(*document, launcherElem, "content", launcherFileName); + } + // Import unknown ns to 0.6.0: + if (e.attribute("type") == "unknow") + e.setAttribute("type", "unknown"); + // Import links from version < 0.5.0: + if (!content.attribute("autotitle").isEmpty() && content.attribute("autoTitle").isEmpty()) + content.setAttribute("autoTitle", content.attribute("autotitle")); + if (!content.attribute("autoicon").isEmpty() && content.attribute("autoIcon").isEmpty()) + content.setAttribute("autoIcon", content.attribute("autoicon")); + } + n = n.nextSibling(); + } - // Save the resulting XML file: - QFile file(Global::basketsFolder() + folderName + "/.basket"); - if (file.open(QIODevice::WriteOnly)) { - QTextStream stream(&file); - stream.setCodec("UTF-8"); -// QString xml = document->toString(); -// stream << "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"; -// stream << xml; - stream << document->toString(); // Document is ALREADY using UTF-8 - file.close(); - } else - kDebug() << "Import Baskets: Failed to save the basket file!"; + // Save the resulting XML file: + QFile file(Global::basketsFolder() + folderName + "/.basket"); + if (file.open(QIODevice::WriteOnly)) { + QTextStream stream(&file); + stream.setCodec("UTF-8"); +// QString xml = document->toString(); +// stream << "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"; +// stream << xml; + stream << document->toString(); // Document is ALREADY using UTF-8 + file.close(); + } else + kDebug() << "Import Baskets: Failed to save the basket file!"; - // Return the newly created properties (to put in the basket tree): - return properties; + // Return the newly created properties (to put in the basket tree): + return properties; } src/formatimporter.cpp @@ -25,8 +25,9 @@ //#include <qwidget.h> #include <qdom.h> -namespace KIO { - class Job; +namespace KIO +{ +class Job; } /** @@ -34,18 +35,18 @@ namespace KIO { */ class FormatImporter : QObject { - Q_OBJECT - public: - static bool shouldImportBaskets(); - static void importBaskets(); - static QDomElement importBasket(const QString &folderName); + Q_OBJECT +public: + static bool shouldImportBaskets(); + static void importBaskets(); + static QDomElement importBasket(const QString &folderName); - void copyFolder(const QString &folder, const QString &newFolder); - void moveFolder(const QString &folder, const QString &newFolder); - private slots: - void slotCopyingDone(KIO::Job*); - private: - bool copyFinished; + void copyFolder(const QString &folder, const QString &newFolder); + void moveFolder(const QString &folder, const QString &newFolder); +private slots: + void slotCopyingDone(KIO::Job*); +private: + bool copyFinished; }; #endif // FORMATIMPORTER_H src/formatimporter.h @@ -45,53 +45,64 @@ AboutData Global::basketAbout; void Global::setCustomSavesFolder(const QString &folder) { - s_customSavesFolder = folder; + s_customSavesFolder = folder; } QString Global::savesFolder() { - static QString *folder = 0L; // Memorize the folder to do not have to re-compute it each time it's needed + static QString *folder = 0L; // Memorize the folder to do not have to re-compute it each time it's needed - if (folder == 0L) { // Initialize it if not yet done - if (!s_customSavesFolder.isEmpty()) { // Passed by command line (for development & debug purpose) - QDir dir; - dir.mkdir(s_customSavesFolder); - folder = new QString(s_customSavesFolder.endsWith("/") ? s_customSavesFolder : s_customSavesFolder + "/"); - } else if (!Settings::dataFolder().isEmpty()) { // Set by config option (in Basket -> Backup & Restore) - QDir dir; - dir.mkdir(s_customSavesFolder); - folder = new QString(Settings::dataFolder().endsWith("/") ? Settings::dataFolder() : Settings::dataFolder() + "/"); - } else { // The default path (should be that for most computers) - folder = new QString(KGlobal::dirs()->saveLocation("data", "basket/")); - } - } + if (folder == 0L) { // Initialize it if not yet done + if (!s_customSavesFolder.isEmpty()) { // Passed by command line (for development & debug purpose) + QDir dir; + dir.mkdir(s_customSavesFolder); + folder = new QString(s_customSavesFolder.endsWith("/") ? s_customSavesFolder : s_customSavesFolder + "/"); + } else if (!Settings::dataFolder().isEmpty()) { // Set by config option (in Basket -> Backup & Restore) + QDir dir; + dir.mkdir(s_customSavesFolder); + folder = new QString(Settings::dataFolder().endsWith("/") ? Settings::dataFolder() : Settings::dataFolder() + "/"); + } else { // The default path (should be that for most computers) + folder = new QString(KGlobal::dirs()->saveLocation("data", "basket/")); + } + } - return *folder; + return *folder; } -QString Global::basketsFolder() { return savesFolder() + "baskets/"; } -QString Global::backgroundsFolder() { return savesFolder() + "backgrounds/"; } -QString Global::templatesFolder() { return savesFolder() + "templates/"; } -QString Global::tempCutFolder() { return savesFolder() + "temp-cut/"; } +QString Global::basketsFolder() +{ + return savesFolder() + "baskets/"; +} +QString Global::backgroundsFolder() +{ + return savesFolder() + "backgrounds/"; +} +QString Global::templatesFolder() +{ + return savesFolder() + "templates/"; +} +QString Global::tempCutFolder() +{ + return savesFolder() + "temp-cut/"; +} QString Global::openNoteIcon() // FIXME: Now an edit icon { - return QVariant(Global::bnpView->m_actEditNote->icon()).toString(); + return QVariant(Global::bnpView->m_actEditNote->icon()).toString(); } KMainWindow* Global::mainWindow() { - QWidget* res = kapp->activeWindow(); + QWidget* res = kapp->activeWindow(); - if(res && res->inherits("KMainWindow")) - { - return static_cast<KMainWindow*>(res); - } - return 0; + if (res && res->inherits("KMainWindow")) { + return static_cast<KMainWindow*>(res); + } + return 0; } KConfig* Global::config() { //The correct solution is to go and replace all KConfig* with KSharedConfig::Ptr, but that seems awfully annoying to do right now - return Global::basketConfig.data(); + return Global::basketConfig.data(); } src/global.cpp @@ -41,31 +41,33 @@ class KAboutData; */ class BASKET_EXPORT Global { - private: - static QString s_customSavesFolder; - public: - // Global Variables: - static LikeBack *likeBack; - static DebugWindow *debugWindow; - static BackgroundManager *backgroundManager; - static SystemTray *systemTray; - static BNPView *bnpView; - static KSharedConfig::Ptr basketConfig; - static AboutData basketAbout; +private: + static QString s_customSavesFolder; +public: + // Global Variables: + static LikeBack *likeBack; + static DebugWindow *debugWindow; + static BackgroundManager *backgroundManager; + static SystemTray *systemTray; + static BNPView *bnpView; + static KSharedConfig::Ptr basketConfig; + static AboutData basketAbout; - // Application Folders: - static void setCustomSavesFolder(const QString &folder); - static QString savesFolder(); /// << @return e.g. "/home/username/.kde/share/apps/basket/". - static QString basketsFolder(); /// << @return e.g. "/home/username/.kde/share/apps/basket/baskets/". - static QString backgroundsFolder(); /// << @return e.g. "/home/username/.kde/share/apps/basket/backgrounds/". - static QString templatesFolder(); /// << @return e.g. "/home/username/.kde/share/apps/basket/templates/". - static QString tempCutFolder(); /// << @return e.g. "/home/username/.kde/share/apps/basket/temp-cut/". (was ".tmp/") + // Application Folders: + static void setCustomSavesFolder(const QString &folder); + static QString savesFolder(); /// << @return e.g. "/home/username/.kde/share/apps/basket/". + static QString basketsFolder(); /// << @return e.g. "/home/username/.kde/share/apps/basket/baskets/". + static QString backgroundsFolder(); /// << @return e.g. "/home/username/.kde/share/apps/basket/backgrounds/". + static QString templatesFolder(); /// << @return e.g. "/home/username/.kde/share/apps/basket/templates/". + static QString tempCutFolder(); /// << @return e.g. "/home/username/.kde/share/apps/basket/temp-cut/". (was ".tmp/") - // Various Things: - static QString openNoteIcon(); /// << @return the icon used for the "Open" action on notes. - static KMainWindow* mainWindow(); - static KConfig* config(); - static KAboutData* about() { return &basketAbout; }; + // Various Things: + static QString openNoteIcon(); /// << @return the icon used for the "Open" action on notes. + static KMainWindow* mainWindow(); + static KConfig* config(); + static KAboutData* about() { + return &basketAbout; + }; }; #endif // GLOBAL_H src/global.h @@ -49,54 +49,54 @@ HTMLExporter::HTMLExporter(Basket *basket) { - QDir dir; - - // Compute a default file name & path: - KConfigGroup config = Global::config()->group("Export to HTML"); - QString folder = config.readEntry("lastFolder", QDir::homePath()) + "/"; - QString url = folder + QString(basket->basketName()).replace("/", "_") + ".html"; - - // Ask a file name & path to the user: - QString filter = "*.html *.htm|" + i18n("HTML Documents") + "\n*|" + i18n("All Files"); - QString destination = url; - for (bool askAgain = true; askAgain; ) { - // Ask: - destination = KFileDialog::getSaveFileName(destination, filter, 0, i18n("Export to HTML")); - // User canceled? - if (destination.isEmpty()) - return; - // File already existing? Ask for overriding: - if (dir.exists(destination)) { - int result = KMessageBox::questionYesNoCancel( - 0, - "<qt>" + i18n("The file %1 already exists. Do you really want to override it?", - KUrl(destination).fileName()), - i18n("Override File?"), - KGuiItem(i18n("&Override"), "document-save") - ); - if (result == KMessageBox::Cancel) - return; - else if (result == KMessageBox::Yes) - askAgain = false; - } else - askAgain = false; - } - - // Create the progress dialog that will always be shown during the export: - KProgressDialog dialog(0, i18n("Export to HTML"), i18n("Exporting to HTML. Please wait..."), /*Not modal, for password dialogs!*/false); - dialog.showCancelButton(false); - dialog.setAutoClose(true); - dialog.show(); - progress = dialog.progressBar(); - - // Remember the last folder used for HTML exporation: - config.writeEntry("lastFolder", KUrl(destination).directory()); - config.sync(); - - prepareExport(basket, destination); - exportBasket(basket, /*isSubBasket*/false); - - progress->setValue(progress->value()+1); // Finishing finished + QDir dir; + + // Compute a default file name & path: + KConfigGroup config = Global::config()->group("Export to HTML"); + QString folder = config.readEntry("lastFolder", QDir::homePath()) + "/"; + QString url = folder + QString(basket->basketName()).replace("/", "_") + ".html"; + + // Ask a file name & path to the user: + QString filter = "*.html *.htm|" + i18n("HTML Documents") + "\n*|" + i18n("All Files"); + QString destination = url; + for (bool askAgain = true; askAgain;) { + // Ask: + destination = KFileDialog::getSaveFileName(destination, filter, 0, i18n("Export to HTML")); + // User canceled? + if (destination.isEmpty()) + return; + // File already existing? Ask for overriding: + if (dir.exists(destination)) { + int result = KMessageBox::questionYesNoCancel( + 0, + "<qt>" + i18n("The file %1 already exists. Do you really want to override it?", + KUrl(destination).fileName()), + i18n("Override File?"), + KGuiItem(i18n("&Override"), "document-save") + ); + if (result == KMessageBox::Cancel) + return; + else if (result == KMessageBox::Yes) + askAgain = false; + } else + askAgain = false; + } + + // Create the progress dialog that will always be shown during the export: + KProgressDialog dialog(0, i18n("Export to HTML"), i18n("Exporting to HTML. Please wait..."), /*Not modal, for password dialogs!*/false); + dialog.showCancelButton(false); + dialog.setAutoClose(true); + dialog.show(); + progress = dialog.progressBar(); + + // Remember the last folder used for HTML exporation: + config.writeEntry("lastFolder", KUrl(destination).directory()); + config.sync(); + + prepareExport(basket, destination); + exportBasket(basket, /*isSubBasket*/false); + + progress->setValue(progress->value() + 1); // Finishing finished } HTMLExporter::~HTMLExporter() @@ -105,416 +105,417 @@ HTMLExporter::~HTMLExporter() void HTMLExporter::prepareExport(Basket *basket, const QString &fullPath) { - progress->setRange(0,/*Preparation:*/1 + /*Finishing:*/1 + /*Basket:*/1 + /*SubBaskets:*/Global::bnpView->basketCount(Global::bnpView->listViewItemForBasket(basket))); - progress->setValue(0); - kapp->processEvents(); - - // Remember the file path choosen by the user: - filePath = fullPath; - fileName = KUrl(fullPath).fileName(); - exportedBasket = basket; - - BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket); - withBasketTree = (item->childCount() >= 0); - - // Create and empty the files folder: - QString filesFolderPath = i18nc("HTML export folder (files)", "%1_files", filePath) + "/"; // eg.: "/home/seb/foo.html_files/" - Tools::deleteRecursively(filesFolderPath); - QDir dir; - dir.mkdir(filesFolderPath); - - // Create sub-folders: - iconsFolderPath = filesFolderPath + i18nc("HTML export folder (icons)", "icons") + "/"; // eg.: "/home/seb/foo.html_files/icons/" - imagesFolderPath = filesFolderPath + i18nc("HTML export folder (images)", "images") + "/"; // eg.: "/home/seb/foo.html_files/images/" - basketsFolderPath = filesFolderPath + i18nc("HTML export folder (baskets)", "baskets") + "/"; // eg.: "/home/seb/foo.html_files/baskets/" - dir.mkdir(iconsFolderPath); - dir.mkdir(imagesFolderPath); - dir.mkdir(basketsFolderPath); - - progress->setValue(progress->value()+1); // Preparation finished + progress->setRange(0,/*Preparation:*/1 + /*Finishing:*/1 + /*Basket:*/1 + /*SubBaskets:*/Global::bnpView->basketCount(Global::bnpView->listViewItemForBasket(basket))); + progress->setValue(0); + kapp->processEvents(); + + // Remember the file path choosen by the user: + filePath = fullPath; + fileName = KUrl(fullPath).fileName(); + exportedBasket = basket; + + BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket); + withBasketTree = (item->childCount() >= 0); + + // Create and empty the files folder: + QString filesFolderPath = i18nc("HTML export folder (files)", "%1_files", filePath) + "/"; // eg.: "/home/seb/foo.html_files/" + Tools::deleteRecursively(filesFolderPath); + QDir dir; + dir.mkdir(filesFolderPath); + + // Create sub-folders: + iconsFolderPath = filesFolderPath + i18nc("HTML export folder (icons)", "icons") + "/"; // eg.: "/home/seb/foo.html_files/icons/" + imagesFolderPath = filesFolderPath + i18nc("HTML export folder (images)", "images") + "/"; // eg.: "/home/seb/foo.html_files/images/" + basketsFolderPath = filesFolderPath + i18nc("HTML export folder (baskets)", "baskets") + "/"; // eg.: "/home/seb/foo.html_files/baskets/" + dir.mkdir(iconsFolderPath); + dir.mkdir(imagesFolderPath); + dir.mkdir(basketsFolderPath); + + progress->setValue(progress->value() + 1); // Preparation finished } void HTMLExporter::exportBasket(Basket *basket, bool isSubBasket) { - if (!basket->isLoaded()) { - basket->load(); - } - - // Compute the absolute & relative paths for this basket: - filesFolderPath = i18nc("HTML export folder (files)", "%1_files", filePath) + "/"; - if (isSubBasket) { - basketFilePath = basketsFolderPath + basket->folderName().left(basket->folderName().length() - 1) + ".html"; - filesFolderName = "../"; - dataFolderName = basket->folderName().left(basket->folderName().length() - 1) + "-" + i18nc("HTML export folder (data)", "data") + "/"; - dataFolderPath = basketsFolderPath + dataFolderName; - basketsFolderName = ""; - } else { - basketFilePath = filePath; - filesFolderName = i18nc("HTML export folder (files)", "%1_files", KUrl(filePath).fileName()) + "/"; - dataFolderName = filesFolderName + i18nc("HTML export folder (data)", "data") + "/"; - dataFolderPath = filesFolderPath + i18nc("HTML export folder (data)", "data") + "/"; - basketsFolderName = filesFolderName + i18nc("HTML export folder (baskets)", "baskets") + "/"; - } - iconsFolderName = (isSubBasket ? "../" : filesFolderName) + i18nc("HTML export folder (icons)", "icons") + "/"; // eg.: "foo.html_files/icons/" or "../icons/" - imagesFolderName = (isSubBasket ? "../" : filesFolderName) + i18nc("HTML export folder (images)", "images") + "/"; // eg.: "foo.html_files/images/" or "../images/" - - kDebug() << "Exporting ================================================"; - kDebug() << " filePath:" << filePath; - kDebug() << " basketFilePath:" << basketFilePath; - kDebug() << " filesFolderPath:" << filesFolderPath; - kDebug() << " filesFolderName:" << filesFolderName; - kDebug() << " iconsFolderPath:" << iconsFolderPath; - kDebug() << " iconsFolderName:" << iconsFolderName; - kDebug() << " imagesFolderPath:" << imagesFolderPath; - kDebug() << " imagesFolderName:" << imagesFolderName; - kDebug() << " dataFolderPath:" << dataFolderPath; - kDebug() << " dataFolderName:" << dataFolderName; - kDebug() << " basketsFolderPath:" << basketsFolderPath; - kDebug() << " basketsFolderName:" << basketsFolderName; - - // Create the data folder for this basket: - QDir dir; - dir.mkdir(dataFolderPath); - - backgroundColorName = basket->backgroundColor().name().toLower().mid(1); - - // Generate basket icons: - QString basketIcon16 = iconsFolderName + copyIcon(basket->icon(), 16); - QString basketIcon32 = iconsFolderName + copyIcon(basket->icon(), 32); - - // Generate the [+] image for groups: - QPixmap expandGroup(Note::EXPANDER_WIDTH, Note::EXPANDER_HEIGHT); - expandGroup.fill(basket->backgroundColor()); - QPainter painter(&expandGroup); - Note::drawExpander(&painter, 0, 0, basket->backgroundColor(), /*expand=*/true, basket); - painter.end(); - expandGroup.save(imagesFolderPath + "expand_group_" + backgroundColorName + ".png", "PNG"); - - // Generate the [-] image for groups: - QPixmap foldGroup(Note::EXPANDER_WIDTH, Note::EXPANDER_HEIGHT); - foldGroup.fill(basket->backgroundColor()); - painter.begin(&foldGroup); - Note::drawExpander(&painter, 0, 0, basket->backgroundColor(), /*expand=*/false, basket); - painter.end(); - foldGroup.save(imagesFolderPath + "fold_group_" + backgroundColorName + ".png", "PNG"); - - // Open the file to write: - QFile file(basketFilePath); - if (!file.open(QIODevice::WriteOnly)) - return; - stream.setDevice(&file); - stream.setCodec("UTF-8"); - - // Compute the colors to draw dragient for notes: - QColor topBgColor; - QColor bottomBgColor; - Note::getGradientColors(basket->backgroundColor(), &topBgColor, &bottomBgColor); - // Compute the gradient image for notes: - QString gradientImageFileName = Basket::saveGradientBackground(basket->backgroundColor(), basket->Q3ScrollView::font(), imagesFolderPath); - - // Output the header: - QString borderColor = Tools::mixColor(basket->backgroundColor(), basket->textColor()).name(); - stream << - "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\n" - "<html>\n" - " <head>\n" - " <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n" - " <meta name=\"Generator\" content=\"" << KGlobal::mainComponent().aboutData()->programName() << " " << VERSION << " http://basket.kde.org/\">\n" - " <style type=\"text/css\">\n" -// " @media print {\n" -// " span.printable { display: inline; }\n" -// " }\n" - " body { margin: 10px; font: 11px sans-serif; }\n" // TODO: Use user font - " h1 { text-align: center; }\n" - " img { border: none; vertical-align: middle; }\n"; - if (withBasketTree) { - stream << - " .tree { margin: 0; padding: 1px 0 1px 1px; width: 150px; _width: 149px; overflow: hidden; float: left; }\n" - " .tree ul { margin: 0 0 0 10px; padding: 0; }\n" - " .tree li { padding: 0; margin: 0; list-style: none; }\n" - " .tree a { display: block; padding: 1px; height: 16px; text-decoration: none;\n" - " white-space: nowrap; word-wrap: normal; text-wrap: suppress; color: black; }\n" - " .tree span { -moz-border-radius: 6px; display: block; float: left;\n" - " line-height: 16px; height: 16px; vertical-align: middle; padding: 0 1px; }\n" - " .tree img { vertical-align: top; padding-right: 1px; }\n" - " .tree .current { background-color: " << kapp->palette().color(QPalette::Highlight).name() << "; " - "-moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; color: " << kapp->palette().color(QPalette::Highlight).name() << "; }\n" - " .basketSurrounder { margin-left: 152px; _margin: 0; _float: right; }\n"; - } - stream << - " .basket { background-color: " << basket->backgroundColor().name() << "; border: solid " << borderColor << " 1px; " - "font: " << Tools::cssFontDefinition(basket->Q3ScrollView::font()) << "; color: " << basket->textColor().name() << "; padding: 1px; width: 100%; }\n" - " table.basket { border-collapse: collapse; }\n" - " .basket * { padding: 0; margin: 0; }\n" - " .basket table { width: 100%; border-spacing: 0; _border-collapse: collapse; }\n" - " .column { vertical-align: top; }\n" - " .columnHandle { width: " << Note::RESIZER_WIDTH << "px; background: transparent url('" << imagesFolderName << "column_handle_" << backgroundColorName << ".png') repeat-y; }\n" - " .group { margin: 0; padding: 0; border-collapse: collapse; width: 100% }\n" - " .groupHandle { margin: 0; width: " << Note::GROUP_WIDTH << "px; text-align: center; }\n" - " .note { padding: 1px 2px; background: " << bottomBgColor.name() << " url('" << imagesFolderName << gradientImageFileName << "')" - " repeat-x; border-top: solid " << topBgColor.name() << - " 1px; border-bottom: solid " << Tools::mixColor(topBgColor, bottomBgColor).name() << - " 1px; width: 100%; }\n" - " .tags { width: 1px; white-space: nowrap; }\n" - " .tags img { padding-right: 2px; }\n" - << LinkLook::soundLook->toCSS("sound", basket->textColor()) - << LinkLook::fileLook->toCSS("file", basket->textColor()) - << LinkLook::localLinkLook->toCSS("local", basket->textColor()) - << LinkLook::networkLinkLook->toCSS("network", basket->textColor()) - << LinkLook::launcherLook->toCSS("launcher", basket->textColor()) - << - " .unknown { margin: 1px 2px; border: 1px solid " << borderColor << "; -moz-border-radius: 4px; }\n"; - QList<State*> states = basket->usedStates(); - QString statesCss; - for (State::List::Iterator it = states.begin(); it != states.end(); ++it) - statesCss += (*it)->toCSS(imagesFolderPath, imagesFolderName, basket->Q3ScrollView::font()); - stream << - statesCss << - " .credits { text-align: right; margin: 3px 0 0 0; _margin-top: -17px; font-size: 80%; color: " << borderColor << "; }\n" - " </style>\n" - " <title>" << Tools::textToHTMLWithoutP(basket->basketName()) << "</title>\n" - " <link rel=\"shortcut icon\" type=\"image/png\" href=\"" << basketIcon16 << "\">\n"; - // Create the column handle image: - QPixmap columnHandle(Note::RESIZER_WIDTH, 50); - painter.begin(&columnHandle); - Note::drawInactiveResizer(&painter, 0, 0, columnHandle.height(), basket->backgroundColor(), /*column=*/true); - painter.end(); - columnHandle.save(imagesFolderPath + "column_handle_" + backgroundColorName + ".png", "PNG"); - - stream << - " </head>\n" - " <body>\n" - " <h1><img src=\"" << basketIcon32 << "\" width=\"32\" height=\"32\" alt=\"\"> " << Tools::textToHTMLWithoutP(basket->basketName()) << "</h1>\n"; - - if (withBasketTree) - writeBasketTree(basket); - - // If filtering, only export filtered notes, inform to the user: - // TODO: Filtering tags too!! - // TODO: Make sure only filtered notes are exported! -// if (decoration()->filterData().isFiltering) -// stream << -// " " << i18n("Notes matching the filter "%1":").arg(Tools::textToHTMLWithoutP(decoration()->filterData().string)) << "\n"; - - stream << - " <div class=\"basketSurrounder\">\n"; - - if (basket->isColumnsLayout()) - stream << - " <table class=\"basket\">\n" - " <tr>\n"; - else - stream << - " <div class=\"basket\" style=\"position: relative; height: " << basket->contentsHeight() << "px; width: " << basket->contentsWidth() << "px; min-width: 100%;\">\n"; - - for (Note *note = basket->firstNote(); note; note = note->next()) - exportNote(note, /*indent=*/(basket->isFreeLayout() ? 4 : 5)); - - // Output the footer: - if (basket->isColumnsLayout()) - stream << - " </tr>\n" - " </table>\n"; - else - stream << - " </div>\n"; - stream << QString( - " </div>\n" - " %1\n").arg( - i18n("Made with <a href=\"http://basket.kde.org/\">%1</a> %2, a KDE tool to take notes and keep information at hand.", - KGlobal::mainComponent().aboutData()->programName(), VERSION)); - - // Copy a transparent GIF image in the folder, needed for the JavaScript hack: - QString gifFileName = "spacer.gif"; - QFile transGIF(imagesFolderPath + gifFileName); - if (!transGIF.exists() && transGIF.open(QIODevice::WriteOnly)) { - QDataStream streamGIF(&transGIF); - // This is a 1px*1px transparent GIF image: - const char blankGIF[] = { - 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x0a, 0x00, 0x0a, 0x00, - 0x80, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x21, - 0xfe, 0x15, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x20, - 0x77, 0x69, 0x74, 0x68, 0x20, 0x54, 0x68, 0x65, 0x20, 0x47, - 0x49, 0x4d, 0x50, 0x00, 0x21, 0xf9, 0x04, 0x01, 0x0a, 0x00, - 0x01, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x0a, - 0x00, 0x00, 0x02, 0x08, 0x8c, 0x8f, 0xa9, 0xcb, 0xed, 0x0f, - 0x63, 0x2b, 0x00, 0x3b }; - streamGIF.writeRawData(blankGIF, 74); - transGIF.close(); - } - stream << - " \n" - " </body>\n" - "</html>\n"; - - file.close(); - stream.setDevice(0); - progress->setValue(progress->value()+1); // Basket exportation finished - - // Recursively export child baskets: - BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket); - if (item->childCount() >=0) { - for (int i=0; i < item->childCount(); i++){ - exportBasket(((BasketListViewItem *)item->child(i))->basket(), /*isSubBasket=*/true); - } - } + if (!basket->isLoaded()) { + basket->load(); + } + + // Compute the absolute & relative paths for this basket: + filesFolderPath = i18nc("HTML export folder (files)", "%1_files", filePath) + "/"; + if (isSubBasket) { + basketFilePath = basketsFolderPath + basket->folderName().left(basket->folderName().length() - 1) + ".html"; + filesFolderName = "../"; + dataFolderName = basket->folderName().left(basket->folderName().length() - 1) + "-" + i18nc("HTML export folder (data)", "data") + "/"; + dataFolderPath = basketsFolderPath + dataFolderName; + basketsFolderName = ""; + } else { + basketFilePath = filePath; + filesFolderName = i18nc("HTML export folder (files)", "%1_files", KUrl(filePath).fileName()) + "/"; + dataFolderName = filesFolderName + i18nc("HTML export folder (data)", "data") + "/"; + dataFolderPath = filesFolderPath + i18nc("HTML export folder (data)", "data") + "/"; + basketsFolderName = filesFolderName + i18nc("HTML export folder (baskets)", "baskets") + "/"; + } + iconsFolderName = (isSubBasket ? "../" : filesFolderName) + i18nc("HTML export folder (icons)", "icons") + "/"; // eg.: "foo.html_files/icons/" or "../icons/" + imagesFolderName = (isSubBasket ? "../" : filesFolderName) + i18nc("HTML export folder (images)", "images") + "/"; // eg.: "foo.html_files/images/" or "../images/" + + kDebug() << "Exporting ================================================"; + kDebug() << " filePath:" << filePath; + kDebug() << " basketFilePath:" << basketFilePath; + kDebug() << " filesFolderPath:" << filesFolderPath; + kDebug() << " filesFolderName:" << filesFolderName; + kDebug() << " iconsFolderPath:" << iconsFolderPath; + kDebug() << " iconsFolderName:" << iconsFolderName; + kDebug() << " imagesFolderPath:" << imagesFolderPath; + kDebug() << " imagesFolderName:" << imagesFolderName; + kDebug() << " dataFolderPath:" << dataFolderPath; + kDebug() << " dataFolderName:" << dataFolderName; + kDebug() << " basketsFolderPath:" << basketsFolderPath; + kDebug() << " basketsFolderName:" << basketsFolderName; + + // Create the data folder for this basket: + QDir dir; + dir.mkdir(dataFolderPath); + + backgroundColorName = basket->backgroundColor().name().toLower().mid(1); + + // Generate basket icons: + QString basketIcon16 = iconsFolderName + copyIcon(basket->icon(), 16); + QString basketIcon32 = iconsFolderName + copyIcon(basket->icon(), 32); + + // Generate the [+] image for groups: + QPixmap expandGroup(Note::EXPANDER_WIDTH, Note::EXPANDER_HEIGHT); + expandGroup.fill(basket->backgroundColor()); + QPainter painter(&expandGroup); + Note::drawExpander(&painter, 0, 0, basket->backgroundColor(), /*expand=*/true, basket); + painter.end(); + expandGroup.save(imagesFolderPath + "expand_group_" + backgroundColorName + ".png", "PNG"); + + // Generate the [-] image for groups: + QPixmap foldGroup(Note::EXPANDER_WIDTH, Note::EXPANDER_HEIGHT); + foldGroup.fill(basket->backgroundColor()); + painter.begin(&foldGroup); + Note::drawExpander(&painter, 0, 0, basket->backgroundColor(), /*expand=*/false, basket); + painter.end(); + foldGroup.save(imagesFolderPath + "fold_group_" + backgroundColorName + ".png", "PNG"); + + // Open the file to write: + QFile file(basketFilePath); + if (!file.open(QIODevice::WriteOnly)) + return; + stream.setDevice(&file); + stream.setCodec("UTF-8"); + + // Compute the colors to draw dragient for notes: + QColor topBgColor; + QColor bottomBgColor; + Note::getGradientColors(basket->backgroundColor(), &topBgColor, &bottomBgColor); + // Compute the gradient image for notes: + QString gradientImageFileName = Basket::saveGradientBackground(basket->backgroundColor(), basket->Q3ScrollView::font(), imagesFolderPath); + + // Output the header: + QString borderColor = Tools::mixColor(basket->backgroundColor(), basket->textColor()).name(); + stream << + "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\n" + "<html>\n" + " <head>\n" + " <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n" + " <meta name=\"Generator\" content=\"" << KGlobal::mainComponent().aboutData()->programName() << " " << VERSION << " http://basket.kde.org/\">\n" + " <style type=\"text/css\">\n" +// " @media print {\n" +// " span.printable { display: inline; }\n" +// " }\n" + " body { margin: 10px; font: 11px sans-serif; }\n" // TODO: Use user font + " h1 { text-align: center; }\n" + " img { border: none; vertical-align: middle; }\n"; + if (withBasketTree) { + stream << + " .tree { margin: 0; padding: 1px 0 1px 1px; width: 150px; _width: 149px; overflow: hidden; float: left; }\n" + " .tree ul { margin: 0 0 0 10px; padding: 0; }\n" + " .tree li { padding: 0; margin: 0; list-style: none; }\n" + " .tree a { display: block; padding: 1px; height: 16px; text-decoration: none;\n" + " white-space: nowrap; word-wrap: normal; text-wrap: suppress; color: black; }\n" + " .tree span { -moz-border-radius: 6px; display: block; float: left;\n" + " line-height: 16px; height: 16px; vertical-align: middle; padding: 0 1px; }\n" + " .tree img { vertical-align: top; padding-right: 1px; }\n" + " .tree .current { background-color: " << kapp->palette().color(QPalette::Highlight).name() << "; " + "-moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; color: " << kapp->palette().color(QPalette::Highlight).name() << "; }\n" + " .basketSurrounder { margin-left: 152px; _margin: 0; _float: right; }\n"; + } + stream << + " .basket { background-color: " << basket->backgroundColor().name() << "; border: solid " << borderColor << " 1px; " + "font: " << Tools::cssFontDefinition(basket->Q3ScrollView::font()) << "; color: " << basket->textColor().name() << "; padding: 1px; width: 100%; }\n" + " table.basket { border-collapse: collapse; }\n" + " .basket * { padding: 0; margin: 0; }\n" + " .basket table { width: 100%; border-spacing: 0; _border-collapse: collapse; }\n" + " .column { vertical-align: top; }\n" + " .columnHandle { width: " << Note::RESIZER_WIDTH << "px; background: transparent url('" << imagesFolderName << "column_handle_" << backgroundColorName << ".png') repeat-y; }\n" + " .group { margin: 0; padding: 0; border-collapse: collapse; width: 100% }\n" + " .groupHandle { margin: 0; width: " << Note::GROUP_WIDTH << "px; text-align: center; }\n" + " .note { padding: 1px 2px; background: " << bottomBgColor.name() << " url('" << imagesFolderName << gradientImageFileName << "')" + " repeat-x; border-top: solid " << topBgColor.name() << + " 1px; border-bottom: solid " << Tools::mixColor(topBgColor, bottomBgColor).name() << + " 1px; width: 100%; }\n" + " .tags { width: 1px; white-space: nowrap; }\n" + " .tags img { padding-right: 2px; }\n" + << LinkLook::soundLook->toCSS("sound", basket->textColor()) + << LinkLook::fileLook->toCSS("file", basket->textColor()) + << LinkLook::localLinkLook->toCSS("local", basket->textColor()) + << LinkLook::networkLinkLook->toCSS("network", basket->textColor()) + << LinkLook::launcherLook->toCSS("launcher", basket->textColor()) + << + " .unknown { margin: 1px 2px; border: 1px solid " << borderColor << "; -moz-border-radius: 4px; }\n"; + QList<State*> states = basket->usedStates(); + QString statesCss; + for (State::List::Iterator it = states.begin(); it != states.end(); ++it) + statesCss += (*it)->toCSS(imagesFolderPath, imagesFolderName, basket->Q3ScrollView::font()); + stream << + statesCss << + " .credits { text-align: right; margin: 3px 0 0 0; _margin-top: -17px; font-size: 80%; color: " << borderColor << "; }\n" + " </style>\n" + " <title>" << Tools::textToHTMLWithoutP(basket->basketName()) << "</title>\n" + " <link rel=\"shortcut icon\" type=\"image/png\" href=\"" << basketIcon16 << "\">\n"; + // Create the column handle image: + QPixmap columnHandle(Note::RESIZER_WIDTH, 50); + painter.begin(&columnHandle); + Note::drawInactiveResizer(&painter, 0, 0, columnHandle.height(), basket->backgroundColor(), /*column=*/true); + painter.end(); + columnHandle.save(imagesFolderPath + "column_handle_" + backgroundColorName + ".png", "PNG"); + + stream << + " </head>\n" + " <body>\n" + " <h1><img src=\"" << basketIcon32 << "\" width=\"32\" height=\"32\" alt=\"\"> " << Tools::textToHTMLWithoutP(basket->basketName()) << "</h1>\n"; + + if (withBasketTree) + writeBasketTree(basket); + + // If filtering, only export filtered notes, inform to the user: + // TODO: Filtering tags too!! + // TODO: Make sure only filtered notes are exported! +// if (decoration()->filterData().isFiltering) +// stream << +// " " << i18n("Notes matching the filter "%1":").arg(Tools::textToHTMLWithoutP(decoration()->filterData().string)) << "\n"; + + stream << + " <div class=\"basketSurrounder\">\n"; + + if (basket->isColumnsLayout()) + stream << + " <table class=\"basket\">\n" + " <tr>\n"; + else + stream << + " <div class=\"basket\" style=\"position: relative; height: " << basket->contentsHeight() << "px; width: " << basket->contentsWidth() << "px; min-width: 100%;\">\n"; + + for (Note *note = basket->firstNote(); note; note = note->next()) + exportNote(note, /*indent=*/(basket->isFreeLayout() ? 4 : 5)); + + // Output the footer: + if (basket->isColumnsLayout()) + stream << + " </tr>\n" + " </table>\n"; + else + stream << + " </div>\n"; + stream << QString( + " </div>\n" + " %1\n").arg( + i18n("Made with <a href=\"http://basket.kde.org/\">%1</a> %2, a KDE tool to take notes and keep information at hand.", + KGlobal::mainComponent().aboutData()->programName(), VERSION)); + + // Copy a transparent GIF image in the folder, needed for the JavaScript hack: + QString gifFileName = "spacer.gif"; + QFile transGIF(imagesFolderPath + gifFileName); + if (!transGIF.exists() && transGIF.open(QIODevice::WriteOnly)) { + QDataStream streamGIF(&transGIF); + // This is a 1px*1px transparent GIF image: + const char blankGIF[] = { + 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x0a, 0x00, 0x0a, 0x00, + 0x80, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x21, + 0xfe, 0x15, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x20, + 0x77, 0x69, 0x74, 0x68, 0x20, 0x54, 0x68, 0x65, 0x20, 0x47, + 0x49, 0x4d, 0x50, 0x00, 0x21, 0xf9, 0x04, 0x01, 0x0a, 0x00, + 0x01, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x0a, + 0x00, 0x00, 0x02, 0x08, 0x8c, 0x8f, 0xa9, 0xcb, 0xed, 0x0f, + 0x63, 0x2b, 0x00, 0x3b + }; + streamGIF.writeRawData(blankGIF, 74); + transGIF.close(); + } + stream << + " \n" + " </body>\n" + "</html>\n"; + + file.close(); + stream.setDevice(0); + progress->setValue(progress->value() + 1); // Basket exportation finished + + // Recursively export child baskets: + BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket); + if (item->childCount() >= 0) { + for (int i = 0; i < item->childCount(); i++) { + exportBasket(((BasketListViewItem *)item->child(i))->basket(), /*isSubBasket=*/true); + } + } } void HTMLExporter::exportNote(Note *note, int indent) { - QString spaces; - - if (note->isColumn()) { - QString width = ""; - if (false/*TODO: DEBUG AND REENABLE: hasResizer()*/) { - // As we cannot be precise in CSS (say eg. "width: 50%-40px;"), - // we output a percentage that is approximatively correct. - // For instance, we compute the currently used percentage of width in the basket - // and try make make it the same on a 1024*768 display in a Web browser: - int availableSpaceForColumnsInThisBasket = note->basket()->contentsWidth() - (note->basket()->columnsCount() - 1) * Note::RESIZER_WIDTH; - int availableSpaceForColumnsInBrowser = 1024 /* typical screen width */ - - 25 /* window border and scrollbar width */ - - 2 * 5 /* page margin */ - - (note->basket()->columnsCount() - 1) * Note::RESIZER_WIDTH; - if (availableSpaceForColumnsInThisBasket <= 0) - availableSpaceForColumnsInThisBasket = 1; - int widthValue = (int)(availableSpaceForColumnsInBrowser * (double) note->groupWidth() / availableSpaceForColumnsInThisBasket); - if (widthValue <= 0) - widthValue = 1; - if (widthValue > 100) - widthValue = 100; - width = QString(" width=\"%1%\"").arg(QString::number(widthValue)); - } - stream << spaces.fill(' ', indent) << "<td class=\"column\"" << width << ">\n"; - - // Export child notes: - for (Note *child = note->firstChild(); child; child = child->next()) { - stream << spaces.fill(' ', indent + 1); - exportNote(child, indent + 1); - stream << '\n'; - } - - stream << spaces.fill(' ', indent) << "</td>\n"; - if (note->hasResizer()) - stream << spaces.fill(' ', indent) << "<td class=\"columnHandle\"></td>\n"; - return; - } - - QString freeStyle; - if (note->isFree()) - freeStyle = " style=\"position: absolute; left: " + QString::number(note->x()) + "px; top: " + QString::number(note->y()) + "px; width: " + QString::number(note->groupWidth()) + "px\""; - - if (note->isGroup()) { - stream << '\n' << spaces.fill(' ', indent) << "<table" << freeStyle << ">\n"; // Note content is expected to be on the same HTML line, but NOT groups - int i = 0; - for (Note *child = note->firstChild(); child; child = child->next()) { - stream << spaces.fill(' ', indent); - if (i == 0) - stream << " <tr><td class=\"groupHandle\"><img src=\"" << imagesFolderName << (note->isFolded() ? "expand_group_" : "fold_group_") << backgroundColorName << ".png" - << "\" width=\"" << Note::EXPANDER_WIDTH << "\" height=\"" << Note::EXPANDER_HEIGHT << "\"></td>\n"; - else if (i == 1) - stream << " <tr><td class=\"freeSpace\" rowspan=\"" << note->countDirectChilds() << "\"></td>\n"; - else - stream << " <tr>\n"; - stream << spaces.fill(' ', indent) << " <td>"; - exportNote(child, indent + 3); - stream << "</td>\n" - << spaces.fill(' ', indent) << " </tr>\n"; - ++i; - } - stream << '\n' << spaces.fill(' ', indent) << "</table>\n" /*<< spaces.fill(' ', indent - 1)*/; - } else { - // Additionnal class for the content (link, netword, color...): - QString additionnalClasses = note->content()->cssClass(); - if (!additionnalClasses.isEmpty()) - additionnalClasses = " " + additionnalClasses; - // Assign the style of each associted tags: - for (State::List::Iterator it = note->states().begin(); it != note->states().end(); ++it) - additionnalClasses += " tag_" + (*it)->id(); - //stream << spaces.fill(' ', indent); - stream << "<table class=\"note" << additionnalClasses << "\"" << freeStyle << "><tr>"; - if (note->emblemsCount() > 0) { - stream << "<td class=\"tags\">"; - for (State::List::Iterator it = note->states().begin(); it != note->states().end(); ++it) - if (!(*it)->emblem().isEmpty()) { - int emblemSize = 16; - QString iconFileName = copyIcon((*it)->emblem(), emblemSize); - stream << "<img src=\"" << iconsFolderName << iconFileName - << "\" width=\"" << emblemSize << "\" height=\"" << emblemSize - << "\" alt=\"" << (*it)->textEquivalent() << "\" title=\"" << (*it)->fullName() << "\">"; - } - stream << "</td>"; - } - stream << "<td>"; - note->content()->exportToHTML(this, indent); - stream << "</td></tr></table>"; - } + QString spaces; + + if (note->isColumn()) { + QString width = ""; + if (false/*TODO: DEBUG AND REENABLE: hasResizer()*/) { + // As we cannot be precise in CSS (say eg. "width: 50%-40px;"), + // we output a percentage that is approximatively correct. + // For instance, we compute the currently used percentage of width in the basket + // and try make make it the same on a 1024*768 display in a Web browser: + int availableSpaceForColumnsInThisBasket = note->basket()->contentsWidth() - (note->basket()->columnsCount() - 1) * Note::RESIZER_WIDTH; + int availableSpaceForColumnsInBrowser = 1024 /* typical screen width */ + - 25 /* window border and scrollbar width */ + - 2 * 5 /* page margin */ + - (note->basket()->columnsCount() - 1) * Note::RESIZER_WIDTH; + if (availableSpaceForColumnsInThisBasket <= 0) + availableSpaceForColumnsInThisBasket = 1; + int widthValue = (int)(availableSpaceForColumnsInBrowser * (double) note->groupWidth() / availableSpaceForColumnsInThisBasket); + if (widthValue <= 0) + widthValue = 1; + if (widthValue > 100) + widthValue = 100; + width = QString(" width=\"%1%\"").arg(QString::number(widthValue)); + } + stream << spaces.fill(' ', indent) << "<td class=\"column\"" << width << ">\n"; + + // Export child notes: + for (Note *child = note->firstChild(); child; child = child->next()) { + stream << spaces.fill(' ', indent + 1); + exportNote(child, indent + 1); + stream << '\n'; + } + + stream << spaces.fill(' ', indent) << "</td>\n"; + if (note->hasResizer()) + stream << spaces.fill(' ', indent) << "<td class=\"columnHandle\"></td>\n"; + return; + } + + QString freeStyle; + if (note->isFree()) + freeStyle = " style=\"position: absolute; left: " + QString::number(note->x()) + "px; top: " + QString::number(note->y()) + "px; width: " + QString::number(note->groupWidth()) + "px\""; + + if (note->isGroup()) { + stream << '\n' << spaces.fill(' ', indent) << "<table" << freeStyle << ">\n"; // Note content is expected to be on the same HTML line, but NOT groups + int i = 0; + for (Note *child = note->firstChild(); child; child = child->next()) { + stream << spaces.fill(' ', indent); + if (i == 0) + stream << " <tr><td class=\"groupHandle\"><img src=\"" << imagesFolderName << (note->isFolded() ? "expand_group_" : "fold_group_") << backgroundColorName << ".png" + << "\" width=\"" << Note::EXPANDER_WIDTH << "\" height=\"" << Note::EXPANDER_HEIGHT << "\"></td>\n"; + else if (i == 1) + stream << " <tr><td class=\"freeSpace\" rowspan=\"" << note->countDirectChilds() << "\"></td>\n"; + else + stream << " <tr>\n"; + stream << spaces.fill(' ', indent) << " <td>"; + exportNote(child, indent + 3); + stream << "</td>\n" + << spaces.fill(' ', indent) << " </tr>\n"; + ++i; + } + stream << '\n' << spaces.fill(' ', indent) << "</table>\n" /*<< spaces.fill(' ', indent - 1)*/; + } else { + // Additionnal class for the content (link, netword, color...): + QString additionnalClasses = note->content()->cssClass(); + if (!additionnalClasses.isEmpty()) + additionnalClasses = " " + additionnalClasses; + // Assign the style of each associted tags: + for (State::List::Iterator it = note->states().begin(); it != note->states().end(); ++it) + additionnalClasses += " tag_" + (*it)->id(); + //stream << spaces.fill(' ', indent); + stream << "<table class=\"note" << additionnalClasses << "\"" << freeStyle << "><tr>"; + if (note->emblemsCount() > 0) { + stream << "<td class=\"tags\">"; + for (State::List::Iterator it = note->states().begin(); it != note->states().end(); ++it) + if (!(*it)->emblem().isEmpty()) { + int emblemSize = 16; + QString iconFileName = copyIcon((*it)->emblem(), emblemSize); + stream << "<img src=\"" << iconsFolderName << iconFileName + << "\" width=\"" << emblemSize << "\" height=\"" << emblemSize + << "\" alt=\"" << (*it)->textEquivalent() << "\" title=\"" << (*it)->fullName() << "\">"; + } + stream << "</td>"; + } + stream << "<td>"; + note->content()->exportToHTML(this, indent); + stream << "</td></tr></table>"; + } } void HTMLExporter::writeBasketTree(Basket *currentBasket) { - stream << " <ul class=\"tree\">\n"; - writeBasketTree(currentBasket, exportedBasket, 3); - stream << " </ul>\n"; + stream << " <ul class=\"tree\">\n"; + writeBasketTree(currentBasket, exportedBasket, 3); + stream << " </ul>\n"; } void HTMLExporter::writeBasketTree(Basket *currentBasket, Basket *basket, int indent) { - // Compute variable HTML code: - QString spaces; - QString cssClass = (basket == currentBasket ? " class=\"current\"" : ""); - QString link = "#"; - if (currentBasket != basket) { - if (currentBasket == exportedBasket) { - link = basketsFolderName + basket->folderName().left(basket->folderName().length() - 1) + ".html"; - } else if (basket == exportedBasket) { - link = "../../" + fileName; - } else { - link = basket->folderName().left(basket->folderName().length() - 1) + ".html"; - } - } - QString spanStyle = ""; - if (basket->backgroundColorSetting().isValid() || basket->textColorSetting().isValid()) { - spanStyle = " style=\"background-color: " + basket->backgroundColor().name() + "; color: " + basket->textColor().name() + "\""; - } - - // Write the basket tree line: - stream << - spaces.fill(' ', indent) << "<li><a" << cssClass << " href=\"" << link << "\">" - "<span" << spanStyle << " title=\"" << Tools::textToHTMLWithoutP(basket->basketName()) << "\">" - "<img src=\"" << iconsFolderName << copyIcon(basket->icon(), 16) << "\" width=\"16\" height=\"16\" alt=\"\">" << Tools::textToHTMLWithoutP(basket->basketName()) << "</a>"; - - // Write the sub-baskets lines & end the current one: - BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket); - if (item->childCount() >= 0) { - stream << - "\n" << - spaces.fill(' ', indent) << " <ul>\n"; - for (int i=0;i<item->childCount();i++) - writeBasketTree(currentBasket, ((BasketListViewItem*)item->child(i))->basket(), indent + 2); - stream << - spaces.fill(' ', indent) << " </ul>\n" << - spaces.fill(' ', indent) << "</li>\n"; - } else { - stream << "</li>\n"; - } + // Compute variable HTML code: + QString spaces; + QString cssClass = (basket == currentBasket ? " class=\"current\"" : ""); + QString link = "#"; + if (currentBasket != basket) { + if (currentBasket == exportedBasket) { + link = basketsFolderName + basket->folderName().left(basket->folderName().length() - 1) + ".html"; + } else if (basket == exportedBasket) { + link = "../../" + fileName; + } else { + link = basket->folderName().left(basket->folderName().length() - 1) + ".html"; + } + } + QString spanStyle = ""; + if (basket->backgroundColorSetting().isValid() || basket->textColorSetting().isValid()) { + spanStyle = " style=\"background-color: " + basket->backgroundColor().name() + "; color: " + basket->textColor().name() + "\""; + } + + // Write the basket tree line: + stream << + spaces.fill(' ', indent) << "<li><a" << cssClass << " href=\"" << link << "\">" + "<span" << spanStyle << " title=\"" << Tools::textToHTMLWithoutP(basket->basketName()) << "\">" + "<img src=\"" << iconsFolderName << copyIcon(basket->icon(), 16) << "\" width=\"16\" height=\"16\" alt=\"\">" << Tools::textToHTMLWithoutP(basket->basketName()) << "</a>"; + + // Write the sub-baskets lines & end the current one: + BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket); + if (item->childCount() >= 0) { + stream << + "\n" << + spaces.fill(' ', indent) << " <ul>\n"; + for (int i = 0; i < item->childCount(); i++) + writeBasketTree(currentBasket, ((BasketListViewItem*)item->child(i))->basket(), indent + 2); + stream << + spaces.fill(' ', indent) << " </ul>\n" << + spaces.fill(' ', indent) << "</li>\n"; + } else { + stream << "</li>\n"; + } } /** Save an icon to a folder. @@ -525,16 +526,16 @@ void HTMLExporter::writeBasketTree(Basket *currentBasket, Basket *basket, int in */ QString HTMLExporter::copyIcon(const QString &iconName, int size) { - if (iconName.isEmpty()) - return ""; - - // Sometimes icon can be "favicons/www.kde.org", we replace the '/' with a '_' - QString fileName = iconName; // QString::replace() isn't const, so I must copy the string before - fileName = "ico" + QString::number(size) + "_" + fileName.replace("/", "_") + ".png"; - QString fullPath = iconsFolderPath + fileName; - if (!QFile::exists(fullPath)) - DesktopIcon(iconName, size).save(fullPath, "PNG"); - return fileName; + if (iconName.isEmpty()) + return ""; + + // Sometimes icon can be "favicons/www.kde.org", we replace the '/' with a '_' + QString fileName = iconName; // QString::replace() isn't const, so I must copy the string before + fileName = "ico" + QString::number(size) + "_" + fileName.replace("/", "_") + ".png"; + QString fullPath = iconsFolderPath + fileName; + if (!QFile::exists(fullPath)) + DesktopIcon(iconName, size).save(fullPath, "PNG"); + return fileName; } /** Done: Sometimes we can call two times copyFile() with the same srcPath and dataFolderPath @@ -545,18 +546,18 @@ QString HTMLExporter::copyIcon(const QString &iconName, int size) */ QString HTMLExporter::copyFile(const QString &srcPath, bool createIt) { - QString fileName = Tools::fileNameForNewFile(KUrl(srcPath).fileName(), dataFolderPath); - QString fullPath = dataFolderPath + fileName; - - if (createIt) { - // We create the file to be sure another very near call to copyFile() willn't choose the same name: - QFile file(KUrl(fullPath).path()); - if (file.open(QIODevice::WriteOnly)) - file.close(); - // And then we copy the file AND overwriting the file we juste created: - KIO::file_copy(KUrl(srcPath), KUrl(fullPath), 0666, KIO::HideProgressInfo| KIO::Resume | KIO::Overwrite); - } else - /*KIO::CopyJob *copyJob = */KIO::copy(KUrl(srcPath), KUrl(fullPath), KIO::DefaultFlags); // Do it as before - - return fileName; + QString fileName = Tools::fileNameForNewFile(KUrl(srcPath).fileName(), dataFolderPath); + QString fullPath = dataFolderPath + fileName; + + if (createIt) { + // We create the file to be sure another very near call to copyFile() willn't choose the same name: + QFile file(KUrl(fullPath).path()); + if (file.open(QIODevice::WriteOnly)) + file.close(); + // And then we copy the file AND overwriting the file we juste created: + KIO::file_copy(KUrl(srcPath), KUrl(fullPath), 0666, KIO::HideProgressInfo | KIO::Resume | KIO::Overwrite); + } else + /*KIO::CopyJob *copyJob = */KIO::copy(KUrl(srcPath), KUrl(fullPath), KIO::DefaultFlags); // Do it as before + + return fileName; } src/htmlexporter.cpp @@ -34,46 +34,46 @@ class Note; */ class HTMLExporter { - public: - HTMLExporter(Basket *basket); - ~HTMLExporter(); - private: - void prepareExport(Basket *basket, const QString &fullPath); - void exportBasket(Basket *basket, bool isSubBasket); - void exportNote(Note *note, int indent); - void writeBasketTree(Basket *currentBasket); - void writeBasketTree(Basket *currentBasket, Basket *basket, int indent); +public: + HTMLExporter(Basket *basket); + ~HTMLExporter(); +private: + void prepareExport(Basket *basket, const QString &fullPath); + void exportBasket(Basket *basket, bool isSubBasket); + void exportNote(Note *note, int indent); + void writeBasketTree(Basket *currentBasket); + void writeBasketTree(Basket *currentBasket, Basket *basket, int indent); - public: - QString copyIcon(const QString &iconName, int size); - QString copyFile(const QString &srcPath, bool createIt); +public: + QString copyIcon(const QString &iconName, int size); + QString copyFile(const QString &srcPath, bool createIt); - public: - // Absolute path of the file name the user choosen: - QString filePath; // eg.: "/home/seb/foo.html" - QString fileName; // eg.: "foo.html" +public: + // Absolute path of the file name the user choosen: + QString filePath; // eg.: "/home/seb/foo.html" + QString fileName; // eg.: "foo.html" - // Absolute & relative paths for the current basket to be exported: - QString basketFilePath; // eg.: "/home/seb/foo.html" or "/home/seb/foo.html_files/baskets/basketN.html" - QString filesFolderPath; // eg.: "/home/seb/foo.html_files/" - QString filesFolderName; // eg.: "foo.html_files/" or "../" - QString iconsFolderPath; // eg.: "/home/seb/foo.html_files/icons/" - QString iconsFolderName; // eg.: "foo.html_files/icons/" or "../icons/" - QString imagesFolderPath; // eg.: "/home/seb/foo.html_files/images/" - QString imagesFolderName; // eg.: "foo.html_files/images/" or "../images/" - QString dataFolderPath; // eg.: "/home/seb/foo.html_files/data/" or "/home/seb/foo.html_files/baskets/basketN-data/" - QString dataFolderName; // eg.: "foo.html_files/data/" or "basketN-data/" - QString basketsFolderPath; // eg.: "/home/seb/foo.html_files/baskets/" - QString basketsFolderName; // eg.: "foo.html_files/baskets/" or "" + // Absolute & relative paths for the current basket to be exported: + QString basketFilePath; // eg.: "/home/seb/foo.html" or "/home/seb/foo.html_files/baskets/basketN.html" + QString filesFolderPath; // eg.: "/home/seb/foo.html_files/" + QString filesFolderName; // eg.: "foo.html_files/" or "../" + QString iconsFolderPath; // eg.: "/home/seb/foo.html_files/icons/" + QString iconsFolderName; // eg.: "foo.html_files/icons/" or "../icons/" + QString imagesFolderPath; // eg.: "/home/seb/foo.html_files/images/" + QString imagesFolderName; // eg.: "foo.html_files/images/" or "../images/" + QString dataFolderPath; // eg.: "/home/seb/foo.html_files/data/" or "/home/seb/foo.html_files/baskets/basketN-data/" + QString dataFolderName; // eg.: "foo.html_files/data/" or "basketN-data/" + QString basketsFolderPath; // eg.: "/home/seb/foo.html_files/baskets/" + QString basketsFolderName; // eg.: "foo.html_files/baskets/" or "" - // Various properties of the currently exporting basket: - QString backgroundColorName; + // Various properties of the currently exporting basket: + QString backgroundColorName; - // Variables used by every export methods: - QTextStream stream; - Basket *exportedBasket; - bool withBasketTree; - QProgressBar *progress; + // Variables used by every export methods: + QTextStream stream; + Basket *exportedBasket; + bool withBasketTree; + QProgressBar *progress; }; #endif // HTMLEXPORTER_H src/htmlexporter.h @@ -26,47 +26,37 @@ //---------------------------- // KCM stuff //---------------------------- -extern "C" -{ - KDE_EXPORT KCModule *create_basket_config_general(QWidget *parent, const char *) - { - GeneralPage *page = new GeneralPage(parent, "kcmbasket_config_general"); - return page; - } +extern "C" { + KDE_EXPORT KCModule *create_basket_config_general(QWidget *parent, const char *) { + GeneralPage *page = new GeneralPage(parent, "kcmbasket_config_general"); + return page; + } } -extern "C" -{ - KDE_EXPORT KCModule *create_basket_config_baskets(QWidget *parent, const char *) - { - BasketsPage *page = new BasketsPage(parent, "kcmbasket_config_baskets"); - return page; - } +extern "C" { + KDE_EXPORT KCModule *create_basket_config_baskets(QWidget *parent, const char *) { + BasketsPage *page = new BasketsPage(parent, "kcmbasket_config_baskets"); + return page; + } } -extern "C" -{ - KDE_EXPORT KCModule *create_basket_config_new_notes(QWidget *parent, const char *) - { - NewNotesPage *page = new NewNotesPage(parent, "kcmbasket_config_new_notes"); - return page; - } +extern "C" { + KDE_EXPORT KCModule *create_basket_config_new_notes(QWidget *parent, const char *) { + NewNotesPage *page = new NewNotesPage(parent, "kcmbasket_config_new_notes"); + return page; + } } -extern "C" -{ - KDE_EXPORT KCModule *create_basket_config_notes_appearance(QWidget *parent, const char *) - { - NotesAppearancePage *page = new NotesAppearancePage(parent, "kcmbasket_config_notes_appearance"); - return page; - } +extern "C" { + KDE_EXPORT KCModule *create_basket_config_notes_appearance(QWidget *parent, const char *) { + NotesAppearancePage *page = new NotesAppearancePage(parent, "kcmbasket_config_notes_appearance"); + return page; + } } -extern "C" -{ - KDE_EXPORT KCModule *create_basket_config_apps(QWidget *parent, const char *) - { - ApplicationsPage *page = new ApplicationsPage(parent, "kcmbasket_config_apps"); - return page; - } +extern "C" { + KDE_EXPORT KCModule *create_basket_config_apps(QWidget *parent, const char *) { + ApplicationsPage *page = new ApplicationsPage(parent, "kcmbasket_config_apps"); + return page; + } } src/kcm_basket.cpp @@ -44,10 +44,10 @@ //#define OUTPUT_GIMP_PALETTE #ifdef DEBUG_COLOR_ARRAY - #include <iomanip> +#include <iomanip> #endif #ifdef OUTPUT_GIMP_PALETTE - #include <iomanip> +#include <iomanip> #endif @@ -58,12 +58,12 @@ const int KColorPopup::FRAME_WIDTH = 1; KColorPopup::KColorPopup(KColorCombo2 *parent) - : QWidget(/*parent=*/0, /*name=*/0, Qt::WType_Popup | WNoAutoErase), - m_selector(parent) + : QWidget(/*parent=*/0, /*name=*/0, Qt::WType_Popup | WNoAutoErase), + m_selector(parent) { - hide(); - setMouseTracking(true); - //resize(20, 20); + hide(); + setMouseTracking(true); + //resize(20, 20); } KColorPopup::~KColorPopup() @@ -74,238 +74,238 @@ KColorPopup::~KColorPopup() void KColorPopup::relayout() // FIXME: relayout should NOT redraw the pixmap! { - int columnCount = m_selector->columnCount(); - int rowCount = m_selector->rowCount(); - int colorHeight = m_selector->colorRectHeight(); - int colorWidth = m_selector->colorRectWidthForHeight(colorHeight); - bool haveDefault = m_selector->defaultColor().isValid(); - - int width = 2 + MARGIN + (colorWidth + MARGIN) * columnCount; - int height = 2 + MARGIN + (colorHeight + MARGIN) * rowCount + (colorHeight + MARGIN); - - resize(width, height); - - // Initialize the pixmap: - m_pixmap.resize(width, height); - QPainter painter(&m_pixmap); - painter.fillRect(0, 0, width, height, palette().color(QPalette::Base)); - painter.setPen(palette().color(QPalette::Text)); - painter.drawRect(0, 0, width, height); - - // Needed to draw: - int x, y; - QRect selectionRect; - - // Draw the color array: - for (int i = 0; i < columnCount; ++i) { - for (int j = 0; j < rowCount; ++j) { - x = 1 + MARGIN + (colorWidth + MARGIN) * i; - y = 1 + MARGIN + (colorHeight + MARGIN) * j; - if (i == m_selectedColumn && j == m_selectedRow) { - selectionRect = QRect(x - 2, y - 2, colorWidth + 4, colorHeight + 4); - painter.fillRect(selectionRect, palette().color(QPalette::Highlight)); - } - m_selector->drawColorRect(painter, x, y, m_selector->colorAt(i, j), /*isDefault=*/false, colorWidth, colorHeight); - } - } - - m_columnOther = (haveDefault ? columnCount / 2 : 0); // "(Default)" is allowed, paint "Other..." on the right - int defaultCellWidth = (colorWidth + MARGIN) * m_columnOther; - int otherCellWidth = (colorWidth + MARGIN) * (columnCount - m_columnOther); - - // Draw the "(Default)" and "Other..." colors: - y = height - (colorHeight + MARGIN) - 1; - QColor textColor; - if (m_selector->defaultColor().isValid()) { - x = 1 + MARGIN; - if (m_selectedColumn < m_columnOther && rowCount == m_selectedRow) { - selectionRect = QRect(x - 2, y - 2, defaultCellWidth, colorHeight + 4); - painter.fillRect(selectionRect, palette().color(QPalette::Highlight)); - textColor = palette().color(QPalette::HighlightedText); - } else - textColor = palette().color(QPalette::Text); - m_selector->drawColorRect(painter, x, y, m_selector->defaultColor(), /*isDefault=*/true, colorWidth, colorHeight); - painter.setFont(m_selector->font()); - painter.setPen(textColor); - painter.drawText(x + 2 + colorWidth, y, /*width=*/5000, colorHeight, Qt::AlignLeft | Qt::AlignVCenter | DontClip, i18n("(Default)")); - } - x = 1 + MARGIN + m_columnOther * (colorWidth + MARGIN); - if (m_selectedColumn >= m_columnOther && rowCount == m_selectedRow) { - selectionRect = QRect(x - 2, y - 2, otherCellWidth, colorHeight + 4); - painter.fillRect(selectionRect, palette().color(QPalette::Highlight)); - textColor = palette().color(QPalette::HighlightedText); - } else - textColor = palette().color(QPalette::Text); - m_selector->drawColorRect(painter, x, y, m_otherColor, /*isDefault=*/false, colorWidth, colorHeight); - painter.setFont(m_selector->font()); - painter.setPen(textColor); - painter.drawText(x + 2 + colorWidth, y, /*width=*/5000, colorHeight, Qt::AlignLeft | Qt::AlignVCenter | DontClip, i18n("Other...")); - -// QPoint pos = mapFromGlobal(QCursor::pos()); -// painter.drawRect(pos.x(), pos.y(), 5000, 5000); + int columnCount = m_selector->columnCount(); + int rowCount = m_selector->rowCount(); + int colorHeight = m_selector->colorRectHeight(); + int colorWidth = m_selector->colorRectWidthForHeight(colorHeight); + bool haveDefault = m_selector->defaultColor().isValid(); + + int width = 2 + MARGIN + (colorWidth + MARGIN) * columnCount; + int height = 2 + MARGIN + (colorHeight + MARGIN) * rowCount + (colorHeight + MARGIN); + + resize(width, height); + + // Initialize the pixmap: + m_pixmap.resize(width, height); + QPainter painter(&m_pixmap); + painter.fillRect(0, 0, width, height, palette().color(QPalette::Base)); + painter.setPen(palette().color(QPalette::Text)); + painter.drawRect(0, 0, width, height); + + // Needed to draw: + int x, y; + QRect selectionRect; + + // Draw the color array: + for (int i = 0; i < columnCount; ++i) { + for (int j = 0; j < rowCount; ++j) { + x = 1 + MARGIN + (colorWidth + MARGIN) * i; + y = 1 + MARGIN + (colorHeight + MARGIN) * j; + if (i == m_selectedColumn && j == m_selectedRow) { + selectionRect = QRect(x - 2, y - 2, colorWidth + 4, colorHeight + 4); + painter.fillRect(selectionRect, palette().color(QPalette::Highlight)); + } + m_selector->drawColorRect(painter, x, y, m_selector->colorAt(i, j), /*isDefault=*/false, colorWidth, colorHeight); + } + } + + m_columnOther = (haveDefault ? columnCount / 2 : 0); // "(Default)" is allowed, paint "Other..." on the right + int defaultCellWidth = (colorWidth + MARGIN) * m_columnOther; + int otherCellWidth = (colorWidth + MARGIN) * (columnCount - m_columnOther); + + // Draw the "(Default)" and "Other..." colors: + y = height - (colorHeight + MARGIN) - 1; + QColor textColor; + if (m_selector->defaultColor().isValid()) { + x = 1 + MARGIN; + if (m_selectedColumn < m_columnOther && rowCount == m_selectedRow) { + selectionRect = QRect(x - 2, y - 2, defaultCellWidth, colorHeight + 4); + painter.fillRect(selectionRect, palette().color(QPalette::Highlight)); + textColor = palette().color(QPalette::HighlightedText); + } else + textColor = palette().color(QPalette::Text); + m_selector->drawColorRect(painter, x, y, m_selector->defaultColor(), /*isDefault=*/true, colorWidth, colorHeight); + painter.setFont(m_selector->font()); + painter.setPen(textColor); + painter.drawText(x + 2 + colorWidth, y, /*width=*/5000, colorHeight, Qt::AlignLeft | Qt::AlignVCenter | DontClip, i18n("(Default)")); + } + x = 1 + MARGIN + m_columnOther * (colorWidth + MARGIN); + if (m_selectedColumn >= m_columnOther && rowCount == m_selectedRow) { + selectionRect = QRect(x - 2, y - 2, otherCellWidth, colorHeight + 4); + painter.fillRect(selectionRect, palette().color(QPalette::Highlight)); + textColor = palette().color(QPalette::HighlightedText); + } else + textColor = palette().color(QPalette::Text); + m_selector->drawColorRect(painter, x, y, m_otherColor, /*isDefault=*/false, colorWidth, colorHeight); + painter.setFont(m_selector->font()); + painter.setPen(textColor); + painter.drawText(x + 2 + colorWidth, y, /*width=*/5000, colorHeight, Qt::AlignLeft | Qt::AlignVCenter | DontClip, i18n("Other...")); + +// QPoint pos = mapFromGlobal(QCursor::pos()); +// painter.drawRect(pos.x(), pos.y(), 5000, 5000); } void KColorPopup::updateCell(int column, int row) { - int colorHeight = m_selector->colorRectHeight(); - int colorWidth = m_selector->colorRectWidthForHeight(colorHeight); + int colorHeight = m_selector->colorRectHeight(); + int colorWidth = m_selector->colorRectWidthForHeight(colorHeight); - int x = 1 + MARGIN + - 2 + column * (colorWidth + MARGIN); - int y = 1 + MARGIN + - 2 + row * (colorHeight + MARGIN); - int width = colorWidth + MARGIN; - int height = colorHeight + MARGIN; + int x = 1 + MARGIN + - 2 + column * (colorWidth + MARGIN); + int y = 1 + MARGIN + - 2 + row * (colorHeight + MARGIN); + int width = colorWidth + MARGIN; + int height = colorHeight + MARGIN; - if (row == m_selector->rowCount()) { - if (m_selectedColumn < m_columnOther) // The "(Default)" cell: - width = (colorWidth + MARGIN) * m_columnOther; - else // The "Other..." cell: - width = (colorWidth + MARGIN) * (m_selector->columnCount() - m_columnOther); - } + if (row == m_selector->rowCount()) { + if (m_selectedColumn < m_columnOther) // The "(Default)" cell: + width = (colorWidth + MARGIN) * m_columnOther; + else // The "Other..." cell: + width = (colorWidth + MARGIN) * (m_selector->columnCount() - m_columnOther); + } - update(x, y, width, height); + update(x, y, width, height); } void KColorPopup::doSelection() { - m_otherColor = QColor(); - - // If the selected color is not the default one, try to find it in the array: - if (m_selector->color().isValid()) { - bool isInArray = false; - for (int column = 0; column < m_selector->columnCount(); ++column) - for (int row = 0; row < m_selector->rowCount(); ++row) - if (m_selector->color() == m_selector->colorAt(column, row)) { - m_selectedColumn = column; - m_selectedRow = row; - isInArray = true; - } - // If not found in array, it's another one: - if (!isInArray) { - m_selectedColumn = m_columnOther; - m_selectedRow = m_selector->rowCount(); - m_otherColor = m_selector->color(); - } - // If it's the default one: - } else { - m_selectedColumn = 0; - m_selectedRow = m_selector->rowCount(); - } + m_otherColor = QColor(); + + // If the selected color is not the default one, try to find it in the array: + if (m_selector->color().isValid()) { + bool isInArray = false; + for (int column = 0; column < m_selector->columnCount(); ++column) + for (int row = 0; row < m_selector->rowCount(); ++row) + if (m_selector->color() == m_selector->colorAt(column, row)) { + m_selectedColumn = column; + m_selectedRow = row; + isInArray = true; + } + // If not found in array, it's another one: + if (!isInArray) { + m_selectedColumn = m_columnOther; + m_selectedRow = m_selector->rowCount(); + m_otherColor = m_selector->color(); + } + // If it's the default one: + } else { + m_selectedColumn = 0; + m_selectedRow = m_selector->rowCount(); + } } void KColorPopup::validate() { - hide(); - close(); + hide(); + close(); - if (m_selectedRow != m_selector->rowCount()) // A normal row: - m_selector->setColor(m_selector->colorAt(m_selectedColumn, m_selectedRow)); - else if (m_selectedColumn < m_columnOther) // The default color: - m_selector->setColor(QColor()); - else { // The user want to choose one: - QColor color = m_selector->effectiveColor(); - if (KColorDialog::getColor(color, this) == QDialog::Accepted) - m_selector->setColor(color); - } + if (m_selectedRow != m_selector->rowCount()) // A normal row: + m_selector->setColor(m_selector->colorAt(m_selectedColumn, m_selectedRow)); + else if (m_selectedColumn < m_columnOther) // The default color: + m_selector->setColor(QColor()); + else { // The user want to choose one: + QColor color = m_selector->effectiveColor(); + if (KColorDialog::getColor(color, this) == QDialog::Accepted) + m_selector->setColor(color); + } } void KColorPopup::mousePressEvent(QMouseEvent *event) { - int x = event->pos().x(); - int y = event->pos().y(); - if (x < 0 || y < 0 || x >= width() || y >= height()) { - hide(); - close(); - } else - validate(); + int x = event->pos().x(); + int y = event->pos().y(); + if (x < 0 || y < 0 || x >= width() || y >= height()) { + hide(); + close(); + } else + validate(); - event->accept(); + event->accept(); } void KColorPopup::paintEvent(QPaintEvent *event) { - QPainter painter(this); - painter.drawPixmap(0, 0, m_pixmap); - painter.setPen(Qt::black); - painter.drawRect(event->rect()); + QPainter painter(this); + painter.drawPixmap(0, 0, m_pixmap); + painter.setPen(Qt::black); + painter.drawRect(event->rect()); } void KColorPopup::mouseMoveEvent(QMouseEvent *event) { - int x = event->pos().x(); - int y = event->pos().y(); - if (x < FRAME_WIDTH + 2 || y < FRAME_WIDTH + 2 || x > width() - 2 - 2*FRAME_WIDTH || y > height() - 2 - 2*FRAME_WIDTH) - return; + int x = event->pos().x(); + int y = event->pos().y(); + if (x < FRAME_WIDTH + 2 || y < FRAME_WIDTH + 2 || x > width() - 2 - 2*FRAME_WIDTH || y > height() - 2 - 2*FRAME_WIDTH) + return; - int colorHeight = m_selector->colorRectHeight(); - int colorWidth = m_selector->colorRectWidthForHeight(colorHeight); + int colorHeight = m_selector->colorRectHeight(); + int colorWidth = m_selector->colorRectWidthForHeight(colorHeight); -// int oldSelectedColumn = m_selectedColumn; -// int oldSelectedRow = m_selectedRow; - m_selectedColumn = (x - FRAME_WIDTH - MARGIN + 2) / (colorWidth + MARGIN); - m_selectedRow = (y - FRAME_WIDTH - MARGIN + 2) / (colorHeight + MARGIN); +// int oldSelectedColumn = m_selectedColumn; +// int oldSelectedRow = m_selectedRow; + m_selectedColumn = (x - FRAME_WIDTH - MARGIN + 2) / (colorWidth + MARGIN); + m_selectedRow = (y - FRAME_WIDTH - MARGIN + 2) / (colorHeight + MARGIN); - relayout(); - update(); + relayout(); + update(); } void KColorPopup::keyPressEvent(QKeyEvent *event) { - int column = m_selectedColumn; - int row = m_selectedRow; - int columnCount = m_selector->columnCount(); - int rowCount = m_selector->rowCount(); - - switch (event->key()) { - case Qt::Key_Right: - if (m_selectedRow != rowCount) // A normal row: - column = (column + 1) % columnCount; - else { - // The last row, if there are two choices, switch. Else, do nothing: - if (m_selector->defaultColor().isValid()) - column = (m_selectedColumn < m_columnOther ? m_columnOther : 0); - } - break; - case Qt::Key_Left: - if (m_selectedRow != rowCount) { // A normal row: - column = (column - 1); - if (column < 0) - column = columnCount - 1; - } else { - // The last row, if there are two choices, switch. Else, do nothing: - if (m_selector->defaultColor().isValid()) - column = (m_selectedColumn < m_columnOther ? m_columnOther : 0); - } - break; - case Qt::Key_Up: row = (row - 1); if (row < 0) row = rowCount; break; - case Qt::Key_Down: row = (row + 1) % (rowCount+1); break; - case Qt::Key_PageDown: row += 10; if (row > rowCount) row = rowCount; break; - case Qt::Key_PageUp: row -= 10; if (row < 0) row = 0; break; - case Qt::Key_Home: row = 0; column = 0; break; - case Qt::Key_End: row = rowCount; column = columnCount - 1; break; - case Qt::Key_Return: - validate(); - break; - default: - QWidget::keyPressEvent(event); - } - - if (row != m_selectedRow || column != m_selectedColumn) { - m_selectedRow = row; - m_selectedColumn = column; - relayout(); - update(); - } + int column = m_selectedColumn; + int row = m_selectedRow; + int columnCount = m_selector->columnCount(); + int rowCount = m_selector->rowCount(); + + switch (event->key()) { + case Qt::Key_Right: + if (m_selectedRow != rowCount) // A normal row: + column = (column + 1) % columnCount; + else { + // The last row, if there are two choices, switch. Else, do nothing: + if (m_selector->defaultColor().isValid()) + column = (m_selectedColumn < m_columnOther ? m_columnOther : 0); + } + break; + case Qt::Key_Left: + if (m_selectedRow != rowCount) { // A normal row: + column = (column - 1); + if (column < 0) + column = columnCount - 1; + } else { + // The last row, if there are two choices, switch. Else, do nothing: + if (m_selector->defaultColor().isValid()) + column = (m_selectedColumn < m_columnOther ? m_columnOther : 0); + } + break; + case Qt::Key_Up: row = (row - 1); if (row < 0) row = rowCount; break; + case Qt::Key_Down: row = (row + 1) % (rowCount+1); break; + case Qt::Key_PageDown: row += 10; if (row > rowCount) row = rowCount; break; + case Qt::Key_PageUp: row -= 10; if (row < 0) row = 0; break; + case Qt::Key_Home: row = 0; column = 0; break; + case Qt::Key_End: row = rowCount; column = columnCount - 1; break; + case Qt::Key_Return: + validate(); + break; + default: + QWidget::keyPressEvent(event); + } + + if (row != m_selectedRow || column != m_selectedColumn) { + m_selectedRow = row; + m_selectedColumn = column; + relayout(); + update(); + } } /** Helper function: */ QColor Tool_mixColors(const QColor &color1, const QColor &color2) { - QColor mixedColor; - mixedColor.setRgb( (color1.red() + color2.red()) / 2, - (color1.green() + color2.green()) / 2, - (color1.blue() + color2.blue()) / 2 ); - return mixedColor; + QColor mixedColor; + mixedColor.setRgb((color1.red() + color2.red()) / 2, + (color1.green() + color2.green()) / 2, + (color1.blue() + color2.blue()) / 2); + return mixedColor; } /** class KColorCombo2Private */ @@ -323,458 +323,458 @@ class KColorCombo2::KColorCombo2Private */ KColorCombo2::KColorCombo2(const QColor &color, const QColor &defaultColor, QWidget *parent, const char *name) - : QComboBox(/*editable=*/false, parent, name), - m_color(color), m_defaultColor(defaultColor) + : QComboBox(/*editable=*/false, parent, name), + m_color(color), m_defaultColor(defaultColor) { - init(); + init(); } KColorCombo2::KColorCombo2(const QColor &color, QWidget *parent, const char *name) - : QComboBox(/*editable=*/false, parent, name), - m_color(color), m_defaultColor() + : QComboBox(/*editable=*/false, parent, name), + m_color(color), m_defaultColor() { - init(); + init(); } void KColorCombo2::init() { - m_discardNextMousePress = false; - m_colorArray = 0; - d = new KColorCombo2Private(); + m_discardNextMousePress = false; + m_colorArray = 0; + d = new KColorCombo2Private(); - setDefaultColor(m_defaultColor); - insertItem("", /*index=*/0); - updateComboBox(); // It need an item of index 0 to exists, so we created it. - setAcceptDrops(true); + setDefaultColor(m_defaultColor); + insertItem("", /*index=*/0); + updateComboBox(); // It need an item of index 0 to exists, so we created it. + setAcceptDrops(true); - m_popup = new KColorPopup(this); - m_popup->installEventFilter(this); + m_popup = new KColorPopup(this); + m_popup->installEventFilter(this); - // By default, the array is filled with setRainbowPreset(). - // But we allocate it on demand (the later as possible) to avoid performances issues if the developer set another array. - // However, to keep columnCount() rowCount() const, we define theme here: - m_columnCount = 13; - m_rowCount = 9; + // By default, the array is filled with setRainbowPreset(). + // But we allocate it on demand (the later as possible) to avoid performances issues if the developer set another array. + // However, to keep columnCount() rowCount() const, we define theme here: + m_columnCount = 13; + m_rowCount = 9; } KColorCombo2::~KColorCombo2() { - deleteColorArray(); + deleteColorArray(); } void KColorCombo2::setColor(const QColor &color) { - // Do nothing if the color should be set to the default one and there is no such default color allowed: - if (!color.isValid() && !m_defaultColor.isValid()) { - // kdebug << this::FUNCTION << "Trying to assign the default color (an invalid one) whereas no such default color is allowed"; - return; - } + // Do nothing if the color should be set to the default one and there is no such default color allowed: + if (!color.isValid() && !m_defaultColor.isValid()) { + // kdebug << this::FUNCTION << "Trying to assign the default color (an invalid one) whereas no such default color is allowed"; + return; + } - if (m_color != color) { - m_color = color; - updateComboBox(); - emit changed(color); - } + if (m_color != color) { + m_color = color; + updateComboBox(); + emit changed(color); + } } QColor KColorCombo2::color() const { - return m_color; + return m_color; } QColor KColorCombo2::effectiveColor() const { - if (m_color.isValid()) - return m_color; - else - return m_defaultColor; + if (m_color.isValid()) + return m_color; + else + return m_defaultColor; } void KColorCombo2::setRainbowPreset(int colorColumnCount, int lightRowCount, int darkRowCount, bool withGray) { - // At least one row and one column: - if (colorColumnCount < 1 - (withGray ? 1 : 0)) - colorColumnCount = 1 - (withGray ? 1 : 0); - if (lightRowCount < 0) - lightRowCount = 0; - if (darkRowCount < 0) - darkRowCount = 0; - - // Create the array: - int columnCount = colorColumnCount + (withGray ? 1 : 0); - int rowCount = lightRowCount + 1 + darkRowCount; - newColorArray(columnCount, rowCount); - - // Fill the array: - for (int i = 0; i < colorColumnCount; ++i) { - int hue = i * 360 / colorColumnCount; - // With light colors: - for (int j = 1; j <= lightRowCount; ++j) { // Start to 1 because we don't want a row full of white! - int saturation = j * 255 / (lightRowCount + 1); - setColorAt(i, j - 1, QColor(hue, saturation, 255, QColor::Hsv)); - } - // With pure colors: - setColorAt(i, lightRowCount, QColor(hue, 255, 255, QColor::Hsv)); - // With dark colors: - for (int j = 1; j <= darkRowCount; ++j) { - int value = 255 - j * 255 / (darkRowCount + 1); - setColorAt(i, lightRowCount + j, QColor(hue, 255, value, QColor::Hsv)); - } - } - - // Fill the gray column: - if (withGray) { - for (int i = 0; i < rowCount; ++i) { - int gray = ( rowCount == 1 ? 128 : 255 - (i * 255 / (rowCount - 1)) ); - setColorAt(columnCount-1, i, QColor(gray, gray, gray)); - } - } + // At least one row and one column: + if (colorColumnCount < 1 - (withGray ? 1 : 0)) + colorColumnCount = 1 - (withGray ? 1 : 0); + if (lightRowCount < 0) + lightRowCount = 0; + if (darkRowCount < 0) + darkRowCount = 0; + + // Create the array: + int columnCount = colorColumnCount + (withGray ? 1 : 0); + int rowCount = lightRowCount + 1 + darkRowCount; + newColorArray(columnCount, rowCount); + + // Fill the array: + for (int i = 0; i < colorColumnCount; ++i) { + int hue = i * 360 / colorColumnCount; + // With light colors: + for (int j = 1; j <= lightRowCount; ++j) { // Start to 1 because we don't want a row full of white! + int saturation = j * 255 / (lightRowCount + 1); + setColorAt(i, j - 1, QColor(hue, saturation, 255, QColor::Hsv)); + } + // With pure colors: + setColorAt(i, lightRowCount, QColor(hue, 255, 255, QColor::Hsv)); + // With dark colors: + for (int j = 1; j <= darkRowCount; ++j) { + int value = 255 - j * 255 / (darkRowCount + 1); + setColorAt(i, lightRowCount + j, QColor(hue, 255, value, QColor::Hsv)); + } + } + + // Fill the gray column: + if (withGray) { + for (int i = 0; i < rowCount; ++i) { + int gray = (rowCount == 1 ? 128 : 255 - (i * 255 / (rowCount - 1))); + setColorAt(columnCount - 1, i, QColor(gray, gray, gray)); + } + } #ifdef DEBUG_COLOR_ARRAY - kDebug() << "KColorCombo2::setColorPreset"; - for (int j = 0; j < rowCount; ++j) { - for (int i = 0; i < columnCount; ++i) { - int h, s, v; - m_colorArray[i][j].getHsv(h, s, v); - kDebug() << QString("(%1,%2,%3)").arg(h, 3).arg(s, 3).arg(v, 3); - //kDebug() << colorArray[i][j].name() << " "; - } - kDebug(); - } + kDebug() << "KColorCombo2::setColorPreset"; + for (int j = 0; j < rowCount; ++j) { + for (int i = 0; i < columnCount; ++i) { + int h, s, v; + m_colorArray[i][j].getHsv(h, s, v); + kDebug() << QString("(%1,%2,%3)").arg(h, 3).arg(s, 3).arg(v, 3); + //kDebug() << colorArray[i][j].name() << " "; + } + kDebug(); + } #endif #ifdef OUTPUT_GIMP_PALETTE - kDebug() << "GIMP Palette"; - for (int j = 0; j < rowCount; ++j) { - for (int i = 0; i < columnCount; ++i) { - kDebug() << QString("(%1,%2,%3)") - .arg(m_colorArray[i][j].red(), 3) - .arg(m_colorArray[i][j].green(), 3) - .arg(m_colorArray[i][j].blue(), 3); - } - } + kDebug() << "GIMP Palette"; + for (int j = 0; j < rowCount; ++j) { + for (int i = 0; i < columnCount; ++i) { + kDebug() << QString("(%1,%2,%3)") + .arg(m_colorArray[i][j].red(), 3) + .arg(m_colorArray[i][j].green(), 3) + .arg(m_colorArray[i][j].blue(), 3); + } + } #endif } int KColorCombo2::columnCount() const { - return m_columnCount; + return m_columnCount; } int KColorCombo2::rowCount() const { - return m_rowCount; + return m_rowCount; } QColor KColorCombo2::colorAt(int column, int row)/* const*/ { - if (!m_colorArray) - setRainbowPreset(); + if (!m_colorArray) + setRainbowPreset(); - if (column < 0 || row < 0 || column >= m_columnCount || row >= m_rowCount) - return QColor(); + if (column < 0 || row < 0 || column >= m_columnCount || row >= m_rowCount) + return QColor(); - return m_colorArray[column][row]; + return m_colorArray[column][row]; } QColor KColorCombo2::defaultColor() const { - return m_defaultColor; + return m_defaultColor; } void KColorCombo2::newColorArray(int columnCount, int rowCount) { - if (columnCount <= 0 || rowCount <= 0) { - // kdebug << this::FUNCTION << "Trying to create an empty new color array (with %d columns and %d rows)"; - return; - } + if (columnCount <= 0 || rowCount <= 0) { + // kdebug << this::FUNCTION << "Trying to create an empty new color array (with %d columns and %d rows)"; + return; + } - // Delete any previous array (if any): - deleteColorArray(); + // Delete any previous array (if any): + deleteColorArray(); - // Create a new array of the wanted dimentions: - m_columnCount = columnCount; - m_rowCount = rowCount; - m_colorArray = new QColor* [columnCount]; - for (int i = 0; i < columnCount; ++i) - m_colorArray[i] = new QColor[rowCount]; + // Create a new array of the wanted dimentions: + m_columnCount = columnCount; + m_rowCount = rowCount; + m_colorArray = new QColor* [columnCount]; + for (int i = 0; i < columnCount; ++i) + m_colorArray[i] = new QColor[rowCount]; - m_popup->relayout(); + m_popup->relayout(); } void KColorCombo2::setColorAt(int column, int row, const QColor &color) { - if (!m_colorArray) - setRainbowPreset(); + if (!m_colorArray) + setRainbowPreset(); - if (column < 0 || row < 0 || column >= m_columnCount || row >= m_rowCount) { - // kdebug << this::FUNCTION << "Trying to set a color at an invalid index (at column %d and row %d, whereas the array have %d columns and %d rows)"; - return; - } + if (column < 0 || row < 0 || column >= m_columnCount || row >= m_rowCount) { + // kdebug << this::FUNCTION << "Trying to set a color at an invalid index (at column %d and row %d, whereas the array have %d columns and %d rows)"; + return; + } - m_colorArray[column][row] = color; + m_colorArray[column][row] = color; } void KColorCombo2::setDefaultColor(const QColor &color) { - m_defaultColor = color; - if (!m_defaultColor.isValid() && !m_color.isValid()) - m_color = Qt::white; // FIXME: Use the first one. + m_defaultColor = color; + if (!m_defaultColor.isValid() && !m_color.isValid()) + m_color = Qt::white; // FIXME: Use the first one. } QPixmap KColorCombo2::colorRectPixmap(const QColor &color, bool isDefault, int width, int height) { - // Prepare to draw: - QPixmap pixmap(width, height); - QBitmap mask(width, height); - QPainter painter(&pixmap); - QPainter maskPainter(&mask); + // Prepare to draw: + QPixmap pixmap(width, height); + QBitmap mask(width, height); + QPainter painter(&pixmap); + QPainter maskPainter(&mask); - // Draw pixmap: - drawColorRect(painter, 0, 0, color, isDefault, width, height); + // Draw pixmap: + drawColorRect(painter, 0, 0, color, isDefault, width, height); - // Draw mask (make the four corners transparent): - maskPainter.fillRect(0, 0, width, height, Qt::color1); // opaque - maskPainter.setPen(Qt::color0); // transparent - maskPainter.drawPoint(0, 0); - maskPainter.drawPoint(0, height - 1); - maskPainter.drawPoint(width - 1, height - 1); - maskPainter.drawPoint(width - 1, 0); + // Draw mask (make the four corners transparent): + maskPainter.fillRect(0, 0, width, height, Qt::color1); // opaque + maskPainter.setPen(Qt::color0); // transparent + maskPainter.drawPoint(0, 0); + maskPainter.drawPoint(0, height - 1); + maskPainter.drawPoint(width - 1, height - 1); + maskPainter.drawPoint(width - 1, 0); - // Finish: - painter.end(); - maskPainter.end(); - pixmap.setMask(mask); - return pixmap; + // Finish: + painter.end(); + maskPainter.end(); + pixmap.setMask(mask); + return pixmap; } void KColorCombo2::drawColorRect(QPainter &painter, int x, int y, const QColor &color, bool isDefault, int width, int height) { - // Fill: - if (color.isValid()) - painter.fillRect(x /*+ 1*/, y /*+ 1*/, width /*- 2*/, height /*- 2*/, color); - else { - // If it's an invalid color, it's for the "Other..." entry: draw a rainbow. - // If it wasn't for the "Other..." entry, the programmer made a fault, so (s)he will be informed about that visually. - for (int i = 0; i < width-2; ++i) { - int hue = i * 360 / (width-2); - for (int j = 0; j < height-2; ++j) { - int saturation = 255 - (j * 255 / (height-2)); - painter.setPen( QColor(hue, saturation, /*value=*/255, QColor::Hsv) ); - painter.drawPoint(x + i + 1, y + j + 1); - } - } - } - - // Stroke: - int dontCare, value; - color.getHsv(/*hue:*/dontCare, /*saturation:*/dontCare, value); - QColor stroke = (color.isValid() ? color.dark(125) : palette().color(QPalette::Text)); - painter.setPen(/*color);//*/stroke); - painter.drawLine(x + 1, y, x + width - 2, y); - painter.drawLine(x, y + 1, x, y + height - 2); - painter.drawLine(x + 1, y + height - 1, x + width - 2, y + height - 1); - painter.drawLine(x + width - 1, y + 1, x + width - 1, y + height - 2); - - // Round corners: - QColor antialiasing; - if (color.isValid()) { - antialiasing = Tool_mixColors(color, stroke); - painter.setPen(antialiasing); - painter.drawPoint(x + 1, y + 1); - painter.drawPoint(x + 1, y + height - 2); - painter.drawPoint(x + width - 2, y + height - 2); - painter.drawPoint(x + width - 2, y + 1); - } else { - // The two top corners: - antialiasing = Tool_mixColors(Qt::red, stroke); - painter.setPen(antialiasing); - painter.drawPoint(x + 1, y + 1); - painter.drawPoint(x + width - 2, y + 1); - // The two bottom ones: - antialiasing = Tool_mixColors(Qt::white, stroke); - painter.setPen(antialiasing); - painter.drawPoint(x + 1, y + height - 2); - painter.drawPoint(x + width - 2, y + height - 2); - } - - // Mark default color: - if (isDefault) { - painter.setPen(stroke); - painter.drawLine(x + 1, y + height - 2, x + width - 2, y + 1); - } + // Fill: + if (color.isValid()) + painter.fillRect(x /*+ 1*/, y /*+ 1*/, width /*- 2*/, height /*- 2*/, color); + else { + // If it's an invalid color, it's for the "Other..." entry: draw a rainbow. + // If it wasn't for the "Other..." entry, the programmer made a fault, so (s)he will be informed about that visually. + for (int i = 0; i < width - 2; ++i) { + int hue = i * 360 / (width - 2); + for (int j = 0; j < height - 2; ++j) { + int saturation = 255 - (j * 255 / (height - 2)); + painter.setPen(QColor(hue, saturation, /*value=*/255, QColor::Hsv)); + painter.drawPoint(x + i + 1, y + j + 1); + } + } + } + + // Stroke: + int dontCare, value; + color.getHsv(/*hue:*/dontCare, /*saturation:*/dontCare, value); + QColor stroke = (color.isValid() ? color.dark(125) : palette().color(QPalette::Text)); + painter.setPen(/*color);//*/stroke); + painter.drawLine(x + 1, y, x + width - 2, y); + painter.drawLine(x, y + 1, x, y + height - 2); + painter.drawLine(x + 1, y + height - 1, x + width - 2, y + height - 1); + painter.drawLine(x + width - 1, y + 1, x + width - 1, y + height - 2); + + // Round corners: + QColor antialiasing; + if (color.isValid()) { + antialiasing = Tool_mixColors(color, stroke); + painter.setPen(antialiasing); + painter.drawPoint(x + 1, y + 1); + painter.drawPoint(x + 1, y + height - 2); + painter.drawPoint(x + width - 2, y + height - 2); + painter.drawPoint(x + width - 2, y + 1); + } else { + // The two top corners: + antialiasing = Tool_mixColors(Qt::red, stroke); + painter.setPen(antialiasing); + painter.drawPoint(x + 1, y + 1); + painter.drawPoint(x + width - 2, y + 1); + // The two bottom ones: + antialiasing = Tool_mixColors(Qt::white, stroke); + painter.setPen(antialiasing); + painter.drawPoint(x + 1, y + height - 2); + painter.drawPoint(x + width - 2, y + height - 2); + } + + // Mark default color: + if (isDefault) { + painter.setPen(stroke); + painter.drawLine(x + 1, y + height - 2, x + width - 2, y + 1); + } } int KColorCombo2::colorRectHeight() const { - return (fontMetrics().boundingRect(i18n("(Default)")).height() + 2)*3/2; + return (fontMetrics().boundingRect(i18n("(Default)")).height() + 2)*3 / 2; } int KColorCombo2::colorRectWidthForHeight(int height) const { - return height * 14 / 10; // 1.4 times the height, like A4 papers. + return height * 14 / 10; // 1.4 times the height, like A4 papers. } void KColorCombo2::deleteColorArray() { - if (m_colorArray) { - for (int i = 0; i < m_columnCount; ++i) - delete[] m_colorArray[i]; - delete[] m_colorArray; - m_colorArray = 0; - } + if (m_colorArray) { + for (int i = 0; i < m_columnCount; ++i) + delete[] m_colorArray[i]; + delete[] m_colorArray; + m_colorArray = 0; + } } void KColorCombo2::updateComboBox() { - int height = colorRectHeight()*2/3; // fontMetrics().boundingRect(i18n("(Default)")).height() + 2 - QPixmap pixmap = colorRectPixmap(effectiveColor(), !m_color.isValid(), colorRectWidthForHeight(height), height); // TODO: isDefaultColorSelected() - changeItem(pixmap, (m_color.isValid() ? "" : i18n("(Default)")), /*index=*/0); + int height = colorRectHeight() * 2 / 3; // fontMetrics().boundingRect(i18n("(Default)")).height() + 2 + QPixmap pixmap = colorRectPixmap(effectiveColor(), !m_color.isValid(), colorRectWidthForHeight(height), height); // TODO: isDefaultColorSelected() + changeItem(pixmap, (m_color.isValid() ? "" : i18n("(Default)")), /*index=*/0); } void KColorCombo2::popup() { - if (!m_colorArray) - setRainbowPreset(); + if (!m_colorArray) + setRainbowPreset(); - // Compute where to show the popup: - QRect desk = KGlobalSettings::desktopGeometry(this); + // Compute where to show the popup: + QRect desk = KGlobalSettings::desktopGeometry(this); - QPoint popupPoint = mapToGlobal(QPoint(0, 0)); + QPoint popupPoint = mapToGlobal(QPoint(0, 0)); - int popupHeight = m_popup->sizeHint().height(); - if (popupPoint.y() + height() + popupHeight > desk.bottom()) - popupPoint.setY(popupPoint.y() - popupHeight); - else - popupPoint.setY(popupPoint.y() + height()); + int popupHeight = m_popup->sizeHint().height(); + if (popupPoint.y() + height() + popupHeight > desk.bottom()) + popupPoint.setY(popupPoint.y() - popupHeight); + else + popupPoint.setY(popupPoint.y() + height()); - int popupWidth = m_popup->sizeHint().width(); - if (popupPoint.x() + popupWidth > desk.right()) - popupPoint.setX(desk.right() - popupWidth); + int popupWidth = m_popup->sizeHint().width(); + if (popupPoint.x() + popupWidth > desk.right()) + popupPoint.setX(desk.right() - popupWidth); - if (popupPoint.x() < desk.left()) - popupPoint.setX(desk.left()); + if (popupPoint.x() < desk.left()) + popupPoint.setX(desk.left()); - if (popupPoint.y() < desk.top()) - popupPoint.setY(desk.top()); + if (popupPoint.y() < desk.top()) + popupPoint.setY(desk.top()); - // Configure the popup: - m_popup->move(popupPoint); - //m_popup->setColor(m_color); - m_popup->doSelection(); - m_popup->relayout(); // FIXME: In aboutToShow() ? + // Configure the popup: + m_popup->move(popupPoint); + //m_popup->setColor(m_color); + m_popup->doSelection(); + m_popup->relayout(); // FIXME: In aboutToShow() ? #if 0 //#ifndef QT_NO_EFFECTS - if (QApplication::isEffectEnabled(UI_AnimateCombo)) { - if (m_popup->y() < mapToGlobal(QPoint(0,0)).y()) - qScrollEffect(m_popup, QEffects::UpScroll); - else - qScrollEffect(m_popup); - } else + if (QApplication::isEffectEnabled(UI_AnimateCombo)) { + if (m_popup->y() < mapToGlobal(QPoint(0, 0)).y()) + qScrollEffect(m_popup, QEffects::UpScroll); + else + qScrollEffect(m_popup); + } else #endif - m_popup->show(); + m_popup->show(); - // The combo box is now shown pressed. Make it show not pressed again - // by causing its (invisible) list box to emit a 'selected' signal. - // Simulate an Enter to unpress it: - QListWidget *lb = listBox(); - if (lb) { - lb->setCurrentItem(0); - QKeyEvent* keyEvent = new QKeyEvent(QEvent::KeyPress, Qt::Key_Enter, 0, 0); - QApplication::postEvent(lb, keyEvent); - } + // The combo box is now shown pressed. Make it show not pressed again + // by causing its (invisible) list box to emit a 'selected' signal. + // Simulate an Enter to unpress it: + QListWidget *lb = listBox(); + if (lb) { + lb->setCurrentItem(0); + QKeyEvent* keyEvent = new QKeyEvent(QEvent::KeyPress, Qt::Key_Enter, 0, 0); + QApplication::postEvent(lb, keyEvent); + } } bool KColorCombo2::eventFilter(QObject */*object*/, QEvent *event) { - QMouseEvent *mouseEvent; - - switch (event->type()) { - case QEvent::MouseButtonDblClick: - case QEvent::MouseButtonPress: - mouseEvent = (QMouseEvent*)event; - if ( !m_popup->rect().contains(mouseEvent->pos()) ) { - QPoint globalPos = m_popup->mapToGlobal(mouseEvent->pos()); - if (QApplication::widgetAt(globalPos, /*child=*/true) == this) { - // The popup is being closed by a click on the KColorCombo2 widget. - // Avoid popping it up again immediately: - m_discardNextMousePress = true; - } - } - break; - default: - break; - } - - // Don't stop the event being handled further: - return false; + QMouseEvent *mouseEvent; + + switch (event->type()) { + case QEvent::MouseButtonDblClick: + case QEvent::MouseButtonPress: + mouseEvent = (QMouseEvent*)event; + if (!m_popup->rect().contains(mouseEvent->pos())) { + QPoint globalPos = m_popup->mapToGlobal(mouseEvent->pos()); + if (QApplication::widgetAt(globalPos, /*child=*/true) == this) { + // The popup is being closed by a click on the KColorCombo2 widget. + // Avoid popping it up again immediately: + m_discardNextMousePress = true; + } + } + break; + default: + break; + } + + // Don't stop the event being handled further: + return false; } void KColorCombo2::mousePressEvent(QMouseEvent *event) { - m_dragStartPos = event->pos(); + m_dragStartPos = event->pos(); - if (event->button() == Qt::LeftButton && m_discardNextMousePress) - m_discardNextMousePress = false; - else - QComboBox::mousePressEvent(event); + if (event->button() == Qt::LeftButton && m_discardNextMousePress) + m_discardNextMousePress = false; + else + QComboBox::mousePressEvent(event); } void KColorCombo2::mouseMoveEvent(QMouseEvent *event) { - if( (event->state() & Qt::LeftButton) && - (event->pos() - m_dragStartPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) { - // Drag color object: - QMimeData* mimeData = new QMimeData; - QDrag* colorDrag = new QDrag(this); - mimeData->setColor(effectiveColor()); - // Replace the drag pixmap with our own rounded one, at the same position and dimetions: - QPixmap pixmap = colorDrag->pixmap(); - pixmap = colorRectPixmap(effectiveColor(), /*isDefault=*/false, pixmap.width(), pixmap.height()); - colorDrag->setPixmap(pixmap, colorDrag->pixmapHotSpot()); - colorDrag->exec(Qt::CopyAction, Qt::CopyAction); - //setDown(false); - } + if ((event->state() & Qt::LeftButton) && + (event->pos() - m_dragStartPos).manhattanLength() > KGlobalSettings::dndEventDelay()) { + // Drag color object: + QMimeData* mimeData = new QMimeData; + QDrag* colorDrag = new QDrag(this); + mimeData->setColor(effectiveColor()); + // Replace the drag pixmap with our own rounded one, at the same position and dimetions: + QPixmap pixmap = colorDrag->pixmap(); + pixmap = colorRectPixmap(effectiveColor(), /*isDefault=*/false, pixmap.width(), pixmap.height()); + colorDrag->setPixmap(pixmap, colorDrag->pixmapHotSpot()); + colorDrag->exec(Qt::CopyAction, Qt::CopyAction); + //setDown(false); + } } void KColorCombo2::dragEnterEvent(QDragEnterEvent *event) { - event->accept(isEnabled() && event->mimeData()->hasColor()); + event->accept(isEnabled() && event->mimeData()->hasColor()); } void KColorCombo2::dropEvent(QDropEvent *event) { - QColor color; - color = qvariant_cast<QColor>(event->mimeData()->colorData()); - if (color.isValid()) - setColor(color); + QColor color; + color = qvariant_cast<QColor>(event->mimeData()->colorData()); + if (color.isValid()) + setColor(color); } void KColorCombo2::keyPressEvent(QKeyEvent *event) { - KKey key(event); + KKey key(event); - if (KStandardShortcut::copy().contains(key)) { - QMimeData *mime = new QMimeData; - mime->setColor(effectiveColor()); - QApplication::clipboard()->setData(mime, QClipboard::Clipboard); - } else if (KStandardShortcut::paste().contains(key)) { - QColor color; - color = qvariant_cast<QColor>(QApplication::clipboard()->data(QClipboard::Clipboard)->colorData()); - setColor(color); - } else - QComboBox::keyPressEvent(event); + if (KStandardShortcut::copy().contains(key)) { + QMimeData *mime = new QMimeData; + mime->setColor(effectiveColor()); + QApplication::clipboard()->setData(mime, QClipboard::Clipboard); + } else if (KStandardShortcut::paste().contains(key)) { + QColor color; + color = qvariant_cast<QColor>(QApplication::clipboard()->data(QClipboard::Clipboard)->colorData()); + setColor(color); + } else + QComboBox::keyPressEvent(event); } void KColorCombo2::fontChange(const QFont &oldFont) { - // Since the color-rectangle is the same height of the text, we should resize it if the font change: - updateComboBox(); - QComboBox::fontChange(oldFont); // To update geometry. + // Since the color-rectangle is the same height of the text, we should resize it if the font change: + updateComboBox(); + QComboBox::fontChange(oldFont); // To update geometry. } void KColorCombo2::virtual_hook(int /*id*/, void */*data*/) { - /* KBASE::virtual_hook(id, data); */ + /* KBASE::virtual_hook(id, data); */ } #endif // USE_NEW_KCOLORCOMBO src/kcolorcombo2.cpp @@ -48,26 +48,22 @@ class KColorCombo2 : public KColorCombo public: KColorCombo2(const QColor &color, const QColor &defaultColor, - QWidget *parent=0) - : KColorCombo(parent) - { + QWidget *parent = 0) + : KColorCombo(parent) { setColor(color); setDefaultColor(defaultColor); } KColorCombo2(const QColor &color, - QWidget *parent=0) - : KColorCombo(parent) - { + QWidget *parent = 0) + : KColorCombo(parent) { setColor(color); } - KColorCombo2(QWidget *parent=0) - : KColorCombo(parent) - {} + KColorCombo2(QWidget *parent = 0) + : KColorCombo(parent) {} - void setDefaultColor(const QColor &) - { /* noop */ } + void setDefaultColor(const QColor &) { /* noop */ } }; @@ -120,233 +116,233 @@ public: */ class KColorCombo2 : public QComboBox { - Q_OBJECT - Q_PROPERTY(QColor color READ color WRITE setColor) - Q_PROPERTY(QColor defaultColor READ defaultColor WRITE setDefaultColor) - - public slots: - /** - * Change the selected color.\n - * If the popup is open, it will not reflect the change. FIXME: Should it? - * @param color The new selected color. Can be invalid to select the default one.\n - * If @p color is invalid and no default color is allowed, the function will keep the old one. - */ - void setColor(const QColor &color); - - /** - * Change the default color. - * @param color The color to return if the user choose the default one. If it is not valid, the user willn't be allowed to choose a default one. - * @see defaultColor() to get it. - */ - void setDefaultColor(const QColor &color); - - signals: - /** - * Emitted when the color of the widget is changed, either with setColor() or via user selection. - * @see color() to know the content of @p newColor. - */ - void changed(const QColor &newColor); - - public: - /** - * Constructs a color combobox with parent @p parent called @p name. - * @param color The initial selected color. If it is not valid, the default one will then be selected.\n - * But if @p color is invalid and there is no default color, the result is undefined. - * @param defaultColor The color to return if the user choose the default one. If it is not valid, the user willn't be allowed to choose a default one. - */ - KColorCombo2(const QColor &color, const QColor &defaultColor, QWidget *parent = 0, const char *name = 0); - - /** - * Constructs a color combobox with parent @p parent called @p name.\n - * The user is not allowed to choose a default color, unless you call setDefaultColor() later. - * @param color The initial selected color. If it is invalid, the result is undefined. - */ - KColorCombo2(const QColor &color, QWidget *parent = 0L, const char *name = 0L); - - /** - * Destroys the combobox. - */ - virtual ~KColorCombo2(); - - /** - * Get the color chosen by the user.\n - * Can be invalid, if the user chosen the default one.\n - * Ideal to store it in settings for later recall. - * @see effectiveColor() if you want the color to be always valid. - */ - QColor color() const; - - /** - * Return the color chosen by the user.\n - * If the user chosen the default color, the default one is then returned, so the returned color is always valid.\n - * Ideal to directly use to draw. - * @see color() if you want to be notified of a default color choice. - */ - QColor effectiveColor() const; - - /** - * Returns the default color or an invalid color if no default color is set (if the user isn't allowed to choose a default color). - * @see setDefaultColor() to change it. - */ - QColor defaultColor() const; - - /** - * Allocate a new color array of the specified dimention.\n - * The new array will have invalid colors: you should then assign them one by one.\n - * If one or both of the dimentions are negative or null, this function do nothing (both dimentions are always ensured to be at least equal to 1). - * @param columnCount The number of columns of the array. - * @param rowCount The number of rows of the array. - * @see setColorAt() to set all colors once the array have been created. - */ - void newColorArray(int columnCount, int rowCount); - - /** - * Get the number of columns in the array that the user can see to choose. - * @see rowCount() for the number of rows, and colorAt() to get a color from the array. - */ - int columnCount() const; - - /** - * Get the number of rows in the array that the user can see to choose. - * @see columnCount() for the number of columns, and colorAt() to get a color from the array. - */ - int rowCount() const; - - /** - * Set a color in the array at position (column,row).\n - * If one or both of the indexes are out of range, this function do nothing.\n - * @p column and @p row start from 0 to columnCount()-1 and columnRow()-1. - * - * @param column The x coordinate of the color to set or change. - * @param row The y coordinate of the color to set or change. - * @param color The color to assign at this position. - */ - void setColorAt(int column, int row, const QColor &color); - - /** - * Get a color in the array that the user can see to choose.\n - * @p column and @p row start from 0 to columnCount()-1 and columnRow()-1. - * - * @return The asked color, or an invalid color if the index is out of limit of the array. - * @see columnCount() and rowCount() to get the array dimentions. - */ - QColor colorAt(int column, int row)/* const*/; - - /** - * Fill the array of colors (that will be shown to the user in the popup that appears when he/she click the arrow) with a rainbow of different luminosity.\n - * This rainbow representation have the advantage of being natural and well structured for a human to be able to select reasonable colors.\n - * This function will allocate a color array by itself depending on the parameters (no need to call newColorArray()). - * @param colorColumnCount The number of columns. The 360 possible colors of the rainbow will be splitted to take the wanted number of colors, equaly separated. - * @param lightRowCount There is always at least 1 row of colors: the "pure" colors: pure red, pure blue, pure green, pure fushia...\n - * Additionnaly, you can add row on top: they will contain the same colors, but lighter.\n - * The parameter @p lightRowCount specify how many different lighting grades shoud be shown (from near to white, but not white, to "pure"). - * @param darkRowCount Finally, on bottom of the row of "pure colors", you can put any variety of dark colors (from "pure", to near to black, but not black).\n - * So, the number of rows is equal to @p lightRowCount + 1 + @p darkRowCount. On top are light colors, gradually going to dark ones on bottom. - * @param withGray If true, another column (so there will be @p colorColumnCount+1 columns) is added on the very-right of the popup - * to show different gray values, matching the brightness of the sibling colors. - * - * The most acceptable parameters: - * @li The default values are good to have the 7 colors of the rainbow + colors between them, and light/dark colors are well distinct. - * @li If the color is a background color, you can set @p darkRowCount to 0, so only light colors are shown. - * @li The inverse is true for text color choice: you can set @p lightRowCount to 0. - * @li But be careful: some advanced users prefer white text on dark background, so you eg. can set @p lightRowCount to a big value and - * @p darkRowCount to a small one for a fewer choice of dark colors, but at least some ones. - */ - void setRainbowPreset(int colorColumnCount = 12, int lightRowCount = 4, int darkRowCount = 4, bool withGray = true); - //void setHsvPreset(QColor hue[], QColor saturation[], QColor value[], bool withGray = true); - - /** - * Returns a pixmap of a colored rounded-rectangle. The four corners are transparent.\n - * Useful if you want to set such a rectangle as an icon for a menu entry, or for drag and drop operation... - * @param color The color of the rectangle. If the color is invalid, a rainbow is then drawn (like for the "Other..." entry in the popup). - * @param isDefault True if @p color is the default one and should then be draw with a diagonal line. - * @param width The width of the rectangle pixmap to return. - * @param height The height of the rectangle pixmap to return. - * - * @see drawColorRect() if you need to draw it directly: it's faster. - */ - static QPixmap colorRectPixmap(const QColor &color, bool isDefault, int width, int height); - - /** - * Draw an image of a colored rounded-rectangle.\n - * This is like colorRectPixmap() but significantly faster because there is nothing to copy, and no transparency mask to create and apply. - * @param painter The painter where to draw the image. - * @param x The x coordinate on the @p painter where to draw the rectangle. - * @param y The y coordinate on the @p painter where to draw the rectangle. - * @param color The color of the rectangle. If the color is invalid, a rainbow is then drawn (like for the "Other..." entry in the popup). - * @param isDefault True if @p color is the default one and should then be draw with a diagonal line. - * @param width The width of the rectangle pixmap to return. - * @param height The height of the rectangle pixmap to return. - * - * @see colorRectPixmap() to get a transparent pixmap of the rectangle. - */ - static void drawColorRect(QPainter &painter, int x, int y, const QColor &color, bool isDefault, int width, int height); - - /** - * Get the height of a color rectangle for this combobox.\n - * This is equal to the text height, regarding to the current font of this combobox. - */ - int colorRectHeight() const; - - /** - * Get the width of a color rectangle, depending of the @p height of it.\n - * It typically return 1.4 * @p height for decent rectangle proportions. - */ - int colorRectWidthForHeight(int height) const; - - protected: - virtual void popup(); - virtual void mousePressEvent(QMouseEvent *event); - virtual void mouseMoveEvent(QMouseEvent *event); - virtual bool eventFilter(QObject *object, QEvent *event); - virtual void dragEnterEvent(QDragEnterEvent *event); - virtual void dropEvent(QDropEvent *event); - virtual void keyPressEvent(QKeyEvent *event); - virtual void fontChange(const QFont &oldFont); - - private: - /** - * Initialization routine common to every constructors.\n - * Constructors just have to initialize the QComboBox, m_color and m_defaultColor - * and this function do the rest to complete the creation of this widget. - */ - void init(); - - /** - * Free up all memory allocated for the color array.\n - * But only if an array have previously been allocated, of course. - */ - void deleteColorArray(); - - /** - * Update the only item of the combobox to mirror the new selected color.\n - * Mainly called on init() and setColor(). - */ - void updateComboBox(); - - KColorPopup *m_popup; - QColor m_color; - QColor m_defaultColor; - bool m_discardNextMousePress; - QColor **m_colorArray; - int m_columnCount; - int m_rowCount; - QPoint m_dragStartPos; - - protected: - /** - * Keep place for future improvements without having to break binary compatibility.\n - * Does nothing for the moment. - */ - virtual void virtual_hook(int id, void *data); - - private: - /** - * Keep place for future improvements without having to break binary compatibility. - */ - class KColorCombo2Private; - - KColorCombo2Private *d; + Q_OBJECT + Q_PROPERTY(QColor color READ color WRITE setColor) + Q_PROPERTY(QColor defaultColor READ defaultColor WRITE setDefaultColor) + +public slots: + /** + * Change the selected color.\n + * If the popup is open, it will not reflect the change. FIXME: Should it? + * @param color The new selected color. Can be invalid to select the default one.\n + * If @p color is invalid and no default color is allowed, the function will keep the old one. + */ + void setColor(const QColor &color); + + /** + * Change the default color. + * @param color The color to return if the user choose the default one. If it is not valid, the user willn't be allowed to choose a default one. + * @see defaultColor() to get it. + */ + void setDefaultColor(const QColor &color); + +signals: + /** + * Emitted when the color of the widget is changed, either with setColor() or via user selection. + * @see color() to know the content of @p newColor. + */ + void changed(const QColor &newColor); + +public: + /** + * Constructs a color combobox with parent @p parent called @p name. + * @param color The initial selected color. If it is not valid, the default one will then be selected.\n + * But if @p color is invalid and there is no default color, the result is undefined. + * @param defaultColor The color to return if the user choose the default one. If it is not valid, the user willn't be allowed to choose a default one. + */ + KColorCombo2(const QColor &color, const QColor &defaultColor, QWidget *parent = 0, const char *name = 0); + + /** + * Constructs a color combobox with parent @p parent called @p name.\n + * The user is not allowed to choose a default color, unless you call setDefaultColor() later. + * @param color The initial selected color. If it is invalid, the result is undefined. + */ + KColorCombo2(const QColor &color, QWidget *parent = 0L, const char *name = 0L); + + /** + * Destroys the combobox. + */ + virtual ~KColorCombo2(); + + /** + * Get the color chosen by the user.\n + * Can be invalid, if the user chosen the default one.\n + * Ideal to store it in settings for later recall. + * @see effectiveColor() if you want the color to be always valid. + */ + QColor color() const; + + /** + * Return the color chosen by the user.\n + * If the user chosen the default color, the default one is then returned, so the returned color is always valid.\n + * Ideal to directly use to draw. + * @see color() if you want to be notified of a default color choice. + */ + QColor effectiveColor() const; + + /** + * Returns the default color or an invalid color if no default color is set (if the user isn't allowed to choose a default color). + * @see setDefaultColor() to change it. + */ + QColor defaultColor() const; + + /** + * Allocate a new color array of the specified dimention.\n + * The new array will have invalid colors: you should then assign them one by one.\n + * If one or both of the dimentions are negative or null, this function do nothing (both dimentions are always ensured to be at least equal to 1). + * @param columnCount The number of columns of the array. + * @param rowCount The number of rows of the array. + * @see setColorAt() to set all colors once the array have been created. + */ + void newColorArray(int columnCount, int rowCount); + + /** + * Get the number of columns in the array that the user can see to choose. + * @see rowCount() for the number of rows, and colorAt() to get a color from the array. + */ + int columnCount() const; + + /** + * Get the number of rows in the array that the user can see to choose. + * @see columnCount() for the number of columns, and colorAt() to get a color from the array. + */ + int rowCount() const; + + /** + * Set a color in the array at position (column,row).\n + * If one or both of the indexes are out of range, this function do nothing.\n + * @p column and @p row start from 0 to columnCount()-1 and columnRow()-1. + * + * @param column The x coordinate of the color to set or change. + * @param row The y coordinate of the color to set or change. + * @param color The color to assign at this position. + */ + void setColorAt(int column, int row, const QColor &color); + + /** + * Get a color in the array that the user can see to choose.\n + * @p column and @p row start from 0 to columnCount()-1 and columnRow()-1. + * + * @return The asked color, or an invalid color if the index is out of limit of the array. + * @see columnCount() and rowCount() to get the array dimentions. + */ + QColor colorAt(int column, int row)/* const*/; + + /** + * Fill the array of colors (that will be shown to the user in the popup that appears when he/she click the arrow) with a rainbow of different luminosity.\n + * This rainbow representation have the advantage of being natural and well structured for a human to be able to select reasonable colors.\n + * This function will allocate a color array by itself depending on the parameters (no need to call newColorArray()). + * @param colorColumnCount The number of columns. The 360 possible colors of the rainbow will be splitted to take the wanted number of colors, equaly separated. + * @param lightRowCount There is always at least 1 row of colors: the "pure" colors: pure red, pure blue, pure green, pure fushia...\n + * Additionnaly, you can add row on top: they will contain the same colors, but lighter.\n + * The parameter @p lightRowCount specify how many different lighting grades shoud be shown (from near to white, but not white, to "pure"). + * @param darkRowCount Finally, on bottom of the row of "pure colors", you can put any variety of dark colors (from "pure", to near to black, but not black).\n + * So, the number of rows is equal to @p lightRowCount + 1 + @p darkRowCount. On top are light colors, gradually going to dark ones on bottom. + * @param withGray If true, another column (so there will be @p colorColumnCount+1 columns) is added on the very-right of the popup + * to show different gray values, matching the brightness of the sibling colors. + * + * The most acceptable parameters: + * @li The default values are good to have the 7 colors of the rainbow + colors between them, and light/dark colors are well distinct. + * @li If the color is a background color, you can set @p darkRowCount to 0, so only light colors are shown. + * @li The inverse is true for text color choice: you can set @p lightRowCount to 0. + * @li But be careful: some advanced users prefer white text on dark background, so you eg. can set @p lightRowCount to a big value and + * @p darkRowCount to a small one for a fewer choice of dark colors, but at least some ones. + */ + void setRainbowPreset(int colorColumnCount = 12, int lightRowCount = 4, int darkRowCount = 4, bool withGray = true); + //void setHsvPreset(QColor hue[], QColor saturation[], QColor value[], bool withGray = true); + + /** + * Returns a pixmap of a colored rounded-rectangle. The four corners are transparent.\n + * Useful if you want to set such a rectangle as an icon for a menu entry, or for drag and drop operation... + * @param color The color of the rectangle. If the color is invalid, a rainbow is then drawn (like for the "Other..." entry in the popup). + * @param isDefault True if @p color is the default one and should then be draw with a diagonal line. + * @param width The width of the rectangle pixma