make the year popup selector working again, and looking like the kdatepicker one

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=634846

diff --git a/extdate/extdatepicker.cpp b/extdate/extdatepicker.cpp
index 99830db132dca5f2f7993f03e43fb64b0c38e214..2bce5d7516978411a1278542580117601f2fdb10 100644 (file)
--- a/extdate/extdatepicker.cpp
+++ b/extdate/extdatepicker.cpp
@@ -374,7 +374,7 @@ ExtDatePicker::selectYearClicked()
 {
 //  const ExtCalendarSystem * calendar = KGlobal::locale()->calendar();
 
-  if (selectYear->isChecked())
+  if (!selectYear->isChecked())
   {
     return;
   }
@@ -382,6 +382,7 @@ ExtDatePicker::selectYearClicked()
   int year;
   KPopupFrame* popup = new KPopupFrame(this);
   ExtDateInternalYearSelector* picker = new ExtDateInternalYearSelector(popup);
+  picker->setYear(d->calendar->year(table->getDate()));
   // -----
   picker->resize(picker->sizeHint());
   popup->setMainWidget(picker);
@@ -406,6 +407,7 @@ ExtDatePicker::selectYearClicked()
       KNotification::beep();
     }
   delete popup;
+  selectYear->setChecked(false);
 }
 
 void

diff --git a/extdate/extdatetbl.cpp b/extdate/extdatetbl.cpp
index a3e10a043faf9a579b809be6a60d4e3af0004dfb..021e9d7578d9b2eb57111b8d97ba9928ebda6dd2 100644 (file)
--- a/extdate/extdatetbl.cpp
+++ b/extdate/extdatetbl.cpp
@@ -891,7 +891,7 @@ KPopupFrame::KPopupFrame(QWidget* parent)
     result(0), // rejected
     main(0)
 {
-  setFrameShape(QFrame::NoFrame);
+  setFrameStyle(QFrame::Box | QFrame::Raised);
   setMidLineWidth(2);
 }
 
@@ -951,6 +951,9 @@ KPopupFrame::popup(const QPoint &pos)
   if (y < d.y())
     y = 0;
 
+  if (QLineEdit *edit = qobject_cast<QLineEdit*>(main))
+    edit->selectAll();
+
   // Pop the thingy up.
   move(x, y);
   show();
@@ -960,7 +963,7 @@ int
 KPopupFrame::exec(const QPoint& pos)
 {
   popup(pos);
-  repaint();
+  update();
   qApp->enter_loop();
   hide();
   return result;