From f93510e1fdca73da2e7755a5c2a40341e9355830 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Mon, 16 May 2016 16:40:00 +0200 Subject: UI. Fixing typos in original strings. Translations. PO template update. (bzr r14894) --- src/ui/dialog/inkscape-preferences.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ui/dialog') diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index c7a168dee..30bbd95c9 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -210,8 +210,8 @@ void InkscapePreferences::AddBaseSimplifySpinbutton(DialogPage &p, Glib::ustring { PrefSpinButton* sb = Gtk::manage( new PrefSpinButton); sb->init ( prefs_path + "/base-simplify", 0.0, 100.0, 1.0, 10.0, def_value, false, false); - p.add_line( false, _("Base simplify:"), *sb, _("on dinamic LPE simplify"), - _("Base simplify of dinamic LPE based simplify"), + p.add_line( false, _("Base simplify:"), *sb, _("on dynamic LPE simplify"), + _("Base simplify of dynamic LPE based simplify"), false ); } -- cgit v1.2.3 From 30cdce52c67422b6403fc5bc54fbc4a0404a5b3a Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 18 May 2016 13:47:57 +0200 Subject: GTK3: Give even more widgets names. (bzr r14901) --- src/ui/dialog/swatches.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/ui/dialog') diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp index 924ebe03d..f2298b59b 100644 --- a/src/ui/dialog/swatches.cpp +++ b/src/ui/dialog/swatches.cpp @@ -594,6 +594,7 @@ SwatchesPanel::SwatchesPanel(gchar const* prefsPath) : _currentDesktop(0), _currentDocument(0) { + set_name( "SwatchesPanel" ); Gtk::RadioMenuItem* hotItem = 0; _holder = new PreviewHolder(); _clear = new ColorItem( ege::PaintDef::CLEAR ); -- cgit v1.2.3 From 0a5ca4a41841f4d42dc051255562724a3b64bf66 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 18 May 2016 15:35:03 +0200 Subject: GTK3: Another widget named. (bzr r14902) --- src/ui/dialog/color-item.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/ui/dialog') diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp index 6603d5c69..34cdb92e3 100644 --- a/src/ui/dialog/color-item.cpp +++ b/src/ui/dialog/color-item.cpp @@ -571,6 +571,8 @@ Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, ::PreviewS widget = lbl; } else { GtkWidget* eekWidget = eek_preview_new(); + gtk_widget_set_name( eekWidget, "ColorItemPreview" ); + EekPreview * preview = EEK_PREVIEW(eekWidget); Gtk::Widget* newBlot = Glib::wrap(eekWidget); _regenPreview(preview); -- cgit v1.2.3 From 9e9ce2c30be9d6af144ff07f69c15c508d84e776 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Sat, 21 May 2016 11:58:25 +0200 Subject: Fix regression: restore order in resources (e.g. pattern list) (bzr r14907) --- src/ui/dialog/document-properties.cpp | 32 ++++++++++++++++---------------- src/ui/dialog/filter-effects-dialog.cpp | 4 ++-- src/ui/dialog/svg-fonts-dialog.cpp | 4 ++-- src/ui/dialog/swatches.cpp | 16 ++++++++-------- 4 files changed, 28 insertions(+), 28 deletions(-) (limited to 'src/ui/dialog') diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index c2c5c5005..12eaba72a 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -492,8 +492,8 @@ void DocumentProperties::linkSelectedProfile() std::vector > pairs = ColorProfile::getProfileFilesWithNames(); Glib::ustring file = pairs[row].first; Glib::ustring name = pairs[row].second; - std::set current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" ); - for (std::set::const_iterator it = current.begin(); it != current.end(); ++it) { + std::vector current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" ); + for (std::vector::const_iterator it = current.begin(); it != current.end(); ++it) { SPObject* obj = *it; Inkscape::ColorProfile* prof = reinterpret_cast(obj); if (!strcmp(prof->href, file.c_str())) @@ -532,11 +532,11 @@ void DocumentProperties::linkSelectedProfile() void DocumentProperties::populate_linked_profiles_box() { _LinkedProfilesListStore->clear(); - std::set current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" ); + std::vector current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" ); if (! current.empty()) { _emb_profiles_observer.set((*(current.begin()))->parent); } - for (std::set::const_iterator it = current.begin(); it != current.end(); ++it) { + for (std::vector::const_iterator it = current.begin(); it != current.end(); ++it) { SPObject* obj = *it; Inkscape::ColorProfile* prof = reinterpret_cast(obj); Gtk::TreeModel::Row row = *(_LinkedProfilesListStore->append()); @@ -614,8 +614,8 @@ void DocumentProperties::removeSelectedProfile(){ return; } } - std::set current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" ); - for (std::set::const_iterator it = current.begin(); it != current.end(); ++it) { + std::vector current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" ); + for (std::vector::const_iterator it = current.begin(); it != current.end(); ++it) { SPObject* obj = *it; Inkscape::ColorProfile* prof = reinterpret_cast(obj); if (!name.compare(prof->name)){ @@ -738,7 +738,7 @@ void DocumentProperties::build_cms() _LinkedProfilesList.signal_button_release_event().connect_notify(sigc::mem_fun(*this, &DocumentProperties::linked_profiles_list_button_release)); cms_create_popup_menu(_LinkedProfilesList, sigc::mem_fun(*this, &DocumentProperties::removeSelectedProfile)); - std::set current = SP_ACTIVE_DOCUMENT->getResourceList( "defs" ); + std::vector current = SP_ACTIVE_DOCUMENT->getResourceList( "defs" ); if (!current.empty()) { _emb_profiles_observer.set((*(current.begin()))->parent); } @@ -975,7 +975,7 @@ void DocumentProperties::build_scripting() #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) //TODO: review this observers code: - std::set current = SP_ACTIVE_DOCUMENT->getResourceList( "script" ); + std::vector current = SP_ACTIVE_DOCUMENT->getResourceList( "script" ); if (! current.empty()) { _scripts_observer.set((*(current.begin()))->parent); } @@ -1190,8 +1190,8 @@ void DocumentProperties::removeExternalScript(){ } } - std::set current = SP_ACTIVE_DOCUMENT->getResourceList( "script" ); - for (std::set::const_iterator it = current.begin(); it != current.end(); ++it) { + std::vector current = SP_ACTIVE_DOCUMENT->getResourceList( "script" ); + for (std::vector::const_iterator it = current.begin(); it != current.end(); ++it) { SPObject* obj = *it; if (obj) { SPScript* script = dynamic_cast(obj); @@ -1268,8 +1268,8 @@ void DocumentProperties::changeEmbeddedScript(){ } bool voidscript=true; - std::set current = SP_ACTIVE_DOCUMENT->getResourceList( "script" ); - for (std::set::const_iterator it = current.begin(); it != current.end(); ++it) { + std::vector current = SP_ACTIVE_DOCUMENT->getResourceList( "script" ); + for (std::vector::const_iterator it = current.begin(); it != current.end(); ++it) { SPObject* obj = *it; if (id == obj->getId()){ @@ -1313,8 +1313,8 @@ void DocumentProperties::editEmbeddedScript(){ } Inkscape::XML::Document *xml_doc = SP_ACTIVE_DOCUMENT->getReprDoc(); - std::set current = SP_ACTIVE_DOCUMENT->getResourceList( "script" ); - for (std::set::const_iterator it = current.begin(); it != current.end(); ++it) { + std::vector current = SP_ACTIVE_DOCUMENT->getResourceList( "script" ); + for (std::vector::const_iterator it = current.begin(); it != current.end(); ++it) { SPObject* obj = *it; if (id == obj->getId()){ @@ -1337,13 +1337,13 @@ void DocumentProperties::editEmbeddedScript(){ void DocumentProperties::populate_script_lists(){ _ExternalScriptsListStore->clear(); _EmbeddedScriptsListStore->clear(); - std::set current = SP_ACTIVE_DOCUMENT->getResourceList( "script" ); + std::vector current = SP_ACTIVE_DOCUMENT->getResourceList( "script" ); if (!current.empty()) { SPObject *obj = *(current.begin()); g_assert(obj != NULL); _scripts_observer.set(obj->parent); } - for (std::set::const_iterator it = current.begin(); it != current.end(); ++it) { + for (std::vector::const_iterator it = current.begin(); it != current.end(); ++it) { SPObject* obj = *it; SPScript* script = dynamic_cast(obj); g_assert(script != NULL); diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index ce08ed1f7..d3ad5d1da 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -1591,11 +1591,11 @@ void FilterEffectsDialog::FilterModifier::update_filters() SPDesktop* desktop = _dialog.getDesktop(); SPDocument* document = desktop->getDocument(); - std::set filters = document->getResourceList( "filter" ); + std::vector filters = document->getResourceList( "filter" ); _model->clear(); - for (std::set::const_iterator it = filters.begin(); it != filters.end(); ++it) { + for (std::vector::const_iterator it = filters.begin(); it != filters.end(); ++it) { Gtk::TreeModel::Row row = *_model->append(); SPFilter* f = SP_FILTER(*it); row[_columns.filter] = f; diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp index 46e045c14..790c0e5fb 100644 --- a/src/ui/dialog/svg-fonts-dialog.cpp +++ b/src/ui/dialog/svg-fonts-dialog.cpp @@ -266,10 +266,10 @@ void SvgFontsDialog::update_fonts() { SPDesktop* desktop = this->getDesktop(); SPDocument* document = desktop->getDocument(); - std::set fonts = document->getResourceList( "fonts" ); + std::vector fonts = document->getResourceList( "fonts" ); _model->clear(); - for (std::set::const_iterator it = fonts.begin(); it != fonts.end(); ++it) { + for (std::vector::const_iterator it = fonts.begin(); it != fonts.end(); ++it) { Gtk::TreeModel::Row row = *_model->append(); SPFont* f = SP_FONT(*it); row[_columns.spfont] = f; diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp index f2298b59b..6577c8d4e 100644 --- a/src/ui/dialog/swatches.cpp +++ b/src/ui/dialog/swatches.cpp @@ -171,8 +171,8 @@ static void editGradient( GtkMenuItem */*menuitem*/, gpointer /*user_data*/ ) SPDocument *doc = desktop ? desktop->doc() : 0; if (doc) { std::string targetName(bounceTarget->def.descr); - std::set gradients = doc->getResourceList("gradient"); - for (std::set::const_iterator item = gradients.begin(); item != gradients.end(); ++item) { + std::vector gradients = doc->getResourceList("gradient"); + for (std::vector::const_iterator item = gradients.begin(); item != gradients.end(); ++item) { SPGradient* grad = SP_GRADIENT(*item); if ( targetName == grad->getId() ) { editGradientImpl( desktop, grad ); @@ -192,8 +192,8 @@ void SwatchesPanelHook::convertGradient( GtkMenuItem * /*menuitem*/, gpointer us gint index = GPOINTER_TO_INT(userData); if ( doc && (index >= 0) && (static_cast(index) < popupItems.size()) ) { Glib::ustring targetName = popupItems[index]; - std::set gradients = doc->getResourceList("gradient"); - for (std::set::const_iterator item = gradients.begin(); item != gradients.end(); ++item) { + std::vector gradients = doc->getResourceList("gradient"); + for (std::vector::const_iterator item = gradients.begin(); item != gradients.end(); ++item) { SPGradient* grad = SP_GRADIENT(*item); if ( targetName == grad->getId() ) { @@ -326,9 +326,9 @@ gboolean colorItemHandleButtonPress( GtkWidget* widget, GdkEventButton* event, g SPDesktopWidget *dtw = SP_DESKTOP_WIDGET(wdgt); if ( dtw && dtw->desktop ) { // Pick up all gradients with vectors - std::set gradients = (dtw->desktop->doc())->getResourceList("gradient"); + std::vector gradients = (dtw->desktop->doc())->getResourceList("gradient"); gint index = 0; - for (std::set::const_iterator item = gradients.begin(); item != gradients.end(); ++item) { + for (std::vector::const_iterator item = gradients.begin(); item != gradients.end(); ++item) { SPGradient* grad = SP_GRADIENT(*item); if ( grad->hasStops() && !grad->isSwatch() ) { //gl = g_slist_prepend(gl, curr->data); @@ -925,8 +925,8 @@ static void recalcSwatchContents(SPDocument* doc, std::map &gradMappings) { std::vector newList; - std::set gradients = doc->getResourceList("gradient"); - for (std::set::const_iterator item = gradients.begin(); item != gradients.end(); ++item) { + std::vector gradients = doc->getResourceList("gradient"); + for (std::vector::const_iterator item = gradients.begin(); item != gradients.end(); ++item) { SPGradient* grad = SP_GRADIENT(*item); if ( grad->isSwatch() ) { newList.push_back(SP_GRADIENT(*item)); -- cgit v1.2.3