aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/sharedfileswindow/sharedfileswindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/sharedfileswindow/sharedfileswindow.cpp')
-rw-r--r--src/modules/sharedfileswindow/sharedfileswindow.cpp112
1 files changed, 65 insertions, 47 deletions
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index f679de1ff..5e72c4567 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -53,8 +53,11 @@ extern KviSharedFilesWindow * g_pSharedFilesWindow;
extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
KviSharedFileEditDialog::KviSharedFileEditDialog(QWidget * par,KviSharedFile * f)
-: QDialog(par,"shared_file_editor",true)
+: QDialog(par)//,"shared_file_editor",true)
{
+ setModal(true);
+ setObjectName("shared_file_editor");
+
QGridLayout * g = new QGridLayout(this);
setWindowTitle(__tr2qs_ctx("Edit Shared File - KVIrc","sharedfileswindow"));
@@ -63,13 +66,15 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(QWidget * par,KviSharedFile * f
g->addWidget(l, 0, 0 );
m_pShareNameEdit = new QLineEdit(this);
- g->addMultiCellWidget( m_pShareNameEdit, 0, 0, 1, 3 );
+ g->addWidget(m_pShareNameEdit,0,1,1,3);
+ //g->addMultiCellWidget( m_pShareNameEdit, 0, 0, 1, 3 );
l = new QLabel(__tr2qs_ctx("File path:","sharedfileswindow"),this);
g->addWidget(l, 1, 0 );
m_pFilePathEdit = new QLineEdit(this);
- g->addMultiCellWidget( m_pFilePathEdit, 1, 1, 1, 2 );
+ g->addWidget(m_pFilePathEdit,1,1,1,2);
+ //g->addMultiCellWidget( m_pFilePathEdit, 1, 1, 1, 2 );
m_pBrowseButton = new QPushButton(__tr2qs_ctx("&Browse...","sharedfileswindow"),this);
g->addWidget( m_pBrowseButton, 1, 3 );
@@ -79,13 +84,15 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(QWidget * par,KviSharedFile * f
g->addWidget(l, 2, 0 );
m_pUserMaskEdit = new QLineEdit(this);
- g->addMultiCellWidget( m_pUserMaskEdit, 2, 2, 1, 3 );
+ g->addWidget(m_pUserMaskEdit,2,1,1,3);
+// g->addMultiCellWidget( m_pUserMaskEdit, 2, 2, 1, 3 );
m_pExpireCheckBox = new KviStyledCheckBox(__tr2qs_ctx("Expire at:","sharedfileswindow"),this);
g->addWidget(m_pExpireCheckBox,3,0);
m_pExpireDateTimeEdit = new QDateTimeEdit(this);
- g->addMultiCellWidget(m_pExpireDateTimeEdit, 3, 3, 1, 3 );
+ g->addWidget(m_pExpireDateTimeEdit,3,1,1,3);
+ //g->addMultiCellWidget(m_pExpireDateTimeEdit, 3, 3, 1, 3 );
connect(m_pExpireCheckBox,SIGNAL(toggled(bool)),m_pExpireDateTimeEdit,SLOT(setEnabled(bool)));
@@ -181,8 +188,8 @@ void KviSharedFileEditDialog::okClicked()
}
-KviSharedFilesListViewItem::KviSharedFilesListViewItem(KviTalListView * lv,KviSharedFile * f)
-: KviTalListViewItem(lv,f->name())
+KviSharedFilesTreeWidgetItem::KviSharedFilesTreeWidgetItem(KviTalTreeWidget * lv,KviSharedFile * f)
+: KviTalTreeWidgetItem(lv,f->name())
{
setText(1,f->absFilePath());
setText(2,f->userMask());
@@ -197,7 +204,7 @@ KviSharedFilesListViewItem::KviSharedFilesListViewItem(KviTalListView * lv,KviSh
m_pSharedFilePointer = f;
}
-KviSharedFilesListViewItem::~KviSharedFilesListViewItem()
+KviSharedFilesTreeWidgetItem::~KviSharedFilesTreeWidgetItem()
{
}
@@ -206,19 +213,28 @@ KviSharedFilesWindow::KviSharedFilesWindow(KviModuleExtensionDescriptor * d,KviF
: KviWindow(KVI_WINDOW_TYPE_TOOL,lpFrm,"shared files window",0) , KviModuleExtension(d)
{
g_pSharedFilesWindow = this;
- m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter");
+ m_pSplitter = new QSplitter(Qt::Horizontal,this);
+ m_pSplitter->setObjectName("sharedfiles_splitter");
KviTalVBox * vbox = new KviTalVBox(m_pSplitter);
- m_pListView = new KviTalListView(vbox);
- //m_pListView->header()->hide();
- m_pListView->setAllColumnsShowFocus(true);
- m_pListView->addColumn(__tr2qs_ctx("Name","sharedfileswindow"),200);
- m_pListView->addColumn(__tr2qs_ctx("Filename","sharedfileswindow"),300);
- m_pListView->addColumn(__tr2qs_ctx("Mask","sharedfileswindow"),200);
- m_pListView->addColumn(__tr2qs_ctx("Expires","sharedfileswindow"),200);
- m_pListView->setSelectionMode(KviTalListView::Single);
- connect(m_pListView,SIGNAL(selectionChanged()),this,SLOT(enableButtons()));
+ m_pTreeWidget = new KviTalTreeWidget(vbox);
+ //m_pTreeWidget->header()->hide();
+ m_pTreeWidget->setAllColumnsShowFocus(true);
+ QStringList columsLabels;
+ columsLabels.append(__tr2qs_ctx("Name","sharedfileswindow"));
+ columsLabels.append(__tr2qs_ctx("Filename","sharedfileswindow"));
+ columsLabels.append(__tr2qs_ctx("Mask","sharedfileswindow"));
+
+ columsLabels.append(__tr2qs_ctx("Expires","sharedfileswindow"));
+ m_pTreeWidget->setHeaderLabels(columsLabels);
+ m_pTreeWidget->setColumnWidth(0,200);
+ m_pTreeWidget->setColumnWidth(0,300);
+ m_pTreeWidget->setColumnWidth(0,300);
+ m_pTreeWidget->setColumnWidth(0,200);
+
+ m_pTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
+ connect(m_pTreeWidget,SIGNAL(itemSelectionChanged()),this,SLOT(enableButtons()));
connect(g_pSharedFilesManager,SIGNAL(sharedFilesChanged()),this,SLOT(fillFileView()));
connect(g_pSharedFilesManager,SIGNAL(sharedFileAdded(KviSharedFile *)),this,SLOT(sharedFileAdded(KviSharedFile *)));
@@ -243,14 +259,14 @@ KviSharedFilesWindow::~KviSharedFilesWindow()
void KviSharedFilesWindow::enableButtons()
{
- KviTalListViewItem * it = m_pListView->currentItem();
+ KviTalTreeWidgetItem * it = (KviTalTreeWidgetItem *)m_pTreeWidget->currentItem();
m_pEditButton->setEnabled(it);
m_pRemoveButton->setEnabled(it);
}
void KviSharedFilesWindow::removeClicked()
{
- KviSharedFilesListViewItem * it = (KviSharedFilesListViewItem *)m_pListView->currentItem();
+ KviSharedFilesTreeWidgetItem * it = (KviSharedFilesTreeWidgetItem *)m_pTreeWidget->currentItem();
if(!it)return;
g_pSharedFilesManager->removeSharedFile(it->readOnlySharedFilePointer()->name(),it->readOnlySharedFilePointer());
@@ -268,13 +284,13 @@ void KviSharedFilesWindow::addClicked()
void KviSharedFilesWindow::editClicked()
{
- KviSharedFilesListViewItem * it = (KviSharedFilesListViewItem *)m_pListView->currentItem();
+ KviSharedFilesTreeWidgetItem * it = (KviSharedFilesTreeWidgetItem *)m_pTreeWidget->currentItem();
if(!it)return;
KviSharedFileEditDialog dlg(0,it->readOnlySharedFilePointer());
if(dlg.exec() != QDialog::Accepted)return;
- KviSharedFilesListViewItem * it2 = (KviSharedFilesListViewItem *)m_pListView->currentItem();
+ KviSharedFilesTreeWidgetItem * it2 = (KviSharedFilesTreeWidgetItem *)m_pTreeWidget->currentItem();
if(it2 != it)return; // ooops ?
KviSharedFile * f = dlg.getResult();
if(!f)return; // ooops 2 ?
@@ -285,16 +301,16 @@ void KviSharedFilesWindow::editClicked()
void KviSharedFilesWindow::fillFileView()
{
- m_pListView->clear();
+ m_pTreeWidget->clear();
KviPointerHashTableIterator<QString,KviSharedFileList> it(*(g_pSharedFilesManager->sharedFileListDict()));
- KviSharedFilesListViewItem * itm;
+ KviSharedFilesTreeWidgetItem * itm;
while(KviSharedFileList * l = it.current())
{
for(KviSharedFile * o = l->first();o;o = l->next())
{
- itm = new KviSharedFilesListViewItem(m_pListView,o);
+ itm = new KviSharedFilesTreeWidgetItem(m_pTreeWidget,o);
}
++it;
}
@@ -303,22 +319,24 @@ void KviSharedFilesWindow::fillFileView()
void KviSharedFilesWindow::sharedFileAdded(KviSharedFile * f)
{
- KviSharedFilesListViewItem * it;
- it = new KviSharedFilesListViewItem(m_pListView,f);
+ KviSharedFilesTreeWidgetItem * it;
+ it = new KviSharedFilesTreeWidgetItem(m_pTreeWidget,f);
enableButtons();
}
void KviSharedFilesWindow::sharedFileRemoved(KviSharedFile * f)
{
- KviTalListViewItem * it = m_pListView->firstChild();
- while(it)
+ KviTalTreeWidgetItem * it;
+ for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
+// while(it)
{
- if(((KviSharedFilesListViewItem *)it)->readOnlySharedFilePointer() == f)
+ it=(KviTalTreeWidgetItem *) m_pTreeWidget->topLevelItem(i);
+ if(((KviSharedFilesTreeWidgetItem *)it)->readOnlySharedFilePointer() == f)
{
- delete ((KviSharedFilesListViewItem *)it);
+ delete ((KviSharedFilesTreeWidgetItem *)it);
return;
}
- it = it->nextSibling();
+ // it = it->nextSibling();
}
enableButtons();
}
@@ -329,10 +347,10 @@ void KviSharedFilesWindow::sharedFileRemoved(KviSharedFile * f)
void KviSharedFilesWindow::tipRequest(KviDynamicToolTip * tip,const QPoint &pnt)
{
- KviSharedFilesItem * it = (KviSharedFilesItem *)m_pListView->itemAt(pnt);
+ KviSharedFilesItem * it = (KviSharedFilesItem *)m_pTreeWidget->itemAt(pnt);
if(!it)return;
QString txt = it->transfer()->tipText();
- tip->tip(m_pListView->itemRect(it),txt);
+ tip->tip(m_pTreeWidget->itemRect(it),txt);
}
*/
@@ -344,14 +362,14 @@ void KviSharedFilesWindow::fillTransferView()
KviSharedFilesItem * it;
for(KviSharedFiles * t = l->first();t;t = l->next())
{
- it = new KviSharedFilesItem(m_pListView,t);
+ it = new KviSharedFilesItem(m_pTreeWidget,t);
t->setDisplayItem(it);
}
}
KviSharedFilesItem * KviSharedFilesWindow::findItem(KviSharedFiles * t)
{
- KviSharedFilesItem * it = (KviSharedFilesItem *)m_pListView->firstChild();
+ KviSharedFilesItem * it = (KviSharedFilesItem *)m_pTreeWidget->firstChild();
while(it)
{
if(it->transfer() == t)return it;
@@ -362,7 +380,7 @@ KviSharedFilesItem * KviSharedFilesWindow::findItem(KviSharedFiles * t)
void KviSharedFilesWindow::transferRegistered(KviSharedFiles * t)
{
- KviSharedFilesItem * it = new KviSharedFilesItem(m_pListView,t);
+ KviSharedFilesItem * it = new KviSharedFilesItem(m_pTreeWidget,t);
//t->setDisplayItem(it);
}
@@ -373,7 +391,7 @@ void KviSharedFilesWindow::transferUnregistering(KviSharedFiles * t)
if(it)delete it;
}
-void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const QPoint &pnt,int col)
+void KviSharedFilesWindow::rightButtonPressed(KviTalTreeWidgetItem *it,const QPoint &pnt,int col)
{
if(!m_pContextPopup)m_pContextPopup = new KviTalPopupMenu(this);
if(!m_pLocalFilePopup)m_pLocalFilePopup = new KviTalPopupMenu(this);
@@ -463,7 +481,7 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const QPoin
bool bHaveTerminated = false;
- KviSharedFilesItem * item = (KviSharedFilesItem *)m_pListView->firstChild();
+ KviSharedFilesItem * item = (KviSharedFilesItem *)m_pTreeWidget->firstChild();
while(item)
{
if(item->transfer()->terminated())
@@ -486,7 +504,7 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const QPoin
KviSharedFiles * KviSharedFilesWindow::selectedTransfer()
{
- KviTalListViewItem * it = m_pListView->selectedItem();
+ KviTalTreeWidgetItem * it = m_pTreeWidget->selectedItem();
if(!it)return 0;
KviSharedFilesItem * i = (KviSharedFilesItem *)it;
return i->transfer();
@@ -620,25 +638,25 @@ void KviSharedFilesWindow::openLocalFileFolder()
void KviSharedFilesWindow::heartbeat()
{
- if(m_pListView->childCount() < 1)return;
+ if(m_pTreeWidget->childCount() < 1)return;
- KviTalListViewItem * i1;
- KviTalListViewItem * i2;
+ KviTalTreeWidgetItem * i1;
+ KviTalTreeWidgetItem * i2;
- i1 = m_pListView->itemAt(QPoint(1,1));
+ i1 = m_pTreeWidget->itemAt(QPoint(1,1));
if(!i1)
{
- m_pListView->viewport()->update();
+ m_pTreeWidget->viewport()->update();
return;
}
- i2 = m_pListView->itemAt(QPoint(1,m_pListView->viewport()->height() - 2));
+ i2 = m_pTreeWidget->itemAt(QPoint(1,m_pTreeWidget->viewport()->height() - 2));
if(i2)i2 = i2->nextSibling();
while(i1 && (i1 != i2))
{
if(((KviSharedFilesItem *)i1)->transfer()->active())
{
- m_pListView->repaintItem(i1);
+ m_pTreeWidget->repaintItem(i1);
}
i1 = i1->nextSibling();
}
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 08:42:31 +0000