[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim/Applications/15.08] libksieve/ksieveui/editor: Fix enable/disable actions
From:       Montel Laurent <montel () kde ! org>
Date:       2015-07-27 6:40:13
Message-ID: E1ZJc57-0007xy-TE () scm ! kde ! org
[Download RAW message or body]

Git commit b74f40e6584c7fa7f0cdd688203f65c8384e20e5 by Montel Laurent.
Committed on 27/07/2015 at 06:40.
Pushed by mlaurent into branch 'Applications/15.08'.

Fix enable/disable actions

M  +63   -0    libksieve/ksieveui/editor/autotests/sieveeditormenubartest.cpp
M  +1    -0    libksieve/ksieveui/editor/autotests/sieveeditormenubartest.h
M  +17   -0    libksieve/ksieveui/editor/sieveeditormenubar.cpp
M  +1    -0    libksieve/ksieveui/editor/sieveeditormenubar.h
M  +2    -0    libksieve/ksieveui/editor/sieveeditorwidget.cpp
M  +1    -0    libksieve/ksieveui/editor/sieveeditorwidget.h

http://commits.kde.org/kdepim/b74f40e6584c7fa7f0cdd688203f65c8384e20e5

diff --git a/libksieve/ksieveui/editor/autotests/sieveeditormenubartest.cpp \
b/libksieve/ksieveui/editor/autotests/sieveeditormenubartest.cpp index \
                dca6a07..eb1f7b9 100644
--- a/libksieve/ksieveui/editor/autotests/sieveeditormenubartest.cpp
+++ b/libksieve/ksieveui/editor/autotests/sieveeditormenubartest.cpp
@@ -33,6 +33,69 @@ SieveEditorMenuBarTest::~SieveEditorMenuBarTest()
 
 }
 
+void SieveEditorMenuBarTest::shouldDisableActions()
+{
+    KSieveUi::SieveEditorMenuBar bar;
+    QVERIFY(bar.goToLineAction()->isEnabled());
+    QVERIFY(bar.findAction()->isEnabled());
+    QVERIFY(bar.replaceAction()->isEnabled());
+    QVERIFY(bar.pasteAction()->isEnabled());
+    QVERIFY(bar.zoomInAction()->isEnabled());
+    QVERIFY(bar.zoomOutAction()->isEnabled());
+    QVERIFY(bar.editorMenu()->isEnabled());
+    QVERIFY(bar.toolsMenu()->isEnabled());
+    QVERIFY(bar.fileMenu()->isEnabled());
+    QVERIFY(bar.commentCodeAction()->isEnabled());
+    QVERIFY(bar.uncommentCodeAction()->isEnabled());
+    QVERIFY(!bar.undoAction()->isEnabled());
+    QVERIFY(!bar.redoAction()->isEnabled());
+    QVERIFY(!bar.copyAction()->isEnabled());
+    QVERIFY(bar.pasteAction()->isEnabled());
+    QVERIFY(!bar.cutAction()->isEnabled());
+    QVERIFY(bar.selectAllAction()->isEnabled());
+
+    bar.setEditorMode(false);
+    QVERIFY(!bar.goToLineAction()->isEnabled());
+    QVERIFY(!bar.findAction()->isEnabled());
+    QVERIFY(!bar.replaceAction()->isEnabled());
+    QVERIFY(!bar.pasteAction()->isEnabled());
+    QVERIFY(!bar.zoomInAction()->isEnabled());
+    QVERIFY(!bar.zoomOutAction()->isEnabled());
+    QVERIFY(!bar.selectAllAction()->isEnabled());
+    QVERIFY(bar.editorMenu()->isEnabled());
+    QVERIFY(bar.toolsMenu()->isEnabled());
+    QVERIFY(bar.fileMenu()->isEnabled());
+    QVERIFY(!bar.commentCodeAction()->isEnabled());
+    QVERIFY(!bar.uncommentCodeAction()->isEnabled());
+    QVERIFY(!bar.undoAction()->isEnabled());
+    QVERIFY(!bar.redoAction()->isEnabled());
+    QVERIFY(!bar.copyAction()->isEnabled());
+    QVERIFY(!bar.pasteAction()->isEnabled());
+    QVERIFY(!bar.cutAction()->isEnabled());
+    QVERIFY(!bar.selectAllAction()->isEnabled());
+
+    bar.setEditorMode(true);
+    QVERIFY(bar.goToLineAction()->isEnabled());
+    QVERIFY(bar.findAction()->isEnabled());
+    QVERIFY(bar.replaceAction()->isEnabled());
+    QVERIFY(bar.pasteAction()->isEnabled());
+    QVERIFY(bar.zoomInAction()->isEnabled());
+    QVERIFY(bar.zoomOutAction()->isEnabled());
+    QVERIFY(bar.selectAllAction()->isEnabled());
+    QVERIFY(bar.editorMenu()->isEnabled());
+    QVERIFY(bar.toolsMenu()->isEnabled());
+    QVERIFY(bar.fileMenu()->isEnabled());
+    QVERIFY(bar.commentCodeAction()->isEnabled());
+    QVERIFY(bar.uncommentCodeAction()->isEnabled());
+    QVERIFY(bar.undoAction()->isEnabled());
+    QVERIFY(bar.redoAction()->isEnabled());
+    QVERIFY(bar.copyAction()->isEnabled());
+    QVERIFY(bar.pasteAction()->isEnabled());
+    QVERIFY(bar.cutAction()->isEnabled());
+    QVERIFY(bar.selectAllAction()->isEnabled());
+
+}
+
 void SieveEditorMenuBarTest::shouldHaveDefaultValue()
 {
     KSieveUi::SieveEditorMenuBar bar;
diff --git a/libksieve/ksieveui/editor/autotests/sieveeditormenubartest.h \
b/libksieve/ksieveui/editor/autotests/sieveeditormenubartest.h index 4a4a9a9..7e73689 \
                100644
--- a/libksieve/ksieveui/editor/autotests/sieveeditormenubartest.h
+++ b/libksieve/ksieveui/editor/autotests/sieveeditormenubartest.h
@@ -29,6 +29,7 @@ public:
 private Q_SLOTS:
     void shouldHaveDefaultValue();
     void shouldEmitSignals();
+    void shouldDisableActions();
 };
 
 #endif // SIEVEEDITORMENUBARTEST_H
