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

+ use dialog button box where possible, replace old Python icon

Browse Source
This commit is contained in:
wmayer 2014-03-08 15:17:56 +01:00
parent 7dfa6208ea
commit 1f478269af
34 changed files with 1115 additions and 1945 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Gui/ApplicationPy.cpp
View File

@ -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);

1
src/Gui/CMakeLists.txt
View File

@ -147,6 +147,7 @@ set(Gui_MOC_HDRS
DlgOnlineHelpImp.h
DlgParameterImp.h
DlgPreferencesImp.h
DlgProjectInformationImp.h
DlgProjectUtility.h
DlgReportViewImp.h
DlgSettings3DViewImp.h

171
src/Gui/DlgActivateWindow.ui
View File

@ -1,10 +1,8 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Gui::Dialog::DlgActivateWindow</class>
<widget class="QDialog" name="Gui::Dialog::DlgActivateWindow" >
<property name="geometry" >
<widget class="QDialog" name="Gui::Dialog::DlgActivateWindow">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@ -12,140 +10,87 @@
<height>267</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Choose Window</string>
</property>
<property name="sizeGripEnabled" >
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
<property name="modal" >
<property name="modal">
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QTreeWidget" name="treeWidget" >
<property name="rootIsDecorated" >
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QTreeWidget" name="treeWidget">
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
</widget>
</item>
<item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QPushButton" name="buttonOk" >
<property name="text" >
<string>&amp;Activate</string>
</property>
<property name="shortcut" >
<string>Alt+A</string>
</property>
<property name="autoDefault" >
<bool>true</bool>
</property>
<property name="default" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>100</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="buttonCancel" >
<property name="text" >
<string>&amp;Cancel</string>
</property>
<property name="shortcut" >
<string/>
</property>
<property name="autoDefault" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<layoutdefault spacing="6" margin="11"/>
<resources/>
<connections>
<connection>
<sender>buttonOk</sender>
<signal>clicked()</signal>
<receiver>Gui::Dialog::DlgActivateWindow</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>22</x>
<y>232</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonCancel</sender>
<signal>clicked()</signal>
<receiver>Gui::Dialog::DlgActivateWindow</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>266</x>
<y>232</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
<connection>
<sender>treeWidget</sender>
<signal>activated(QModelIndex)</signal>
<receiver>Gui::Dialog::DlgActivateWindow</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<hint type="sourcelabel">
<x>139</x>
<y>109</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>174</x>
<y>256</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Gui::Dialog::DlgActivateWindow</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>170</x>
<y>245</y>
</hint>
<hint type="destinationlabel">
<x>170</x>
<y>133</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Gui::Dialog::DlgActivateWindow</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>170</x>
<y>245</y>
</hint>
<hint type="destinationlabel">
<x>170</x>
<y>133</y>
</hint>
</hints>
</connection>
</connections>
</ui>

38
src/Gui/DlgActivateWindowImp.cpp
View File

@ -23,10 +23,12 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QApplication>
# include <QHeaderView>
#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<QWidget*> windows = getMainWindow()->windows();
if (windows.isEmpty())
{
this->buttonOk->setDisabled(true);
if (windows.isEmpty()) {
buttonOk->setDisabled(true);
return;
}
QWidget* activeWnd = getMainWindow()->activeWindow();
for (QList<QWidget*>::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<QWidget*> windows = getMainWindow()->windows();
if (item) {
int index = treeWidget->indexOfTopLevelItem(item);
int index = ui->treeWidget->indexOfTopLevelItem(item);
getMainWindow()->setActiveWindow((MDIView*)windows.at(index));
}

11
src/Gui/DlgActivateWindowImp.h
View File

@ -24,27 +24,30 @@
#ifndef GUI_DIALOG_DLGACTIVATEWINDOW_IMP_H
#define GUI_DIALOG_DLGACTIVATEWINDOW_IMP_H
#include "ui_DlgActivateWindow.h"
#include <QDialog>
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

40
src/Gui/DlgChooseIcon.ui
View File

@ -53,19 +53,9 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="okButton">
<property name="text">
<string>OK</string>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="cancelButton">
<property name="text">
<string>Cancel</string>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
@ -76,34 +66,34 @@
<resources/>
<connections>
<connection>
<sender>okButton</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Gui::Dialog::DlgChooseIcon</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>278</x>
<y>253</y>
<x>339</x>
<y>344</y>
</hint>
<hint type="destinationlabel">
<x>96</x>
<y>254</y>
<x>214</x>
<y>184</y>
</hint>
</hints>
</connection>
<connection>
<sender>cancelButton</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Gui::Dialog::DlgChooseIcon</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>369</x>
<y>253</y>
<x>339</x>
<y>344</y>
</hint>
<hint type="destinationlabel">
<x>179</x>
<y>282</y>
<x>214</x>
<y>184</y>
</hint>
</hints>
</connection>

67
src/Gui/DlgDisplayProperties.ui
View File

@ -344,37 +344,11 @@
</widget>
</item>
<item row="3" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Close</set>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>81</width>
<height>21</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="CancelButton">
<property name="text">
<string>Close</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
@ -399,26 +373,9 @@
<tabstop>spinTransparency</tabstop>
<tabstop>sliderLineTransparency</tabstop>
<tabstop>spinLineTransparency</tabstop>
<tabstop>CancelButton</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>CancelButton</sender>
<signal>clicked()</signal>
<receiver>Gui::Dialog::DlgDisplayProperties</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>226</x>
<y>451</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
<y>28</y>
</hint>
</hints>
</connection>
<connection>
<sender>spinTransparency</sender>
<signal>valueChanged(int)</signal>
@ -483,5 +440,21 @@
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Gui::Dialog::DlgDisplayProperties</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>150</x>
<y>461</y>
</hint>
<hint type="destinationlabel">
<x>144</x>
<y>243</y>
</hint>
</hints>
</connection>
</connections>
</ui>

186
src/Gui/DlgInputDialog.ui
View File

@ -1,198 +1,146 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Gui::Dialog::DlgInputDialog</class>
<widget class="QDialog" name="Gui::Dialog::DlgInputDialog" >
<property name="geometry" >
<widget class="QDialog" name="Gui::Dialog::DlgInputDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>89</height>
<width>399</width>
<height>99</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Input</string>
</property>
<property name="sizeGripEnabled" >
<property name="sizeGripEnabled">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>6</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="label" >
<property name="text" >
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QStackedWidget" name="stack" >
<widget class="QWidget" name="WStackPage1" >
<layout class="QGridLayout" >
<property name="margin" >
<item row="1" column="0">
<widget class="QStackedWidget" name="stack">
<widget class="QWidget" name="WStackPage1">
<layout class="QGridLayout">
<property name="margin">
<number>1</number>
</property>
<property name="spacing" >
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QLineEdit" name="lineEdit" />
<item row="0" column="0">
<widget class="QLineEdit" name="lineEdit"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="WStackPage2" >
<layout class="QGridLayout" >
<property name="margin" >
<widget class="QWidget" name="WStackPage2">
<layout class="QGridLayout">
<property name="margin">
<number>1</number>
</property>
<property name="spacing" >
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QSpinBox" name="spinBox" />
<item row="0" column="0">
<widget class="QSpinBox" name="spinBox"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="WStackPage3" >
<layout class="QGridLayout" >
<property name="margin" >
<widget class="QWidget" name="WStackPage3">
<layout class="QGridLayout">
<property name="margin">
<number>1</number>
</property>
<property name="spacing" >
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QDoubleSpinBox" name="floatSpinBox" />
<item row="0" column="0">
<widget class="QDoubleSpinBox" name="floatSpinBox"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="WStackPage4" >
<layout class="QGridLayout" >
<property name="margin" >
<widget class="QWidget" name="WStackPage4">
<layout class="QGridLayout">
<property name="margin">
<number>1</number>
</property>
<property name="spacing" >
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QComboBox" name="comboBox" />
<item row="0" column="0">
<widget class="QComboBox" name="comboBox"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="WStackPage5" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>1</number>
</property>
<property name="spacing" >
<widget class="QWidget" name="WStackPage5">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>1</number>
</property>
<item>
<widget class="Gui::UIntSpinBox" name="uIntSpinBox" />
<widget class="Gui::UIntSpinBox" name="uIntSpinBox"/>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
<item row="2" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="buttonOk" >
<property name="text" >
<string>OK</string>
</property>
<property name="shortcut" >
<string/>
</property>
<property name="default" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonCancel" >
<property name="text" >
<string>Cancel</string>
</property>
<property name="shortcut" >
<string/>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>Gui::UIntSpinBox</class>
<extends>QSpinBox</extends>
<header>Gui/SpinBox.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<resources/>
<connections>
<connection>
<sender>buttonOk</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Gui::Dialog::DlgInputDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
<y>20</y>
<hint type="sourcelabel">
<x>199</x>
<y>99</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
<hint type="destinationlabel">
<x>199</x>
<y>58</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonCancel</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Gui::Dialog::DlgInputDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
<y>20</y>
<hint type="sourcelabel">
<x>199</x>
<y>99</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
<hint type="destinationlabel">
<x>199</x>
<y>58</y>
</hint>
</hints>
</connection>

6
src/Gui/DlgInputDialogImp.cpp
View File

@ -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()

2
src/Gui/DlgMacroExecuteImp.cpp
View File

@ -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));

173
src/Gui/DlgMaterialProperties.ui
View File

@ -1,10 +1,8 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Gui::Dialog::DlgMaterialProperties</class>
<widget class="QDialog" name="Gui::Dialog::DlgMaterialProperties" >
<property name="geometry" >
<widget class="QDialog" name="Gui::Dialog::DlgMaterialProperties">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@ -12,100 +10,94 @@
<height>247</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Material properties</string>
</property>
<property name="sizeGripEnabled" >
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
<property name="modal" >
<property name="modal">
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBox4" >
<property name="title" >
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox4">
<property name="title">
<string>Material</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing" >
<property name="spacing">
<number>6</number>
</property>
<item row="2" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<item row="2" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Emissive color:</string>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="textLabel3" >
<property name="text" >
<item row="3" column="0">
<widget class="QLabel" name="textLabel3">
<property name="text">
<string>Specular color:</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="textLabel2" >
<property name="text" >
<item row="0" column="0">
<widget class="QLabel" name="textLabel2">
<property name="text">
<string>Ambient color:</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="textLabel1" >
<property name="text" >
<item row="1" column="0">
<widget class="QLabel" name="textLabel1">
<property name="text">
<string>Diffuse color:</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="Gui::ColorButton" name="emissiveColor" >
<property name="text" >
<item row="2" column="1">
<widget class="Gui::ColorButton" name="emissiveColor">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="1" >
<widget class="Gui::ColorButton" name="specularColor" >
<property name="text" >
<item row="3" column="1">
<widget class="Gui::ColorButton" name="specularColor">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<item row="4" column="0" colspan="2">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="textLabel4" >
<property name="text" >
<widget class="QLabel" name="textLabel4">
<property name="text">
<string>Shininess:</string>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>81</width>
<height>31</height>
@ -114,24 +106,24 @@
</spacer>
</item>
<item>
<widget class="QSpinBox" name="shininess" >
<property name="suffix" >
<widget class="QSpinBox" name="shininess">
<property name="suffix">
<string>%</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="1" >
<widget class="Gui::ColorButton" name="diffuseColor" >
<property name="text" >
<item row="1" column="1">
<widget class="Gui::ColorButton" name="diffuseColor">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="Gui::ColorButton" name="ambientColor" >
<property name="text" >
<item row="0" column="1">
<widget class="Gui::ColorButton" name="ambientColor">
<property name="text">
<string/>
</property>
</widget>
@ -139,55 +131,21 @@
</layout>
</widget>
</item>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
<item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Close</set>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="buttonCancel" >
<property name="text" >
<string>&amp;Close</string>
</property>
<property name="shortcut" >
<string>Alt+C</string>
</property>
<property name="autoDefault" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>Gui::ColorButton</class>
<extends>QPushButton</extends>
<header>Gui/Widgets.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<tabstops>
@ -196,23 +154,22 @@
<tabstop>emissiveColor</tabstop>
<tabstop>specularColor</tabstop>
<tabstop>shininess</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>buttonCancel</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Gui::Dialog::DlgMaterialProperties</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>257</x>
<y>271</y>
<hint type="sourcelabel">
<x>145</x>
<y>225</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>36</y>
<hint type="destinationlabel">
<x>145</x>
<y>123</y>
</hint>
</hints>
</connection>

184
src/Gui/DlgPreferences.ui
View File

@ -1,10 +1,8 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Gui::Dialog::DlgPreferences</class>
<widget class="QDialog" name="Gui::Dialog::DlgPreferences" >
<property name="geometry" >
<widget class="QDialog" name="Gui::Dialog::DlgPreferences">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@ -12,205 +10,125 @@
<height>454</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Preferences</string>
</property>
<property name="sizeGripEnabled" >
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
<property name="modal" >
<property name="modal">
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing" >
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<item row="0" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QListWidget" name="listBox" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>7</vsizetype>
<widget class="QListWidget" name="listBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="maximumSize" >
<property name="maximumSize">
<size>
<width>128</width>
<height>16777215</height>
</size>
</property>
<property name="frameShape" >
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow" >
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<property name="verticalScrollBarPolicy" >
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="horizontalScrollBarPolicy" >
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="iconSize" >
<property name="iconSize">
<size>
<width>96</width>
<height>96</height>
</size>
</property>
<property name="spacing" >
<property name="spacing">
<number>12</number>
</property>
<property name="viewMode" >
<property name="viewMode">
<enum>QListView::IconMode</enum>
</property>
</widget>
</item>
<item>
<widget class="QStackedWidget" name="tabWidgetStack" />
<widget class="QStackedWidget" name="tabWidgetStack"/>
</item>
</layout>
</item>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
<item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QPushButton" name="buttonHelp" >
<property name="text" >
<string>&amp;Help</string>
</property>
<property name="shortcut" >
<string>Alt+H</string>
</property>
<property name="autoDefault" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>170</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="buttonOk" >
<property name="text" >
<string>&amp;OK</string>
</property>
<property name="shortcut" >
<string/>
</property>
<property name="autoDefault" >
<bool>true</bool>
</property>
<property name="default" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonApply" >
<property name="text" >
<string>&amp;Apply</string>
</property>
<property name="shortcut" >
<string>Alt+A</string>
</property>
<property name="autoDefault" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonCancel" >
<property name="text" >
<string>&amp;Cancel</string>
</property>
<property name="shortcut" >
<string/>
</property>
<property name="autoDefault" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>listBox</tabstop>
<tabstop>buttonHelp</tabstop>
<tabstop>buttonOk</tabstop>
<tabstop>buttonApply</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>buttonOk</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Gui::Dialog::DlgPreferences</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
<y>20</y>
<hint type="sourcelabel">
<x>284</x>
<y>432</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
<hint type="destinationlabel">
<x>284</x>
<y>226</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonCancel</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Gui::Dialog::DlgPreferences</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
<y>20</y>
<hint type="sourcelabel">
<x>284</x>
<y>432</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
<hint type="destinationlabel">
<x>284</x>
<y>226</y>
</hint>
</hints>
</connection>

13
src/Gui/DlgPreferencesImp.cpp
View File

@ -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; i<tabWidgetStack->count(); i++) {

3
src/Gui/DlgPreferencesImp.h
View File

@ -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:

88
src/Gui/DlgProjectInformation.ui
View File

@ -19,13 +19,7 @@
<property name="modal">
<bool>true</bool>
</property>
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBoxInfo">
<property name="title">
@ -304,59 +298,11 @@
</widget>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="buttonOk">
<property name="text">
<string>&amp;OK</string>
</property>
<property name="shortcut">
<string/>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonCancel">
<property name="text">
<string>&amp;Cancel</string>
</property>
<property name="shortcut">
<string/>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
@ -364,34 +310,34 @@
<resources/>
<connections>
<connection>
<sender>buttonOk</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Gui::Dialog::DlgProjectInformation</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>20</x>
<y>20</y>
<x>298</x>
<y>518</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
<y>20</y>
<x>298</x>
<y>269</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonCancel</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Gui::Dialog::DlgProjectInformation</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>20</x>
<y>20</y>
<x>298</x>
<y>518</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
<y>20</y>
<x>298</x>
<y>269</y>
</hint>
</hints>
</connection>

52
src/Gui/DlgProjectInformationImp.cpp
View File

@ -27,6 +27,7 @@
#include <App/PropertyStandard.h>
#include "DlgProjectInformationImp.h"
#include "ui_DlgProjectInformation.h"
#include "Document.h"
#include <QUrl>
#include <QDesktopServices>
@ -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"

18
src/Gui/DlgProjectInformationImp.h
View File

@ -24,7 +24,7 @@
#ifndef GUI_DIALOG_DLGPROJECTINFORMATIONIMP_H
#define GUI_DIALOG_DLGPROJECTINFORMATIONIMP_H
#include "ui_DlgProjectInformation.h"
#include <QDialog>
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

360
src/Gui/DlgSettingsColorGradient.ui
View File

@ -1,10 +1,8 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Gui::Dialog::DlgSettingsColorGradient</class>
<widget class="QDialog" name="Gui::Dialog::DlgSettingsColorGradient" >
<property name="geometry" >
<widget class="QDialog" name="Gui::Dialog::DlgSettingsColorGradient">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@ -12,71 +10,65 @@
<height>342</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Color-gradient settings</string>
</property>
<property name="sizeGripEnabled" >
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
<property name="modal" >
<property name="modal">
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBoxModel" >
<property name="title" >
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBoxModel">
<property name="title">
<string>Color model</string>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>11</number>
</property>
<property name="spacing" >
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>11</number>
</property>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="textLabel5" >
<property name="text" >
<widget class="QLabel" name="textLabel5">
<property name="text">
<string>&amp;Gradient:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>comboBoxModel</cstring>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBoxModel" >
<widget class="QComboBox" name="comboBoxModel">
<item>
<property name="text" >
<property name="text">
<string>red-yellow-green-cyan-blue</string>
</property>
</item>
<item>
<property name="text" >
<property name="text">
<string>blue-cyan-green-yellow-red</string>
</property>
</item>
<item>
<property name="text" >
<property name="text">
<string>white-black</string>
</property>
</item>
<item>
<property name="text" >
<property name="text">
<string>black-white</string>
</property>
</item>
@ -84,13 +76,13 @@
</item>
<item>
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>100</width>
<height>20</height>
@ -103,72 +95,37 @@
</layout>
</widget>
</item>
<item row="2" column="0" >
<widget class="QGroupBox" name="groupBoxVisible" >
<property name="title" >
<string>Visibility</string>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>11</number>
</property>
<property name="spacing" >
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="checkBoxGrayed" >
<property name="text" >
<string>Out g&amp;rayed</string>
</property>
<property name="shortcut" >
<string>Alt+R</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxInvisible" >
<property name="text" >
<string>Out &amp;invisible</string>
</property>
<property name="shortcut" >
<string>Alt+I</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" >
<widget class="QGroupBox" name="buttonGroupStyle" >
<property name="title" >
<item row="1" column="0">
<widget class="QGroupBox" name="buttonGroupStyle">
<property name="title">
<string>Style</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing" >
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1" >
<widget class="QRadioButton" name="radioButtonZero" >
<property name="text" >
<item row="0" column="1">
<widget class="QRadioButton" name="radioButtonZero">
<property name="text">
<string>&amp;Zero</string>
</property>
<property name="shortcut" >
<property name="shortcut">
<string>Alt+Z</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QRadioButton" name="radioButtonFlow" >
<property name="text" >
<item row="0" column="0">
<widget class="QRadioButton" name="radioButtonFlow">
<property name="text">
<string>&amp;Flow</string>
</property>
<property name="shortcut" >
<property name="shortcut">
<string>Alt+F</string>
</property>
<property name="checked" >
<property name="checked">
<bool>true</bool>
</property>
</widget>
@ -176,82 +133,62 @@
</layout>
</widget>
</item>
<item row="4" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
<item row="2" column="0">
<widget class="QGroupBox" name="groupBoxVisible">
<property name="title">
<string>Visibility</string>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>41</width>
<height>27</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="buttonOk" >
<property name="text" >
<string>&amp;OK</string>
</property>
<property name="shortcut" >
<string/>
</property>
<property name="autoDefault" >
<bool>true</bool>
</property>
<property name="default" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonCancel" >
<property name="text" >
<string>&amp;Cancel</string>
</property>
<property name="shortcut" >
<string/>
</property>
<property name="autoDefault" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0" >
<widget class="QGroupBox" name="groupBoxRange" >
<property name="title" >
<string>Parameter range</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<layout class="QHBoxLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>11</number>
</property>
<property name="spacing" >
<item>
<widget class="QCheckBox" name="checkBoxGrayed">
<property name="text">
<string>Out g&amp;rayed</string>
</property>
<property name="shortcut">
<string>Alt+R</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxInvisible">
<property name="text">
<string>Out &amp;invisible</string>
</property>
<property name="shortcut">
<string>Alt+I</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="QGroupBox" name="groupBoxRange">
<property name="title">
<string>Parameter range</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<number>11</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1" >
<item row="0" column="1">
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>35</width>
<height>20</height>
@ -259,79 +196,79 @@
</property>
</spacer>
</item>
<item row="0" column="0" >
<layout class="QGridLayout" >
<property name="margin" >
<item row="0" column="0">
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
</property>
<property name="spacing" >
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1" >
<widget class="QLineEdit" name="floatLineEditMax" />
<item row="0" column="1">
<widget class="QLineEdit" name="floatLineEditMax"/>
</item>
<item row="1" column="1" >
<widget class="QLineEdit" name="floatLineEditMin" />
<item row="1" column="1">
<widget class="QLineEdit" name="floatLineEditMin"/>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="textLabelMin" >
<property name="text" >
<item row="1" column="0">
<widget class="QLabel" name="textLabelMin">
<property name="text">
<string>Mi&amp;nimum:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>floatLineEditMin</cstring>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="textLabelMax" >
<property name="text" >
<item row="0" column="0">
<widget class="QLabel" name="textLabelMax">
<property name="text">
<string>Ma&amp;ximum:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>floatLineEditMax</cstring>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="2" >
<layout class="QGridLayout" >
<property name="margin" >
<item row="0" column="2">
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
</property>
<property name="spacing" >
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1" >
<widget class="QSpinBox" name="spinBoxLabel" />
<item row="0" column="1">
<widget class="QSpinBox" name="spinBoxLabel"/>
</item>
<item row="1" column="1" >
<widget class="QSpinBox" name="spinBoxDecimals" >
<property name="maximum" >
<item row="1" column="1">
<widget class="QSpinBox" name="spinBoxDecimals">
<property name="maximum">
<number>6</number>
</property>
<property name="value" >
<property name="value">
<number>2</number>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="textLabel1" >
<property name="text" >
<item row="0" column="0">
<widget class="QLabel" name="textLabel1">
<property name="text">
<string>&amp;Labels:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>spinBoxLabel</cstring>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="textLabel1_2" >
<property name="text" >
<item row="1" column="0">
<widget class="QLabel" name="textLabel1_2">
<property name="text">
<string>&amp;Decimals:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>spinBoxDecimals</cstring>
</property>
</widget>
@ -341,9 +278,16 @@
</layout>
</widget>
</item>
<item row="4" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>comboBoxModel</tabstop>
<tabstop>radioButtonFlow</tabstop>
@ -352,40 +296,38 @@
<tabstop>floatLineEditMax</tabstop>
<tabstop>floatLineEditMin</tabstop>
<tabstop>spinBoxLabel</tabstop>
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>buttonOk</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Gui::Dialog::DlgSettingsColorGradient</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
<y>20</y>
<hint type="sourcelabel">
<x>180</x>
<y>320</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
<hint type="destinationlabel">
<x>180</x>
<y>170</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonCancel</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Gui::Dialog::DlgSettingsColorGradient</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
<y>20</y>
<hint type="sourcelabel">
<x>180</x>
<y>320</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
<hint type="destinationlabel">
<x>180</x>
<y>170</y>
</hint>
</hints>
</connection>

117
src/Gui/DlgTreeWidget.ui
View File

@ -1,43 +1,29 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Gui::DlgTreeWidget</class>
<widget class="QDialog" name="Gui::DlgTreeWidget" >
<property name="geometry" >
<widget class="QDialog" name="Gui::DlgTreeWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>379</width>
<height>283</height>
<width>396</width>
<height>281</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item rowspan="2" row="0" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string/>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QTreeWidget" name="treeWidget" >
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QTreeWidget" name="treeWidget">
<column>
<property name="text" >
<property name="text">
<string>Items</string>
</property>
</column>
@ -46,77 +32,46 @@
</layout>
</widget>
</item>
<item row="1" column="1" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
<item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>131</width>
<height>31</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="okButton" >
<property name="text" >
<string>OK</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="cancelButton" >
<property name="text" >
<string>Cancel</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<pixmapfunction></pixmapfunction>
<resources/>
<connections>
<connection>
<sender>okButton</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Gui::DlgTreeWidget</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>278</x>
<y>253</y>
<hint type="sourcelabel">
<x>436</x>
<y>220</y>
</hint>
<hint type="destinationlabel" >
<x>96</x>
<y>254</y>
<hint type="destinationlabel">
<x>271</x>
<y>247</y>
</hint>
</hints>
</connection>
<connection>
<sender>cancelButton</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Gui::DlgTreeWidget</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>369</x>
<y>253</y>
<hint type="sourcelabel">
<x>436</x>
<y>220</y>
</hint>
<hint type="destinationlabel" >
<x>179</x>
<y>282</y>
<hint type="destinationlabel">
<x>271</x>
<y>247</y>
</hint>
</hints>
</connection>

141
src/Gui/InputVector.ui
View File

@ -1,10 +1,8 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Gui::Dialog::InputVector</class>
<widget class="QDialog" name="Gui::Dialog::InputVector" >
<property name="geometry" >
<widget class="QDialog" name="Gui::Dialog::InputVector">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@ -12,78 +10,72 @@
<height>177</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Input vector</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Vector</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing" >
<property name="spacing">
<number>6</number>
</property>
<item row="2" column="1" >
<widget class="QDoubleSpinBox" name="vectorZ" >
<property name="maximum" >
<double>2.14748e+09</double>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="vectorZ">
<property name="minimum">
<double>-2147480000.000000000000000</double>
</property>
<property name="minimum" >
<double>-2.14748e+09</double>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
<property name="value" >
<double>1</double>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QDoubleSpinBox" name="vectorY" >
<property name="maximum" >
<double>2.14748e+09</double>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="vectorY">
<property name="minimum">
<double>-2147480000.000000000000000</double>
</property>
<property name="minimum" >
<double>-2.14748e+09</double>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QDoubleSpinBox" name="vectorX" >
<property name="maximum" >
<double>2.14748e+09</double>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="vectorX">
<property name="minimum">
<double>-2147480000.000000000000000</double>
</property>
<property name="minimum" >
<double>-2.14748e+09</double>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Z:</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Y:</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>X:</string>
</property>
</widget>
@ -91,60 +83,35 @@
</layout>
</widget>
</item>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
<item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Ok</set>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>131</width>
<height>31</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="okButton" >
<property name="text" >
<string>OK</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>vectorX</tabstop>
<tabstop>vectorY</tabstop>
<tabstop>vectorZ</tabstop>
<tabstop>okButton</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>okButton</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Gui::Dialog::InputVector</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>278</x>
<y>253</y>
<hint type="sourcelabel">
<x>90</x>
<y>155</y>
</hint>
<hint type="destinationlabel" >
<x>96</x>
<y>254</y>
<hint type="destinationlabel">
<x>90</x>
<y>88</y>
</hint>
</hints>
</connection>

2
src/Gui/MainWindow.cpp
View File

@ -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);

