Merge with develop

--HG--
branch : feature
This commit is contained in:
dismine 2013-10-07 19:46:47 +03:00
commit 2cab6a467c
3 changed files with 1896 additions and 468 deletions

View File

@ -437,7 +437,7 @@ void MainWindow::ToolDetail(bool checked){
QPixmap pixmap("://cursor/new_detail_cursor.png"); QPixmap pixmap("://cursor/new_detail_cursor.png");
QCursor cur(pixmap, 2, 3); QCursor cur(pixmap, 2, 3);
view->setCursor(cur); view->setCursor(cur);
helpLabel->setText(tr("Select points, arcs, curves and details clockwise.")); helpLabel->setText(tr("Select points, arcs, curves clockwise."));
dialogDetail = QSharedPointer<DialogDetail>(new DialogDetail(data, mode)); dialogDetail = QSharedPointer<DialogDetail>(new DialogDetail(data, mode));
connect(currentScene, &VMainGraphicsScene::ChoosedObject, dialogDetail.data(), connect(currentScene, &VMainGraphicsScene::ChoosedObject, dialogDetail.data(),
&DialogDetail::ChoosedObject); &DialogDetail::ChoosedObject);

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff