andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

Port away from KTextEdit.

This commit is contained in:
Andrius Štikonas 2014-05-17 02:14:18 +01:00
parent 14e9ecb779
commit a490106e75
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/applyprogressdetailswidget.h
View File

@ -34,7 +34,7 @@ class ApplyProgressDetailsWidget : public QWidget, public Ui::ApplyProgressDetai
ApplyProgressDetailsWidget(QWidget* parent) : QWidget(parent) { setupUi(this); } ApplyProgressDetailsWidget(QWidget* parent) : QWidget(parent) { setupUi(this); }
public: public:
KTextEdit& editReport() { Q_ASSERT(m_EditReport); return *m_EditReport; } QTextEdit& editReport() { Q_ASSERT(m_EditReport); return *m_EditReport; }
QPushButton& buttonSave() { Q_ASSERT(m_ButtonSave); return *m_ButtonSave; } QPushButton& buttonSave() { Q_ASSERT(m_ButtonSave); return *m_ButtonSave; }
QPushButton& buttonBrowser() { Q_ASSERT(m_ButtonBrowser); return *m_ButtonBrowser; } QPushButton& buttonBrowser() { Q_ASSERT(m_ButtonBrowser); return *m_ButtonBrowser; }
}; };

9
src/gui/applyprogressdetailswidgetbase.ui
View File

@ -12,7 +12,7 @@
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="3"> <item row="0" column="0" colspan="3">
<widget class="KTextEdit" name="m_EditReport"> <widget class="QTextEdit" name="m_EditReport">
<property name="textInteractionFlags"> <property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property> </property>
@ -47,13 +47,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>KTextEdit</class>
<extends>QTextEdit</extends>
<header>ktextedit.h</header>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

3
src/gui/applyprogressdialog.cpp
View File

@ -45,7 +45,6 @@
#include <krun.h> #include <krun.h>
#include <ktemporaryfile.h> #include <ktemporaryfile.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <ktextedit.h>
#include <kio/netaccess.h> #include <kio/netaccess.h>
#include <kio/jobuidelegate.h> #include <kio/jobuidelegate.h>
#include <kio/copyjob.h> #include <kio/copyjob.h>
@ -231,7 +230,7 @@ void ApplyProgressDialog::allOpsDone(const QString& msg)
void ApplyProgressDialog::updateReport(bool force) void ApplyProgressDialog::updateReport(bool force)
{ {
// Rendering the HTML in the KTextEdit is extremely expensive. So make sure not to do that // Rendering the HTML in the QTextEdit is extremely expensive. So make sure not to do that
// unnecessarily and not too often: // unnecessarily and not too often:
// (1) If the widget isn't visible, don't update. // (1) If the widget isn't visible, don't update.
// (2) Also don't update if the last update was n msecs ago, BUT // (2) Also don't update if the last update was n msecs ago, BUT