Rename all commands to camel case.

This commit is contained in:
David Capello 2011-01-20 20:46:58 -03:00
parent af3c4e9fba
commit 3887173fac
84 changed files with 452 additions and 451 deletions

View File

@ -7,110 +7,110 @@
<!-- Keyboard shortcuts for commands (menu options) -->
<commands>
<!-- File -->
<key command="new_file" shortcut="Ctrl+N" />
<key command="open_file" shortcut="Ctrl+O" />
<key command="save_file" shortcut="Ctrl+S" />
<key command="save_file_as" shortcut="Ctrl+Shift+S" />
<key command="save_file_copy_as" shortcut="Ctrl+Shift+C" />
<key command="close_file" shortcut="Ctrl+W" />
<key command="close_all_files" shortcut="Ctrl+Shift+W" />
<key command="screen_shot" shortcut="F12" />
<key command="exit" shortcut="Ctrl+Q" />
<key command="exit" shortcut="Esc" />
<key command="NewFile" shortcut="Ctrl+N" />
<key command="OpenFile" shortcut="Ctrl+O" />
<key command="SaveFile" shortcut="Ctrl+S" />
<key command="SaveFileAs" shortcut="Ctrl+Shift+S" />
<key command="SaveFileCopyAs" shortcut="Ctrl+Shift+C" />
<key command="CloseFile" shortcut="Ctrl+W" />
<key command="CloseAllFiles" shortcut="Ctrl+Shift+W" />
<key command="ScreenShot" shortcut="F12" />
<key command="Exit" shortcut="Ctrl+Q" />
<key command="Exit" shortcut="Esc" />
<!-- Edit -->
<key command="undo" shortcut="Ctrl+Z" /> <key command="undo" shortcut="Ctrl+U" />
<key command="redo" shortcut="Ctrl+R" />
<key command="redo" shortcut="Ctrl+Shift+Z" />
<key command="cut" shortcut="Ctrl+X" /> <key command="cut" shortcut="Shift+Del" />
<key command="copy" shortcut="Ctrl+C" /> <key command="copy" shortcut="Ctrl+Ins" />
<key command="paste" shortcut="Ctrl+V" /> <key command="paste" shortcut="Shift+Ins" />
<key command="clear" shortcut="Del" /> <key command="clear" shortcut="Backspace" />
<key command="flip" shortcut="Shift+H">
<key command="Undo" shortcut="Ctrl+Z" /> <key command="Undo" shortcut="Ctrl+U" />
<key command="Redo" shortcut="Ctrl+R" />
<key command="Redo" shortcut="Ctrl+Shift+Z" />
<key command="Cut" shortcut="Ctrl+X" /> <key command="Cut" shortcut="Shift+Del" />
<key command="Copy" shortcut="Ctrl+C" /> <key command="Copy" shortcut="Ctrl+Ins" />
<key command="Paste" shortcut="Ctrl+V" /> <key command="Paste" shortcut="Shift+Ins" />
<key command="Clear" shortcut="Del" /> <key command="Clear" shortcut="Backspace" />
<key command="Flip" shortcut="Shift+H">
<param name="target" value="mask" />
<param name="orientation" value="horizontal" />
</key>
<key command="flip" shortcut="Shift+V">
<key command="Flip" shortcut="Shift+V">
<param name="target" value="mask" />
<param name="orientation" value="vertical" />
</key>
<key command="replace_color" shortcut="Shift+R" />
<key command="invert_color" shortcut="Ctrl+I" />
<key command="convolution_matrix" shortcut="F9" />
<key command="color_curve" shortcut="Ctrl+M" />
<key command="color_curve" shortcut="F10" />
<key command="configure_tools" shortcut="C" />
<key command="options" shortcut="Ctrl+Shift+O" />
<key command="ReplaceColor" shortcut="Shift+R" />
<key command="InvertColor" shortcut="Ctrl+I" />
<key command="ConvolutionMatrix" shortcut="F9" />
<key command="ColorCurve" shortcut="Ctrl+M" />
<key command="ColorCurve" shortcut="F10" />
<key command="ConfigureTools" shortcut="C" />
<key command="Options" shortcut="Ctrl+Shift+O" />
<!-- Sprite -->
<key command="sprite_properties" shortcut="Ctrl+P" />
<key command="SpriteProperties" shortcut="Ctrl+P" />
<!-- Layer -->
<key command="layer_properties" shortcut="Shift+P" />
<key command="new_layer" shortcut="Shift+N" />
<key command="goto_previous_layer" shortcut="Down" />
<key command="goto_next_layer" shortcut="Up" />
<key command="LayerProperties" shortcut="Shift+P" />
<key command="NewLayer" shortcut="Shift+N" />
<key command="GotoPreviousLayer" shortcut="Down" />
<key command="GotoNextLayer" shortcut="Up" />
<!-- Frame -->
<key command="new_frame" shortcut="N" />
<key command="frame_properties" shortcut="P" />
<key command="goto_first_frame" shortcut="Home" />
<key command="goto_previous_frame" shortcut="Left" />
<key command="goto_next_frame" shortcut="Right" />
<key command="goto_last_frame" shortcut="End" />
<key command="play_animation" shortcut="Enter" />
<key command="NewFrame" shortcut="N" />
<key command="FrameProperties" shortcut="P" />
<key command="GotoFirstFrame" shortcut="Home" />
<key command="GotoPreviousFrame" shortcut="Left" />
<key command="GotoNextFrame" shortcut="Right" />
<key command="GotoLastFrame" shortcut="End" />
<key command="PlayAnimation" shortcut="Enter" />
<!-- Select -->
<key command="mask_all" shortcut="Ctrl+A" />
<key command="deselect_mask" shortcut="Ctrl+D" />
<key command="reselect_mask" shortcut="Ctrl+Shift+D" />
<key command="invert_mask" shortcut="Ctrl+Shift+I" />
<key command="MaskAll" shortcut="Ctrl+A" />
<key command="DeselectMask" shortcut="Ctrl+D" />
<key command="ReselectMask" shortcut="Ctrl+Shift+D" />
<key command="InvertMask" shortcut="Ctrl+Shift+I" />
<!-- View -->
<key command="refresh" shortcut="F5" />
<key command="make_unique_editor" shortcut="Ctrl+1" />
<key command="split_editor_vertically" shortcut="Ctrl+2" />
<key command="split_editor_horizontally" shortcut="Ctrl+3" />
<key command="close_editor" shortcut="Ctrl+4" />
<key command="preview" shortcut="F8" />
<key command="show_grid" shortcut="Shift+G" />
<key command="snap_to_grid" shortcut="Shift+S" />
<key command="film_editor" shortcut="Tab" />
<key command="palette_editor" shortcut="F4">
<key command="Refresh" shortcut="F5" />
<key command="MakeUniqueEditor" shortcut="Ctrl+1" />
<key command="SplitEditorVertically" shortcut="Ctrl+2" />
<key command="SplitEditorHorizontally" shortcut="Ctrl+3" />
<key command="CloseEditor" shortcut="Ctrl+4" />
<key command="Preview" shortcut="F8" />
<key command="ShowGrid" shortcut="Shift+G" />
<key command="SnapToGrid" shortcut="Shift+S" />
<key command="FilmEditor" shortcut="Tab" />
<key command="PaletteEditor" shortcut="F4">
<param name="switch" value="true" />
</key>
<!-- Others -->
<key command="switch_colors" shortcut="X" />
<key command="change_color" shortcut="9">
<key command="SwitchColors" shortcut="X" />
<key command="ChangeColor" shortcut="9">
<param name="target" value="foreground" />
<param name="change" value="decrement-index" />
</key>
<key command="change_color" shortcut="0">
<key command="ChangeColor" shortcut="0">
<param name="target" value="foreground" />
<param name="change" value="increment-index" />
</key>
<key command="change_color" shortcut="[">
<key command="ChangeColor" shortcut="[">
<param name="target" value="foreground" />
<param name="change" value="decrement-index" />
</key>
<key command="change_color" shortcut="]">
<key command="ChangeColor" shortcut="]">
<param name="target" value="foreground" />
<param name="change" value="increment-index" />
</key>
<key command="change_color" shortcut="Ctrl+9">
<key command="ChangeColor" shortcut="Ctrl+9">
<param name="target" value="background" />
<param name="change" value="decrement-index" />
</key>
<key command="change_color" shortcut="Ctrl+0">
<key command="ChangeColor" shortcut="Ctrl+0">
<param name="target" value="background" />
<param name="change" value="increment-index" />
</key>
<!-- Modify pen size with +/- signs -->
<key command="change_pen" shortcut="+">
<key command="ChangePen" shortcut="+">
<param name="change" value="increment-size" />
</key>
<key command="change_pen" shortcut="-">
<key command="ChangePen" shortcut="-">
<param name="change" value="decrement-size" />
</key>
<key command="change_pen" shortcut="Plus Pad">
<key command="ChangePen" shortcut="Plus Pad">
<param name="change" value="increment-size" />
</key>
<key command="change_pen" shortcut="Minus Pad">
<key command="ChangePen" shortcut="Minus Pad">
<param name="change" value="decrement-size" />
</key>
</commands>
@ -163,194 +163,194 @@
<!-- main bar menu -->
<menu id="main_menu">
<menu text="&amp;File">
<item command="new_file" text="&amp;New..." />
<item command="open_file" text="&amp;Open..." />
<item command="NewFile" text="&amp;New..." />
<item command="OpenFile" text="&amp;Open..." />
<item id="recent_list" text="Open &amp;Recent" />
<separator />
<item command="save_file" text="&amp;Save" />
<item command="save_file_as" text="Save &amp;As..." />
<item command="save_file_copy_as" text="Save Cop&amp;y As..." />
<item command="close_file" text="&amp;Close" />
<item command="close_all_files" text="Close All" />
<item command="SaveFile" text="&amp;Save" />
<item command="SaveFileAs" text="Save &amp;As..." />
<item command="SaveFileCopyAs" text="Save Cop&amp;y As..." />
<item command="CloseFile" text="&amp;Close" />
<item command="CloseAllFiles" text="Close All" />
<separator />
<item command="exit" text="E&amp;xit" />
<item command="Exit" text="E&amp;xit" />
</menu>
<menu text="&amp;Edit">
<item command="undo" text="&amp;Undo" />
<item command="redo" text="&amp;Redo" />
<item command="Undo" text="&amp;Undo" />
<item command="Redo" text="&amp;Redo" />
<separator />
<item command="cut" text="Cu&amp;t" />
<item command="copy" text="&amp;Copy" />
<item command="paste" text="&amp;Paste" />
<item command="clear" text="C&amp;lear" />
<item command="Cut" text="Cu&amp;t" />
<item command="Copy" text="&amp;Copy" />
<item command="Paste" text="&amp;Paste" />
<item command="Clear" text="C&amp;lear" />
<separator />
<item command="flip" text="Flip &amp;Horizontal">
<item command="Flip" text="Flip &amp;Horizontal">
<param name="target" value="mask" />
<param name="orientation" value="horizontal" />
</item>
<item command="flip" text="Flip &amp;Vertical">
<item command="Flip" text="Flip &amp;Vertical">
<param name="target" value="mask" />
<param name="orientation" value="vertical" />
</item>
<separator />
<item command="replace_color" text="R&amp;eplace Color..." />
<item command="invert_color" text="&amp;Invert" />
<item command="ReplaceColor" text="R&amp;eplace Color..." />
<item command="InvertColor" text="&amp;Invert" />
<menu text="F&amp;X" id="fx_popup">
<item command="convolution_matrix" text="Convolution &amp;Matrix" />
<item command="color_curve" text="&amp;Color Curve" />
<item command="ConvolutionMatrix" text="Convolution &amp;Matrix" />
<item command="ColorCurve" text="&amp;Color Curve" />
<separator />
<item command="despeckle" text="&amp;Despeckle (median filter)" />
<item command="Despeckle" text="&amp;Despeckle (median filter)" />
</menu>
<separator />
<item command="configure_tools" text="Tool&amp;s" />
<item command="options" text="&amp;Options" />
<item command="ConfigureTools" text="Tool&amp;s" />
<item command="Options" text="&amp;Options" />
</menu>
<menu text="&amp;Sprite">
<item command="sprite_properties" text="&amp;Properties..." />
<item command="SpriteProperties" text="&amp;Properties..." />
<menu text="Color &amp;Mode">
<item command="change_image_type" text="&amp;RGB Color">
<item command="ChangeImageType" text="&amp;RGB Color">
<param name="imgtype" value="rgb" />
</item>
<item command="change_image_type" text="&amp;Grayscale">
<item command="ChangeImageType" text="&amp;Grayscale">
<param name="imgtype" value="grayscale" />
</item>
<item command="change_image_type" text="&amp;Indexed (No Dithering)">
<item command="ChangeImageType" text="&amp;Indexed (No Dithering)">
<param name="imgtype" value="indexed" />
</item>
<item command="change_image_type" text="Indexed (Ordered &amp;Dither)">
<item command="ChangeImageType" text="Indexed (Ordered &amp;Dither)">
<param name="imgtype" value="indexed" />
<param name="dithering" value="ordered" />
</item>
</menu>
<separator />
<item command="duplicate_sprite" text="&amp;Duplicate..." />
<item command="DuplicateSprite" text="&amp;Duplicate..." />
<separator />
<item command="sprite_size" text="&amp;Sprite Size..." />
<item command="canvas_size" text="&amp;Canvas Size..." />
<item command="SpriteSize" text="&amp;Sprite Size..." />
<item command="CanvasSize" text="&amp;Canvas Size..." />
<menu text="&amp;Rotate Canvas">
<item command="rotate_canvas" text="180">
<item command="RotateCanvas" text="180">
<param name="angle" value="180" />
</item>
<item command="rotate_canvas" text="90 CW">
<item command="RotateCanvas" text="90 CW">
<param name="angle" value="90" />
</item>
<item command="rotate_canvas" text="90 CCW">
<item command="RotateCanvas" text="90 CCW">
<param name="angle" value="-90" />
</item>
<separator />
<item command="flip" text="Flip Canvas &amp;Horizontal">
<item command="Flip" text="Flip Canvas &amp;Horizontal">
<param name="target" value="canvas" />
<param name="orientation" value="horizontal" />
</item>
<item command="flip" text="Flip Canvas &amp;Vertical">
<item command="Flip" text="Flip Canvas &amp;Vertical">
<param name="target" value="canvas" />
<param name="orientation" value="vertical" />
</item>
</menu>
<separator />
<item command="crop_sprite" text="Cr&amp;op" />
<item command="autocrop_sprite" text="&amp;Trim" />
<item command="CropSprite" text="Cr&amp;op" />
<item command="AutocropSprite" text="&amp;Trim" />
</menu>
<menu text="&amp;Layer">
<item command="layer_properties" text="&amp;Properties..." />
<item command="LayerProperties" text="&amp;Properties..." />
<separator />
<item command="new_layer" text="&amp;New Layer" />
<item command="remove_layer" text="&amp;Remove Layer" />
<item command="background_from_layer" text="&amp;Background from Layer" />
<item command="layer_from_background" text="&amp;Layer from Background" />
<item command="NewLayer" text="&amp;New Layer" />
<item command="RemoveLayer" text="&amp;Remove Layer" />
<item command="BackgroundFromLayer" text="&amp;Background from Layer" />
<item command="LayerFromBackground" text="&amp;Layer from Background" />
<separator />
<item command="duplicate_layer" text="&amp;Duplicate" />
<item command="merge_down_layer" text="&amp;Merge Down" />
<item command="flatten_layers" text="&amp;Flatten" />
<item command="DuplicateLayer" text="&amp;Duplicate" />
<item command="MergeDownLayer" text="&amp;Merge Down" />
<item command="FlattenLayers" text="&amp;Flatten" />
</menu>
<menu text="F&amp;rame">
<item command="frame_properties" text="Frame &amp;Properties..." />
<item command="cel_properties" text="&amp;Cel Properties..." />
<item command="FrameProperties" text="Frame &amp;Properties..." />
<item command="CelProperties" text="&amp;Cel Properties..." />
<separator />
<item command="new_frame" text="&amp;New Frame" />
<item command="remove_frame" text="&amp;Remove Frame" />
<item command="NewFrame" text="&amp;New Frame" />
<item command="RemoveFrame" text="&amp;Remove Frame" />
<separator />
<menu text="&amp;Jump to">
<item command="goto_first_frame" text="&amp;First Frame" />
<item command="goto_previous_frame" text="&amp;Previous Frame" />
<item command="goto_next_frame" text="&amp;Next Frame" />
<item command="goto_last_frame" text="&amp;Last Frame" />
<item command="GotoFirstFrame" text="&amp;First Frame" />
<item command="GotoPreviousFrame" text="&amp;Previous Frame" />
<item command="GotoNextFrame" text="&amp;Next Frame" />
<item command="GotoLastFrame" text="&amp;Last Frame" />
</menu>
<item command="play_animation" text="&amp;Play Animation" />
<item command="PlayAnimation" text="&amp;Play Animation" />
</menu>
<menu text="Selec&amp;t">
<item command="mask_all" text="&amp;All" />
<item command="deselect_mask" text="&amp;Deselect" />
<item command="reselect_mask" text="&amp;Reselect" />
<item command="invert_mask" text="&amp;Inverse" />
<item command="MaskAll" text="&amp;All" />
<item command="DeselectMask" text="&amp;Deselect" />
<item command="ReselectMask" text="&amp;Reselect" />
<item command="InvertMask" text="&amp;Inverse" />
<separator />
<item command="mask_by_color" text="&amp;Color Range" />
<item command="MaskByColor" text="&amp;Color Range" />
<separator />
<item command="load_mask" text="&amp;Load from MSK file" />
<item command="save_mask" text="&amp;Save to MSK file" />
<item command="LoadMask" text="&amp;Load from MSK file" />
<item command="SaveMask" text="&amp;Save to MSK file" />
</menu>
<menu text="&amp;View">
<menu text="Sprite &amp;Editor">
<item command="make_unique_editor" text="Make &amp;Unique" />
<item command="MakeUniqueEditor" text="Make &amp;Unique" />
<separator />
<item command="split_editor_vertically" text="Split &amp;Vertically" />
<item command="split_editor_horizontally" text="Split &amp;Horizontally" />
<item command="SplitEditorVertically" text="Split &amp;Vertically" />
<item command="SplitEditorHorizontally" text="Split &amp;Horizontally" />
<separator />
<item command="close_editor" text="&amp;Close" />
<item command="CloseEditor" text="&amp;Close" />
</menu>
<separator />
<item command="show_grid" text="Show &amp;Grid" />
<item command="snap_to_grid" text="&amp;Snap to Grid" />
<item command="grid_settings" text="Gri&amp;d Settings" />
<item command="ShowGrid" text="Show &amp;Grid" />
<item command="SnapToGrid" text="&amp;Snap to Grid" />
<item command="GridSettings" text="Gri&amp;d Settings" />
<separator />
<item command="film_editor" text="&amp;Animation Editor" />
<item command="palette_editor" text="&amp;Palette Editor">
<param name="switch" value="true" />
<item command="FilmEditor" text="&amp;Animation Editor" />
<item command="PaletteEditor" text="&amp;Palette Editor">
<param name="Switch" value="true" />
</item>
<item command="preview" text="Previe&amp;w" />
<item command="Preview" text="Previe&amp;w" />
<separator />
<item command="refresh" text="&amp;Refresh &amp;&amp; Reload Skin" />
<item command="screen_shot" text="&amp;Screen Shot" />
<item command="Refresh" text="&amp;Refresh &amp;&amp; Reload Skin" />
<item command="ScreenShot" text="&amp;Screen Shot" />
</menu>
<menu text="&amp;Help">
<item command="quick_reference" text="Quick &amp;Reference" />
<item command="QuickReference" text="Quick &amp;Reference" />
<separator />
<item command="donate" text="&amp;Donate" />
<item command="check_updates" text="&amp;Check for New Version" />
<item command="Donate" text="&amp;Donate" />
<item command="CheckUpdates" text="&amp;Check for New Version" />
<separator />
<item command="about" text="&amp;About" />
<item command="About" text="&amp;About" />
</menu>
</menu>
<menu id="layer_popup">
<item command="layer_properties" text="&amp;Properties..." />
<item command="LayerProperties" text="&amp;Properties..." />
<separator />
<item command="new_layer" text="&amp;New..." />
<item command="remove_layer" text="&amp;Remove" />
<item command="background_from_layer" text="&amp;Background from Layer" />
<item command="layer_from_background" text="&amp;Layer from Background" />
<item command="NewLayer" text="&amp;New..." />
<item command="RemoveLayer" text="&amp;Remove" />
<item command="BackgroundFromLayer" text="&amp;Background from Layer" />
<item command="LayerFromBackground" text="&amp;Layer from Background" />
<separator />
<item command="duplicate_layer" text="&amp;Duplicate..." />
<item command="merge_down_layer" text="&amp;Merge Down" />
<item command="flatten_layers" text="&amp;Flatten" />
<item command="DuplicateLayer" text="&amp;Duplicate..." />
<item command="MergeDownLayer" text="&amp;Merge Down" />
<item command="FlattenLayers" text="&amp;Flatten" />
</menu>
<menu id="frame_popup">
<item command="frame_properties" text="&amp;Properties..." />
<item command="FrameProperties" text="&amp;Properties..." />
<separator />
<item command="new_frame" text="&amp;New" />
<item command="remove_frame" text="&amp;Remove" />
<item command="NewFrame" text="&amp;New" />
<item command="RemoveFrame" text="&amp;Remove" />
</menu>
<menu id="cel_popup">
<item command="cel_properties" text="&amp;Properties..." />
<item command="CelProperties" text="&amp;Properties..." />
<separator />
<item command="clear" text="&amp;Clear" />
<item command="Clear" text="&amp;Clear" />
</menu>
<menu id="cel_movement_popup">
<item command="move_cel" text="&amp;Move" />
<item command="copy_cel" text="&amp;Copy" />
<item command="MoveCel" text="&amp;Move" />
<item command="CopyCel" text="&amp;Copy" />
</menu>
</menus>

