Changeset 274

Timestamp:

06/04/09 08:21:28 (3 years ago)

Author:

Alan Knowles

Message:

fixed to work with gtkd

Files:

• trunk/src/leds/BrowserView.d (modified) (8 diffs)
• trunk/src/leds/CodeView.d (modified) (3 diffs)
• trunk/src/leds/CompilerBox.d (modified) (8 diffs)
• trunk/src/leds/CompilerWindow.d (modified) (1 diff)
• trunk/src/leds/DSpell.d (modified) (2 diffs)
• trunk/src/leds/Docker.d (modified) (3 diffs)
• trunk/src/leds/DockerTools.d (modified) (2 diffs)
• trunk/src/leds/ErrorPane.d (modified) (4 diffs)
• trunk/src/leds/EventImage.d (modified) (5 diffs)
• trunk/src/leds/FSTree.d (modified) (1 diff)
• trunk/src/leds/FSView.d (modified) (4 diffs)
• trunk/src/leds/FindAndReplace.d (modified) (2 diffs)
• trunk/src/leds/GotoLineDialog.d (modified) (1 diff)
• trunk/src/leds/InputStringDialog.d (modified) (4 diffs)
• trunk/src/leds/LanguageD.d (modified) (3 diffs)
• trunk/src/leds/Leds.d (modified) (4 diffs)
• trunk/src/leds/ListBox.d (modified) (3 diffs)
• trunk/src/leds/Project.d (modified) (2 diffs)
• trunk/src/leds/ProjectTargetUI.d (modified) (1 diff)
• trunk/src/leds/ProjectView.d (modified) (5 diffs)
• trunk/src/leds/Scintilla.d (modified) (4 diffs)
• trunk/src/leds/SimpleCodeEdit.d (modified) (4 diffs)
• trunk/src/leds/SourceViewEdit.d (modified) (10 diffs)
• trunk/src/leds/SystemConsole.d (modified) (1 diff)
• trunk/src/leds/TrashUI.d (modified) (2 diffs)
• trunk/src/leds/Workspace.d (modified) (6 diffs)
• trunk/src/leds/WrapGtk.d (modified) (1 diff)

trunk/src/leds/BrowserView.d

