Merge branch 'master' into arch-roof-2

This commit is contained in:
Jonathan Wiedemann 2016-03-01 08:08:32 +01:00
commit 0172544cc7
976 changed files with 47545 additions and 28637 deletions

View File

@ -165,13 +165,8 @@ PyDoc_STRVAR(Console_doc,
"FreeCAD Console\n"
);
Application::Application(ParameterManager * /*pcSysParamMngr*/,
ParameterManager * /*pcUserParamMngr*/,
std::map<std::string,std::string> &mConfig)
://_pcSysParamMngr(pcSysParamMngr),
//_pcUserParamMngr(pcUserParamMngr),
_mConfig(mConfig),
_pActiveDoc(0)
Application::Application(std::map<std::string,std::string> &mConfig)
: _mConfig(mConfig), _pActiveDoc(0)
{
//_hApp = new ApplicationOCC;
mpcPramManager["System parameter"] = _pcSysParamMngr;
@ -1277,7 +1272,7 @@ void Application::initApplication(void)
// creating the application
if (!(mConfig["Verbose"] == "Strict")) Console().Log("Create Application\n");
Application::_pcSingleton = new Application(0,0,mConfig);
Application::_pcSingleton = new Application(mConfig);
// set up Unit system default
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath

View File

@ -273,7 +273,7 @@ protected:
private:
/// Constructor
Application(ParameterManager *pcSysParamMngr, ParameterManager *pcUserParamMngr,std::map<std::string,std::string> &mConfig);
Application(std::map<std::string,std::string> &mConfig);
/// Destructor
virtual ~Application();

View File

@ -109,7 +109,10 @@ typedef unsigned int flex_uint32_t;
#endif
/* Returned upon end-of-file. */
#define YY_NULL 0
# ifdef YY_NULL
# undef YY_NULL
# define YY_NULL 0
# endif
/* Promotes a possibly negative, possibly signed char to an unsigned
* integer for use as an array index. If the signed char is negative,
@ -686,7 +689,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
int n; \
unsigned int n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \

View File

@ -508,6 +508,7 @@ void WorkbenchGroup::addTo(QWidget *w)
if (w->inherits("QToolBar")) {
QToolBar* bar = qobject_cast<QToolBar*>(w);
QComboBox* box = new WorkbenchComboBox(this, w);
box->setIconSize(QSize(16, 16));
box->setToolTip(_action->toolTip());
box->setStatusTip(_action->statusTip());
box->setWhatsThis(_action->whatsThis());

View File

@ -589,7 +589,7 @@ void BitmapFactoryInst::convert(const QImage& p, SoSFImage& img) const
size[0] = p.width();
size[1] = p.height();
int buffersize = p.numBytes();
int buffersize = p.byteCount();
int numcomponents = 0;
QVector<QRgb> table = p.colorTable();
if (!table.isEmpty()) {

View File

@ -27,6 +27,7 @@
# include <QEventLoop>
# include <QFileDialog>
# include <QMutex>
# include <QMutexLocker>
# include <QThread>
# include <QTimer>
# include <QMdiArea>
@ -294,10 +295,10 @@ CmdTestProgress1::CmdTestProgress1()
void CmdTestProgress1::activated(int iMsg)
{
QMutex mutex;
QMutexLocker ml(&mutex);
try
{
QMutex mutex;
mutex.lock();
unsigned long steps = 1000;
Base::SequencerLauncher seq("Starting progress bar", steps);
@ -306,8 +307,6 @@ void CmdTestProgress1::activated(int iMsg)
seq.next(true);
QWaitCondition().wait(&mutex, 30);
}
mutex.unlock();
}
catch (...)
{
@ -337,10 +336,11 @@ CmdTestProgress2::CmdTestProgress2()
void CmdTestProgress2::activated(int iMsg)
{
QMutex mutex;
QMutexLocker ml(&mutex);
try
{
QMutex mutex;
mutex.lock();
unsigned long steps = 1000;
Base::SequencerLauncher seq("Starting progress bar", steps);
@ -378,11 +378,12 @@ CmdTestProgress3::CmdTestProgress3()
void CmdTestProgress3::activated(int iMsg)
{
QMutex mutex;
QMutexLocker ml(&mutex);
try
{
// level 1
QMutex mutex;
mutex.lock();
unsigned long steps = 5;
Base::SequencerLauncher seq1("Starting progress bar", steps);
for (unsigned long i=0; i<steps;i++)
@ -446,10 +447,11 @@ CmdTestProgress4::CmdTestProgress4()
void CmdTestProgress4::activated(int iMsg)
{
QMutex mutex;
QMutexLocker ml(&mutex);
try
{
QMutex mutex;
mutex.lock();
unsigned long steps = 50;
Base::SequencerLauncher* seq = new Base::SequencerLauncher("Starting progress bar", steps);
@ -508,10 +510,11 @@ public:
}
void run()
{
QMutex mutex;
QMutexLocker ml(&mutex);
try
{
QMutex mutex;
mutex.lock();
Base::SequencerLauncher seq("Starting progress bar in thread", steps);
for (unsigned long i=0; i<this->steps;i++)
@ -519,7 +522,6 @@ public:
seq.next(true);
QWaitCondition().wait(&mutex, 5);
}
mutex.unlock();
}
catch (...)
{
@ -662,27 +664,23 @@ public:
}
virtual void Warning(const char * msg)
{
mutex.lock();
QMutexLocker ml(&mutex);
matchWrn += strcmp(msg, "Write a warning to the console output.\n");
mutex.unlock();
}
virtual void Message(const char * msg)
{
mutex.lock();
QMutexLocker ml(&mutex);
matchMsg += strcmp(msg, "Write a message to the console output.\n");
mutex.unlock();
}
virtual void Error(const char * msg)
{
mutex.lock();
QMutexLocker ml(&mutex);
matchErr += strcmp(msg, "Write an error to the console output.\n");
mutex.unlock();
}
virtual void Log(const char * msg)
{
mutex.lock();
QMutexLocker ml(&mutex);
matchLog += strcmp(msg, "Write a log to the console output.\n");
mutex.unlock();
}
};

View File

@ -265,10 +265,9 @@ void DlgParameterImp::onChangeParameterSet(int index)
hGrp = hGrp->GetGroup("ParameterEditor");
QString path = QString::fromUtf8(hGrp->GetASCII("LastParameterGroup").c_str());
QStringList paths = path.split(QLatin1String("."), QString::SkipEmptyParts);
if (paths.empty())
return;
QTreeWidgetItem* parent = 0;
for (int index=0; index < paramGroup->topLevelItemCount(); index++) {
for (int index=0; index < paramGroup->topLevelItemCount() && !paths.empty(); index++) {
QTreeWidgetItem* child = paramGroup->topLevelItem(index);
if (child->text(0) == paths.front()) {
paths.pop_front();

View File

@ -20,7 +20,16 @@
<string>Output</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<property name="leftMargin">
<number>11</number>
</property>
<property name="topMargin">
<number>11</number>
</property>
<property name="rightMargin">
<number>11</number>
</property>
<property name="bottomMargin">
<number>11</number>
</property>
<item row="0" column="0">
@ -77,7 +86,16 @@
<string>Colors</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
@ -101,7 +119,16 @@
</item>
<item row="0" column="0">
<layout class="QGridLayout">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="spacing">
@ -147,7 +174,7 @@
<property name="text">
<string/>
</property>
<property name="color">
<property name="color" stdset="0">
<color>
<red>0</red>
<green>0</green>
@ -202,7 +229,7 @@
<property name="text">
<string/>
</property>
<property name="color">
<property name="color" stdset="0">
<color>
<red>0</red>
<green>0</green>
@ -257,7 +284,7 @@
<property name="text">
<string/>
</property>
<property name="color">
<property name="color" stdset="0">
<color>
<red>255</red>
<green>170</green>
@ -312,7 +339,7 @@
<property name="text">
<string/>
</property>
<property name="color">
<property name="color" stdset="0">
<color>
<red>255</red>
<green>0</green>
@ -343,6 +370,9 @@
<property name="text">
<string>Redirect internal Python output to report view</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>RedirectPythonOutput</cstring>
</property>
@ -356,6 +386,9 @@
<property name="text">
<string>Redirect internal Python errors to report view</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>RedirectPythonErrors</cstring>
</property>

View File

@ -172,6 +172,9 @@
<property name="text">
<string>Zoom at cursor</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>ZoomAtCursor</cstring>
</property>
@ -258,7 +261,16 @@
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>11</number>
</property>
<property name="topMargin">
<number>11</number>
</property>
<property name="rightMargin">
<number>11</number>
</property>
<property name="bottomMargin">
<number>11</number>
</property>
<item>
@ -297,7 +309,16 @@
</item>
<item>
<layout class="QGridLayout" name="backlightLayout">
<property name="margin">
<property name="leftMargin">
<number>11</number>
</property>
<property name="topMargin">
<number>11</number>
</property>
<property name="rightMargin">
<number>11</number>
</property>
<property name="bottomMargin">
<number>11</number>
</property>
<property name="spacing">
@ -345,7 +366,7 @@
<property name="enabled">
<bool>false</bool>
</property>
<property name="color">
<property name="color" stdset="0">
<color>
<red>255</red>
<green>255</green>
@ -391,7 +412,16 @@
<string>Camera type</string>
</property>
<layout class="QGridLayout" name="gridLayout1">
<property name="margin">
<property name="leftMargin">
<number>11</number>
</property>
<property name="topMargin">
<number>11</number>
</property>
<property name="rightMargin">
<number>11</number>
</property>
<property name="bottomMargin">
<number>11</number>
</property>
<property name="spacing">
@ -400,7 +430,7 @@
<item row="0" column="1">
<widget class="Gui::PrefRadioButton" name="radioOrthographic">
<property name="text">
<string>Orthographic rendering</string>
<string>Or&amp;thographic rendering</string>
</property>
<property name="checked">
<bool>true</bool>
@ -416,7 +446,7 @@
<item row="0" column="0">
<widget class="Gui::PrefRadioButton" name="radioPerspective">
<property name="text">
<string>Perspective rendering</string>
<string>Perspective renderin&amp;g</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>Perspective</cstring>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 862 B

After

Width:  |  Height:  |  Size: 662 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@ -13,9 +14,10 @@
height="64px"
id="svg3140"
sodipodi:version="0.32"
inkscape:version="0.46"
sodipodi:docname="FreeCAD05.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
inkscape:version="0.91 r13725"
sodipodi:docname="freecad.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1">
<defs
id="defs3142">
<linearGradient
@ -29,17 +31,6 @@
offset="1"
style="stop-color:#002795;stop-opacity:1;" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3864"
id="radialGradient3661"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.6186598,0.9666542,-1.0332462,0.6612786,-327.27568,-255.84136)"
cx="282.64584"
cy="29.149046"
fx="282.64584"
fy="29.149046"
r="19.571428" />
<linearGradient
id="linearGradient3682">
<stop
@ -51,17 +42,6 @@
offset="1"
id="stop3686" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3682"
id="radialGradient3817"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.1149219,0.2722306,-0.7507171,3.0745639,-471.08629,-148.32863)"
cx="270.58316"
cy="33.899986"
fx="270.58316"
fy="33.899986"
r="19.571428" />
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 32 : 1"
@ -69,6 +49,57 @@
inkscape:vp_z="64 : 32 : 1"
inkscape:persp3d-origin="32 : 21.333333 : 1"
id="perspective3148" />
<linearGradient
id="linearGradient3864-9">
<stop
style="stop-color:#316cab;stop-opacity:1"
offset="0"
id="stop3866-1" />
<stop
style="stop-color:#002ca8;stop-opacity:1"
offset="1"
id="stop3868-1" />
</linearGradient>
<radialGradient
r="19.571428"
fy="29.149046"
fx="282.64584"
cy="29.149046"
cx="282.64584"
gradientTransform="matrix(0.6186598,0.9666542,-1.0332462,0.6612786,-327.27568,-255.84136)"
gradientUnits="userSpaceOnUse"
id="radialGradient3661-2"
xlink:href="#linearGradient3864-9"
inkscape:collect="always" />
<linearGradient
id="linearGradient3682-0">
<stop
id="stop3684-0"
offset="0"
style="stop-color:#ff390f;stop-opacity:1" />
<stop
id="stop3686-0"
offset="1"
style="stop-color:#ff1000;stop-opacity:1;" />
</linearGradient>
<radialGradient
r="19.571428"
fy="33.899986"
fx="270.58316"
cy="33.899986"
cx="270.58316"
gradientTransform="matrix(1.1149219,0.2722306,-0.7507171,3.0745639,-471.08629,-148.32863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3817-5"
xlink:href="#linearGradient3682-0"
inkscape:collect="always" />
<inkscape:perspective
id="perspective3148-5"
inkscape:persp3d-origin="32 : 21.333333 : 1"
inkscape:vp_z="64 : 32 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 32 : 1"
sodipodi:type="inkscape:persp3d" />
</defs>
<sodipodi:namedview
id="base"
@ -84,10 +115,11 @@
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="640"
inkscape:window-height="684"
inkscape:window-width="1920"
inkscape:window-height="1053"
inkscape:window-x="0"
inkscape:window-y="93" />
inkscape:window-y="0"
inkscape:window-maximized="1" />
<metadata
id="metadata3145">
<rdf:RDF>
@ -104,19 +136,24 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<g
id="g3813"
transform="matrix(0.8506406,0,0,0.8506406,187.82699,-0.1960013)">
<path
sodipodi:nodetypes="ccccccccccc"
id="rect3663"
d="M -216.13659,7.270763 L -216.13659,62.770763 L -203.76159,62.770763 L -203.76159,41.052013 L -195.01159,41.052013 L -195.01159,32.489513 L -203.76159,32.489513 L -203.76159,23.247634 L -182.20645,23.247634 L -182.20645,7.302013 L -216.13659,7.270763 z"
style="opacity:1;fill:url(#radialGradient3817);fill-opacity:1;fill-rule:evenodd;stroke:#370700;stroke-width:1.91000152;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
id="path3659"
d="M -161.05088,23.811562 L -168.24914,27.941451 L -171.42783,26.838359 L -174.46057,19.087636 L -179.23123,19.338335 L -181.40725,27.353068 L -184.45272,28.811478 L -192.04863,25.488663 L -195.25694,29.05385 L -191.12704,36.252107 L -192.25562,39.421483 L -200.00635,42.454224 L -199.73017,47.234186 L -191.71543,49.410207 L -190.25702,52.455668 L -193.60531,60.042283 L -190.04013,63.250589 L -182.84188,59.120698 L -179.64701,60.258581 L -176.63975,68 L -171.83431,67.733117 L -169.68377,59.709083 L -166.6383,58.250671 L -159.02622,61.608278 L -155.81791,58.043091 L -159.9478,50.844835 L -158.83541,47.640667 L -151.09399,44.633407 L -151.33537,39.83727 L -159.35941,37.686734 L -160.81783,34.641273 L -157.48571,27.019867 L -161.05088,23.811562 z M -171.83168,35.615821 L -170.35403,36.473178 L -169.07381,37.633913 L -168.04887,39.019136 L -167.31158,40.559263 L -166.87809,42.219505 L -166.80627,43.920968 L -167.05202,45.621989 L -167.61286,47.236819 L -168.50501,48.730653 L -169.63095,49.99469 L -171.01618,51.019623 L -172.55631,51.756914 L -174.21654,52.190397 L -175.92731,52.287705 L -177.62834,52.041972 L -179.24316,51.48112 L -180.73699,50.588971 L -181.99174,49.43754 L -183.02596,48.077805 L -183.76327,46.537679 L -184.18744,44.851952 L -184.28475,43.141183 L -184.03902,41.440158 L -183.47816,39.825332 L -182.59532,38.356981 L -181.46006,37.067461 L -180.07484,36.042527 L -178.53472,35.305233 L -176.849,34.881059 L -175.14753,34.809236 L -173.44651,35.054967 L -171.83168,35.615821 z"
style="opacity:1;fill:url(#radialGradient3661);fill-opacity:1;fill-rule:evenodd;stroke:#000137;stroke-width:1.91000152;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
inkscape:label="Layer 1"
id="layer1-4"
transform="translate(-6e-6,-0.36363683)">
<g
transform="matrix(0.8506406,0,0,0.8506406,187.82699,-0.1960013)"
id="g3813-3">
<path
style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3817-5);fill-opacity:1;fill-rule:evenodd;stroke:#370700;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
d="m -216.13659,7.270763 0,55.5 12.375,0 0,-21.71875 8.75,0 0,-8.5625 -8.75,0 0,-9.241879 21.55514,0 0,-15.945621 -33.93014,-0.03125 z"
id="rect3663-8"
sodipodi:nodetypes="ccccccccccc"
inkscape:connector-curvature="0" />
<path
style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient3661-2);fill-opacity:1;fill-rule:evenodd;stroke:#000137;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
d="m -161.05088,23.811562 -7.19826,4.129889 -3.17869,-1.103092 -3.03274,-7.750723 -4.77066,0.250699 -2.17602,8.014733 -3.04547,1.45841 -7.59591,-3.322815 -3.20831,3.565187 4.1299,7.198257 -1.12858,3.169376 -7.75073,3.032741 0.27618,4.779962 8.01474,2.176021 1.45841,3.045461 -3.34829,7.586615 3.56518,3.208306 7.19825,-4.129891 3.19487,1.137883 3.00726,7.741419 4.80544,-0.266883 2.15054,-8.024034 3.04547,-1.458412 7.61208,3.357607 3.20831,-3.565187 -4.12989,-7.198256 1.11239,-3.204168 7.74142,-3.00726 -0.24138,-4.796137 -8.02404,-2.150536 -1.45842,-3.045461 3.33212,-7.621406 -3.56517,-3.208305 z m -10.7808,11.804259 1.47765,0.857357 1.28022,1.160735 1.02494,1.385223 0.73729,1.540127 0.43349,1.660242 0.0718,1.701463 -0.24575,1.701021 -0.56084,1.61483 -0.89215,1.493834 -1.12594,1.264037 -1.38523,1.024933 -1.54013,0.737291 -1.66023,0.433483 -1.71077,0.09731 -1.70103,-0.245733 -1.61482,-0.560852 -1.49383,-0.892149 -1.25475,-1.151431 -1.03422,-1.359735 -0.73731,-1.540126 -0.42417,-1.685727 -0.0973,-1.710769 0.24573,-1.701025 0.56086,-1.614826 0.88284,-1.468351 1.13526,-1.28952 1.38522,-1.024934 1.54012,-0.737294 1.68572,-0.424174 1.70147,-0.07182 1.70102,0.245731 1.61483,0.560854 z"
id="path3659-5"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

View File

@ -1,362 +1,52 @@
/* XPM */
static char * freecad_xpm[] = {
"32 32 327 2",
" c None",
". c #5D0900",
"+ c #AF0D00",
"@ c #AF1001",
"# c #AF1601",
"$ c #AF1A02",
"% c #AF2003",
"& c #AF2404",
"* c #AF2904",
"= c #AF2C05",
"- c #AF2F05",
"; c #AF3105",
"> c #370700",
", c #AD0C00",
"' c #FF1100",
") c #FF1A01",
"! c #FF2203",
"~ c #FF2B04",
"{ c #FF3305",
"] c #FF3B07",
"^ c #FF4308",
"/ c #FF4909",
"( c #FF4E0A",
"_ c #FF500A",
": c #FF4F0A",
"< c #FF4B09",
"[ c #FF4608",
"} c #470C01",
"| c #FF1300",
"1 c #FF1D02",
"2 c #FF2603",
"3 c #FF2E04",
"4 c #FF3706",
"5 c #FF3F07",
"6 c #FF4708",
"7 c #FF4D09",
"8 c #FF520A",
"9 c #FF530A",
"0 c #FF1601",
"a c #FF1F02",
"b c #FF2904",
"c c #FF3205",
"d c #FF3A06",
"e c #FF4A09",
"f c #FF510A",
"g c #FF560B",
"h c #FF570B",
"i c #FF540B",
"j c #FF4709",
"k c #FF1901",
"l c #FF3505",
"m c #FF3E07",
"n c #FF550B",
"o c #FF5A0C",
"p c #AD0E00",
"q c #FF1C01",
"r c #FF2503",
"s c #FF3806",
"t c #FF4107",
"u c #FF590B",
"v c #FF5E0C",
"w c #FF5D0C",
"x c #01043C",
"y c #0E2470",
"z c #040C4A",
"A c #AD0F00",
"B c #FF1E02",
"C c #FF2803",
"D c #FF3105",
"E c #EA3505",
"F c #701802",
"G c #7D1F03",
"H c #7D2304",
"I c #7D2504",
"J c #7D2604",
"K c #7D2103",
"L c #7D1D02",
"M c #310606",
"N c #091452",
"O c #2858B8",
"P c #1E47A1",
"Q c #040943",
"R c #AD1101",
"S c #FF2102",
"T c #FF2A04",
"U c #FF3405",
"V c #DC3306",
"W c #420B00",
"X c #070739",
"Y c #1D3881",
"Z c #3366C2",
"` c #2E60BD",
" . c #08114E",
".. c #01063F",
"+. c #000541",
"@. c #00053F",
"#. c #AD1201",
"$. c #FF2303",
"%. c #FF2D04",
"&. c #FF3606",
"*. c #DC3506",
"=. c #4E0F01",
"-. c #030943",
";. c #193380",
">. c #0C1754",
",. c #060D46",
"'. c #03063D",
"). c #3662B3",
"!. c #3D73CB",
"~. c #386BC6",
"{. c #224596",
"]. c #02053E",
"^. c #01043D",
"/. c #091B62",
"(. c #0A3197",
"_. c #012995",
":. c #AD1301",
"<. c #FF2F05",
"[. c #DC3707",
"}. c #0F2264",
"|. c #386CC6",
"1. c #4076CD",
"2. c #3A68B8",
"3. c #254186",
"4. c #4476C5",
"5. c #4C85D8",
"6. c #477ED3",
"7. c #2D5FBC",
"8. c #204AA6",
"9. c #1A47AC",
"0. c #0F3AA2",
"a. c #052B95",
"b. c #00043F",
"c. c #AD1501",
"d. c #FF2703",
"e. c #DC3807",
"f. c #4F1101",
"g. c #4F1201",
"h. c #430D04",
"i. c #070A41",
"j. c #396ABE",
"k. c #4981D5",
"l. c #518BDC",
"m. c #5793E1",
"n. c #5A95E3",
"o. c #5691E1",
"p. c #5089DB",
"q. c #3D72CA",
"r. c #3365C1",
"s. c #1E4BAF",
"t. c #123EA5",
"u. c #041B70",
"v. c #FA4308",
"w. c #E44509",
"x. c #E44C0A",
"y. c #E4540A",
"z. c #923206",
"A. c #190522",
"B. c #172A6A",
"C. c #4F88DA",
"D. c #5995E3",
"E. c #62A0EB",
"F. c #65A3ED",
"G. c #426DB2",
"H. c #1C306E",
"I. c #152562",
"J. c #1F3A81",
"K. c #3060B8",
"L. c #2A5BBA",
"M. c #1F4DB0",
"N. c #143FA6",
"O. c #01053F",
"P. c #AD1601",
"Q. c #FF3D07",
"R. c #FF5F0C",
"S. c #AD3D08",
"T. c #02053C",
"U. c #5089DA",
"V. c #5D99E6",
"W. c #68A6EF",
"X. c #243975",
"Y. c #091047",
"Z. c #040A42",
"`. c #21489F",
" + c #1F4EB0",
".+ c #041765",
"++ c #000238",
"@+ c #AD1702",
"#+ c #FD4608",
"$+ c #F24A09",
"%+ c #F2510A",
"&+ c #F2570B",
"*+ c #892D0D",
"=+ c #0C0836",
"-+ c #152666",
";+ c #5A96E4",
">+ c #3C61A6",
",+ c #080E44",
"'+ c #040B46",
")+ c #1E4AAD",
"!+ c #072D94",
"~+ c #00156B",
"{+ c #000A4B",
"]+ c #000440",
"^+ c #00053E",
"/+ c #AD1802",
"(+ c #DC3B07",
"_+ c #310B12",
":+ c #0E0938",
"<+ c #0D134B",
"[+ c #234592",
"}+ c #3F73C9",
"|+ c #4B83D7",
"1+ c #538DDE",
"2+ c #0F1A53",
"3+ c #030942",
"4+ c #13358D",
"5+ c #103BA3",
"6+ c #052D99",
"7+ c #002795",
"8+ c #002692",
"9+ c #00033D",
"0+ c #020840",
"a+ c #112C7C",
"b+ c #2959B8",
"c+ c #3265C1",
"d+ c #3B70C9",
"e+ c #437AD0",
"f+ c #4A82D5",
"g+ c #080E46",
"h+ c #02063E",
"i+ c #0E2B80",
"j+ c #0B359F",
"k+ c #012896",
"l+ c #002289",
"m+ c #000239",
"n+ c #AD1902",
"o+ c #02043E",
"p+ c #0A1C63",
"q+ c #224FAE",
"r+ c #2C5DBB",
"s+ c #3467C2",
"t+ c #3A6FC8",
"u+ c #3F75CC",
"v+ c #0E1B58",
"w+ c #030842",
"x+ c #0D2F8C",
"y+ c #072F9B",
"z+ c #001A75",
"A+ c #000A4C",
"B+ c #000540",
"C+ c #DC3A07",
"D+ c #020842",
"E+ c #071050",
"F+ c #1A3886",
"G+ c #3063BF",
"H+ c #3468C3",
"I+ c #274B9C",
"J+ c #040941",
"K+ c #030C4A",
"L+ c #0A339C",
"M+ c #002895",
"N+ c #002083",
"O+ c #00033B",
"P+ c #214CA7",
"Q+ c #295AB9",
"R+ c #2B5CBA",
"S+ c #16307A",
"T+ c #020740",
"U+ c #020A46",
"V+ c #0A2E93",
"W+ c #022A97",
"X+ c #001569",
"Y+ c #00023A",
"Z+ c #FF3506",
"`+ c #FF3C07",
" @ c #01063E",
".@ c #13348B",
"+@ c #1E4CAF",
"@@ c #1A409E",
"#@ c #0D2575",
"$@ c #0A1E68",
"%@ c #0B277E",
"&@ c #09319B",
"*@ c #00248E",
"=@ c #00043E",
"-@ c #010844",
";@ c #103BA2",
">@ c #133EA6",
",@ c #133FA6",
"'@ c #123DA5",
")@ c #062E9A",
"!@ c #00156A",
"~@ c #FF2C04",
"{@ c #FF3906",
"]@ c #4E0E01",
"^@ c #01186D",
"/@ c #052E9A",
"(@ c #07309B",
"_@ c #072C92",
":@ c #062582",
"<@ c #072F9A",
"[@ c #032B98",
"}@ c #001261",
"|@ c #00105A",
"1@ c #002288",
"2@ c #00258F",
"3@ c #000137",
"4@ c #DC3105",
"5@ c #00023B",
"6@ c #001975",
"7@ c #001466",
"8@ c #00043D",
"9@ c #002693",
"0@ c #000746",
"a@ c #000C4F",
"b@ c #000645",
"c@ c #510C00",
"d@ c #510D01",
"e@ c #430900",
"f@ c #400900",
"g@ c #001A76",
"h@ c #000A4D",
"i@ c #001D7C",
"j@ c #00063F",
"k@ c #00033C",
"l@ c #000C51",
" ",
" ",
" ",
" . + @ # $ % & * = - ; ; - = > ",
" , ' ) ! ~ { ] ^ / ( _ : < [ } ",
" , | 1 2 3 4 5 6 7 8 9 8 7 6 } ",
" , 0 a b c d ^ e f g h i : j } ",
" , k ! ~ l m [ ( n o o g : j } ",
" p q r 3 s t e 8 u v w h _ j } x y z ",
" A B C D E F G H I J I H K L M N O P Q ",
" R S T U V W X Y Z ` . ..+.@. ",
" #.$.%.&.*.=. -.;.>.,. '.).!.~.{.].^./.(._.+. ",
" :.r <.s [.=. }.|.1.2.3.4.5.6.1.~.7.8.9.0.a.b. ",
" c.d.D d e.> f.g.h.i.j.k.l.m.n.o.p.6.q.r.O s.t.u. ",
" c.b c ] v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O. ",
" P.T { Q.[ : h R.S. T.U.V.W.X.Y. Z.`. +N..+++ ",
" @+~ l m #+$+%+&+*+=+-+p.;+>+,+ '+)+t.!+~+{+]+^+ ",
" /+%.&.m (+> _+:+<+[+}+|+1+2+ 3+4+5+6+7+7+8+9+ ",
" /+%.&.5 (+=.0+a+b+c+d+e+f+g+ h+i+j+k+7+7+l+m+ ",
" n+3 &.m (+=.o+p+q+r+s+t+u+v+ w+x+y+7+z+A+B+ ",
" n+3 &.m C+=. D+D+E+F+G+H+I+J+ K+L+M+N+O+ ",
" n+3 &.Q.e.=. ].P+Q+R+S+T+ 0+U+V+W+7+X+Y+ ",
" n+3 Z+`+[.=. @.@+@ + +@@#@$@%@&@W+7+7+*@=@ ",
" n+%.U d *.=. -@;@>@N.,@'@0.j+)@7+7+7+7+7+!@=@ ",
" n+~@{ {@V ]@ ^@/@(@_@:@<@[@7+7+*@}@|@1@7+2@3@ ",
" /+~ D 4 4@]@ 5@6@8+7@]+8@=@9@7+7+0@ +.a@b@ ",
" > c@d@d@e@f@ @.5@ @.g@7+8++. ",
" h@7+i@j@ ",
" k@l@O+ ",
" ",
" ",
" "};
"32 32 17 1",
" c None",
". c #002CA9",
"+ c #0231A9",
"@ c #0036AB",
"# c #FF0000",
"$ c #0D3AA9",
"% c #0141AB",
"& c #383B8F",
"* c #1648A9",
"= c #FF1A00",
"- c #1250AB",
"; c #FF1E0A",
"> c #1E57AB",
", c #1A5DAC",
"' c #FF2C0B",
") c #2A64AC",
"! c #3469AB",
" ",
" ",
" ",
" ###===;;;''''; ",
" ###==;;;'''''; ",
" ##===;;''''''; ",
" ##==;;;''''''' ",
" ##==;;;''''''' ",
" #===;;'''''''' %$ ",
" #===;;'''''''; %%% ",
" #==;; -**% +. ",
" #==;; %*- ----*%%$+.. ",
" #==;; *-->>,>>--*%$@+ ",
" ===;;' ->,,),,>-*%%@+ ",
" ==;;;'''' >>,)!),>-*%%@+ ",
" ==;;;'''' >,)!! %%@+ ",
" ==;;;'''' ->,) %@+... ",
" ==;;; &**->,, $@..... ",
" ==;;; %%*-->> @+..... ",
" ==;;; $%%*--- @+... ",
" ==;;; %*** @+.. ",
" ==;;; %%%%% @+... ",
" ==;;; $$%%$$@@+..... ",
" ==;;; +@@@@@++....... ",
" ==;;; ..++++......... ",
" ===;; ... ..... .. ",
" ... ",
" ... ",
" . ",
" ",
" ",
" "};

