10000 [pull] master from qcad:master by pull[bot] · Pull Request #201 · anxornot/qcad · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[pull] master from qcad:master #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions scripts/Help/Help.pro
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ SUBDIRS = \
ReportBug \
ReportTranslationError \
ShowReadme \
VideoTutorials \
Website
2 changes: 1 addition & 1 deletion scripts/Help/ReportBug/ReportBug.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ ReportBug.prototype = new Help();
ReportBug.prototype.beginEvent = function() {
Help.prototype.beginEvent.call(this);

Help.openUrl("https://qcad.org/bugtracker/index.php?do=newtask&project=1");
Help.openUrl("https://qcad.org/bugreport");
};

32 changes: 32 additions & 0 deletions scripts/Help/VideoTutorials/VideoTutorials.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/**
* Copyright (c) 2011-2025 by Andrew Mustun. All rights reserved.
*
* This file is part of the QCAD project.
*
* QCAD is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* QCAD is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with QCAD.
*/

include("scripts/Help/Help.js");

function VideoTutorials(guiAction) {
Help.call(this, guiAction);
}

VideoTutorials.prototype = new Help();

VideoTutorials.prototype.beginEvent = function() {
Help.prototype.beginEvent.call(this);
Help.openUrl("https://qcad.org/videotutorials");
};

2 changes: 2 additions & 0 deletions scripts/Help/VideoTutorials/VideoTutorials.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1, 10000 2 @@
NAME = $${TARGET}
SOURCES = $${TARGET}.js $${TARGET}Init.js
9 changes: 9 additions & 0 deletions scripts/Help/VideoTutorials/VideoTutorialsInit.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
function init(basePath) {
var action = new RGuiAction(qsTranslate("VideoTutorials", "QCAD &Video Tutorials"), RMainWindowQt.getMainWindow());
action.setRequiresDocument(false);
action.setScriptFile(basePath + "/VideoTutorials.js");
action.setNoState();
action.setGroupSortOrder(110200);
action.setSortOrder(150);
action.setWidgetNames(["HelpMenu", "!HelpToolBar"]);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<p>Shows the web site with all our official video tutorials for QCAD.</p>
4 changes: 2 additions & 2 deletions src/core/RVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
* x.x.x for releases
* x.x.x.x for snapshots only
*/
#define R_QCAD_VERSION_STRING "3.32.2"
#define R_QCAD_VERSION_STRING "3.32.3"

#define R_QCAD_VERSION_MAJOR 3
#define R_QCAD_VERSION_MINOR 32
#define R_QCAD_VERSION_REV 2
#define R_QCAD_VERSION_REV 3
#define R_QCAD_VERSION_BUILD 0

#endif
7 changes: 7 additions & 0 deletions src/operations/RChangePropertyOperation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,13 @@ RTransaction RChangePropertyOperation::apply(RDocument& document, bool preview)
}
}

// don't apply attribute properties of block with attributes to selected attributes:
if (obj->isOfType(RS::EntityAttribute) && propertyTypeId.isCustom()) {
if (propertyTypeId.getCustomPropertyTitle()=="Attributes") {
continue;
}
}

// apply operation to object:
bool modified = obj->setProperty(propertyTypeId, val, &transaction);

Expand Down
0