diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-06-02 19:49:24 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-06-03 20:35:30 +0000 |
| commit | e31dc1f32f6cd90a6a31ae239708818f8b71bc60 (patch) | |
| tree | 0629b80430df728ea6a78008de6d33c299549cb1 /src | |
| parent | CI: Recover and update some translation checks (diff) | |
| download | inkscape-e31dc1f32f6cd90a6a31ae239708818f8b71bc60.tar.gz inkscape-e31dc1f32f6cd90a6a31ae239708818f8b71bc60.zip | |
Attemp to add values from enums
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/dialog/styledialog.cpp | 12 | ||||
| -rw-r--r-- | src/ui/dialog/styledialog.h | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp index a96ec43a6..d50a755cf 100644 --- a/src/ui/dialog/styledialog.cpp +++ b/src/ui/dialog/styledialog.cpp @@ -467,8 +467,8 @@ void StyleDialog::_readStyleElement() value->property_editable() = true; value->signal_edited().connect( sigc::bind<Glib::RefPtr<Gtk::TreeStore>>(sigc::mem_fun(*this, &StyleDialog::_valueEdited), store)); - // value->signal_editing_started().connect( sigc::bind<Glib::RefPtr<Gtk::TreeStore> >(sigc::mem_fun(*this, - // &StyleDialog::_startValueEdit), store)); + value->signal_editing_started().connect( sigc::bind<Glib::RefPtr<Gtk::TreeStore> >(sigc::mem_fun(*this, + &StyleDialog::_startValueEdit), store)); addCol = css_tree->append_column("CSS Value", *value) - 1; col = css_tree->get_column(addCol); if (col) { @@ -581,6 +581,8 @@ void StyleDialog::_readStyleElement() value->signal_edited().connect( sigc::bind<Glib::RefPtr<Gtk::TreeStore>>(sigc::mem_fun(*this, &StyleDialog::_valueEdited), store)); value->property_placeholder_text() = _("value"); + value->signal_editing_started().connect( sigc::bind<Glib::RefPtr<Gtk::TreeStore> >(sigc::mem_fun(*this, + &StyleDialog::_startValueEdit), store)); addCol = css_tree->append_column("CSS Value", *value) - 1; col = css_tree->get_column(addCol); if (col) { @@ -925,15 +927,15 @@ void StyleDialog::_startNameEdit(Gtk::CellEditable *cell, const Glib::ustring &p entry->set_completion(_entry_completion); } -/* void +void StyleDialog::_setAutocompletion(Gtk::Entry *entry, SPStyleEnum const cssenum[]) { Glib::RefPtr<Gtk::ListStore> completionModel = Gtk::ListStore::create(_mCSSData); Glib::RefPtr<Gtk::EntryCompletion> entry_completion = Gtk::EntryCompletion::create(); + entry_completion->set_model(completionModel); entry_completion->set_text_column (_mCSSData._colCSSData); entry_completion->set_minimum_key_length(0); entry_completion->set_popup_completion(true); - gint counter = 0; const char * key = cssenum[counter].key; while (key) { @@ -998,7 +1000,7 @@ StyleDialog::_startValueEdit(Gtk::CellEditable* cell, const Glib::ustring& path, _setAutocompletion(entry, enum_color_interpolation); } } -} */ +} /** * @brief StyleDialog::nameEdited diff --git a/src/ui/dialog/styledialog.h b/src/ui/dialog/styledialog.h index 7b1a7cde5..e4a621182 100644 --- a/src/ui/dialog/styledialog.h +++ b/src/ui/dialog/styledialog.h @@ -127,8 +127,8 @@ class StyleDialog : public Widget::Panel { void _valueEdited(const Glib::ustring &path, const Glib::ustring &value, Glib::RefPtr<Gtk::TreeStore> store); void _startNameEdit(Gtk::CellEditable *cell, const Glib::ustring &path); - // void _startValueEdit(Gtk::CellEditable* cell, const Glib::ustring& path, Glib::RefPtr<Gtk::TreeStore> store); - // void _setAutocompletion(Gtk::Entry *entry, SPStyleEnum const cssenum[]); + void _startValueEdit(Gtk::CellEditable* cell, const Glib::ustring& path, Glib::RefPtr<Gtk::TreeStore> store); + void _setAutocompletion(Gtk::Entry *entry, SPStyleEnum const cssenum[]); void _reload(); // Update watchers |