2
src/Gui/PythonDebugger.cpp
View File

@ -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);

2
src/Gui/ReportView.cpp
View File

@ -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);

1
src/Gui/Widgets.h
View File

@ -29,6 +29,7 @@
#include <QLabel>
#include <QLineEdit>
#include <QPointer>
#include <QPushButton>
#include <QBasicTimer>
#include <QTime>

11
src/Mod/Inspection/Gui/VisualInspection.cpp
View File

@ -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();

2
src/Mod/Inspection/Gui/VisualInspection.h
View File

@ -28,6 +28,7 @@
#include <vector>
class QTreeWidgetItem;
class QPushButton;
namespace InspectionGui {
class Ui_VisualInspection;
@ -48,6 +49,7 @@ protected Q_SLOTS:
private:
Ui_VisualInspection* ui;
QPushButton* buttonOk;
};
} // namespace InspectionGui

300
src/Mod/Inspection/Gui/VisualInspection.ui
View File

@ -1,10 +1,8 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>InspectionGui::VisualInspection</class>
<widget class="QDialog" name="InspectionGui::VisualInspection" >
<property name="geometry" >
<widget class="QDialog" name="InspectionGui::VisualInspection">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@ -12,65 +10,32 @@
<height>406</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Visual Inspection</string>
</property>
<property name="sizeGripEnabled" >
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="1" >
<widget class="QGroupBox" name="groupBox_2" >
<property name="title" >
<string>Nominal</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QTreeWidget" name="treeWidgetNominal" >
<property name="rootIsDecorated" >
<bool>false</bool>
</property>
<column>
<property name="text" >
<string>Objects</string>
</property>
</column>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Actual</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing" >
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QTreeWidget" name="treeWidgetActual" >
<property name="rootIsDecorated" >
<item row="0" column="0">
<widget class="QTreeWidget" name="treeWidgetActual">
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<column>
<property name="text" >
<property name="text">
<string>Objects</string>
</property>
</column>
@ -79,95 +44,54 @@
</layout>
</widget>
</item>
<item row="2" column="0" colspan="2" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
<item row="0" column="1">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Nominal</string>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QPushButton" name="buttonHelp" >
<property name="text" >
<string>&amp;Help</string>
</property>
<property name="shortcut" >
<string>F1</string>
</property>
<property name="autoDefault" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="buttonOk" >
<property name="text" >
<string>&amp;OK</string>
</property>
<property name="shortcut" >
<string/>
</property>
<property name="autoDefault" >
<bool>true</bool>
</property>
<property name="default" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonCancel" >
<property name="text" >
<string>&amp;Cancel</string>
</property>
<property name="shortcut" >
<string/>
</property>
<property name="autoDefault" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox_3" >
<property name="title" >
<string>Parameter</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing" >
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1" >
<item row="0" column="0">
<widget class="QTreeWidget" name="treeWidgetNominal">
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<column>
<property name="text">
<string>Objects</string>
</property>
</column>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Parameter</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1">
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>61</width>
<height>54</height>
@ -175,75 +99,75 @@
</property>
</spacer>
</item>
<item row="0" column="0" >
<layout class="QGridLayout" >
<property name="margin" >
<item row="0" column="0">
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
</property>
<property name="spacing" >
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="2" >
<widget class="Gui::PrefDoubleSpinBox" name="prefFloatSpinBox2" >
<property name="suffix" >
<item row="1" column="2">
<widget class="Gui::PrefDoubleSpinBox" name="prefFloatSpinBox2">
<property name="suffix">
<string> mm</string>
</property>
<property name="decimals" >
<property name="decimals">
<number>3</number>
</property>
<property name="singleStep" >
<double>0.1</double>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
<property name="prefEntry" stdset="0" >
<property name="prefEntry" stdset="0">
<cstring>Thickness</cstring>
</property>
<property name="prefPath" stdset="0" >
<property name="prefPath" stdset="0">
<cstring>Mod/Inspection/Inspection</cstring>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="textLabel1" >
<property name="text" >
<item row="0" column="0">
<widget class="QLabel" name="textLabel1">
<property name="text">
<string>Search distance</string>
</property>
</widget>
</item>
<item row="0" column="2" >
<widget class="Gui::PrefDoubleSpinBox" name="prefFloatSpinBox1" >
<property name="suffix" >
<item row="0" column="2">
<widget class="Gui::PrefDoubleSpinBox" name="prefFloatSpinBox1">
<property name="suffix">
<string> mm</string>
</property>
<property name="decimals" >
<property name="decimals">
<number>3</number>
</property>
<property name="value" >
<double>0.05</double>
<property name="value">
<double>0.050000000000000</double>
</property>
<property name="prefEntry" stdset="0" >
<property name="prefEntry" stdset="0">
<cstring>SearchDistance</cstring>
</property>
<property name="prefPath" stdset="0" >
<property name="prefPath" stdset="0">
<cstring>Mod/Inspection/Inspection</cstring>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="textLabel2" >
<property name="text" >
<item row="1" column="0">
<widget class="QLabel" name="textLabel2">
<property name="text">
<string>Thickness</string>
</property>
</widget>
</item>
<item row="0" column="1" >
<item row="0" column="1">
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>91</width>
<height>21</height>
@ -251,15 +175,15 @@
</property>
</spacer>
</item>
<item row="1" column="1" >
<item row="1" column="1">
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>101</width>
<height>21</height>
@ -272,56 +196,58 @@
</layout>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>Gui::PrefDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>Gui/PrefWidgets.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>prefFloatSpinBox1</tabstop>
<tabstop>prefFloatSpinBox2</tabstop>
<tabstop>buttonHelp</tabstop>
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>buttonOk</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>InspectionGui::VisualInspection</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
<y>20</y>
<hint type="sourcelabel">
<x>269</x>
<y>384</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
<hint type="destinationlabel">
<x>269</x>
<y>202</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonCancel</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>InspectionGui::VisualInspection</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
<y>20</y>
<hint type="sourcelabel">
<x>269</x>
<y>384</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
<hint type="destinationlabel">
<x>269</x>
<y>202</y>
</hint>
</hints>
</connection>

