fixxx

2 files changed, 49 insertions, 11 deletions

diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index ce2880a..9709324 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -145,8 +145,8 @@ void KOCalEditView::selectStdCal( int id, bool b )
         }
         return;
     }
-    KOCalCheckButton* sen = (KOCalCheckButton*) sender();
-    KOCalCheckButton* it = mStdandardB.first();
+    KOCalRadioButton* sen = (KOCalRadioButton*) sender();
+    KOCalRadioButton* it = mStdandardB.first();
     while ( it ) {
         if ( it->isChecked() ) {
             if ( it != sen ) {
@@ -236,7 +236,9 @@ void KOCalEditView::readConfig()
     QPushButton * addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
     mainLayout->addWidget( addBut,0,0 );
-    addBut->setPixmap ( SmallIcon("greenhook16"));
+    addBut->setText( "D");
+    connect(addBut,SIGNAL(clicked()),SLOT(defaultInfo()));
+    //addBut->setPixmap ( SmallIcon("greenhook16"));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
     int max = addBut->sizeHint().height();
     addBut = new QPushButton ( mw );
@@ -290,14 +292,14 @@ void KOCalEditView::readConfig()
     int row = 1;
     while ( kkf ) {
         int iii = 0;
-        KOCalCheckButton* cb = new KOCalCheckButton( mw );
-        mainLayout->addWidget( cb,row,0 );mStdandardB.append( cb );
-        cb->setChecked( kkf->isStandard );
-        cb->setNum( kkf->mCalNumber );
-        connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) );
+        KOCalRadioButton* rb = new KOCalRadioButton( mw );
+        mainLayout->addWidget( rb,row,0 );mStdandardB.append( rb );
+        rb->setChecked( kkf->isStandard );
+        rb->setNum( kkf->mCalNumber );
+        connect (rb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) );
         if ( kkf->mErrorOnLoad ||  kkf->isReadOnly )
-            cb->setEnabled( false );
-        cb = new KOCalCheckButton( mw );
+            rb->setEnabled( false );
+        KOCalCheckButton* cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,++iii );mEnabledB.append( cb );
         cb->setChecked( kkf->isEnabled );
         cb->setNum( kkf->mCalNumber );
@@ -347,6 +349,12 @@ void KOCalEditView::readConfig()
     mw->show();
 
 }
+
+
+void KOCalEditView::defaultInfo()
+{
+    KMessageBox::information( this,  i18n("Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.") ); 
+}
 void KOCalEditView::addCal()
 {
     bool tryagain = true;
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index 5495d60..b57a6e9 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -25,6 +25,7 @@
 
 #include <qstring.h>
 #include <qcheckbox.h>
+#include <qradiobutton.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qdialog.h>
@@ -148,6 +149,34 @@ private slots :
     void bottonClicked( bool b) { if ( mNumber > 0 ) emit selectNum ( mNumber , b); }
 };
 
+class KOCalRadioButton : public QRadioButton
+{
+    Q_OBJECT
+  public:
+    KOCalRadioButton( QWidget *parent=0, const char *name=0 ) :
+      QRadioButton( parent, name) 
+    {
+      connect( this, SIGNAL( toggled ( bool ) ),
+               SLOT( bottonClicked( bool ) )); 
+      mNumber = -1;
+      setFocusPolicy(NoFocus); 
+      //setMaximumWidth( 10 );
+
+    }
+    void setNum ( int num ) {mNumber = num; }
+    signals:
+    void selectNum ( int, bool );
+private: 
+    int mNumber;
+    void keyPressEvent ( QKeyEvent * e )
+    {
+        e->ignore();     
+    }
+
+private slots :
+    void bottonClicked( bool b) { if ( mNumber > 0 ) emit selectNum ( mNumber , b); }
+};
+
 
 
 class KOFilterView : public KOFilterView_base
@@ -194,6 +223,7 @@ class KOCalEditView : public QScrollView
     void deleteCal(int) ;
     void infoCal(int) ;
     void readConfig(); 
+    void defaultInfo();
   signals:
     void alarmEnabled ( int cal, bool enable );
     void calendarEnabled ( int cal, bool enable );
@@ -206,7 +236,7 @@ class KOCalEditView : public QScrollView
   private:
     QWidget *mw;
     void toggleList ( QPtrList<KOCalCheckButton> );
-    QPtrList<KOCalCheckButton> mStdandardB;
+    QPtrList<KOCalRadioButton> mStdandardB;
     QPtrList<KOCalCheckButton> mEnabledB;
     QPtrList<KOCalCheckButton> mAlarmB;
     QPtrList<KOCalCheckButton> mROB;