[Tora-cvs] tora NEWS,1.882,1.883 toresultcontent.cpp,1.106,1.107 toresultcontent.h,1.53,1.54

[<hp...@us...>]

Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv21419

Modified Files:
	NEWS toresultcontent.cpp toresultcontent.h 
Log Message:


Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.882
retrieving revision 1.883
diff -C2 -d -r1.882 -r1.883
*** NEWS	27 Jul 2003 15:41:27 -0000	1.882
--- NEWS	27 Jul 2003 16:03:29 -0000	1.883
***************
*** 1,4 ****
--- 1,6 ----
  1.3.11:
  
+ 2003-07-27: Fixed initialization of allfilter.
+ 2003-07-27: Indicate if filter is used in content editor by pressing down the filter button.
  2003-07-27: Made filter criterias shared between all content editors.
  2003-07-27: Fixed problem with UNICODE chars being truncated.

Index: toresultcontent.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toresultcontent.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** toresultcontent.cpp	27 Jul 2003 15:41:27 -0000	1.106
--- toresultcontent.cpp	27 Jul 2003 16:03:30 -0000	1.107
***************
*** 281,284 ****
--- 281,285 ----
    SearchStart=SearchEnd=0;
    NoUseReturning=false;
+   AllFilter=false;
    MaxColDisp=toTool::globalConfig(CONF_MAX_COL_DISP,DEFAULT_MAX_COL_DISP).toInt();
    Query=NULL;
***************
*** 378,381 ****
--- 379,383 ----
        where=true;
      }
+     emit filterEnabled(where);
  
      toQList par;
***************
*** 1205,1212 ****
    Editor=new toResultContentEditor(this,name);
  
!   new QToolButton(QPixmap((const char **)filter_xpm),
! 		  tr("Define filter for editor"),
! 		  tr("Define filter for editor"),
! 		  this,SLOT(changeFilter()),toolbar);
    new QToolButton(QPixmap((const char **)nofilter_xpm),
  		  tr("Remove any filter"),
--- 1207,1220 ----
    Editor=new toResultContentEditor(this,name);
  
!   QToolButton *btn=new QToolButton(QPixmap((const char **)filter_xpm),
! 				   tr("Define filter for editor"),
! 				   tr("Define filter for editor"),
! 				   this,SLOT(changeFilter()),toolbar);
!   connect(Editor,
! 	  SIGNAL(filterEnabled(bool)),
! 	  btn,
! 	  SLOT(setOn(bool)));
!   btn->setToggleButton(true);
! 
    new QToolButton(QPixmap((const char **)nofilter_xpm),
  		  tr("Remove any filter"),
***************
*** 1249,1253 ****
    toolbar->addSeparator();
  
!   QToolButton *btn=new QToolButton(toolbar);
    btn->setToggleButton(true);
    btn->setIconSet(QIconSet(QPixmap((const char **)single_xpm)));
--- 1257,1261 ----
    toolbar->addSeparator();
  
!   btn=new QToolButton(toolbar);
    btn->setToggleButton(true);
    btn->setIconSet(QIconSet(QPixmap((const char **)single_xpm)));

Index: toresultcontent.h
===================================================================
RCS file: /cvsroot/tora/tora/toresultcontent.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** toresultcontent.h	27 Jul 2003 15:41:27 -0000	1.53
--- toresultcontent.h	27 Jul 2003 16:03:30 -0000	1.54
***************
*** 378,381 ****
--- 378,385 ----
     */
    virtual bool searchCanReplace(bool all);
+ signals:
+   /** Emitted to indicate wether a filter is used.
+    */
+   void filterEnabled(bool);
  protected slots:
    /** Callback from popup menu.