From cba952c812c8cd105f509d79e3d3fbb0b013323d Mon Sep 17 00:00:00 2001
From: Salvatore Larosa <lrssvtml@gmail.com>
Date: Sun, 14 Apr 2013 01:57:03 +0200
Subject: [PATCH] [pyqgis-console] added new toolbar for side editor

---
 .../default/console/iconCopyEditorConsole.png | Bin 0 -> 529 bytes
 .../default/console/iconCutEditorConsole.png  | Bin 0 -> 1048 bytes
 .../console/iconPasteEditorConsole.png        | Bin 0 -> 677 bytes
 .../default/console/iconRunScriptConsole.png  | Bin 0 -> 1099 bytes
 .../default/console/iconSaveAsConsole.png     | Bin 0 -> 1396 bytes
 python/console/console.py                     | 232 +++++++++++++-----
 6 files changed, 169 insertions(+), 63 deletions(-)
 create mode 100644 images/themes/default/console/iconCopyEditorConsole.png
 create mode 100644 images/themes/default/console/iconCutEditorConsole.png
 create mode 100644 images/themes/default/console/iconPasteEditorConsole.png
 create mode 100644 images/themes/default/console/iconRunScriptConsole.png
 create mode 100644 images/themes/default/console/iconSaveAsConsole.png

