Delete closeEvent and and ButtonBox to htmleditor

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2082 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
cfdev
2013-04-01 16:19:05 +00:00
parent b10c83f8fe
commit 5c8a1bee57
5 changed files with 91 additions and 666 deletions

View File

@@ -27,14 +27,15 @@
- 26/03/2013 : Start integration...Compilation and object creation are successful
*/
#include "htmleditor.h"
#include "highlighter.h"
#include "../ui/ui_htmleditor.h"
#include "../ui/ui_inserthtmldialog.h"
#include "htmleditor.h"
#include "highlighter.h"
#include <QtGui>
#include <QtWebKit>
#include <QFontDatabase>
#define FORWARD_ACTION(action1, action2) \
connect(action1, SIGNAL(triggered()), \
@@ -55,7 +56,7 @@ HtmlEditor::HtmlEditor(QWidget *parent)
ui->tabWidget->setTabText(0, "Normal View");
ui->tabWidget->setTabText(1, "HTML Source");
connect(ui->tabWidget, SIGNAL(currentChanged(int)), SLOT(changeTab(int)));
resize(600, 600);
resize(600, 300);
highlighter = new Highlighter(ui->plainTextEdit->document());
@@ -568,21 +569,6 @@ void HtmlEditor::changeZoom(int percent)
zoomSlider->setValue(percent);
}
/**
* @brief HtmlEditor::closeEvent and send a applyEditText signal!
* @param e
*/
void HtmlEditor::closeEvent(QCloseEvent *e)
{
/*if (maybeSave())
e->accept();
else
e->ignore();*/
//start applyEdit
emit applyEditText( ui->webView->page()->mainFrame()->toHtml() );
}
/**
* @brief HtmlEditor::loadHtml to the editor
* @param f
@@ -643,3 +629,19 @@ void HtmlEditor::setCurrentFileName(const QString &fileName)
}
/**
* @brief HtmlEditor::on_buttonBox_accepted
*/
void HtmlEditor::on_buttonBox_accepted() {
emit applyEditText( ui->webView->page()->mainFrame()->toHtml() );
this->close();
}
/**
* @brief HtmlEditor::on_buttonBox_rejected
*/
void HtmlEditor::on_buttonBox_rejected() {
this->close();
}