From 290ad96d0c2765f5b1955165a47e07c3e328cae3 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Sun, 2 Oct 2011 15:13:21 +0000 Subject: [PATCH] Cleanup decoration of tree views (effect list, project tree) svn path=/trunk/kdenlive/; revision=5938 --- src/CMakeLists.txt | 1 + src/effectslistview.cpp | 9 +++++++++ src/projectlistview.cpp | 10 ++++++++++ src/widgets/effectlist_ui.ui | 16 +++++++++------- src/widgets/resources.qrc | 6 ++++++ src/widgets/stylesheet-branch-closed.png | Bin 0 -> 283 bytes src/widgets/stylesheet-branch-open.png | Bin 0 -> 273 bytes 7 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 src/widgets/resources.qrc create mode 100644 src/widgets/stylesheet-branch-closed.png create mode 100644 src/widgets/stylesheet-branch-open.png diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4664e1c9..173eabcd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -318,6 +318,7 @@ message(STATUS "using dl library: ${DL_LIB}") kde4_add_kcfg_files(kdenlive_SRCS kdenlivesettings.kcfgc) qt4_add_dbus_adaptor(kdenlive_SRCS org.kdenlive.MainWindow.xml mainwindow.h MainWindow) +qt4_add_resources(kdenlive_SRCS widgets/resources.qrc) kde4_add_executable(kdenlive ${kdenlive_SRCS} ${kdenlive_UI}) if(${KDE_VERSION} VERSION_LESS 4.3.80) diff --git a/src/effectslistview.cpp b/src/effectslistview.cpp index 9935394c..d7d9c0a2 100644 --- a/src/effectslistview.cpp +++ b/src/effectslistview.cpp @@ -35,8 +35,17 @@ EffectsListView::EffectsListView(QWidget *parent) : { setupUi(this); + QString style = "QTreeView::branch:has-siblings:!adjoins-item{border-image: none 0;} \ + QTreeView::branch:has-siblings:adjoins-item {border-image: none 0;} \ + QTreeView::branch:!has-children:!has-siblings:adjoins-item {border-image: none 0;} \ + QTreeView::branch:has-children:!has-siblings:closed,QTreeView::branch:closed:has-children:has-siblings { \ + border-image: none;image: url(:/images/stylesheet-branch-closed.png);} \ + QTreeView::branch:open:has-children:!has-siblings,QTreeView::branch:open:has-children:has-siblings { \ + border-image: none;image: url(:/images/stylesheet-branch-open.png);}"; + QMenu *contextMenu = new QMenu(this); m_effectsList = new EffectsListWidget(contextMenu); + m_effectsList->setStyleSheet(style); QVBoxLayout *lyr = new QVBoxLayout(effectlistframe); lyr->addWidget(m_effectsList); lyr->setContentsMargins(0, 0, 0, 0); diff --git a/src/projectlistview.cpp b/src/projectlistview.cpp index 5e4a7d34..816ce866 100644 --- a/src/projectlistview.cpp +++ b/src/projectlistview.cpp @@ -45,6 +45,16 @@ ProjectListView::ProjectListView(QWidget *parent) : setFrameShape(QFrame::NoFrame); setRootIsDecorated(true); + QString style = "QTreeView::branch:has-siblings:!adjoins-item{border-image: none 0;} \ + QTreeView::branch:has-siblings:adjoins-item {border-image: none 0;} \ + QTreeView::branch:!has-children:!has-siblings:adjoins-item {border-image: none 0;} \ + QTreeView::branch:has-children:!has-siblings:closed,QTreeView::branch:closed:has-children:has-siblings { \ + border-image: none;image: url(:/images/stylesheet-branch-closed.png);} \ + QTreeView::branch:open:has-children:!has-siblings,QTreeView::branch:open:has-children:has-siblings { \ + border-image: none;image: url(:/images/stylesheet-branch-open.png);}"; + + setStyleSheet(style); + setColumnCount(3); QStringList headers; headers << i18n("Clip") << i18n("Description") << i18n("Rating"); diff --git a/src/widgets/effectlist_ui.ui b/src/widgets/effectlist_ui.ui index f1266646..8b183bb5 100644 --- a/src/widgets/effectlist_ui.ui +++ b/src/widgets/effectlist_ui.ui @@ -103,9 +103,9 @@ - KTreeWidgetSearchLine - KLineEdit -
ktreewidgetsearchline.h
+ KComboBox + QComboBox +
kcombobox.h
 KLineEdit @@ -113,11 +113,13 @@
klineedit.h
 - KComboBox - QComboBox -
kcombobox.h
+ KTreeWidgetSearchLine + KLineEdit +
ktreewidgetsearchline.h
 - + + + diff --git a/src/widgets/resources.qrc b/src/widgets/resources.qrc new file mode 100644 index 00000000..c6c69eb7 --- /dev/null +++ b/src/widgets/resources.qrc @@ -0,0 +1,6 @@ + + + stylesheet-branch-closed.png + stylesheet-branch-open.png + + diff --git a/src/widgets/stylesheet-branch-closed.png b/src/widgets/stylesheet-branch-closed.png new file mode 100644 index 0000000000000000000000000000000000000000..42ba094b86f2a02e5bc3047a6a20e8242720d394 GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=fvS{2n6b#Q{2ow{y~NYkmHjps6F;-4q(vG~o?*79i(`ny<<$O- zzRZClEb0Fvo8EYeN4izLpVeUYqOpPP#2u!c%vMD%yx*OhChM7RPx07hF1I#q#j5_y zS#k`kx^A03xcV(TP3~D`n#^%)hTGMi%g@xrO?%2Eq4dc266=kqY<41(Uvlx7G3~e!sRTJ<8ZU z&4lUtluK+27&2~8oAa4(hvzQ-!yDf3dRHA4D$3w{d5vgTe~DWM4fRQX^1 literal 0 HcmV?d00001 -- 2.39.2