diff options
| author |  Fabio Bas | 2012-09-25 13:15:57 +0000 |
|---|---|---|
| committer | Fabio Bas | 2012-09-25 13:15:57 +0000 |
| commit | 4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c (patch) | |
| tree | 2a36735ae8685b0d6011f1bfdf0d27ec6211089b /src/modules/filetransferwindow | |
| parent | Properly sort the console windows when sorting by name is selected in the tre... (diff) | |
| download | KVIrc-4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c.tar.gz KVIrc-4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c.tar.bz2 KVIrc-4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c.zip | |
qt5 support (sip): code only, no touch to build system by now
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6251 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/filetransferwindow')
| -rw-r--r-- | src/modules/filetransferwindow/FileTransferWindow.cpp | 13 | ||||
| -rw-r--r-- | src/modules/filetransferwindow/FileTransferWindow.h | 2 | ||||
| -rw-r--r-- | src/modules/filetransferwindow/libkvifiletransferwindow.cpp | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp index a9b90b0ed..6aee2d99b 100644 --- a/src/modules/filetransferwindow/FileTransferWindow.cpp +++ b/src/modules/filetransferwindow/FileTransferWindow.cpp @@ -137,8 +137,13 @@ FileTransferWidget::FileTransferWidget(QWidget * pParent) setHorizontalHeaderLabels(colHeaders); //default column widths setColumnWidth(0, FILETRANSFERW_CELLSIZE); +#if (QT_VERSION >= 0x050000) + horizontalHeader()->setSectionResizeMode(0, QHeaderView::Fixed); + horizontalHeader()->setSectionResizeMode(1, QHeaderView::Interactive); +#else horizontalHeader()->setResizeMode(0, QHeaderView::Fixed); horizontalHeader()->setResizeMode(1, QHeaderView::Interactive); +#endif setColumnWidth(1, 500); horizontalHeader()->setStretchLastSection(true); //focus policy @@ -326,13 +331,15 @@ bool FileTransferWindow::eventFilter( QObject *obj, QEvent *ev ) return KviWindow::eventFilter( obj, ev ); } +#warning FileTransferWindow::fontChange +/* void FileTransferWindow::fontChange(const QFont &oldFont) { QFontMetrics fm(font()); m_iLineSpacing = fm.lineSpacing(); KviWindow::fontChange(oldFont); } - +*/ void FileTransferWindow::tipRequest(KviDynamicToolTip * tip,const QPoint &pnt) { FileTransferItem * it = (FileTransferItem *)m_pTableWidget->itemAt(pnt); @@ -863,7 +870,3 @@ void FileTransferWindow::applyOptions() m_pIrcView->applyOptions(); KviWindow::applyOptions(); } - -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_FileTransferWindow.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/filetransferwindow/FileTransferWindow.h b/src/modules/filetransferwindow/FileTransferWindow.h index 614054cc0..9b3bb55a2 100644 --- a/src/modules/filetransferwindow/FileTransferWindow.h +++ b/src/modules/filetransferwindow/FileTransferWindow.h @@ -122,7 +122,7 @@ protected: FileTransferItem * findItem(KviFileTransfer * t); void fillTransferView(); KviFileTransfer * selectedTransfer(); - virtual void fontChange(const QFont &oldFont); +// virtual void fontChange(const QFont &oldFont); bool eventFilter( QObject *obj, QEvent *ev ); public: virtual QSize sizeHint() const; diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp index a5bef8883..07a474f5a 100644 --- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp +++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp @@ -69,7 +69,7 @@ static FileTransferWindow * filetransferwindow_alloc(bool bCreateMinimized,bool static bool filetransferwindow_kvs_cmd_open(KviKvsModuleCommandCall * c) { - filetransferwindow_alloc(c->hasSwitch('m',QString::fromAscii("minimized")),c->hasSwitch('n',QString::fromAscii("noraise"))); + filetransferwindow_alloc(c->hasSwitch('m',QString::fromLatin1("minimized")),c->hasSwitch('n',QString::fromLatin1("noraise"))); return true; } |