Changeset 24

Timestamp:

12/02/06 02:26:18 (2 years ago)

Author:

baxissimo

Message:

rearranged the example proggies.
GUI creation now in a separate function.

Files:

• trunk/luigi/example1.d (modified) (3 diffs)
• trunk/luigi/example1_gld.d (modified) (4 diffs)

trunk/luigi/example1.d

@@ -62 +62 @@
-}
-
-
-
+
-{
-    bool dosync = true;
-    char[] theme = "dxut";
-    
-    //---------------- PARSE ARGS -----------------------
-    for( int i=1; i<argv.length; i++ ) {
-        auto a = argv[i];
-        if (a == "-nosync") dosync = false;
-        else if (a == "-help") { usage(argv[0]); return; }
-        else if (a == "-theme") {
-            theme = argv[++i];
-        }
-    }
-
-    //---------------- SETUP -----------------------
-    // Open OpenGL window
-    if (!glfwOpenWindow( 640, 480, 0,0,0,0, 0,0, GLFW_WINDOW ))
-        return;
-
-    // Enable sticky keys
-    glfwEnable( GLFW_STICKY_KEYS );
-    glfwEnable( GLFW_KEY_REPEAT );
-
-    // Disable vertical sync if requested (on cards that support it)
-    if (!dosync) glfwSwapInterval( 0 );
-
-    // Set the background color
-    glClearColor( 66/255., 75/255., 121/255., 0 );
-
-
-    //---------------- CREATE GUI ----------------------
-    
-    luigui.Overlay gui;
-    with(luigui) {
@@ -140 +108 @@
-            auto b16 =   g.add_widget(new Button("Help"));
-
-            /*c15.value_changed.connect( 
-                (Widget w, bool onoff) {
-                    writefln(onoff?"checked!":"unchecked!"); 
-                    });*/
-            c15.value_changed ~= (Widget w, bool onoff) {
-                writefln(onoff?"checked!":"unchecked!"); 
@@ -230 +194 @@
-*/
-    }
+    return gui;
+}
+
+void main(char[][] argv)
+{
+    bool dosync = true;
+    char[] theme = "dxut";
+    
+    //---------------- PARSE ARGS -----------------------
+    for( int i=1; i<argv.length; i++ ) {
+        auto a = argv[i];
+        if (a == "-nosync") dosync = false;
+        else if (a == "-help") { usage(argv[0]); return; }
+        else if (a == "-theme") {
+            theme = argv[++i];
+        }
+    }
+
+    //---------------- SETUP -----------------------
+    // Open OpenGL window
+    if (!glfwOpenWindow( 640, 480, 0,0,0,0, 0,0, GLFW_WINDOW ))
+        return;
+
+    // Enable sticky keys
+    glfwEnable( GLFW_STICKY_KEYS );
+    glfwEnable( GLFW_KEY_REPEAT );
+
+    // Disable vertical sync if requested (on cards that support it)
+    if (!dosync) glfwSwapInterval( 0 );
+
+    // Set the background color
+    glClearColor( 66/255., 75/255., 121/255., 0 );
+
+
+    //---------------- CREATE GUI ----------------------
+    luigui.Overlay gui = create_gui(theme);
+/+
+     luigui.Overlay gui;
+    with(luigui) {
+        Luigi().adapter = GLFWAdapter();
+        if (theme == "dxut" || theme == "dx") {
+            Luigi().theme = new luigi.themes.dxut.DXUTTheme();
+        }
+        gui = new Overlay;
+    
+        //gui.arranger = new FlowArranger(Alignment.Left|Alignment.Bottom);
+        //gui.arranger = new GridArranger(2,2);
+        //BorderArranger layout = new BorderArranger(5,5);
+        gui.arranger = new BorderArranger(Gaps(5));
+
+        alias BorderArranger.Region Region;
+        alias Alignment A;
+
+        auto eastGroup = gui.add_arranged(new GridPanel(1,0, Gaps(2)), Region.East);
+        auto westGroup = gui.add_arranged(new GridPanel(2,0, Gaps(2)), Region.West);
+        auto northGroup = gui.add_arranged(new FlowPanel, Region.North);
+        auto southGroup = gui.add_arranged(new FlowPanel, Region.South);
+
+        with(eastGroup) {
+            alias eastGroup g; // workaround for http://tinyurl.com/u5eal
+            auto b0 = g.add_widget(new Button("Luigi"));
+            g.add_widget(new Button("Is"));
+            g.add_widget(new Button("My"));
+            g.add_widget(new Button("Pal"));
+            auto b1 = g.add_widget(new Button("Hide West"));
+
+            b0.disable();
+            b1.clicked.connect( &westGroup.toggle_shown );
+        }
+
+        with (northGroup) {
+            alias northGroup g; // workaround for http://tinyurl.com/u5eal
+            auto b10 =   g.add_widget(new Button("File"));
+            auto b11 =   g.add_widget(new Button("Edit"));
+            auto b12 =   g.add_widget(new Button("View"));
+            auto b13 =   g.add_widget(new Button("Favorites"));
+            auto b14 =   g.add_widget(new Button("Tools"));
+            auto b15 =   g.add_widget(new Button("Options"));
+            auto c15 =   g.add_widget(new Checkbox("Check it out!"));
+            auto b16 =   g.add_widget(new Button("Help"));
+
+            c15.value_changed ~= (Widget w, bool onoff) {
+                writefln(onoff?"checked!":"unchecked!"); 
+            };
+        }
+
+        with(southGroup) {
+            alias southGroup g; // workaround for http://tinyurl.com/u5eal
+            //Button b0 = add_widget(new Button("Hohoho!"));
+            auto l0 = g.add_widget(new Label( "First Name:"));
+            auto t0 = g.add_widget(new TextField("Hello"));
+            auto l1 = g.add_widget(new Label( "Last Name:"));
+            auto t1 = g.add_widget(new TextField("Rumpelstiltskin"));
+            auto b4 = g.add_widget(new Button("Click me!"));
+            auto l2 = g.add_widget(new Label("Disabled label"));
+            l2.disable;
+            b4.clicked ~= (Widget w){ writefln("Ouch! Not so hard!"); };
+        }
+
+        with (westGroup) {
+            alias westGroup g; // workaround for http://tinyurl.com/u5eal
+            auto b20 = g.add_arranged(new Button("Tool0"));
+            auto b21 = g.add_arranged(new Button("Tool1"));
+            auto b22 = g.add_arranged(new Button("Tool2"));
+            auto b23 = g.add_arranged(new Button("Tool3"));
+            auto b24 = g.add_arranged(new Button("LongNameTool4"));
+            auto b25 = g.add_arranged(new Button("Tool5"));
+            auto b26 = g.add_arranged(new Button("Tool6"));
+            auto b27 = g.add_arranged(new Button("Tool7"));
+            auto b28 = g.add_arranged(new Button("Tool8"));
+            auto b29 = g.add_arranged(new Button("Tool9"));
+            auto s01 = g.add_arranged(new Slider("Thingy"));
+            auto s02 = g.add_arranged(new Slider("Thingy"));
+            s02.vertical = true;
+            s01.precision = 0.1;
+            s02.precision = 0.1;
+
+            s01.value_changed.connect2nd( (double d){ writefln("Slider now %s",d); } );
+            s02.value_changed.connect2nd( (double d){ writefln("Slider now %s",d); } );
+            s02.value_changed.connect2nd(&s01.value);
+            s01.value_changed.connect2nd(&s02.value);
+        }
+
+/*
+       // This is my ideal version, but it requires more smarts from D IFTI
+  
+        Button b3 = gui.add_widget(new Button("Mate!")).arranged(Region.East);
+        Button b4 = gui.add_widget(new Button("Click me!")).arranged(Region.South);
+
+        b4.clicked.connect( (Widget w){ writefln("Ouch! Not so hard!"); } ); 
+        b3.disable();
+
+        Panel northGroup = gui.add_widget(new FlowPanel).arranged(Region.North);
+
+        with (northGroup) {
+            auto b10 = add_widget(new Button("File"));
+            auto b11 = add_widget(new Button("Edit"));
+            auto b12 = add_widget(new Button("View"));
+            auto b13 = add_widget(new Button("Favorites"));
+            auto b14 = add_widget(new Button("Tools"));
+            auto b15 = add_widget(new Button("Options"));
+            auto c15 = add_widget(new Checkbox("Check it out!"));
+            auto b16 = add_widget(new Button("Help"));
+
+            c15.value_changed.connect( (Widget w, bool onoff)
+            { 
+                writefln(onoff?"checked!":"unchecked!"); 
+            });
+        }
+        Panel westGroup = gui.add_widget(new GridPanel(2,0, Gaps(2))).arrangement(Region.West);
+
+        with (westGroup) {
+            auto b20 = add_widget(new Button("Tool0")).arranged();
+            auto b21 = add_widget(new Button("Tool1")).arranged();
+            auto b22 = add_widget(new Button("Tool2")).arranged();
+            auto b23 = add_widget(new Button("Tool3")).arranged();
+            auto b24 = add_widget(new Button("LongNameTool4")).arranged();
+            auto b25 = add_widget(new Button("Tool5")).arranged();
+            auto b26 = add_widget(new Button("Tool6")).arranged();
+            auto b27 = add_widget(new Button("Tool7")).arranged();
+            auto b28 = add_widget(new Button("Tool8")).arranged();
+            auto b29 = add_widget(new Button("Tool9")).arranged();
+        }
+
+        //b1.rect.set(10,10,50,30);
+*/
+    }
++/
-
-    //---------------- HELPERS -------------------------

trunk/luigi/example1_gld.d

@@ -67 +67 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    luigui.Overlay gui;
-    with(luigui) {
-        Luigi().adapter = GLDAdapter();
-
+ || theme == "dx"
-            Luigi().theme = new luigi.themes.dxut.DXUTTheme();
-        }
-        gui = new Overlay;
-    
-        //gui.arranger = new FlowArranger(Alignment.Left|Alignment.Bottom);
-        //gui.arranger = new GridArranger(2,2);
-        //BorderArranger layout = new BorderArranger(5,5);
-        gui.arranger = new BorderArranger(Gaps(5));
-
@@ -144 +110 @@
-            auto b16 =   g.add_widget(new Button("Help"));
-
-
-
+
-                writefln(onoff?"checked!":"unchecked!"); 
-)
+
-        }
-
@@ -153 +118 @@
-            alias southGroup g; // workaround for http://tinyurl.com/u5eal
-            //Button b0 = add_widget(new Button("Hohoho!"));
-
-
-t1 = g.add_widget(new TextField("Last n
-t1.text = "Rumplestilskin"
+ 
+("Hello")
+l1 = g.add_widget(new Label( "Last N
+auto t1 = g.add_widget(new TextField("Rumpelstiltskin"))
-            auto b4 = g.add_widget(new Button("Click me!"));
-
+
+
+
-        }
-
@@ -184 +151 @@
-            s01.value_changed.connect2nd(&s02.value);
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    //---------------- HELPERS -------------------------