Skip to content

Commit

Permalink
Fixing duplicate qrc aliases, alphabetizing
Browse files Browse the repository at this point in the history
  • Loading branch information
axelstudios committed Aug 27, 2015
1 parent 4dd0a22 commit 338a99f
Showing 1 changed file with 31 additions and 34 deletions.
65 changes: 31 additions & 34 deletions openstudiocore/src/openstudio_lib/openstudio.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
<file>images/chiller_absorption_direct.png</file>
<file>images/chiller_absorption_indirect.png</file>
<file>images/chiller_air.png</file>
<file>images/coil_ht_dx_singlespeed.png</file>
<file>images/coil_system_coolingwater_heat_exchanger.png</file>
<file>images/coilcoolingchilledbeam.png</file>
<file>images/coilcoolinglowtemprad_constflow.png</file>
<file>images/coilcoolinglowtemprad_varflow.png</file>
<file>images/coilheatinglowtemprad_constflow.png</file>
<file>images/coilheatinglowtemprad_varflow.png</file>
<file>images/coilheatingwater_baseboard.png</file>
<file>images/coilsystem_cooling_dx.png</file>
<file>images/coil_ht_dx_singlespeed.png</file>
<file>images/coil_system_coolingwater_heat_exchanger.png</file>
<file>images/combo_box_arrows.png</file>
<file>images/combo_box_arrows_gray.png</file>
<file>images/coming_soon_building_summary.png</file>
Expand All @@ -45,10 +45,10 @@
<file>images/contextual_arrow_up.png</file>
<file>images/controller_icon_off.png</file>
<file>images/controller_icon_on.png</file>
<file>images/cool_coil.png</file>
<file>images/cooling_tower.png</file>
<file>images/cooling_tower_2speed.png</file>
<file>images/cooling_tower_variable.png</file>
<file>images/cool_coil.png</file>
<file>images/dehumidify_schedule_icon.png</file>
<file>images/delete-icon.png</file>
<file>images/delete.png</file>
Expand Down Expand Up @@ -81,10 +81,10 @@
<file>images/duplicate_off.png</file>
<file>images/duplicate_over.png</file>
<file>images/duplicate_press.png</file>
<file>images/dx_cooling_multispeed.png</file>
<file>images/dxcoolingcoil_2speed.png</file>
<file>images/dxcoolingcoil_2stage_humidity.png</file>
<file>images/dxcoolingcoil_singlespeed.png</file>
<file>images/dx_cooling_multispeed.png</file>
<file>images/electric_furnace.png</file>
<file>images/electric_humidifier.png</file>
<file>images/evap_cooled.png</file>
Expand Down Expand Up @@ -163,13 +163,13 @@
<file>images/on_thermal_zone_tab.png</file>
<file>images/on_var_tab.png</file>
<file>images/open_file.png</file>
<file>images/osm-icon-open.png</file>
<file>images/os_16.png</file>
<file>images/os_32.png</file>
<file>images/os_48.png</file>
<file>images/os_64.png</file>
<file>images/os_128.png</file>
<file>images/os_256.png</file>
<file>images/osm-icon-open.png</file>
<file>images/parallel_fan_terminal.png</file>
<file>images/pipe_adiabatic.png</file>
<file>images/pipe_indoor.png</file>
Expand All @@ -193,6 +193,8 @@
<file>images/series_fan_terminal.png</file>
<file>images/setpoint_coldest.png</file>
<file>images/setpoint_coldest_right.png</file>
<file>images/setpoint_dual.png</file>
<file>images/setpoint_dual_right.png</file>
<file>images/setpoint_follow_ground_temp.png</file>
<file>images/setpoint_follow_ground_temp_right.png</file>
<file>images/setpoint_follow_outdoorair.png</file>
Expand All @@ -213,23 +215,21 @@
<file>images/setpoint_multizone_maxhumidity_avg_right.png</file>
<file>images/setpoint_multizone_minhumidity_avg.png</file>
<file>images/setpoint_multizone_minhumidity_avg_right.png</file>
<file>images/setpoint_pretreat.png</file>
<file>images/setpoint_pretreat_right.png</file>
<file>images/setpoint_onestage_cooling.png</file>
<file>images/setpoint_onestage_cooling_right.png</file>
<file>images/setpoint_onestage_heating.png</file>
<file>images/setpoint_onestage_heating_right.png</file>
<file>images/setpoint_outdoorair.png</file>
<file>images/setpoint_outdoorair_right.png</file>
<file>images/setpoint_pretreat.png</file>
<file>images/setpoint_pretreat_right.png</file>
<file>images/setpoint_scheduled.png</file>
<file>images/setpoint_scheduled_right.png</file>
<file>images/setpoint_dual.png</file>
<file>images/setpoint_dual_right.png</file>
<file>images/setpoint_singlezone.png</file>
<file>images/setpoint_singlezone_humidity_max.png</file>
<file>images/setpoint_singlezone_humidity_max_right.png</file>
<file>images/setpoint_singlezone_humidity_min.png</file>
<file>images/setpoint_singlezone_humidity_min_right.png</file>
<file>images/setpoint_onestage_cooling.png</file>
<file>images/setpoint_onestage_cooling_right.png</file>
<file>images/setpoint_onestage_heating.png</file>
<file>images/setpoint_onestage_heating_right.png</file>
<file>images/setpoint_singlezone.png</file>
<file>images/setpoint_singlezone_right.png</file>
<file>images/setpoint_warmest.png</file>
<file>images/setpoint_warmest_right.png</file>
Expand Down Expand Up @@ -275,30 +275,30 @@
<file>images/toggle_true_over.png</file>
<file>images/unitary_system.png</file>
<file>images/utility_calibration_warning.png</file>
<file>images/v_divider_dots.png</file>
<file>images/vav-reheat.png</file>
<file>images/vav_noreheat.png</file>
<file>images/vrf_outdoor.png</file>
<file>images/vrf_transfer.png</file>
<file>images/vrf_unit.png</file>
<file>images/v_divider_dots.png</file>
<file>images/wahpDXCC.png</file>
<file>images/wahpDXHC.png</file>
<file>images/walkin_case.png</file>
<file>images/walkin_right_tab_off.png</file>
<file>images/walkin_right_tab_on.png</file>
<file>images/watertoairHP.png</file>
<file>images/water_connection.png</file>
<file>images/water_cooled.png</file>
<file>images/water_heater_mixed.png</file>
<file>images/water_heater_stratified.png</file>
<file>images/water_main_alone.png</file>
<file>images/water_main_alone_over.png</file>
<file>images/water_main_alone_press.png</file>
<file>images/watertoairHP.png</file>
<file>images/wizard.png</file>
<file>images/zone.png</file>
<file>images/zonehvac_low_temperature_radiant_electric.png</file>
<file>images/zone_icon_off.png</file>
<file>images/zone_icon_pressed.png</file>
<file>images/zonehvac_low_temperature_radiant_electric.png</file>
<file>images/zoom-in-over.png</file>
<file>images/zoom-in-press.png</file>
<file>images/zoom-in.png</file>
Expand All @@ -319,19 +319,19 @@
<file>images/mini_icons/cav_reheat.png</file>
<file>images/mini_icons/chilled_beam.png</file>
<file>images/mini_icons/chiller_air.png</file>
<file>images/mini_icons/coil_ht_dx_singlespeed_mini.png</file>
<file>images/mini_icons/coilcoolingchilledbeam_mini.png</file>
<file>images/mini_icons/coilcoolinglowtemprad_constflow.png</file>
<file>images/mini_icons/coilcoolinglowtemprad_varflow.png</file>
<file>images/mini_icons/coilheatinglowtemprad_constflow.png</file>
<file>images/mini_icons/coilheatinglowtemprad_varflow.png</file>
<file>images/mini_icons/coilheatingwater_baseboard_mini.png</file>
<file>images/mini_icons/coil_ht_dx_singlespeed_mini.png</file>
<file>images/mini_icons/construct_inter_source.png</file>
<file>images/mini_icons/construction.png</file>
<file>images/mini_icons/construction_gnd.png</file>
<file>images/mini_icons/construction_undergnd.png</file>
<file>images/mini_icons/construct_inter_source.png</file>
<file>images/mini_icons/cooling_tower.png</file>
<file>images/mini_icons/cool_coil.png</file>
<file>images/mini_icons/cooling_tower.png</file>
<file>images/mini_icons/daylighting_control.png</file>
<file>images/mini_icons/default_construction_set.png</file>
<file>images/mini_icons/default_schedule_set.png</file>
Expand Down Expand Up @@ -383,14 +383,16 @@
<file>images/mini_icons/material_air_gap.png</file>
<file>images/mini_icons/material_air_wall.png</file>
<file>images/mini_icons/material_infrared_transparent.png</file>
<file>images/mini_icons/min_window_data.png</file>
<file>images/mini_icons/min_window_simple_glazing.png</file>
<file>images/mini_icons/mini-dxcoolingcoil_2speed.png</file>
<file>images/mini_icons/mini-window-shade.png</file>
<file>images/mini_icons/mini_air_cooled.png</file>
<file>images/mini_icons/mini_air_terminal_inlet_mixer.png</file>
<file>images/mini_icons/mini_chiller_absorption_direct.png</file>
<file>images/mini_icons/mini_chiller_absorption_indirect.png</file>
<file>images/mini_icons/mini_coilsystem_cooling_DX.png</file>
<file>images/mini_icons/mini_coil_system_water.png</file>
<file>images/mini_icons/mini_coilsystem_cooling_DX.png</file>
<file>images/mini_icons/mini_compressor.png</file>
<file>images/mini_icons/mini_condenser_cascade.png</file>
<file>images/mini_icons/mini_condensor.png</file>
Expand All @@ -399,10 +401,10 @@
<file>images/mini_icons/mini_cooling_tower_variable.png</file>
<file>images/mini_icons/mini_display_case.png</file>
<file>images/mini_icons/mini_duct.png</file>
<file>images/mini_icons/mini_dxcoolingcoil_2stage_humidity.png</file>
<file>images/mini_icons/mini_dxcoolingcoil_singlespeed.png</file>
<file>images/mini_icons/mini_dx_cooling_coil_multispeed.png</file>
<file>images/mini_icons/mini_dx_cooling_coil_two_speed.png</file>
<file>images/mini_icons/mini_dxcoolingcoil_2stage_humidity.png</file>
<file>images/mini_icons/mini_dxcoolingcoil_singlespeed.png</file>
<file>images/mini_icons/mini_electric_humidifier.png</file>
<file>images/mini_icons/mini_evap_cooled.png</file>
<file>images/mini_icons/mini_fluid_cooler_single.png</file>
Expand Down Expand Up @@ -432,9 +434,6 @@
<file>images/mini_icons/mini_window_refraction.png</file>
<file>images/mini_icons/mini_window_screen.png</file>
<file>images/mini_icons/mini_window_thermoc.png</file>
<file>images/mini_icons/min_window_data.png</file>
<file>images/mini_icons/min_window_simple_glazing.png</file>
<file>images/mini_icons/mini-window-shade.png</file>
<file>images/mini_icons/OAMixer.png</file>
<file>images/mini_icons/other_equipment.png</file>
<file>images/mini_icons/other_equipment_definition.png</file>
Expand All @@ -446,8 +445,8 @@
<file>images/mini_icons/pump_variable.png</file>
<file>images/mini_icons/schedule.png</file>
<file>images/mini_icons/series_fan_terminal.png</file>
<file>images/mini_icons/setpoint_dual.png</file>
<file>images/mini_icons/setpoint_coldest.png</file>
<file>images/mini_icons/setpoint_dual.png</file>
<file>images/mini_icons/setpoint_follow_ground_temp.png</file>
<file>images/mini_icons/setpoint_follow_outdoorair.png</file>
<file>images/mini_icons/setpoint_follow_system_node.png</file>
Expand All @@ -458,16 +457,14 @@
<file>images/mini_icons/setpoint_multizone_humidity_min.png</file>
<file>images/mini_icons/setpoint_multizone_maxhumidity_avg.png</file>
<file>images/mini_icons/setpoint_multizone_minhumidity_avg.png</file>
<file>images/mini_icons/setpoint_pretreat.png</file>
<file>images/mini_icons/setpoint_onestage_cooling.png</file>
<file>images/mini_icons/setpoint_onestage_heating.png</file>
<file>images/mini_icons/setpoint_outdoorair.png</file>
<file>images/mini_icons/setpoint_pretreat.png</file>
<file>images/mini_icons/setpoint_scheduled.png</file>
<file>images/mini_icons/setpoint_dual.png</file>
<file>images/mini_icons/setpoint_singlezone.png</file>
<file>images/mini_icons/setpoint_singlezone_humidity_max.png</file>
<file>images/mini_icons/setpoint_singlezone_humidity_min.png</file>
<file>images/mini_icons/setpoint_onestage_cooling.png</file>
<file>images/mini_icons/setpoint_onestage_heating.png</file>
<file>images/mini_icons/setpoint_singlezone.png</file>
<file>images/mini_icons/setpoint_warmest.png</file>
<file>images/mini_icons/setpoint_warmest_tempflow.png</file>
<file>images/mini_icons/shading_surface.png</file>
Expand All @@ -491,10 +488,10 @@
<file>images/mini_icons/vav_noreheat.png</file>
<file>images/mini_icons/wahpDXCC_mini.png</file>
<file>images/mini_icons/wahpDXHC_mini.png</file>
<file>images/mini_icons/watertoairHP.png</file>
<file>images/mini_icons/water_connection.png</file>
<file>images/mini_icons/water_heater_mixed.png</file>
<file>images/mini_icons/water_heater_stratified.png</file>
<file>images/mini_icons/watertoairHP.png</file>
<file>images/mini_icons/window_material_gas.png</file>
<file>images/mini_icons/window_material_gasmixture.png</file>
<file>images/mini_icons/window_material_glazing.png</file>
Expand Down Expand Up @@ -543,9 +540,9 @@
<file alias="shared_gui_components/images/forward.png">../shared_gui_components/images/forward.png</file>
<file alias="shared_gui_components/images/gray_add_icon.png">../shared_gui_components/images/gray_add_icon.png</file>
<file alias="shared_gui_components/images/launch_aws.png">../shared_gui_components/images/launch_aws.png</file>
<file alias="shared_gui_components/images/openstudio_measure_icon.png">../shared_gui_components/images/openstudio_measure_icon.png</file>
<file alias="shared_gui_components/images/open_my_measures.png">../shared_gui_components/images/open_my_measures.png</file>
<file alias="shared_gui_components/images/open_my_measures_press.png">../shared_gui_components/images/open_my_measures_press.png</file>
<file alias="shared_gui_components/images/openstudio_measure_icon.png">../shared_gui_components/images/openstudio_measure_icon.png</file>
<file alias="shared_gui_components/images/pause_over.png">../shared_gui_components/images/pause_over.png</file>
<file alias="shared_gui_components/images/pause_press.png">../shared_gui_components/images/pause_press.png</file>
<file alias="shared_gui_components/images/pause_regular.png">../shared_gui_components/images/pause_regular.png</file>
Expand Down

8 comments on commit 338a99f

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

develop (axelstudios) - x86_64-MacOS-10.9-clang: Tests Failed

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

develop (axelstudios) - x86_64-Linux-Ubuntu-14.04-clang-3.5: OK (2281 of 2343 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

develop (axelstudios) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

develop (axelstudios) - i386-Windows-7-VisualStudio-12: OK (2303 of 2343 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

develop (axelstudios) - Win64-Windows-7-VisualStudio-12: OK (2302 of 2343 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

iteration (axelstudios) - x86_64-MacOS-10.9-clang: Tests Failed

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

iteration (axelstudios) - x86_64-Linux-Ubuntu-14.04-clang-3.5: OK (2295 of 2343 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

iteration (axelstudios) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

Please sign in to comment.