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") || else if (ext == QLatin1String("py") || ext == QLatin1String("fcmacro") ||
ext == QLatin1String("fcscript")) { ext == QLatin1String("fcscript")) {
PythonEditor* editor = new PythonEditor(); PythonEditor* editor = new PythonEditor();
editor->setWindowIcon(Gui::BitmapFactory().pixmap("python_small")); editor->setWindowIcon(Gui::BitmapFactory().pixmap("applications-python"));
PythonEditorView* edit = new PythonEditorView(editor, getMainWindow()); PythonEditorView* edit = new PythonEditorView(editor, getMainWindow());
edit->open(fileName); edit->open(fileName);
edit->resize(400, 300); edit->resize(400, 300);
@ -329,7 +329,7 @@ PyObject* Application::sInsert(PyObject * /*self*/, PyObject *args,PyObject * /*
else if (ext == QLatin1String("py") || ext == QLatin1String("fcmacro") || else if (ext == QLatin1String("py") || ext == QLatin1String("fcmacro") ||
ext == QLatin1String("fcscript")) { ext == QLatin1String("fcscript")) {
PythonEditor* editor = new PythonEditor(); PythonEditor* editor = new PythonEditor();
editor->setWindowIcon(Gui::BitmapFactory().pixmap("python_small")); editor->setWindowIcon(Gui::BitmapFactory().pixmap("applications-python"));
PythonEditorView* edit = new PythonEditorView(editor, getMainWindow()); PythonEditorView* edit = new PythonEditorView(editor, getMainWindow());
edit->open(fileName); edit->open(fileName);
edit->resize(400, 300); edit->resize(400, 300);

1
src/Gui/CMakeLists.txt
View File

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

139
src/Gui/DlgActivateWindow.ui
View File

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>Gui::Dialog::DlgActivateWindow</class> <class>Gui::Dialog::DlgActivateWindow</class>
<widget class="QDialog" name="Gui::Dialog::DlgActivateWindow"> <widget class="QDialog" name="Gui::Dialog::DlgActivateWindow">
<property name="geometry"> <property name="geometry">
@ -21,116 +19,31 @@
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout">
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTreeWidget" name="treeWidget"> <widget class="QTreeWidget" name="treeWidget">
<property name="rootIsDecorated"> <property name="rootIsDecorated">
<bool>false</bool> <bool>false</bool>
</property> </property>
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<layout class="QHBoxLayout" > <widget class="QDialogButtonBox" name="buttonBox">
<property name="margin" > <property name="standardButtons">
<number>0</number> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</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> </property>
</widget> </widget>
</item> </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> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<resources/> <resources/>
<connections> <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> <connection>
<sender>treeWidget</sender> <sender>treeWidget</sender>
<signal>activated(QModelIndex)</signal> <signal>activated(QModelIndex)</signal>
@ -147,5 +60,37 @@
</hint> </hint>
</hints> </hints>
</connection> </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> </connections>
</ui> </ui>

34
src/Gui/DlgActivateWindowImp.cpp
View File

@ -23,10 +23,12 @@
#include "PreCompiled.h" #include "PreCompiled.h"
#ifndef _PreComp_ #ifndef _PreComp_
# include <QApplication>
# include <QHeaderView> # include <QHeaderView>
#endif #endif
#include "DlgActivateWindowImp.h" #include "DlgActivateWindowImp.h"
#include "ui_DlgActivateWindow.h"
#include "MainWindow.h" #include "MainWindow.h"
#include "MDIView.h" #include "MDIView.h"
@ -42,39 +44,45 @@ using namespace Gui::Dialog;
* TRUE to construct a modal dialog. * TRUE to construct a modal dialog.
*/ */
DlgActivateWindowImp::DlgActivateWindowImp(QWidget* parent, Qt::WFlags fl) DlgActivateWindowImp::DlgActivateWindowImp(QWidget* parent, Qt::WFlags fl)
: QDialog( parent, fl ) : QDialog(parent, fl), ui(new Ui_DlgActivateWindow)
{ {
// create widgets // 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; QTreeWidgetItem* active=0;
QStringList labels; labels << tr("Windows"); QStringList labels; labels << tr("Windows");
treeWidget->setHeaderLabels(labels); ui->treeWidget->setHeaderLabels(labels);
treeWidget->header()->hide(); ui->treeWidget->header()->hide();
QList<QWidget*> windows = getMainWindow()->windows(); QList<QWidget*> windows = getMainWindow()->windows();
if (windows.isEmpty()) if (windows.isEmpty()) {
{ buttonOk->setDisabled(true);
this->buttonOk->setDisabled(true);
return; return;
} }
QWidget* activeWnd = getMainWindow()->activeWindow(); QWidget* activeWnd = getMainWindow()->activeWindow();
for (QList<QWidget*>::ConstIterator it = windows.begin(); it != windows.end(); ++it) { for (QList<QWidget*>::ConstIterator it = windows.begin(); it != windows.end(); ++it) {
QTreeWidgetItem* item = new QTreeWidgetItem(treeWidget); QTreeWidgetItem* item = new QTreeWidgetItem(ui->treeWidget);
item->setText(0, (*it)->windowTitle()); QString title = (*it)->windowTitle();
title.replace(QLatin1String("[*]"), QLatin1String(""));
if ((*it)->isWindowModified())
title += QLatin1String("*");
item->setText(0, title);
if (*it == activeWnd) if (*it == activeWnd)
active = item; active = item;
} }
if (active) if (active)
treeWidget->setCurrentItem( active ); ui->treeWidget->setCurrentItem( active );
treeWidget->setFocus(); ui->treeWidget->setFocus();
} }
/** Destroys the object and frees any allocated resources */ /** Destroys the object and frees any allocated resources */
DlgActivateWindowImp::~DlgActivateWindowImp() DlgActivateWindowImp::~DlgActivateWindowImp()
{ {
delete ui;
} }
/** /**
@ -82,11 +90,11 @@ DlgActivateWindowImp::~DlgActivateWindowImp()
*/ */
void DlgActivateWindowImp::accept() void DlgActivateWindowImp::accept()
{ {
QTreeWidgetItem* item = treeWidget->currentItem(); QTreeWidgetItem* item = ui->treeWidget->currentItem();
QList<QWidget*> windows = getMainWindow()->windows(); QList<QWidget*> windows = getMainWindow()->windows();
if (item) { if (item) {
int index = treeWidget->indexOfTopLevelItem(item); int index = ui->treeWidget->indexOfTopLevelItem(item);
getMainWindow()->setActiveWindow((MDIView*)windows.at(index)); getMainWindow()->setActiveWindow((MDIView*)windows.at(index));
} }

9
src/Gui/DlgActivateWindowImp.h
View File

@ -24,18 +24,18 @@
#ifndef GUI_DIALOG_DLGACTIVATEWINDOW_IMP_H #ifndef GUI_DIALOG_DLGACTIVATEWINDOW_IMP_H
#define GUI_DIALOG_DLGACTIVATEWINDOW_IMP_H #define GUI_DIALOG_DLGACTIVATEWINDOW_IMP_H
#include "ui_DlgActivateWindow.h" #include <QDialog>
namespace Gui { namespace Gui {
namespace Dialog { namespace Dialog {
class Ui_DlgActivateWindow;
/** /**
* The DlgActivateWindowImp class provides a dialog to activate the MDI window * 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 * 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. * an application you cannot put all of them into the "Windows" popup menu.
* \author Werner Mayer * \author Werner Mayer
*/ */
class DlgActivateWindowImp : public QDialog, public Ui_DlgActivateWindow class DlgActivateWindowImp : public QDialog
{ {
Q_OBJECT Q_OBJECT
@ -45,6 +45,9 @@ public:
protected: protected:
void accept(); void accept();
private:
Ui_DlgActivateWindow* ui;
}; };
} // namespace Dialog } // namespace Dialog

40
src/Gui/DlgChooseIcon.ui
View File

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

65
src/Gui/DlgDisplayProperties.ui
View File

@ -344,39 +344,13 @@
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<layout class="QHBoxLayout"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="spacing"> <property name="standardButtons">
<number>6</number> <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> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<customwidgets> <customwidgets>
@ -399,26 +373,9 @@
<tabstop>spinTransparency</tabstop> <tabstop>spinTransparency</tabstop>
<tabstop>sliderLineTransparency</tabstop> <tabstop>sliderLineTransparency</tabstop>
<tabstop>spinLineTransparency</tabstop> <tabstop>spinLineTransparency</tabstop>
<tabstop>CancelButton</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <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> <connection>
<sender>spinTransparency</sender> <sender>spinTransparency</sender>
<signal>valueChanged(int)</signal> <signal>valueChanged(int)</signal>
@ -483,5 +440,21 @@
</hint> </hint>
</hints> </hints>
</connection> </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> </connections>
</ui> </ui>

102
src/Gui/DlgInputDialog.ui
View File

@ -1,15 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>Gui::Dialog::DlgInputDialog</class> <class>Gui::Dialog::DlgInputDialog</class>
<widget class="QDialog" name="Gui::Dialog::DlgInputDialog"> <widget class="QDialog" name="Gui::Dialog::DlgInputDialog">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>399</width>
<height>89</height> <height>99</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -18,21 +16,15 @@
<property name="sizeGripEnabled"> <property name="sizeGripEnabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QGridLayout" name="gridLayout">
<property name="margin" > <item row="0" column="0">
<number>6</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0">
<widget class="QStackedWidget" name="stack"> <widget class="QStackedWidget" name="stack">
<widget class="QWidget" name="WStackPage1"> <widget class="QWidget" name="WStackPage1">
<layout class="QGridLayout"> <layout class="QGridLayout">
@ -88,12 +80,12 @@
</widget> </widget>
<widget class="QWidget" name="WStackPage5"> <widget class="QWidget" name="WStackPage5">
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="margin" >
<number>1</number>
</property>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="margin">
<number>1</number>
</property>
<item> <item>
<widget class="Gui::UIntSpinBox" name="uIntSpinBox"/> <widget class="Gui::UIntSpinBox" name="uIntSpinBox"/>
</item> </item>
@ -101,55 +93,13 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0">
<layout class="QHBoxLayout" > <widget class="QDialogButtonBox" name="buttonBox">
<property name="margin" > <property name="standardButtons">
<number>0</number> <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> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="buttonCancel" >
<property name="text" >
<string>Cancel</string>
</property>
<property name="shortcut" >
<string/>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
@ -158,41 +108,39 @@
<class>Gui::UIntSpinBox</class> <class>Gui::UIntSpinBox</class>
<extends>QSpinBox</extends> <extends>QSpinBox</extends>
<header>Gui/SpinBox.h</header> <header>Gui/SpinBox.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
<sender>buttonOk</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>accepted()</signal>
<receiver>Gui::Dialog::DlgInputDialog</receiver> <receiver>Gui::Dialog::DlgInputDialog</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>20</x> <x>199</x>
<y>20</y> <y>99</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>20</x> <x>199</x>
<y>20</y> <y>58</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection> <connection>
<sender>buttonCancel</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>rejected()</signal>
<receiver>Gui::Dialog::DlgInputDialog</receiver> <receiver>Gui::Dialog::DlgInputDialog</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>20</x> <x>199</x>
<y>20</y> <y>99</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>20</x> <x>199</x>
<y>20</y> <y>58</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>

6
src/Gui/DlgInputDialogImp.cpp
View File

@ -45,10 +45,6 @@ DlgInputDialogImp::DlgInputDialogImp( const QString& labelTxt, QWidget* parent,
this->setupUi(this); this->setupUi(this);
label->setText(labelTxt); label->setText(labelTxt);
QSize bs = buttonOk->sizeHint().expandedTo(buttonCancel->sizeHint());
buttonOk->setFixedSize( bs );
buttonCancel->setFixedSize( bs );
QSize sh = sizeHint(); QSize sh = sizeHint();
setType(type); setType(type);
resize(qMax(sh.width(), 400), 1); resize(qMax(sh.width(), 400), 1);
@ -78,7 +74,7 @@ void DlgInputDialogImp::textChanged( const QString &s )
on = !s.isEmpty(); on = !s.isEmpty();
} }
buttonOk->setEnabled( on ); buttonBox->button(QDialogButtonBox::Ok)->setEnabled( on );
} }
void DlgInputDialogImp::tryAccept() void DlgInputDialogImp::tryAccept()

2
src/Gui/DlgMacroExecuteImp.cpp
View File

@ -182,7 +182,7 @@ void DlgMacroExecuteImp::on_createButton_clicked()
} }
file.close(); file.close();
PythonEditor* editor = new PythonEditor(); PythonEditor* editor = new PythonEditor();
editor->setWindowIcon(Gui::BitmapFactory().pixmap("python_small")); editor->setWindowIcon(Gui::BitmapFactory().pixmap("applications-python"));
PythonEditorView* edit = new PythonEditorView(editor, getMainWindow()); PythonEditorView* edit = new PythonEditorView(editor, getMainWindow());
edit->open(fi.absoluteFilePath()); edit->open(fi.absoluteFilePath());
edit->setWindowTitle(QString::fromAscii("%1[*]").arg(fn)); edit->setWindowTitle(QString::fromAscii("%1[*]").arg(fn));

73
src/Gui/DlgMaterialProperties.ui
View File

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>Gui::Dialog::DlgMaterialProperties</class> <class>Gui::Dialog::DlgMaterialProperties</class>
<widget class="QDialog" name="Gui::Dialog::DlgMaterialProperties"> <widget class="QDialog" name="Gui::Dialog::DlgMaterialProperties">
<property name="geometry"> <property name="geometry">
@ -21,13 +19,7 @@
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout">
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QGroupBox" name="groupBox4"> <widget class="QGroupBox" name="groupBox4">
<property name="title"> <property name="title">
@ -84,12 +76,12 @@
</item> </item>
<item row="4" column="0" colspan="2"> <item row="4" column="0" colspan="2">
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="margin" >
<number>0</number>
</property>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="textLabel4"> <widget class="QLabel" name="textLabel4">
<property name="text"> <property name="text">
@ -105,7 +97,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>81</width> <width>81</width>
<height>31</height> <height>31</height>
@ -140,45 +132,13 @@
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<layout class="QHBoxLayout" > <widget class="QDialogButtonBox" name="buttonBox">
<property name="margin" > <property name="standardButtons">
<number>0</number> <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> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<customwidgets> <customwidgets>
@ -186,8 +146,6 @@
<class>Gui::ColorButton</class> <class>Gui::ColorButton</class>
<extends>QPushButton</extends> <extends>QPushButton</extends>
<header>Gui/Widgets.h</header> <header>Gui/Widgets.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
@ -196,23 +154,22 @@
<tabstop>emissiveColor</tabstop> <tabstop>emissiveColor</tabstop>
<tabstop>specularColor</tabstop> <tabstop>specularColor</tabstop>
<tabstop>shininess</tabstop> <tabstop>shininess</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
<sender>buttonCancel</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>rejected()</signal>
<receiver>Gui::Dialog::DlgMaterialProperties</receiver> <receiver>Gui::Dialog::DlgMaterialProperties</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>257</x> <x>145</x>
<y>271</y> <y>225</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>20</x> <x>145</x>
<y>36</y> <y>123</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>

122
src/Gui/DlgPreferences.ui
View File

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>Gui::Dialog::DlgPreferences</class> <class>Gui::Dialog::DlgPreferences</class>
<widget class="QDialog" name="Gui::Dialog::DlgPreferences"> <widget class="QDialog" name="Gui::Dialog::DlgPreferences">
<property name="geometry"> <property name="geometry">
@ -30,18 +28,16 @@
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="margin" >
<number>0</number>
</property>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QListWidget" name="listBox"> <widget class="QListWidget" name="listBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<hsizetype>0</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -90,127 +86,49 @@
</layout> </layout>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<layout class="QHBoxLayout" > <widget class="QDialogButtonBox" name="buttonBox">
<property name="margin" > <property name="standardButtons">
<number>0</number> <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> </property>
</widget> </widget>
</item> </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>
</item>
</layout> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<tabstops> <tabstops>
<tabstop>listBox</tabstop> <tabstop>listBox</tabstop>
<tabstop>buttonHelp</tabstop>
<tabstop>buttonOk</tabstop>
<tabstop>buttonApply</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
<sender>buttonOk</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>accepted()</signal>
<receiver>Gui::Dialog::DlgPreferences</receiver> <receiver>Gui::Dialog::DlgPreferences</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>20</x> <x>284</x>
<y>20</y> <y>432</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>20</x> <x>284</x>
<y>20</y> <y>226</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection> <connection>
<sender>buttonCancel</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>rejected()</signal>
<receiver>Gui::Dialog::DlgPreferences</receiver> <receiver>Gui::Dialog::DlgPreferences</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>20</x> <x>284</x>
<y>20</y> <y>432</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>20</x> <x>284</x>
<y>20</y> <y>226</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>

13
src/Gui/DlgPreferencesImp.cpp
View File

@ -56,7 +56,8 @@ DlgPreferencesImp::DlgPreferencesImp( QWidget* parent, Qt::WFlags fl )
: QDialog(parent, fl) : QDialog(parent, fl)
{ {
this->setupUi(this); this->setupUi(this);
connect( buttonHelp, SIGNAL ( clicked() ), getMainWindow(), SLOT ( whatsThis() )); connect(buttonBox, SIGNAL (helpRequested()),
getMainWindow(), SLOT (whatsThis()));
connect(listBox, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), connect(listBox, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)),
this, SLOT(changeGroup(QListWidgetItem *, QListWidgetItem*))); this, SLOT(changeGroup(QListWidgetItem *, QListWidgetItem*)));
@ -189,12 +190,18 @@ void DlgPreferencesImp::activateGroupPage(const QString& group, int index)
void DlgPreferencesImp::accept() void DlgPreferencesImp::accept()
{ {
this->invalidParameter = false; this->invalidParameter = false;
on_buttonApply_clicked(); applyChanges();
if (!this->invalidParameter) if (!this->invalidParameter)
QDialog::accept(); 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 { try {
for (int i=0; i<tabWidgetStack->count(); i++) { for (int i=0; i<tabWidgetStack->count(); i++) {

3
src/Gui/DlgPreferencesImp.h
View File

@ -120,12 +120,13 @@ protected:
protected Q_SLOTS: protected Q_SLOTS:
void changeGroup(QListWidgetItem *current, QListWidgetItem *previous); void changeGroup(QListWidgetItem *current, QListWidgetItem *previous);
void on_buttonApply_clicked(); void on_buttonBox_clicked(QAbstractButton*);
private: private:
/** @name for internal use only */ /** @name for internal use only */
//@{ //@{
void setupPages(); void setupPages();
void applyChanges();
//@} //@}
private: private:

86
src/Gui/DlgProjectInformation.ui
View File

@ -19,13 +19,7 @@
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QGroupBox" name="groupBoxInfo"> <widget class="QGroupBox" name="groupBoxInfo">
<property name="title"> <property name="title">
@ -304,94 +298,46 @@
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<layout class="QHBoxLayout"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="spacing"> <property name="standardButtons">
<number>6</number> <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> </property>
</widget> </widget>
</item> </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> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
<sender>buttonOk</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>accepted()</signal>
<receiver>Gui::Dialog::DlgProjectInformation</receiver> <receiver>Gui::Dialog::DlgProjectInformation</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>20</x> <x>298</x>
<y>20</y> <y>518</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>20</x> <x>298</x>
<y>20</y> <y>269</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection> <connection>
<sender>buttonCancel</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>rejected()</signal>
<receiver>Gui::Dialog::DlgProjectInformation</receiver> <receiver>Gui::Dialog::DlgProjectInformation</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>20</x> <x>298</x>
<y>20</y> <y>518</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>20</x> <x>298</x>
<y>20</y> <y>269</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>

48
src/Gui/DlgProjectInformationImp.cpp
View File

@ -27,6 +27,7 @@
#include <App/PropertyStandard.h> #include <App/PropertyStandard.h>
#include "DlgProjectInformationImp.h" #include "DlgProjectInformationImp.h"
#include "ui_DlgProjectInformation.h"
#include "Document.h" #include "Document.h"
#include <QUrl> #include <QUrl>
#include <QDesktopServices> #include <QDesktopServices>
@ -37,33 +38,33 @@ using namespace Gui::Dialog;
/** /**
* Constructs a Gui::Dialog::DlgProjectInformationImp as a child of 'parent', with the * 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 * The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog. * TRUE to construct a modal dialog.
*/ */
DlgProjectInformationImp::DlgProjectInformationImp(App::Document* doc, QWidget* parent, Qt::WFlags fl) DlgProjectInformationImp::DlgProjectInformationImp(App::Document* doc, QWidget* parent, Qt::WFlags fl)
: QDialog( parent, fl ), _doc(doc) : QDialog(parent, fl), _doc(doc), ui(new Ui_DlgProjectInformation)
{ {
this->setupUi(this); ui->setupUi(this);
lineEditName->setText(QString::fromUtf8(doc->Label.getValue())); ui->lineEditName->setText(QString::fromUtf8(doc->Label.getValue()));
lineEditPath->setText(QString::fromUtf8(doc->FileName.getValue())); ui->lineEditPath->setText(QString::fromUtf8(doc->FileName.getValue()));
lineEditUuid->setText(QString::fromUtf8(doc->Uid.getValueStr().c_str())); ui->lineEditUuid->setText(QString::fromUtf8(doc->Uid.getValueStr().c_str()));
lineEditCreator->setText(QString::fromUtf8(doc->CreatedBy.getValue())); ui->lineEditCreator->setText(QString::fromUtf8(doc->CreatedBy.getValue()));
lineEditDate->setText(QString::fromUtf8(doc->CreationDate.getValue())); ui->lineEditDate->setText(QString::fromUtf8(doc->CreationDate.getValue()));
lineEditLastMod->setText(QString::fromUtf8(doc->LastModifiedBy.getValue())); ui->lineEditLastMod->setText(QString::fromUtf8(doc->LastModifiedBy.getValue()));
lineEditLastModDate->setText(QString::fromUtf8(doc->LastModifiedDate.getValue())); ui->lineEditLastModDate->setText(QString::fromUtf8(doc->LastModifiedDate.getValue()));
lineEditCompany->setText(QString::fromUtf8(doc->Company.getValue())); ui->lineEditCompany->setText(QString::fromUtf8(doc->Company.getValue()));
lineEditLicense->setText(QString::fromUtf8(doc->License.getValue())); ui->lineEditLicense->setText(QString::fromUtf8(doc->License.getValue()));
lineEditLicenseURL->setText(QString::fromUtf8(doc->LicenseURL.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'. // When saving the text to XML the newlines get lost. So we store also the newlines as '\n'.
// See also accept(). // See also accept().
QString comment = QString::fromUtf8(doc->Comment.getValue()); QString comment = QString::fromUtf8(doc->Comment.getValue());
QStringList lines = comment.split(QLatin1String("\\n"), QString::KeepEmptyParts); QStringList lines = comment.split(QLatin1String("\\n"), QString::KeepEmptyParts);
QString text = lines.join(QLatin1String("\n")); QString text = lines.join(QLatin1String("\n"));
textEditComment->setPlainText( text ); ui->textEditComment->setPlainText( text );
connect(pushButtonOpenURL, SIGNAL(clicked()),this, SLOT(open_url())); connect(ui->pushButtonOpenURL, SIGNAL(clicked()),this, SLOT(open_url()));
} }
/** /**
@ -72,6 +73,7 @@ DlgProjectInformationImp::DlgProjectInformationImp( App::Document* doc, QWidget*
DlgProjectInformationImp::~DlgProjectInformationImp() 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() void DlgProjectInformationImp::accept()
{ {
_doc->CreatedBy.setValue(lineEditCreator->text().toUtf8()); _doc->CreatedBy.setValue(ui->lineEditCreator->text().toUtf8());
_doc->LastModifiedBy.setValue(lineEditCreator->text().toUtf8()); _doc->LastModifiedBy.setValue(ui->lineEditCreator->text().toUtf8());
_doc->Company.setValue(lineEditCompany->text().toUtf8()); _doc->Company.setValue(ui->lineEditCompany->text().toUtf8());
_doc->License.setValue(lineEditLicense->text().toUtf8()); _doc->License.setValue(ui->lineEditLicense->text().toUtf8());
_doc->LicenseURL.setValue(lineEditLicenseURL->text().toUtf8()); _doc->LicenseURL.setValue(ui->lineEditLicenseURL->text().toUtf8());
// Replace newline escape sequence trough '\\n' string // Replace newline escape sequence trough '\\n' string
QStringList lines = textEditComment->toPlainText().split QStringList lines = ui->textEditComment->toPlainText().split
(QLatin1String("\n"), QString::KeepEmptyParts); (QLatin1String("\n"), QString::KeepEmptyParts);
QString text = lines.join(QLatin1String("\\n")); QString text = lines.join(QLatin1String("\\n"));
_doc->Comment.setValue(text.isEmpty() ? "" : text.toUtf8()); _doc->Comment.setValue(text.isEmpty() ? "" : text.toUtf8());
@ -99,6 +101,8 @@ void DlgProjectInformationImp::accept()
*/ */
void DlgProjectInformationImp::open_url() void DlgProjectInformationImp::open_url()
{ {
QString url = QString::fromUtf8(_doc->LicenseURL.getValue()); QString url = ui->lineEditLicenseURL->text();
QDesktopServices::openUrl(QUrl(url, QUrl::TolerantMode)); QDesktopServices::openUrl(QUrl(url, QUrl::TolerantMode));
} }
#include "moc_DlgProjectInformationImp.cpp"

14
src/Gui/DlgProjectInformationImp.h
View File

@ -24,7 +24,7 @@
#ifndef GUI_DIALOG_DLGPROJECTINFORMATIONIMP_H #ifndef GUI_DIALOG_DLGPROJECTINFORMATIONIMP_H
#define GUI_DIALOG_DLGPROJECTINFORMATIONIMP_H #define GUI_DIALOG_DLGPROJECTINFORMATIONIMP_H
#include "ui_DlgProjectInformation.h" #include <QDialog>
namespace App { namespace App {
class Document; class Document;
@ -34,16 +34,22 @@ namespace Gui {
namespace Dialog { namespace Dialog {
class DlgProjectInformationImp : public QDialog, public Ui_DlgProjectInformation class Ui_DlgProjectInformation;
class DlgProjectInformationImp : public QDialog
{ {
Q_OBJECT
public: public:
DlgProjectInformationImp(App::Document* doc, QWidget* parent = 0, Qt::WFlags fl = 0); DlgProjectInformationImp(App::Document* doc, QWidget* parent = 0, Qt::WFlags fl = 0);
~DlgProjectInformationImp(); ~DlgProjectInformationImp();
protected:
void accept(); void accept();
private Q_SLOTS:
void open_url(); void open_url();
private:
App::Document* _doc; App::Document* _doc;
Ui_DlgProjectInformation* ui;
}; };
} // namespace Dialog } // namespace Dialog

146
src/Gui/DlgSettingsColorGradient.ui
View File

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>Gui::Dialog::DlgSettingsColorGradient</class> <class>Gui::Dialog::DlgSettingsColorGradient</class>
<widget class="QDialog" name="Gui::Dialog::DlgSettingsColorGradient"> <widget class="QDialog" name="Gui::Dialog::DlgSettingsColorGradient">
<property name="geometry"> <property name="geometry">
@ -21,33 +19,27 @@
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout">
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QGroupBox" name="groupBoxModel"> <widget class="QGroupBox" name="groupBoxModel">
<property name="title"> <property name="title">
<string>Color model</string> <string>Color model</string>
</property> </property>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin"> <property name="margin">
<number>11</number> <number>11</number>
</property> </property>
<property name="spacing" >
<number>6</number>
</property>
<item> <item>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="margin" >
<number>0</number>
</property>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="textLabel5"> <widget class="QLabel" name="textLabel5">
<property name="text"> <property name="text">
@ -90,7 +82,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>100</width> <width>100</width>
<height>20</height> <height>20</height>
@ -103,41 +95,6 @@
</layout> </layout>
</widget> </widget>
</item> </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"> <item row="1" column="0">
<widget class="QGroupBox" name="buttonGroupStyle"> <widget class="QGroupBox" name="buttonGroupStyle">
<property name="title"> <property name="title">
@ -176,60 +133,40 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="4" column="0" > <item row="2" column="0">
<widget class="QGroupBox" name="groupBoxVisible">
<property name="title">
<string>Visibility</string>
</property>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="margin" > <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <property name="margin">
<number>6</number> <number>11</number>
</property> </property>
<item> <item>
<spacer> <widget class="QCheckBox" name="checkBoxGrayed">
<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"> <property name="text">
<string>&amp;OK</string> <string>Out g&amp;rayed</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string/> <string>Alt+R</string>
</property>
<property name="autoDefault" >
<bool>true</bool>
</property>
<property name="default" >
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="buttonCancel" > <widget class="QCheckBox" name="checkBoxInvisible">
<property name="text"> <property name="text">
<string>&amp;Cancel</string> <string>Out &amp;invisible</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string/> <string>Alt+I</string>
</property>
<property name="autoDefault" >
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QGroupBox" name="groupBoxRange"> <widget class="QGroupBox" name="groupBoxRange">
@ -251,7 +188,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>35</width> <width>35</width>
<height>20</height> <height>20</height>
@ -341,6 +278,13 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="4" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
@ -352,40 +296,38 @@
<tabstop>floatLineEditMax</tabstop> <tabstop>floatLineEditMax</tabstop>
<tabstop>floatLineEditMin</tabstop> <tabstop>floatLineEditMin</tabstop>
<tabstop>spinBoxLabel</tabstop> <tabstop>spinBoxLabel</tabstop>
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
<sender>buttonOk</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>accepted()</signal>
<receiver>Gui::Dialog::DlgSettingsColorGradient</receiver> <receiver>Gui::Dialog::DlgSettingsColorGradient</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>20</x> <x>180</x>
<y>20</y> <y>320</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>20</x> <x>180</x>
<y>20</y> <y>170</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection> <connection>
<sender>buttonCancel</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>rejected()</signal>
<receiver>Gui::Dialog::DlgSettingsColorGradient</receiver> <receiver>Gui::Dialog::DlgSettingsColorGradient</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>20</x> <x>180</x>
<y>20</y> <y>320</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>20</x> <x>180</x>
<y>20</y> <y>170</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>

89
src/Gui/DlgTreeWidget.ui
View File

@ -1,39 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>Gui::DlgTreeWidget</class> <class>Gui::DlgTreeWidget</class>
<widget class="QDialog" name="Gui::DlgTreeWidget"> <widget class="QDialog" name="Gui::DlgTreeWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>379</width> <width>396</width>
<height>283</height> <height>281</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Dialog</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout">
<property name="margin" > <item row="0" column="0">
<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"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string/> <string/>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout_2">
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTreeWidget" name="treeWidget"> <widget class="QTreeWidget" name="treeWidget">
<column> <column>
@ -46,77 +32,46 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="0">
<layout class="QHBoxLayout" > <widget class="QDialogButtonBox" name="buttonBox">
<property name="margin" > <property name="standardButtons">
<number>0</number> <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> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
<pixmapfunction></pixmapfunction>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
<sender>okButton</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>accepted()</signal>
<receiver>Gui::DlgTreeWidget</receiver> <receiver>Gui::DlgTreeWidget</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>278</x> <x>436</x>
<y>253</y> <y>220</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>96</x> <x>271</x>
<y>254</y> <y>247</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection> <connection>
<sender>cancelButton</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>rejected()</signal>
<receiver>Gui::DlgTreeWidget</receiver> <receiver>Gui::DlgTreeWidget</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>369</x> <x>436</x>
<y>253</y> <y>220</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>179</x> <x>271</x>
<y>282</y> <y>247</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>

81
src/Gui/InputVector.ui
View File

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>Gui::Dialog::InputVector</class> <class>Gui::Dialog::InputVector</class>
<widget class="QDialog" name="Gui::Dialog::InputVector"> <widget class="QDialog" name="Gui::Dialog::InputVector">
<property name="geometry"> <property name="geometry">
@ -15,13 +13,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Input vector</string> <string>Input vector</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout">
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
@ -36,34 +28,34 @@
</property> </property>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QDoubleSpinBox" name="vectorZ"> <widget class="QDoubleSpinBox" name="vectorZ">
<property name="maximum" >
<double>2.14748e+09</double>
</property>
<property name="minimum"> <property name="minimum">
<double>-2.14748e+09</double> <double>-2147480000.000000000000000</double>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property> </property>
<property name="value"> <property name="value">
<double>1</double> <double>1.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QDoubleSpinBox" name="vectorY"> <widget class="QDoubleSpinBox" name="vectorY">
<property name="maximum" >
<double>2.14748e+09</double>
</property>
<property name="minimum"> <property name="minimum">
<double>-2.14748e+09</double> <double>-2147480000.000000000000000</double>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QDoubleSpinBox" name="vectorX"> <widget class="QDoubleSpinBox" name="vectorX">
<property name="maximum" >
<double>2.14748e+09</double>
</property>
<property name="minimum"> <property name="minimum">
<double>-2.14748e+09</double> <double>-2147480000.000000000000000</double>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
@ -92,59 +84,34 @@
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<layout class="QHBoxLayout" > <widget class="QDialogButtonBox" name="buttonBox">
<property name="margin" > <property name="standardButtons">
<number>0</number> <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> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
<pixmapfunction></pixmapfunction>
<tabstops> <tabstops>
<tabstop>vectorX</tabstop> <tabstop>vectorX</tabstop>
<tabstop>vectorY</tabstop> <tabstop>vectorY</tabstop>
<tabstop>vectorZ</tabstop> <tabstop>vectorZ</tabstop>
<tabstop>okButton</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
<sender>okButton</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>accepted()</signal>
<receiver>Gui::Dialog::InputVector</receiver> <receiver>Gui::Dialog::InputVector</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>278</x> <x>90</x>
<y>253</y> <y>155</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>96</x> <x>90</x>
<y>254</y> <y>88</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>

2
src/Gui/MainWindow.cpp
View File

@ -406,7 +406,7 @@ MainWindow::MainWindow(QWidget * parent, Qt::WFlags f)
// Python console // Python console
PythonConsole* pcPython = new PythonConsole(this); PythonConsole* pcPython = new PythonConsole(this);
pcPython->setWordWrapMode(QTextOption::NoWrap); pcPython->setWordWrapMode(QTextOption::NoWrap);
pcPython->setWindowIcon(Gui::BitmapFactory().pixmap("python_small")); pcPython->setWindowIcon(Gui::BitmapFactory().pixmap("applications-python"));
pcPython->setObjectName pcPython->setObjectName
(QString::fromAscii(QT_TRANSLATE_NOOP("QDockWidget","Python console"))); (QString::fromAscii(QT_TRANSLATE_NOOP("QDockWidget","Python console")));
pDockMgr->registerDockWindow("Std_PythonView", pcPython); 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) { if (!edit) {
PythonEditor* editor = new PythonEditor(); PythonEditor* editor = new PythonEditor();
editor->setWindowIcon(Gui::BitmapFactory().pixmap("python_small")); editor->setWindowIcon(Gui::BitmapFactory().pixmap("applications-python"));
edit = new PythonEditorView(editor, getMainWindow()); edit = new PythonEditorView(editor, getMainWindow());
edit->open(fn); edit->open(fn);
edit->resize(400, 300); edit->resize(400, 300);

2
src/Gui/ReportView.cpp
View File

@ -75,7 +75,7 @@ ReportView::ReportView( QWidget* parent )
tabPython = new PythonConsole(); tabPython = new PythonConsole();
tabPython->setWordWrapMode(QTextOption::NoWrap); tabPython->setWordWrapMode(QTextOption::NoWrap);
tabPython->setWindowTitle(trUtf8("Python console")); tabPython->setWindowTitle(trUtf8("Python console"));
tabPython->setWindowIcon(BitmapFactory().pixmap("python_small")); tabPython->setWindowIcon(BitmapFactory().pixmap("applications-python"));
int python = tabWidget->addTab(tabPython, tabPython->windowTitle()); int python = tabWidget->addTab(tabPython, tabPython->windowTitle());
tabWidget->setTabIcon(python, tabPython->windowIcon()); tabWidget->setTabIcon(python, tabPython->windowIcon());
tabWidget->setCurrentIndex(0); tabWidget->setCurrentIndex(0);

1
src/Gui/Widgets.h
View File

@ -29,6 +29,7 @@
#include <QLabel> #include <QLabel>
#include <QLineEdit> #include <QLineEdit>
#include <QPointer> #include <QPointer>
#include <QPushButton>
#include <QBasicTimer> #include <QBasicTimer>
#include <QTime> #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*))); this, SLOT(onActivateItem(QTreeWidgetItem*)));
connect(ui->treeWidgetNominal, SIGNAL(itemClicked(QTreeWidgetItem*, int)), connect(ui->treeWidgetNominal, SIGNAL(itemClicked(QTreeWidgetItem*, int)),
this, SLOT(onActivateItem(QTreeWidgetItem*))); this, SLOT(onActivateItem(QTreeWidgetItem*)));
connect(ui->buttonBox, SIGNAL(helpRequested()),
Gui::getMainWindow(), SLOT(whatsThis()));
//FIXME: Not used yet //FIXME: Not used yet
ui->textLabel2->hide(); ui->textLabel2->hide();
@ -91,11 +93,10 @@ VisualInspection::VisualInspection(QWidget* parent, Qt::WFlags fl)
ui->prefFloatSpinBox1->setDecimals(Base::UnitsApi::getDecimals()); ui->prefFloatSpinBox1->setDecimals(Base::UnitsApi::getDecimals());
ui->prefFloatSpinBox2->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(); App::Document* doc = App::GetApplication().getActiveDocument();
// disable Ok button and enable of at least one item in each view is on // 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) { if (!doc) {
ui->treeWidgetActual->setDisabled(true); ui->treeWidgetActual->setDisabled(true);
@ -185,13 +186,13 @@ void VisualInspection::onActivateItem(QTreeWidgetItem* item)
} }
} }
ui->buttonOk->setEnabled(ok); buttonOk->setEnabled(ok);
} }
void VisualInspection::accept() void VisualInspection::accept()
{ {
onActivateItem(0); onActivateItem(0);
if (ui->buttonOk->isEnabled()) { if (buttonOk->isEnabled()) {
QDialog::accept(); QDialog::accept();
saveSettings(); saveSettings();

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

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

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

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>InspectionGui::VisualInspection</class> <class>InspectionGui::VisualInspection</class>
<widget class="QDialog" name="InspectionGui::VisualInspection"> <widget class="QDialog" name="InspectionGui::VisualInspection">
<property name="geometry"> <property name="geometry">
@ -18,40 +16,7 @@
<property name="sizeGripEnabled"> <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout">
<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"> <item row="0" column="0">
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
@ -79,73 +44,32 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2" > <item row="0" column="1">
<layout class="QHBoxLayout" > <widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Nominal</string>
</property>
<layout class="QGridLayout">
<property name="margin"> <property name="margin">
<number>0</number> <number>9</number>
</property> </property>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item> <item row="0" column="0">
<widget class="QPushButton" name="buttonHelp" > <widget class="QTreeWidget" name="treeWidgetNominal">
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<column>
<property name="text"> <property name="text">
<string>&amp;Help</string> <string>Objects</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> </property>
</column>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_3"> <widget class="QGroupBox" name="groupBox_3">
@ -167,7 +91,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>61</width> <width>61</width>
<height>54</height> <height>54</height>
@ -192,7 +116,7 @@
<number>3</number> <number>3</number>
</property> </property>
<property name="singleStep"> <property name="singleStep">
<double>0.1</double> <double>0.100000000000000</double>
</property> </property>
<property name="prefEntry" stdset="0"> <property name="prefEntry" stdset="0">
<cstring>Thickness</cstring> <cstring>Thickness</cstring>
@ -218,7 +142,7 @@
<number>3</number> <number>3</number>
</property> </property>
<property name="value"> <property name="value">
<double>0.05</double> <double>0.050000000000000</double>
</property> </property>
<property name="prefEntry" stdset="0"> <property name="prefEntry" stdset="0">
<cstring>SearchDistance</cstring> <cstring>SearchDistance</cstring>
@ -243,7 +167,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>91</width> <width>91</width>
<height>21</height> <height>21</height>
@ -259,7 +183,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>101</width> <width>101</width>
<height>21</height> <height>21</height>
@ -272,6 +196,13 @@
</layout> </layout>
</widget> </widget>
</item> </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> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
@ -280,48 +211,43 @@
<class>Gui::PrefDoubleSpinBox</class> <class>Gui::PrefDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends> <extends>QDoubleSpinBox</extends>
<header>Gui/PrefWidgets.h</header> <header>Gui/PrefWidgets.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>prefFloatSpinBox1</tabstop> <tabstop>prefFloatSpinBox1</tabstop>
<tabstop>prefFloatSpinBox2</tabstop> <tabstop>prefFloatSpinBox2</tabstop>
<tabstop>buttonHelp</tabstop>
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
<sender>buttonOk</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>accepted()</signal>
<receiver>InspectionGui::VisualInspection</receiver> <receiver>InspectionGui::VisualInspection</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>20</x> <x>269</x>
<y>20</y> <y>384</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>20</x> <x>269</x>
<y>20</y> <y>202</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection> <connection>
<sender>buttonCancel</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>rejected()</signal>
<receiver>InspectionGui::VisualInspection</receiver> <receiver>InspectionGui::VisualInspection</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>20</x> <x>269</x>
<y>20</y> <y>384</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>20</x> <x>269</x>
<y>20</y> <y>202</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>

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

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>371</width> <width>371</width>
<height>683</height> <height>680</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -883,57 +883,12 @@
</spacer> </spacer>
</item> </item>
<item row="20" column="0"> <item row="20" column="0">
<layout class="QHBoxLayout"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="spacing"> <property name="standardButtons">
<number>6</number> <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> </property>
</widget> </widget>
</item> </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>
</item>
</layout> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
@ -957,24 +912,22 @@
<tabstop>checkIndicesButton</tabstop> <tabstop>checkIndicesButton</tabstop>
<tabstop>analyzeIndicesButton</tabstop> <tabstop>analyzeIndicesButton</tabstop>
<tabstop>repairIndicesButton</tabstop> <tabstop>repairIndicesButton</tabstop>
<tabstop>buttonHelp</tabstop>
<tabstop>closeButton</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
<sender>closeButton</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>rejected()</signal>
<receiver>MeshGui::DlgEvaluateMesh</receiver> <receiver>MeshGui::DlgEvaluateMesh</receiver>
<slot>close()</slot> <slot>close()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>326</x> <x>185</x>
<y>615</y> <y>661</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>189</x> <x>185</x>
<y>337</y> <y>341</y>
</hint> </hint>
</hints> </hints>
</connection> </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->setFrameShape(QFrame::HLine);
line_8->setFrameShadow(QFrame::Sunken); line_8->setFrameShadow(QFrame::Sunken);
connect(buttonHelp, SIGNAL (clicked()), connect(buttonBox, SIGNAL (helpRequested()),
Gui::getMainWindow(), SLOT (whatsThis())); Gui::getMainWindow(), SLOT (whatsThis()));
// try to attach to the active document // try to attach to the active document

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

@ -7,20 +7,14 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>299</width> <width>299</width>
<height>514</height> <height>477</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Block definition</string> <string>Block definition</string>
</property> </property>
<layout class="QVBoxLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="spacing"> <item row="0" column="0">
<number>6</number>
</property>
<property name="margin">
<number>9</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>First limit</string> <string>First limit</string>
@ -115,7 +109,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0">
<widget class="QGroupBox" name="GroupBox6"> <widget class="QGroupBox" name="GroupBox6">
<property name="title"> <property name="title">
<string>Profile</string> <string>Profile</string>
@ -154,7 +148,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0">
<layout class="QGridLayout"> <layout class="QGridLayout">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
@ -178,7 +172,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item> <item row="3" column="0">
<widget class="QGroupBox" name="SecondLimit"> <widget class="QGroupBox" name="SecondLimit">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -276,7 +270,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="4" column="0">
<widget class="QGroupBox" name="Direction"> <widget class="QGroupBox" name="Direction">
<property name="title"> <property name="title">
<string>Direction</string> <string>Direction</string>
@ -328,69 +322,13 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="5" column="0">
<layout class="QGridLayout"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="margin"> <property name="standardButtons">
<number>0</number> <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> </property>
</widget> </widget>
</item> </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>
</item>
</layout> </layout>
</widget> </widget>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
@ -406,10 +344,40 @@
<tabstop>SecondLimitSelection</tabstop> <tabstop>SecondLimitSelection</tabstop>
<tabstop>DirectionPerpendicular</tabstop> <tabstop>DirectionPerpendicular</tabstop>
<tabstop>DirectionSelection</tabstop> <tabstop>DirectionSelection</tabstop>
<tabstop>OKButton</tabstop>
<tabstop>ApplyButton</tabstop>
<tabstop>CancelButton</tabstop>
</tabstops> </tabstops>
<resources/> <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> </ui>

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

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>PartGui::DlgPartBox</class> <class>PartGui::DlgPartBox</class>
<widget class="QDialog" name="PartGui::DlgPartBox"> <widget class="QDialog" name="PartGui::DlgPartBox">
<property name="geometry"> <property name="geometry">
@ -9,85 +7,13 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>257</width> <width>257</width>
<height>323</height> <height>305</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Box definition</string> <string>Box definition</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout">
<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"> <item row="0" column="0">
<widget class="QGroupBox" name="GroupBox5"> <widget class="QGroupBox" name="GroupBox5">
<property name="title"> <property name="title">
@ -102,11 +28,11 @@
</property> </property>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QDoubleSpinBox" name="xPos"> <widget class="QDoubleSpinBox" name="xPos">
<property name="maximum" >
<double>2.14748e+09</double>
</property>
<property name="minimum"> <property name="minimum">
<double>-2.14748e+09</double> <double>-2147480000.000000000000000</double>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
@ -119,21 +45,21 @@
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QDoubleSpinBox" name="yPos"> <widget class="QDoubleSpinBox" name="yPos">
<property name="maximum" >
<double>2.14748e+09</double>
</property>
<property name="minimum"> <property name="minimum">
<double>-2.14748e+09</double> <double>-2147480000.000000000000000</double>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QDoubleSpinBox" name="zPos"> <widget class="QDoubleSpinBox" name="zPos">
<property name="maximum" >
<double>2.14748e+09</double>
</property>
<property name="minimum"> <property name="minimum">
<double>-2.14748e+09</double> <double>-2147480000.000000000000000</double>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
@ -168,45 +94,78 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="1" column="0">
<layout class="QHBoxLayout" > <widget class="QGroupBox" name="GroupBox5_2">
<property name="title">
<string>Size:</string>
</property>
<layout class="QGridLayout">
<property name="margin"> <property name="margin">
<number>0</number> <number>9</number>
</property> </property>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item> <item row="2" column="1">
<spacer> <widget class="QDoubleSpinBox" name="wLength">
<property name="orientation" > <property name="maximum">
<enum>Qt::Horizontal</enum> <double>2147480000.000000000000000</double>
</property> </property>
<property name="sizeType" > <property name="value">
<enum>QSizePolicy::Expanding</enum> <double>100.000000000000000</double>
</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> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="1">
<widget class="QPushButton" name="CancelButton" > <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"> <property name="text">
<string>Cancel</string> <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> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -219,40 +178,38 @@
<tabstop>uLength</tabstop> <tabstop>uLength</tabstop>
<tabstop>vLength</tabstop> <tabstop>vLength</tabstop>
<tabstop>wLength</tabstop> <tabstop>wLength</tabstop>
<tabstop>OKButton</tabstop>
<tabstop>CancelButton</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
<sender>OKButton</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>accepted()</signal>
<receiver>PartGui::DlgPartBox</receiver> <receiver>PartGui::DlgPartBox</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>60</x> <x>125</x>
<y>249</y> <y>311</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>7</x> <x>128</x>
<y>7</y> <y>161</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection> <connection>
<sender>CancelButton</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>rejected()</signal>
<receiver>PartGui::DlgPartBox</receiver> <receiver>PartGui::DlgPartBox</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>242</x> <x>125</x>
<y>246</y> <y>311</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>291</x> <x>128</x>
<y>179</y> <y>161</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>

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

@ -1,76 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>PartGui::DlgPartCylinder</class> <class>PartGui::DlgPartCylinder</class>
<widget class="QDialog" name="PartGui::DlgPartCylinder"> <widget class="QDialog" name="PartGui::DlgPartCylinder">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>296</width> <width>275</width>
<height>323</height> <height>279</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Cylinder definition</string> <string>Cylinder definition</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout">
<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"> <item row="0" column="0">
<widget class="QGroupBox" name="GroupBox5"> <widget class="QGroupBox" name="GroupBox5">
<property name="title"> <property name="title">
@ -120,31 +63,80 @@
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QDoubleSpinBox" name="zPos"> <widget class="QDoubleSpinBox" name="zPos">
<property name="maximum" >
<double>2.14748e+09</double>
</property>
<property name="minimum"> <property name="minimum">
<double>-2.14748e+09</double> <double>-2147480000.000000000000000</double>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QDoubleSpinBox" name="yPos"> <widget class="QDoubleSpinBox" name="yPos">
<property name="maximum" >
<double>2.14748e+09</double>
</property>
<property name="minimum"> <property name="minimum">
<double>-2.14748e+09</double> <double>-2147480000.000000000000000</double>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QDoubleSpinBox" name="xPos"> <widget class="QDoubleSpinBox" name="xPos">
<property name="maximum" >
<double>2.14748e+09</double>
</property>
<property name="minimum"> <property name="minimum">
<double>-2.14748e+09</double> <double>-2147480000.000000000000000</double>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<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>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> </property>
</widget> </widget>
</item> </item>
@ -152,45 +144,12 @@
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<layout class="QHBoxLayout" > <widget class="QDialogButtonBox" name="buttonBox">
<property name="margin" > <property name="standardButtons">
<number>0</number> <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>88</width>
<height>27</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="OKButton" >
<property name="text" >
<string>OK</string>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="CancelButton" >
<property name="text" >
<string>Cancel</string>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
@ -201,40 +160,38 @@
<tabstop>direction</tabstop> <tabstop>direction</tabstop>
<tabstop>radius</tabstop> <tabstop>radius</tabstop>
<tabstop>length</tabstop> <tabstop>length</tabstop>
<tabstop>OKButton</tabstop>
<tabstop>CancelButton</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
<sender>OKButton</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>accepted()</signal>
<receiver>PartGui::DlgPartCylinder</receiver> <receiver>PartGui::DlgPartCylinder</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>60</x> <x>139</x>
<y>249</y> <y>255</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>7</x> <x>0</x>
<y>7</y> <y>223</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection> <connection>
<sender>CancelButton</sender> <sender>buttonBox</sender>
<signal>clicked()</signal> <signal>rejected()</signal>
<receiver>PartGui::DlgPartCylinder</receiver> <receiver>PartGui::DlgPartCylinder</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>242</x> <x>253</x>
<y>246</y> <y>258</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>291</x> <x>278</x>
<y>179</y> <y>243</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>

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

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>PartGui::DlgPartImportIges</class> <class>PartGui::DlgPartImportIges</class>
<widget class="QDialog" name="PartGui::DlgPartImportIges"> <widget class="QDialog" name="PartGui::DlgPartImportIges">
<property name="geometry"> <property name="geometry">
@ -9,84 +7,33 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>342</width> <width>342</width>
<height>121</height> <height>112</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>IGES input file</string> <string>IGES input file</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout_2">
<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"> <item row="0" column="0">
<widget class="QGroupBox" name="GroupBox5"> <widget class="QGroupBox" name="GroupBox5">
<property name="title"> <property name="title">
<string>File Name</string> <string>File Name</string>
</property> </property>
<layout class="QHBoxLayout" > <layout class="QGridLayout" name="gridLayout">
<property name="margin"> <property name="margin">
<number>11</number> <number>11</number>
</property> </property>
<property name="spacing" > <item row="0" column="0">
<number>6</number>
</property>
<item>
<widget class="QLineEdit" name="FileName"> <widget class="QLineEdit" name="FileName">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="1">
<widget class="QPushButton" name="SearchFile"> <widget class="QPushButton" name="SearchFile">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -111,48 +58,20 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<tabstops> <tabstops>
<tabstop>FileName</tabstop> <tabstop>FileName</tabstop>
<tabstop>SearchFile</tabstop> <tabstop>SearchFile</tabstop>
<tabstop>OKButton</tabstop>
<tabstop>CancelButton</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <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>
</ui> </ui>

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

@ -1,52 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>PartGui::DlgPartImportStep</class> <class>PartGui::DlgPartImportStep</class>
<widget class="QDialog" name="PartGui::DlgPartImportStep"> <widget class="QDialog" name="PartGui::DlgPartImportStep">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>342</width> <width>349</width>
<height>117</height> <height>116</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Step input file</string> <string>Step input file</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout">
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QGroupBox" name="GroupBox5"> <widget class="QGroupBox" name="GroupBox5">
<property name="title"> <property name="title">
<string>File Name</string> <string>File Name</string>
</property> </property>
<layout class="QHBoxLayout" > <layout class="QGridLayout" name="gridLayout_2">
<property name="margin"> <property name="margin">
<number>11</number> <number>11</number>
</property> </property>
<property name="spacing" > <item row="0" column="0">
<number>6</number>
</property>
<item>
<widget class="QLineEdit" name="FileName"> <widget class="QLineEdit" name="FileName">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="1">
<widget class="QPushButton" name="SearchFile"> <widget class="QPushButton" name="SearchFile">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -72,87 +59,19 @@
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<layout class="QHBoxLayout" > <widget class="QDialogButtonBox" name="buttonBox">
<property name="margin" > <property name="standardButtons">
<number>0</number> <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> </property>
</widget> </widget>
</item> </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>
</layout> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<tabstops> <tabstops>
<tabstop>FileName</tabstop> <tabstop>FileName</tabstop>
<tabstop>SearchFile</tabstop> <tabstop>SearchFile</tabstop>
<tabstop>OKButton</tabstop>
<tabstop>CancelButton</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <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>
</ui> </ui>