69
src/Mod/Mesh/Gui/DlgEvaluateMesh.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>371</width>
<height>683</height>
<height>680</height>
</rect>
</property>
<property name="windowTitle">
@ -883,56 +883,11 @@
</spacer>
</item>
<item row="20" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="buttonHelp">
<property name="text">
<string>&amp;Help</string>
</property>
<property name="shortcut">
<string>F1</string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="closeButton">
<property name="text">
<string>&amp;Close</string>
</property>
<property name="shortcut">
<string>Alt+C</string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
@ -957,24 +912,22 @@
<tabstop>checkIndicesButton</tabstop>
<tabstop>analyzeIndicesButton</tabstop>
<tabstop>repairIndicesButton</tabstop>
<tabstop>buttonHelp</tabstop>
<tabstop>closeButton</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>closeButton</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>MeshGui::DlgEvaluateMesh</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel">
<x>326</x>
<y>615</y>
<x>185</x>
<y>661</y>
</hint>
<hint type="destinationlabel">
<x>189</x>
<y>337</y>
<x>185</x>
<y>341</y>
</hint>
</hints>
</connection>

2
src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp
View File

@ -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

124
src/Mod/Part/Gui/DlgBlock.ui
View File

@ -7,20 +7,14 @@
<x>0</x>
<y>0</y>
<width>299</width>
<height>514</height>
<height>477</height>
</rect>
</property>
<property name="windowTitle">
<string>Block definition</string>
</property>
<layout class="QVBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>9</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>First limit</string>
@ -115,7 +109,7 @@
</layout>
</widget>
</item>
<item>
<item row="1" column="0">
<widget class="QGroupBox" name="GroupBox6">
<property name="title">
<string>Profile</string>
@ -154,7 +148,7 @@
</layout>
</widget>
</item>
<item>
<item row="2" column="0">
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
@ -178,7 +172,7 @@
</item>
</layout>
</item>
<item>
<item row="3" column="0">
<widget class="QGroupBox" name="SecondLimit">
<property name="enabled">
<bool>false</bool>
@ -276,7 +270,7 @@
</layout>
</widget>
</item>
<item>
<item row="4" column="0">
<widget class="QGroupBox" name="Direction">
<property name="title">
<string>Direction</string>
@ -328,68 +322,12 @@
</layout>
</widget>
</item>
<item>
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
<item row="5" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="2">
<widget class="QPushButton" name="ApplyButton">
<property name="text">
<string>Apply</string>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QPushButton" name="CancelButton">
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QPushButton" name="OKButton">
<property name="text">
<string>OK</string>
</property>
</widget>
</item>
<item row="0" column="3">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
@ -406,10 +344,40 @@
<tabstop>SecondLimitSelection</tabstop>
<tabstop>DirectionPerpendicular</tabstop>
<tabstop>DirectionSelection</tabstop>
<tabstop>OKButton</tabstop>
<tabstop>ApplyButton</tabstop>
<tabstop>CancelButton</tabstop>
</tabstops>
<resources/>
<connections/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>BlockDefinition</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>149</x>
<y>455</y>
</hint>
<hint type="destinationlabel">
<x>149</x>
<y>238</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>BlockDefinition</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>149</x>
<y>455</y>
</hint>
<hint type="destinationlabel">
<x>149</x>
<y>238</y>
</hint>
</hints>
</connection>
</connections>
</ui>

309
src/Mod/Part/Gui/DlgPartBox.ui
View File

@ -1,166 +1,92 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>PartGui::DlgPartBox</class>
<widget class="QDialog" name="PartGui::DlgPartBox" >
<property name="geometry" >
<widget class="QDialog" name="PartGui::DlgPartBox">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>257</width>
<height>323</height>
<height>305</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Box definition</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="1" column="0" >
<widget class="QGroupBox" name="GroupBox5_2" >
<property name="title" >
<string>Size:</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="2" column="1" >
<widget class="QDoubleSpinBox" name="wLength" >
<property name="maximum" >
<double>2.14748e+09</double>
</property>
<property name="value" >
<double>100</double>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QDoubleSpinBox" name="vLength" >
<property name="maximum" >
<double>2.14748e+09</double>
</property>
<property name="value" >
<double>100</double>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QDoubleSpinBox" name="uLength" >
<property name="maximum" >
<double>2.14748e+09</double>
</property>
<property name="value" >
<double>100</double>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="TextLabel3_2" >
<property name="text" >
<string>Height:</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="TextLabel2_2" >
<property name="text" >
<string>Width:</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="TextLabel1_2" >
<property name="text" >
<string>Length:</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="0" >
<widget class="QGroupBox" name="GroupBox5" >
<property name="title" >
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="GroupBox5">
<property name="title">
<string>Position:</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing" >
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1" >
<widget class="QDoubleSpinBox" name="xPos" >
<property name="maximum" >
<double>2.14748e+09</double>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="xPos">
<property name="minimum">
<double>-2147480000.000000000000000</double>
</property>
<property name="minimum" >
<double>-2.14748e+09</double>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
</widget>
</item>
<item row="3" column="1" >
<widget class="QComboBox" name="direction" >
<property name="currentIndex" >
<item row="3" column="1">
<widget class="QComboBox" name="direction">
<property name="currentIndex">
<number>-1</number>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QDoubleSpinBox" name="yPos" >
<property name="maximum" >
<double>2.14748e+09</double>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="yPos">
<property name="minimum">
<double>-2147480000.000000000000000</double>
</property>
<property name="minimum" >
<double>-2.14748e+09</double>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QDoubleSpinBox" name="zPos" >
<property name="maximum" >
<double>2.14748e+09</double>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="zPos">
<property name="minimum">
<double>-2147480000.000000000000000</double>
</property>
<property name="minimum" >
<double>-2.14748e+09</double>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="TextLabel1_3" >
<property name="text" >
<item row="3" column="0">
<widget class="QLabel" name="TextLabel1_3">
<property name="text">
<string>Direction:</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="TextLabel1" >
<property name="text" >
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="text">
<string>X:</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="TextLabel2" >
<property name="text" >
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2">
<property name="text">
<string>Y:</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="TextLabel3" >
<property name="text" >
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3">
<property name="text">
<string>Z:</string>
</property>
</widget>
@ -168,49 +94,82 @@
</layout>
</widget>
</item>
<item row="2" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
<item row="1" column="0">
<widget class="QGroupBox" name="GroupBox5_2">
<property name="title">
<string>Size:</string>
</property>
<property name="spacing" >
<number>6</number>
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="wLength">
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
<property name="value">
<double>100.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="vLength">
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
<property name="value">
<double>100.000000000000000</double>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="uLength">
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
<property name="value">
<double>100.000000000000000</double>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3_2">
<property name="text">
<string>Height:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2_2">
<property name="text">
<string>Width:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1_2">
<property name="text">
<string>Length:</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>16</width>
<height>27</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="OKButton" >
<property name="text" >
<string>OK</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="CancelButton" >
<property name="text" >
<string>Cancel</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>xPos</tabstop>
<tabstop>yPos</tabstop>
@ -219,40 +178,38 @@
<tabstop>uLength</tabstop>
<tabstop>vLength</tabstop>
<tabstop>wLength</tabstop>
<tabstop>OKButton</tabstop>
<tabstop>CancelButton</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>OKButton</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>PartGui::DlgPartBox</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>60</x>
<y>249</y>
<hint type="sourcelabel">
<x>125</x>
<y>311</y>
</hint>
<hint type="destinationlabel" >
<x>7</x>
<y>7</y>
<hint type="destinationlabel">
<x>128</x>
<y>161</y>
</hint>
</hints>
</connection>
<connection>
<sender>CancelButton</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>PartGui::DlgPartBox</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>242</x>
<y>246</y>
<hint type="sourcelabel">
<x>125</x>
<y>311</y>
</hint>
<hint type="destinationlabel" >
<x>291</x>
<y>179</y>
<hint type="destinationlabel">
<x>128</x>
<y>161</y>
</hint>
</hints>
</connection>

