[rkward-cvs] rkward/rkward/plugin rkinput.cpp,1.2,1.3 rkvarslot.cpp,1.9,1.10 rkvarslot.h,1.7,1.8

[adrien]

Update of /cvsroot/rkward/rkward/rkward/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4748/rkward/plugin

Modified Files:
	rkinput.cpp rkvarslot.cpp rkvarslot.h 
Log Message:
small changes

Index: rkvarslot.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/plugin/rkvarslot.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rkvarslot.h	11 Apr 2005 12:49:34 -0000	1.7
--- rkvarslot.h	15 Apr 2005 07:35:53 -0000	1.8
***************
*** 80,83 ****
--- 80,84 ----
  	bool varOrCont ;
  	bool dupli ;
+ 	int ordre ;
  protected:
  	bool isSatisfied ();

Index: rkvarslot.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/plugin/rkvarslot.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** rkvarslot.cpp	11 Apr 2005 12:49:34 -0000	1.9
--- rkvarslot.cpp	15 Apr 2005 07:35:53 -0000	1.10
***************
*** 57,64 ****
  	QString temp  = element.attribute ("duplicate","false") ; 
  	if (temp == "true") {
- 	qDebug("##########################oui");
  	dupli = true ; }
  	else {
- 	qDebug("##########################non");
  	dupli = false ; }
  	
--- 57,62 ----
***************
*** 70,76 ****
  	} else {
  		list = new QListView (this);
- 		list->setSorting (100);
  		list->setSelectionMode (QListView::Extended);
  		list->addColumn ("Name");
  		g_layout->addWidget (list, 1, 2);
  		QString dummy = element.attribute ("min_vars", "1");
--- 68,76 ----
  	} else {
  		list = new QListView (this);
  		list->setSelectionMode (QListView::Extended);
+ 		list->addColumn (" ");
  		list->addColumn ("Name");
+ 		list->setSorting (2); 
+ 		ordre = 1 ;
  		g_layout->addWidget (list, 1, 2);
  		QString dummy = element.attribute ("min_vars", "1");
***************
*** 219,229 ****
  					}
  				}
! 				if (dupli) {
! 				
! 				duplicate = false ; }
  				if (!duplicate && belongToClasses(sel->makeClassString(""))) {
! 					QListViewItem *new_item = new QListViewItem (list, sel->getShortName ());
  					list->insertItem (new_item);
  					item_map.insert (new_item, sel);
  				}
  			}
--- 219,230 ----
  					}
  				}
! 				if (dupli) duplicate = false ; 
  				if (!duplicate && belongToClasses(sel->makeClassString(""))) {
! 					QString string; 
!         				string = string.setNum( ordre);  
! 					QListViewItem *new_item = new QListViewItem (list,string, sel->getShortName ());
  					list->insertItem (new_item);
  					item_map.insert (new_item, sel);
+ 					ordre ++ ;
  				}
  			}
***************
*** 241,247 ****
  				if (dupli) duplicate = false ; 
  				if (!duplicate && belongToClasses(selcont->makeClassString(""))) {
! 					QListViewItem *new_item = new QListViewItem (list, selcont->getShortName ());
  					list->insertItem (new_item);
  					cont_map.insert (new_item, selcont);
  				}
  			}
--- 242,251 ----
  				if (dupli) duplicate = false ; 
  				if (!duplicate && belongToClasses(selcont->makeClassString(""))) {
! 					QString string; 
!         				string = string.setNum( ordre);  
! 					QListViewItem *new_item = new QListViewItem (list,string,selcont->getShortName ());
  					list->insertItem (new_item);
  					cont_map.insert (new_item, selcont);
+ 					ordre ++ ;
  				}
  			}

Index: rkinput.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/plugin/rkinput.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rkinput.cpp	2 Apr 2005 08:48:10 -0000	1.2
--- rkinput.cpp	15 Apr 2005 07:35:52 -0000	1.3
***************
*** 27,34 ****
  	textedit->setMaximumSize (100,25) ; 
  	textedit->setMinimumSize (100,25) ; 
! 	}
! 	else if (size == "big") {
! 	textedit->setMaximumSize (500,200) ; 
! 	textedit->setMinimumSize (500,200) ; 
  	}
  
--- 27,35 ----
  	textedit->setMaximumSize (100,25) ; 
  	textedit->setMinimumSize (100,25) ; 
! 	} else if (size == "medium") {
! 	textedit->setMaximumSize (250,25) ; 
! 	textedit->setMinimumSize (250,25) ; 
! 	} else if (size == "big") {
! 	textedit->setMinimumSize (250,100) ; 
  	}