Changeset 292 for trunk

Timestamp:

07/24/11 11:52:23 (10 months ago)

Author:

Kuan Hsu

Message:

(1)Change bookmark and debug marks
(2)DDoc and debug little fix

Files:

• trunk/current/poseidon/images/bookmark_obj.gif (added)
• trunk/current/poseidon/images/debug/Thumbs.db (modified) (previous)
• trunk/current/poseidon/images/obj16/xpm/arrow.xpm (added)
• trunk/current/poseidon/images/obj16/xpm/bookmark_obj.xpm (added)
• trunk/current/poseidon/images/obj16/xpm/breakpoint.xpm (added)
• trunk/current/poseidon/images/obj16/xpm/breakpoint_unchecked.xpm (added)
• trunk/current/poseidon/images/target.gif (modified) (previous)
• trunk/current/poseidon/poseidon.exe (modified) (previous)
• trunk/current/poseidon/poseidon/controller/ddoc/ddocparser.d (modified) (1 diff)
• trunk/current/poseidon/poseidon/controller/debugcontrol/watch.d (modified) (3 diffs)
• trunk/current/poseidon/poseidon/controller/edititem.d (modified) (7 diffs)
• trunk/current/poseidon/poseidon/controller/editor.d (modified) (2 diffs)
• trunk/current/poseidon/poseidon/globals.d (modified) (2 diffs)
• trunk/current/poseidon/poseidon/model/editorsettings.d (modified) (1 diff)
• trunk/current/poseidon/poseidon/style/dstyle.d (modified) (7 diffs)
• trunk/current/poseidon/poseidon/style/xpm.d (modified) (1 diff)

trunk/current/poseidon/poseidon/controller/ddoc/ddocparser.d

@@ -303 +303 @@
-                            }
-                        }
+                        else if( lineText[0..3] == "///" )
+                        {
+                            result = std.string.strip( lineText[3..length] );
+                            if( result == "ditto" ) result = getDDOCComment( node.prev, scx );
+
+                            return result;
+                        }
+                        
-                    }
-                }

trunk/current/poseidon/poseidon/controller/debugcontrol/watch.d

