Branch 'kolab/integration/4.13.0' - 2 commits - CMakeLists.txt messageviewer/widgets

Christian Mollekopf mollekopf at kolabsys.com
Sun Feb 1 22:33:45 CET 2015


 CMakeLists.txt                      |    2 +-
 messageviewer/widgets/eventedit.cpp |    2 +-
 messageviewer/widgets/noteedit.cpp  |    2 +-
 messageviewer/widgets/todoedit.cpp  |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 72a9d6e3749ac463cfa9586e284fa555b4f120f3
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Sun Feb 1 22:33:27 2015 +0100

    Prepare release of 4.13.0.1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53a83e3..87c1cf9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,7 +84,7 @@ endif()
 set(KDEPIM_VERSION_MAJOR 4)
 set(KDEPIM_VERSION_MINOR 13)
 set(KDEPIM_VERSION_PATCH 0)
-set(KDEPIM_VERSION_KOLAB 0)
+set(KDEPIM_VERSION_KOLAB 1)
 set(KDEPIM_VERSION ${KDEPIM_VERSION_MAJOR}.${KDEPIM_VERSION_MINOR}.${KDEPIM_VERSION_PATCH}.${KDEPIM_VERSION_KOLAB})
 
 


commit ff0acb3014fe98d2aaaa99ab7783774facfd225e
Author: Sandro Knauß <knauss at kolabsys.com>
Date:   Thu Jan 29 00:32:18 2015 +0100

    Show close button instead of cancel
    
    we want to create multiple to-dos/events out of one mail. the cancel
    button looks a little bit wired, so it is replaced with an close button.
    
    KOLAB: 4356

diff --git a/messageviewer/widgets/eventedit.cpp b/messageviewer/widgets/eventedit.cpp
index 0dd5ba1..334e1cd 100644
--- a/messageviewer/widgets/eventedit.cpp
+++ b/messageviewer/widgets/eventedit.cpp
@@ -139,7 +139,7 @@ EventEdit::EventEdit(QWidget *parent)
     connect(mOpenEditorButton, SIGNAL(clicked(bool)), this, SLOT(slotOpenEditor()));
     hbox->addWidget(mOpenEditorButton);
 
-    KPushButton *btn = new KPushButton(KStandardGuiItem::cancel());
+    KPushButton *btn = new KPushButton(KStandardGuiItem::close());
     btn->setObjectName(QLatin1String("close-button"));
 #ifndef QT_NO_ACCESSIBILITY
     btn->setAccessibleDescription(i18n("Close the widget for creating new events."));
diff --git a/messageviewer/widgets/noteedit.cpp b/messageviewer/widgets/noteedit.cpp
index 936052a..bcabf67 100644
--- a/messageviewer/widgets/noteedit.cpp
+++ b/messageviewer/widgets/noteedit.cpp
@@ -104,7 +104,7 @@ NoteEdit::NoteEdit(QWidget *parent)
     connect(mSaveButton, SIGNAL(clicked(bool)), this, SLOT(slotReturnPressed()));
     hbox->addWidget(mSaveButton);
 
-    KPushButton *btn = new KPushButton(KStandardGuiItem::cancel());
+    KPushButton *btn = new KPushButton(KStandardGuiItem::close());
     btn->setObjectName(QLatin1String("close-button"));
 #ifndef QT_NO_ACCESSIBILITY
     btn->setAccessibleDescription(i18n("Close the widget for creating new notes."));
diff --git a/messageviewer/widgets/todoedit.cpp b/messageviewer/widgets/todoedit.cpp
index 3db7f89..4625c7b 100644
--- a/messageviewer/widgets/todoedit.cpp
+++ b/messageviewer/widgets/todoedit.cpp
@@ -111,7 +111,7 @@ TodoEdit::TodoEdit(QWidget *parent)
     connect(mOpenEditorButton, SIGNAL(clicked(bool)), this, SLOT(slotOpenEditor()));
     hbox->addWidget(mOpenEditorButton);
 
-    KPushButton *btn = new KPushButton(KStandardGuiItem::cancel());
+    KPushButton *btn = new KPushButton(KStandardGuiItem::close());
     btn->setObjectName(QLatin1String("close-button"));
 #ifndef QT_NO_ACCESSIBILITY
     btn->setAccessibleDescription(i18n("Close the widget for creating new todos."));




More information about the commits mailing list