Skip to content

Commit da33554

Browse files
committed
Working on renaming subnet item
1 parent dd6bcc4 commit da33554

File tree

3 files changed

+32
-4
lines changed

3 files changed

+32
-4
lines changed

src/Interface/Application/SCIRunMainWindow.cc

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@ void SCIRunMainWindow::fillSavedSubnetworkMenu()
12831283
qDebug() << "invalid subnet saved settings: sizes don't match" << savedSubnetworksNames_.size() << "," << savedSubnetworksXml_.size() << ',' << savedSubnetworksNames_.keys().size() << savedSubnetworksNames_.keys();
12841284
return;
12851285
}
1286-
auto keys = savedSubnetworksNames_.keys();
1286+
auto keys = savedSubnetworksNames_.keys(); // don't inline this into the zip call! temporary containers don't work with zip.
12871287
for (auto&& tup : zip(savedSubnetworksNames_, savedSubnetworksXml_, keys))
12881288
{
12891289
auto subnet = new QTreeWidgetItem();
@@ -1345,11 +1345,11 @@ void SCIRunMainWindow::setupSubnetItem(QTreeWidgetItem* fave, bool addToMap, con
13451345

13461346
delButton->setIcon(QPixmap(":/general/Resources/delete_red.png"));
13471347
delButton->setToolTip("Delete");
1348-
13491348
connect(delButton, SIGNAL(clicked()), this, SLOT(removeSavedSubnetwork()));
13501349
auto renButton = new QToolButton();
13511350
renButton->setIcon(QPixmap(":/general/Resources/rename.ico"));
13521351
renButton->setToolTip("Rename");
1352+
connect(renButton, SIGNAL(clicked()), this, SLOT(renameSavedSubnetwork()));
13531353
auto name = new QLabel(fave->text(0));
13541354
name->setStyleSheet("QLabel { color : " + fave->textColor(0).name() + "; }");
13551355
hLayout->addWidget(name);
@@ -1366,6 +1366,7 @@ int subnetHeight = 35;
13661366
moduleSelectorTreeWidget_->setItemWidget(fave, 0, dualPushButtons);
13671367
auto id = addToMap ? idFromPointer(fave) + "::" + fave->text(0) : idFromMap;
13681368
delButton->setProperty("ID", id);
1369+
renButton->setProperty("ID", id);
13691370
fave->setData(0, Qt::UserRole, id);
13701371

13711372
if (addToMap)
@@ -1397,7 +1398,7 @@ void SCIRunMainWindow::handleCheckedModuleEntry(QTreeWidgetItem* item, int colum
13971398
setupSubnetItem(fave, true, "");
13981399
}
13991400
}
1400-
}
1401+
}
14011402
else
14021403
{
14031404
if (faves && item->textColor(0) != CLIPBOARD_COLOR)
@@ -1433,6 +1434,32 @@ void SCIRunMainWindow::removeSavedSubnetwork()
14331434
}
14341435
}
14351436

1437+
void SCIRunMainWindow::renameSavedSubnetwork()
1438+
{
1439+
auto toRename = sender()->property("ID").toString();
1440+
qDebug() << "renaming subnet : " << toRename << savedSubnetworksNames_;
1441+
1442+
bool ok;
1443+
auto text = QInputDialog::getText(this, tr("Rename subnet"), tr("Enter new subnet name:"), QLineEdit::Normal, savedSubnetworksNames_[toRename].toString(), &ok);
1444+
if (ok && !text.isEmpty())
1445+
{
1446+
qDebug() << "new name:" << text;
1447+
savedSubnetworksNames_[toRename] = text;
1448+
auto tree = getSavedSubnetworksMenu(moduleSelectorTreeWidget_);
1449+
for (int i = 0; i < tree->childCount(); ++i)
1450+
{
1451+
auto subnet = tree->child(i);
1452+
if (toRename == subnet->data(0, Qt::UserRole).toString())
1453+
{
1454+
auto widget = moduleSelectorTreeWidget_->itemWidget(subnet, 0);
1455+
qDebug() << widget;
1456+
//qobject_cast<QLabel*>(widget->layout()->children()[0])->setText(text);
1457+
break;
1458+
}
1459+
}
1460+
}
1461+
}
1462+
14361463
bool SCIRunMainWindow::isInFavorites(const QString& module) const
14371464
{
14381465
return favoriteModuleNames_.contains(module);

src/Interface/Application/SCIRunMainWindow.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ private Q_SLOTS:
198198
void toolkitDownload();
199199
void addToPathFromGUI();
200200
void removeSavedSubnetwork();
201+
void renameSavedSubnetwork();
201202
void displayAcknowledgement();
202203
void setFocusOnFilterLine();
203204
void addModuleKeyboardAction();

src/Interface/Application/Settings.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,8 @@ void SCIRunMainWindow::writeSettings()
317317
settings.setValue("savedSubnetworksNames", savedSubnetworksNames_);
318318
//settings.setValue("savedSubnetworksNames", QMap<QString, QVariant>());
319319
//qDebug() << "writing xml: " << savedSubnetworksXml_;
320-
//settings.setValue("savedSubnetworksXml", QMap<QString, QVariant>());
321320
settings.setValue("savedSubnetworksXml", savedSubnetworksXml_);
321+
//settings.setValue("savedSubnetworksXml", QMap<QString, QVariant>());
322322

323323
settings.setValue("geometry", saveGeometry());
324324
settings.setValue("windowState", saveState());

0 commit comments

Comments
 (0)