From 22880ade4e9cf038bad509648f21452ee9ce27ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mladen=20Pejakovi=C4=87?= <pejakm@autistici.org>
Date: Wed, 1 Jan 2014 12:29:19 +0100
Subject: [PATCH] [Sidebar] Expand/collapse buttons for bookmarks sidebar

---
 src/lib/data/icons.qrc                 |   2 +
 src/lib/data/icons/faenza/collapse.png | Bin 0 -> 631 bytes
 src/lib/data/icons/faenza/expand.png   | Bin 0 -> 640 bytes
 src/lib/sidebar/bookmarkssidebar.cpp   |   5 ++
 src/lib/sidebar/bookmarkssidebar.ui    |  98 ++++++++++++++++++-------
 5 files changed, 78 insertions(+), 27 deletions(-)
 create mode 100644 src/lib/data/icons/faenza/collapse.png
 create mode 100644 src/lib/data/icons/faenza/expand.png

diff --git a/src/lib/data/icons.qrc b/src/lib/data/icons.qrc
index a1a934f94..d9f3be0c8 100644
--- a/src/lib/data/icons.qrc
+++ b/src/lib/data/icons.qrc
@@ -75,5 +75,7 @@
         <file>icons/browsers/internet-explorer.png</file>
         <file>icons/sites/startpage.png</file>
         <file>icons/sites/w3.png</file>
+        <file>icons/faenza/expand.png</file>
+        <file>icons/faenza/collapse.png</file>
     </qresource>
 </RCC>
