avoid qsplitter children to collapse, since we already have buttons where necessary (fixes #889);

small fix to iograph: added sanity check to traffic counters

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

17 files changed, 31 insertions, 14 deletions

diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index 6315b225e..b6b4f60bc 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -112,6 +112,7 @@ KviChannel::KviChannel(KviFrame * lpFrm, KviConsole * lpConsole, const QString &
 	m_pButtonBox->setMargin(0);
 
 	m_pTopSplitter = new KviTalSplitter(Qt::Horizontal,m_pButtonBox);
+	m_pTopSplitter->setChildrenCollapsible(false);
 
 	m_pButtonBox->setStretchFactor(m_pTopSplitter,1);
 
@@ -136,6 +137,8 @@ KviChannel::KviChannel(KviFrame * lpFrm, KviConsole * lpConsole, const QString &
 	
 	// Spitted vertially on the left
 	m_pVertSplitter = new KviTalSplitter(Qt::Vertical,m_pSplitter);
+	m_pVertSplitter->setChildrenCollapsible(false);
+
 	// With the IRC view over
 	m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this);
 	m_pIrcView->setObjectName(szName);
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index 55daa3823..5d0549203 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -112,6 +112,7 @@ KviFrame::KviFrame()
 
 	m_pSplitter = new QSplitter(Qt::Horizontal,this);
 	m_pSplitter->setObjectName("main_frame_splitter");
+	m_pSplitter->setChildrenCollapsible(false);
 
 	setCentralWidget(m_pSplitter);
 
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index e2f27a31e..f83cdfba2 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -174,6 +174,8 @@
 // Do not change unless you're sure that it will not happen :)
 #define KVI_IRCVIEW_MINIMUM_WIDTH 22
 //16+4+(2*4) * Do not change
+//this is mostly needed to avoid collapsing in slit view
+#define KVI_IRCVIEW_MINIMUM_HEIGHT 22
 #define KVI_IRCVIEW_PIXMAP_AND_SEPARATOR 20
 #define KVI_IRCVIEW_PIXMAP_SEPARATOR_AND_DOUBLEBORDER_WIDTH 28
 #define KVI_IRCVIEW_SIZEHINT_WIDTH 150
@@ -324,8 +326,8 @@ KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd)
 	connect(m_pScrollBar,SIGNAL(valueChanged(int)),this,SLOT(scrollBarPositionChanged(int)));
 	m_iLastScrollBarValue      = 0;
 
-	// set the minimum width
-	setMinimumWidth(KVI_IRCVIEW_MINIMUM_WIDTH + m_pScrollBar->sizeHint().width());
+	// set the minimum size
+	setMinimumSize(KVI_IRCVIEW_MINIMUM_WIDTH + m_pScrollBar->sizeHint().width(), KVI_IRCVIEW_MINIMUM_HEIGHT);
 	// and catch all mouse events
 	setMouseTracking(true);
 	// let's go!
diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp
index fb87e07d9..a51734947 100644
--- a/src/kvirc/ui/kvi_topicw.cpp
+++ b/src/kvirc/ui/kvi_topicw.cpp
@@ -137,6 +137,7 @@ KviTopicWidget::KviTopicWidget(QWidget * par, KviChannel * pChannel, const char
 	m_pCompletionBox->hide();
 
 	setContentsMargins(0,0,0,0);
+	setMinimumWidth(80);
 	applyOptions();
 }
 
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index 3edb3d775..d195853ae 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -618,7 +618,7 @@ KviActionEditor::KviActionEditor(QWidget * par)
 
 	QGridLayout * l = new QGridLayout(this);
 	m_pSplitter = new QSplitter(Qt::Horizontal,this);
-	m_pSplitter->setOpaqueResize(false);
+	m_pSplitter->setChildrenCollapsible(false);
 	l->addWidget(m_pSplitter,0,0);
 
 
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index 4bb6a8373..c23ac16c1 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -125,7 +125,7 @@ KviAliasEditor::KviAliasEditor(QWidget * par)
 	QGridLayout * l = new QGridLayout(this);
 
 	m_pSplitter = new QSplitter(Qt::Horizontal,this);
-	m_pSplitter->setOpaqueResize(false);
+	m_pSplitter->setChildrenCollapsible(false);
 	l->addWidget(m_pSplitter,0,0);
 
 	KviTalVBox * box = new KviTalVBox(m_pSplitter);
diff --git a/src/modules/classeditor/classeditor.cpp b/src/modules/classeditor/classeditor.cpp
index 4624762c0..72cc53ce8 100644
--- a/src/modules/classeditor/classeditor.cpp
+++ b/src/modules/classeditor/classeditor.cpp
@@ -156,7 +156,7 @@ KviClassEditor::KviClassEditor(QWidget * par)
 	QGridLayout * l = new QGridLayout(this);
 
 	m_pSplitter = new QSplitter(Qt::Horizontal,this);
-	m_pSplitter->setOpaqueResize(false);
+	m_pSplitter->setChildrenCollapsible(false);
 	l->addWidget(m_pSplitter,0,0);
 
 	KviTalVBox * box = new KviTalVBox(m_pSplitter);
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index f39893653..a6f464083 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -91,7 +91,7 @@ KviEventEditor::KviEventEditor(QWidget * par)
 	QGridLayout * l = new QGridLayout(this);
 
 	QSplitter * spl = new QSplitter(Qt::Horizontal,this);
-	spl->setOpaqueResize(false);
+	spl->setChildrenCollapsible(false);
 
 	l->addWidget(spl,0,0);
 
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index c607b5f2c..38cf8d6d8 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -251,8 +251,11 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv
 
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal,this);
 	m_pSplitter->setObjectName("transferwindow_hsplitter");