277
src/Mod/Part/Gui/DlgPartCylinder.ui
View File

@ -1,199 +1,158 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>PartGui::DlgPartCylinder</class>
<widget class="QDialog" name="PartGui::DlgPartCylinder" >
<property name="geometry" >
<widget class="QDialog" name="PartGui::DlgPartCylinder">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>296</width>
<height>323</height>
<width>275</width>
<height>279</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Cylinder definition</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="1" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Parameter</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="1" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Height:</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="TextLabel1_2" >
<property name="text" >
<string>Radius:</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QDoubleSpinBox" name="length" >
<property name="maximum" >
<double>2.14748e+09</double>
</property>
<property name="value" >
<double>100</double>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QDoubleSpinBox" name="radius" >
<property name="maximum" >
<double>2.14748e+09</double>
</property>
<property name="value" >
<double>10</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="0" >
<widget class="QGroupBox" name="GroupBox5" >
<property name="title" >
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="GroupBox5">
<property name="title">
<string>Position:</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing" >
<property name="spacing">
<number>6</number>
</property>
<item row="3" column="1" >
<widget class="QComboBox" name="direction" >
<property name="currentIndex" >
<item row="3" column="1">
<widget class="QComboBox" name="direction">
<property name="currentIndex">
<number>-1</number>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="TextLabel1_3" >
<property name="text" >
<item row="3" column="0">
<widget class="QLabel" name="TextLabel1_3">
<property name="text">
<string>Direction:</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="TextLabel1" >
<property name="text" >
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="text">
<string>X:</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="TextLabel3" >
<property name="text" >
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3">
<property name="text">
<string>Z:</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="TextLabel2" >
<property name="text" >
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2">
<property name="text">
<string>Y:</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QDoubleSpinBox" name="zPos" >
<property name="maximum" >
<double>2.14748e+09</double>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="zPos">
<property name="minimum">
<double>-2147480000.000000000000000</double>
</property>
<property name="minimum" >
<double>-2.14748e+09</double>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QDoubleSpinBox" name="yPos" >
<property name="maximum" >
<double>2.14748e+09</double>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="yPos">
<property name="minimum">
<double>-2147480000.000000000000000</double>
</property>
<property name="minimum" >
<double>-2.14748e+09</double>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QDoubleSpinBox" name="xPos" >
<property name="maximum" >
<double>2.14748e+09</double>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="xPos">
<property name="minimum">
<double>-2147480000.000000000000000</double>
</property>
<property name="minimum" >
<double>-2.14748e+09</double>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Parameter</string>
</property>
<property name="spacing" >
<number>6</number>
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Height:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1_2">
<property name="text">
<string>Radius:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="length">
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
<property name="value">
<double>100.000000000000000</double>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="radius">
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
<property name="value">
<double>10.000000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>88</width>
<height>27</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="OKButton" >
<property name="text" >
<string>OK</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="CancelButton" >
<property name="text" >
<string>Cancel</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>xPos</tabstop>
<tabstop>yPos</tabstop>
@ -201,40 +160,38 @@
<tabstop>direction</tabstop>
<tabstop>radius</tabstop>
<tabstop>length</tabstop>
<tabstop>OKButton</tabstop>
<tabstop>CancelButton</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>OKButton</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>PartGui::DlgPartCylinder</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>60</x>
<y>249</y>
<hint type="sourcelabel">
<x>139</x>
<y>255</y>
</hint>
<hint type="destinationlabel" >
<x>7</x>
<y>7</y>
<hint type="destinationlabel">
<x>0</x>
<y>223</y>
</hint>
</hints>
</connection>
<connection>
<sender>CancelButton</sender>
<signal>clicked()</signal>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>PartGui::DlgPartCylinder</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>242</x>
<y>246</y>
<hint type="sourcelabel">
<x>253</x>
<y>258</y>
</hint>
<hint type="destinationlabel" >
<x>291</x>
<y>179</y>
<hint type="destinationlabel">
<x>278</x>
<y>243</y>
</hint>
</hints>
</connection>

