diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/actioneditor/actioneditor.cpp | 2 | ||||
| -rw-r--r-- | src/modules/aliaseditor/aliaseditor.cpp | 2 | ||||
| -rw-r--r-- | src/modules/classeditor/classeditor.cpp | 2 | ||||
| -rw-r--r-- | src/modules/eventeditor/eventeditor.cpp | 2 | ||||
| -rw-r--r-- | src/modules/filetransferwindow/filetransferwindow.cpp | 3 | ||||
| -rw-r--r-- | src/modules/help/helpwidget.cpp | 1 | ||||
| -rw-r--r-- | src/modules/help/helpwindow.cpp | 2 | ||||
| -rw-r--r-- | src/modules/iograph/libkviiograph.cpp | 4 | ||||
| -rw-r--r-- | src/modules/logview/logviewmdiwindow.cpp | 3 | ||||
| -rw-r--r-- | src/modules/logview/logviewwidget.cpp | 1 | ||||
| -rw-r--r-- | src/modules/options/dialog.cpp | 1 | ||||
| -rw-r--r-- | src/modules/popupeditor/popupeditor.cpp | 8 | ||||
| -rw-r--r-- | src/modules/raweditor/raweditor.cpp | 3 |
13 files changed, 22 insertions, 12 deletions
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); |
