Skip to content

Commit

Permalink
Merge pull request #96 from openstudiocoalition/update_icons
Browse files Browse the repository at this point in the history
Update icons
  • Loading branch information
macumber authored Nov 26, 2021
2 parents 1df6303 + fa8ab15 commit 0135a89
Show file tree
Hide file tree
Showing 201 changed files with 131 additions and 265 deletions.
2 changes: 1 addition & 1 deletion plugin/openstudio.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

module OpenStudio
SKETCHUPPLUGIN_NAME = "OpenStudio"
SKETCHUPPLUGIN_VERSION = "1.2.1"
SKETCHUPPLUGIN_VERSION = "1.3.0"
SKETCHUPPLUGIN_LAUNCH_GETTING_STARTED_ON_START = false
end

Expand Down
228 changes: 79 additions & 149 deletions plugin/openstudio/lib/MenuManager.rb

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions plugin/openstudio/lib/PluginManager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def self.current_call_stack
# PluginManager is an App level class, its members correspond to global variables
class PluginManager

attr_reader :name, :version, :dir, :profile_running
attr_reader :name, :version, :dir, :image_ext, :profile_running
attr_reader :event_queue
attr_reader :openstudio_application_dir

Expand All @@ -117,6 +117,7 @@ def initialize
@version = OpenStudio::SKETCHUPPLUGIN_VERSION
@dir = File.dirname(__FILE__) + "/.."
@profile_running = false
@image_ext = platform_select('.svg', '.pdf')

# this global variable is set by openstudio.rb
@openstudio_application_dir = eval("$OPENSTUDIO_APPLICATION_DIR")
Expand Down Expand Up @@ -199,7 +200,7 @@ def start
add_event( proc )

if OpenStudio::SKETCHUPPLUGIN_LAUNCH_GETTING_STARTED_ON_START
UI.openURL("http://nrel.github.io/OpenStudio-user-documentation/reference/sketchup_plugin_interface/")
UI.openURL("https://openstudiocoalition.org/reference/sketchup_plugin_interface/")
end

@process_events_timer_id = nil
Expand Down Expand Up @@ -542,9 +543,9 @@ def log(level, message)

# initialize QApplication
OpenStudio::ApplicationClass::instance.application(true)
OpenStudio::ApplicationClass::instance.application.setOrganizationName("NREL")
OpenStudio::ApplicationClass::instance.application.setOrganizationDomain("nrel.gov")
OpenStudio::ApplicationClass::instance.application.setApplicationName("OpenStudio")
OpenStudio::ApplicationClass::instance.application.setOrganizationName("OpenStudio Coalition")
OpenStudio::ApplicationClass::instance.application.setOrganizationDomain("openstudiocoalition.org")
OpenStudio::ApplicationClass::instance.application.setApplicationName("OpenStudioSketchUpPlugIn")

# get SketchUp Qt Widget if possible
SketchUpWidget = OpenStudio::ApplicationClass::instance.sketchUpWidget
Expand Down
14 changes: 8 additions & 6 deletions plugin/openstudio/lib/dialogs/html/About.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,21 @@

<center>

<a href="https://openstudiocoalition.org/" target="_blank"><img src="sp_png_256x256.png" border="0"></a>
<a href="https://openstudiocoalition.org/" target="_blank"><img src="os_256.png" border="0" width="250" height="250"></a>

<br>

<span style="font-size:x-large;">OpenStudio SketchUp Plug-in</span><br><br>
SketchUp Plug-in Version:<br><input id="OPENSTUDIO_SKETCHUPPLUGIN_VERSION" name="OPENSTUDIO_SKETCHUPPLUGIN_VERSION" type="text" size="50" class="static_text" style="text-align:center; border:0; border-style:solid;" readonly><br>
OpenStudio Application Dir:<br><input id="OPENSTUDIO_APPLICATION_DIR" name="OPENSTUDIO_APPLICATION_DIR" type="text" size="50" class="static_text" style="text-align:center; border:0; border-style:solid;" readonly><br>
<span style="font-size:x-large;">OpenStudio SketchUp Plug-in</span><br><br><br><br>

<b>SketchUp Plug-in Version:</b><br><input id="OPENSTUDIO_SKETCHUPPLUGIN_VERSION" name="OPENSTUDIO_SKETCHUPPLUGIN_VERSION" type="text" size="50" class="static_text" style="text-align:center; border:0; border-style:solid;" readonly><br>
<a href="https://openstudiocoalition.org/" target="_blank">https://openstudiocoalition.org/</a><br><br>

OpenStudio SDK (core) Version:<br><input id="OPENSTUDIO_VERSION" name="OPENSTUDIO_VERSION" type="text" size="50" class="static_text" style="text-align:center; border:0; border-style:solid;" readonly><br>
<b>OpenStudio Application Dir:</b><br><input id="OPENSTUDIO_APPLICATION_DIR" name="OPENSTUDIO_APPLICATION_DIR" type="text" size="50" class="static_text" style="text-align:center; border:0; border-style:solid;" readonly><br><br>