View File

@ -39,6 +39,7 @@
#include "Command.h"
#include "InputField.h"
#include "BitmapFactory.h"
#include "propertyeditor/PropertyItem.h"
using namespace Gui;
using namespace App;

View File

@ -28,6 +28,7 @@
#include "InputVector.h"
#include "ui_InputVector.h"
#include "QuantitySpinBox.h"
#include <Base/UnitsApi.h>
using namespace Gui;
@ -37,21 +38,21 @@ LocationWidget::LocationWidget (QWidget * parent)
{
box = new QGridLayout();
xValue = new QDoubleSpinBox(this);
xValue = new QuantitySpinBox(this);
xValue->setMinimum(-2.14748e+09);
xValue->setMaximum(2.14748e+09);
xLabel = new QLabel(this);
box->addWidget(xLabel, 0, 0, 1, 1);
box->addWidget(xValue, 0, 1, 1, 1);
yValue = new QDoubleSpinBox(this);
yValue = new QuantitySpinBox(this);
yValue->setMinimum(-2.14748e+09);
yValue->setMaximum(2.14748e+09);
yLabel = new QLabel(this);
box->addWidget(yLabel, 1, 0, 1, 1);
box->addWidget(yValue, 1, 1, 1, 1);
zValue = new QDoubleSpinBox(this);
zValue = new QuantitySpinBox(this);
zValue->setMinimum(-2.14748e+09);
zValue->setMaximum(2.14748e+09);
zLabel = new QLabel(this);
@ -64,9 +65,9 @@ LocationWidget::LocationWidget (QWidget * parent)
box->addWidget(dLabel, 3, 0, 1, 1);
box->addWidget(dValue, 3, 1, 1, 1);
xValue->setDecimals(Base::UnitsApi::getDecimals());
yValue->setDecimals(Base::UnitsApi::getDecimals());
zValue->setDecimals(Base::UnitsApi::getDecimals());
xValue->setUnit(Base::Unit::Length);
yValue->setUnit(Base::Unit::Length);
zValue->setUnit(Base::Unit::Length);
QGridLayout* gridLayout = new QGridLayout(this);
gridLayout->addLayout(box, 0, 0, 1, 2);
@ -122,13 +123,13 @@ void LocationWidget::retranslateUi()
dValue->setItemText(dValue->count()-1,
QApplication::translate("Gui::LocationDialog", "User defined..."));
}
}
}
Base::Vector3d LocationWidget::getPosition() const
{
return Base::Vector3d(this->xValue->value(),
this->yValue->value(),
this->zValue->value());
return Base::Vector3d(this->xValue->value().getValue(),
this->yValue->value().getValue(),
this->zValue->value().getValue());
}
void LocationWidget::setPosition(const Base::Vector3d& v)

