Merge gsoc2012-gui-editor.
dfighter1985
11 years ago
commit
b4a64d4c04
@ -0,0 +1,30 @@
|
||||
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
|
||||
// Copyright (C) 2010 Winch Gate Property Limited
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Affero General Public License as
|
||||
// published by the Free Software Foundation, either version 3 of the
|
||||
// License, or (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Affero General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Affero General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace NLGUI
|
||||
{
|
||||
/// Watches the currently selected GUI widget
|
||||
class IEditorSelectionWatcher
|
||||
{
|
||||
public:
|
||||
|
||||
/// Notifies the watcher about the change
|
||||
virtual void selectionChanged( std::string &newSelection ) = 0;
|
||||
};
|
||||
}
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
|
||||
// Copyright (C) 2010 Winch Gate Property Limited
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Affero General Public License as
|
||||
// published by the Free Software Foundation, either version 3 of the
|
||||
// License, or (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Affero General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Affero General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#ifndef WIDGET_ADD_WATCHER
|
||||
#define WIDGET_ADD_WATCHER
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace NLGUI
|
||||
{
|
||||
class IWidgetAdditionWatcher
|
||||
{
|
||||
public:
|
||||
virtual void widgetAdded( const std::string &name ) = 0;
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@ -0,0 +1,77 @@
|
||||
#include "add_widget_widget.h"
|
||||
#include "widget_info_tree.h"
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <QMessageBox>
|
||||
|
||||
namespace GUIEditor
|
||||
{
|
||||
|
||||
AddWidgetWidget::AddWidgetWidget( QWidget *parent ) :
|
||||
QWidget( parent )
|
||||
{
|
||||
setupUi( this );
|
||||
setupConnections();
|
||||
}
|
||||
|
||||
AddWidgetWidget::~AddWidgetWidget()
|
||||
{
|
||||
}
|
||||
|
||||
void AddWidgetWidget::setCurrentGroup( const QString &g )
|
||||
{
|
||||
groupEdit->setText( g );
|
||||
}
|
||||
|
||||
void AddWidgetWidget::setupWidgetInfo( const CWidgetInfoTree *tree )
|
||||
{
|
||||
std::vector< std::string > names;
|
||||
tree->getNames( names, false );
|
||||
|
||||
widgetCB->clear();
|
||||
|
||||
std::sort( names.begin(), names.end() );
|
||||
|
||||
std::vector< std::string >::const_iterator itr = names.begin();
|
||||
while( itr != names.end() )
|
||||
{
|
||||
widgetCB->addItem( QString( itr->c_str() ) );
|
||||
++itr;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void AddWidgetWidget::setupConnections()
|
||||
{
|
||||
connect( cancelButton, SIGNAL( clicked( bool ) ), this, SLOT( close() ) );
|
||||
connect( addButton, SIGNAL( clicked( bool ) ), this, SLOT( onAddClicked() ) );
|
||||
}
|
||||
|
||||
void AddWidgetWidget::onAddClicked()
|
||||
{
|
||||
if( groupEdit->text().isEmpty() )
|
||||
{
|
||||
QMessageBox::warning( NULL,
|
||||
tr( "WARNING" ),
|
||||
tr( "You need to be adding the new widget into a group!" ),
|
||||
QMessageBox::Ok );
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if( nameEdit->text().isEmpty() )
|
||||
{
|
||||
QMessageBox::warning( NULL,
|
||||
tr( "WARNING" ),
|
||||
tr( "You need to specify a name for your new widget!" ),
|
||||
QMessageBox::Ok );
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
close();
|
||||
|
||||
Q_EMIT adding( groupEdit->text(), widgetCB->currentText(), nameEdit->text() );
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
#ifndef ADD_WIDGET_WIDGET_H
|
||||
#define ADD_WIDGET_WIDGET_H
|
||||
|
||||
#include "ui_add_widget_widget.h"
|
||||
|
||||
namespace GUIEditor
|
||||
{
|
||||
class CWidgetInfoTree;
|
||||
|
||||
class AddWidgetWidget : public QWidget, public Ui::AddWidgetWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
AddWidgetWidget( QWidget *parent = NULL );
|
||||
~AddWidgetWidget();
|
||||
|
||||
void setCurrentGroup( const QString &g );
|
||||
void setupWidgetInfo( const CWidgetInfoTree *tree );
|
||||
|
||||
private:
|
||||
void setupConnections();
|
||||
|
||||
private Q_SLOTS:
|
||||
void onAddClicked();
|
||||
|
||||
Q_SIGNALS:
|
||||
void adding( const QString &parentGroup, const QString &widgetType, const QString &name );
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -0,0 +1,79 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>AddWidgetWidget</class>
|
||||
<widget class="QWidget" name="AddWidgetWidget">
|
||||
<property name="windowModality">
|
||||
<enum>Qt::ApplicationModal</enum>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>318</width>
|
||||
<height>132</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Add new widget</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
<item row="0" column="0" colspan="2">
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Group</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QLineEdit" name="groupEdit">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="readOnly">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>Widget</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QComboBox" name="widgetCB"/>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
<string>Name</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QLineEdit" name="nameEdit"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QPushButton" name="addButton">
|
||||
<property name="text">
|
||||
<string>Add</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QPushButton" name="cancelButton">
|
||||
<property name="text">
|
||||
<string>Cancel</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
@ -0,0 +1,134 @@
|
||||
// Object Viewer Qt GUI Editor plugin <http://dev.ryzom.com/projects/ryzom/>
|
||||
// Copyright (C) 2010 Winch Gate Property Limited
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Affero General Public License as
|
||||
// published by the Free Software Foundation, either version 3 of the
|
||||
// License, or (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Affero General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Affero General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include <QMessageBox>
|
||||
#include "editor_message_processor.h"
|
||||
|
||||
#include "nel/gui/interface_group.h"
|
||||
#include "nel/gui/widget_manager.h"
|
||||
#include "widget_info_tree.h"
|
||||
|
||||
namespace GUIEditor
|
||||
{
|
||||
void CEditorMessageProcessor::onDelete()
|
||||
{
|
||||
std::string selection = CWidgetManager::getInstance()->getCurrentEditorSelection();
|
||||
if( selection.empty() )
|
||||
return;
|
||||
|
||||
QMessageBox::StandardButton r =
|
||||
QMessageBox::question( NULL,
|
||||
tr( "Deleting widget" ),
|
||||
tr( "Are you sure you want to delete %1?" ).arg( selection.c_str() ),
|
||||
QMessageBox::Yes | QMessageBox::No );
|
||||
if( r != QMessageBox::Yes )
|
||||
return;
|
||||
|
||||
CInterfaceElement *e =
|
||||
CWidgetManager::getInstance()->getElementFromId( selection );
|
||||
if( e == NULL )
|
||||
return;
|
||||
|
||||
CInterfaceElement *p = e->getParent();
|
||||
if( p == NULL )
|
||||
return;
|
||||
|
||||
CInterfaceGroup *g = dynamic_cast< CInterfaceGroup* >( p );
|
||||
if( g == NULL )
|
||||
return;
|
||||
|
||||
if( g->delElement( e ) )
|
||||
{
|
||||
CWidgetManager::getInstance()->setCurrentEditorSelection( "" );
|
||||
}
|
||||
}
|
||||
|
||||
void CEditorMessageProcessor::onAdd( const QString &parentGroup, const QString &widgetType, const QString &name )
|
||||
{
|
||||
CWidgetInfoTreeNode *node = tree->findNodeByName( std::string( widgetType.toUtf8() ) );
|
||||
// No such widget
|
||||
if( node == NULL )
|
||||
{
|
||||
QMessageBox::critical(
|
||||
NULL,
|
||||
tr( "Error" ),
|
||||
tr( "Error adding the new widget! No such widget type!" ),
|
||||
QMessageBox::Ok
|
||||
);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
// No class name defined
|
||||
std::string className = node->getInfo().className;
|
||||
if( className.empty() )
|
||||
{
|
||||
QMessageBox::critical(
|
||||
NULL,
|
||||
tr( "Error" ),
|
||||
tr( "Error adding the new widget! Missing classname!" ),
|
||||
QMessageBox::Ok
|
||||
);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
std::string pgName = std::string( parentGroup.toUtf8() );
|
||||
std::string wName = std::string( name.toUtf8() );
|
||||
|
||||
CInterfaceElement *e =
|
||||
CWidgetManager::getInstance()->addWidgetToGroup(
|
||||
pgName,
|
||||
className,
|
||||
wName
|
||||
);
|
||||
|
||||
// Failed to add widget
|
||||
if( e == NULL )
|
||||
{
|
||||
QMessageBox::critical(
|
||||
NULL,
|
||||
tr( "Error" ),
|
||||
tr( "Error adding the new widget!" ),
|
||||
QMessageBox::Ok
|
||||
);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
// Setting the defaults will override the Id too
|
||||
std::string id = e->getId();
|
||||
|
||||
// Set up the defaults
|
||||
std::vector< SPropEntry >::const_iterator itr = node->getInfo().props.begin();
|
||||
while( itr != node->getInfo().props.end() )
|
||||
{
|
||||
e->setProperty( itr->propName, itr->propDefault );
|
||||
++itr;
|
||||
}
|
||||
|
||||
// Restore the Id
|
||||
e->setId( id );
|
||||
// Make the widget aligned to the top left corner
|
||||
e->setParentPosRef( Hotspot_TL );
|
||||
e->setPosRef( Hotspot_TL );
|
||||
|
||||
// Apply the new settings
|
||||
e->setActive( false );
|
||||
e->setActive( true );
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
// Object Viewer Qt GUI Editor plugin <http://dev.ryzom.com/projects/ryzom/>
|
||||
// Copyright (C) 2010 Winch Gate Property Limited
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Affero General Public License as
|
||||
// published by the Free Software Foundation, either version 3 of the
|
||||
// License, or (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Affero General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Affero General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include <QObject>
|
||||
|
||||
namespace GUIEditor
|
||||
{
|
||||
class CWidgetInfoTree;
|
||||
|
||||
/// Processes the GUI Editor's editor messages like delete, new, etc...
|
||||
class CEditorMessageProcessor : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
CEditorMessageProcessor( QObject *parent = NULL ) :
|
||||
QObject( parent )
|
||||
{
|
||||
tree = NULL;
|
||||
}
|
||||
|
||||
~CEditorMessageProcessor(){}
|
||||
|
||||
void setTree( CWidgetInfoTree *tree ){ this->tree = tree; }
|
||||
|
||||
public Q_SLOTS:
|
||||
void onDelete();
|
||||
void onAdd( const QString &parentGroup, const QString &widgetType, const QString &name );
|
||||
|
||||
private:
|
||||
CWidgetInfoTree *tree;
|
||||
};
|
||||
}
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
|
||||
// Copyright (C) 2010 Winch Gate Property Limited
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Affero General Public License as
|
||||
// published by the Free Software Foundation, either version 3 of the
|
||||
// License, or (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Affero General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Affero General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "editor_selection_watcher.h"
|
||||
|
||||
namespace GUIEditor
|
||||
{
|
||||
void CEditorSelectionWatcher::selectionChanged( std::string &newSelection )
|
||||
{
|
||||
Q_EMIT sgnSelectionChanged( newSelection );
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
|
||||
// Copyright (C) 2010 Winch Gate Property Limited
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Affero General Public License as
|
||||
// published by the Free Software Foundation, either version 3 of the
|
||||
// License, or (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Affero General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Affero General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "nel/gui/editor_selection_watcher.h"
|
||||
#include <QObject>
|
||||
|
||||
namespace GUIEditor
|
||||
{
|
||||
/// Watches the Editor selection, and emits a signal when it changes
|
||||
class CEditorSelectionWatcher : public QObject, public NLGUI::IEditorSelectionWatcher
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
CEditorSelectionWatcher() : QObject( NULL ){}
|
||||
|
||||
void selectionChanged( std::string &newSelection );
|
||||
|
||||
Q_SIGNALS:
|
||||
void sgnSelectionChanged( std::string &id );
|
||||
};
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue