aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/aliaseditor/aliaseditor.cpp131
-rw-r--r--src/modules/aliaseditor/aliaseditor.h10
-rw-r--r--src/modules/objects/class_ftp.cpp11
-rw-r--r--src/modules/objects/class_ftp.h2
4 files changed, 66 insertions, 88 deletions
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index ef3c16e44..73b286bc9 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -761,20 +761,24 @@ void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerList<KviAliasTreeWi
szFileName += ".kvs";
szFileName.replace("::","_");
QString szCompletePath=m_szDir+szFileName;
-
+ // debug("saving alias: %s",szCompletePath.toUtf8().data());
if (KviFileUtils::fileExists(szCompletePath) && !bReplaceAll)
{
QString szMsg;
KviQString::sprintf(szMsg,__tr2qs_ctx("The file \"%Q\" exists. Do you want to replace it ?","editor"),&szFileName);
int ret = QMessageBox::question(this,__tr2qs_ctx("Replace file","editor"),szMsg,__tr2qs_ctx("Yes","editor"),__tr2qs_ctx("Yes to All","editor"),__tr2qs_ctx("No","editor"));
if (ret!=2){
+ // debug("overwrite %s",szCompletePath.toUtf8().data());
KviFileUtils::writeFile(szCompletePath,tmp);
if (ret==1) bReplaceAll=true;
}
}
- else
+ else{
+
+ // debug("write %s",szCompletePath.toUtf8().data());
KviFileUtils::writeFile(szCompletePath,tmp);
+ }
}
g_pAliasEditorModule->unlock();
@@ -789,12 +793,12 @@ void KviAliasEditor::exportAliases(bool bSelectedOnly,bool bSingleFiles)
l.setAutoDelete(false);
QString out;
-
- appendAliasItems(&l,bSelectedOnly);
+ if (bSelectedOnly) appendSelectedAliasItems(&l);
+ else appendAllAliasItems(&l);
if (bSingleFiles)
{
- exportSelectionInSinglesFiles(&l);
- return;
+ exportSelectionInSinglesFiles(&l);
+ return;
}
int count=0;
@@ -868,66 +872,58 @@ void KviAliasEditor::loadProperties(KviConfig *cfg)
if(!it)it = findNamespaceItem(tmp);
if(it)activateItem(it);
}
+void KviAliasEditor::appendSelectedAliasItems(KviPointerList<KviAliasTreeWidgetItem> * l)
+{
+ QList<QTreeWidgetItem *> list=m_pTreeWidget->selectedItems();
+ for(int i=0;i<list.count();i++)
+ {
+ if (((KviAliasTreeWidgetItem *)list.at(i))->isAlias())
+ l->append((KviAliasTreeWidgetItem *)list.at(i));
+ else
+ {
+ appendSelectedAliasItemsRecursive(l,list.at(i));
+ }
+ }
-void KviAliasEditor::appendAliasItems(KviPointerList<KviAliasTreeWidgetItem> * l,bool bSelectedOnly)
+}
+void KviAliasEditor::appendSelectedAliasItemsRecursive(KviPointerList<KviAliasTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom)
{
- for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
+ for (int i=0;i<pStartFrom->childCount();i++)
+ {
+
+ if (((KviAliasTreeWidgetItem *)pStartFrom->child(i))->isAlias())
+ l->append(((KviAliasTreeWidgetItem *)pStartFrom->child(i)));
+ else
+ appendSelectedAliasItemsRecursive(l,pStartFrom->child(i));
+ }
+}
+void KviAliasEditor::appendAllAliasItems(KviPointerList<KviAliasTreeWidgetItem> * l)
+{
+ for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
{
if (((KviAliasTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->isAlias())
{
- if(bSelectedOnly)
- {
- if(m_pTreeWidget->topLevelItem(i)->isSelected())
- l->append(((KviAliasTreeWidgetItem *)m_pTreeWidget->topLevelItem(i)));
- }
- else
- {
- l->append(((KviAliasTreeWidgetItem *)m_pTreeWidget->topLevelItem(i)));
- }
+ l->append(((KviAliasTreeWidgetItem *)m_pTreeWidget->topLevelItem(i)));
}
else
- {
- if(bSelectedOnly)
- {
- if(m_pTreeWidget->topLevelItem(i)->isSelected())
- appendAliasItemsRecursive(l,m_pTreeWidget->topLevelItem(i),false);
- else
- appendAliasItemsRecursive(l,m_pTreeWidget->topLevelItem(i),true);
- }
- else
- appendAliasItemsRecursive(l,m_pTreeWidget->topLevelItem(i),false);
- }
- }
+ {
+ appendAllAliasItemsRecursive(l,m_pTreeWidget->topLevelItem(i));
+ }
+ }
}
-void KviAliasEditor::appendAliasItemsRecursive(KviPointerList<KviAliasTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom,bool bSelectedOnly)
+void KviAliasEditor::appendAllAliasItemsRecursive(KviPointerList<KviAliasTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom)
{
for (int i=0;i<pStartFrom->childCount();i++)
{
if (((KviAliasTreeWidgetItem *)pStartFrom->child(i))->isAlias())
{
- if(bSelectedOnly)
- {
- if(pStartFrom->child(i)->isSelected())
- l->append((KviAliasTreeWidgetItem *)pStartFrom->child(i));
- }
- else
- {
- l->append((KviAliasTreeWidgetItem *)pStartFrom->child(i));
- }
+ l->append((KviAliasTreeWidgetItem *)pStartFrom->child(i));
}
else
{
- if(bSelectedOnly)
- {
- if(pStartFrom->isSelected())
- appendAliasItemsRecursive(l,pStartFrom->child(i),false);
- else
- appendAliasItemsRecursive(l,pStartFrom->child(i),true);
- }
- else
- appendAliasItemsRecursive(l,pStartFrom->child(i),false);
+ appendAllAliasItemsRecursive(l,pStartFrom->child(i));
}
}
@@ -1009,11 +1005,10 @@ void KviAliasEditor::appendSelectedItemsRecursive(KviPointerList<KviAliasEditorT
else
{
if (it->child(i)->childCount())
- appendSelectedItemsRecursive(l,it->child(i));
+ appendSelectedItemsRecursive(l,it->child(i));
}
}
}
-
void KviAliasEditor::appendSelectedItems(KviPointerList<KviAliasEditorTreeWidgetItem> * l)
{
for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
@@ -1082,33 +1077,14 @@ bool KviAliasEditor::removeItem(KviAliasEditorTreeWidgetItem *it,bool * pbYesToA
removeItemChildren(it);
delete it;
return true;
- /*
- if(bDeleteEmptyTree)
- {
- while(it)
- {
- KviAliasEditorTreeWidgetItem * par = (KviAliasEditorTreeWidgetItem *)(it->parent());
- delete it;
- if(par)
- {
- //if(!par->firstChild())it = par;
- //else it = 0;
- } else {
- it = 0;
- }
- }
- } else {
- delete it;
- }
- return true;
- */
}
void KviAliasEditor::removeSelectedItems()
{
KviPointerList<KviAliasEditorTreeWidgetItem> l;
l.setAutoDelete(false);
- appendSelectedItems(&l);
+ appendSelectedItems(&l);
+
bool bYesToAll = false;
for(KviAliasEditorTreeWidgetItem *it = l.first();it;it = l.next())
@@ -1324,7 +1300,7 @@ bool KviAliasEditor::aliasExists(QString &szFullItemName)
KviPointerList<KviAliasTreeWidgetItem> l;
l.setAutoDelete(false);
- appendAliasItems(&l,false);
+ appendAllAliasItems(&l);
for(KviAliasTreeWidgetItem * it = l.first();it;it = l.next())
{
if (KviQString::equalCI(buildFullItemName(it),szFullItemName))
@@ -1350,16 +1326,7 @@ bool KviAliasEditor::namespaceExists(QString &szFullItemName)
}
return false;
}
-/*
-void KviAliasEditor::appendItems(KviPointerList<KviAliasEditorTreeWidgetItem> * l,QTreeWidgetItem *it)
-{
- for (int i=0;i<it->childCount();i++)
- {
- l->append((KviAliasEditorTreeWidgetItem *) it->child(i);
- if(it->child(i)->childCount()) appendItemd(it->child(i));
- }
-}
-*/
+
void KviAliasEditor::renameItem()
{
if(!m_pLastEditedItem)return;
diff --git a/src/modules/aliaseditor/aliaseditor.h b/src/modules/aliaseditor/aliaseditor.h
index 5b806222f..586ce75bb 100644
--- a/src/modules/aliaseditor/aliaseditor.h
+++ b/src/modules/aliaseditor/aliaseditor.h
@@ -164,11 +164,13 @@ protected:
void oneTimeSetup();
void saveLastEditedItem();
void getUniqueItemName(KviAliasEditorTreeWidgetItem *item,QString &buffer,KviAliasEditorTreeWidgetItem::Type eType);
- void appendSelectedItems(KviPointerList<KviAliasEditorTreeWidgetItem> * l);
- void appendSelectedItemsRecursive(KviPointerList<KviAliasEditorTreeWidgetItem> * l,QTreeWidgetItem *it);
+ void appendSelectedItems(KviPointerList<KviAliasEditorTreeWidgetItem> * l);
+ void appendSelectedAliasItems(KviPointerList<KviAliasTreeWidgetItem> * l);
+ void appendSelectedAliasItemsRecursive(KviPointerList<KviAliasTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom);
+ void appendSelectedItemsRecursive(KviPointerList<KviAliasEditorTreeWidgetItem> * l,QTreeWidgetItem *it);
- void appendAliasItems(KviPointerList<KviAliasTreeWidgetItem> * l,bool bSelectedOnly);
- void appendAliasItemsRecursive(KviPointerList<KviAliasTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom,bool bSelectedOnly);
+ void appendAllAliasItems(KviPointerList<KviAliasTreeWidgetItem> * l);
+ void appendAllAliasItemsRecursive(KviPointerList<KviAliasTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom);
void appendNamespaceItemsRecursive(KviPointerList<KviAliasTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom,bool bSelectedOnly);
void appendNamespaceItems(KviPointerList<KviAliasTreeWidgetItem> * l,bool bSelectedOnly);
diff --git a/src/modules/objects/class_ftp.cpp b/src/modules/objects/class_ftp.cpp
index 9b12e42e6..342cd61b3 100644
--- a/src/modules/objects/class_ftp.cpp
+++ b/src/modules/objects/class_ftp.cpp
@@ -85,6 +85,8 @@
KVSO_BEGIN_REGISTERCLASS(KviKvsObject_ftp,"ftp","object")
KVSO_REGISTER_HANDLER(KviKvsObject_ftp,"connect",functionConnect)
KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,abort)
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,close)
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,close)
KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,login)
KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,get)
KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,cd)
@@ -199,6 +201,13 @@ KVSO_CLASS_FUNCTION(ftp,abort)
m_pFtp->abort();
return true;
}
+KVSO_CLASS_FUNCTION(ftp,close)
+{
+ CHECK_INTERNAL_POINTER(m_pFtp)
+ m_bAbort=true;
+ m_pFtp->close();
+ return true;
+}
//signals & slots
KVSO_CLASS_FUNCTION(ftp,commandFinishedEvent)
{
@@ -226,7 +235,7 @@ void KviKvsObject_ftp::slotCommandFinished ( int id, bool error )
}
if (m_pFtp->currentCommand()==QFtp::Get)
{
- status="Finished to load";
+ status="Downloaded";
QFile *pFile=getDict.value(id);
pFile->close();
delete pFile;
diff --git a/src/modules/objects/class_ftp.h b/src/modules/objects/class_ftp.h
index 974f26088..85c40688b 100644
--- a/src/modules/objects/class_ftp.h
+++ b/src/modules/objects/class_ftp.h
@@ -52,7 +52,7 @@ protected:
bool commandFinishedEvent(KviKvsObjectFunctionCall *c);
bool stateChangedEvent(KviKvsObjectFunctionCall *c);
bool abort(KviKvsObjectFunctionCall *c);
-
+ bool close(KviKvsObjectFunctionCall *c);
protected slots:
void slotCommandFinished ( int id, bool error );
void slotCommandStarted ( int id );
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 06:06:45 +0000