View File

@ -26,7 +26,7 @@
#include <cfloat>
#include <QDialog>
#include <QMessageBox>
#include <QApplication>
#include <QApplication>
#include <Gui/propertyeditor/PropertyItem.h>
@ -36,6 +36,7 @@ class QDoubleSpinBox;
class QComboBox;
namespace Gui {
class QuantitySpinBox;
class GuiExport LocationWidget : public QWidget
{
@ -65,9 +66,9 @@ private:
QLabel *yLabel;
QLabel *zLabel;
QLabel *dLabel;
QDoubleSpinBox *xValue;
QDoubleSpinBox *yValue;
QDoubleSpinBox *zValue;
QuantitySpinBox *xValue;
QuantitySpinBox *yValue;
QuantitySpinBox *zValue;
QComboBox *dValue;
};
@ -155,9 +156,9 @@ public:
Base::Vector3d getPosition() const
{
return Base::Vector3d(this->xPos->value(),
this->yPos->value(),
this->zPos->value());
return Base::Vector3d(this->xPos->value().getValue(),
this->yPos->value().getValue(),
this->zPos->value().getValue());
}
Base::Vector3d getDirection() const
@ -284,9 +285,9 @@ public:
Base::Vector3d getPosition() const
{
return Base::Vector3d(this->xPos->value(),
this->yPos->value(),
this->zPos->value());
return Base::Vector3d(this->xPos->value().getValue(),
this->yPos->value().getValue(),
this->zPos->value().getValue());
}
Base::Vector3d getDirection() const

View File

@ -1796,14 +1796,6 @@ Specify another directory, please.</source>
<source>Camera type</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Orthographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source></source>
<translation></translation>
@ -1872,6 +1864,14 @@ Specify another directory, please.</source>
<source>MSAA 8x</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>

Binary file not shown.

View File

@ -1239,10 +1239,6 @@ Definieer asseblief &apos;n ander kortpad.</translation>
<source>Macro name:</source>
<translation>Makronaam:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Makrobestemming:</translation>
</message>
<message>
<source>Execute</source>
<translation>Voer uit</translation>
@ -1265,15 +1261,15 @@ Definieer asseblief &apos;n ander kortpad.</translation>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">System macros</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros location:</translation>
</message>
</context>
<context>
@ -1318,7 +1314,7 @@ Hierdie lêer bestaan reeds.</translation>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Read-only</translation>
</message>
</context>
<context>
@ -1806,11 +1802,11 @@ Spesifiseer asseblief &apos;n ander gids.</translation>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Ortografiese weergawe</translation>
<translation type="obsolete">Ortografiese weergawe</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Perspektief weergawe</translation>
<translation type="obsolete">Perspektief weergawe</translation>
</message>
<message>
<source></source>
@ -1880,6 +1876,14 @@ Spesifiseer asseblief &apos;n ander gids.</translation>
<source>MSAA 8x</source>
<translation type="unfinished">MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4860,11 +4864,11 @@ Wees bewus dat die punt waar jy kliek belangrik is.</translation>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Verwyder makro</translation>
<translation>Verwyder makro</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Not allowed to delete system-wide macros</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -136,7 +136,7 @@
<name>DlgExpressionInput</name>
<message>
<source>Formula editor</source>
<translation type="unfinished">Formula editor</translation>
<translation>Editor vzorců</translation>
</message>
<message>
<source>Result:</source>
@ -144,7 +144,7 @@
</message>
<message>
<source>&amp;Discard</source>
<translation type="unfinished">&amp;Discard</translation>
<translation>&amp;Zahodit</translation>
</message>
<message>
<source>Ok</source>
@ -246,7 +246,7 @@
</message>
<message>
<source>%1 help files not found (%2). You might need to install the %1 documentation package.</source>
<translation type="unfinished">%1 help files not found (%2). You might need to install the %1 documentation package.</translation>
<translation>%1 soubory nápovědy nebyly nalezeny (%2). Zřejmě potřebujete nainstalovat %1 balík dokumentace.</translation>
</message>
<message>
<source>Unable to launch Qt Assistant (%1)</source>
@ -257,7 +257,7 @@
<name>Gui::AutoSaver</name>
<message>
<source>Please wait until the AutoRecovery file has been saved...</source>
<translation type="unfinished">Please wait until the AutoRecovery file has been saved...</translation>
<translation>Prosím počkejte než se uloží soubor Automatické obnovy...</translation>
</message>
</context>
<context>
@ -1237,10 +1237,6 @@ Please define another shortcut.</source>
<source>Macro name:</source>
<translation>Název makra:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Umístění makra:</translation>
</message>
<message>
<source>Execute</source>
<translation>Spustit</translation>
@ -1263,15 +1259,15 @@ Please define another shortcut.</source>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation>Uživatelská makra</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation>Systémová makra</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation>Umístění uživatelských maker:</translation>
</message>
</context>
<context>
@ -1316,7 +1312,7 @@ Tento soubor již existuje.</translation>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation>Jen pro čtení</translation>
</message>
</context>
<context>
@ -1449,7 +1445,7 @@ Specify another directory, please.</source>
</message>
<message>
<source>HTML files</source>
<translation type="unfinished">HTML files</translation>
<translation>HTML soubory</translation>
</message>
</context>
<context>
@ -1525,15 +1521,15 @@ Specify another directory, please.</source>
</message>
<message>
<source>Clear user settings</source>
<translation type="unfinished">Clear user settings</translation>
<translation>Vymazat uživatelská nastavení</translation>
</message>
<message>
<source>Do you want to clear all your user settings?</source>
<translation type="unfinished">Do you want to clear all your user settings?</translation>
<translation>Chcete vymazat všechna uživatelská nastavení?</translation>
</message>
<message>
<source>If you agree all your settings will be cleared.</source>
<translation type="unfinished">If you agree all your settings will be cleared.</translation>
<translation>Pokud souhlasíte, budou všechna vaše nastavení vymazána.</translation>
</message>
</context>
<context>
@ -1803,11 +1799,11 @@ Specify another directory, please.</source>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Ortografické vykreslování</translation>
<translation type="obsolete">Ortografické vykreslování</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Perspektivní vykreslování</translation>
<translation type="obsolete">Perspektivní vykreslování</translation>
</message>
<message>
<source></source>
@ -1877,6 +1873,14 @@ Specify another directory, please.</source>
<source>MSAA 8x</source>
<translation>MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -1886,11 +1890,11 @@ Specify another directory, please.</source>
</message>
<message>
<source>Anti-aliasing</source>
<translation type="unfinished">Anti-aliasing</translation>
<translation>Anti-aliasing</translation>
</message>
<message>
<source>Open a new viewer or restart %1 to apply anti-aliasing changes.</source>
<translation type="unfinished">Open a new viewer or restart %1 to apply anti-aliasing changes.</translation>
<translation>Otevřete nové okno nebo restartujte %1 pro aplikaci změn anti-aliasingu.</translation>
</message>
</context>
<context>
@ -2140,11 +2144,11 @@ Specify another directory, please.</source>
</message>
<message>
<source>Run AutoRecovery at startup</source>
<translation type="unfinished">Run AutoRecovery at startup</translation>
<translation>Spusti Automatickou obnovu při startu</translation>
</message>
<message>
<source>Save AutoRecovery information every</source>
<translation type="unfinished">Save AutoRecovery information every</translation>
<translation>Uložit informace Automatické obnovy každých</translation>
</message>
</context>
<context>
@ -2597,11 +2601,11 @@ Specify another directory, please.</source>
</message>
<message>
<source>Enabled workbenches</source>
<translation type="unfinished">Enabled workbenches</translation>
<translation>Povolené workenche</translation>
</message>
<message>
<source>Disabled workbenches</source>
<translation type="unfinished">Disabled workbenches</translation>
<translation>Vyřazené workbenche</translation>
</message>
<message>
<source>Move down</source>
@ -2609,7 +2613,7 @@ Specify another directory, please.</source>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Move the selected item down.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;The item will be moved down&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Move the selected item down.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;The item will be moved down&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Přesunout vybranou položku dolů.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Položka bude přesunuta dolů&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>Move left</source>
@ -2617,7 +2621,7 @@ Specify another directory, please.</source>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Remove the selected workbench from enabled workbenches&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Remove the selected workbench from enabled workbenches&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Odstranit vybrané workbenche z povolených workenchů&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>Move right</source>
@ -2625,15 +2629,15 @@ Specify another directory, please.</source>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Move the selected workbench to enabled workbenches.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Move the selected workbench to enabled workbenches.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Přesunout vybrané workbenche mezi povolené workbenche.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>Sort enabled workbenches</source>
<translation type="unfinished">Sort enabled workbenches</translation>
<translation>Třídit povolené workbenche</translation>
</message>
<message>
<source>&lt;b&gt;Sort enabled workbenches&lt;/p&gt;</source>
<translation type="unfinished">&lt;b&gt;Sort enabled workbenches&lt;/p&gt;</translation>
<translation>&lt;b&gt;Třídit povolené workbenche&lt;/p&gt;</translation>
</message>
<message>
<source>Move up</source>
@ -2641,15 +2645,15 @@ Specify another directory, please.</source>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Move the selected item up.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;The item will be moved up.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Move the selected item up.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;The item will be moved up.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Přesunout vybranou položku nahoru.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Položka bude přesunuta nahoru.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Note:&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; The changes become active the next time you start FreeCAD&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Note:&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; The changes become active the next time you start FreeCAD&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Poznámka:&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Změna bude aktivní po příštím startu FreeCADu&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>Add all to enabled workbenches</source>
<translation type="unfinished">Add all to enabled workbenches</translation>
<translation>Přidat všechny mezi povolené workbenche</translation>
</message>
</context>
<context>
@ -2663,23 +2667,23 @@ Specify another directory, please.</source>
<name>Gui::Dialog::DocumentRecovery</name>
<message>
<source>Document Recovery</source>
<translation type="unfinished">Document Recovery</translation>
<translation>Obnova dokumentu</translation>
</message>
<message>
<source>Press &apos;Start Recovery&apos; to start the recovery process of the doument listed below.
The &apos;Status&apos; column shows whether the document could be recovered.</source>
<translation type="unfinished">Press &apos;Start Recovery&apos; to start the recovery process of the doument listed below.
<translation>Stiskněte &quot;Začít obnovu&quot; pro start procesu obnovy dokumentu níže.
The &apos;Status&apos; column shows whether the document could be recovered.</translation>
Sloupec &quot;Status&quot; zobrazuje, jestli může být dokument obnoven.</translation>
</message>
<message>
<source>Status of recovered documents:</source>
<translation type="unfinished">Status of recovered documents:</translation>
<translation>Status obnovených dokumentů:</translation>
</message>
<message>
<source>Document Name</source>
<translation type="unfinished">Document Name</translation>
<translation>Název dokumentu</translation>
</message>
<message>
<source>Status</source>
@ -2691,19 +2695,19 @@ The &apos;Status&apos; column shows whether the document could be recovered.</tr
</message>
<message>
<source>Not yet recovered</source>
<translation type="unfinished">Not yet recovered</translation>
<translation>Zatím neobnoveno</translation>
</message>
<message>
<source>Unknown problem occurred</source>
<translation type="unfinished">Unknown problem occurred</translation>
<translation>Objevil se neznámý problém</translation>
</message>
<message>
<source>Failed to recover</source>
<translation type="unfinished">Failed to recover</translation>
<translation>Obnova selhala</translation>
</message>
<message>
<source>Successfully recovered</source>
<translation type="unfinished">Successfully recovered</translation>
<translation>Úspěšně obnoveno</translation>
</message>
<message>
<source>Finish</source>
@ -3120,7 +3124,7 @@ The &apos;Status&apos; column shows whether the document could be recovered.</tr
</message>
<message>
<source>Euler angles (XY&apos;Z&apos;&apos;)</source>
<translation type="unfinished">Euler angles (XY&apos;Z&apos;&apos;)</translation>
<translation>Eulerovy úhly (XY&apos;Z&quot;)</translation>
</message>
</context>
<context>
@ -3338,7 +3342,7 @@ The &apos;Status&apos; column shows whether the document could be recovered.</tr
</message>
<message>
<source>Plain Text Files</source>
<translation type="unfinished">Plain Text Files</translation>
<translation>Soubory prostého textu</translation>
</message>
</context>
<context>
@ -3404,11 +3408,11 @@ The &apos;Status&apos; column shows whether the document could be recovered.</tr
</message>
<message>
<source>To python console</source>
<translation type="unfinished">To python console</translation>
<translation>Do konzole pythonu</translation>
</message>
<message>
<source>Reveals this object and its subelements in the python console.</source>
<translation type="unfinished">Reveals this object and its subelements in the python console.</translation>
<translation>Odkrýt tento objekt a jeho subelementy v konzoli pythonu.</translation>
</message>
</context>
<context>
@ -3525,11 +3529,11 @@ Chcete uložit provedené změny?</translation>
</message>
<message>
<source>FreeCAD macro</source>
<translation type="unfinished">FreeCAD macro</translation>
<translation>FreeCAD makro</translation>
</message>
<message>
<source>PDF file</source>
<translation type="unfinished">PDF file</translation>
<translation>PDF soubor</translation>
</message>
</context>
<context>
@ -3592,19 +3596,19 @@ Chcete uložit provedené změny?</translation>
<name>Gui::GestureNavigationStyle</name>
<message>
<source>Tap. Or click left mouse button.</source>
<translation type="unfinished">Tap. Or click left mouse button.</translation>
<translation>Ťukněte. Nebo stiskněte levé tlačítko myši.</translation>
</message>
<message>
<source>Drag screen with two fingers. Or press right mouse button.</source>
<translation type="unfinished">Drag screen with two fingers. Or press right mouse button.</translation>
<translation>Táhněte obrazovku dvěma prsty. Nebo stiskněté pravé tlačítko myši.</translation>
</message>
<message>
<source>Drag the screen with one finger. Or press left mouse button. In Sketcher and other edit modes, hold Alt in addition.</source>
<translation type="unfinished">Drag the screen with one finger. Or press left mouse button. In Sketcher and other edit modes, hold Alt in addition.</translation>
<translation>Táhněte obrazovku jedním prstem. Nebo stiskněté levé tlačítko myši. V Náčrtu a dalších editačních módech držte navíc Alt.</translation>
</message>
<message>
<source>Pinch (put two fingers on the screen and drag them apart/to each other). Or scroll middle mouse button. Or PgUp/PgDown on keyboard.</source>
<translation type="unfinished">Pinch (put two fingers on the screen and drag them apart/to each other). Or scroll middle mouse button. Or PgUp/PgDown on keyboard.</translation>
<translation>Štípněte (položte dva prsty na obrazovku a táhněte je od sebe/k sobě). Nebo rolujte prostředním tlačítem myši. Nebo použijte na klávesnici PgUp/PgDown.</translation>
</message>
</context>
<context>
@ -3631,11 +3635,11 @@ Chcete uložit provedené změny?</translation>
</message>
<message>
<source>SVG format</source>
<translation type="unfinished">SVG format</translation>
<translation>SVG formát</translation>
</message>
<message>
<source>PDF format</source>
<translation type="unfinished">PDF format</translation>
<translation>PDF formát</translation>
</message>
</context>
<context>
@ -3729,11 +3733,11 @@ Chcete uložit provedené změny?</translation>
</message>
<message>
<source>Macro file doesn&apos;t exist</source>
<translation type="unfinished">Macro file doesn&apos;t exist</translation>
<translation>Soubor makra neexistuje</translation>
</message>
<message>
<source>No such macro file: &apos;%1&apos;</source>
<translation type="unfinished">No such macro file: &apos;%1&apos;</translation>
<translation>Není soubor makra: &apos;%1&apos;</translation>
</message>
</context>
<context>
@ -3769,15 +3773,15 @@ Do you want to copy them, too?</source>
</message>
<message>
<source>There is a rendering issue on MacOS.</source>
<translation type="unfinished">There is a rendering issue on MacOS.</translation>
<translation>Na MacOS je problém s vykreslováním.</translation>
</message>
<message>
<source>See &lt;a href=&quot;http://www.freecadweb.org/wiki/index.php?title=OpenGL_on_MacOS&quot;&gt; the wiki&lt;/a&gt; for more information</source>
<translation type="unfinished">See &lt;a href=&quot;http://www.freecadweb.org/wiki/index.php?title=OpenGL_on_MacOS&quot;&gt; the wiki&lt;/a&gt; for more information</translation>
<translation>Podívejte se na &lt;a href=&quot;http://www.freecadweb.org/wiki/index.php?title=OpenGL_on_MacOS&quot;&gt; wiki&lt;/a&gt; pro více informací</translation>
</message>
<message>
<source>Don&apos;t show again</source>
<translation type="unfinished">Don&apos;t show again</translation>
<translation>Znovu nezobrazovat</translation>
</message>
</context>
<context>
@ -3875,19 +3879,19 @@ V pravém pohledu jsou %2 body vybrány.</translation>
<name>Gui::MayaGestureNavigationStyle</name>
<message>
<source>Tap. Or click left mouse button.</source>
<translation type="unfinished">Tap. Or click left mouse button.</translation>
<translation>Ťukněte. Nebo stiskněte levé tlačítko myši.</translation>
</message>
<message>
<source>Drag screen with two fingers. Or press ALT + middle mouse button.</source>
<translation type="unfinished">Drag screen with two fingers. Or press ALT + middle mouse button.</translation>
<translation>Táhněte obrazovku dvěma prsty. Nebo stiskněte ALT + prostřední tlačítko myši.</translation>
</message>
<message>
<source>Drag the screen with one finger. Or press ALT + left mouse button. In Sketcher and other edit modes, hold Alt in addition.</source>
<translation type="unfinished">Drag the screen with one finger. Or press ALT + left mouse button. In Sketcher and other edit modes, hold Alt in addition.</translation>
<translation>Táhněte obrazovku jedním prstem. Nebo stiskněte ALT + levé tlačítko myši. V Náčrtu a dalších editačních módech držte navíc Alt.</translation>
</message>
<message>
<source>Pinch (put two fingers on the screen and drag them apart/to each other). Or scroll middle mouse button. Or press ALT + right mouse button. Or PgUp/PgDown on keyboard.</source>
<translation type="unfinished">Pinch (put two fingers on the screen and drag them apart/to each other). Or scroll middle mouse button. Or press ALT + right mouse button. Or PgUp/PgDown on keyboard.</translation>
<translation>Štípněte (položte dva prsty na obrazovku a táhněte je od sebe/k sobě). Nebo rolujte prostředním tlačítkem myši. Nebo stiskněte ALT + pravé tlačítko myši. Nebo použijte PgUp/PgDown na klávesnici.</translation>
</message>
</context>
<context>
@ -3906,7 +3910,7 @@ V pravém pohledu jsou %2 body vybrány.</translation>
</message>
<message>
<source>Press CTRL and middle mouse button</source>
<translation type="unfinished">Press CTRL and middle mouse button</translation>
<translation>Stiskněte CTRL a prostřední tlačítko myši</translation>
</message>
<message>
<source>Press CTRL and right mouse button</source>
@ -4073,7 +4077,7 @@ Chcete průvodce ukončit bez uložení dat?</translation>
</message>
<message>
<source>All Files</source>
<translation type="unfinished">All Files</translation>
<translation>Všechny soubory</translation>
</message>
</context>
<context>
@ -4337,15 +4341,15 @@ Do you want to specify another directory?</source>
</message>
<message>
<source>PDF file</source>
<translation type="unfinished">PDF file</translation>
<translation>PDF soubor</translation>
</message>
<message>
<source>Opening file failed</source>
<translation type="unfinished">Opening file failed</translation>
<translation>Otevření souboru selhalo</translation>
</message>
<message>
<source>Can&apos;t open file &apos;%1&apos; for writing.</source>
<translation type="unfinished">Can&apos;t open file &apos;%1&apos; for writing.</translation>
<translation>Soubor &quot;%1&quot; nelze otevřít pro zápis.</translation>
</message>
</context>
<context>
@ -4842,7 +4846,7 @@ Dejte si pozor na místo, kam klikáte.</translation>
</message>
<message>
<source>Frozen views</source>
<translation type="unfinished">Frozen views</translation>
<translation>Zmražené pohledy</translation>
</message>
<message>
<source>Saving document failed</source>
@ -4854,11 +4858,11 @@ Dejte si pozor na místo, kam klikáte.</translation>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Odstranit makro</translation>
<translation>Odstranit makro</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation>Není povoleno mazat systémová makra</translation>
</message>
</context>
<context>
@ -5015,7 +5019,7 @@ Dejte si pozor na místo, kam klikáte.</translation>
</message>
<message>
<source>Close all windows</source>
<translation>Zavřete všechna okna</translation>
<translation>Zavřít všechna okna</translation>
</message>
</context>
<context>
@ -5195,7 +5199,7 @@ Dejte si pozor na místo, kam klikáte.</translation>
</message>
<message>
<source>List of available dock panels</source>
<translation type="unfinished">List of available dock panels</translation>
<translation>Seznam dostupných dokovaných panelů</translation>
</message>
</context>
<context>
@ -5846,11 +5850,11 @@ Dejte si pozor na místo, kam klikáte.</translation>
</message>
<message>
<source>Revert</source>
<translation type="unfinished">Revert</translation>
<translation>Vrátit</translation>
</message>
<message>
<source>Reverts to the saved version of this file</source>
<translation type="unfinished">Reverts to the saved version of this file</translation>
<translation>Vrátit se k uložené verzi tohoto souboru</translation>
</message>
</context>
<context>
@ -5895,7 +5899,7 @@ Dejte si pozor na místo, kam klikáte.</translation>
</message>
<message>
<source>Save a copy of the active document under a new file name</source>
<translation type="unfinished">Save a copy of the active document under a new file name</translation>
<translation>Uložit kopii aktivního dokumento pod novým názvem</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -1238,10 +1238,6 @@ Wählen Sie bitte eine andere Tastenkombination.</translation>
<source>Macro name:</source>
<translation>Makroname:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Makro-Zielpfad:</translation>
</message>
<message>
<source>Execute</source>
<translation>Ausführen</translation>
@ -1264,15 +1260,15 @@ Wählen Sie bitte eine andere Tastenkombination.</translation>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">System macros</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros location:</translation>
</message>
</context>
<context>
@ -1317,7 +1313,7 @@ Diese Datei ist bereits vorhanden.</translation>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Read-only</translation>
</message>
</context>
<context>
@ -1806,11 +1802,11 @@ Wählen Sie bitte ein anderes Verzeichnis aus.</translation>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Orthographische Darstellung</translation>
<translation type="obsolete">Orthographische Darstellung</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Perspektivische Darstellung</translation>
<translation type="obsolete">Perspektivische Darstellung</translation>
</message>
<message>
<source></source>
@ -1880,6 +1876,14 @@ Wählen Sie bitte ein anderes Verzeichnis aus.</translation>
<source>MSAA 8x</source>
<translation>MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4862,11 +4866,11 @@ Beachten Sie, dass es auf den Punkt ankommt, auf den Sie klicken.</translation>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Makro löschen</translation>
<translation>Makro löschen</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Not allowed to delete system-wide macros</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -1239,10 +1239,6 @@ Please define another shortcut.</source>
<source>Macro name:</source>
<translation>Όνομα μακροεντολής:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Προορισμός μακροεντολής:</translation>
</message>
<message>
<source>Execute</source>
<translation>Εκτέλεση</translation>
@ -1265,15 +1261,15 @@ Please define another shortcut.</source>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">System macros</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros location:</translation>
</message>
</context>
<context>
@ -1318,7 +1314,7 @@ This file already exists.</source>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Read-only</translation>
</message>
</context>
<context>
@ -1807,11 +1803,11 @@ Specify another directory, please.</source>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Ορθογραφική αποτύπωση</translation>
<translation type="obsolete">Ορθογραφική αποτύπωση</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Προοπτική αποτύπωση</translation>
<translation type="obsolete">Προοπτική αποτύπωση</translation>
</message>
<message>
<source></source>
@ -1881,6 +1877,14 @@ Specify another directory, please.</source>
<source>MSAA 8x</source>
<translation>MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4868,11 +4872,11 @@ Be aware the point where you click matters.</source>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Διαγραφή μακροεντολής</translation>
<translation>Διαγραφή μακροεντολής</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Not allowed to delete system-wide macros</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -148,7 +148,7 @@
</message>
<message>
<source>Ok</source>
<translation>Ok</translation>
<translation>Aceptar</translation>
</message>
</context>
<context>
@ -1239,10 +1239,6 @@ Por favor defina otro atajo de teclado.</translation>
<source>Macro name:</source>
<translation>Nombre de la macro:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Destino de la macro:</translation>
</message>
<message>
<source>Execute</source>
<translation>Ejecutar</translation>
@ -1265,15 +1261,15 @@ Por favor defina otro atajo de teclado.</translation>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation>Macros de usuario</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation>Macros de sistema</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation>Ubicación de macros de usuario:</translation>
</message>
</context>
<context>
@ -1318,7 +1314,7 @@ Este archivo ya existe.</translation>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation>Solo lectura</translation>
</message>
</context>
<context>
@ -1807,11 +1803,11 @@ Especifique otro directorio, por favor.</translation>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Renderizado ortográfico</translation>
<translation type="obsolete">Renderizado ortográfico</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Renderizado en perspectiva</translation>
<translation type="obsolete">Renderizado en perspectiva</translation>
</message>
<message>
<source></source>
@ -1881,6 +1877,14 @@ Especifique otro directorio, por favor.</translation>
<source>MSAA 8x</source>
<translation>MSAA 8 x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4858,11 +4862,11 @@ Be aware the point where you click matters.</source>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Borrar macro</translation>
<translation>Borrar macro</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation>No se permite eliminar macros del sistema</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -1239,10 +1239,6 @@ Määritä toinen pikakuvake.</translation>
<source>Macro name:</source>
<translation>Makron nimi:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Makro kohde:</translation>
</message>
<message>
<source>Execute</source>
<translation>Suorita</translation>
@ -1265,15 +1261,15 @@ Määritä toinen pikakuvake.</translation>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">System macros</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros location:</translation>
</message>
</context>
<context>
@ -1318,7 +1314,7 @@ Tämä tiedosto on jo olemassa.</translation>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Read-only</translation>
</message>
</context>
<context>
@ -1807,11 +1803,11 @@ Määritä toinen hakemisto, ole hyvä.</translation>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Ortografinen renderointi</translation>
<translation type="obsolete">Ortografinen renderointi</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Perspektiivin renderöinti</translation>
<translation type="obsolete">Perspektiivin renderöinti</translation>
</message>
<message>
<source></source>
@ -1881,6 +1877,14 @@ Määritä toinen hakemisto, ole hyvä.</translation>
<source>MSAA 8x</source>
<translation>MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4859,11 +4863,11 @@ Huomaa, että piste johon klikkaat vaikuttaa.</translation>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Poista makro</translation>
<translation>Poista makro</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Not allowed to delete system-wide macros</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -1239,10 +1239,6 @@ Veuillez définir un autre raccourci.</translation>
<source>Macro name:</source>
<translation>Nom de la macro :</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Destination de la macro :</translation>
</message>
<message>
<source>Execute</source>
<translation>Lancer</translation>
@ -1265,15 +1261,15 @@ Veuillez définir un autre raccourci.</translation>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation>Macros utilisateur</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation>Macros du système</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation>Emplacement des macros de l&apos;utilisateur :</translation>
</message>
</context>
<context>
@ -1317,7 +1313,7 @@ This file already exists.</source>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation>Lecture seule</translation>
</message>
</context>
<context>
@ -1806,11 +1802,11 @@ Veuillez spécifier un autre répertoire.</translation>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Rendu orthographique</translation>
<translation type="obsolete">Rendu orthographique</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Rendu en perspective</translation>
<translation type="obsolete">Rendu en perspective</translation>
</message>
<message>
<source></source>
@ -1880,6 +1876,14 @@ Veuillez spécifier un autre répertoire.</translation>
<source>MSAA 8x</source>
<translation>MSAA 8 x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4856,11 +4860,11 @@ Be aware the point where you click matters.</source>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Supprimer la macro</translation>
<translation>Supprimer la macro</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation>Pas autorisé à supprimer les macros du système</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -1238,10 +1238,6 @@ Please define another shortcut.</source>
<source>Macro name:</source>
<translation>Makro ime:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Makro odredište:</translation>
</message>
<message>
<source>Execute</source>
<translation>Izvršiti</translation>
@ -1264,15 +1260,15 @@ Please define another shortcut.</source>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">System macros</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros location:</translation>
</message>
</context>
<context>
@ -1317,7 +1313,7 @@ Ova datoteka već postoji.</translation>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Read-only</translation>
</message>
</context>
<context>
@ -1804,11 +1800,11 @@ Specify another directory, please.</source>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Renderiranje pravopisa</translation>
<translation type="obsolete">Renderiranje pravopisa</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Perspektivna projekcija</translation>
<translation type="obsolete">Perspektivna projekcija</translation>
</message>
<message>
<source></source>
@ -1878,6 +1874,14 @@ Specify another directory, please.</source>
<source>MSAA 8x</source>
<translation type="unfinished">MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4854,11 +4858,11 @@ Pazite jer točke odabira utječu.</translation>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Brisanje makro</translation>
<translation>Brisanje makro</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Not allowed to delete system-wide macros</translation>
</message>
</context>
<context>

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -1239,10 +1239,6 @@ Definire un&apos;altra scorciatoia.</translation>
<source>Macro name:</source>
<translation>Nome macro:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Percorso Macro:</translation>
</message>
<message>
<source>Execute</source>
<translation>Esegui</translation>
@ -1265,15 +1261,15 @@ Definire un&apos;altra scorciatoia.</translation>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation>Macro utente</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation>Macro di sistema</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation>Posizione delle macro utente:</translation>
</message>
</context>
<context>
@ -1318,7 +1314,7 @@ Il file esiste già.</translation>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation>Sola lettura</translation>
</message>
</context>
<context>
@ -1807,11 +1803,11 @@ Specificare un&apos;altra cartella.</translation>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Render ortografico</translation>
<translation type="obsolete">Render ortografico</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Render prospettico</translation>
<translation type="obsolete">Render prospettico</translation>
</message>
<message>
<source></source>
@ -1881,6 +1877,14 @@ Specificare un&apos;altra cartella.</translation>
<source>MSAA 8x</source>
<translation>MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4818,7 +4822,7 @@ Prestare attenzione al punto dove si fa clic.</translation>
</message>
<message>
<source>Navigation styles</source>
<translation>Stili di navigazione</translation>
<translation>Stile di navigazione</translation>
</message>
<message>
<source>%1 navigation</source>
@ -4862,11 +4866,11 @@ Prestare attenzione al punto dove si fa clic.</translation>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Cancella macro</translation>
<translation>Cancella macro</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation>Non è consentito eliminare le macro di sistema</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -1240,10 +1240,6 @@ Please define another shortcut.</source>
<source>Macro name:</source>
<translation>:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">:</translation>
</message>
<message>
<source>Execute</source>
<translation></translation>
@ -1266,15 +1262,15 @@ Please define another shortcut.</source>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation>:</translation>
</message>
</context>
<context>
@ -1318,7 +1314,7 @@ This file already exists.</source>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
</context>
<context>
@ -1806,11 +1802,11 @@ Specify another directory, please.</source>
</message>
<message>
<source>Orthographic rendering</source>
<translation></translation>
<translation type="obsolete"></translation>
</message>
<message>
<source>Perspective rendering</source>
<translation></translation>
<translation type="obsolete"></translation>
</message>
<message>
<source></source>
@ -1880,6 +1876,14 @@ Specify another directory, please.</source>
<source>MSAA 8x</source>
<translation>MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4856,11 +4860,11 @@ Be aware the point where you click matters.</source>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -1238,10 +1238,6 @@ Gelieve een andere snelkoppeling te kiezen.</translation>
<source>Macro name:</source>
<translation>Macro-naam:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Macro-bestemming:</translation>
</message>
<message>
<source>Execute</source>
<translation>Uitvoeren</translation>
@ -1264,15 +1260,15 @@ Gelieve een andere snelkoppeling te kiezen.</translation>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation>Gebruikers macro&apos;s</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation>Systeem macro&apos;s</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation>Locatie gebruikers macro&apos;s:</translation>
</message>
</context>
<context>
@ -1316,7 +1312,7 @@ This file already exists.</source>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation>Enkel lezen</translation>
</message>
</context>
<context>
@ -1804,11 +1800,11 @@ Kies een andere map, alstublieft.</translation>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Orthogonale projectie</translation>
<translation type="obsolete">Orthogonale projectie</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Perspectiefreproductie</translation>
<translation type="obsolete">Perspectiefreproductie</translation>
</message>
<message>
<source></source>
@ -1878,6 +1874,14 @@ Kies een andere map, alstublieft.</translation>
<source>MSAA 8x</source>
<translation>MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -2703,7 +2707,7 @@ De kolom &apos;Status&apos; toont als het document kan hersteld worden.</transla
</message>
<message>
<source>Successfully recovered</source>
<translation type="unfinished">Successfully recovered</translation>
<translation>Met success teruggehaald</translation>
</message>
<message>
<source>Finish</source>
@ -3611,31 +3615,31 @@ Wilt u uw wijzigingen opslaan?</translation>
<name>Gui::GraphvizView</name>
<message>
<source>Export graph</source>
<translation type="unfinished">Export graph</translation>
<translation>Export grafiek</translation>
</message>
<message>
<source>PNG format</source>
<translation type="unfinished">PNG format</translation>
<translation>PNG formaat</translation>
</message>
<message>
<source>Bitmap format</source>
<translation type="unfinished">Bitmap format</translation>
<translation>Bitmap formaat</translation>
</message>
<message>
<source>GIF format</source>
<translation type="unfinished">GIF format</translation>
<translation>GIF formaat</translation>
</message>
<message>
<source>JPG format</source>
<translation type="unfinished">JPG format</translation>
<translation>JPG formaat</translation>
</message>
<message>
<source>SVG format</source>
<translation type="unfinished">SVG format</translation>
<translation>SVG formaat</translation>
</message>
<message>
<source>PDF format</source>
<translation type="unfinished">PDF format</translation>
<translation>PDF formaat</translation>
</message>
</context>
<context>
@ -3760,7 +3764,7 @@ Wilt u uw wijzigingen opslaan?</translation>
</message>
<message>
<source>Object dependencies</source>
<translation type="unfinished">Object dependencies</translation>
<translation>Object afhankelijkheden</translation>
</message>
<message>
<source>The selected objects have a dependency to unselected objects.
@ -4067,7 +4071,7 @@ Do you want to exit without saving your data?</source>
</message>
<message>
<source>Macro Files</source>
<translation type="unfinished">Macro Files</translation>
<translation>Macro Bestanden</translation>
</message>
<message>
<source>All Files</source>
@ -4853,11 +4857,11 @@ Let op, het maakt uit waar je klikt.</translation>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Verwijder macro</translation>
<translation>Verwijder macro</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Not allowed to delete system-wide macros</translation>
</message>
</context>
<context>
@ -5845,11 +5849,11 @@ Let op, het maakt uit waar je klikt.</translation>
</message>
<message>
<source>Revert</source>
<translation type="unfinished">Revert</translation>
<translation>Ongedaan maken</translation>
</message>
<message>
<source>Reverts to the saved version of this file</source>
<translation type="unfinished">Reverts to the saved version of this file</translation>
<translation>Keer terug naar de bewaarde versie van dit bestand</translation>
</message>
</context>
<context>
@ -5890,11 +5894,11 @@ Let op, het maakt uit waar je klikt.</translation>
</message>
<message>
<source>Save a &amp;Copy...</source>
<translation type="unfinished">Save a &amp;Copy...</translation>
<translation>&amp;Duplicaat opslagen...</translation>
</message>
<message>
<source>Save a copy of the active document under a new file name</source>
<translation type="unfinished">Save a copy of the active document under a new file name</translation>
<translation>Bewaar een duplikaat van het aktieve document onder een nieuwe naam</translation>
</message>
</context>
<context>
@ -6691,7 +6695,7 @@ Let op, het maakt uit waar je klikt.</translation>
<name>Std_Delete</name>
<message>
<source>Object dependencies</source>
<translation type="unfinished">Object dependencies</translation>
<translation>Object afhankelijkheden</translation>
</message>
<message>
<source>This object is referenced by other objects and thus these objects might get broken.
@ -6740,20 +6744,20 @@ Are you sure to continue?</translation>
</message>
<message>
<source>Points mode</source>
<translation type="unfinished">Points mode</translation>
<translation>Punten modus</translation>
</message>
</context>
<context>
<name>Std_DuplicateSelection</name>
<message>
<source>Object dependencies</source>
<translation type="unfinished">Object dependencies</translation>
<translation>Object afhankelijkheden</translation>
</message>
<message>
<source>The selected objects have a dependency to unselected objects.
Do you want to duplicate them, too?</source>
<translation type="unfinished">The selected objects have a dependency to unselected objects.
Do you want to duplicate them, too?</translation>
<translation>De geselecteerde objecten hebben een afhankelijkheid van niet-geselecteerde objecten.
Wilt u deze ook dupliceren?</translation>
</message>
</context>
<context>
@ -6788,11 +6792,11 @@ Do you want to specify its installation path if it&apos;s already installed?</so
<name>Std_Revert</name>
<message>
<source>This will discard all the changes since last file save.</source>
<translation type="unfinished">This will discard all the changes since last file save.</translation>
<translation>Dit zal alle wijzigingen annuleren sinds de laatste keer dat het bestand werd bewaard.</translation>
</message>
<message>
<source>Are you sure?</source>
<translation type="unfinished">Are you sure?</translation>
<translation>Bent u zeker?</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -1238,10 +1238,6 @@ Please define another shortcut.</source>
<source>Macro name:</source>
<translation>Makronavn:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Makrodestinasjon:</translation>
</message>
<message>
<source>Execute</source>
<translation>Kjør</translation>
@ -1264,15 +1260,15 @@ Please define another shortcut.</source>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">System macros</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros location:</translation>
</message>
</context>
<context>
@ -1317,7 +1313,7 @@ Denne filen finnes allerede.</translation>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Read-only</translation>
</message>
</context>
<context>
@ -1805,11 +1801,11 @@ Vennligst angi en annen mappe.</translation>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Ortografisk presentasjonsgjengivelse</translation>
<translation type="obsolete">Ortografisk presentasjonsgjengivelse</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Perspektiv presentasjonsgjengivelse</translation>
<translation type="obsolete">Perspektiv presentasjonsgjengivelse</translation>
</message>
<message>
<source></source>
@ -1879,6 +1875,14 @@ Vennligst angi en annen mappe.</translation>
<source>MSAA 8x</source>
<translation type="unfinished">MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4857,11 +4861,11 @@ Vær oppmerksom på at punktet hvor du klikker betyr noe.</translation>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Slett makro</translation>
<translation>Slett makro</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Not allowed to delete system-wide macros</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -1237,10 +1237,6 @@ Please define another shortcut.</source>
<source>Macro name:</source>
<translation>Nazwa Makra:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Przeznaczenia makra:</translation>
</message>
<message>
<source>Execute</source>
<translation>Uruchom</translation>
@ -1263,15 +1259,15 @@ Please define another shortcut.</source>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">System macros</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros location:</translation>
</message>
</context>
<context>
@ -1315,7 +1311,7 @@ This file already exists.</source>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Read-only</translation>
</message>
</context>
<context>
@ -1803,11 +1799,11 @@ Specify another directory, please.</source>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Rzutowanie równoległe</translation>
<translation type="obsolete">Rzutowanie równoległe</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Rzutowanie perspektywiczne</translation>
<translation type="obsolete">Rzutowanie perspektywiczne</translation>
</message>
<message>
<source></source>
@ -1877,6 +1873,14 @@ Specify another directory, please.</source>
<source>MSAA 8x</source>
<translation>MSAA 8 x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4845,11 +4849,11 @@ Be aware the point where you click matters.</source>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Usuń makro</translation>
<translation>Usuń makro</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Not allowed to delete system-wide macros</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -1239,10 +1239,6 @@ Defina outro atalho.</translation>
<source>Macro name:</source>
<translation>Nome da macro:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Destino da macro:</translation>
</message>
<message>
<source>Execute</source>
<translation>Executar</translation>
@ -1265,15 +1261,15 @@ Defina outro atalho.</translation>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation>Macros do usuário</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation>Macros do sistema</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation>Localização das macros do usuário:</translation>
</message>
</context>
<context>
@ -1318,7 +1314,7 @@ Este arquivo já existe.</translation>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation>Somente leitura</translation>
</message>
</context>
<context>
@ -1806,11 +1802,11 @@ Por favor especifique outro diretório.</translation>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Renderização ortográfica</translation>
<translation type="obsolete">Renderização ortográfica</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Renderização perspectiva</translation>
<translation type="obsolete">Renderização perspectiva</translation>
</message>
<message>
<source></source>
@ -1880,6 +1876,14 @@ Por favor especifique outro diretório.</translation>
<source>MSAA 8x</source>
<translation>MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4847,11 +4851,11 @@ Be aware the point where you click matters.</source>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Excluir macro</translation>
<translation>Excluir macro</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation>Não é permitido excluir macros do sistema</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -922,7 +922,7 @@ Please define another shortcut.</source>
<name>Gui::Dialog::DlgDisplayProperties</name>
<message>
<source>Display properties</source>
<translation>Propriedades da Visualização</translation>
<translation>Propriedades</translation>
</message>
<message>
<source>Display</source>
@ -1237,10 +1237,6 @@ Please define another shortcut.</source>
<source>Macro name:</source>
<translation> Nome da Macro: </translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Destino da macro:</translation>
</message>
<message>
<source>Execute</source>
<translation>Executar</translation>
@ -1263,15 +1259,15 @@ Please define another shortcut.</source>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation>Macros do utilizador</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation>Macros do sistema</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation>Localização de macros do utilizador:</translation>
</message>
</context>
<context>
@ -1315,7 +1311,7 @@ This file already exists.</source>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation>-de-leitura</translation>
</message>
</context>
<context>
@ -1678,7 +1674,7 @@ Por favor, indique outra pasta.</translation>
<name>Gui::Dialog::DlgReportView</name>
<message>
<source>Output window</source>
<translation>Janela de Destino</translation>
<translation>Janela mensagens</translation>
</message>
<message>
<source>Output</source>
@ -1776,7 +1772,7 @@ Por favor, indique outra pasta.</translation>
<name>Gui::Dialog::DlgSettings3DView</name>
<message>
<source>3D View</source>
<translation>Visualização a 3D</translation>
<translation>Vista 3D</translation>
</message>
<message>
<source>3D View settings</source>
@ -1804,11 +1800,11 @@ Por favor, indique outra pasta.</translation>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Renderização Ortográfica</translation>
<translation type="obsolete">Renderização Ortográfica</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Renderização de perspectiva</translation>
<translation type="obsolete">Renderização de perspectiva</translation>
</message>
<message>
<source></source>
@ -1878,6 +1874,14 @@ Por favor, indique outra pasta.</translation>
<source>MSAA 8x</source>
<translation>MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4476,7 +4480,7 @@ Quer especificar outro diretório?</translation>
</message>
<message>
<source>Combo View</source>
<translation>Visualizar Combinação de visualizações</translation>
<translation>Visualização Combinada</translation>
</message>
<message>
<source>Toolbox</source>
@ -4488,7 +4492,7 @@ Quer especificar outro diretório?</translation>
</message>
<message>
<source>Display properties</source>
<translation>Propriedades da Visualização</translation>
<translation>Propriedades</translation>
</message>
</context>
<context>
@ -4851,11 +4855,11 @@ Be aware the point where you click matters.</source>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Apagar macro</translation>
<translation>Apagar macro</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation>Não é permitido apagar macros do sistema</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -1239,10 +1239,6 @@ Vă rugăm definiți o altă comandă rapidă.</translation>
<source>Macro name:</source>
<translation>Nume macrocomandă:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Destinație de macrocomandă:</translation>
</message>
<message>
<source>Execute</source>
<translation>Execută</translation>
@ -1265,15 +1261,15 @@ Vă rugăm definiți o altă comandă rapidă.</translation>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">System macros</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros location:</translation>
</message>
</context>
<context>
@ -1318,7 +1314,7 @@ Acest fişier există deja.</translation>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Read-only</translation>
</message>
</context>
<context>
@ -1805,11 +1801,11 @@ Specify another directory, please.</source>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Redare ortografică</translation>
<translation type="obsolete">Redare ortografică</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Redare din perspectivă</translation>
<translation type="obsolete">Redare din perspectivă</translation>
</message>
<message>
<source></source>
@ -1879,6 +1875,14 @@ Specify another directory, please.</source>
<source>MSAA 8x</source>
<translation>MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4856,11 +4860,11 @@ Retineti: locul unde faceti click conteaza.</translation>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Ştergeţi macrocomanda</translation>
<translation>Ştergeţi macrocomanda</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Not allowed to delete system-wide macros</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -144,7 +144,7 @@
</message>
<message>
<source>&amp;Discard</source>
<translation type="unfinished">&amp;Discard</translation>
<translation>&amp; Отменить</translation>
</message>
<message>
<source>Ok</source>
@ -1239,10 +1239,6 @@ Please define another shortcut.</source>
<source>Macro name:</source>
<translation>Имя макроса:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Папка с макросами:</translation>
</message>
<message>
<source>Execute</source>
<translation>Выполнить</translation>
@ -1265,15 +1261,15 @@ Please define another shortcut.</source>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation>Пользовательские макросы</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation>Системные макросы</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation>Расположение пользовательских макросов:</translation>
</message>
</context>
<context>
@ -1317,7 +1313,7 @@ This file already exists.</source>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation>Только для чтения</translation>
</message>
</context>
<context>
@ -1805,11 +1801,11 @@ Specify another directory, please.</source>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Рендеринг в параллельной проекции</translation>
<translation type="obsolete">Рендеринг в параллельной проекции</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Рендеринг в перспективной проекции</translation>
<translation type="obsolete">Рендеринг в перспективной проекции</translation>
</message>
<message>
<source></source>
@ -1879,6 +1875,14 @@ Specify another directory, please.</source>
<source>MSAA 8x</source>
<translation>MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -3533,7 +3537,7 @@ Do you want to save your changes?</source>
</message>
<message>
<source>PDF file</source>
<translation type="unfinished">PDF file</translation>
<translation>PDF файл</translation>
</message>
</context>
<context>
@ -3676,7 +3680,7 @@ Do you want to save your changes?</source>
<name>Gui::LabelEditor</name>
<message>
<source>List</source>
<translation type="unfinished">List</translation>
<translation>Список</translation>
</message>
</context>
<context>
@ -3737,7 +3741,7 @@ Do you want to save your changes?</source>
</message>
<message>
<source>No such macro file: &apos;%1&apos;</source>
<translation type="unfinished">No such macro file: &apos;%1&apos;</translation>
<translation>Нет такого файла макроса: «%1»</translation>
</message>
</context>
<context>
@ -4075,7 +4079,7 @@ Do you want to exit without saving your data?</source>
</message>
<message>
<source>All Files</source>
<translation type="unfinished">All Files</translation>
<translation>Все файлы</translation>
</message>
</context>
<context>
@ -4340,7 +4344,7 @@ Do you want to specify another directory?</source>
</message>
<message>
<source>PDF file</source>
<translation type="unfinished">PDF file</translation>
<translation>PDF файл</translation>
</message>
<message>
<source>Opening file failed</source>
@ -4853,11 +4857,11 @@ Be aware the point where you click matters.</source>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Удалить макрос</translation>
<translation>Удалить макрос</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Not allowed to delete system-wide macros</translation>
</message>
</context>
<context>
@ -5890,7 +5894,7 @@ Be aware the point where you click matters.</source>
</message>
<message>
<source>Save a &amp;Copy...</source>
<translation type="unfinished">Save a &amp;Copy...</translation>
<translation>Сохранить &amp;копию...</translation>
</message>
<message>
<source>Save a copy of the active document under a new file name</source>

Binary file not shown.

View File

@ -1240,10 +1240,6 @@ Definujte iného zástupcu, prosím.</translation>
<source>Macro name:</source>
<translation>Názov makra:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Umiestnenie makra:</translation>
</message>
<message>
<source>Execute</source>
<translation>Vykonať</translation>
@ -1266,15 +1262,15 @@ Definujte iného zástupcu, prosím.</translation>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">System macros</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros location:</translation>
</message>
</context>
<context>
@ -1319,7 +1315,7 @@ Tento súbor už existuje.</translation>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Read-only</translation>
</message>
</context>
<context>
@ -1808,11 +1804,11 @@ Určite iný adresár.</translation>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Ortografické vykresľovanie</translation>
<translation type="obsolete">Ortografické vykresľovanie</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Perspektívne vykresľovanie</translation>
<translation type="obsolete">Perspektívne vykresľovanie</translation>
</message>
<message>
<source></source>
@ -1882,6 +1878,14 @@ Určite iný adresár.</translation>
<source>MSAA 8x</source>
<translation type="unfinished">MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4865,11 +4869,11 @@ Buďte opatrní pri klikaní na body.</translation>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Odstrániť makro</translation>
<translation>Odstrániť makro</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Not allowed to delete system-wide macros</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -272,7 +272,7 @@
</message>
<message>
<source>Press middle mouse button</source>
<translation>Pritisnite srednjo tipko miške</translation>
<translation>Pritisnite srednjo tipko na miški</translation>
</message>
<message>
<source>Scroll middle mouse button</source>
@ -287,7 +287,7 @@
</message>
<message>
<source>Press middle mouse button</source>
<translation>Pritisnite srednjo tipko miške</translation>
<translation>Pritisnite srednjo tipko na miški</translation>
</message>
<message>
<source>Press middle and left or right mouse button</source>
@ -322,7 +322,7 @@ kliknete na levi ali desni gumb in premikate miško gor in dol</translation>
<name>Gui::ControlSingleton</name>
<message>
<source>Task panel</source>
<translation>Opravilna plošča</translation>
<translation>Podokno opravil</translation>
</message>
</context>
<context>
@ -1234,16 +1234,12 @@ Prosim določite drugačno bližnjico.</translation>
<name>Gui::Dialog::DlgMacroExecute</name>
<message>
<source>Execute macro</source>
<translation>Izvedi makro</translation>
<translation>Zaženi makro</translation>
</message>
<message>
<source>Macro name:</source>
<translation>Ime makra:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Cilj makrov:</translation>
</message>
<message>
<source>Execute</source>
<translation>Izvedi</translation>
@ -1266,15 +1262,15 @@ Prosim določite drugačno bližnjico.</translation>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation>Uporabniški makri</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation>Sistemski makri</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation>Mesto uporabniških makrov:</translation>
</message>
</context>
<context>
@ -1318,7 +1314,7 @@ This file already exists.</source>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation>Samo za branje</translation>
</message>
</context>
<context>
@ -1611,7 +1607,7 @@ Navedite drugo mapo.</translation>
</message>
<message>
<source>Extract project</source>
<translation>Izvleči projekt</translation>
<translation>Izvleci projekt</translation>
</message>
<message>
<source>Source</source>
@ -1807,11 +1803,11 @@ Navedite drugo mapo.</translation>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Ortografski izris</translation>
<translation type="obsolete">Ortografski izris</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Izris v perspektivi</translation>
<translation type="obsolete">Izris v perspektivi</translation>
</message>
<message>
<source></source>
@ -1881,6 +1877,14 @@ Navedite drugo mapo.</translation>
<source>MSAA 8x</source>
<translation>MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -2251,7 +2255,7 @@ Navedite drugo mapo.</translation>
</message>
<message>
<source>Pixel</source>
<translation>sl. točk</translation>
<translation> sl. točk</translation>
</message>
<message>
<source>&amp;Width:</source>
@ -2446,7 +2450,7 @@ Navedite drugo mapo.</translation>
</message>
<message>
<source>Macro path</source>
<translation>Makro pot</translation>
<translation>Pot makrov</translation>
</message>
<message>
<source>General macro settings</source>
@ -2497,7 +2501,7 @@ Navedite drugo mapo.</translation>
</message>
<message>
<source>Imperial decimal (in/lb)</source>
<translation>Angleške decimalke (palci/funti)</translation>
<translation>Angleške decimalne (palci/funti)</translation>
</message>
</context>
<context>
@ -3100,7 +3104,7 @@ Stolpec &apos;Stanje&apos; prikazuje, ali je dokument mogoče obnoviti.</transla
</message>
<message>
<source>Apply incremental changes to object placement</source>
<translation>Uporabi prirastne spremembe postavitve objekta</translation>
<translation>Uporabi prirastne spr. postavitve objekta</translation>
</message>
<message>
<source>Apply</source>
@ -3663,7 +3667,7 @@ Ali želite shraniti spremembe?</translation>
</message>
<message>
<source>Press middle mouse button</source>
<translation>Pritisnite srednjo tipko miške</translation>
<translation>Pritisnite srednjo tipko na miški</translation>
</message>
<message>
<source>Press left mouse button</source>
@ -4188,7 +4192,7 @@ Ali želite navesti drugo mapo?</translation>
</message>
<message>
<source>Automatic python modules documentation</source>
<translation>Samodejna dokumentacija o modulih Python</translation>
<translation>Dokumentacija o samodejnih modulih Python</translation>
</message>
<message>
<source>Opens a browser to show the Python modules documentation</source>
@ -4552,7 +4556,7 @@ Ali želite navesti drugo mapo?</translation>
</message>
<message>
<source>Cannot load workbench</source>
<translation>Ni mogoče naložiti delovnega okolja</translation>
<translation>Delovnega okolja ni mogoče naložiti</translation>
</message>
<message>
<source>A general error occurred while loading the workbench</source>
@ -4864,11 +4868,11 @@ Upoštevajte, da je mesto klika pomembno.</translation>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Izbriši makro</translation>
<translation>Izbriši makro</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation>Sistemskih makrov ni dovoljeno izbrisati</translation>
</message>
</context>
<context>
@ -4890,11 +4894,11 @@ Upoštevajte, da je mesto klika pomembno.</translation>
</message>
<message>
<source>&amp;About %1</source>
<translation>&amp;O %1</translation>
<translation>&amp;O %1u</translation>
</message>
<message>
<source>About %1</source>
<translation>O %1</translation>
<translation>O %1u</translation>
</message>
</context>
<context>
@ -4920,7 +4924,7 @@ Upoštevajte, da je mesto klika pomembno.</translation>
</message>
<message>
<source>Ne&amp;xt</source>
<translation>Nap&amp;rej</translation>
<translation>Napr&amp;ej</translation>
</message>
<message>
<source>Activate next window</source>
@ -4965,7 +4969,7 @@ Upoštevajte, da je mesto klika pomembno.</translation>
</message>
<message>
<source>Arrange &amp;Icons</source>
<translation>&amp;Razporedi ikone</translation>
<translation>R&amp;azporedi ikone</translation>
</message>
<message>
<source>Arrange Icons</source>
@ -5141,11 +5145,11 @@ Upoštevajte, da je mesto klika pomembno.</translation>
</message>
<message>
<source>Execute macro</source>
<translation>Izvedi makro</translation>
<translation>Zaženi makro</translation>
</message>
<message>
<source>Execute the macro in the editor</source>
<translation>Izvedi makro v urejevalniku</translation>
<translation>Zaženi makro v urejevalniku</translation>
</message>
</context>
<context>
@ -5205,7 +5209,7 @@ Upoštevajte, da je mesto klika pomembno.</translation>
</message>
<message>
<source>List of available dock panels</source>
<translation>Seznam razpoložljivih usidrljivih plošč</translation>
<translation>Seznam razpoložljivih usidrljivih podoken</translation>
</message>
</context>
<context>
@ -5242,7 +5246,7 @@ Upoštevajte, da je mesto klika pomembno.</translation>
</message>
<message>
<source>Toggle &amp;Edit mode</source>
<translation>Preklopi način &amp;urejanja</translation>
<translation>Pr&amp;eklopi način urejanja</translation>
</message>
<message>
<source>Toggles the selected object&apos;s edit mode</source>
@ -5706,7 +5710,7 @@ Upoštevajte, da je mesto klika pomembno.</translation>
</message>
<message>
<source>&amp;Export PDF...</source>
<translation>I&amp;zvozi PDF </translation>
<translation>Izvozi &amp;PDF </translation>
</message>
<message>
<source>Export the document as PDF</source>
@ -5721,7 +5725,7 @@ Upoštevajte, da je mesto klika pomembno.</translation>
</message>
<message>
<source>&amp;Print preview...</source>
<translation>&amp;Predogled tiskanja </translation>
<translation>P&amp;redogled tiskanja </translation>
</message>
<message>
<source>Print the document</source>
@ -5740,7 +5744,7 @@ Upoštevajte, da je mesto klika pomembno.</translation>
</message>
<message>
<source>Project i&amp;nformation...</source>
<translation>&amp;Podatki o projektu </translation>
<translation>Po&amp;datki o projektu </translation>
</message>
<message>
<source>Show details of the currently active project</source>
@ -5886,7 +5890,7 @@ Upoštevajte, da je mesto klika pomembno.</translation>
</message>
<message>
<source>Save &amp;As...</source>
<translation>Shrani &amp;kot </translation>
<translation>Shr&amp;ani kot </translation>
</message>
<message>
<source>Save the active document under a new file name</source>
@ -6598,11 +6602,11 @@ Upoštevajte, da je mesto klika pomembno.</translation>
</message>
<message>
<source>Workbench</source>
<translation>Delovna miza</translation>
<translation>Delovno okolje</translation>
</message>
<message>
<source>Switch between workbenches</source>
<translation>Preklopi med delovnimi mizami</translation>
<translation>Preklopi med delovnimi okolji</translation>
</message>
</context>
<context>
@ -6845,7 +6849,7 @@ Ali želite navesti namestitveno pot, če je že nameščen?</translation>
</message>
<message>
<source>&amp;Windows</source>
<translation>&amp;Okna</translation>
<translation>O&amp;kna</translation>
</message>
<message>
<source>&amp;On-line help</source>
@ -6890,7 +6894,7 @@ p, li { white-space: pre-wrap; }
<translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;span style=&quot; font-size:20pt; font-weight:600;&quot;&gt;Plošča opravil iis&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;span style=&quot; font-size:20pt; font-weight:600;&quot;&gt;Podokno opravil iis&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:20pt; font-weight:600;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:20pt; font-weight:600;&quot;&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Ustvarjeno za Qt 4.3.x&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;&quot;&gt;&lt;/p&gt;
@ -6898,7 +6902,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<source>Choose the style of the Task Panel</source>
<translation>Izberite slog plošče opravil</translation>
<translation>Izberite slog podokna opravil</translation>
</message>
<message>
<source>Default</source>

Binary file not shown.

View File

@ -1238,10 +1238,6 @@ Please define another shortcut.</source>
<source>Macro name:</source>
<translation>Име макронаредбе:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Дестинација макронаредбе:</translation>
</message>
<message>
<source>Execute</source>
<translation>Изврши</translation>
@ -1264,15 +1260,15 @@ Please define another shortcut.</source>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">System macros</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros location:</translation>
</message>
</context>
<context>
@ -1316,7 +1312,7 @@ This file already exists.</source>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Read-only</translation>
</message>
</context>
<context>
@ -1804,11 +1800,11 @@ Specify another directory, please.</source>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Ортографски приказ</translation>
<translation type="obsolete">Ортографски приказ</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Приказ &apos;Из перспективе&apos;</translation>
<translation type="obsolete">Приказ &apos;Из перспективе&apos;</translation>
</message>
<message>
<source></source>
@ -1878,6 +1874,14 @@ Specify another directory, please.</source>
<source>MSAA 8x</source>
<translation>MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4862,11 +4866,11 @@ Be aware the point where you click matters.</source>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Обриши макронаредбу</translation>
<translation>Обриши макронаредбу</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Not allowed to delete system-wide macros</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -1239,10 +1239,6 @@ Definiera en annan genväg.</translation>
<source>Macro name:</source>
<translation>Makronamn:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Makro destination:</translation>
</message>
<message>
<source>Execute</source>
<translation>Utför</translation>
@ -1265,15 +1261,15 @@ Definiera en annan genväg.</translation>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">System macros</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros location:</translation>
</message>
</context>
<context>
@ -1318,7 +1314,7 @@ Denna fil finns redan.</translation>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Read-only</translation>
</message>
</context>
<context>
@ -1807,11 +1803,11 @@ Ange en annan katalog.</translation>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Ortografisk rendering</translation>
<translation type="obsolete">Ortografisk rendering</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Perspektivrendering</translation>
<translation type="obsolete">Perspektivrendering</translation>
</message>
<message>
<source></source>
@ -1881,6 +1877,14 @@ Ange en annan katalog.</translation>
<source>MSAA 8x</source>
<translation type="unfinished">MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4862,11 +4866,11 @@ Tänk på att det har betydelse var du klickar.</translation>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Radera makro</translation>
<translation>Radera makro</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Not allowed to delete system-wide macros</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -1238,10 +1238,6 @@ Please define another shortcut.</source>
<source>Macro name:</source>
<translation>Makro adı:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Makro konumu:</translation>
</message>
<message>
<source>Execute</source>
<translation>Çalıştır</translation>
@ -1264,15 +1260,15 @@ Please define another shortcut.</source>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">System macros</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros location:</translation>
</message>
</context>
<context>
@ -1317,7 +1313,7 @@ Bu dosya zaten var.</translation>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Read-only</translation>
</message>
</context>
<context>
@ -1806,11 +1802,11 @@ Lütfen başka bir dizin belirtin.</translation>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Ortografik işleme</translation>
<translation type="obsolete">Ortografik işleme</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Perspektif işleme</translation>
<translation type="obsolete">Perspektif işleme</translation>
</message>
<message>
<source></source>
@ -1880,6 +1876,14 @@ Lütfen başka bir dizin belirtin.</translation>
<source>MSAA 8x</source>
<translation type="unfinished">MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4854,11 +4858,11 @@ Be aware the point where you click matters.</source>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Makroyu sil</translation>
<translation>Makroyu sil</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Not allowed to delete system-wide macros</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -1239,10 +1239,6 @@ Please define another shortcut.</source>
<source>Macro name:</source>
<translation>Назва макросу:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">Призначення макросу:</translation>
</message>
<message>
<source>Execute</source>
<translation>Виконати</translation>
@ -1265,15 +1261,15 @@ Please define another shortcut.</source>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">System macros</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros location:</translation>
</message>
</context>
<context>
@ -1318,7 +1314,7 @@ This file already exists.</source>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Read-only</translation>
</message>
</context>
<context>
@ -1806,11 +1802,11 @@ Specify another directory, please.</source>
</message>
<message>
<source>Orthographic rendering</source>
<translation>Ортогональна візуалізація</translation>
<translation type="obsolete">Ортогональна візуалізація</translation>
</message>
<message>
<source>Perspective rendering</source>
<translation>Візуалізація в перспективі</translation>
<translation type="obsolete">Візуалізація в перспективі</translation>
</message>
<message>
<source></source>
@ -1880,6 +1876,14 @@ Specify another directory, please.</source>
<source>MSAA 8x</source>
<translation>MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4859,11 +4863,11 @@ Be aware the point where you click matters.</source>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished">Видалити макрос</translation>
<translation>Видалити макрос</translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Not allowed to delete system-wide macros</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -1238,10 +1238,6 @@ Please define another shortcut.</source>
<source>Macro name:</source>
<translation>:</translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete">:</translation>
</message>
<message>
<source>Execute</source>
<translation></translation>
@ -1264,15 +1260,15 @@ Please define another shortcut.</source>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">System macros</translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">User macros location:</translation>
</message>
</context>
<context>
@ -1317,7 +1313,7 @@ This file already exists.</source>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Read-only</translation>
</message>
</context>
<context>
@ -1804,11 +1800,11 @@ Specify another directory, please.</source>
</message>
<message>
<source>Orthographic rendering</source>
<translation></translation>
<translation type="obsolete"></translation>
</message>
<message>
<source>Perspective rendering</source>
<translation></translation>
<translation type="obsolete"></translation>
</message>
<message>
<source></source>
@ -1878,6 +1874,14 @@ Specify another directory, please.</source>
<source>MSAA 8x</source>
<translation type="unfinished">MSAA 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -4852,11 +4856,11 @@ Be aware the point where you click matters.</source>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Not allowed to delete system-wide macros</translation>
</message>
</context>
<context>

Binary file not shown.

View File

@ -64,7 +64,7 @@
</message>
<message>
<source>Test console output</source>
<translation type="unfinished">Test console output</translation>
<translation></translation>
</message>
</context>
<context>
@ -1237,10 +1237,6 @@ Please define another shortcut.</source>
<source>Macro name:</source>
<translation></translation>
</message>
<message>
<source>Macro destination:</source>
<translation type="obsolete"></translation>
</message>
<message>
<source>Execute</source>
<translation></translation>
@ -1263,15 +1259,15 @@ Please define another shortcut.</source>
</message>
<message>
<source>User macros</source>
<translation type="unfinished"></translation>
<translation>使</translation>
</message>
<message>
<source>System macros</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<source>User macros location:</source>
<translation type="unfinished"></translation>
<translation>使</translation>
</message>
</context>
<context>
@ -1315,7 +1311,7 @@ This file already exists.</source>
</message>
<message>
<source>Read-only</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
</context>
<context>
@ -1802,11 +1798,11 @@ Specify another directory, please.</source>
</message>
<message>
<source>Orthographic rendering</source>
<translation></translation>
<translation type="obsolete"></translation>
</message>
<message>
<source>Perspective rendering</source>
<translation></translation>
<translation type="obsolete"></translation>
</message>
<message>
<source></source>
@ -1876,6 +1872,14 @@ Specify another directory, please.</source>
<source>MSAA 8x</source>
<translation> 8x</translation>
</message>
<message>
<source>Or&amp;thographic rendering</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Perspective renderin&amp;g</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
@ -3402,11 +3406,11 @@ The &apos;Status&apos; column shows whether the document could be recovered.</so
</message>
<message>
<source>To python console</source>
<translation type="unfinished">To python console</translation>
<translation> python </translation>
</message>
<message>
<source>Reveals this object and its subelements in the python console.</source>
<translation type="unfinished">Reveals this object and its subelements in the python console.</translation>
<translation>python主控台中顯示</translation>
</message>
</context>
<context>
@ -4843,11 +4847,11 @@ Be aware the point where you click matters.</source>
</message>
<message>
<source>Delete macro</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<source>Not allowed to delete system-wide macros</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
</context>
<context>
@ -5184,7 +5188,7 @@ Be aware the point where you click matters.</source>
</message>
<message>
<source>List of available dock panels</source>
<translation type="unfinished">List of available dock panels</translation>
<translation>使</translation>
</message>
</context>
<context>

View File

@ -84,6 +84,10 @@ void MDIView::deleteSelf()
parent->deleteLater();
else
this->deleteLater();
// detach from document
if (_pcDocument)
onClose();
_pcDocument = 0;
}

