Changeset 29

Show
Ignore:
Timestamp:
12/02/06 21:47:16 (2 years ago)
Author:
baxissimo
Message:

Fixes so that things compile again after reorganization.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/luigi/adapter.d

    r28 r29  
    2626  William Baxter wbaxter@gmail.com 
    2727*/ 
    28 module luigi.adapter.base; 
     28module luigi.adapter; 
    2929 
    3030//import sslot.signal; 

  • trunk/luigi/adapters/gld.d

    r19 r29  
    2626  William Baxter wbaxter@gmail.com 
    2727*/ 
    28 module luigi.adapter.gld; 
     28module luigi.adapters.gld; 
    2929 
    3030import luigi.base; 
    3131import luigi.event; 
    32 import luigi.adapter.base; 
     32import luigi.adapter; 
    3333import gld; 
    3434//import sslot.signal; 

  • trunk/luigi/adapters/glfw.d

    r19 r29  
    2626  William Baxter wbaxter@gmail.com 
    2727*/ 
    28 module luigi.adapter.glfw; 
     28module luigi.adapters.glfw; 
    2929 
    3030import luigi.base; 
    3131import luigi.event; 
    32 import luigi.adapter.base; 
     32import luigi.adapter; 
    3333import derelict.glfw.glfw; 
    3434//import sslot.signal; 

  • trunk/luigi/example1.d

    r26 r29  
    3232*/ 
    3333import luigui = luigi.gui; 
    34 import luigi.adapter.glfw; 
     34import luigi.adapters.glfw; 
    3535static import luigi.themes.std; 
    3636static import luigi.themes.dxut; 
    …… 
    152152 
    153153/* 
    154        // This is my ideal version, but it requires more smarts from D IFTI 
    155    
     154       // This is my ideal version, but it requires more smarts from D 
    156155        Button b3 = gui.add_widget(new Button("Mate!")).arranged(Region.East); 
    157         Button b4 = gui.add_widget(new Button("Click me!")).arranged(Region.South); 
    158  
    159         b4.clicked.connect( (Widget w){ writefln("Ouch! Not so hard!"); } );  
    160         b3.disable(); 
    161  
    162         Panel northGroup = gui.add_widget(new FlowPanel).arranged(Region.North); 
    163  
    164         with (northGroup) { 
    165             auto b10 = add_widget(new Button("File")); 
    166             auto b11 = add_widget(new Button("Edit")); 
    167             auto b12 = add_widget(new Button("View")); 
    168             auto b13 = add_widget(new Button("Favorites")); 
    169             auto b14 = add_widget(new Button("Tools")); 
    170             auto b15 = add_widget(new Button("Options")); 
    171             auto c15 = add_widget(new Checkbox("Check it out!")); 
    172             auto b16 = add_widget(new Button("Help")); 
    173  
    174             c15.value_changed.connect( (Widget w, bool onoff) 
    175             {  
    176                 writefln(onoff?"checked!":"unchecked!");  
    177             }); 
    178         } 
    179         Panel westGroup = gui.add_widget(new GridPanel(2,0, Gaps(2))).arrangement(Region.West); 
    180  
    181         with (westGroup) { 
    182             auto b20 = add_widget(new Button("Tool0")).arranged(); 
    183             auto b21 = add_widget(new Button("Tool1")).arranged(); 
    184             auto b22 = add_widget(new Button("Tool2")).arranged(); 
    185             auto b23 = add_widget(new Button("Tool3")).arranged(); 
    186             auto b24 = add_widget(new Button("LongNameTool4")).arranged(); 
    187             auto b25 = add_widget(new Button("Tool5")).arranged(); 
    188             auto b26 = add_widget(new Button("Tool6")).arranged(); 
    189             auto b27 = add_widget(new Button("Tool7")).arranged(); 
    190             auto b28 = add_widget(new Button("Tool8")).arranged(); 
    191             auto b29 = add_widget(new Button("Tool9")).arranged(); 
    192         } 
    193  
    194         //b1.rect.set(10,10,50,30); 
    195156*/ 
    196157    } 
    …… 
    231192    //---------------- CREATE GUI ---------------------- 
    232193    luigui.Overlay gui = create_gui(theme); 
    233 /+ 
    234      luigui.Overlay gui; 
    235     with(luigui) { 
    236         Luigi().adapter = GLFWAdapter(); 
    237         if (theme == "dxut" || theme == "dx") { 
    238             Luigi().theme = new luigi.themes.dxut.DXUTTheme(); 
    239         } 
    240         gui = new Overlay; 
    241      
    242         //gui.arranger = new FlowArranger(Alignment.Left|Alignment.Bottom); 
    243         //gui.arranger = new GridArranger(2,2); 
    244         //BorderArranger layout = new BorderArranger(5,5); 
    245         gui.arranger = new BorderArranger(Gaps(5)); 
    246  
    247         alias BorderArranger.Region Region; 
    248         alias Alignment A; 
    249  
    250         auto eastGroup = gui.add_arranged(new GridPanel(1,0, Gaps(2)), Region.East); 
    251         auto westGroup = gui.add_arranged(new GridPanel(2,0, Gaps(2)), Region.West); 
    252         auto northGroup = gui.add_arranged(new FlowPanel, Region.North); 
    253         auto southGroup = gui.add_arranged(new FlowPanel, Region.South); 
    254  
    255         with(eastGroup) { 
    256             alias eastGroup g; // workaround for http://tinyurl.com/u5eal 
    257             auto b0 = g.add_widget(new Button("Luigi")); 
    258             g.add_widget(new Button("Is")); 
    259             g.add_widget(new Button("My")); 
    260             g.add_widget(new Button("Pal")); 
    261             auto b1 = g.add_widget(new Button("Hide West")); 
    262  
    263             b0.disable(); 
    264             b1.clicked.connect( &westGroup.toggle_shown ); 
    265         } 
    266  
    267         with (northGroup) { 
    268             alias northGroup g; // workaround for http://tinyurl.com/u5eal 
    269             auto b10 =   g.add_widget(new Button("File")); 
    270             auto b11 =   g.add_widget(new Button("Edit")); 
    271             auto b12 =   g.add_widget(new Button("View")); 
    272             auto b13 =   g.add_widget(new Button("Favorites")); 
    273             auto b14 =   g.add_widget(new Button("Tools")); 
    274             auto b15 =   g.add_widget(new Button("Options")); 
    275             auto c15 =   g.add_widget(new Checkbox("Check it out!")); 
    276             auto b16 =   g.add_widget(new Button("Help")); 
    277  
    278             c15.value_changed ~= (Widget w, bool onoff) { 
    279                 writefln(onoff?"checked!":"unchecked!");  
    280             }; 
    281         } 
    282  
    283         with(southGroup) { 
    284             alias southGroup g; // workaround for http://tinyurl.com/u5eal 
    285             //Button b0 = add_widget(new Button("Hohoho!")); 
    286             auto l0 = g.add_widget(new Label( "First Name:")); 
    287             auto t0 = g.add_widget(new TextField("Hello")); 
    288             auto l1 = g.add_widget(new Label( "Last Name:")); 
    289             auto t1 = g.add_widget(new TextField("Rumpelstiltskin")); 
    290             auto b4 = g.add_widget(new Button("Click me!")); 
    291             auto l2 = g.add_widget(new Label("Disabled label")); 
    292             l2.disable; 
    293             b4.clicked ~= (Widget w){ writefln("Ouch! Not so hard!"); }; 
    294         } 
    295  
    296         with (westGroup) { 
    297             alias westGroup g; // workaround for http://tinyurl.com/u5eal 
    298             auto b20 = g.add_arranged(new Button("Tool0")); 
    299             auto b21 = g.add_arranged(new Button("Tool1")); 
    300             auto b22 = g.add_arranged(new Button("Tool2")); 
    301             auto b23 = g.add_arranged(new Button("Tool3")); 
    302             auto b24 = g.add_arranged(new Button("LongNameTool4")); 
    303             auto b25 = g.add_arranged(new Button("Tool5")); 
    304             auto b26 = g.add_arranged(new Button("Tool6")); 
    305             auto b27 = g.add_arranged(new Button("Tool7")); 
    306             auto b28 = g.add_arranged(new Button("Tool8")); 
    307             auto b29 = g.add_arranged(new Button("Tool9")); 
    308             auto s01 = g.add_arranged(new Slider("Thingy")); 
    309             auto s02 = g.add_arranged(new Slider("Thingy")); 
    310             s02.vertical = true; 
    311             s01.precision = 0.1; 
    312             s02.precision = 0.1; 
    313  
    314             s01.value_changed.connect2nd( (double d){ writefln("Slider now %s",d); } ); 
    315             s02.value_changed.connect2nd( (double d){ writefln("Slider now %s",d); } ); 
    316             s02.value_changed.connect2nd(&s01.value); 
    317             s01.value_changed.connect2nd(&s02.value); 
    318         } 
    319  
    320 /* 
    321        // This is my ideal version, but it requires more smarts from D IFTI 
    322    
    323         Button b3 = gui.add_widget(new Button("Mate!")).arranged(Region.East); 
    324         Button b4 = gui.add_widget(new Button("Click me!")).arranged(Region.South); 
    325  
    326         b4.clicked.connect( (Widget w){ writefln("Ouch! Not so hard!"); } );  
    327         b3.disable(); 
    328  
    329         Panel northGroup = gui.add_widget(new FlowPanel).arranged(Region.North); 
    330  
    331         with (northGroup) { 
    332             auto b10 = add_widget(new Button("File")); 
    333             auto b11 = add_widget(new Button("Edit")); 
    334             auto b12 = add_widget(new Button("View")); 
    335             auto b13 = add_widget(new Button("Favorites")); 
    336             auto b14 = add_widget(new Button("Tools")); 
    337             auto b15 = add_widget(new Button("Options")); 
    338             auto c15 = add_widget(new Checkbox("Check it out!")); 
    339             auto b16 = add_widget(new Button("Help")); 
    340  
    341             c15.value_changed.connect( (Widget w, bool onoff) 
    342             {  
    343                 writefln(onoff?"checked!":"unchecked!");  
    344             }); 
    345         } 
    346         Panel westGroup = gui.add_widget(new GridPanel(2,0, Gaps(2))).arrangement(Region.West); 
    347  
    348         with (westGroup) { 
    349             auto b20 = add_widget(new Button("Tool0")).arranged(); 
    350             auto b21 = add_widget(new Button("Tool1")).arranged(); 
    351             auto b22 = add_widget(new Button("Tool2")).arranged(); 
    352             auto b23 = add_widget(new Button("Tool3")).arranged(); 
    353             auto b24 = add_widget(new Button("LongNameTool4")).arranged(); 
    354             auto b25 = add_widget(new Button("Tool5")).arranged(); 
    355             auto b26 = add_widget(new Button("Tool6")).arranged(); 
    356             auto b27 = add_widget(new Button("Tool7")).arranged(); 
    357             auto b28 = add_widget(new Button("Tool8")).arranged(); 
    358             auto b29 = add_widget(new Button("Tool9")).arranged(); 
    359         } 
    360  
    361         //b1.rect.set(10,10,50,30); 
    362 */ 
    363     } 
    364 +/ 
    365194 
    366195    //---------------- HELPERS ------------------------- 

  • trunk/luigi/example1_gld.d

    r26 r29  
    3737 
    3838import luigui = luigi.gui; 
    39 import luigi.adapter.gld; 
     39import luigi.adapters.gld; 
    4040static import luigi.themes.std; 
    4141static import luigi.themes.dxut; 

  • trunk/luigi/gui.d

    r26 r29  
    5656static import luigi.themes.std; 
    5757import luigi.arranger; 
    58 import luigi.adapter.base; 
     58import luigi.adapter; 
    5959//import sslot.signal; 
    6060import luigi.signalobj; 
    …… 
    6363 
    6464import drawsys = luigi.gldraw; 
    65  
    66  
    6765 
    6866import math = std.math;