From f04f2697c8bee207fbb1d362647781d4cf4370ef Mon Sep 17 00:00:00 2001 From: GĂ©rard Milmeister Date: Jan 23 2008 12:27:40 +0000 Subject: added patch to add arc type tangential to menu --- diff --git a/qcad-arc.patch b/qcad-arc.patch new file mode 100644 index 0000000..bc50727 --- /dev/null +++ b/qcad-arc.patch @@ -0,0 +1,37 @@ +diff -ur BUILD/qcad-2.0.5.0-1-community.src/qcad/src/qc_applicationwindow.cpp qcad-2.0.5.0-1-community.src/qcad/src/qc_applicationwindow.cpp +--- BUILD/qcad-2.0.5.0-1-community.src/qcad/src/qc_applicationwindow.cpp 2008-01-16 22:04:55.000000000 +0200 ++++ qcad-2.0.5.0-1-community.src/qcad/src/qc_applicationwindow.cpp 2008-01-16 21:56:16.000000000 +0200 +@@ -750,6 +750,9 @@ + action = actionFactory.createAction(RS2::ActionDrawArcParallel, actionHandler); + action->addTo(subMenu); + connect(this, SIGNAL(windowsChanged(bool)), action, SLOT(setEnabled(bool))); ++ action = actionFactory.createAction(RS2::ActionDrawArcTangential, actionHandler); ++ action->addTo(subMenu); ++ connect(this, SIGNAL(windowsChanged(bool)), action, SLOT(setEnabled(bool))); + menu->insertItem(tr("&Arc"), subMenu); + // Circles: + subMenu=new QPopupMenu(this); +diff -ur BUILD/qcad-2.0.5.0-1-community.src/qcadguiqt/src/qg_actionfactory.cpp qcad-2.0.5.0-1-community.src/qcadguiqt/src/qg_actionfactory.cpp +--- BUILD/qcad-2.0.5.0-1-community.src/qcadguiqt/src/qg_actionfactory.cpp 2005-11-22 13:52:22.000000000 +0200 ++++ qcad-2.0.5.0-1-community.src/qcadguiqt/src/qg_actionfactory.cpp 2008-01-16 20:31:59.000000000 +0200 +@@ -45,6 +45,7 @@ + #include "rs_actiondimradial.h" + #include "rs_actiondrawarc.h" + #include "rs_actiondrawarc3p.h" ++#include "rs_actiondrawarctangential.h" + #include "rs_actiondrawcircle.h" + #include "rs_actiondrawcircle2p.h" + #include "rs_actiondrawcircle3p.h" +@@ -632,6 +633,12 @@ + obj, SLOT(slotDrawArcParallel())); + break; + ++ case RS2::ActionDrawArcTangential: ++ action = RS_ActionDrawArcTangential::createGUIAction(id, mw); ++ connect(action, SIGNAL(activated()), ++ obj, SLOT(slotDrawArcTangential())); ++ break; ++ + case RS2::ActionDrawEllipseAxis: + action = RS_ActionDrawEllipseAxis::createGUIAction(id, mw); + connect(action, SIGNAL(activated()), diff --git a/qcad.spec b/qcad.spec index fd89af8..ab7a772 100644 --- a/qcad.spec +++ b/qcad.spec @@ -1,6 +1,6 @@ Name: qcad Version: 2.0.5.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Simple 2D CAD program Group: Applications/Engineering @@ -12,6 +12,7 @@ Patch1: qcad-assistant.patch Patch2: qcad-manual-bugs.patch Patch3: qcad-64bit.patch Patch4: qcad-nopedantic.patch +Patch5: qcad-arc.patch URL: http://www.ribbonsoft.com/qcad.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel >= 3.1.2, python-devel, desktop-file-utils @@ -38,6 +39,7 @@ released under the GPL (Open Source). %patch2 -p0 %patch3 -p1 -b .64bit %patch4 -p1 -b .nopedantic +%patch5 -p1 -b .arc %build @@ -119,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 23 2008 Gerard Milmeister - 2.0.5.0-6 +- added patch to add arc type tangential to menu + * Mon Aug 28 2006 Gerard Milmeister - 2.0.5.0-5 - Rebuild for FE6