@@ -159 +159 @@
-    }
-
-int
+bool
-    {
-        if ( Leds.leds.getPropValue("showWideTreeTooltip", true) )
@@ -175 +175 @@
-    }
-
-int
+bool
-    {
-        return false;
-    }
-    
-int
+bool
-    {
-        return false;
@@ -413 +413 @@
-    }
-    
-**
+[][]
-    {
-        EventImage ei = new EventImage(pixActive, dlg);
@@ -527 +527 @@
-        }
-
-int
+bool
-        {
-            TreeIter iter = getSelectedIter();
@@ -534 +534 @@
-        }
-        
-int
+bool
-        {
-            TreeIter iter = getSelectedIter();
@@ -648 +648 @@
-        }
-
-int
+bool
-        {
-            //writefln("TipWindow.onLeave 1");
@@ -665 +665 @@
-//      }
-        
-int
+bool
-        {
-            entered = true;
-            return false;
-        }
-int
+bool
-        {
-            browserView.mouseButtonPressCallback(eventButton, widget, iter);
@@ -676 +676 @@
-        }
-        
-int
+bool
-        {
-            iter.setModel(treeView.getModel());

trunk/src/leds/CodeView.d

@@ -593 +593 @@
-    {
-        bool needReload = false;
-
-
+
+
+
+
+
+
+
+
-        {
-            debug(getFileMTime)writefln("calling getFileMTime 6.1");
-            needReload = PopupBox.yesNo(workspace, 
-
+
+
-                "leds - Light Editor for D");
-            // we better save it now as the user expects this version to be on disk
@@ -1606 +1613 @@
-    
-    
-int
+bool
-    {
-        int lineNumber = codeEdit.getLineAtY(cast(int)eventButton.y)/17;    // TODO 17?
@@ -2554 +2561 @@
-            }
-            
-
+cast(TreeModel)
-        }
-    

trunk/src/leds/CompilerBox.d

@@ -199 +199 @@
-        rawTextCommands = new TextView();
-        
-
+ast(TreeModel)c
-        compilerMessages.addOnButtonPress(&mouseButtonPressCallback);
-        compilerMessages.addOnButtonRelease(&mouseButtonReleaseCallback);
@@ -265 +265 @@
-    {
-        TreeSelection selection = compilerMessages.getSelection();
-
+
+
-        if ( paths.length > 0 )
-        {
@@ -273 +274 @@
-            gotoSourceCode(compilerMessages.getSelectedIter());
-        }
+        */
-    }
-    
@@ -278 +280 @@
-    {
-        TreeSelection selection = compilerMessages.getSelection();
+        /* FIXME
-        TreePath[] paths = selection.getSelectedRows(compilerModel);
-        if ( paths.length > 0 )
@@ -286 +289 @@
-            gotoSourceCode(compilerMessages.getSelectedIter());
-        }
+        */
-    }
-    
@@ -312 +316 @@
-             * @return true to refuse to close the window
-             */
-int
+bool
-            {
-                sw.removeAll();
@@ -443 +447 @@
-    }
-    
-int
+bool
-    {
-        TreeIter iter = compilerMessages.getSelectedIter();
@@ -457 +461 @@
-    }
-
-int
+bool
-    {
-        TreeIter iter = compilerMessages.getSelectedIter();

trunk/src/leds/CompilerWindow.d

@@ -54 +54 @@
-     * @return true to refuse to close the window
-     */
-int
+bool
-    {
-        hide();

trunk/src/leds/DSpell.d

@@ -116 +116 @@
-    void hide()
-    {
-&left, &
+left, 
-        super.hide();
-    }
@@ -246 +246 @@
-        {
-            CellRenderer renderer;
-
+cast(TreeModel)
-            renderer = new CellRendererText();
-            int pos = treeView.insertEditableColumn(0, heading.toString(), renderer, true);

trunk/src/leds/Docker.d

@@ -274 +274 @@
-    bit inExposeEvent;
-    
-int
+bool
-    {
-        Dockable dockable = getCurrentDockable();
@@ -482 +482 @@
-        
-
-int
+bool
-        {
-            super.onPress(event, widget);
@@ -493 +493 @@
-        }
-        
-int
+bool
-        {
-            super.onRelease(event, widget);

trunk/src/leds/DockerTools.d

@@ -98 +98 @@
-//  }
-            
-**pixInactive, char**
+[][] pixInactive, char[][]
-    {
-        debug(startup) writefln("DockerTools.addButton 1");
@@ -113 +113 @@
-    }
-    
-**
+[][]
-    {
-        debug(startup) writefln("DockerTools.addButton 1");

trunk/src/leds/ErrorPane.d

@@ -142 +142 @@
-    
-    
-int
+bool
-    {
-        int line;
@@ -218 +218 @@
-     * @return 
-     */
-int
+bool
-    {
-        bit found = false;
@@ -251 +251 @@
-     * @return 
-     */
-int
+bool
-    {
-        if ( lineCount == 0 )
@@ -263 +263 @@
-    public void drawNow()
-    {
-Drawable
+Window
-        GC gc = new GC(d);
-

trunk/src/leds/EventImage.d

@@ -55 +55 @@
-    bit delegate() onClick;
-    
-char**
+string[]
-    {
+        //this(new Pixbuf((new XPM("inactive", pixdef)).halfColor().getChars()), new Pixbuf(pixdef), onClick);
-        this(new Pixbuf((new XPM("inactive", pixdef)).halfColor().getChars()), new Pixbuf(pixdef), onClick);
-    }
@@ -88 +89 @@
-    }
-    
-int
+bool
-    {
-        mouseIsIn = true;
@@ -101 +102 @@
-        return false;
-    }
-int
+bool
-    {
-        mouseIsIn = false;
@@ -114 +115 @@
-    }
-
-int
+bool
-    {
-        if ( pressed !is null )
@@ -124 +125 @@
-    }
-    
-int
+bool
-    {
-        if ( mouseIsIn )

trunk/src/leds/FSTree.d

@@ -220 +220 @@
-    }
-
-int
+bool
-    {
-        //printf("mouse release on project tree view with button %d\n",eventButton.button());

trunk/src/leds/FSView.d

@@ -271 +271 @@
-        // start by reading children.
-        TreeIter childNode = new TreeIter();
-
+cast(TreeModel)
-        if (!model.iterChildren(childNode, parentIter)) {
-            writefln("NO CHILDREN FOUND?");
@@ -356 +356 @@
-    TreeIter iterFromPath(TreePath tp)
-    {
-
+cast(TreeModel)
-        TreeIter iter = new TreeIter();
-            model.getIter(iter,tp);
@@ -549 +549 @@
-        //}
-        
-int
+bool
-        {
-            //printf("mouse release on project tree view with button %d\n",eventButton.button());
@@ -615 +615 @@
-        {
-            TreeIter iter = new TreeIter();
-
+cast(TreeModel)
-                    model.getIter(iter,tp);
-                    

trunk/src/leds/FindAndReplace.d

@@ -122 +122 @@
-     * @return true to refuse to close the window
-     */
-int
+bool
-    {
-        hide();
@@ -150 +150 @@
-    void hide()
-    {
-&left, &
+left, 
-        super.hide();
-    }

trunk/src/leds/GotoLineDialog.d

@@ -102 +102 @@
-    void hide()
-    {
-&left, &
+left, 
-        super.hide();
-    }

trunk/src/leds/InputStringDialog.d

@@ -30 +30 @@
-private import gtk.Label;
-private import gtk.Table;
-GtkD
+Main
-
-private import gtkc.gtktypes;
@@ -105 +105 @@
-    void hide()
-    {
-&left, &
+left, 
-        super.hide();
-        this.closed = true;
@@ -135 +135 @@
-        add(vbox);
-    }
-int 
+bool
-    {
-        this.closed = true;
@@ -174 +174 @@
-        this.closed = false;
-        while(!this.closed) {
-GtkD.mainI
+Main.i
-        }
-        writefln("closed is %d", this.closed);

trunk/src/leds/LanguageD.d

@@ -47 +47 @@
-    private import gtk.TreeIter;
-    private import gdk.Pixbuf;
-GtkD
+Main
-    private import image.XPM;
-    
@@ -261 +261 @@
-        }
-        
-**
+[][]
-        
-         
@@ -656 +656 @@
-        {
-            debug(flow ) writefln("LanguageD.checkSintax 11.1");
-GtkD
+Main
-            {
-                debug(flow ) writefln("LanguageD.checkSintax 11.2");
-GtkD.mainI
+Main.i
-                debug(flow ) writefln("LanguageD.checkSintax 11.3");
-            }

trunk/src/leds/Leds.d

@@ -41 +41 @@
-private import dool.io.FileException;
-
-GtkD
+Main
-
-private import gthread.Thread;
@@ -811 +811 @@
-    {
-        // TODO threads are still broken on windows
-GtkD
+Main
-    }
-    else
-    {
-GtkD
-GtkD
+Main
+Main
-    }
-    
@@ -836 +836 @@
-        version(splash) w.destroy();
-        debug(startup) writefln("Leds.main 4");
-GtkD.mai
-GtkD
+Main.ru
+Main
-        debug(startup) writefln("Leds.main 5");
-    }
@@ -847 +847 @@
-{
-    gdkThreadsEnter();
-GtkD.mai
+Main.ru
-    gdkThreadsLeave();
-}

trunk/src/leds/ListBox.d

@@ -85 +85 @@
-        listModel = createModel(header);
-
-
+cast(TreeModel)
-        addOnButtonPress(&mouseButtonPressCallback);
-        addOnButtonRelease(&mouseButtonReleaseCallback);
@@ -152 +152 @@
-    }
-    
-int
+bool
-    {
-        TreeIter iter = getSelectedIter();
@@ -166 +166 @@
-    }
-
-int
+bool
-    {
-        TreeIter iter = getSelectedIter();

trunk/src/leds/Project.d

@@ -24 +24 @@
-//{
-    version = compd;
+    version = compd_a; // old version
+//  version = compd_b; // current afaik
-//}
-
@@ -777 +779 @@
-    static class BeepCompiler : Compiler
-    {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        public void compileEnded(int status)
-        {

trunk/src/leds/ProjectTargetUI.d

@@ -156 +156 @@
-        dropTarget(new String(comboBox.getActiveText()));
-        TreeIter iter = new TreeIter();
-
+ast(TreeModel)c
-        iter.setModel(model);
-        int index = 0;

trunk/src/leds/ProjectView.d

@@ -660 +660 @@
-        }
-        
-**
+[][]
-        
-        switch( key.toString() )
@@ -684 +684 @@
-    public void setProjectStatus(Project project)
-    {
-**
+[][]
-        if ( project !is null )
-        {
@@ -881 +881 @@
-    }
-
-**
+[][]
-    {
-        EventImage ei = new EventImage(pixActive, dlg);
@@ -1378 +1378 @@
-        }
-
-int
+bool
-        {
-            debug(treeView)writefln("ProjectTreeView.mouseButtonPressCallback 1");
@@ -1395 +1395 @@
-        }
-
-int
+bool
-        {
-            debug(treeView)writefln("ProjectView.mouseButtonReleaseCallback 1");

trunk/src/leds/Scintilla.d

@@ -1407 +1407 @@
- Dynamically load scintilla.dll GTK+ version on windows
- *********************************************************************************/
-
-
+
+
+
-
-private Linker scintilla_Linker;
+
-
-extern(C)
@@ -1596 +1598 @@
-Symbol[] scintillaLinks =
-[
-   { "scintilla_get_type",         
-   { "scintilla_new",              
-   { "scintilla_set_id",           
-   { "scintilla_send_message",     
-   
+    { "scintilla_get_type",         
+    { "scintilla_new",              
+    { "scintilla_set_id",           
+    { "scintilla_send_message",     
+    
-];
-
@@ -1698 +1700 @@
-    if ( countInstances == 0 )
-    {
-
+//
-        /* Assume scintilla.dll is in same directory as current executable */
-        version(Windows) scintilla_Linker = new Linker("scintilla.dll");
-        version(linux)   scintilla_Linker = new Linker("libscintilla.so.1.7.4");
-        scintilla_Linker.link(scintillaLinks);
+
+
+
+
-    }
-    ++countInstances;
@@ -2621 +2627 @@
-    }
-
-int
+bool
-    {
-        //printf("mouse pressed on Scintilla with button %d and time %d\n",eventButton.button(),eventButton.getTime());

trunk/src/leds/SimpleCodeEdit.d

@@ -47 +47 @@
-private import gtk.Menu;
-private import gtk.MenuItem;
-GtkD
+Main
-
-private import gtkc.gtktypes;
@@ -163 +163 @@
-    }
-    
-int
+bool
-    {
-        //writefln("SimpleCodeEdit.keyPressed ");
@@ -748 +748 @@
-    {
-        int lineTop;
-&
+
-        return lineTop;
-    }
@@ -810 +810 @@
-    }
-
-int
+bool
-    {
-        Menu menu = cast(Menu)widget;
-        menu.popdown();
-GtkD
+Main
-        return false;
-    }

trunk/src/leds/SourceViewEdit.d

@@ -31 +31 @@
-private import gtk.MenuItem;
-
-GtkD
+Main
-private import gsv.SourceView;
-private import gsv.SourceBuffer;
@@ -94 +94 @@
-    {
-        SourceLanguageManager slm = new SourceLanguageManager();
-Str.toStringArray(slm.getLanguageIds()
+slm.getLanguageIds(
-        
-        //writefln("%s available languages", list.length());
@@ -103 +103 @@
-//      }
-        
-
+.getSourceLanguageStruct()
-        
-    }
@@ -139 +139 @@
-        //Pixbuf pixbuf = new Pixbuf(Pixmaps.closeInactive_xpm);
-        Pixbuf pixbuf = new Pixbuf(Pixmaps.red_xpm);
-.getPixbufStruct()
+
-        
-    }
@@ -227 +227 @@
-    }
-    
-int
+bool
-    {
-        debug(flow)writefln("SourceViewEdit.keyPressed ");
@@ -759 +759 @@
-    {
-        int lineTop;
-&
+
-        return lineTop;
-    }
@@ -830 +830 @@
-        int lineTop;
-        int bufferX, bufferY;
-&bufferX, &
-&
+bufferX, 
+
-        return lineTop;
-    }
@@ -885 +885 @@
-        }
-        popupMenu.showAll();
-GtkD
+Main
-    }
-    
@@ -901 +901 @@
-        }
-        popupMenu.showAll();
-GtkD
+Main
-    }
-
@@ -944 +944 @@
-    }
-
-int
+bool
-    {
-        //Menu menu = cast(Menu)widget;
-        //menu.popdown();
-GtkD
+Main
-
-        return false;

trunk/src/leds/SystemConsole.d

@@ -127 +127 @@
-    }
-
-int
+bool
-    {
-        char[] textLine = getSelectedLine(event);

trunk/src/leds/TrashUI.d

@@ -167 +167 @@
-    void hide()
-    {
-&left, &
+left, 
-        super.hide();
-    }
@@ -416 +416 @@
-        //}
-        
-int
+bool
-        {
-            //printf("mouse release on project tree view with button %d\n",eventButton.button());

trunk/src/leds/Workspace.d

@@ -62 +62 @@
-private import resources.LedsLogo;
-
-GtkD
+Main
-private import gtk.MainWindow;
-private import gtk.Button;
@@ -295 +295 @@
-        int width;
-        int height;
-&width, &height);      
+width, height);
-        int left;
-        int top;
-&left,&
+left,
-        int posLeft = leftMainPane.getPosition();
-        if ( posLeft == 0 )
@@ -1495 +1495 @@
-     * Check the ctrl+F to popup the full find and replace dialog
-     */
-int
+bool
-    {
-        if ( event.string[0] == 6 )
@@ -1512 +1512 @@
-     * Returns: false
-     */
-int
+bool
-    {
-        if ( event.string[0]=='\r' || event.string[0]=='\n' )
@@ -1709 +1709 @@
-                    if ( exit(0,false) )
-                    {
-GtkD
+Main
-                    }
-                break;
@@ -2153 +2153 @@
-        if ( fileSelection.run() == ResponseType.GTK_RESPONSE_OK )
-        {
-Str.toStringArray(fileSelection.getSelections()
+fileSelection.getSelections(
-            openFiles(selections);
-            //for ( int i=0 ;i<selections.length ; i++)

trunk/src/leds/WrapGtk.d

@@ -97 +97 @@
-    void hide()
-    {
-&left, &
+left, 
-        super.hide();
-    }