@@ -943 +943 @@
-        this.setControl( table );
-
+        table.handleEvent( null, DWT.Selection, &onSelection );
-        table.handleEvent( null, DWT.DefaultSelection, &onDefaultSelection );
-    }
@@ -965 +966 @@
-    }
-
+    void onSelection( Event e )
+    {
+        TableItem ti = cast(TableItem) e.item;
+
+        if( e.detail == DWT.CHECK )
+        {
+            if( ti.getChecked )
+            {
+                if( sGUI.debuggerDMD.isPipeCreate() ) sGUI.debuggerDMD.write( "bp " ~ std.string.strip( ti.getText( 1 ) ) ~ ":" ~ std.string.strip( ti.getText( 2 ) ) ~ "\n" );
+            }
+            else
+            {
+                if( sGUI.debuggerDMD.isPipeCreate() ) sGUI.debuggerDMD.write( "dbp " ~ std.string.strip( ti.getText( 1 ) ) ~ ":" ~ std.string.strip( ti.getText( 2 ) ) ~ "\n" );
+            }
+
+            EditItem eti = sGUI.editor.findEditItem( std.string.strip( ti.getText( 3 ) ) );
+            if( eti !is null ) 
+            {
+                if( eti.scintilla !is null )
+                {
+                    int lineNumber = std.string.atoi( ti.getText( 2 ) ) - 1;
+                    uint state = eti.scintilla.markerGet( lineNumber );
+                    if( state & ( 1 << Editor.MARK_DEBUGSYMBOLE  ) )
+                    {
+                        eti.scintilla.markerDelete( lineNumber, Editor.MARK_DEBUGSYMBOLE );
+                    }
+                    else
+                    {
+                        eti.scintilla.markerAdd( lineNumber, Editor.MARK_DEBUGSYMBOLE );
+                    }
+                }
+                
+            }
+        }
+    }   
+
-public:
-    this( CTabFolder parent )
@@ -1000 +1037 @@
-                {
-                    if( sGUI.debuggerDMD.isPipeCreate() )
-3
-
+1
+
-                    EditItem ei = sGUI.editor.findEditItem( std.string.strip( ti.getText( 3 ) ) );
-                    if( ei !is null ) ei.deleteAllDebugMarker();

trunk/current/poseidon/poseidon/controller/edititem.d

@@ -41 +41 @@
-    private import poseidon.controller.debugcontrol.debugparser;
-    private import poseidon.controller.ddoc.ddocparser;
+    private import poseidon.style.xpm;
-    private import std.stream, std.string, std.path;
-    
@@ -95 +96 @@
-        
-        this.handleEvent(null, DWT.Dispose, &onDispose);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        scintilla.defineMarker( Editor.MARK_DEBUGRUNLINE, Scintilla.SC_MARK_ARROW, 0x00FFFF00, 0x000000FF );
-
@@ -394 +404 @@
-            setText( Globals.getTranslation( "edit.undo" ) );
-            handleEvent( this, DWT.Selection, delegate(Event e){
-
+
+
-            });
-        }
@@ -403 +414 @@
-            setText( Globals.getTranslation( "edit.redo" ) );
-            handleEvent( this, DWT.Selection, delegate(Event e){
-
+
+
-            });
-        }
@@ -415 +427 @@
-            setText( Globals.getTranslation( "edit.cut" ) );
-            handleEvent( this, DWT.Selection, delegate(Event e){
-
+
+
-            });
-        }
@@ -435 +448 @@
-            setText( Globals.getTranslation( "edit.paste" ) );
-            handleEvent( this, DWT.Selection, delegate(Event e){
-
+
+
-            });
-        }
@@ -446 +460 @@
-            setText( Globals.getTranslation( "debug.tooltip_run" ) );
-            handleEvent( this, DWT.Selection, delegate(Event e){
-
+
+
-            });
-        }
-
+        with( new MenuItem( popupMenu, DWT.PUSH ) )
+        {
+            setImage( Globals.getImage( "debug_runtocursor" ) );
+            setText( Globals.getTranslation( "debug.runtocursor" ) );
+            handleEvent( this, DWT.Selection, delegate(Event e){
+                EditItem pthis = cast(EditItem) e.cData;
+                if( pthis.scintilla !is null )              
+                    sGUI.debuggerDMD.runToCursor( pthis.getFileName(), pthis.scintilla.getCurrentLineNumber + 1, sGUI.packageExp.getActiveProjectDir );
+            });
+        }
+        
-        with( inMenuItem = new MenuItem( popupMenu, DWT.PUSH ) )
-        {

trunk/current/poseidon/poseidon/controller/editor.d

@@ -78 +78 @@
-    }
-    
-2
-1
+1
+2
-    const int MARK_DEBUGRUNSYMBOLE  = 3;
-    const int MARK_DEBUGRUNLINE     = 4;
@@ -160 +160 @@
-            pthis.checkExternModify();
-        });
-
-
-        private_method_xpm          = getXpm( "images\\obj16\\xpm\\function_private_obj.xpm");
-        protected_method_xpm        = getXpm( "images\\obj16\\xpm\\function_protected_obj.xpm" );
-        public_method_xpm           = getXpm( "images\\obj16\\xpm\\function_obj.xpm" );
-        private_variable_xpm        = getXpm( "images\\obj16\\xpm\\variable_private_obj.xpm" );
-        protected_variable_xpm      = getXpm( "images\\obj16\\xpm\\variable_protected_obj.xpm" );
-        public_variable_xpm         = getXpm( "images\\obj16\\xpm\\variable_obj.xpm" );
-        class_private_obj_xpm       = getXpm( "images\\obj16\\xpm\\class_private_obj.xpm" );
-        class_protected_obj_xpm     = getXpm( "images\\obj16\\xpm\\class_protected_obj.xpm" );
-        class_obj_xpm               = getXpm( "images\\obj16\\xpm\\class_obj.xpm" );
-        struct_private_obj_xpm      = getXpm( "images\\obj16\\xpm\\struct_private_obj.xpm" );
-        struct_protected_obj_xpm    = getXpm( "images\\obj16\\xpm\\struct_protected_obj.xpm" );
-        struct_obj_xpm              = getXpm( "images\\obj16\\xpm\\struct_obj.xpm" );
-        interface_private_obj_xpm   = getXpm( "images\\obj16\\xpm\\interface_private_obj.xpm" );
-        interface_protected_obj_xpm = getXpm( "images\\obj16\\xpm\\interface_protected_obj.xpm" );
-        interface_obj_xpm           = getXpm( "images\\obj16\\xpm\\interface_obj.xpm" );
-        union_private_obj_xpm       = getXpm( "images\\obj16\\xpm\\union_private_obj.xpm" );
-        union_protected_obj_xpm     = getXpm( "images\\obj16\\xpm\\union_protected_obj.xpm" );
-        union_obj_xpm               = getXpm( "images\\obj16\\xpm\\union_obj.xpm" );
-        enum_private_obj_xpm        = getXpm( "images\\obj16\\xpm\\enum_private_obj.xpm" );
-        enum_protected_obj_xpm      = getXpm( "images\\obj16\\xpm\\enum_protected_obj.xpm" );
-        enum_obj_xpm                = getXpm( "images\\obj16\\xpm\\enum_obj.xpm" );
-        
-        normal_xpm                  = getXpm( "images\\obj16\\xpm\\normal.xpm" );
-        import_xpm                  = getXpm( "images\\obj16\\xpm\\import.xpm" );
-        autoWord_xpm                = getXpm( "images\\obj16\\xpm\\autoword.xpm" );
-
-        parameter_xpm               = getXpm( "images\\obj16\\xpm\\parameter_obj.xpm" );
-        enum_member_obj_xpm         = getXpm( "images\\obj16\\xpm\\enum_member_obj.xpm" );
-        template_obj_xpm            = getXpm( "images\\obj16\\xpm\\template_obj.xpm" );
-
-        alias_obj_xpm               = getXpm( "images\\obj16\\xpm\\alias_obj.xpm" );
-        mixin_template_obj_xpm      = getXpm( "images\\obj16\\xpm\\mixin_template_obj.xpm" );
-        functionpointer_obj_xpm     = getXpm( "images\\obj16\\xpm\\functionpointer_obj.xpm" );
-        
-        template_function_obj_xpm   = getXpm( "images\\obj16\\xpm\\template_function_obj.xpm" );
-        template_class_obj_xpm      = getXpm( "images\\obj16\\xpm\\template_class_obj.xpm" );
-        template_struct_obj_xpm     = getXpm( "images\\obj16\\xpm\\template_struct_obj.xpm" );
-        template_union_obj_xpm      = getXpm( "images\\obj16\\xpm\\template_union_obj.xpm" );
-        template_interface_obj_xpm  = getXpm( "images\\obj16\\xpm\\template_interface_obj.xpm" );
-    }
-

