[paragui-cvs] CVS: paragui/test factory.cpp,1.3,1.4 list.cpp,1.2,1.3 paratest.cpp,1.11,1.12 tabbar.cpp,1.5,1.6

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/test
In directory subversions:/tmp/cvs-serv21071/test

Modified Files:
        factory.cpp list.cpp paratest.cpp tabbar.cpp 
Log Message:
redesign of widgetlist/listbox.
items can now be added by specifing the list in the item's constructor.

PG_WidgetListEx may be seriously broken !!!



Index: factory.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/factory.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** factory.cpp 26 Jun 2002 13:21:42 -0000      1.3
--- factory.cpp 26 Jun 2002 16:00:21 -0000      1.4
***************
*** 14,18 ****
  
      app.LoadTheme( "default" );
!     app.InitScreen( 640, 480 );
      app.SetEmergencyQuit(true);
  
--- 14,18 ----
  
      app.LoadTheme( "default" );
!     app.InitScreen( 640, 480, 0 );
      app.SetEmergencyQuit(true);
  

Index: list.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/list.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** list.cpp    25 Jun 2002 20:38:42 -0000      1.2
--- list.cpp    26 Jun 2002 16:00:21 -0000      1.3
***************
*** 27,40 ****
        listbox.sigSelectItem.connect(slot(handleListBoxItem));
        
!       listbox.AddItem(new PG_ListBoxItem(25, "Item1"));
!       listbox.AddItem(new PG_ListBoxItem(25, "Item2"));
!       listbox.AddItem(new PG_ListBoxItem(25, "Item3"));
!       listbox.AddItem(new PG_ListBoxItem(25, "Item4"));
!       listbox.AddItem(new PG_ListBoxItem(25, "Item5"));
!       listbox.AddItem(new PG_ListBoxItem(25, "Item6"));
!       listbox.AddItem(new PG_ListBoxItem(25, "Item7"));
!       listbox.AddItem(new PG_ListBoxItem(25, "Item8"));
!       listbox.AddItem(new PG_ListBoxItem(25, "Item9"));
!       listbox.AddItem(new PG_ListBoxItem(25, "Item10"));
        listbox.Show();
        
--- 27,41 ----
        listbox.sigSelectItem.connect(slot(handleListBoxItem));
        
!       new PG_ListBoxItem(&listbox, 25, "Item1");
!       new PG_ListBoxItem(&listbox, 25, "Item2");
!       new PG_ListBoxItem(&listbox, 25, "Item3");
!       new PG_ListBoxItem(&listbox, 25, "Item4");
!       new PG_ListBoxItem(&listbox, 25, "Item5");
!       new PG_ListBoxItem(&listbox, 25, "Item6");
!       new PG_ListBoxItem(&listbox, 25, "Item7");
!       new PG_ListBoxItem(&listbox, 25, "Item8");
!       new PG_ListBoxItem(&listbox, 25, "Item9");
!       new PG_ListBoxItem(&listbox, 25, "Item10");
! 
        listbox.Show();
        

Index: paratest.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/paratest.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** paratest.cpp        26 Jun 2002 11:22:17 -0000      1.11
--- paratest.cpp        26 Jun 2002 16:00:21 -0000      1.12
***************
*** 122,131 ****
        remove->sigButtonClick.connect(slot(*this, &TestWindow::handleButton));
        
!       PG_Button* b = new PG_Button(NULL, BTN_ID_YES, PG_Rect(0,0, 400,50), 
"YES");
        b->SetTransparency(128,128,128);
        b->SetFontName("qnx/font.ttf");
-       WidgetList->AddWidget(b);
  
!       PG_Slider* s = new PG_Slider(NULL, 20, PG_Rect(0, 0, 200,20), 
PG_SB_HORIZONTAL);
        s->SetRange(0,255);
        s->SetTransparency(200);
--- 122,130 ----
        remove->sigButtonClick.connect(slot(*this, &TestWindow::handleButton));
        
