From: Jean-Baptiste Mardelle Date: Fri, 13 Nov 2009 12:27:16 +0000 (+0000) Subject: Slightly smaller icons for project tree X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6b48ad9b2a0145a86322c62c1444d2559fe13356;p=kdenlive Slightly smaller icons for project tree svn path=/trunk/kdenlive/; revision=4110 --- diff --git a/src/projectitem.cpp b/src/projectitem.cpp index 208bc575..1039be1c 100644 --- a/src/projectitem.cpp +++ b/src/projectitem.cpp @@ -28,11 +28,12 @@ #include const int DurationRole = Qt::UserRole + 1; +const int itemHeight = 38; ProjectItem::ProjectItem(QTreeWidget * parent, DocClipBase *clip) : QTreeWidgetItem(parent, PROJECTCLIPTYPE) { - setSizeHint(0, QSize(65, 45)); + setSizeHint(0, QSize(60, itemHeight)); setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable); m_clip = clip; m_clipId = clip->getId(); @@ -52,7 +53,7 @@ ProjectItem::ProjectItem(QTreeWidget * parent, DocClipBase *clip) : ProjectItem::ProjectItem(QTreeWidgetItem * parent, DocClipBase *clip) : QTreeWidgetItem(parent, PROJECTCLIPTYPE) { - setSizeHint(0, QSize(65, 45)); + setSizeHint(0, QSize(60, itemHeight)); setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable); m_clip = clip; m_clipId = clip->getId(); @@ -73,6 +74,12 @@ ProjectItem::~ProjectItem() { } +//static +int ProjectItem::itemDefaultHeight() +{ + return itemHeight; +} + int ProjectItem::numReferences() const { if (!m_clip) return 0; diff --git a/src/projectitem.h b/src/projectitem.h index 5af45c86..30321386 100644 --- a/src/projectitem.h +++ b/src/projectitem.h @@ -60,6 +60,7 @@ public: void setProperty(const QString &key, const QString &value); void clearProperty(const QString &key); QString getClipHash() const; + static int itemDefaultHeight(); virtual bool operator<(const QTreeWidgetItem &other)const { int column = treeWidget()->sortColumn(); diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 2bd11bd1..eade2f3d 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -316,44 +316,43 @@ void ProjectList::slotReloadClip(const QString &id) void ProjectList::setRenderer(Render *projectRender) { m_render = projectRender; - m_listView->setIconSize(QSize(43 * m_render->dar(), 43)); + m_listView->setIconSize(QSize((ProjectItem::itemDefaultHeight() - 2) * m_render->dar(), ProjectItem::itemDefaultHeight() - 2)); } void ProjectList::slotClipSelected() { if (m_listView->currentItem()) { - if (m_listView->currentItem()->type() == PROJECTFOLDERTYPE) { - emit clipSelected(NULL); - m_editAction->setEnabled(false); - m_deleteAction->setEnabled(true); - m_openAction->setEnabled(false); - m_reloadAction->setEnabled(false); - m_transcodeAction->setEnabled(false); - } - else { - ProjectItem *clip; - if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) { - // this is a sub item, use base clip - clip = static_cast (m_listView->currentItem()->parent()); - if (clip == NULL) kDebug() << "-----------ERROR"; - SubProjectItem *sub = static_cast (m_listView->currentItem()); - emit clipSelected(clip->referencedClip(), sub->zone()); - return; - } - clip = static_cast (m_listView->currentItem()); - emit clipSelected(clip->referencedClip()); - m_editAction->setEnabled(true); - m_deleteAction->setEnabled(true); - m_reloadAction->setEnabled(true); - m_transcodeAction->setEnabled(true); - if (clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { - m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); - m_openAction->setEnabled(true); - } else if (clip->clipType() == AUDIO && !KdenliveSettings::defaultaudioapp().isEmpty()) { - m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp())); - m_openAction->setEnabled(true); - } else m_openAction->setEnabled(false); - } + if (m_listView->currentItem()->type() == PROJECTFOLDERTYPE) { + emit clipSelected(NULL); + m_editAction->setEnabled(false); + m_deleteAction->setEnabled(true); + m_openAction->setEnabled(false); + m_reloadAction->setEnabled(false); + m_transcodeAction->setEnabled(false); + } else { + ProjectItem *clip; + if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) { + // this is a sub item, use base clip + clip = static_cast (m_listView->currentItem()->parent()); + if (clip == NULL) kDebug() << "-----------ERROR"; + SubProjectItem *sub = static_cast (m_listView->currentItem()); + emit clipSelected(clip->referencedClip(), sub->zone()); + return; + } + clip = static_cast (m_listView->currentItem()); + emit clipSelected(clip->referencedClip()); + m_editAction->setEnabled(true); + m_deleteAction->setEnabled(true); + m_reloadAction->setEnabled(true); + m_transcodeAction->setEnabled(true); + if (clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { + m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); + m_openAction->setEnabled(true); + } else if (clip->clipType() == AUDIO && !KdenliveSettings::defaultaudioapp().isEmpty()) { + m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp())); + m_openAction->setEnabled(true); + } else m_openAction->setEnabled(false); + } } else { emit clipSelected(NULL); m_editAction->setEnabled(false);