+	m_pSplitter->setChildrenCollapsible(false);
+
 	m_pVertSplitter = new KviTalSplitter(Qt::Vertical,m_pSplitter);
 	m_pVertSplitter->setObjectName("transferwindow_vsplitter");
+	m_pVertSplitter->setChildrenCollapsible(false);
 
 	m_pTableWidget  = new KviFileTransferWidget(m_pVertSplitter);
 
diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
index 2ae0c6a2c..f84405730 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/helpwidget.cpp
@@ -48,6 +48,7 @@ KviHelpWidget::KviHelpWidget(QWidget * par,KviFrame *,bool bIsStandalone)
 : QWidget(par)
 {
 	setObjectName("help_widget");
+	setMinimumWidth(80);
 	if(bIsStandalone)g_pHelpWidgetList->append(this);
 	m_bIsStandalone = bIsStandalone;
 
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
index e4cb8f26b..162f2099d 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/helpwindow.cpp
@@ -68,6 +68,8 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name)
 	g_pHelpWindowList->append(this);
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal,this);
 	m_pSplitter->setObjectName("main_splitter");
+	m_pSplitter->setChildrenCollapsible(false);
+
 	m_pHelpWidget = new KviHelpWidget(m_pSplitter,lpFrm);
 
 	m_pToolBar=new KviTalVBox(m_pSplitter);
diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp
index 931c1f048..13dd6d0c6 100644
--- a/src/modules/iograph/libkviiograph.cpp
+++ b/src/modules/iograph/libkviiograph.cpp
@@ -151,8 +151,8 @@ void KviIOGraphWidget::timerEvent(QTimerEvent *)
 	kvi_u64_t sB = g_uOutgoingTraffic;
 	kvi_u64_t rB = g_uIncomingTraffic;
 
-	unsigned int sDiff = sB - m_uLastSentBytes;
-	unsigned int rDiff = rB - m_uLastRecvBytes;
+	unsigned int sDiff = sB > m_uLastSentBytes ? (sB - m_uLastSentBytes) : 0;
+	unsigned int rDiff = rB > m_uLastRecvBytes ? (rB - m_uLastRecvBytes) : 0;
 
 	unsigned int iMax = qMax(sDiff, rDiff);
 
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index e906d21cf..29ad77473 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -55,6 +55,7 @@
 #include <QMouseEvent>
 #include <QByteArray>
 #include <QMessageBox>
+#include <QSplitter>
 
 #ifdef COMPILE_ZLIB_SUPPORT
 	#include <zlib.h>
@@ -72,6 +73,8 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal,this);
 	m_pSplitter->setObjectName("main_splitter");
+	m_pSplitter->setChildrenCollapsible(false);
+
 	m_pTabWidget = new QTabWidget(m_pSplitter);
 
 	m_pIndexTab  = new KviTalVBox(m_pTabWidget);
diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/logviewwidget.cpp
index 81724f829..0e1ab0636 100644
--- a/src/modules/logview/logviewwidget.cpp
+++ b/src/modules/logview/logviewwidget.cpp
@@ -31,7 +31,6 @@
 #include "kvi_app.h"
 #include "kvi_qstring.h"
 
-#include <QSplitter>
 #include <QLayout>
 #include <QDir>
 #include <QTextCodec>
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 8140823e0..9d0d293c3 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -165,6 +165,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 
 	QGridLayout * g1 = new QGridLayout(this);
 	QSplitter * spl = new QSplitter(Qt::Horizontal,this);
+	spl->setChildrenCollapsible(false);
 
 	g1->addWidget(spl,0,0,1,5);
 
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index ff3cdb8eb..b7ab9bb5a 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -201,8 +201,8 @@ KviSinglePopupEditor::KviSinglePopupEditor(QWidget * par)
 	g->addWidget(m_pMenuButton,0,2);
 	connect(m_pMenuButton,SIGNAL(clicked()),this,SLOT(testPopup()));
 	QSplitter * spl = new QSplitter(Qt::Vertical,this);
-	spl->setObjectName("popupeditor");
-	spl->setOpaqueResize(false);
+	spl->setObjectName("popupeditor_vertical_splitter");
+	spl->setChildrenCollapsible(false);
 
 	m_pTreeWidget = new QTreeWidget(spl);
 	m_pTreeWidget->setColumnCount(2);
@@ -1005,8 +1005,8 @@ KviPopupEditor::KviPopupEditor(QWidget * par)
 {
 	QGridLayout * l = new QGridLayout(this);
 	QSplitter * spl = new QSplitter(Qt::Horizontal,this);
-	spl->setObjectName("popupeditor");
-	spl->setOpaqueResize(false);
+	spl->setObjectName("popupeditor_horizontal_splitter");
+	spl->setChildrenCollapsible(false);
 	l->addWidget(spl,0,0);
 
 	KviTalVBox * box = new KviTalVBox(spl);
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index f82949e32..a77b6399b 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -74,7 +74,8 @@ KviRawEditor::KviRawEditor(QWidget * par)
 	QGridLayout * l = new QGridLayout(this);
 	QSplitter * spl = new QSplitter(Qt::Horizontal,this);
 	spl->setObjectName("raweditor_splitter");
-	spl->setOpaqueResize(false);
+	spl->setChildrenCollapsible(false);
+
 	l->addWidget(spl,0,0);
 
 	KviTalVBox * boxi = new KviTalVBox(spl);