View File

@ -231,8 +231,8 @@ void MacroManager::run(MacroType eType,const char *sName)
try {
ParameterGrp::handle hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("OutputWindow");
PyObject* pyout = hGrp->GetBool("RedirectPythonOutput") ? new OutputStdout : 0;
PyObject* pyerr = hGrp->GetBool("RedirectPythonErrors") ? new OutputStderr : 0;
PyObject* pyout = hGrp->GetBool("RedirectPythonOutput",true) ? new OutputStdout : 0;
PyObject* pyerr = hGrp->GetBool("RedirectPythonErrors",true) ? new OutputStderr : 0;
PythonRedirector std_out("stdout",pyout);
PythonRedirector std_err("stderr",pyerr);
//The given path name is expected to be Utf-8

View File

@ -233,7 +233,7 @@ void NavigationStyle::initialize()
this->invertZoom = App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/View")->GetBool("InvertZoom",true);
this->zoomAtCursor = App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/View")->GetBool("ZoomAtCursor",false);
("User parameter:BaseApp/Preferences/View")->GetBool("ZoomAtCursor",true);
this->zoomStep = App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/View")->GetFloat("ZoomStep",0.2f);
}

View File

@ -534,6 +534,16 @@ void PrefQuantitySpinBox::contextMenuEvent(QContextMenuEvent *event)
delete menu;
}
void PrefQuantitySpinBox::onSave()
{
pushToHistory();
}
void PrefQuantitySpinBox::onRestore()
{
setToLastUsedValue();
}
void PrefQuantitySpinBox::pushToHistory(const QString &valueq)
{
Q_D(PrefQuantitySpinBox);
@ -594,7 +604,11 @@ void PrefQuantitySpinBox::setToLastUsedValue()
void PrefQuantitySpinBox::setParamGrpPath(const QByteArray& path)
{
Q_D(PrefQuantitySpinBox);
d->handle = App::GetApplication().GetParameterGroupByPath(path);
QByteArray groupPath = path;
if (!groupPath.startsWith("User parameter:")) {
groupPath.prepend("User parameter:BaseApp/Preferences/");
}
d->handle = App::GetApplication().GetParameterGroupByPath(groupPath);
if (d->handle.isValid())
d->prefGrp = path;
}

View File

@ -296,6 +296,10 @@ public:
int historySize() const;
/// set the value of the history size property
void setHistorySize(int);
/// Convenience method as offered by PrefWidget. Does the same as pushToHistory().
void onSave();
/// Convenience method as offered by PrefWidget. Does the same as setToLastUsedValue().
void onRestore();
/** @name history and default management */
//@{

View File

@ -195,7 +195,7 @@ void SequencerDialog::showRemainingTime()
QTime time( 0,0, 0);
time = time.addSecs( rest/1000 );
QString remain = Gui::ProgressDialog::tr("Remaining: %1").arg(time.toString());
QString status = QString::fromAscii("%1\t[%2]").arg(txt).arg(remain);
QString status = QString::fromLatin1("%1\t[%2]").arg(txt).arg(remain);
if (thr != currentThread) {
QMetaObject::invokeMethod(d->dlg, "setLabelText",

View File

@ -38,6 +38,7 @@
#include "QuantitySpinBox.h"
#include "QuantitySpinBox_p.h"
#include "DlgExpressionInput.h"
#include "propertyeditor/PropertyItem.h"
#include "BitmapFactory.h"
#include "Command.h"
#include <Base/Tools.h>

View File

@ -30,6 +30,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\**************************************************************************/
#include <QMutexLocker>
#include "SignalThread.h"
using namespace SIM::Coin3D::Quarter;
@ -47,25 +49,23 @@ void
SignalThread::trigger(void)
{
// lock first to make sure the QThread is actually waiting for a signal
this->mutex.lock();
QMutexLocker ml(&this->mutex);
this->waitcond.wakeOne();
this->mutex.unlock();
}
void
SignalThread::stopThread(void)
{
this->mutex.lock();
QMutexLocker ml(&this->mutex);
this->isstopped = true;
this->waitcond.wakeOne();
this->mutex.unlock();
}
void
SignalThread::run(void)
{
this->mutex.lock();
QMutexLocker ml(&this->mutex);
while (!this->isstopped) {
// just wait, and trigger every time we receive a signal
this->waitcond.wait(&this->mutex);
@ -73,5 +73,4 @@ SignalThread::run(void)
emit triggerSignal();
}
}
this->mutex.unlock();
}

View File

@ -134,7 +134,7 @@ public:
splash->showMessage(msg.replace(QLatin1String("\n"), QString()), alignment, textColor);
QMutex mutex;
mutex.lock();
QMutexLocker ml(&mutex);
QWaitCondition().wait(&mutex, 50);
}

View File

@ -344,7 +344,7 @@ void View3DInventor::OnChange(ParameterGrp::SubjectType &rCaller,ParameterGrp::M
_viewer->navigationStyle()->setZoomInverted(on);
}
else if (strcmp(Reason,"ZoomAtCursor") == 0) {
bool on = rGrp.GetBool("ZoomAtCursor", false);
bool on = rGrp.GetBool("ZoomAtCursor", true);
_viewer->navigationStyle()->setZoomAtCursor(on);
}
else if (strcmp(Reason,"ZoomStep") == 0) {

View File

@ -266,6 +266,16 @@ void ViewProvider::setDisplayMaskMode( const char* type )
setModeSwitch();
}
SoNode* ViewProvider::getDisplayMaskMode(const char* type) const
{
std::map<std::string, int>::const_iterator it = _sDisplayMaskModes.find( type );
if (it != _sDisplayMaskModes.end()) {
return pcModeSwitch->getChild(it->second);
}
return 0;
}
std::vector<std::string> ViewProvider::getDisplayMaskModes() const
{
std::vector<std::string> types;

View File

@ -308,6 +308,8 @@ protected:
void addDisplayMaskMode( SoNode *node, const char* type );
/// Activates the display mask mode \a type
void setDisplayMaskMode( const char* type );
/// Get the node to the display mask mode \a type
SoNode* getDisplayMaskMode(const char* type) const;
/// Returns a list of added display mask modes
std::vector<std::string> getDisplayMaskModes() const;
void setDefaultMode(int);

View File

@ -9,6 +9,7 @@
#define IISICONLABEL_H
#include <QtGui>
#include <QWidget>
#include "iistaskpanel_global.h"

View File

@ -9,6 +9,11 @@
#define IISTASKBOX_H
#include <QtGui>
#include <QWidget>
#include <QFrame>
#include <QBoxLayout>
#include <QPaintEvent>
#include <QPixmap>
#include "iistaskpanel_global.h"

View File

@ -9,6 +9,10 @@
#define IISTASKGROUP_H
#include <QtGui>
#include <QWidget>
#include <QFrame>
#include <QBoxLayout>
#include <QPaintEvent>
#include "iistaskpanel_global.h"

View File

@ -5,6 +5,12 @@
* *
***************************************************************************/
#include <QSizePolicy>
#include <QHBoxLayout>
#include <QLabel>
#include <QPainter>
#include <QTimer>
#include "iistaskheader.h"
#include "iistaskpanelscheme.h"
#include "iisiconlabel.h"

View File

@ -9,6 +9,10 @@
#define IISTASKHEADER_H
#include <QtGui>
#include <QFrame>
#include <QLabel>
#include <QEvent>
#include <QMouseEvent>
#include "iistaskpanel_global.h"

View File

@ -20,6 +20,8 @@
#include <QtGui>
#include <QtCore>
#include <QSpacerItem>
#include <QWidget>
#include <QPaintEvent>
#include "iistaskpanel_global.h"

View File

@ -9,6 +9,10 @@
#define IISTASKPANELSCHEME_H
#include <QtGui>
#include <QColor>
#include <QPen>
#include <QBrush>
#include <QSize>
#include "iistaskpanel_global.h"

View File

@ -49,6 +49,10 @@ PropertyEditor::PropertyEditor(QWidget *parent)
setAlternatingRowColors(true);
setRootIsDecorated(true);
QStyleOptionViewItem opt = viewOptions();
this->background = opt.palette.dark();
this->groupColor = opt.palette.color(QPalette::BrightText);
}
PropertyEditor::~PropertyEditor()
@ -65,6 +69,26 @@ bool PropertyEditor::isAutomaticDocumentUpdate(bool) const
return autoupdate;
}
QBrush PropertyEditor::groupBackground() const
{
return this->background;
}
void PropertyEditor::setGroupBackground(const QBrush& c)
{
this->background = c;
}
QColor PropertyEditor::groupTextColor() const
{
return this->groupColor;
}
void PropertyEditor::setGroupTextColor(const QColor& c)
{
this->groupColor = c;
}
QStyleOptionViewItem PropertyEditor::viewOptions() const
{
QStyleOptionViewItem option = QTreeView::viewOptions();
@ -114,7 +138,7 @@ void PropertyEditor::drawBranches(QPainter *painter, const QRect &rect, const QM
QStyleOptionViewItem opt = viewOptions();
PropertyItem *property = static_cast<PropertyItem*>(index.internalPointer());
if (property && property->isSeparator()) {
painter->fillRect(rect, opt.palette.dark());
painter->fillRect(rect, this->background);
//} else if (selectionModel()->isSelected(index)) {
// painter->fillRect(rect, opt.palette.brush(QPalette::Highlight));
}

View File

@ -41,10 +41,26 @@ namespace Gui {
namespace PropertyEditor {
class PropertyModel;
/*!
Put this into the .qss file after Gui--PropertyEditor--PropertyEditor
Gui--PropertyEditor--PropertyEditor
{
qproperty-groupBackground: gray;
qproperty-groupTextColor: white;
}
See also: https://man42.net/blog/2011/09/qt-4-7-modify-a-custom-q_property-with-a-qt-style-sheet/
*/
class PropertyEditor : public QTreeView
{
Q_OBJECT
Q_PROPERTY(QBrush groupBackground READ groupBackground WRITE setGroupBackground DESIGNABLE true SCRIPTABLE true)
Q_PROPERTY(QColor groupTextColor READ groupTextColor WRITE setGroupTextColor DESIGNABLE true SCRIPTABLE true)
public:
PropertyEditor(QWidget *parent = 0);
~PropertyEditor();
@ -57,6 +73,11 @@ public:
void setAutomaticDocumentUpdate(bool);
bool isAutomaticDocumentUpdate(bool) const;
QBrush groupBackground() const;
void setGroupBackground(const QBrush& c);
QColor groupTextColor() const;
void setGroupTextColor(const QColor& c);
protected:
virtual void closeEditor (QWidget * editor, QAbstractItemDelegate::EndEditHint hint);
virtual void commitData (QWidget * editor);
@ -72,6 +93,8 @@ private:
bool autoupdate;
bool committing;
bool delaybuild;
QColor groupColor;
QBrush background;
};
} //namespace PropertyEditor

View File

@ -58,7 +58,14 @@ void PropertyItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
PropertyItem *property = static_cast<PropertyItem*>(index.internalPointer());
if (property && property->isSeparator()) {
option.palette.setColor(QPalette::Text, option.palette.color(QPalette::BrightText));
QColor color = option.palette.color(QPalette::BrightText);
QObject* par = parent();
if (par) {
QVariant value = par->property("groupTextColor");
if (value.canConvert<QColor>())
color = value.value<QColor>();
}
option.palette.setColor(QPalette::Text, color);
option.font.setBold(true);
option.state &= ~QStyle::State_Selected;
}
@ -70,15 +77,21 @@ void PropertyItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
option.state &= ~QStyle::State_HasFocus;
if (property && property->isSeparator()) {
QBrush bg = option.palette.dark();
painter->fillRect(option.rect, bg);
QBrush brush = option.palette.dark();
QObject* par = parent();
if (par) {
QVariant value = par->property("groupBackground");
if (value.canConvert<QBrush>())
brush = value.value<QBrush>();
}
painter->fillRect(option.rect, brush);
}
QPen savedPen = painter->pen();
QItemDelegate::paint(painter, option, index);
QColor color = static_cast<QRgb>(QApplication::style()->styleHint(QStyle::SH_Table_GridLineColor, &option));
QColor color = static_cast<QRgb>(QApplication::style()->styleHint(QStyle::SH_Table_GridLineColor, &opt, qobject_cast<QWidget*>(parent())));
painter->setPen(QPen(color));
if (index.column() == 1 || !(property && property->isSeparator())) {
int right = (option.direction == Qt::LeftToRight) ? option.rect.right() : option.rect.left();

View File

@ -1208,7 +1208,13 @@ class _CommandComponent:
FreeCAD.ActiveDocument.commitTransaction()
FreeCAD.ActiveDocument.recompute()
def makeIfcSpreadsheet(obj=None):
def makeIfcSpreadsheet(archobj=None):
ifc_container = None
for obj in FreeCAD.ActiveDocument.Objects :
if obj.Name == "IfcPropertiesContainer" :
ifc_container = obj
if not ifc_container :
ifc_container = FreeCAD.ActiveDocument.addObject('App::DocumentObjectGroup','IfcPropertiesContainer')
import Spreadsheet
ifc_spreadsheet = FreeCAD.ActiveDocument.addObject('Spreadsheet::Sheet','IfcProperties')
ifc_spreadsheet.set('A1', translate("Arch","Category"))
@ -1216,14 +1222,15 @@ def makeIfcSpreadsheet(obj=None):
ifc_spreadsheet.set('C1', translate("Arch","Type"))
ifc_spreadsheet.set('D1', translate("Arch","Value"))
ifc_spreadsheet.set('E1', translate("Arch","Unit"))
if obj :
if hasattr(obj,"IfcProperties"):
obj.IfcProperties = ifc_spreadsheet
ifc_container.addObject(ifc_spreadsheet)
if archobj :
if hasattr(obj,"IfcProperties") :
archobj.IfcProperties = ifc_spreadsheet
return ifc_spreadsheet
else :
FreeCAD.Console.PrintWarning(translate("Arch", "The object have not IfcProperties attribute. Cancel spreadsheet creation for object : ") + obj.Label)
FreeCAD.Console.PrintWarning(translate("Arch", "The object have not IfcProperties attribute. Cancel spreadsheet creation for object : ") + archobj.Label)
FreeCAD.ActiveDocument.removeObject(ifc_spreadsheet)
else:
else :
return ifc_spreadsheet
class _CommandIfcSpreadsheet:

View File

@ -380,7 +380,9 @@ class _Structure(ArchComponent.Component):
if len(obj.Base.Shape.Faces) > 0 :
normal=obj.Base.Shape.Faces[0].normalAt(.5,.5)
else:
return
normal = DraftGeomUtils.getNormal(obj.Base.Shape)
if not normal:
normal = FreeCAD.Vector(0,0,1)
#p = FreeCAD.Placement(obj.Base.Placement)
#normal = p.Rotation.multVec(normal)
else:

View File

@ -74,5 +74,13 @@ INSTALL(
Presets
DESTINATION
${CMAKE_INSTALL_DATADIR}/Mod/Arch
FILES_MATCHING PATTERN "*.csv*"
FILES_MATCHING PATTERN "*.csv*"
)
SET(ArchGuiIcon_SVG
Resources/icons/ArchWorkbench.svg
)
fc_copy_sources(Arch "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Arch" ${ArchGuiIcon_SVG})
INSTALL(FILES ${ArchGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Arch/Resources/icons")

View File

@ -23,46 +23,10 @@
class ArchWorkbench(Workbench):
"Arch workbench object"
Icon = """
/* XPM */
static char * arch_xpm[] = {
"16 16 17 1",
" c None",
". c #373936",
"+ c #464845",
"@ c #545553",
"# c #626461",
"$ c #6B6D6A",
"% c #727471",
"& c #7E807D",
"* c #8A8C89",
"= c #949693",
"- c #A1A3A0",
"; c #ADAFAC",
"> c #BEC1BD",
", c #C9CBC8",
"' c #D9DCD8",
") c #E4E6E3",
"! c #FDFFFC",
" ",
" ",
" & ",
" >)'-% ",
" #,))))),@ ",
" >%*-))))*# ",
" $')>!)**>%*% ",
"@=')>!!!!$==# ",
"=!=**;'!!&=$++ ",
"=!!!)*@&-%#@#&-.",
" ,!!!!#>&#=,'=%@",
" ;)!#!!!-*$&=@",
" *@!!!!!$=* ",
" =>!!$& ",
" -+ ",
" "};"""
MenuText = "Arch"
ToolTip = "Architecture workbench"
def __init__(self):
self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Arch/Resources/icons/ArchWorkbench.svg"
self.__class__.MenuText = "Arch"
self.__class__.ToolTip = "Architecture workbench"
def Initialize(self):
import DraftTools,DraftGui,Arch_rc,Arch,Draft_rc

View File

@ -57,6 +57,7 @@
<file>icons/Arch_Material.svg</file>
<file>icons/Arch_Material_Group.svg</file>
<file>icons/Arch_Schedule.svg</file>
<file>icons/ArchWorkbench.svg</file>
<file>ui/preferences-arch.ui</file>
<file>ui/preferences-archdefaults.ui</file>
<file>ui/preferences-ifc.ui</file>

Some files were not shown because too many files have changed in this diff Show More