diff --git a/images/themes/default/console/iconCopyEditorConsole.png b/images/themes/default/console/iconCopyEditorConsole.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf31e1a94990948f1f4f8de4c5db9114a5c04e88
GIT binary patch
literal 529
zcmV+s0`C2ZP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10gg#TK~zYIwUk{>!ax*-&z(XMC8CfJeRBowLsw(mfG_TXt@uJD
zVHHMVh|~uyu~O_0b9^AJL$NI&oMe*TrgOiZGe1HS`&7j&L_|p5X|1JblIyyU?RNWN
zEdt4O0H|^eO(qledcA9NZr<1m5Cj2z-)FzyzuF66KA)2$XR{fn)9F2c+D-vk4Tr-)
zx7)qk8-OIo<M9)K!?gj=ukUm{e<O(FI0FFnojcH4Gm0X5o|i!Eq^Hn0Xd+T28LqXz
z3nU^fk}i-rXr{iy7!^yQVkrQ?aQso)_~N{^3d=gsT8Box$&Z_TQU@yUqqh$aUw*I^
zz|=}aiKEVGW68nJB8uZUjYz3ngN0H`<u7sqe0iJT^!N}bjXHouWJNlv*U+fj<qpCy
zTyn6@LR*%V??7v90@LRpj7ysSZfR4w5oK$qB%)^H0L`O=mG{|*6o4}T766P!quWlW
zb5q#)581Z;cSIyLfY+qfT7O1Sv}yk(<z5vA^j`oeY9JytEF#-f4#}VtunYYFs{6QL
TGVC%N00000NkvXXu0mjf$vE9D

literal 0
HcmV?d00001

diff --git a/images/themes/default/console/iconCutEditorConsole.png b/images/themes/default/console/iconCutEditorConsole.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c2c56c20901dbc1a4f4d31d271a8dd7618fe2cf
GIT binary patch
literal 1048
zcmV+z1n2vSP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11C>ccK~zYIwUo_o8$}q0-`%y-#K{`RaT*1uaa=jAEypRQRB&jD
ztx9}INbQ0A0nnt8T+~t!r56qej^%)i-2}TKaDqfAg+mV%%ZUq850!9wAW{+a?mDp@
zud%(}_1gQ*DN^Km^U<oWG?#gw`8}E$%^;el!SgKixu)+XSXx@b_8St7Mtcq{;5hD!
zSS<GDegrO;>uxw4K6D@ff*{D~=;+Obg@w-D!sGGyMZe$w8jj=0fdl{me!t&|qUaU9
zek2m<^Z9(AnM@|#3|)buC^ZyCVSIf2lV~)0q#a|k*{*rL-l2NE4kSs+ZG$vTYdaPf
z7cqh$v|6pErBW$sZf@>{o&EXw`KvTdYsF$wOC%DTdO5l~n4FwcNRniDo`<oqu_N8x
z-5+iD;_>)^*XzBGVHgO40NHHz=7En003e&q{wT{b$g&J>xBF@&5^(?k;5dHW<#HWv
zHk&|E6x8eW_)`fOhWR>|%Yi70;B-3ifq{V=v$L~f9*^fkQ4~Q@6v*fEKZQb}!cz%C
zq0o9hpHHf)3XMhsd_Ld1cDp@nx7$IIBq)_iP%4$8yJhV8RTPWG3lv3xBuOBOA`k=-
zU|AMqS%&rX^&e(tW>U{2n3|f(6bgkqs;a{3>MATRFGHnL0h*?P<G643T954KH;u(&
z$5d7Q%3`s+V>B88MNyWf>5r$Ur(=7qHME;t2_Ek0G<St;$MH{PUfJ;c+q_l16!s1d
z4nnnBE%*2LTPtLy=l(gzHLKI~9@>HR<<hm!&-_M3_T0g@uOP-#BO?!wo;16+hz1<$
z!oX}b!XtPU9y!l^DT?CvHf!%)`<)vjqetsdE(jnsRp_^O!sE4C_~g&T<y{5I*X{4S
zU+%s|7bUWsgO@Z}a`X)we=*~jBlCCTbTGB~=kISF|G?|f!gNt0|D&XHh`~r&Uxf5d
zW;^eROYZ1^H)>lPlyk!EKr&Me-rHC!=Y-o$h6e=E-Ua~ZQn=IGOz_^uS|FLJwlcZ`
zNrW_CYC^9;IlmHgT9Ok(CwdLad9EaYromsWOmbrA#7fX<X=QW;iXeZ-){#wx<s8E*
zQ*j_%T4p&1-^3pO!{>i(WkwJ#J*+a7Rz_EF_WstEU@!$4=zK^q0#KX+ENV*d2JGy`
z2b$E%kgN<8BRs+AUh>XL1O`uG2+)CKp3r0dm>4=H8&q>3nS0Q#zpsb(EcHJsITM6R
SEvmBs0000<MNUMnLSTZc8R&}u

literal 0
HcmV?d00001

diff --git a/images/themes/default/console/iconPasteEditorConsole.png b/images/themes/default/console/iconPasteEditorConsole.png
new file mode 100644
index 0000000000000000000000000000000000000000..9638d8255e360f90b6cc3e98013f51ee20f29873
GIT binary patch
literal 677
zcmV;W0$TlvP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10wPI7K~zYIwNx>S6HyTUW_Ppha>-?z(`!Qt1+lQP5bshb7J~R=
z1dBjCR7iPt{stRMD~l_HgzHiWmxyo}!Gtq`+!;y8?ao;2zP){WSvK+TgN3(`dEYlP
z-<wAwg8vCC`9nmM{H@pPFVhE_&E{(WaaNL(VJz_B)!iq@hwnZT8R{rL_ljEZa5%(q
z>+PNh1H$-r^tDAqyCM?g3S2XdduJzKqTB?4z;z#K!H(nL^yeW&0zd-%`f+j}fB_(1
z0E#yvhX^*g8|{aCn_G;yJ1bhJ3na(^!FBsP0LJ#sr}4hXooLN4xBlR~@u@MN&)Id|
zH_KX;sz729kqfaKx1KG{Zu>R>pkY}SI-Sl#BC3f9Cu0o#2&c$763s`YQhCtp^$v*0
z%oGq2s2dWK>j`DTwry0a)!lx-uZidtC}Oa_UQvLVQ7V;oy4~)9nyKXi>2C!XhJiw%
z0MGNl%sYtuO_>}Z>^-17kX7$v0^{*GUM~?qrpc4(43popOk%I(!YjJko+c1ZsLDPe
zq6mtY3G$#<z=2X)TEV~Ia*GlJCd!8^i0Cb1Uz_G|4%R16CX{NCkBeKxv4A=-na*%J
zoo5o4i%z!5?^|d4dyikZfsm;^l>&&!a{wrBI4Ey8x!ETxpuGMP5iJ&r)ut^%yWK{u
zR<lLq+{zEf+9qdvkOAhk3RquYFc|FnzHjD7h8T@T@hh3@!Bz1Wm|#f}3J9G>00000
LNkvXXu0mjf)OjiQ

literal 0
HcmV?d00001

diff --git a/images/themes/default/console/iconRunScriptConsole.png b/images/themes/default/console/iconRunScriptConsole.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3f90a2785fd30302ebb238e75d5010093c5ddb5
GIT binary patch
literal 1099
zcmV-R1ho5!P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11IS54K~zYIwU$e4lvNbRf9HOWY3U3zAf-?(2o#A41~mpqR5VdH
z#7J0(8Uwn47-=+a(1p>3kKh7bfVeTbu!ewa2!t32q?okfX@Nw*0u?h8pi=vo=}c$7
z?|$ELK}Ew%QA)VUO>RzZ&hMQ6Irkx|%H169&4wjw_FhWVB~pD?av${Ud3~$iVFXox
zRC@AkD;ZiJoVLaBzn{_4vg*@pcE{*M0jAm{lqwPZd12PvMejF1x9;=<FMRvFh}76S
z0e~VPf&v30F?H#CTbt)RviqS|_wJm(eDl0J2dG?Mh#&&xAfg<3WTwwuIi+RE>3J)@
zc}zrP!hl%hhI5SI`Z0-Q3HAQOOEPKttcMRTT)lVe{N<Y){|`WJZjxnfN3^01h=4eT
z<UNB}8==~d4Fh7^gy**4JCGl`_G_U(+je%xO9xdot_7&-BIWPs4Ppe95@4}mfDJ>?
z0%5FFB1oj07EGF)*<Zi5;|CFWMOCB!lt@(&2hvUbq#A!GvPG;d5L7CJl?ugjOxHVG
zSpRqjBbAs!=#ic|`^ClUyACdRdHbT9>r-6=1g|~>Gm5nqYeS;Y5?f0gM@&fqc7$i<
zp2YPWjB6;AV<tB>FS~!iq7#p<J@7^26Yr+Rmq-PO2!j9{1guyX@Z|hHL@jkriG@?U
zpps{b1Fr7?iYgRFV;ocGG`F_CZG&=yh_tC{r3w(nP|OP%H^AC}x1K(QPXOTv#G_!#
zU`Mz#bRUU&cPuEyprj`WgID|d2hQ(13V1*@z(x?n35p}rF=iMiE<;?R<Ki4tV~my|
z4%n4lj^{flknjX2C`A{JAK7_v-$z?Uul;fsDAtt7IAAaYwh_N>CQ{iBT4dRbET0@-
z$I=<yY&x?6V}wM#kZur${}?JB+4kYuzV7x;;Hs(y;}+Q%L5yI==65HTGFT8|Tjr^m
zT^zXjES~Q$HRF+VEj`D&4|ab2#;U&V_T51C-_D`NL0jC`ttG9;^$dQUhvyqy-@)}=
zT;GsNc_b4;?qV+2)6u>$+ws|tz-3jfdE-_|Bu0>!u`Ku}8%IbrxY&HYeDqjn`-NR^
zeifF6dx89Tr?_?v42TLM*QIh@!?cV?DW5N&IdHiB?Do|kkLg?)&*`l*5CH)M(n%NJ
zMD(8e`Ot4aeYt7y+@2G_mD_pcY5>59Fg4|o@5|+K-Mc=|9@@AE$N}ZseL|}ND2*Az
z(3ReEr?#zmEzIZ61H-q{`L+N9m(On)9q3J7+W+1Tphs21i8#Iy@ZJ8l`~~n$z3n~+
RWx4<W002ovPDHLkV1i_~`$GT#

literal 0
HcmV?d00001

diff --git a/images/themes/default/console/iconSaveAsConsole.png b/images/themes/default/console/iconSaveAsConsole.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0280535d3341858d3a2469147a94307b298d082
GIT binary patch
literal 1396
zcmV-)1&jKLP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11o25kK~zYIwUs+;990;Fzk6q9AG4da<F^w-AcBBELSTYO1Slv(
zK!_<2iYTB9f{qRf3M3?Gp-4f6s1OCBKmsL#1d#xW2oO7f;=DJ;VGT~!v9r4~JFojw
z%y_(}p<<=GnwdNE-*e7?&b>-R_&<L(z*`4DdtgJg^y*5x9X)lcEB$4SF=p+p9E0ik
zm;8~*3SC+DnOSJ7rA`<|Vf4*x<MdG*z;#P6OB_Dr7Mzhg$NMHmDmLc7h^h6rS}W|u
z4riMocnMB{YOSlM?F?d6ES2gyPL$LJC#aR6N4m%e(+!_Lm%EfK*t4x4$I|~^0oqGg
zh3gbcfJyMZOd_Q$U2-eWcW>N4_YaF6s3|3D5`8hVK$4XC;6$A`3~2<KSN7bqo{*)H
zn}Snv(X9Z#>j54*7g7X40Hsh0lm?~gghI7wGk2}UU862x(B)EN3GmY{WbdIgppdN2
zDm;5#9|goDU}7-BvGYyd`|1K6-zN$J!k|kOh1d$z^1CQ?53=EftRWgqf*6As$*qtw
zFecYr=?sn5%r!fBewQc==__i+HWb<1@ABMa3%X0-eFsFKHBp=pMsbQ>gjI#@Odtfv
zGocg+7-NW{kf-krdGi?$k~T;Ltr>_qh;cw!fa27V!&pP(3|2G?i;{xQ89>HB5HXOA
zA=e=e1BOct@P38%X}I|dgv$`FpvsegO|W<sIdzEm`W(A<+|Ta&HZeL_*_1Pop0RcT
zQ<D=+O-?}PaEdzi5miBz9z;go$g$0R_zv#hCmB3<jM+2KQrfnYt{-&0yvdR=kj&3o
z)0;F=6^L7?sEsP$4$fHS8d#qBo~Ut#>R6XXy@a*&Etl)pXbx>(>T!`t>x&>s0%A}-
zK~wHyP<{lYjo_ek86~MP7Ct?Q6mMcX7ArR#LaV~>n;!+=1Am=O1<SJe;q(Q@hWbeo
zvo^EJFf)Q=TG}T+r+;aVfja`OTyU|K!@12nF-qmzSH3_TM?`VNZ<iPN?cxHGu`-hR
zdi7caF$NuXd2;qE>=BPnt3c2#u%b6`v9>LBQ05{#EiQPTPm&}kAxkv$xfZ2DnK(%U
zq!cKnQCe}^&xaVQwAnZsbN2TNNurtF@;H)#SeN7=@DayKlPrP}gI1b-ySCE}A}-YD
z86K!{_Z_z~Jh+kQud7@-@jitCpT8Rgh;0@M!!(^iY$Iu&GL1AqlEjEf_mI^|gRs)-
zFf)6ZV?UkYY<+>Y7Z64XM?U$8_?8K(eb8Ji;FN2e7~7Ti$cVuhp=YxrFTOg~9SBP0
z9|Hti??>%>oumE~q0>io`x8V~vBv~!+nok5#%K}27}K**&p{?>!i`A)!F63`&z)zn
zwuSn(-MD*R%we*sLT?X}B%T-Jtf3dkx}Ba>mW5Udg#r{o5HLSK&(^J5nVQ<i+#ij#
zP>Q6kTj!!6`ZCh?E^S+T(_Ju?s912gePWb23K<*PNU`Y9YPC3i{5S^=9AJEW98e@C
zNiA&zt@Esi*0!isI<LL`!4Ai9UP|J)Ad-mIn*C2cOvNp7ZSgvVqQlU@0JU0`IF9i=
z565w+R;$#n{K3JG4^wm;w9<$e=?0zS^()g~<O?YEw%)tHIT!~W2Rr~Cn7o_8av9(E
z0VtQtxfH(d=l9KKldq@G;%0MN+Y)NO^W&jI?SBAA9N;_C&k!*H0000<MNUMnLSTX%
C?|6&=

literal 0
HcmV?d00001

diff --git a/python/console/console.py b/python/console/console.py
index 3ad849f55f1..c79bd17235d 100644
--- a/python/console/console.py
+++ b/python/console/console.py
@@ -110,19 +110,96 @@ class PythonConsoleWidget(QWidget):
         self.splitter.setChildrenCollapsible(False)
         self.splitter.addWidget(self.shellOut)
         self.splitter.addWidget(self.shell)
-        self.splitterEditor.addWidget(self.tabEditorWidget)
-        
+        #self.splitterEditor.addWidget(self.tabEditorWidget)
+
+        self.widgetEditor = QWidget(self.splitterEditor)
+
         # Hide side editor on start up
-        self.tabEditorWidget.hide()
-        
+        self.widgetEditor.hide()
+
         # List for tab script
         self.settings = QSettings()
         storedTabScripts = self.settings.value("pythonConsole/tabScripts")
         self.tabListScript = storedTabScripts.toList()
-        
+
         sizes = self.splitter.sizes()
         self.splitter.setSizes(sizes)
 
+        ##------------------Toolbar Editor-------------------------------------
+
+        ## Action for Open File
+        openFileBt = QCoreApplication.translate("PythonConsole", "Open file")
+        self.openFileButton = QAction(parent)
+        self.openFileButton.setCheckable(False)
+        self.openFileButton.setEnabled(False)
+        self.openFileButton.setIcon(QgsApplication.getThemeIcon("console/iconOpenConsole.png"))
+        self.openFileButton.setMenuRole(QAction.PreferencesRole)
+        self.openFileButton.setIconVisibleInMenu(True)
+        self.openFileButton.setToolTip(openFileBt)
+        self.openFileButton.setText(openFileBt)
+        ## Action for Save File
+        saveFileBt = QCoreApplication.translate("PythonConsole", "Save")
+        self.saveFileButton = QAction(parent)
+        self.saveFileButton.setCheckable(False)
+        self.saveFileButton.setEnabled(False)
+        self.saveFileButton.setIcon(QgsApplication.getThemeIcon("console/iconSaveConsole.png"))
+        self.saveFileButton.setMenuRole(QAction.PreferencesRole)
+        self.saveFileButton.setIconVisibleInMenu(True)
+        self.saveFileButton.setToolTip(saveFileBt)
+        self.saveFileButton.setText(saveFileBt)
+        ## Action for Save File As
+        saveAsFileBt = QCoreApplication.translate("PythonConsole", "Save As..")
+        self.saveAsFileButton = QAction(parent)
+        self.saveAsFileButton.setCheckable(False)
+        self.saveAsFileButton.setEnabled(False)
+        self.saveAsFileButton.setIcon(QgsApplication.getThemeIcon("console/iconSaveAsConsole.png"))
+        self.saveAsFileButton.setMenuRole(QAction.PreferencesRole)
+        self.saveAsFileButton.setIconVisibleInMenu(True)
+        self.saveAsFileButton.setToolTip(saveAsFileBt)
+        self.saveAsFileButton.setText(saveAsFileBt)
+        ## Action Cut
+        cutEditorBt = QCoreApplication.translate("PythonConsole", "Cut")
+        self.cutEditorButton = QAction(parent)
+        self.cutEditorButton.setCheckable(False)
+        self.cutEditorButton.setEnabled(True)
+        self.cutEditorButton.setIcon(QgsApplication.getThemeIcon("console/iconCutEditorConsole.png"))
+        self.cutEditorButton.setMenuRole(QAction.PreferencesRole)
+        self.cutEditorButton.setIconVisibleInMenu(True)
+        self.cutEditorButton.setToolTip(cutEditorBt)
+        self.cutEditorButton.setText(cutEditorBt)
+        ## Action Copy
+        copyEditorBt = QCoreApplication.translate("PythonConsole", "Copy")
+        self.copyEditorButton = QAction(parent)
+        self.copyEditorButton.setCheckable(False)
+        self.copyEditorButton.setEnabled(True)
+        self.copyEditorButton.setIcon(QgsApplication.getThemeIcon("console/iconCopyEditorConsole.png"))
+        self.copyEditorButton.setMenuRole(QAction.PreferencesRole)
+        self.copyEditorButton.setIconVisibleInMenu(True)
+        self.copyEditorButton.setToolTip(copyEditorBt)
+        self.copyEditorButton.setText(copyEditorBt)
+        ## Action Paste
+        pasteEditorBt = QCoreApplication.translate("PythonConsole", "Paste")
+        self.pasteEditorButton = QAction(parent)
+        self.pasteEditorButton.setCheckable(False)
+        self.pasteEditorButton.setEnabled(True)
+        self.pasteEditorButton.setIcon(QgsApplication.getThemeIcon("console/iconPasteEditorConsole.png"))
+        self.pasteEditorButton.setMenuRole(QAction.PreferencesRole)
+        self.pasteEditorButton.setIconVisibleInMenu(True)
+        self.pasteEditorButton.setToolTip(pasteEditorBt)
+        self.pasteEditorButton.setText(pasteEditorBt)
+        ## Action Run Script (subprocess)
+        runScriptEditorBt = QCoreApplication.translate("PythonConsole", "Run script")
+        self.runScriptEditorButton = QAction(parent)
+        self.runScriptEditorButton.setCheckable(False)
+        self.runScriptEditorButton.setEnabled(True)
+        self.runScriptEditorButton.setIcon(QgsApplication.getThemeIcon("console/iconRunScriptConsole.png"))
+        self.runScriptEditorButton.setMenuRole(QAction.PreferencesRole)
+        self.runScriptEditorButton.setIconVisibleInMenu(True)
+        self.runScriptEditorButton.setToolTip(runScriptEditorBt)
+        self.runScriptEditorButton.setText(runScriptEditorBt)
+        
+        ##----------------Toolbar Console-------------------------------------
+
         ## Action Show Editor
         showEditor = QCoreApplication.translate("PythonConsole", "Show editor")
         self.showEditorButton = QAction(parent)
@@ -165,15 +242,15 @@ class PythonConsoleWidget(QWidget):
         self.actionClass.setToolTip(actionClassBt)
         self.actionClass.setText(actionClassBt)
         ## Action menu Open/Save script
-        actionScriptBt = QCoreApplication.translate("PythonConsole", "Manage Script")
-        self.actionScript = QAction(parent)
-        self.actionScript.setCheckable(False)
-        self.actionScript.setEnabled(True)
-        self.actionScript.setIcon(QgsApplication.getThemeIcon("console/iconScriptConsole.png"))
-        self.actionScript.setMenuRole(QAction.PreferencesRole)
-        self.actionScript.setIconVisibleInMenu(True)
-        self.actionScript.setToolTip(actionScriptBt)
-        self.actionScript.setText(actionScriptBt)
+#        actionScriptBt = QCoreApplication.translate("PythonConsole", "Manage Script")
+#        self.actionScript = QAction(parent)
+#        self.actionScript.setCheckable(False)
+#        self.actionScript.setEnabled(True)
+#        self.actionScript.setIcon(QgsApplication.getThemeIcon("console/iconScriptConsole.png"))
+#        self.actionScript.setMenuRole(QAction.PreferencesRole)
+#        self.actionScript.setIconVisibleInMenu(True)
+#        self.actionScript.setToolTip(actionScriptBt)
+#        self.actionScript.setText(actionScriptBt)
         ## Import Sextante class
         loadSextanteBt = QCoreApplication.translate("PythonConsole", "Import Sextante class")
         self.loadSextanteButton = QAction(parent)
@@ -204,36 +281,6 @@ class PythonConsoleWidget(QWidget):
         self.loadQtGuiButton.setIconVisibleInMenu(True)
         self.loadQtGuiButton.setToolTip(loadQtGuiBt)
         self.loadQtGuiButton.setText(loadQtGuiBt)
-        ## Action for Open File
-        openFileBt = QCoreApplication.translate("PythonConsole", "Open file")
-        self.openFileButton = QAction(parent)
-        self.openFileButton.setCheckable(False)
-        self.openFileButton.setEnabled(False)
-        self.openFileButton.setIcon(QgsApplication.getThemeIcon("console/iconOpenConsole.png"))
-        self.openFileButton.setMenuRole(QAction.PreferencesRole)
-        self.openFileButton.setIconVisibleInMenu(True)
-        self.openFileButton.setToolTip(openFileBt)
-        self.openFileButton.setText(openFileBt)
-        ## Action for Save File
-        saveFileBt = QCoreApplication.translate("PythonConsole", "Save")
-        self.saveFileButton = QAction(parent)
-        self.saveFileButton.setCheckable(False)
-        self.saveFileButton.setEnabled(False)
-        self.saveFileButton.setIcon(QgsApplication.getThemeIcon("console/iconSaveConsole.png"))
-        self.saveFileButton.setMenuRole(QAction.PreferencesRole)
-        self.saveFileButton.setIconVisibleInMenu(True)
-        self.saveFileButton.setToolTip(saveFileBt)
-        self.saveFileButton.setText(saveFileBt)
-        ## Action for Save File As
-        saveAsFileBt = QCoreApplication.translate("PythonConsole", "Save As..")
-        self.saveAsFileButton = QAction(parent)
-        self.saveAsFileButton.setCheckable(False)
-        self.saveAsFileButton.setEnabled(False)
-        #self.saveAsFileButton.setIcon(QgsApplication.getThemeIcon("console/iconSaveConsole.png"))
-        self.saveAsFileButton.setMenuRole(QAction.PreferencesRole)
-        self.saveAsFileButton.setIconVisibleInMenu(True)
-        self.saveAsFileButton.setToolTip(saveAsFileBt)
-        self.saveAsFileButton.setText(saveAsFileBt)
         ## Action for Run script
         runBt = QCoreApplication.translate("PythonConsole", "Run command")
         self.runButton = QAction(parent)
@@ -269,27 +316,49 @@ class PythonConsoleWidget(QWidget):
         self.toolBar.addAction(self.runButton)
         self.toolBar.addSeparator()
         self.toolBar.addAction(self.showEditorButton)
-        self.toolBar.addAction(self.actionScript)
+#        self.toolBar.addAction(self.actionScript)
         self.toolBar.addSeparator()
         self.toolBar.addAction(self.optionsButton)
         self.toolBar.addAction(self.helpButton)
         
+        self.toolBarEditor = QToolBar()
+        self.toolBarEditor.setStyleSheet('background-color: rgb(200, 200, 200);\
+                                          border-right: 1px solid rgb(155, 155, 155);')
+        self.toolBarEditor.setEnabled(True)
+        self.toolBarEditor.setFocusPolicy(Qt.NoFocus)
+        self.toolBarEditor.setContextMenuPolicy(Qt.DefaultContextMenu)
+        self.toolBarEditor.setLayoutDirection(Qt.LeftToRight)
+        self.toolBarEditor.setIconSize(QSize(18, 18))
+        self.toolBarEditor.setOrientation(Qt.Vertical)
+        self.toolBarEditor.setMovable(True)
+        self.toolBarEditor.setFloatable(True)
+        self.toolBarEditor.addAction(self.openFileButton)
+        self.toolBarEditor.addSeparator()
+        self.toolBarEditor.addAction(self.saveFileButton)
+        self.toolBarEditor.addAction(self.saveAsFileButton)
+        self.toolBarEditor.addSeparator()
+        self.toolBarEditor.addAction(self.cutEditorButton)
+        self.toolBarEditor.addAction(self.copyEditorButton)
+        self.toolBarEditor.addAction(self.pasteEditorButton)
+        self.toolBarEditor.addSeparator()
+        self.toolBarEditor.addAction(self.runScriptEditorButton)
+        
         ## Menu Import Class
-        self.classMenu = QMenu(self)
-        self.classMenu.addAction(self.loadSextanteButton)
-        self.classMenu.addAction(self.loadQtCoreButton)
-        self.classMenu.addAction(self.loadQtGuiButton)
-        cM = self.toolBar.widgetForAction(self.actionClass)
-        cM.setMenu(self.classMenu)
-        cM.setPopupMode(QToolButton.InstantPopup)
-        ## Menu Manage Script
-        self.scriptMenu = QMenu(self)
-        self.scriptMenu.addAction(self.openFileButton)
-        self.scriptMenu.addAction(self.saveFileButton)
-        self.scriptMenu.addAction(self.saveAsFileButton)
-        sM = self.toolBar.widgetForAction(self.actionScript)
-        sM.setMenu(self.scriptMenu)
-        sM.setPopupMode(QToolButton.InstantPopup)
+#        self.classMenu = QMenu(self)
+#        self.classMenu.addAction(self.loadSextanteButton)
+#        self.classMenu.addAction(self.loadQtCoreButton)
+#        self.classMenu.addAction(self.loadQtGuiButton)
+#        cM = self.toolBar.widgetForAction(self.actionClass)
+#        cM.setMenu(self.classMenu)
+#        cM.setPopupMode(QToolButton.InstantPopup)
+#        ## Menu Manage Script
+#        self.scriptMenu = QMenu(self)
+#        self.scriptMenu.addAction(self.openFileButton)
+#        self.scriptMenu.addAction(self.saveFileButton)
+#        self.scriptMenu.addAction(self.saveAsFileButton)
+#        sM = self.toolBar.widgetForAction(self.actionScript)
+#        sM.setMenu(self.scriptMenu)
+#        sM.setPopupMode(QToolButton.InstantPopup)
 
         self.widgetButton = QWidget()
         sizePolicy = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Preferred)
@@ -297,11 +366,20 @@ class PythonConsoleWidget(QWidget):
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.widgetButton.sizePolicy().hasHeightForWidth())
         self.widgetButton.setSizePolicy(sizePolicy)
+        
+        self.widgetButtonEditor = QWidget(self.splitterEditor)
+        sizePolicy = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.widgetButtonEditor.sizePolicy().hasHeightForWidth())
+        self.widgetButtonEditor.setSizePolicy(sizePolicy)
+        
         sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.shellOut.sizePolicy().hasHeightForWidth())
         self.shellOut.setSizePolicy(sizePolicy)
+        
         self.shellOut.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
         self.shell.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
 
@@ -311,11 +389,23 @@ class PythonConsoleWidget(QWidget):
         self.mainLayout.setMargin(0)
         self.mainLayout.setSpacing(0)
         self.mainLayout.addWidget(self.widgetButton, 0, 0, 1, 1)
-        self.mainLayout.addWidget(self.splitterEditor, 0, 1, 1, 1)
+        self.mainLayout.addWidget(self.widgetButtonEditor, 0, 1, 1, 1)
+        self.mainLayout.addWidget(self.splitterEditor, 0, 2, 1, 1)
+        
+        self.layoutEditor = QGridLayout(self.widgetEditor)
+        self.layoutEditor.setMargin(0)
+        self.layoutEditor.setSpacing(0)
+        self.layoutEditor.addWidget(self.widgetButtonEditor, 0, 0, 1, 1)
+        self.layoutEditor.addWidget(self.tabEditorWidget, 0, 1, 1, 1)
+        
         self.toolBarLayout = QGridLayout(self.widgetButton)
         self.toolBarLayout.setMargin(0)
         self.toolBarLayout.setSpacing(0)
         self.toolBarLayout.addWidget(self.toolBar)
+        self.toolBarEditorLayout = QGridLayout(self.widgetButtonEditor)
+        self.toolBarEditorLayout.setMargin(0)
+        self.toolBarEditorLayout.setSpacing(0)
+        self.toolBarEditorLayout.addWidget(self.toolBarEditor)
         
         ##------------ Add first Tab in Editor -------------------------------
         
@@ -323,6 +413,10 @@ class PythonConsoleWidget(QWidget):
         
         ##------------ Signal -------------------------------
 
+        self.runScriptEditorButton.triggered.connect(self.runScriptEditor)
+        self.cutEditorButton.triggered.connect(self.cutEditor)
+        self.copyEditorButton.triggered.connect(self.copyEditor)
+        self.pasteEditorButton.triggered.connect(self.pasteEditor)
         self.showEditorButton.toggled.connect(self.toggleEditor)
         self.clearButton.triggered.connect(self.shellOut.clearConsole)
         self.optionsButton.triggered.connect(self.openSettings)
@@ -347,10 +441,22 @@ class PythonConsoleWidget(QWidget):
        self.shell.commandConsole('qtGui')
        
     def toggleEditor(self, checked):
-        self.tabEditorWidget.show() if checked else self.tabEditorWidget.hide()
+        self.widgetEditor.show() if checked else self.widgetEditor.hide()
         self.openFileButton.setEnabled(checked)
         self.saveFileButton.setEnabled(checked)
         self.saveAsFileButton.setEnabled(checked)
+        
+    def pasteEditor(self):
+        self.tabEditorWidget.currentWidget().newEditor.paste()
+        
+    def cutEditor(self):
+        self.tabEditorWidget.currentWidget().newEditor.cut()
+        
+    def copyEditor(self):
+        self.tabEditorWidget.currentWidget().newEditor.copy()
+        
+    def runScriptEditor(self):
+        self.tabEditorWidget.currentWidget().newEditor.runScriptCode()
             
 #    def openScriptFile(self):
 #       settings = QSettings()
@@ -427,7 +533,7 @@ class PythonConsoleWidget(QWidget):
             return
         filename = QFileDialog.getSaveFileName(self,
                         "Save File As",
-                        tabWidget.path, "Script file (*.py)")
+                        "*.py", "Script file (*.py)")
         if not filename.isEmpty():
             self.tabListScript.remove(tabWidget.path)
             tabWidget.path = filename