Skip to content

[FIX] Remove '(from Orange3)' from widget names in canvas#1385

Merged
astaric merged 1 commit intobiolab:masterfrom
janezd:no-from-orange3
Jul 6, 2016
Merged

[FIX] Remove '(from Orange3)' from widget names in canvas#1385
astaric merged 1 commit intobiolab:masterfrom
janezd:no-from-orange3

Conversation

@janezd
Copy link
Contributor

@janezd janezd commented Jun 26, 2016

Tooltips on widget toolbars showed "(from Orange3)" after the name of each widget due to mismatching project name.

@ales-erjavec, @astaric, is there a better, long-term solution? Comparing with Orange.setup.NAME doesn't seem appropriate - or is it?

@codecov-io
Copy link

codecov-io commented Jun 26, 2016

Current coverage is 88.04%

Merging #1385 into master will not change coverage

@@             master      #1385   diff @@
==========================================
  Files            77         77          
  Lines          7489       7489          
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
  Hits           6594       6594          
  Misses          895        895          
  Partials          0          0          

Sunburst

Powered by Codecov. Last updated by f415742...4be4f75

@kernc
Copy link
Contributor

kernc commented Jun 27, 2016

setup.py doesn't get installed. You could check for existence of '-':

desc.project_name and (not desc.project_name.startswith('Orange') or '-' in desc.project_name)

@janezd
Copy link
Contributor Author

janezd commented Jun 27, 2016

Why '-' in desc.project_name?

@kernc
Copy link
Contributor

kernc commented Jun 28, 2016

So the addendum won't show for Orange core widgets but will show for widgets from add-ons, normally named Orange-Something. It's what the PR is about, no?

@janezd janezd force-pushed the no-from-orange3 branch from 224fd32 to 3a60974 Compare June 28, 2016 18:30
@janezd
Copy link
Contributor Author

janezd commented Jun 28, 2016

Changed as told. And let's please attribute my question to sleep deprivation or something. Thanks.

tooltip.append("<b>{name}</b>".format(name=escape(desc.name)))

if desc.project_name and desc.project_name != "Orange":
if desc.project_name and (not desc.project_name.startswith('Orange') or
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could also remove the additional condition and just show (from package_name) for all projects. This might come in handy if (when) we decide to separate canvas and core widgets.

@janezd janezd force-pushed the no-from-orange3 branch from 3a60974 to 4be4f75 Compare July 5, 2016 21:59
@janezd
Copy link
Contributor Author

janezd commented Jul 5, 2016

Done.

@astaric astaric merged commit 0a9b2a4 into biolab:master Jul 6, 2016
@janezd janezd deleted the no-from-orange3 branch April 5, 2019 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants