From b9bf3ce155203b7afcc7ac28cf495a6924f1ded4 Mon Sep 17 00:00:00 2001
From: "luke.segars" <lukes@eecs.berkeley.edu>
Date: Fri, 8 Oct 2010 00:31:42 -0700
Subject: [PATCH] Changed some icons and added toolbar widgets.

---
 icons/play.png   | Bin 617 -> 676 bytes
 icons/rewind.png | Bin 629 -> 666 bytes
 icons/stop.png   | Bin 667 -> 820 bytes
 mainwindow.cpp   |  59 +++++++++++++++++++++++++++++++++++++++++++++++
 mainwindow.h     |   2 ++
 5 files changed, 61 insertions(+)

diff --git a/icons/play.png b/icons/play.png
index 2e8f4159bb236aee0643c0dd34f939fe7a1269d2..6ef8de76e0f5bf01c09da24a07c61cfe558d7a4b 100644
GIT binary patch
delta 652
zcmV;70(1T81f&I!B!2{RLP=Bz2nYy#2xN!=000?uMObuGZ)S9NVRB^vcXxL#X>MzC
zV_|S*E^l&Yo9;Xs0006uNkl<ZIE|H(OGs2<9L0a%<IclI!xU1)UPK^h6a<CSMrhF@
zf&^PefkL>+a*Q@YD>sdhizspv6uqQHVm@#YEoRUuq!c&NB7ZD1ow0!)<9P4f`?UyP
zGZWN-v-$pq!}*{8hcSkHhP!mEu~WAdo8?nd1jeIrclCk3aF;a@j#!~$nl%(P0Jzf9
z8$5aR>}dqE;fU4n-v&x*nhu}wwKrd{4f;b9;fU2%OeY#6`YVQ=TOJkJo9%;vsn26n
zmF>ePxAA!V)_=-}`I%v3I3J5TKQ|0IwduKdA1M?{D1?v*1OSOoLwLB9`FF6Zyq@^<
zxHC36uz)eAVo_%XKm)j5j@ZX%D5+6Gfe;7*LIJ{K*`6c4G|$1hBUVk-p4z8lcPGLT
zt0NY5`ZYk#TP2-Yz;?6PZWg69r6pyQ1VZ>NKSsFNUVn~vOQY0;>O^aESIN+;M}5by
zTE{fN(vLabCtt63pnZarBhguj)(XEbh))Jk_$kemqfC&joiXbxY$;HJ)B<J6KlFj8
zvY;#)Dw;?yX3T?^cUH2inT-_yS`J-XH&B*9Y01c3FWM)m4(+FI`w1rB#O=h}_*dhy
zsYJoz?SCgdTh1sgvX{<v2b5COS2j_h_cHMOVP-M;WyH97XEeqXe2#F$GM8Js`Q;@^
zrc&m`=-`U&*d4JOPJh0(po29yIh({(Vs(0UYSG&ixuCPZC8#K`%zXQv8a6H$Hb?%a
m1VR#DPN(k0qJ@$3@f$(j3AAo@<+cC-002ovP6b4+LSTY;<u4-u

delta 592
zcmV-W0<Zm~1?dEkB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0006D
zNkl<Zc-o{>ziSjh6#jN^ch3!+q&cG&5&{tmA;PrUNC+6gLJI|BV{>Aa#{a=Gm5?G<
z3n~(j1S}+7+Pfeo#HfUzP0qx~<}SBCXJ>tHZtpyWppXY2Z-3s*n{VE)G4edeNyM6X
zx(>rIz(mcJXE;0gSlh$ZYTt?Mc~YxVN>8RK(m2*gq6pR?+nMW+`s*X#hg+%iOi_Tv
z8@yv47aG45v|3s-W~R>z(z6um%zqKEWKtsTbac3fhZ*iqUl3`M{6S(;?(>8?Yu*^J
zHL@(LGeH<i?0@V8xOZbrljH@7MTg?y-7DhxtM~nUAKac0K_I~m>LQ2lCy1g9+uJGb
zOpS{dOY2Mmi!0e`rMjX$X}41}_X4zo5J4Csr5aEq`m9tc;p?uA$*W`H?aJn?m5_tu
zl)$<t2QtHVQ$Y?nP_7N7h&0a7Nt8Yxt-5%#+-OjH=YNcm+7jn1$Y@Z*Yv|TM{9Vw>
zttqh|DvX{s(Oi6|FWcp^XOVMF(G#X=_6ADZJ>fj58}$S06e`2OH}7@#vg7D^usV&G
z+9}=L(6G;4*62^+#hY5Y2H-Dv`Z9ig@s2($YJcNjvu;)|!MgUOuA}+!X-;h|d)eN{
z-+!SPCP|mmEHG5;Yf<}Kkj>4{i2OCRwy;54<J_nMAxFTl2@auLtdE;eE>22_2??)_
elYZx40t^74qA~ZJH34b>0000<MNUMnLSTaPpdQ))

diff --git a/icons/rewind.png b/icons/rewind.png
index 77ffb1cd9b38d8899ac9fa09d8e83c7e48f47239..9c15c09e95c3430b5bd1bf24e7a01e8203a2e9a8 100644
GIT binary patch
delta 641
zcmV-{0)GAV1eyhqB!2{RLP=Bz2nYy#2xN!=000?uMObuGZ)S9NVRB^vcXxL#X>MzC
zV_|S*E^l&Yo9;Xs0006kNkl<ZIE{T%O-NKx7(L&;?~OAVMhP)NO+`V%P*jVi=0PB3
zr6we}NL+-VK_G2rgtkGnnqbx$G_)wFMIh6rf}j}462VM}2!D#15bej&oS!%E{<R3n
zkvDVUZti!^;T*nm5l>hqp0JED290h!VU0NBR?cr`p~-QQ_EsWfBH@EQ`Nc0GKMZR^
zJ`BSAxf26@WBs>$$pHKvI7xf7HPn_K?i~+>+atsnZ|Jg4VBK;@<XF#O*I1}5i<nz@
zh2wk9gE(9#X@8qKHere432XiF2r-uJJvF#17Cmc!TmFDzWf6unVtf0bp`f*b(h^Eb
zNF{Om{`LP3+FIMEE_YoEZr`?pW(v<Cv<u<}AdOt%5i}H}_8?>pp73yb-%x#otCwzs
zmfi1|&c6kSz!?K)fQEo8SK;b4xS|B96`&X-yn2DPT7MBM)gSm-F2Iv66t6<_DvT{)
z*#yQ3h65S~N*cK84}cA8%uJ@MwX!mYcE(UuE2yX<6!XAsf)!w}S{UpW1}nh8Z33}P
zTc~-J*t6G<vqw8(;WN=Ifsemm;FtUgZV@gXNP=+!0BH5kfs&?PAeRzzPSTFfewxZG
zEakhqJ9_)KtkQmbF1-OU!kxP}UE!MG<~7#!AeRy)00U0a9(_1@FMXl2H{|RdA^;Gs
z3FcCQHW$ga%DI%75W+i|efhNTe)?Ta2+t4JSYSPp(TL8@&txAwnW!|vHT{hnB8@PP
bVL!}YTFejo%y6SL00000NkvXXu0mjfNKzn3

delta 604
zcmV-i0;Bz!1@#1wB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0006P
zNkl<Zc-o{>y=xRf6o0!nyO#@|!JLU+&?<ffqs?3;*aQnj#6rcwwXo2QB4Pgodo3h|
zn9AnBMhg{@fL3Cq*O&xUh(;usaEi&Tm))J+oAJHL?s+FBO@9V{`{vEO@A<8vl!C1+
zHgfAN*gZX9<?|ZMvVbw>;N5Wy?q-H7^*T_prI+_$_lX-|7>3r_e}Xzml6aj5f$z8X
zgJa`e#%7nMl#|4<clq=XM+t<rMnlUDTj+F-h48LjJivWlLL5aPlLVxco6lg~cis8A
zbA->&2hi8YbbkO`@45?AH54w&DU_Uark$h6yLqL;=jIxzp@g$z`*`+1ByHP-hfm*U
zvH1B@qx{i}SzzQmarGFVnOSLPisKg4e<tud2w)8%L=2_=0*Ekd+bk}xYTb;(@a~<-
zSGD2cZ8}r4rC<?zUp6JI7Ho)iY=_oB2^zgc5ELxMXMdrzH1<qPQ@;+j;$3o2^6Hla
z%EcTkJ)W-pJ1~6v8h%{NG==t@^lXS#93niJeBvE;FYtvXfWRT<7^@Ir+HY=}8G&4S
z9j()aRUU=>(Q^R(`*kII#~uFdew8Yys87%T&gT292H6uRn9*5cZg2$5LuVXg=RwWH
z<n`@}tW|&5ln1$#jlGDHYW^t8uWx>-!ayKH-<BVrE#Uc32X-Nf2%9=bw5S4tl^*8P
qy}3a`q9yT~SSDz1Z1s2kBftQR*And#liHpD0000<MNUMnLSTY_7Ap||

diff --git a/icons/stop.png b/icons/stop.png
index d86254085638a76110b3ee8275fd38e2e0b48240..ab6808fba55428710250c72b2569ca5288cd6df2 100644
GIT binary patch
delta 797
zcmV+&1LFLf1+)f`B!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA
z00(qQO+^RQ3K17A4Qs%hzyJUO!AV3xR5;6Rle<q-VHk&>bLj<bjmF5}C5Fa8D|l&Y
zxCyB?h?<y?xUmpe{103@I2dUh984UH3vtlFyD_+!P$ZhLh=0Mv4h|@_)D}u<p$Fl#
z=R2PRrGoM%U%uo`p5J@<<yF`ckHTR+Ju&e_z*Tk#4aNjqjzVQKr~CsyYxMapUA%V9
zt!NqmQc4g4X<2-D_|W_^GxJ`+l_*#>fhzpM@ALIWhKAhp<Kvk5{I=>&ub29c4n916
zY9^A&F#&y1uz$3XP{@&;oO~HLcC0rtIJg0?u7YK46A-G(S~^W2646)Z=8i0tN@oVc
z;pbXsCiCWaV`I<xfdO|m9>=P$M~}rInM7u@8?&D{!QQ)fsU#8@U%zrZ9M+9g>gbO|
zBB=GK>f`?F*Y(W1ca#eS)V@B{mKKzb4*32Zb^m_$41W*f+P4oyN=oD7{4Nw|4u|!r
z&z}Rjq9`CG<w9Yj)sYc!xp4LN;=XYMT~Tm)Ject~`8#*8fpx<`3V{Ns|9K@P;{JW)
z)D+HLyKs8FSku$wVljkmV*@rIt2<J6^t-tkcPNCe>o^<^b_avhg+j<GEXrlX+}vLQ
zDMSrcTYp;c-nxa;>t#J2XLWQGr^kcu-aS0+?U=b7#<y?Cl@$PVDdmQmVIVAvy0$i4
zRd{iD7~3?_fCK&g)SWuT`hy3cY1q}G+65`QE5+jBKwFzuN+c+~eof`)PZn<8q@2l6
zUR)&i>J@9Vvm|fdM$t5Uen07@CHu$na$bpnQ-6cECmR~NTZ2JYDjsL8Sgb8;>r)&K
z8k(9&7YgEII=x^+r#1#60#9<qVwY(chXSpwdTD;1ifL|xRfmHHzn|HBUQGV_m9n8d
z3aQ#LZFb^6c(D8I>C-Mn2yDwjT2}2(B$L*sY<9+mt|%;SyT+{|0(y3`SA}UC&P8E)
bGZyy;$4yf9*M|2L00000NkvXXu0mjfi`#Z2

delta 642
zcmV-|0)73o2Ac(tB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0006#
zNkl<Zc-o9pO=#0#7=Dr^S+`bYZlcwL1E)e&5OWZ`dmH|o^q>bp@Y<W;(UZp>?a+fP
zOhm9wikIQVF$FP9kU8CSM|E2pyT&zXe!lpA-<mY79(>{DOMkxid7t<9lTP2RV9)V$
zNQ)#%WjgfKl^I3Rtu$uq%Ns1-y98y|#96Q~M4#wa&gXUC2UHb!GWVn34(`WA`Q2#n
zh{$BKJpk8bux*B1PDU66y|(RbP)78Xhtjfb$g+%p!lg+(FNEU+&@@HZ($0Rn4aV3`
z2C;#I93oRQnSX?!)gsc2lo0r?i?FX;CH=#Vk>fxf7$9d4o0}Fz(hzu_=u;f^F9NEk
zOjgnLkU+fVTFpYeUdPbTh)9{_ee6VdlMXQzr89wfy3}u6J)?j9whk6C{MvF5QF9wj
z7kXht=RMmumPPf|nn_KckICc?qd{qwrXIaDNB8f>>VMA`)*S{%9mIwkVXfvOyEli*
z%Vm?}IKGD<A@Tjv%;R@v;p8FM+Hj)dM-QO-;)BWUX=g#u_`HCoWr;fDOlFPO=ERXP
zGzW)qczhIdPZyHN9LMq8Pi(DHxCrIMWwA_(ra>ho;5E|Xsq2&a$LT7sxkPICGz~rx
zzC^)N1$+L|^WHHA9RMwsA<=RzK73ZB>r%v+@vjkf_khM2r5=x1mhQq7JKB}>7=ur<
z2c=_^`h`0;b=q9`#6-^k?f4{h!kyEjJ4V_nKLGb5|L;75e7Lc^Qn`B{|1H+)ig-yx
c@JE0F0C8zsgjTi*LI3~&07*qoM6N<$g1N6gYybcN

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 5eca4c8..720e85b 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -6,6 +6,10 @@
 #include <QLabel>
 #include <QMenuBar>
 #include <QStatusBar>
+#include <QToolBar>
+#include <QSlider>
+#include <QSpinBox>
+#include <QColorDialog>
 
 #include "connectionmanager.h"
 #include "shareboard.h"
@@ -15,6 +19,8 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent) {
 	createActions();
 	createMenus();
 
+	createToolBars();
+
 	board = new Shareboard(this);
 	setCentralWidget(board);
 
@@ -114,3 +120,56 @@ void MainWindow::createMenus() {
 
 }
 
+void MainWindow::createToolBars() {
+
+	// Create some of the basic tool actions.
+	//   They should also be added to an exclusive tool group.
+	QActionGroup* toolGroup = new QActionGroup(this);
+	QAction* penAction = new QAction(QIcon("icons/pen.png"), "Pen", this);
+	QAction* eraserAction = new QAction(QIcon("icons/eraser.png"), "Eraser", this);
+	penAction->setChecked(true);
+	toolGroup->addAction(penAction);
+	toolGroup->addAction(eraserAction);
+
+	// Create some other one-click actions that are not a part of the action group.
+	QAction* imageAction = new QAction(QIcon("icons/import_image.png"), "Import Image", this);
+	QAction* clearAction = new QAction(QIcon("icons/clear.png"), "Clear", this);
+
+	// Style
+	QSpinBox* spinboxWidget = new QSpinBox(this);
+	spinboxWidget->setMinimum(4);
+	spinboxWidget->setMaximum(40);
+
+
+	QPixmap pixmap(16, 16);
+	pixmap.fill(QColor(0, 0, 255));
+	QAction* colorAction = new QAction(QIcon(pixmap), "Select Color", this);
+
+	// Create the history UI elements.
+	QAction* restartAction = new QAction(QIcon("icons/rewind.png"), "Replay History", this);
+	QAction* playAction = new QAction(QIcon("icons/play.png"), "Play", this);
+	QSlider* sliderWidget = new QSlider(Qt::Horizontal, this);
+
+	toolBar = addToolBar("Test");
+	toolBar->setMovable(false);
+
+	toolBar->addSeparator();
+//	toolBar->addWidget(new QLabel("Tools", this));
+	toolBar->addAction(penAction);
+	toolBar->addAction(eraserAction);
+	toolBar->addAction(imageAction);
+	toolBar->addAction(clearAction);
+	toolBar->addSeparator();
+
+//	toolBar->addWidget(new QLabel("Style", this));
+	toolBar->addWidget(new QLabel("Width: ", this));
+	toolBar->addWidget(spinboxWidget);
+	toolBar->addWidget(new QLabel("Color: ", this));
+	toolBar->addAction(colorAction);
+	toolBar->addSeparator();
+
+//	toolBar->addWidget(new QLabel("History", this));
+	toolBar->addAction(restartAction);
+	toolBar->addWidget(sliderWidget);
+	toolBar->addAction(playAction);
+}
diff --git a/mainwindow.h b/mainwindow.h
index 692bc3c..867bd6c 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -27,7 +27,9 @@ public slots:
 private:
 	void createActions();
 	void createMenus();
+	void createToolBars();
 	QMenu* fileMenu;
+	QToolBar* toolBar;
 //	QAction* joinAction; // Removed in favor of central widget handling this.
 	QAction* loadPastAction;
 	QAction* saveAction;
-- 
2.39.5