X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7fbae445277374fb2bacfcd7c04e8d7fbb2c3f05..6b5b881dee01ff8be62a396891bb90ff1e9287b3:/src/infosidebarpage.cpp diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index bf3d5f4fc..185ba7b8e 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "infosidebarpage.h" @@ -26,16 +26,12 @@ #include #include -#include #include #include #include -#include -#include -//Added by qt3to4: #include #include -#include +#include #include #include @@ -46,21 +42,23 @@ #include #include #include +#include -#include "dolphin.h" +#include "dolphinmainwindow.h" +#include "dolphinapplication.h" #include "pixmapviewer.h" #include "dolphinsettings.h" +#include "metadataloader.h" -InfoSidebarPage::InfoSidebarPage(QWidget* parent) : - SidebarPage(parent), +InfoSidebarPage::InfoSidebarPage(DolphinMainWindow* mainWindow, QWidget* parent) : + SidebarPage(mainWindow, parent), m_multipleSelection(false), m_pendingPreview(false), m_timer(0), m_preview(0), m_name(0), - m_currInfoLineIdx(0), - m_infoGrid(0), - m_actionBox(0) + m_infos(0), + m_metadata(DolphinApplication::app()->metadataLoader()) { const int spacing = KDialog::spacingHint(); @@ -68,7 +66,7 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : connect(m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); - Q3VBoxLayout* layout = new Q3VBoxLayout(this); + QVBoxLayout* layout = new QVBoxLayout; layout->setSpacing(spacing); // preview @@ -84,15 +82,27 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : m_name->setMinimumHeight(fontMetrics.height() * 3); m_name->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum); - QWidget* sep1 = new Q3HGroupBox(this); // TODO: check whether default widget exist for this? - sep1->setFixedHeight(1); + KSeparator* sep1 = new KSeparator(this); // general information - m_infoGrid = new Q3Grid(2, this); - m_infoGrid->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); - - QWidget* sep2 = new Q3HGroupBox(this); // TODO: check whether default widget exist for this? - sep2->setFixedHeight(1); + m_infos = new QLabel(this); + m_infos->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); + m_infos->setTextFormat(Qt::RichText); + + KSeparator* sep2 = new KSeparator(this); + + // annotation + KSeparator* sep3 = 0; + if (m_metadata->storageUp()) { + m_annotationLabel = new QLabel(this); + m_annotationLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + m_annotationLabel->setTextFormat(Qt::RichText); + m_annotationLabel->setWordWrap(true); + m_annotationButton = new QPushButton("", this); + m_annotationButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + connect(m_annotationButton, SIGNAL(released()), this, SLOT(changeAnnotation())); + sep3 = new KSeparator(this); + } // actions m_actionBox = new KVBox(this); @@ -106,12 +116,17 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : layout->addWidget(m_preview); layout->addWidget(m_name); layout->addWidget(sep1); - layout->addWidget(m_infoGrid); + layout->addWidget(m_infos); layout->addWidget(sep2); + if (m_metadata->storageUp()) { + layout->addWidget(m_annotationLabel); + layout->addWidget(m_annotationButton); + layout->addWidget(sep3); + } layout->addWidget(m_actionBox); layout->addWidget(dummy); - - connect(&Dolphin::mainWin(), SIGNAL(selectionChanged()), + setLayout(layout); + connect(mainWindow, SIGNAL(selectionChanged()), this, SLOT(showItemInfo())); connectToActiveView(); @@ -132,7 +147,8 @@ void InfoSidebarPage::requestDelayedItemInfo(const KUrl& url) if (!url.isEmpty() && !m_multipleSelection) { m_urlCandidate = url; - m_timer->start(300, true); + m_timer->setSingleShot(true); + m_timer->start(300); } } @@ -153,38 +169,48 @@ void InfoSidebarPage::showItemInfo() m_multipleSelection = false; // show the preview... - DolphinView* view = Dolphin::mainWin().activeView(); - const KFileItemList* selectedItems = view->selectedItems(); - if ((selectedItems != 0) && selectedItems->count() > 1) { + DolphinView* view = mainWindow()->activeView(); + const KFileItemList selectedItems = view->selectedItems(); + KUrl file; + if (selectedItems.count() > 1) { m_multipleSelection = true; + } else if(selectedItems.count() == 0) { + file = m_shownUrl; + } else { + file = selectedItems[0]->url(); } - if (m_multipleSelection) { KIconLoader iconLoader; QPixmap icon = iconLoader.loadIcon("exec", K3Icon::NoGroup, K3Icon::SizeEnormous); m_preview->setPixmap(icon); - m_name->setText(i18n("%1 items selected",selectedItems->count())); + m_name->setText(i18n("%1 items selected",selectedItems.count())); } - else if (!applyBookmark()) { + else if (!applyBookmark(file)) { // try to get a preview pixmap from the item... KUrl::List list; - list.append(m_shownUrl); + list.append(file); m_pendingPreview = true; m_preview->setPixmap(QPixmap()); KIO::PreviewJob* job = KIO::filePreview(list, m_preview->width(), - K3Icon::SizeEnormous); + K3Icon::SizeEnormous, + 0, + 0, + true, + false); + job->setIgnoreMaximumSize(true); + connect(job, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)), this, SLOT(gotPreview(const KFileItem*, const QPixmap&))); connect(job, SIGNAL(failed(const KFileItem*)), this, SLOT(slotPreviewFailed(const KFileItem*))); QString text(""); - text.append(m_shownUrl.fileName()); + text.append(file.fileName()); text.append(""); m_name->setText(text); } @@ -202,7 +228,7 @@ void InfoSidebarPage::slotTimeout() void InfoSidebarPage::slotPreviewFailed(const KFileItem* item) { m_pendingPreview = false; - if (!applyBookmark()) { + if (!applyBookmark(item->url())) { m_preview->setPixmap(item->pixmap(K3Icon::SizeEnormous)); } } @@ -218,7 +244,7 @@ void InfoSidebarPage::gotPreview(const KFileItem* /* item */, void InfoSidebarPage::startService(int index) { - DolphinView* view = Dolphin::mainWin().activeView(); + DolphinView* view = mainWindow()->activeView(); if (view->hasSelection()) { KUrl::List selectedUrls = view->selectedUrls(); KDEDesktopMimeType::executeService(selectedUrls, m_actionsVector[index]); @@ -232,22 +258,22 @@ void InfoSidebarPage::connectToActiveView() { cancelRequest(); - DolphinView* view = Dolphin::mainWin().activeView(); - connect(view, SIGNAL(signalRequestItemInfo(const KUrl&)), + DolphinView* view = mainWindow()->activeView(); + connect(view, SIGNAL(requestItemInfo(const KUrl&)), this, SLOT(requestDelayedItemInfo(const KUrl&))); - connect(view, SIGNAL(signalUrlChanged(const KUrl&)), + connect(view, SIGNAL(urlChanged(const KUrl&)), this, SLOT(requestItemInfo(const KUrl&))); m_shownUrl = view->url(); showItemInfo(); } -bool InfoSidebarPage::applyBookmark() +bool InfoSidebarPage::applyBookmark(const KUrl& url) { KBookmarkGroup root = DolphinSettings::instance().bookmarkManager()->root(); KBookmark bookmark = root.first(); while (!bookmark.isNull()) { - if (m_shownUrl.equals(bookmark.url(), KUrl::CompareWithoutTrailingSlash)) { + if (url.equals(bookmark.url(), KUrl::CompareWithoutTrailingSlash)) { QString text(""); text.append(bookmark.text()); text.append(""); @@ -274,12 +300,8 @@ void InfoSidebarPage::cancelRequest() void InfoSidebarPage::createMetaInfo() { - // To prevent a flickering it's important to reuse available - // labels instead of deleting them and recreate them afterwards. - // The methods beginInfoLines(), addInfoLine() and endInfoLines() - // take care of this. beginInfoLines(); - DolphinView* view = Dolphin::mainWin().activeView(); + DolphinView* view = mainWindow()->activeView(); if (!view->hasSelection()) { KFileItem fileItem(S_IFDIR, KFileItem::Unknown, m_shownUrl); fileItem.refresh(); @@ -287,56 +309,47 @@ void InfoSidebarPage::createMetaInfo() if (fileItem.isDir()) { addInfoLine(i18n("Type:"), i18n("Directory")); } - else { - addInfoLine(i18n("Type:"), fileItem.mimeComment()); - - QString sizeText(KIO::convertSize(fileItem.size())); - addInfoLine(i18n("Size:"), sizeText); - addInfoLine(i18n("Modified:"), fileItem.timeString()); - - const KFileMetaInfo& metaInfo = fileItem.metaInfo(); - if (metaInfo.isValid()) { - QStringList keys = metaInfo.supportedKeys(); - for (QStringList::Iterator it = keys.begin(); it != keys.end(); ++it) { - if (showMetaInfo(*it)) { - KFileMetaInfoItem metaInfoItem = metaInfo.item(*it); - addInfoLine(*it, metaInfoItem.string()); - } + showAnnotation(m_shownUrl); + } + else if (view->selectedItems().count() == 1) { + KFileItem* fileItem = view->selectedItems()[0]; + addInfoLine(i18n("Type:"), fileItem->mimeComment()); + + QString sizeText(KIO::convertSize(fileItem->size())); + addInfoLine(i18n("Size:"), sizeText); + addInfoLine(i18n("Modified:"), fileItem->timeString()); + + const KFileMetaInfo& metaInfo = fileItem->metaInfo(); + if (metaInfo.isValid()) { + QStringList keys = metaInfo.supportedKeys(); + for (QStringList::Iterator it = keys.begin(); it != keys.end(); ++it) { + if (showMetaInfo(*it)) { + KFileMetaInfoItem metaInfoItem = metaInfo.item(*it); + addInfoLine(*it, metaInfoItem.value().toString()); } } } + showAnnotation(fileItem->url()); + } + else { + showAnnotations(view->selectedItems().urlList()); + unsigned long int totSize = 0; + foreach(KFileItem* item, view->selectedItems()) { + totSize += item->size(); //FIXME what to do with directories ? (same with the one-item-selected-code), item->size() does not return the size of the content : not very instinctive for users + } + addInfoLine(i18n("Total size:"), KIO::convertSize(totSize)); } endInfoLines(); } void InfoSidebarPage::beginInfoLines() { - m_currInfoLineIdx = 0; + m_infoLines = QString(""); } void InfoSidebarPage::endInfoLines() { - if (m_currInfoLineIdx <= 0) { - return; - } - - // remove labels which have not been used - if (m_currInfoLineIdx < static_cast(m_infoWidgets.count())) { - Q3PtrListIterator deleteIter(m_infoWidgets); - deleteIter += m_currInfoLineIdx; - - QWidget* widget = 0; - int removeCount = 0; - while ((widget = deleteIter.current()) != 0) { - widget->close(); - widget->deleteLater(); - ++deleteIter; - ++removeCount; - } - for (int i = 0; i < removeCount; ++i) { - m_infoWidgets.removeLast(); - } - } + m_infos->setText(m_infoLines); } bool InfoSidebarPage::showMetaInfo(const QString& key) const @@ -379,33 +392,9 @@ bool InfoSidebarPage::showMetaInfo(const QString& key) const void InfoSidebarPage::addInfoLine(const QString& labelText, const QString& infoText) { - QString labelStr(""); - labelStr.append(labelText); - labelStr.append(" "); - - const int count = m_infoWidgets.count(); - if (m_currInfoLineIdx < count - 1) { - // reuse available labels - m_infoWidgets.at(m_currInfoLineIdx++)->setText(labelStr); - m_infoWidgets.at(m_currInfoLineIdx++)->setText(infoText); - } - else { - // no labels are available anymore, hence create 2 new ones - QLabel* label = new QLabel(labelStr, m_infoGrid); - label->setTextFormat(Qt::RichText); - label->setAlignment(Qt::AlignRight | - Qt::AlignTop); - label->show(); - m_infoWidgets.append(label); - - QLabel* info = new QLabel(infoText, m_infoGrid); - info->setTextFormat(Qt::RichText); - info->setAlignment(Qt::AlignTop | Qt::TextWordWrap); - info->show(); - m_infoWidgets.append(info); - - m_currInfoLineIdx += 2; - } + if (!m_infoLines.isEmpty()) + m_infoLines += "
"; + m_infoLines += QString("%1 %2").arg(labelText).arg(infoText); } void InfoSidebarPage::insertActions() @@ -429,12 +418,10 @@ void InfoSidebarPage::insertActions() // of KFileItems. If no selection is given, a temporary KFileItem // by the given Url 'url' is created and added to the list. KFileItem fileItem(S_IFDIR, KFileItem::Unknown, m_shownUrl); - KFileItemList localList; - const KFileItemList* itemList = Dolphin::mainWin().activeView()->selectedItems(); - if ((itemList == 0) || itemList->isEmpty()) { + KFileItemList itemList = mainWindow()->activeView()->selectedItems(); + if (itemList.isEmpty()) { fileItem.refresh(); - localList.append(&fileItem); - itemList = &localList; + itemList.append(&fileItem); } // 'itemList' contains now all KFileItems, where an item information should be shown. @@ -443,13 +430,12 @@ void InfoSidebarPage::insertActions() QStringList dirs = KGlobal::dirs()->findDirs("data", "dolphin/servicemenus/"); for (QStringList::ConstIterator dirIt = dirs.begin(); dirIt != dirs.end(); ++dirIt) { QDir dir(*dirIt); - QStringList entries = dir.entryList("*.desktop", QDir::Files); + QStringList entries = dir.entryList(QStringList("*.desktop"), QDir::Files); for (QStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) { - KSimpleConfig cfg(*dirIt + *entryIt, true); - cfg.setDesktopGroup(); + KConfigGroup cfg(KSharedConfig::openConfig( *dirIt + *entryIt, KConfig::OnlyLocal ), "Desktop Entry" ); if ((cfg.hasKey("Actions") || cfg.hasKey("X-KDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) { - const QStringList types = cfg.readListEntry("ServiceTypes"); + const QStringList types = cfg.readEntry("ServiceTypes", QStringList(), ','); for (QStringList::ConstIterator it = types.begin(); it != types.end(); ++it) { // check whether the mime type is equal or whether the // mimegroup (e. g. image/*) is supported @@ -458,7 +444,7 @@ void InfoSidebarPage::insertActions() if ((*it) == "all/allfiles") { // The service type is valid for all files, but not for directories. // Check whether the selected items only consist of files... - QListIterator mimeIt(*itemList); + QListIterator mimeIt(itemList); insert = true; while (insert && mimeIt.hasNext()) { KFileItem* item = mimeIt.next(); @@ -470,16 +456,16 @@ void InfoSidebarPage::insertActions() // Check whether the MIME types of all selected files match // to the mimetype of the service action. As soon as one MIME // type does not match, no service menu is shown at all. - QListIterator mimeIt(*itemList); + QListIterator mimeIt(itemList); insert = true; while (insert && mimeIt.hasNext()) { KFileItem* item = mimeIt.next(); const QString mimeType(item->mimetype()); - const QString mimeGroup(mimeType.left(mimeType.find('/'))); + const QString mimeGroup(mimeType.left(mimeType.indexOf('/'))); insert = (*it == mimeType) || ((*it).right(1) == "*") && - ((*it).left((*it).find('/')) == mimeGroup); + ((*it).left((*it).indexOf('/')) == mimeGroup); } } @@ -494,7 +480,7 @@ void InfoSidebarPage::insertActions() QPushButton* button = new QPushButton(submenuName, m_actionBox); button->setFlat(true); - button->setPopup(popup); + button->setMenu(popup); button->show(); m_actionWidgets.append(button); } @@ -507,7 +493,7 @@ void InfoSidebarPage::insertActions() for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) { KDEDesktopMimeType::Service service = (*serviceIt); if (popup == 0) { - ServiceButton* button = new ServiceButton(SmallIcon(service.m_strIcon), + ServiceButton* button = new ServiceButton(KIcon(service.m_strIcon), service.m_strName, m_actionBox, actionsIndex); @@ -517,7 +503,7 @@ void InfoSidebarPage::insertActions() button->show(); } else { - popup->insertItem(SmallIcon(service.m_strIcon), service.m_strName, actionsIndex); + popup->insertItem(KIcon(service.m_strIcon), service.m_strName, actionsIndex); } m_actionsVector.append(service); @@ -530,6 +516,71 @@ void InfoSidebarPage::insertActions() } } +void InfoSidebarPage::showAnnotation(const KUrl& file) +{ + if(m_metadata->storageUp()) { + QString text = m_metadata->getAnnotation(file); + if (!text.isEmpty()) { + m_annotationLabel->show(); + m_annotationLabel->setText(QString("%1 :
%2").arg(i18n("Annotation")).arg(text)); + m_annotationButton->setText(i18n("Change annotation")); + } else { + m_annotationLabel->hide(); + m_annotationButton->setText(i18n("Annotate file")); + } + } +} + +void InfoSidebarPage::showAnnotations(const KUrl::List& files) +{ + static unsigned int maxShownAnnot = 3; //The maximum number of show annotations when selecting multiple files + if (m_metadata->storageUp()) { + bool hasAnnotation = false; + unsigned int annotateNum = 0; + QString firsts = QString("%1 :
").arg(i18n("Annotations")); + foreach (KUrl file, files) { + QString annotation = m_metadata->getAnnotation(file); + if (!annotation.isEmpty()) { + hasAnnotation = true; + if(annotateNum < maxShownAnnot) { + firsts += m_annotationLabel->fontMetrics().elidedText(QString("%1 : %2
").arg(file.fileName()).arg(annotation), Qt::ElideRight, width());//FIXME not really the good method, does not handle resizing ... + annotateNum++; + } + } + } + if (hasAnnotation) { + m_annotationLabel->show(); + m_annotationLabel->setText(firsts); + } else m_annotationLabel->hide(); + m_annotationButton->setText(hasAnnotation ? i18n("Change annotations") : i18n("Annotate files")); + } +} + +void InfoSidebarPage::changeAnnotation() +{ + bool ok = false; + KUrl::List files(mainWindow()->activeView()->selectedItems().urlList()); + QString name, old; + if (files.isEmpty()) { + files << m_shownUrl; + } + else if (files.count() == 1) { + name = files[0].url(); + old = m_metadata->getAnnotation(files[0]); + } + else { + name = QString("%1 files").arg(files.count()); + old = QString(); + } + QString text = QInputDialog::getText(this, "Annotate", QString("Set annotation for %1").arg(name), QLineEdit::Normal, old, &ok);//FIXME temporary, must move to a real dialog + if(ok) { + foreach(KUrl file, files) { + m_metadata->setAnnotation(file, text); + } + showAnnotation(files[0]); + } +} + ServiceButton::ServiceButton(const QIcon& icon, const QString& text, QWidget* parent, @@ -538,7 +589,7 @@ ServiceButton::ServiceButton(const QIcon& icon, m_hover(false), m_index(index) { - setEraseColor(colorGroup().background()); + setEraseColor(palette().brush(QPalette::Background).color()); setFocusPolicy(Qt::NoFocus); connect(this, SIGNAL(released()), this, SLOT(slotReleased())); @@ -548,8 +599,10 @@ ServiceButton::~ServiceButton() { } -void ServiceButton::drawButton(QPainter* painter) +void ServiceButton::paintEvent(QPaintEvent* event) { + Q_UNUSED(event); + QPainter painter(this); const int buttonWidth = width(); const int buttonHeight = height(); @@ -560,34 +613,34 @@ void ServiceButton::drawButton(QPainter* painter) foregroundColor = KGlobalSettings::highlightedTextColor(); } else { - backgroundColor = colorGroup().background(); + backgroundColor = palette().brush(QPalette::Background).color(); foregroundColor = KGlobalSettings::buttonTextColor(); } // draw button background - painter->setPen(Qt::NoPen); - painter->setBrush(backgroundColor); - painter->drawRect(0, 0, buttonWidth, buttonHeight); + painter.setPen(Qt::NoPen); + painter.setBrush(backgroundColor); + painter.drawRect(0, 0, buttonWidth, buttonHeight); const int spacing = KDialog::spacingHint(); // draw icon int x = spacing; const int y = (buttonHeight - K3Icon::SizeSmall) / 2; - const QIcon* set = iconSet(); - if (set != 0) { - painter->drawPixmap(x, y, set->pixmap(QIcon::Small, QIcon::Normal)); + const QIcon &set = icon(); + if (!set.isNull()) { + painter.drawPixmap(x, y, set.pixmap(QIcon::Small, QIcon::Normal)); } x += K3Icon::SizeSmall + spacing; // draw text - painter->setPen(foregroundColor); + painter.setPen(foregroundColor); const int textWidth = buttonWidth - x; QFontMetrics fontMetrics(font()); const bool clipped = fontMetrics.width(text()) >= textWidth; //const int align = clipped ? Qt::AlignVCenter : Qt::AlignCenter; - painter->drawText(QRect(x, 0, textWidth, buttonHeight), Qt::AlignVCenter, text()); + painter.drawText(QRect(x, 0, textWidth, buttonHeight), Qt::AlignVCenter, text()); if (clipped) { // Blend the right area of the text with the background, as the @@ -601,9 +654,9 @@ void ServiceButton::drawButton(QPainter* painter) const int greenInc = (foregroundColor.green() - backgroundColor.green()) / blendSteps; const int blueInc = (foregroundColor.blue() - backgroundColor.blue()) / blendSteps; for (int i = 0; i < blendSteps; ++i) { - painter->setClipRect(QRect(x + textWidth - i, 0, 1, buttonHeight)); - painter->setPen(blendColor); - painter->drawText(QRect(x, 0, textWidth, buttonHeight), Qt::AlignVCenter, text()); + painter.setClipRect(QRect(x + textWidth - i, 0, 1, buttonHeight)); + painter.setPen(blendColor); + painter.drawText(QRect(x, 0, textWidth, buttonHeight), Qt::AlignVCenter, text()); blendColor.setRgb(blendColor.red() + redInc, blendColor.green() + greenInc,