Changeset 885
- Timestamp:
- 02/13/14 17:12:35 (10 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/actions/ExploratorySearchActions.java
r877 r885 5 5 import org.expeditee.gui.Frame; 6 6 import org.expeditee.gui.FrameIO; 7 import org.expeditee.gui.FrameKeyboardActions; 7 8 import org.expeditee.gui.FrameMouseActions; 8 9 import org.expeditee.gui.FreeItems; 9 10 import org.expeditee.items.Item; 11 import org.expeditee.items.Justification; 10 12 import org.expeditee.items.Text; 11 13 import org.expeditee.settings.exploratorysearch.ExploratorySearchSettings; … … 39 41 } 40 42 41 Item linkToBrowserSession = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(), "Web Browser Session", null);43 Text linkToBrowserSession = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(), " - Web Browser Session", null); 42 44 linkToBrowserSession.setParent(DisplayIO.getCurrentFrame()); 45 FrameKeyboardActions.AddDate(linkToBrowserSession); 43 46 FrameMouseActions.pickup(linkToBrowserSession); 44 47 … … 53 56 54 57 // Add web browser active overlay and @old 55 Text t = (Text) frame.addText(1100, 50, "@ao: 2", null, "overlayset2"); 56 t.setAnchorLeft(1087.0f); 57 t = (Text) frame.addText(1100, 20, "@old", null); 58 t.setAnchorLeft(1087.0f); 58 Text t = (Text) frame.addText(-150, 50, "@ao: 2", null, "overlayset2"); 59 t.setAnchorRight(-100.0f); 60 t.setAnchorTop(50.0f); 61 t = (Text) frame.addText(-150, 50, "@old", null); 62 t.setFamily("Roboto Condensed"); 63 t.setSize(15.0f); 64 t.setColor(null); 65 t.setWidth(116); 66 t.setJustification(Justification.right); 67 t.setLinkMark(false); 68 t.setAnchorLeft(9.0f); 69 t.setAnchorBottom(114.0f); 59 70 60 71 Text wt; … … 68 79 // Start Browser in fullscreen or default, depending on settings 69 80 if(ExploratorySearchSettings.BrowserFullScreen.get()) { 70 wt = frame.addText(144 + lm, 0 + tm, "@iw: org.expeditee.items.widgets.JfxBrowser " 71 + ("--anchorLeft " + lm + " --anchorRight " + rm + " --anchorTop " + (tm + ExploratorySearchSettings.BROWSER_VERT_OFFSET) + " --anchorBottom " + bm + " ") 72 + (Browser._theBrowser.getContentPane().getWidth() - lm - rm) + " " 81 wt = frame.addText(ExploratorySearchSettings.BROWSER_HORZ_OFFSET + lm, ExploratorySearchSettings.BROWSER_VERT_OFFSET + tm, 82 "@iw: org.expeditee.items.widgets.JfxBrowser " 83 + ("--anchorLeft " + (lm + ExploratorySearchSettings.BROWSER_HORZ_OFFSET) + " --anchorRight " + rm + " --anchorTop " 84 + (ExploratorySearchSettings.BROWSER_VERT_OFFSET + tm) + " --anchorBottom " + bm + " ") 85 + (Browser._theBrowser.getContentPane().getWidth() - ExploratorySearchSettings.BROWSER_HORZ_OFFSET - lm - rm) + " " 73 86 + (Browser._theBrowser.getContentPane().getHeight() - ExploratorySearchSettings.BROWSER_VERT_OFFSET - tm - bm) + " : " + url, null); 74 System.err.println(wt.getText());75 } else {76 wt = frame.addText(144 + lm, 0 + tm,"@iw: org.expeditee.items.widgets.JfxBrowser " +87 } else { 88 wt = frame.addText(ExploratorySearchSettings.BROWSER_HORZ_OFFSET + lm, ExploratorySearchSettings.BROWSER_VERT_OFFSET + tm, 89 "@iw: org.expeditee.items.widgets.JfxBrowser " + 77 90 (ExploratorySearchSettings.BrowserDefaultWidth.get() - lm - rm) + " " + 78 91 (ExploratorySearchSettings.BrowserDefaultHeight.get() - tm - bm) + " : " + url, null); … … 91 104 // Replace any text item on cursor with link to a new mindmap 92 105 FreeItems.getInstance().clear(); 93 Text text = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(), " Mindmap Session", null);106 Text text = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(), " - Mindmap Session", null); 94 107 text.setParent(DisplayIO.getCurrentFrame()); 108 FrameKeyboardActions.AddDate(text); 95 109 FrameMouseActions.pickup(text); 96 110 Frame frame = FrameIO.CreateNewFrame(text); … … 99 113 // Clear new frame and add active overlay and @old 100 114 frame.removeAllItems(frame.getItems()); 101 Text t = (Text) frame.addText(1100, 50, "@ao: 2", null, "overlayset3"); 102 t.setAnchorLeft(1087.0f); 103 t = (Text) frame.addText(1100, 20, "@old", null); 104 t.setAnchorLeft(1087.0f); 115 Text t = (Text) frame.addText(-150, 50, "@ao: 2", null, "overlayset3"); 116 t.setAnchorLeft(-150.0f); 117 t.setAnchorTop(50.0f); 118 t = (Text) frame.addText(-150, 50, "@old", null); 119 t.setFamily("Roboto Condensed"); 120 t.setSize(15.0f); 121 t.setColor(null); 122 t.setWidth(116); 123 t.setJustification(Justification.right); 124 t.setLinkMark(false); 125 t.setAnchorLeft(9.0f); 126 t.setAnchorBottom(114.0f); 105 127 106 128 FrameIO.SaveFrame(frame); 107 129 } 108 130 131 /** 132 * Adds a text item to the cursor which is linked to a new frame with the web browser active overlay and a JavaFX browser. 133 * @param caller The item that the action is called from 134 */ 135 public static void startBrowserWithOverlay(Item caller) { 136 try { 137 String url; 138 139 Text urlItem = FreeItems.getTextAttachedToCursor(); 140 141 // If there is a text item attached to the cursor, use it as the URL to load 142 if (urlItem != null) { 143 url = urlItem.getText(); 144 145 // Remove the item, since the link to the browser session will added to the cursor 146 urlItem.delete(); 147 } else { 148 // Otherwise use the home page specified in the settings 149 url = NetworkSettings.HomePage.get(); 150 } 151 152 Text linkToBrowserSession = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(), url, null); 153 linkToBrowserSession.setParent(DisplayIO.getCurrentFrame()); 154 FrameMouseActions.pickup(linkToBrowserSession); 155 156 // Create new frame 157 Frame frame = FrameIO.CreateNewFrame(linkToBrowserSession); 158 159 // link this text item to new frame 160 linkToBrowserSession.setLink("" + frame.getNumber()); 161 162 // Remove everything from new frame 163 frame.removeAllItems(frame.getItems()); 164 165 // Add web browser active overlay and @old 166 Text t = (Text) frame.addText(-150, 50, "@ao: 2", null, "overlayset2"); 167 t.setAnchorLeft(-150.0f); 168 t.setAnchorTop(50.0f); 169 t = (Text) frame.addText(-150, 50, "@old", null); 170 t.setFamily("Roboto Condensed"); 171 t.setSize(15.0f); 172 t.setColor(null); 173 t.setWidth(116); 174 t.setJustification(Justification.right); 175 t.setLinkMark(false); 176 t.setAnchorLeft(9.0f); 177 t.setAnchorBottom(114.0f); 178 179 Text wt; 180 181 // Extract marigns from settings 182 int lm = ExploratorySearchSettings.BrowserLeftMargin.get(); 183 int rm = ExploratorySearchSettings.BrowserRightMargin.get(); 184 int tm = ExploratorySearchSettings.BrowserTopMargin.get(); 185 int bm = ExploratorySearchSettings.BrowserBottomMargin.get(); 186 187 // Start Browser in fullscreen or default, depending on settings 188 if(ExploratorySearchSettings.BrowserFullScreen.get()) { 189 wt = frame.addText(ExploratorySearchSettings.BROWSER_HORZ_OFFSET + lm, ExploratorySearchSettings.BROWSER_VERT_OFFSET + tm, 190 "@iw: org.expeditee.items.widgets.JfxBrowser " 191 + ("--anchorLeft " + (lm + ExploratorySearchSettings.BROWSER_HORZ_OFFSET) + " --anchorRight " + rm + " --anchorTop " 192 + (ExploratorySearchSettings.BROWSER_VERT_OFFSET + tm) + " --anchorBottom " + bm + " ") 193 + (Browser._theBrowser.getContentPane().getWidth() - ExploratorySearchSettings.BROWSER_HORZ_OFFSET - lm - rm) + " " 194 + (Browser._theBrowser.getContentPane().getHeight() - ExploratorySearchSettings.BROWSER_VERT_OFFSET - tm - bm) + " : " + url, null); 195 } else { 196 wt = frame.addText(ExploratorySearchSettings.BROWSER_HORZ_OFFSET + lm, ExploratorySearchSettings.BROWSER_VERT_OFFSET + tm, 197 "@iw: org.expeditee.items.widgets.JfxBrowser " + 198 (ExploratorySearchSettings.BrowserDefaultWidth.get() - lm - rm) + " " + 199 (ExploratorySearchSettings.BrowserDefaultHeight.get() - tm - bm) + " : " + url, null); 200 } 201 202 FrameIO.SaveFrame(frame); // save frame to disk 203 } catch(Exception e) { 204 e.printStackTrace(); 205 } 206 } 207 109 208 } -
trunk/src/org/expeditee/actions/Navigation.java
r669 r885 43 43 public static void GotoHome() { 44 44 FrameUtils.DisplayFrame(UserSettings.HomeFrame.get()); 45 } 46 47 /** 48 * Displays the user's first settings frame - should be `username`2 49 */ 50 public static void GotoSettings() { 51 String framename = UserSettings.HomeFrame.get(); 52 framename = framename.substring(0, framename.length() - 1) + '2'; 53 FrameUtils.DisplayFrame(framename); 45 54 } 46 55 -
trunk/src/org/expeditee/assets/resources/framesets/exploratorysearch/1.exp
r810 r885 1 V 1281 V 210 2 2 U csl14A 3 3 D 12Dec2013[10:07] 4 4 M csl14A 5 d 03Feb2014[12:04]5 d 13Feb2014[17:09] 6 6 Z 7 8 S T 369 s 16Jan2014[15:52.06]10 d 50 50 50 10011 R 37.012 P 50 49013 T @old14 F exploratorysearch-old1715 Q 016 o csl14A17 v S18 f tr1819 t -1.020 b 0.021 m 0.022 w 97423 h -1.024 7 25 8 S T 24 26 9 s 12Dec2013[10:16.21] 27 10 d 50 50 50 100 28 R 37.0 29 P 50 615 30 T @ao: 2 11 P 1048 68 12 T @ao: 3 31 13 F overlayset1 32 14 Q 0 15 H -100.0 16 N 50.0 33 17 o csl14A 34 18 v S … … 39 23 h -1.0 40 24 25 S T 36 26 s 16Jan2014[15:52.06] 27 P 11 506 28 T @old 29 F exploratorysearch-old100 30 Q 0 31 R 9.0 32 I 114.0 33 o csl14A 34 n F 35 v S 36 f Roboto Condensed_r15 37 t -1.0 38 b 0.0 39 m 0.0 40 w 116 41 k R 42 h -1.0 43 41 44 Z 42 45 … … 45 48 Z 46 49 47 ActiveTime:00:40:37 48 DarkTime:00:46:25 49 04:02:324 350 64 Rd 50 04:02:387 350 64 Ru 51 04:02:675 715 385 Md 52 04:02:747 715 385 Mu 53 04:02:948 618 297 Rd 54 04:02:953 618 297 Md 55 04:05:345 524 501 kF9 56 04:05:857 524 501 kF9 57 04:08:827 78 610 Ld 58 04:08:891 78 610 Lu 50 ActiveTime:00:55:48 51 DarkTime:01:21:18 -
trunk/src/org/expeditee/assets/resources/framesets/overlayset/1.exp
r877 r885 1 V 241 V 114 2 2 U Nathaniel 3 3 D 06Feb2014[17:16] 4 M nathaniel5 d 1 1Feb2014[00:40]4 M csl14A 5 d 13Feb2014[17:08] 6 6 Z 7 7 … … 28 28 s 10Feb2014[21:29.35] 29 29 d 50 50 50 100 30 P 167 4530 P -87 58 31 31 T @ao: base 32 32 F 4 33 33 Q 0 34 R -100.0 35 N 50.0 34 36 o nathaniel 35 37 v S … … 62 64 P 11 84 63 65 T Web Browser 64 X start browsersession66 X startBrowserSession 65 67 x F 66 68 Q 0 … … 100 102 P 11 114 101 103 T MindMap 102 X start mindmapsession104 X startMindmapSession 103 105 x F 104 106 Q 0 … … 122 124 Z 123 125 124 ActiveTime:00:07:29 125 DarkTime:00:00:00 126 40:44:669 109 111 Rd 127 40:44:695 109 111 Ld 128 40:45:178 389 242 Md 129 40:45:300 389 242 Mu 130 40:46:448 618 336 Rd 131 40:49:586 122 97 Md 132 40:49:745 122 97 Mu 133 40:50:563 498 308 Rd 134 40:50:578 498 308 Md 135 40:51:656 350 317 Ld 136 40:51:721 350 317 Lu 126 ActiveTime:00:16:25 127 DarkTime:00:01:59 128 08:23:914 340 310 Ld 129 08:23:978 340 310 Lu -
trunk/src/org/expeditee/assets/resources/framesets/overlayset/2.exp
r877 r885 1 V 2121 V 304 2 2 U csl14A 3 3 D 12Dec2013[10:14] 4 M nathaniel5 d 1 1Feb2014[00:41]4 M csl14A 5 d 13Feb2014[17:02] 6 6 Z 7 7 8 S T 1478 9 s 18Dec2013[15:23.27] 10 d 50 50 50 100 11 P 1925 -3 12 T @i: rightArrow.png 32 13 X Forward 14 x F 15 Q 0 16 H -37.0 17 N -3.0 8 S P 1921 9 s 13Feb2014[11:37.51] 10 d 90 90 90 100 11 P 1007 0 12 e 95 95 95 100 13 Q 0 14 H -11.0 15 N 0.0 18 16 o csl14A 19 v S 20 f Roboto Condensed_r18 21 t -1.0 22 b 0.0 23 m 0.0 24 h -1.0 25 26 S T 1903 27 s 11Feb2014[00:05.31] 28 d 50 50 50 100 29 P 166 22 30 T @ao: base 31 F 4 32 Q 0 33 o nathaniel 34 v S 35 f DejaVu Sans Light_r9 36 t -1.0 37 b 0.0 38 m 0.0 39 h -1.0 17 j 50.0 0.3 0.75 18 v S 19 h 2.0 20 l 1927 1930 21 c 4902 4903 22 23 S P 1922 24 s 13Feb2014[11:37.51] 25 d 90 90 90 100 26 P 140 0 27 e 95 95 95 100 28 Q 0 29 R 140.0 30 N 0.0 31 o csl14A 32 v S 33 h 2.0 34 l 1927 1928 35 c 4902 4905 40 36 41 37 S T 1496 … … 56 52 k C 57 53 h -1.0 54 55 S P 1924 56 s 13Feb2014[11:37.51] 57 d 90 90 90 100 58 P 1007 50 59 e 95 95 95 100 60 Q 0 61 H -11.0 62 N 50.0 63 o csl14A 64 j 14.000001 0.3 0.75 65 v S 66 h 2.0 67 l 1930 1929 68 c 4903 4906 69 70 S P 1923 71 s 13Feb2014[11:37.51] 72 d 90 90 90 100 73 P 140 50 74 e 95 95 95 100 75 Q 0 76 R 140.0 77 N 50.0 78 o csl14A 79 j 50.0 0.3 0.75 80 v S 81 h 2.0 82 l 1928 1929 83 c 4905 4906 58 84 59 85 S T 1680 … … 78 104 s 12Dec2013[10:14.45] 79 105 P 11 59 80 T Add Browser81 X start browser106 T Browser Widget 107 X startBrowser 82 108 x F 83 109 Q 0 … … 93 119 w 116 94 120 k R 121 h -1.0 122 123 S T 1945 124 s 13Feb2014[15:14.24] 125 d 50 50 50 100 126 P 1048 68 127 T @ao: 3 128 F overlayset4 129 Q 0 130 H -100.0 131 N 50.0 132 o csl14A 133 v S 134 f tr18 135 t -1.0 136 b 0.0 137 m 0.0 95 138 h -1.0 96 139 … … 99 142 G 100 100 100 100 100 143 P 12 89 101 T Drop url here to get 102 T link to new browser 103 X startbrowsernewframe 144 T New Browser: Drop url here for link 145 X startBrowserWithOverlay 104 146 x F 105 147 Q 0 … … 284 326 s 10Feb2014[23:49.05] 285 327 d 90 90 90 100 286 P 9 889328 P 9 493 287 329 e 100 100 100 100 288 330 Q 0 289 331 R 9.0 290 I 74.0332 I 225.0 291 333 o nathaniel 292 334 v S … … 298 340 s 10Feb2014[23:49.05] 299 341 d 90 90 90 100 300 P 132 889342 P 132 493 301 343 e 100 100 100 100 302 344 Q 0 303 345 R 132.0 304 I 74.0346 I 225.0 305 347 o nathaniel 306 348 v S … … 311 353 Z 312 354 355 L 1927 1 356 s 1921 1922 357 358 L 1930 1 359 s 1924 1921 360 361 L 1928 1 362 s 1922 1923 363 364 L 1929 1 365 s 1923 1924 366 313 367 L 1899 1 314 368 s 1895 1896 … … 325 379 Z 326 380 381 C 4902 3 382 s 1921 1922 383 384 C 4903 2 385 s 1924 1921 386 387 C 4905 2 388 s 1922 1923 389 390 C 4906 3 391 s 1923 1924 392 327 393 C 1891 3 328 394 s 1895 1896 … … 339 405 Z 340 406 341 ActiveTime:01:47:59 342 DarkTime:01:16:04 343 41:33:841 100 52 Rd 344 41:33:849 100 52 Ld 345 41:34:401 423 191 Md 346 41:34:544 430 199 Mu 347 41:35:921 602 294 Rd 348 41:38:406 88 41 Md 349 41:38:601 88 41 Mu 350 41:40:957 581 308 Rd 351 41:42:752 101 42 Md 352 41:42:906 101 42 Mu 353 41:44:368 515 301 Rd 354 41:44:378 515 301 Md 355 41:46:207 107 92 Ld 356 41:46:241 107 92 Rd 357 41:47:381 349 178 Md 358 41:47:383 349 178 Rd 359 41:52:712 509 438 kRight 407 ActiveTime:02:15:52 408 DarkTime:01:31:51 409 02:24:984 224 242 kF9 410 02:50:807 55 437 Ld 411 02:50:879 55 437 Lu -
trunk/src/org/expeditee/assets/resources/framesets/overlayset/3.exp
r877 r885 1 V 1771 V 211 2 2 U csl14A 3 3 D 12Dec2013[10:15] 4 M nathaniel5 d 1 1Feb2014[00:42]4 M csl14A 5 d 13Feb2014[16:57] 6 6 Z 7 7 … … 33 33 l 674 697 34 34 c 40 41 35 36 S T 143837 s 11Feb2014[00:05.44]38 d 50 50 50 10039 P 162 2040 T @ao: base41 F 442 Q 043 o nathaniel44 v S45 f DejaVu Sans Light_r946 t -1.047 b 0.048 m 0.049 h -1.050 35 51 36 S T 676 … … 107 92 h -1.0 108 93 94 S T 1438 95 s 11Feb2014[00:05.44] 96 d 50 50 50 100 97 P -87 58 98 T @ao: base 99 F 4 100 Q 0 101 R -100.0 102 N 50.0 103 o nathaniel 104 v S 105 f DejaVu Sans Light_r9 106 t -1.0 107 b 0.0 108 m 0.0 109 h -1.0 110 111 S T 1444 112 s 13Feb2014[16:44.56] 113 d 50 50 50 100 114 P 1048 68 115 T @ao: 3 116 F overlayset4 117 Q 0 118 H -100.0 119 N 50.0 120 o csl14A 121 v S 122 f tr18 123 t -1.0 124 b 0.0 125 m 0.0 126 h -1.0 127 109 128 S T 1432 110 129 s 06Feb2014[22:09.56] … … 230 249 s 06Feb2014[22:05.01] 231 250 d 90 90 90 100 232 P -41 6 51251 P -41 643 233 252 e 95 95 95 100 234 253 Q 0 … … 244 263 s 06Feb2014[22:05.01] 245 264 d 90 90 90 100 246 P 140 6 51265 P 140 643 247 266 e 95 95 95 100 248 267 Q 0 … … 286 305 Z 287 306 288 ActiveTime:01:22:01 289 DarkTime:00:11:36 290 41:53:711 117 41 Rd 291 41:53:726 117 41 Ld 292 41:56:481 284 117 Rd 293 41:56:669 284 117 Md 294 41:58:056 124 42 Ld 295 41:58:156 124 42 Lu 296 41:59:069 637 190 Rd 297 41:59:070 637 190 Md 298 42:00:592 117 53 Ld 299 42:00:595 117 53 Rd 300 42:00:987 458 249 Md 301 42:01:117 458 249 Mu 302 42:02:987 628 345 Rd 303 42:05:055 114 41 Md 304 42:05:208 114 41 Mu 305 42:06:481 119 41 Rd 306 42:06:488 119 41 Ld 307 42:07:387 222 100 Rd 308 42:07:410 222 100 Md 309 42:07:957 511 313 Md 310 42:07:963 511 313 Rd 311 42:09:581 126 71 Rd 312 42:09:585 126 71 Ld 313 42:11:193 299 141 Md 314 42:11:307 299 141 Mu 315 42:12:136 474 234 kBackspace 316 42:12:792 459 239 k2 317 42:13:184 468 239 Rd 318 42:15:681 125 72 Md 319 42:15:824 125 72 Mu 320 42:16:382 366 183 Rd 321 42:16:391 366 183 Md 322 42:17:777 126 72 Rd 323 42:17:794 126 72 Ld 324 42:18:598 295 115 Rd 325 42:18:616 295 115 Md 326 42:19:839 126 102 Rd 327 42:19:868 126 102 Ld 328 42:20:630 301 135 Rd 329 42:20:658 301 135 Md 330 42:21:928 114 130 Ld 331 42:21:965 114 130 Rd 332 42:22:803 305 146 Rd 333 42:22:827 305 146 Md 334 42:24:060 114 148 Ld 335 42:24:064 114 148 Rd 336 42:24:711 283 167 Rd 337 42:24:720 283 167 Md 338 42:25:394 114 116 Ld 339 42:25:406 114 116 Rd 340 42:26:113 260 126 Rd 341 42:26:116 260 126 Md 342 42:27:832 112 92 Ld 343 42:27:837 112 92 Rd 344 42:28:638 298 124 Rd 345 42:28:680 298 124 Md 346 42:30:008 444 253 kWindows 347 42:31:615 305 312 kWindows 348 42:31:663 305 312 kShift 307 ActiveTime:01:25:21 308 DarkTime:00:13:54 309 57:03:046 287 245 Ld 310 57:03:109 287 245 Lu -
trunk/src/org/expeditee/assets/resources/framesets/overlayset/4.exp
r877 r885 1 V 3531 V 455 2 2 U csl14A 3 3 D 12Dec2013[10:13] 4 M nathaniel5 d 1 1Feb2014[00:40]4 M csl14A 5 d 13Feb2014[17:08] 6 6 Z 7 7 … … 35 35 c 36 37 36 36 37 S T 460 38 s 06Feb2014[21:22.21] 39 P 11 574 37 S T 4853 38 s 12Feb2014[14:09.29] 39 P 11 416 40 T print 41 X writeFrame pdf2 42 x F 43 Q 0 44 R 9.0 45 I 204.0 46 o csl14A 47 v S 48 f Roboto Condensed_r15 49 t -1.0 50 b 0.0 51 m 0.0 52 w 116 53 k R 54 h -1.0 55 56 S T 4859 57 s 12Feb2014[14:09.29] 58 P 7 397 59 T @i: iconbutton_print.png 127 60 F Documentation1 61 x F 62 Q 0 63 R 5.0 64 I 202.0 65 o csl14A 66 n F 67 v S 68 f tr18 69 t -1.0 70 b 0.0 71 m 0.0 72 h 0.0 73 74 S T 4854 75 s 12Feb2014[14:09.29] 76 P 11 446 77 T Audience 78 X toggleAudienceMode 79 x F 80 Q 0 81 R 9.0 82 I 174.0 83 o csl14A 84 v S 85 f Roboto Condensed_r15 86 t -1.0 87 b 0.0 88 m 0.0 89 w 116 90 k R 91 h -1.0 92 93 S T 4861 94 s 12Feb2014[14:09.29] 95 P 7 427 96 T @i: iconbutton_presentation_mode.png 127 97 F Documentation1 98 x F 99 Q 0 100 R 5.0 101 I 172.0 102 o csl14A 103 n F 104 v S 105 f tr18 106 t -1.0 107 b 0.0 108 m 0.0 109 h 0.0 110 111 S T 4855 112 s 12Feb2014[14:09.29] 113 P 11 476 114 T Twinframe 115 X toggleTwinFramesMode 116 x F 117 Q 0 118 R 9.0 119 I 144.0 120 o csl14A 121 v S 122 f Roboto Condensed_r15 123 t -1.0 124 b 0.0 125 m 0.0 126 w 116 127 k R 128 h -1.0 129 130 S T 4863 131 s 12Feb2014[14:09.29] 132 P 7 457 133 T @i: iconbutton_twin_frame_mode.png 127 134 F Documentation1 135 x F 136 Q 0 137 R 5.0 138 I 142.0 139 o csl14A 140 n F 141 v S 142 f tr18 143 t -1.0 144 b 0.0 145 m 0.0 146 h 0.0 147 148 S T 4865 149 s 12Feb2014[14:09.29] 150 P 7 487 151 T @i: iconbutton_history.png 127 152 F Documentation1 153 x F 154 Q 0 155 R 5.0 156 I 112.0 157 o csl14A 158 n F 159 v S 160 f tr18 161 t -1.0 162 b 0.0 163 m 0.0 164 h 0.0 165 166 S T 4857 167 s 12Feb2014[14:09.29] 168 P 11 536 169 T Settings 170 X goToSettings 171 x F 172 Q 0 173 R 9.0 174 I 84.0 175 o csl14A 176 n F 177 v S 178 f Roboto Condensed_r15 179 t -1.0 180 b 0.0 181 m 0.0 182 w 116 183 k R 184 h -1.0 185 186 S T 4867 187 s 12Feb2014[14:09.29] 188 P 7 517 189 T @i: iconbutton_settings.png 127 190 F Documentation1 191 x F 192 Q 0 193 R 5.0 194 I 82.0 195 o csl14A 196 n F 197 v S 198 f tr18 199 t -1.0 200 b 0.0 201 m 0.0 202 h 0.0 203 204 S T 4858 205 s 12Feb2014[14:09.29] 206 P 11 566 40 207 T Expeditee Help 41 208 F Documentation1 … … 44 211 R 9.0 45 212 I 54.0 46 o nathaniel213 o csl14A 47 214 n F 48 215 v S … … 55 222 h -1.0 56 223 57 S T 294058 s 06Feb2014[21:16.23]59 P 7 5 55224 S T 4869 225 s 12Feb2014[14:09.29] 226 P 7 547 60 227 T @i: iconbutton_question.png 127 61 228 F Documentation1 … … 64 231 R 5.0 65 232 I 52.0 66 o Nathaniel233 o csl14A 67 234 n F 68 235 v S … … 76 243 s 18Dec2013[15:26.35] 77 244 d 100 0 0 100 78 P 140 5 87245 P 140 579 79 246 e 75 2 1 100 80 247 Q 0 … … 90 257 s 06Feb2014[17:39.26] 91 258 d 100 0 0 100 92 P 0 5 87259 P 0 579 93 260 e 75 2 1 100 94 261 Q 0 … … 104 271 s 10Feb2014[15:50.02] 105 272 d 60 2 1 100 106 P 140 58 8273 P 140 580 107 274 e 100 59 59 100 108 275 Q 0 … … 118 285 s 10Feb2014[15:50.02] 119 286 d 60 2 1 100 120 P 0 58 8287 P 0 580 121 288 e 100 59 59 100 122 289 Q 0 … … 132 299 s 12Dec2013[10:14.00] 133 300 d 90 90 90 100 134 P 0 58 8301 P 0 580 135 302 e 95 95 95 100 136 303 Q 0 … … 147 314 s 12Dec2013[10:14.00] 148 315 d 90 90 90 100 149 P 140 58 8316 P 140 580 150 317 e 95 95 95 100 151 318 Q 0 … … 162 329 s 06Feb2014[16:23.42] 163 330 d 0 0 0 50 164 P 107 6 24331 P 107 616 165 332 T 166 333 X forward … … 181 348 s 06Feb2014[16:21.07] 182 349 d 0 0 0 50 183 P 12 6 24350 P 12 616 184 351 T 185 352 X back … … 200 367 s 06Feb2014[16:21.38] 201 368 d 0 0 0 50 202 P 52 6 26369 P 52 618 203 370 T 204 371 X gotohome … … 219 386 s 06Feb2014[17:39.26] 220 387 d 100 0 0 100 221 P 0 6 41388 P 0 633 222 389 e 75 2 1 100 223 390 Q 0 … … 233 400 s 06Feb2014[17:39.26] 234 401 d 100 0 0 100 235 P 140 6 41402 P 140 633 236 403 e 75 2 1 100 237 404 Q 0 … … 359 526 Z 360 527 361 ActiveTime:02:38:42 362 DarkTime:01:25:28 363 40:28:423 76 67 Ld 364 40:28:425 76 67 Rd 365 40:29:778 182 77 Rd 366 40:29:825 182 77 Md 367 40:30:453 112 78 Rd 368 40:30:470 112 78 Ld 369 40:31:293 221 119 Rd 370 40:31:334 221 119 Md 371 40:32:351 104 97 Rd 372 40:32:364 104 97 Ld 373 40:33:497 201 113 Rd 374 40:33:554 201 113 Md 375 40:34:253 106 111 Rd 376 40:34:255 106 111 Ld 377 40:35:279 174 130 Rd 378 40:35:332 174 130 Md 379 40:36:186 119 97 Rd 380 40:36:194 119 97 Ld 381 40:36:872 188 113 Rd 382 40:36:908 188 113 Md 383 40:41:803 88 610 Ld 384 40:41:904 88 610 Lu 528 ActiveTime:03:41:26 529 DarkTime:03:05:38 530 08:23:914 340 310 Ld 531 08:23:978 340 310 Lu -
trunk/src/org/expeditee/gui/FrameKeyboardActions.java
r851 r885 2132 2132 * The Item to prepend the date to, or null 2133 2133 */ 2134 p rivatestatic void AddDate(Item toAdd) {2134 public static void AddDate(Item toAdd) { 2135 2135 String date1 = Formatter.getDateTime(); 2136 2136 String date2 = Formatter.getDate(); -
trunk/src/org/expeditee/items/widgets/InteractiveWidget.java
r876 r885 269 269 270 270 formatter.printHelp(printWriter, 80, TAG + ":" + widget_name + " [options] width height", null, options, 4, 0, null); 271 System.out.println(usage_str_writer.toString());271 //System.out.println(usage_str_writer.toString()); 272 272 273 273 float width = -1, height = -1; -
trunk/src/org/expeditee/settings/exploratorysearch/ExploratorySearchSettings.java
r876 r885 12 12 public abstract class ExploratorySearchSettings { 13 13 14 // Vert offset for the JfxBrowser's position to work with the Exploratory Search web browser overlay 15 public static final int BROWSER_VERT_OFFSET = 70; 14 // Horz and Vert offset for the JfxBrowser's position to work with the Exploratory Search web browser overlay 15 public static final int BROWSER_HORZ_OFFSET = 140; 16 public static final int BROWSER_VERT_OFFSET = 50; 16 17 17 18 public static final BooleanSetting BrowserFullScreen = new BooleanSetting("Start Exploratory Search browser in fullscreen", true);
Note:
See TracChangeset
for help on using the changeset viewer.