aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Little refactoring.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2016-02-12 15:49:59 +02:00
parent 8683b69f13
commit 791d874c9a
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/valentina/mainwindow.cpp
View File

@ -48,6 +48,12 @@
#include "../ifc/xml/vvstconverter.h" #include "../ifc/xml/vvstconverter.h"
#include "../ifc/xml/vvitconverter.h" #include "../ifc/xml/vvitconverter.h"
#include "../vwidgets/vwidgetpopup.h" #include "../vwidgets/vwidgetpopup.h"
#include "../vwidgets/vmaingraphicsscene.h"
#include "tools/drawTools/drawtools.h"
#include "../vtools/dialogs/tooldialogs.h"
#include "tools/vtooldetail.h"
#include "tools/vtooluniondetails.h"
#include "dialogs/dialogs.h"
#include <QInputDialog> #include <QInputDialog>
#include <QDebug> #include <QDebug>
@ -66,6 +72,8 @@
#include <QDesktopServices> #include <QDesktopServices>
#include <chrono> #include <chrono>
#include <thread> #include <thread>
#include <QFileSystemWatcher>
#include <QComboBox>
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
#include <QMimeData> #include <QMimeData>

15
src/app/valentina/mainwindow.h
View File

@ -30,17 +30,10 @@
#define MAINWINDOW_H #define MAINWINDOW_H
#include "mainwindowsnogui.h" #include "mainwindowsnogui.h"
#include "../vwidgets/vmaingraphicsview.h"
#include "../vtools/dialogs/tooldialogs.h"
#include "dialogs/dialogs.h"
#include "tools/vtooldetail.h"
#include "tools/vtooluniondetails.h"
#include "tools/drawTools/drawtools.h"
#include "core/vcmdexport.h" #include "core/vcmdexport.h"
#include "../vmisc/vlockguard.h" #include "../vmisc/vlockguard.h"
#include <QPointer>
#include <QFileSystemWatcher> #include <QPointer>
namespace Ui namespace Ui
{ {
@ -49,6 +42,12 @@ namespace Ui
class VToolOptionsPropertyBrowser; class VToolOptionsPropertyBrowser;
class VMeasurements; class VMeasurements;
class VMainGraphicsScene;
class QFileSystemWatcher;
class QLabel;
class DialogIncrements;
class DialogTool;
class DialogHistory;
/** /**
* @brief The MainWindow class main windows. * @brief The MainWindow class main windows.

2
src/libs/vtools/dialogs/tools/dialogendline.cpp
View File

@ -279,7 +279,7 @@ void DialogEndLine::ShowDialog(bool click)
{ {
if (click) if (click)
{ {
/*We will ignore click if poinet is in point circle*/ /*We will ignore click if pointer is in point circle*/
VMainGraphicsScene *scene = qobject_cast<VMainGraphicsScene *>(qApp->getCurrentScene()); VMainGraphicsScene *scene = qobject_cast<VMainGraphicsScene *>(qApp->getCurrentScene());
SCASSERT(scene != nullptr); SCASSERT(scene != nullptr);
const QSharedPointer<VPointF> point = data->GeometricObject<VPointF>(GetBasePointId()); const QSharedPointer<VPointF> point = data->GeometricObject<VPointF>(GetBasePointId());

2
src/libs/vtools/tools/drawTools/vdrawtool.h
View File

@ -31,12 +31,10 @@
#include "../vabstracttool.h" #include "../vabstracttool.h"
#include "../../dialogs/tools/dialogtool.h" #include "../../dialogs/tools/dialogtool.h"
#include "../vwidgets/vmaingraphicsscene.h"
#include "../vwidgets/vmaingraphicsview.h" #include "../vwidgets/vmaingraphicsview.h"
#include <QMenu> #include <QMenu>
#include <QGraphicsSceneContextMenuEvent> #include <QGraphicsSceneContextMenuEvent>
#include <QGraphicsView>
/** /**
* @brief The VDrawTool abstract class for all draw tool. * @brief The VDrawTool abstract class for all draw tool.