index ccd91fa2e74ee191613d0e8f9f8183e06a8a356e..ffa4642e77533f0c4327ee4d9fb0f1ffdfa2e64c 100644 (file)
SPDesktop *desktop=dialog._desktop;
dialog.set_title(_("Rename Layer"));
gchar const *name = desktop->currentLayer()->label();
SPDesktop *desktop=dialog._desktop;
dialog.set_title(_("Rename Layer"));
gchar const *name = desktop->currentLayer()->label();
- dialog._layer_name_entry.set_text(( name ? name : "" ));
+ dialog._layer_name_entry.set_text(( name ? name : _("Layer") ));
dialog._apply_button.set_label(_("_Rename"));
}
void LayerPropertiesDialog::Rename::perform(LayerPropertiesDialog &dialog) {
SPDesktop *desktop=dialog._desktop;
Glib::ustring name(dialog._layer_name_entry.get_text());
dialog._apply_button.set_label(_("_Rename"));
}
void LayerPropertiesDialog::Rename::perform(LayerPropertiesDialog &dialog) {
SPDesktop *desktop=dialog._desktop;
Glib::ustring name(dialog._layer_name_entry.get_text());
+ if (name.empty())
+ return;
desktop->layer_manager->renameLayer( desktop->currentLayer(),
desktop->layer_manager->renameLayer( desktop->currentLayer(),
- ( name.empty() ? NULL : (gchar *)name.c_str() )
+ (gchar *)name.c_str(),
+ FALSE
);
sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE,
_("Rename layer"));
);
sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE,
_("Rename layer"));
void LayerPropertiesDialog::Create::setup(LayerPropertiesDialog &dialog) {
dialog.set_title(_("Add Layer"));
void LayerPropertiesDialog::Create::setup(LayerPropertiesDialog &dialog) {
dialog.set_title(_("Add Layer"));
- dialog._layer_name_entry.set_text("");
+ //TODO: find an unused layer number, forming name from _("Layer ") + "%d"
+ dialog._layer_name_entry.set_text(_("Layer"));
dialog._apply_button.set_label(_("_Add"));
dialog._setup_position_controls();
}
dialog._apply_button.set_label(_("_Add"));
dialog._setup_position_controls();
}
Gtk::ListStore::iterator activeRow(dialog._layer_position_combo.get_active());
position = activeRow->get_value(dialog._dropdown_columns.position);
}
Gtk::ListStore::iterator activeRow(dialog._layer_position_combo.get_active());
position = activeRow->get_value(dialog._dropdown_columns.position);
}
+ Glib::ustring name(dialog._layer_name_entry.get_text());
+ if (name.empty())
+ return;
SPObject *new_layer=Inkscape::create_layer(desktop->currentRoot(), dialog._layer, position);
SPObject *new_layer=Inkscape::create_layer(desktop->currentRoot(), dialog._layer, position);
- Glib::ustring name(dialog._layer_name_entry.get_text());
if (!name.empty()) {
if (!name.empty()) {
- desktop->layer_manager->renameLayer( new_layer, (gchar *)name.c_str() );
+ desktop->layer_manager->renameLayer( new_layer, (gchar *)name.c_str(), TRUE );
}
sp_desktop_selection(desktop)->clear();
desktop->setCurrentLayer(new_layer);
}
sp_desktop_selection(desktop)->clear();
desktop->setCurrentLayer(new_layer);