From 51fa1b6584f6d55509235f3817cccb470ee35b36 Mon Sep 17 00:00:00 2001 From: JaeMin Kim Date: Fri, 21 Apr 2017 18:08:55 +0900 Subject: [PATCH] RTSDK: move terminal resources to another plugin 1. move terminal resources to another plugin 2. use TerminalViewEx -Enable new terminal in TerminalEx. -hide "org.eclipse.tm.terminal.view.ui.views.category" -move "NewTerminalViewHandler" to "tizen.rt.terminalex.plugin" -add "org.eclipse.tm.terminal.view.ui.views.categoryEx" Change-Id: I34fdf8f0e136e2f4d3ae8b98ba8660e4eaed9de7 Signed-off-by: JaeMin Kim --- .../org.eclipse.tm.terminal.view.ui/plugin.xml | 10 +- .../terminal/view/ui/interfaces/IUIConstants.java | 4 +- .../dialogs/LaunchTerminalSettingsDialog.java | 4 +- .../tizen.rt.product.plugin/META-INF/MANIFEST.MF | 4 +- .../terminal/view_menu_clear_terminal_dim.png | Bin 1235 -> 0 bytes .../terminal/view_menu_clear_terminal_nor.png | Bin 1261 -> 0 bytes .../icons/terminal/view_menu_open_new_t_dim.png | Bin 1019 -> 0 bytes .../icons/terminal/view_menu_open_new_t_nor.png | Bin 1022 -> 0 bytes .../icons/terminal/view_menu_paste_dim.png | Bin 1037 -> 0 bytes .../icons/terminal/view_menu_paste_nor.png | Bin 1041 -> 0 bytes .../icons/terminal/view_menu_pin_dim.png | Bin 1098 -> 0 bytes .../icons/terminal/view_menu_pin_nor.png | Bin 1094 -> 0 bytes .../icons/terminal/view_menu_scroll_lock_dim.png | Bin 1107 -> 0 bytes .../icons/terminal/view_menu_scroll_lock_nor.png | Bin 1112 -> 0 bytes .../terminal/view_menu_toggle_command_dim.png | Bin 1058 -> 0 bytes .../terminal/view_menu_toggle_command_nor.png | Bin 1060 -> 0 bytes rt-ide/tizen.rt.product.plugin/plugin.xml | 55 +---------- .../rt/ide/perspectives/TizenRTPerspective.java | 3 - rt-ide/tizen.rt.terminalex.plugin/.classpath | 7 ++ rt-ide/tizen.rt.terminalex.plugin/.gitignore | 2 + rt-ide/tizen.rt.terminalex.plugin/.project | 28 ++++++ .../.settings/org.eclipse.jdt.core.prefs | 7 ++ .../META-INF/MANIFEST.MF | 16 ++++ rt-ide/tizen.rt.terminalex.plugin/build.properties | 6 ++ .../icons/clcl16/save_log.png} | Bin 1064 -> 1167 bytes .../icons/dlcl16/save_log.png | Bin 0 -> 1183 bytes .../icons/elcl16/save_log.png} | Bin 1050 -> 1167 bytes rt-ide/tizen.rt.terminalex.plugin/icons/sample.gif | Bin 0 -> 983 bytes .../icons/terminal/tab_terminal_view.png | Bin .../icons/terminal/tab_terminal_view_sel.png | Bin .../terminal/view_menu_disconnect_terminal_dim.png | Bin .../terminal/view_menu_disconnect_terminal_nor.png | Bin .../icons/terminal/view_menu_open_t_dim.png | Bin .../icons/terminal/view_menu_open_t_nor.png | Bin rt-ide/tizen.rt.terminalex.plugin/plugin.xml | 89 ++++++++++++++++++ .../ide/terminal/view/ui/activator/Activator.java | 104 +++++++++++++++++++++ .../terminal/view/ui/interfaces/ImageConsts.java | 52 +++++++++++ .../rt/ide/terminal/view/ui/nls/Messages.java | 68 ++++++++++++++ .../ide/terminal/view/ui/nls/Messages.properties | 6 ++ .../view/ui/tabs}/TabFolderToolbarHandlerEx.java | 13 ++- .../view/ui/tabs}/ToggleSaveLogAction.java | 19 ++-- .../terminal/view/ui/view}/RtTerminalsViewEx.java | 4 +- 42 files changed, 424 insertions(+), 77 deletions(-) delete mode 100644 rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_clear_terminal_dim.png delete mode 100644 rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_clear_terminal_nor.png delete mode 100644 rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_open_new_t_dim.png delete mode 100644 rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_open_new_t_nor.png delete mode 100644 rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_paste_dim.png delete mode 100644 rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_paste_nor.png delete mode 100644 rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_pin_dim.png delete mode 100644 rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_pin_nor.png delete mode 100644 rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_scroll_lock_dim.png delete mode 100644 rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_scroll_lock_nor.png delete mode 100644 rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_toggle_command_dim.png delete mode 100644 rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_toggle_command_nor.png create mode 100644 rt-ide/tizen.rt.terminalex.plugin/.classpath create mode 100644 rt-ide/tizen.rt.terminalex.plugin/.gitignore create mode 100644 rt-ide/tizen.rt.terminalex.plugin/.project create mode 100644 rt-ide/tizen.rt.terminalex.plugin/.settings/org.eclipse.jdt.core.prefs create mode 100644 rt-ide/tizen.rt.terminalex.plugin/META-INF/MANIFEST.MF create mode 100644 rt-ide/tizen.rt.terminalex.plugin/build.properties rename rt-ide/{tizen.rt.product.plugin/icons/terminal/view_menu_copy_dim.png => tizen.rt.terminalex.plugin/icons/clcl16/save_log.png} (50%) create mode 100644 rt-ide/tizen.rt.terminalex.plugin/icons/dlcl16/save_log.png rename rt-ide/{tizen.rt.product.plugin/icons/terminal/view_menu_copy_nor.png => tizen.rt.terminalex.plugin/icons/elcl16/save_log.png} (50%) create mode 100644 rt-ide/tizen.rt.terminalex.plugin/icons/sample.gif rename rt-ide/{tizen.rt.product.plugin => tizen.rt.terminalex.plugin}/icons/terminal/tab_terminal_view.png (100%) rename rt-ide/{tizen.rt.product.plugin => tizen.rt.terminalex.plugin}/icons/terminal/tab_terminal_view_sel.png (100%) rename rt-ide/{tizen.rt.product.plugin => tizen.rt.terminalex.plugin}/icons/terminal/view_menu_disconnect_terminal_dim.png (100%) rename rt-ide/{tizen.rt.product.plugin => tizen.rt.terminalex.plugin}/icons/terminal/view_menu_disconnect_terminal_nor.png (100%) rename rt-ide/{tizen.rt.product.plugin => tizen.rt.terminalex.plugin}/icons/terminal/view_menu_open_t_dim.png (100%) rename rt-ide/{tizen.rt.product.plugin => tizen.rt.terminalex.plugin}/icons/terminal/view_menu_open_t_nor.png (100%) create mode 100644 rt-ide/tizen.rt.terminalex.plugin/plugin.xml create mode 100644 rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/activator/Activator.java create mode 100644 rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/interfaces/ImageConsts.java create mode 100644 rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/nls/Messages.java create mode 100644 rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/nls/Messages.properties rename rt-ide/{tizen.rt.product.plugin/src/org/tizen/rt/ide/terminal => tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/tabs}/TabFolderToolbarHandlerEx.java (92%) rename rt-ide/{tizen.rt.product.plugin/src/org/tizen/rt/ide/terminal => tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/tabs}/ToggleSaveLogAction.java (90%) rename rt-ide/{tizen.rt.product.plugin/src/org/tizen/rt/ide/views => tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/view}/RtTerminalsViewEx.java (91%) diff --git a/rt-ide/org.eclipse.tm.terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml b/rt-ide/org.eclipse.tm.terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml index 73a4f73..e920b9e 100644 --- a/rt-ide/org.eclipse.tm.terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml +++ b/rt-ide/org.eclipse.tm.terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml @@ -7,10 +7,13 @@ - + - id="org.eclipse.tm.terminal.view.ui.TerminalsView" name="%TerminalsView.name"> +--> @@ -405,7 +409,9 @@ original end --> commandId="org.eclipse.tm.terminal.view.ui.command.newview"> + + diff --git a/rt-ide/org.eclipse.tm.terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IUIConstants.java b/rt-ide/org.eclipse.tm.terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IUIConstants.java index dcaaddd..5df331b 100644 --- a/rt-ide/org.eclipse.tm.terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IUIConstants.java +++ b/rt-ide/org.eclipse.tm.terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/IUIConstants.java @@ -19,6 +19,8 @@ public interface IUIConstants { /** * The view id of the terminals view. */ - public static final String ID = "org.eclipse.tm.terminal.view.ui.TerminalsView"; //$NON-NLS-1$ + //public static final String ID = "org.eclipse.tm.terminal.view.ui.TerminalsView"; //$NON-NLS-1$ + public static final String ID = "org.tizen.rt.ide.terminal.view.ui.view.RtTerminalsViewEx"; //$NON-NLS-1$ + } diff --git a/rt-ide/org.eclipse.tm.terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java b/rt-ide/org.eclipse.tm.terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java index 88b2197..b010f24 100644 --- a/rt-ide/org.eclipse.tm.terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java +++ b/rt-ide/org.eclipse.tm.terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java @@ -596,8 +596,8 @@ public class LaunchTerminalSettingsDialog extends TrayDialog { data = new HashMap(); /* Tizen */ - // Apply RtTerminalsView instead of TerminalsView - data.put(ITerminalsConnectorConstants.PROP_ID, "org.tizen.rt.ide.view.RtTerminalsView"); + // Apply RtTerminalsViewEx instead of TerminalsView + data.put(ITerminalsConnectorConstants.PROP_ID, "org.tizen.rt.ide.terminal.view.ui.view.RtTerminalsViewEx"); /* ===== */ // Store the id of the selected delegate diff --git a/rt-ide/tizen.rt.product.plugin/META-INF/MANIFEST.MF b/rt-ide/tizen.rt.product.plugin/META-INF/MANIFEST.MF index 8922a7e..99309ee 100644 --- a/rt-ide/tizen.rt.product.plugin/META-INF/MANIFEST.MF +++ b/rt-ide/tizen.rt.product.plugin/META-INF/MANIFEST.MF @@ -29,8 +29,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.debug.core, org.eclipse.debug.ui, org.eclipse.cdt.debug.core, - org.eclipse.cdt.dsf.gdb, - org.eclipse.tm.terminal.connector.serial + org.eclipse.cdt.dsf.gdb Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-ClassPath: lib/slf4j-api-1.6.4.jar, @@ -42,3 +41,4 @@ Bundle-ClassPath: lib/slf4j-api-1.6.4.jar, lib/org.eclipse.cdt.debug.gdbjtag.core_8.5.0.201602051005.jar, lib/commons-compress-1.13.jar, . +Export-Package: org.tizen.rt.ide.util diff --git a/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_clear_terminal_dim.png b/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_clear_terminal_dim.png deleted file mode 100644 index 182da13e8efe3628f1c8414c315a10a922a4b786..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1235 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0gE#1sbTnr6e%`Du^OdOrf zO$;oJ4J=F@U0`}$@{>z*Q}aq-dQ%X39dYUfC5PMspv^9+MVV!(DQ-pixe8!!TV>*Q zi#bm7pn6kqyTt;hUVWfr^g)q}6xlE#Ul3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0z*Q}aq-dQ%X3opI^~C5PMspv^9+MVV!(DQ-pixe8!!TV>*Q zizQC;pn6kqyTuWwUVWfr^g)q}6xlE#Uc$(FwC9Yu51i7#jv~ZdfqeXVG*6-bF{MzkHS2sHb`= zTi&iF;l}oS`NO@^<`Q=G|IQpZeE9H!l`Bs^c=4hmQ$Vla^)=nLqut`hFJ8YkuBfau zEGR5Atoi?M?!$9)t$Au|Yg_iR6+PTt{$4^%H|ofP2M-P`Sg?R$`r~KM*rat76b@`C ze(pCRj&)C*b-@FM=7kFtZ%l~XoMyOW>C%Hw6KaZ!i`yov`-eT~-8$Pm-$+ASyZNSq zufo|AZ4C?|_qf+P&bO;&YUkuRz~fvd84@S6-m#{phUfmi+QT3C&ZH_ZOszlZq)~lm zZ?(A0h7)>@Ws)9p9NUbUx&>?cf><7T=jG+uoY=_5%r9@pa`aZZLU8}b|NsBDba9p| zY`t~nOi#G0E32w3V={M&hlIhgasd;LtQj&BRxusr6Yy?0#L}^ysgV7`1a<{e21Yi9 X6$#VSwsW4!2Ngh`u6{1-oD!M<3lp(c diff --git a/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_open_new_t_dim.png b/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_open_new_t_dim.png deleted file mode 100644 index 9b191fc3cc8106c20a4a93105c7261ee3e430493..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1019 zcmaJ=&ui0A9M9+&V`HM*bm-}kfxoc%*>+7>HoK->3uctIb3HCiUf0+qFD7p`8|Xnr z^s<|%I|&|SAS!qi8HyKCRPZ8RMEwIicopVL*LEJPftUA#&*$^~@jmZXVPSq`=-3cN zQ6u@BS|symI0gsE|NQ&SB{ChwnF=nU8gA+yq*5lTLXfxh6LD}WE~!}G-yF^L!tMQs%Qm}MjixlCJ{AwF$tz5 zhL1~0A$A4`9G_r0iREKaj+Z$}=6KNlXcEmcYjRP|wquc&z475au}x!6Ju2o?1zTEhxWGTke|cDu5U-)<9W7#rv= z%QIY9QU|DM|A*Rk7wzLB+|T!)!hU((g=`V}Xw5Uo#nmRmP_CTzppKDOMrgIu#X=on z zri8SViHn>n@qCA?B4f>l4(@QxeQu&BH?)K8lE^CbtV__$ddLQ?vSq7xE@Dr;HrMQ( zOROiCCCRYi<^FZqog?C)aM`sk*>ueh9pZS8So_Mg&-cl*XynyYIrvijy}LUbiBoU4 z;*G(r@zK#&xsTwWUaQ?Gz1%K6yy+bpi`=G$`NY_d%SX%uGwk;Wm@j;7yzb{_CY~*S z%56^EJ8NCPi{}=feEW5Jcw0~H^h@tvWFOsm+Lyg>c$MlKpgxSB;KT=udiWgknFaOn H-15~w$M8J( diff --git a/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_open_new_t_nor.png b/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_open_new_t_nor.png deleted file mode 100644 index 9f009911ec9b079dc7d6973524879c33943c5aca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1022 zcmaJ=OK1~87~WD8QwXR~9~ETSg0^7xmFF%^OPWn=&@CYiHudCYciIf;?yS30vk8Jy zM0|i$^rAP57ZF?WSP=!i2;$wx(YqehlTc^VBziCo?9PM#`~L6$=bP)r*^}X+ks*d* z!i5>NMCbj%w`Vu~pLu_4o=%5Ju0rPUB5CL@WHKhMLQt^uC0K&G**yOiPB6^iF;uRQ zigsEtu*K;?4Ch-8MKjFAl<(+99THH5OUO>MU!T8Z0W#C7nPEl@8qJpG+QIYQFy-5XmE`vhutM! zlx3M0BwmstG$P_PZKC@T+Z*jNsL(T9qFK%%(NaZM57wQDNWsH}*T`blx z!CnnJAe#-kmIPz-$To4q8*gJYO)1zO(QN}3)HF+3ID||^mZO0-?uHY)VR26nIya5*1lMLu}+_bT~IS+|6}#n_V(0ZoG}m@ z&)nJC+By_^qz~*v2&IPK-H+cKJ1C09(9^w!x3KWx(t3FH>aK;2fwSu1=7Ud{M}K}h za^>jc7yowXZvI-~c=^Z3n;v_3V`%ts@FEMj KS#@Lj-0E)<3_@1` diff --git a/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_paste_dim.png b/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_paste_dim.png deleted file mode 100644 index 4f6b7962ea630313796692fdbd170b13b4a2c5fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1037 zcmaJ=&ui0A9FJ_wIo6BFnBpPJP$t^^=+7mrc4?E^f*GSLTLlkGleaZ?$&1O`nhgc< zpi@x9i;4$9K^e$U1TRk9KnGqF#e;b9ADB4sA|lL}uI)Tn1269fpU>y}<9*(h(UB8@ zt^-{JK?HJHDUav9{^;z$|M7R%C-Af%$wf2Fu$IzZ>V>UqyB|Tf!DgcosFl|@~>idgV6lv%QY9gwzik${!BfH>$ zv4xR>wouV{ok|`jhdcobm;kAyXU?EguIlg$HKb=RYu4b7^YgS z($z2xooR;Sd7fcIOehq@h@d-fA=L|7Zhu2T0w!fs*S2238faMscA#ZC45p==@T02M)} z0O3rdi=$Y*2SBq`GJKU?_g_xJ=60IKa2A@Ni29@ zO24F%t%6SL{X zDpt^g9$GIxz=Ma1*o%1Tp%tOnOHV>kP`nfbl`8lEPtLYY>cO}$I}g6^`ycbojp3nz z_O{M8ilW-ngHndfd%V%QgZxh~-^!6`A5P}+2rA&JVnZsfp-~9ZhEjwXsA#o|OE5}N zEeG{%9_QubqKXVg@i2^QScFYc(LUEw)H1|i6c%+eMz77y(?Hi^bS@-wvXy`(eQ?}{ zBjZC^b-b(!8r^pkL|u^x7!WJKHO5RwbYt|ou1MD2F-wDW2rkFyjimDOFi0R9f)Eq- zseB*;dIg3L2@!v=2lzQY%yI(D2Ynnba)QY5VDqC%G+Qf(87Z|Hi|k@_31drS*=n`Q zR09mMi!3h)0?YYXzu!j?KBs14#r2s^cU?h(j%w=`){zN3MP(FKaEvCIZj@kH4O!FK zY!hi1>naw@Gn`ja9VpBHhZ;r$?cfaD%J-kbPPS%2HUk}0u~l+$g>EmDB_?dBU}R?z z8mo74xP&lrO2`6Szr=~Lxn8fXF`rXONn+s#lj_tYpTGJCM&43X diff --git a/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_pin_dim.png b/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_pin_dim.png deleted file mode 100644 index d98a12ffd627840d1f48c086f087708fd1d517e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1098 zcmaJ=TSyd97#^`=v6L(yv;q%fH_6@ES>0K8aI1A^&6QTSb<4#kXJ?K&tTShtIlAlW zlM&GsAA>HGLJ)@7gMo-i7~LQrvLt*mdWjHvNFwM$XUw%8+J-ad#`k^y^_-71A1f@_ zRX|ZxVW?4vl68mm+qRJT)cln;vXtRq9JiuQoDvO4`DK)VAf$?2FbYMv|MYWMM^X8- z5{u(__&6^i)gf9KM_Sbho1*HDq;*kBLJShHOVNDvr|DT5D6)@kbBCQ_Jpj9v#*6`5 zGtDt6la#zNedI8xOY=lPg;)e>wMR4gw2xlX<;mWmN<58FD8d6&luUk&}<^##rYWCY4G# zQq>M*bTO>g>$NmoE;~Wk&3+AwX}e}tWEBKxN`|6i1!=%i6ceZy`)K0n?+{ddLsm1_ z(?k-+q(z-!9ZoBxEHE7YKU7sW&?b(;KmPtx*o^h-kcmPQ^%@c>TxW%4O6LOx6frVl z2=!#M80khBncYYSfmRM2Y*REDrOe7Td^pU9G!u)O1Ve(4CJGKkk$E@E`B`V6w%Y3t zuxya?*9OS!sjhLm>l@ghKg$)6)T=@bXSwnpt~V#wY6Vp%mIY`ieNb*NkP6m9=9S#O za5?qXxpHn_JUO`xafY!9`&Xf}SEPHa?MB;@!$#vnjdZ&~+B!KO+)19q!;s*QrI+r# zepEOIwoykfx$?{JEYIy-S&+;3znd!=j1Rpy8JjBEJv=0gY{GAg^4gOh&-X3wds2Jt z+*qEcv_6uNPOz)+*#MI`6qznAUKo2;<(fIucy<5Tm2anBUinruYKt~qxLEM?!{V*G zd1c?nmu4$$!#~?bD;tKD`z=N9hl^KTPp;2TiA}H2$iUF|93C+xOe@0571xlPtrhD0(7fSbc;p^ zCe_9s6Snj;#pIq2*{{%h_kh}rKm;_1C6Lilx+P=+^n$KH=Jqy2g9Qlg2+)g3wTaCj zgiHv0F0WH|vn=3w7t8s0p4|;RZq~!N$;&%gPVn)9ry49hG>K*^?Lsu%uoR1|0(25% zLtvP6I_*k(UC2x@tl#gqH9Q_CK{%~$9ZMOfZdK+K!qAdU)xav!fvqUTQ5O!-B-6zs zXvVUvZY`CG6pYD82E)4C_K|WxQT#tt)0WW|j>46E|0!(6x(&!gp@q6knKZ7w(hg+^ zArnd%nK6V?xhgg%5k^)L86eccgB`7^uAsD4wSX5zA);GY(q$M42WX<;QdLFp)$rBc z2G;BK2SY4d&j)=WPlLCP3;H=O)S3@+!%cQ<5$7{s!x|X-+q`l zKL057zm_sRf5zXH6OcV}JapiX|IiC&u=sQ@HTr;{eK76ul z&hh*2MeAuC1*b8@^icdwh0FK`{mTkG=cWn|*KJ>_~l6c(m?B?;oi% BYmoo| diff --git a/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_scroll_lock_dim.png b/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_scroll_lock_dim.png deleted file mode 100644 index 7ed5774d0dd72a3dcc9e517fd9666e928464ad20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1107 zcmaJ=TWHfz7|t9_aZamvse*8pAt>0SX_wT7Rc)I(3wDgQxIGM6nw)N7OHNGA)~=vV z_p}WJ@u481#Rm}t5q%IZbDew8B8d1h5Yd4O;)7Eky`Ri=`d|%7&V}#${{Q^{cg8zA z+M8ByTTM|^Q~aQmB;y9>Th&1Rho7A8BEwc3>&7XR#W~r6R9HnB2;#cj2a`}%M~+rt z8%5RATDlu|Ck}}U(iz#oFnQf1Y>H~zmp5f)0Ai4VeVP%X7w%5eKvP3>7oYGZ%qZ;F z4i+q!Ds-fk!hjM~>3w@aTV5mrI>a)_>w|_Z=0o(Nu1Mz2HcNv=2p$O0zmw`tbb=_d zAmAClNAYqT5Cn#6`dBU)3_2Px+a`vu8d?F#n4I9gb0^?GMCJKzEsbZjY5AWlJ zus;xpaa>FY@`6|L1v#(81^j%(U*$?j8PcJFt6cRDH&T=9SV1>QWC>c@FjNm%NC%5Y z7PZ>B?5U}@#8qqO60FH(NiwX{*uNTG-6HOBrpvY^i)G_OgSg!ywjMs#u!UTShjA&K z&OgueOcnTg*SEfs>w4Lp&1R(map?WViGu6m_=c|0HKTPCYa+v&8u^~+nQ*$PMcvPj z%^&&t`EBFu*vfV8`zL-rDOW0$QmIrf&(22gOn!Jd^%yia&-7+8D=sg*xE;MPcl^h< z3ZUr+ho$ zdnu}pHgiLGNZl{$$O>vcCRni?!ltO+-4#dEOAvzs95wAY{blYh4NN0W4@Oi@b&{}X z?wxYsz*IV?PnGnTLGSJZy%muNSP*NVVvX6JSc%gsx+0nT+bj)MAh;B#SCbl2Ga!jv z2qM8SqjNkD1R=lAqB$%dfN`2%4rLMx~x^A=NL1 zqtO)4r-YtvPKqU?LX;OGiAY$ga%H4XSkT5*uJMPPtjYDQU^yhR3|;duH2Pg+ft4eR zX6;;JHTBlGM(tb@HMuNFhV>i!SEH+2#6A9W-L_=0ZhUAHx4XpFPJaFZxf1h=oXAyP z7j`iWq-K5vwrpr=?O>QwMfJwWv%=D+Pcz@2K6%o5Zs&OYBdYcMBVY_(%RGo|X_H@Z zQbR7>`1$5pb~v;xK6U2(+qrT;lBB@G!a`tiaq-ez@yom0f!W#FfTAe*_J=#3mWJ;f z(J}`Pzj^5g6K zx{2$@r>CifH)*%!@|7$1+q;e)st+wSzQ9|1`+82Yp*#idQIj9!;cwet|Mc&=l1j^0 HrTolqnk#J+ diff --git a/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_toggle_command_dim.png b/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_toggle_command_dim.png deleted file mode 100644 index 53b391597de58256f8e599f426a25c4cc12cd02f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1058 zcmaJ=O-K|`93Rp|gw0$kFbKvmLZO|H{n8zFv)!Fp-DqT47u`dL#+kS7pfhipdA6%i z^dW^15+X$(hYFD(>Jk|dqz5l{FoL|45D^{%!>-w(-mJUYp>5#J`{4Kc{XgFCO{RLg zT@8mD2!e1WdxSKe-Oi}5!~g!3sR2ASBQcBmU=9^z3lLEi4gxZ%%R?XyWOeM^G6)ky z%`q*LMOo=IuRxua9SmL6P0S{Ua97ckm0^I$K`^8l5o+`G0!3m)luG#3bUdi}>qFUtiPHpFm#56kgvh-W#n{82cXrRMmwkSNE(y9kv>$mAKO zP$@fq$MUP>(RulwaE0$&=4H~4QC=bF>6rpgY+a>7c zj;vvq+k_j&6lIg)Xx1sI0+gixLv?)zZKE{U&G(O;h=Vm`Dg> zoJ(~01&$MgF)tU5`GcYu@UhW=*jeEUP#M*Mfht^em+P&{b?l&igtcB8kv&(p_CL8Bt6h1Oo}HP0x%cPi+Q!RMbNST4n{!Fu#szK2y*_{R-g@`bu)A)= zwR|dm>*Cv$15Mx7^y&Vu*1C1%ecOZ8t>0(9Pqi-uW`nT#IZ;C_zTszn)aR}{uQn<6 K3eRF^ulxZ%H(G}P diff --git a/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_toggle_command_nor.png b/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_toggle_command_nor.png deleted file mode 100644 index 61132f3e50095b2a7eb330254067d69d5da43312..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1060 zcmaJ=Pe>F|9G+CdG!43>74aG&RNDEo>*~(nChN{_F1U-Vo33?noO$Y`GjE!Cwxb@B zEI}$SMV+F+C_5+-?WJ0}MMj8G1PUF3f}lekB7!J-qwdzBZQ#xO!}oo^Kks|9U5TSr z6?-cvimHlrNJ%p9c1QVk^6y!h>m^eyj-+un8pIjdf>cOF0}#Y?c?c$CL3l@h%WX76g8# z*`x5j0B8{y-Y*2aO^1P(-LZc>MoRT`!<*oP>Y!{im><8aE-Egf<$p6moHcb#5qA3|mmf z$VwqJn(t!QFv7?lMkWY{-LAEO`d-aYQO0iA;Kbu%%&@U+C@>}kX`;etnksVsKs(x(% - + - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/perspectives/TizenRTPerspective.java b/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/perspectives/TizenRTPerspective.java index 97905ed..0a92592 100644 --- a/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/perspectives/TizenRTPerspective.java +++ b/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/perspectives/TizenRTPerspective.java @@ -25,7 +25,6 @@ package org.tizen.rt.ide.perspectives; import org.eclipse.egit.ui.internal.repository.RepositoriesView; -import org.eclipse.tm.terminal.view.ui.interfaces.IUIConstants; import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; @@ -67,7 +66,6 @@ public class TizenRTPerspective implements IPerspectiveFactory { IFolderLayout bottom = factory.createFolder("bottomRight", //$NON-NLS-1$ IPageLayout.BOTTOM, 0.75f, factory.getEditorArea()); bottom.addView(IConsoleConstants.ID_CONSOLE_VIEW); - bottom.addView("org.tizen.rt.ide.view.RtTerminalsView"); //$NON-NLS-1$ bottom.addPlaceholder(IConsoleConstants.ID_CONSOLE_VIEW); IFolderLayout topRight = factory.createFolder("topRight", //$NON-NLS-1$ @@ -95,7 +93,6 @@ public class TizenRTPerspective implements IPerspectiveFactory { private void addViewShortcuts() { factory.addShowViewShortcut("org.tizen.rt.product.RtProjectExplorer"); //$NON-NLS-1$ factory.addShowViewShortcut(IConsoleConstants.ID_CONSOLE_VIEW); - factory.addShowViewShortcut(IUIConstants.ID); // TM Terminal View ID factory.addShowViewShortcut(IPageLayout.ID_OUTLINE); factory.addShowViewShortcut(RepositoriesView.VIEW_ID); } diff --git a/rt-ide/tizen.rt.terminalex.plugin/.classpath b/rt-ide/tizen.rt.terminalex.plugin/.classpath new file mode 100644 index 0000000..eca7bdb --- /dev/null +++ b/rt-ide/tizen.rt.terminalex.plugin/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/rt-ide/tizen.rt.terminalex.plugin/.gitignore b/rt-ide/tizen.rt.terminalex.plugin/.gitignore new file mode 100644 index 0000000..5804cd2 --- /dev/null +++ b/rt-ide/tizen.rt.terminalex.plugin/.gitignore @@ -0,0 +1,2 @@ +/bin +/.settings/org.eclipse.jdt.core.prefs \ No newline at end of file diff --git a/rt-ide/tizen.rt.terminalex.plugin/.project b/rt-ide/tizen.rt.terminalex.plugin/.project new file mode 100644 index 0000000..2675b18 --- /dev/null +++ b/rt-ide/tizen.rt.terminalex.plugin/.project @@ -0,0 +1,28 @@ + + + tizen.rt.terminalex.plugin + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/rt-ide/tizen.rt.terminalex.plugin/.settings/org.eclipse.jdt.core.prefs b/rt-ide/tizen.rt.terminalex.plugin/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..0c68a61 --- /dev/null +++ b/rt-ide/tizen.rt.terminalex.plugin/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/rt-ide/tizen.rt.terminalex.plugin/META-INF/MANIFEST.MF b/rt-ide/tizen.rt.terminalex.plugin/META-INF/MANIFEST.MF new file mode 100644 index 0000000..0d901db --- /dev/null +++ b/rt-ide/tizen.rt.terminalex.plugin/META-INF/MANIFEST.MF @@ -0,0 +1,16 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Plugin +Bundle-SymbolicName: tizen.rt.terminalex.plugin;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: org.tizen.rt.ide.terminal.view.ui.activator.Activator +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.tm.terminal.view.ui, + org.eclipse.tm.terminal.control, + org.eclipse.tm.terminal.connector.serial, + org.eclipse.core.resources, + org.tizen.rt.product.plugin, + org.eclipse.osgi +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-ActivationPolicy: lazy diff --git a/rt-ide/tizen.rt.terminalex.plugin/build.properties b/rt-ide/tizen.rt.terminalex.plugin/build.properties new file mode 100644 index 0000000..855ee81 --- /dev/null +++ b/rt-ide/tizen.rt.terminalex.plugin/build.properties @@ -0,0 +1,6 @@ +source.. = src/ +output.. = bin/ +bin.includes = plugin.xml,\ + META-INF/,\ + .,\ + icons/,\ diff --git a/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_copy_dim.png b/rt-ide/tizen.rt.terminalex.plugin/icons/clcl16/save_log.png similarity index 50% rename from rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_copy_dim.png rename to rt-ide/tizen.rt.terminalex.plugin/icons/clcl16/save_log.png index 44b27fa526be6633a0c825afd0333a77d50e9b97..2e5b3dafc141c89bba2548404a7a390b84f9466f 100644 GIT binary patch delta 464 zcmZ3%(a*WTi%G%J+}POF#nRZo#KOYR(AC`0(a_D+z{T9v$k@%o#ng0i7LyE2kqJ&k z%a{yepe7mOQlz9%ToRO;W|fkkT$-DjSK{ent5lI&pqG-FVg=P}giG&aBW9=ijv~8m z1_p-zo-U3d6}OUfbahh~u#}XRHfD+`{5$U;nZPpHLHw_}xWiYY1_NQ{sSMmk%h#;o z$+r;56)==4VEk3pE3rQ4Y_`r3tv`Q%n;-u7_qXJ^`S#~OJUqmJxL*Js2?}y){ z>u=t?kq8P3I?&d@V_o;h;_yP}_HPVd>vsxGRVaUV=V$%rXJ=n<3i3ESa;Ret+{pH+ zZ|PFiFiUN1Z2{5KPB}RT53$%v+`4_+aS9K&&E<#esgU&Fw+C(%GO==Mthtc%Rw7`}WWf|=Lxw4F4I!)o?#vr?1nk)! kEtPe+!|3JCz{tk1)QvZ?=l)h3U|=wKy85}Sb4q9e034~Gx&QzG delta 360 zcmeC@T*0xyi%G%6)X><-#nH{p+{DGu(ACVz(7?jN+0Deo+|k0^&Cqdj7LyEAk&^*V zMa!5BVxT6u;8LWdP+Ss}nr4-fpIn-onpfiKVyjexxV7WFuy$`c=Eq zFEB7L%azSjJn9c;%xO9O<7Tq%F{vguhe#_==f$N)`W(E1 zjfQOs@wV3=Nw59-Q($SJm#XZVt#vbZTCFp!X*X}SEQ(>C>@$hyac5IX@{BdD`9+UD zUiCP$F2j=Rqh#^gsU32{OUn%IiJX!3S!v29^(Uh>$Gng^5G3<*p7f#@I@c}xL!PC{xWt~$(695s-dS(Cs diff --git a/rt-ide/tizen.rt.terminalex.plugin/icons/dlcl16/save_log.png b/rt-ide/tizen.rt.terminalex.plugin/icons/dlcl16/save_log.png new file mode 100644 index 0000000000000000000000000000000000000000..1e17804b379a0a6378edd991db428c241dd25ca3 GIT binary patch literal 1183 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0tLOx!FConU%h@{>z*Q}aq-dQ%X34RPuPC5PMspv^9+MVV!(DQ-pixe8!!TV>*O zi;F8x^PqZDaJt3C4X0jxpkwqwk&6`BFd<+H0x{u97s!Dp{?t5RiZ22t?GpVjSquz} z{GKk3Ar-fhV)j;)A&tre?(@D~3JXU;kfXo_+nf56{j@x5e+TGu*IoW8=~5Ya$PG`b@d+ z`Ds>53rllb8`}+m35ojg`%)@CJ~}G5AaR{b<=c~!)f2=|o;-O_mt|$^r?m}jQw2q{ z^Y8CV6%ZFcuEj3epQ>oKEg`W)KhDuK-@d+S#d4hu zNeuD~Y|n}k4qQ8Mh(of0NrppAc=o2-jf_=qE-rRY5dZW4zr0WL4~4=7HR{S96C@bC v^c_|)bu4a-5bKa<{ure2j$x^C0|PUI-=DJJeEsIrpd!Q5)z4*}Q$iB}eW#2Q literal 0 HcmV?d00001 diff --git a/rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_copy_nor.png b/rt-ide/tizen.rt.terminalex.plugin/icons/elcl16/save_log.png similarity index 50% rename from rt-ide/tizen.rt.product.plugin/icons/terminal/view_menu_copy_nor.png rename to rt-ide/tizen.rt.terminalex.plugin/icons/elcl16/save_log.png index 5369244497951672dc9f0e3e8759cd2621e8f526..2e5b3dafc141c89bba2548404a7a390b84f9466f 100644 GIT binary patch delta 464 zcmbQm(a*WTi%G%J+}POF#nRZo#KOYR(AC`0(a_D+z{T9v$k@%o#ng0i7LyE2kqJ&k z%a{yepe7mOQlz9%ToRO;W|fkkT$-DjSK{ent5lI&pqG-FVg=P}giG&aBW9=ijv~8m z1_p-zo-U3d6}OUfbahh~u#}XRHfD+`{5$U;nZPpHLHw_}xWiYY1_NQ{sSMmk%h#;o z$+r;56)==4VEk3pE3rQ4Y_`r3tv`Q%n;-u7_qXJ^`S#~OJUqmJxL*Js2?}y){ z>u=t?kq8P3I?&d@V_o;h;_yP}_HPVd>vsxGRVaUV=V$%rXJ=n<3i3ESa;Ret+{pH+ zZ|PFiFiUN1Z2{5KPB}RT53$%v+`4_+aS9K&&E<#esgU&Fw+C(%GO==Mthtc%Rw7`}WWf|=Lxw4F4I!)o?#vr?1nk)! kEtPe+!|3JCz{tk1)QvZ?=l)h3U|=wKy85}Sb4q9e00T*%tN;K2 delta 346 zcmeC@oW-%hi%G%6(cIbG+|bR<+{DGu(ACVs&CJr#(#+M+)XBuq#Labb7LyEAk&yvT zMa!5BVxT6u;8LWdP+Ss}nr4-fpIn-onpfiKVyjexxV7WFuy$ddBX6 z=L`%CU7jwEAr-gYOgYHapdjE9`&I7m8u^Fk#qJhIJ3AkVT5D^@E-EW;%)z9j^;~9E zo$tNhYwxx2EOMUauy2pa6aJ?&_Zk-6I%zGOliRe2ZIZ4@{K+l9md)_-Zt#oP9Mym7 z*Axv8)kDW!?r>l0Ppa;nqq1t{{#yxKzf4s>a68K^wuwnCSofe?gBo8u12cn}tz)e? T=gCN*vlu*G{an^LB{Ts5X_a(n diff --git a/rt-ide/tizen.rt.terminalex.plugin/icons/sample.gif b/rt-ide/tizen.rt.terminalex.plugin/icons/sample.gif new file mode 100644 index 0000000000000000000000000000000000000000..34fb3c9d8cb7d489681b7f7aee4bdcd7eaf53610 GIT binary patch literal 983 zcmZ?wbhEHb6krfw_|CxKYUg-n!?izO{@9*?jxd%4aX0yzy`dymabz zw#(eg=y~&N&n)dZv2xzduG}5lraiApo3(c4*{Ylg5#|$JO_EEZ<^|a2`Z*=9ns7DV zy=TR&gYw*7f%auV?ip3tvjRPmcdoho{K?x$_vR?C#t5&<;~V}S*>OMCr>h}%%bLZ9 zmo3`hYEwTICo-TTCZwgTsC&VjZRgJ1eE#fBa^%9R zmmfWS@;bnyJ27HWY}kxYzv(Hl>yu;FCPlAEh+34Muq-8Rb6C)<8qA3{r2e5 z`$vyngh#H=FWlqqvnapfc5%(!sQ4v?r7J61-&eJNEN^;KTK}T7{#i-gJh%G*9vcYdwv_*~xdw!Gz4Va?T!sXyyF@8?w<>X`X=#j%uHV4GRvj@+tE@ zQ%F!a)GKcn^~8abN>4la1UNXVL;{ZWi)lEwyeatDu%Lr6;aASiLrXXW zQm# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/activator/Activator.java b/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/activator/Activator.java new file mode 100644 index 0000000..7cc9983 --- /dev/null +++ b/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/activator/Activator.java @@ -0,0 +1,104 @@ +/* +* Activator +* +* Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved. +* +* Contact: +* Jaemin Kim +* HyeongSeok Heo +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* Contributors: +* - S-Core Co., Ltd +* +*/ +package org.tizen.rt.ide.terminal.view.ui.activator; + +import java.net.URL; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ImageRegistry; +import org.eclipse.tm.terminal.view.ui.interfaces.ImageConsts; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "tizen.rt.terminalex.plugin"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + + /** + * Loads the image registered under the specified key from the image registry and returns the ImageDescriptor object instance. + * @param key The key the image is registered with. + * @return The ImageDescriptor object instance or null. + */ + public static ImageDescriptor getImageDescriptor(String key) { + return getDefault().getImageRegistry().getDescriptor(key); + } + + /* (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeImageRegistry(org.eclipse.jface.resource.ImageRegistry) + */ + @Override + protected void initializeImageRegistry(ImageRegistry registry) { + Bundle bundle = getBundle(); + + URL url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_CLCL + "save_log.png"); //$NON-NLS-1$ + registry.put(ImageConsts.ACTION_SaveLog_Hover, ImageDescriptor.createFromURL(url)); + url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_ELCL + "save_log.png"); //$NON-NLS-1$ + registry.put(ImageConsts.ACTION_SaveLog_Enabled, ImageDescriptor.createFromURL(url)); + url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_DLCL + "save_log.png"); //$NON-NLS-1$ + registry.put(ImageConsts.ACTION_SaveLog_Disabled, ImageDescriptor.createFromURL(url)); + + } +} diff --git a/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/interfaces/ImageConsts.java b/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/interfaces/ImageConsts.java new file mode 100644 index 0000000..6bd0294 --- /dev/null +++ b/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/interfaces/ImageConsts.java @@ -0,0 +1,52 @@ +/* +* ImageConsts +* +* Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved. +* +* Contact: +* Jaemin Kim +* HyeongSeok Heo +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* Contributors: +* - S-Core Co., Ltd +* +*/ +package org.tizen.rt.ide.terminal.view.ui.interfaces; + +/** + * Image registry constants. + * @noextend This interface is not intended to be extended by clients. + * @noimplement This interface is not intended to be implemented by clients. + */ +public interface ImageConsts { + /** + * The root directory where to load the images from, relative to the bundle directory. + */ + public final static String IMAGE_DIR_ROOT = "icons/"; //$NON-NLS-1$ + /** + * The key to access the save log action image (enabled). + */ + public static final String ACTION_SaveLog_Enabled = "SaveLog_enabled"; //$NON-NLS-1$ + + /** + * The key to access the save log action image (disabled). + */ + public static final String ACTION_SaveLog_Disabled = "SaveLog_disabled"; //$NON-NLS-1$ + + /** + * The key to access the save log action image (hover). + */ + public static final String ACTION_SaveLog_Hover = "SaveLog_hover"; //$NON-NLS-1$ +} diff --git a/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/nls/Messages.java b/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/nls/Messages.java new file mode 100644 index 0000000..86f235b --- /dev/null +++ b/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/nls/Messages.java @@ -0,0 +1,68 @@ +/* + * Messages + * + * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * JaeMin Kim + * HyeongSeok Heo + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Contributors: + * - S-Core Co., Ltd + */ +package org.tizen.rt.ide.terminal.view.ui.nls; + +import java.lang.reflect.Field; + +import org.eclipse.osgi.util.NLS; + +/** + * TerminalEx plug-in externalized strings management. + */ +public class Messages extends NLS { + + // The plug-in resource bundle name + private static final String BUNDLE_NAME = "org.tizen.rt.ide.terminal.view.ui.nls.Messages"; //$NON-NLS-1$ + + /** + * Static constructor. + */ + static { + // Load message values from bundle file + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + /** + * Returns the corresponding string for the given externalized strings key or null if the key does not exist. + * @param key The externalized strings key or null. + * @return The corresponding string or null. + */ + public static String getString(String key) { + if (key != null) { + try { + Field field = Messages.class.getDeclaredField(key); + return (String) field.get(null); + } catch (Exception e) { + /* ignored on purpose */ } + } + + return null; + } + + // **** Declare externalized string id's down here ***** + + public static String TabSaveLogAction_text; + public static String TabSaveLogAction_tooltip; +} diff --git a/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/nls/Messages.properties b/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/nls/Messages.properties new file mode 100644 index 0000000..62393ab --- /dev/null +++ b/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/nls/Messages.properties @@ -0,0 +1,6 @@ +TabSaveLogAction_text=SaveLog +TabSaveLogAction_tooltip=SaveLog to file + +TabSaveLogAction_tooltip_startLogging=Start logging +TabSaveLogAction_tooltip_stopLogging=Stop logging + diff --git a/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/terminal/TabFolderToolbarHandlerEx.java b/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/tabs/TabFolderToolbarHandlerEx.java similarity index 92% rename from rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/terminal/TabFolderToolbarHandlerEx.java rename to rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/tabs/TabFolderToolbarHandlerEx.java index a6b4523..01b8c84 100644 --- a/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/terminal/TabFolderToolbarHandlerEx.java +++ b/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/tabs/TabFolderToolbarHandlerEx.java @@ -24,7 +24,7 @@ * */ -package org.tizen.rt.ide.terminal; +package org.tizen.rt.ide.terminal.view.ui.tabs; import org.eclipse.core.runtime.Assert; import org.eclipse.jface.action.IMenuManager; @@ -61,6 +61,17 @@ public class TabFolderToolbarHandlerEx extends TabFolderToolbarHandler { return getActiveTerminalViewControl(); } }); + + // Create and add the new terminal view action + add (new NewTerminalViewAction(getParentView()) { + /* (non-Javadoc) + * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() + */ + @Override + protected ITerminalViewControl getTarget() { + return getActiveTerminalViewControl(); + } + }); } @Override diff --git a/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/terminal/ToggleSaveLogAction.java b/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/tabs/ToggleSaveLogAction.java similarity index 90% rename from rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/terminal/ToggleSaveLogAction.java rename to rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/tabs/ToggleSaveLogAction.java index 49fa79f..f748e40 100644 --- a/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/terminal/ToggleSaveLogAction.java +++ b/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/tabs/ToggleSaveLogAction.java @@ -22,7 +22,7 @@ * Contributors: * - S-Core Co., Ltd */ -package org.tizen.rt.ide.terminal; +package org.tizen.rt.ide.terminal.view.ui.tabs; import java.io.File; import java.io.FileNotFoundException; @@ -45,12 +45,11 @@ import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl; import org.eclipse.tm.terminal.connector.serial.connector.SerialConnector; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; -import org.eclipse.tm.terminal.view.ui.interfaces.ImageConsts; -import org.eclipse.tm.terminal.view.ui.nls.Messages; -import org.eclipse.tm.terminal.view.ui.tabs.TabCommandFieldHandler; import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; +import org.tizen.rt.ide.terminal.view.ui.activator.Activator; +import org.tizen.rt.ide.terminal.view.ui.interfaces.ImageConsts; +import org.tizen.rt.ide.terminal.view.ui.nls.Messages; import org.tizen.rt.ide.util.ResourceUtil; public class ToggleSaveLogAction extends AbstractTerminalAction { @@ -68,9 +67,9 @@ public class ToggleSaveLogAction extends AbstractTerminalAction { this.view = view; setupAction(Messages.TabSaveLogAction_text, Messages.TabSaveLogAction_tooltip, - UIPlugin.getImageDescriptor(ImageConsts.ACTION_SaveLog_Hover), - UIPlugin.getImageDescriptor(ImageConsts.ACTION_SaveLog_Enabled), - UIPlugin.getImageDescriptor(ImageConsts.ACTION_SaveLog_Disabled), true); + Activator.getImageDescriptor(ImageConsts.ACTION_SaveLog_Hover), + Activator.getImageDescriptor(ImageConsts.ACTION_SaveLog_Enabled), + Activator.getImageDescriptor(ImageConsts.ACTION_SaveLog_Disabled), true); setChecked(hasSaveLog()); } @@ -118,8 +117,8 @@ public class ToggleSaveLogAction extends AbstractTerminalAction { saveLog = null; } - TabFolderManager mangeter = (TabFolderManager) view.getAdapter(TabFolderManager.class); - CTabItem item = mangeter.getActiveTabItem(); + TabFolderManager manager = (TabFolderManager) view.getAdapter(TabFolderManager.class); + CTabItem item = manager.getActiveTabItem(); Assert.isTrue(!item.isDisposed()); if (on) { diff --git a/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/views/RtTerminalsViewEx.java b/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/view/RtTerminalsViewEx.java similarity index 91% rename from rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/views/RtTerminalsViewEx.java rename to rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/view/RtTerminalsViewEx.java index 63e6f35..d02b9ae 100644 --- a/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/views/RtTerminalsViewEx.java +++ b/rt-ide/tizen.rt.terminalex.plugin/src/org/tizen/rt/ide/terminal/view/ui/view/RtTerminalsViewEx.java @@ -23,13 +23,13 @@ * - S-Core Co., Ltd * */ -package org.tizen.rt.ide.views; +package org.tizen.rt.ide.terminal.view.ui.view; import org.eclipse.core.runtime.Assert; import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; import org.eclipse.tm.terminal.view.ui.tabs.TabFolderToolbarHandler; import org.eclipse.tm.terminal.view.ui.view.TerminalsView; -import org.tizen.rt.ide.terminal.TabFolderToolbarHandlerEx; +import org.tizen.rt.ide.terminal.view.ui.tabs.TabFolderToolbarHandlerEx; public class RtTerminalsViewEx extends TerminalsView { -- 2.7.4