View File

@ -395,7 +395,7 @@ bool app_realloc_recent_list()
if (jmenuitem_has_submenu_opened(list_menuitem))
return false;
Command *cmd_open_file = CommandsModule::instance()->get_command_by_name(CommandId::open_file);
Command* cmd_open_file = CommandsModule::instance()->get_command_by_name(CommandId::OpenFile);
Widget* submenu = jmenuitem_get_submenu(list_menuitem);
if (submenu) {
@ -484,7 +484,7 @@ void TabsBarHandler::clickTab(Tabs* tabs, void* data, int button)
// middle-button: close the sprite
if (data && (button & 4)) {
Command* close_file_cmd =
CommandsModule::instance()->get_command_by_name(CommandId::close_file);
CommandsModule::instance()->get_command_by_name(CommandId::CloseFile);
UIContext::instance()->executeCommand(close_file_cmd, NULL);
}

View File

@ -40,7 +40,7 @@ protected:
};
AboutCommand::AboutCommand()
: Command("about",
: Command("About",
"About",
CmdUIOnlyFlag)
{
@ -105,7 +105,7 @@ void AboutCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_about_command()
Command* CommandFactory::createAboutCommand()
{
return new AboutCommand;
}

View File

@ -44,7 +44,7 @@ private:
bool AdvancedModeCommand::advanced_mode = false;
AdvancedModeCommand::AdvancedModeCommand()
: Command("advanced_mode",
: Command("AdvancedMode",
"Advanced Mode",
CmdUIOnlyFlag)
{
@ -91,7 +91,7 @@ void AdvancedModeCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_advanced_mode_command()
Command* CommandFactory::createAdvancedModeCommand()
{
return new AdvancedModeCommand;
}

View File

@ -39,7 +39,7 @@ protected:
};
BackgroundFromLayerCommand::BackgroundFromLayerCommand()
: Command("background_from_layer",
: Command("BackgroundFromLayer",
"BackgroundFromLayer",
CmdRecordableFlag)
{
@ -77,7 +77,7 @@ void BackgroundFromLayerCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_background_from_layer_command()
Command* CommandFactory::createBackgroundFromLayerCommand()
{
return new BackgroundFromLayerCommand;
}

View File

@ -46,7 +46,7 @@ protected:
};
CanvasSizeCommand::CanvasSizeCommand()
: Command("canvas_size",
: Command("CanvasSize",
"Canvas Size",
CmdRecordableFlag)
{
@ -122,7 +122,7 @@ void CanvasSizeCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_canvas_size_command()
Command* CommandFactory::createCanvasSizeCommand()
{
return new CanvasSizeCommand;
}

View File

@ -46,7 +46,7 @@ protected:
};
CelPropertiesCommand::CelPropertiesCommand()
: Command("cel_properties",
: Command("CelProperties",
"Cel Properties",
CmdUIOnlyFlag)
{
@ -151,7 +151,7 @@ void CelPropertiesCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_cel_properties_command()
Command* CommandFactory::createCelPropertiesCommand()
{
return new CelPropertiesCommand;
}

View File

@ -49,7 +49,7 @@ protected:
};
ChangeColorCommand::ChangeColorCommand()
: Command("change_color",
: Command("ChangeColor",
"Change Color",
CmdUIOnlyFlag)
{
@ -107,7 +107,7 @@ void ChangeColorCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_change_color_command()
Command* CommandFactory::createChangeColorCommand()
{
return new ChangeColorCommand;
}

View File

@ -46,7 +46,7 @@ protected:
};
ChangeImageTypeCommand::ChangeImageTypeCommand()
: Command("change_image_type",
: Command("ChangeImageType",
"Change Image Type",
CmdUIOnlyFlag)
{
@ -115,7 +115,7 @@ void ChangeImageTypeCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_change_image_type_command()
Command* CommandFactory::createChangeImageTypeCommand()
{
return new ChangeImageTypeCommand;
}

View File

@ -46,7 +46,7 @@ protected:
};
ChangePenCommand::ChangePenCommand()
: Command("change_pen",
: Command("ChangePen",
"Change Pen",
CmdUIOnlyFlag)
{
@ -84,7 +84,7 @@ void ChangePenCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_change_pen_command()
Command* CommandFactory::createChangePenCommand()
{
return new ChangePenCommand;
}

View File

@ -39,7 +39,7 @@ protected:
};
CheckUpdatesCommand::CheckUpdatesCommand()
: Command("check_updates",
: Command("CheckUpdates",
"Check for New Version",
CmdUIOnlyFlag)
{
@ -101,7 +101,7 @@ void CheckUpdatesCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_check_updates_command()
Command* CommandFactory::createCheckUpdatesCommand()
{
return new CheckUpdatesCommand;
}

View File

@ -44,7 +44,7 @@ protected:
};
ClearCommand::ClearCommand()
: Command("clear",
: Command("Clear",
"Clear",
CmdUIOnlyFlag)
{
@ -80,7 +80,7 @@ void ClearCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_clear_command()
Command* CommandFactory::createClearCommand()
{
return new ClearCommand;
}

View File

@ -40,7 +40,7 @@ class CloseFileCommand : public Command
{
public:
CloseFileCommand()
: Command("close_file",
: Command("CloseFile",
"Close File",
CmdUIOnlyFlag)
{
@ -72,7 +72,7 @@ class CloseAllFilesCommand : public Command
{
public:
CloseAllFilesCommand()
: Command("close_all_files",
: Command("CloseAllFiles",
"Close All Files",
CmdRecordableFlag)
{
@ -146,7 +146,7 @@ try_again:;
// Does we need to save the sprite?
if (save_it) {
Command* save_command =
CommandsModule::instance()->get_command_by_name(CommandId::save_file);
CommandsModule::instance()->get_command_by_name(CommandId::SaveFile);
context->executeCommand(save_command);
goto try_again;
@ -166,12 +166,12 @@ try_again:;
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_close_file_command()
Command* CommandFactory::createCloseFileCommand()
{
return new CloseFileCommand;
}
Command* CommandFactory::create_close_all_files_command()
Command* CommandFactory::createCloseAllFilesCommand()
{
return new CloseAllFilesCommand;
}

View File

@ -203,7 +203,7 @@ private:
};
ConfigureTools::ConfigureTools()
: Command("configure_tools",
: Command("ConfigureTools",
"Configure Tools",
CmdUIOnlyFlag)
{
@ -537,7 +537,7 @@ void ConfigureTools::onSetGridClick()
}
else {
Command* grid_settings_cmd =
CommandsModule::instance()->get_command_by_name(CommandId::grid_settings);
CommandsModule::instance()->get_command_by_name(CommandId::GridSettings);
UIContext::instance()->executeCommand(grid_settings_cmd, NULL);
}
@ -556,7 +556,7 @@ void ConfigureTools::onOnionSkinClick()
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_configure_tools_command()
Command* CommandFactory::createConfigureToolsCommand()
{
return new ConfigureTools;
}

View File

@ -40,7 +40,7 @@ protected:
};
CopyCommand::CopyCommand()
: Command("copy",
: Command("Copy",
"Copy",
CmdUIOnlyFlag)
{
@ -70,7 +70,7 @@ void CopyCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_copy_command()
Command* CommandFactory::createCopyCommand()
{
return new CopyCommand;
}

View File

@ -37,7 +37,7 @@ protected:
};
CopyCelCommand::CopyCelCommand()
: Command("copy_cel",
: Command("CopyCel",
"Copy Cel",
CmdUIOnlyFlag)
{
@ -57,7 +57,7 @@ void CopyCelCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_copy_cel_command()
Command* CommandFactory::createCopyCelCommand()
{
return new CopyCelCommand;
}

View File

@ -47,7 +47,7 @@ protected:
};
CropSpriteCommand::CropSpriteCommand()
: Command("crop_sprite",
: Command("CropSprite",
"Crop Sprite",
CmdRecordableFlag)
{
@ -95,7 +95,7 @@ protected:
};
AutocropSpriteCommand::AutocropSpriteCommand()
: Command("autocrop_sprite",
: Command("AutocropSprite",
"Autocrop Sprite",
CmdRecordableFlag)
{
@ -124,12 +124,12 @@ void AutocropSpriteCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_crop_sprite_command()
Command* CommandFactory::createCropSpriteCommand()
{
return new CropSpriteCommand;
}
Command* CommandFactory::create_autocrop_sprite_command()
Command* CommandFactory::createAutocropSpriteCommand()
{
return new AutocropSpriteCommand;
}

View File

@ -40,7 +40,7 @@ protected:
};
CutCommand::CutCommand()
: Command("cut",
: Command("Cut",
"Cut",
CmdUIOnlyFlag)
{
@ -69,7 +69,7 @@ void CutCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_cut_command()
Command* CommandFactory::createCutCommand()
{
return new CutCommand;
}

View File

@ -40,7 +40,7 @@ protected:
};
DeselectMaskCommand::DeselectMaskCommand()
: Command("deselect_mask",
: Command("DeselectMask",
"Deselect Mask",
CmdRecordableFlag)
{
@ -67,7 +67,7 @@ void DeselectMaskCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_deselect_mask_command()
Command* CommandFactory::createDeselectMaskCommand()
{
return new DeselectMaskCommand;
}

View File

@ -35,7 +35,7 @@ protected:
};
DonateCommand::DonateCommand()
: Command("donate",
: Command("Donate",
"Donate",
CmdUIOnlyFlag)
{
@ -53,7 +53,7 @@ void DonateCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_donate_command()
Command* CommandFactory::createDonateCommand()
{
return new DonateCommand;
}

View File

@ -46,7 +46,7 @@ protected:
};
DuplicateLayerCommand::DuplicateLayerCommand()
: Command("duplicate_layer",
: Command("DuplicateLayer",
"Duplicate Layer",
CmdRecordableFlag)
{
@ -108,7 +108,7 @@ static Layer* duplicate_layer(Sprite* sprite)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_duplicate_layer_command()
Command* CommandFactory::createDuplicateLayerCommand()
{
return new DuplicateLayerCommand;
}

View File

@ -46,7 +46,7 @@ protected:
};
DuplicateSpriteCommand::DuplicateSpriteCommand()
: Command("duplicate_sprite",
: Command("DuplicateSprite",
"Duplicate Sprite",
CmdUIOnlyFlag)
{
@ -104,7 +104,7 @@ void DuplicateSpriteCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_duplicate_sprite_command()
Command* CommandFactory::createDuplicateSpriteCommand()
{
return new DuplicateSpriteCommand;
}

View File

@ -39,7 +39,7 @@ protected:
};
ExitCommand::ExitCommand()
: Command("exit",
: Command("Exit",
"Exit",
CmdUIOnlyFlag)
{
@ -67,7 +67,7 @@ void ExitCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_exit_command()
Command* CommandFactory::createExitCommand()
{
return new ExitCommand;
}

View File

@ -51,7 +51,7 @@ protected:
};
EyedropperCommand::EyedropperCommand()
: Command("eyedropper",
: Command("Eyedropper",
"Eyedropper",
CmdUIOnlyFlag)
{
@ -96,7 +96,7 @@ void EyedropperCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_eyedropper_command()
Command* CommandFactory::createEyedropperCommand()
{
return new EyedropperCommand;
}

View File

@ -39,7 +39,7 @@ protected:
};
FilmEditorCommand::FilmEditorCommand()
: Command("film_editor",
: Command("FilmEditor",
"Animation Editor",
CmdUIOnlyFlag)
{
@ -59,7 +59,7 @@ void FilmEditorCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_film_editor_command()
Command* CommandFactory::createFilmEditorCommand()
{
return new FilmEditorCommand;
}

View File

@ -42,7 +42,7 @@ protected:
};
FlattenLayersCommand::FlattenLayersCommand()
: Command("flatten_layers",
: Command("FlattenLayers",
"Flatten Layers",
CmdUIOnlyFlag)
{
@ -69,7 +69,7 @@ void FlattenLayersCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_flatten_layers_command()
Command* CommandFactory::createFlattenLayersCommand()
{
return new FlattenLayersCommand;
}

View File

@ -56,7 +56,7 @@ private:
};
FlipCommand::FlipCommand()
: Command("flip",
: Command("Flip",
"Flip",
CmdRecordableFlag)
{
@ -154,7 +154,7 @@ void FlipCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_flip_command()
Command* CommandFactory::createFlipCommand()
{
return new FlipCommand;
}

View File

@ -44,7 +44,7 @@ class SpriteReader;
void dialogs_frame_length(const SpriteReader& sprite, int sprite_frame);
FramePropertiesCommand::FramePropertiesCommand()
: Command("frame_properties",
: Command("FrameProperties",
"Frame Properties",
CmdUIOnlyFlag)
{
@ -109,7 +109,7 @@ void dialogs_frame_length(const SpriteReader& sprite, int sprite_frame)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_frame_properties_command()
Command* CommandFactory::createFramePropertiesCommand()
{
return new FramePropertiesCommand;
}

View File

@ -40,7 +40,7 @@ protected:
};
GotoFirstFrameCommand::GotoFirstFrameCommand()
: Command("goto_first_frame",
: Command("GotoFirstFrame",
"Goto First Frame",
CmdRecordableFlag)
{
@ -77,7 +77,7 @@ protected:
};
GotoPreviousFrameCommand::GotoPreviousFrameCommand()
: Command("goto_previous_frame",
: Command("GotoPreviousFrame",
"Goto Previous Frame",
CmdRecordableFlag)
{
@ -120,7 +120,7 @@ protected:
};
GotoNextFrameCommand::GotoNextFrameCommand()
: Command("goto_next_frame",
: Command("GotoNextFrame",
"Goto Next Frame",
CmdRecordableFlag)
{
@ -163,7 +163,7 @@ protected:
};
GotoLastFrameCommand::GotoLastFrameCommand()
: Command("goto_last_frame",
: Command("GotoLastFrame",
"Goto Last Frame",
CmdRecordableFlag)
{
@ -188,22 +188,22 @@ void GotoLastFrameCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_goto_first_frame_command()
Command* CommandFactory::createGotoFirstFrameCommand()
{
return new GotoFirstFrameCommand;
}
Command* CommandFactory::create_goto_previous_frame_command()
Command* CommandFactory::createGotoPreviousFrameCommand()
{
return new GotoPreviousFrameCommand;
}
Command* CommandFactory::create_goto_next_frame_command()
Command* CommandFactory::createGotoNextFrameCommand()
{
return new GotoNextFrameCommand;
}
Command* CommandFactory::create_goto_last_frame_command()
Command* CommandFactory::createGotoLastFrameCommand()
{
return new GotoLastFrameCommand;
}

View File

@ -43,7 +43,7 @@ protected:
};
GotoPreviousLayerCommand::GotoPreviousLayerCommand()
: Command("goto_previous_layer",
: Command("GotoPreviousLayer",
"Goto Previous Layer",
CmdUIOnlyFlag)
{
@ -92,7 +92,7 @@ protected:
};
GotoNextLayerCommand::GotoNextLayerCommand()
: Command("goto_next_layer",
: Command("GotoNextLayer",
"Goto Next Layer",
CmdUIOnlyFlag)
{
@ -129,12 +129,12 @@ void GotoNextLayerCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_goto_previous_layer_command()
Command* CommandFactory::createGotoPreviousLayerCommand()
{
return new GotoPreviousLayerCommand;
}
Command* CommandFactory::create_goto_next_layer_command()
Command* CommandFactory::createGotoNextLayerCommand()
{
return new GotoNextLayerCommand;
}

View File

@ -40,7 +40,7 @@ class ShowGridCommand : public Command
{
public:
ShowGridCommand()
: Command("show_grid",
: Command("ShowGrid",
"Show Grid",
CmdUIOnlyFlag)
{
@ -72,7 +72,7 @@ class SnapToGridCommand : public Command
{
public:
SnapToGridCommand()
: Command("snap_to_grid",
: Command("SnapToGrid",
"Snap to Grid",
CmdUIOnlyFlag)
{
@ -118,7 +118,7 @@ protected:
};
GridSettingsCommand::GridSettingsCommand()
: Command("grid_settings",
: Command("GridSettings",
"Grid Settings",
CmdUIOnlyFlag)
{
@ -168,17 +168,17 @@ void GridSettingsCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_show_grid_command()
Command* CommandFactory::createShowGridCommand()
{
return new ShowGridCommand;
}
Command* CommandFactory::create_snap_to_grid_command()
Command* CommandFactory::createSnapToGridCommand()
{
return new SnapToGridCommand;
}
Command* CommandFactory::create_grid_settings_command()
Command* CommandFactory::createGridSettingsCommand()
{
return new GridSettingsCommand;
}

View File

@ -42,7 +42,7 @@ protected:
};
InvertMaskCommand::InvertMaskCommand()
: Command("invert_mask",
: Command("InvertMask",
"Invert Mask",
CmdRecordableFlag)
{
@ -67,7 +67,7 @@ void InvertMaskCommand::onExecute(Context* context)
if (!has_mask) {
// so we select all
Command* mask_all_cmd =
CommandsModule::instance()->get_command_by_name(CommandId::mask_all);
CommandsModule::instance()->get_command_by_name(CommandId::MaskAll);
context->executeCommand(mask_all_cmd);
}
// invert the current mask
@ -115,7 +115,7 @@ void InvertMaskCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_invert_mask_command()
Command* CommandFactory::createInvertMaskCommand()
{
return new InvertMaskCommand;
}

View File

@ -41,7 +41,7 @@ protected:
};
LayerFromBackgroundCommand::LayerFromBackgroundCommand()
: Command("layer_from_background",
: Command("LayerFromBackground",
"Layer From Background",
CmdRecordableFlag)
{
@ -73,7 +73,7 @@ void LayerFromBackgroundCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_layer_from_background_command()
Command* CommandFactory::createLayerFromBackgroundCommand()
{
return new LayerFromBackgroundCommand;
}

View File

@ -44,7 +44,7 @@ protected:
};
LayerPropertiesCommand::LayerPropertiesCommand()
: Command("layer_properties",
: Command("LayerProperties",
"Layer Properties",
CmdRecordableFlag)
{
@ -101,7 +101,7 @@ void LayerPropertiesCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_layer_properties_command()
Command* CommandFactory::createLayerPropertiesCommand()
{
return new LayerPropertiesCommand;
}

View File

@ -46,7 +46,7 @@ protected:
};
LoadMaskCommand::LoadMaskCommand()
: Command("load_mask",
: Command("LoadMask",
"LoadMask",
CmdRecordableFlag)
{
@ -99,7 +99,7 @@ void LoadMaskCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_load_mask_command()
Command* CommandFactory::createLoadMaskCommand()
{
return new LoadMaskCommand;
}

View File

@ -40,7 +40,7 @@ protected:
};
MaskAllCommand::MaskAllCommand()
: Command("mask_all",
: Command("MaskAll",
"Mask All",
CmdRecordableFlag)
{
@ -72,7 +72,7 @@ void MaskAllCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_mask_all_command()
Command* CommandFactory::createMaskAllCommand()
{
return new MaskAllCommand;
}

View File

@ -39,7 +39,7 @@ protected:
};
MaskByColorCommand::MaskByColorCommand()
: Command("mask_by_color",
: Command("MaskByColor",
"Mask By Color",
CmdUIOnlyFlag)
{
@ -61,7 +61,7 @@ void MaskByColorCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_mask_by_color_command()
Command* CommandFactory::createMaskByColorCommand()
{
return new MaskByColorCommand;
}

View File

@ -46,7 +46,7 @@ protected:
};
MergeDownLayerCommand::MergeDownLayerCommand()
: Command("merge_down_layer",
: Command("MergeDownLayer",
"Merge Down Layer",
CmdRecordableFlag)
{
@ -192,7 +192,7 @@ void MergeDownLayerCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_merge_down_layer_command()
Command* CommandFactory::createMergeDownLayerCommand()
{
return new MergeDownLayerCommand;
}

View File

@ -37,7 +37,7 @@ protected:
};
MoveCelCommand::MoveCelCommand()
: Command("move_cel",
: Command("MoveCel",
"Move Cel",
CmdUIOnlyFlag)
{
@ -57,7 +57,7 @@ void MoveCelCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_move_cel_command()
Command* CommandFactory::createMoveCelCommand()
{
return new MoveCelCommand;
}

View File

@ -102,7 +102,7 @@ void NewCelCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_new_cel_command()
Command* CommandFactory::createNewCelCommand()
{
return new NewCelCommand;
}

View File

@ -59,7 +59,7 @@ static int _sprite_counter = 0;
static Sprite* new_sprite(Context* context, int imgtype, int w, int h, int ncolors);
NewFileCommand::NewFileCommand()
: Command("new_file",
: Command("NewFile",
"New File",
CmdRecordableFlag)
{
@ -201,7 +201,7 @@ static Sprite* new_sprite(Context* context, int imgtype, int w, int h, int ncolo
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_new_file_command()
Command* CommandFactory::createNewFileCommand()
{
return new NewFileCommand;
}

View File

@ -50,7 +50,7 @@ protected:
};
NewFrameCommand::NewFrameCommand()
: Command("new_frame",
: Command("NewFrame",
"New Frame",
CmdRecordableFlag)
{
@ -85,7 +85,7 @@ void NewFrameCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_new_frame_command()
Command* CommandFactory::createNewFrameCommand()
{
return new NewFrameCommand;
}

View File

@ -53,7 +53,7 @@ static std::string get_unique_layer_name(Sprite* sprite);
static int get_max_layer_num(Layer* layer);
NewLayerCommand::NewLayerCommand()
: Command("new_layer",
: Command("NewLayer",
"New Layer",
CmdRecordableFlag)
{
@ -146,7 +146,7 @@ static int get_max_layer_num(Layer* layer)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_new_layer_command()
Command* CommandFactory::createNewLayerCommand()
{
return new NewLayerCommand;
}

View File

@ -42,7 +42,7 @@ protected:
};
NewLayerSetCommand::NewLayerSetCommand()
: Command("new_layer_set",
: Command("NewLayerSet",
"New Layer Set",
CmdRecordableFlag)
{
@ -79,7 +79,7 @@ void NewLayerSetCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_new_layer_set_command()
Command* CommandFactory::createNewLayerSetCommand()
{
return new NewLayerSetCommand;
}

View File

@ -117,7 +117,7 @@ static void monitor_free(void* _data)
}
OpenFileCommand::OpenFileCommand()
: Command("open_file",
: Command("OpenFile",
"Open Sprite",
CmdRecordableFlag)
{
@ -216,7 +216,7 @@ void OpenFileCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_open_file_command()
Command* CommandFactory::createOpenFileCommand()
{
return new OpenFileCommand;
}

View File

@ -56,7 +56,7 @@ private:
};
OptionsCommand::OptionsCommand()
: Command("options",
: Command("Options",
"Options",
CmdUIOnlyFlag)
{
@ -186,7 +186,7 @@ void OptionsCommand::onResetCheckedBg()
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_options_command()
Command* CommandFactory::createOptionsCommand()
{
return new OptionsCommand;
}

View File

@ -131,7 +131,7 @@ static void on_color_changed(const Color& color);
static void set_new_palette(Palette *palette, const char* operationName);
PaletteEditorCommand::PaletteEditorCommand()
: Command("palette_editor",
: Command("PaletteEditor",
"PaletteEditor",
CmdRecordableFlag)
{
@ -1168,7 +1168,7 @@ static void set_new_palette(Palette* palette, const char* operationName)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_palette_editor_command()
Command* CommandFactory::createPaletteEditorCommand()
{
return new PaletteEditorCommand;
}

View File

@ -40,7 +40,7 @@ protected:
};
PasteCommand::PasteCommand()
: Command("paste",
: Command("Paste",
"Paste",
CmdUIOnlyFlag)
{
@ -66,7 +66,7 @@ void PasteCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_paste_command()
Command* CommandFactory::createPasteCommand()
{
return new PasteCommand;
}

View File

@ -56,7 +56,7 @@ static void speed_timer_callback()
END_OF_STATIC_FUNCTION(speed_timer_callback);
PlayAnimationCommand::PlayAnimationCommand()
: Command("play_animation",
: Command("PlayAnimation",
"Play Animation",
CmdUIOnlyFlag)
{
@ -160,7 +160,7 @@ void PlayAnimationCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_play_animation_command()
Command* CommandFactory::createPlayAnimationCommand()
{
return new PlayAnimationCommand;
}

View File

@ -55,7 +55,7 @@ protected:
};
PreviewCommand::PreviewCommand()
: Command("preview",
: Command("Preview",
"Preview",
CmdUIOnlyFlag)
{
@ -182,10 +182,10 @@ void PreviewCommand::onExecute(Context* context)
// Change frame
if (command != NULL &&
(strcmp(command->short_name(), CommandId::goto_first_frame) == 0 ||
strcmp(command->short_name(), CommandId::goto_previous_frame) == 0 ||
strcmp(command->short_name(), CommandId::goto_next_frame) == 0 ||
strcmp(command->short_name(), CommandId::goto_last_frame) == 0)) {
(strcmp(command->short_name(), CommandId::GotoFirstFrame) == 0 ||
strcmp(command->short_name(), CommandId::GotoPreviousFrame) == 0 ||
strcmp(command->short_name(), CommandId::GotoNextFrame) == 0 ||
strcmp(command->short_name(), CommandId::GotoLastFrame) == 0)) {
// Execute the command
context->executeCommand(command);
@ -199,7 +199,7 @@ void PreviewCommand::onExecute(Context* context)
}
// Play the animation
else if (command != NULL &&
strcmp(command->short_name(), CommandId::play_animation) == 0) {
strcmp(command->short_name(), CommandId::PlayAnimation) == 0) {
// TODO
}
// Change background color
@ -242,7 +242,7 @@ void PreviewCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_preview_command()
Command* CommandFactory::createPreviewCommand()
{
return new PreviewCommand;
}

View File

@ -38,7 +38,7 @@ protected:
};
QuickReferenceCommand::QuickReferenceCommand()
: Command("quick_reference",
: Command("QuickReference",
"Quick Reference",
CmdUIOnlyFlag)
{
@ -61,7 +61,7 @@ void QuickReferenceCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_quick_reference_command()
Command* CommandFactory::createQuickReferenceCommand()
{
return new QuickReferenceCommand;
}

View File

@ -38,7 +38,7 @@ protected:
};
RedoCommand::RedoCommand()
: Command("redo",
: Command("Redo",
"Redo",
CmdUIOnlyFlag)
{
@ -68,7 +68,7 @@ void RedoCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_redo_command()
Command* CommandFactory::createRedoCommand()
{
return new RedoCommand;
}

View File

@ -48,7 +48,7 @@ protected:
};
RefreshCommand::RefreshCommand()
: Command("refresh",
: Command("Refresh",
"Refresh",
CmdUIOnlyFlag)
{
@ -91,7 +91,7 @@ void RefreshCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_refresh_command()
Command* CommandFactory::createRefreshCommand()
{
return new RefreshCommand;
}

View File

@ -41,7 +41,7 @@ protected:
};
RemoveCelCommand::RemoveCelCommand()
: Command("remove_cel",
: Command("RemoveCel",
"Remove Cel",
CmdRecordableFlag)
{
@ -74,7 +74,7 @@ void RemoveCelCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_remove_cel_command()
Command* CommandFactory::createRemoveCelCommand()
{
return new RemoveCelCommand;
}

View File

@ -41,7 +41,7 @@ protected:
};
RemoveFrameCommand::RemoveFrameCommand()
: Command("remove_frame",
: Command("RemoveFrame",
"Remove Frame",
CmdRecordableFlag)
{
@ -69,7 +69,7 @@ void RemoveFrameCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_remove_frame_command()
Command* CommandFactory::createRemoveFrameCommand()
{
return new RemoveFrameCommand;
}

View File

@ -45,7 +45,7 @@ protected:
};
RemoveLayerCommand::RemoveLayerCommand()
: Command("remove_layer",
: Command("RemoveLayer",
"Remove Layer",
CmdRecordableFlag)
{
@ -82,7 +82,7 @@ void RemoveLayerCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_remove_layer_command()
Command* CommandFactory::createRemoveLayerCommand()
{
return new RemoveLayerCommand;
}

View File

@ -40,7 +40,7 @@ protected:
};
ReselectMaskCommand::ReselectMaskCommand()
: Command("reselect_mask",
: Command("ReselectMask",
"Reselect Mask",
CmdRecordableFlag)
{
@ -82,7 +82,7 @@ void ReselectMaskCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_reselect_mask_command()
Command* CommandFactory::createReselectMaskCommand()
{
return new ReselectMaskCommand;
}

View File

@ -167,7 +167,7 @@ protected:
};
RotateCanvasCommand::RotateCanvasCommand()
: Command("rotate_canvas",
: Command("RotateCanvas",
"Rotate Canvas",
CmdRecordableFlag)
{
@ -201,7 +201,7 @@ void RotateCanvasCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_rotate_canvas_command()
Command* CommandFactory::createRotateCanvasCommand()
{
return new RotateCanvasCommand;
}

View File

@ -201,7 +201,7 @@ protected:
};
SaveFileCommand::SaveFileCommand()
: Command("save_file",
: Command("SaveFile",
"Save File",
CmdRecordableFlag)
{
@ -256,7 +256,7 @@ protected:
};
SaveFileAsCommand::SaveFileAsCommand()
: Command("save_file_as",
: Command("SaveFileAs",
"Save File As",
CmdRecordableFlag)
{
@ -290,7 +290,7 @@ protected:
};
SaveFileCopyAsCommand::SaveFileCopyAsCommand()
: Command("save_file_copy_as",
: Command("SaveFileCopyAs",
"Save File Copy As",
CmdRecordableFlag)
{
@ -319,17 +319,17 @@ void SaveFileCopyAsCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_save_file_command()
Command* CommandFactory::createSaveFileCommand()
{
return new SaveFileCommand;
}
Command* CommandFactory::create_save_file_as_command()
Command* CommandFactory::createSaveFileAsCommand()
{
return new SaveFileAsCommand;
}
Command* CommandFactory::create_save_file_copy_as_command()
Command* CommandFactory::createSaveFileCopyAsCommand()
{
return new SaveFileCopyAsCommand;
}

View File

@ -44,7 +44,7 @@ protected:
};
SaveMaskCommand::SaveMaskCommand()
: Command("save_mask",
: Command("SaveMask",
"Save Mask",
CmdUIOnlyFlag)
{
@ -97,7 +97,7 @@ void SaveMaskCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_save_mask_command()
Command* CommandFactory::createSaveMaskCommand()
{
return new SaveMaskCommand;
}

View File

@ -41,7 +41,7 @@ protected:
};
ScreenShotCommand::ScreenShotCommand()
: Command("screen_shot",
: Command("ScreenShot",
"Screen Shot",
CmdUIOnlyFlag)
{
@ -132,7 +132,7 @@ void ScreenShotCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_screen_shot_command()
Command* CommandFactory::createScreenShotCommand()
{
return new ScreenShotCommand;
}

View File

@ -50,7 +50,7 @@ protected:
};
SelectFileCommand::SelectFileCommand()
: Command("select_file",
: Command("SelectFile",
"Select File",
CmdUIOnlyFlag)
{
@ -106,7 +106,7 @@ void SelectFileCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_select_file_command()
Command* CommandFactory::createSelectFileCommand()
{
return new SelectFileCommand;
}

View File

@ -35,7 +35,7 @@ protected:
};
CloseEditorCommand::CloseEditorCommand()
: Command("close_editor",
: Command("CloseEditor",
"Close Editor",
CmdUIOnlyFlag)
{
@ -60,7 +60,7 @@ protected:
};
MakeUniqueEditorCommand::MakeUniqueEditorCommand()
: Command("make_unique_editor",
: Command("MakeUniqueEditor",
"Make Unique Editor",
CmdUIOnlyFlag)
{
@ -85,7 +85,7 @@ protected:
};
SplitEditorHorizontallyCommand::SplitEditorHorizontallyCommand()
: Command("split_editor_horizontally",
: Command("SplitEditorHorizontally",
"Split Editor Horizontally",
CmdUIOnlyFlag)
{
@ -110,7 +110,7 @@ protected:
};
SplitEditorVerticallyCommand::SplitEditorVerticallyCommand()
: Command("split_editor_vertically",
: Command("SplitEditorVertically",
"Split Editor Vertically",
CmdUIOnlyFlag)
{
@ -124,22 +124,22 @@ void SplitEditorVerticallyCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_close_editor_command()
Command* CommandFactory::createCloseEditorCommand()
{
return new CloseEditorCommand;
}
Command* CommandFactory::create_make_unique_editor_command()
Command* CommandFactory::createMakeUniqueEditorCommand()
{
return new MakeUniqueEditorCommand;
}
Command* CommandFactory::create_split_editor_horizontally_command()
Command* CommandFactory::createSplitEditorHorizontallyCommand()
{
return new SplitEditorHorizontallyCommand;
}
Command* CommandFactory::create_split_editor_vertically_command()
Command* CommandFactory::createSplitEditorVerticallyCommand()
{
return new SplitEditorVerticallyCommand;
}

View File

@ -51,7 +51,7 @@ protected:
};
SpritePropertiesCommand::SpritePropertiesCommand()
: Command("sprite_properties",
: Command("SpriteProperties",
"Sprite Properties",
CmdUIOnlyFlag)
{
@ -163,7 +163,7 @@ void SpritePropertiesCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_sprite_properties_command()
Command* CommandFactory::createSpritePropertiesCommand()
{
return new SpritePropertiesCommand;
}

View File

@ -172,7 +172,7 @@ private:
};
SpriteSizeCommand::SpriteSizeCommand()
: Command("sprite_size",
: Command("SpriteSize",
"Sprite Size",
CmdRecordableFlag)
{
@ -314,7 +314,7 @@ static bool height_perc_change_hook(JWidget widget, void *data)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_sprite_size_command()
Command* CommandFactory::createSpriteSizeCommand()
{
return new SpriteSizeCommand;
}

View File

@ -36,7 +36,7 @@ protected:
};
SwitchColorsCommand::SwitchColorsCommand()
: Command("switch_colors",
: Command("SwitchColors",
"SwitchColors",
CmdUIOnlyFlag)
{
@ -55,7 +55,7 @@ void SwitchColorsCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_switch_colors_command()
Command* CommandFactory::createSwitchColorsCommand()
{
return new SwitchColorsCommand;
}

View File

@ -38,7 +38,7 @@ protected:
};
UndoCommand::UndoCommand()
: Command("undo",
: Command("Undo",
"Undo",
CmdUIOnlyFlag)
{
@ -68,7 +68,7 @@ void UndoCommand::onExecute(Context* context)
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_undo_command()
Command* CommandFactory::createUndoCommand()
{
return new UndoCommand;
}

View File

@ -25,8 +25,8 @@ class CommandFactory
{
public:
#undef FOR_EACH_COMMAND
#define FOR_EACH_COMMAND(name) \
static Command* create_##name##_command();
#define FOR_EACH_COMMAND(Name) \
static Command* create##Name##Command();
#include "commands/commands_list.h"
#undef FOR_EACH_COMMAND

View File

@ -30,8 +30,8 @@
#include "commands/commands.h"
#undef FOR_EACH_COMMAND
#define FOR_EACH_COMMAND(name) \
const char* CommandId::name = #name;
#define FOR_EACH_COMMAND(Name) \
const char* CommandId::Name = #Name;
#include "commands/commands_list.h"
#undef FOR_EACH_COMMAND
@ -43,8 +43,8 @@ CommandsModule::CommandsModule()
m_instance = this;
#undef FOR_EACH_COMMAND
#define FOR_EACH_COMMAND(name) \
m_commands.push_back(CommandFactory::create_##name##_command());
#define FOR_EACH_COMMAND(Name) \
m_commands.push_back(CommandFactory::create##Name##Command());
#include "commands/commands_list.h"
#undef FOR_EACH_COMMAND

View File

@ -24,8 +24,8 @@
struct CommandId
{
#undef FOR_EACH_COMMAND
#define FOR_EACH_COMMAND(name) \
static const char* name;
#define FOR_EACH_COMMAND(Name) \
static const char* Name;
#include "commands/commands_list.h"
#undef FOR_EACH_COMMAND
};

View File

@ -16,85 +16,85 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
FOR_EACH_COMMAND(about)
FOR_EACH_COMMAND(advanced_mode)
FOR_EACH_COMMAND(autocrop_sprite)
FOR_EACH_COMMAND(background_from_layer)
FOR_EACH_COMMAND(canvas_size)
FOR_EACH_COMMAND(cel_properties)
FOR_EACH_COMMAND(change_color)
FOR_EACH_COMMAND(change_image_type)
FOR_EACH_COMMAND(change_pen)
FOR_EACH_COMMAND(check_updates)
FOR_EACH_COMMAND(clear)
FOR_EACH_COMMAND(close_all_files)
FOR_EACH_COMMAND(close_editor)
FOR_EACH_COMMAND(close_file)
FOR_EACH_COMMAND(color_curve)
FOR_EACH_COMMAND(configure_tools)
FOR_EACH_COMMAND(convolution_matrix)
FOR_EACH_COMMAND(copy)
FOR_EACH_COMMAND(copy_cel)
FOR_EACH_COMMAND(crop_sprite)
FOR_EACH_COMMAND(cut)
FOR_EACH_COMMAND(deselect_mask)
FOR_EACH_COMMAND(despeckle)
FOR_EACH_COMMAND(donate)
FOR_EACH_COMMAND(duplicate_layer)
FOR_EACH_COMMAND(duplicate_sprite)
FOR_EACH_COMMAND(exit)
FOR_EACH_COMMAND(eyedropper)
FOR_EACH_COMMAND(film_editor)
FOR_EACH_COMMAND(flatten_layers)
FOR_EACH_COMMAND(flip)
FOR_EACH_COMMAND(frame_properties)
FOR_EACH_COMMAND(goto_first_frame)
FOR_EACH_COMMAND(goto_last_frame)
FOR_EACH_COMMAND(goto_next_frame)
FOR_EACH_COMMAND(goto_next_layer)
FOR_EACH_COMMAND(goto_previous_frame)
FOR_EACH_COMMAND(goto_previous_layer)
FOR_EACH_COMMAND(grid_settings)
FOR_EACH_COMMAND(invert_color)
FOR_EACH_COMMAND(invert_mask)
FOR_EACH_COMMAND(layer_from_background)
FOR_EACH_COMMAND(layer_properties)
FOR_EACH_COMMAND(load_mask)
FOR_EACH_COMMAND(make_unique_editor)
FOR_EACH_COMMAND(mask_all)
FOR_EACH_COMMAND(mask_by_color)
FOR_EACH_COMMAND(merge_down_layer)
FOR_EACH_COMMAND(move_cel)
FOR_EACH_COMMAND(new_file)
FOR_EACH_COMMAND(new_frame)
FOR_EACH_COMMAND(new_layer)
FOR_EACH_COMMAND(new_layer_set)
FOR_EACH_COMMAND(open_file)
FOR_EACH_COMMAND(options)
FOR_EACH_COMMAND(palette_editor)
FOR_EACH_COMMAND(paste)
FOR_EACH_COMMAND(play_animation)
FOR_EACH_COMMAND(preview)
FOR_EACH_COMMAND(quick_reference)
FOR_EACH_COMMAND(redo)
FOR_EACH_COMMAND(refresh)
FOR_EACH_COMMAND(remove_cel)
FOR_EACH_COMMAND(remove_frame)
FOR_EACH_COMMAND(remove_layer)
FOR_EACH_COMMAND(replace_color)
FOR_EACH_COMMAND(reselect_mask)
FOR_EACH_COMMAND(rotate_canvas)
FOR_EACH_COMMAND(save_file)
FOR_EACH_COMMAND(save_file_as)
FOR_EACH_COMMAND(save_file_copy_as)
FOR_EACH_COMMAND(save_mask)
FOR_EACH_COMMAND(screen_shot)
FOR_EACH_COMMAND(select_file)
FOR_EACH_COMMAND(show_grid)
FOR_EACH_COMMAND(snap_to_grid)
FOR_EACH_COMMAND(split_editor_horizontally)
FOR_EACH_COMMAND(split_editor_vertically)
FOR_EACH_COMMAND(sprite_properties)
FOR_EACH_COMMAND(sprite_size)
FOR_EACH_COMMAND(switch_colors)
FOR_EACH_COMMAND(undo)
FOR_EACH_COMMAND(About)
FOR_EACH_COMMAND(AdvancedMode)
FOR_EACH_COMMAND(AutocropSprite)
FOR_EACH_COMMAND(BackgroundFromLayer)
FOR_EACH_COMMAND(CanvasSize)
FOR_EACH_COMMAND(CelProperties)
FOR_EACH_COMMAND(ChangeColor)
FOR_EACH_COMMAND(ChangeImageType)
FOR_EACH_COMMAND(ChangePen)
FOR_EACH_COMMAND(CheckUpdates)
FOR_EACH_COMMAND(Clear)
FOR_EACH_COMMAND(CloseAllFiles)
FOR_EACH_COMMAND(CloseEditor)
FOR_EACH_COMMAND(CloseFile)
FOR_EACH_COMMAND(ColorCurve)
FOR_EACH_COMMAND(ConfigureTools)
FOR_EACH_COMMAND(ConvolutionMatrix)
FOR_EACH_COMMAND(Copy)
FOR_EACH_COMMAND(CopyCel)
FOR_EACH_COMMAND(CropSprite)
FOR_EACH_COMMAND(Cut)
FOR_EACH_COMMAND(DeselectMask)
FOR_EACH_COMMAND(Despeckle)
FOR_EACH_COMMAND(Donate)
FOR_EACH_COMMAND(DuplicateLayer)
FOR_EACH_COMMAND(DuplicateSprite)
FOR_EACH_COMMAND(Exit)
FOR_EACH_COMMAND(Eyedropper)
FOR_EACH_COMMAND(FilmEditor)
FOR_EACH_COMMAND(FlattenLayers)
FOR_EACH_COMMAND(Flip)
FOR_EACH_COMMAND(FrameProperties)
FOR_EACH_COMMAND(GotoFirstFrame)
FOR_EACH_COMMAND(GotoLastFrame)
FOR_EACH_COMMAND(GotoNextFrame)
FOR_EACH_COMMAND(GotoNextLayer)
FOR_EACH_COMMAND(GotoPreviousFrame)
FOR_EACH_COMMAND(GotoPreviousLayer)
FOR_EACH_COMMAND(GridSettings)
FOR_EACH_COMMAND(InvertColor)
FOR_EACH_COMMAND(InvertMask)
FOR_EACH_COMMAND(LayerFromBackground)
FOR_EACH_COMMAND(LayerProperties)
FOR_EACH_COMMAND(LoadMask)
FOR_EACH_COMMAND(MakeUniqueEditor)
FOR_EACH_COMMAND(MaskAll)
FOR_EACH_COMMAND(MaskByColor)
FOR_EACH_COMMAND(MergeDownLayer)
FOR_EACH_COMMAND(MoveCel)
FOR_EACH_COMMAND(NewFile)
FOR_EACH_COMMAND(NewFrame)
FOR_EACH_COMMAND(NewLayer)
FOR_EACH_COMMAND(NewLayerSet)
FOR_EACH_COMMAND(OpenFile)
FOR_EACH_COMMAND(Options)
FOR_EACH_COMMAND(PaletteEditor)
FOR_EACH_COMMAND(Paste)
FOR_EACH_COMMAND(PlayAnimation)
FOR_EACH_COMMAND(Preview)
FOR_EACH_COMMAND(QuickReference)
FOR_EACH_COMMAND(Redo)
FOR_EACH_COMMAND(Refresh)
FOR_EACH_COMMAND(RemoveCel)
FOR_EACH_COMMAND(RemoveFrame)
FOR_EACH_COMMAND(RemoveLayer)
FOR_EACH_COMMAND(ReplaceColor)
FOR_EACH_COMMAND(ReselectMask)
FOR_EACH_COMMAND(RotateCanvas)
FOR_EACH_COMMAND(SaveFile)
FOR_EACH_COMMAND(SaveFileAs)
FOR_EACH_COMMAND(SaveFileCopyAs)
FOR_EACH_COMMAND(SaveMask)
FOR_EACH_COMMAND(ScreenShot)
FOR_EACH_COMMAND(SelectFile)
FOR_EACH_COMMAND(ShowGrid)
FOR_EACH_COMMAND(SnapToGrid)
FOR_EACH_COMMAND(SplitEditorHorizontally)
FOR_EACH_COMMAND(SplitEditorVertically)
FOR_EACH_COMMAND(SpriteProperties)
FOR_EACH_COMMAND(SpriteSize)
FOR_EACH_COMMAND(SwitchColors)
FOR_EACH_COMMAND(Undo)

View File

@ -67,7 +67,7 @@ protected:
};
ColorCurveCommand::ColorCurveCommand()
: Command("color_curve",
: Command("ColorCurve",
"Color Curve",
CmdRecordableFlag)
{
@ -185,7 +185,7 @@ static void make_preview()
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_color_curve_command()
Command* CommandFactory::createColorCurveCommand()
{
return new ColorCurveCommand;
}

View File

@ -81,7 +81,7 @@ protected:
};
ConvolutionMatrixCommand::ConvolutionMatrixCommand()
: Command("convolution_matrix",
: Command("ConvolutionMatrix",
"Convolution Matrix",
CmdRecordableFlag)
{
@ -339,7 +339,7 @@ static void make_preview()
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_convolution_matrix_command()
Command* CommandFactory::createConvolutionMatrixCommand()
{
return new ConvolutionMatrixCommand;
}

View File

@ -70,7 +70,7 @@ protected:
};
DespeckleCommand::DespeckleCommand()
: Command("despeckle",
: Command("Despeckle",
"Despeckle",
CmdRecordableFlag)
{
@ -206,7 +206,7 @@ static void make_preview()
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_despeckle_command()
Command* CommandFactory::createDespeckleCommand()
{
return new DespeckleCommand;
}

View File

@ -64,7 +64,7 @@ protected:
};
InvertColorCommand::InvertColorCommand()
: Command("invert_color",
: Command("InvertColor",
"Invert Color",
CmdRecordableFlag)
{
@ -152,7 +152,7 @@ static void make_preview()
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_invert_color_command()
Command* CommandFactory::createInvertColorCommand()
{
return new InvertColorCommand;
}

View File

@ -69,7 +69,7 @@ protected:
};
ReplaceColorCommand::ReplaceColorCommand()
: Command("replace_color",
: Command("ReplaceColor",
"Replace Color",
CmdRecordableFlag)
{
@ -206,7 +206,7 @@ static void make_preview()
//////////////////////////////////////////////////////////////////////
// CommandFactory
Command* CommandFactory::create_replace_color_command()
Command* CommandFactory::createReplaceColorCommand()
{
return new ReplaceColorCommand;
}

View File

@ -78,7 +78,7 @@ void check_for_dropped_files()
// open all files
Command* cmd_open_file =
CommandsModule::instance()->get_command_by_name(CommandId::open_file);
CommandsModule::instance()->get_command_by_name(CommandId::OpenFile);
Params params;
for (std::vector<base::string>::iterator

View File

@ -538,7 +538,7 @@ static bool anieditor_msg_proc(JWidget widget, JMessage msg)
if (anieditor->clk_frame == anieditor->hot_frame) {
UIContext::instance()
->executeCommand(CommandsModule::instance()
->get_command_by_name(CommandId::frame_properties));
->get_command_by_name(CommandId::FrameProperties));
}
else {
const SpriteReader sprite((Sprite*)anieditor->sprite);
@ -690,14 +690,14 @@ static bool anieditor_msg_proc(JWidget widget, JMessage msg)
Command *command = get_command_from_key_message(msg);
/* close animation editor */
if ((command && (strcmp(command->short_name(), CommandId::film_editor) == 0)) ||
if ((command && (strcmp(command->short_name(), CommandId::FilmEditor) == 0)) ||
(msg->key.scancode == KEY_ESC)) {
jwidget_close_window(widget);
return true;
}
/* undo */
if (command && strcmp(command->short_name(), CommandId::undo) == 0) {
if (command && strcmp(command->short_name(), CommandId::Undo) == 0) {
const SpriteReader sprite((Sprite*)anieditor->sprite);
if (sprite->getUndo()->canUndo()) {
SpriteWriter sprite_writer(sprite);
@ -712,7 +712,7 @@ static bool anieditor_msg_proc(JWidget widget, JMessage msg)
}
/* redo */
if (command && strcmp(command->short_name(), CommandId::redo) == 0) {
if (command && strcmp(command->short_name(), CommandId::Redo) == 0) {
const SpriteReader sprite((Sprite*)anieditor->sprite);
if (sprite->getUndo()->canRedo()) {
SpriteWriter sprite_writer(sprite);
@ -728,15 +728,15 @@ static bool anieditor_msg_proc(JWidget widget, JMessage msg)
/* new_frame, remove_frame, new_cel, remove_cel */
if (command != NULL) {
if (strcmp(command->short_name(), CommandId::new_frame) == 0 ||
strcmp(command->short_name(), CommandId::remove_cel) == 0 ||
strcmp(command->short_name(), CommandId::remove_frame) == 0 ||
strcmp(command->short_name(), CommandId::goto_first_frame) == 0 ||
strcmp(command->short_name(), CommandId::goto_previous_frame) == 0 ||
strcmp(command->short_name(), CommandId::goto_previous_layer) == 0 ||
strcmp(command->short_name(), CommandId::goto_next_frame) == 0 ||
strcmp(command->short_name(), CommandId::goto_next_layer) == 0 ||
strcmp(command->short_name(), CommandId::goto_last_frame) == 0) {
if (strcmp(command->short_name(), CommandId::NewFrame) == 0 ||
strcmp(command->short_name(), CommandId::RemoveCel) == 0 ||
strcmp(command->short_name(), CommandId::RemoveFrame) == 0 ||
strcmp(command->short_name(), CommandId::GotoFirstFrame) == 0 ||
strcmp(command->short_name(), CommandId::GotoPreviousFrame) == 0 ||
strcmp(command->short_name(), CommandId::GotoPreviousLayer) == 0 ||
strcmp(command->short_name(), CommandId::GotoNextFrame) == 0 ||
strcmp(command->short_name(), CommandId::GotoNextLayer) == 0 ||
strcmp(command->short_name(), CommandId::GotoLastFrame) == 0) {
// execute the command
UIContext::instance()->executeCommand(command);
@ -745,8 +745,8 @@ static bool anieditor_msg_proc(JWidget widget, JMessage msg)
return true;
}
if (strcmp(command->short_name(), CommandId::new_layer) == 0 ||
strcmp(command->short_name(), CommandId::remove_layer) == 0) {
if (strcmp(command->short_name(), CommandId::NewLayer) == 0 ||
strcmp(command->short_name(), CommandId::RemoveLayer) == 0) {
// execute the command
UIContext::instance()->executeCommand(command);

View File

@ -1239,7 +1239,7 @@ static bool manager_msg_proc(JWidget widget, JMessage msg)
Command* command = shortcut->command;
// the screen shot is available in everywhere
if (strcmp(command->short_name(), CommandId::screen_shot) == 0) {
if (strcmp(command->short_name(), CommandId::ScreenShot) == 0) {
UIContext::instance()->executeCommand(command, shortcut->params);
return true;
}

View File

@ -137,7 +137,7 @@ static int load_root_menu()
const char* command_key = xmlKey->Attribute("shortcut");
if (command_name && command_key) {
Command *command = CommandsModule::instance()->get_command_by_name(command_name);
Command* command = CommandsModule::instance()->get_command_by_name(command_name);
if (command) {
// Read params
Params params;

View File

@ -417,7 +417,7 @@ bool ColorBar::onProcessMessage(JMessage msg)
case HOTCOLOR_FGCOLOR:
case HOTCOLOR_BGCOLOR: {
Command* paledit_cmd = CommandsModule::instance()->get_command_by_name(CommandId::palette_editor);
Command* paledit_cmd = CommandsModule::instance()->get_command_by_name(CommandId::PaletteEditor);
Params params;
params.set("target", (m_hot == HOTCOLOR_FGCOLOR ? "foreground": "background"));
params.set("open", "true");

View File

@ -1140,7 +1140,7 @@ bool Editor::onProcessMessage(JMessage msg)
// Call the eyedropper command
else if (current_tool->getInk(msg->mouse.right ? 1: 0)->isEyedropper()) {
Command* eyedropper_cmd =
CommandsModule::instance()->get_command_by_name(CommandId::eyedropper);
CommandsModule::instance()->get_command_by_name(CommandId::Eyedropper);
Params params;
params.set("target", msg->mouse.right ? "background": "foreground");
@ -1442,7 +1442,8 @@ bool Editor::onProcessMessage(JMessage msg)
case WHEEL_FRAME:
if (m_state == EDITOR_STATE_STANDBY) {
Command* command = CommandsModule::instance()->get_command_by_name
((dz < 0) ? CommandId::goto_next_frame: CommandId::goto_previous_frame);
((dz < 0) ? CommandId::GotoNextFrame:
CommandId::GotoPreviousFrame);
if (command)
UIContext::instance()->executeCommand(command, NULL);
}

View File

@ -683,7 +683,7 @@ bool StatusBar::onProcessMessage(JMessage msg)
else {
// Call "Donate" command
Command* donate = CommandsModule::instance()
->get_command_by_name(CommandId::donate);
->get_command_by_name(CommandId::Donate);
Params params;
UIContext::instance()->executeCommand(donate, &params);
@ -770,12 +770,12 @@ static void ani_button_command(Button* widget, AniAction action)
Command* cmd = NULL;
switch (action) {
//case ACTION_LAYER: cmd = CommandsModule::instance()->get_command_by_name(CommandId::layer_properties); break;
case ACTION_FIRST: cmd = CommandsModule::instance()->get_command_by_name(CommandId::goto_first_frame); break;
case ACTION_PREV: cmd = CommandsModule::instance()->get_command_by_name(CommandId::goto_previous_frame); break;
case ACTION_PLAY: cmd = CommandsModule::instance()->get_command_by_name(CommandId::play_animation); break;
case ACTION_NEXT: cmd = CommandsModule::instance()->get_command_by_name(CommandId::goto_next_frame); break;
case ACTION_LAST: cmd = CommandsModule::instance()->get_command_by_name(CommandId::goto_last_frame); break;
//case ACTION_LAYER: cmd = CommandsModule::instance()->get_command_by_name(CommandId::LayerProperties); break;
case ACTION_FIRST: cmd = CommandsModule::instance()->get_command_by_name(CommandId::GotoFirstFrame); break;
case ACTION_PREV: cmd = CommandsModule::instance()->get_command_by_name(CommandId::GotoPreviousFrame); break;
case ACTION_PLAY: cmd = CommandsModule::instance()->get_command_by_name(CommandId::PlayAnimation); break;
case ACTION_NEXT: cmd = CommandsModule::instance()->get_command_by_name(CommandId::GotoNextFrame); break;
case ACTION_LAST: cmd = CommandsModule::instance()->get_command_by_name(CommandId::GotoLastFrame); break;
}
if (cmd)

View File

@ -277,7 +277,7 @@ bool ToolBar::onProcessMessage(JMessage msg)
toolrc = getToolGroupBounds(-1);
if (msg->mouse.y >= toolrc.y && msg->mouse.y < toolrc.y+toolrc.h) {
Command* conf_tools_cmd =
CommandsModule::instance()->get_command_by_name(CommandId::configure_tools);
CommandsModule::instance()->get_command_by_name(CommandId::ConfigureTools);
UIContext::instance()->executeCommand(conf_tools_cmd);
}