ADDED: #1471 ProcList window, it will list the loaded procedures. Functionality not yet implemented.

This commit is contained in:
dfighter1985 2012-07-23 23:03:58 +02:00
parent effdf45a70
commit e03a4606bf
8 changed files with 82 additions and 70 deletions

View file

@ -15,9 +15,10 @@ SET(OVQT_PLUGIN_GUI_EDITOR_HDR
gui_editor_context.h gui_editor_context.h
widget_properties.h widget_properties.h
widget_hierarchy.h widget_hierarchy.h
action_editor.h
link_editor.h link_editor.h
proc_list.h
proc_editor.h proc_editor.h
action_editor.h
property_browser_ctrl.h property_browser_ctrl.h
project_window.h project_window.h
nel3d_widget.h nel3d_widget.h
@ -28,9 +29,10 @@ SET(OVQT_PLUGIN_GUI_EDITOR_UIS
gui_editor_window.ui gui_editor_window.ui
widget_properties.ui widget_properties.ui
widget_hierarchy.ui widget_hierarchy.ui
action_editor.ui
link_editor.ui link_editor.ui
proc_list.ui
proc_editor.ui proc_editor.ui
action_editor.ui
project_window.ui project_window.ui
) )

View file

@ -2,6 +2,9 @@
<ui version="4.0"> <ui version="4.0">
<class>ActionEditor</class> <class>ActionEditor</class>
<widget class="QWidget" name="ActionEditor"> <widget class="QWidget" name="ActionEditor">
<property name="windowModality">
<enum>Qt::ApplicationModal</enum>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>

View file

@ -34,7 +34,7 @@
#include "widget_properties_parser.h" #include "widget_properties_parser.h"
#include "widget_hierarchy.h" #include "widget_hierarchy.h"
#include "link_editor.h" #include "link_editor.h"
#include "proc_editor.h" #include "proc_list.h"
#include "project_file_parser.h" #include "project_file_parser.h"
#include "project_window.h" #include "project_window.h"
#include "nelgui_widget.h" #include "nelgui_widget.h"
@ -52,7 +52,7 @@ namespace GUIEditor
m_undoStack = new QUndoStack(this); m_undoStack = new QUndoStack(this);
widgetProps = new CWidgetProperties; widgetProps = new CWidgetProperties;
linkEditor = new LinkEditor; linkEditor = new LinkEditor;
procEditor = new ProcEditor; procList = new ProcList;
projectWindow = new ProjectWindow; projectWindow = new ProjectWindow;
connect( projectWindow, SIGNAL( projectFilesChanged() ), this, SLOT( onProjectFilesChanged() ) ); connect( projectWindow, SIGNAL( projectFilesChanged() ), this, SLOT( onProjectFilesChanged() ) );
viewPort = new NelGUIWidget; viewPort = new NelGUIWidget;
@ -94,8 +94,8 @@ namespace GUIEditor
delete linkEditor; delete linkEditor;
linkEditor = NULL; linkEditor = NULL;
delete procEditor; delete procList;
procEditor = NULL; procList = NULL;
delete projectWindow; delete projectWindow;
projectWindow = NULL; projectWindow = NULL;
@ -200,8 +200,8 @@ namespace GUIEditor
connect( a, SIGNAL( triggered( bool ) ), linkEditor, SLOT( show() ) ); connect( a, SIGNAL( triggered( bool ) ), linkEditor, SLOT( show() ) );
m->addAction( a ); m->addAction( a );
a = new QAction( "Proc Editor", this ); a = new QAction( "Procedure Editor", this );
connect( a, SIGNAL( triggered( bool ) ), procEditor, SLOT( show() ) ); connect( a, SIGNAL( triggered( bool ) ), procList, SLOT( show() ) );
m->addAction( a ); m->addAction( a );
a = new QAction( "Project Window", this ); a = new QAction( "Project Window", this );

View file

@ -32,7 +32,7 @@ namespace GUIEditor
class CWidgetProperties; class CWidgetProperties;
class WidgetHierarchy; class WidgetHierarchy;
class LinkEditor; class LinkEditor;
class ProcEditor; class ProcList;
class ProjectWindow; class ProjectWindow;
class NelGUIWidget; class NelGUIWidget;
@ -68,7 +68,7 @@ private:
WidgetHierarchy *hierarchyView; WidgetHierarchy *hierarchyView;
QtTreePropertyBrowser *propBrowser; QtTreePropertyBrowser *propBrowser;
LinkEditor *linkEditor; LinkEditor *linkEditor;
ProcEditor *procEditor; ProcList *procList;
ProjectWindow *projectWindow; ProjectWindow *projectWindow;
NelGUIWidget *viewPort; NelGUIWidget *viewPort;

View file

@ -2,6 +2,9 @@
<ui version="4.0"> <ui version="4.0">
<class>LinkEditor</class> <class>LinkEditor</class>
<widget class="QWidget" name="LinkEditor"> <widget class="QWidget" name="LinkEditor">
<property name="windowModality">
<enum>Qt::ApplicationModal</enum>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>

View file

@ -119,7 +119,8 @@ namespace GUIEditor
void NelGUIWidget::paintEvent( QPaintEvent *evnt ) void NelGUIWidget::paintEvent( QPaintEvent *evnt )
{ {
//draw(); if( !guiLoaded )
clear();
} }
void NelGUIWidget::timerEvent( QTimerEvent *evnt ) void NelGUIWidget::timerEvent( QTimerEvent *evnt )

View file

@ -2,6 +2,9 @@
<ui version="4.0"> <ui version="4.0">
<class>ProcEditor</class> <class>ProcEditor</class>
<widget class="QWidget" name="ProcEditor"> <widget class="QWidget" name="ProcEditor">
<property name="windowModality">
<enum>Qt::ApplicationModal</enum>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>