diff --git a/src/Gui/ApplicationPy.cpp b/src/Gui/ApplicationPy.cpp index 373ec7fa9..21717f8d3 100644 --- a/src/Gui/ApplicationPy.cpp +++ b/src/Gui/ApplicationPy.cpp @@ -269,7 +269,7 @@ PyObject* Application::sOpen(PyObject * /*self*/, PyObject *args,PyObject * /*kw else if (ext == QLatin1String("py") || ext == QLatin1String("fcmacro") || ext == QLatin1String("fcscript")) { PythonEditor* editor = new PythonEditor(); - editor->setWindowIcon(Gui::BitmapFactory().pixmap("python_small")); + editor->setWindowIcon(Gui::BitmapFactory().pixmap("applications-python")); PythonEditorView* edit = new PythonEditorView(editor, getMainWindow()); edit->open(fileName); edit->resize(400, 300); @@ -329,7 +329,7 @@ PyObject* Application::sInsert(PyObject * /*self*/, PyObject *args,PyObject * /* else if (ext == QLatin1String("py") || ext == QLatin1String("fcmacro") || ext == QLatin1String("fcscript")) { PythonEditor* editor = new PythonEditor(); - editor->setWindowIcon(Gui::BitmapFactory().pixmap("python_small")); + editor->setWindowIcon(Gui::BitmapFactory().pixmap("applications-python")); PythonEditorView* edit = new PythonEditorView(editor, getMainWindow()); edit->open(fileName); edit->resize(400, 300); diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index db271fc9c..f3df6a980 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -147,6 +147,7 @@ set(Gui_MOC_HDRS DlgOnlineHelpImp.h DlgParameterImp.h DlgPreferencesImp.h + DlgProjectInformationImp.h DlgProjectUtility.h DlgReportViewImp.h DlgSettings3DViewImp.h diff --git a/src/Gui/DlgActivateWindow.ui b/src/Gui/DlgActivateWindow.ui index b60a85dce..a8b19cb84 100644 --- a/src/Gui/DlgActivateWindow.ui +++ b/src/Gui/DlgActivateWindow.ui @@ -1,10 +1,8 @@ - - - - + + Gui::Dialog::DlgActivateWindow - - + + 0 0 @@ -12,140 +10,87 @@ 267 - + Choose Window - + true - + true - - - 9 - - - 6 - - - - + + + + false + + + 1 + + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + - - - - 0 - - - 6 - - - - - &Activate - - - Alt+A - - - true - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 100 - 20 - - - - - - - - &Cancel - - - - - - true - - - - - - - - buttonOk - buttonCancel - + - - buttonOk - clicked() - Gui::Dialog::DlgActivateWindow - accept() - - - 22 - 232 - - - 20 - 20 - - - - - buttonCancel - clicked() - Gui::Dialog::DlgActivateWindow - reject() - - - 266 - 232 - - - 20 - 20 - - - treeWidget activated(QModelIndex) Gui::Dialog::DlgActivateWindow accept() - + 139 109 - + 174 256 + + buttonBox + accepted() + Gui::Dialog::DlgActivateWindow + accept() + + + 170 + 245 + + + 170 + 133 + + + + + buttonBox + rejected() + Gui::Dialog::DlgActivateWindow + reject() + + + 170 + 245 + + + 170 + 133 + + + diff --git a/src/Gui/DlgActivateWindowImp.cpp b/src/Gui/DlgActivateWindowImp.cpp index 1bde7c2bc..1ec0b1eca 100644 --- a/src/Gui/DlgActivateWindowImp.cpp +++ b/src/Gui/DlgActivateWindowImp.cpp @@ -23,10 +23,12 @@ #include "PreCompiled.h" #ifndef _PreComp_ +# include # include #endif #include "DlgActivateWindowImp.h" +#include "ui_DlgActivateWindow.h" #include "MainWindow.h" #include "MDIView.h" @@ -41,40 +43,46 @@ using namespace Gui::Dialog; * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -DlgActivateWindowImp::DlgActivateWindowImp( QWidget* parent, Qt::WFlags fl ) - : QDialog( parent, fl ) +DlgActivateWindowImp::DlgActivateWindowImp(QWidget* parent, Qt::WFlags fl) + : QDialog(parent, fl), ui(new Ui_DlgActivateWindow) { // create widgets - setupUi(this); + ui->setupUi(this); + QPushButton* buttonOk = ui->buttonBox->button(QDialogButtonBox::Ok); + buttonOk->setText(QApplication::translate("Gui::Dialog::DlgActivateWindow", "&Activate")); QTreeWidgetItem* active=0; QStringList labels; labels << tr("Windows"); - treeWidget->setHeaderLabels(labels); - treeWidget->header()->hide(); + ui->treeWidget->setHeaderLabels(labels); + ui->treeWidget->header()->hide(); QList windows = getMainWindow()->windows(); - if (windows.isEmpty()) - { - this->buttonOk->setDisabled(true); + if (windows.isEmpty()) { + buttonOk->setDisabled(true); return; } QWidget* activeWnd = getMainWindow()->activeWindow(); for (QList::ConstIterator it = windows.begin(); it != windows.end(); ++it) { - QTreeWidgetItem* item = new QTreeWidgetItem(treeWidget); - item->setText(0, (*it)->windowTitle()); - if ( *it == activeWnd ) + QTreeWidgetItem* item = new QTreeWidgetItem(ui->treeWidget); + QString title = (*it)->windowTitle(); + title.replace(QLatin1String("[*]"), QLatin1String("")); + if ((*it)->isWindowModified()) + title += QLatin1String("*"); + item->setText(0, title); + if (*it == activeWnd) active = item; } if (active) - treeWidget->setCurrentItem( active ); - treeWidget->setFocus(); + ui->treeWidget->setCurrentItem( active ); + ui->treeWidget->setFocus(); } /** Destroys the object and frees any allocated resources */ DlgActivateWindowImp::~DlgActivateWindowImp() { + delete ui; } /** @@ -82,11 +90,11 @@ DlgActivateWindowImp::~DlgActivateWindowImp() */ void DlgActivateWindowImp::accept() { - QTreeWidgetItem* item = treeWidget->currentItem(); + QTreeWidgetItem* item = ui->treeWidget->currentItem(); QList windows = getMainWindow()->windows(); if (item) { - int index = treeWidget->indexOfTopLevelItem(item); + int index = ui->treeWidget->indexOfTopLevelItem(item); getMainWindow()->setActiveWindow((MDIView*)windows.at(index)); } diff --git a/src/Gui/DlgActivateWindowImp.h b/src/Gui/DlgActivateWindowImp.h index fcd90c724..454f1ed6e 100644 --- a/src/Gui/DlgActivateWindowImp.h +++ b/src/Gui/DlgActivateWindowImp.h @@ -24,27 +24,30 @@ #ifndef GUI_DIALOG_DLGACTIVATEWINDOW_IMP_H #define GUI_DIALOG_DLGACTIVATEWINDOW_IMP_H -#include "ui_DlgActivateWindow.h" +#include namespace Gui { namespace Dialog { - +class Ui_DlgActivateWindow; /** * The DlgActivateWindowImp class provides a dialog to activate the MDI window * of the main window you wish. Since there could be a lot of MDI windows in * an application you cannot put all of them into the "Windows" popup menu. * \author Werner Mayer */ -class DlgActivateWindowImp : public QDialog, public Ui_DlgActivateWindow +class DlgActivateWindowImp : public QDialog { Q_OBJECT public: - DlgActivateWindowImp( QWidget* parent = 0, Qt::WFlags fl = 0 ); + DlgActivateWindowImp(QWidget* parent = 0, Qt::WFlags fl = 0); ~DlgActivateWindowImp(); protected: void accept(); + +private: + Ui_DlgActivateWindow* ui; }; } // namespace Dialog diff --git a/src/Gui/DlgChooseIcon.ui b/src/Gui/DlgChooseIcon.ui index 40fac914a..567bd4cc0 100644 --- a/src/Gui/DlgChooseIcon.ui +++ b/src/Gui/DlgChooseIcon.ui @@ -53,19 +53,9 @@ - - - OK - - - true - - - - - - - Cancel + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -76,34 +66,34 @@ - okButton - clicked() + buttonBox + accepted() Gui::Dialog::DlgChooseIcon accept() - 278 - 253 + 339 + 344 - 96 - 254 + 214 + 184 - cancelButton - clicked() + buttonBox + rejected() Gui::Dialog::DlgChooseIcon reject() - 369 - 253 + 339 + 344 - 179 - 282 + 214 + 184 diff --git a/src/Gui/DlgDisplayProperties.ui b/src/Gui/DlgDisplayProperties.ui index ba09a1797..8515901bc 100644 --- a/src/Gui/DlgDisplayProperties.ui +++ b/src/Gui/DlgDisplayProperties.ui @@ -344,37 +344,11 @@ - - - 6 + + + QDialogButtonBox::Close - - 0 - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 81 - 21 - - - - - - - - Close - - - - + @@ -399,26 +373,9 @@ spinTransparency sliderLineTransparency spinLineTransparency - CancelButton - - CancelButton - clicked() - Gui::Dialog::DlgDisplayProperties - reject() - - - 226 - 451 - - - 20 - 28 - - - spinTransparency valueChanged(int) @@ -483,5 +440,21 @@ + + buttonBox + rejected() + Gui::Dialog::DlgDisplayProperties + reject() + + + 150 + 461 + + + 144 + 243 + + + diff --git a/src/Gui/DlgInputDialog.ui b/src/Gui/DlgInputDialog.ui index 66c5fc67e..d12e30029 100644 --- a/src/Gui/DlgInputDialog.ui +++ b/src/Gui/DlgInputDialog.ui @@ -1,198 +1,146 @@ - - - - + + Gui::Dialog::DlgInputDialog - - + + 0 0 - 400 - 89 + 399 + 99 - + Input - + false - - - 6 - - - 6 - - - - + + + + - - - - - + + + + + 1 - + 6 - - + + - - - + + + 1 - + 6 - - + + - - - + + + 1 - + 6 - - + + - - - + + + 1 - + 6 - - + + - - - - 1 - - + + + 6 + + 1 + - + - - - - 0 + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - 6 - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - OK - - - - - - true - - - - - - - Cancel - - - - - - - + - + Gui::UIntSpinBox QSpinBox
Gui/SpinBox.h
- 0 - - buttonOk - clicked() + buttonBox + accepted() Gui::Dialog::DlgInputDialog accept() - - 20 - 20 + + 199 + 99 - - 20 - 20 + + 199 + 58 - buttonCancel - clicked() + buttonBox + rejected() Gui::Dialog::DlgInputDialog reject() - - 20 - 20 + + 199 + 99 - - 20 - 20 + + 199 + 58 diff --git a/src/Gui/DlgInputDialogImp.cpp b/src/Gui/DlgInputDialogImp.cpp index 18493a2da..7f954d2c1 100644 --- a/src/Gui/DlgInputDialogImp.cpp +++ b/src/Gui/DlgInputDialogImp.cpp @@ -45,10 +45,6 @@ DlgInputDialogImp::DlgInputDialogImp( const QString& labelTxt, QWidget* parent, this->setupUi(this); label->setText(labelTxt); - QSize bs = buttonOk->sizeHint().expandedTo(buttonCancel->sizeHint()); - buttonOk->setFixedSize( bs ); - buttonCancel->setFixedSize( bs ); - QSize sh = sizeHint(); setType(type); resize(qMax(sh.width(), 400), 1); @@ -78,7 +74,7 @@ void DlgInputDialogImp::textChanged( const QString &s ) on = !s.isEmpty(); } - buttonOk->setEnabled( on ); + buttonBox->button(QDialogButtonBox::Ok)->setEnabled( on ); } void DlgInputDialogImp::tryAccept() diff --git a/src/Gui/DlgMacroExecuteImp.cpp b/src/Gui/DlgMacroExecuteImp.cpp index 1fa36e246..40475ddde 100644 --- a/src/Gui/DlgMacroExecuteImp.cpp +++ b/src/Gui/DlgMacroExecuteImp.cpp @@ -182,7 +182,7 @@ void DlgMacroExecuteImp::on_createButton_clicked() } file.close(); PythonEditor* editor = new PythonEditor(); - editor->setWindowIcon(Gui::BitmapFactory().pixmap("python_small")); + editor->setWindowIcon(Gui::BitmapFactory().pixmap("applications-python")); PythonEditorView* edit = new PythonEditorView(editor, getMainWindow()); edit->open(fi.absoluteFilePath()); edit->setWindowTitle(QString::fromAscii("%1[*]").arg(fn)); diff --git a/src/Gui/DlgMaterialProperties.ui b/src/Gui/DlgMaterialProperties.ui index 5dbd37501..cdcfc9b58 100644 --- a/src/Gui/DlgMaterialProperties.ui +++ b/src/Gui/DlgMaterialProperties.ui @@ -1,10 +1,8 @@ - - - - + + Gui::Dialog::DlgMaterialProperties - - + + 0 0 @@ -12,100 +10,94 @@ 247 - + Material properties - + true - + true - - - 9 - - - 6 - - - - + + + + Material - - + + 9 - + 6 - - - + + + Emissive color: - - - + + + Specular color: - - - + + + Ambient color: - - - + + + Diffuse color: - - - + + + - - - + + + - - - - 0 - - + + + 6 + + 0 + - - + + Shininess: - + Qt::Horizontal - + QSizePolicy::Expanding - + 81 31 @@ -114,24 +106,24 @@ - - + + % - - - + + + - - - + + + @@ -139,55 +131,21 @@ - - - - 0 + + + + QDialogButtonBox::Close - - 6 - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - &Close - - - Alt+C - - - true - - - - + - + Gui::ColorButton QPushButton
Gui/Widgets.h
- 0 - @@ -196,23 +154,22 @@ emissiveColor specularColor shininess - buttonCancel - buttonCancel - clicked() + buttonBox + rejected() Gui::Dialog::DlgMaterialProperties reject() - - 257 - 271 + + 145 + 225 - - 20 - 36 + + 145 + 123 diff --git a/src/Gui/DlgPreferences.ui b/src/Gui/DlgPreferences.ui index 510cd0e23..213932203 100644 --- a/src/Gui/DlgPreferences.ui +++ b/src/Gui/DlgPreferences.ui @@ -1,10 +1,8 @@ - - - - + + Gui::Dialog::DlgPreferences - - + + 0 0 @@ -12,205 +10,125 @@ 454 - + Preferences - + true - + true - - + + 9 - + 6 - - - - 0 - - + + + 6 + + 0 + - - - - 0 - 7 + + + 0 0 - + 120 0 - + 128 16777215 - + QFrame::StyledPanel - + QFrame::Sunken - + Qt::ScrollBarAlwaysOff - + Qt::ScrollBarAlwaysOff - + 96 96 - + 12 - + QListView::IconMode - + - - - - 0 + + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok - - 6 - - - - - &Help - - - Alt+H - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 170 - 20 - - - - - - - - &OK - - - - - - true - - - true - - - - - - - &Apply - - - Alt+A - - - true - - - - - - - &Cancel - - - - - - true - - - - + - + listBox - buttonHelp - buttonOk - buttonApply - buttonCancel - buttonOk - clicked() + buttonBox + accepted() Gui::Dialog::DlgPreferences accept() - - 20 - 20 + + 284 + 432 - - 20 - 20 + + 284 + 226 - buttonCancel - clicked() + buttonBox + rejected() Gui::Dialog::DlgPreferences reject() - - 20 - 20 + + 284 + 432 - - 20 - 20 + + 284 + 226 diff --git a/src/Gui/DlgPreferencesImp.cpp b/src/Gui/DlgPreferencesImp.cpp index e841e9b18..d5203e65d 100644 --- a/src/Gui/DlgPreferencesImp.cpp +++ b/src/Gui/DlgPreferencesImp.cpp @@ -56,7 +56,8 @@ DlgPreferencesImp::DlgPreferencesImp( QWidget* parent, Qt::WFlags fl ) : QDialog(parent, fl) { this->setupUi(this); - connect( buttonHelp, SIGNAL ( clicked() ), getMainWindow(), SLOT ( whatsThis() )); + connect(buttonBox, SIGNAL (helpRequested()), + getMainWindow(), SLOT (whatsThis())); connect(listBox, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(changeGroup(QListWidgetItem *, QListWidgetItem*))); @@ -189,12 +190,18 @@ void DlgPreferencesImp::activateGroupPage(const QString& group, int index) void DlgPreferencesImp::accept() { this->invalidParameter = false; - on_buttonApply_clicked(); + applyChanges(); if (!this->invalidParameter) QDialog::accept(); } -void DlgPreferencesImp::on_buttonApply_clicked() +void DlgPreferencesImp::on_buttonBox_clicked(QAbstractButton* btn) +{ + if (buttonBox->standardButton(btn) == QDialogButtonBox::Apply) + applyChanges(); +} + +void DlgPreferencesImp::applyChanges() { try { for (int i=0; icount(); i++) { diff --git a/src/Gui/DlgPreferencesImp.h b/src/Gui/DlgPreferencesImp.h index 020a82bda..3e8cd8262 100644 --- a/src/Gui/DlgPreferencesImp.h +++ b/src/Gui/DlgPreferencesImp.h @@ -120,12 +120,13 @@ protected: protected Q_SLOTS: void changeGroup(QListWidgetItem *current, QListWidgetItem *previous); - void on_buttonApply_clicked(); + void on_buttonBox_clicked(QAbstractButton*); private: /** @name for internal use only */ //@{ void setupPages(); + void applyChanges(); //@} private: diff --git a/src/Gui/DlgProjectInformation.ui b/src/Gui/DlgProjectInformation.ui index df33f5517..5ee4276d0 100644 --- a/src/Gui/DlgProjectInformation.ui +++ b/src/Gui/DlgProjectInformation.ui @@ -19,13 +19,7 @@ true - - - 9 - - - 6 - + @@ -304,59 +298,11 @@ - - - 6 + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - 0 - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - &OK - - - - - - true - - - true - - - - - - - &Cancel - - - - - - true - - - - + @@ -364,34 +310,34 @@ - buttonOk - clicked() + buttonBox + accepted() Gui::Dialog::DlgProjectInformation accept() - 20 - 20 + 298 + 518 - 20 - 20 + 298 + 269 - buttonCancel - clicked() + buttonBox + rejected() Gui::Dialog::DlgProjectInformation reject() - 20 - 20 + 298 + 518 - 20 - 20 + 298 + 269 diff --git a/src/Gui/DlgProjectInformationImp.cpp b/src/Gui/DlgProjectInformationImp.cpp index fd58c674d..b0b47ebec 100644 --- a/src/Gui/DlgProjectInformationImp.cpp +++ b/src/Gui/DlgProjectInformationImp.cpp @@ -27,6 +27,7 @@ #include #include "DlgProjectInformationImp.h" +#include "ui_DlgProjectInformation.h" #include "Document.h" #include #include @@ -37,33 +38,33 @@ using namespace Gui::Dialog; /** * Constructs a Gui::Dialog::DlgProjectInformationImp as a child of 'parent', with the - * name 'name' and widget flags set to 'f'. + * name 'name' and widget flags set to 'fl'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -DlgProjectInformationImp::DlgProjectInformationImp( App::Document* doc, QWidget* parent, Qt::WFlags fl ) - : QDialog( parent, fl ), _doc(doc) +DlgProjectInformationImp::DlgProjectInformationImp(App::Document* doc, QWidget* parent, Qt::WFlags fl) + : QDialog(parent, fl), _doc(doc), ui(new Ui_DlgProjectInformation) { - this->setupUi(this); - lineEditName->setText(QString::fromUtf8(doc->Label.getValue())); - lineEditPath->setText(QString::fromUtf8(doc->FileName.getValue())); - lineEditUuid->setText(QString::fromUtf8(doc->Uid.getValueStr().c_str())); - lineEditCreator->setText(QString::fromUtf8(doc->CreatedBy.getValue())); - lineEditDate->setText(QString::fromUtf8(doc->CreationDate.getValue())); - lineEditLastMod->setText(QString::fromUtf8(doc->LastModifiedBy.getValue())); - lineEditLastModDate->setText(QString::fromUtf8(doc->LastModifiedDate.getValue())); - lineEditCompany->setText(QString::fromUtf8(doc->Company.getValue())); - lineEditLicense->setText(QString::fromUtf8(doc->License.getValue())); - lineEditLicenseURL->setText(QString::fromUtf8(doc->LicenseURL.getValue())); + ui->setupUi(this); + ui->lineEditName->setText(QString::fromUtf8(doc->Label.getValue())); + ui->lineEditPath->setText(QString::fromUtf8(doc->FileName.getValue())); + ui->lineEditUuid->setText(QString::fromUtf8(doc->Uid.getValueStr().c_str())); + ui->lineEditCreator->setText(QString::fromUtf8(doc->CreatedBy.getValue())); + ui->lineEditDate->setText(QString::fromUtf8(doc->CreationDate.getValue())); + ui->lineEditLastMod->setText(QString::fromUtf8(doc->LastModifiedBy.getValue())); + ui->lineEditLastModDate->setText(QString::fromUtf8(doc->LastModifiedDate.getValue())); + ui->lineEditCompany->setText(QString::fromUtf8(doc->Company.getValue())); + ui->lineEditLicense->setText(QString::fromUtf8(doc->License.getValue())); + ui->lineEditLicenseURL->setText(QString::fromUtf8(doc->LicenseURL.getValue())); // When saving the text to XML the newlines get lost. So we store also the newlines as '\n'. // See also accept(). QString comment = QString::fromUtf8(doc->Comment.getValue()); QStringList lines = comment.split(QLatin1String("\\n"), QString::KeepEmptyParts); QString text = lines.join(QLatin1String("\n")); - textEditComment->setPlainText( text ); - connect(pushButtonOpenURL, SIGNAL(clicked()),this, SLOT(open_url())); + ui->textEditComment->setPlainText( text ); + connect(ui->pushButtonOpenURL, SIGNAL(clicked()),this, SLOT(open_url())); } /** @@ -71,7 +72,8 @@ DlgProjectInformationImp::DlgProjectInformationImp( App::Document* doc, QWidget* */ DlgProjectInformationImp::~DlgProjectInformationImp() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, Qt does it all for us + delete ui; } /** @@ -79,14 +81,14 @@ DlgProjectInformationImp::~DlgProjectInformationImp() */ void DlgProjectInformationImp::accept() { - _doc->CreatedBy.setValue(lineEditCreator->text().toUtf8()); - _doc->LastModifiedBy.setValue(lineEditCreator->text().toUtf8()); - _doc->Company.setValue(lineEditCompany->text().toUtf8()); - _doc->License.setValue(lineEditLicense->text().toUtf8()); - _doc->LicenseURL.setValue(lineEditLicenseURL->text().toUtf8()); + _doc->CreatedBy.setValue(ui->lineEditCreator->text().toUtf8()); + _doc->LastModifiedBy.setValue(ui->lineEditCreator->text().toUtf8()); + _doc->Company.setValue(ui->lineEditCompany->text().toUtf8()); + _doc->License.setValue(ui->lineEditLicense->text().toUtf8()); + _doc->LicenseURL.setValue(ui->lineEditLicenseURL->text().toUtf8()); // Replace newline escape sequence trough '\\n' string - QStringList lines = textEditComment->toPlainText().split + QStringList lines = ui->textEditComment->toPlainText().split (QLatin1String("\n"), QString::KeepEmptyParts); QString text = lines.join(QLatin1String("\\n")); _doc->Comment.setValue(text.isEmpty() ? "" : text.toUtf8()); @@ -99,6 +101,8 @@ void DlgProjectInformationImp::accept() */ void DlgProjectInformationImp::open_url() { - QString url = QString::fromUtf8(_doc->LicenseURL.getValue()); + QString url = ui->lineEditLicenseURL->text(); QDesktopServices::openUrl(QUrl(url, QUrl::TolerantMode)); } + +#include "moc_DlgProjectInformationImp.cpp" diff --git a/src/Gui/DlgProjectInformationImp.h b/src/Gui/DlgProjectInformationImp.h index cda120e7c..cbcd1d398 100644 --- a/src/Gui/DlgProjectInformationImp.h +++ b/src/Gui/DlgProjectInformationImp.h @@ -24,7 +24,7 @@ #ifndef GUI_DIALOG_DLGPROJECTINFORMATIONIMP_H #define GUI_DIALOG_DLGPROJECTINFORMATIONIMP_H -#include "ui_DlgProjectInformation.h" +#include namespace App { class Document; @@ -34,16 +34,22 @@ namespace Gui { namespace Dialog { -class DlgProjectInformationImp : public QDialog, public Ui_DlgProjectInformation +class Ui_DlgProjectInformation; +class DlgProjectInformationImp : public QDialog { -public: - DlgProjectInformationImp( App::Document* doc, QWidget* parent = 0, Qt::WFlags fl = 0 ); - ~DlgProjectInformationImp(); + Q_OBJECT -protected: +public: + DlgProjectInformationImp(App::Document* doc, QWidget* parent = 0, Qt::WFlags fl = 0); + ~DlgProjectInformationImp(); void accept(); + +private Q_SLOTS: void open_url(); + +private: App::Document* _doc; + Ui_DlgProjectInformation* ui; }; } // namespace Dialog diff --git a/src/Gui/DlgSettingsColorGradient.ui b/src/Gui/DlgSettingsColorGradient.ui index 2fbc52e65..3a2ba1fc6 100644 --- a/src/Gui/DlgSettingsColorGradient.ui +++ b/src/Gui/DlgSettingsColorGradient.ui @@ -1,10 +1,8 @@ - - - - + + Gui::Dialog::DlgSettingsColorGradient - - + + 0 0 @@ -12,71 +10,65 @@ 342 - + Color-gradient settings - + true - + true - - - 9 - - - 6 - - - - + + + + Color model - - - 11 - - + + 6 + + 11 + - - - 0 - - + + 6 + + 0 + - - + + &Gradient: - + comboBoxModel - + - + red-yellow-green-cyan-blue - + blue-cyan-green-yellow-red - + white-black - + black-white @@ -84,13 +76,13 @@ - + Qt::Horizontal - + QSizePolicy::Expanding - + 100 20 @@ -103,72 +95,37 @@ - - - - Visibility - - - - 11 - - - 0 - - - - - Out g&rayed - - - Alt+R - - - - - - - Out &invisible - - - Alt+I - - - - - - - - - + + + Style - - + + 9 - + 6 - - - + + + &Zero - + Alt+Z - - - + + + &Flow - + Alt+F - + true @@ -176,82 +133,62 @@ - - - - 0 + + + + Visibility - - 6 - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 41 - 27 - - - - - - - - &OK - - - - - - true - - - true - - - - - - - &Cancel - - - - - - true - - - - - - - - - Parameter range - - - + + + 0 + + 11 - + + + + Out g&rayed + + + Alt+R + + + + + + + Out &invisible + + + Alt+I + + + + + + + + + + Parameter range + + + + 11 + + 6 - + - + Qt::Horizontal - + QSizePolicy::Expanding - + 35 20 @@ -259,79 +196,79 @@ - - - + + + 0 - + 6 - - + + - - + + - - - + + + Mi&nimum: - + floatLineEditMin - - - + + + Ma&ximum: - + floatLineEditMax - - - + + + 0 - + 6 - - + + - - - + + + 6 - + 2 - - - + + + &Labels: - + spinBoxLabel - - - + + + &Decimals: - + spinBoxDecimals @@ -341,9 +278,16 @@ + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + - + comboBoxModel radioButtonFlow @@ -352,40 +296,38 @@ floatLineEditMax floatLineEditMin spinBoxLabel - buttonOk - buttonCancel - buttonOk - clicked() + buttonBox + accepted() Gui::Dialog::DlgSettingsColorGradient accept() - - 20 - 20 + + 180 + 320 - - 20 - 20 + + 180 + 170 - buttonCancel - clicked() + buttonBox + rejected() Gui::Dialog::DlgSettingsColorGradient reject() - - 20 - 20 + + 180 + 320 - - 20 - 20 + + 180 + 170 diff --git a/src/Gui/DlgTreeWidget.ui b/src/Gui/DlgTreeWidget.ui index 6e84c2b3d..ca9610950 100644 --- a/src/Gui/DlgTreeWidget.ui +++ b/src/Gui/DlgTreeWidget.ui @@ -1,43 +1,29 @@ - - - - + + Gui::DlgTreeWidget - - + + 0 0 - 379 - 283 + 396 + 281 - + Dialog - - - 9 - - - 6 - - - - + + + + - - - 9 - - - 6 - - - + + + - + Items @@ -46,77 +32,46 @@ - - - - 0 + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - 6 - - - - - Qt::Horizontal - - - - 131 - 31 - - - - - - - - OK - - - - - - - Cancel - - - - + - - okButton - clicked() + buttonBox + accepted() Gui::DlgTreeWidget accept() - - 278 - 253 + + 436 + 220 - - 96 - 254 + + 271 + 247 - cancelButton - clicked() + buttonBox + rejected() Gui::DlgTreeWidget reject() - - 369 - 253 + + 436 + 220 - - 179 - 282 + + 271 + 247 diff --git a/src/Gui/InputVector.ui b/src/Gui/InputVector.ui index 7fc917665..621c9eebb 100644 --- a/src/Gui/InputVector.ui +++ b/src/Gui/InputVector.ui @@ -1,10 +1,8 @@ - - - - + + Gui::Dialog::InputVector - - + + 0 0 @@ -12,78 +10,72 @@ 177 - + Input vector - - - 9 - - - 6 - - - - + + + + Vector - - + + 9 - + 6 - - - - 2.14748e+09 + + + + -2147480000.000000000000000 - - -2.14748e+09 + + 2147480000.000000000000000 - - 1 + + 1.000000000000000 - - - - 2.14748e+09 + + + + -2147480000.000000000000000 - - -2.14748e+09 + + 2147480000.000000000000000 - - - - 2.14748e+09 + + + + -2147480000.000000000000000 - - -2.14748e+09 + + 2147480000.000000000000000 - - - + + + Z: - - - + + + Y: - - - + + + X: @@ -91,60 +83,35 @@ - - - - 0 + + + + QDialogButtonBox::Ok - - 6 - - - - - Qt::Horizontal - - - - 131 - 31 - - - - - - - - OK - - - - + - vectorX vectorY vectorZ - okButton - okButton - clicked() + buttonBox + accepted() Gui::Dialog::InputVector accept() - - 278 - 253 + + 90 + 155 - - 96 - 254 + + 90 + 88 diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index 675c02a07..1cb98181a 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -406,7 +406,7 @@ MainWindow::MainWindow(QWidget * parent, Qt::WFlags f) // Python console PythonConsole* pcPython = new PythonConsole(this); pcPython->setWordWrapMode(QTextOption::NoWrap); - pcPython->setWindowIcon(Gui::BitmapFactory().pixmap("python_small")); + pcPython->setWindowIcon(Gui::BitmapFactory().pixmap("applications-python")); pcPython->setObjectName (QString::fromAscii(QT_TRANSLATE_NOOP("QDockWidget","Python console"))); pDockMgr->registerDockWindow("Std_PythonView", pcPython); diff --git a/src/Gui/PythonDebugger.cpp b/src/Gui/PythonDebugger.cpp index ab4102868..f265df746 100644 --- a/src/Gui/PythonDebugger.cpp +++ b/src/Gui/PythonDebugger.cpp @@ -534,7 +534,7 @@ void PythonDebugger::showDebugMarker(const QString& fn, int line) if (!edit) { PythonEditor* editor = new PythonEditor(); - editor->setWindowIcon(Gui::BitmapFactory().pixmap("python_small")); + editor->setWindowIcon(Gui::BitmapFactory().pixmap("applications-python")); edit = new PythonEditorView(editor, getMainWindow()); edit->open(fn); edit->resize(400, 300); diff --git a/src/Gui/ReportView.cpp b/src/Gui/ReportView.cpp index 3936bd5ad..c130aa712 100644 --- a/src/Gui/ReportView.cpp +++ b/src/Gui/ReportView.cpp @@ -75,7 +75,7 @@ ReportView::ReportView( QWidget* parent ) tabPython = new PythonConsole(); tabPython->setWordWrapMode(QTextOption::NoWrap); tabPython->setWindowTitle(trUtf8("Python console")); - tabPython->setWindowIcon(BitmapFactory().pixmap("python_small")); + tabPython->setWindowIcon(BitmapFactory().pixmap("applications-python")); int python = tabWidget->addTab(tabPython, tabPython->windowTitle()); tabWidget->setTabIcon(python, tabPython->windowIcon()); tabWidget->setCurrentIndex(0); diff --git a/src/Gui/Widgets.h b/src/Gui/Widgets.h index 70366a67f..622422865 100644 --- a/src/Gui/Widgets.h +++ b/src/Gui/Widgets.h @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/src/Mod/Inspection/Gui/VisualInspection.cpp b/src/Mod/Inspection/Gui/VisualInspection.cpp index 35417d68f..f5eb625d4 100644 --- a/src/Mod/Inspection/Gui/VisualInspection.cpp +++ b/src/Mod/Inspection/Gui/VisualInspection.cpp @@ -84,6 +84,8 @@ VisualInspection::VisualInspection(QWidget* parent, Qt::WFlags fl) this, SLOT(onActivateItem(QTreeWidgetItem*))); connect(ui->treeWidgetNominal, SIGNAL(itemClicked(QTreeWidgetItem*, int)), this, SLOT(onActivateItem(QTreeWidgetItem*))); + connect(ui->buttonBox, SIGNAL(helpRequested()), + Gui::getMainWindow(), SLOT(whatsThis())); //FIXME: Not used yet ui->textLabel2->hide(); @@ -91,11 +93,10 @@ VisualInspection::VisualInspection(QWidget* parent, Qt::WFlags fl) ui->prefFloatSpinBox1->setDecimals(Base::UnitsApi::getDecimals()); ui->prefFloatSpinBox2->setDecimals(Base::UnitsApi::getDecimals()); - connect(ui->buttonHelp, SIGNAL(clicked()), Gui::getMainWindow(), SLOT(whatsThis())); - App::Document* doc = App::GetApplication().getActiveDocument(); // disable Ok button and enable of at least one item in each view is on - ui->buttonOk->setDisabled(true); + buttonOk = ui->buttonBox->button(QDialogButtonBox::Ok); + buttonOk->setDisabled(true); if (!doc) { ui->treeWidgetActual->setDisabled(true); @@ -185,13 +186,13 @@ void VisualInspection::onActivateItem(QTreeWidgetItem* item) } } - ui->buttonOk->setEnabled(ok); + buttonOk->setEnabled(ok); } void VisualInspection::accept() { onActivateItem(0); - if (ui->buttonOk->isEnabled()) { + if (buttonOk->isEnabled()) { QDialog::accept(); saveSettings(); diff --git a/src/Mod/Inspection/Gui/VisualInspection.h b/src/Mod/Inspection/Gui/VisualInspection.h index df4b938f5..8057244a2 100644 --- a/src/Mod/Inspection/Gui/VisualInspection.h +++ b/src/Mod/Inspection/Gui/VisualInspection.h @@ -28,6 +28,7 @@ #include class QTreeWidgetItem; +class QPushButton; namespace InspectionGui { class Ui_VisualInspection; @@ -48,6 +49,7 @@ protected Q_SLOTS: private: Ui_VisualInspection* ui; + QPushButton* buttonOk; }; } // namespace InspectionGui diff --git a/src/Mod/Inspection/Gui/VisualInspection.ui b/src/Mod/Inspection/Gui/VisualInspection.ui index 80f3fffb2..d00078dd1 100644 --- a/src/Mod/Inspection/Gui/VisualInspection.ui +++ b/src/Mod/Inspection/Gui/VisualInspection.ui @@ -1,10 +1,8 @@ - - - - + + InspectionGui::VisualInspection - - + + 0 0 @@ -12,65 +10,32 @@ 406 - + Visual Inspection - + true - - - 9 - - - 6 - - - - - Nominal - - - - 9 - - - 6 - - - - - false - - - - Objects - - - - - - - - - - + + + + Actual - - + + 9 - + 6 - - - + + + false - + Objects @@ -79,95 +44,54 @@ - - - - 0 + + + + Nominal - - 6 - - - - - &Help - - - F1 - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - &OK - - - - - - true - - - true - - - - - - - &Cancel - - - - - - true - - - - - - - - - Parameter - - - + + 9 - + 6 - + + + + false + + + + Objects + + + + + + + + + + + Parameter + + + + 9 + + + 6 + + - + Qt::Horizontal - + QSizePolicy::Expanding - + 61 54 @@ -175,75 +99,75 @@ - - - + + + 0 - + 6 - - - + + + mm - + 3 - - 0.1 + + 0.100000000000000 - + Thickness - + Mod/Inspection/Inspection - - - + + + Search distance - - - + + + mm - + 3 - - 0.05 + + 0.050000000000000 - + SearchDistance - + Mod/Inspection/Inspection - - - + + + Thickness - + - + Qt::Horizontal - + QSizePolicy::Expanding - + 91 21 @@ -251,15 +175,15 @@ - + - + Qt::Horizontal - + QSizePolicy::Expanding - + 101 21 @@ -272,56 +196,58 @@ + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok + + + - + Gui::PrefDoubleSpinBox QDoubleSpinBox
Gui/PrefWidgets.h
- 0 - prefFloatSpinBox1 prefFloatSpinBox2 - buttonHelp - buttonOk - buttonCancel - buttonOk - clicked() + buttonBox + accepted() InspectionGui::VisualInspection accept() - - 20 - 20 + + 269 + 384 - - 20 - 20 + + 269 + 202 - buttonCancel - clicked() + buttonBox + rejected() InspectionGui::VisualInspection reject() - - 20 - 20 + + 269 + 384 - - 20 - 20 + + 269 + 202 diff --git a/src/Mod/Mesh/Gui/DlgEvaluateMesh.ui b/src/Mod/Mesh/Gui/DlgEvaluateMesh.ui index b49b76b53..0558a5ffc 100644 --- a/src/Mod/Mesh/Gui/DlgEvaluateMesh.ui +++ b/src/Mod/Mesh/Gui/DlgEvaluateMesh.ui @@ -7,7 +7,7 @@ 0 0 371 - 683 + 680 @@ -883,56 +883,11 @@ - - - 6 + + + QDialogButtonBox::Close|QDialogButtonBox::Help - - 0 - - - - - &Help - - - F1 - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - &Close - - - Alt+C - - - true - - - - + @@ -957,24 +912,22 @@ checkIndicesButton analyzeIndicesButton repairIndicesButton - buttonHelp - closeButton - closeButton - clicked() + buttonBox + rejected() MeshGui::DlgEvaluateMesh close() - 326 - 615 + 185 + 661 - 189 - 337 + 185 + 341 diff --git a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp index aabb82690..0a4e0736e 100644 --- a/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp +++ b/src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp @@ -197,7 +197,7 @@ DlgEvaluateMeshImp::DlgEvaluateMeshImp(QWidget* parent, Qt::WFlags fl) line_8->setFrameShape(QFrame::HLine); line_8->setFrameShadow(QFrame::Sunken); - connect(buttonHelp, SIGNAL (clicked()), + connect(buttonBox, SIGNAL (helpRequested()), Gui::getMainWindow(), SLOT (whatsThis())); // try to attach to the active document diff --git a/src/Mod/Part/Gui/DlgBlock.ui b/src/Mod/Part/Gui/DlgBlock.ui index da30f2257..acd9ebe59 100644 --- a/src/Mod/Part/Gui/DlgBlock.ui +++ b/src/Mod/Part/Gui/DlgBlock.ui @@ -7,20 +7,14 @@ 0 0 299 - 514 + 477 Block definition - - - 6 - - - 9 - - + + First limit @@ -115,7 +109,7 @@ - + Profile @@ -154,7 +148,7 @@ - + 0 @@ -178,7 +172,7 @@ - + false @@ -276,7 +270,7 @@ - + Direction @@ -328,68 +322,12 @@ - - - - 0 + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - 6 - - - - - Apply - - - - - - - Cancel - - - - - - - OK - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - + @@ -406,10 +344,40 @@ SecondLimitSelection DirectionPerpendicular DirectionSelection - OKButton - ApplyButton - CancelButton - + + + buttonBox + accepted() + BlockDefinition + accept() + + + 149 + 455 + + + 149 + 238 + + + + + buttonBox + rejected() + BlockDefinition + reject() + + + 149 + 455 + + + 149 + 238 + + + + diff --git a/src/Mod/Part/Gui/DlgPartBox.ui b/src/Mod/Part/Gui/DlgPartBox.ui index 1ab3ae352..d3824966b 100644 --- a/src/Mod/Part/Gui/DlgPartBox.ui +++ b/src/Mod/Part/Gui/DlgPartBox.ui @@ -1,166 +1,92 @@ - - - - + + PartGui::DlgPartBox - - + + 0 0 257 - 323 + 305 - + Box definition - - - 9 - - - 6 - - - - - Size: - - - - 9 - - - 6 - - - - - 2.14748e+09 - - - 100 - - - - - - - 2.14748e+09 - - - 100 - - - - - - - 2.14748e+09 - - - 100 - - - - - - - Height: - - - - - - - Width: - - - - - - - Length: - - - - - - - - - + + + + Position: - - + + 9 - + 6 - - - - 2.14748e+09 + + + + -2147480000.000000000000000 - - -2.14748e+09 + + 2147480000.000000000000000 - - - + + + -1 - - - - 2.14748e+09 + + + + -2147480000.000000000000000 - - -2.14748e+09 + + 2147480000.000000000000000 - - - - 2.14748e+09 + + + + -2147480000.000000000000000 - - -2.14748e+09 + + 2147480000.000000000000000 - - - + + + Direction: - - - + + + X: - - - + + + Y: - - - + + + Z: @@ -168,49 +94,82 @@ - - - - 0 + + + + Size: - - 6 + + + 9 + + + 6 + + + + + 2147480000.000000000000000 + + + 100.000000000000000 + + + + + + + 2147480000.000000000000000 + + + 100.000000000000000 + + + + + + + 2147480000.000000000000000 + + + 100.000000000000000 + + + + + + + Height: + + + + + + + Width: + + + + + + + Length: + + + + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 16 - 27 - - - - - - - - OK - - - - - - - Cancel - - - - + - + xPos yPos @@ -219,40 +178,38 @@ uLength vLength wLength - OKButton - CancelButton - OKButton - clicked() + buttonBox + accepted() PartGui::DlgPartBox accept() - - 60 - 249 + + 125 + 311 - - 7 - 7 + + 128 + 161 - CancelButton - clicked() + buttonBox + rejected() PartGui::DlgPartBox reject() - - 242 - 246 + + 125 + 311 - - 291 - 179 + + 128 + 161 diff --git a/src/Mod/Part/Gui/DlgPartCylinder.ui b/src/Mod/Part/Gui/DlgPartCylinder.ui index afca534bc..260e130e2 100644 --- a/src/Mod/Part/Gui/DlgPartCylinder.ui +++ b/src/Mod/Part/Gui/DlgPartCylinder.ui @@ -1,199 +1,158 @@ - - - - + + PartGui::DlgPartCylinder - - + + 0 0 - 296 - 323 + 275 + 279 - + Cylinder definition - - - 9 - - - 6 - - - - - Parameter - - - - 9 - - - 6 - - - - - Height: - - - - - - - Radius: - - - - - - - 2.14748e+09 - - - 100 - - - - - - - 2.14748e+09 - - - 10 - - - - - - - - - + + + + Position: - - + + 9 - + 6 - - - + + + -1 - - - + + + Direction: - - - + + + X: - - - + + + Z: - - - + + + Y: - - - - 2.14748e+09 + + + + -2147480000.000000000000000 - - -2.14748e+09 + + 2147480000.000000000000000 - - - - 2.14748e+09 + + + + -2147480000.000000000000000 - - -2.14748e+09 + + 2147480000.000000000000000 - - - - 2.14748e+09 + + + + -2147480000.000000000000000 - - -2.14748e+09 + + 2147480000.000000000000000 - - - - 0 + + + + Parameter - - 6 + + + 9 + + + 6 + + + + + Height: + + + + + + + Radius: + + + + + + + 2147480000.000000000000000 + + + 100.000000000000000 + + + + + + + 2147480000.000000000000000 + + + 10.000000000000000 + + + + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 88 - 27 - - - - - - - - OK - - - - - - - Cancel - - - - + - + xPos yPos @@ -201,40 +160,38 @@ direction radius length - OKButton - CancelButton - OKButton - clicked() + buttonBox + accepted() PartGui::DlgPartCylinder accept() - - 60 - 249 + + 139 + 255 - - 7 - 7 + + 0 + 223 - CancelButton - clicked() + buttonBox + rejected() PartGui::DlgPartCylinder reject() - - 242 - 246 + + 253 + 258 - - 291 - 179 + + 278 + 243 diff --git a/src/Mod/Part/Gui/DlgPartImportIges.ui b/src/Mod/Part/Gui/DlgPartImportIges.ui index b563153fa..f78ec4c6b 100644 --- a/src/Mod/Part/Gui/DlgPartImportIges.ui +++ b/src/Mod/Part/Gui/DlgPartImportIges.ui @@ -1,109 +1,56 @@ - - - - + + PartGui::DlgPartImportIges - - + + 0 0 342 - 121 + 112 - + IGES input file - - - 9 - - - 6 - - - - - 0 - - - 6 - - - - - OK - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 151 - 27 - - - - - - - - Cancel - - - - - - - - + + + + File Name - - + + 11 - - 6 - - - - + + + - - - - - 0 - 0 + + + + 0 0 - + 30 0 - + 30 32767 - + ... @@ -111,48 +58,20 @@ + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + - + FileName SearchFile - OKButton - CancelButton - - - OKButton - clicked() - PartGui::DlgPartImportIges - accept() - - - 20 - 20 - - - 20 - 20 - - - - - CancelButton - clicked() - PartGui::DlgPartImportIges - reject() - - - 20 - 20 - - - 20 - 20 - - - - + diff --git a/src/Mod/Part/Gui/DlgPartImportStep.ui b/src/Mod/Part/Gui/DlgPartImportStep.ui index 0a46ddca8..400aae501 100644 --- a/src/Mod/Part/Gui/DlgPartImportStep.ui +++ b/src/Mod/Part/Gui/DlgPartImportStep.ui @@ -1,69 +1,56 @@ - - - - + + PartGui::DlgPartImportStep - - + + 0 0 - 342 - 117 + 349 + 116 - + Step input file - - - 9 - - - 6 - - - - + + + + File Name - - + + 11 - - 6 - - - - + + + - - - - - 0 - 0 + + + + 0 0 - + 30 0 - + 30 32767 - + ... @@ -71,88 +58,20 @@ - - - - 0 + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - 6 - - - - - OK - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 151 - 27 - - - - - - - - Cancel - - - - + - + FileName SearchFile - OKButton - CancelButton - - - OKButton - clicked() - PartGui::DlgPartImportStep - accept() - - - 20 - 20 - - - 20 - 20 - - - - - CancelButton - clicked() - PartGui::DlgPartImportStep - reject() - - - 20 - 20 - - - 20 - 20 - - - - +