filter edit fix

4 files changed, 6 insertions, 16 deletions

diff --git a/korganizer/filteredit_base.cpp b/korganizer/filteredit_base.cpp
index e724da4..d61ee67 100644
--- a/korganizer/filteredit_base.cpp
+++ b/korganizer/filteredit_base.cpp
@@ -1,145 +1,144 @@
 /****************************************************************************
 ** Form implementation generated from reading ui file 'filteredit_base.ui'
 **
-** Created: So Jan 16 11:23:21 2005
+** Created: So Jan 16 11:40:31 2005
 **      by: The User Interface Compiler ($Id$)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 
 #include "filteredit_base.h"
 
 #include <qvariant.h>
 #include <qpushbutton.h>
 #include <qframe.h>
 #include <qbuttongroup.h>
 #include <qradiobutton.h>
 #include <qlistbox.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qlayout.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
-#include "filteredit_base.ui.h"
 
 /*
  *  Constructs a FilterEdit_base as a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'.
  */
 FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl )
     : QWidget( parent, name, fl )
 {
     if ( !name )
         setName( "FilterEdit_base" );
     FilterEdit_baseLayout = new QVBoxLayout( this, 0, 0, "FilterEdit_baseLayout"); 
 
     mCriteriaFrame = new QFrame( this, "mCriteriaFrame" );
     mCriteriaFrame->setFrameShape( QFrame::StyledPanel );
     mCriteriaFrame->setFrameShadow( QFrame::Raised );
     mCriteriaFrameLayout = new QVBoxLayout( mCriteriaFrame, 3, 2, "mCriteriaFrameLayout"); 
 
     ButtonGroup1 = new QButtonGroup( mCriteriaFrame, "ButtonGroup1" );
     ButtonGroup1->setColumnLayout(0, Qt::Vertical );
     ButtonGroup1->layout()->setSpacing( 6 );
     ButtonGroup1->layout()->setMargin( 6 );
     ButtonGroup1Layout = new QGridLayout( ButtonGroup1->layout() );
     ButtonGroup1Layout->setAlignment( Qt::AlignTop );
 
     layout4 = new QHBoxLayout( 0, 0, 6, "layout4"); 
 
     mCatShowCheck = new QRadioButton( ButtonGroup1, "mCatShowCheck" );
     layout4->addWidget( mCatShowCheck );
 
     mCatHideCheck = new QRadioButton( ButtonGroup1, "mCatHideCheck" );
     layout4->addWidget( mCatHideCheck );
 
     mCatEditButton = new QPushButton( ButtonGroup1, "mCatEditButton" );
     layout4->addWidget( mCatEditButton );
 
     ButtonGroup1Layout->addLayout( layout4, 0, 0 );
 
     mCatList = new QListBox( ButtonGroup1, "mCatList" );
 
     ButtonGroup1Layout->addWidget( mCatList, 1, 0 );
     mCriteriaFrameLayout->addWidget( ButtonGroup1 );
 
     layout7 = new QHBoxLayout( 0, 0, 6, "layout7"); 
 
     textLabel1 = new QLabel( mCriteriaFrame, "textLabel1" );
     layout7->addWidget( textLabel1 );
 
     mRecurringCheck = new QCheckBox( mCriteriaFrame, "mRecurringCheck" );
     layout7->addWidget( mRecurringCheck );
 
     mCompletedCheck = new QCheckBox( mCriteriaFrame, "mCompletedCheck" );
     layout7->addWidget( mCompletedCheck );
     mCriteriaFrameLayout->addLayout( layout7 );
 
     layout9 = new QHBoxLayout( 0, 0, 6, "layout9"); 
 
     textLabel1_2 = new QLabel( mCriteriaFrame, "textLabel1_2" );
     layout9->addWidget( textLabel1_2 );
 
     mEventCheck = new QCheckBox( mCriteriaFrame, "mEventCheck" );
     layout9->addWidget( mEventCheck );
 
     mTodoCheck = new QCheckBox( mCriteriaFrame, "mTodoCheck" );
     layout9->addWidget( mTodoCheck );
 
     mJournalCheck = new QCheckBox( mCriteriaFrame, "mJournalCheck" );
     layout9->addWidget( mJournalCheck );
     mCriteriaFrameLayout->addLayout( layout9 );
 
     layout2 = new QHBoxLayout( 0, 0, 0, "layout2"); 
 
     textLabel2 = new QLabel( mCriteriaFrame, "textLabel2" );
     layout2->addWidget( textLabel2 );
 
     mPublicCheck = new QCheckBox( mCriteriaFrame, "mPublicCheck" );
     layout2->addWidget( mPublicCheck );
 
     mPrivateCheck = new QCheckBox( mCriteriaFrame, "mPrivateCheck" );
     layout2->addWidget( mPrivateCheck );
 
     mConfidentialCheck = new QCheckBox( mCriteriaFrame, "mConfidentialCheck" );
     mConfidentialCheck->setChecked( FALSE );
     layout2->addWidget( mConfidentialCheck );
     mCriteriaFrameLayout->addLayout( layout2 );
     FilterEdit_baseLayout->addWidget( mCriteriaFrame );
     languageChange();
-    resize( QSize(351, 275).expandedTo(minimumSizeHint()) );
+    resize( QSize(324, 281).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 FilterEdit_base::~FilterEdit_base()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
 /*
  *  Sets the strings of the subwidgets using the current
  *  language.
  */
 void FilterEdit_base::languageChange()
 {
     setCaption( tr( "FilterEditor" ) );
     ButtonGroup1->setTitle( tr( "Categories" ) );
     mCatShowCheck->setText( tr( "Include" ) );
     mCatHideCheck->setText( tr( "Exclude" ) );
     mCatEditButton->setText( tr( "Edit Selection..." ) );
     textLabel1->setText( tr( "Exclude" ) );
     mRecurringCheck->setText( tr( "recurring events" ) );
     mCompletedCheck->setText( tr( "completed to-dos" ) );
     textLabel1_2->setText( tr( "Exclude" ) );
     mEventCheck->setText( tr( "events" ) );
     mTodoCheck->setText( tr( "todos" ) );
     mJournalCheck->setText( tr( "journals" ) );
     textLabel2->setText( tr( "Include" ) );
     mPublicCheck->setText( tr( "public" ) );
     mPrivateCheck->setText( tr( "private" ) );
     mConfidentialCheck->setText( tr( "confidential" ) );
 }
 
diff --git a/korganizer/filteredit_base.h b/korganizer/filteredit_base.h
index 0c2988a..6d8780e 100644
--- a/korganizer/filteredit_base.h
+++ b/korganizer/filteredit_base.h
@@ -1,72 +1,69 @@
 /****************************************************************************
 ** Form interface generated from reading ui file 'filteredit_base.ui'
 **
-** Created: So Jan 16 11:23:21 2005
+** Created: So Jan 16 11:40:31 2005
 **      by: The User Interface Compiler ($Id$)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 
 #ifndef FILTEREDIT_BASE_H
 #define FILTEREDIT_BASE_H
 
 #include <qvariant.h>
 #include <qwidget.h>
 
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QSpacerItem;
 class QFrame;
 class QButtonGroup;
 class QRadioButton;
 class QPushButton;
 class QListBox;
 class QListBoxItem;
 class QLabel;
 class QCheckBox;
 
 class FilterEdit_base : public QWidget
 {
     Q_OBJECT
 
 public:
     FilterEdit_base( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~FilterEdit_base();
 
     QFrame* mCriteriaFrame;
     QButtonGroup* ButtonGroup1;
     QRadioButton* mCatShowCheck;
     QRadioButton* mCatHideCheck;
     QPushButton* mCatEditButton;
     QListBox* mCatList;
     QLabel* textLabel1;
     QCheckBox* mRecurringCheck;
     QCheckBox* mCompletedCheck;
     QLabel* textLabel1_2;
     QCheckBox* mEventCheck;
     QCheckBox* mTodoCheck;
     QCheckBox* mJournalCheck;
     QLabel* textLabel2;
     QCheckBox* mPublicCheck;
     QCheckBox* mPrivateCheck;
     QCheckBox* mConfidentialCheck;
 
-public slots:
-    virtual void updateFilter();
-
 protected:
     QVBoxLayout* FilterEdit_baseLayout;
     QVBoxLayout* mCriteriaFrameLayout;
     QGridLayout* ButtonGroup1Layout;
     QHBoxLayout* layout4;
     QHBoxLayout* layout7;
     QHBoxLayout* layout9;
     QHBoxLayout* layout2;
 
 protected slots:
     virtual void languageChange();
 
 };
 
 #endif // FILTEREDIT_BASE_H
diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui
index 2436f57..b093b00 100644
--- a/korganizer/filteredit_base.ui
+++ b/korganizer/filteredit_base.ui
@@ -1,250 +1,244 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>FilterEdit_base</class>
 <widget class="QWidget">
     <property name="name">
         <cstring>FilterEdit_base</cstring>
     </property>
     <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>351</width>
-            <height>275</height>
+            <width>324</width>
+            <height>281</height>
         </rect>
     </property>
     <property name="caption">
         <string>FilterEditor</string>
     </property>
     <property name="layoutMargin" stdset="0">
     </property>
     <property name="layoutSpacing" stdset="0">
     </property>
     <vbox>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
         <property name="margin">
             <number>0</number>
         </property>
         <property name="spacing">
             <number>0</number>
         </property>
         <widget class="QFrame">
             <property name="name">
                 <cstring>mCriteriaFrame</cstring>
             </property>
             <property name="frameShape">
                 <enum>StyledPanel</enum>
             </property>
             <property name="frameShadow">
                 <enum>Raised</enum>
             </property>
             <property name="layoutMargin" stdset="0">
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
                 <property name="margin">
                     <number>3</number>
                 </property>
                 <property name="spacing">
                     <number>2</number>
                 </property>
                 <widget class="QButtonGroup">
                     <property name="name">
                         <cstring>ButtonGroup1</cstring>
                     </property>
                     <property name="title">
                         <string>Categories</string>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <property name="margin">
                             <number>6</number>
                         </property>
                         <property name="spacing">
                             <number>6</number>
                         </property>
                         <widget class="QLayoutWidget" row="0" column="0">
                             <property name="name">
                                 <cstring>layout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
                                 <widget class="QRadioButton">
                                     <property name="name">
                                         <cstring>mCatShowCheck</cstring>
                                     </property>
                                     <property name="text">
                                         <string>Include</string>
                                     </property>
                                 </widget>
                                 <widget class="QRadioButton">
                                     <property name="name">
                                         <cstring>mCatHideCheck</cstring>
                                     </property>
                                     <property name="text">
                                         <string>Exclude</string>
                                     </property>
                                 </widget>
                                 <widget class="QPushButton">
                                     <property name="name">
                                         <cstring>mCatEditButton</cstring>
                                     </property>
                                     <property name="text">
                                         <string>Edit Selection...</string>
                                     </property>
                                 </widget>
                             </hbox>
                         </widget>
                         <widget class="QListBox" row="1" column="0">
                             <property name="name">
                                 <cstring>mCatList</cstring>
                             </property>
                         </widget>
                     </grid>
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
                         <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <widget class="QLabel">
                             <property name="name">
                                 <cstring>textLabel1</cstring>
                             </property>
                             <property name="text">
                                 <string>Exclude</string>
                             </property>
                         </widget>
                         <widget class="QCheckBox">
                             <property name="name">
                                 <cstring>mRecurringCheck</cstring>
                             </property>
                             <property name="text">
                                 <string>recurring events</string>
                             </property>
                         </widget>
                         <widget class="QCheckBox">
                             <property name="name">
                                 <cstring>mCompletedCheck</cstring>
                             </property>
                             <property name="text">
                                 <string>completed to-dos</string>
                             </property>
                         </widget>
                     </hbox>
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
                         <cstring>layout9</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <widget class="QLabel">
                             <property name="name">
                                 <cstring>textLabel1_2</cstring>
                             </property>
                             <property name="text">
                                 <string>Exclude</string>
                             </property>
                         </widget>
                         <widget class="QCheckBox">
                             <property name="name">
                                 <cstring>mEventCheck</cstring>
                             </property>
                             <property name="text">
                                 <string>events</string>
                             </property>
                         </widget>
                         <widget class="QCheckBox">
                             <property name="name">
                                 <cstring>mTodoCheck</cstring>
                             </property>
                             <property name="text">
                                 <string>todos</string>
                             </property>
                         </widget>
                         <widget class="QCheckBox">
                             <property name="name">
                                 <cstring>mJournalCheck</cstring>
                             </property>
                             <property name="text">
                                 <string>journals</string>
                             </property>
                         </widget>
                     </hbox>
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
                         <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
                         <property name="margin">
                             <number>0</number>
                         </property>
                         <property name="spacing">
                             <number>0</number>
                         </property>
                         <widget class="QLabel">
                             <property name="name">
                                 <cstring>textLabel2</cstring>
                             </property>
                             <property name="text">
                                 <string>Include</string>
                             </property>
                         </widget>
                         <widget class="QCheckBox">
                             <property name="name">
                                 <cstring>mPublicCheck</cstring>
                             </property>
                             <property name="text">
                                 <string>public</string>
                             </property>
                         </widget>
                         <widget class="QCheckBox">
                             <property name="name">
                                 <cstring>mPrivateCheck</cstring>
                             </property>
                             <property name="text">
                                 <string>private</string>
                             </property>
                         </widget>
                         <widget class="QCheckBox">
                             <property name="name">
                                 <cstring>mConfidentialCheck</cstring>
                             </property>
                             <property name="text">
                                 <string>confidential</string>
                             </property>
                             <property name="checked">
                                 <bool>false</bool>
                             </property>
                         </widget>
                     </hbox>
                 </widget>
             </vbox>
         </widget>
     </vbox>
 </widget>
-<includes>
-    <include location="local" impldecl="in implementation">filteredit_base.ui.h</include>
-</includes>
-<slots>
-    <slot>updateFilter()</slot>
-</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 628d84e..c2602b2 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,193 +1,193 @@
         TEMPLATE= app
         CONFIG  = qt warn_on 
         TARGET  = kopi
 OBJECTS_DIR = _obj/
 MOC_DIR = _moc
 DESTDIR= ../bin
 
 include( ../variables.pri )
 
 INCLUDEPATH += ../microkde  ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim
 #../qtcompat
 DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL
 DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
 #KORG_NOPRINTER KORG_NOKABC 
 DEFINES += KORG_NOLVALTERNATION
 DEFINES +=  DESKTOP_VERSION
 unix : {
 LIBS += ../bin/libmicrokdepim.so
 LIBS += ../bin/libmicrokcal.so
 LIBS += ../bin/libmicrokde.so
 LIBS += ../bin/libmicrokabc.so
 #LIBS += -lbluetooth
 #LIBS += -lsdp
 
 #LIBS += -lldap
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 RC_FILE = winicons.rc
 DEFINES += _WIN32_  
 LIBS += ../bin/microkdepim.lib
 LIBS += ../bin/microkcal.lib
 LIBS += ../bin/microkde.lib
 LIBS += ../bin/microkabc.lib
 LIBS += ../libical/lib/ical.lib
 LIBS += ../libical/lib/icalss.lib
 #LIBS += atls.lib
 LIBS += mfc71u.lib
 QMAKE_LINK += /NODEFAULTLIB:LIBC
 #QMAKE_LINK += /NODEFAULTLIB:MSVCRT
 #QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 }
 
  
 INTERFACES = kofilterview_base.ui 
-# filteredit_base.ui
+#filteredit_base.ui
 
 # kdateedit.h \
 
 HEADERS = \
  filteredit_base.h \
  alarmclient.h \
  calendarview.h \
  customlistviewitem.h \
  datenavigator.h \
  docprefs.h \
  filtereditdialog.h \
  incomingdialog.h \
  incomingdialog_base.h \
  interfaces/korganizer/baseview.h \
  interfaces/korganizer/calendarviewbase.h \
  journalentry.h \
  kdatenavigator.h \
  koagenda.h \
  koagendaitem.h \
  koagendaview.h \
  kocounterdialog.h \
  kodaymatrix.h \
  kodialogmanager.h \
  koeditordetails.h \
  koeditorgeneral.h \
  koeditorgeneralevent.h \
  koeditorgeneraltodo.h \
  koeditorrecurrence.h \
  koeventeditor.h \
  koeventpopupmenu.h \
  koeventview.h \
  koeventviewer.h \
  koeventviewerdialog.h \
  kofilterview.h \
  koglobals.h \
  koincidenceeditor.h \
  kojournalview.h \
  kolistview.h \
  kolocationbox.h \
  komonthview.h \
  koprefs.h \
  koprefsdialog.h \
  kotimespanview.h \
  kotodoeditor.h \
  kotodoview.h \
  kotodoviewitem.h \
  koviewmanager.h \
  kowhatsnextview.h \
  ktimeedit.h \
  lineview.h \
  mainwindow.h \
  navigatorbar.h \
  outgoingdialog.h \
  outgoingdialog_base.h \
  publishdialog.h \
  publishdialog_base.h \
  savetemplatedialog.h \
  searchdialog.h \
  simplealarmclient.h \
  statusdialog.h \
  timeline.h \
  timespanview.h \
  version.h \
  ../kalarmd/alarmdialog.h \
 
 
 SOURCES = \ 
 filteredit_base.cpp \
  calendarview.cpp \
  datenavigator.cpp \
  docprefs.cpp \
  filtereditdialog.cpp \
  incomingdialog.cpp \
  incomingdialog_base.cpp \
  journalentry.cpp \
  kdatenavigator.cpp \
  koagenda.cpp \
  koagendaitem.cpp \
  koagendaview.cpp \
  kocounterdialog.cpp \
  kodaymatrix.cpp \
  kodialogmanager.cpp \
  koeditordetails.cpp \
  koeditorgeneral.cpp \
  koeditorgeneralevent.cpp \
  koeditorgeneraltodo.cpp \
  koeditorrecurrence.cpp \
  koeventeditor.cpp \
  koeventpopupmenu.cpp \
  koeventview.cpp \
  koeventviewer.cpp \
  koeventviewerdialog.cpp \
  kofilterview.cpp \
  koglobals.cpp \
  koincidenceeditor.cpp \
  kojournalview.cpp \
  kolistview.cpp \
  kolocationbox.cpp \
  komonthview.cpp \
  koprefs.cpp \
  koprefsdialog.cpp \
  kotimespanview.cpp \
  kotodoeditor.cpp \
  kotodoview.cpp \
  kotodoviewitem.cpp \
  koviewmanager.cpp \
  kowhatsnextview.cpp \
  ktimeedit.cpp \
  lineview.cpp \
  main.cpp \
  mainwindow.cpp \
  navigatorbar.cpp \
  outgoingdialog.cpp \
  outgoingdialog_base.cpp \
  publishdialog.cpp \
  publishdialog_base.cpp \
  savetemplatedialog.cpp \
  searchdialog.cpp \
  simplealarmclient.cpp \
  statusdialog.cpp \
  timeline.cpp \
  timespanview.cpp \
  ../kalarmd/alarmdialog.cpp
 
 HEADERS += calprintbase.h calprinter.h calprintplugins.h cellitem.h
 INTERFACES += calprintdayconfig_base.ui \
               calprintmonthconfig_base.ui \
               calprinttodoconfig_base.ui \
               calprintweekconfig_base.ui
 SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp
 
 
 
 win32: {
 HEADERS += ../outport/msoutl9.h \
  koimportoldialog.h 
 
 
 SOURCES += ../outport/msoutl9.cpp \
  koimportoldialog.cpp 
 
 
 }