SVN_SILENT made messages (.desktop file)

[dolphin.git] / src / commenteditwidget.cpp

diff --git a/src/commenteditwidget.cpp b/src/commenteditwidget.cpp
index 3b98d44d7b8d659e3ac208529558ce8d1e30ccbf..a55adbea426972839b33d8b3e3f80d0bb2863453 100644 (file)
--- a/src/commenteditwidget.cpp
+++ b/src/commenteditwidget.cpp
@@ -19,7 +19,6 @@
 
 #include "commenteditwidget.h"
 
 
 #include "commenteditwidget.h"
 

-#include <QtGui/QTextEdit>

 #include <QtGui/QToolButton>
 #include <QtGui/QVBoxLayout>
 #include <QtCore/QEventLoop>
 #include <QtGui/QToolButton>
 #include <QtGui/QVBoxLayout>
 #include <QtCore/QEventLoop>


@@ -33,6 +32,7 @@
 #include <KDialog>
 #include <KLocale>
 #include <KDebug>
 #include <KDialog>
 #include <KLocale>
 #include <KDebug>

+#include <KTextEdit>

 
 
 class CommentEditWidget::Private
 
 
 class CommentEditWidget::Private


@@ -45,7 +45,7 @@ public:
 
     QEventLoop* eventLoop;
     bool success;
 
     QEventLoop* eventLoop;
     bool success;

-    QTextEdit* textEdit;
+    KTextEdit* textEdit;

     QToolButton* buttonSave;
     QToolButton* buttonCancel;
 
     QToolButton* buttonSave;
     QToolButton* buttonCancel;
 


@@ -112,7 +112,7 @@ CommentEditWidget::CommentEditWidget( QWidget* parent )
     setFrameStyle( QFrame::Box|QFrame::Plain );
     setWindowFlags( Qt::Popup );
 
     setFrameStyle( QFrame::Box|QFrame::Plain );
     setWindowFlags( Qt::Popup );
 

-    d->textEdit = new QTextEdit( this );
+    d->textEdit = new KTextEdit( this );

     d->textEdit->installEventFilter( this );
     QVBoxLayout* layout = new QVBoxLayout( this );
     layout->setMargin( 0 );
     d->textEdit->installEventFilter( this );
     QVBoxLayout* layout = new QVBoxLayout( this );
     layout->setMargin( 0 );


@@ -126,8 +126,8 @@ CommentEditWidget::CommentEditWidget( QWidget* parent )
     d->buttonCancel->setAutoRaise( true );
     d->buttonSave->setIcon( KIcon( "document-save" ) );
     d->buttonCancel->setIcon( KIcon( "edit-delete" ) );
     d->buttonCancel->setAutoRaise( true );
     d->buttonSave->setIcon( KIcon( "document-save" ) );
     d->buttonCancel->setIcon( KIcon( "edit-delete" ) );

-    d->buttonSave->setText( i18n( "Save" ) );
-    d->buttonCancel->setText( i18n( "Cancel" ) );
+    d->buttonSave->setText( i18nc( "@action:button", "Save" ) );
+    d->buttonCancel->setText( i18nc( "@action:button", "Cancel" ) );

 
     QFont fnt( font() );
     fnt.setPointSize( fnt.pointSize()-2 );
 
     QFont fnt( font() );
     fnt.setPointSize( fnt.pointSize()-2 );


@@ -162,7 +162,7 @@ QString CommentEditWidget::comment()
 bool CommentEditWidget::exec( const QPoint& pos )
 {
     d->success = false;
 bool CommentEditWidget::exec( const QPoint& pos )
 {
     d->success = false;

-    d->textEdit->setText( d->comment );
+    d->textEdit->setPlainText( d->comment );

     d->textEdit->setFocus();
     d->textEdit->moveCursor( QTextCursor::End );
     QEventLoop eventLoop;
     d->textEdit->setFocus();
     d->textEdit->moveCursor( QTextCursor::End );
     QEventLoop eventLoop;