eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-06-16 12:33:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Created QIcon for media files using QIconProvider.

Browse Source
This commit is contained in:
Tats
2014-10-17 12:29:42 +00:00
parent e3bfe310b3
commit 50a96dc254
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MainWindow.cpp
+12 -3
View File
@@ -218,7 +218,7 @@ void MainWindow::handlePaintChanged(Paint::ptr paint) {
if (paint->getType() == "media") {
std::tr1::shared_ptr<Media> media = std::tr1::static_pointer_cast<Media>(paint);
Q_CHECK_PTR(media);
updatePaintItem(paintId, QIcon(), strippedName(media->getUri()));
updatePaintItem(paintId, createFileIcon(media->getUri()), strippedName(media->getUri()));
// QString fileName = QFileDialog::getOpenFileName(this,
// tr("Import media source file"), ".");
// // Restart video playback. XXX Hack
@@ -228,7 +228,7 @@ void MainWindow::handlePaintChanged(Paint::ptr paint) {
if (paint->getType() == "image") {
std::tr1::shared_ptr<Image> image = std::tr1::static_pointer_cast<Image>(paint);
Q_CHECK_PTR(image);
updatePaintItem(paintId, QIcon(), strippedName(image->getUri()));
updatePaintItem(paintId, createImageIcon(image->getUri()), strippedName(image->getUri()));
// QString fileName = QFileDialog::getOpenFileName(this,
// tr("Import media source file"), ".");
// // Restart video playback. XXX Hack
@@ -649,7 +649,7 @@ uid MainWindow::createMediaPaint(uid paintId, QString uri, float x, float y,
uid id = mappingManager->addPaint(paint);
// Add paint widget item.
addPaintItem(id, QIcon(uri), strippedName(uri));
addPaintItem(id, isImage ? createImageIcon(uri) : createFileIcon(uri), strippedName(uri));
return id;
}
}
@@ -1873,6 +1873,15 @@ QIcon MainWindow::createColorIcon(const QColor &color) {
return QIcon(pixmap);
}
QIcon MainWindow::createFileIcon(const QString& filename) {
static QFileIconProvider provider;
return provider.icon(QFileInfo(filename));
}
QIcon MainWindow::createImageIcon(const QString& filename) {
return QIcon(filename);
}
void MainWindow::setCurrentPaint(int uid)
{
currentPaintId = uid;
MainWindow.h
+3 -1
View File
@@ -210,7 +210,9 @@ private:
static void setItemId(QListWidgetItem& item, uid id);
static QListWidgetItem* getItemFromId(const QListWidget& list, uid id);
static int getItemRowFromId(const QListWidget& list, uid id);
static QIcon createColorIcon(const QColor &color);
static QIcon createColorIcon(const QColor& color);
static QIcon createFileIcon(const QString& filename);
static QIcon createImageIcon(const QString& filename);
// GUI elements. ////////////////////////////////////////////////////////////////////////////////////////