kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Refactor

Browse Source
This commit is contained in:
Benjamin Bræstrup Sayoc
2022-02-01 01:17:21 +01:00
committed by WandererFan
parent a97dd7139e
commit 8506453c93
1 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Mod/TechDraw/Gui/SymbolChooser.cpp
View File

@@ -58,8 +58,9 @@ SymbolChooser::SymbolChooser(QWidget *parent,
void SymbolChooser::setUiPrimary()
{
// Base::Console().Message("SC::setUiPrimary()\n");
// Base::Console().Message("SC::setUiPrimary()\n");
setWindowTitle(QObject::tr("Select a symbol"));
resize(QSize(700, 500));
if (!m_symbolDir.isEmpty()) {
ui->fcSymbolDir->setFileName(m_symbolDir);
loadSymbolNames(m_symbolDir);
@@ -67,21 +68,18 @@ void SymbolChooser::setUiPrimary()
std::string resourceDir = App::Application::getResourceDir();
std::string defPath = "Mod/TechDraw/Symbols/Welding/AWS/";
resourceDir = resourceDir + defPath;
QString defDir = QString::fromUtf8(resourceDir.c_str());
ui->fcSymbolDir->setFileName(defDir);
loadSymbolNames(defDir);
m_symbolDir = defDir;
QString m_symbolDir = QString::fromUtf8(resourceDir.c_str());
ui->fcSymbolDir->setFileName(m_symbolDir);
loadSymbolNames(m_symbolDir);
}
ui->lwSymbols->setViewMode(QListView::IconMode);
ui->lwSymbols->setFlow(QListView::LeftToRight);
ui->lwSymbols->setWrapping(true);
ui->lwSymbols->setDragEnabled(true);
ui->lwSymbols->setSelectionMode(QAbstractItemView::SingleSelection);
ui->lwSymbols->setGridSize(QSize(75, 85));
ui->lwSymbols->setIconSize(QSize(45, 45));
ui->lwSymbols->setResizeMode(QListView::Adjust);
ui->lwSymbols->setAcceptDrops(false);
}
void SymbolChooser::onOKClicked()
@@ -106,8 +104,8 @@ void SymbolChooser::onCancelClicked()
void SymbolChooser::onItemClicked(QListWidgetItem* item)
{
Q_UNUSED(item);
// Base::Console().Message("SCS::onItemClicked(%s)\n", qPrintable(item->text()));
//are item and currentItem() the same? should use item?
// Base::Console().Message("SCS::onItemClicked(%s)\n", qPrintable(item->text()));
// Are item and currentItem() the same? Should use item?
QListWidgetItem* sourceItem = ui->lwSymbols->currentItem();
QString targetText = sourceItem->text();
m_symbolPath = m_symbolDir +
@@ -115,41 +113,32 @@ void SymbolChooser::onItemClicked(QListWidgetItem* item)
QString::fromUtf8(".svg");
Q_EMIT symbolSelected(m_symbolPath, m_source);
// Base::Console().Message("SC::onOKClicked - symbol: %s\n", qPrintable(m_symbolPath));
// Base::Console().Message("SC::onOKClicked - symbol: %s\n", qPrintable(m_symbolPath));
accept();
}
void SymbolChooser::onDirectoryChanged(const QString& newDir)
{
ui->lwSymbols->clear(); // Remove all previous symbols
// Base::Console().Message("SC::onDirectoryChanged(%s)\n", qPrintable(newDir));
// Base::Console().Message("SC::onDirectoryChanged(%s)\n", qPrintable(newDir));
m_symbolDir = newDir + QString::fromUtf8("/");
loadSymbolNames(m_symbolDir);
}
void SymbolChooser::loadSymbolNames(QString pathToSymbols)
{
//fill selection list with names and icons
// Fill selection list with names and icons
QDir symbolDir(pathToSymbols);
symbolDir.setFilter(QDir::Files);
QStringList fileNames = symbolDir.entryList();
for (auto& fn: fileNames) {
QListWidgetItem* item = new QListWidgetItem(fn, ui->lwSymbols);
QFileInfo fi(fn);
item->setText(fi.baseName());
QIcon symbolIcon(pathToSymbols + fn);
item->setIcon(symbolIcon);
ui->lwSymbols->addItem(item);
QString text = (new QFileInfo(fn))->baseName();
QIcon icon(pathToSymbols + fn);
// Create a symbol in the QListWidget lwSymbols
new QListWidgetItem(icon, text, ui->lwSymbols);
}
ui->lwSymbols->setCurrentRow(0);
ui->lwSymbols->setAcceptDrops(false); //have to do this every time you update the items
}
//QString SymbolChooser::getSymbolPath(void)
//{
// Base::Console().Message("SC::getSymbolPath returns: %s\n", qPrintable(m_symbolPath));
// return m_symbolPath;
//}
#include <Mod/TechDraw/Gui/moc_SymbolChooser.cpp>