!       PG_Button* b = new PG_Button(WidgetList, BTN_ID_YES, PG_Rect(0,0, 
400,50), "YES");
        b->SetTransparency(128,128,128);
        b->SetFontName("qnx/font.ttf");
  
!       PG_Slider* s = new PG_Slider(WidgetList, 20, PG_Rect(0, 0, 200,20), 
PG_SB_HORIZONTAL);
        s->SetRange(0,255);
        s->SetTransparency(200);
***************
*** 133,143 ****
  
        s->sigSlide.connect(slot(*this, &TestWindow::handle_slide_btntrans), b);
- 
-       WidgetList->AddWidget(s);
                
!       WidgetList->AddWidget(new PG_LineEdit(NULL, PG_Rect(0,0,80,30)));
  
!       PG_CheckButton* check = new PG_CheckButton(NULL, 10, 
PG_Rect(0,0,200,25), "CheckButton 2");
!       WidgetList->AddWidget(check);
  
        progress = new PG_ProgressBar(this, PG_Rect(260, 90, 150, 25));
--- 132,139 ----
  
        s->sigSlide.connect(slot(*this, &TestWindow::handle_slide_btntrans), b);
                
!       new PG_LineEdit(WidgetList, PG_Rect(0,0,80,30));
  
!       PG_CheckButton* check = new PG_CheckButton(WidgetList, 10, 
PG_Rect(0,0,200,25), "CheckButton 2");
  
        progress = new PG_ProgressBar(this, PG_Rect(260, 90, 150, 25));
***************
*** 206,213 ****
  
        if(widget->GetID() == 100) {
!               PG_Label* l = new PG_Label(NULL, PG_Rect(0,0,220,25), "");
                l->SetAlignment(PG_TA_CENTER);
                l->SetTextFormat("Label %i", ++label);
-               WidgetList->AddWidget(l);
        
                return true;
--- 202,208 ----
  
        if(widget->GetID() == 100) {
!               PG_Label* l = new PG_Label(WidgetList, PG_Rect(0,0,220,25), "");
                l->SetAlignment(PG_TA_CENTER);
                l->SetTextFormat("Label %i", ++label);
        
                return true;

Index: tabbar.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/tabbar.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** tabbar.cpp  26 Jun 2002 08:03:53 -0000      1.5
--- tabbar.cpp  26 Jun 2002 16:00:21 -0000      1.6
***************
*** 84,97 ****
        
        PG_ListBox listpage(NULL, PG_Rect(0,0,300,100));
!       listpage.AddItem(new PG_ListBoxItem(25, "Item1"));
!       listpage.AddItem(new PG_ListBoxItem(25, "Item2"));
!       listpage.AddItem(new PG_ListBoxItem(25, "Item3"));
!       listpage.AddItem(new PG_ListBoxItem(25, "Item4"));
!       listpage.AddItem(new PG_ListBoxItem(25, "Item5"));
!       listpage.AddItem(new PG_ListBoxItem(25, "Item6"));
!       listpage.AddItem(new PG_ListBoxItem(25, "Item7"));
!       listpage.AddItem(new PG_ListBoxItem(25, "Item8"));
!       listpage.AddItem(new PG_ListBoxItem(25, "Item9"));
!       listpage.AddItem(new PG_ListBoxItem(25, "Item10"));
        listpage.SetID(3);
        
--- 84,97 ----
        
        PG_ListBox listpage(NULL, PG_Rect(0,0,300,100));
!       new PG_ListBoxItem(&listpage, 25, "Item1");
!       new PG_ListBoxItem(&listpage, 25, "Item2");
!       new PG_ListBoxItem(&listpage, 25, "Item3");
!       new PG_ListBoxItem(&listpage, 25, "Item4");
!       new PG_ListBoxItem(&listpage, 25, "Item5");
!       new PG_ListBoxItem(&listpage, 25, "Item6");
!       new PG_ListBoxItem(&listpage, 25, "Item7");
!       new PG_ListBoxItem(&listpage, 25, "Item8");
!       new PG_ListBoxItem(&listpage, 25, "Item9");
!       new PG_ListBoxItem(&listpage, 25, "Item10");
        listpage.SetID(3);