Merge pull request #144 from TrevisanGMW/dev

release <- dev (3.0.2)

gt/__init__.py

@@ -3,7 +3,7 @@
 import sys
 
 # Package Variables
-__version_tuple__ = (3, 0, 1)
+__version_tuple__ = (3, 0, 2)
 __version_suffix__ = ''
 __version__ = '.'.join(str(n) for n in __version_tuple__) + __version_suffix__
 __authors__ = ['Guilherme Trevisan']

gt/tools/generate_inbetween/__init__.py → gt/tools/add_inbetween/__init__.py

@@ -38,9 +38,9 @@ def launch_tool():
     Launch user interface and create any necessary connections for the tool to function.
     Entry point for when using the tool GT Generate Inbetween.
     """
-    from gt.tools.generate_inbetween import generate_inbetween
-    generate_inbetween.script_version = __version__
-    generate_inbetween.build_gui_generate_inbetween()
+    from gt.tools.add_inbetween import add_inbetween
+    add_inbetween.script_version = __version__
+    add_inbetween.build_gui_generate_inbetween()
 
 
 if __name__ == "__main__":

gt/tools/generate_inbetween/generate_inbetween.py → gt/tools/add_inbetween/add_inbetween.py

@@ -9,7 +9,7 @@
 import maya.cmds as cmds
 
 # Script Name
-script_name = "GT - In-between Generator"
+script_name = "GT - Add In-between"
 
 # Version
 script_version = "?.?.?"  # Module version (init)

gt/tools/attributes_to_python/attributes_to_python.py

@@ -329,7 +329,7 @@ def _btn_extract_attr(attr_type='default'):
     # Set Window Icon
     qw = OpenMayaUI.MQtUtil.findWindow(window_name)
     widget = wrapInstance(int(qw), QWidget)
-    icon = QIcon(resource_library.Icon.attributes_to_python)
+    icon = QIcon(resource_library.Icon.tool_attributes_to_python)
     widget.setWindowIcon(icon)
 
     # Main GUI Ends Here =================================================================================

gt/tools/auto_rigger/rigger_biped_gui.py

@@ -605,7 +605,7 @@ def build_gui_auto_biped_rig():
     # Set Window Icon
     qw = OpenMayaUI.MQtUtil.findWindow(window_name)
     widget = wrapInstance(int(qw), QWidget)
-    icon = QIcon(resource_library.Icon.rig_auto_rigger)
+    icon = QIcon(resource_library.Icon.tool_auto_rigger)
     widget.setWindowIcon(icon)
 
     # ### GUI Functions ###

gt/tools/color_manager/color_manager.py

@@ -456,7 +456,7 @@ def set_color_reset(obj_to_set, reset_overrides=False, reset_wireframe=False, re
     # Set Window Icon
     qw = OpenMayaUI.MQtUtil.findWindow(window_name)
     widget = wrapInstance(int(qw), QWidget)
-    icon = QIcon(resource_library.Icon.color_manager)
+    icon = QIcon(resource_library.Icon.tool_color_manager)
     widget.setWindowIcon(icon)
 
     # Main GUI Ends Here =================================================================================

gt/tools/create_sphere_types/create_sphere_types.py

@@ -70,7 +70,7 @@ def build_gui_sphere_type():
     # Set Window Icon
     qw = OpenMayaUI.MQtUtil.findWindow(window_gui_sphere_type)
     widget = wrapInstance(int(qw), QWidget)
-    icon = QIcon(resource_library.Icon.mod_sphere_types)
+    icon = QIcon(resource_library.Icon.tool_sphere_types)
 
     widget.setWindowIcon(icon)
 

gt/tools/fspy_importer/fspy_importer.py

@@ -182,7 +182,7 @@ def load_image_path():
     # Set Window Icon
     qw = OpenMayaUI.MQtUtil.findWindow(window_name)
     widget = wrapInstance(int(qw), QWidget)
-    icon = QIcon(resource_library.Icon.fspy_importer)
+    icon = QIcon(resource_library.Icon.tool_fspy_importer)
     widget.setWindowIcon(icon)
 
     # Main GUI Ends Here =================================================================================

gt/tools/outliner_sorter/outliner_sorter.py

@@ -327,7 +327,7 @@ def update_sort_attr(*args):
     # Set Window Icon
     qw = OpenMayaUI.MQtUtil.findWindow(window_name)
     widget = wrapInstance(int(qw), QWidget)
-    icon = QIcon(resource_library.Icon.outliner_sorter)
+    icon = QIcon(resource_library.Icon.tool_outliner_sorter)
     widget.setWindowIcon(icon)
 
     # Remove the focus from the textfield and give it to the window

gt/tools/package_setup/setup_view.py

@@ -74,7 +74,7 @@ def __init__(self, parent=None, controller=None):
         self.setMinimumWidth(self.width())
         self.setMinimumHeight(self.height())
         self.center()
-        self.setWindowFlag(QtCore.Qt.Tool, True)  # Window Stay On Top Modality
+        self.setWindowFlag(QtCore.Qt.Tool, True)
         # self.setWindowFlags(self.windowFlags() | QtCore.Qt.FramelessWindowHint)  # Todo: Custom window border
 
     def center(self):

gt/tools/path_manager/path_manager.py

@@ -86,7 +86,7 @@ def __init__(self, parent=maya_main_window()):
         self.resize(self.width() + 250, 500)
 
         # Set Icon
-        self.setWindowIcon(QtGui.QIcon(resource_library.Icon.selection_manager))
+        self.setWindowIcon(QtGui.QIcon(resource_library.Icon.tool_selection_manager))
 
         # Setup Window Content and Signals
         self.create_widgets()

gt/tools/renamer/renamer.py

@@ -557,7 +557,7 @@ def start_renaming(operation):
     # Set Window Icon
     qw = OpenMayaUI.MQtUtil.findWindow(window_name)
     widget = wrapInstance(int(qw), QWidget)
-    icon = QIcon(resource_library.Icon.renamer)
+    icon = QIcon(resource_library.Icon.tool_renamer)
     widget.setWindowIcon(icon)
 
 

gt/tools/render_calculator/render_calculator.py

@@ -183,7 +183,7 @@ def _btn_get_current_timeline(*args):
     # Set Window Icon
     qw = OpenMayaUI.MQtUtil.findWindow(window_name)
     widget = wrapInstance(int(qw), QWidget)
-    icon = QIcon(resource_library.Icon.render_calculator)
+    icon = QIcon(resource_library.Icon.tool_render_calculator)
     widget.setWindowIcon(icon)
 
     _recalculate_time()

gt/tools/render_checklist/render_checklist.py

@@ -280,7 +280,7 @@ def update_gui_settings():
     # Set Window Icon
     qw = OpenMayaUI.MQtUtil.findWindow(window_name)
     widget = wrapInstance(int(qw), QWidget)
-    icon = QIcon(resource_library.Icon.render_checklist)
+    icon = QIcon(resource_library.Icon.tool_render_checklist)
     widget.setWindowIcon(icon)
 
     # Main GUI Ends ==========================================================

gt/tools/sample_tool/sample_view.py

@@ -55,7 +55,7 @@ def __init__(self, parent=None, controller=None):
         self.setWindowFlags(self.windowFlags() |
                             QtCore.Qt.WindowMaximizeButtonHint |
                             QtCore.Qt.WindowMinimizeButtonHint)
-        self.setWindowIcon(QIcon(resource_library.Icon.cog_icon))
+        self.setWindowIcon(QIcon(resource_library.Icon.misc_cog))
 
         sample_stylesheet = resource_library.Stylesheet.dark_scroll_bar
         sample_stylesheet += resource_library.Stylesheet.maya_basic_dialog

gt/tools/selection_manager/selection_manager.py

@@ -477,7 +477,7 @@ def update_stored_values_and_run(is_new_selection):
     # Set Window Icon
     qw = OpenMayaUI.MQtUtil.findWindow(window_name)
     widget = wrapInstance(int(qw), QWidget)
-    icon = QIcon(resource_library.Icon.selection_manager)
+    icon = QIcon(resource_library.Icon.tool_selection_manager)
     widget.setWindowIcon(icon)
 
     # Main GUI Ends Here =================================================================================

gt/tools/shape_curve_to_python/shape_curve_to_python.py

@@ -174,7 +174,7 @@ def generate_python_curve():
     # Set Window Icon
     qw = OpenMayaUI.MQtUtil.findWindow(window_name)
     widget = wrapInstance(int(qw), QWidget)
-    icon = QIcon(resource_library.Icon.crv_to_python)
+    icon = QIcon(resource_library.Icon.tool_crv_python)
     widget.setWindowIcon(icon)
 
     # Main GUI Ends Here =================================================================================

gt/tools/shape_extract_state/shape_extract_state.py

@@ -173,7 +173,7 @@ def _btn_extract_python_curve_shape():
     # Set Window Icon
     qw = OpenMayaUI.MQtUtil.findWindow(window_name)
     widget = wrapInstance(int(qw), QWidget)
-    icon = QIcon(resource_library.Icon.crv_state)
+    icon = QIcon(resource_library.Icon.tool_crv_extract_state)
     widget.setWindowIcon(icon)
 
     # Main GUI Ends Here =================================================================================

gt/tools/shape_text_to_curve/shape_text_to_curve.py

@@ -82,7 +82,7 @@ def build_gui_generate_text_curve():
     # Set Window Icon
     qw = OpenMayaUI.MQtUtil.findWindow(window_name)
     widget = wrapInstance(int(qw), QWidget)
-    icon = QIcon(resource_library.Icon.crv_text)
+    icon = QIcon(resource_library.Icon.tool_crv_text)
     widget.setWindowIcon(icon)
 
     # Main GUI Ends Here =================================================================================

gt/tools/startup_booster/startup_booster.py

@@ -790,7 +790,7 @@ def add_button_custom(text_field_data):
     # Set Window Icon
     qw = OpenMayaUI.MQtUtil.findWindow(window_gui_startup_booster)
     widget = wrapInstance(int(qw), QWidget)
-    icon = QIcon(resource_library.Icon.startup_booster)
+    icon = QIcon(resource_library.Icon.tool_startup_booster)
     widget.setWindowIcon(icon)
 
     # main dialog Ends Here =================================================================================

gt/tools/transfer_transforms/transfer_transforms.py

@@ -482,7 +482,7 @@ def validate_import_export(operation):
     # Set Window Icon
     qw = OpenMayaUI.MQtUtil.findWindow(window_name)
     widget = wrapInstance(int(qw), QWidget)
-    icon = QIcon(resource_library.Icon.transfer_transforms)
+    icon = QIcon(resource_library.Icon.tool_transfer_transforms)
     widget.setWindowIcon(icon)
 
     # Deselect Text Field

gt/tools/transfer_uvs/transfer_uvs.py

@@ -74,7 +74,7 @@ def build_gui_uv_transfer():
     # Set Window Icon
     qw = OpenMayaUI.MQtUtil.findWindow(window_gui_uv_transfer)
     widget = wrapInstance(int(qw), QWidget)
-    icon = QIcon(resource_library.Icon.mod_transfer_uvs)
+    icon = QIcon(resource_library.Icon.tool_transfer_uvs)
 
     widget.setWindowIcon(icon)
 

gt/tools/world_space_baker/world_space_baker.py

@@ -250,7 +250,7 @@ def validate_operation(operation='extract'):
     # Set Window Icon
     qw = OpenMayaUI.MQtUtil.findWindow(window_name)
     widget = wrapInstance(int(qw), QWidget)
-    icon = QIcon(resource_library.Icon.world_space_baker)
+    icon = QIcon(resource_library.Icon.tool_world_space_baker)
     widget.setWindowIcon(icon)
 
     # Remove the focus from the textfield and give it to the window

gt/ui/resource_library.py

@@ -235,46 +235,60 @@ def __init__(self):
     root_utilities = get_icon_path(r"root_utilities.svg")
     root_miscellaneous = get_icon_path(r"root_miscellaneous.svg")
     root_help = get_icon_path(r"root_help.svg")
-    # Tools
-    maya_to_discord_icon = get_icon_path(r"maya_to_discord.svg")
-    fspy_importer = get_icon_path(r"fspy_importer.svg")
-    render_calculator = get_icon_path(r"render_calculator.svg")
-    startup_booster = get_icon_path(r"startup_booster.svg")
-    renamer = get_icon_path(r"renamer.svg")
-    outliner_sorter = get_icon_path(r"outliner_sorter.svg")
-    selection_manager = get_icon_path(r"selection_manager.svg")
-    path_manager = get_icon_path(r"path_manager.svg")
-    color_manager = get_icon_path(r"color_manager.svg")
-    transfer_transforms = get_icon_path(r"transfer_transforms.svg")
-    world_space_baker = get_icon_path(r"world_space_baker.svg")
-    attributes_to_python = get_icon_path(r"attributes_to_python.svg")
-    render_checklist = get_icon_path(r"render_checklist.svg")
+    # General
+    tool_renamer = get_icon_path(r"tool_renamer.svg")
+    tool_outliner_sorter = get_icon_path(r"tool_outliner_sorter.svg")
+    tool_selection_manager = get_icon_path(r"tool_selection_manager.svg")
+    tool_path_manager = get_icon_path(r"tool_path_manager.svg")
+    tool_color_manager = get_icon_path(r"tool_color_manager.svg")
+    tool_transfer_transforms = get_icon_path(r"tool_transfer_transforms.svg")
+    tool_world_space_baker = get_icon_path(r"tool_world_space_baker.svg")
+    tool_attributes_to_python = get_icon_path(r"tool_attributes_to_python.svg")
+    tool_render_checklist = get_icon_path(r"tool_render_checklist.svg")
     # Curves
-    crv_to_python = get_icon_path(r"crv_to_python.svg")
-    crv_text = get_icon_path(r"crv_text.svg")
-    crv_state = get_icon_path(r"crv_state.svg")
-    crv_combine = get_icon_path(r"crv_combine.svg")
-    crv_separate = get_icon_path(r"crv_separate.svg")
+    tool_crv_python = get_icon_path(r"tool_crv_python.svg")
+    tool_crv_text = get_icon_path(r"tool_crv_text.svg")
+    tool_crv_extract_state = get_icon_path(r"tool_crv_extract_state.svg")
+    util_crv_combine = get_icon_path(r"util_crv_combine.svg")
+    util_crv_separate = get_icon_path(r"util_crv_separate.svg")
     # Modeling
-    mod_transfer_uvs = get_icon_path(r"mod_transfer_uvs.svg")
-    mod_sphere_types = get_icon_path(r"mod_sphere_types.svg")
-    mod_load_udims = get_icon_path(r"mod_load_udims.svg")
-    mod_bif_to_mesh = get_icon_path(r"mod_bif_to_mesh.svg")
-    mod_copy_material = get_icon_path(r"mod_copy_material.svg")
-    mod_paste_material = get_icon_path(r"mod_paste_material.svg")
+    tool_transfer_uvs = get_icon_path(r"tool_transfer_uvs.svg")
+    tool_sphere_types = get_icon_path(r"tool_sphere_types.svg")
+    util_mod_load_udims = get_icon_path(r"util_mod_load_udims.svg")
+    util_mod_bif_to_mesh = get_icon_path(r"util_mod_bif_to_mesh.svg")
+    util_mod_copy_material = get_icon_path(r"util_mod_copy_material.svg")
+    util_mod_paste_material = get_icon_path(r"util_mod_paste_material.svg")
     # Rigging
-    rig_auto_rigger = get_icon_path(r"rig_auto_rigger.svg")
-    # Help
-    rebuild_menu = get_icon_path(r"rebuild_menu.svg")
-    check_for_updates = get_icon_path(r"check_for_updates.svg")
-    about = get_icon_path(r"about.svg")
-    current_version = get_icon_path(r"current_version.svg")
+    tool_auto_rigger = get_icon_path(r"tool_auto_rigger.svg")
+    tool_rig_interface = get_icon_path(r"tool_rig_interface.svg")
+    tool_retarget_assistant = get_icon_path(r"tool_retarget_assistant.svg")
+    tool_game_fbx_exporter = get_icon_path(r"tool_game_fbx_exporter.svg")
+    tool_influence_joints = get_icon_path(r"tool_influence_joints.svg")
+    tool_add_inbetween = get_icon_path(r"tool_add_inbetween.svg")
+    tool_sine_attributes = get_icon_path(r"tool_sine_attributes.svg")
+    tool_connect_attributes = get_icon_path(r"tool_connect_attributes.svg")
+    tool_create_fk = get_icon_path(r"tool_create_fk.svg")
+    tool_testing_keys = get_icon_path(r"tool_testing_keys.svg")
+    tool_make_ik_stretchy = get_icon_path(r"tool_make_ik_stretchy.svg")
+    tool_mirror_cluster = get_icon_path(r"tool_mirror_cluster.svg")
+    tool_morphing_attributes = get_icon_path(r"tool_morphing_attributes.svg")
+    tool_morphing_utils = get_icon_path(r"tool_morphing_utils.svg")
     # Misc
+    tool_maya_to_discord = get_icon_path(r"tool_maya_to_discord.svg")
+    tool_fspy_importer = get_icon_path(r"tool_fspy_importer.svg")
+    tool_render_calculator = get_icon_path(r"tool_render_calculator.svg")
+    tool_startup_booster = get_icon_path(r"tool_startup_booster.svg")
+    # Help
+    tool_check_for_updates = get_icon_path(r"tool_check_for_updates.svg")
+    misc_rebuild_menu = get_icon_path(r"misc_rebuild_menu.svg")
+    misc_about = get_icon_path(r"misc_about.svg")
+    misc_current_version = get_icon_path(r"misc_current_version.svg")
+    # Other
+    package_logo = get_icon_path(r"package_logo.svg")
+    package_icon = get_icon_path(r"package_icon.svg")
     abr_create_proxy = get_icon_path(r"abr_create_proxy.svg")
     abr_create_rig = get_icon_path(r"abr_create_rig.svg")
-    package_logo = get_icon_path(r"package_logo.png")
-    package_icon = get_icon_path(r"package_icon.png")
-    cog_icon = get_icon_path(r"cog.svg")
+    misc_cog = get_icon_path(r"misc_cog.svg")
     scrollbar_up = get_icon_path(r"scrollbar_up.svg")
     scrollbar_down = get_icon_path(r"scrollbar_down.svg")
     setup_install = get_icon_path(r"setup_install.svg")
@@ -480,6 +494,6 @@ def __init__(self):
 if __name__ == "__main__":
     from pprint import pprint
     out = None
-    out = Stylesheet.dark_progress_bar
+    out = Icon.package_icon
     pprint(out)