diff --git a/src/lib/data/icons/faenza/collapse.png b/src/lib/data/icons/faenza/collapse.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4341b64e5a89411dcd600643093d5d40fef925e
GIT binary patch
literal 631
zcmV--0*L*IP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10rW{kK~y-6rIJsJQehOvfA_tnq9&;16|WXXgCVtWsD(Hmz=HOL
zB(o|)S8ZDP0opXPn@t;+wHjzW3!xSRL$+|CL_stT-pF*JqINH*MG9A$V4w#Mhr<i!
zef}IxMED<g03C<{Az%y)0O!IRL?j-KM)x#L`x=c#_e3NvB3!f-5E>4LJ0db34u?BS
zCYuNX86dp*pn!3uQaKC+0%w&<<!~v(jZ3Xo>zdE!+ix@)TY!I4f-WL=Mdb0a>n@6#
zh+GW@gRg-Tzu*5>L^2|x+!6r30Uws#jVrla?!ja-xdjYnvzeJnr5*usw}hBs7&WET
z8^bVa{7nSla;;Xo-RX250zZH`FzEGq_sZq+_R0@UM6P>0o>z|JIJ&OuwrxKLzPH=$
z8~J?xrES~4S&voey6$f_n=gvR;%5bntJUgJI2^XB)#}mGM59nBJhN?k4orZVtEP_Q
zOiQKGQy{L1hz@K6H-QfD5r}uY-C`n<h)t(clF8(q)%T;(=menO@BhkXv+q|6&bve}
zpiWOux6<kK6IW^nz!yM(g#u!xY3?ee4ouVBb(y#T=8ogo8xriLp^H@tA<MEdBJ#<y
ztPJO0;@nkhP{6oeuOCMuk)QQ?{g{nQ^m@Ir!C(#lGSMAd8o2M8-vMW<;SVFu3D`N3
RE+GH_002ovPDHLkV1i*24(k8_

literal 0
HcmV?d00001

diff --git a/src/lib/data/icons/faenza/expand.png b/src/lib/data/icons/faenza/expand.png
new file mode 100644
index 0000000000000000000000000000000000000000..4385011ff5fb961cc08e33b4bd72efa261e75629
GIT binary patch
literal 640
zcmV-`0)PF9P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10sTotK~y-6rISBsQ&AMgfA_uD7(#gACGfx(5z;}#p@V-GDYzB0
zITw;$;-(gtEZvGj2RGx;sY?qjf`da4OF@F*q(vySRU}}^GpH%Vw()bhue?U=;s+m>
zbI!fr`NO$J68{4aaDft#2L?b4j8b<l0J)Ss0J<lZq_9{lE*fKYipAohq)-x;W@BSx
z3g{)2bSV|b1M>ZTe_GO@-|tV`O7@ckrBZ1GeEC-k4lt<K>+88(u3N9y*KLU>$Ye4C
zex-OCl3YnQB-QNc+VUJp?)LWf72tJ3+k#_>XLUZ=;U(G6FE1}ghlhvG!NGw843mUQ
zOG^ddS|*eEJv%$wMN$}s;k+^CZ5W30c8KL52%Z94zz5)Yid(=|p-^}xsq6sxIF6?z
zeU9UJDjDM5-ricJQfXU(VT$j|<?^fD-Q6`{-vI`VMx*Wf{?|sM(Y9?I`M$roy1LrQ
zX0zYZ0uvJxKUY>(IzbR@0!L>J5lI(Yt=3(jm2hEU;hv<)<W3?GT4y*WU?g3y)oS;F
zCo?lMk0jl+{u6;PilRAV%*!Z>=EgP=N#1Zcyj`tUAM|>?JCe?&<3`e?=XnoDqtOr7
zb^YVx<Hx|x*t+C_TfiIO+h3d5Y&JVV5cHbOW@mg8Ee61g@y7s0k_%h~E(0Hdcbxu>
aXW|b$AX;p&kO&R{0000<MNUMnLSTX}6d3FP

literal 0
HcmV?d00001

diff --git a/src/lib/sidebar/bookmarkssidebar.cpp b/src/lib/sidebar/bookmarkssidebar.cpp
index 7e61bcdcd..784ff534b 100644
--- a/src/lib/sidebar/bookmarkssidebar.cpp
+++ b/src/lib/sidebar/bookmarkssidebar.cpp
@@ -46,12 +46,17 @@ BookmarksSideBar::BookmarksSideBar(QupZilla* mainClass, QWidget* parent)
     ui->bookmarksTree->setDragDropReceiver(true, m_bookmarksModel);
     ui->bookmarksTree->setMimeType(QLatin1String("application/qupzilla.treewidgetitem.bookmarks"));
 
+    ui->expandAll->setIcon(QIcon::fromTheme("view-sort-ascending", QIcon(":/icons/faenza/expand.png")));
+    ui->collapseAll->setIcon(QIcon::fromTheme("view-sort-descending", QIcon(":/icons/faenza/collapse.png")));
+
     ui->bookmarksTree->setDefaultItemShowMode(TreeWidget::ItemsExpanded);
     connect(ui->bookmarksTree, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuRequested(QPoint)));
     connect(ui->bookmarksTree, SIGNAL(itemControlClicked(QTreeWidgetItem*)), this, SLOT(itemControlClicked(QTreeWidgetItem*)));
     connect(ui->bookmarksTree, SIGNAL(itemMiddleButtonClicked(QTreeWidgetItem*)), this, SLOT(itemControlClicked(QTreeWidgetItem*)));
     connect(ui->bookmarksTree, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(itemDoubleClicked(QTreeWidgetItem*)));
     connect(ui->search, SIGNAL(textChanged(QString)), ui->bookmarksTree, SLOT(filterString(QString)));
+    connect(ui->collapseAll, SIGNAL(clicked()), ui->bookmarksTree, SLOT(collapseAll()));
+    connect(ui->expandAll, SIGNAL(clicked()), ui->bookmarksTree, SLOT(expandAll()));
 
     connect(m_bookmarksModel, SIGNAL(bookmarkAdded(BookmarksModel::Bookmark)), this, SLOT(addBookmark(BookmarksModel::Bookmark)));
     connect(m_bookmarksModel, SIGNAL(bookmarkDeleted(BookmarksModel::Bookmark)), this, SLOT(removeBookmark(BookmarksModel::Bookmark)));
diff --git a/src/lib/sidebar/bookmarkssidebar.ui b/src/lib/sidebar/bookmarkssidebar.ui
index ec86c30cd..b059c7c28 100644
--- a/src/lib/sidebar/bookmarkssidebar.ui
+++ b/src/lib/sidebar/bookmarkssidebar.ui
@@ -27,34 +27,78 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QLineEdit" name="search">
-     <property name="placeholderText">
-      <string>Search...</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="BookmarksTree" name="bookmarksTree">
-     <property name="contextMenuPolicy">
-      <enum>Qt::CustomContextMenu</enum>
-     </property>
-     <property name="alternatingRowColors">
-      <bool>true</bool>
-     </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::ContiguousSelection</enum>
-     </property>
-     <property name="headerHidden">
-      <bool>true</bool>
-     </property>
-     <attribute name="headerDefaultSectionSize">
-      <number>330</number>
-     </attribute>
-     <column>
-      <property name="text">
-       <string notr="true">Bookmark</string>
+    <widget class="QWidget" name="widget" native="true">
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="margin">
+       <number>0</number>
       </property>
-     </column>
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <item row="3" column="0" colspan="3">
+       <widget class="BookmarksTree" name="bookmarksTree">
+        <property name="contextMenuPolicy">
+         <enum>Qt::CustomContextMenu</enum>
+        </property>
+        <property name="alternatingRowColors">
+         <bool>true</bool>
+        </property>
+        <property name="selectionMode">
+         <enum>QAbstractItemView::ContiguousSelection</enum>
+        </property>
+        <property name="headerHidden">
+         <bool>true</bool>
+        </property>
+        <attribute name="headerDefaultSectionSize">
+         <number>330</number>
+        </attribute>
+        <column>
+         <property name="text">
+          <string notr="true">Bookmark</string>
+         </property>
+        </column>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLineEdit" name="search">
+        <property name="placeholderText">
+         <string>Search...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QToolButton" name="collapseAll">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="toolTip">
+         <string>Collapse All</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="autoRaise">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QToolButton" name="expandAll">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="toolTip">
+         <string>Expand All</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="autoRaise">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
   </layout>