143
src/Mod/Part/Gui/DlgPartImportIges.ui
View File

@ -1,109 +1,56 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>PartGui::DlgPartImportIges</class>
<widget class="QDialog" name="PartGui::DlgPartImportIges" >
<property name="geometry" >
<widget class="QDialog" name="PartGui::DlgPartImportIges">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>342</width>
<height>121</height>
<height>112</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>IGES input file</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QPushButton" name="OKButton" >
<property name="text" >
<string>OK</string>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>151</width>
<height>27</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="CancelButton" >
<property name="text" >
<string>Cancel</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0" >
<widget class="QGroupBox" name="GroupBox5" >
<property name="title" >
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QGroupBox" name="GroupBox5">
<property name="title">
<string>File Name</string>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>11</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLineEdit" name="FileName" >
<property name="text" >
<item row="0" column="0">
<widget class="QLineEdit" name="FileName">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="SearchFile" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<item row="0" column="1">
<widget class="QPushButton" name="SearchFile">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<property name="minimumSize">
<size>
<width>30</width>
<height>0</height>
</size>
</property>
<property name="maximumSize" >
<property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
</size>
</property>
<property name="text" >
<property name="text">
<string>...</string>
</property>
</widget>
@ -111,48 +58,20 @@
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>FileName</tabstop>
<tabstop>SearchFile</tabstop>
<tabstop>OKButton</tabstop>
<tabstop>CancelButton</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>OKButton</sender>
<signal>clicked()</signal>
<receiver>PartGui::DlgPartImportIges</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
<connection>
<sender>CancelButton</sender>
<signal>clicked()</signal>
<receiver>PartGui::DlgPartImportIges</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
</connections>
<connections/>
</ui>

