Commit c97cf840 authored by Bertjan Broeksema's avatar Bertjan Broeksema

Merged revisions 1158228 via svnmerge from

svn+ssh://bbroeksema@svn.kde.org/home/kde/branches/work/kdepim_kcalcore

........
  r1158228 | bbroeksema | 2010-08-02 12:05:37 +0200 (Mon, 02 Aug 2010) | 4 lines
  
  - Use KPIM::Button2 for buttons
  - Fix signal/slot connection to make the event creation dialog disapear when
    clicking ok.
........

svn path=/trunk/KDE/kdepim/mobile/; revision=1158232
parent c154466a
......@@ -100,7 +100,7 @@ KPIM.MainView {
Flickable {
anchors.top: parent.top
anchors.bottom: cancelButton.top
anchors.bottom: collectionCombo.top
anchors.left: parent.left
anchors.right: parent.right
......@@ -128,22 +128,20 @@ KPIM.MainView {
height: parent.height / 6;
}
KPIM.Button {
KPIM.Button2 {
id: cancelButton
anchors.bottom: parent.bottom;
anchors.right: okButton.left;
width: 100;
height: parent.height / 6;
buttonText: KDE.i18n( "Cancel" );
onClicked: window.cancel();
}
KPIM.Button {
KPIM.Button2 {
id: okButton;
anchors.bottom: parent.bottom;
anchors.right: parent.right;
width: 100;
height: parent.height / 6;
buttonText: KDE.i18n( "Ok" );
onClicked: window.save();
}
......
......@@ -65,10 +65,10 @@ IncidenceView::IncidenceView( QWidget* parent )
mItem.setPayload<KCal::Incidence::Ptr>( KCal::Incidence::Ptr( new KCal::Event ) );
mItem.setMimeType( IncidenceMimeTypeVisitor::eventMimeType() );
connect( mItemManager, SIGNAL(itemSaveFinished()),
SLOT(slotSaveFinished() ) );
connect( mItemManager, SIGNAL(itemSaveFailed(QString)),
SLOT(slotSaveFailed(QString) ) );
connect( mItemManager, SIGNAL(itemSaveFinished(Akonadi::EditorItemManager::SaveAction)),
SLOT(slotSaveFinished(Akonadi::EditorItemManager::SaveAction) ) );
connect( mItemManager, SIGNAL(itemSaveFailed(Akonadi::EditorItemManager::SaveAction, QString)),
SLOT(slotSaveFailed(Akonadi::EditorItemManager::SaveAction, QString) ) );
}
IncidenceView::~IncidenceView()
......@@ -216,12 +216,12 @@ void IncidenceView::save()
mItemManager->save();
}
void IncidenceView::slotSaveFinished()
void IncidenceView::slotSaveFinished( Akonadi::EditorItemManager::SaveAction action )
{
deleteLater();
}
void IncidenceView::slotSaveFailed( const QString &message )
void IncidenceView::slotSaveFailed( Akonadi::EditorItemManager::SaveAction action, const QString &message )
{
QPointer<QMessageBox> dlg = new QMessageBox; //krazy:exclude=qclasses
dlg->setIcon( QMessageBox::Warning );
......
......@@ -69,8 +69,8 @@ class MOBILEUI_EXPORT IncidenceView : public KDeclarativeFullScreenView, public
void cancel(); /// Cancel clicked in the user interface
private slots:
void slotSaveFinished();
void slotSaveFailed( const QString &message );
void slotSaveFinished(Akonadi::EditorItemManager::SaveAction action );
void slotSaveFailed( Akonadi::EditorItemManager::SaveAction action, const QString &message );
private:
QDate mActiveDate;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment