#include "layerdialog.h"
-#include "rs_layer.h"
-#include "rs_layerlist.h"
+#include "layer.h"
+#include "layerlist.h"
LayerDialog::LayerDialog(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/):
QDialog(parent, flags), layer(NULL), layerList(NULL), layerName(""), editLayer(false)
{
}
-void LayerDialog::setLayer(RS_Layer * l)
+void LayerDialog::setLayer(Layer * l)
{
layer = l;
layerName = layer->getName();
ui.leName->setEnabled(false);
}
-void LayerDialog::setLayerList(RS_LayerList * ll)
+void LayerDialog::setLayerList(LayerList * ll)
{
layerList = ll;
}
layer->setPen(ui.wPen->getPen());
#if 0
//OK, the problem is the color widget is misreporting the color that's been set.
-RS_Color c = ui.wPen->getPen().getColor();
+Color c = ui.wPen->getPen().getColor();
printf("LayerDialog::updateLayer() -> selected pen is %u, %u, %u\n", c.red(), c.green(), c.blue());
std::cout << ui.wPen->getPen();
-RS_Pen p = layer->getPen();
+Pen p = layer->getPen();
c = p.getColor();
printf("LayerDialog::updateLayer() -> selected pen is %u, %u, %u\n", c.red(), c.green(), c.blue());
std::cout << ui.wPen->getPen();
void LayerDialog::validate()
{
- if (layerList != NULL && (editLayer == FALSE || layerName != ui.leName->text()))
+ if (layerList && (!editLayer || layerName != ui.leName->text()))
{
- RS_Layer * l = layerList->find(ui.leName->text().toLatin1());
+ Layer * l = layerList->find(ui.leName->text().toLatin1());
- if (l != NULL)
+ if (l)
{
QMessageBox::information(parentWidget(), QMessageBox::tr("Layer Properties"),
QMessageBox::tr("Layer with a name \"%1\" already exists. Please specify "