ported modules about and action;

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1329 17fca916-40b9-46aa-a4ea-0a15b648b75c

3 files changed, 37 insertions, 67 deletions

diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index 49bce0426..d42cb3af2 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -40,29 +40,26 @@
 #include "kvi_action.h"
 #include "kvi_kvs_useraction.h"
 #include "kvi_customtoolbarmanager.h"
-
-#include <qsplitter.h>
-#include <qlayout.h>
+#include "kvi_valuelist.h"
 #include "kvi_tal_vbox.h"
-#include <qtooltip.h>
-#include <qpushbutton.h>
-#include <qdir.h>
-#include <qmessagebox.h>
-#include <qlineedit.h>
-#include <qcombobox.h>
-#include <qtoolbutton.h>
-#include <qcheckbox.h>
-#include <qtooltip.h>
-#include <qpainter.h>
-#ifdef COMPILE_USE_QT4
-	#include <q3header.h>
-#else
-	#include <qheader.h>
-#endif
-#include <qtabwidget.h>
 #include <kvi_tal_groupbox.h>
-#include "kvi_valuelist.h"
-#include <qlabel.h>
+
+#include <QSplitter>
+#include <QLayout>
+#include <QToolTip>
+#include <QPushButton>
+#include <QDir>
+#include <QMessageBox>
+#include <QLineEdit>
+#include <QComboBox>
+#include <QToolButton>
+#include <QCheckBox>
+#include <QPainter>
+#include <QTabWidget>
+#include <QLabel>
+#include <q3header.h>
+// FIXME: #include <QHeaderView>
+
 
 extern KviActionEditorWindow * g_pActionEditorWindow;
 
@@ -217,9 +214,9 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed)
 	m_pKeySequenceEdit = new QLineEdit(tab);
 	gl->addMultiCellWidget(m_pKeySequenceEdit,4,5,1,1);
 	QToolTip::add(m_pKeySequenceEdit,__tr2qs("Optional keyboard sequence that will activate this action.<br>" \
-						"The sequence should be expressed as a string of up to four key codes separated by commas " \
-						"eventually combined with the modifiers \"Ctrl\",\"Shift\",\"Alt\" and \"Meta\".<br>" \
-						"Examples of such sequences are \"Ctrl+X\", \"Ctrl+Alt+Z\", \"Ctrl+X,Ctrl+C\" ..."));
+		"The sequence should be expressed as a string of up to four key codes separated by commas " \
+		"eventually combined with the modifiers \"Ctrl\",\"Shift\",\"Alt\" and \"Meta\".<br>" \
+		"Examples of such sequences are \"Ctrl+X\", \"Ctrl+Alt+Z\", \"Ctrl+X,Ctrl+C\" ..."));
 
 	l = new QLabel(tab);
 	gl->addMultiCellWidget(l,6,6,0,3);
@@ -613,11 +610,6 @@ void KviSingleActionEditor::commit()
 
 
 
-
-
-
-
-
 KviActionEditorListView::KviActionEditorListView(QWidget * pParent)
 : KviTalListView(pParent)
 {
@@ -643,25 +635,13 @@ void KviActionEditorListView::resizeEvent(QResizeEvent * e)
 
 
 
-
-
-
-
-
 KviActionEditor::KviActionEditor(QWidget * par)
 : QWidget(par)
 {
 	
 	QGridLayout * l = new QGridLayout(this,1,1,2,2);
-
-#ifdef COMPILE_USE_QT4
 	m_pSplitter = new QSplitter(Qt::Horizontal,this);
 	m_pSplitter->setOpaqueResize(false);
-
-#else
-	m_pSplitter = new QSplitter(QSplitter::Horizontal,this);
-#endif
-
 	l->addWidget(m_pSplitter,0,0);
 	
 	
@@ -669,14 +649,9 @@ KviActionEditor::KviActionEditor(QWidget * par)
 	m_pListView = new KviActionEditorListView(box);
 	//m_pListView->setMultiSelection(false);
 	m_pListView->setShowSortIndicator(true);
-#ifdef COMPILE_USE_QT4
 	m_pListView->setFocusPolicy(Qt::StrongFocus);
-#else
-	m_pListView->setFocusPolicy(QWidget::StrongFocus);
-#endif
 	connect(m_pListView,SIGNAL(currentChanged(KviTalListViewItem *)),this,SLOT(currentChanged(KviTalListViewItem *)));
 
-
 	m_pNewActionButton = new QPushButton(__tr2qs("New Action"),box);
 	connect(m_pNewActionButton,SIGNAL(clicked()),this,SLOT(newAction()));
 
diff --git a/src/modules/actioneditor/actioneditor.h b/src/modules/actioneditor/actioneditor.h
index e62df5565..7c25f84df 100644
--- a/src/modules/actioneditor/actioneditor.h
+++ b/src/modules/actioneditor/actioneditor.h
@@ -26,11 +26,23 @@
 
 #include "kvi_window.h"
 
-#include <qwidget.h>
 #include "kvi_tal_listview.h"
 #include "kvi_styled_controls.h"
 
+#include <QWidget>
+#include <q3simplerichtext.h>
+#define QSimpleRichText Q3SimpleRichText
+
 class KviActionEditorListViewItem;
+class KviScriptEditor;
+class KviActionEditor;
+class QLineEdit;
+class QComboBox;
+class QToolButton;
+class QSimpleRichText;
+class QPushButton;
+class QSplitter;
+
 
 class KviActionData
 {
@@ -64,22 +76,6 @@ public:
 };
 
 
-class QLineEdit;
-class QComboBox;
-class KviScriptEditor;
-class QToolButton;
-class QSimpleRichText;
-class QPushButton;
-
-#ifdef COMPILE_USE_QT4
-	#include <q3simplerichtext.h>
-	#define QSimpleRichText Q3SimpleRichText
-#else
-	#include <qsimplerichtext.h>
-#endif
-
-
-
 class KviActionEditorListViewItem : public KviTalListViewItem
 {
 public:
@@ -111,7 +107,6 @@ protected:
 	virtual void resizeEvent(QResizeEvent * e);
 };
 
-class KviActionEditor;
 
 class KviSingleActionEditor : public QWidget
 {
@@ -156,7 +151,6 @@ protected slots:
 	void channelQueryOrConsoleWindowCheckToggled(bool);
 };
 
-class QSplitter;
 
 class KviActionEditor : public QWidget
 {
diff --git a/src/modules/actioneditor/libkviactioneditor.cpp b/src/modules/actioneditor/libkviactioneditor.cpp
index ec3ac3ff7..af3252521 100644
--- a/src/modules/actioneditor/libkviactioneditor.cpp
+++ b/src/modules/actioneditor/libkviactioneditor.cpp
@@ -22,11 +22,12 @@
 //
 //=============================================================================
 
+#include "actioneditor.h"
+
 #include "kvi_module.h"
 #include "kvi_locale.h"
 #include "kvi_frame.h"
 
-#include "actioneditor.h"
 KviActionEditorWindow * g_pActionEditorWindow = 0;
 
 
@@ -76,7 +77,7 @@ static bool actioneditor_module_cleanup(KviModule *m)
 
 KVIRC_MODULE(
 	"ActionEditor",                                                 // module name
-	"1.0.0",                                                // module version
+	"4.0.0",                                                // module version
 	"Copyright (C) 2004 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
 	"Editor for the script actions",
 	actioneditor_module_init,