1 files changed, 21 insertions, 22 deletions

diff --git a/src/frontend/displaywindow/cplainwritewindow.cpp b/src/frontend/displaywindow/cplainwritewindow.cpp
index dc97aec..6394998 100644
--- a/src/frontend/displaywindow/cplainwritewindow.cpp
+++ b/src/frontend/displaywindow/cplainwritewindow.cpp
@@ -7,25 +7,22 @@
 *
 **********/
 
-#include "cplainwritewindow.h"
-#include "btactioncollection.h"
+#include "frontend/displaywindow/cplainwritewindow.h"
 
+#include <QAction>
+#include <QDebug>
+#include <QRegExp>
+#include <QToolBar>
+#include "backend/config/cbtconfig.h"
+#include "backend/keys/cswordkey.h"
 #include "frontend/display/cwritedisplay.h"
-
+#include "frontend/displaywindow/btactioncollection.h"
 #include "frontend/keychooser/ckeychooser.h"
 #include "frontend/profile/cprofilewindow.h"
-#include "backend/config/cbtconfig.h"
-
-#include "backend/keys/cswordkey.h"
-
 #include "util/cresmgr.h"
-#include "util/directoryutil.h"
+#include "util/directory.h"
+#include "util/dialogutil.h"
 
-#include <QRegExp>
-#include <QToolBar>
-#include <QMessageBox>
-#include <QDebug>
-#include <QAction>
 
 using namespace Profile;
 
@@ -54,9 +51,11 @@ void CPlainWriteWindow::initView() {
 }
 
 void CPlainWriteWindow::initToolbars() {
+    namespace DU = util::directory;
+
     m_actions.syncWindow = new QAction(
         //KIcon(CResMgr::displaywindows::commentaryWindow::syncWindow::icon),
-        util::filesystem::DirectoryUtil::getIcon(CResMgr::displaywindows::commentaryWindow::syncWindow::icon),
+        DU::getIcon(CResMgr::displaywindows::commentaryWindow::syncWindow::icon),
         tr("Sync with active Bible"),
         actionCollection()
     );
@@ -69,7 +68,7 @@ void CPlainWriteWindow::initToolbars() {
 
     m_actions.saveText = new QAction(
         //KIcon(CResMgr::displaywindows::writeWindow::saveText::icon),
-        util::filesystem::DirectoryUtil::getIcon(CResMgr::displaywindows::writeWindow::saveText::icon),
+        DU::getIcon(CResMgr::displaywindows::writeWindow::saveText::icon),
         tr("Save text"),
         actionCollection()
     );
@@ -82,7 +81,7 @@ void CPlainWriteWindow::initToolbars() {
 
     m_actions.deleteEntry = new QAction(
         //KIcon(CResMgr::displaywindows::writeWindow::deleteEntry::icon),
-        util::filesystem::DirectoryUtil::getIcon(CResMgr::displaywindows::writeWindow::deleteEntry::icon),
+        DU::getIcon(CResMgr::displaywindows::writeWindow::deleteEntry::icon),
         tr("Delete current entry"),
         actionCollection()
     );
@@ -95,7 +94,7 @@ void CPlainWriteWindow::initToolbars() {
 
     m_actions.restoreText = new QAction(
         //KIcon(CResMgr::displaywindows::writeWindow::restoreText::icon),
-        util::filesystem::DirectoryUtil::getIcon(CResMgr::displaywindows::writeWindow::restoreText::icon),
+        DU::getIcon(CResMgr::displaywindows::writeWindow::restoreText::icon),
         tr("Restore original text"),
         actionCollection()
     );
@@ -142,11 +141,11 @@ void CPlainWriteWindow::saveCurrentText( const QString& /*key*/ ) {
         textChanged();
     }
     else {
-        QMessageBox::critical( this, tr("Module not writable"),
-                               QString::fromLatin1("<qt><B>%1</B><BR>%2</qt>")
-                               .arg( tr("Module is not writable.") )
-                               .arg( tr("Either the module may not be edited, or "
-                                        "you do not have write permission.") ) );
+        util::showCritical( this, tr("Module not writable"),
+                            QString::fromLatin1("<qt><b>%1</b><br/>%2</qt>")
+                            .arg( tr("Module is not writable.") )
+                            .arg( tr("Either the module may not be edited, or "
+                                     "you do not have write permission.") ) );
     }
 }