diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/about/aboutdialog.cpp | 8 | ||||
| -rw-r--r-- | src/modules/addon/packaddondialog.cpp | 4 | ||||
| -rw-r--r-- | src/modules/addon/packaddondialog.h | 12 | ||||
| -rw-r--r-- | src/modules/editor/scripteditor.cpp | 2 | ||||
| -rw-r--r-- | src/modules/editor/scripteditor.h | 3 | ||||
| -rw-r--r-- | src/modules/setup/setupwizard.cpp | 4 | ||||
| -rw-r--r-- | src/modules/theme/packthemedialog.cpp | 6 | ||||
| -rw-r--r-- | src/modules/theme/packthemedialog.h | 22 | ||||
| -rw-r--r-- | src/modules/theme/savethemedialog.cpp | 4 | ||||
| -rw-r--r-- | src/modules/theme/savethemedialog.h | 22 |
10 files changed, 42 insertions, 45 deletions
diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index 2a3b1c78d..b21c15615 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -32,8 +32,8 @@ #include "kvi_sourcesdate.h" #include "kvi_buildinfo.h" #include "kvi_osinfo.h" -#include "kvi_tal_textedit.h" +#include <QTextEdit> #include <QWidget> #include <QLayout> #include <QLabel> @@ -112,7 +112,7 @@ KviAboutDialog::KviAboutDialog() w = new QWidget(this); g = new QGridLayout(w); - KviTalTextEdit * v = new KviTalTextEdit(w); + QTextEdit * v = new QTextEdit(w); v->setReadOnly(true); g->addWidget(v,0,0); @@ -186,7 +186,7 @@ KviAboutDialog::KviAboutDialog() w = new QWidget(this); g = new QGridLayout(w); - v = new KviTalTextEdit(w); + v = new QTextEdit(w); v->setReadOnly(true); g->addWidget(v,0,0); @@ -199,7 +199,7 @@ KviAboutDialog::KviAboutDialog() w = new QWidget(this); g = new QGridLayout(w); - v = new KviTalTextEdit(w); + v = new QTextEdit(w); v->setReadOnly(true); v->setWordWrapMode(QTextOption::NoWrap); g->addWidget(v,0,0); diff --git a/src/modules/addon/packaddondialog.cpp b/src/modules/addon/packaddondialog.cpp index 4376e91e3..bbbbfc028 100644 --- a/src/modules/addon/packaddondialog.cpp +++ b/src/modules/addon/packaddondialog.cpp @@ -39,8 +39,8 @@ #include "kvi_selectors.h" #include "kvi_miscutils.h" #include "kvi_sourcesdate.h" -#include "kvi_tal_textedit.h" +#include <QTextEdit> #include <QLineEdit> #include <QMessageBox> #include <QDir> @@ -512,7 +512,7 @@ KviPackAddonInfoPackageWidget::KviPackAddonInfoPackageWidget(KviPackAddonDialog pLabel->setText(__tr2qs_ctx("Package &Description:","addon")); pLayout->addWidget(pLabel,3,0); - m_pPackageDescriptionEdit = new KviTalTextEdit(this); + m_pPackageDescriptionEdit = new QTextEdit(this); m_pPackageDescriptionEdit->setBackgroundRole(QPalette::Window); m_pPackageDescriptionEdit->setText(__tr2qs_ctx("Put a package description here...","addon")); pLabel->setBuddy(m_pPackageDescriptionEdit); diff --git a/src/modules/addon/packaddondialog.h b/src/modules/addon/packaddondialog.h index 8ae66e2b2..c4943e757 100644 --- a/src/modules/addon/packaddondialog.h +++ b/src/modules/addon/packaddondialog.h @@ -36,11 +36,11 @@ #include "kvi_settings.h" #include "kvi_pointerlist.h" #include "kvi_selectors.h" -#include "kvi_tal_textedit.h" #include <QWizard> #include <QWizardPage> +class QTextEdit; class QLineEdit; class QLabel; @@ -123,11 +123,11 @@ public: */ ~KviPackAddonInfoPackageWidget(); protected: - QLineEdit * m_pPackageAuthorEdit; - QLineEdit * m_pPackageNameEdit; - QLineEdit * m_pPackageVersionEdit; - KviTalTextEdit * m_pPackageDescriptionEdit; - QLineEdit * m_pPackageMinVersionEdit; + QLineEdit * m_pPackageAuthorEdit; + QLineEdit * m_pPackageNameEdit; + QLineEdit * m_pPackageVersionEdit; + QTextEdit * m_pPackageDescriptionEdit; + QLineEdit * m_pPackageMinVersionEdit; }; /** diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index 349eeff03..56f1849bf 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -940,7 +940,7 @@ void KviScriptEditorImplementation::loadFromFile() { m_pEditor->setPlainText(szBuffer); setCursorPosition(0); - //m_pEditor->moveCursor(KviTalTextEdit::MoveEnd,false); + //m_pEditor->moveCursor(QTextEdit::MoveEnd,false); //updateRowColLabel(); } else { QString szTmp; diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h index 7a66f1074..a95def827 100644 --- a/src/modules/editor/scripteditor.h +++ b/src/modules/editor/scripteditor.h @@ -28,7 +28,6 @@ #include "kvi_scripteditor.h" #include "kvi_pointerlist.h" #include "kvi_selectors.h" -#include "kvi_tal_textedit.h" #include "kvi_tal_popupmenu.h" #include <QCompleter> @@ -55,7 +54,7 @@ public: public: QString m_szFind; protected: - KviScriptEditorSyntaxHighlighter *m_pSyntaxHighlighter; + KviScriptEditorSyntaxHighlighter * m_pSyntaxHighlighter; QCompleter * m_pCompleter; QStringList * m_pListModulesNames; QStringList * m_pListCompletition; diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index ec84bd527..2439e8a2e 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -36,9 +36,9 @@ bool g_bFoundMirc; #include "kvi_env.h" #include "kvi_options.h" #include "kvi_config.h" -#include "kvi_tal_textedit.h" #include "kvi_tal_hbox.h" +#include <QTextEdit> #include <QMessageBox> #include <QDir> #include <QPushButton> @@ -190,7 +190,7 @@ KviSetupWizard::KviSetupWizard() "</ul></p>" \ "<p>The \"legalese\" version of the license is shown in the box below.</p>")); - KviTalTextEdit * ed = new KviTalTextEdit(m_pLicense->m_pVBox); + QTextEdit * ed = new QTextEdit(m_pLicense->m_pVBox); ed->setReadOnly(true); ed->setWordWrapMode(QTextOption::NoWrap); QString szLicense; diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp index d28384296..e9cbd1ff6 100644 --- a/src/modules/theme/packthemedialog.cpp +++ b/src/modules/theme/packthemedialog.cpp @@ -39,8 +39,8 @@ #include "kvi_selectors.h" #include "kvi_miscutils.h" #include "kvi_sourcesdate.h" -#include "kvi_tal_textedit.h" +#include <QTextEdit> #include <QLayout> #include <QPushButton> #include <QLineEdit> @@ -185,7 +185,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme szThemesDescription += "</body></html>"; - KviTalTextEdit * pTextEdit = new KviTalTextEdit(pPage); + QTextEdit * pTextEdit = new QTextEdit(pPage); pTextEdit->setBackgroundRole(QPalette::Window); pTextEdit->setReadOnly(true); QTextDocument *doc=new QTextDocument(pTextEdit); @@ -235,7 +235,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme pLabel->setText(__tr2qs_ctx("Description:","theme")); pLayout->addWidget(pLabel,3,0); - m_pPackageDescriptionEdit = new KviTalTextEdit(pPage); + m_pPackageDescriptionEdit = new QTextEdit(pPage); m_pPackageDescriptionEdit->setText(szPackageDescription); pLayout->addWidget(m_pPackageDescriptionEdit,3,1); diff --git a/src/modules/theme/packthemedialog.h b/src/modules/theme/packthemedialog.h index 3be50f4db..a794bcf39 100644 --- a/src/modules/theme/packthemedialog.h +++ b/src/modules/theme/packthemedialog.h @@ -33,7 +33,7 @@ class QLineEdit; class QLabel; -class KviTalTextEdit; +class QTextEdit; class KviFileSelector; @@ -44,17 +44,17 @@ public: KviPackThemeDialog(QWidget * pParent,KviPointerList<KviThemeInfo> * pThemeInfoList); virtual ~KviPackThemeDialog(); protected: - QString m_szImagePath; - KviFileSelector * m_pImageSelector; - QString m_szPackagePath; - KviFileSelector * m_pPathSelector; - QLabel * m_pImageLabel; + QString m_szImagePath; + KviFileSelector * m_pImageSelector; + QString m_szPackagePath; + KviFileSelector * m_pPathSelector; + QLabel * m_pImageLabel; KviPointerList<KviThemeInfo> * m_pThemeInfoList; - QLineEdit * m_pPackageNameEdit; - KviTalTextEdit * m_pPackageDescriptionEdit; - QLineEdit * m_pPackageVersionEdit; - QLineEdit * m_pPackagerNameEdit; - QWidget * m_pImageSelectionPage; + QLineEdit * m_pPackageNameEdit; + QTextEdit * m_pPackageDescriptionEdit; + QLineEdit * m_pPackageVersionEdit; + QLineEdit * m_pPackagerNameEdit; + QWidget * m_pImageSelectionPage; protected: virtual void accept(); bool packTheme(); diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp index cea3933b7..efc0064da 100644 --- a/src/modules/theme/savethemedialog.cpp +++ b/src/modules/theme/savethemedialog.cpp @@ -39,8 +39,8 @@ #include "kvi_selectors.h" #include "kvi_miscutils.h" #include "kvi_sourcesdate.h" -#include "kvi_tal_textedit.h" +#include <QTextEdit> #include <QLayout> #include <QPushButton> #include <QLineEdit> @@ -119,7 +119,7 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent) pLabel->setText(__tr2qs_ctx("Description:","theme")); pLayout->addWidget(pLabel,3,0); - m_pThemeDescriptionEdit = new KviTalTextEdit(pPage); + m_pThemeDescriptionEdit = new QTextEdit(pPage); //m_pThemeDescriptionEdit->setText(szThemeDescription); pLayout->addWidget(m_pThemeDescriptionEdit,3,1); diff --git a/src/modules/theme/savethemedialog.h b/src/modules/theme/savethemedialog.h index 80a503694..99b9529d5 100644 --- a/src/modules/theme/savethemedialog.h +++ b/src/modules/theme/savethemedialog.h @@ -34,7 +34,7 @@ class QLineEdit; class QPushButton; class QLabel; -class KviTalTextEdit; +class QTextEdit; class KviFileSelector; @@ -45,24 +45,22 @@ public: KviSaveThemeDialog(QWidget * pParent); virtual ~KviSaveThemeDialog(); protected: - QString m_szScreenshotPath; + QString m_szScreenshotPath; KviFileSelector * m_pImageSelector; - QLabel * m_pImageLabel; - QLineEdit * m_pThemeNameEdit; - KviTalTextEdit * m_pThemeDescriptionEdit; - QLineEdit * m_pThemeVersionEdit; - QLineEdit * m_pAuthorNameEdit; - QWidget * m_pImageSelectionPage; - QPushButton * m_pOkButton; + QLabel * m_pImageLabel; + QLineEdit * m_pThemeNameEdit; + QTextEdit * m_pThemeDescriptionEdit; + QLineEdit * m_pThemeVersionEdit; + QLineEdit * m_pAuthorNameEdit; + QWidget * m_pImageSelectionPage; + QPushButton * m_pOkButton; protected: virtual void accept(); bool saveTheme(); protected slots: void makeScreenshot(); - void imageSelectionChanged(const QString &szImagePath); + void imageSelectionChanged(const QString & szImagePath); //void themeNameChanged(const QString &txt); }; - - #endif //!_SAVETHEMEDIALOG_H_ |