<b>OpenStudio SDK (core) Version:</b><br><input id="OPENSTUDIO_VERSION" name="OPENSTUDIO_VERSION" type="text" size="50" class="static_text" style="text-align:center; border:0; border-style:solid;" readonly><br>
<a href="https://openstudio.net" target="_blank">https://openstudio.net/</a><br><br>

Copyright &copy; 2020-2021, OpenStudio Coalition and other contributors<br><br>
<b>Copyright &copy; 2020-2021:</b><br>OpenStudio Coalition and other contributors<br><br>

<input id="ok" onclick="onOK()" type="button" class="button" value=" OK ">

Expand Down
4 changes: 2 additions & 2 deletions plugin/openstudio/lib/dialogs/html/SurfaceMatching.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<body onload="onLoad()" link="#0000FF" alink="#0000FF" vlink="#0000FF" class="label">

<fieldset>
<legend>Intersect and Divide Inter-Zone Surfaces <a href="http://nrel.github.io/OpenStudio-user-documentation/reference/sketchup_plugin_interface/#surface-matching" target="_blank">(help)</a></legend>
<legend>Intersect and Divide Inter-Zone Surfaces <a href="http://openstudiocoalition.org/reference/sketchup_plugin_interface/#surface-matching" target="_blank">(help)</a></legend>

<i>Some users have reported issues with the intersect functionality in this dialog. If you experience problems, please try to using the "IntersectSpaceGeometry" user script.</i>

Expand All @@ -58,7 +58,7 @@


<fieldset>
<legend>Surface Matching <a href="http://http://nrel.github.io/OpenStudio-user-documentation/reference/sketchup_plugin_interface/#surface-matching" target="_blank">(help)</a></legend>
<legend>Surface Matching <a href="http://openstudiocoalition.org/reference/sketchup_plugin_interface/#surface-matching" target="_blank">(help)</a></legend>

<table border="0" cellpadding="4" width="100%" align="center">

Expand Down
2 changes: 1 addition & 1 deletion plugin/openstudio/lib/dialogs/html/SurfaceSearch.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<body onload="onLoad()" link="#0000FF" alink="#0000FF" vlink="#0000FF" class="label">

<fieldset>
<legend>Surface Search <a href="http://nrel.github.io/OpenStudio-user-documentation/reference/sketchup_plugin_interface/#surface-search" target="_blank">(help)</a></legend>
<legend>Surface Search <a href="https://openstudiocoalition.org/reference/sketchup_plugin_interface/#surface-search" target="_blank">(help)</a></legend>

<table border="0" cellpadding="4" width="100%" align="center">

Expand Down
Binary file added plugin/openstudio/lib/dialogs/html/os_256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file added plugin/openstudio/lib/resources/icons.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed plugin/openstudio/lib/resources/icons/Forward16.png
Binary file not shown.
Binary file removed plugin/openstudio/lib/resources/icons/Forward24.png
Binary file not shown.
Binary file removed plugin/openstudio/lib/resources/icons/ForwardFull16.png
Binary file not shown.
Binary file removed plugin/openstudio/lib/resources/icons/ForwardFull24.png
Binary file not shown.
Binary file removed plugin/openstudio/lib/resources/icons/Help-16.png
Binary file not shown.
Binary file removed plugin/openstudio/lib/resources/icons/Help-24.png
Binary file not shown.
Binary file removed plugin/openstudio/lib/resources/icons/HideRest-16.png
Binary file not shown.
Binary file removed plugin/openstudio/lib/resources/icons/HideRest-24.png
Binary file not shown.
Binary file removed plugin/openstudio/lib/resources/icons/IDFExport-16.png
Binary file not shown.
Binary file removed plugin/openstudio/lib/resources/icons/IDFExport-24.png
Binary file not shown.
Binary file removed plugin/openstudio/lib/resources/icons/IDFImport-16.png
Binary file not shown.
Binary file removed plugin/openstudio/lib/resources/icons/IDFImport-24.png
Binary file not shown.
Binary file removed plugin/openstudio/lib/resources/icons/InfoTool-16.png
Binary file not shown.
Binary file not shown.
Binary file removed plugin/openstudio/lib/resources/icons/Inspector-16.png
Binary file not shown.
Binary file not shown.
Binary file removed plugin/openstudio/lib/resources/icons/ModelMaker-16.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Binary file removed plugin/openstudio/lib/resources/icons/NewGlare-16.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed plugin/openstudio/lib/resources/icons/NewShading-16.png
Diff not rendered.
Binary file removed plugin/openstudio/lib/resources/icons/NewShading-24.png
Diff not rendered.
Binary file removed plugin/openstudio/lib/resources/icons/NewSpace-16.png
Diff not rendered.
Binary file removed plugin/openstudio/lib/resources/icons/NewSpace-24.png
Diff not rendered.
Binary file not shown.
1 change: 1 addition & 0 deletions plugin/openstudio/lib/resources/icons/OSC_IDFexport.svg
Binary file not shown.
1 change: 1 addition & 0 deletions plugin/openstudio/lib/resources/icons/OSC_IDFimport.svg
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions plugin/openstudio/lib/resources/icons/OSC_SU_shadows.svg
Binary file not shown.
Loading

0 comments on commit 0135a89

Please sign in to comment.