kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 22:00:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

element editor bugfix: after reload element, add a primitive crash qet

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2401 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2013-07-28 21:55:02 +00:00
parent 20f37a2595
commit ee02965880
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/editor/elementscene.cpp
View File

@@ -1048,8 +1048,8 @@ void ElementScene::reset() {
undoStack().clear(); undoStack().clear();
// enleve les elements de la scene // enleve les elements de la scene
foreach (QGraphicsItem *qgi, items()) { foreach (QGraphicsItem *qgi, items()) {
removeItem(qgi);
qgiManager().release(qgi); qgiManager().release(qgi);
removeItem(qgi);
} }
} }

9
sources/editor/qetelementeditor.cpp
View File

@@ -184,7 +184,7 @@ void QETElementEditor::setupActions() {
open_file -> setShortcut(tr("Ctrl+Shift+O")); open_file -> setShortcut(tr("Ctrl+Shift+O"));
save -> setShortcut(QKeySequence::Save); save -> setShortcut(QKeySequence::Save);
save_as_file -> setShortcut(tr("Ctrl+Shift+S")); save_as_file -> setShortcut(tr("Ctrl+Shift+S"));
//reload -> setShortcut(Qt::Key_F5); reload -> setShortcut(Qt::Key_F5);
quit -> setShortcut(QKeySequence(tr("Ctrl+Q"))); quit -> setShortcut(QKeySequence(tr("Ctrl+Q")));
selectall -> setShortcut(QKeySequence::SelectAll); selectall -> setShortcut(QKeySequence::SelectAll);
deselectall -> setShortcut(QKeySequence(tr("Ctrl+Shift+A"))); deselectall -> setShortcut(QKeySequence(tr("Ctrl+Shift+A")));
@@ -313,7 +313,7 @@ void QETElementEditor::setupActions() {
main_toolbar -> addAction(open); main_toolbar -> addAction(open);
main_toolbar -> addAction(save); main_toolbar -> addAction(save);
main_toolbar -> addAction(save_as); main_toolbar -> addAction(save_as);
//main_toolbar -> addAction(reload); main_toolbar -> addAction(reload);
main_toolbar -> addSeparator(); main_toolbar -> addSeparator();
main_toolbar -> addAction(undo); main_toolbar -> addAction(undo);
main_toolbar -> addAction(redo); main_toolbar -> addAction(redo);
@@ -373,7 +373,7 @@ void QETElementEditor::setupMenus() {
file_menu -> addAction(save_as); file_menu -> addAction(save_as);
file_menu -> addAction(save_as_file); file_menu -> addAction(save_as_file);
file_menu -> addSeparator(); file_menu -> addSeparator();
//file_menu -> addAction(reload); file_menu -> addAction(reload);
file_menu -> addSeparator(); file_menu -> addSeparator();
file_menu -> addAction(quit); file_menu -> addAction(quit);
@@ -953,7 +953,6 @@ void QETElementEditor::slot_reload() {
} }
// recharge l'element // recharge l'element
//TODO disable reload action because after action element is not editable next
if (opened_from_file) { if (opened_from_file) {
// l'element a ete ouvert a partir d'un chemin de fichier // l'element a ete ouvert a partir d'un chemin de fichier
ce_scene -> reset(); ce_scene -> reset();
@@ -977,7 +976,7 @@ void QETElementEditor::slot_reload() {
*/ */
bool QETElementEditor::slot_save() { bool QETElementEditor::slot_save() {
// verification avant d'enregistrer le fichier // verification avant d'enregistrer le fichier
//checkElement(); checkElement();
// si on ne connait pas le nom du fichier en cours, enregistrer revient a enregistrer sous // si on ne connait pas le nom du fichier en cours, enregistrer revient a enregistrer sous
if (opened_from_file) { if (opened_from_file) {
if (filename_.isEmpty()) return(slot_saveAsFile()); if (filename_.isEmpty()) return(slot_saveAsFile());