141
src/Mod/Part/Gui/DlgPartImportStep.ui
View File

@ -1,69 +1,56 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>PartGui::DlgPartImportStep</class>
<widget class="QDialog" name="PartGui::DlgPartImportStep" >
<property name="geometry" >
<widget class="QDialog" name="PartGui::DlgPartImportStep">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>342</width>
<height>117</height>
<width>349</width>
<height>116</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Step input file</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QGroupBox" name="GroupBox5" >
<property name="title" >
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="GroupBox5">
<property name="title">
<string>File Name</string>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>11</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLineEdit" name="FileName" >
<property name="text" >
<item row="0" column="0">
<widget class="QLineEdit" name="FileName">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="SearchFile" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<item row="0" column="1">
<widget class="QPushButton" name="SearchFile">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<property name="minimumSize">
<size>
<width>30</width>
<height>0</height>
</size>
</property>
<property name="maximumSize" >
<property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
</size>
</property>
<property name="text" >
<property name="text">
<string>...</string>
</property>
</widget>
@ -71,88 +58,20 @@
</layout>
</widget>
</item>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
<item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QPushButton" name="OKButton" >
<property name="text" >
<string>OK</string>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>151</width>
<height>27</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="CancelButton" >
<property name="text" >
<string>Cancel</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>FileName</tabstop>
<tabstop>SearchFile</tabstop>
<tabstop>OKButton</tabstop>
<tabstop>CancelButton</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>OKButton</sender>
<signal>clicked()</signal>
<receiver>PartGui::DlgPartImportStep</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
<connection>
<sender>CancelButton</sender>
<signal>clicked()</signal>
<receiver>PartGui::DlgPartImportStep</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
</connections>
<connections/>
</ui>