チェンジセット 2652
- コミット日時:
- 2009/05/16 20:49:15 (3 年前)
- ファイル:
-
- air/TLife/trunk/air/TLife.air (更新) (変更前)
- air/TLife/trunk/application.xml (更新) (1 diff)
- air/TLife/trunk/bin/TLife.swf (更新) (変更前)
- air/TLife/trunk/src/Main.mxml (更新) (2 diffs)
- air/TLife/trunk/src/uwi/search/Searcher.as (更新) (7 diffs)
- air/TLife/trunk/src/uwi/thread/event/ContextMenuItemEventThread.as (更新) (2 diffs)
- air/TLife/trunk/src/uwi/thread/event/PostEventThread.as (更新) (4 diffs)
- air/TLife/trunk/src/uwi/ui/dbsearch/DBSearchWindow.mxml (更新) (2 diffs)
- air/TLife/trunk/src/uwi/ui/dbsearch/DBSearchWindowEventThread.as (更新) (4 diffs)
- air/TLife/trunk/src/uwi/ui/multipletabbar/MultipleTabBar.as (更新) (2 diffs)
- air/TLife/trunk/src/uwi/ui/search/SearchWindow.mxml (更新) (1 diff)
- air/TLife/trunk/src/uwi/ui/search/SearchWindowEventThread.as (更新) (6 diffs)
凡例:
- 変更無し
- 追加
- 削除
- 更新
- コピー
- 移動
air/TLife/trunk/application.xml
r2651 r2652 3 3 4 4 <id>uwi.TLife</id> 5 <version>alpha 19</version>5 <version>alpha20</version> 6 6 <filename>TLife</filename> 7 7 <name>TLife</name> air/TLife/trunk/src/Main.mxml
r2651 r2652 115 115 Logger.errorLevel = Logger.INFO; 116 116 Logger.dumpLimDepth = 999; 117 //Logger.logging = new FilePutLogging(CommonData.FILE_LOG);118 Logger.logging = new TraceLogging();117 Logger.logging = new FilePutLogging(CommonData.FILE_LOG); 118 // Logger.logging = new TraceLogging(); 119 119 120 120 postarea.text = ""; … … 221 221 } 222 222 tabbar.titles = new ArrayCollection(ar); 223 tabbar.changeLayout(); 224 tabbar.SelectedIndex = 0; 223 tabbar.changeLayout(0); 225 224 226 225 reflectConfig(); air/TLife/trunk/src/uwi/search/Searcher.as
r2650 r2652 5 5 import mx.controls.DataGrid; 6 6 import mx.core.Application; 7 import mx.utils.StringUtil; 7 8 import uwi.migemo.AIRMigemo; 8 9 import uwi.regexp.RegExpParser; … … 154 155 if (query.posterid) { 155 156 var escaped : Array = []; 156 for (var q : String in query.posterid) {157 for each(var q : String in query.posterid) { 157 158 escaped.push(StringUtility.escapeSQL(q)); 158 159 } … … 162 163 if (query.content is RegExp) query.content = query.content.source; 163 164 164 for (var frag : String in query.content) {165 for each(var frag : String in query.content) { 165 166 var prefix : String = frag.charAt(0); 166 167 if (prefix == "-") { … … 169 170 frag = StringUtility.escapeSQLForLike(frag); 170 171 if(!option.capital){ 171 conds.push("content " + prefix == "-" ? "not " : ""+ "glob '" + frag + "'");172 conds.push("content " + (prefix == "-" ? "not " : "") + "glob '" + frag + "'"); 172 173 }else { 173 conds.push("content " + prefix == "-" ? "not " : ""+ "like '" + frag + "'");174 conds.push("content " + (prefix == "-" ? "not " : "") + "like '" + frag + "'"); 174 175 } 175 176 } … … 190 191 rule : conds.join(" and "), 191 192 type : 1, 192 numdisplay : 0,193 numdisplay : 20, 193 194 numnotify : 0, 194 195 manageunread : -1, … … 196 197 hammer : -1 197 198 } 198 Application.application.tabbar.selectTabName(title); 199 Application.application.tabbar.callLater(function() : void { 200 Application.application.tabbar.selectTabName(title); 201 }); 199 202 } 200 203 } … … 217 220 if (query.posterid) { 218 221 // queryを空白文字で分解 219 query.posterid = query.posterid.split(" ");222 query.posterid = StringUtil.trim(query.posterid).split(" "); 220 223 } 221 224 air/TLife/trunk/src/uwi/thread/event/ContextMenuItemEventThread.as
r2650 r2652 415 415 { 416 416 var tb : TabBar = e.mouseTarget.parent as TabBar; 417 var oldtabname : String = tb.itemToLabel(e.mouseTarget) 417 var oldtabname : String = tb.itemToLabel(e.mouseTarget); 418 418 var ans : Answer = new Answer(); 419 419 ans.title = "リネーム(from " + oldtabname + ")"; … … 421 421 if (newtabname == "") return; 422 422 if (tabbar.titles.contains(newtabname)) return; 423 424 var ind : int = tabbar.titles.source.indexOf(oldtabname); 425 tabbar.titles.setItemAt(newtabname, ind); 423 426 424 427 for each(var rule : TabRule in CommonData.tabrules){ air/TLife/trunk/src/uwi/thread/event/PostEventThread.as
r2651 r2652 48 48 public function PostEventThread() 49 49 { 50 sub = new EventThread(postarea, Event.CHANGE, onChange);51 50 uict = new UserIDCompleteThread(postarea, Application.application as Container); 52 51 downatpostarea = false; … … 56 55 protected override function run() : void 57 56 { 57 sub = new EventThread(postarea, Event.CHANGE, onChange); 58 58 sub.start(); 59 59 uict.start(); … … 132 132 133 133 CommonData.datagridsuspend = true; 134 //next(waitEvents);134 next(waitEvents); 135 135 } 136 136 137 137 private function onKeyUp(e : KeyboardEvent) : void 138 138 { 139 trace("up"); 139 140 CommonData.datagridsuspend = false; 140 141 … … 182 183 } 183 184 184 post();185 /*185 // post(); 186 /* 186 187 // ポスト直前に短縮する 187 188 switch(CommonData.configxml.urlshotening.policy) { air/TLife/trunk/src/uwi/ui/dbsearch/DBSearchWindow.mxml
r2634 r2652 9 9 systemChrome="standard" 10 10 transparent="false" 11 type=" utility"11 type="normal" 12 12 paddingLeft="1" 13 13 paddingRight="1" … … 18 18 resizable="false" 19 19 showStatusBar="false" 20 alwaysInFront="false" 20 21 creationComplete="onLoad()" 21 22 closing="onClosing()" air/TLife/trunk/src/uwi/ui/dbsearch/DBSearchWindowEventThread.as
r2634 r2652 16 16 { 17 17 private var sw : DBSearchWindow; 18 private var code_down : uint; 18 19 19 20 public function DBSearchWindowEventThread(sw : DBSearchWindow) … … 24 25 protected override function run() : void 25 26 { 27 event(sw.queryuserid, KeyboardEvent.KEY_DOWN, onKeyDown); 28 event(sw.querycontent, KeyboardEvent.KEY_DOWN, onKeyDown); 26 29 event(sw.queryuserid, KeyboardEvent.KEY_UP, onKeyUp); 27 30 event(sw.querycontent, KeyboardEvent.KEY_UP, onKeyUp); … … 29 32 } 30 33 34 private function onKeyDown(e : KeyboardEvent) : void 35 { 36 code_down = e.keyCode; 37 next(run); 38 } 39 31 40 private function onKeyUp(e : KeyboardEvent) : void 32 41 { 33 if (e.keyCode == Keyboard.ENTER) { 34 onSearchClick(null); 35 }else { 36 next(run); 42 if (e.keyCode == Keyboard.ENTER && e.keyCode == code_down) { 43 doSearch(); 37 44 } 45 next(run); 38 46 } 39 47 40 48 private function onSearchClick(e : MouseEvent) : void 49 { 50 doSearch(); 51 next(run); 52 } 53 54 private function doSearch() : void 41 55 { 42 56 var src : Array; … … 84 98 sw.close(); 85 99 } 86 next(run);87 100 } 88 101 } air/TLife/trunk/src/uwi/ui/multipletabbar/MultipleTabBar.as
r2651 r2652 65 65 tab.dataProvider = tabdp; 66 66 tab.selectedIndex = -1; 67 // tab.styleName = ".tabbarstyle";68 67 this.tablist.push(tab); 69 68 } … … 73 72 this.height = tabheight * tablist.length; 74 73 74 // タブは初期化されているので選び直す 75 var ind : int = index != -1 ? index : selectedIndex; 75 76 this.callLater(function() : void { 76 var ind : int = index != -1 ? index : selectedIndex; 77 if (ind != selectedIndex) { 78 dispatchEvent(EVENT_CHANGE); 79 } 77 80 setSelectedIndexCore(ind); 78 81 }); air/TLife/trunk/src/uwi/ui/search/SearchWindow.mxml
r2634 r2652 17 17 maximizable="false" 18 18 resizable="false" 19 alwaysInFront="false" 19 20 showStatusBar="true" 20 21 creationComplete="onLoad()" air/TLife/trunk/src/uwi/ui/search/SearchWindowEventThread.as
r2634 r2652 15 15 { 16 16 private var sw : SearchWindow; 17 private var code_down : uint; 17 18 18 19 public function SearchWindowEventThread(sw : SearchWindow) … … 33 34 } 34 35 35 private var prevcode : int = -1;36 37 36 private function onKeyDown(e : KeyboardEvent) : void 38 37 { 39 prevcode= e.keyCode;38 code_down = e.keyCode; 40 39 sw.status = ""; 41 40 next(run); … … 44 43 private function onKeyUp(e : KeyboardEvent) : void 45 44 { 46 if (e.keyCode == Keyboard.ENTER && prevcode == e.keyCode){ 47 onSearchClick(null); 48 }else { 49 next(run); 45 if (e.keyCode == Keyboard.ENTER && code_down == e.keyCode) { 46 doSearch(true); 50 47 } 48 next(run); 51 49 } 52 50 … … 58 56 59 57 private function onSearchClick(e : MouseEvent) : void 58 { 59 doSearch(e.target == sw.searchForward); 60 next(run); 61 } 62 63 private function doSearch(forward : Boolean) : void 60 64 { 61 65 if (sw.queryuserid.text == "" && sw.querycontent.text == "") { … … 88 92 89 93 if(CommonData.searcher.searchTimeline(query, { 90 forward : e == null || e.target == sw.searchForward,94 forward : forward, 91 95 fromnext : true, 92 96 cosuffix : sw.condCoSuffix.selected, // yet … … 108 112 } 109 113 if (sw.closeDialog.selected) sw.close(); 110 next(run);111 114 } 112 115 }

