-rw-r--r-- | korganizer/filteredit_base.cpp | 5 | ||||
-rw-r--r-- | korganizer/filteredit_base.h | 5 | ||||
-rw-r--r-- | korganizer/filteredit_base.ui | 10 | ||||
-rw-r--r-- | korganizer/korganizer.pro | 2 |
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,47 +1,46 @@ /**************************************************************************** ** 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 ); @@ -86,49 +85,49 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl ) 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" ) ); 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,28 +1,28 @@ /**************************************************************************** ** 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; @@ -31,42 +31,39 @@ 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,36 +1,36 @@ <!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"> @@ -219,32 +219,26 @@ <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 @@ -25,49 +25,49 @@ LIBS += ../bin/libmicrokabc.so #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 \ |