trunk/current/poseidon/poseidon/globals.d

@@ -21 +21 @@
-    private import CodeAnalyzer.syntax.nodeHsu;
-
-1
+2
-    
-    static public boolean showSplash = true;
@@ -282 +282 @@
-        images["annotation_remove"] = DWTResourceManager.getImage("debug/annotate_remove.gif");
-        images["annotation_removedoc"]  = DWTResourceManager.getImage("debug/annotate_removedoc.gif");
-
+
+
-
-        images["debug_exc_dis"]     = DWTResourceManager.getImage("debug//debug_exc_dis.gif");

trunk/current/poseidon/poseidon/model/editorsettings.d

@@ -438 +438 @@
-        
-        //setup xpm image
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
+
+XPM.
+XPM.
+XPM.
+
+XPM.
+XPM.
+XPM.
+
+XPM.
+XPM.
+XPM.
+
+XPM.
+XPM.
+XPM.
+XPM.
+XPM.
-
-        //sc.call( sc.SCI_MARKERDEFINEPIXMAP, sc.SC_MARK_PIXMAP, cast(int) debug_obj_xpm, true );

trunk/current/poseidon/poseidon/style/dstyle.d

@@ -18 +18 @@
-    private import poseidon.controller.edititem;
-
-/+
+
-    class Timer : Runnable
-    {
@@ -33 +33 @@
-        void run() 
-        {
+            MessageBox.showMessage("Live");
-            if( scx !is null ) addAnalyzerNodeLive( scx );
-        }
@@ -46 +47 @@
-        }
-    }
-+/
+
-
-    /+
@@ -190 +191 @@
-    }
-
-    /+
-    private Timer liveTimer;
-
@@ -202 +202 @@
-        if( liveTimer !is null ) delete liveTimer;
-    }   
-    +/
-    
-    char[][] getKeyWords()
@@ -246 +245 @@
-        if( Globals.updateParseLiveFull || Globals.updateParseLive )
-        {
-
+//
-
-            if( e.keyCode == DWT.INSERT && e.stateMask & DWT.SHIFT )
-            {
-                ScintillaEx scx = cast(ScintillaEx) e.widget;
-
+
+
+
+
+
+
+
+
+
+
-            }
-            else if( ( e.keyCode > 31 && e.keyCode < 128 ) || e.keyCode == 8 || e.keyCode == 9 )
@@ -257 +265 @@
-                //MessageBox.showMessage( "onKeyUp_SURE" );
-                ScintillaEx scx = cast(ScintillaEx) e.widget;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }

trunk/current/poseidon/poseidon/style/xpm.d

@@ -1 +1 @@
-module poseidon.style.xpm;
-
-
-private import std.stream;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-try
+
+
+static this()
-    {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-
-
+
+
+
+
+
+
+
+
-            {
-
+
+
-                {
-
+
+
+
-
-
-
+
+
+
-                }
-            }
+
+            file.close;
+
+            char** result = (new char*[countActiveLine]).ptr;
+            for( int i; i < data.length; ++ i )
+            {
+                char[] charData = data[i];
+                *( result + i ) = charData.ptr;
+            }
+
+            return result;
-        }
-
-
-
-
-
+
-        {
-
-
+
-        }
-
-        return result;
-    }
-    catch
-    {
-        return null;
-    }
-}