suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fix whitespaces

Browse Source
This commit is contained in:
wmayer 2016-01-11 23:48:59 +01:00
parent 8a3958ced5
commit db539008be
1 changed files with 87 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
src/Gui/DlgMacroExecuteImp.cpp
View File

@ -103,30 +103,26 @@ DlgMacroExecuteImp::~DlgMacroExecuteImp()
*/ */
void DlgMacroExecuteImp::fillUpList(void) void DlgMacroExecuteImp::fillUpList(void)
{ {
// lists all files in macro path // lists all files in macro path
QDir dir(this->macroPath, QLatin1String("*.FCMacro *.py")); QDir dir(this->macroPath, QLatin1String("*.FCMacro *.py"));
// fill up with the directory // fill up with the directory
userMacroListBox->clear(); userMacroListBox->clear();
for (unsigned int i=0; i<dir.count(); i++ ) { for (int i=0; i<dir.count(); i++ ) {
MacroItem* item = new MacroItem(userMacroListBox,false); MacroItem* item = new MacroItem(userMacroListBox,false);
item->setText(0, dir[i]); item->setText(0, dir[i]);
} }
QString dirstr = QString::fromUtf8(App::GetApplication().getHomePath()) + QString::fromUtf8("Macro"); QString dirstr = QString::fromUtf8(App::GetApplication().getHomePath()) + QString::fromUtf8("Macro");
dir = QDir(dirstr, QLatin1String("*.FCMacro *.py")); dir = QDir(dirstr, QLatin1String("*.FCMacro *.py"));
systemMacroListBox->clear();
if(dir.exists()) {
for (unsigned int i=0; i<dir.count(); i++ ) {
MacroItem* item = new MacroItem(systemMacroListBox,true);
item->setText(0, dir[i]);
}
}
systemMacroListBox->clear();
if (dir.exists()) {
for (int i=0; i<dir.count(); i++ ) {
MacroItem* item = new MacroItem(systemMacroListBox,true);
item->setText(0, dir[i]);
}
}
} }
/** /**
@ -135,80 +131,80 @@ void DlgMacroExecuteImp::fillUpList(void)
void DlgMacroExecuteImp::on_userMacroListBox_currentItemChanged(QTreeWidgetItem* item) void DlgMacroExecuteImp::on_userMacroListBox_currentItemChanged(QTreeWidgetItem* item)
{ {
if (item) { if (item) {
LineEditMacroName->setText(item->text(0)); LineEditMacroName->setText(item->text(0));
executeButton->setEnabled(true); executeButton->setEnabled(true);
editButton->setEnabled(true); editButton->setEnabled(true);
deleteButton->setEnabled(true); deleteButton->setEnabled(true);
createButton->setEnabled(true); createButton->setEnabled(true);
} }
else { else {
executeButton->setEnabled(false); executeButton->setEnabled(false);
editButton->setEnabled(false); editButton->setEnabled(false);
deleteButton->setEnabled(false); deleteButton->setEnabled(false);
createButton->setEnabled(true); createButton->setEnabled(true);
} }
} }
void DlgMacroExecuteImp::on_systemMacroListBox_currentItemChanged(QTreeWidgetItem* item) void DlgMacroExecuteImp::on_systemMacroListBox_currentItemChanged(QTreeWidgetItem* item)
{ {
if (item) { if (item) {
LineEditMacroName->setText(item->text(0)); LineEditMacroName->setText(item->text(0));
executeButton->setEnabled(true); executeButton->setEnabled(true);
editButton->setEnabled(false); editButton->setEnabled(false);
deleteButton->setEnabled(false); deleteButton->setEnabled(false);
createButton->setEnabled(false); createButton->setEnabled(false);
} }
else { else {
executeButton->setEnabled(false); executeButton->setEnabled(false);
editButton->setEnabled(false); editButton->setEnabled(false);
deleteButton->setEnabled(false); deleteButton->setEnabled(false);
createButton->setEnabled(false); createButton->setEnabled(false);
} }
} }
void DlgMacroExecuteImp::on_tabMacroWidget_currentChanged(int index) void DlgMacroExecuteImp::on_tabMacroWidget_currentChanged(int index)
{ {
QTreeWidgetItem* item; QTreeWidgetItem* item;
if(index == 0) { //user-specific if (index == 0) { //user-specific
item = userMacroListBox->currentItem(); item = userMacroListBox->currentItem();
if(item) { if (item) {
executeButton->setEnabled(true); executeButton->setEnabled(true);
editButton->setEnabled(true); editButton->setEnabled(true);
deleteButton->setEnabled(true); deleteButton->setEnabled(true);
createButton->setEnabled(true); createButton->setEnabled(true);
} }
else { else {
executeButton->setEnabled(false); executeButton->setEnabled(false);
editButton->setEnabled(false); editButton->setEnabled(false);
deleteButton->setEnabled(false); deleteButton->setEnabled(false);
createButton->setEnabled(true); createButton->setEnabled(true);
} }
} }
else { //index==1 system-wide else { //index==1 system-wide
item = systemMacroListBox->currentItem(); item = systemMacroListBox->currentItem();
if(item) { if (item) {
executeButton->setEnabled(true); executeButton->setEnabled(true);
editButton->setEnabled(false); editButton->setEnabled(false);
deleteButton->setEnabled(false); deleteButton->setEnabled(false);
createButton->setEnabled(false); createButton->setEnabled(false);
} }
else { else {
executeButton->setEnabled(false); executeButton->setEnabled(false);
editButton->setEnabled(false); editButton->setEnabled(false);
deleteButton->setEnabled(false); deleteButton->setEnabled(false);
createButton->setEnabled(false); createButton->setEnabled(false);
} }
} }
if (item) { if (item) {
LineEditMacroName->setText(item->text(0)); LineEditMacroName->setText(item->text(0));
} }
else { else {
LineEditMacroName->setText(QString::fromLatin1("")); LineEditMacroName->setText(QString::fromLatin1(""));
} }
} }
@ -218,32 +214,32 @@ void DlgMacroExecuteImp::on_tabMacroWidget_currentChanged(int index)
void DlgMacroExecuteImp::accept() void DlgMacroExecuteImp::accept()
{ {
QTreeWidgetItem* item; QTreeWidgetItem* item;
int index = tabMacroWidget->currentIndex(); int index = tabMacroWidget->currentIndex();
if (index == 0) { //user-specific
if(index == 0) { //user-specific item = userMacroListBox->currentItem();
item = userMacroListBox->currentItem();
} }
else { else {
//index == 1 system-wide //index == 1 system-wide
item = systemMacroListBox->currentItem(); item = systemMacroListBox->currentItem();
} }
if (!item) return; if (!item)
return;
QDialog::accept(); QDialog::accept();
MacroItem * mitem = static_cast<MacroItem *>(item); MacroItem * mitem = static_cast<MacroItem *>(item);
QDir dir; QDir dir;
if(!mitem->systemWide){ if (!mitem->systemWide){
dir =QDir(this->macroPath); dir =QDir(this->macroPath);
} }
else { else {
QString dirstr = QString::fromUtf8(App::GetApplication().getHomePath()) + QString::fromUtf8("Macro"); QString dirstr = QString::fromUtf8(App::GetApplication().getHomePath()) + QString::fromUtf8("Macro");
dir = QDir(dirstr); dir = QDir(dirstr);
} }
QFileInfo fi(dir, item->text(0)); QFileInfo fi(dir, item->text(0));
try { try {
Application::Instance->macroManager()->run(Gui::MacroManager::File, fi.filePath().toUtf8()); Application::Instance->macroManager()->run(Gui::MacroManager::File, fi.filePath().toUtf8());
@ -280,11 +276,12 @@ void DlgMacroExecuteImp::on_fileChooser_fileNameChanged(const QString& fn)
void DlgMacroExecuteImp::on_editButton_clicked() void DlgMacroExecuteImp::on_editButton_clicked()
{ {
QTreeWidgetItem* item = userMacroListBox->currentItem(); QTreeWidgetItem* item = userMacroListBox->currentItem();
if (!item) return; if (!item)
return;
MacroItem * mitem = static_cast<MacroItem *>(item); MacroItem * mitem = static_cast<MacroItem *>(item);
if(mitem->systemWide) { if (mitem->systemWide) {
QMessageBox::critical(qApp->activeWindow(), QObject::tr("Delete macro"), QMessageBox::critical(qApp->activeWindow(), QObject::tr("Delete macro"),
QObject::tr("Not allowed to edit system-wide macros")); QObject::tr("Not allowed to edit system-wide macros"));
return; return;
@ -340,11 +337,12 @@ void DlgMacroExecuteImp::on_createButton_clicked()
void DlgMacroExecuteImp::on_deleteButton_clicked() void DlgMacroExecuteImp::on_deleteButton_clicked()
{ {
QTreeWidgetItem* item = userMacroListBox->currentItem(); QTreeWidgetItem* item = userMacroListBox->currentItem();
if (!item) return; if (!item)
return;
MacroItem * mitem = static_cast<MacroItem *>(item); MacroItem * mitem = static_cast<MacroItem *>(item);
if(mitem->systemWide) { if (mitem->systemWide) {
QMessageBox::critical(qApp->activeWindow(), QObject::tr("Delete macro"), QMessageBox::critical(qApp->activeWindow(), QObject::tr("Delete macro"),
QObject::tr("Not allowed to delete system-wide macros")); QObject::tr("Not allowed to delete system-wide macros"));
return; return;