historywin QT4 port (almost completed)

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

4 files changed, 31 insertions, 8 deletions

diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index ac01c146b..f933955f5 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -128,7 +128,7 @@ KVIRC_API KviGarbageCollector          * g_pGarbageCollector          = 0;
 KVIRC_API KviCtcpPageDialog            * g_pCtcpPageDialog            = 0;
 KVIRC_API KviRegisteredChannelDataBase * g_pRegisteredChannelDataBase = 0;
 KVIRC_API KviInputHistory              * g_pInputHistory              = 0;
-KVIRC_API KviHistoryWindow             * g_pHistoryWindow             = 0;
+KVIRC_API KviHistoryWindowWidget       * g_pHistoryWindow             = 0;
 
 
 KVIRC_API int                            g_iIdentDaemonRunningUsers   = 0; // this is eventually set by libkviident
diff --git a/src/kvirc/ui/kvi_historywin.cpp b/src/kvirc/ui/kvi_historywin.cpp
index bf3b230bb..0709dea8c 100644
--- a/src/kvirc/ui/kvi_historywin.cpp
+++ b/src/kvirc/ui/kvi_historywin.cpp
@@ -39,10 +39,10 @@
 
 extern KviInputHistory * g_pInputHistory;
 
-KviHistoryWindow::KviHistoryWindow()
-: QListWidget(0)
+KviHistoryWindow::KviHistoryWindow(QWidget *parent)
+: QListWidget(parent)
 {
-	setWindowFlags(Qt::Popup);
+	m_pParent=parent;
 	m_pOwner = 0;
 	setSelectionMode(QAbstractItemView::SingleSelection);
 	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -228,7 +228,7 @@ void KviHistoryWindow::doHide()
 		killTimer(m_iTimerId);
 		m_iTimerId = -1;
 	}
-	hide();
+	m_pParent->hide();
 	if(m_pOwner)
 		m_pOwner->setFocus();
 }
@@ -248,6 +248,13 @@ void KviHistoryWindow::hideEvent(QHideEvent *)
 		m_iTimerId = -1;
 	}
 }
+KviHistoryWindowWidget::KviHistoryWindowWidget()

+:QWidget(0)

+{

+	setWindowFlags(Qt::Popup);

+	wid=new KviHistoryWindow(this);

+}

+
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "kvi_historywin.moc"
 #endif //_KVI_HISTORYWIN_CPP_
diff --git a/src/kvirc/ui/kvi_historywin.h b/src/kvirc/ui/kvi_historywin.h
index 2ae5ffc56..9492ecce8 100644
--- a/src/kvirc/ui/kvi_historywin.h
+++ b/src/kvirc/ui/kvi_historywin.h
@@ -37,11 +37,12 @@ class KVIRC_API KviHistoryWindow : public QListWidget
 {
 	Q_OBJECT
 public:
-	KviHistoryWindow();
+	KviHistoryWindow(QWidget *parent);
 	~KviHistoryWindow();
 private:
 	KviInput      * m_pOwner;
 	int             m_iTimerId;
+	QWidget * m_pParent;
 public:
 	void popup(KviInput *owner);
 //	KviInput * owner(){ return m_pOwner; };
@@ -58,5 +59,20 @@ public slots:
 	void ownerDead();
 	void itemSelected(QListWidgetItem *);
 };
+class KVIRC_API KviHistoryWindowWidget : public QWidget
+{
+	Q_OBJECT
+public:
+	KviHistoryWindow *wid;
+	KviHistoryWindowWidget();
+	void popup(KviInput *owner)
+	{
+		wid->popup(owner);
+		wid->setFixedSize(width(),height());
+		//move(QCursor::pos());
+		show();
+	};
+	~KviHistoryWindowWidget(){};
+};
 
 #endif //_KVI_HISTORYWIN_H_
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
index f98fdde46..9ca128bbe 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/kvi_input.cpp
@@ -97,7 +97,7 @@
 //This comes from kvi_app.cpp
 extern KviColorWindow    * g_pColorWindow;
 extern KviTextIconWindowWidget * g_pTextIconWindow;
-extern KviHistoryWindow  * g_pHistoryWindow;
+extern KviHistoryWindowWidget  * g_pHistoryWindow;
 extern KviTalPopupMenu   * g_pInputPopup;
 
 static QFontMetrics      * g_pLastFontMetrics = 0;
@@ -2501,7 +2501,7 @@ void KviInput::iconButtonClicked()
 
 void KviInput::historyButtonClicked()
 {
-	if(!g_pHistoryWindow)g_pHistoryWindow = new KviHistoryWindow();
+	if(!g_pHistoryWindow)g_pHistoryWindow = new KviHistoryWindowWidget();
 
 	QPoint pnt = mapToGlobal(QPoint(0,0));