diff --git a/libksieve/ksieveui/editor/sieveeditormenubar.cpp \
b/libksieve/ksieveui/editor/sieveeditormenubar.cpp index f3cdac8..8f47781 100644
--- a/libksieve/ksieveui/editor/sieveeditormenubar.cpp
+++ b/libksieve/ksieveui/editor/sieveeditormenubar.cpp
@@ -35,6 +35,23 @@ SieveEditorMenuBar::~SieveEditorMenuBar()
 
 }
 
+void SieveEditorMenuBar::setEditorMode(bool editorMode)
+{
+    mGoToLine->setEnabled(editorMode);
+    mFindAction->setEnabled(editorMode);
+    mReplaceAction->setEnabled(editorMode);
+    mUndoAction->setEnabled(editorMode);
+    mRedoAction->setEnabled(editorMode);
+    mCopyAction->setEnabled(editorMode);
+    mPasteAction->setEnabled(editorMode);
+    mCutAction->setEnabled(editorMode);
+    mSelectAllAction->setEnabled(editorMode);
+    mCommentCodeAction->setEnabled(editorMode);
+    mUncommentCodeAction->setEnabled(editorMode);
+    mZoomInAction->setEnabled(editorMode);
+    mZoomOutAction->setEnabled(editorMode);
+}
+
 void SieveEditorMenuBar::initActions()
 {
     mGoToLine = new QAction(i18n("Go to Line"), this);
diff --git a/libksieve/ksieveui/editor/sieveeditormenubar.h \
b/libksieve/ksieveui/editor/sieveeditormenubar.h index 41229bf..0feadf8 100644
--- a/libksieve/ksieveui/editor/sieveeditormenubar.h
+++ b/libksieve/ksieveui/editor/sieveeditormenubar.h
@@ -54,6 +54,7 @@ public:
     QAction *zoomOutAction() const;
 
 public Q_SLOTS:
+    void setEditorMode(bool editorMode);
     void slotUndoAvailable(bool b);
     void slotRedoAvailable(bool b);
     void slotCopyAvailable(bool b);
diff --git a/libksieve/ksieveui/editor/sieveeditorwidget.cpp \
b/libksieve/ksieveui/editor/sieveeditorwidget.cpp index 1d94aca1..d698a9e 100644
--- a/libksieve/ksieveui/editor/sieveeditorwidget.cpp
+++ b/libksieve/ksieveui/editor/sieveeditorwidget.cpp
@@ -94,6 +94,7 @@ SieveEditorWidget::SieveEditorWidget(bool useMenuBar, QWidget \
*parent)  
     if (useMenuBar) {
         SieveEditorMenuBar *menuBar = new SieveEditorMenuBar;
+        connect(this, &SieveEditorWidget::changeModeEditor, menuBar, \
                &SieveEditorMenuBar::setEditorMode);
         connect(menuBar, &SieveEditorMenuBar::copy, this, &SieveEditorWidget::copy);
         connect(menuBar, &SieveEditorMenuBar::find, this, &SieveEditorWidget::find);
         connect(menuBar, &SieveEditorMenuBar::replace, this, \
&SieveEditorWidget::replace); @@ -352,6 +353,7 @@ void \
                SieveEditorWidget::changeMode(EditorMode mode)
             mCheckSyntax->setEnabled(!mTextModeWidget->currentscript().isEmpty());
         }
         Q_EMIT modeEditorChanged(mode);
+        changeModeEditor((mMode == TextMode));
         changeSwitchButtonText();
     }
 }
diff --git a/libksieve/ksieveui/editor/sieveeditorwidget.h \
b/libksieve/ksieveui/editor/sieveeditorwidget.h index 5721d5f..347d5e3 100644
--- a/libksieve/ksieveui/editor/sieveeditorwidget.h
+++ b/libksieve/ksieveui/editor/sieveeditorwidget.h
@@ -112,6 +112,7 @@ Q_SIGNALS:
     void undoAvailable(bool);
     void redoAvailable(bool);
     void copyAvailable(bool);
+    void changeModeEditor(bool);
 private:
     void changeSwitchButtonText();
     void changeMode(EditorMode mode);


[prev in list] [next in list] [prev in thread] [next in thread]