Menu
▾
▴
mp-plugins-svn
|
From: <che...@us...> - 2009-06-16 03:12:57
|
Revision: 2924
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2924&view=rev
Author: chef_koch
Date: 2009-06-16 01:57:28 +0000 (Tue, 16 Jun 2009)
Log Message:
-----------
updated resharper code style sharing file to 4.5
updated code style:
- static fields (not public) : _lowerCamelCase
- instance fields (not public) : _lowerCamelCase
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper
Removed Paths:
-------------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.1.resharper
Deleted: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.1.resharper
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.1.resharper 2009-06-16 00:45:30 UTC (rev 2923)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.1.resharper 2009-06-16 01:57:28 UTC (rev 2924)
@@ -1,311 +0,0 @@
-<Configuration>
- <CodeStyleSettings>
- <Sharing>SOLUTION</Sharing>
- <ExternalPath>
- </ExternalPath>
- <CSharp>
- <FormatSettings>
- <INSERT_TABS>False</INSERT_TABS>
- <INDENT_SIZE>2</INDENT_SIZE>
- <CONTINUOUS_INDENT_MULTIPLIER>1</CONTINUOUS_INDENT_MULTIPLIER>
- <SPACE_BEFORE_METHOD_CALL_PARENTHESES>False</SPACE_BEFORE_METHOD_CALL_PARENTHESES>
- <SPACE_BEFORE_EMPTY_METHOD_CALL_PARENTHESES>False</SPACE_BEFORE_EMPTY_METHOD_CALL_PARENTHESES>
- <SPACE_BEFORE_METHOD_PARENTHESES>False</SPACE_BEFORE_METHOD_PARENTHESES>
- <SPACE_BEFORE_EMPTY_METHOD_PARENTHESES>False</SPACE_BEFORE_EMPTY_METHOD_PARENTHESES>
- <SPACE_WITHIN_METHOD_PARENTHESES>False</SPACE_WITHIN_METHOD_PARENTHESES>
- <SPACE_WITHIN_EMPTY_METHOD_PARENTHESES>False</SPACE_WITHIN_EMPTY_METHOD_PARENTHESES>
- <SPACE_WITHIN_METHOD_CALL_PARENTHESES>False</SPACE_WITHIN_METHOD_CALL_PARENTHESES>
- <SPACE_WITHIN_EMPTY_METHOD_CALL_PARENTHESES>False</SPACE_WITHIN_EMPTY_METHOD_CALL_PARENTHESES>
- <SPACE_BEFORE_ARRAY_ACCESS_BRACKETS>False</SPACE_BEFORE_ARRAY_ACCESS_BRACKETS>
- <SPACE_WITHIN_ARRAY_ACCESS_BRACKETS>False</SPACE_WITHIN_ARRAY_ACCESS_BRACKETS>
- <SPACE_BEFORE_IF_PARENTHESES>True</SPACE_BEFORE_IF_PARENTHESES>
- <SPACE_WITHIN_IF_PARENTHESES>False</SPACE_WITHIN_IF_PARENTHESES>
- <SPACE_WITHIN_TYPECAST_PARENTHESES>False</SPACE_WITHIN_TYPECAST_PARENTHESES>
- <SPACE_AFTER_TYPECAST_PARENTHESES>True</SPACE_AFTER_TYPECAST_PARENTHESES>
- <SPACE_WITHIN_PARENTHESES>False</SPACE_WITHIN_PARENTHESES>
- <SPACE_BEFORE_WHILE_PARENTHESES>True</SPACE_BEFORE_WHILE_PARENTHESES>
- <SPACE_WITHIN_WHILE_PARENTHESES>False</SPACE_WITHIN_WHILE_PARENTHESES>
- <SPACE_BEFORE_CATCH_PARENTHESES>True</SPACE_BEFORE_CATCH_PARENTHESES>
- <SPACE_WITHIN_CATCH_PARENTHESES>False</SPACE_WITHIN_CATCH_PARENTHESES>
- <SPACE_BEFORE_SWITCH_PARENTHESES>True</SPACE_BEFORE_SWITCH_PARENTHESES>
- <SPACE_WITHIN_SWITCH_PARENTHESES>False</SPACE_WITHIN_SWITCH_PARENTHESES>
- <SPACE_BEFORE_FOR_PARENTHESES>True</SPACE_BEFORE_FOR_PARENTHESES>
- <SPACE_WITHIN_FOR_PARENTHESES>False</SPACE_WITHIN_FOR_PARENTHESES>
- <SPACE_BEFORE_FOREACH_PARENTHESES>True</SPACE_BEFORE_FOREACH_PARENTHESES>
- <SPACE_WITHIN_FOREACH_PARENTHESES>False</SPACE_WITHIN_FOREACH_PARENTHESES>
- <SPACE_BEFORE_USING_PARENTHESES>True</SPACE_BEFORE_USING_PARENTHESES>
- <SPACE_WITHIN_USING_PARENTHESES>False</SPACE_WITHIN_USING_PARENTHESES>
- <SPACE_BEFORE_LOCK_PARENTHESES>True</SPACE_BEFORE_LOCK_PARENTHESES>
- <SPACE_WITHIN_LOCK_PARENTHESES>False</SPACE_WITHIN_LOCK_PARENTHESES>
- <SPACE_BEFORE_TYPEOF_PARENTHESES>True</SPACE_BEFORE_TYPEOF_PARENTHESES>
- <SPACE_WITHIN_TYPEOF_PARENTHESES>False</SPACE_WITHIN_TYPEOF_PARENTHESES>
- <SPACE_BEFORE_FIXED_PARENTHESES>True</SPACE_BEFORE_FIXED_PARENTHESES>
- <SPACE_WITHIN_FIXED_PARENTHESES>False</SPACE_WITHIN_FIXED_PARENTHESES>
- <SPACE_BEFORE_SIZEOF_PARENTHESES>True</SPACE_BEFORE_SIZEOF_PARENTHESES>
- <SPACE_WITHIN_SIZEOF_PARENTHESES>False</SPACE_WITHIN_SIZEOF_PARENTHESES>
- <SPACE_BEFORE_TYPE_PARAMETER_ANGLE>False</SPACE_BEFORE_TYPE_PARAMETER_ANGLE>
- <SPACE_WITHIN_TYPE_PARAMETER_ANGLES>False</SPACE_WITHIN_TYPE_PARAMETER_ANGLES>
- <SPACE_BEFORE_TYPE_ARGUMENT_ANGLE>False</SPACE_BEFORE_TYPE_ARGUMENT_ANGLE>
- <SPACE_WITHIN_TYPE_ARGUMENT_ANGLES>False</SPACE_WITHIN_TYPE_ARGUMENT_ANGLES>
- <SPACE_AFTER_COMMA>True</SPACE_AFTER_COMMA>
- <SPACE_BEFORE_COMMA>False</SPACE_BEFORE_COMMA>
- <SPACE_BEFORE_FOR_SEMICOLON>False</SPACE_BEFORE_FOR_SEMICOLON>
- <SPACE_AFTER_FOR_SEMICOLON>True</SPACE_AFTER_FOR_SEMICOLON>
- <SPACE_BEFORE_TERNARY_QUEST>True</SPACE_BEFORE_TERNARY_QUEST>
- <SPACE_AFTER_TERNARY_QUEST>True</SPACE_AFTER_TERNARY_QUEST>
- <SPACE_BEFORE_TERNARY_COLON>True</SPACE_BEFORE_TERNARY_COLON>
- <SPACE_AFTER_TERNARY_COLON>True</SPACE_AFTER_TERNARY_COLON>
- <SPACE_BEFORE_ATTRIBUTE_COLON>False</SPACE_BEFORE_ATTRIBUTE_COLON>
- <SPACE_AFTER_ATTRIBUTE_COLON>True</SPACE_AFTER_ATTRIBUTE_COLON>
- <SPACE_BEFORE_EXTENDS_COLON>True</SPACE_BEFORE_EXTENDS_COLON>
- <SPACE_AFTER_EXTENDS_COLON>True</SPACE_AFTER_EXTENDS_COLON>
- <SPACE_BEFORE_TYPE_PARAMETER_CONSTRAINT_COLON>True</SPACE_BEFORE_TYPE_PARAMETER_CONSTRAINT_COLON>
- <SPACE_AFTER_TYPE_PARAMETER_CONSTRAINT_COLON>True</SPACE_AFTER_TYPE_PARAMETER_CONSTRAINT_COLON>
- <SPACE_AROUND_LAMBDA_ARROW>True</SPACE_AROUND_LAMBDA_ARROW>
- <SPACE_AROUND_ASSIGNMENT_OP>True</SPACE_AROUND_ASSIGNMENT_OP>
- <SPACE_AROUND_LOGICAL_OP>True</SPACE_AROUND_LOGICAL_OP>
- <SPACE_AROUND_EQUALITY_OP>True</SPACE_AROUND_EQUALITY_OP>
- <SPACE_AROUND_RELATIONAL_OP>True</SPACE_AROUND_RELATIONAL_OP>
- <SPACE_AROUND_BITWISE_OP>True</SPACE_AROUND_BITWISE_OP>
- <SPACE_AROUND_ADDITIVE_OP>True</SPACE_AROUND_ADDITIVE_OP>
- <SPACE_AROUND_MULTIPLICATIVE_OP>False</SPACE_AROUND_MULTIPLICATIVE_OP>
- <SPACE_AROUND_SHIFT_OP>True</SPACE_AROUND_SHIFT_OP>
- <SPACE_AROUND_NULLCOALESCING_OP>True</SPACE_AROUND_NULLCOALESCING_OP>
- <SPACE_AFTER_AMPERSAND_OP>False</SPACE_AFTER_AMPERSAND_OP>
- <SPACE_AFTER_ASTERIK_OP>False</SPACE_AFTER_ASTERIK_OP>
- <SPACE_AROUND_ARROW_OP>False</SPACE_AROUND_ARROW_OP>
- <SPACE_AROUND_DOT>False</SPACE_AROUND_DOT>
- <SPACE_IN_SINGLELINE_ACCESSOR>True</SPACE_IN_SINGLELINE_ACCESSOR>
- <SPACE_IN_SINGLELINE_METHOD>True</SPACE_IN_SINGLELINE_METHOD>
- <SPACE_IN_SINGLELINE_ANONYMOUS_METHOD>True</SPACE_IN_SINGLELINE_ANONYMOUS_METHOD>
- <SPACE_WITHIN_ATTRIBUTE_BRACKETS>False</SPACE_WITHIN_ATTRIBUTE_BRACKETS>
- <SPACE_BEFORE_SEMICOLON>False</SPACE_BEFORE_SEMICOLON>
- <SPACE_BEFORE_COLON_IN_CASE>False</SPACE_BEFORE_COLON_IN_CASE>
- <SPACE_BEFORE_NULLABLE_MARK>False</SPACE_BEFORE_NULLABLE_MARK>
- <SPACE_BEFORE_ARRAY_CREATION_BRACE>True</SPACE_BEFORE_ARRAY_CREATION_BRACE>
- <SPACE_BEFORE_ARRAY_RANK_BRACKETS>False</SPACE_BEFORE_ARRAY_RANK_BRACKETS>
- <SPACE_WITHIN_ARRAY_RANK_BRACKETS>False</SPACE_WITHIN_ARRAY_RANK_BRACKETS>
- <SPACE_WITHIN_ARRAY_RANK_EMPTY_BRACKETS>False</SPACE_WITHIN_ARRAY_RANK_EMPTY_BRACKETS>
- <SPACE_BEFORE_POINTER_ASTERIK_DECLARATION>False</SPACE_BEFORE_POINTER_ASTERIK_DECLARATION>
- <SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES>False</SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES>
- <TYPE_DECLARATION_BRACES>NEXT_LINE</TYPE_DECLARATION_BRACES>
- <INVOCABLE_DECLARATION_BRACES>NEXT_LINE</INVOCABLE_DECLARATION_BRACES>
- <ANONYMOUS_METHOD_DECLARATION_BRACES>NEXT_LINE_SHIFTED_2</ANONYMOUS_METHOD_DECLARATION_BRACES>
- <CASE_BLOCK_BRACES>NEXT_LINE_SHIFTED_2</CASE_BLOCK_BRACES>
- <INITIALIZER_BRACES>NEXT_LINE_SHIFTED_2</INITIALIZER_BRACES>
- <OTHER_BRACES>NEXT_LINE</OTHER_BRACES>
- <EMPTY_BLOCK_STYLE>MULTILINE</EMPTY_BLOCK_STYLE>
- <PLACE_ELSE_ON_NEW_LINE>True</PLACE_ELSE_ON_NEW_LINE>
- <PLACE_WHILE_ON_NEW_LINE>False</PLACE_WHILE_ON_NEW_LINE>
- <PLACE_CATCH_ON_NEW_LINE>True</PLACE_CATCH_ON_NEW_LINE>
- <PLACE_FINALLY_ON_NEW_LINE>True</PLACE_FINALLY_ON_NEW_LINE>
- <KEEP_USER_LINEBREAKS>True</KEEP_USER_LINEBREAKS>
- <SIMPLE_EMBEDDED_STATEMENT_STYLE>DO_NOT_CHANGE</SIMPLE_EMBEDDED_STATEMENT_STYLE>
- <FORCE_IFELSE_BRACES_STYLE>DO_NOT_CHANGE</FORCE_IFELSE_BRACES_STYLE>
- <FORCE_FOR_BRACES_STYLE>DO_NOT_CHANGE</FORCE_FOR_BRACES_STYLE>
- <FORCE_FOREACH_BRACES_STYLE>DO_NOT_CHANGE</FORCE_FOREACH_BRACES_STYLE>
- <FORCE_WHILE_BRACES_STYLE>DO_NOT_CHANGE</FORCE_WHILE_BRACES_STYLE>
- <FORCE_USING_BRACES_STYLE>DO_NOT_CHANGE</FORCE_USING_BRACES_STYLE>
- <FORCE_FIXED_BRACES_STYLE>DO_NOT_CHANGE</FORCE_FIXED_BRACES_STYLE>
- <KEEP_BLANK_LINES_IN_DECLARATIONS>2</KEEP_BLANK_LINES_IN_DECLARATIONS>
- <KEEP_BLANK_LINES_IN_CODE>2</KEEP_BLANK_LINES_IN_CODE>
- <BLANK_LINES_BEFORE_USING>0</BLANK_LINES_BEFORE_USING>
- <BLANK_LINES_AFTER_USING>1</BLANK_LINES_AFTER_USING>
- <BLANK_LINES_AROUND_NAMESPACE>1</BLANK_LINES_AROUND_NAMESPACE>
- <BLANK_LINES_AROUND_TYPE>1</BLANK_LINES_AROUND_TYPE>
- <BLANK_LINES_AROUND_FIELD>1</BLANK_LINES_AROUND_FIELD>
- <BLANK_LINES_AROUND_SINGLE_LINE_FIELD>0</BLANK_LINES_AROUND_SINGLE_LINE_FIELD>
- <BLANK_LINES_AROUND_INVOCABLE>1</BLANK_LINES_AROUND_INVOCABLE>
- <BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>0</BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>
- <BLANK_LINES_AROUND_REGION>1</BLANK_LINES_AROUND_REGION>
- <BLANK_LINES_INSIDE_REGION>1</BLANK_LINES_INSIDE_REGION>
- <BLANK_LINES_BETWEEN_USING_GROUPS>0</BLANK_LINES_BETWEEN_USING_GROUPS>
- <BLANK_LINES_AFTER_USING_LIST>1</BLANK_LINES_AFTER_USING_LIST>
- <MODIFIERS_ORDER length="14">
- <_0>public</_0>
- <_1>protected</_1>
- <_2>internal</_2>
- <_3>private</_3>
- <_4>new</_4>
- <_5>abstract</_5>
- <_6>virtual</_6>
- <_7>override</_7>
- <_8>sealed</_8>
- <_9>static</_9>
- <_10>readonly</_10>
- <_11>extern</_11>
- <_12>unsafe</_12>
- <_13>volatile</_13>
- </MODIFIERS_ORDER>
- <EXPLICIT_PRIVATE_MODIFIER>True</EXPLICIT_PRIVATE_MODIFIER>
- <EXPLICIT_INTERNAL_MODIFIER>True</EXPLICIT_INTERNAL_MODIFIER>
- <ARRANGE_MODIFIER_IN_EXISTING_CODE>True</ARRANGE_MODIFIER_IN_EXISTING_CODE>
- <ALIGN_MULTILINE_PARAMETER>True</ALIGN_MULTILINE_PARAMETER>
- <ALIGN_MULTILINE_ARGUMENT>True</ALIGN_MULTILINE_ARGUMENT>
- <ALIGN_MULTILINE_EXTENDS_LIST>True</ALIGN_MULTILINE_EXTENDS_LIST>
- <ALIGN_MULTILINE_EXPRESSION>True</ALIGN_MULTILINE_EXPRESSION>
- <ALIGN_MULTILINE_ARRAY_AND_OBJECT_INITIALIZER>True</ALIGN_MULTILINE_ARRAY_AND_OBJECT_INITIALIZER>
- <ALIGN_MULTLINE_TYPE_PARAMETER_LIST>True</ALIGN_MULTLINE_TYPE_PARAMETER_LIST>
- <ALIGN_MULTLINE_TYPE_PARAMETER_CONSTRAINS>True</ALIGN_MULTLINE_TYPE_PARAMETER_CONSTRAINS>
- <ALIGN_MULTILINE_FOR_STMT>True</ALIGN_MULTILINE_FOR_STMT>
- <ALIGN_MULTIPLE_DECLARATION>True</ALIGN_MULTIPLE_DECLARATION>
- <WRAP_LINES>True</WRAP_LINES>
- <WRAP_LIMIT>120</WRAP_LIMIT>
- <WRAP_BEFORE_INVOCATION_LPAR>False</WRAP_BEFORE_INVOCATION_LPAR>
- <WRAP_AFTER_INVOCATION_LPAR>False</WRAP_AFTER_INVOCATION_LPAR>
- <WRAP_BEFORE_DECLARATION_LPAR>False</WRAP_BEFORE_DECLARATION_LPAR>
- <WRAP_AFTER_DECLARATION_LPAR>False</WRAP_AFTER_DECLARATION_LPAR>
- <WRAP_BEFORE_TYPE_PARAMETER_LANGLE>False</WRAP_BEFORE_TYPE_PARAMETER_LANGLE>
- <WRAP_BEFORE_EXTENDS_COLON>False</WRAP_BEFORE_EXTENDS_COLON>
- <WRAP_BEFORE_BINARY_OPSIGN>False</WRAP_BEFORE_BINARY_OPSIGN>
- <WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT>False</WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT>
- <FORCE_CHOP_COMPOUND_IF_EXPRESSION>False</FORCE_CHOP_COMPOUND_IF_EXPRESSION>
- <FORCE_CHOP_COMPOUND_WHILE_EXPRESSION>False</FORCE_CHOP_COMPOUND_WHILE_EXPRESSION>
- <FORCE_CHOP_COMPOUND_DO_EXPRESSION>False</FORCE_CHOP_COMPOUND_DO_EXPRESSION>
- <WRAP_PARAMETERS_STYLE>WRAP_IF_LONG</WRAP_PARAMETERS_STYLE>
- <WRAP_ARGUMENTS_STYLE>WRAP_IF_LONG</WRAP_ARGUMENTS_STYLE>
- <WRAP_EXTENDS_LIST_STYLE>WRAP_IF_LONG</WRAP_EXTENDS_LIST_STYLE>
- <WRAP_FOR_STMT_HEADER_STYLE>CHOP_IF_LONG</WRAP_FOR_STMT_HEADER_STYLE>
- <WRAP_TERNARY_EXPR_STYLE>CHOP_IF_LONG</WRAP_TERNARY_EXPR_STYLE>
- <WRAP_MULTIPLE_DECLARATION_STYLE>CHOP_IF_LONG</WRAP_MULTIPLE_DECLARATION_STYLE>
- <WRAP_MULTIPLE_TYPE_PARAMEER_CONSTRAINTS_STYLE>CHOP_IF_LONG</WRAP_MULTIPLE_TYPE_PARAMEER_CONSTRAINTS_STYLE>
- <WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE>CHOP_IF_LONG</WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE>
- <FORCE_ATTRIBUTE_STYLE>DO_NOT_CHANGE</FORCE_ATTRIBUTE_STYLE>
- <PLACE_ABSTRACT_ACCESSORHOLDER_ON_SINGLE_LINE>True</PLACE_ABSTRACT_ACCESSORHOLDER_ON_SINGLE_LINE>
- <PLACE_SIMPLE_ACCESSORHOLDER_ON_SINGLE_LINE>False</PLACE_SIMPLE_ACCESSORHOLDER_ON_SINGLE_LINE>
- <PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE>True</PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE>
- <PLACE_SIMPLE_METHOD_ON_SINGLE_LINE>False</PLACE_SIMPLE_METHOD_ON_SINGLE_LINE>
- <PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE>True</PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE>
- <PLACE_SIMPLE_LINQ_ON_SINGLE_LINE>True</PLACE_SIMPLE_LINQ_ON_SINGLE_LINE>
- <PLACE_SIMPLE_INITIALIZER_ON_SINGLE_LINE>True</PLACE_SIMPLE_INITIALIZER_ON_SINGLE_LINE>
- <PLACE_TYPE_ATTRIBUTE_ON_SAME_LINE>False</PLACE_TYPE_ATTRIBUTE_ON_SAME_LINE>
- <PLACE_METHOD_ATTRIBUTE_ON_SAME_LINE>False</PLACE_METHOD_ATTRIBUTE_ON_SAME_LINE>
- <PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE>False</PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE>
- <PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>True</PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>
- <PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE>True</PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE>
- <PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE>True</PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE>
- <INDENT_ANONYMOUS_METHOD_BLOCK>True</INDENT_ANONYMOUS_METHOD_BLOCK>
- <INDENT_EMBRACED_INITIALIZER_BLOCK>True</INDENT_EMBRACED_INITIALIZER_BLOCK>
- <SPECIAL_ELSE_IF_TREATMENT>True</SPECIAL_ELSE_IF_TREATMENT>
- <INDENT_CASE_FROM_SWITCH>True</INDENT_CASE_FROM_SWITCH>
- <INDENT_NESTED_USINGS_STMT>False</INDENT_NESTED_USINGS_STMT>
- <INDENT_NESTED_FIXED_STMT>False</INDENT_NESTED_FIXED_STMT>
- <STICK_COMMENT>True</STICK_COMMENT>
- <REDUNDANT_THIS_QUALIFIER_STYLE>DO_NOT_USE</REDUNDANT_THIS_QUALIFIER_STYLE>
- </FormatSettings>
- <UsingsSettings>
- <AddImportsToDeepestScope>False</AddImportsToDeepestScope>
- <AllowAlias>True</AllowAlias>
- <PreferQualifiedReference>False</PreferQualifiedReference>
- <CanUseGlobalAlias>True</CanUseGlobalAlias>
- <SortUsings>True</SortUsings>
- <KeepImports length="0" />
- <MandatoryImports length="0" />
- <KeepNontrivialAlias>True</KeepNontrivialAlias>
- </UsingsSettings>
- </CSharp>
- <VB>
- <FormatSettings>
- <INSERT_TABS>False</INSERT_TABS>
- <INDENT_SIZE>2</INDENT_SIZE>
- <SPACE_BEFORE_INVOCATION_PARENTHESES>True</SPACE_BEFORE_INVOCATION_PARENTHESES>
- <SPACE_BEFORE_EMPTY_INVOCATION_PARENTHESES>False</SPACE_BEFORE_EMPTY_INVOCATION_PARENTHESES>
- <SPACE_BEFORE_METHOD_PARENTHESES>True</SPACE_BEFORE_METHOD_PARENTHESES>
- <SPACE_BEFORE_EMPTY_METHOD_PARENTHESES>False</SPACE_BEFORE_EMPTY_METHOD_PARENTHESES>
- <SPACE_WITHIN_INVOCATION_PARENTHESES>False</SPACE_WITHIN_INVOCATION_PARENTHESES>
- <SPACE_WITHIN_EMPTY_INVOCATION_PARENTHESES>False</SPACE_WITHIN_EMPTY_INVOCATION_PARENTHESES>
- <SPACE_WITHIN_METHOD_PARENTHESES>False</SPACE_WITHIN_METHOD_PARENTHESES>
- <SPACE_WITHIN_EMPTY_METHOD_PARENTHESES>False</SPACE_WITHIN_EMPTY_METHOD_PARENTHESES>
- <SPACE_BEFORE_TYPE_PARAMETER_PARENTHESES>True</SPACE_BEFORE_TYPE_PARAMETER_PARENTHESES>
- <SPACE_WITHIN_TYPE_PARAMETER_PARENTHESES>False</SPACE_WITHIN_TYPE_PARAMETER_PARENTHESES>
- <SPACE_WITHIN_EXPRESSION_PARENTHESES>False</SPACE_WITHIN_EXPRESSION_PARENTHESES>
- <SPACE_BEFORE_COMMA>False</SPACE_BEFORE_COMMA>
- <SPACE_AFTER_COMMA>True</SPACE_AFTER_COMMA>
- <SPACE_WITHIN_ATTRIBUTE_ANGLES>False</SPACE_WITHIN_ATTRIBUTE_ANGLES>
- <SPACE_BEFORE_ATTRIBUTE_TARGET_COLON>False</SPACE_BEFORE_ATTRIBUTE_TARGET_COLON>
- <SPACE_AFTER_ATTRIBUTE_TARGET_COLON>True</SPACE_AFTER_ATTRIBUTE_TARGET_COLON>
- <SPACE_BEFORE_ARRAY_RANK_PARENTHESES>False</SPACE_BEFORE_ARRAY_RANK_PARENTHESES>
- <SPACE_WITHIN_ARRAY_RANK_PARENTHESES>False</SPACE_WITHIN_ARRAY_RANK_PARENTHESES>
- <SPACE_WITHIN_ARRAY_RANK_EMPTY_PARENTHESES>False</SPACE_WITHIN_ARRAY_RANK_EMPTY_PARENTHESES>
- <SPACE_WITHIN_ARRAY_INITIALIZATION_BRACES>False</SPACE_WITHIN_ARRAY_INITIALIZATION_BRACES>
- <SPACE_AROUND_ASSIGNMENT_OP>True</SPACE_AROUND_ASSIGNMENT_OP>
- <SPACE_AROUND_RELATIONAL_OP>True</SPACE_AROUND_RELATIONAL_OP>
- <SPACE_AROUND_ADDITIVE_OP>True</SPACE_AROUND_ADDITIVE_OP>
- <SPACE_AROUND_MULTIPLICATIVE_OP>False</SPACE_AROUND_MULTIPLICATIVE_OP>
- <SPACE_AROUND_SHIFT_OP>True</SPACE_AROUND_SHIFT_OP>
- <SPACE_AROUND_DOT>False</SPACE_AROUND_DOT>
- <SPACE_BEFORE_LABEL_COLON>False</SPACE_BEFORE_LABEL_COLON>
- <SPACE_AROUND_STMT_COLON>True</SPACE_AROUND_STMT_COLON>
- <KEEP_BLANK_LINES_IN_DECLARATIONS>2</KEEP_BLANK_LINES_IN_DECLARATIONS>
- <KEEP_BLANK_LINES_IN_CODE>2</KEEP_BLANK_LINES_IN_CODE>
- <KEEP_USER_LINEBREAKS>True</KEEP_USER_LINEBREAKS>
- <BLANK_LINES_AFTER_OPTIONS>1</BLANK_LINES_AFTER_OPTIONS>
- <BLANK_LINES_AFTER_IMPORTS>1</BLANK_LINES_AFTER_IMPORTS>
- <BLANK_LINES_AROUND_GLOBAL_ATTRIBUTE>0</BLANK_LINES_AROUND_GLOBAL_ATTRIBUTE>
- <BLANK_LINES_AROUND_NAMESPACE>1</BLANK_LINES_AROUND_NAMESPACE>
- <BLANK_LINES_AROUND_TYPE>1</BLANK_LINES_AROUND_TYPE>
- <BLANK_LINES_AROUND_FIELD>1</BLANK_LINES_AROUND_FIELD>
- <BLANK_LINES_AROUND_INVOCABLE>1</BLANK_LINES_AROUND_INVOCABLE>
- <BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>0</BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>
- <BLANK_LINES_AROUND_SINGLE_LINE_FIELD>0</BLANK_LINES_AROUND_SINGLE_LINE_FIELD>
- <BLANK_LINES_AROUND_REGION>1</BLANK_LINES_AROUND_REGION>
- <BLANK_LINES_INSIDE_REGION>1</BLANK_LINES_INSIDE_REGION>
- <WRAP_LINES>True</WRAP_LINES>
- <WRAP_LIMIT>120</WRAP_LIMIT>
- <WRAP_BEFORE_INVOCATION_LPAR>False</WRAP_BEFORE_INVOCATION_LPAR>
- <WRAP_BEFORE_DECLARATION_LPAR>False</WRAP_BEFORE_DECLARATION_LPAR>
- <WRAP_BEFORE_BINARY_OPSIGN>False</WRAP_BEFORE_BINARY_OPSIGN>
- <WRAP_PARAMETERS_STYLE>WRAP_IF_LONG</WRAP_PARAMETERS_STYLE>
- <WRAP_ARGUMENTS_STYLE>WRAP_IF_LONG</WRAP_ARGUMENTS_STYLE>
- <WRAP_EXTENDS_LIST_STYLE>WRAP_IF_LONG</WRAP_EXTENDS_LIST_STYLE>
- <WRAP_MULTIPLE_DECLARATION_STYLE>CHOP_IF_LONG</WRAP_MULTIPLE_DECLARATION_STYLE>
- <ALIGN_MULTILINE_PARAMETER>True</ALIGN_MULTILINE_PARAMETER>
- <ALIGN_MULTILINE_ARGUMENT>True</ALIGN_MULTILINE_ARGUMENT>
- <ALIGN_MULTILINE_IMPLEMENTS_LIST>True</ALIGN_MULTILINE_IMPLEMENTS_LIST>
- <ALIGN_MULTILINE_EXPRESSION>True</ALIGN_MULTILINE_EXPRESSION>
- <ALIGN_MULTILINE_ARRAY_INITIALIZER>True</ALIGN_MULTILINE_ARRAY_INITIALIZER>
- <ALIGN_MULTIPLE_DECLARATION>True</ALIGN_MULTIPLE_DECLARATION>
- <PLACE_TYPE_ATTRIBUTE_ON_SAME_LINE>False</PLACE_TYPE_ATTRIBUTE_ON_SAME_LINE>
- <PLACE_METHOD_ATTRIBUTE_ON_SAME_LINE>False</PLACE_METHOD_ATTRIBUTE_ON_SAME_LINE>
- <PLACE_PROPERTY_ATTRIBUTE_ON_SAME_LINE>False</PLACE_PROPERTY_ATTRIBUTE_ON_SAME_LINE>
- <PLACE_EVENT_ATTRIBUTE_ON_SAME_LINE>False</PLACE_EVENT_ATTRIBUTE_ON_SAME_LINE>
- <PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>True</PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>
- <INDENT_CASE_FROM_SELECT>True</INDENT_CASE_FROM_SELECT>
- <STICK_COMMENT>True</STICK_COMMENT>
- </FormatSettings>
- <ImportsSettings>
- <AllowAlias>True</AllowAlias>
- <PreferQualifiedReference>False</PreferQualifiedReference>
- <KeepImports length="0" />
- <MandatoryImports length="0" />
- <KeepNontrivialAlias>True</KeepNontrivialAlias>
- </ImportsSettings>
- </VB>
- <CopyXmlCommentsOnOverride>False</CopyXmlCommentsOnOverride>
- <FileHeader Region="Copyright (C) 2005-2009 Team MediaPortal"><![CDATA[Copyright (C) 2005-2009 Team MediaPortal
-http://www.team-mediaportal.com
-
-This Program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This Program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Make; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-http://www.gnu.org/copyleft/gpl.html]]></FileHeader>
- <Naming>
- <DefaultExceptionName>e</DefaultExceptionName>
- <PreferLongerNames>False</PreferLongerNames>
- <Field prefix="" suffix="" />
- <StaticField prefix="" suffix="" />
- <Parameter prefix="" suffix="" />
- <LocalVariable prefix="" suffix="" />
- </Naming>
- </CodeStyleSettings>
-</Configuration>
\ No newline at end of file
Copied: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper (from rev 2922, trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.1.resharper)
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.4.5.resharper 2009-06-16 01:57:28 UTC (rev 2924)
@@ -0,0 +1,70 @@
+<Configuration>
+ <CodeStyleSettings>
+ <ExternalPath IsNull="False">
+ </ExternalPath>
+ <Sharing>SOLUTION</Sharing>
+ <CSharp>
+ <FormatSettings>
+ <MODIFIERS_ORDER IsNull="False">
+ <Item>public</Item>
+ <Item>protected</Item>
+ <Item>internal</Item>
+ <Item>private</Item>
+ <Item>new</Item>
+ <Item>abstract</Item>
+ <Item>virtual</Item>
+ <Item>override</Item>
+ <Item>sealed</Item>
+ <Item>static</Item>
+ <Item>readonly</Item>
+ <Item>extern</Item>
+ <Item>unsafe</Item>
+ <Item>volatile</Item>
+ </MODIFIERS_ORDER>
+ </FormatSettings>
+ <UsingsSettings />
+ <Naming2 />
+ </CSharp>
+ <VB>
+ <FormatSettings />
+ <ImportsSettings />
+ <Naming2 />
+ </VB>
+ <FileHeader Region="Copyright (C) 2005-2009 Team MediaPortal"><![CDATA[Copyright (C) 2005-2009 Team MediaPortal
+http://www.team-mediaportal.com
+
+This Program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This Program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Make; see the file COPYING. If not, write to
+the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+http://www.gnu.org/copyleft/gpl.html]]></FileHeader>
+ <GenerateMemberBody />
+ <Naming2>
+ <ExceptionName IsNull="False">
+ </ExceptionName>
+ <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />
+ <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="NotPublicInstanceFields" />
+ <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="NotPublicStaticFields" />
+ <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />
+ <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />
+ <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />
+ <PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />
+ <PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />
+ <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />
+ <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />
+ <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />
+ <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />
+ <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />
+ <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />
+ </Naming2>
+ </CodeStyleSettings>
+</Configuration>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2009-06-25 23:23:16
|
Revision: 2963
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2963&view=rev
Author: belcom
Date: 2009-06-25 23:21:50 +0000 (Thu, 25 Jun 2009)
Log Message:
-----------
- iMON pad mode (mouse/keyboard) is switchable through configuration and remotes switch button (if enabled in configuration).
- Remote mode MCE working for DOS and HID devices (even xBox remote is working in MCE mode (at least with DOS) but lacks support from abstract layer -> needs to be done).
- Apply mode changes when configuration dialog is closed (before a restart of IR Server or Input Service was required sometimes).
- Modifications/rearranges to configuration dialog in order to support new features.
Code cleanups and readability improvements.
- tiny bug in IRServer.cs where it tries to free resources even if they are NULL.
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/IRServer.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Configuration.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Configuration.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Configuration.resx
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/RawInput.cs
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Debug.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Exclusions.txt
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/FileIO.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/PluginBaseInterfaces.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/TestApplication.cs
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/IRServer.cs 2009-06-25 21:55:39 UTC (rev 2962)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/IRServer.cs 2009-06-25 23:21:50 UTC (rev 2963)
@@ -1096,16 +1096,20 @@
private bool UnregisterClient(ClientManager removeClient)
{
- lock (_registeredClients)
- {
- if (!_registeredClients.Contains(removeClient))
- return false;
+ if (_registeredClients != null)
+ {
+ lock (_registeredClients)
+ {
+ if (!_registeredClients.Contains(removeClient))
+ return false;
- _registeredClients.Remove(removeClient);
- }
+ _registeredClients.Remove(removeClient);
+ }
- IrssLog.Info("Unregistered a client");
- return true;
+ IrssLog.Info("Unregistered a client");
+ return true;
+ }
+ else return false;
}
private bool RegisterRepeater(ClientManager addRepeater)
@@ -1122,16 +1126,20 @@
private bool UnregisterRepeater(ClientManager removeRepeater)
{
- lock (_registeredRepeaters)
- {
- if (!_registeredRepeaters.Contains(removeRepeater))
- return false;
+ if (_registeredRepeaters != null)
+ {
+ lock (_registeredRepeaters)
+ {
+ if (!_registeredRepeaters.Contains(removeRepeater))
+ return false;
- _registeredRepeaters.Remove(removeRepeater);
- }
+ _registeredRepeaters.Remove(removeRepeater);
+ }
- IrssLog.Info("Unregistered a repeater");
- return true;
+ IrssLog.Info("Unregistered a repeater");
+ return true;
+ }
+ else return false;
}
private bool BlastIR(byte[] data)
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Configuration.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Configuration.Designer.cs 2009-06-25 21:55:39 UTC (rev 2962)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Configuration.Designer.cs 2009-06-25 23:21:50 UTC (rev 2963)
@@ -43,45 +43,57 @@
this.numericUpDownKeyRepeatDelay = new System.Windows.Forms.NumericUpDown();
this.checkBoxHandleKeyboardLocal = new System.Windows.Forms.CheckBox();
this.checkBoxHandleMouseLocal = new System.Windows.Forms.CheckBox();
- this.numericUpDownMouseSensitivity = new System.Windows.Forms.NumericUpDown();
this.checkBoxEnableRemote = new System.Windows.Forms.CheckBox();
this.checkBoxEnableKeyboard = new System.Windows.Forms.CheckBox();
this.checkBoxEnableMouse = new System.Windows.Forms.CheckBox();
this.checkBoxUseSystemRatesRemote = new System.Windows.Forms.CheckBox();
this.checkBoxUseSystemRatesKeyboard = new System.Windows.Forms.CheckBox();
- this.comboBoxHardwareMode = new System.Windows.Forms.ComboBox();
this.comboBoxRemoteMode = new System.Windows.Forms.ComboBox();
- this.labelHardwareMode = new System.Windows.Forms.Label();
+ this.comboBoxPadMode = new System.Windows.Forms.ComboBox();
+ this.labelRemoteMode = new System.Windows.Forms.Label();
this.tabControl = new System.Windows.Forms.TabControl();
this.tabPageRemote = new System.Windows.Forms.TabPage();
- this.labelRemoteMode = new System.Windows.Forms.Label();
+ this.labelPadMode = new System.Windows.Forms.Label();
this.tabPageKeyboard = new System.Windows.Forms.TabPage();
this.groupBoxKeypressTiming = new System.Windows.Forms.GroupBox();
this.labelKeyRepeatDelay = new System.Windows.Forms.Label();
this.labelKeyHeldDelay = new System.Windows.Forms.Label();
this.tabPageMouse = new System.Windows.Forms.TabPage();
+ this.checkBoxUsePadSwitch = new System.Windows.Forms.CheckBox();
+ this.trackBarKeyPadSensitivity = new System.Windows.Forms.TrackBar();
+ this.labelKeyPadHarder = new System.Windows.Forms.Label();
+ this.labelKeyPadSofter = new System.Windows.Forms.Label();
+ this.groupBoxKeyPadSensitivity = new System.Windows.Forms.GroupBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.trackBar1 = new System.Windows.Forms.TrackBar();
+ this.groupBoxMouseSensitivity = new System.Windows.Forms.GroupBox();
+ this.labelMouseFaster = new System.Windows.Forms.Label();
+ this.labelMouseSlower = new System.Windows.Forms.Label();
+ this.trackBarMouseSensitivity = new System.Windows.Forms.TrackBar();
this.labelMouseSensitivity = new System.Windows.Forms.Label();
- this.trackBarKeyPadSensitivity = new System.Windows.Forms.TrackBar();
- this.labelKeyPadSensitivity = new System.Windows.Forms.Label();
- this.labelKpsSoft = new System.Windows.Forms.Label();
- this.labelKpsHard = new System.Windows.Forms.Label();
+ this.groupBoxHardwareConfig = new System.Windows.Forms.GroupBox();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownButtonRepeatDelay)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownButtonHeldDelay)).BeginInit();
this.groupBoxRemoteTiming.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownKeyHeldDelay)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownKeyRepeatDelay)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMouseSensitivity)).BeginInit();
this.tabControl.SuspendLayout();
this.tabPageRemote.SuspendLayout();
this.tabPageKeyboard.SuspendLayout();
this.groupBoxKeypressTiming.SuspendLayout();
this.tabPageMouse.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.trackBarKeyPadSensitivity)).BeginInit();
+ this.groupBoxKeyPadSensitivity.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.trackBar1)).BeginInit();
+ this.groupBoxMouseSensitivity.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.trackBarMouseSensitivity)).BeginInit();
+ this.groupBoxHardwareConfig.SuspendLayout();
this.SuspendLayout();
//
// labelButtonRepeatDelay
//
- this.labelButtonRepeatDelay.Location = new System.Drawing.Point(8, 24);
+ this.labelButtonRepeatDelay.Location = new System.Drawing.Point(6, 17);
this.labelButtonRepeatDelay.Name = "labelButtonRepeatDelay";
this.labelButtonRepeatDelay.Size = new System.Drawing.Size(128, 20);
this.labelButtonRepeatDelay.TabIndex = 0;
@@ -90,7 +102,7 @@
//
// labelButtonHeldDelay
//
- this.labelButtonHeldDelay.Location = new System.Drawing.Point(8, 56);
+ this.labelButtonHeldDelay.Location = new System.Drawing.Point(6, 43);
this.labelButtonHeldDelay.Name = "labelButtonHeldDelay";
this.labelButtonHeldDelay.Size = new System.Drawing.Size(128, 20);
this.labelButtonHeldDelay.TabIndex = 2;
@@ -104,7 +116,7 @@
0,
0,
0});
- this.numericUpDownButtonRepeatDelay.Location = new System.Drawing.Point(144, 24);
+ this.numericUpDownButtonRepeatDelay.Location = new System.Drawing.Point(150, 19);
this.numericUpDownButtonRepeatDelay.Maximum = new decimal(new int[] {
10000,
0,
@@ -130,7 +142,7 @@
0,
0,
0});
- this.numericUpDownButtonHeldDelay.Location = new System.Drawing.Point(144, 56);
+ this.numericUpDownButtonHeldDelay.Location = new System.Drawing.Point(150, 45);
this.numericUpDownButtonHeldDelay.Maximum = new decimal(new int[] {
10000,
0,
@@ -151,7 +163,7 @@
// buttonOK
//
this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonOK.Location = new System.Drawing.Point(128, 263);
+ this.buttonOK.Location = new System.Drawing.Point(128, 275);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(64, 24);
this.buttonOK.TabIndex = 1;
@@ -163,7 +175,7 @@
//
this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.buttonCancel.Location = new System.Drawing.Point(200, 263);
+ this.buttonCancel.Location = new System.Drawing.Point(200, 275);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(64, 24);
this.buttonCancel.TabIndex = 2;
@@ -177,9 +189,9 @@
this.groupBoxRemoteTiming.Controls.Add(this.numericUpDownButtonHeldDelay);
this.groupBoxRemoteTiming.Controls.Add(this.labelButtonHeldDelay);
this.groupBoxRemoteTiming.Controls.Add(this.numericUpDownButtonRepeatDelay);
- this.groupBoxRemoteTiming.Location = new System.Drawing.Point(8, 72);
+ this.groupBoxRemoteTiming.Location = new System.Drawing.Point(6, 154);
this.groupBoxRemoteTiming.Name = "groupBoxRemoteTiming";
- this.groupBoxRemoteTiming.Size = new System.Drawing.Size(232, 88);
+ this.groupBoxRemoteTiming.Size = new System.Drawing.Size(236, 73);
this.groupBoxRemoteTiming.TabIndex = 2;
this.groupBoxRemoteTiming.TabStop = false;
this.groupBoxRemoteTiming.Text = "Remote button timing (in milliseconds)";
@@ -191,7 +203,7 @@
0,
0,
0});
- this.numericUpDownKeyHeldDelay.Location = new System.Drawing.Point(144, 56);
+ this.numericUpDownKeyHeldDelay.Location = new System.Drawing.Point(150, 45);
this.numericUpDownKeyHeldDelay.Maximum = new decimal(new int[] {
1000,
0,
@@ -216,7 +228,7 @@
0,
0,
0});
- this.numericUpDownKeyRepeatDelay.Location = new System.Drawing.Point(144, 24);
+ this.numericUpDownKeyRepeatDelay.Location = new System.Drawing.Point(150, 19);
this.numericUpDownKeyRepeatDelay.Maximum = new decimal(new int[] {
1000,
0,
@@ -239,7 +251,7 @@
this.checkBoxHandleKeyboardLocal.AutoSize = true;
this.checkBoxHandleKeyboardLocal.Checked = true;
this.checkBoxHandleKeyboardLocal.CheckState = System.Windows.Forms.CheckState.Checked;
- this.checkBoxHandleKeyboardLocal.Location = new System.Drawing.Point(8, 168);
+ this.checkBoxHandleKeyboardLocal.Location = new System.Drawing.Point(6, 29);
this.checkBoxHandleKeyboardLocal.Name = "checkBoxHandleKeyboardLocal";
this.checkBoxHandleKeyboardLocal.Size = new System.Drawing.Size(139, 17);
this.checkBoxHandleKeyboardLocal.TabIndex = 2;
@@ -252,7 +264,7 @@
this.checkBoxHandleMouseLocal.AutoSize = true;
this.checkBoxHandleMouseLocal.Checked = true;
this.checkBoxHandleMouseLocal.CheckState = System.Windows.Forms.CheckState.Checked;
- this.checkBoxHandleMouseLocal.Location = new System.Drawing.Point(8, 40);
+ this.checkBoxHandleMouseLocal.Location = new System.Drawing.Point(6, 29);
this.checkBoxHandleMouseLocal.Name = "checkBoxHandleMouseLocal";
this.checkBoxHandleMouseLocal.Size = new System.Drawing.Size(126, 17);
this.checkBoxHandleMouseLocal.TabIndex = 1;
@@ -260,42 +272,12 @@
this.toolTips.SetToolTip(this.checkBoxHandleMouseLocal, "Act on mouse locally (on the machine Input Service is running on)");
this.checkBoxHandleMouseLocal.UseVisualStyleBackColor = true;
//
- // numericUpDownMouseSensitivity
- //
- this.numericUpDownMouseSensitivity.DecimalPlaces = 1;
- this.numericUpDownMouseSensitivity.Increment = new decimal(new int[] {
- 1,
- 0,
- 0,
- 65536});
- this.numericUpDownMouseSensitivity.Location = new System.Drawing.Point(160, 80);
- this.numericUpDownMouseSensitivity.Maximum = new decimal(new int[] {
- 10,
- 0,
- 0,
- 0});
- this.numericUpDownMouseSensitivity.Minimum = new decimal(new int[] {
- 10,
- 0,
- 0,
- -2147483648});
- this.numericUpDownMouseSensitivity.Name = "numericUpDownMouseSensitivity";
- this.numericUpDownMouseSensitivity.Size = new System.Drawing.Size(80, 20);
- this.numericUpDownMouseSensitivity.TabIndex = 3;
- this.numericUpDownMouseSensitivity.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.toolTips.SetToolTip(this.numericUpDownMouseSensitivity, "Multiply mouse movements by this number");
- this.numericUpDownMouseSensitivity.Value = new decimal(new int[] {
- 10,
- 0,
- 0,
- 65536});
- //
// checkBoxEnableRemote
//
this.checkBoxEnableRemote.AutoSize = true;
this.checkBoxEnableRemote.Checked = true;
this.checkBoxEnableRemote.CheckState = System.Windows.Forms.CheckState.Checked;
- this.checkBoxEnableRemote.Location = new System.Drawing.Point(8, 8);
+ this.checkBoxEnableRemote.Location = new System.Drawing.Point(6, 6);
this.checkBoxEnableRemote.Name = "checkBoxEnableRemote";
this.checkBoxEnableRemote.Size = new System.Drawing.Size(155, 17);
this.checkBoxEnableRemote.TabIndex = 0;
@@ -308,7 +290,7 @@
this.checkBoxEnableKeyboard.AutoSize = true;
this.checkBoxEnableKeyboard.Checked = true;
this.checkBoxEnableKeyboard.CheckState = System.Windows.Forms.CheckState.Checked;
- this.checkBoxEnableKeyboard.Location = new System.Drawing.Point(8, 8);
+ this.checkBoxEnableKeyboard.Location = new System.Drawing.Point(6, 6);
this.checkBoxEnableKeyboard.Name = "checkBoxEnableKeyboard";
this.checkBoxEnableKeyboard.Size = new System.Drawing.Size(132, 17);
this.checkBoxEnableKeyboard.TabIndex = 0;
@@ -321,7 +303,7 @@
this.checkBoxEnableMouse.AutoSize = true;
this.checkBoxEnableMouse.Checked = true;
this.checkBoxEnableMouse.CheckState = System.Windows.Forms.CheckState.Checked;
- this.checkBoxEnableMouse.Location = new System.Drawing.Point(8, 8);
+ this.checkBoxEnableMouse.Location = new System.Drawing.Point(6, 6);
this.checkBoxEnableMouse.Name = "checkBoxEnableMouse";
this.checkBoxEnableMouse.Size = new System.Drawing.Size(119, 17);
this.checkBoxEnableMouse.TabIndex = 0;
@@ -332,7 +314,7 @@
// checkBoxUseSystemRatesRemote
//
this.checkBoxUseSystemRatesRemote.AutoSize = true;
- this.checkBoxUseSystemRatesRemote.Location = new System.Drawing.Point(8, 40);
+ this.checkBoxUseSystemRatesRemote.Location = new System.Drawing.Point(6, 131);
this.checkBoxUseSystemRatesRemote.Name = "checkBoxUseSystemRatesRemote";
this.checkBoxUseSystemRatesRemote.Size = new System.Drawing.Size(187, 17);
this.checkBoxUseSystemRatesRemote.TabIndex = 1;
@@ -343,7 +325,7 @@
// checkBoxUseSystemRatesKeyboard
//
this.checkBoxUseSystemRatesKeyboard.AutoSize = true;
- this.checkBoxUseSystemRatesKeyboard.Location = new System.Drawing.Point(8, 40);
+ this.checkBoxUseSystemRatesKeyboard.Location = new System.Drawing.Point(6, 131);
this.checkBoxUseSystemRatesKeyboard.Name = "checkBoxUseSystemRatesKeyboard";
this.checkBoxUseSystemRatesKeyboard.Size = new System.Drawing.Size(187, 17);
this.checkBoxUseSystemRatesKeyboard.TabIndex = 0;
@@ -351,37 +333,37 @@
this.toolTips.SetToolTip(this.checkBoxUseSystemRatesKeyboard, "Use the system keyboard repeat rate settings for remote keyboard repeat rates");
this.checkBoxUseSystemRatesKeyboard.UseVisualStyleBackColor = true;
//
- // comboBoxHardwareMode
- //
- this.comboBoxHardwareMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboBoxHardwareMode.FormattingEnabled = true;
- this.comboBoxHardwareMode.Location = new System.Drawing.Point(152, 168);
- this.comboBoxHardwareMode.Name = "comboBoxHardwareMode";
- this.comboBoxHardwareMode.Size = new System.Drawing.Size(89, 21);
- this.comboBoxHardwareMode.TabIndex = 4;
- this.toolTips.SetToolTip(this.comboBoxHardwareMode, "Choose between MCE and iMon remote types");
- //
// comboBoxRemoteMode
//
this.comboBoxRemoteMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxRemoteMode.FormattingEnabled = true;
- this.comboBoxRemoteMode.Location = new System.Drawing.Point(152, 194);
+ this.comboBoxRemoteMode.Location = new System.Drawing.Point(141, 19);
this.comboBoxRemoteMode.Name = "comboBoxRemoteMode";
this.comboBoxRemoteMode.Size = new System.Drawing.Size(89, 21);
- this.comboBoxRemoteMode.TabIndex = 6;
+ this.comboBoxRemoteMode.TabIndex = 4;
this.toolTips.SetToolTip(this.comboBoxRemoteMode, "Choose between MCE and iMon remote types");
//
- // labelHardwareMode
+ // comboBoxPadMode
//
- this.labelHardwareMode.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.labelHardwareMode.Location = new System.Drawing.Point(8, 168);
- this.labelHardwareMode.Name = "labelHardwareMode";
- this.labelHardwareMode.Size = new System.Drawing.Size(136, 21);
- this.labelHardwareMode.TabIndex = 3;
- this.labelHardwareMode.Text = "Hardware mode:";
- this.labelHardwareMode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.toolTips.SetToolTip(this.labelHardwareMode, "IMPORTANT: Set the hardware mode here");
+ this.comboBoxPadMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxPadMode.FormattingEnabled = true;
+ this.comboBoxPadMode.Location = new System.Drawing.Point(141, 46);
+ this.comboBoxPadMode.Name = "comboBoxPadMode";
+ this.comboBoxPadMode.Size = new System.Drawing.Size(89, 21);
+ this.comboBoxPadMode.TabIndex = 6;
+ this.toolTips.SetToolTip(this.comboBoxPadMode, "Choose between MCE and iMon remote types");
//
+ // labelRemoteMode
+ //
+ this.labelRemoteMode.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.labelRemoteMode.Location = new System.Drawing.Point(6, 18);
+ this.labelRemoteMode.Name = "labelRemoteMode";
+ this.labelRemoteMode.Size = new System.Drawing.Size(129, 21);
+ this.labelRemoteMode.TabIndex = 3;
+ this.labelRemoteMode.Text = "Remote:";
+ this.labelRemoteMode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.toolTips.SetToolTip(this.labelRemoteMode, "IMPORTANT: Set the hardware mode here");
+ //
// tabControl
//
this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -393,37 +375,36 @@
this.tabControl.Location = new System.Drawing.Point(8, 8);
this.tabControl.Name = "tabControl";
this.tabControl.SelectedIndex = 0;
- this.tabControl.Size = new System.Drawing.Size(256, 247);
+ this.tabControl.Size = new System.Drawing.Size(256, 259);
this.tabControl.TabIndex = 0;
//
// tabPageRemote
//
- this.tabPageRemote.Controls.Add(this.comboBoxRemoteMode);
- this.tabPageRemote.Controls.Add(this.labelRemoteMode);
- this.tabPageRemote.Controls.Add(this.comboBoxHardwareMode);
- this.tabPageRemote.Controls.Add(this.labelHardwareMode);
+ this.tabPageRemote.Controls.Add(this.groupBoxHardwareConfig);
+ this.tabPageRemote.Controls.Add(this.checkBoxUsePadSwitch);
this.tabPageRemote.Controls.Add(this.checkBoxUseSystemRatesRemote);
this.tabPageRemote.Controls.Add(this.checkBoxEnableRemote);
this.tabPageRemote.Controls.Add(this.groupBoxRemoteTiming);
this.tabPageRemote.Location = new System.Drawing.Point(4, 22);
this.tabPageRemote.Name = "tabPageRemote";
this.tabPageRemote.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageRemote.Size = new System.Drawing.Size(248, 221);
+ this.tabPageRemote.Size = new System.Drawing.Size(248, 233);
this.tabPageRemote.TabIndex = 1;
this.tabPageRemote.Text = "Remote";
this.tabPageRemote.UseVisualStyleBackColor = true;
//
- // labelRemoteMode
+ // labelPadMode
//
- this.labelRemoteMode.Location = new System.Drawing.Point(8, 194);
- this.labelRemoteMode.Name = "labelRemoteMode";
- this.labelRemoteMode.Size = new System.Drawing.Size(136, 21);
- this.labelRemoteMode.TabIndex = 5;
- this.labelRemoteMode.Text = "Remote MouseStick mode:";
- this.labelRemoteMode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.labelPadMode.Location = new System.Drawing.Point(6, 45);
+ this.labelPadMode.Name = "labelPadMode";
+ this.labelPadMode.Size = new System.Drawing.Size(129, 21);
+ this.labelPadMode.TabIndex = 5;
+ this.labelPadMode.Text = "Remote Pad mode:";
+ this.labelPadMode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// tabPageKeyboard
//
+ this.tabPageKeyboard.Controls.Add(this.groupBoxKeyPadSensitivity);
this.tabPageKeyboard.Controls.Add(this.checkBoxUseSystemRatesKeyboard);
this.tabPageKeyboard.Controls.Add(this.checkBoxHandleKeyboardLocal);
this.tabPageKeyboard.Controls.Add(this.checkBoxEnableKeyboard);
@@ -431,7 +412,7 @@
this.tabPageKeyboard.Location = new System.Drawing.Point(4, 22);
this.tabPageKeyboard.Name = "tabPageKeyboard";
this.tabPageKeyboard.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageKeyboard.Size = new System.Drawing.Size(248, 221);
+ this.tabPageKeyboard.Size = new System.Drawing.Size(248, 233);
this.tabPageKeyboard.TabIndex = 2;
this.tabPageKeyboard.Text = "Keyboard";
this.tabPageKeyboard.UseVisualStyleBackColor = true;
@@ -442,16 +423,16 @@
this.groupBoxKeypressTiming.Controls.Add(this.numericUpDownKeyHeldDelay);
this.groupBoxKeypressTiming.Controls.Add(this.labelKeyHeldDelay);
this.groupBoxKeypressTiming.Controls.Add(this.numericUpDownKeyRepeatDelay);
- this.groupBoxKeypressTiming.Location = new System.Drawing.Point(8, 72);
+ this.groupBoxKeypressTiming.Location = new System.Drawing.Point(6, 154);
this.groupBoxKeypressTiming.Name = "groupBoxKeypressTiming";
- this.groupBoxKeypressTiming.Size = new System.Drawing.Size(232, 88);
+ this.groupBoxKeypressTiming.Size = new System.Drawing.Size(236, 73);
this.groupBoxKeypressTiming.TabIndex = 1;
this.groupBoxKeypressTiming.TabStop = false;
this.groupBoxKeypressTiming.Text = "Key press timing (in milliseconds)";
//
// labelKeyRepeatDelay
//
- this.labelKeyRepeatDelay.Location = new System.Drawing.Point(8, 24);
+ this.labelKeyRepeatDelay.Location = new System.Drawing.Point(6, 17);
this.labelKeyRepeatDelay.Name = "labelKeyRepeatDelay";
this.labelKeyRepeatDelay.Size = new System.Drawing.Size(128, 20);
this.labelKeyRepeatDelay.TabIndex = 1;
@@ -460,7 +441,7 @@
//
// labelKeyHeldDelay
//
- this.labelKeyHeldDelay.Location = new System.Drawing.Point(8, 56);
+ this.labelKeyHeldDelay.Location = new System.Drawing.Point(6, 43);
this.labelKeyHeldDelay.Name = "labelKeyHeldDelay";
this.labelKeyHeldDelay.Size = new System.Drawing.Size(128, 20);
this.labelKeyHeldDelay.TabIndex = 3;
@@ -469,82 +450,175 @@
//
// tabPageMouse
//
- this.tabPageMouse.Controls.Add(this.labelKpsHard);
- this.tabPageMouse.Controls.Add(this.labelKpsSoft);
- this.tabPageMouse.Controls.Add(this.labelKeyPadSensitivity);
- this.tabPageMouse.Controls.Add(this.trackBarKeyPadSensitivity);
- this.tabPageMouse.Controls.Add(this.labelMouseSensitivity);
- this.tabPageMouse.Controls.Add(this.numericUpDownMouseSensitivity);
+ this.tabPageMouse.Controls.Add(this.groupBoxMouseSensitivity);
this.tabPageMouse.Controls.Add(this.checkBoxHandleMouseLocal);
this.tabPageMouse.Controls.Add(this.checkBoxEnableMouse);
this.tabPageMouse.Location = new System.Drawing.Point(4, 22);
this.tabPageMouse.Name = "tabPageMouse";
this.tabPageMouse.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageMouse.Size = new System.Drawing.Size(248, 221);
+ this.tabPageMouse.Size = new System.Drawing.Size(248, 233);
this.tabPageMouse.TabIndex = 3;
this.tabPageMouse.Text = "Mouse";
this.tabPageMouse.UseVisualStyleBackColor = true;
//
- // labelMouseSensitivity
+ // checkBoxUsePadSwitch
//
- this.labelMouseSensitivity.Location = new System.Drawing.Point(8, 80);
- this.labelMouseSensitivity.Name = "labelMouseSensitivity";
- this.labelMouseSensitivity.Size = new System.Drawing.Size(144, 20);
- this.labelMouseSensitivity.TabIndex = 2;
- this.labelMouseSensitivity.Text = "Mouse sensitivity:";
- this.labelMouseSensitivity.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.checkBoxUsePadSwitch.AutoSize = true;
+ this.checkBoxUsePadSwitch.Location = new System.Drawing.Point(6, 29);
+ this.checkBoxUsePadSwitch.Name = "checkBoxUsePadSwitch";
+ this.checkBoxUsePadSwitch.Size = new System.Drawing.Size(236, 17);
+ this.checkBoxUsePadSwitch.TabIndex = 8;
+ this.checkBoxUsePadSwitch.Text = "Enable mouse/keyboard switch (iMON PAD)";
+ this.checkBoxUsePadSwitch.UseVisualStyleBackColor = true;
//
// trackBarKeyPadSensitivity
//
this.trackBarKeyPadSensitivity.BackColor = System.Drawing.Color.White;
this.trackBarKeyPadSensitivity.LargeChange = 4;
- this.trackBarKeyPadSensitivity.Location = new System.Drawing.Point(6, 148);
- this.trackBarKeyPadSensitivity.Maximum = 15;
+ this.trackBarKeyPadSensitivity.Location = new System.Drawing.Point(6, 19);
+ this.trackBarKeyPadSensitivity.Maximum = 14;
this.trackBarKeyPadSensitivity.Name = "trackBarKeyPadSensitivity";
- this.trackBarKeyPadSensitivity.Size = new System.Drawing.Size(236, 45);
- this.trackBarKeyPadSensitivity.TabIndex = 4;
- this.trackBarKeyPadSensitivity.Value = 8;
+ this.trackBarKeyPadSensitivity.Size = new System.Drawing.Size(224, 45);
+ this.trackBarKeyPadSensitivity.TabIndex = 5;
+ this.trackBarKeyPadSensitivity.Value = 7;
//
- // labelKeyPadSensitivity
+ // labelKeyPadHarder
//
- this.labelKeyPadSensitivity.AutoSize = true;
- this.labelKeyPadSensitivity.Location = new System.Drawing.Point(6, 132);
- this.labelKeyPadSensitivity.Name = "labelKeyPadSensitivity";
- this.labelKeyPadSensitivity.Size = new System.Drawing.Size(229, 13);
- this.labelKeyPadSensitivity.TabIndex = 5;
- this.labelKeyPadSensitivity.Text = "KeyPad Sensitivity (if Pad works as arrow keys)";
+ this.labelKeyPadHarder.AutoSize = true;
+ this.labelKeyPadHarder.Location = new System.Drawing.Point(193, 51);
+ this.labelKeyPadHarder.Name = "labelKeyPadHarder";
+ this.labelKeyPadHarder.Size = new System.Drawing.Size(37, 13);
+ this.labelKeyPadHarder.TabIndex = 10;
+ this.labelKeyPadHarder.Text = "harder";
//
- // labelKpsSoft
+ // labelKeyPadSofter
//
- this.labelKpsSoft.AutoSize = true;
- this.labelKpsSoft.Location = new System.Drawing.Point(6, 180);
- this.labelKpsSoft.Name = "labelKpsSoft";
- this.labelKpsSoft.Size = new System.Drawing.Size(33, 13);
- this.labelKpsSoft.TabIndex = 6;
- this.labelKpsSoft.Text = "softer";
+ this.labelKeyPadSofter.AutoSize = true;
+ this.labelKeyPadSofter.Location = new System.Drawing.Point(6, 51);
+ this.labelKeyPadSofter.Name = "labelKeyPadSofter";
+ this.labelKeyPadSofter.Size = new System.Drawing.Size(33, 13);
+ this.labelKeyPadSofter.TabIndex = 9;
+ this.labelKeyPadSofter.Text = "softer";
//
- // labelKpsHard
+ // groupBoxKeyPadSensitivity
//
- this.labelKpsHard.AutoSize = true;
- this.labelKpsHard.Location = new System.Drawing.Point(205, 180);
- this.labelKpsHard.Name = "labelKpsHard";
- this.labelKpsHard.Size = new System.Drawing.Size(37, 13);
- this.labelKpsHard.TabIndex = 7;
- this.labelKpsHard.Text = "harder";
+ this.groupBoxKeyPadSensitivity.Controls.Add(this.labelKeyPadHarder);
+ this.groupBoxKeyPadSensitivity.Controls.Add(this.labelKeyPadSofter);
+ this.groupBoxKeyPadSensitivity.Controls.Add(this.trackBarKeyPadSensitivity);
+ this.groupBoxKeyPadSensitivity.Location = new System.Drawing.Point(6, 52);
+ this.groupBoxKeyPadSensitivity.Name = "groupBoxKeyPadSensitivity";
+ this.groupBoxKeyPadSensitivity.Size = new System.Drawing.Size(236, 73);
+ this.groupBoxKeyPadSensitivity.TabIndex = 11;
+ this.groupBoxKeyPadSensitivity.TabStop = false;
+ this.groupBoxKeyPadSensitivity.Text = "KeyPad sensitivity (Pad in keyboard mode)";
//
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(193, 51);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(37, 13);
+ this.label1.TabIndex = 10;
+ this.label1.Text = "harder";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(6, 51);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(33, 13);
+ this.label2.TabIndex = 9;
+ this.label2.Text = "softer";
+ //
+ // trackBar1
+ //
+ this.trackBar1.BackColor = System.Drawing.Color.White;
+ this.trackBar1.LargeChange = 4;
+ this.trackBar1.Location = new System.Drawing.Point(6, 19);
+ this.trackBar1.Maximum = 15;
+ this.trackBar1.Name = "trackBar1";
+ this.trackBar1.Size = new System.Drawing.Size(224, 45);
+ this.trackBar1.TabIndex = 5;
+ this.trackBar1.Value = 8;
+ //
+ // groupBoxMouseSensitivity
+ //
+ this.groupBoxMouseSensitivity.Controls.Add(this.labelMouseFaster);
+ this.groupBoxMouseSensitivity.Controls.Add(this.labelMouseSlower);
+ this.groupBoxMouseSensitivity.Controls.Add(this.labelMouseSensitivity);
+ this.groupBoxMouseSensitivity.Controls.Add(this.trackBarMouseSensitivity);
+ this.groupBoxMouseSensitivity.Location = new System.Drawing.Point(6, 52);
+ this.groupBoxMouseSensitivity.Name = "groupBoxMouseSensitivity";
+ this.groupBoxMouseSensitivity.Size = new System.Drawing.Size(236, 73);
+ this.groupBoxMouseSensitivity.TabIndex = 12;
+ this.groupBoxMouseSensitivity.TabStop = false;
+ this.groupBoxMouseSensitivity.Text = "Mouse sensitivity";
+ //
+ // labelMouseFaster
+ //
+ this.labelMouseFaster.AutoSize = true;
+ this.labelMouseFaster.Location = new System.Drawing.Point(197, 51);
+ this.labelMouseFaster.Name = "labelMouseFaster";
+ this.labelMouseFaster.Size = new System.Drawing.Size(33, 13);
+ this.labelMouseFaster.TabIndex = 10;
+ this.labelMouseFaster.Text = "faster";
+ //
+ // labelMouseSlower
+ //
+ this.labelMouseSlower.AutoSize = true;
+ this.labelMouseSlower.Location = new System.Drawing.Point(6, 51);
+ this.labelMouseSlower.Name = "labelMouseSlower";
+ this.labelMouseSlower.Size = new System.Drawing.Size(37, 13);
+ this.labelMouseSlower.TabIndex = 9;
+ this.labelMouseSlower.Text = "slower";
+ //
+ // trackBarMouseSensitivity
+ //
+ this.trackBarMouseSensitivity.BackColor = System.Drawing.Color.White;
+ this.trackBarMouseSensitivity.Cursor = System.Windows.Forms.Cursors.Default;
+ this.trackBarMouseSensitivity.Location = new System.Drawing.Point(6, 19);
+ this.trackBarMouseSensitivity.Maximum = 50;
+ this.trackBarMouseSensitivity.Name = "trackBarMouseSensitivity";
+ this.trackBarMouseSensitivity.Size = new System.Drawing.Size(224, 45);
+ this.trackBarMouseSensitivity.TabIndex = 5;
+ this.trackBarMouseSensitivity.TickFrequency = 5;
+ this.trackBarMouseSensitivity.Value = 10;
+ this.trackBarMouseSensitivity.Scroll += new System.EventHandler(this.trackBarMouseSensitivity_Scroll);
+ //
+ // labelMouseSensitivity
+ //
+ this.labelMouseSensitivity.Location = new System.Drawing.Point(6, 51);
+ this.labelMouseSensitivity.Name = "labelMouseSensitivity";
+ this.labelMouseSensitivity.Size = new System.Drawing.Size(224, 20);
+ this.labelMouseSensitivity.TabIndex = 11;
+ this.labelMouseSensitivity.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // groupBoxHardwareConfig
+ //
+ this.groupBoxHardwareConfig.Controls.Add(this.labelRemoteMode);
+ this.groupBoxHardwareConfig.Controls.Add(this.comboBoxRemoteMode);
+ this.groupBoxHardwareConfig.Controls.Add(this.comboBoxPadMode);
+ this.groupBoxHardwareConfig.Controls.Add(this.labelPadMode);
+ this.groupBoxHardwareConfig.Location = new System.Drawing.Point(6, 52);
+ this.groupBoxHardwareConfig.Name = "groupBoxHardwareConfig";
+ this.groupBoxHardwareConfig.Size = new System.Drawing.Size(236, 73);
+ this.groupBoxHardwareConfig.TabIndex = 9;
+ this.groupBoxHardwareConfig.TabStop = false;
+ this.groupBoxHardwareConfig.Text = "Hardware configuration";
+ //
// Configuration
//
this.AcceptButton = this.buttonOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.buttonCancel;
- this.ClientSize = new System.Drawing.Size(272, 295);
+ this.ClientSize = new System.Drawing.Size(272, 307);
this.Controls.Add(this.tabControl);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonOK);
this.MaximizeBox = false;
this.MinimizeBox = false;
- this.MinimumSize = new System.Drawing.Size(280, 306);
+ this.MinimumSize = new System.Drawing.Size(280, 320);
this.Name = "Configuration";
this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
@@ -554,7 +628,6 @@
this.groupBoxRemoteTiming.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.numericUpDownKeyHeldDelay)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownKeyRepeatDelay)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMouseSensitivity)).EndInit();
this.tabControl.ResumeLayout(false);
this.tabPageRemote.ResumeLayout(false);
this.tabPageRemote.PerformLayout();
@@ -564,6 +637,13 @@
this.tabPageMouse.ResumeLayout(false);
this.tabPageMouse.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.trackBarKeyPadSensitivity)).EndInit();
+ this.groupBoxKeyPadSensitivity.ResumeLayout(false);
+ this.groupBoxKeyPadSensitivity.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.trackBar1)).EndInit();
+ this.groupBoxMouseSensitivity.ResumeLayout(false);
+ this.groupBoxMouseSensitivity.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.trackBarMouseSensitivity)).EndInit();
+ this.groupBoxHardwareConfig.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -590,20 +670,28 @@
private System.Windows.Forms.CheckBox checkBoxHandleKeyboardLocal;
private System.Windows.Forms.CheckBox checkBoxEnableKeyboard;
private System.Windows.Forms.TabPage tabPageMouse;
- private System.Windows.Forms.Label labelMouseSensitivity;
- private System.Windows.Forms.NumericUpDown numericUpDownMouseSensitivity;
private System.Windows.Forms.CheckBox checkBoxHandleMouseLocal;
private System.Windows.Forms.CheckBox checkBoxEnableMouse;
private System.Windows.Forms.CheckBox checkBoxUseSystemRatesRemote;
private System.Windows.Forms.CheckBox checkBoxUseSystemRatesKeyboard;
- private System.Windows.Forms.ComboBox comboBoxHardwareMode;
- private System.Windows.Forms.Label labelHardwareMode;
private System.Windows.Forms.ComboBox comboBoxRemoteMode;
private System.Windows.Forms.Label labelRemoteMode;
+ private System.Windows.Forms.ComboBox comboBoxPadMode;
+ private System.Windows.Forms.Label labelPadMode;
+ private System.Windows.Forms.CheckBox checkBoxUsePadSwitch;
private System.Windows.Forms.TrackBar trackBarKeyPadSensitivity;
- private System.Windows.Forms.Label labelKpsSoft;
- private System.Windows.Forms.Label labelKeyPadSensitivity;
- private System.Windows.Forms.Label labelKpsHard;
+ private System.Windows.Forms.GroupBox groupBoxKeyPadSensitivity;
+ private System.Windows.Forms.Label labelKeyPadHarder;
+ private System.Windows.Forms.Label labelKeyPadSofter;
+ private System.Windows.Forms.GroupBox groupBoxMouseSensitivity;
+ private System.Windows.Forms.Label labelMouseFaster;
+ private System.Windows.Forms.Label labelMouseSlower;
+ private System.Windows.Forms.TrackBar trackBarMouseSensitivity;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TrackBar trackBar1;
+ private System.Windows.Forms.Label labelMouseSensitivity;
+ private System.Windows.Forms.GroupBox groupBoxHardwareConfig;
}
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Configuration.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Configuration.cs 2009-06-25 21:55:39 UTC (rev 2962)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Configuration.cs 2009-06-25 23:21:50 UTC (rev 2963)
@@ -25,125 +25,141 @@
namespace InputService.Plugin
{
- internal partial class Configuration : Form
- {
- public Configuration()
+ internal partial class Configuration : Form
{
- InitializeComponent();
- comboBoxHardwareMode.Items.AddRange(Enum.GetNames(typeof (iMonUSBReceivers.RcMode)));
- comboBoxRemoteMode.Items.AddRange(Enum.GetNames(typeof (iMonUSBReceivers.RemoteMode)));
- }
+ public Configuration()
+ {
+ InitializeComponent();
+ comboBoxRemoteMode.Items.AddRange(Enum.GetNames(typeof(iMonUSBReceivers.RemoteMode)));
+ comboBoxPadMode.Items.AddRange(Enum.GetNames(typeof(iMonUSBReceivers.PadMode)));
+ }
- public iMonUSBReceivers.RcMode HardwareMode
- {
- get
- {
- return
- (iMonUSBReceivers.RcMode)
- Enum.Parse(typeof (iMonUSBReceivers.RcMode), comboBoxHardwareMode.SelectedItem as string);
- }
- set { comboBoxHardwareMode.SelectedItem = Enum.GetName(typeof (iMonUSBReceivers.RcMode), value); }
- }
+ public iMonUSBReceivers.RemoteMode RemoteMode
+ {
+ get
+ {
+ return
+ (iMonUSBReceivers.RemoteMode)
+ Enum.Parse(typeof(iMonUSBReceivers.RemoteMode), comboBoxRemoteMode.SelectedItem as string);
+ }
+ set { comboBoxRemoteMode.SelectedItem = Enum.GetName(typeof(iMonUSBReceivers.RemoteMode), value); }
+ }
- public iMonUSBReceivers.RemoteMode RemoteMode
- {
- get
- {
- return
- (iMonUSBReceivers.RemoteMode)
- Enum.Parse(typeof (iMonUSBReceivers.RemoteMode), comboBoxRemoteMode.SelectedItem as string);
- }
- set { comboBoxRemoteMode.SelectedItem = Enum.GetName(typeof (iMonUSBReceivers.RemoteMode), value); }
- }
+ public iMonUSBReceivers.PadMode PadMode
+ {
+ get
+ {
+ return
+ (iMonUSBReceivers.PadMode)
+ Enum.Parse(typeof(iMonUSBReceivers.PadMode), comboBoxPadMode.SelectedItem as string);
+ }
+ set { comboBoxPadMode.SelectedItem = Enum.GetName(typeof(iMonUSBReceivers.PadMode), value); }
+ }
- public bool EnableRemote
- {
- get { return checkBoxEnableRemote.Checked; }
- set { checkBoxEnableRemote.Checked = value; }
- }
+ public bool EnableRemote
+ {
+ get { return checkBoxEnableRemote.Checked; }
+ set { checkBoxEnableRemote.Checked = value; }
+ }
- public bool UseSystemRatesForRemote
- {
- get { return checkBoxUseSystemRatesRemote.Checked; }
- set { checkBoxUseSystemRatesRemote.Checked = value; }
- }
+ public bool UsePadSwitch
+ {
+ get { return checkBoxUsePadSwitch.Checked; }
+ set { checkBoxUsePadSwitch.Checked = value; }
+ }
- public int RemoteRepeatDelay
- {
- get { return Decimal.ToInt32(numericUpDownButtonRepeatDelay.Value); }
- set { numericUpDownButtonRepeatDelay.Value = new Decimal(value); }
- }
+ public bool UseSystemRatesForRemote
+ {
+ get { return checkBoxUseSystemRatesRemote.Checked; }
+ set { checkBoxUseSystemRatesRemote.Checked = value; }
+ }
- public int RemoteHeldDelay
- {
- get { return Decimal.ToInt32(numericUpDownButtonHeldDelay.Value); }
- set { numericUpDownButtonHeldDelay.Value = new Decimal(value); }
- }
+ public int RemoteRepeatDelay
+ {
+ get { return Decimal.ToInt32(numericUpDownButtonRepeatDelay.Value); }
+ set { numericUpDownButtonRepeatDelay.Value = new Decimal(value); }
+ }
- public bool EnableKeyboard
- {
- get { return checkBoxEnableKeyboard.Checked; }
- set { checkBoxEnableKeyboard.Checked = value; }
- }
+ public int RemoteHeldDelay
+ {
+ get { return Decimal.ToInt32(numericUpDownButtonHeldDelay.Value); }
+ set { numericUpDownButtonHeldDelay.Value = new Decimal(value); }
+ }
- public bool UseSystemRatesForKeyboard
- {
- get { return checkBoxUseSystemRatesKeyboard.Checked; }
- set { checkBoxUseSystemRatesKeyboard.Checked = value; }
- }
+ public bool EnableKeyboard
+ {
+ get { return checkBoxEnableKeyboard.Checked; }
+ set { checkBoxEnableKeyboard.Checked = value; }
+ }
- public int KeyboardRepeatDelay
- {
- get { return Decimal.ToInt32(numericUpDownKeyRepeatDelay.Value); }
- set { numericUpDownKeyRepeatDelay.Value = new Decimal(value); }
- }
+ public int KeyPadSensitivity
+ {
+ get { return trackBarKeyPadSensitivity.Value; }
+ set { trackBarKeyPadSensitivity.Value = value; }
+ }
- public int KeyboardHeldDelay
- {
- get { return Decimal.ToInt32(numericUpDownKeyHeldDelay.Value); }
- set { numericUpDownKeyHeldDelay.Value = new Decimal(value); }
- }
+ public bool UseSystemRatesForKeyboard
+ {
+ get { return checkBoxUseSystemRatesKeyboard.Checked; }
+ set { checkBoxUseSystemRatesKeyboard.Checked = value; }
+ }
- public bool HandleKeyboardLocal
- {
- get { return checkBoxHandleKeyboardLocal.Checked; }
- set { checkBoxHandleKeyboardLocal.Checked = value; }
- }
+ public int KeyboardRepeatDelay
+ {
+ get { return Decimal.ToInt32(numericUpDownKeyRepeatDelay.Value); }
+ set { numericUpDownKeyRepeatDelay.Value = new Decimal(value); }
+ }
- public bool EnableMouse
- {
- get { return checkBoxEnableMouse.Checked; }
- set { checkBoxEnableMouse.Checked = value; }
- }
+ public int KeyboardHeldDelay
+ {
+ get { return Decimal.ToInt32(numericUpDownKeyHeldDelay.Value); }
+ set { numericUpDownKeyHeldDelay.Value = new Decimal(value); }
+ }
- public double MouseSensitivity
- {
- get { return Decimal.ToDouble(numericUpDownMouseSensitivity.Value); }
- set { numericUpDownMouseSensitivity.Value = new Decimal(value); }
- }
+ public bool HandleKeyboardLocal
+ {
+ get { return checkBoxHandleKeyboardLocal.Checked; }
+ set { checkBoxHandleKeyboardLocal.Checked = value; }
+ }
- public bool HandleMouseLocal
- {
- get { return checkBoxHandleMouseLocal.Checked; }
- set { checkBoxHandleMouseLocal.Checked = value; }
- }
+ public bool EnableMouse
+ {
+ get { return checkBoxEnableMouse.Checked; }
+ set { checkBoxEnableMouse.Checked = value; }
+ }
- public int KeyPadSensitivity
- {
- get { return trackBarKeyPadSensitivity.Value; }
- set { trackBarKeyPadSensitivity.Value = value; }
- }
+ public double MouseSensitivity
+ {
+ get { return ((double)trackBarMouseSensitivity.Value / 10); }
+ set
+ {
+ trackBarMouseSensitivity.Value = (int)(value * 10);
+ trackBarMouseSensitivity_Scroll((object) null, (EventArgs) null);
+ }
+ }
- private void buttonOK_Click(object sender, EventArgs e)
- {
- DialogResult = DialogResult.OK;
- Close();
- }
+ private void trackBarMouseSensitivity_Scroll(object sender, EventArgs e)
+ {
+ labelMouseSensitivity.Text = string.Format("{0:0.0}", (double)trackBarMouseSensitivity.Value / 10);
+ }
- private void buttonCancel_Click(object sender, EventArgs e)
- {
- DialogResult = DialogResult.Cancel;
- Close();
+ public bool HandleMouseLocal
+ {
+ get { return checkBoxHandleMouseLocal.Checked; }
+ set { checkBoxHandleMouseLocal.Checked = value; }
+ }
+
+ private void buttonOK_Click(object sender, EventArgs e)
+ {
+ DialogResult = DialogResult.OK;
+ Close();
+ }
+
+ private void buttonCancel_Click(object sender, EventArgs e)
+ {
+ DialogResult = DialogResult.Cancel;
+ Close();
+ }
+
}
- }
}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Configuration.resx
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Configuration.resx 2009-06-25 21:55:39 UTC (rev 2962)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Configuration.resx 2009-06-25 23:21:50 UTC (rev 2963)
@@ -120,7 +120,4 @@
<metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
</root>
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Debug.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Debug.cs (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Debug.cs 2009-06-25 23:21:50 UTC (rev 2963)
@@ -0,0 +1,136 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+
+namespace InputService.Plugin
+{
+ public partial class iMonUSBReceivers
+ {
+#if DEBUG
+ private static StreamWriter _debugFile;
+#endif
+
+ /// <summary>
+ /// Opens a debug output file.
+ /// </summary>
+ /// <param name="fileName">Name of the file.</param>
+ private static void DebugOpen(string fileName)
+ {
+#if DEBUG
+ if (_debugFile != null) return;
+ try
+ {
+ string path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData),
+ String.Format("IR Server Suite\\Logs\\{0}", fileName));
+ _debugFile = new StreamWriter(path, false);
+ _debugFile.AutoFlush = true;
+ }
+ catch
+ {
+ _debugFile = null;
+ }
+#endif
+ }
+
+ /// <summary>
+ /// Closes the debug output file.
+ /// </summary>
+ private static void DebugClose()
+ {
+#if DEBUG
+ if (_debugFile != null)
+ {
+ _debugFile.Close();
+ _debugFile.Dispose();
+ _debugFile = null;
+ }
+#endif
+ }
+
+ /// <summary>
+ /// Writes a line to the debug output file.
+ /// </summary>
+ /// <param name="line">The line.</param>
+ /// <param name="args">Formatting arguments.</param>
+ private static void DebugWriteLine(string line, params object[] args)
+ {
+#if DEBUG
+ if (_debugFile != null)
+ {
+ _debugFile.Write("{0:yyyy-MM-dd HH:mm:ss.ffffff} - ", DateTime.Now);
+ _debugFile.WriteLine(line, args);
+ }
+#endif
+#if TEST_APPLICATION
+ Console.Write("{0:yyyy-MM-dd HH:mm:ss.ffffff} - ", DateTime.Now);
+ Console.WriteLine(line, args);
+#endif
+ }
+
+ /// <summary>
+ /// Writes a string to the debug output file.
+ /// </summary>
+ /// <param name="text">The string to write.</param>
+ /// <param name="args">Formatting arguments.</param>
+ private static void DebugWrite(string text, params object[] args)
+ {
+#if DEBUG
+ if (_debugFile != null)
+ {
+ _debugFile.Write(text, args);
+ }
+#endif
+#if TEST_APPLICATION
+ Console.Write(text, args);
+#endif
+ }
+
+ /// <summary>
+ /// Writes a new line to the debug output file.
+ /// </summary>
+ private static void DebugWriteNewLine()
+ {
+#if DEBUG
+ if (_debugFile != null)
+ {
+ _debugFile.WriteLine();
+ }
+#endif
+#if TEST_APPLICATION
+ Console.WriteLine();
+#endif
+ }
+
+ /// <summary>
+ /// Dumps an Array to the debug output file.
+ /// </summary>
+ /// <param name="array">The array.</param>
+ private static void DebugDump(Array array)
+ {
+ foreach (object item in array)
+ {
+ if (item is byte)
+ {
+ DebugWrite("{0:X2}", (byte)item);
+ }
+ else if (item is ushort)
+ {
+ DebugWrite("{0:X4}", (ushort)item);
+ }
+ else if (item is int)
+ {
+ DebugWrite("{1}{0}", (int)item, (int)item > 0 ? "+" : String.Empty);
+ }
+ else
+ {
+ DebugWrite("{0}", item);
+ }
+
+ DebugWrite(", ");
+ }
+
+ DebugWriteNewLine();
+ }
+ }
+}
Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Exclusions.txt
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Exclusions.txt (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Exclusions.txt 2009-06-25 23:21:50 UTC (rev 2963)
@@ -0,0 +1,100 @@
+ [Serializable, StructLayout(LayoutKind.Sequential)]
+ private struct RECT
+ {
+ public readonly int Left;
+ public readonly int Top;
+ public readonly int Right;
+ public readonly int Bottom;
+
+ public RECT(int left_, int top_, int right_, int bottom_)
+ {
+ Left = left_;
+ Top = top_;
+ Right = right_;
+ Bottom = bottom_;
+ }
+
+ public int Height
+ {
+ get { return Bottom - Top; }
+ }
+
+ public int Width
+ {
+ get { return Right - Left; }
+ }
+
+ public Size Size
+ {
+ get { return new Size(Width, Height); }
+ }
+
+ public Point Location
+ {
+ get { return new Point(Left, Top); }
+ }
+
+ // Handy method for converting to a System.Drawing.Rectangle
+ public Rectangle ToRectangle()
+ {
+ return Rectangle.FromLTRB(Left, Top, Right, Bottom);
+ }
+
+ public static RECT FromRectangle(Rectangle rectangle)
+ {
+ return new RECT(rectangle.Left, rectangle.Top, rectangle.Right, rectangle.Bottom);
+ }
+
+ public override int GetHashCode()
+ {
+ return Left ^ ((Top << 13) | (Top >> 0x13))
+ ^ ((Width << 0x1a) | (Width >> 6))
+ ^ ((Height << 7) | (Height >> 0x19));
+ }
+
+ #region Operator overloads
+
+ public static implicit operator Rectangle(RECT rect)
+ {
+ return rect.ToRectangle();
+ }
+
+ public static implicit operator RECT(Rectangle rect)
+ {
+ return FromRectangle(rect);
+ }
+
+ #endregion
+ }
+
+ [DllImport("user32.dll")]
+ private static extern bool SendMessage(IntPtr hWnd, int Msg, int wParam, int lParam);
+
+ private static void RedrawNotificationArea()
+ {
+ IntPtr hNotificationArea = GetNotificationAreaHandle();
+ RECT r;
+ GetClientRect(hNotificationArea, out r);
+ for (int x = 0; x < r.Right; x += 5)
+ for (int y = 0; y < r.Bottom; y += 5)
+ SendMessage(hNotificationAre...
[truncated message content] |
|
From: <be...@us...> - 2009-07-08 23:53:24
|
Revision: 2993
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2993&view=rev
Author: belcom
Date: 2009-07-08 23:53:08 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
- iMON USB plugin: making old DOS device working again.
- iMON USB abstract mapping: all buttons work now, some mappings changed.
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs
trunk/plugins/IR Server Suite/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/iMon USB/Imon PAD.xml
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs 2009-07-07 00:34:56 UTC (rev 2992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs 2009-07-08 23:53:08 UTC (rev 2993)
@@ -57,12 +57,31 @@
private const uint IOCTL_IMON_READ2 = 0x00222034; // function 0x80D - ??? read (8 bytes)
private const uint IOCTL_IMON_WRITE = 0x00222018; // function 0x806 - write data (8 bytes) to device
- private static readonly byte[][] SetDosRemotePAD = new byte[][]
+ private static readonly byte[][] SetDosRemotePADold = new byte[][]
{
+ new byte[] {0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00},
+ new byte[] {0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x02},
+ new byte[] {0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x04},
+ new byte[] {0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x06},
+ new byte[] {0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x08},
+ new byte[] {0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0A}
+ };
+ private static readonly byte[][] SetDosRemoteMCEold = new byte[][]
+ {
+ new byte[] {0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00},
+ new byte[] {0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x02},
+ new byte[] {0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x04},
+ new byte[] {0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x06},
+ new byte[] {0x20, 0x20, 0x20, 0x20, 0x01, 0x00, 0x00, 0x08},
+ new byte[] {0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0A}
+ };
+
+ private static readonly byte[][] SetDosRemotePADnew = new byte[][]
+ {
new byte[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02}
};
- private static readonly byte[][] SetDosRemoteMCE = new byte[][]
+ private static readonly byte[][] SetDosRemoteMCEnew = new byte[][]
{
new byte[] {0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02}
};
@@ -389,6 +408,7 @@
private RemoteHandler _remoteHandler;
private byte _remoteToggle;
+ private uint firmwareVersion = 0;
#endregion Global Variables
@@ -506,6 +526,14 @@
byte[] dataBytes = new byte[bytesRead];
Marshal.Copy(deviceBufferPtr, dataBytes, 0, bytesRead);
+ if ((dataBytes[0] == 0xFF) &&
+ (dataBytes[1] == 0xFF) &&
+ (dataBytes[2] == 0xFF) &&
+ (dataBytes[3] == 0xFF) &&
+ (dataBytes[4] == 0xFF) &&
+ (dataBytes[5] == 0xFF))
+ firmwareVersion = (uint)dataBytes[6] + 2;
+
// Rubbish data:
// FF, FF, FF, FF, FF, FF, 9F, FF,
// 00, 00, 00, 00, 00, 00, 00, F0,
@@ -556,11 +584,11 @@
switch (mode)
{
case RemoteMode.iMON:
- modeData = SetDosRemotePAD;
+ modeData = (firmwareVersion < 0x9a) ? SetDosRemotePADold : SetDosRemotePADnew;
break;
case RemoteMode.MCE:
- modeData = SetDosRemoteMCE;
+ modeData = (firmwareVersion < 0x9a) ? SetDosRemoteMCEold : SetDosRemoteMCEnew;
break;
}
SetDos(modeData);
@@ -876,6 +904,12 @@
}
else
{
+ _processReceiveThread = true;
+ _receiveThread = new Thread(ReceiveThread);
+ _receiveThread.Name = "iMon Receive Thread";
+ _receiveThread.IsBackground = true;
+ _receiveThread.Start();
+
if (_remoteMode == RemoteMode.iMON)
{
DebugWriteLine("Configured Hardware Mode: {0}", _remoteMode);
@@ -886,13 +920,7 @@
DebugWriteLine("Configured Hardware Mode: {0}\n", _remoteMode);
}
- SetDos(_remoteMode);
-
- _processReceiveThread = true;
- _receiveThread = new Thread(ReceiveThread);
- _receiveThread.Name = "iMon Receive Thread";
- _receiveThread.IsBackground = true;
- _receiveThread.Start();
+ SetDos(_remoteMode);
}
}
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/iMon USB/Imon PAD.xml
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/iMon USB/Imon PAD.xml 2009-07-07 00:34:56 UTC (rev 2992)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Input Service/Input Service/Abstract Remote Maps/iMon USB/Imon PAD.xml 2009-07-08 23:53:08 UTC (rev 2993)
@@ -30,8 +30,8 @@
<RemoteTable RawCode="1136" AbstractButton="Number8" />
<RemoteTable RawCode="1160" AbstractButton="Number9" />
<RemoteTable RawCode="1034" AbstractButton="OK" />
- <RemoteTable RawCode="1096" AbstractButton="Imon" />
- <RemoteTable RawCode="1056" AbstractButton="Imon" />
+ <RemoteTable RawCode="1096" AbstractButton="Star" />
+ <RemoteTable RawCode="1056" AbstractButton="Hash" />
<RemoteTable RawCode="1082" AbstractButton="Music" />
<RemoteTable RawCode="1224" AbstractButton="Pictures" />
<RemoteTable RawCode="1200" AbstractButton="Videos" />
@@ -52,5 +52,7 @@
<RemoteTable RawCode="1226" AbstractButton="LeftClick" />
<RemoteTable RawCode="1228" AbstractButton="RightClick" />
<RemoteTable RawCode="1060" AbstractButton="Info" />
- <RemoteTable RawCode="1124" AbstractButton="Teletext" />
+ <RemoteTable RawCode="1124" AbstractButton="Info" />
+ <RemoteTable RawCode="1008" AbstractButton="Teletext" />
+ <RemoteTable RawCode="1188" AbstractButton="Snapshot" />
</DocumentElement>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-07-11 16:41:58
|
Revision: 3004
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3004&view=rev
Author: chemelli_sf
Date: 2009-07-11 16:41:50 +0000 (Sat, 11 Jul 2009)
Log Message:
-----------
- Added 3 return status for Detect(): DevicePresent, DeviceNotFound, DeviceException
- Handled well known exception where driver is not installed
- Removed unused x86 compile platform
- Handled x64 plugin load
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Config.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommandReceiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/PluginBase.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/PluginBaseInterfaces.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDriveReceiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/IR Server Suite/Input Service/Input Service/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/Input Service/Input Service Configuration/Config.cs
trunk/plugins/IR Server Suite/IR Server Suite/Input Service/Input Service Configuration/Program.cs
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Config.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Config.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Config.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -29,9 +29,9 @@
using SourceGrid;
using SourceGrid.Cells;
using SourceGrid.Cells.Controllers;
-using Button=SourceGrid.Cells.Button;
-using CheckBox=SourceGrid.Cells.CheckBox;
-using ColumnHeader=SourceGrid.Cells.ColumnHeader;
+using Button = SourceGrid.Cells.Button;
+using CheckBox = SourceGrid.Cells.CheckBox;
+using ColumnHeader = SourceGrid.Cells.ColumnHeader;
namespace IRServer
{
@@ -217,8 +217,8 @@
private void buttonClickEvent_Executed(object sender, EventArgs e)
{
- CellContext context = (CellContext) sender;
- Button cell = (Button) context.Cell;
+ CellContext context = (CellContext)sender;
+ Button cell = (Button)context.Cell;
try
{
@@ -236,8 +236,8 @@
private void TransmitChanged(object sender, EventArgs e)
{
- CellContext context = (CellContext) sender;
- CheckBox cell = (CheckBox) context.Cell;
+ CellContext context = (CellContext)sender;
+ CheckBox cell = (CheckBox)context.Cell;
if (cell.Checked != true)
return;
@@ -256,8 +256,8 @@
private void PluginDoubleClick(object sender, EventArgs e)
{
- CellContext context = (CellContext) sender;
- Cell cell = (Cell) context.Cell;
+ CellContext context = (CellContext)sender;
+ Cell cell = (Cell)context.Cell;
CheckBox checkBoxReceive = gridPlugins[cell.Row.Index, ColReceive] as CheckBox;
if (checkBoxReceive != null)
@@ -406,31 +406,46 @@
CheckBox checkBox;
for (int row = 1; row < gridPlugins.RowsCount; row++)
{
+ PluginBase plugin = gridPlugins.Rows[row].Tag as PluginBase;
+
try
{
- PluginBase plugin = gridPlugins.Rows[row].Tag as PluginBase;
+ if (plugin == null)
+ throw new InvalidOperationException(String.Format("Invalid grid data, row {0} contains no plugin in tag",
+ row));
- IrssLog.Info("Checking: {0}", plugin.Name);
- bool detected = plugin.Detect();
+ PluginBase.DetectionResult detected = plugin.Detect();
- if (detected)
- IrssLog.Info("Found: {0}", plugin.Name);
+ if (detected == PluginBase.DetectionResult.DevicePresent)
+ {
+ IrssLog.Info("Plugin {0}: detected", plugin.Name);
+ }
+ if (detected == PluginBase.DetectionResult.DeviceException)
+ {
+ IrssLog.Warn("Plugin {0}: exception during Detect()", plugin.Name);
+ }
// Receive
checkBox = gridPlugins[row, ColReceive] as CheckBox;
if (checkBox != null)
- checkBox.Checked = detected;
+ checkBox.Checked = (detected == PluginBase.DetectionResult.DevicePresent ? true : false);
// Transmit
checkBox = gridPlugins[row, ColTransmit] as CheckBox;
if (checkBox != null)
- checkBox.Checked = detected;
+ checkBox.Checked = (detected == PluginBase.DetectionResult.DevicePresent ? true : false);
}
+ catch (BadImageFormatException)
+ {
+ IrssLog.Warn("Plugin {0}: not available on current OS architecture ({1})", plugin.Name, IntPtr.Size == 8 ? "x64" : "x86");
+ }
catch (Exception ex)
{
IrssLog.Error(ex);
}
}
+
+ IrssLog.Info("Input Plugins detection completed...");
}
private void Advanced()
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Program.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/Program.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -187,7 +187,7 @@
{
try
{
- if ((plugin is IRemoteReceiver || plugin is IKeyboardReceiver || plugin is IMouseReceiver) && plugin.Detect())
+ if ((plugin is IRemoteReceiver || plugin is IKeyboardReceiver || plugin is IMouseReceiver) && plugin.Detect() == PluginBase.DetectionResult.DevicePresent)
receivers.Add(plugin.Name);
}
catch (Exception ex)
@@ -220,7 +220,7 @@
{
try
{
- if (plugin is ITransmitIR && plugin.Detect())
+ if (plugin is ITransmitIR && plugin.Detect() == PluginBase.DetectionResult.DevicePresent)
blasters.Add(plugin.Name);
}
catch (Exception ex)
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj 2009-07-11 16:41:50 UTC (rev 3004)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{E146C2D8-6842-46C5-B2A9-AFA9D6F1A3BB}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -52,6 +52,10 @@
</Compile>
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
+ <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
+ <Name>IrssUtils</Name>
+ </ProjectReference>
<ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
<Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
<Name>IR Server Plugin Interface</Name>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/AdsTechPTV335Receiver.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -25,6 +25,7 @@
using System.Runtime.InteropServices;
using System.Threading;
using InputService.Plugin.Properties;
+using IrssUtils;
namespace InputService.Plugin
{
@@ -125,21 +126,28 @@
#endregion
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
+ /// Detect the presence of this device.
/// </summary>
- /// <returns>
- /// <c>true</c> if the device is present, otherwise <c>false</c>.
- /// </returns>
- public override bool Detect()
+ public override DetectionResult Detect()
{
try
{
- return (Init() != 0);
+ if (Init() != 0)
+ {
+ return DetectionResult.DevicePresent;
+ }
}
- catch
+ catch (DllNotFoundException)
{
- return false;
+ return DetectionResult.DeviceNotFound;
}
+ catch (Exception ex)
+ {
+ IrssLog.Error("{0} exception: {1} type: {2}", Name, ex.Message, ex.GetType());
+ return DetectionResult.DeviceException;
+ }
+
+ return DetectionResult.DeviceNotFound;
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommandReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommandReceiver.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommandReceiver.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -106,22 +106,12 @@
}
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
+ /// Detect the presence of this device.
/// </summary>
- /// <returns>
- /// <c>true</c> if the device is present, otherwise <c>false</c>.
- /// </returns>
- public override bool Detect()
+ public override DetectionResult Detect()
{
// TODO: Add CoolCommand detection
- try
- {
- return false;
- }
- catch
- {
- return false;
- }
+ return DetectionResult.DeviceNotFound;
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj 2009-07-11 16:41:50 UTC (rev 3004)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{732CDF64-D047-4D3C-91DA-E2FF27D84179}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -75,6 +75,10 @@
</Compile>
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
+ <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
+ <Name>IrssUtils</Name>
+ </ProjectReference>
<ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
<Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
<Name>IR Server Plugin Interface</Name>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/DirectInputReceiver.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -27,6 +27,7 @@
using System.Windows.Forms;
using System.Xml;
using InputService.Plugin.Properties;
+using IrssUtils;
using Microsoft.DirectX.DirectInput;
namespace InputService.Plugin
@@ -231,23 +232,26 @@
#endregion
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
+ /// Detect the presence of this device.
/// </summary>
- /// <returns>
- /// true if the device is present, otherwise false.
- /// </returns>
- public override bool Detect()
+ public override DetectionResult Detect()
{
try
{
InitDeviceList();
- return (_deviceList.Count != 0);
+ if (_deviceList.Count != 0)
+ {
+ return DetectionResult.DevicePresent;
+ }
}
- catch
+ catch (Exception ex)
{
- return false;
+ IrssLog.Error("{0} exception: {1}", Name, ex.Message);
+ return DetectionResult.DeviceException;
}
+
+ return DetectionResult.DeviceNotFound;
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj 2009-07-11 16:41:50 UTC (rev 3004)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{9FDD649E-0502-4FED-9AC1-AA0346394375}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -58,6 +58,10 @@
</Compile>
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
+ <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
+ <Name>IrssUtils</Name>
+ </ProjectReference>
<ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
<Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
<Name>IR Server Plugin Interface</Name>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -26,6 +26,7 @@
using System.IO;
using System.Runtime.InteropServices;
using InputService.Plugin.Properties;
+using IrssUtils;
using Microsoft.Win32.SafeHandles;
namespace InputService.Plugin
@@ -289,12 +290,9 @@
}
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
+ /// Detect the presence of this device.
/// </summary>
- /// <returns>
- /// <c>true</c> if the device is present, otherwise <c>false</c>.
- /// </returns>
- public override bool Detect()
+ public override DetectionResult Detect()
{
try
{
@@ -303,12 +301,18 @@
string devicePath = FindDevice(hidGuid, DeviceID);
- return (devicePath != null);
+ if (devicePath != null)
+ {
+ return DetectionResult.DevicePresent;
+ }
}
- catch
+ catch (Exception ex)
{
- return false;
+ IrssLog.Error("{0} exception: {1}", Name, ex.Message);
+ return DetectionResult.DeviceException;
}
+
+ return DetectionResult.DeviceNotFound;
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/PluginBase.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/PluginBase.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/PluginBase.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -79,16 +79,35 @@
#endregion Properties
+ #region Enums
+ ///<summary>
+ /// Store the result of Detect() in PluginBase
+ ///</summary>
+ public enum DetectionResult
+ {
+ ///<summary>
+ /// Device is not installed
+ ///</summary>
+ DeviceNotFound,
+ ///<summary>
+ /// Device is working
+ ///</summary>
+ DevicePresent,
+ ///<summary>
+ /// Init call fails
+ ///</summary>
+ DeviceException
+ }
+ #endregion
+
#region Methods
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
- /// This method should not throw exceptions.
+ /// Detect the presence of this device.
/// </summary>
- /// <returns><c>true</c> if the device is present, otherwise <c>false</c>.</returns>
- public virtual bool Detect()
+ public virtual DetectionResult Detect()
{
- return false;
+ return DetectionResult.DeviceNotFound;
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj 2009-07-11 16:41:50 UTC (rev 3004)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{C7BF555E-638F-4E1B-9D5A-D2D226C77676}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -52,6 +52,10 @@
</Compile>
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
+ <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
+ <Name>IrssUtils</Name>
+ </ProjectReference>
<ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
<Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
<Name>IR Server Plugin Interface</Name>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501Receiver.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501Receiver.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -26,6 +26,7 @@
using System.IO;
using System.Runtime.InteropServices;
using InputService.Plugin.Properties;
+using IrssUtils;
using Microsoft.Win32.SafeHandles;
namespace InputService.Plugin
@@ -249,12 +250,9 @@
}
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
+ /// Detect the presence of this device.
/// </summary>
- /// <returns>
- /// <c>true</c> if the device is present, otherwise <c>false</c>.
- /// </returns>
- public override bool Detect()
+ public override DetectionResult Detect()
{
try
{
@@ -263,12 +261,22 @@
string devicePath = FindDevice(guid);
- return (devicePath != null);
+ if (devicePath != null)
+ {
+ return DetectionResult.DevicePresent;
+ }
}
- catch
+ catch (FileNotFoundException)
{
- return false;
+ //No error if driver is not installed. Handled using default return "DeviceNotFound"
}
+ catch (Exception ex)
+ {
+ IrssLog.Error("{0} exception: {1}", Name, ex.Message);
+ return DetectionResult.DeviceException;
+ }
+
+ return DetectionResult.DeviceNotFound;
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj 2009-07-11 16:41:50 UTC (rev 3004)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{1DD4B652-DBF4-47E2-B46C-C810EEE3B7C3}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -57,6 +57,10 @@
<Compile Include="ReceiverWindow.cs" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
+ <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
+ <Name>IrssUtils</Name>
+ </ProjectReference>
<ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
<Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
<Name>IR Server Plugin Interface</Name>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -26,6 +26,7 @@
using System.Runtime.InteropServices;
using System.Windows.Forms;
using InputService.Plugin.Properties;
+using IrssUtils;
namespace InputService.Plugin
{
@@ -120,7 +121,8 @@
private struct DeviceInterfaceDetailData
{
public int Size;
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)] public string DevicePath;
+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+ public string DevicePath;
}
#endregion
@@ -203,12 +205,9 @@
}
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
+ /// Detect the presence of this device.
/// </summary>
- /// <returns>
- /// <c>true</c> if the device is present, otherwise <c>false</c>.
- /// </returns>
- public override bool Detect()
+ public override DetectionResult Detect()
{
try
{
@@ -217,12 +216,26 @@
string devicePath = FindDevice(guid);
- return (devicePath != null);
+ if (devicePath != null)
+ {
+ return DetectionResult.DevicePresent;
+ }
}
- catch
+ catch (Win32Exception ex)
{
- return false;
+ if (ex.NativeErrorCode != 2)
+ {
+ IrssLog.Error("{0} exception: {1}", Name, ex.NativeErrorCode);
+ return DetectionResult.DeviceException;
+ }
}
+ catch (Exception ex)
+ {
+ IrssLog.Error("{0} exception: {1} type: {2}", Name, ex.Message, ex.GetType());
+ return DetectionResult.DeviceException;
+ }
+
+ return DetectionResult.DeviceNotFound;
}
/// <summary>
@@ -281,7 +294,7 @@
private bool RegisterForRawInput(RawInput.RAWINPUTDEVICE[] devices)
{
- return RawInput.RegisterRawInputDevices(devices, (uint) devices.Length, (uint) Marshal.SizeOf(devices[0]));
+ return RawInput.RegisterRawInputDevices(devices, (uint)devices.Length, (uint)Marshal.SizeOf(devices[0]));
}
private void ProcMessage(ref Message m)
@@ -292,9 +305,9 @@
uint dwSize = 0;
RawInput.GetRawInputData(m.LParam, RawInput.RawInputCommand.Input, IntPtr.Zero, ref dwSize,
- (uint) Marshal.SizeOf(typeof (RawInput.RAWINPUTHEADER)));
+ (uint)Marshal.SizeOf(typeof(RawInput.RAWINPUTHEADER)));
- IntPtr buffer = Marshal.AllocHGlobal((int) dwSize);
+ IntPtr buffer = Marshal.AllocHGlobal((int)dwSize);
try
{
if (buffer == IntPtr.Zero)
@@ -302,14 +315,14 @@
if (
RawInput.GetRawInputData(m.LParam, RawInput.RawInputCommand.Input, buffer, ref dwSize,
- (uint) Marshal.SizeOf(typeof (RawInput.RAWINPUTHEADER))) != dwSize)
+ (uint)Marshal.SizeOf(typeof(RawInput.RAWINPUTHEADER))) != dwSize)
return;
- RawInput.RAWINPUT raw = (RawInput.RAWINPUT) Marshal.PtrToStructure(buffer, typeof (RawInput.RAWINPUT));
+ RawInput.RAWINPUT raw = (RawInput.RAWINPUT)Marshal.PtrToStructure(buffer, typeof(RawInput.RAWINPUT));
if (raw.header.dwType == RawInput.RawInputType.HID)
{
- int offset = Marshal.SizeOf(typeof (RawInput.RAWINPUTHEADER)) + Marshal.SizeOf(typeof (RawInput.RAWHID));
+ int offset = Marshal.SizeOf(typeof(RawInput.RAWINPUTHEADER)) + Marshal.SizeOf(typeof(RawInput.RAWHID));
byte[] bRawData = new byte[offset + raw.hid.dwSizeHid];
Marshal.Copy(buffer, bRawData, 0, bRawData.Length);
@@ -351,7 +364,7 @@
string devicePath = null;
- for (int deviceIndex = 0;; deviceIndex++)
+ for (int deviceIndex = 0; ; deviceIndex++)
{
DeviceInfoData deviceInfoData = new DeviceInfoData();
deviceInfoData.Size = Marshal.SizeOf(deviceInfoData);
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj 2009-07-11 16:41:50 UTC (rev 3004)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{883913F6-F4A7-4DE2-846A-C2102FAF499E}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -76,6 +76,10 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
+ <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
+ <Name>IrssUtils</Name>
+ </ProjectReference>
<ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
<Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
<Name>IR Server Plugin Interface</Name>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -29,6 +29,7 @@
using System.Windows.Forms;
using System.Xml;
using InputService.Plugin.Properties;
+using IrssUtils;
namespace InputService.Plugin
{
@@ -308,12 +309,9 @@
#endregion
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
+ /// Detect the presence of this device.
/// </summary>
- /// <returns>
- /// <c>true</c> if the device is present, otherwise <c>false</c>.
- /// </returns>
- public override bool Detect()
+ public override DetectionResult Detect()
{
try
{
@@ -322,14 +320,16 @@
if (Connect(_irTransServerAddress, _irTransServerPort))
{
_socket.Close();
- return true;
+ return DetectionResult.DevicePresent;
}
}
- catch
+ catch (Exception ex)
{
+ IrssLog.Error("{0} exception: {1}", Name, ex.Message);
+ return DetectionResult.DeviceException;
}
- return false;
+ return DetectionResult.DeviceNotFound;
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -28,6 +28,7 @@
using System.Runtime.InteropServices;
using System.Threading;
using InputService.Plugin.Properties;
+using IrssUtils;
using Microsoft.Win32.SafeHandles;
namespace InputService.Plugin
@@ -226,11 +227,9 @@
}
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
- /// This method should not throw exceptions.
+ /// Detect the presence of this device.
/// </summary>
- /// <returns><c>true</c> if the device is present, otherwise <c>false</c>.</returns>
- public override bool Detect()
+ public override DetectionResult Detect()
{
try
{
@@ -241,17 +240,19 @@
IntPtr.Zero);
int lastError = Marshal.GetLastWin32Error();
- if (deviceHandle.IsInvalid)
- throw new Win32Exception(lastError, "Failed to open device");
-
- deviceHandle.Dispose();
-
- return true;
+ if (!deviceHandle.IsInvalid)
+ {
+ deviceHandle.Dispose();
+ return DetectionResult.DevicePresent;
+ }
}
- catch
+ catch (Exception ex)
{
- return false;
+ IrssLog.Error("{0} exception: {1}", Name, ex.Message);
+ return DetectionResult.DeviceException;
}
+
+ return DetectionResult.DeviceNotFound;
}
/// <summary>
@@ -262,7 +263,7 @@
DebugOpen("IgorPlug Receiver.log");
DebugWriteLine("Start()");
- if (!Detect())
+ if (Detect() != DetectionResult.DevicePresent)
throw new InvalidOperationException("IgorPlug not found");
_readThread = new Thread(ReadThread);
@@ -415,7 +416,7 @@
foreach (byte dataByte in data)
{
- timingData.Add((int) Math.Round(dataByte * TimeCodeMultiplier * multiplier));
+ timingData.Add((int)Math.Round(dataByte * TimeCodeMultiplier * multiplier));
multiplier *= -1;
}
@@ -651,9 +652,9 @@
{
foreach (object item in array)
{
- if (item is byte) DebugWrite("{0:X2}", (byte) item);
- else if (item is ushort) DebugWrite("{0:X4}", (ushort) item);
- else if (item is int) DebugWrite("{1}{0}", (int) item, (int) item > 0 ? "+" : String.Empty);
+ if (item is byte) DebugWrite("{0:X2}", (byte)item);
+ else if (item is ushort) DebugWrite("{0:X4}", (ushort)item);
+ else if (item is int) DebugWrite("{1}{0}", (int)item, (int)item > 0 ? "+" : String.Empty);
else DebugWrite("{0}", item);
DebugWrite(", ");
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj 2009-07-11 16:41:50 UTC (rev 3004)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{A4023992-CCD6-461E-8E14-219A496734C5}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -61,6 +61,10 @@
<Compile Include="RemoteDetectionData.cs" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
+ <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
+ <Name>IrssUtils</Name>
+ </ProjectReference>
<ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
<Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
<Name>IR Server Plugin Interface</Name>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/PluginBaseInterfaces.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/PluginBaseInterfaces.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/PluginBaseInterfaces.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -57,12 +57,9 @@
}
/// <summary>
- /// Detect the presence of iMon devices. Devices that cannot be detected will always return false.
+ /// Detect the presence of iMon devices.
/// </summary>
- /// <returns>
- /// <c>true</c> if a DOS or HID device is present, otherwise <c>false</c>.
- /// </returns>
- public override bool Detect()
+ public override DetectionResult Detect()
{
DebugWriteLine("Detect()");
bool HasDOS = Detect_DOS();
@@ -70,18 +67,18 @@
{
_DriverMode = DeviceType.DOS;
DebugWriteLine("Detect(): completed - found DOS device");
- return true;
+ return DetectionResult.DevicePresent;
}
bool HasHID = Detect_HID();
if (HasHID)
{
_DriverMode = DeviceType.HID;
DebugWriteLine("Detect(): completed - found HID device");
- return true;
+ return DetectionResult.DevicePresent;
}
_DriverMode = DeviceType.None;
DebugWriteLine("Detect(): completed - device not found");
- return false;
+ return DetectionResult.DeviceNotFound;
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDriveReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDriveReceiver.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDriveReceiver.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -238,14 +238,13 @@
#endregion
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
+ /// Detect the presence of this device.
/// </summary>
- /// <returns>
- /// <c>true</c> if the device is present, otherwise <c>false</c>.
- /// </returns>
- public override bool Detect()
+ public override DetectionResult Detect()
{
- return false;
+ // TODO: Add LiveDrive detection
+
+ return DetectionResult.DeviceNotFound;
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -26,6 +26,7 @@
using System.IO;
using System.Runtime.InteropServices;
using InputService.Plugin.Properties;
+using IrssUtils;
using Microsoft.Win32.SafeHandles;
namespace InputService.Plugin
@@ -41,9 +42,9 @@
private const string DevicePathVidPid = "vid_045e&pid_0284";
//const string DeviceGuid = "{9DE464EB-5DAC-4498-88BC-5010CFD2F724}";
- private static readonly byte[] FlatCode = new byte[] {0x25, 0x87, 0xE0};
- private static readonly byte[] KeyCodeTemplate = new byte[] {0x25, 0x87, 0xEE, 0xFF, 0xFF};
- private static readonly byte[] RepeatCode = new byte[] {0x26, 0x00, 0x00, 0x00, 0x00};
+ private static readonly byte[] FlatCode = new byte[] { 0x25, 0x87, 0xE0 };
+ private static readonly byte[] KeyCodeTemplate = new byte[] { 0x25, 0x87, 0xEE, 0xFF, 0xFF };
+ private static readonly byte[] RepeatCode = new byte[] { 0x26, 0x00, 0x00, 0x00, 0x00 };
#endregion Constants
@@ -154,7 +155,8 @@
private struct DeviceInterfaceDetailData
{
public int Size;
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)] public string DevicePath;
+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+ public string DevicePath;
}
#endregion
@@ -304,12 +306,9 @@
}
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
+ /// Detect the presence of this device.
/// </summary>
- /// <returns>
- /// <c>true</c> if the device is present, otherwise <c>false</c>.
- /// </returns>
- public override bool Detect()
+ public override DetectionResult Detect()
{
try
{
@@ -318,12 +317,26 @@
string devicePath = FindDevice(guid);
- return (devicePath != null);
+ if (devicePath != null)
+ {
+ return DetectionResult.DevicePresent;
+ }
}
- catch
+ catch (Win32Exception ex)
{
- return false;
+ if (ex.NativeErrorCode != 13)
+ {
+ IrssLog.Error("{0} exception: {1}", Name, ex.NativeErrorCode);
+ return DetectionResult.DeviceException;
+ }
}
+ catch (Exception ex)
+ {
+ IrssLog.Error("{0} exception: {1} type: {2}", Name, ex.Message, ex.GetType());
+ return DetectionResult.DeviceException;
+ }
+
+ return DetectionResult.DeviceNotFound;
}
/// <summary>
@@ -410,7 +423,7 @@
string devicePath = null;
- for (int deviceIndex = 0;; deviceIndex++)
+ for (int deviceIndex = 0; ; deviceIndex++)
{
DeviceInfoData deviceInfoData = new DeviceInfoData();
deviceInfoData.Size = Marshal.SizeOf(deviceInfoData);
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj 2009-07-11 16:41:50 UTC (rev 3004)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{FCE5308F-C451-4113-B7F2-BB6212EA7FAD}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -52,6 +52,10 @@
</Compile>
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
+ <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
+ <Name>IrssUtils</Name>
+ </ProjectReference>
<ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
<Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
<Name>IR Server Plugin Interface</Name>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj 2009-07-11 16:41:50 UTC (rev 3004)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BABC30EB-7D0F-4398-9FCB-E517EA8D2AA9}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -90,6 +90,10 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
+ <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
+ <Name>IrssUtils</Name>
+ </ProjectReference>
<ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
<Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
<Name>IR Server Plugin Interface</Name>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -30,6 +30,7 @@
using System.Windows.Forms;
using System.Xml;
using InputService.Plugin.Properties;
+using IrssUtils;
using Microsoft.Win32;
namespace InputService.Plugin
@@ -341,24 +342,27 @@
#endregion
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
+ /// Detect the presence of this device.
/// </summary>
- /// <returns>
- /// <c>true</c> if the device is present, otherwise <c>false</c>.
- /// </returns>
- public override bool Detect()
+ public override DetectionResult Detect()
{
try
{
Guid deviceGuid;
string devicePath;
- return FindDevice(out deviceGuid, out devicePath);
+ if (FindDevice(out deviceGuid, out devicePath))
+ {
+ return DetectionResult.DevicePresent;
+ }
}
- catch
+ catch(Exception ex)
{
- return false;
+ IrssLog.Error("{0} exception: {1}", Name, ex.Message);
+ return DetectionResult.DeviceException;
}
+
+ return DetectionResult.DeviceNotFound;
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102 Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102 Receiver.csproj 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102 Receiver.csproj 2009-07-11 16:41:50 UTC (rev 3004)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{A2702ACF-C59E-4564-8A4A-5CBFF21C1E66}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -52,6 +52,10 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
+ <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
+ <Name>IrssUtils</Name>
+ </ProjectReference>
<ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
<Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
<Name>IR Server Plugin Interface</Name>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102Receiver.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102Receiver.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -26,6 +26,7 @@
using System.IO;
using System.Runtime.InteropServices;
using InputService.Plugin.Properties;
+using IrssUtils;
using Microsoft.Win32.SafeHandles;
namespace InputService.Plugin
@@ -252,12 +253,9 @@
}
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
+ /// Detect the presence of this device.
/// </summary>
- /// <returns>
- /// <c>true</c> if the device is present, otherwise <c>false</c>.
- /// </returns>
- public override bool Detect()
+ public override DetectionResult Detect()
{
try
{
@@ -266,12 +264,18 @@
string devicePath = FindDevice(guid);
- return (devicePath != null);
+ if (devicePath != null)
+ {
+ return DetectionResult.DevicePresent;
+ }
}
- catch
+ catch (Exception ex)
{
- return false;
+ IrssLog.Error("{0} exception: {1}", Name, ex.Message);
+ return DetectionResult.DeviceException;
}
+
+ return DetectionResult.DeviceNotFound;
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -25,6 +25,7 @@
using System.Drawing;
using System.Runtime.InteropServices;
using InputService.Plugin.Properties;
+using IrssUtils;
namespace InputService.Plugin
{
@@ -303,10 +304,9 @@
}
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
+ /// Detect the presence of this device.
/// </summary>
- /// <returns><c>true</c> if the device is present, otherwise <c>false</c>.</returns>
- public override bool Detect()
+ public override DetectionResult Detect()
{
IntPtr handle;
TYPE_RET_VAL error;
@@ -327,7 +327,7 @@
bdaapiClose(handle);
if (error == TYPE_RET_VAL.RET_SUCCESS)
- return true;
+ return DetectionResult.DevicePresent;
}
}
catch
@@ -337,11 +337,13 @@
}
}
}
- catch
+ catch (Exception ex)
{
+ IrssLog.Error("{0} exception: {1}", Name, ex.Message);
+ return DetectionResult.DeviceException;
}
- return false;
+ return DetectionResult.DeviceNotFound;
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj 2009-07-11 16:41:50 UTC (rev 3004)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{E83E5C73-5F70-4B52-B6BD-E906BAE90DF6}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -59,6 +59,10 @@
<Compile Include="Technotrend Receiver.cs" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
+ <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
+ <Name>IrssUtils</Name>
+ </ProjectReference>
<ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
<Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
<Name>IR Server Plugin Interface</Name>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj 2009-07-11 16:41:50 UTC (rev 3004)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{99B5CA78-3E0B-477F-A7D3-EE1B65E85DE4}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -74,6 +74,10 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
+ <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
+ <Name>IrssUtils</Name>
+ </ProjectReference>
<ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
<Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
<Name>IR Server Plugin Interface</Name>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -21,6 +21,7 @@
#endregion
using System;
+using System.ComponentModel;
using System.Drawing;
using System.IO;
using System.Runtime.InteropServices;
@@ -28,6 +29,7 @@
using System.Windows.Forms;
using System.Xml;
using InputService.Plugin.Properties;
+using IrssUtils;
namespace InputService.Plugin
{
@@ -49,7 +51,7 @@
private const int UUIRTDRV_IRFMT_UUIRT = 0x0000;
private static readonly string ConfigurationFile = Path.Combine(ConfigurationPath, "USB-UIRT Transceiver.xml");
- private static readonly string[] Ports = new string[] {"Default", "Port 1", "Port 2", "Port 3"};
+ private static readonly string[] Ports = new string[] { "Default", "Port 1", "Port 2", "Port 3" };
#endregion Constants
@@ -288,7 +290,7 @@
try
{
- _abortLearn = Marshal.AllocHGlobal(Marshal.SizeOf(typeof (Int32)));
+ _abortLearn = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(Int32)));
Marshal.WriteInt32(_abortLearn, AllowLearn);
result = UUIRTLearnIR(
@@ -396,12 +398,9 @@
#endregion
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
+ /// Detect the presence of this device.
/// </summary>
- /// <returns>
- /// <c>true</c> if the device is present, otherwise <c>false</c>.
- /// </returns>
- public override bool Detect()
+ public override DetectionResult Detect()
{
try
{
@@ -410,14 +409,20 @@
if (handle != new IntPtr(-1) && handle != IntPtr.Zero)
{
UUIRTClose(handle);
- return true;
+ return DetectionResult.DevicePresent;
}
}
- catch
+ catch (DllNotFoundException)
{
+ return DetectionResult.DeviceNotFound;
}
+ catch (Exception ex)
+ {
+ IrssLog.Error("{0} exception: {1} type: {2}", Name, ex.Message, ex.GetType());
+ return DetectionResult.DeviceException;
+ }
- return false;
+ return DetectionResult.DeviceNotFound;
}
/// <summary>
@@ -513,7 +518,7 @@
{
writer.Formatting = Formatting.Indented;
writer.Indentation = 1;
- writer.IndentChar = (char) 9;
+ writer.IndentChar = (char)9;
writer.WriteStartDocument(true);
writer.WriteStartElement("settings"); // <settings>
@@ -586,7 +591,7 @@
_learnTimedOut = true;
- ((Timer) sender).Stop();
+ ((Timer)sender).Stop();
}
#endregion Implementation
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -174,14 +174,13 @@
#endregion
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
+ /// Detect the presence of this device.
/// </summary>
- /// <returns>
- /// <c>true</c> if the device is present, otherwise <c>false</c>.
- /// </returns>
- public override bool Detect()
+ public override DetectionResult Detect()
{
- return false;
+ // TODO: Add Wii Remote detection
+
+ return DetectionResult.DeviceNotFound;
}
/// <summary>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.cs 2009-07-11 10:56:05 UTC (rev 3003)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.cs 2009-07-11 16:41:50 UTC (rev 3004)
@@ -28,6 +28,7 @@
using System.Windows.Forms;
using System.Xml;
using InputService.Plugin.Properties;
+using IrssUtils;
namespace InputService.Plugin
{
@@ -190,21 +191,24 @@
#endregion
/// <summary>
- /// Detect the presence of this device. Devices that cannot be detected will always return false.
+ /...
[truncated message content] |
|
From: <che...@us...> - 2009-07-12 12:41:47
|
Revision: 3006
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3006&view=rev
Author: chemelli_sf
Date: 2009-07-12 12:41:43 +0000 (Sun, 12 Jul 2009)
Log Message:
-----------
Added x86 platform properly
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Abstractor.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Debug Client.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/IR Blast.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/IR Server.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MacroScope.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Media Center Blaster.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/Sage Setup.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Web Remote.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Commands/Command/Command.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Commands/VariableList/VariableList.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssScheduler/IrssScheduler.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink/ShellLink.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDrive Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Pinnacle Serial Receiver/Pinnacle Serial Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RedEye Blaster/RedEye Blaster.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Speech Receiver/Speech Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Wii Remote Receiver/Wii Remote Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/WiimoteLib.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/IR Server Suite/Input Service/Input Service/Input Service.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Input Service/Input Service Configuration/Configuration.csproj
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Abstractor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Abstractor.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Abstractor.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -42,7 +42,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x86\Debug\</OutputPath>
+ <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
@@ -51,7 +51,7 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>bin\x86\Release\</OutputPath>
+ <OutputPath>bin\Release\</OutputPath>
<Optimize>true</Optimize>
<DebugType>
</DebugType>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{F8CC05AA-6306-459E-BD32-40C02489EFEC}</ProjectGuid>
<OutputType>Exe</OutputType>
@@ -44,6 +44,14 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Debug Client.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{4CD051F4-F2B5-47B3-8647-F47C2E4DC131}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -43,6 +43,14 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -37,6 +37,14 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/IR Blast.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{C6B0CF12-01D3-439A-9FB4-DEFD5B32F6FB}</ProjectGuid>
<OutputType>Exe</OutputType>
@@ -45,6 +45,14 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -45,6 +45,14 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -44,6 +44,14 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Drawing" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/IR Server.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/IR Server.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/IR Server.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -61,6 +61,14 @@
<DocumentationFile>
</DocumentationFile>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="DevAge.Core, Version=4.10.2845.21697, Culture=neutral, PublicKeyToken=faad465d84242dbf, processorArchitecture=MSIL">
<HintPath>SourceGrid\DevAge.Core.dll</HintPath>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -43,6 +43,14 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Drawing" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{58BFF250-541B-4AA4-A62D-ACB819AD317B}</ProjectGuid>
<OutputType>Exe</OutputType>
@@ -34,6 +34,14 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MacroScope.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MacroScope.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MacroScope.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{2F296C09-627B-4D6E-A041-1601A8C030C7}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -38,6 +38,14 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Media Center Blaster.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Media Center Blaster.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Media Center Blaster/Media Center Blaster.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{349D0A5D-BF1F-4E3E-AF92-5A3D54AD1EB4}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -45,6 +45,14 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="MediaState, Version=1.0.1740.26564, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/Sage Setup.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/Sage Setup.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/Sage Setup.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -42,6 +42,14 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -45,6 +45,14 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -45,6 +45,14 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -44,6 +44,14 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D871AB9A-71B3-4D63-8320-084BAD75064E}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -43,6 +43,14 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Web Remote.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Web Remote.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Web Remote.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{CCDBA239-8E8E-4F5F-A098-7132EED5F160}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -42,6 +42,14 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Commands/Command/Command.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Commands/Command/Command.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Commands/Command/Command.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{21E04B17-D850-43E7-AAD3-876C0E062BDB}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -40,6 +40,14 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D1BAC7A9-FFB6-44BA-825F-32506831DC3D}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -40,6 +40,14 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Commands/VariableList/VariableList.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Commands/VariableList/VariableList.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Commands/VariableList/VariableList.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{106A69D2-670C-4DE5-A81C-A3CD5D3F21EB}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -40,6 +40,14 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -46,6 +46,14 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssScheduler/IrssScheduler.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssScheduler/IrssScheduler.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssScheduler/IrssScheduler.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{28098574-D22E-457C-AFFA-560554499EAC}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -36,6 +36,14 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -47,6 +47,14 @@
</DocumentationFile>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink/ShellLink.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink/ShellLink.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink/ShellLink.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -1,7 +1,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{28923F6E-8A68-4BC8-A507-825B09C3F64E}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -72,6 +72,14 @@
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System">
<Name>System</Name>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Ads Tech PTV-335 Receiver/Ads Tech PTV-335 Receiver.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -38,6 +38,14 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Drawing" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{C9DB6BFE-4AA7-43D6-8B5D-3B27A2FA4B1A}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -41,6 +41,14 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Drawing" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0F6576B4-C88E-4E79-B7E9-9480498C5A32}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -42,6 +42,14 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Direct Input Receiver/Direct Input Receiver.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -42,6 +42,14 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.DirectX, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<SpecificVersion>False</SpecificVersion>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -41,6 +41,14 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Girder Plugin/Girder Plugin.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0C291BE9-5D15-4097-9119-4FFE19C23113}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -43,6 +43,14 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/HCW Receiver/HCW Receiver.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{EE8F2C22-8BD3-4832-85F0-E6F67ED3AADB}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -40,6 +40,14 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -43,6 +43,14 @@
<DocumentationFile>
</DocumentationFile>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Drawing" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -38,6 +38,14 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Drawing" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -40,6 +40,14 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Drawing" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{7C686499-7517-4338-8837-7E8617549D9A}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -40,6 +40,14 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -41,6 +41,14 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -42,6 +42,14 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Drawing" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -42,6 +42,14 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Keyboard Input/Keyboard Input.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{26DEDF6D-F60D-4311-9A9E-DDF64500D5BF}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -39,6 +39,14 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Drawing" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDrive Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDrive Receiver.csproj 2009-07-11 17:24:10 UTC (rev 3005)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/LiveDrive Receiver/LiveDrive Receiver.csproj 2009-07-12 12:41:43 UTC (rev 3006)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ...
[truncated message content] |
|
From: <che...@us...> - 2009-07-23 16:10:59
|
Revision: 3026
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3026&view=rev
Author: chemelli_sf
Date: 2009-07-23 16:10:55 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
Rework of MCE transceiver struct to fit both x86 and x64 systems (part I)
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs 2009-07-23 16:07:31 UTC (rev 3025)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs 2009-07-23 16:10:55 UTC (rev 3026)
@@ -2103,6 +2103,12 @@
uint flags);
*/
+ [DllImport("kernel32.dll", SetLastError = true, CallingConvention = CallingConvention.Winapi)]
+ [return: MarshalAs(UnmanagedType.Bool)]
+ public static extern bool IsWow64Process(
+ [In] IntPtr hProcess,
+ [Out] out bool lpSystemInfo);
+
#endregion Interop
#region Methods
@@ -2673,6 +2679,23 @@
return ptr;
}
+ public static bool Check64Bit()
+ {
+ //IsWow64Process is not supported under Windows2000 ( ver 5.0 )
+ int osver = Environment.OSVersion.Version.Major * 10 + Environment.OSVersion.Version.Minor;
+ if (osver <= 50) return false;
+
+ Process p = Process.GetCurrentProcess();
+ IntPtr handle = p.Handle;
+ bool isWow64;
+ bool success = IsWow64Process(handle, out isWow64);
+ if (!success)
+ {
+ throw new Win32Exception();
+ }
+ return isWow64;
+ }
+
#endregion Methods
}
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs 2009-07-23 16:07:31 UTC (rev 3025)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs 2009-07-23 16:10:55 UTC (rev 3026)
@@ -67,6 +67,52 @@
#endregion Notes
+ #region Nested type: Structures size
+
+ private int[] _availableBlastersSize =
+ {
+ // 1 IntPtr
+ 1 * 4,
+ 1 * 8
+ };
+
+ private int[] _deviceCapabilitiesSize =
+ {
+ // 5 IntPtr
+ 5 * 4,
+ 5 * 8
+ };
+
+ private int[] _receiveParamsSize =
+ {
+ // 3 IntPtr
+ 3 * 4,
+ 3 * 8
+ };
+
+ private int[] _startReceiveParamsSize =
+ {
+ // 2 IntPtr
+ 2 * 4,
+ 2 * 8
+ };
+
+ private int[] _transmitChunkSize =
+ {
+ // 3 IntPtr
+ 3 * 4,
+ 3 * 8
+ };
+
+ private int[] _transmitParamsSize =
+ {
+ // 4 IntPtr
+ 4 * 4,
+ 4 * 8
+ };
+
+ #endregion
+
#region Nested type: AvailableBlasters
/// <summary>
@@ -384,6 +430,8 @@
private ReadThreadMode _readThreadModeNext;
private bool _deviceReceiveStarted;
+ private int _isSystem64Bit;
+
#endregion Variables
#region Constructor
@@ -411,12 +459,11 @@
try
{
- structPtr = Marshal.AllocHGlobal(Marshal.SizeOf(structure));
-
+ structPtr = Marshal.AllocHGlobal(_startReceiveParamsSize[_isSystem64Bit]);
Marshal.StructureToPtr(structure, structPtr, false);
int bytesReturned;
- IoControl(IoCtrl.StartReceive, structPtr, Marshal.SizeOf(structure), IntPtr.Zero, 0, out bytesReturned);
+ IoControl(IoCtrl.StartReceive, structPtr, _startReceiveParamsSize[_isSystem64Bit], IntPtr.Zero, 0, out bytesReturned);
}
finally
{
@@ -445,14 +492,14 @@
try
{
- structPtr = Marshal.AllocHGlobal(Marshal.SizeOf(structure));
+ structPtr = Marshal.AllocHGlobal(_deviceCapabilitiesSize[_isSystem64Bit]);
Marshal.StructureToPtr(structure, structPtr, false);
int bytesReturned;
- IoControl(IoCtrl.GetDetails, IntPtr.Zero, 0, structPtr, Marshal.SizeOf(structure), out bytesReturned);
+ IoControl(IoCtrl.GetDetails, IntPtr.Zero, 0, structPtr, _deviceCapabilitiesSize[_isSystem64Bit], out bytesReturned);
- structure = (DeviceCapabilities) Marshal.PtrToStructure(structPtr, typeof (DeviceCapabilities));
+ structure = (DeviceCapabilities)Marshal.PtrToStructure(structPtr, typeof(DeviceCapabilities));
}
finally
{
@@ -469,10 +516,7 @@
_receivePort = receivePort;
int learnPort = FirstHighBit(_learnPortMask);
- if (learnPort != -1)
- _learnPort = learnPort;
- else
- _learnPort = _receivePort;
+ _learnPort = learnPort != -1 ? learnPort : _receivePort;
//DeviceCapabilityFlags flags = (DeviceCapabilityFlags)structure.DetailsFlags.ToInt32();
//_legacyDevice = (int)(flags & DeviceCapabilityFlags.Legacy) != 0;
@@ -501,14 +545,14 @@
try
{
- structPtr = Marshal.AllocHGlobal(Marshal.SizeOf(structure));
+ structPtr = Marshal.AllocHGlobal(_availableBlastersSize[_isSystem64Bit]);
Marshal.StructureToPtr(structure, structPtr, false);
int bytesReturned;
- IoControl(IoCtrl.GetBlasters, IntPtr.Zero, 0, structPtr, Marshal.SizeOf(structure), out bytesReturned);
+ IoControl(IoCtrl.GetBlasters, IntPtr.Zero, 0, structPtr, _availableBlastersSize[_isSystem64Bit], out bytesReturned);
- structure = (AvailableBlasters) Marshal.PtrToStructure(structPtr, typeof (AvailableBlasters));
+ structure = (AvailableBlasters)Marshal.PtrToStructure(structPtr, typeof(AvailableBlasters));
}
finally
{
@@ -540,14 +584,14 @@
else
transmitParams.PulseSize = new IntPtr(carrier);
- transmitParams.Flags = new IntPtr((int) mode);
+ transmitParams.Flags = new IntPtr((int)mode);
TransmitChunk transmitChunk = new TransmitChunk();
transmitChunk.OffsetToNextChunk = new IntPtr(0);
transmitChunk.RepeatCount = new IntPtr(1);
transmitChunk.ByteCount = new IntPtr(irData.Length);
- int bufferSize = irData.Length + Marshal.SizeOf(typeof (TransmitChunk)) + 8;
+ int bufferSize = irData.Length + _transmitChunkSize[_isSystem64Bit] + 8;
byte[] buffer = new byte[bufferSize];
byte[] rawTransmitChunk = RawSerialize(transmitChunk);
@@ -560,7 +604,7 @@
try
{
- structurePtr = Marshal.AllocHGlobal(Marshal.SizeOf(transmitParams));
+ structurePtr = Marshal.AllocHGlobal(_transmitParamsSize[_isSystem64Bit]);
bufferPtr = Marshal.AllocHGlobal(buffer.Length);
Marshal.StructureToPtr(transmitParams, structurePtr, true);
@@ -568,7 +612,7 @@
Marshal.Copy(buffer, 0, bufferPtr, buffer.Length);
int bytesReturned;
- IoControl(IoCtrl.Transmit, structurePtr, Marshal.SizeOf(typeof (TransmitParams)), bufferPtr, bufferSize,
+ IoControl(IoCtrl.Transmit, structurePtr, _transmitParamsSize[_isSystem64Bit], bufferPtr, bufferSize,
out bytesReturned);
}
finally
@@ -608,6 +652,7 @@
DeviceIoOverlapped overlapped = new DeviceIoOverlapped();
overlapped.ClearAndSetEvent(dangerousWaitHandle);
+ IrssUtils.IrssLog.Debug("inBufferSize={0}, outBufferSize={1}", inBufferSize, outBufferSize);
bool deviceIoControl = DeviceIoControl(_eHomeHandle, ioControlCode, inBuffer, inBufferSize, outBuffer,
outBufferSize, out bytesReturned, overlapped.Overlapped);
lastError = Marshal.GetLastWin32Error();
@@ -682,6 +727,9 @@
DebugWriteLine("Device Guid: {0}", _deviceGuid);
DebugWriteLine("Device Path: {0}", _devicePath);
+ _isSystem64Bit = IrssUtils.Win32.Check64Bit() ? 1 : 0;
+ DebugWriteLine("Operating system arch is {0}", _isSystem64Bit == 1 ? "x64" : "x86");
+
_notifyWindow = new NotifyWindow();
_notifyWindow.Create();
_notifyWindow.Class = _deviceGuid;
@@ -829,7 +877,7 @@
int portMask = 0;
// Hardware ports map to bits in mask with Port 1 at left, ascending to right
- switch ((BlasterPort) port)
+ switch ((BlasterPort)port)
{
case BlasterPort.Both:
portMask = _txPortMask;
@@ -877,11 +925,11 @@
int dataIndex = 0;
for (int timeIndex = 0; timeIndex < code.TimingData.Length; timeIndex++)
{
- uint time = (uint) (50 * (int) Math.Round((double) code.TimingData[timeIndex] / 50));
+ uint time = (uint)(50 * (int)Math.Round((double)code.TimingData[timeIndex] / 50));
for (int timeShift = 0; timeShift < 4; timeShift++)
{
- data[dataIndex++] = (byte) (time & 0xFF);
+ data[dataIndex++] = (byte)(time & 0xFF);
time >>= 8;
}
}
@@ -894,7 +942,7 @@
/// </summary>
private void StartReadThread(ReadThreadMode mode)
{
- DebugWriteLine("StartReadThread({0})", Enum.GetName(typeof (ReadThreadMode), mode));
+ DebugWriteLine("StartReadThread({0})", Enum.GetName(typeof(ReadThreadMode), mode));
if (_readThread != null)
{
@@ -905,9 +953,11 @@
_deviceReceiveStarted = false;
_readThreadModeNext = mode;
- _readThread = new Thread(ReadThread);
- _readThread.Name = "MicrosoftMceTransceiver.DriverVista.ReadThread";
- _readThread.IsBackground = true;
+ _readThread = new Thread(ReadThread)
+ {
+ Name = "MicrosoftMceTransceiver.DriverVista.ReadThread",
+ IsBackground = true
+ };
_readThread.Start();
}
@@ -917,10 +967,9 @@
private void RestartReadThread(ReadThreadMode mode)
{
// Alternative to StopReadThread() ... StartReadThread(). Avoids Thread.Abort.
- int numTriesLeft;
_readThreadModeNext = mode;
- numTriesLeft = MaxReadThreadTries;
+ int numTriesLeft = MaxReadThreadTries;
// Simple, optimistic wait for read thread to respond. Has room for improvement, but tends to work first time in practice.
while (_readThreadMode != _readThreadModeNext && numTriesLeft-- != 0)
@@ -976,12 +1025,10 @@
return;
}
- int lastError;
-
_eHomeHandle = CreateFile(_devicePath, CreateFileAccessTypes.GenericRead | CreateFileAccessTypes.GenericWrite,
CreateFileShares.None, IntPtr.Zero, CreateFileDisposition.OpenExisting,
CreateFileAttributes.Overlapped, IntPtr.Zero);
- lastError = Marshal.GetLastWin32Error();
+ int lastError = Marshal.GetLastWin32Error();
if (_eHomeHandle.IsInvalid)
{
_eHomeHandle = null;
@@ -1062,7 +1109,7 @@
try
{
- int receiveParamsSize = Marshal.SizeOf(typeof (ReceiveParams)) + DeviceBufferSize + 8;
+ int receiveParamsSize = _receiveParamsSize[_isSystem64Bit] + DeviceBufferSize + 8;
receiveParamsPtr = Marshal.AllocHGlobal(receiveParamsSize);
ReceiveParams receiveParams = new ReceiveParams();
@@ -1087,11 +1134,11 @@
int bytesRead;
IoControl(IoCtrl.Receive, IntPtr.Zero, 0, receiveParamsPtr, receiveParamsSize, out bytesRead);
- if (bytesRead > Marshal.SizeOf(receiveParams))
+ if (bytesRead > _receiveParamsSize[_isSystem64Bit])
{
int dataSize = bytesRead;
- bytesRead -= Marshal.SizeOf(receiveParams);
+ bytesRead -= _receiveParamsSize[_isSystem64Bit];
byte[] packetBytes = new byte[bytesRead];
byte[] dataBytes = new byte[dataSize];
@@ -1111,10 +1158,10 @@
}
// Determine carrier frequency when learning ...
- if (_readThreadMode == ReadThreadMode.Learning && bytesRead >= Marshal.SizeOf(receiveParams))
+ if (_readThreadMode == ReadThreadMode.Learning && bytesRead >= _receiveParamsSize[_isSystem64Bit])
{
ReceiveParams receiveParams2 =
- (ReceiveParams) Marshal.PtrToStructure(receiveParamsPtr, typeof (ReceiveParams));
+ (ReceiveParams)Marshal.PtrToStructure(receiveParamsPtr, typeof(ReceiveParams));
if (receiveParams2.DataEnd.ToInt32() != 0)
{
@@ -1210,7 +1257,7 @@
private static int GetCarrierPeriod(int carrier)
{
- return (int) Math.Round(1000000.0 / carrier);
+ return (int)Math.Round(1000000.0 / carrier);
}
private static TransmitMode GetTransmitMode(int carrier)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-08-09 17:32:31
|
Revision: 3046
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3046&view=rev
Author: chemelli_sf
Date: 2009-08-09 17:32:25 +0000 (Sun, 09 Aug 2009)
Log Message:
-----------
Removed obsolete code (IRServer application is merged with IRServer service since rev 3010)
Revision Links:
--------------
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3010&view=rev
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
Removed Paths:
-------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Server/
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2009-08-09 16:58:24 UTC (rev 3045)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2009-08-09 17:32:25 UTC (rev 3046)
@@ -11,8 +11,6 @@
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Commands", "Commands", "{F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IR Server", "Applications\IR Server\IR Server.csproj", "{D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tray Launcher", "Applications\Tray Launcher\Tray Launcher.csproj", "{0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debug Client", "Applications\Debug Client\Debug Client.csproj", "{4CD051F4-F2B5-47B3-8647-F47C2E4DC131}"
@@ -135,14 +133,6 @@
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Debug|x86.ActiveCfg = Debug|x86
- {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Debug|x86.Build.0 = Debug|x86
- {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Release|Any CPU.Build.0 = Release|Any CPU
- {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Release|x86.ActiveCfg = Release|x86
- {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA}.Release|x86.Build.0 = Release|x86
{0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}.Debug|x86.ActiveCfg = Debug|x86
@@ -604,7 +594,6 @@
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {D2A1F8D6-A9D3-4BFA-913B-8806642BD0DA} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{0C894165-4BE8-4CF7-8F92-2B6DF68EB43A} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{4CD051F4-F2B5-47B3-8647-F47C2E4DC131} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{A8B8B9C6-9E88-486B-AE9C-F2D945ED05A6} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2009-08-09 20:13:38
|
Revision: 3048
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3048&view=rev
Author: misterd_sf
Date: 2009-08-09 20:13:30 +0000 (Sun, 09 Aug 2009)
Log Message:
-----------
Initial version of FireDTV receiver plugin - Still WiP
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Configure.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Configure.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Configure.resx
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/FireSATControl.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/FireSATDefines.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/FireSATSourceFilterInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTVReceiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Icon.ico
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Properties/
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Properties/Resources.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Properties/Resources.resx
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/ReceiverWindow.cs
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver
___________________________________________________________________
Added: svn:ignore
+ [Bb]in
obj
[Dd]ebug
[Rr]elease
*.user
*.aps
*.eto
Copied: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Configure.Designer.cs (from rev 3043, trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/Configure.Designer.cs)
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Configure.Designer.cs (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Configure.Designer.cs 2009-08-09 20:13:30 UTC (rev 3048)
@@ -0,0 +1,124 @@
+namespace IRServer.Plugin
+{
+ partial class Configure
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.buttonOK = new System.Windows.Forms.Button();
+ this.buttonCancel = new System.Windows.Forms.Button();
+ this.toolTips = new System.Windows.Forms.ToolTip(this.components);
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.labelDevice = new System.Windows.Forms.Label();
+ this.comboBoxDevice = new System.Windows.Forms.ComboBox();
+ this.labelFireDTV = new System.Windows.Forms.Label();
+ this.SuspendLayout();
+ //
+ // buttonOK
+ //
+ this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonOK.Location = new System.Drawing.Point(137, 134);
+ this.buttonOK.Name = "buttonOK";
+ this.buttonOK.Size = new System.Drawing.Size(64, 24);
+ this.buttonOK.TabIndex = 4;
+ this.buttonOK.Text = "OK";
+ this.buttonOK.UseVisualStyleBackColor = true;
+ this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
+ //
+ // buttonCancel
+ //
+ this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.buttonCancel.Location = new System.Drawing.Point(209, 134);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(64, 24);
+ this.buttonCancel.TabIndex = 5;
+ this.buttonCancel.Text = "Cancel";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+ //
+ // labelDevice
+ //
+ this.labelDevice.Location = new System.Drawing.Point(12, 9);
+ this.labelDevice.Name = "labelDevice";
+ this.labelDevice.Size = new System.Drawing.Size(134, 20);
+ this.labelDevice.TabIndex = 6;
+ this.labelDevice.Text = "Please select the device:";
+ this.labelDevice.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // comboBoxDevice
+ //
+ this.comboBoxDevice.FormattingEnabled = true;
+ this.comboBoxDevice.Location = new System.Drawing.Point(15, 35);
+ this.comboBoxDevice.Name = "comboBoxDevice";
+ this.comboBoxDevice.Size = new System.Drawing.Size(258, 21);
+ this.comboBoxDevice.TabIndex = 9;
+ this.comboBoxDevice.SelectedIndexChanged += new System.EventHandler(this.comboBoxDevice_SelectedIndexChanged);
+ //
+ // labelFireDTV
+ //
+ this.labelFireDTV.AutoSize = true;
+ this.labelFireDTV.Location = new System.Drawing.Point(12, 91);
+ this.labelFireDTV.Name = "labelFireDTV";
+ this.labelFireDTV.Size = new System.Drawing.Size(134, 13);
+ this.labelFireDTV.TabIndex = 10;
+ this.labelFireDTV.Text = "FireDTV API Version: 1.1.1";
+ //
+ // Configure
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(281, 167);
+ this.Controls.Add(this.labelFireDTV);
+ this.Controls.Add(this.comboBoxDevice);
+ this.Controls.Add(this.labelDevice);
+ this.Controls.Add(this.buttonCancel);
+ this.Controls.Add(this.buttonOK);
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.MinimumSize = new System.Drawing.Size(256, 164);
+ this.Name = "Configure";
+ this.ShowIcon = false;
+ this.ShowInTaskbar = false;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "FireDTV Configuration";
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Button buttonOK;
+ private System.Windows.Forms.Button buttonCancel;
+ private System.Windows.Forms.ToolTip toolTips;
+ private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.Label labelDevice;
+ private System.Windows.Forms.ComboBox comboBoxDevice;
+ private System.Windows.Forms.Label labelFireDTV;
+ }
+}
\ No newline at end of file
Copied: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Configure.cs (from rev 3043, trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/Configure.cs)
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Configure.cs (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Configure.cs 2009-08-09 20:13:30 UTC (rev 3048)
@@ -0,0 +1,116 @@
+#region Copyright (C) 2005-2009 Team MediaPortal
+
+// Copyright (C) 2005-2009 Team MediaPortal
+// http://www.team-mediaportal.com
+//
+// This Program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// This Program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with GNU Make; see the file COPYING. If not, write to
+// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+// http://www.gnu.org/copyleft/gpl.html
+
+#endregion
+
+using System;
+using System.Windows.Forms;
+
+namespace IRServer.Plugin
+{
+ /// <summary>
+ /// Configure the FireDTV receiver
+ /// </summary>
+ internal partial class Configure : Form
+ {
+ #region variables
+
+ private FireDTVControl fireDTV;
+ private string _deviceName;
+ #endregion variables
+
+ #region Properties
+
+ /// <summary>
+ /// Gets or sets the device name
+ /// </summary>
+ /// <value>Use channel control</value>
+ public string DeviceName
+ {
+ get { return _deviceName; }
+ set
+ {
+ _deviceName = value;
+ }
+ }
+
+ #endregion Properties
+
+ #region Constructor
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="Configure"/> class.
+ /// </summary>
+ public Configure()
+ {
+ InitializeComponent();
+ try
+ {
+ fireDTV = new FireDTVControl((IntPtr)0);
+ labelFireDTV.Text = "FireDTV API Version:"+fireDTV.APIVersion;
+ if (fireDTV.OpenDrivers())
+ {
+ comboBoxDevice.DataSource = fireDTV.SourceFilters;
+ comboBoxDevice.DisplayMember = "FriendlyName";
+ comboBoxDevice.ValueMember = "Name";
+ }
+ if (!string.IsNullOrEmpty(_deviceName))
+ {
+ comboBoxDevice.SelectedValue = _deviceName;
+ }
+ comboBoxDevice.Enabled = true;
+ buttonOK.Enabled = true;
+ labelFireDTV.Visible = true;
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show(e.ToString());
+ labelFireDTV.Visible = false;
+ comboBoxDevice.Enabled = false;
+ buttonOK.Enabled = false;
+ }
+
+ }
+
+ #endregion Constructor
+
+ #region Buttons
+
+ private void buttonOK_Click(object sender, EventArgs e)
+ {
+ if (comboBoxDevice.SelectedValue != null)
+ {
+ _deviceName = comboBoxDevice.SelectedValue.ToString();
+ }
+ DialogResult = DialogResult.OK;
+ Close();
+ }
+
+ private void buttonCancel_Click(object sender, EventArgs e)
+ {
+ DialogResult = DialogResult.Cancel;
+ Close();
+ }
+
+
+ #endregion Buttons
+
+ }
+}
\ No newline at end of file
Copied: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Configure.resx (from rev 3043, trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/X10 Transceiver/Configure.resx)
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Configure.resx (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/Configure.resx 2009-08-09 20:13:30 UTC (rev 3048)
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>107, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj 2009-08-09 20:13:30 UTC (rev 3048)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{D88EDBC1-D583-4149-9873-8239FA63F4FE}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>IRServer.Plugin</RootNamespace>
+ <AssemblyName>FireDTV Receiver</AssemblyName>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <TargetFrameworkSubset>
+ </TargetFrameworkSubset>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <DocumentationFile>bin\Debug\FireDTV Receiver.XML</DocumentationFile>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>
+ </DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <DocumentationFile>bin\Release\FireDTV Receiver.XML</DocumentationFile>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Configure.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Configure.Designer.cs">
+ <DependentUpon>Configure.cs</DependentUpon>
+ </Compile>
+ <Compile Include="FireDTV interfaces\FireSATControl.cs" />
+ <Compile Include="FireDTV interfaces\FireSATDefines.cs" />
+ <Compile Include="FireDTV interfaces\FireSATSourceFilterInfo.cs" />
+ <Compile Include="FireDTVReceiver.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <Compile Include="ReceiverWindow.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
+ <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
+ <Name>IrssUtils</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
+ <Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
+ <Name>IR Server Plugin Interface</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Configure.resx">
+ <DependentUpon>Configure.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Properties\Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="Icon.ico" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/FireSATControl.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/FireSATControl.cs (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/FireSATControl.cs 2009-08-09 20:13:30 UTC (rev 3048)
@@ -0,0 +1,352 @@
+#region Copyright (C) 2005-2009 Team MediaPortal
+
+/*
+ * Copyright (C) 2005-2009 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+#region Usings
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+
+#endregion
+
+namespace IRServer.Plugin
+{
+ /// <summary>
+ /// Summary description for FireDTVControl.
+ /// </summary>
+ public class FireDTVControl
+ {
+ /// <summary>
+ /// The SetDllDirectory function adds a directory to the search path used to locate DLLs for the application.
+ /// http://msdn.microsoft.com/library/en-us/dllproc/base/setdlldirectory.asp
+ /// </summary>
+ /// <param name="pathName">Pointer to a null-terminated string that specifies the directory to be added to the search path.</param>
+ /// <returns></returns>
+ [DllImport("kernel32.dll")]
+ private static extern bool SetDllDirectory(
+ string pathName);
+
+ #region Constructor / Destructor
+
+ /// <summary>
+ /// Try to locate the FireDTV API library and initialise the library.
+ /// </summary>
+ /// <param name="windowHandle"></param>
+ public FireDTVControl(IntPtr windowHandle)
+ {
+ try
+ {
+ string prgPath = Environment.GetEnvironmentVariable("ProgramW6432");
+ if (string.IsNullOrEmpty(prgPath))
+ {
+ prgPath = Environment.GetEnvironmentVariable("ProgramFiles");
+ }
+
+ // Look for Digital Everywhere's software which uses a hardcoded path
+ string fullDllPath = Path.Combine(prgPath, @"FireDTV\Tools\FiresatApi.dll");
+ if (!File.Exists(fullDllPath))
+ {
+ throw new FileNotFoundException("Could not FireSATApi.dll");
+ }
+
+ try
+ {
+ SetDllDirectory(Path.GetDirectoryName(fullDllPath));
+ }
+ catch (Exception)
+ {
+ throw new FileNotFoundException("FireDTV: Trying to enable FireDTV remote but failed to set its path.");
+ }
+ }
+ catch (Exception)
+ {
+ throw new FileNotFoundException("FireDTV: Trying to enable FireDTV remote but failed");
+ }
+
+ _windowHandle = windowHandle;
+
+ // initialise the library
+ InitializeLibrary();
+ RegisterGeneralNotifications();
+ }
+
+ /// <summary>
+ /// Default contructer should not be called.
+ /// </summary>
+ private FireDTVControl()
+ {
+ }
+
+
+ ~FireDTVControl()
+ {
+ CloseDrivers();
+ }
+
+ #endregion
+
+ #region Private Methods
+
+ #region Initialization
+
+ [DebuggerStepThrough]
+ internal void InitializeLibrary()
+ {
+ if (!LibrayInitialized)
+ {
+ try
+ {
+ uint returnCode = FireDTVAPI.FS_Initialize();
+ if ((FireDTVConstants.FireDTVStatusCodes)returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVInitializationException("Initilization Failure (" + returnCode.ToString() + ")");
+ }
+ LibrayInitialized = true;
+ }
+ catch (Exception e)
+ {
+ throw new InvalidOperationException("FireDTV: error initializing "+ e.Message);
+ }
+ }
+ }
+
+ #endregion
+
+ #region FireDTV Open/Close Device
+
+ internal uint OpenWDMDevice(int deviceIndex)
+ {
+ uint DeviceHandle;
+ uint returnCode = FireDTVAPI.FS_OpenWDMDeviceHandle((uint)deviceIndex, out DeviceHandle);
+ if ((FireDTVConstants.FireDTVStatusCodes)returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVDeviceOpenException((FireDTVConstants.FireDTVStatusCodes)returnCode, "Open WDM Device Error!");
+ }
+ return DeviceHandle;
+ }
+
+ internal uint OpenBDADevice(int deviceIndex)
+ {
+ uint DeviceHandle;
+ uint returnCode = FireDTVAPI.FS_OpenBDADeviceHandle((uint)deviceIndex, out DeviceHandle);
+ if ((FireDTVConstants.FireDTVStatusCodes)returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVDeviceOpenException((FireDTVConstants.FireDTVStatusCodes)returnCode, "Open BDA Device Error!");
+ }
+ return DeviceHandle;
+ }
+
+ internal void CloseFireDTVHandle(FireDTVSourceFilterInfo currentSourceFilter)
+ {
+ try
+ {
+ uint returnCode = FireDTVAPI.FS_CloseDeviceHandle(currentSourceFilter.Handle);
+ if ((FireDTVConstants.FireDTVStatusCodes)returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVException((FireDTVConstants.FireDTVStatusCodes)returnCode, "Device Close Failure");
+ }
+ }
+ catch (Exception)
+ {
+ }
+ }
+
+ internal int getWDMCount()
+ {
+ try
+ {
+ uint WDMCount;
+ uint returnCode = FireDTVAPI.FS_GetNumberOfWDMDevices(out WDMCount);
+ if ((FireDTVConstants.FireDTVStatusCodes)returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVException((FireDTVConstants.FireDTVStatusCodes)returnCode, "Unable to WDM Driver Count");
+ }
+ return (int)WDMCount;
+ }
+ catch (Exception ex)
+ {
+ throw new InvalidOperationException("FireSATControl: Error getting WDM Devices "+ ex.Message);
+ }
+ }
+
+ internal int getBDACount()
+ {
+ try
+ {
+ uint BDACount;
+ uint returnCode = FireDTVAPI.FS_GetNumberOfBDADevices(out BDACount);
+ if ((FireDTVConstants.FireDTVStatusCodes)returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVException((FireDTVConstants.FireDTVStatusCodes)returnCode, "Unable to BDA Driver Count");
+ }
+ return (int)BDACount;
+ }
+ catch (Exception ex)
+ {
+ throw new InvalidOperationException("FireSATControl: Error getting BDA Devices " + ex.Message);
+ }
+ }
+
+ #endregion
+
+ #region FireDTV Register Notifications
+
+ internal void UnRegisterNotifications(uint widowHandle)
+ {
+ if (NotificationsRegistered)
+ {
+ uint returnCode = FireDTVAPI.FS_UnregisterNotifications(widowHandle);
+ if ((FireDTVConstants.FireDTVStatusCodes)returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVException((FireDTVConstants.FireDTVStatusCodes)returnCode,
+ "Unable to unRegister Notifiations");
+ }
+ NotificationsRegistered = false;
+ }
+ }
+
+ [DebuggerStepThrough]
+ internal void RegisterGeneralNotifications()
+ {
+ if (!NotificationsRegistered)
+ {
+ try
+ {
+ uint returnCode = FireDTVAPI.FS_RegisterGeneralNotifications((int)WindowsHandle);
+ if ((FireDTVConstants.FireDTVStatusCodes)returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVException((FireDTVConstants.FireDTVStatusCodes)returnCode,
+ "Unable to Register General Notifiations");
+ }
+ NotificationsRegistered = true;
+ }
+ catch (Exception)
+ {
+ }
+ }
+ }
+
+ #endregion
+
+ #endregion
+
+ #region Private Variables
+
+ private bool LibrayInitialized = false;
+ private bool NotificationsRegistered = false;
+ private IntPtr _windowHandle = (IntPtr)0;
+ private SourceFilterCollection _sourceFilterCollection = new SourceFilterCollection();
+
+ #endregion
+
+ #region Properties
+
+ public SourceFilterCollection SourceFilters
+ {
+ get { return _sourceFilterCollection; }
+ set { _sourceFilterCollection = value; }
+ }
+
+ /// <summary>
+ /// Get the API version of the FireDTV libary
+ /// </summary>
+ public string APIVersion
+ {
+ get { return Marshal.PtrToStringAnsi(FireDTVAPI.FS_GetApiVersion()); }
+ }
+
+ public IntPtr WindowsHandle
+ {
+ get
+ {
+ if (_windowHandle == (IntPtr)0)
+ {
+ return (IntPtr)FireDTVAPI.GetActiveWindow();
+ }
+ else
+ {
+ return _windowHandle;
+ }
+ }
+ }
+
+ #endregion
+
+ #region Public Methods
+
+ /// <summary>
+ /// Open the communication channels with the FireDTV's.
+ /// </summary>
+ /// <returns>true if success</returns>
+ public bool OpenDrivers()
+ {
+ if (!LibrayInitialized)
+ {
+ return false;
+ }
+
+ int BDADriverCount = getBDACount();
+ int WDMDriverCount = getWDMCount();
+
+ for (int BDACount = 0; BDACount < BDADriverCount; BDACount++)
+ {
+ FireDTVSourceFilterInfo bdaSourceFilter = new FireDTVSourceFilterInfo(OpenBDADevice(BDACount), _windowHandle);
+ _sourceFilterCollection.Add(bdaSourceFilter);
+ }
+
+ for (int WDMCount = 0; WDMCount < WDMDriverCount; WDMCount++)
+ {
+ FireDTVSourceFilterInfo wdmSourceFilter = new FireDTVSourceFilterInfo(OpenWDMDevice(WDMCount), _windowHandle);
+ _sourceFilterCollection.Add(wdmSourceFilter);
+ }
+ return true;
+ }
+
+ public void CloseDrivers()
+ {
+ for (int DeviceCount = 0; DeviceCount < SourceFilters.Count; DeviceCount++)
+ {
+ FireDTVSourceFilterInfo SourceFilter = SourceFilters.Item(DeviceCount);
+ _sourceFilterCollection.RemoveAt(DeviceCount);
+ }
+ }
+
+ public bool StopRemoteControlSupport()
+ {
+ foreach (FireDTVSourceFilterInfo SourceFilter in _sourceFilterCollection)
+ {
+ if (SourceFilter.RemoteRunning)
+ {
+ SourceFilter.StopFireDTVRemoteControlSupport();
+ return SourceFilter.RemoteRunning;
+ }
+ }
+ return false;
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/FireSATDefines.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/FireSATDefines.cs (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/FireSATDefines.cs 2009-08-09 20:13:30 UTC (rev 3048)
@@ -0,0 +1,390 @@
+#region Copyright (C) 2005-2009 Team MediaPortal
+
+/*
+ * Copyright (C) 2005-2009 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
+using System.Text;
+
+namespace IRServer.Plugin
+{
+ public class FireDTVConstants
+ {
+ #region Constants
+
+ public const int WM_USER = 0x0400;
+
+ #endregion
+
+ #region FireDTV Enumeration
+
+ public enum FireDTVWindowMessages
+ {
+ DeviceAttached = WM_USER + 1,
+ DeviceDetached = WM_USER + 2,
+ DeviceChanged = WM_USER + 3,
+ CIModuleInserted = WM_USER + 4,
+ CIModuleReady = WM_USER + 5,
+ CIModuleRemoved = WM_USER + 6,
+ CIMMI = WM_USER + 7,
+ CIDateTime = WM_USER + 8,
+ CIPMTReply = WM_USER + 9,
+ RemoteControlEvent = WM_USER + 10
+ }
+
+ public enum FireDTVStatusCodes
+ {
+ Success = 0,
+ Error = 1,
+ InvalidDeviceHandle = 2,
+ InvalidValue = 3,
+ AlreadyInUse = 4,
+ NotSuppotedByTuner = 5,
+ } ;
+
+ #endregion
+
+ #region Structs
+
+ public struct FireDTV_DRIVER_VERSION
+ {
+ [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)] public byte[] DriverVersion;
+ }
+
+ [StructLayout(LayoutKind.Sequential)]
+ public struct FireDTV_FIRMWARE_VERSION
+ {
+ public byte uHWMajor;
+ public byte uHWMiddle;
+ public byte uHWMinor;
+ public byte uSWMajor;
+ public byte uSWMiddle;
+ public byte uSWMinor;
+ public byte uBuildNrMSB;
+ public byte uBuildNrLSB;
+ }
+
+ [StructLayout(LayoutKind.Sequential)]
+ public struct FireDTV_SYSTEM_INFO
+ {
+ public byte uNrAntennas; //0-3
+ public byte uAntennaInfo; //ANTENNA_FIX, ANTENNA_MOVABLE, ANTENNA_MOBIL
+ public byte uSystem; //
+ public byte uTransport; //TRANSPORT_SATELLITE, TRANSPORT_CABLE, TRANSPORT_TERRESTRIAL
+ public bool bLists;
+ }
+
+ #endregion
+ }
+
+ #region FireDTV Exception Class
+
+ public class FireDTVException : Exception
+ {
+ public FireDTVException()
+ {
+ }
+
+ public FireDTVException(string message)
+ : base(message)
+ {
+ }
+
+ public FireDTVException(SerializationInfo info, StreamingContext context)
+ : base(info, context)
+ {
+ }
+
+ public FireDTVException(FireDTVConstants.FireDTVStatusCodes status, string message)
+ {
+ friendlyMessage = message;
+ statusCode = status;
+ }
+
+
+ private FireDTVConstants.FireDTVStatusCodes statusCode;
+ private string friendlyMessage;
+
+ public FireDTVConstants.FireDTVStatusCodes StatusCode
+ {
+ get { return statusCode; }
+ }
+
+ public override string Message
+ {
+ get
+ {
+ if (friendlyMessage != string.Empty)
+ {
+ return friendlyMessage;
+ }
+ else
+ {
+ switch (statusCode)
+ {
+ case FireDTVConstants.FireDTVStatusCodes.AlreadyInUse:
+ return "DEVICE ALREADY IN USE!";
+
+
+ case FireDTVConstants.FireDTVStatusCodes.Error:
+ return "STATUS ERROR!";
+
+
+ case FireDTVConstants.FireDTVStatusCodes.InvalidDeviceHandle:
+ return "INVALID DEVICE HANDLE!";
+
+
+ case FireDTVConstants.FireDTVStatusCodes.InvalidValue:
+ return "INVALID VALUE!";
+
+
+ case FireDTVConstants.FireDTVStatusCodes.NotSuppotedByTuner:
+ return "NOT SUPPORTED BY TUNER!";
+
+
+ default:
+ return base.Message;
+ }
+ }
+ }
+ }
+ }
+
+ public class FireDTVInitializationException : FireDTVException
+ {
+ public FireDTVInitializationException()
+ {
+ }
+
+ public FireDTVInitializationException(string message)
+ : base(message)
+ {
+ }
+
+ public FireDTVInitializationException(SerializationInfo info, StreamingContext context)
+ : base(info, context)
+ {
+ }
+ }
+
+ public class FireDTVDeviceOpenException : FireDTVException
+ {
+ public FireDTVDeviceOpenException()
+ {
+ }
+
+ public FireDTVDeviceOpenException(string message)
+ : base(message)
+ {
+ }
+
+ public FireDTVDeviceOpenException(SerializationInfo info, StreamingContext context)
+ : base(info, context)
+ {
+ }
+
+ public FireDTVDeviceOpenException(FireDTVConstants.FireDTVStatusCodes status, string message)
+ : base(status, message)
+ {
+ }
+ }
+
+ #endregion
+
+ /// <summary>
+ /// Summary description for FireDTVDefines.
+ /// </summary>
+ public class FireDTVAPI
+ {
+ #region FireDTV API Imports
+
+ [DllImport("FireSATApi.dll",
+ EntryPoint = "?FS_Initialize@@YAKXZ",
+ PreserveSig = false,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern uint FS_Initialize();
+
+ [DllImport("FireSATApi.dll",
+ EntryPoint = "?FS_RegisterGeneralNotifications@@YAKPAUHWND__@@@Z",
+ SetLastError = true,
+ CharSet = CharSet.Unicode,
+ ExactSpelling = true,
+ PreserveSig = false,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern uint FS_RegisterGeneralNotifications(int hWnd);
+
+ [DllImport("FireSATApi.dll",
+ EntryPoint = "?FS_GetNumberOfWDMDevices@@YAKPAK@Z",
+ SetLastError = true,
+ CharSet = CharSet.Unicode,
+ ExactSpelling = true,
+ PreserveSig = false,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern uint FS_GetNumberOfWDMDevices(out uint puNumberOfWDMDevices);
+
+ [DllImport("FireSATApi.dll",
+ EntryPoint = "?FS_GetNumberOfBDADevices@@YAKPAK@Z",
+ SetLastError = true,
+ CharSet = CharSet.Unicode,
+ ExactSpelling = true,
+ PreserveSig = false,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern uint FS_GetNumberOfBDADevices(out uint puNumberOfWDMDevices);
+
+ [DllImport("FireSATApi.dll",
+ EntryPoint = "?FS_OpenWDMDeviceHandle@@YAKKPAK@Z",
+ SetLastError = true,
+ CharSet = CharSet.Ansi,
+ ExactSpelling = true,
+ PreserveSig = false,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern uint FS_OpenWDMDeviceHandle(uint uWDMDeviceNumber, out uint pDeviceHandle);
+
+ [DllImport("FireSATApi.dll",
+ EntryPoint = "?FS_OpenBDADeviceHandle@@YAKKPAK@Z",
+ SetLastError = true,
+ CharSet = CharSet.Ansi,
+ ExactSpelling = true,
+ PreserveSig = false,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern uint FS_OpenBDADeviceHandle(uint uBDADeviceNumber, out uint DeviceHandle);
+
+ [DllImport("FireSATApi.dll",
+ EntryPoint = "?FS_CloseDeviceHandle@@YAKK@Z",
+ SetLastError = true,
+ CharSet = CharSet.Ansi,
+ ExactSpelling = true,
+ PreserveSig = false,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern uint FS_CloseDeviceHandle(uint DeviceHandle);
+
+ [DllImport("FireSATApi.dll",
+ EntryPoint = "?FS_RegisterNotifications@@YAKKPAUHWND__@@@Z",
+ SetLastError = true,
+ CharSet = CharSet.Ansi,
+ ExactSpelling = true,
+ PreserveSig = false,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern uint FS_RegisterNotifications(uint DeviceHandle, int hWnd);
+
+ [DllImport("FireSATApi.dll",
+ EntryPoint = "?FS_UnregisterNotifications@@YAKK@Z",
+ SetLastError = true,
+ CharSet = CharSet.Ansi,
+ ExactSpelling = true,
+ PreserveSig = false,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern uint FS_UnregisterNotifications(uint DeviceHandle);
+
+ [DllImport("FireSATApi.dll",
+ EntryPoint = "?FS_GetApiVersion@@YAPADXZ",
+ SetLastError = true,
+ CharSet = CharSet.Ansi,
+ ExactSpelling = true,
+ PreserveSig = true,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern IntPtr FS_GetApiVersion();
+
+ [DllImport("FireSATApi.dll",
+ EntryPoint = "?FS_GetFriendlyString@@YAKKPAPAD@Z",
+ SetLastError = true,
+ CharSet = CharSet.Ansi,
+ ExactSpelling = true,
+ PreserveSig = true,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern uint FS_GetFriendlyString(uint deviceHandle, out string friendlyName);
+
+ [DllImport("FireSATApi.dll",
+ EntryPoint = "?FS_GetDisplayString@@YAKKPAD@Z",
+ SetLastError = true,
+ CharSet = CharSet.Ansi,
+ ExactSpelling = true,
+ PreserveSig = true,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern uint FS_GetDisplayString(uint DeviceHandle, StringBuilder strDisplayName);
+
+ [DllImport("FireSATApi.dll",
+ EntryPoint = "?FS_GetGUIDString@@YAKKPAD@Z",
+ SetLastError = true,
+ CharSet = CharSet.Ansi,
+ ExactSpelling = true,
+ PreserveSig = false,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern uint FS_GetGUIDString(uint DeviceHandle, StringBuilder strGUIDName);
+
+ [DllImport("FiresatApi.dll",
+ EntryPoint = "?FS_GetDriverVersion@@YAKKPAU_FIRESAT_DRIVER_VERSION@@@Z",
+ SetLastError = true,
+ CharSet = CharSet.Ansi,
+ ExactSpelling = true,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern uint FS_GetDriverVersion(uint DeviceHandle,
+ ref FireDTVConstants.FireDTV_DRIVER_VERSION pDriverVersion);
+
+ [DllImport("FireSATApi.dll",
+ EntryPoint = "?FS_GetFirmwareVersion@@YAKKPAU_FIRESAT_FIRMWARE_VERSION@@@Z",
+ SetLastError = true,
+ CharSet = CharSet.Ansi,
+ ExactSpelling = true,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern uint FS_GetFirmwareVersion(uint DeviceHandle,
+ ref FireDTVConstants.FireDTV_FIRMWARE_VERSION Version);
+
+ [DllImport("FiresatApi.dll",
+ EntryPoint = "?FS_GetSystemInfo@@YAKKPAU_FIRESAT_SYSTEM_INFO@@@Z",
+ SetLastError = true,
+ CharSet = CharSet.Ansi,
+ ExactSpelling = true,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern uint FS_GetSystemInfo(uint DeviceHandle, ref FireDTVConstants.FireDTV_SYSTEM_INFO pSystemInfo);
+
+ [DllImport("FireSATApi.dll",
+ EntryPoint = "?FS_RemoteControl_Start@@YAKK@Z",
+ SetLastError = true,
+ CharSet = CharSet.Ansi,
+ ExactSpelling = true,
+ PreserveSig = false,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern uint FS_RemoteControl_Start(uint DeviceHandle);
+
+ [DllImport("FireSATApi.dll",
+ EntryPoint = "?FS_RemoteControl_Stop@@YAKK@Z",
+ SetLastError = true,
+ CharSet = CharSet.Ansi,
+ ExactSpelling = true,
+ PreserveSig = false,
+ CallingConvention = CallingConvention.StdCall)]
+ public static extern uint FS_RemoteControl_Stop(uint DeviceHandle);
+
+ #endregion
+
+ #region Win32 API Imports
+
+ [DllImport("user32.dll", CharSet = CharSet.Ansi)]
+ public static extern int GetActiveWindow();
+
+ #endregion
+ } ;
+}
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/FireSATSourceFilterInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/FireSATSourceFilterInfo.cs (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV interfaces/FireSATSourceFilterInfo.cs 2009-08-09 20:13:30 UTC (rev 3048)
@@ -0,0 +1,364 @@
+#region Copyright (C) 2005-2009 Team MediaPortal
+
+/*
+ * Copyright (C) 2005-2009 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+#region Usings
+
+using System;
+using System.Collections;
+using System.Text;
+
+#endregion
+
+namespace IRServer.Plugin
+{
+ public class FireDTVSourceFilterInfo
+ {
+ public FireDTVSourceFilterInfo(uint deviceHandle, IntPtr activeWindow)
+ {
+ _windowHandle = activeWindow;
+ _handle = deviceHandle;
+
+ StringBuilder displayName = new StringBuilder(256);
+ uint returnCode = FireDTVAPI.FS_GetDisplayString(Handle, displayName);
+ if ((FireDTVConstants.FireDTVStatusCodes) returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVException((FireDTVConstants.FireDTVStatusCodes) returnCode,
+ "Unable to get Device Display Name!");
+ }
+ _name = displayName.ToString();
+
+ StringBuilder GuidString = new StringBuilder(256);
+ returnCode = FireDTVAPI.FS_GetGUIDString(Handle, GuidString);
+ if ((FireDTVConstants.FireDTVStatusCodes) returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVException((FireDTVConstants.FireDTVStatusCodes) returnCode, "Unable to get GUID String!");
+ }
+ _GUID = GuidString.ToString();
+
+ string DriverFriend;
+ returnCode = FireDTVAPI.FS_GetFriendlyString(Handle, out DriverFriend);
+ if ((FireDTVConstants.FireDTVStatusCodes) returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVException((FireDTVConstants.FireDTVStatusCodes) returnCode,
+ "Unable to get Device Friendly Name!");
+ }
+ _friendlyName = DriverFriend;
+
+ FireDTVConstants.FireDTV_DRIVER_VERSION version = new FireDTVConstants.FireDTV_DRIVER_VERSION();
+ returnCode = FireDTVAPI.FS_GetDriverVersion(Handle, ref version);
+ if ((FireDTVConstants.FireDTVStatusCodes) returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVException((FireDTVConstants.FireDTVStatusCodes) returnCode, "Unable to get Driver Version!");
+ }
+ _driverVersion = Encoding.ASCII.GetString(version.DriverVersion);
+
+ returnCode = FireDTVAPI.FS_GetFirmwareVersion(Handle, ref _firmwareVersion);
+ if ((FireDTVConstants.FireDTVStatusCodes) returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVException((FireDTVConstants.FireDTVStatusCodes) returnCode,
+ "Unable to get Firmware Hardware Version!");
+ }
+
+ returnCode = FireDTVAPI.FS_GetSystemInfo(Handle, ref _systemInfo);
+ if ((FireDTVConstants.FireDTVStatusCodes) returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVException((FireDTVConstants.FireDTVStatusCodes) returnCode, "Unable to get System Information!");
+ }
+
+
+ RegisterNotifications();
+ }
+
+ ~FireDTVSourceFilterInfo()
+ {
+ Close();
+ }
+
+ public void Close()
+ {
+ if (_handle != 0)
+ {
+ if (_remoteRunning)
+ {
+ StopFireDTVRemoteControlSupport();
+ }
+
+ if (_notificationRegistered)
+ {
+ UnRegisterNotifications();
+ }
+
+ CloseFireDTVHandle();
+ }
+ }
+
+ #region Private variables
+
+ private uint _handle;
+ private string _name;
+ private string _friendlyName;
+ private string _GUID;
+ private string _driverVersion;
+ private IntPtr _windowHandle = (IntPtr) 0;
+ private bool _remoteRunning = false;
+ private bool _notificationRegistered = false;
+
+ private FireDTVConstants.FireDTV_FIRMWARE_VERSION _firmwareVersion = new FireDTVConstants.FireDTV_FIRMWARE_VERSION();
+ private FireDTVConstants.FireDTV_SYSTEM_INFO _systemInfo = new FireDTVConstants.FireDTV_SYSTEM_INFO();
+ //IBaseFilter *pFilter;
+
+ #endregion
+
+ #region Properties
+
+ public string Name
+ {
+ get { return _name; }
+ }
+
+ public string GUID
+ {
+ get { return _GUID; }
+ }
+
+ public uint Handle
+ {
+ get { return _handle; }
+ set { _handle = value; }
+ }
+
+ public string FriendlyName
+ {
+ get { return _friendlyName; }
+ }
+
+ public bool RemoteRunning
+ {
+ get { return _remoteRunning; }
+ }
+
+ public IntPtr WindowHandle
+ {
+ get
+ {
+ if (_windowHandle == (IntPtr) 0)
+ {
+ return (IntPtr) FireDTVAPI.GetActiveWindow();
+ }
+ else
+ {
+ return _windowHandle;
+ }
+ }
+ }
+
+ #endregion
+
+ /// <summary>
+ /// ToString() for debugging and logging.
+ /// </summary>
+ /// <returns></returns>
+ public override String ToString()
+ {
+ return String.Format("SourceFilter: handle[{0}],name[{1}],friendly[{2}],GUID[{3}],version[{4}]",
+ _handle, _name, _friendlyName, _GUID, _driverVersion);
+ }
+
+ #region FireDTV Close Device
+
+ internal void CloseFireDTVHandle()
+ {
+ uint returnCode = FireDTVAPI.FS_CloseDeviceHandle(Handle);
+ if ((FireDTVConstants.FireDTVStatusCodes) returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVException((FireDTVConstants.FireDTVStatusCodes) returnCode, "Device Close Failure");
+ }
+ _handle = 0;
+ }
+
+ #endregion
+
+ #region FireDTV Register Notifications
+
+ public void RegisterNotifications()
+ {
+ uint returnCode = FireDTVAPI.FS_RegisterNotifications(Handle, (int) this.WindowHandle);
+ if ((FireDTVConstants.FireDTVStatusCodes) returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVException((FireDTVConstants.FireDTVStatusCodes) returnCode, "Unable to Register Notifiations");
+ }
+ _notificationRegistered = true;
+ }
+
+ public void UnRegisterNotifications()
+ {
+ uint returnCode = FireDTVAPI.FS_UnregisterNotifications(Handle);
+ if ((FireDTVConstants.FireDTVStatusCodes) returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVException((FireDTVConstants.FireDTVStatusCodes) returnCode, "Unable to unRegister Notifiations");
+ }
+ _notificationRegistered = false;
+ }
+
+ #endregion
+
+ #region Remote Control Management
+
+ public void StartFireDTVRemoteControlSupport()
+ {
+ uint returnCode = FireDTVAPI.FS_RemoteControl_Start(Handle);
+ if ((FireDTVConstants.FireDTVStatusCodes) returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVException((FireDTVConstants.FireDTVStatusCodes) returnCode, "Unable to Start RC Support");
+ }
+ _remoteRunning = true;
+ }
+
+ public void StopFireDTVRemoteControlSupport()
+ {
+ uint returnCode = FireDTVAPI.FS_RemoteControl_Stop(Handle);
+ if ((FireDTVConstants.FireDTVStatusCodes) returnCode != FireDTVConstants.FireDTVStatusCodes.Success)
+ {
+ throw new FireDTVException((FireDTVConstants.FireDTVStatusCodes) returnCode, "Unable to Stop RC Support");
+ }
+ _remoteRunning = true;
+ }
+
+ #endregion
+ }
+
+ /// <summary>
+ /// Strongly typed collection of FireDTVSourceFilters
+ /// </summary>
+ public class SourceFilterCollection : CollectionBase
+ {
+ public void Add(FireDTVSourceFilterInfo sourceFilter)
+ {
+ foreach (FireDTVSourceFilterInfo srcFilter in List)
+ {
+ if (srcFilter.Name == sourceFilter.Name)
+ {
+ sourceFilter.Close();
+ return;
+ }
+ }
+ List.Add(sourceFilter);
+ }
+
+ /// <summary>
+ /// Remove a FilterSource but first close it.
+ /// </summary>
+ /// <param name="index">index of the filter</param>
+ public new void RemoveAt(int index)
+ {
+ if (index > List.Count - 1 || index < 0)
+ {
+ throw new IndexOutOfRangeException("Source Filter Index out of Bounds");
+ }
+ else
+ {
+ ((FireDTVSourceFilterInfo) List[index]).Close();
+ List.RemoveAt(index);
+ }
+ }
+
+ /// <summary>
+ /// Remove a FilterSource, but first close it.
+ /// </summary>
+ /// <param name="index">index of the filter</param>
+ public void RemoveByHandle(uint deviceHandle)
+ {
+ foreach (FireDTVSourceFilterInfo sourceFilter in List)
+ {
+ if (sourceFilter.Handle == deviceHandle)
+ {
+ List.Remove(sourceFilter);
+ }
+ }
+ // TODO <THROW ERROR>
+ }
+
+ public FireDTVSourceFilterInfo Item(int index)
+ {
+ if (index > List.Count - 1 || index < 0)
+ {
+ throw new IndexOutOfRangeException("Source Filter Index out of Bounds");
+ }
+ else
+ {
+ return (FireDTVSourceFilterInfo) List[index];
+ }
+ }
+
+ public FireDTVSourceFilterInfo ItemByHandle(uint deviceHandle)
+ {
+ foreach (FireDTVSourceFilterInfo sourceFilter in List)
+ {
+ if (sourceFilter.Handle == deviceHandle)
+ {
+ return sourceFilter;
+ }
+ }
+ return null;
+ }
+
+ public FireDTVSourceFilterInfo ItemByName(string displayString)
+ {
+ foreach (FireDTVSourceFilterInfo SourceFilter in List)
+ {
+ if (SourceFilter.Name == displayString)
+ {
+ return SourceFilter;
+ }
+ }
+ return null;
+ }
+
+ public FireDTVSourceFilterInfo ItemByGUID(string guidString)
+ {
+ foreach (FireDTVSourceFilterInfo SourceFilter in List)
+ {
+ if (SourceFilter.GUID == guidString)
+ {
+ return SourceFilter;
+ }
+ }
+ return null;
+ }
+
+ public int IndexByHandle(uint deviceHandle)
+ {
+ for (int iIndex = 0; iIndex < List.Count; iIndex++)
+ {
+ FireDTVSourceFilterInfo SourceFilter = Item(iIndex);
+ if (SourceFilter.Handle == deviceHandle)
+ {
+ return iIndex;
+ }
+ }
+ return -1;
+ }
+ }
+}
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTVReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTVReceiver.cs (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTVReceiver.cs 2009-08-09 20:13:30 UTC (rev 3048)
@@ -0,0 +1,300 @@
+#region Copyright (C) 2005-2009 Team MediaPortal
+
+// Copyright (C) 2005-2009 Team MediaPortal
+// http://www.team-mediaportal.com
+//
+// This Program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// This Program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with GNU Make; see the file COPYING. If not, write to
+// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+// http://www.gnu.org/copyleft/gpl.html
+
+#endregion
+
+using System;
+using System.Drawing;
+using System.IO;
+using System.Text;
+using System.Windows.Forms;
+using System.Xml;
+using IRServer.Plugin.Properties;
+using IrssUtils;
+
+namespace IRServer.Plugin
+{
+ /// <summary>
+ /// IR Server Plugin for X10 Transceiver devices.
+ /// </summary>
+ public class FireDTVReceiver : PluginBase, IRemoteReceiver, IConfigure
+ {
+ #region Constants
+
+ private static readonly string ConfigurationFile = Path.Combine(ConfigurationPath, "FireDTV Receiver.xml");
+
+ #endregion Constants
+
+ #region Variables
+
+ private static RemoteHandler _remoteButtonHandler;
+ private string _deviceName;
+ private FireDTVControl _fireDTV = null;
+ private ReceiverWindow _receiverWindow;
+
+ #endregion Variables
+
+ /// <summary>
+ /// Name of the IR Server plugin.
+ /// </summary>
+ /// <value>The name.</value>
+ public override string Name
+ {
+ get { return "...
[truncated message content] |
|
From: <che...@us...> - 2009-08-10 19:57:49
|
Revision: 3053
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3053&view=rev
Author: chemelli_sf
Date: 2009-08-10 19:57:38 +0000 (Mon, 10 Aug 2009)
Log Message:
-----------
Changed new FireDTV plugin to build as x86
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj 2009-08-10 18:19:41 UTC (rev 3052)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj 2009-08-10 19:57:38 UTC (rev 3053)
@@ -2,7 +2,7 @@
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D88EDBC1-D583-4149-9873-8239FA63F4FE}</ProjectGuid>
@@ -15,7 +15,7 @@
<TargetFrameworkSubset>
</TargetFrameworkSubset>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
@@ -25,7 +25,7 @@
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\FireDTV Receiver.XML</DocumentationFile>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2009-08-10 18:19:41 UTC (rev 3052)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2009-08-10 19:57:38 UTC (rev 3053)
@@ -593,10 +593,12 @@
{1E84C2ED-92FC-43A4-9C12-374B3347F6D7}.Release|x86.Build.0 = Release|x86
{D88EDBC1-D583-4149-9873-8239FA63F4FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D88EDBC1-D583-4149-9873-8239FA63F4FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Debug|x86.ActiveCfg = Debug|x86
+ {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Debug|x86.Build.0 = Debug|x86
{D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|Any CPU.Build.0 = Release|Any CPU
- {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|x86.ActiveCfg = Release|Any CPU
+ {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|x86.ActiveCfg = Release|x86
+ {D88EDBC1-D583-4149-9873-8239FA63F4FE}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-08-11 01:12:51
|
Revision: 3056
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3056&view=rev
Author: chef_koch
Date: 2009-08-11 01:12:41 +0000 (Tue, 11 Aug 2009)
Log Message:
-----------
added initial version of help system, please improve it if you have ideas
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/Resources.resx
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Setup.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Setup.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.cs
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssHelp.cs
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.Designer.cs 2009-08-10 23:24:30 UTC (rev 3055)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.Designer.cs 2009-08-11 01:12:41 UTC (rev 3056)
@@ -281,6 +281,7 @@
this.Name = "MainForm";
this.Text = "Abstract Remote Map Creator";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
+ this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.MainForm_HelpRequested);
this.groupBoxSetup.ResumeLayout(false);
this.groupBoxStatus.ResumeLayout(false);
this.groupBoxMapAbstract.ResumeLayout(false);
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs 2009-08-10 23:24:30 UTC (rev 3055)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/MainForm.cs 2009-08-11 01:12:41 UTC (rev 3056)
@@ -664,5 +664,10 @@
private delegate void DelegateRemoteEvent(string deviceName, string keyCode);
#endregion
+
+ private void MainForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+ {
+ IrssHelp.Open(sender);
+ }
}
}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs 2009-08-10 23:24:30 UTC (rev 3055)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs 2009-08-11 01:12:41 UTC (rev 3056)
@@ -49,7 +49,6 @@
this.groupBoxCommands = new System.Windows.Forms.GroupBox();
this.comboBoxPort = new System.Windows.Forms.ComboBox();
this.toolTips = new System.Windows.Forms.ToolTip(this.components);
- this.buttonHelp = new System.Windows.Forms.Button();
this.groupBoxStatus.SuspendLayout();
this.groupBoxRemoteButton.SuspendLayout();
this.groupBoxSetup.SuspendLayout();
@@ -135,7 +134,7 @@
this.listBoxStatus.Location = new System.Drawing.Point(8, 16);
this.listBoxStatus.Name = "listBoxStatus";
this.listBoxStatus.ScrollAlwaysVisible = true;
- this.listBoxStatus.Size = new System.Drawing.Size(424, 185);
+ this.listBoxStatus.Size = new System.Drawing.Size(424, 211);
this.listBoxStatus.TabIndex = 0;
this.toolTips.SetToolTip(this.listBoxStatus, "Status messages");
//
@@ -147,7 +146,7 @@
this.groupBoxStatus.Controls.Add(this.listBoxStatus);
this.groupBoxStatus.Location = new System.Drawing.Point(8, 192);
this.groupBoxStatus.Name = "groupBoxStatus";
- this.groupBoxStatus.Size = new System.Drawing.Size(440, 216);
+ this.groupBoxStatus.Size = new System.Drawing.Size(440, 242);
this.groupBoxStatus.TabIndex = 3;
this.groupBoxStatus.TabStop = false;
this.groupBoxStatus.Text = "Status";
@@ -263,34 +262,26 @@
this.comboBoxPort.TabIndex = 2;
this.toolTips.SetToolTip(this.comboBoxPort, "Port for blasting IR");
//
- // buttonHelp
- //
- this.buttonHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonHelp.Location = new System.Drawing.Point(8, 416);
- this.buttonHelp.Name = "buttonHelp";
- this.buttonHelp.Size = new System.Drawing.Size(56, 24);
- this.buttonHelp.TabIndex = 4;
- this.buttonHelp.Text = "Help";
- this.buttonHelp.UseVisualStyleBackColor = true;
- this.buttonHelp.Click += new System.EventHandler(this.buttonHelp_Click);
- //
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(464, 455);
- this.Controls.Add(this.buttonHelp);
+ this.ClientSize = new System.Drawing.Size(464, 446);
this.Controls.Add(this.groupBoxCommands);
this.Controls.Add(this.groupBoxSetup);
this.Controls.Add(this.groupBoxRemoteButton);
this.Controls.Add(this.groupBoxStatus);
+ this.HelpButton = true;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(472, 482);
this.Name = "MainForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Debug Client";
- this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
this.Load += new System.EventHandler(this.MainForm_Load);
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
+ this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.MainForm_HelpRequested);
this.groupBoxStatus.ResumeLayout(false);
this.groupBoxRemoteButton.ResumeLayout(false);
this.groupBoxRemoteButton.PerformLayout();
@@ -317,7 +308,6 @@
private System.Windows.Forms.ToolTip toolTips;
private System.Windows.Forms.ComboBox comboBoxPort;
private System.Windows.Forms.ComboBox comboBoxComputer;
- private System.Windows.Forms.Button buttonHelp;
private System.Windows.Forms.Label labelRemoteCode;
private System.Windows.Forms.Label labelRemoteDevice;
private System.Windows.Forms.TextBox textBoxRemoteCode;
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.cs 2009-08-10 23:24:30 UTC (rev 3055)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.cs 2009-08-11 01:12:41 UTC (rev 3056)
@@ -557,5 +557,10 @@
private delegate void DelegateAddStatusLine(string status);
#endregion
+
+ private void MainForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+ {
+ IrssHelp.Open(sender);
+ }
}
}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2009-08-10 23:24:30 UTC (rev 3055)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2009-08-11 01:12:41 UTC (rev 3056)
@@ -142,8 +142,8 @@
this.listViewPrograms.TileSize = new System.Drawing.Size(128, 48);
this.toolTip.SetToolTip(this.listViewPrograms, "Choose a Program to modify mappings");
this.listViewPrograms.UseCompatibleStateImageBehavior = false;
+ this.listViewPrograms.SelectedIndexChanged += new System.EventHandler(this.listViewPrograms_SelectedIndexChanged);
this.listViewPrograms.DoubleClick += new System.EventHandler(this.listViewPrograms_DoubleClick);
- this.listViewPrograms.SelectedIndexChanged += new System.EventHandler(this.listViewPrograms_SelectedIndexChanged);
//
// contextMenuStripPrograms
//
@@ -208,14 +208,14 @@
this.toolStripSeparator3,
this.copyButtonsFromToolStripMenuItem});
this.contextMenuStripButtonMapping.Name = "contextMenuStripButtonMapping";
- this.contextMenuStripButtonMapping.Size = new System.Drawing.Size(151, 142);
+ this.contextMenuStripButtonMapping.Size = new System.Drawing.Size(144, 142);
this.contextMenuStripButtonMapping.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStripButtonMapping_Opening);
//
// newButtonToolStripMenuItem
//
this.newButtonToolStripMenuItem.Image = global::Translator.Properties.Resources.Plus;
this.newButtonToolStripMenuItem.Name = "newButtonToolStripMenuItem";
- this.newButtonToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
+ this.newButtonToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.newButtonToolStripMenuItem.Text = "&New";
this.newButtonToolStripMenuItem.Click += new System.EventHandler(this.newButtonToolStripMenuItem_Click);
//
@@ -223,7 +223,7 @@
//
this.editButtonToolStripMenuItem.Image = global::Translator.Properties.Resources.Edit;
this.editButtonToolStripMenuItem.Name = "editButtonToolStripMenuItem";
- this.editButtonToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
+ this.editButtonToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.editButtonToolStripMenuItem.Text = "&Edit";
this.editButtonToolStripMenuItem.Click += new System.EventHandler(this.editButtonToolStripMenuItem_Click);
//
@@ -231,7 +231,7 @@
//
this.deleteButtonToolStripMenuItem.Image = global::Translator.Properties.Resources.Delete;
this.deleteButtonToolStripMenuItem.Name = "deleteButtonToolStripMenuItem";
- this.deleteButtonToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
+ this.deleteButtonToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.deleteButtonToolStripMenuItem.Text = "&Delete";
this.deleteButtonToolStripMenuItem.Click += new System.EventHandler(this.deleteButtonToolStripMenuItem_Click);
//
@@ -239,7 +239,7 @@
//
this.clearButtonsToolStripMenuItem.Image = global::Translator.Properties.Resources.DeleteAll;
this.clearButtonsToolStripMenuItem.Name = "clearButtonsToolStripMenuItem";
- this.clearButtonsToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
+ this.clearButtonsToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.clearButtonsToolStripMenuItem.Text = "&Clear";
this.clearButtonsToolStripMenuItem.Click += new System.EventHandler(this.clearButtonsToolStripMenuItem_Click);
//
@@ -247,20 +247,20 @@
//
this.remapButtonToolStripMenuItem.Image = global::Translator.Properties.Resources.Remap;
this.remapButtonToolStripMenuItem.Name = "remapButtonToolStripMenuItem";
- this.remapButtonToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
+ this.remapButtonToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.remapButtonToolStripMenuItem.Text = "&Remap";
this.remapButtonToolStripMenuItem.Click += new System.EventHandler(this.remapButtonToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(147, 6);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(140, 6);
//
// copyButtonsFromToolStripMenuItem
//
this.copyButtonsFromToolStripMenuItem.Image = global::Translator.Properties.Resources.MoveRight;
this.copyButtonsFromToolStripMenuItem.Name = "copyButtonsFromToolStripMenuItem";
- this.copyButtonsFromToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
+ this.copyButtonsFromToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.copyButtonsFromToolStripMenuItem.Text = "Copy &from ...";
//
// buttonOK
@@ -388,7 +388,7 @@
this.toolStripButtonNewMapping.Image = global::Translator.Properties.Resources.Plus;
this.toolStripButtonNewMapping.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonNewMapping.Name = "toolStripButtonNewMapping";
- this.toolStripButtonNewMapping.Size = new System.Drawing.Size(48, 22);
+ this.toolStripButtonNewMapping.Size = new System.Drawing.Size(51, 22);
this.toolStripButtonNewMapping.Text = "New";
this.toolStripButtonNewMapping.ToolTipText = "Create a new button mapping";
this.toolStripButtonNewMapping.Click += new System.EventHandler(this.toolStripButtonNewMapping_Click);
@@ -398,7 +398,7 @@
this.toolStripButtonEditMapping.Image = global::Translator.Properties.Resources.Edit;
this.toolStripButtonEditMapping.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonEditMapping.Name = "toolStripButtonEditMapping";
- this.toolStripButtonEditMapping.Size = new System.Drawing.Size(45, 22);
+ this.toolStripButtonEditMapping.Size = new System.Drawing.Size(47, 22);
this.toolStripButtonEditMapping.Text = "Edit";
this.toolStripButtonEditMapping.ToolTipText = "Edit the selected button mapping";
this.toolStripButtonEditMapping.Click += new System.EventHandler(this.toolStripButtonEditMapping_Click);
@@ -408,7 +408,7 @@
this.toolStripButtonDeleteMapping.Image = global::Translator.Properties.Resources.Delete;
this.toolStripButtonDeleteMapping.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonDeleteMapping.Name = "toolStripButtonDeleteMapping";
- this.toolStripButtonDeleteMapping.Size = new System.Drawing.Size(58, 22);
+ this.toolStripButtonDeleteMapping.Size = new System.Drawing.Size(60, 22);
this.toolStripButtonDeleteMapping.Text = "Delete";
this.toolStripButtonDeleteMapping.ToolTipText = "Delete the selected button mapping";
this.toolStripButtonDeleteMapping.Click += new System.EventHandler(this.toolStripButtonDeleteMapping_Click);
@@ -419,7 +419,7 @@
this.toolStripButtonDeleteAllMappings.Image = global::Translator.Properties.Resources.DeleteAll;
this.toolStripButtonDeleteAllMappings.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonDeleteAllMappings.Name = "toolStripButtonDeleteAllMappings";
- this.toolStripButtonDeleteAllMappings.Size = new System.Drawing.Size(72, 22);
+ this.toolStripButtonDeleteAllMappings.Size = new System.Drawing.Size(77, 22);
this.toolStripButtonDeleteAllMappings.Text = "Delete All";
this.toolStripButtonDeleteAllMappings.ToolTipText = "Delete all the button mappings";
this.toolStripButtonDeleteAllMappings.Click += new System.EventHandler(this.toolStripButtonDeleteAllMappings_Click);
@@ -429,7 +429,7 @@
this.toolStripButtonRemapMapping.Image = global::Translator.Properties.Resources.Remap;
this.toolStripButtonRemapMapping.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonRemapMapping.Name = "toolStripButtonRemapMapping";
- this.toolStripButtonRemapMapping.Size = new System.Drawing.Size(60, 22);
+ this.toolStripButtonRemapMapping.Size = new System.Drawing.Size(64, 22);
this.toolStripButtonRemapMapping.Text = "Remap";
this.toolStripButtonRemapMapping.ToolTipText = "Link a new code to the selected mapping";
this.toolStripButtonRemapMapping.Click += new System.EventHandler(this.toolStripButtonRemapMapping_Click);
@@ -554,13 +554,13 @@
this.contextMenuStripEvents.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.removeEventToolStripMenuItem});
this.contextMenuStripEvents.Name = "contextMenuStripEvents";
- this.contextMenuStripEvents.Size = new System.Drawing.Size(125, 26);
+ this.contextMenuStripEvents.Size = new System.Drawing.Size(118, 26);
//
// removeEventToolStripMenuItem
//
this.removeEventToolStripMenuItem.Image = global::Translator.Properties.Resources.Delete;
this.removeEventToolStripMenuItem.Name = "removeEventToolStripMenuItem";
- this.removeEventToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
+ this.removeEventToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
this.removeEventToolStripMenuItem.Text = "&Remove";
this.removeEventToolStripMenuItem.Click += new System.EventHandler(this.removeEventToolStripMenuItem_Click);
//
@@ -597,7 +597,7 @@
this.toolStripButtonNewMacro.Image = global::Translator.Properties.Resources.Plus;
this.toolStripButtonNewMacro.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonNewMacro.Name = "toolStripButtonNewMacro";
- this.toolStripButtonNewMacro.Size = new System.Drawing.Size(48, 22);
+ this.toolStripButtonNewMacro.Size = new System.Drawing.Size(51, 22);
this.toolStripButtonNewMacro.Text = "New";
this.toolStripButtonNewMacro.ToolTipText = "Create a new macro";
this.toolStripButtonNewMacro.Click += new System.EventHandler(this.toolStripButtonNewMacro_Click);
@@ -607,7 +607,7 @@
this.toolStripButtonEditMacro.Image = global::Translator.Properties.Resources.Edit;
this.toolStripButtonEditMacro.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonEditMacro.Name = "toolStripButtonEditMacro";
- this.toolStripButtonEditMacro.Size = new System.Drawing.Size(45, 22);
+ this.toolStripButtonEditMacro.Size = new System.Drawing.Size(47, 22);
this.toolStripButtonEditMacro.Text = "Edit";
this.toolStripButtonEditMacro.ToolTipText = "Edit the selected macro";
this.toolStripButtonEditMacro.Click += new System.EventHandler(this.toolStripButtonEditMacro_Click);
@@ -617,7 +617,7 @@
this.toolStripButtonDeleteMacro.Image = global::Translator.Properties.Resources.Delete;
this.toolStripButtonDeleteMacro.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonDeleteMacro.Name = "toolStripButtonDeleteMacro";
- this.toolStripButtonDeleteMacro.Size = new System.Drawing.Size(58, 22);
+ this.toolStripButtonDeleteMacro.Size = new System.Drawing.Size(60, 22);
this.toolStripButtonDeleteMacro.Text = "Delete";
this.toolStripButtonDeleteMacro.ToolTipText = "Delete the selected macro";
this.toolStripButtonDeleteMacro.Click += new System.EventHandler(this.toolStripButtonDeleteMacro_Click);
@@ -628,7 +628,7 @@
this.toolStripButtonCreateShortcutForMacro.Image = global::Translator.Properties.Resources.Shortcut;
this.toolStripButtonCreateShortcutForMacro.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonCreateShortcutForMacro.Name = "toolStripButtonCreateShortcutForMacro";
- this.toolStripButtonCreateShortcutForMacro.Size = new System.Drawing.Size(103, 22);
+ this.toolStripButtonCreateShortcutForMacro.Size = new System.Drawing.Size(108, 22);
this.toolStripButtonCreateShortcutForMacro.Text = "Create shortcut";
this.toolStripButtonCreateShortcutForMacro.ToolTipText = "Create a shortcut to run the selected macro";
this.toolStripButtonCreateShortcutForMacro.Click += new System.EventHandler(this.toolStripButtonCreateShortcutForMacro_Click);
@@ -638,7 +638,7 @@
this.toolStripButtonTestMacro.Image = global::Translator.Properties.Resources.MoveRight;
this.toolStripButtonTestMacro.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonTestMacro.Name = "toolStripButtonTestMacro";
- this.toolStripButtonTestMacro.Size = new System.Drawing.Size(48, 22);
+ this.toolStripButtonTestMacro.Size = new System.Drawing.Size(49, 22);
this.toolStripButtonTestMacro.Text = "Test";
this.toolStripButtonTestMacro.ToolTipText = "Test the selected macro";
this.toolStripButtonTestMacro.Click += new System.EventHandler(this.toolStripButtonTestMacro_Click);
@@ -660,8 +660,8 @@
this.listViewMacro.TabIndex = 0;
this.listViewMacro.UseCompatibleStateImageBehavior = false;
this.listViewMacro.View = System.Windows.Forms.View.List;
+ this.listViewMacro.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewMacro_AfterLabelEdit);
this.listViewMacro.DoubleClick += new System.EventHandler(this.listViewMacro_DoubleClick);
- this.listViewMacro.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewMacro_AfterLabelEdit);
//
// tabPageIRCommands
//
@@ -694,7 +694,7 @@
this.toolStripButtonNewIR.Image = global::Translator.Properties.Resources.Plus;
this.toolStripButtonNewIR.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonNewIR.Name = "toolStripButtonNewIR";
- this.toolStripButtonNewIR.Size = new System.Drawing.Size(48, 22);
+ this.toolStripButtonNewIR.Size = new System.Drawing.Size(51, 22);
this.toolStripButtonNewIR.Text = "New";
this.toolStripButtonNewIR.ToolTipText = "Create a new IR Command";
this.toolStripButtonNewIR.Click += new System.EventHandler(this.toolStripButtonNewIR_Click);
@@ -704,7 +704,7 @@
this.toolStripButtonEditIR.Image = global::Translator.Properties.Resources.Edit;
this.toolStripButtonEditIR.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonEditIR.Name = "toolStripButtonEditIR";
- this.toolStripButtonEditIR.Size = new System.Drawing.Size(45, 22);
+ this.toolStripButtonEditIR.Size = new System.Drawing.Size(47, 22);
this.toolStripButtonEditIR.Text = "Edit";
this.toolStripButtonEditIR.ToolTipText = "Edit the selected IR Command";
this.toolStripButtonEditIR.Click += new System.EventHandler(this.toolStripButtonEditIR_Click);
@@ -714,7 +714,7 @@
this.toolStripButtonDeleteIR.Image = global::Translator.Properties.Resources.Delete;
this.toolStripButtonDeleteIR.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonDeleteIR.Name = "toolStripButtonDeleteIR";
- this.toolStripButtonDeleteIR.Size = new System.Drawing.Size(58, 22);
+ this.toolStripButtonDeleteIR.Size = new System.Drawing.Size(60, 22);
this.toolStripButtonDeleteIR.Text = "Delete";
this.toolStripButtonDeleteIR.ToolTipText = "Delete the selected IR Command";
this.toolStripButtonDeleteIR.Click += new System.EventHandler(this.toolStripButtonDeleteIR_Click);
@@ -736,8 +736,8 @@
this.listViewIR.TabIndex = 0;
this.listViewIR.UseCompatibleStateImageBehavior = false;
this.listViewIR.View = System.Windows.Forms.View.List;
+ this.listViewIR.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewIR_AfterLabelEdit);
this.listViewIR.DoubleClick += new System.EventHandler(this.listViewIR_DoubleClick);
- this.listViewIR.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewIR_AfterLabelEdit);
//
// checkBoxAutoRun
//
@@ -776,65 +776,65 @@
this.toolStripSeparator2,
this.quitToolStripMenuItem});
this.configurationToolStripMenuItem.Name = "configurationToolStripMenuItem";
- this.configurationToolStripMenuItem.Size = new System.Drawing.Size(35, 20);
+ this.configurationToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
this.configurationToolStripMenuItem.Text = "&File";
//
// newToolStripMenuItem
//
this.newToolStripMenuItem.Name = "newToolStripMenuItem";
- this.newToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.newToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
this.newToolStripMenuItem.Text = "&New";
this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click);
//
// openToolStripMenuItem
//
this.openToolStripMenuItem.Name = "openToolStripMenuItem";
- this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.openToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
this.openToolStripMenuItem.Text = "&Open ...";
this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
//
// importToolStripMenuItem
//
this.importToolStripMenuItem.Name = "importToolStripMenuItem";
- this.importToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.importToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
this.importToolStripMenuItem.Text = "&Import ...";
this.importToolStripMenuItem.Click += new System.EventHandler(this.importToolStripMenuItem_Click);
//
// exportToolStripMenuItem
//
this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
- this.exportToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.exportToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
this.exportToolStripMenuItem.Text = "&Export ...";
this.exportToolStripMenuItem.Click += new System.EventHandler(this.exportToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(136, 6);
//
// serverToolStripMenuItem
//
this.serverToolStripMenuItem.Name = "serverToolStripMenuItem";
- this.serverToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.serverToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
this.serverToolStripMenuItem.Text = "&Server ...";
this.serverToolStripMenuItem.Click += new System.EventHandler(this.serverToolStripMenuItem_Click);
//
// advancedToolStripMenuItem
//
this.advancedToolStripMenuItem.Name = "advancedToolStripMenuItem";
- this.advancedToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.advancedToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
this.advancedToolStripMenuItem.Text = "&Advanced ...";
this.advancedToolStripMenuItem.Click += new System.EventHandler(this.advancedToolStripMenuItem_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(136, 6);
//
// quitToolStripMenuItem
//
this.quitToolStripMenuItem.Name = "quitToolStripMenuItem";
- this.quitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.quitToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
this.quitToolStripMenuItem.Text = "&Quit";
this.quitToolStripMenuItem.Click += new System.EventHandler(this.quitToolStripMenuItem_Click);
//
@@ -844,11 +844,12 @@
this.translatorHelpToolStripMenuItem,
this.aboutToolStripMenuItem});
this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
- this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20);
+ this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
this.helpToolStripMenuItem.Text = "&Help";
//
// translatorHelpToolStripMenuItem
//
+ this.translatorHelpToolStripMenuItem.Image = global::Translator.Properties.Resources.Help;
this.translatorHelpToolStripMenuItem.Name = "translatorHelpToolStripMenuItem";
this.translatorHelpToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.translatorHelpToolStripMenuItem.Text = "&Contents";
@@ -887,8 +888,9 @@
this.Name = "MainForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Translator";
+ this.Load += new System.EventHandler(this.MainForm_Load);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
- this.Load += new System.EventHandler(this.MainForm_Load);
+ this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.MainForm_HelpRequested);
this.contextMenuStripButtonMapping.ResumeLayout(false);
this.tabControl.ResumeLayout(false);
this.tabPagePrograms.ResumeLayout(false);
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2009-08-10 23:24:30 UTC (rev 3055)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2009-08-11 01:12:41 UTC (rev 3056)
@@ -1190,16 +1190,7 @@
private void translatorHelpToolStripMenuItem_Click(object sender, EventArgs e)
{
- try
- {
- string file = Path.Combine(SystemRegistry.GetInstallFolder(), "IR Server Suite.chm");
- Help.ShowHelp(this, file, HelpNavigator.Topic, "Translator\\index.html");
- }
- catch (Exception ex)
- {
- IrssLog.Error(ex);
- MessageBox.Show(this, ex.Message, "Failed to load help", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
+ IrssHelp.Open(this);
}
private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1561,5 +1552,10 @@
RefreshProgramList();
}
}
+
+ private void MainForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+ {
+ IrssHelp.Open(sender);
+ }
}
}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs 2009-08-10 23:24:30 UTC (rev 3055)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs 2009-08-11 01:12:41 UTC (rev 3056)
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
-// This code was generated by a tool.
-// Runtime Version:2.0.50727.832
+// Dieser Code wurde von einem Tool generiert.
+// Laufzeitversion:2.0.50727.4016
//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+// der Code erneut generiert wird.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -13,12 +13,12 @@
/// <summary>
- /// A strongly-typed resource class, for looking up localized strings, etc.
+ /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
/// </summary>
- // This class was auto-generated by the StronglyTypedResourceBuilder
- // class via a tool like ResGen or Visual Studio.
- // To add or remove a member, edit your .ResX file then rerun ResGen
- // with the /str option, or rebuild your VS project.
+ // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+ // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+ // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+ // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -33,7 +33,7 @@
}
/// <summary>
- /// Returns the cached ResourceManager instance used by this class.
+ /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@
}
/// <summary>
- /// Overrides the current thread's CurrentUICulture property for all
- /// resource lookups using this strongly typed resource class.
+ /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+ /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
@@ -102,6 +102,13 @@
}
}
+ internal static System.Drawing.Bitmap Help {
+ get {
+ object obj = ResourceManager.GetObject("Help", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
internal static System.Drawing.Icon Icon16 {
get {
object obj = ResourceManager.GetObject("Icon16", resourceCulture);
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/Resources.resx
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/Resources.resx 2009-08-10 23:24:30 UTC (rev 3055)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/Resources.resx 2009-08-11 01:12:41 UTC (rev 3056)
@@ -136,6 +136,9 @@
<data name="Edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\graphics\edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\graphics\help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="Icon16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Icon16.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Setup.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Setup.Designer.cs 2009-08-10 23:24:30 UTC (rev 3055)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Setup.Designer.cs 2009-08-11 01:12:41 UTC (rev 3056)
@@ -217,6 +217,7 @@
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.groupBoxApp);
this.Controls.Add(this.buttonOK);
+ this.HelpButton = true;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
@@ -224,6 +225,7 @@
this.Name = "Setup";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Tray Launcher - Setup";
+ this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.Setup_HelpRequested);
this.groupBoxApp.ResumeLayout(false);
this.groupBoxApp.PerformLayout();
this.groupBoxOptions.ResumeLayout(false);
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Setup.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Setup.cs 2009-08-10 23:24:30 UTC (rev 3055)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Setup.cs 2009-08-11 01:12:41 UTC (rev 3056)
@@ -157,5 +157,10 @@
{
checkBoxRepeatsFocus.Enabled = checkBoxOneInstance.Checked;
}
+
+ private void Setup_HelpRequested(object sender, HelpEventArgs hlpevent)
+ {
+ IrssHelp.Open(sender);
+ }
}
}
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssHelp.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssHelp.cs (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssHelp.cs 2009-08-11 01:12:41 UTC (rev 3056)
@@ -0,0 +1,49 @@
+#region Copyright (C) 2005-2009 Team MediaPortal
+
+// Copyright (C) 2005-2009 Team MediaPortal
+// http://www.team-mediaportal.com
+//
+// This Program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// This Program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with GNU Make; see the file COPYING. If not, write to
+// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+// http://www.gnu.org/copyleft/gpl.html
+
+#endregion
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Windows.Forms;
+
+namespace IrssUtils
+{
+ /// <summary>
+ /// Log file recording class.
+ /// </summary>
+ public static class IrssHelp
+ {
+ public static void Open(string obj)
+ {
+ Process.Start(
+ String.Format(
+ @"http://wiki.team-mediaportal.com/help/irss/{0}",
+ obj.Replace(".", string.Empty)));
+ }
+
+ public static void Open(object obj)
+ {
+ Open(obj.GetType().ToString());
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2009-08-10 23:24:30 UTC (rev 3055)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2009-08-11 01:12:41 UTC (rev 3056)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -231,6 +231,7 @@
<Compile Include="IrssLog.cs" />
<Compile Include="IrssMacro.cs" />
<Compile Include="Keyboard.cs" />
+ <Compile Include="IrssHelp.cs" />
<Compile Include="Mouse.cs" />
<Compile Include="Network.cs" />
<Compile Include="Properties\Resources.Designer.cs">
@@ -388,6 +389,7 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent></PostBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.Designer.cs 2009-08-10 23:24:30 UTC (rev 3055)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.Designer.cs 2009-08-11 01:12:41 UTC (rev 3056)
@@ -28,83 +28,83 @@
/// </summary>
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Config));
- this.buttonOK = new System.Windows.Forms.Button();
- this.buttonCancel = new System.Windows.Forms.Button();
- this.toolTips = new System.Windows.Forms.ToolTip(this.components);
- this.groupBoxTransceiver = new System.Windows.Forms.GroupBox();
- this.gridPlugins = new SourceGrid.Grid();
- this.toolStrip = new System.Windows.Forms.ToolStrip();
- this.toolStripButtonDetect = new System.Windows.Forms.ToolStripButton();
- this.toolStripButtonAdvancedSettings = new System.Windows.Forms.ToolStripButton();
- this.toolStripButtonHelp = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator();
- this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
- this.toolStripButtonService = new System.Windows.Forms.ToolStripButton();
- this.toolStripServiceButton = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
- this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
- this.toolStripButtonApplication = new System.Windows.Forms.ToolStripButton();
- this.groupBoxTransceiver.SuspendLayout();
- this.toolStrip.SuspendLayout();
- this.SuspendLayout();
- //
- // buttonOK
- //
- this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonOK.Location = new System.Drawing.Point(427, 400);
- this.buttonOK.Name = "buttonOK";
- this.buttonOK.Size = new System.Drawing.Size(64, 24);
- this.buttonOK.TabIndex = 1;
- this.buttonOK.Text = "OK";
- this.buttonOK.UseVisualStyleBackColor = true;
- this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
- //
- // buttonCancel
- //
- this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.buttonCancel.Location = new System.Drawing.Point(499, 400);
- this.buttonCancel.Name = "buttonCancel";
- this.buttonCancel.Size = new System.Drawing.Size(64, 24);
- this.buttonCancel.TabIndex = 2;
- this.buttonCancel.Text = "Cancel";
- this.buttonCancel.UseVisualStyleBackColor = true;
- this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
- //
- // groupBoxTransceiver
- //
- this.groupBoxTransceiver.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.groupBoxTransceiver.Controls.Add(this.gridPlugins);
- this.groupBoxTransceiver.Location = new System.Drawing.Point(8, 32);
- this.groupBoxTransceiver.Name = "groupBoxTransceiver";
- this.groupBoxTransceiver.Size = new System.Drawing.Size(555, 360);
- this.groupBoxTransceiver.TabIndex = 0;
- this.groupBoxTransceiver.TabStop = false;
- this.groupBoxTransceiver.Text = "Device plugins";
- //
- // gridPlugins
- //
- this.gridPlugins.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.gridPlugins.BackColor = System.Drawing.SystemColors.Window;
- this.gridPlugins.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.gridPlugins.Location = new System.Drawing.Point(8, 16);
- this.gridPlugins.Name = "gridPlugins";
- this.gridPlugins.OptimizeMode = SourceGrid.CellOptimizeMode.ForRows;
- this.gridPlugins.SelectionMode = SourceGrid.GridSelectionMode.Row;
- this.gridPlugins.Size = new System.Drawing.Size(539, 336);
- this.gridPlugins.TabIndex = 0;
- this.gridPlugins.TabStop = true;
- this.gridPlugins.ToolTipText = "";
- //
- // toolStrip
- //
- this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Config));
+ this.buttonOK = new System.Windows.Forms.Button();
+ this.buttonCancel = new System.Windows.Forms.Button();
+ this.toolTips = new System.Windows.Forms.ToolTip(this.components);
+ this.groupBoxTransceiver = new System.Windows.Forms.GroupBox();
+ this.gridPlugins = new SourceGrid.Grid();
+ this.toolStrip = new System.Windows.Forms.ToolStrip();
+ this.toolStripButtonDetect = new System.Windows.Forms.ToolStripButton();
+ this.toolStripButtonAdvancedSettings = new System.Windows.Forms.ToolStripButton();
+ this.toolStripButtonHelp = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
+ this.toolStripButtonService = new System.Windows.Forms.ToolStripButton();
+ this.toolStripServiceButton = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
+ this.toolStripButtonApplication = new System.Windows.Forms.ToolStripButton();
+ this.groupBoxTransceiver.SuspendLayout();
+ this.toolStrip.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // buttonOK
+ //
+ this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonOK.Location = new System.Drawing.Point(427, 400);
+ this.buttonOK.Name = "buttonOK";
+ this.buttonOK.Size = new System.Drawing.Size(64, 24);
+ this.buttonOK.TabIndex = 1;
+ this.buttonOK.Text = "OK";
+ this.buttonOK.UseVisualStyleBackColor = true;
+ this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
+ //
+ // buttonCancel
+ //
+ this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.buttonCancel.Location = new System.Drawing.Point(499, 400);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(64, 24);
+ this.buttonCancel.TabIndex = 2;
+ this.buttonCancel.Text = "Cancel";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+ //
+ // groupBoxTransceiver
+ //
+ this.groupBoxTransceiver.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBoxTransceiver.Controls.Add(this.gridPlugins);
+ this.groupBoxTransceiver.Location = new System.Drawing.Point(8, 32);
+ this.groupBoxTransceiver.Name = "groupBoxTransceiver";
+ this.groupBoxTransceiver.Size = new System.Drawing.Size(555, 360);
+ this.groupBoxTransceiver.TabIndex = 0;
+ this.groupBoxTransceiver.TabStop = false;
+ this.groupBoxTransceiver.Text = "Device plugins";
+ //
+ // gridPlugins
+ //
+ this.gridPlugins.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.gridPlugins.BackColor = System.Drawing.SystemColors.Window;
+ this.gridPlugins.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.gridPlugins.Location = new System.Drawing.Point(8, 16);
+ this.gridPlugins.Name = "gridPlugins";
+ this.gridPlugins.OptimizeMode = SourceGrid.CellOptimizeMode.ForRows;
+ this.gridPlugins.SelectionMode = SourceGrid.GridSelectionMode.Row;
+ this.gridPlugins.Size = new System.Drawing.Size(539, 336);
+ this.gridPlugins.TabIndex = 0;
+ this.gridPlugins.TabStop = true;
+ this.gridPlugins.ToolTipText = "";
+ //
+ // toolStrip
+ //
+ this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripButtonDetect,
this.toolStripButtonAdvancedSettings,
this.toolStripButtonHelp,
@@ -115,115 +115,116 @@
this.toolStripSeparator1,
this.toolStripLabel2,
this.toolStripButtonApplication});
- this.toolStrip.Location = new System.Drawing.Point(0, 0);
- this.toolStrip.Name = "toolStrip";
- this.toolStrip.Size = new System.Drawing.Size(571, 25);
- this.toolStrip.TabIndex = 3;
- //
- // toolStripButtonDetect
- //
- this.toolStripButtonDetect.Image = global::IRServer.Configuration.Properties.Resources.Detect;
- this.toolStripButtonDetect.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButtonDetect.Name = "toolStripButtonDetect";
- this.toolStripButtonDetect.Size = new System.Drawing.Size(61, 22);
- this.toolStripButtonDetect.Text = "Detect";
- this.toolStripButtonDetect.ToolTipText = "Detect attached devices";
- this.toolStripButtonDetect.Click += new System.EventHandler(this.toolStripButtonDetect_Click);
- //
- // toolStripButtonAdvancedSettings
- //
- this.toolStripButtonAdvancedSettings.Image = global::IRServer.Configuration.Properties.Resources.Advanced;
- this.toolStripButtonAdvancedSettings.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButtonAdvancedSettings.Name = "toolStripButtonAdvancedSettings";
- this.toolStripButtonAdvancedSettings.Size = new System.Drawing.Size(80, 22);
- this.toolStripButtonAdvancedSettings.Text = "Advanced";
- this.toolStripButtonAdvancedSettings.ToolTipText = "Advanced settings";
- this.toolStripButtonAdvancedSettings.Click += new System.EventHandler(this.toolStripButtonAdvancedSettings_Click);
- //
- // toolStripButtonHelp
- //
- this.toolStripButtonHelp.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
- this.toolStripButtonHelp.Image = global::IRServer.Configuration.Properties.Resources.Help;
- this.toolStripButtonHelp.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButtonHelp.Name = "toolStripButtonHelp";
- this.toolStripButtonHelp.Size = new System.Drawing.Size(52, 22);
- this.toolStripButtonHelp.Text = "Help";
- this.toolStripButtonHelp.Click += new System.EventHandler(this.toolStripButtonHelp_Click);
- //
- // toolStripSeparator
- //
- this.toolStripSeparator.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.toolStripSeparator.Name = "toolStripSeparator";
- this.toolStripSeparator.Size = new System.Drawing.Size(6, 25);
- //
- // toolStripLabel1
- //
- this.toolStripLabel1.Name = "toolStripLabel1";
- this.toolStripLabel1.Size = new System.Drawing.Size(47, 22);
- this.toolStripLabel1.Text = "Service:";
- //
- // toolStripButtonService
- //
- this.toolStripButtonService.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.toolStripButtonService.Enabled = false;
- this.toolStripButtonService.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButtonService.Name = "toolStripButtonService";
- this.toolStripButtonService.Size = new System.Drawing.Size(23, 22);
- this.toolStripButtonService.Text = "Stop";
- this.toolStripButtonService.ToolTipText = "Stop the IR Server";
- this.toolStripButtonService.Click += new System.EventHandler(this.toolStripButtonService_Click);
- //
- // toolStripServiceButton
- //
- this.toolStripServiceButton.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripServiceButton.Name = "toolStripServiceButton";
- this.toolStripServiceButton.Size = new System.Drawing.Size(23, 22);
- this.toolStripServiceButton.Click += new System.EventHandler(this.toolStripServiceButton_Click);
- //
- // toolStripSeparator1
- //
- this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
- //
- // toolStripLabel2
- //
- this.toolStripLabel2.Name = "toolStripLabel2";
- this.toolStripLabel2.Size = new System.Drawing.Size(71, 22);
- this.toolStripLabel2.Text = "Application:";
- //
- // toolStripButtonApplication
- //
- this.toolStripButtonApplication.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.toolStripButtonApplication.Enabled = false;
- this.toolStripButtonApplication.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButtonApplication.Name = "toolStripButtonApplication";
- this.toolStripButtonApplication.Size = new System.Drawing.Size(23, 22);
- this.toolStripButtonApplication.Text = "Stop";
- this.toolStripButtonApplication.Click += new System.EventHandler(this.toolStripButtonApplication_Click);
- //
- // Config
- //
- this.AcceptButton = this.buttonOK;
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.CancelButton = this.buttonCancel;
- this.ClientSize = new System.Drawing.Size(571, 432);
- this.Controls.Add(this.toolStrip);
- this.Controls.Add(this.groupBoxTransceiver);
- this.Controls.Add(this.buttonCancel);
- this.Controls.Add(this.buttonOK);
- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MinimumSize = new System.Drawing.Size(480, 298);
- this.Name = "Config";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
- this.Text = "IR Server Configuration";
- this.Load += new System.EventHandler(this.Config_Load);
- this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Config_FormClosing);
- this.groupBoxTransceiver.ResumeLayout(false);
- this.toolStrip.ResumeLayout(false);
- this.toolStrip.PerformLayout();
- this.ResumeLayout(false);
- this.PerformLayout();
+ this.toolStrip.Location = new System.Drawing.Point(0, 0);
+ this.toolStrip.Name = "toolStrip";
+ this.toolStrip.Size = new System.Drawing.Size(571, 25);
+ this.toolStrip.TabIndex = 3;
+ //
+ // toolStripButtonDetect
+ //
+ this.toolStripButtonDetect.Image = global::IRServer.Configuration.Properties.Resources.Detect;
+ this.toolStripButtonDetect.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButtonDetect.Name = "toolStripButtonDetect";
+ this.toolStripButtonDetect.Size = new System.Drawing.Size(61, 22);
+ this.toolStripButtonDetect.Text = "Detect";
+ this.toolStripButtonDetect.ToolTipText = "Detect attached devices";
+ this.toolStripButtonDetect.Click += new System.EventHandler(this.toolStripButtonDetect_Click);
+ //
+ // toolStripButtonAdvancedSettings
+ //
+ this.toolStripButtonAdvancedSettings.Image = global::IRServer.Configuration.Properties.Resources.Advanced;
+ this.toolStripButtonAdvancedSettings.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButtonAdvancedSettings.Name = "toolStripButtonAdvancedSettings";
+ this.toolStripButtonAdvancedSettings.Size = new System.Drawing.Size(80, 22);
+ this.toolStripButtonAdvancedSettings.Text = "Advanced";
+ this.toolStripButtonAdvancedSettings.ToolTipText = "Advanced settings";
+ this.toolStripButtonAdvancedSettings.Click += new System.EventHandler(this.toolStripButtonAdvancedSettings_Click);
+ //
+ // toolStripButtonHelp
+ //
+ this.toolStripButtonHelp.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripButtonHelp.Image = global::IRServer.Configuration.Properties.Resources.Help;
+ this.toolStripButtonHelp.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButtonHelp.Name = "toolStripButtonHelp";
+ this.toolStripButtonHelp.Size = new System.Drawing.Size(52, 22);
+ this.toolStripButtonHelp.Text = "Help";
+ this.toolStripButtonHelp.Click += new System.EventHandler(this.toolStripButtonHelp_Click);
+ //
+ // toolStripSeparator
+ //
+ this.toolStripSeparator.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.toolStripSeparator.Name = "toolStripSeparator";
+ this.toolStripSeparator.Size = new System.Drawing.Size(6, 25);
+ //
+ // toolStripLabel1
+ //
+ this.toolStripLabel1.Name = "toolStripLabel1";
+ this.toolStripLabel1.Size = new System.Drawing.Size(47, 22);
+ this.toolStripLabel1.Text = "Service:";
+ //
+ // toolStripButtonService
+ //
+ this.toolStripButtonService.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.toolStripButtonService.Enabled = false;
+ this.toolStripButtonService.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButtonService.Name = "toolStripButtonService";
+ this.toolStripButtonService.Size = new System.Drawing.Size(23, 22);
+ this.toolStripButtonService.Text = "Stop";
+ this.toolStripButtonService...
[truncated message content] |
|
From: <che...@us...> - 2009-09-17 20:57:43
|
Revision: 3088
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3088&view=rev
Author: chef_koch
Date: 2009-09-17 20:57:28 +0000 (Thu, 17 Sep 2009)
Log Message:
-----------
moved graphics from various projects to common IrssUtils
added AboutForm to IrssUtils
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MenuForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/Resources.resx
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.resx
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Config.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties/Resources.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Properties/Resources.resx
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/AboutForm.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/AboutForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/AboutForm.resx
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Advanced.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Delete.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/DeleteAll.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Detect.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Edit.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Help.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Info.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/NoIcon.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Plus.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Remap.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Shortcut.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Start.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Stop.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/WinLogo.png
Removed Paths:
-------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Graphics/
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Graphics/
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2009-09-16 13:20:55 UTC (rev 3087)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2009-09-17 20:57:28 UTC (rev 3088)
@@ -213,7 +213,7 @@
//
// newButtonToolStripMenuItem
//
- this.newButtonToolStripMenuItem.Image = global::Translator.Properties.Resources.Plus;
+ this.newButtonToolStripMenuItem.Image = IrssUtils.Properties.Resources.Plus;
this.newButtonToolStripMenuItem.Name = "newButtonToolStripMenuItem";
this.newButtonToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.newButtonToolStripMenuItem.Text = "&New";
@@ -221,7 +221,7 @@
//
// editButtonToolStripMenuItem
//
- this.editButtonToolStripMenuItem.Image = global::Translator.Properties.Resources.Edit;
+ this.editButtonToolStripMenuItem.Image = IrssUtils.Properties.Resources.Edit;
this.editButtonToolStripMenuItem.Name = "editButtonToolStripMenuItem";
this.editButtonToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.editButtonToolStripMenuItem.Text = "&Edit";
@@ -229,7 +229,7 @@
//
// deleteButtonToolStripMenuItem
//
- this.deleteButtonToolStripMenuItem.Image = global::Translator.Properties.Resources.Delete;
+ this.deleteButtonToolStripMenuItem.Image = IrssUtils.Properties.Resources.Delete;
this.deleteButtonToolStripMenuItem.Name = "deleteButtonToolStripMenuItem";
this.deleteButtonToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.deleteButtonToolStripMenuItem.Text = "&Delete";
@@ -237,7 +237,7 @@
//
// clearButtonsToolStripMenuItem
//
- this.clearButtonsToolStripMenuItem.Image = global::Translator.Properties.Resources.DeleteAll;
+ this.clearButtonsToolStripMenuItem.Image = IrssUtils.Properties.Resources.DeleteAll;
this.clearButtonsToolStripMenuItem.Name = "clearButtonsToolStripMenuItem";
this.clearButtonsToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.clearButtonsToolStripMenuItem.Text = "&Clear";
@@ -245,7 +245,7 @@
//
// remapButtonToolStripMenuItem
//
- this.remapButtonToolStripMenuItem.Image = global::Translator.Properties.Resources.Remap;
+ this.remapButtonToolStripMenuItem.Image = IrssUtils.Properties.Resources.Remap;
this.remapButtonToolStripMenuItem.Name = "remapButtonToolStripMenuItem";
this.remapButtonToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.remapButtonToolStripMenuItem.Text = "&Remap";
@@ -258,7 +258,7 @@
//
// copyButtonsFromToolStripMenuItem
//
- this.copyButtonsFromToolStripMenuItem.Image = global::Translator.Properties.Resources.MoveRight;
+ this.copyButtonsFromToolStripMenuItem.Image = IrssUtils.Properties.Resources.MoveRight;
this.copyButtonsFromToolStripMenuItem.Name = "copyButtonsFromToolStripMenuItem";
this.copyButtonsFromToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
this.copyButtonsFromToolStripMenuItem.Text = "Copy &from ...";
@@ -332,7 +332,7 @@
//
this.labelProgramsDelete.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.labelProgramsDelete.Cursor = System.Windows.Forms.Cursors.Hand;
- this.labelProgramsDelete.Image = global::Translator.Properties.Resources.Delete;
+ this.labelProgramsDelete.Image = IrssUtils.Properties.Resources.Delete;
this.labelProgramsDelete.Location = new System.Drawing.Point(1, 52);
this.labelProgramsDelete.Name = "labelProgramsDelete";
this.labelProgramsDelete.Size = new System.Drawing.Size(24, 24);
@@ -345,7 +345,7 @@
//
this.labelProgramsEdit.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.labelProgramsEdit.Cursor = System.Windows.Forms.Cursors.Hand;
- this.labelProgramsEdit.Image = global::Translator.Properties.Resources.Edit;
+ this.labelProgramsEdit.Image = IrssUtils.Properties.Resources.Edit;
this.labelProgramsEdit.Location = new System.Drawing.Point(1, 27);
this.labelProgramsEdit.Name = "labelProgramsEdit";
this.labelProgramsEdit.Size = new System.Drawing.Size(24, 24);
@@ -358,7 +358,7 @@
//
this.labelProgramsAdd.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.labelProgramsAdd.Cursor = System.Windows.Forms.Cursors.Hand;
- this.labelProgramsAdd.Image = global::Translator.Properties.Resources.Plus;
+ this.labelProgramsAdd.Image = IrssUtils.Properties.Resources.Plus;
this.labelProgramsAdd.Location = new System.Drawing.Point(1, 2);
this.labelProgramsAdd.Name = "labelProgramsAdd";
this.labelProgramsAdd.Size = new System.Drawing.Size(24, 24);
@@ -385,7 +385,7 @@
//
// toolStripButtonNewMapping
//
- this.toolStripButtonNewMapping.Image = global::Translator.Properties.Resources.Plus;
+ this.toolStripButtonNewMapping.Image = IrssUtils.Properties.Resources.Plus;
this.toolStripButtonNewMapping.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonNewMapping.Name = "toolStripButtonNewMapping";
this.toolStripButtonNewMapping.Size = new System.Drawing.Size(51, 22);
@@ -395,7 +395,7 @@
//
// toolStripButtonEditMapping
//
- this.toolStripButtonEditMapping.Image = global::Translator.Properties.Resources.Edit;
+ this.toolStripButtonEditMapping.Image = IrssUtils.Properties.Resources.Edit;
this.toolStripButtonEditMapping.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonEditMapping.Name = "toolStripButtonEditMapping";
this.toolStripButtonEditMapping.Size = new System.Drawing.Size(47, 22);
@@ -405,7 +405,7 @@
//
// toolStripButtonDeleteMapping
//
- this.toolStripButtonDeleteMapping.Image = global::Translator.Properties.Resources.Delete;
+ this.toolStripButtonDeleteMapping.Image = IrssUtils.Properties.Resources.Delete;
this.toolStripButtonDeleteMapping.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonDeleteMapping.Name = "toolStripButtonDeleteMapping";
this.toolStripButtonDeleteMapping.Size = new System.Drawing.Size(60, 22);
@@ -416,7 +416,7 @@
// toolStripButtonDeleteAllMappings
//
this.toolStripButtonDeleteAllMappings.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
- this.toolStripButtonDeleteAllMappings.Image = global::Translator.Properties.Resources.DeleteAll;
+ this.toolStripButtonDeleteAllMappings.Image = IrssUtils.Properties.Resources.DeleteAll;
this.toolStripButtonDeleteAllMappings.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonDeleteAllMappings.Name = "toolStripButtonDeleteAllMappings";
this.toolStripButtonDeleteAllMappings.Size = new System.Drawing.Size(77, 22);
@@ -426,7 +426,7 @@
//
// toolStripButtonRemapMapping
//
- this.toolStripButtonRemapMapping.Image = global::Translator.Properties.Resources.Remap;
+ this.toolStripButtonRemapMapping.Image = IrssUtils.Properties.Resources.Remap;
this.toolStripButtonRemapMapping.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonRemapMapping.Name = "toolStripButtonRemapMapping";
this.toolStripButtonRemapMapping.Size = new System.Drawing.Size(64, 22);
@@ -558,7 +558,7 @@
//
// removeEventToolStripMenuItem
//
- this.removeEventToolStripMenuItem.Image = global::Translator.Properties.Resources.Delete;
+ this.removeEventToolStripMenuItem.Image = IrssUtils.Properties.Resources.Delete;
this.removeEventToolStripMenuItem.Name = "removeEventToolStripMenuItem";
this.removeEventToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
this.removeEventToolStripMenuItem.Text = "&Remove";
@@ -594,7 +594,7 @@
//
// toolStripButtonNewMacro
//
- this.toolStripButtonNewMacro.Image = global::Translator.Properties.Resources.Plus;
+ this.toolStripButtonNewMacro.Image = IrssUtils.Properties.Resources.Plus;
this.toolStripButtonNewMacro.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonNewMacro.Name = "toolStripButtonNewMacro";
this.toolStripButtonNewMacro.Size = new System.Drawing.Size(51, 22);
@@ -604,7 +604,7 @@
//
// toolStripButtonEditMacro
//
- this.toolStripButtonEditMacro.Image = global::Translator.Properties.Resources.Edit;
+ this.toolStripButtonEditMacro.Image = IrssUtils.Properties.Resources.Edit;
this.toolStripButtonEditMacro.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonEditMacro.Name = "toolStripButtonEditMacro";
this.toolStripButtonEditMacro.Size = new System.Drawing.Size(47, 22);
@@ -614,7 +614,7 @@
//
// toolStripButtonDeleteMacro
//
- this.toolStripButtonDeleteMacro.Image = global::Translator.Properties.Resources.Delete;
+ this.toolStripButtonDeleteMacro.Image = IrssUtils.Properties.Resources.Delete;
this.toolStripButtonDeleteMacro.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonDeleteMacro.Name = "toolStripButtonDeleteMacro";
this.toolStripButtonDeleteMacro.Size = new System.Drawing.Size(60, 22);
@@ -625,7 +625,7 @@
// toolStripButtonCreateShortcutForMacro
//
this.toolStripButtonCreateShortcutForMacro.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
- this.toolStripButtonCreateShortcutForMacro.Image = global::Translator.Properties.Resources.Shortcut;
+ this.toolStripButtonCreateShortcutForMacro.Image = IrssUtils.Properties.Resources.Shortcut;
this.toolStripButtonCreateShortcutForMacro.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonCreateShortcutForMacro.Name = "toolStripButtonCreateShortcutForMacro";
this.toolStripButtonCreateShortcutForMacro.Size = new System.Drawing.Size(108, 22);
@@ -635,7 +635,7 @@
//
// toolStripButtonTestMacro
//
- this.toolStripButtonTestMacro.Image = global::Translator.Properties.Resources.MoveRight;
+ this.toolStripButtonTestMacro.Image = IrssUtils.Properties.Resources.MoveRight;
this.toolStripButtonTestMacro.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonTestMacro.Name = "toolStripButtonTestMacro";
this.toolStripButtonTestMacro.Size = new System.Drawing.Size(49, 22);
@@ -691,7 +691,7 @@
//
// toolStripButtonNewIR
//
- this.toolStripButtonNewIR.Image = global::Translator.Properties.Resources.Plus;
+ this.toolStripButtonNewIR.Image = IrssUtils.Properties.Resources.Plus;
this.toolStripButtonNewIR.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonNewIR.Name = "toolStripButtonNewIR";
this.toolStripButtonNewIR.Size = new System.Drawing.Size(51, 22);
@@ -701,7 +701,7 @@
//
// toolStripButtonEditIR
//
- this.toolStripButtonEditIR.Image = global::Translator.Properties.Resources.Edit;
+ this.toolStripButtonEditIR.Image = IrssUtils.Properties.Resources.Edit;
this.toolStripButtonEditIR.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonEditIR.Name = "toolStripButtonEditIR";
this.toolStripButtonEditIR.Size = new System.Drawing.Size(47, 22);
@@ -711,7 +711,7 @@
//
// toolStripButtonDeleteIR
//
- this.toolStripButtonDeleteIR.Image = global::Translator.Properties.Resources.Delete;
+ this.toolStripButtonDeleteIR.Image = IrssUtils.Properties.Resources.Delete;
this.toolStripButtonDeleteIR.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButtonDeleteIR.Name = "toolStripButtonDeleteIR";
this.toolStripButtonDeleteIR.Size = new System.Drawing.Size(60, 22);
@@ -849,7 +849,7 @@
//
// translatorHelpToolStripMenuItem
//
- this.translatorHelpToolStripMenuItem.Image = global::Translator.Properties.Resources.Help;
+ this.translatorHelpToolStripMenuItem.Image = IrssUtils.Properties.Resources.Help;
this.translatorHelpToolStripMenuItem.Name = "translatorHelpToolStripMenuItem";
this.translatorHelpToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.translatorHelpToolStripMenuItem.Text = "&Contents";
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2009-09-16 13:20:55 UTC (rev 3087)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2009-09-17 20:57:28 UTC (rev 3088)
@@ -109,7 +109,7 @@
private void RefreshProgramList()
{
imageListPrograms.Images.Clear();
- imageListPrograms.Images.Add(Resources.WinLogo);
+ imageListPrograms.Images.Add(IrssUtils.Properties.Resources.WinLogo);
Icon large;
Icon small;
@@ -275,11 +275,11 @@
private void SetupProgramsContextMenu()
{
- _addProgramToolStripMenuItem = new ToolStripMenuItem("&Add Program", Resources.Plus,
+ _addProgramToolStripMenuItem = new ToolStripMenuItem("&Add Program", IrssUtils.Properties.Resources.Plus,
new EventHandler(addProgramToolStripMenuItem_Click));
- _editProgramToolStripMenuItem = new ToolStripMenuItem("&Edit Program", Resources.Edit,
+ _editProgramToolStripMenuItem = new ToolStripMenuItem("&Edit Program", IrssUtils.Properties.Resources.Edit,
new EventHandler(editProgramToolStripMenuItem_Click));
- _removeProgramToolStripMenuItem = new ToolStripMenuItem("&Remove Program", Resources.Delete,
+ _removeProgramToolStripMenuItem = new ToolStripMenuItem("&Remove Program", IrssUtils.Properties.Resources.Delete,
new EventHandler(removeProgramToolStripMenuItem_Click));
contextMenuStripPrograms.Items.Add(_addProgramToolStripMenuItem);
@@ -1195,8 +1195,9 @@
private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
{
- MessageBox.Show(this, "Translator\nVersion 1.4.2.0 for IR Server Suite\nBy Aaron Dinnage, 2008",
- "About Translator", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ new AboutForm().ShowDialog();
+ //MessageBox.Show(this, "Translator\nVersion 1.4.2.0 for IR Server Suite\nBy Aaron Dinnage, 2008",
+ //"About Translator", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
private void addProgramToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1257,7 +1258,7 @@
string selectedItem = listViewPrograms.Items[_selectedProgram].Text;
if (_selectedProgram > 0)
- copyButtonsFromToolStripMenuItem.DropDownItems.Add(SystemWide, Resources.WinLogo, ClickCopyFrom);
+ copyButtonsFromToolStripMenuItem.DropDownItems.Add(SystemWide, IrssUtils.Properties.Resources.WinLogo, ClickCopyFrom);
foreach (ProgramSettings programSettings in Program.Config.Programs)
{
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MenuForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MenuForm.cs 2009-09-16 13:20:55 UTC (rev 3087)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MenuForm.cs 2009-09-17 20:57:28 UTC (rev 3088)
@@ -189,7 +189,7 @@
Win32.ExtractIcons(file, IconMacros, out large, out small);
_listMain.Images.Add(large);
- _listMain.Images.Add(Resources.WinLogo);
+ _listMain.Images.Add(IrssUtils.Properties.Resources.WinLogo);
}
private void SetToIconStyle()
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs 2009-09-16 13:20:55 UTC (rev 3087)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs 2009-09-17 20:57:28 UTC (rev 3088)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Dieser Code wurde von einem Tool generiert.
-// Laufzeitversion:2.0.50727.4016
+// Laufzeitversion:2.0.50727.4927
//
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// der Code erneut generiert wird.
@@ -60,55 +60,6 @@
}
}
- internal static System.Drawing.Bitmap ClickLeft {
- get {
- object obj = ResourceManager.GetObject("ClickLeft", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap ClickMiddle {
- get {
- object obj = ResourceManager.GetObject("ClickMiddle", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap ClickRight {
- get {
- object obj = ResourceManager.GetObject("ClickRight", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap Delete {
- get {
- object obj = ResourceManager.GetObject("Delete", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap DeleteAll {
- get {
- object obj = ResourceManager.GetObject("DeleteAll", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap Edit {
- get {
- object obj = ResourceManager.GetObject("Edit", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap Help {
- get {
- object obj = ResourceManager.GetObject("Help", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
internal static System.Drawing.Icon Icon16 {
get {
object obj = ResourceManager.GetObject("Icon16", resourceCulture);
@@ -122,82 +73,5 @@
return ((System.Drawing.Icon)(obj));
}
}
-
- internal static System.Drawing.Bitmap MoveDown {
- get {
- object obj = ResourceManager.GetObject("MoveDown", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap MoveLeft {
- get {
- object obj = ResourceManager.GetObject("MoveLeft", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap MoveRight {
- get {
- object obj = ResourceManager.GetObject("MoveRight", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap MoveUp {
- get {
- object obj = ResourceManager.GetObject("MoveUp", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap NoIcon {
- get {
- object obj = ResourceManager.GetObject("NoIcon", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap Plus {
- get {
- object obj = ResourceManager.GetObject("Plus", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap Remap {
- get {
- object obj = ResourceManager.GetObject("Remap", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap ScrollDown {
- get {
- object obj = ResourceManager.GetObject("ScrollDown", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap ScrollUp {
- get {
- object obj = ResourceManager.GetObject("ScrollUp", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap Shortcut {
- get {
- object obj = ResourceManager.GetObject("Shortcut", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap WinLogo {
- get {
- object obj = ResourceManager.GetObject("WinLogo", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
}
}
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/Resources.resx
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/Resources.resx 2009-09-16 13:20:55 UTC (rev 3087)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Properties/Resources.resx 2009-09-17 20:57:28 UTC (rev 3088)
@@ -118,64 +118,10 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="ClickLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\clickleft.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="Icon16Connecting" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Icon16Connecting.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="ClickMiddle" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\clickmiddle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="ClickRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\clickright.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="Delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="DeleteAll" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\deleteall.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="Edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="Icon16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Icon16.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="Icon16Connecting" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Icon16Connecting.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="MoveDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\movedown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="MoveLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\moveleft.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="MoveRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\moveright.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="MoveUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\moveup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="NoIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\noicon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="Plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="Remap" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\remap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="ScrollDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\scrolldown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="ScrollUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\scrollup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="Shortcut" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\shortcut.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="WinLogo" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\graphics\winlogo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
</root>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj 2009-09-16 13:20:55 UTC (rev 3087)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj 2009-09-17 20:57:28 UTC (rev 3088)
@@ -171,26 +171,6 @@
<ItemGroup>
<None Include="Icon16Connecting.ico" />
</ItemGroup>
- <ItemGroup>
- <Content Include="Graphics\ClickLeft.png" />
- <Content Include="Graphics\ClickMiddle.png" />
- <Content Include="Graphics\ClickRight.png" />
- <Content Include="Graphics\Delete.png" />
- <Content Include="Graphics\DeleteAll.png" />
- <Content Include="Graphics\Edit.png" />
- <Content Include="Graphics\Help.png" />
- <Content Include="Graphics\MoveDown.png" />
- <Content Include="Graphics\MoveLeft.png" />
- <Content Include="Graphics\MoveRight.png" />
- <Content Include="Graphics\MoveUp.png" />
- <Content Include="Graphics\NoIcon.png" />
- <Content Include="Graphics\Plus.png" />
- <Content Include="Graphics\Remap.png" />
- <Content Include="Graphics\ScrollDown.png" />
- <Content Include="Graphics\ScrollUp.png" />
- <Content Include="Graphics\Shortcut.png" />
- <Content Include="Graphics\WinLogo.png" />
- </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Added: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/AboutForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/AboutForm.Designer.cs (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/AboutForm.Designer.cs 2009-09-17 20:57:28 UTC (rev 3088)
@@ -0,0 +1,192 @@
+namespace IrssUtils.Forms
+{
+ partial class AboutForm
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.forumLinkLabel = new System.Windows.Forms.LinkLabel();
+ this.manualLinkLabel = new System.Windows.Forms.LinkLabel();
+ this.productNameLabel = new System.Windows.Forms.Label();
+ this.productVersionLabel = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.teamLinkLabel = new System.Windows.Forms.LinkLabel();
+ this.label4 = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
+ this.okButton = new System.Windows.Forms.Button();
+ this.groupBox1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // forumLinkLabel
+ //
+ this.forumLinkLabel.AutoSize = true;
+ this.forumLinkLabel.Location = new System.Drawing.Point(18, 43);
+ this.forumLinkLabel.Name = "forumLinkLabel";
+ this.forumLinkLabel.Size = new System.Drawing.Size(64, 13);
+ this.forumLinkLabel.TabIndex = 1;
+ this.forumLinkLabel.TabStop = true;
+ this.forumLinkLabel.Text = "IRSS Forum";
+ this.forumLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.forumLinkLabel_LinkClicked);
+ //
+ // manualLinkLabel
+ //
+ this.manualLinkLabel.AutoSize = true;
+ this.manualLinkLabel.Location = new System.Drawing.Point(18, 23);
+ this.manualLinkLabel.Name = "manualLinkLabel";
+ this.manualLinkLabel.Size = new System.Drawing.Size(75, 13);
+ this.manualLinkLabel.TabIndex = 0;
+ this.manualLinkLabel.TabStop = true;
+ this.manualLinkLabel.Text = "Online Manual";
+ this.manualLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.manualLinkLabel_LinkClicked);
+ //
+ // productNameLabel
+ //
+ this.productNameLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.productNameLabel.Location = new System.Drawing.Point(111, 57);
+ this.productNameLabel.Name = "productNameLabel";
+ this.productNameLabel.Size = new System.Drawing.Size(173, 13);
+ this.productNameLabel.TabIndex = 2;
+ this.productNameLabel.Text = "ProductName";
+ this.productNameLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ //
+ // productVersionLabel
+ //
+ this.productVersionLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.productVersionLabel.Location = new System.Drawing.Point(111, 75);
+ this.productVersionLabel.Name = "productVersionLabel";
+ this.productVersionLabel.Size = new System.Drawing.Size(173, 13);
+ this.productVersionLabel.TabIndex = 4;
+ this.productVersionLabel.Text = "ProductVersion";
+ this.productVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label3.Location = new System.Drawing.Point(12, 9);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(160, 26);
+ this.label3.TabIndex = 0;
+ this.label3.Text = "IR Server Suite";
+ //
+ // groupBox1
+ //
+ this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBox1.Controls.Add(this.teamLinkLabel);
+ this.groupBox1.Controls.Add(this.forumLinkLabel);
+ this.groupBox1.Controls.Add(this.manualLinkLabel);
+ this.groupBox1.Location = new System.Drawing.Point(12, 115);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(272, 89);
+ this.groupBox1.TabIndex = 5;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Online Ressources";
+ //
+ // teamLinkLabel
+ //
+ this.teamLinkLabel.AutoSize = true;
+ this.teamLinkLabel.Location = new System.Drawing.Point(18, 63);
+ this.teamLinkLabel.Name = "teamLinkLabel";
+ this.teamLinkLabel.Size = new System.Drawing.Size(93, 13);
+ this.teamLinkLabel.TabIndex = 2;
+ this.teamLinkLabel.TabStop = true;
+ this.teamLinkLabel.Text = "Team MediaPortal";
+ this.teamLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.teamLinkLabel_LinkClicked);
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(14, 57);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(62, 13);
+ this.label4.TabIndex = 1;
+ this.label4.Text = "Application:";
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(14, 75);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(45, 13);
+ this.label5.TabIndex = 3;
+ this.label5.Text = "Version:";
+ //
+ // okButton
+ //
+ this.okButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
+ this.okButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.okButton.Location = new System.Drawing.Point(111, 212);
+ this.okButton.Name = "okButton";
+ this.okButton.Size = new System.Drawing.Size(75, 23);
+ this.okButton.TabIndex = 0;
+ this.okButton.Text = "OK";
+ this.okButton.UseVisualStyleBackColor = true;
+ this.okButton.Click += new System.EventHandler(this.okButton_Click);
+ //
+ // AboutForm
+ //
+ this.AcceptButton = this.okButton;
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.CancelButton = this.okButton;
+ this.ClientSize = new System.Drawing.Size(296, 247);
+ this.Controls.Add(this.okButton);
+ this.Controls.Add(this.label5);
+ this.Controls.Add(this.label4);
+ this.Controls.Add(this.groupBox1);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.productVersionLabel);
+ this.Controls.Add(this.productNameLabel);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "AboutForm";
+ this.ShowInTaskbar = false;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "AboutForm";
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.LinkLabel forumLinkLabel;
+ private System.Windows.Forms.LinkLabel manualLinkLabel;
+ private System.Windows.Forms.Label productNameLabel;
+ private System.Windows.Forms.Label productVersionLabel;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.LinkLabel teamLinkLabel;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.Button okButton;
+ }
+}
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/AboutForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/AboutForm.cs (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/AboutForm.cs 2009-09-17 20:57:28 UTC (rev 3088)
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Diagnostics;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace IrssUtils.Forms
+{
+ public partial class AboutForm : Form
+ {
+ public AboutForm()
+ {
+ InitializeComponent();
+
+ productNameLabel.Text = Application.ProductName;
+ productVersionLabel.Text = Application.ProductVersion;
+ }
+
+ private void okButton_Click(object sender, EventArgs e)
+ {
+ Close();
+ }
+
+ private void manualLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+ {
+ Process.Start("http://wiki.team-mediaportal.com/IRServerSuite");
+ }
+
+ private void forumLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+ {
+ Process.Start("http://forum.team-mediaportal.com/ir-server-suite-irss-165/");
+ }
+
+ private void teamLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+ {
+ Process.Start("http://www.team-mediaportal.com/");
+ }
+ }
+}
Added: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/AboutForm.resx
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/AboutForm.resx (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/AboutForm.resx 2009-09-17 20:57:28 UTC (rev 3088)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
Copied: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Advanced.png (from rev 3087, trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Graphics/Advanced.png)
===================================================================
(Binary files differ)
Copied: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Delete.png (from rev 3087, trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Graphics/Delete.png)
===================================================================
(Binary files differ)
Copied: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/DeleteAll.png (from rev 3087, trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Graphics/DeleteAll.png)
===================================================================
(Binary files differ)
Copied: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Detect.png (from rev 3087, trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Graphics/Detect.png)
===================================================================
(Binary files differ)
Copied: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Edit.png (from rev 3087, trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Graphics/Edit.png)
===================================================================
(Binary files differ)
Added: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Help.png
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Help.png (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Help.png 2009-09-17 20:57:28 UTC (rev 3088)
@@ -0,0 +1,13 @@
+\x89PNG
+
+ |
|
From: <che...@us...> - 2009-09-17 22:14:22
|
Revision: 3090
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3090&view=rev
Author: chef_koch
Date: 2009-09-17 22:14:12 +0000 (Thu, 17 Sep 2009)
Log Message:
-----------
added more toolstrip gaphics
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.resx
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Export.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/ExportDocument.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Import.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/ImportDocument.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/NewDocument.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/OpenDocument.png
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2009-09-17 21:19:26 UTC (rev 3089)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2009-09-17 22:14:12 UTC (rev 3090)
@@ -781,6 +781,7 @@
//
// newToolStripMenuItem
//
+ this.newToolStripMenuItem.Image = IrssUtils.Properties.Resources.NewDocument;
this.newToolStripMenuItem.Name = "newToolStripMenuItem";
this.newToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
this.newToolStripMenuItem.Text = "&New";
@@ -788,6 +789,7 @@
//
// openToolStripMenuItem
//
+ this.openToolStripMenuItem.Image = IrssUtils.Properties.Resources.OpenDocument;
this.openToolStripMenuItem.Name = "openToolStripMenuItem";
this.openToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
this.openToolStripMenuItem.Text = "&Open ...";
@@ -795,6 +797,7 @@
//
// importToolStripMenuItem
//
+ this.importToolStripMenuItem.Image = IrssUtils.Properties.Resources.ImportDocument;
this.importToolStripMenuItem.Name = "importToolStripMenuItem";
this.importToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
this.importToolStripMenuItem.Text = "&Import ...";
@@ -802,6 +805,7 @@
//
// exportToolStripMenuItem
//
+ this.exportToolStripMenuItem.Image = IrssUtils.Properties.Resources.ExportDocument;
this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
this.exportToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
this.exportToolStripMenuItem.Text = "&Export ...";
@@ -857,6 +861,7 @@
//
// aboutToolStripMenuItem
//
+ this.aboutToolStripMenuItem.Image = IrssUtils.Properties.Resources.Info;
this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
this.aboutToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.aboutToolStripMenuItem.Text = "&About";
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj 2009-09-17 21:19:26 UTC (rev 3089)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj 2009-09-17 22:14:12 UTC (rev 3090)
@@ -65,6 +65,7 @@
<Compile Include="Configuration.cs" />
<Compile Include="AppProfile.cs" />
<Compile Include="Forms\Advanced.cs">
+ <SubType>Form</SubType>
</Compile>
<Compile Include="Forms\Advanced.Designer.cs">
<DependentUpon>Advanced.cs</DependentUpon>
@@ -76,6 +77,7 @@
<DependentUpon>ButtonMappingForm.cs</DependentUpon>
</Compile>
<Compile Include="Forms\EditProgramForm.cs">
+ <SubType>Form</SubType>
</Compile>
<Compile Include="Forms\EditProgramForm.Designer.cs">
<DependentUpon>EditProgramForm.cs</DependentUpon>
Added: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Export.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Export.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/ExportDocument.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/ExportDocument.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Import.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Import.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/ImportDocument.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/ImportDocument.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/NewDocument.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/NewDocument.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/OpenDocument.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/OpenDocument.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2009-09-17 21:19:26 UTC (rev 3089)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2009-09-17 22:14:12 UTC (rev 3090)
@@ -383,16 +383,20 @@
<Content Include="Graphics\DoubleClickMiddle.png" />
<Content Include="Graphics\DoubleClickRight.png" />
<Content Include="Graphics\Edit.png" />
+ <Content Include="Graphics\Export.png" />
+ <Content Include="Graphics\ExportDocument.png" />
<Content Include="Graphics\Help.png" />
- <Content Include="Graphics\Help48.png" />
+ <Content Include="Graphics\Import.png" />
+ <Content Include="Graphics\ImportDocument.png" />
<Content Include="Graphics\Info.png" />
- <Content Include="Graphics\Info48.png" />
<Content Include="Graphics\Left.png" />
<Content Include="Graphics\MoveDown.png" />
<Content Include="Graphics\MoveLeft.png" />
<Content Include="Graphics\MoveRight.png" />
<Content Include="Graphics\MoveUp.png" />
+ <Content Include="Graphics\NewDocument.png" />
<Content Include="Graphics\NoIcon.png" />
+ <Content Include="Graphics\OpenDocument.png" />
<Content Include="Graphics\Plus.png" />
<Content Include="Graphics\Remap.png" />
<Content Include="Graphics\Right.png" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.Designer.cs 2009-09-17 21:19:26 UTC (rev 3089)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.Designer.cs 2009-09-17 22:14:12 UTC (rev 3090)
@@ -165,6 +165,20 @@
}
}
+ public static System.Drawing.Bitmap Export {
+ get {
+ object obj = ResourceManager.GetObject("Export", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ public static System.Drawing.Bitmap ExportDocument {
+ get {
+ object obj = ResourceManager.GetObject("ExportDocument", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
public static System.Drawing.Bitmap Help {
get {
object obj = ResourceManager.GetObject("Help", resourceCulture);
@@ -172,6 +186,20 @@
}
}
+ public static System.Drawing.Bitmap Import {
+ get {
+ object obj = ResourceManager.GetObject("Import", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ public static System.Drawing.Bitmap ImportDocument {
+ get {
+ object obj = ResourceManager.GetObject("ImportDocument", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
public static System.Drawing.Bitmap Info {
get {
object obj = ResourceManager.GetObject("Info", resourceCulture);
@@ -214,6 +242,13 @@
}
}
+ public static System.Drawing.Bitmap NewDocument {
+ get {
+ object obj = ResourceManager.GetObject("NewDocument", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
public static System.Drawing.Bitmap NoIcon {
get {
object obj = ResourceManager.GetObject("NoIcon", resourceCulture);
@@ -221,6 +256,13 @@
}
}
+ public static System.Drawing.Bitmap OpenDocument {
+ get {
+ object obj = ResourceManager.GetObject("OpenDocument", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
public static System.Drawing.Bitmap Plus {
get {
object obj = ResourceManager.GetObject("Plus", resourceCulture);
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.resx
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.resx 2009-09-17 21:19:26 UTC (rev 3089)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.resx 2009-09-17 22:14:12 UTC (rev 3090)
@@ -163,9 +163,21 @@
<data name="Edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\graphics\edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="Export" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\graphics\export.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="ExportDocument" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\graphics\exportdocument.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\graphics\help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="Import" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\graphics\import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="ImportDocument" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\graphics\importdocument.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="Info" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\graphics\info.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -184,9 +196,15 @@
<data name="MoveUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\graphics\moveup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="NewDocument" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\graphics\newdocument.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="NoIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\graphics\noicon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="OpenDocument" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\graphics\opendocument.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="Plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\graphics\plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj 2009-09-17 21:19:26 UTC (rev 3089)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj 2009-09-17 22:14:12 UTC (rev 3090)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{46F1DB42-F082-4200-B939-6E4B72A8117C}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -152,6 +152,7 @@
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj 2009-09-17 21:19:26 UTC (rev 3089)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj 2009-09-17 22:14:12 UTC (rev 3090)
@@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D88EDBC1-D583-4149-9873-8239FA63F4FE}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -107,6 +107,7 @@
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-09-17 22:50:28
|
Revision: 3091
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3091&view=rev
Author: chef_koch
Date: 2009-09-17 22:50:19 +0000 (Thu, 17 Sep 2009)
Log Message:
-----------
added icons to ir file tool
added save and save as icons
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.resx
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Save.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/SaveAll.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/SaveAs.png
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.Designer.cs 2009-09-17 22:14:12 UTC (rev 3090)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.Designer.cs 2009-09-17 22:50:19 UTC (rev 3091)
@@ -84,46 +84,55 @@
this.toolStripSeparator1,
this.quitToolStripMenuItem});
this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
- this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);
+ this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
this.fileToolStripMenuItem.Text = "&File";
//
// newToolStripMenuItem
//
+ this.newToolStripMenuItem.Image = IrssUtils.Properties.Resources.NewDocument;
this.newToolStripMenuItem.Name = "newToolStripMenuItem";
- this.newToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
+ this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
+ this.newToolStripMenuItem.Size = new System.Drawing.Size(246, 22);
this.newToolStripMenuItem.Text = "&New";
this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click);
//
// openToolStripMenuItem
//
+ this.openToolStripMenuItem.Image = IrssUtils.Properties.Resources.OpenDocument;
this.openToolStripMenuItem.Name = "openToolStripMenuItem";
- this.openToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
- this.openToolStripMenuItem.Text = "&Open ...";
+ this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
+ this.openToolStripMenuItem.Size = new System.Drawing.Size(246, 22);
+ this.openToolStripMenuItem.Text = "&Open...";
this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
//
// saveToolStripMenuItem
//
+ this.saveToolStripMenuItem.Image = IrssUtils.Properties.Resources.Save;
this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
- this.saveToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
+ this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
+ this.saveToolStripMenuItem.Size = new System.Drawing.Size(246, 22);
this.saveToolStripMenuItem.Text = "&Save";
this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
//
// saveasToolStripMenuItem
//
+ this.saveasToolStripMenuItem.Image = IrssUtils.Properties.Resources.SaveAs;
this.saveasToolStripMenuItem.Name = "saveasToolStripMenuItem";
- this.saveasToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
- this.saveasToolStripMenuItem.Text = "Save &as ...";
+ this.saveasToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
+ | System.Windows.Forms.Keys.S)));
+ this.saveasToolStripMenuItem.Size = new System.Drawing.Size(246, 22);
+ this.saveasToolStripMenuItem.Text = "Save &as...";
this.saveasToolStripMenuItem.Click += new System.EventHandler(this.saveasToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(135, 6);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(243, 6);
//
// quitToolStripMenuItem
//
this.quitToolStripMenuItem.Name = "quitToolStripMenuItem";
- this.quitToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
+ this.quitToolStripMenuItem.Size = new System.Drawing.Size(246, 22);
this.quitToolStripMenuItem.Text = "&Quit";
this.quitToolStripMenuItem.Click += new System.EventHandler(this.quitToolStripMenuItem_Click);
//
@@ -140,21 +149,21 @@
// connectToolStripMenuItem
//
this.connectToolStripMenuItem.Name = "connectToolStripMenuItem";
- this.connectToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
+ this.connectToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.connectToolStripMenuItem.Text = "&Connect";
this.connectToolStripMenuItem.Click += new System.EventHandler(this.connectToolStripMenuItem_Click);
//
// disconnectToolStripMenuItem
//
this.disconnectToolStripMenuItem.Name = "disconnectToolStripMenuItem";
- this.disconnectToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
+ this.disconnectToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.disconnectToolStripMenuItem.Text = "&Disconnect";
this.disconnectToolStripMenuItem.Click += new System.EventHandler(this.disconnectToolStripMenuItem_Click);
//
// changeServerToolStripMenuItem
//
this.changeServerToolStripMenuItem.Name = "changeServerToolStripMenuItem";
- this.changeServerToolStripMenuItem.Size = new System.Drawing.Size(156, 22);
+ this.changeServerToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.changeServerToolStripMenuItem.Text = "Change &server";
this.changeServerToolStripMenuItem.Click += new System.EventHandler(this.changeServerToolStripMenuItem_Click);
//
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2009-09-17 22:14:12 UTC (rev 3090)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2009-09-17 22:50:19 UTC (rev 3091)
@@ -783,6 +783,7 @@
//
this.newToolStripMenuItem.Image = IrssUtils.Properties.Resources.NewDocument;
this.newToolStripMenuItem.Name = "newToolStripMenuItem";
+ this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
this.newToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
this.newToolStripMenuItem.Text = "&New";
this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click);
@@ -791,8 +792,9 @@
//
this.openToolStripMenuItem.Image = IrssUtils.Properties.Resources.OpenDocument;
this.openToolStripMenuItem.Name = "openToolStripMenuItem";
+ this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.openToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
- this.openToolStripMenuItem.Text = "&Open ...";
+ this.openToolStripMenuItem.Text = "&Open...";
this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
//
// importToolStripMenuItem
@@ -800,7 +802,7 @@
this.importToolStripMenuItem.Image = IrssUtils.Properties.Resources.ImportDocument;
this.importToolStripMenuItem.Name = "importToolStripMenuItem";
this.importToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
- this.importToolStripMenuItem.Text = "&Import ...";
+ this.importToolStripMenuItem.Text = "&Import...";
this.importToolStripMenuItem.Click += new System.EventHandler(this.importToolStripMenuItem_Click);
//
// exportToolStripMenuItem
@@ -808,7 +810,7 @@
this.exportToolStripMenuItem.Image = IrssUtils.Properties.Resources.ExportDocument;
this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
this.exportToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
- this.exportToolStripMenuItem.Text = "&Export ...";
+ this.exportToolStripMenuItem.Text = "&Export...";
this.exportToolStripMenuItem.Click += new System.EventHandler(this.exportToolStripMenuItem_Click);
//
// toolStripSeparator1
@@ -820,14 +822,14 @@
//
this.serverToolStripMenuItem.Name = "serverToolStripMenuItem";
this.serverToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
- this.serverToolStripMenuItem.Text = "&Server ...";
+ this.serverToolStripMenuItem.Text = "&Server...";
this.serverToolStripMenuItem.Click += new System.EventHandler(this.serverToolStripMenuItem_Click);
//
// advancedToolStripMenuItem
//
this.advancedToolStripMenuItem.Name = "advancedToolStripMenuItem";
this.advancedToolStripMenuItem.Size = new System.Drawing.Size(139, 22);
- this.advancedToolStripMenuItem.Text = "&Advanced ...";
+ this.advancedToolStripMenuItem.Text = "&Advanced...";
this.advancedToolStripMenuItem.Click += new System.EventHandler(this.advancedToolStripMenuItem_Click);
//
// toolStripSeparator2
Added: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Save.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Save.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/SaveAll.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/SaveAll.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/SaveAs.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/SaveAs.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2009-09-17 22:14:12 UTC (rev 3090)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2009-09-17 22:50:19 UTC (rev 3091)
@@ -389,6 +389,8 @@
<Content Include="Graphics\Import.png" />
<Content Include="Graphics\ImportDocument.png" />
<Content Include="Graphics\Info.png" />
+ <Content Include="Graphics\SaveAs.png" />
+ <Content Include="Graphics\SaveAll.png" />
<Content Include="Graphics\Left.png" />
<Content Include="Graphics\MoveDown.png" />
<Content Include="Graphics\MoveLeft.png" />
@@ -400,6 +402,7 @@
<Content Include="Graphics\Plus.png" />
<Content Include="Graphics\Remap.png" />
<Content Include="Graphics\Right.png" />
+ <Content Include="Graphics\Save.png" />
<Content Include="Graphics\ScrollDown.png" />
<Content Include="Graphics\ScrollUp.png" />
<Content Include="Graphics\Shortcut.png" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.Designer.cs 2009-09-17 22:14:12 UTC (rev 3090)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.Designer.cs 2009-09-17 22:50:19 UTC (rev 3091)
@@ -284,6 +284,27 @@
}
}
+ public static System.Drawing.Bitmap Save {
+ get {
+ object obj = ResourceManager.GetObject("Save", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ public static System.Drawing.Bitmap SaveAll {
+ get {
+ object obj = ResourceManager.GetObject("SaveAll", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ public static System.Drawing.Bitmap SaveAs {
+ get {
+ object obj = ResourceManager.GetObject("SaveAs", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
public static System.Drawing.Bitmap ScrollDown {
get {
object obj = ResourceManager.GetObject("ScrollDown", resourceCulture);
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.resx
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.resx 2009-09-17 22:14:12 UTC (rev 3090)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.resx 2009-09-17 22:50:19 UTC (rev 3091)
@@ -214,6 +214,15 @@
<data name="Right" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Graphics\Right.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="Save" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\graphics\save.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="SaveAll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\graphics\saveall.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="SaveAs" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\graphics\saveas.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="ScrollDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\graphics\scrolldown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-09-18 11:33:20
|
Revision: 3094
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3094&view=rev
Author: chef_koch
Date: 2009-09-18 11:33:05 +0000 (Fri, 18 Sep 2009)
Log Message:
-----------
added a few more icons
make more usage of icons
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MacroScope.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.resx
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Properties/Resources.resx
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MainForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/MainForm.resx
trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MainForm.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MainForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MainForm.resx
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/ChangeServer.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/CloseDocument.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Connect.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Disconnect.png
Removed Paths:
-------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.resx
trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/FormMain.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/FormMain.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/FormMain.resx
Deleted: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.Designer.cs 2009-09-18 01:12:50 UTC (rev 3093)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.Designer.cs 2009-09-18 11:33:05 UTC (rev 3094)
@@ -1,404 +0,0 @@
-namespace IrFileTool
-{
- partial class FormMain
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- this.components = new System.ComponentModel.Container();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain));
- this.menuStrip = new System.Windows.Forms.MenuStrip();
- this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.saveasToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
- this.quitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.serverToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.connectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.disconnectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.changeServerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.textBoxPronto = new System.Windows.Forms.TextBox();
- this.toolTips = new System.Windows.Forms.ToolTip(this.components);
- this.buttonSetCarrier = new System.Windows.Forms.Button();
- this.checkBoxStoreBinary = new System.Windows.Forms.CheckBox();
- this.buttonAttemptDecode = new System.Windows.Forms.Button();
- this.buttonBlast = new System.Windows.Forms.Button();
- this.buttonLearn = new System.Windows.Forms.Button();
- this.textBoxCarrier = new System.Windows.Forms.TextBox();
- this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
- this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
- this.groupBoxCarrier = new System.Windows.Forms.GroupBox();
- this.groupBoxTestBlast = new System.Windows.Forms.GroupBox();
- this.comboBoxPort = new System.Windows.Forms.ComboBox();
- this.statusStrip = new System.Windows.Forms.StatusStrip();
- this.toolStripStatusLabelConnected = new System.Windows.Forms.ToolStripStatusLabel();
- this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.contentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.menuStrip.SuspendLayout();
- this.groupBoxCarrier.SuspendLayout();
- this.groupBoxTestBlast.SuspendLayout();
- this.statusStrip.SuspendLayout();
- this.SuspendLayout();
- //
- // menuStrip
- //
- this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.fileToolStripMenuItem,
- this.serverToolStripMenuItem,
- this.helpToolStripMenuItem});
- this.menuStrip.Location = new System.Drawing.Point(0, 0);
- this.menuStrip.Name = "menuStrip";
- this.menuStrip.Size = new System.Drawing.Size(512, 24);
- this.menuStrip.TabIndex = 0;
- this.menuStrip.Text = "menuStrip";
- //
- // fileToolStripMenuItem
- //
- this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.newToolStripMenuItem,
- this.openToolStripMenuItem,
- this.saveToolStripMenuItem,
- this.saveasToolStripMenuItem,
- this.toolStripSeparator1,
- this.quitToolStripMenuItem});
- this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
- this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
- this.fileToolStripMenuItem.Text = "&File";
- //
- // newToolStripMenuItem
- //
- this.newToolStripMenuItem.Name = "newToolStripMenuItem";
- this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
- this.newToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
- this.newToolStripMenuItem.Text = "&New";
- this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click);
- //
- // openToolStripMenuItem
- //
- this.openToolStripMenuItem.Name = "openToolStripMenuItem";
- this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
- this.openToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
- this.openToolStripMenuItem.Text = "&Open...";
- this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
- //
- // saveToolStripMenuItem
- //
- this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
- this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
- this.saveToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
- this.saveToolStripMenuItem.Text = "&Save";
- this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
- //
- // saveasToolStripMenuItem
- //
- this.saveasToolStripMenuItem.Name = "saveasToolStripMenuItem";
- this.saveasToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
- | System.Windows.Forms.Keys.S)));
- this.saveasToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
- this.saveasToolStripMenuItem.Text = "Save &As...";
- this.saveasToolStripMenuItem.Click += new System.EventHandler(this.saveasToolStripMenuItem_Click);
- //
- // toolStripSeparator1
- //
- this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(245, 6);
- //
- // quitToolStripMenuItem
- //
- this.quitToolStripMenuItem.Name = "quitToolStripMenuItem";
- this.quitToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
- this.quitToolStripMenuItem.Text = "E&xit";
- this.quitToolStripMenuItem.Click += new System.EventHandler(this.quitToolStripMenuItem_Click);
- //
- // serverToolStripMenuItem
- //
- this.serverToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.connectToolStripMenuItem,
- this.disconnectToolStripMenuItem,
- this.changeServerToolStripMenuItem});
- this.serverToolStripMenuItem.Name = "serverToolStripMenuItem";
- this.serverToolStripMenuItem.Size = new System.Drawing.Size(51, 20);
- this.serverToolStripMenuItem.Text = "&Server";
- //
- // connectToolStripMenuItem
- //
- this.connectToolStripMenuItem.Name = "connectToolStripMenuItem";
- this.connectToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.connectToolStripMenuItem.Text = "&Connect";
- this.connectToolStripMenuItem.Click += new System.EventHandler(this.connectToolStripMenuItem_Click);
- //
- // disconnectToolStripMenuItem
- //
- this.disconnectToolStripMenuItem.Name = "disconnectToolStripMenuItem";
- this.disconnectToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.disconnectToolStripMenuItem.Text = "&Disconnect";
- this.disconnectToolStripMenuItem.Click += new System.EventHandler(this.disconnectToolStripMenuItem_Click);
- //
- // changeServerToolStripMenuItem
- //
- this.changeServerToolStripMenuItem.Name = "changeServerToolStripMenuItem";
- this.changeServerToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
- this.changeServerToolStripMenuItem.Text = "Change &Server...";
- this.changeServerToolStripMenuItem.Click += new System.EventHandler(this.changeServerToolStripMenuItem_Click);
- //
- // textBoxPronto
- //
- this.textBoxPronto.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.textBoxPronto.Font = new System.Drawing.Font("Courier New", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.textBoxPronto.Location = new System.Drawing.Point(8, 32);
- this.textBoxPronto.Multiline = true;
- this.textBoxPronto.Name = "textBoxPronto";
- this.textBoxPronto.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.textBoxPronto.Size = new System.Drawing.Size(320, 240);
- this.textBoxPronto.TabIndex = 1;
- //
- // buttonSetCarrier
- //
- this.buttonSetCarrier.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonSetCarrier.Location = new System.Drawing.Point(112, 24);
- this.buttonSetCarrier.Name = "buttonSetCarrier";
- this.buttonSetCarrier.Size = new System.Drawing.Size(48, 24);
- this.buttonSetCarrier.TabIndex = 1;
- this.buttonSetCarrier.Text = "&Set";
- this.toolTips.SetToolTip(this.buttonSetCarrier, "Change the carrier frequency");
- this.buttonSetCarrier.UseVisualStyleBackColor = true;
- this.buttonSetCarrier.Click += new System.EventHandler(this.buttonSetCarrier_Click);
- //
- // checkBoxStoreBinary
- //
- this.checkBoxStoreBinary.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.checkBoxStoreBinary.Location = new System.Drawing.Point(344, 248);
- this.checkBoxStoreBinary.Name = "checkBoxStoreBinary";
- this.checkBoxStoreBinary.Size = new System.Drawing.Size(160, 24);
- this.checkBoxStoreBinary.TabIndex = 6;
- this.checkBoxStoreBinary.Text = "Store &mceir.dll compatible";
- this.toolTips.SetToolTip(this.checkBoxStoreBinary, "Store this IR Code in an MceIr.dll compatible form");
- this.checkBoxStoreBinary.UseVisualStyleBackColor = true;
- //
- // buttonAttemptDecode
- //
- this.buttonAttemptDecode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonAttemptDecode.Location = new System.Drawing.Point(368, 208);
- this.buttonAttemptDecode.Name = "buttonAttemptDecode";
- this.buttonAttemptDecode.Size = new System.Drawing.Size(112, 24);
- this.buttonAttemptDecode.TabIndex = 5;
- this.buttonAttemptDecode.Text = "&Attempt Decode";
- this.toolTips.SetToolTip(this.buttonAttemptDecode, "Try to decode the IR signal into a recognised format");
- this.buttonAttemptDecode.UseVisualStyleBackColor = true;
- this.buttonAttemptDecode.Click += new System.EventHandler(this.buttonAttemptDecode_Click);
- //
- // buttonBlast
- //
- this.buttonBlast.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonBlast.Location = new System.Drawing.Point(112, 24);
- this.buttonBlast.Name = "buttonBlast";
- this.buttonBlast.Size = new System.Drawing.Size(48, 24);
- this.buttonBlast.TabIndex = 1;
- this.buttonBlast.Text = "&Blast";
- this.toolTips.SetToolTip(this.buttonBlast, "Blast the current IR command for testing");
- this.buttonBlast.UseVisualStyleBackColor = true;
- this.buttonBlast.Click += new System.EventHandler(this.buttonBlast_Click);
- //
- // buttonLearn
- //
- this.buttonLearn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonLearn.Enabled = false;
- this.buttonLearn.Location = new System.Drawing.Point(368, 168);
- this.buttonLearn.Name = "buttonLearn";
- this.buttonLearn.Size = new System.Drawing.Size(112, 24);
- this.buttonLearn.TabIndex = 4;
- this.buttonLearn.Text = "&Learn IR";
- this.toolTips.SetToolTip(this.buttonLearn, "Learn a new IR command");
- this.buttonLearn.UseVisualStyleBackColor = true;
- this.buttonLearn.Click += new System.EventHandler(this.buttonLearn_Click);
- //
- // textBoxCarrier
- //
- this.textBoxCarrier.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.textBoxCarrier.Location = new System.Drawing.Point(8, 24);
- this.textBoxCarrier.Name = "textBoxCarrier";
- this.textBoxCarrier.Size = new System.Drawing.Size(96, 20);
- this.textBoxCarrier.TabIndex = 0;
- //
- // openFileDialog
- //
- this.openFileDialog.DefaultExt = "IR";
- this.openFileDialog.Filter = "IR Files|*.IR";
- this.openFileDialog.Title = "Open an IR file ...";
- //
- // saveFileDialog
- //
- this.saveFileDialog.DefaultExt = "IR";
- this.saveFileDialog.Filter = "IR Files|*.IR";
- this.saveFileDialog.Title = "Save an IR file ...";
- //
- // groupBoxCarrier
- //
- this.groupBoxCarrier.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.groupBoxCarrier.Controls.Add(this.textBoxCarrier);
- this.groupBoxCarrier.Controls.Add(this.buttonSetCarrier);
- this.groupBoxCarrier.Location = new System.Drawing.Point(336, 32);
- this.groupBoxCarrier.Name = "groupBoxCarrier";
- this.groupBoxCarrier.Size = new System.Drawing.Size(168, 56);
- this.groupBoxCarrier.TabIndex = 2;
- this.groupBoxCarrier.TabStop = false;
- this.groupBoxCarrier.Text = "Carrier frequency";
- //
- // groupBoxTestBlast
- //
- this.groupBoxTestBlast.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.groupBoxTestBlast.Controls.Add(this.buttonBlast);
- this.groupBoxTestBlast.Controls.Add(this.comboBoxPort);
- this.groupBoxTestBlast.Enabled = false;
- this.groupBoxTestBlast.Location = new System.Drawing.Point(336, 96);
- this.groupBoxTestBlast.Name = "groupBoxTestBlast";
- this.groupBoxTestBlast.Size = new System.Drawing.Size(168, 56);
- this.groupBoxTestBlast.TabIndex = 3;
- this.groupBoxTestBlast.TabStop = false;
- this.groupBoxTestBlast.Text = "Test blast";
- //
- // comboBoxPort
- //
- this.comboBoxPort.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.comboBoxPort.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboBoxPort.FormattingEnabled = true;
- this.comboBoxPort.Location = new System.Drawing.Point(8, 24);
- this.comboBoxPort.Name = "comboBoxPort";
- this.comboBoxPort.Size = new System.Drawing.Size(96, 21);
- this.comboBoxPort.TabIndex = 0;
- //
- // statusStrip
- //
- this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripStatusLabelConnected});
- this.statusStrip.Location = new System.Drawing.Point(0, 284);
- this.statusStrip.Name = "statusStrip";
- this.statusStrip.Size = new System.Drawing.Size(512, 22);
- this.statusStrip.TabIndex = 7;
- this.statusStrip.Text = "statusStrip";
- //
- // toolStripStatusLabelConnected
- //
- this.toolStripStatusLabelConnected.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
- this.toolStripStatusLabelConnected.Name = "toolStripStatusLabelConnected";
- this.toolStripStatusLabelConnected.Size = new System.Drawing.Size(497, 17);
- this.toolStripStatusLabelConnected.Spring = true;
- this.toolStripStatusLabelConnected.Text = "Not connected";
- this.toolStripStatusLabelConnected.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // helpToolStripMenuItem
- //
- this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.contentsToolStripMenuItem,
- this.aboutToolStripMenuItem});
- this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
- this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
- this.helpToolStripMenuItem.Text = "&Help";
- //
- // contentsToolStripMenuItem
- //
- this.contentsToolStripMenuItem.Name = "contentsToolStripMenuItem";
- this.contentsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.contentsToolStripMenuItem.Text = "&Contents";
- //
- // aboutToolStripMenuItem
- //
- this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
- this.aboutToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.aboutToolStripMenuItem.Text = "&About";
- //
- // FormMain
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(512, 306);
- this.Controls.Add(this.statusStrip);
- this.Controls.Add(this.buttonLearn);
- this.Controls.Add(this.groupBoxTestBlast);
- this.Controls.Add(this.groupBoxCarrier);
- this.Controls.Add(this.buttonAttemptDecode);
- this.Controls.Add(this.checkBoxStoreBinary);
- this.Controls.Add(this.textBoxPronto);
- this.Controls.Add(this.menuStrip);
- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MainMenuStrip = this.menuStrip;
- this.MinimumSize = new System.Drawing.Size(520, 332);
- this.Name = "FormMain";
- this.Text = "IR File Tool";
- this.menuStrip.ResumeLayout(false);
- this.menuStrip.PerformLayout();
- this.groupBoxCarrier.ResumeLayout(false);
- this.groupBoxCarrier.PerformLayout();
- this.groupBoxTestBlast.ResumeLayout(false);
- this.statusStrip.ResumeLayout(false);
- this.statusStrip.PerformLayout();
- this.ResumeLayout(false);
- this.PerformLayout();
-
- }
-
- #endregion
-
- private System.Windows.Forms.MenuStrip menuStrip;
- private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem newToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem saveasToolStripMenuItem;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
- private System.Windows.Forms.ToolStripMenuItem quitToolStripMenuItem;
- private System.Windows.Forms.TextBox textBoxPronto;
- private System.Windows.Forms.ToolTip toolTips;
- private System.Windows.Forms.TextBox textBoxCarrier;
- private System.Windows.Forms.Button buttonSetCarrier;
- private System.Windows.Forms.CheckBox checkBoxStoreBinary;
- private System.Windows.Forms.Button buttonAttemptDecode;
- private System.Windows.Forms.OpenFileDialog openFileDialog;
- private System.Windows.Forms.SaveFileDialog saveFileDialog;
- private System.Windows.Forms.ToolStripMenuItem serverToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem connectToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem disconnectToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem changeServerToolStripMenuItem;
- private System.Windows.Forms.GroupBox groupBoxCarrier;
- private System.Windows.Forms.GroupBox groupBoxTestBlast;
- private System.Windows.Forms.Button buttonBlast;
- private System.Windows.Forms.ComboBox comboBoxPort;
- private System.Windows.Forms.Button buttonLearn;
- private System.Windows.Forms.StatusStrip statusStrip;
- private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelConnected;
- private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem contentsToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
- }
-}
-
Deleted: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.cs 2009-09-18 01:12:50 UTC (rev 3093)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.cs 2009-09-18 11:33:05 UTC (rev 3094)
@@ -1,779 +0,0 @@
-#region Copyright (C) 2005-2009 Team MediaPortal
-
-// Copyright (C) 2005-2009 Team MediaPortal
-// http://www.team-mediaportal.com
-//
-// This Program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// This Program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with GNU Make; see the file COPYING. If not, write to
-// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-// http://www.gnu.org/copyleft/gpl.html
-
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Threading;
-using System.Windows.Forms;
-using System.Xml;
-using IrssComms;
-using IrssUtils;
-using IrssUtils.Forms;
-
-namespace IrFileTool
-{
- /// <summary>
- /// IR File Tool Main Form.
- /// </summary>
- internal partial class FormMain : Form
- {
- #region Constants
-
- private static readonly string ConfigurationFile = Path.Combine(Common.FolderAppData,
- "IR File Tool\\IR File Tool.xml");
-
- #endregion Constants
-
- #region Variables
-
- private Client _client;
- private IrCode _code = new IrCode();
- private string _fileName = String.Empty;
- private IRServerInfo _irServerInfo = new IRServerInfo();
-
- private bool _registered;
-
- private string _serverHost = String.Empty;
-
- #endregion Variables
-
- #region Constructor
-
- /// <summary>
- /// Initializes a new instance of the <see cref="FormMain"/> class.
- /// </summary>
- public FormMain()
- {
- InitializeComponent();
-
- SetImages();
-
- LoadSettings();
- }
-
- private void SetImages()
- {
- this.newToolStripMenuItem.Image = IrssUtils.Properties.Resources.NewDocument;
- this.openToolStripMenuItem.Image = IrssUtils.Properties.Resources.OpenDocument;
- this.saveToolStripMenuItem.Image = IrssUtils.Properties.Resources.Save;
- this.saveasToolStripMenuItem.Image = IrssUtils.Properties.Resources.SaveAs;
- this.contentsToolStripMenuItem.Image = IrssUtils.Properties.Resources.Help;
- this.aboutToolStripMenuItem.Image = IrssUtils.Properties.Resources.Info;
- }
-
- #endregion Constructor
-
- private void RefreshForm()
- {
- if (String.IsNullOrEmpty(_fileName))
- Text = "IR File Tool";
- else
- Text = "IR File Tool - " + _fileName;
-
- textBoxPronto.Text = Encoding.ASCII.GetString(_code.ToByteArray());
-
- switch (_code.Carrier)
- {
- case IrCode.CarrierFrequencyDCMode:
- textBoxCarrier.Text = "DC Mode";
- break;
-
- case IrCode.CarrierFrequencyUnknown:
- textBoxCarrier.Text = "Unknown";
- break;
-
- default:
- textBoxCarrier.Text = _code.Carrier.ToString();
- break;
- }
- }
-
- private void Save()
- {
- if (String.IsNullOrEmpty(_fileName))
- if (!GetSaveFileName())
- return;
-
- if (!checkBoxStoreBinary.Checked)
- {
- Pronto.WriteProntoFile(_fileName, Pronto.ConvertIrCodeToProntoRaw(_code));
- }
- else
- {
- using (FileStream file = File.OpenWrite(_fileName))
- {
- byte[] fileBytes = DataPacket(_code);
-
- file.Write(fileBytes, 0, fileBytes.Length);
- }
- }
- }
-
- private bool GetSaveFileName()
- {
- if (String.IsNullOrEmpty(saveFileDialog.InitialDirectory))
- saveFileDialog.InitialDirectory = Common.FolderIRCommands;
-
- if (saveFileDialog.ShowDialog(this) != DialogResult.OK)
- return false;
-
- _fileName = saveFileDialog.FileName;
- return true;
- }
-
-
- private void LoadSettings()
- {
- try
- {
- XmlDocument doc = new XmlDocument();
- doc.Load(ConfigurationFile);
-
- _serverHost = doc.DocumentElement.Attributes["ServerHost"].Value;
- }
- catch (FileNotFoundException)
- {
- IrssLog.Warn("Configuration file not found, using defaults");
-
- CreateDefaultSettings();
- }
- catch (Exception ex)
- {
- IrssLog.Error(ex);
-
- CreateDefaultSettings();
- }
- }
-
- private void SaveSettings()
- {
- try
- {
- using (XmlTextWriter writer = new XmlTextWriter(ConfigurationFile, Encoding.UTF8))
- {
- writer.Formatting = Formatting.Indented;
- writer.Indentation = 1;
- writer.IndentChar = (char) 9;
- writer.WriteStartDocument(true);
- writer.WriteStartElement("settings"); // <settings>
-
- writer.WriteAttributeString("ServerHost", _serverHost);
-
- writer.WriteEndElement(); // </settings>
- writer.WriteEndDocument();
- }
- }
- catch (Exception ex)
- {
- IrssLog.Error(ex);
- }
- }
-
- private void CreateDefaultSettings()
- {
- _serverHost = "localhost";
-
- SaveSettings();
- }
-
-
- private void UpdateWindow(string status)
- {
- toolStripStatusLabelConnected.Text = status;
-
- comboBoxPort.Items.Clear();
- comboBoxPort.Items.AddRange(_irServerInfo.Ports);
- comboBoxPort.SelectedIndex = 0;
-
- if (_registered)
- {
- groupBoxTestBlast.Enabled = _irServerInfo.CanTransmit;
- buttonLearn.Enabled = _irServerInfo.CanLearn;
- }
- else
- {
- groupBoxTestBlast.Enabled = false;
- buttonLearn.Enabled = false;
- }
- }
-
-
- private void CommsFailure(object obj)
- {
- Exception ex = obj as Exception;
-
- if (ex != null)
- IrssLog.Error("Communications failure: {0}", ex.Message);
- else
- IrssLog.Error("Communications failure");
-
- StopClient();
-
- MessageBox.Show(this, "Please report this error.", "IR File Tool - Communications failure", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- }
-
- private void Connected(object obj)
- {
- IrssLog.Info("Connected to server");
-
- IrssMessage message = new IrssMessage(MessageType.RegisterClient, MessageFlags.Request);
- _client.Send(message);
- }
-
- private void Disconnected(object obj)
- {
- IrssLog.Warn("Communications with server has been lost");
-
- Thread.Sleep(1000);
- }
-
- private bool StartClient(IPEndPoint endPoint)
- {
- if (_client != null)
- return false;
-
- ClientMessageSink sink = ReceivedMessage;
-
- _client = new Client(endPoint, sink);
- _client.CommsFailureCallback = CommsFailure;
- _client.ConnectCallback = Connected;
- _client.DisconnectCallback = Disconnected;
-
- if (_client.Start())
- {
- return true;
- }
- else
- {
- _client = null;
- return false;
- }
- }
-
- private void StopClient()
- {
- if (_client == null)
- return;
-
- _client.Dispose();
- _client = null;
- }
-
- private void ReceivedMessage(IrssMessage received)
- {
- IrssLog.Debug("Received Message \"{0}\"", received.Type);
-
- try
- {
- switch (received.Type)
- {
- case MessageType.RegisterClient:
- if ((received.Flags & MessageFlags.Success) == MessageFlags.Success)
- {
- _irServerInfo = IRServerInfo.FromBytes(received.GetDataAsBytes());
- _registered = true;
-
- string message = "Connected";
- IrssLog.Info(message);
- Invoke(new UpdateWindowDel(UpdateWindow), new string[] {message});
- }
- else if ((received.Flags & MessageFlags.Failure) == MessageFlags.Failure)
- {
- _registered = false;
-
- string message = "Failed to connect";
- IrssLog.Warn(message);
- Invoke(new UpdateWindowDel(UpdateWindow), new string[] {message});
- }
- return;
-
- case MessageType.BlastIR:
- if ((received.Flags & MessageFlags.Success) == MessageFlags.Success)
- {
- string message = "Blast successful";
- IrssLog.Info(message);
- Invoke(new UpdateWindowDel(UpdateWindow), new string[] {message});
- }
- else if ((received.Flags & MessageFlags.Failure) == MessageFlags.Failure)
- {
- string message = "Failed to blast IR command";
- IrssLog.Error(message);
- Invoke(new UpdateWindowDel(UpdateWindow), new string[] {message});
- }
- break;
-
- case MessageType.LearnIR:
- if ((received.Flags & MessageFlags.Success) == MessageFlags.Success)
- {
- byte[] dataBytes = received.GetDataAsBytes();
-
- _code = IrCode.FromByteArray(dataBytes);
-
- _fileName = null;
-
- string message = "Learned IR Successfully";
- IrssLog.Info(message);
- Invoke(new UpdateWindowDel(UpdateWindow), new string[] {message});
-
- RefreshForm();
- }
- else if ((received.Flags & MessageFlags.Failure) == MessageFlags.Failure)
- {
- string message = "Failed to learn IR command";
-
- IrssLog.Warn(message);
- Invoke(new UpdateWindowDel(UpdateWindow), new string[] {message});
- }
- else if ((received.Flags & MessageFlags.Timeout) == MessageFlags.Timeout)
- {
- string message = "Learn IR command timed-out";
-
- IrssLog.Warn(message);
- Invoke(new UpdateWindowDel(UpdateWindow), new string[] {message});
- }
- break;
-
- case MessageType.ServerShutdown:
- _registered = false;
- Invoke(new UpdateWindowDel(UpdateWindow), new string[] {"Server shut down"});
- return;
-
- case MessageType.Error:
- IrssLog.Error("Error from server: " + received.GetDataAsString());
- return;
- }
- }
- catch (Exception ex)
- {
- IrssLog.Error(ex);
- MessageBox.Show(this, ex.Message, "IR File Tool Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- }
-
-
- private void newToolStripMenuItem_Click(object sender, EventArgs e)
- {
- _code = new IrCode();
- _fileName = null;
-
- RefreshForm();
- }
-
- private void openToolStripMenuItem_Click(object sender, EventArgs e)
- {
- if (String.IsNullOrEmpty(openFileDialog.InitialDirectory))
- openFileDialog.InitialDirectory = Common.FolderIRCommands;
-
- if (openFileDialog.ShowDialog(this) != DialogResult.OK)
- return;
-
- using (FileStream file = File.OpenRead(openFileDialog.FileName))
- {
- if (file.Length == 0)
- {
- MessageBox.Show(this, "The selected file is empty", "Empty file", MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
-
- byte[] fileData = new byte[file.Length];
- file.Read(fileData, 0, (int) file.Length);
-
- IrCode newCode = IrCode.FromByteArray(fileData);
- if (newCode == null)
- {
- MessageBox.Show(this, "Not a valid IR code file", "Bad file", MessageBoxButtons.OK, MessageBoxIcon.Warning);
- return;
- }
-
- _code = newCode;
- }
-
- _fileName = openFileDialog.FileName;
-
- RefreshForm();
- }
-
- private void saveToolStripMenuItem_Click(object sender, EventArgs e)
- {
- Save();
- }
-
- private void saveasToolStripMenuItem_Click(object sender, EventArgs e)
- {
- if (GetSaveFileName())
- Save();
- }
-
- private void quitToolStripMenuItem_Click(object sender, EventArgs e)
- {
- Close();
- }
-
- private void buttonAttemptDecode_Click(object sender, EventArgs e)
- {
- // NOTES:
- // All start with a correct RC6 0xFCA93 header.
-
- /*
- int[][] timingData = new int[][]
- {
-
-new int[] { 2800, -750, 550, -350, 500, -400, 500, -800, 550, -800, 1400, -800, 550, -350, 500, -400, 500, -400, 500, -350, 500, -400, 500, -400, 500, -400, 500, -350, 500, -400, 500, -400, 950, -350, 500, -400, 500, -400, 500, -850, 450, -400, 500, -400, 500, -400, 6550, -850, 450, -400, 500, -400, 500, -850, 500, -800, 1400, -850, 500, -400, 450, -400, 500, -400, 500, -400, 500, -400, 450, -400, 500, -400, 500, -400, 500, -2800, 350, -400, 500, -400, 450, -450, 900, -25400 },
-
-new int[] { 2800, -750, 550, -350, 550, -350, 500, -800, 550, -800, 1400, -800, 550, -350, 550, -350, 500, -400, 500, -350, 550, -350, 500, -400, 500, -400, 500, -350, 550, -350, 500, -3750, 250, -400, 500, -800, 500, -400, 500, -400, 500, -400, 900, -850, 500, -400, 500, -400, 500, -350, 500, -400, 500, -400, 500, -400, 500, -350, 500, -400, 950, -31550 },
-
-new int[] { 2700, -850, 500, -400, 450, -400, 500, -850, 500, -850, 1350, -850, 500, -400, 500, -400, 450, -400, 500, -400, 500, -400, 500, -400, 450, -400, 500, -400, 500, -400, 500, -400, 900, -400, 500, -400, 500, -400, 450, -450, 450, -850, 500, -400, 450, -31750 },
-
-new int[] { 2700, -850, 450, -400, 500, -400, 500, -850, 450, -850, 1400, -850, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 1850, -400, 500, -400, 450, -450, 450, -450, 900, -25400 },
-
-new int[] { 2700, -850, 450, -400, 500, -400, 450, -900, 450, -900, 1350, -850, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -5350, 450, -400, 500, -850, 450, -450, 450, -400, 500, -400, 900, -900, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 900, -31750 },
-
-new int[] { 2700, -850, 450, -450, 450, -400, 500, -850, 450, -900, 1350, -850, 450, -450, 450, -450, 450, -400, 450, -450, 450, -450, 450, -450, 450, -400, 450, -450, 450, -450, 1100, -300, 450, -450, 450, -450, 450, -400, 500, -400, 900, -25400, },
-
-new int[] { 2700, -850, 450, -450, 450, -400, 500, -850, 450, -900, 1350, -850, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -4400, 450, -450, 450, -450, 450, -900, 400, -450, 450, -450, 450, -400, 950, -850, 450, -450, 450, -450, 450, -400, 450, -450, 450, -450, 450, -450, 450, -400, 450, -31750 },
-
-new int[] { 2650, -900, 450, -400, 500, -400, 450, -900, 450, -900, 1300, -900, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 900, -450, 450, -450, 450, -450, 450, -400, 500, -850, 5150, -31750 },
-
-new int[] { 2650, -900, 450, -400, 500, -400, 450, -900, 450, -900, 1300, -900, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -950, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 900, -25400 },
-
-new int[] { 2700, -900, 400, -450, 450, -450, 450, -900, 450, -850, 1350, -900, 450, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -3750, 250, -400, 500, -400, 450, -450, 450, -900, 450, -400, 500, -400, 450, -450, 900, -900, 450, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -31750 },
-
-new int[] { 2700, -900, 400, -450, 450, -450, 450, -850, 450, -900, 1350, -900, 400, -450, 450, -450, 450, -450, 450, -400, 450, -450, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 900, -400, 500, -400, 450, -450, 450, -450, 450, -31750 },
-
-new int[] { 2700, -850, 450, -450, 450, -450, 450, -850, 450, -900, 1350, -900, 400, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -450, 450, -400, 1000, -400, 450, -450, 450, -450, 450, -450, 450, -400, 500, -400, 900, -25400 },
-
-new int[] { 2700, -850, 450, -400, 500, -400, 450, -900, 450, -900, 1350, -850, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -3550, 450, -450, 450, -450, 450, -400, 500, -850, 450, -450, 450, -400, 500, -400, 900, -900, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -31750 },
-
-new int[] { 2700, -900, 450, -400, 450, -450, 450, -900, 450, -850, 1350, -900, 450, -400, 450, -450, 450, -450, 450, -450, 450, -400, 450, -450, 450, -450, 450, -450, 450, -400, 450, -450, 900, -450, 450, -400, 500, -400, 450, -450, 5300, -31750 },
-
-new int[] { 2700, -850, 450, -450, 450, -450, 450, -900, 400, -900, 1350, -900, 400, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -12900, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 900, -25400 },
-
-new int[] { 2700, -850, 450, -450, 450, -400, 450, -900, 450, -900, 1350, -850, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -2500, 650, -400, 450, -450, 450, -450, 450, -400, 500, -850, 450, -450, 450, -400, 500, -400, 900, -900, 450, -400, 500, -400, 450, -450, 450, -450, 450, -450, 450, -31750 },
-
-new int[] { 2700, -850, 450, -400, 500, -400, 450, -900, 450, -900, 1350, -850, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 950, -400, 450, -450, 450, -450, 450, -400, 4650, -31750 },
-
-new int[] { 2700, -900, 400, -450, 450, -450, 450, -900, 450, -850, 1350, -900, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -11950, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 900, -19050 },
-
-new int[] { 2700, -850, 450, -450, 450, -400, 500, -850, 450, -900, 1350, -850, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 2400, -300, 900, -400, 500, -400, 450, -450, 450, -450, 450, -900, 400, -450, 450, -450, 450, -400, 950, -850, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 4700, -31750 },
-
-new int[] { 2650, -900, 450, -400, 500, -400, 450, -900, 450, -900, 1300, -900, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 950, -400, 450, -450, 450, -450, 450, -31750 },
-
-new int[] { 2700, -900, 450, -400, 450, -450, 450, -900, 450, -850, 1350, -900, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 5350, -31750 },
-
-new int[] { 2700, -900, 400, -450, 450, -450, 450, -900, 450, -850, 1350, -900, 450, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -1300, 450, -450, 900, -450, 450, -400, 500, -400, 450, -450, 450, -900, 450, -400, 450, -450, 450, -450, 900, -900, 400, -450, 450, -450, 450, -450, 450, -400, 450, -31750 },
-
-new int[] { 2700, -850, 450, -450, 450, -400, 500, -850, 450, -900, 1350, -850, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 900, -400, 500, -400, 450, -450, 450, -31750 },
-
-new int[] { 2700, -850, 450, -400, 500, -400, 450, -900, 450, -900, 1300, -900, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 4700, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 900, -19050 },
-
-new int[] { 2700, -900, 450, -400, 450, -450, 450, -900, 450, -850, 1350, -900, 450, -400, 500, -400, 450, -450, 450, -450, 450, 3350, 350, -900, 1350, -900, 450, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 900, -400, 500, -400, 450, -31750 },
-
-new int[] { 2650, -900, 450, -400, 500, -400, 450, -900, 450, -900, 1300, -900, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 10650, -900, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 900, -19050 },
-
-new int[] { 2700, -900, 450, -400, 450, -450, 450, -900, 450, -850, 1350, -900, 450, -400, 450, -450, 450, -450, 450, -450, 450, -400, 450, -450, 450, -450, 550, -350, 450, -400, 450, -450, 900, -450, 450, -400, 500, -400, 450, -450, 450, -900, 450, -400, 450, -450, 450, -450, 900, -900, 450, -400, 450, -450, 450, -450, 4700, -31750 },
-
-new int[] { 2700, -850, 450, -450, 450, -400, 500, -850, 450, -900, 1350, -900, 400, -450, 450, -450, 450, -450, 450, -400, 450, -450, 450, -450, 450, -450, 450, -400, 450, -450, 450, -450, 900, -400, 500, -400, 450, -31750 },
-
-new int[] { 2650, -900, 450, -400, 500, -400, 450, -900, 450, -900, 1300, -900, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 10650, -900, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 900, -19050 },
-
-new int[] { 2700, -900, 450, -400, 450, -450, 450, -900, 450, -850, 1350, -900, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 900, -450, 450, -450, 450, -400, 500, -400, 450, -900, 450, -400, 500, -400, 450, -450, 900, -900, 450, -400, 450, -450, 450, -31750 },
-
-new int[] { 2700, -900, 400, -450, 450, -450, 450, -900, 450, -850, 1350, -900, 450, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 900, -450, 450, -400, 3350, -31750 },
-
-new int[] { 2650, -900, 450, -400, 450, -450, 450, -900, 450, -900, 1300, -900, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, 2400, 50, -450, 900, -900, 450, -400, 450, -450, 450, -450, 450, -450, 450, -400, 450, -450, 450, -450, 450, -450, 900, -19050 },
-
-new int[] { 2700, -900, 400, -450, 450, -450, 450, -900, 450, -850, 1350, -900, 450, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 900, -450, 450, -400, 500, -400, 450, -450, 450, -900, 450, -400, 450, -450, 450, -450, 900, -900, 400, -450, 450, -450, 4300, -31750 },
-
-new int[] { 2700, -900, 400, -450, 450, -450, 450, -900, 450, -850, 1350, -900, 450, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 900, -450, 3600, -31750 },
-
-new int[] { 2700, -850, 450, -450, 450, -400, 500, -850, 450, -900, 1350, -850, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 2300, -200, 450, -400, 900, -900, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 900, -19050 },
-
-new int[] { 2650, -900, 450, -400, 450, -450, 450, -900, 450, -900, 1300, -900, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 900, -450, 450, -450, 450, -400, 500, -400, 450, -900, 450, -400, 500, -400, 450, -450, 900, -900, 450, -400, 4650, -31750 },
-
-new int[] { 2700, -900, 400, -450, 450, -450, 450, -900, 400, -900, 1350, -900, 450, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 450, -450, 450, -400, 500, -400, 450, -450, 900, -3500, 550, -25400 },
-
- };
-
- for (int index = 0; index < timingData.GetLength(0); index++)
- {
- IrDecoder.DecodeIR(timingData[index], new RemoteCallback(RemoteEvent), new KeyboardCallback(KeyboardEvent), new MouseCallback(MouseEvent));
-
- //IrCode newCode = new IrCode(timingData[index]);
- //Pronto.WriteProntoFile(String.Format("C:\\{0}.ir", index), Pronto.ConvertIrCodeToProntoRaw(newCode));
- }
- */
- IrDecoder.DecodeIR(_code.TimingData, RemoteEvent, KeyboardEvent, MouseEvent);
- }
-
- private static byte[] DataPacket(IrCode code)
- {
- if (code.TimingData.Length == 0)
- return null;
-
- // Construct data bytes into "packet" ...
- List<byte> packet = new List<byte>();
-
- for (int index = 0; index < code.TimingData.Length; index++)
- {
- double time = code.TimingData[index];
-
- byte duration = (byte) Math.Abs(Math.Round(time / 50));
- bool pulse = (time > 0);
-
- while (duration > 0x7F)
- {
- packet.Add((byte) (pulse ? 0xFF : 0x7F));
-
- duration -= 0x7F;
- }
-
- packet.Add((byte) (pulse ? 0x80 | duration : duration));
- }
-
- // Insert byte count markers into packet data bytes ...
- int subpackets = (int) Math.Ceiling(packet.Count / (double) 4);
-
- byte[] output = new byte[packet.Count + subpackets + 1];
-
- int outputPos = 0;
-
- for (int packetPos = 0; packetPos < packet.Count;)
- {
- byte copyCount = (byte) (packet.Count - packetPos < 4 ? packet.Count - packetPos : 0x04);
-
- output[outputPos++] = (byte) (0x80 | copyCount);
-
- for (int index = 0; index < copyCount; index++)
- output[outputPos++] = packet[packetPos++];
- }
-
- output[outputPos] = 0x80;
-
- return output;
- }
-
- private void RemoteEvent(IrProtocol codeType, uint keyCode, bool firstPress)
- {
- MessageBox.Show(this,
- String.Format("Protocol: {0}\nCode: {1}", Enum.GetName(typeof (IrProtocol), codeType), keyCode),
- "Decode IR", MessageBoxButtons.OK, MessageBoxIcon.Information);
-
- int newCarrier;
- switch (codeType)
- {
- case IrProtocol.Daewoo:
- newCarrier = 38000;
- break;
- case IrProtocol.JVC:
- newCarrier = 38000;
- break;
- case IrProtocol.Matsushita:
- newCarrier = 56800;
- break;
- case IrProtocol.Mitsubishi:
- newCarrier = 40000;
- break;
- case IrProtocol.NEC:
- newCarrier = 38000;
- break;
- case IrProtocol.NRC17:
- newCarrier = 38000;
- break;
- case IrProtocol.Panasonic:
- newCarrier = 38000;
- break;
- case IrProtocol.RC5:
- newCarrier = 36000;
- break;
- case IrProtocol.RC5X:
- newCarrier = 36000;
- break;
- case IrProtocol.RC6:
- newCarrier = 36000;
- break;
- case IrProtocol.RC6A:
- newCarrier = 36000;
- break;
- case IrProtocol.RC6_MCE:
- newCarrier = 36000;
- break;
- case IrProtocol.RC6_16:
- newCarrier = 36000;
- break;
- case IrProtocol.RC6_20:
- newCarrier = 36000;
- break;
- case IrProtocol.RC6_24:
- newCarrier = 36000;
- break;
- case IrProtocol.RC6_32:
- newCarrier = 36000;
- break;
- case IrProtocol.RCA:
- newCarrier = 56000;
- break;
- case IrProtocol.RCMM:
- newCarrier = 36000;
- break;
- case IrProtocol.RECS80:
- newCarrier = 38000;
- break;
- case IrProtocol.Sharp:
- newCarrier = 38000;
- break;
- case IrProtocol.SIRC:
- newCarrier = 40000;
- break;
- case IrProtocol.Toshiba:
- newCarrier = 38000;
- break;
- case IrProtocol.XSAT:
- newCarrier = 38000;
- break;
-
- default:
- return;
- }
-
- // If the current carrier frequency is within +- 50 hz then it's close enough.
- if (_code.Carrier >= newCarrier - 50 && _code.Carrier <= newCarrier + 50)
- return;
-
- if (DialogResult.Yes ==
- MessageBox.Show(this, String.Format("Use this protocol's carrier frequency ({0})?", newCarrier), "Decode IR",
- MessageBoxButtons.YesNo, MessageBoxIcon.Question))
- {
- textBoxCarrier.Text = newCarrier.ToString();
-
- _code.Carrier = newCarrier;
-
- RefreshForm();
- }
- }
-
- private void KeyboardEvent(uint keyCode, uint modifiers)
- {
- MessageBox.Show(this, String.Format("Keyboard: {0}, {1}", keyCode, modifiers), "Decode IR", MessageBoxButtons.OK,
- MessageBoxIcon.Information);
- }
-
- private void MouseEvent(int deltaX, int deltaY, bool right, bool left)
- {
- MessageBox.Show(this, String.Format("Mouse: DX {0}, DY {1}, Right: {2}, Left: {3}", deltaX, deltaY, right, left),
- "Decode IR", MessageBoxButtons.OK, MessageBoxIcon.Information);
- }
-
- private void buttonSetCarrier_Click(object sender, EventArgs e)
- {
- if (textBoxCarrier.Text == "Unknown")
- return;
-
- if (textBoxCarrier.Text == "DC Mode")
- _code.Carrier = IrCode.CarrierFrequencyDCMode;
-
- _code.Carrier = int.Parse(textBoxCarrier.Text);
-
- RefreshForm();
- }
-
-
- private void connectToolStripMenuItem_Click(object sender, EventArgs e)
- {
- Invoke(new UpdateWindowDel(UpdateWindow), new string[] {"Connecting ..."});
-
- IPAddress serverIP = Client.GetIPFromName(_serverHost);
- IPEndPoint endPoint = new IPEndPoint(serverIP, Server.DefaultPort);
-
- StartClient(endPoint);
- }
-
- private void disconnectToolStripMenuItem_Click(object sender, EventArgs e)
- {
- if (_registered)
- {
- IrssMessage message = new IrssMessage(MessageType.UnregisterClient, MessageFlags.Request);
- _client.Send(message);
-
- _registered = false;
- }
-
- Invoke(new UpdateWindowDel(UpdateWindow), new string[] {"Disconnected"});
-
- StopClient();
- }
-
- private void changeServerToolStripMenuItem_Click(object sender, EventArgs e)
- {
- ServerAddress serverAddress = new ServerAddress(_serverHost);
- serverAddress.ShowDialog(this);
-
- _serverHost = serverAddress.ServerHost;
-
- SaveSettings();
- }
-
-
- private void buttonBlast_Click(object sender, EventArgs e)
- {
- if (!_registered)
- MessageBox.Show(this, "Not registered to an active IR Server", "Cannot blast", MessageBoxButtons.OK,
- MessageBoxIcon.Warning);
-
- Invoke(new UpdateWindowDel(UpdateWindow), new string[] {"Blasting ..."});
-
- string port = comboBoxPort.Text;
- byte[] codeBytes = _code.ToByteArray();
-
- byte[] outData = new byte[4 + port.Length + codeBytes.Length];
-
- BitConverter.GetBytes(port.Length).CopyTo(outData, 0);
- Encoding.ASCII.GetBytes(port).CopyTo(outData, 4);
-
- Array.Copy(codeBytes, 0, outData, 4 + port.Length, codeBytes.Length);
-
- IrssMessage message = new IrssMessage(MessageType.BlastIR, MessageFlags.Request, outData);
- _client.Send(message);
- }
-
- private void buttonLearn_Click(object sender, EventArgs e)
- {
- if (!_registered)
- MessageBox.Show(this, "Not registered to an active IR Server", "Cannot learn", MessageBoxButtons.OK,
- MessageBoxIcon.Warning);
-
- Invoke(new UpdateWindowDel(UpdateWindow), new string[] {"Learning ..."});
-
- IrssMessage message = new IrssMessage(MessageType.LearnIR, MessageFlags.Request);
- _client.Send(message);
- }
-
- #region Nested type: UpdateWindowDel
-
- private delegate void UpdateWindowDel(string status);
-
- #endregion
- }
-}
\ No newline at end of file
Deleted: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.resx
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.resx 2009-09-18 01:12:50 UTC (rev 3093)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/FormMain.resx 2009-09-18 11:33:05 UTC (rev 3094)
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type...
[truncated message content] |
|
From: <che...@us...> - 2009-09-18 12:35:32
|
Revision: 3095
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3095&view=rev
Author: chef_koch
Date: 2009-09-18 12:34:04 +0000 (Fri, 18 Sep 2009)
Log Message:
-----------
added OpenHelp when pressing F1 to skin editor
added useful connection icons
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/ChangeServer.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Connect.png
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Disconnect.png
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.Designer.cs 2009-09-18 11:33:05 UTC (rev 3094)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.Designer.cs 2009-09-18 12:34:04 UTC (rev 3095)
@@ -47,9 +47,10 @@
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.serverToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -66,7 +67,6 @@
this.buttonSetCode = new System.Windows.Forms.Button();
this.buttonSetShortcut = new System.Windows.Forms.Button();
this.comboBoxShortcut = new System.Windows.Forms.ComboBox();
- this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.panelRemote.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxRemote)).BeginInit();
this.menuStrip.SuspendLayout();
@@ -235,6 +235,19 @@
this.openToolStripMenuItem.Text = "&Open...";
this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
//
+ // closeToolStripMenuItem
+ //
+ this.closeToolStripMenuItem.Name = "closeToolStripMenuItem";
+ this.closeToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W)));
+ this.closeToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
+ this.closeToolStripMenuItem.Text = "&Close";
+ this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click);
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(245, 6);
+ //
// saveToolStripMenuItem
//
this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
@@ -252,14 +265,6 @@
this.saveAsToolStripMenuItem.Text = "Save &As...";
this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click);
//
- // closeToolStripMenuItem
- //
- this.closeToolStripMenuItem.Name = "closeToolStripMenuItem";
- this.closeToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W)));
- this.closeToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
- this.closeToolStripMenuItem.Text = "&Close";
- this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click);
- //
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
@@ -387,11 +392,6 @@
this.comboBoxShortcut.Size = new System.Drawing.Size(112, 21);
this.comboBoxShortcut.TabIndex = 9;
//
- // toolStripSeparator2
- //
- this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(245, 6);
- //
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -414,6 +414,7 @@
this.Text = "Virtual Remote Skin Editor";
this.Load += new System.EventHandler(this.MainForm_Load);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
+ this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.MainForm_HelpRequested);
this.panelRemote.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBoxRemote)).EndInit();
this.menuStrip.ResumeLayout(false);
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2009-09-18 11:33:05 UTC (rev 3094)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2009-09-18 12:34:04 UTC (rev 3095)
@@ -404,6 +404,11 @@
#endregion
+ private void MainForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+ {
+ IrssHelp.Open(sender);
+ }
+
#region Implementation
private void UpdateWindowTitle()
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/ChangeServer.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Connect.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Graphics/Disconnect.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-10-06 09:19:37
|
Revision: 3105
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3105&view=rev
Author: chemelli_sf
Date: 2009-10-06 09:19:26 +0000 (Tue, 06 Oct 2009)
Log Message:
-----------
Code cleanup: moved all interop to a common file
(only WiiMote is missing)
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs 2009-10-06 09:00:41 UTC (rev 3104)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs 2009-10-06 09:19:26 UTC (rev 3105)
@@ -24,8 +24,10 @@
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
+using System.IO;
using System.Runtime.InteropServices;
using System.Text;
+using Microsoft.Win32.SafeHandles;
namespace IrssUtils
{
@@ -1727,6 +1729,41 @@
#endregion
+ #region Nested type: EFileAttributes
+
+ [Flags]
+ public enum EFileAttributes : uint
+ {
+ Readonly = 0x00000001,
+ Hidden = 0x00000002,
+ System = 0x00000004,
+ Directory = 0x00000010,
+ Archive = 0x00000020,
+ Device = 0x00000040,
+ Normal = 0x00000080,
+ Temporary = 0x00000100,
+ SparseFile = 0x00000200,
+ ReparsePoint = 0x00000400,
+ Compressed = 0x00000800,
+ Offline = 0x00001000,
+ NotContentIndexed = 0x00002000,
+ Encrypted = 0x00004000,
+ Write_Through = 0x80000000,
+ Overlapped = 0x40000000,
+ NoBuffering = 0x20000000,
+ RandomAccess = 0x10000000,
+ SequentialScan = 0x08000000,
+ DeleteOnClose = 0x04000000,
+ BackupSemantics = 0x02000000,
+ PosixSemantics = 0x01000000,
+ OpenReparsePoint = 0x00200000,
+ OpenNoRecall = 0x00100000,
+ FirstPipeInstance = 0x00080000,
+ }
+
+ #endregion
+
+
#endregion Enumerations
#region Structures
@@ -1879,6 +1916,44 @@
}
#endregion
+ #region Nested type: DeviceInfoData
+
+ [StructLayout(LayoutKind.Sequential, Pack = 1)]
+ public struct DeviceInfoData
+ {
+ public int Size;
+ public Guid Class;
+ public int DevInst;
+ public IntPtr Reserved;
+ }
+
+ #endregion
+
+ #region Nested type: DeviceInterfaceData
+
+ [StructLayout(LayoutKind.Sequential, Pack = 1)]
+ public struct DeviceInterfaceData
+ {
+ public int Size;
+ public Guid Class;
+ public int Flags;
+ public IntPtr Reserved;
+ }
+
+ #endregion
+
+ #region Nested type: DeviceInterfaceDetailData
+
+ [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+ public struct DeviceInterfaceDetailData
+ {
+ public int Size;
+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+ public string DevicePath;
+ }
+
+ #endregion
+
#endregion Structures
#region Delegates
@@ -2108,6 +2183,72 @@
[In] IntPtr hProcess,
[Out] out bool lpSystemInfo);
+
+ #region HID
+
+ [DllImport("kernel32", SetLastError = true, CharSet = CharSet.Auto)]
+ public static extern SafeFileHandle CreateFile(
+ String fileName,
+ [MarshalAs(UnmanagedType.U4)] FileAccess fileAccess,
+ [MarshalAs(UnmanagedType.U4)] FileShare fileShare,
+ IntPtr securityAttributes,
+ [MarshalAs(UnmanagedType.U4)] FileMode creationDisposition,
+ [MarshalAs(UnmanagedType.U4)] EFileAttributes flags,
+ IntPtr template);
+
+ [DllImport("hid")]
+ public static extern void HidD_GetHidGuid(
+ ref Guid guid);
+
+ [DllImport("setupapi", CharSet = CharSet.Auto, SetLastError = true)]
+ public static extern IntPtr SetupDiGetClassDevs(
+ ref Guid ClassGuid,
+ int Enumerator,
+ IntPtr hwndParent,
+ int Flags);
+
+ [DllImport("setupapi", SetLastError = true)]
+ [return: MarshalAs(UnmanagedType.Bool)]
+ public static extern bool SetupDiEnumDeviceInfo(
+ IntPtr handle,
+ int Index,
+ ref DeviceInfoData deviceInfoData);
+
+ [DllImport("setupapi", SetLastError = true)]
+ [return: MarshalAs(UnmanagedType.Bool)]
+ public static extern bool SetupDiEnumDeviceInterfaces(
+ IntPtr handle,
+ ref DeviceInfoData deviceInfoData,
+ ref Guid guidClass,
+ int MemberIndex,
+ ref DeviceInterfaceData deviceInterfaceData);
+
+ [DllImport("setupapi", SetLastError = true)]
+ [return: MarshalAs(UnmanagedType.Bool)]
+ public static extern bool SetupDiGetDeviceInterfaceDetail(
+ IntPtr handle,
+ ref DeviceInterfaceData deviceInterfaceData,
+ IntPtr unused1,
+ int unused2,
+ ref uint requiredSize,
+ IntPtr unused3);
+
+ [DllImport("setupapi", SetLastError = true)]
+ [return: MarshalAs(UnmanagedType.Bool)]
+ public static extern bool SetupDiGetDeviceInterfaceDetail(
+ IntPtr handle,
+ ref DeviceInterfaceData deviceInterfaceData,
+ ref DeviceInterfaceDetailData deviceInterfaceDetailData,
+ uint detailSize,
+ IntPtr unused1,
+ IntPtr unused2);
+
+ [DllImport("setupapi")]
+ [return: MarshalAs(UnmanagedType.Bool)]
+ public static extern bool SetupDiDestroyDeviceInfoList(IntPtr handle);
+
+ #endregion
+
#endregion Interop
#region Methods
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2009-10-06 09:00:41 UTC (rev 3104)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2009-10-06 09:19:26 UTC (rev 3105)
@@ -41,13 +41,6 @@
private const int DeviceBufferSize = 4;
private const string DeviceID = "VID_0FE9&PID_9010";
- private const uint DIGCF_ALLCLASSES = 0x04;
- private const uint DIGCF_DEVICEINTERFACE = 0x10;
- private const uint DIGCF_PRESENT = 0x02;
- private const uint DIGCF_PROFILE = 0x08;
- private const uint GENERIC_ALL = 0x10000000;
- private const uint GENERIC_EXECUTE = 0x20000000;
-
// File Access Types
private const uint GENERIC_READ = 0x80000000;
private const uint GENERIC_WRITE = 0x40000000;
@@ -56,173 +49,6 @@
#endregion Constants
- #region Interop
-
- [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
- private static extern SafeFileHandle CreateFile(
- [MarshalAs(UnmanagedType.LPTStr)] string fileName,
- uint fileAccess,
- [MarshalAs(UnmanagedType.U4)] EFileShares fileShare,
- //[In, Out, MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(SecurityAttributesMarshaler))] SecurityAttributes lpSecurityAttributes,
- IntPtr sa,
- [MarshalAs(UnmanagedType.U4)] ECreationDisposition creationDisposition,
- [MarshalAs(UnmanagedType.U4)] EFileAttributes flags,
- IntPtr templateFile);
-
- [DllImport("kernel32.dll")]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool CancelIo(SafeFileHandle handle);
-
- [DllImport("hid.dll")]
- private static extern void HidD_GetHidGuid(
- ref Guid guid);
-
- [DllImport("setupapi.dll", CharSet = CharSet.Auto)]
- private static extern IntPtr SetupDiGetClassDevs(
- ref Guid ClassGuid,
- [MarshalAs(UnmanagedType.LPTStr)] string Enumerator,
- IntPtr hwndParent,
- UInt32 Flags);
-
- [DllImport("setupapi.dll", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiEnumDeviceInfo(
- IntPtr handle,
- int Index,
- ref DeviceInfoData deviceInfoData);
-
- [DllImport("setupapi.dll", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiEnumDeviceInterfaces(
- IntPtr handle,
- ref DeviceInfoData deviceInfoData,
- ref Guid guidClass,
- int MemberIndex,
- ref DeviceInterfaceData deviceInterfaceData);
-
- [DllImport("setupapi.dll", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiGetDeviceInterfaceDetail(
- IntPtr handle,
- ref DeviceInterfaceData deviceInterfaceData,
- IntPtr unused1,
- int unused2,
- ref uint requiredSize,
- IntPtr unused3);
-
- [DllImport("setupapi.dll", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiGetDeviceInterfaceDetail(
- IntPtr handle,
- ref DeviceInterfaceData deviceInterfaceData,
- ref DeviceInterfaceDetailData deviceInterfaceDetailData,
- uint detailSize,
- IntPtr unused1,
- IntPtr unused2);
-
- [DllImport("setupapi.dll")]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiDestroyDeviceInfoList(IntPtr handle);
-
- #region Nested type: DeviceInfoData
-
- [StructLayout(LayoutKind.Sequential, Pack = 1)]
- private struct DeviceInfoData
- {
- public int Size;
- public Guid Class;
- public int DevInst;
- public IntPtr Reserved;
- }
-
- #endregion
-
- #region Nested type: DeviceInterfaceData
-
- [StructLayout(LayoutKind.Sequential, Pack = 1)]
- private struct DeviceInterfaceData
- {
- public int Size;
- public Guid Class;
- public int Flags;
- public IntPtr Reserved;
- }
-
- #endregion
-
- #region Nested type: DeviceInterfaceDetailData
-
- [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
- private struct DeviceInterfaceDetailData
- {
- public int Size;
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)] public string DevicePath;
- }
-
- #endregion
-
- #region Nested type: ECreationDisposition
-
- private enum ECreationDisposition
- {
- New = 1,
- CreateAlways = 2,
- OpenExisting = 3,
- OpenAlways = 4,
- TruncateExisting = 5,
- }
-
- #endregion
-
- #region Nested type: EFileAttributes
-
- [Flags]
- private enum EFileAttributes : uint
- {
- Readonly = 0x00000001,
- Hidden = 0x00000002,
- System = 0x00000004,
- Directory = 0x00000010,
- Archive = 0x00000020,
- Device = 0x00000040,
- Normal = 0x00000080,
- Temporary = 0x00000100,
- SparseFile = 0x00000200,
- ReparsePoint = 0x00000400,
- Compressed = 0x00000800,
- Offline = 0x00001000,
- NotContentIndexed = 0x00002000,
- Encrypted = 0x00004000,
- Write_Through = 0x80000000,
- Overlapped = 0x40000000,
- NoBuffering = 0x20000000,
- RandomAccess = 0x10000000,
- SequentialScan = 0x08000000,
- DeleteOnClose = 0x04000000,
- BackupSemantics = 0x02000000,
- PosixSemantics = 0x01000000,
- OpenReparsePoint = 0x00200000,
- OpenNoRecall = 0x00100000,
- FirstPipeInstance = 0x00080000
- }
-
- #endregion
-
- #region Nested type: EFileShares
-
- [Flags]
- private enum EFileShares
- {
- None = 0x00000000,
- Read = 0x00000001,
- Write = 0x00000002,
- Delete = 0x00000004,
- }
-
- #endregion
-
- #endregion Interop
-
#region Variables
private byte[] _deviceBuffer;
@@ -297,7 +123,7 @@
try
{
Guid hidGuid = new Guid();
- HidD_GetHidGuid(ref hidGuid);
+ Win32.HidD_GetHidGuid(ref hidGuid);
string devicePath = FindDevice(hidGuid, DeviceID);
@@ -369,16 +195,15 @@
private void OpenDevice()
{
Guid hidGuid = new Guid();
- HidD_GetHidGuid(ref hidGuid);
+ Win32.HidD_GetHidGuid(ref hidGuid);
string devicePath = FindDevice(hidGuid, DeviceID);
if (devicePath == null)
throw new InvalidOperationException("No device detected");
- SafeFileHandle deviceHandle = CreateFile(devicePath, GENERIC_READ, EFileShares.Read | EFileShares.Write,
- IntPtr.Zero, ECreationDisposition.OpenExisting,
- EFileAttributes.Overlapped, IntPtr.Zero);
+ SafeFileHandle deviceHandle = Win32.CreateFile(devicePath, FileAccess.Read,FileShare.ReadWrite, IntPtr.Zero, FileMode.Open,
+ Win32.EFileAttributes.Overlapped, IntPtr.Zero);
int lastError = Marshal.GetLastWin32Error();
if (lastError != 0)
@@ -397,68 +222,66 @@
private static string FindDevice(Guid classGuid, string deviceID)
{
string devicePath = null;
+ // 0x12 = DIGCF_PRESENT | DIGCF_DEVICEINTERFACE
+ IntPtr handle = Win32.SetupDiGetClassDevs(ref classGuid, 0, IntPtr.Zero, 0x12);
- IntPtr handle = SetupDiGetClassDevs(ref classGuid, null, IntPtr.Zero, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT);
-
if (handle.ToInt32() == -1)
return null;
for (int deviceIndex = 0;; deviceIndex++)
{
- DeviceInfoData deviceInfoData = new DeviceInfoData();
+ Win32.DeviceInfoData deviceInfoData = new Win32.DeviceInfoData();
deviceInfoData.Size = Marshal.SizeOf(deviceInfoData);
- if (!SetupDiEnumDeviceInfo(handle, deviceIndex, ref deviceInfoData))
+ if (!Win32.SetupDiEnumDeviceInfo(handle, deviceIndex, ref deviceInfoData))
{
int lastError = Marshal.GetLastWin32Error();
// out of devices or do we have an error?
if (lastError != 0x0103 && lastError != 0x007E)
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(lastError);
}
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
break;
}
- DeviceInterfaceData deviceInterfaceData = new DeviceInterfaceData();
+ Win32.DeviceInterfaceData deviceInterfaceData = new Win32.DeviceInterfaceData();
deviceInterfaceData.Size = Marshal.SizeOf(deviceInterfaceData);
- if (!SetupDiEnumDeviceInterfaces(handle, ref deviceInfoData, ref classGuid, 0, ref deviceInterfaceData))
+ if (!Win32.SetupDiEnumDeviceInterfaces(handle, ref deviceInfoData, ref classGuid, 0, ref deviceInterfaceData))
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
uint cbData = 0;
- if (
- !SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, IntPtr.Zero, 0, ref cbData, IntPtr.Zero) &&
+ if (!Win32.SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, IntPtr.Zero, 0, ref cbData, IntPtr.Zero) &&
cbData == 0)
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
- DeviceInterfaceDetailData deviceInterfaceDetailData = new DeviceInterfaceDetailData();
+ Win32.DeviceInterfaceDetailData deviceInterfaceDetailData = new Win32.DeviceInterfaceDetailData();
if (IntPtr.Size == 8)
deviceInterfaceDetailData.Size = 8;
else
deviceInterfaceDetailData.Size = 5;
- if (
- !SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, ref deviceInterfaceDetailData, cbData,
+ if (!Win32.SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, ref deviceInterfaceDetailData, cbData,
IntPtr.Zero, IntPtr.Zero))
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
if (deviceInterfaceDetailData.DevicePath.IndexOf(deviceID, StringComparison.OrdinalIgnoreCase) != -1)
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
devicePath = deviceInterfaceDetailData.DevicePath;
break;
}
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501Receiver.cs 2009-10-06 09:00:41 UTC (rev 3104)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501Receiver.cs 2009-10-06 09:19:26 UTC (rev 3105)
@@ -37,142 +37,6 @@
[CLSCompliant(false)]
public class IR501Receiver : PluginBase, IRemoteReceiver
{
- #region Interop
-
- [DllImport("kernel32", SetLastError = true, CharSet = CharSet.Auto)]
- private static extern SafeFileHandle CreateFile(
- String fileName,
- [MarshalAs(UnmanagedType.U4)] FileAccess fileAccess,
- [MarshalAs(UnmanagedType.U4)] FileShare fileShare,
- IntPtr securityAttributes,
- [MarshalAs(UnmanagedType.U4)] FileMode creationDisposition,
- [MarshalAs(UnmanagedType.U4)] EFileAttributes flags,
- IntPtr template);
-
- [DllImport("hid")]
- private static extern void HidD_GetHidGuid(
- ref Guid guid);
-
- [DllImport("setupapi", CharSet = CharSet.Auto)]
- private static extern IntPtr SetupDiGetClassDevs(
- ref Guid ClassGuid,
- [MarshalAs(UnmanagedType.LPTStr)] string Enumerator,
- IntPtr hwndParent,
- UInt32 Flags);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiEnumDeviceInfo(
- IntPtr handle,
- int Index,
- ref DeviceInfoData deviceInfoData);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiEnumDeviceInterfaces(
- IntPtr handle,
- ref DeviceInfoData deviceInfoData,
- ref Guid guidClass,
- int MemberIndex,
- ref DeviceInterfaceData deviceInterfaceData);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiGetDeviceInterfaceDetail(
- IntPtr handle,
- ref DeviceInterfaceData deviceInterfaceData,
- IntPtr unused1,
- int unused2,
- ref uint requiredSize,
- IntPtr unused3);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiGetDeviceInterfaceDetail(
- IntPtr handle,
- ref DeviceInterfaceData deviceInterfaceData,
- ref DeviceInterfaceDetailData deviceInterfaceDetailData,
- uint detailSize,
- IntPtr unused1,
- IntPtr unused2);
-
- [DllImport("setupapi")]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiDestroyDeviceInfoList(IntPtr handle);
-
- #region Nested type: DeviceInfoData
-
- [StructLayout(LayoutKind.Sequential)]
- private struct DeviceInfoData
- {
- public int Size;
- public Guid Class;
- public uint DevInst;
- public IntPtr Reserved;
- }
-
- #endregion
-
- #region Nested type: DeviceInterfaceData
-
- [StructLayout(LayoutKind.Sequential)]
- private struct DeviceInterfaceData
- {
- public int Size;
- public Guid Class;
- public uint Flags;
- public uint Reserved;
- }
-
- #endregion
-
- #region Nested type: DeviceInterfaceDetailData
-
- [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
- private struct DeviceInterfaceDetailData
- {
- public int Size;
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)] public string DevicePath;
- }
-
- #endregion
-
- #region Nested type: EFileAttributes
-
- [Flags]
- private enum EFileAttributes : uint
- {
- Readonly = 0x00000001,
- Hidden = 0x00000002,
- System = 0x00000004,
- Directory = 0x00000010,
- Archive = 0x00000020,
- Device = 0x00000040,
- Normal = 0x00000080,
- Temporary = 0x00000100,
- SparseFile = 0x00000200,
- ReparsePoint = 0x00000400,
- Compressed = 0x00000800,
- Offline = 0x00001000,
- NotContentIndexed = 0x00002000,
- Encrypted = 0x00004000,
- Write_Through = 0x80000000,
- Overlapped = 0x40000000,
- NoBuffering = 0x20000000,
- RandomAccess = 0x10000000,
- SequentialScan = 0x08000000,
- DeleteOnClose = 0x04000000,
- BackupSemantics = 0x02000000,
- PosixSemantics = 0x01000000,
- OpenReparsePoint = 0x00200000,
- OpenNoRecall = 0x00100000,
- FirstPipeInstance = 0x00080000,
- }
-
- #endregion
-
- #endregion Interop
-
#region Constants
private const int DeviceBufferSize = 255;
@@ -257,7 +121,7 @@
try
{
Guid guid = new Guid();
- HidD_GetHidGuid(ref guid);
+ Win32.HidD_GetHidGuid(ref guid);
string devicePath = FindDevice(guid);
@@ -285,14 +149,14 @@
public override void Start()
{
Guid guid = new Guid();
- HidD_GetHidGuid(ref guid);
+ Win32.HidD_GetHidGuid(ref guid);
string devicePath = FindDevice(guid);
if (String.IsNullOrEmpty(devicePath))
throw new InvalidOperationException("Device not found");
- SafeFileHandle deviceHandle = CreateFile(devicePath, FileAccess.Read, FileShare.Read, IntPtr.Zero, FileMode.Open,
- EFileAttributes.Overlapped, IntPtr.Zero);
+ SafeFileHandle deviceHandle = Win32.CreateFile(devicePath, FileAccess.Read, FileShare.Read, IntPtr.Zero, FileMode.Open,
+ Win32.EFileAttributes.Overlapped, IntPtr.Zero);
int lastError = Marshal.GetLastWin32Error();
if (deviceHandle.IsInvalid)
@@ -348,7 +212,7 @@
int lastError;
// 0x12 = DIGCF_PRESENT | DIGCF_DEVICEINTERFACE
- IntPtr handle = SetupDiGetClassDevs(ref classGuid, "", IntPtr.Zero, 0x12);
+ IntPtr handle = Win32.SetupDiGetClassDevs(ref classGuid, 0, IntPtr.Zero, 0x12);
lastError = Marshal.GetLastWin32Error();
if (handle.ToInt32() == -1)
@@ -356,57 +220,55 @@
string devicePath = null;
- for (int deviceIndex = 0;; deviceIndex++)
+ for (int deviceIndex = 0; ; deviceIndex++)
{
- DeviceInfoData deviceInfoData = new DeviceInfoData();
+ Win32.DeviceInfoData deviceInfoData = new Win32.DeviceInfoData();
deviceInfoData.Size = Marshal.SizeOf(deviceInfoData);
- if (SetupDiEnumDeviceInfo(handle, deviceIndex, ref deviceInfoData) == false)
+ if (!Win32.SetupDiEnumDeviceInfo(handle, deviceIndex, ref deviceInfoData))
{
// out of devices or do we have an error?
lastError = Marshal.GetLastWin32Error();
if (lastError != 0x0103 && lastError != 0x007E)
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
break;
}
- DeviceInterfaceData deviceInterfaceData = new DeviceInterfaceData();
+ Win32.DeviceInterfaceData deviceInterfaceData = new Win32.DeviceInterfaceData();
deviceInterfaceData.Size = Marshal.SizeOf(deviceInterfaceData);
- if (SetupDiEnumDeviceInterfaces(handle, ref deviceInfoData, ref classGuid, 0, ref deviceInterfaceData) == false)
+ if (!Win32.SetupDiEnumDeviceInterfaces(handle, ref deviceInfoData, ref classGuid, 0, ref deviceInterfaceData))
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
uint cbData = 0;
- if (SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, IntPtr.Zero, 0, ref cbData, IntPtr.Zero) ==
- false && cbData == 0)
+ if (!Win32.SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, IntPtr.Zero, 0, ref cbData, IntPtr.Zero) && cbData == 0)
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
- DeviceInterfaceDetailData deviceInterfaceDetailData = new DeviceInterfaceDetailData();
+ Win32.DeviceInterfaceDetailData deviceInterfaceDetailData = new Win32.DeviceInterfaceDetailData();
deviceInterfaceDetailData.Size = 5;
- if (
- SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, ref deviceInterfaceDetailData, cbData,
- IntPtr.Zero, IntPtr.Zero) == false)
+ if (!Win32.SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, ref deviceInterfaceDetailData, cbData,
+ IntPtr.Zero, IntPtr.Zero))
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
if (deviceInterfaceDetailData.DevicePath.IndexOf(DeviceID, StringComparison.InvariantCultureIgnoreCase) != -1)
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
devicePath = deviceInterfaceDetailData.DevicePath;
break;
}
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs 2009-10-06 09:00:41 UTC (rev 3104)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507Receiver.cs 2009-10-06 09:19:26 UTC (rev 3105)
@@ -23,6 +23,7 @@
using System;
using System.ComponentModel;
using System.Drawing;
+using System.IO;
using System.Runtime.InteropServices;
using System.Windows.Forms;
using IRServer.Plugin.Properties;
@@ -36,99 +37,6 @@
[CLSCompliant(false)]
public class IR507Receiver : PluginBase, IRemoteReceiver
{
- #region Interop
-
- [DllImport("hid")]
- private static extern void HidD_GetHidGuid(
- ref Guid guid);
-
- [DllImport("setupapi", CharSet = CharSet.Auto)]
- private static extern IntPtr SetupDiGetClassDevs(
- ref Guid ClassGuid,
- [MarshalAs(UnmanagedType.LPTStr)] string Enumerator,
- IntPtr hwndParent,
- UInt32 Flags);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiEnumDeviceInfo(
- IntPtr handle,
- int Index,
- ref DeviceInfoData deviceInfoData);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiEnumDeviceInterfaces(
- IntPtr handle,
- ref DeviceInfoData deviceInfoData,
- ref Guid guidClass,
- int MemberIndex,
- ref DeviceInterfaceData deviceInterfaceData);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiGetDeviceInterfaceDetail(
- IntPtr handle,
- ref DeviceInterfaceData deviceInterfaceData,
- IntPtr unused1,
- int unused2,
- ref uint requiredSize,
- IntPtr unused3);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiGetDeviceInterfaceDetail(
- IntPtr handle,
- ref DeviceInterfaceData deviceInterfaceData,
- ref DeviceInterfaceDetailData deviceInterfaceDetailData,
- uint detailSize,
- IntPtr unused1,
- IntPtr unused2);
-
- [DllImport("setupapi")]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiDestroyDeviceInfoList(IntPtr handle);
-
- #region Nested type: DeviceInfoData
-
- [StructLayout(LayoutKind.Sequential)]
- private struct DeviceInfoData
- {
- public int Size;
- public Guid Class;
- public uint DevInst;
- public IntPtr Reserved;
- }
-
- #endregion
-
- #region Nested type: DeviceInterfaceData
-
- [StructLayout(LayoutKind.Sequential)]
- private struct DeviceInterfaceData
- {
- public int Size;
- public Guid Class;
- public uint Flags;
- public uint Reserved;
- }
-
- #endregion
-
- #region Nested type: DeviceInterfaceDetailData
-
- [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
- private struct DeviceInterfaceDetailData
- {
- public int Size;
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
- public string DevicePath;
- }
-
- #endregion
-
- #endregion Interop
-
#region Constants
//const string DeviceID = "vid_0e6a&pid_6002"; // Unknown
@@ -212,7 +120,7 @@
try
{
Guid guid = new Guid();
- HidD_GetHidGuid(ref guid);
+ Win32.HidD_GetHidGuid(ref guid);
string devicePath = FindDevice(guid);
@@ -221,18 +129,13 @@
return DetectionResult.DevicePresent;
}
}
- catch (Win32Exception ex)
- {
- if (ex.NativeErrorCode != 2)
+ catch (FileNotFoundException)
{
- IrssLog.Error("{0,15} exception: {1}", Name, ex.NativeErrorCode);
- return DetectionResult.DeviceException;
- }
- IrssLog.Debug("{0,15} exception: {1}", Name, ex.NativeErrorCode);
+ //No error if driver is not installed. Handled using default return "DeviceNotFound"
}
catch (Exception ex)
{
- IrssLog.Error("{0,15} exception: {1} type: {2}", Name, ex.Message, ex.GetType());
+ IrssLog.Error("{0,15} exception: {1}", Name, ex.Message);
return DetectionResult.DeviceException;
}
@@ -354,11 +257,9 @@
private static string FindDevice(Guid classGuid)
{
- int lastError;
-
// 0x12 = DIGCF_PRESENT | DIGCF_DEVICEINTERFACE
- IntPtr handle = SetupDiGetClassDevs(ref classGuid, "", IntPtr.Zero, 0x12);
- lastError = Marshal.GetLastWin32Error();
+ IntPtr handle = Win32.SetupDiGetClassDevs(ref classGuid, 0, IntPtr.Zero, 0x12);
+ int lastError = Marshal.GetLastWin32Error();
if (handle.ToInt32() == -1)
throw new Win32Exception(lastError);
@@ -367,55 +268,53 @@
for (int deviceIndex = 0; ; deviceIndex++)
{
- DeviceInfoData deviceInfoData = new DeviceInfoData();
+ Win32.DeviceInfoData deviceInfoData = new Win32.DeviceInfoData();
deviceInfoData.Size = Marshal.SizeOf(deviceInfoData);
- if (SetupDiEnumDeviceInfo(handle, deviceIndex, ref deviceInfoData) == false)
+ if (!Win32.SetupDiEnumDeviceInfo(handle, deviceIndex, ref deviceInfoData))
{
// out of devices or do we have an error?
lastError = Marshal.GetLastWin32Error();
if (lastError != 0x0103 && lastError != 0x007E)
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
break;
}
- DeviceInterfaceData deviceInterfaceData = new DeviceInterfaceData();
+ Win32.DeviceInterfaceData deviceInterfaceData = new Win32.DeviceInterfaceData();
deviceInterfaceData.Size = Marshal.SizeOf(deviceInterfaceData);
- if (SetupDiEnumDeviceInterfaces(handle, ref deviceInfoData, ref classGuid, 0, ref deviceInterfaceData) == false)
+ if (!Win32.SetupDiEnumDeviceInterfaces(handle, ref deviceInfoData, ref classGuid, 0, ref deviceInterfaceData))
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
uint cbData = 0;
- if (SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, IntPtr.Zero, 0, ref cbData, IntPtr.Zero) ==
- false && cbData == 0)
+ if (!Win32.SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, IntPtr.Zero, 0, ref cbData, IntPtr.Zero) && cbData == 0)
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
- DeviceInterfaceDetailData deviceInterfaceDetailData = new DeviceInterfaceDetailData();
+ Win32.DeviceInterfaceDetailData deviceInterfaceDetailData = new Win32.DeviceInterfaceDetailData();
deviceInterfaceDetailData.Size = 5;
- if (
- SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, ref deviceInterfaceDetailData, cbData,
- IntPtr.Zero, IntPtr.Zero) == false)
+ if (!Win32.SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, ref deviceInterfaceDetailData, cbData,
+ IntPtr.Zero, IntPtr.Zero))
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
if (deviceInterfaceDetailData.DevicePath.IndexOf(DeviceID, StringComparison.InvariantCultureIgnoreCase) != -1)
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
devicePath = deviceInterfaceDetailData.DevicePath;
break;
}
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.cs 2009-10-06 09:00:41 UTC (rev 3104)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.cs 2009-10-06 09:19:26 UTC (rev 3105)
@@ -41,7 +41,7 @@
private const int DeviceBufferSize = 5;
private const string DevicePathVidPid = "vid_045e&pid_0284";
//const string DeviceGuid = "{9DE464EB-5DAC-4498-88BC-5010CFD2F724}";
-
+
private static readonly byte[] FlatCode = new byte[] { 0x25, 0x87, 0xE0 };
private static readonly byte[] KeyCodeTemplate = new byte[] { 0x25, 0x87, 0xEE, 0xFF, 0xFF };
private static readonly byte[] RepeatCode = new byte[] { 0x26, 0x00, 0x00, 0x00, 0x00 };
@@ -60,143 +60,6 @@
#endregion Variables
- #region Interop
-
- [DllImport("kernel32", SetLastError = true, CharSet = CharSet.Auto)]
- private static extern SafeFileHandle CreateFile(
- String fileName,
- [MarshalAs(UnmanagedType.U4)] FileAccess fileAccess,
- [MarshalAs(UnmanagedType.U4)] FileShare fileShare,
- IntPtr securityAttributes,
- [MarshalAs(UnmanagedType.U4)] FileMode creationDisposition,
- [MarshalAs(UnmanagedType.U4)] EFileAttributes flags,
- IntPtr template);
-
- [DllImport("hid")]
- private static extern void HidD_GetHidGuid(
- ref Guid guid);
-
- [DllImport("setupapi", CharSet = CharSet.Auto, SetLastError = true)]
- private static extern IntPtr SetupDiGetClassDevs(
- ref Guid ClassGuid,
- [MarshalAs(UnmanagedType.LPTStr)] string Enumerator,
- IntPtr hwndParent,
- UInt32 Flags);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiEnumDeviceInfo(
- IntPtr handle,
- int Index,
- ref DeviceInfoData deviceInfoData);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiEnumDeviceInterfaces(
- IntPtr handle,
- ref DeviceInfoData deviceInfoData,
- ref Guid guidClass,
- int MemberIndex,
- ref DeviceInterfaceData deviceInterfaceData);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiGetDeviceInterfaceDetail(
- IntPtr handle,
- ref DeviceInterfaceData deviceInterfaceData,
- IntPtr unused1,
- int unused2,
- ref uint requiredSize,
- IntPtr unused3);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiGetDeviceInterfaceDetail(
- IntPtr handle,
- ref DeviceInterfaceData deviceInterfaceData,
- ref DeviceInterfaceDetailData deviceInterfaceDetailData,
- uint detailSize,
- IntPtr unused1,
- IntPtr unused2);
-
- [DllImport("setupapi")]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiDestroyDeviceInfoList(IntPtr handle);
-
- #region Nested type: DeviceInfoData
-
- [StructLayout(LayoutKind.Sequential, Pack = 1)]
- private struct DeviceInfoData
- {
- public int Size;
- public Guid Class;
- public int DevInst;
- public IntPtr Reserved;
- }
-
- #endregion
-
- #region Nested type: DeviceInterfaceData
-
- [StructLayout(LayoutKind.Sequential, Pack = 1)]
- private struct DeviceInterfaceData
- {
- public int Size;
- public Guid Class;
- public int Flags;
- public IntPtr Reserved;
- }
-
- #endregion
-
- #region Nested type: DeviceInterfaceDetailData
-
- [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
- private struct DeviceInterfaceDetailData
- {
- public int Size;
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
- public string DevicePath;
- }
-
- #endregion
-
- #region Nested type: EFileAttributes
-
- [Flags]
- private enum EFileAttributes : uint
- {
- Readonly = 0x00000001,
- Hidden = 0x00000002,
- System = 0x00000004,
- Directory = 0x00000010,
- Archive = 0x00000020,
- Device = 0x00000040,
- Normal = 0x00000080,
- Temporary = 0x00000100,
- SparseFile = 0x00000200,
- ReparsePoint = 0x00000400,
- Compressed = 0x00000800,
- Offline = 0x00001000,
- NotContentIndexed = 0x00002000,
- Encrypted = 0x00004000,
- Write_Through = 0x80000000,
- Overlapped = 0x40000000,
- NoBuffering = 0x20000000,
- RandomAccess = 0x10000000,
- SequentialScan = 0x08000000,
- DeleteOnClose = 0x04000000,
- BackupSemantics = 0x02000000,
- PosixSemantics = 0x01000000,
- OpenReparsePoint = 0x00200000,
- OpenNoRecall = 0x00100000,
- FirstPipeInstance = 0x00080000,
- }
-
- #endregion
-
- #endregion Interop
-
#region Destructor
/// <summary>
@@ -313,7 +176,7 @@
try
{
Guid guid = new Guid();
- HidD_GetHidGuid(ref guid);
+ Win32.HidD_GetHidGuid(ref guid);
string devicePath = FindDevice(guid);
@@ -346,14 +209,14 @@
public override void Start()
{
Guid guid = new Guid();
- HidD_GetHidGuid(ref guid);
+ Win32.HidD_GetHidGuid(ref guid);
string devicePath = FindDevice(guid);
if (String.IsNullOrEmpty(devicePath))
throw new InvalidOperationException("Device not found");
- SafeFileHandle deviceHandle = CreateFile(devicePath, FileAccess.Read, FileShare.ReadWrite, IntPtr.Zero,
- FileMode.Open, EFileAttributes.Overlapped, IntPtr.Zero);
+ SafeFileHandle deviceHandle = Win32.CreateFile(devicePath, FileAccess.Read, FileShare.ReadWrite, IntPtr.Zero,
+ FileMode.Open, Win32.EFileAttributes.Overlapped, IntPtr.Zero);
int lastError = Marshal.GetLastWin32Error();
if (deviceHandle.IsInvalid)
@@ -413,11 +276,9 @@
/// <returns>Device path.</returns>
private static string FindDevice(Guid classGuid)
{
- int lastError;
-
// 0x12 = DIGCF_PRESENT | DIGCF_DEVICEINTERFACE
- IntPtr handle = SetupDiGetClassDevs(ref classGuid, "", IntPtr.Zero, 0x12);
- lastError = Marshal.GetLastWin32Error();
+ IntPtr handle = Win32.SetupDiGetClassDevs(ref classGuid, 0, IntPtr.Zero, 0x12);
+ int lastError = Marshal.GetLastWin32Error();
if (handle.ToInt32() == -1)
throw new Win32Exception(lastError);
@@ -426,59 +287,56 @@
for (int deviceIndex = 0; ; deviceIndex++)
{
- DeviceInfoData deviceInfoData = new DeviceInfoData();
+ Win32.DeviceInfoData deviceInfoData = new Win32.DeviceInfoData();
deviceInfoData.Size = Marshal.SizeOf(deviceInfoData);
- if (!SetupDiEnumDeviceInfo(handle, deviceIndex, ref deviceInfoData))
+ if (!Win32.SetupDiEnumDeviceInfo(handle, deviceIndex, ref deviceInfoData))
{
// out of devices or do we have an error?
lastError = Marshal.GetLastWin32Error();
if (lastError != 0x0103 && lastError != 0x007E)
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(lastError);
}
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
break;
}
- DeviceInterfaceData deviceInterfaceData = new DeviceInterfaceData();
+ Win32.DeviceInterfaceData deviceInterfaceData = new Win32.DeviceInterfaceData();
deviceInterfaceData.Size = Marshal.SizeOf(deviceInterfaceData);
- if (!SetupDiEnumDeviceInterfaces(handle, ref deviceInfoData, ref classGuid, 0, ref deviceInterfaceData))
+ if (!Win32.SetupDiEnumDeviceInterfaces(handle, ref deviceInfoData, ref classGuid, 0, ref deviceInterfaceData))
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
uint cbData = 0;
- if (
- !SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, IntPtr.Zero, 0, ref cbData, IntPtr.Zero) &&
+ if (!Win32.SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, IntPtr.Zero, 0, ref cbData, IntPtr.Zero) &&
cbData == 0)
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
- DeviceInterfaceDetailData deviceInterfaceDetailData = new DeviceInterfaceDetailData();
- if (IntPtr.Size == 8)
- deviceInterfaceDetailData.Size = 8;
- else
- deviceInterfaceDetailData.Size = 5;
+ Win32.DeviceInterfaceDetailData deviceInterfaceDetailData = new Win32.DeviceInterfaceDetailData
+ {
+ Size = Win32.Check64Bit() ? 8 : 5
+ };
- if (
- !SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, ref deviceInterfaceDetailData, cbData,
+ if (!Win32.SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, ref deviceInterfaceDetailData, cbData,
IntPtr.Zero, IntPtr.Zero))
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
if (deviceInterfaceDetailData.DevicePath.IndexOf(DevicePathVidPid, StringComparison.OrdinalIgnoreCase) != -1)
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
devicePath = deviceInterfaceDetailData.DevicePath;
break;
}
@@ -536,16 +394,9 @@
_deviceStream.BeginRead(_deviceBuffer, 0, _deviceBuffer.Length, OnReadComplete, null);
}
-#if TRACE
- catch (Exception ex)
+ catch (Exception)
{
- Trace.WriteLine(ex.ToString());
}
-#else
- catch
- {
- }
-#endif
}
#endregion Implementation
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102Receiver.cs 2009-10-06 09:00:41 UTC (rev 3104)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/RC102 Receiver/RC102Receiver.cs 2009-10-06 09:19:26 UTC (rev 3105)
@@ -37,142 +37,6 @@
[CLSCompliant(false)]
public class RC102Receiver : PluginBase, IRemoteReceiver
{
- #region Interop
-
- [DllImport("kernel32", SetLastError = true, CharSet = CharSet.Auto)]
- private static extern SafeFileHandle CreateFile(
- String fileName,
- [MarshalAs(UnmanagedType.U4)] FileAccess fileAccess,
- [MarshalAs(UnmanagedType.U4)] FileShare fileShare,
- IntPtr securityAttributes,
- [MarshalAs(UnmanagedType.U4)] FileMode creationDisposition,
- [MarshalAs(UnmanagedType.U4)] EFileAttributes flags,
- IntPtr template);
-
- [DllImport("hid")]
- private static extern void HidD_GetHidGuid(
- ref Guid guid);
-
- [DllImport("setupapi", CharSet = CharSet.Auto)]
- private static extern IntPtr SetupDiGetClassDevs(
- ref Guid ClassGuid,
- [MarshalAs(UnmanagedType.LPTStr)] string Enumerator,
- IntPtr hwndParent,
- UInt32 Flags);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiEnumDeviceInfo(
- IntPtr handle,
- int Index,
- ref DeviceInfoData deviceInfoData);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiEnumDeviceInterfaces(
- IntPtr handle,
- ref DeviceInfoData deviceInfoData,
- ref Guid guidClass,
- int MemberIndex,
- ref DeviceInterfaceData deviceInterfaceData);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiGetDeviceInterfaceDetail(
- IntPtr handle,
- ref DeviceInterfaceData deviceInterfaceData,
- IntPtr unused1,
- int unused2,
- ref uint requiredSize,
- IntPtr unused3);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiGetDeviceInterfaceDetail(
- IntPtr handle,
- ref DeviceInterfaceData deviceInterfaceData,
- ref DeviceInterfaceDetailData deviceInterfaceDetailData,
- uint detailSize,
- IntPtr unused1,
- IntPtr unused2);
-
- [DllImport("setupapi")]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiDestroyDeviceInfoList(IntPtr handle);
-
- #region Nested type: DeviceInfoData
-
- [StructLayout(LayoutKind.Sequential)]
- private struct DeviceInfoData
- {
- public int Size;
- public Guid Class;
- public uint DevInst;
- public IntPtr Reserved;
- }
-
- #endregion
-
- #region Nested type: DeviceInterfaceData
-
- [StructLayout(LayoutKind.Sequential)]
- private struct DeviceInterfaceData
- {
- public int Size;
- public Guid Class;
- public uint Flags;
- public uint Reserved;
- }
-
- #endregion
-
- #region Nested type: DeviceInterfaceDetailData
-
- [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
- private struct DeviceInterfaceDetailData
- {
- public int Size;
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)] public string DevicePath;
- }
-
- #endregion
-
- #region Nested type: EFileAttributes
-
- [Flags]
- private enum EFileAttributes : uint
- {
- Readonly = 0x00000001,
- Hidden = 0x00000002,
- System = 0x00000004,
- Directory = 0x00000010,
- Archive = 0x00000020,
- Device = 0x00000040,
- Normal = 0x00000080,
- Temporary = 0x00000100,
- SparseFile = 0x00000200,
- ReparsePoint = 0x00000400,
- Compressed = 0x00000800,
- Offline = 0x00001000,
- NotContentIndexed = 0x00002000,
- Encrypted = 0x00004000,
- Write_Through = 0x80000000,
- Overlapped = 0x40000000,
- NoBuffering = 0x20000000,
- RandomAccess = 0x10000000,
- SequentialScan = 0x08000000,
- DeleteOnClose = 0x04000000,
- BackupSemantics = 0x02000000,
- PosixSemantics = 0x01000000,
- OpenReparsePoint = 0x00200000,
- OpenNoRecall = 0x00100000,
- FirstPipeInstance = 0x00080000,
- }
-
- #endregion
-
- #endregion Interop
-
#region Constants
private const int DeviceBufferSize = 4;
@@ -260,7 +124,7 @@
try
{
Guid guid = new Guid();
- HidD_GetHidGuid(ref guid);
+ Win32.HidD_GetHidGuid(ref guid);
string devicePath = FindDevice(guid);
@@ -269,9 +133,18 @@
return DetectionResult.DevicePresent;
}
}
+ catch (Win32Exception ex)
+ {
+ if (ex.NativeErrorCode != 13)
+ {
+ IrssLog.Error("{0,15} exception: {1}|{2}", Name, ex.NativeErrorCode, ex.Message);
+ return DetectionResult.DeviceException;
+ }
+ IrssLog.Debug("{0,15} exception: {1} | {2} | {3}", Name, ex.NativeErrorCode, ex.Message, ex.GetType());
+ }
catch (Exception ex)
{
- IrssLog.Error("{0,15} exception: {1}", Name, ex.Message);
+ IrssLog.Error("{0,15} exception: {1} type: {2}", Name, ex.Message, ex.GetType());
return DetectionResult.DeviceException;
}
@@ -284,19 +157,20 @@
public override void Start()
{
Guid guid = new Guid();
- HidD_GetHidGuid(ref guid);
+ Win32.HidD_GetHidGuid(ref guid);
string devicePath = FindDevice(guid);
if (String.IsNullOrEmpty(devicePath))
throw new InvalidOperationException("Device not found");
- SafeFileHandle deviceHandle = CreateFile(devicePath, FileAccess.Read, FileShare.Read, IntPtr.Zero, FileMode.Open,
- EFileAttributes.Overlapped, IntPtr.Zero);
+ SafeFileHandle deviceHandle = Win32.CreateFile(devicePath, FileAccess.Read, FileShare.Read, IntPtr.Zero, FileMode.Open,
+ Win32.EFileAttributes.Overlapped, IntPtr.Zero);
int lastError = Marshal.GetLastWin32Error();
if (deviceHandle.IsInvalid)
throw new Win32Exception(lastError, "Failed to open device");
+ // TODO: Add device removal notification.
//_deviceWatcher.RegisterDeviceRemoval(deviceHandle);
_deviceBuffer = new byte[DeviceBufferSize];
@@ -342,70 +216,71 @@
}
}
+ /// <summary>
+ /// Finds the device.
+ /// </summary>
+ /// <param name="classGuid">The class GUID.</param>
+ /// <returns>Device path.</returns>
private static string FindDevice(Guid classGuid)
{
- int lastError;
-
// 0x12 = DIGCF_PRESENT | DIGCF_DEVICEINTERFACE
- IntPtr handle = SetupDiGetClassDevs(ref classGuid, "", IntPtr.Zero, 0x12);
- lastError = Marshal.GetLastWin32Error();
+ IntPtr handle = Win32.SetupDiGetClassDevs(ref classGuid, 0, IntPtr.Zero, 0x12);
+ int lastError = Marshal.GetLastWin32Error();
if (handle.ToInt32() == -1)
throw new Win32Exception(lastError);
string devicePath = null;
- for (int deviceIndex = 0;; deviceIndex++)
+ for (int deviceIndex = 0; ; deviceIndex++)
{
- DeviceInfoData deviceInfoData = new DeviceInfoData();
+ Win32.DeviceInfoData deviceInfoData = new Win32.DeviceInfoData();
deviceInfoData.Size = Marshal.SizeOf(deviceInfoData);
- if (SetupDiEnumDeviceInfo(handle, deviceIndex, ref deviceInfoData) == false)
+ if (!Win32.SetupDiEnumDeviceInfo(handle, deviceIndex, ref deviceInfoData))
{
// out of devices or do we have an error?
lastError = Marshal.GetLastWin32Error();
if (lastError != 0x0103 && lastError != 0x007E)
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
break;
}
- DeviceInterfaceData deviceInterfaceData = new DeviceInterfaceData();
+ Win32.DeviceInterfaceData deviceInterfaceData = new Win32.DeviceInterfaceData();
deviceInterfaceData.Size = Marshal.SizeOf(deviceInterfaceData);
- if (SetupDiEnumDeviceInterfaces(handle, ref deviceInfoData, ref classGuid, 0, ref deviceInterfaceData) == false)
+ if (!Win32.SetupDiEnumDeviceInterfaces(handle, ref deviceInfoData, ref classGuid, 0, ref deviceInterfaceData))
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
uint cbData = 0;
- if (SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, IntPtr.Zero, 0, ref cbData, IntPtr.Zero) ==
- false && cbData == 0)
+ if (!Win32.SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, IntPtr.Zero, 0, ref cbData, IntPtr.Zero) && cbData == 0)
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
- DeviceInterfaceDetailData deviceInterfaceDetailData = new DeviceInterfaceDetailData();
+ Win32.DeviceInterfaceDetailData deviceInterfaceDetailData = new Win32.DeviceInterfaceDetailData();
deviceInterfaceDetailData.Size = 5;
- if (
- SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, ref deviceInterfaceDetailData, cbData,
- IntPtr.Zero, IntPtr.Zero) == false)
+ if (!Win32.SetupDiGetDeviceInterfaceDetail(handle, ref deviceInterfaceData, ref deviceInterfaceDetailData, cbData,
+ IntPtr.Zero, IntPtr.Zero))
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
throw new Win32Exception(Marshal.GetLastWin32Error());
}
if (deviceInterfaceDetailData.DevicePath.IndexOf(DeviceID, StringComparison.InvariantCultureIgnoreCase) != -1)
{
- SetupDiDestroyDeviceInfoList(handle);
+ Win32.SetupDiDestroyDeviceInfoList(handle);
devicePath = deviceInterfaceDetailData.DevicePath;
break;
}
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs 2009-10-06 09:00:41 UTC (rev 3104)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs 2009-10-06 09:19:26 UTC (rev 3105)
@@ -56,143 +56,6 @@
#endregion Variables
- #region Interop
-
- [DllImport("kernel32", SetLastError = true, CharSet = CharSet.Auto)]
- private static extern SafeFileHandle CreateFile(
- String fileName,
- [MarshalAs(UnmanagedType.U4)] FileAccess fileAccess,
- [MarshalAs(UnmanagedType.U4)] FileShare fileShare,
- IntPtr securityAttributes,
- [MarshalAs(UnmanagedType.U4)] FileMode creationDisposition,
- [MarshalAs(UnmanagedType.U4)] EFileAttributes flags,
- IntPtr template);
-
- [DllImport("hid")]
- private static extern void HidD_GetHidGuid(
- ref Guid guid);
-
- [DllImport("setupapi", CharSet = CharSet.Auto, SetLastError = true)]
- private static extern IntPtr SetupDiGetClassDevs(
- ref Guid ClassGuid,
- [MarshalAs(UnmanagedType.LPTStr)] string Enumerator,
- IntPtr hwndParent,
- UInt32 Flags);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiEnumDeviceInfo(
- IntPtr handle,
- int Index,
- ref DeviceInfoData deviceInfoData);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiEnumDeviceInterfaces(
- IntPtr handle,
- ref DeviceInfoData deviceInfoData,
- ref Guid guidClass,
- int MemberIndex,
- ref DeviceInterfaceData deviceInterfaceData);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiGetDeviceInterfaceDetail(
- IntPtr handle,
- ref DeviceInterfaceData deviceInterfaceData,
- IntPtr unused1,
- int unused2,
- ref uint requiredSize,
- IntPtr unused3);
-
- [DllImport("setupapi", SetLastError = true)]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiGetDeviceInterfaceDetail(
- IntPtr handle,
- ref DeviceInterfaceData deviceInterfaceData,
- ref DeviceInterfaceDetailData deviceInterfaceDetailData,
- uint detailSize,
- IntPtr unused1,
- IntPtr unused2);
-
- [DllImport("setupapi")]
- [return: MarshalAs(UnmanagedType.Bool)]
- private static extern bool SetupDiDestroyDeviceInfoList(IntPtr handle);
-
- #region Nested type: DeviceInfoData
-
- [StructLayout(LayoutKind.Sequential, Pack = 1)]
- private struct DeviceInfoData
- {
- public int Size;
- public Guid Class;
- public int DevInst;
- public IntPtr Reserved;
- }
-
- #endregion
-
- #region Nested type: DeviceInterfaceData
-
- [StructLayout(LayoutKind.Sequential, Pack = 1)]
- private struct DeviceInterfaceData
- {
- public int Size;
- public Guid Class;
- public int Flags;
- public IntPtr Reserved;
- }
-
- #endregion
-
- #region Nested type: DeviceInterfaceDetailData
-
- [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
- private struct DeviceInterfaceDetailData
- {
- public int Size;
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
- public string DevicePath;
- }
-
- #endregion
-
- #region Nested type: EFileAttributes
-
- [Flags]
- private enum EFileAttributes : uint
- {
- Readonly = 0x00000001,
- Hidden = 0x00000002,
- System = 0x00000004,
- Directory = 0x00000010,
- Archive = 0x00000020,
- Device = 0x00000040,
- Normal = 0x00000080,
- Temporary = 0x00000100,
- SparseFile = 0x00000200,
- ReparsePoint = 0x00000400,
- Compressed = 0x00000800,
- Offline = 0x00001000,
- NotContentIndexed = 0x00002000,
- Encrypted = 0x00004000,
- Write_Through = 0x80000000,
- Overlapped = 0x40000000,
- NoBuffering = 0x20000000,
- RandomAccess = 0x10000000,
- SequentialScan = 0x08000000,
- DeleteOnClose = 0x04000000,
- BackupS...
[truncated message content] |
|
From: <che...@us...> - 2009-10-11 08:02:42
|
Revision: 3115
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3115&view=rev
Author: chemelli_sf
Date: 2009-10-11 08:02:35 +0000 (Sun, 11 Oct 2009)
Log Message:
-----------
Projects settings cleanup
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/WiimoteLib.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj 2009-10-09 16:26:27 UTC (rev 3114)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj 2009-10-11 08:02:35 UTC (rev 3115)
@@ -29,7 +29,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DocumentationFile>bin\Debug\KeyboardInputRelay.xml</DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj 2009-10-09 16:26:27 UTC (rev 3114)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj 2009-10-11 08:02:35 UTC (rev 3115)
@@ -33,7 +33,8 @@
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
- <DocumentationFile>bin\Debug\IrssComms.XML</DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -77,6 +78,7 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent></PostBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2009-10-09 16:26:27 UTC (rev 3114)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2009-10-11 08:02:35 UTC (rev 3115)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -30,7 +30,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DocumentationFile>bin\Debug\IrssUtils.XML</DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<UseVSHostingProcess>false</UseVSHostingProcess>
<NoWarn>1591</NoWarn>
</PropertyGroup>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj 2009-10-09 16:26:27 UTC (rev 3114)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/CoolCommand Receiver/CoolCommand Receiver.csproj 2009-10-11 08:02:35 UTC (rev 3115)
@@ -27,7 +27,8 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
- <DocumentationFile>bin\Debug\CoolCommand Receiver.xml</DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj 2009-10-09 16:26:27 UTC (rev 3114)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/FireDTV Receiver/FireDTV Receiver.csproj 2009-10-11 08:02:35 UTC (rev 3115)
@@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D88EDBC1-D583-4149-9873-8239FA63F4FE}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -23,7 +23,8 @@
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <DocumentationFile>bin\Debug\FireDTV Receiver.XML</DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2009-10-09 16:26:27 UTC (rev 3114)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2009-10-11 08:02:35 UTC (rev 3115)
@@ -28,7 +28,8 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
- <DocumentationFile>bin\Debug\IRServerPluginInterface.XML</DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj 2009-10-09 16:26:27 UTC (rev 3114)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR501 Receiver/IR501 Receiver.csproj 2009-10-11 08:02:35 UTC (rev 3115)
@@ -25,7 +25,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DocumentationFile>bin\Debug\IR501 Receiver.XML</DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj 2009-10-09 16:26:27 UTC (rev 3114)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR507 Receiver/IR507 Receiver.csproj 2009-10-11 08:02:35 UTC (rev 3115)
@@ -27,7 +27,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DocumentationFile>bin\Debug\IR507 Receiver.XML</DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj 2009-10-09 16:26:27 UTC (rev 3114)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/MacMini Receiver/MacMini Receiver.csproj 2009-10-11 08:02:35 UTC (rev 3115)
@@ -25,7 +25,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <DocumentationFile>bin\Debug\MacMini Receiver.XML</DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj 2009-10-09 16:26:27 UTC (rev 3114)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Technotrend Receiver/Technotrend Receiver.csproj 2009-10-11 08:02:35 UTC (rev 3115)
@@ -29,7 +29,8 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
- <DocumentationFile>bin\Debug\Technotrend Receiver.XML</DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/WiimoteLib.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/WiimoteLib.csproj 2009-10-09 16:26:27 UTC (rev 3114)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WiimoteLib/WiimoteLib.csproj 2009-10-11 08:02:35 UTC (rev 3115)
@@ -34,7 +34,8 @@
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <DocumentationFile>bin\Debug\WiimoteLib.XML</DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj 2009-10-09 16:26:27 UTC (rev 3114)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj 2009-10-11 08:02:35 UTC (rev 3115)
@@ -27,7 +27,8 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
- <DocumentationFile>bin\Debug\WinLirc Transceiver.XML</DocumentationFile>
+ <DocumentationFile>
+ </DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-10-24 20:17:10
|
Revision: 3134
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3134&view=rev
Author: chef_koch
Date: 2009-10-24 20:17:01 +0000 (Sat, 24 Oct 2009)
Log Message:
-----------
prevent IRSSConfig running multiple times
feel free to modify ProcessHelper, if needed.
can also be used for other apps, but those may designed to be run to listen to different ir servers on network
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/ProcessHelper.cs
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2009-10-24 18:17:01 UTC (rev 3133)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2009-10-24 20:17:01 UTC (rev 3134)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -246,6 +246,7 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
+ <Compile Include="ProcessHelper.cs" />
<Compile Include="SystemRegistry.cs" />
<Compile Include="IRServerInfo.cs" />
<Compile Include="VariableList.cs" />
Added: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/ProcessHelper.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/ProcessHelper.cs (rev 0)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/ProcessHelper.cs 2009-10-24 20:17:01 UTC (rev 3134)
@@ -0,0 +1,68 @@
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+namespace IrssUtils
+{
+ public static class ProcessHelper
+ {
+ /// <summary>
+ /// Checks if the Process is already running.
+ /// </summary>
+ /// <returns>true if process is already running.</returns>
+ public static bool IsProcessAlreadyRunning()
+ {
+ return IsProcessAlreadyRunning(true);
+ }
+
+ /// <summary>
+ /// Checks if the Process is already running.
+ /// </summary>
+ /// <param name="activateMainForm">If true, the mainForm will be activated, if process is already running.</param>
+ /// <returns>true if process is already running.</returns>
+ public static bool IsProcessAlreadyRunning(bool activateMainForm)
+ {
+ Process process = RunningInstance();
+ if (process == null) return false;
+
+ // activates the main form of the application
+ if (activateMainForm && process.MainWindowHandle != IntPtr.Zero)
+ ShowWindow(process.MainWindowHandle, SW_SHOWNORMAL);
+
+ return true;
+ }
+
+ public static Process RunningInstance()
+ {
+ Process current = Process.GetCurrentProcess();
+ Process[] processes = Process.GetProcessesByName(current.ProcessName);
+
+ // Loop through the running processes in with the same name
+ foreach (Process process in processes)
+ {
+ // Ignore the current process
+ if (process.Id == current.Id) continue;
+
+ // Make sure that the process is running from the same exe file.
+ // todo: is this really needed???
+ //if (process.MainModule.FileName == current.MainModule.FileName)
+ //{
+ // Return the other process instance.
+ return process;
+ //}
+ }
+
+ // No other instance was found, return null
+ return null;
+ }
+
+ #region InterOp
+
+ private const int SW_SHOWNORMAL = 1;
+ [DllImport("user32.dll")]
+ private static extern IntPtr ShowWindow(IntPtr hwnd, int nCmdShow);
+
+ #endregion
+ }
+}
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-10-24 18:17:01 UTC (rev 3133)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-10-24 20:17:01 UTC (rev 3134)
@@ -142,6 +142,10 @@
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(true);
+ // allow only one application instance
+ if (IrssUtils.ProcessHelper.IsProcessAlreadyRunning())
+ return;
+
IrssLog.LogLevel = IrssLog.Level.Debug;
IrssLog.Open("IR Server Configuration.log");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-11-13 12:22:01
|
Revision: 3150
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3150&view=rev
Author: chef_koch
Date: 2009-11-13 12:21:41 +0000 (Fri, 13 Nov 2009)
Log Message:
-----------
added virtual svn working root
moved some interops from config to win32
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj 2009-11-13 12:04:08 UTC (rev 3149)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj 2009-11-13 12:21:41 UTC (rev 3150)
@@ -136,10 +136,12 @@
<ProjectReference Include="..\..\Common\IrssComms\IrssComms.csproj">
<Project>{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}</Project>
<Name>IrssComms</Name>
+ <Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj">
<Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project>
<Name>IrssUtils</Name>
+ <Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\IR Server Plugins\IR Server Plugin Interface\IR Server Plugin Interface.csproj">
<Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-11-13 12:04:08 UTC (rev 3149)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-11-13 12:21:41 UTC (rev 3150)
@@ -119,20 +119,6 @@
#endregion Variables
- #region Interops
-
- [DllImport("user32.dll", EntryPoint = "FindWindow", SetLastError = true)]
- internal static extern IntPtr FindWindowByCaption(IntPtr ZeroOnly, string lpWindowName);
- [DllImport("user32.dll")]
- internal static extern int SendMessage(
- IntPtr hWnd, // handle to destination window
- uint Msg, // message
- long wParam, // first message parameter
- long lParam // second message parameter
- );
-
- #endregion Interops
-
/// <summary>
/// The main entry point for the application.
/// </summary>
@@ -198,7 +184,7 @@
try
{
- irsWindow = FindWindowByCaption(IntPtr.Zero, ServerWindowName);
+ irsWindow = Win32.FindWindowByTitle(ServerWindowName);
if (irsWindow != IntPtr.Zero)
_irsStatus = IrsStatus.RunningApplication;
}
@@ -559,7 +545,7 @@
IrssLog.Info("Starting IR Server (application)");
Process IRServer = Process.Start(IRServerFile);
waitCount = 0;
- while (FindWindowByCaption(IntPtr.Zero, ServerWindowName) == IntPtr.Zero)
+ while (Win32.FindWindowByTitle(ServerWindowName) == IntPtr.Zero)
{
waitCount++;
if (waitCount > 150) throw new TimeoutException();
@@ -584,10 +570,10 @@
try
{
IrssLog.Info("Stopping IR Server (application)");
- IntPtr irssWindow = FindWindowByCaption(IntPtr.Zero, ServerWindowName);
- int result = SendMessage(irssWindow, 16, 0, 0);
+ IntPtr irssWindow = Win32.FindWindowByTitle(ServerWindowName);
+ IntPtr result = Win32.SendWindowsMessage(irssWindow, 16, 0, 0);
waitCount = 0;
- while (FindWindowByCaption(IntPtr.Zero, ServerWindowName) != IntPtr.Zero)
+ while (Win32.FindWindowByTitle(ServerWindowName) != IntPtr.Zero)
{
waitCount++;
if (waitCount > 150) throw new TimeoutException();
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2009-11-13 12:04:08 UTC (rev 3149)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2009-11-13 12:21:41 UTC (rev 3150)
@@ -663,4 +663,7 @@
{106A69D2-670C-4DE5-A81C-A3CD5D3F21EB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50}
{D1BAC7A9-FFB6-44BA-825F-32506831DC3D} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50}
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ VisualSVNWorkingCopyRoot = ..
+ EndGlobalSection
EndGlobal
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-11-15 11:05:25
|
Revision: 3154
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3154&view=rev
Author: chef_koch
Date: 2009-11-15 11:05:17 +0000 (Sun, 15 Nov 2009)
Log Message:
-----------
fixed build process
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/IRServer.Shared.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/IRServer.Shared.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/IRServer.Shared.csproj 2009-11-15 10:48:19 UTC (rev 3153)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/IRServer.Shared.csproj 2009-11-15 11:05:17 UTC (rev 3154)
@@ -32,6 +32,14 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.ServiceProcess" />
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2009-11-15 10:48:19 UTC (rev 3153)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2009-11-15 11:05:17 UTC (rev 3154)
@@ -613,10 +613,12 @@
{5C0DF76E-D1AE-4161-B8D1-843925C8AB58}.Release|x86.Build.0 = Release|x86
{0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}.Debug|x86.ActiveCfg = Debug|x86
+ {0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}.Debug|x86.Build.0 = Debug|x86
{0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}.Release|Any CPU.Build.0 = Release|Any CPU
- {0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}.Release|x86.ActiveCfg = Release|Any CPU
+ {0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}.Release|x86.ActiveCfg = Release|x86
+ {0C6A59C2-B5CC-48EF-A41F-0F1E463D8391}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-11-25 16:28:01
|
Revision: 3183
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3183&view=rev
Author: chef_koch
Date: 2009-11-25 15:49:08 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
added context menu to ircommands and macros
fixed disabling/enabling toolbars and contextmenus in ircommands and macros
added BringWindowToTop when clicking setup in TrayIcon even if setup was opened already
added icons for programs in TrayIcon's context menu
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.resx
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Win32.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Settings.cs
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2009-11-25 15:40:49 UTC (rev 3182)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2009-11-25 15:49:08 UTC (rev 3183)
@@ -40,13 +40,14 @@
this.mappingsContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
this.newMappingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.editMappingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.removeMappingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.deleteMappingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.clearMappingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.remapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.copyMappingsFromToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.buttonOK = new System.Windows.Forms.Button();
- this.contextMenuStripEvents = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.eventsContextMenuStripEvents = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.addEventToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.removeEventToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.checkBoxAutoRun = new System.Windows.Forms.CheckBox();
@@ -58,29 +59,28 @@
this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.serverToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.advancedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
- this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.contentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
this.tabPageIRCommands = new System.Windows.Forms.TabPage();
- this.toolStripIRCommands = new System.Windows.Forms.ToolStrip();
- this.toolStripButtonNewIR = new System.Windows.Forms.ToolStripButton();
- this.toolStripButtonEditIR = new System.Windows.Forms.ToolStripButton();
- this.toolStripButtonDeleteIR = new System.Windows.Forms.ToolStripButton();
+ this.irCommandsToolStrip = new System.Windows.Forms.ToolStrip();
+ this.newIRToolStripButton = new System.Windows.Forms.ToolStripButton();
+ this.editIRToolStripButton = new System.Windows.Forms.ToolStripButton();
+ this.deleteIRToolStripButton = new System.Windows.Forms.ToolStripButton();
this.listViewIR = new System.Windows.Forms.ListView();
this.tabPageMacro = new System.Windows.Forms.TabPage();
- this.toolStripMacros = new System.Windows.Forms.ToolStrip();
- this.toolStripButtonNewMacro = new System.Windows.Forms.ToolStripButton();
- this.toolStripButtonEditMacro = new System.Windows.Forms.ToolStripButton();
- this.toolStripButtonDeleteMacro = new System.Windows.Forms.ToolStripButton();
- this.toolStripButtonCreateShortcutForMacro = new System.Windows.Forms.ToolStripButton();
- this.toolStripButtonTestMacro = new System.Windows.Forms.ToolStripButton();
+ this.macrosToolStrip = new System.Windows.Forms.ToolStrip();
+ this.newMacroToolStripButton = new System.Windows.Forms.ToolStripButton();
+ this.editMacroToolStripButton = new System.Windows.Forms.ToolStripButton();
+ this.deleteMacroToolStripButton = new System.Windows.Forms.ToolStripButton();
+ this.createShortcutForMacroToolStripButton = new System.Windows.Forms.ToolStripButton();
+ this.testMacroToolStripButton = new System.Windows.Forms.ToolStripButton();
this.listViewMacro = new System.Windows.Forms.ListView();
this.tabPageEvents = new System.Windows.Forms.TabPage();
this.buttonSetCommand = new System.Windows.Forms.Button();
@@ -93,6 +93,12 @@
this.columnHeaderEvent = new System.Windows.Forms.ColumnHeader();
this.columnHeaderEventCommand = new System.Windows.Forms.ColumnHeader();
this.tabPagePrograms = new System.Windows.Forms.TabPage();
+ this.mappingsToolStrip = new System.Windows.Forms.ToolStrip();
+ this.newMappingToolStripButton = new System.Windows.Forms.ToolStripButton();
+ this.editMappingToolStripButton = new System.Windows.Forms.ToolStripButton();
+ this.deleteMappingToolStripButton = new System.Windows.Forms.ToolStripButton();
+ this.clearMappingsToolStripButton = new System.Windows.Forms.ToolStripButton();
+ this.remapToolStripButton = new System.Windows.Forms.ToolStripButton();
this.programsPanel = new System.Windows.Forms.Panel();
this.programsToolStrip = new System.Windows.Forms.ToolStrip();
this.addProgramToolStripButton = new System.Windows.Forms.ToolStripButton();
@@ -102,27 +108,35 @@
this.columnHeaderButton = new System.Windows.Forms.ColumnHeader();
this.columnHeaderDescription = new System.Windows.Forms.ColumnHeader();
this.columnHeaderCommand = new System.Windows.Forms.ColumnHeader();
- this.mappingsToolStrip = new System.Windows.Forms.ToolStrip();
- this.newMappingToolStripButton = new System.Windows.Forms.ToolStripButton();
- this.editMappingToolStripButton = new System.Windows.Forms.ToolStripButton();
- this.removeMappingToolStripButton = new System.Windows.Forms.ToolStripButton();
- this.clearMappingsToolStripButton = new System.Windows.Forms.ToolStripButton();
- this.remapToolStripButton = new System.Windows.Forms.ToolStripButton();
this.tabControl = new System.Windows.Forms.TabControl();
+ this.irCommandsContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.addIRToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.editIRToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.deleteIRToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.macrosContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.addMacroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.editMacroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.deleteMacroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+ this.testMacroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+ this.createShortcutForMacroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.programsContextMenuStrip.SuspendLayout();
this.mappingsContextMenuStrip.SuspendLayout();
- this.contextMenuStripEvents.SuspendLayout();
+ this.eventsContextMenuStripEvents.SuspendLayout();
this.menuStrip.SuspendLayout();
this.tabPageIRCommands.SuspendLayout();
- this.toolStripIRCommands.SuspendLayout();
+ this.irCommandsToolStrip.SuspendLayout();
this.tabPageMacro.SuspendLayout();
- this.toolStripMacros.SuspendLayout();
+ this.macrosToolStrip.SuspendLayout();
this.tabPageEvents.SuspendLayout();
this.tabPagePrograms.SuspendLayout();
+ this.mappingsToolStrip.SuspendLayout();
this.programsPanel.SuspendLayout();
this.programsToolStrip.SuspendLayout();
- this.mappingsToolStrip.SuspendLayout();
this.tabControl.SuspendLayout();
+ this.irCommandsContextMenuStrip.SuspendLayout();
+ this.macrosContextMenuStrip.SuspendLayout();
this.SuspendLayout();
//
// programsContextMenuStrip
@@ -153,7 +167,7 @@
this.removeProgramToolStripMenuItem.Name = "removeProgramToolStripMenuItem";
this.removeProgramToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
this.removeProgramToolStripMenuItem.Text = "&Remove Program";
- this.removeProgramToolStripMenuItem.Click += new System.EventHandler(this.RemoveProgram);
+ this.removeProgramToolStripMenuItem.Click += new System.EventHandler(this.DeleteProgram);
//
// imageListPrograms
//
@@ -166,7 +180,7 @@
this.mappingsContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.newMappingToolStripMenuItem,
this.editMappingToolStripMenuItem,
- this.removeMappingToolStripMenuItem,
+ this.deleteMappingToolStripMenuItem,
this.clearMappingsToolStripMenuItem,
this.remapToolStripMenuItem,
this.toolStripSeparator3,
@@ -178,54 +192,54 @@
// newMappingToolStripMenuItem
//
this.newMappingToolStripMenuItem.Name = "newMappingToolStripMenuItem";
- this.newMappingToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
+ this.newMappingToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.newMappingToolStripMenuItem.Text = "&New";
this.newMappingToolStripMenuItem.Click += new System.EventHandler(this.NewButtonMapping);
//
// editMappingToolStripMenuItem
//
this.editMappingToolStripMenuItem.Name = "editMappingToolStripMenuItem";
- this.editMappingToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
+ this.editMappingToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.editMappingToolStripMenuItem.Text = "&Edit";
this.editMappingToolStripMenuItem.Click += new System.EventHandler(this.EditButtonMapping);
//
- // removeMappingToolStripMenuItem
+ // deleteMappingToolStripMenuItem
//
- this.removeMappingToolStripMenuItem.Name = "removeMappingToolStripMenuItem";
- this.removeMappingToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
- this.removeMappingToolStripMenuItem.Text = "&Delete";
- this.removeMappingToolStripMenuItem.Click += new System.EventHandler(this.DeleteButtonMapping);
+ this.deleteMappingToolStripMenuItem.Name = "deleteMappingToolStripMenuItem";
+ this.deleteMappingToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.deleteMappingToolStripMenuItem.Text = "&Delete";
+ this.deleteMappingToolStripMenuItem.Click += new System.EventHandler(this.DeleteButtonMapping);
//
// clearMappingsToolStripMenuItem
//
this.clearMappingsToolStripMenuItem.Name = "clearMappingsToolStripMenuItem";
- this.clearMappingsToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
+ this.clearMappingsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.clearMappingsToolStripMenuItem.Text = "&Clear";
this.clearMappingsToolStripMenuItem.Click += new System.EventHandler(this.ClearButtonMappings);
//
// remapToolStripMenuItem
//
this.remapToolStripMenuItem.Name = "remapToolStripMenuItem";
- this.remapToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
+ this.remapToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.remapToolStripMenuItem.Text = "&Remap";
this.remapToolStripMenuItem.Click += new System.EventHandler(this.RemapButtonMapping);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(140, 6);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);
//
// copyMappingsFromToolStripMenuItem
//
this.copyMappingsFromToolStripMenuItem.Name = "copyMappingsFromToolStripMenuItem";
- this.copyMappingsFromToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
+ this.copyMappingsFromToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.copyMappingsFromToolStripMenuItem.Text = "Copy &from ...";
//
// buttonOK
//
this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.buttonOK.Location = new System.Drawing.Point(472, 440);
+ this.buttonOK.Location = new System.Drawing.Point(464, 409);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(64, 24);
this.buttonOK.TabIndex = 3;
@@ -233,17 +247,24 @@
this.buttonOK.UseVisualStyleBackColor = true;
this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
//
- // contextMenuStripEvents
+ // eventsContextMenuStripEvents
//
- this.contextMenuStripEvents.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.eventsContextMenuStripEvents.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.addEventToolStripMenuItem,
this.removeEventToolStripMenuItem});
- this.contextMenuStripEvents.Name = "contextMenuStripEvents";
- this.contextMenuStripEvents.Size = new System.Drawing.Size(118, 26);
+ this.eventsContextMenuStripEvents.Name = "contextMenuStripEvents";
+ this.eventsContextMenuStripEvents.Size = new System.Drawing.Size(154, 48);
//
+ // addEventToolStripMenuItem
+ //
+ this.addEventToolStripMenuItem.Name = "addEventToolStripMenuItem";
+ this.addEventToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
+ this.addEventToolStripMenuItem.Text = "Add new event";
+ //
// removeEventToolStripMenuItem
//
this.removeEventToolStripMenuItem.Name = "removeEventToolStripMenuItem";
- this.removeEventToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
+ this.removeEventToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
this.removeEventToolStripMenuItem.Text = "&Remove";
this.removeEventToolStripMenuItem.Click += new System.EventHandler(this.removeEventToolStripMenuItem_Click);
//
@@ -251,7 +272,7 @@
//
this.checkBoxAutoRun.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.checkBoxAutoRun.AutoSize = true;
- this.checkBoxAutoRun.Location = new System.Drawing.Point(8, 448);
+ this.checkBoxAutoRun.Location = new System.Drawing.Point(8, 417);
this.checkBoxAutoRun.Name = "checkBoxAutoRun";
this.checkBoxAutoRun.Size = new System.Drawing.Size(167, 17);
this.checkBoxAutoRun.TabIndex = 2;
@@ -276,7 +297,7 @@
this.programsListView.Name = "programsListView";
this.programsListView.ShowGroups = false;
this.programsListView.ShowItemToolTips = true;
- this.programsListView.Size = new System.Drawing.Size(445, 84);
+ this.programsListView.Size = new System.Drawing.Size(451, 86);
this.programsListView.TabIndex = 0;
this.programsListView.TileSize = new System.Drawing.Size(128, 48);
this.toolTip.SetToolTip(this.programsListView, "Choose a Program to modify mappings");
@@ -288,10 +309,11 @@
//
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.configurationToolStripMenuItem,
+ this.settingsToolStripMenuItem,
this.helpToolStripMenuItem});
this.menuStrip.Location = new System.Drawing.Point(0, 0);
this.menuStrip.Name = "menuStrip";
- this.menuStrip.Size = new System.Drawing.Size(544, 24);
+ this.menuStrip.Size = new System.Drawing.Size(536, 24);
this.menuStrip.TabIndex = 0;
this.menuStrip.Text = "menuStrip";
//
@@ -301,15 +323,10 @@
this.newToolStripMenuItem,
this.openToolStripMenuItem,
this.importToolStripMenuItem,
- this.exportToolStripMenuItem,
- this.toolStripSeparator1,
- this.serverToolStripMenuItem,
- this.advancedToolStripMenuItem,
- this.toolStripSeparator2,
- this.exitToolStripMenuItem});
+ this.exportToolStripMenuItem});
this.configurationToolStripMenuItem.Name = "configurationToolStripMenuItem";
- this.configurationToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
- this.configurationToolStripMenuItem.Text = "&File";
+ this.configurationToolStripMenuItem.Size = new System.Drawing.Size(93, 20);
+ this.configurationToolStripMenuItem.Text = "&Configuration";
//
// newToolStripMenuItem
//
@@ -317,7 +334,7 @@
this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
this.newToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
this.newToolStripMenuItem.Text = "&New";
- this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click);
+ this.newToolStripMenuItem.Click += new System.EventHandler(this.NewConfig);
//
// openToolStripMenuItem
//
@@ -325,53 +342,45 @@
this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.openToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
this.openToolStripMenuItem.Text = "&Open...";
- this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
+ this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenConfig);
//
// importToolStripMenuItem
//
this.importToolStripMenuItem.Name = "importToolStripMenuItem";
this.importToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
this.importToolStripMenuItem.Text = "&Import...";
- this.importToolStripMenuItem.Click += new System.EventHandler(this.importToolStripMenuItem_Click);
+ this.importToolStripMenuItem.Click += new System.EventHandler(this.ImportConfig);
//
// exportToolStripMenuItem
//
this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
this.exportToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
this.exportToolStripMenuItem.Text = "&Export...";
- this.exportToolStripMenuItem.Click += new System.EventHandler(this.exportToolStripMenuItem_Click);
+ this.exportToolStripMenuItem.Click += new System.EventHandler(this.ExportConfig);
//
- // toolStripSeparator1
+ // settingsToolStripMenuItem
//
- this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(154, 6);
+ this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.serverToolStripMenuItem,
+ this.advancedToolStripMenuItem});
+ this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
+ this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
+ this.settingsToolStripMenuItem.Text = "Settings";
//
// serverToolStripMenuItem
//
this.serverToolStripMenuItem.Name = "serverToolStripMenuItem";
- this.serverToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+ this.serverToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.serverToolStripMenuItem.Text = "&Server...";
- this.serverToolStripMenuItem.Click += new System.EventHandler(this.serverToolStripMenuItem2_Click);
+ this.serverToolStripMenuItem.Click += new System.EventHandler(this.SetServer);
//
// advancedToolStripMenuItem
//
this.advancedToolStripMenuItem.Name = "advancedToolStripMenuItem";
- this.advancedToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+ this.advancedToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.advancedToolStripMenuItem.Text = "&Advanced...";
- this.advancedToolStripMenuItem.Click += new System.EventHandler(this.advancedToolStripMenuItem_Click);
+ this.advancedToolStripMenuItem.Click += new System.EventHandler(this.ShowAdvancedSettings);
//
- // toolStripSeparator2
- //
- this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(154, 6);
- //
- // exitToolStripMenuItem
- //
- this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
- this.exitToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
- this.exitToolStripMenuItem.Text = "E&xit";
- this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
- //
// helpToolStripMenuItem
//
this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -395,6 +404,11 @@
this.aboutToolStripMenuItem.Text = "&About";
this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
//
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 6);
+ //
// openFileDialog
//
this.openFileDialog.Filter = "XML Files|*.xml";
@@ -406,56 +420,56 @@
//
// tabPageIRCommands
//
- this.tabPageIRCommands.Controls.Add(this.toolStripIRCommands);
+ this.tabPageIRCommands.Controls.Add(this.irCommandsToolStrip);
this.tabPageIRCommands.Controls.Add(this.listViewIR);
this.tabPageIRCommands.Location = new System.Drawing.Point(4, 22);
this.tabPageIRCommands.Name = "tabPageIRCommands";
this.tabPageIRCommands.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageIRCommands.Size = new System.Drawing.Size(520, 374);
+ this.tabPageIRCommands.Size = new System.Drawing.Size(512, 343);
this.tabPageIRCommands.TabIndex = 3;
this.tabPageIRCommands.Text = "IR Commands";
this.tabPageIRCommands.UseVisualStyleBackColor = true;
//
- // toolStripIRCommands
+ // irCommandsToolStrip
//
- this.toolStripIRCommands.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.toolStripIRCommands.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
- this.toolStripIRCommands.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripButtonNewIR,
- this.toolStripButtonEditIR,
- this.toolStripButtonDeleteIR});
- this.toolStripIRCommands.Location = new System.Drawing.Point(3, 346);
- this.toolStripIRCommands.Name = "toolStripIRCommands";
- this.toolStripIRCommands.Size = new System.Drawing.Size(514, 25);
- this.toolStripIRCommands.TabIndex = 1;
- this.toolStripIRCommands.Text = "IR Commands";
+ this.irCommandsToolStrip.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.irCommandsToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
+ this.irCommandsToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.newIRToolStripButton,
+ this.editIRToolStripButton,
+ this.deleteIRToolStripButton});
+ this.irCommandsToolStrip.Location = new System.Drawing.Point(3, 315);
+ this.irCommandsToolStrip.Name = "irCommandsToolStrip";
+ this.irCommandsToolStrip.Size = new System.Drawing.Size(506, 25);
+ this.irCommandsToolStrip.TabIndex = 1;
+ this.irCommandsToolStrip.Text = "IR Commands";
//
- // toolStripButtonNewIR
+ // newIRToolStripButton
//
- this.toolStripButtonNewIR.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButtonNewIR.Name = "toolStripButtonNewIR";
- this.toolStripButtonNewIR.Size = new System.Drawing.Size(35, 22);
- this.toolStripButtonNewIR.Text = "New";
- this.toolStripButtonNewIR.ToolTipText = "Create a new IR Command";
- this.toolStripButtonNewIR.Click += new System.EventHandler(this.toolStripButtonNewIR_Click);
+ this.newIRToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.newIRToolStripButton.Name = "newIRToolStripButton";
+ this.newIRToolStripButton.Size = new System.Drawing.Size(35, 22);
+ this.newIRToolStripButton.Text = "New";
+ this.newIRToolStripButton.ToolTipText = "Create a new IR Command";
+ this.newIRToolStripButton.Click += new System.EventHandler(this.NewIRCommand);
//
- // toolStripButtonEditIR
+ // editIRToolStripButton
//
- this.toolStripButtonEditIR.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButtonEditIR.Name = "toolStripButtonEditIR";
- this.toolStripButtonEditIR.Size = new System.Drawing.Size(31, 22);
- this.toolStripButtonEditIR.Text = "Edit";
- this.toolStripButtonEditIR.ToolTipText = "Edit the selected IR Command";
- this.toolStripButtonEditIR.Click += new System.EventHandler(this.toolStripButtonEditIR_Click);
+ this.editIRToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.editIRToolStripButton.Name = "editIRToolStripButton";
+ this.editIRToolStripButton.Size = new System.Drawing.Size(31, 22);
+ this.editIRToolStripButton.Text = "Edit";
+ this.editIRToolStripButton.ToolTipText = "Edit the selected IR Command";
+ this.editIRToolStripButton.Click += new System.EventHandler(this.EditIRCommand);
//
- // toolStripButtonDeleteIR
+ // deleteIRToolStripButton
//
- this.toolStripButtonDeleteIR.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButtonDeleteIR.Name = "toolStripButtonDeleteIR";
- this.toolStripButtonDeleteIR.Size = new System.Drawing.Size(44, 22);
- this.toolStripButtonDeleteIR.Text = "Delete";
- this.toolStripButtonDeleteIR.ToolTipText = "Delete the selected IR Command";
- this.toolStripButtonDeleteIR.Click += new System.EventHandler(this.toolStripButtonDeleteIR_Click);
+ this.deleteIRToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.deleteIRToolStripButton.Name = "deleteIRToolStripButton";
+ this.deleteIRToolStripButton.Size = new System.Drawing.Size(44, 22);
+ this.deleteIRToolStripButton.Text = "Delete";
+ this.deleteIRToolStripButton.ToolTipText = "Delete the selected IR Command";
+ this.deleteIRToolStripButton.Click += new System.EventHandler(this.DeleteIRCommand);
//
// listViewIR
//
@@ -466,110 +480,113 @@
this.listViewIR.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.listViewIR.HideSelection = false;
this.listViewIR.LabelEdit = true;
- this.listViewIR.Location = new System.Drawing.Point(8, 8);
+ this.listViewIR.Location = new System.Drawing.Point(6, 6);
this.listViewIR.MultiSelect = false;
this.listViewIR.Name = "listViewIR";
this.listViewIR.ShowGroups = false;
- this.listViewIR.Size = new System.Drawing.Size(504, 328);
+ this.listViewIR.Size = new System.Drawing.Size(500, 306);
this.listViewIR.TabIndex = 0;
this.listViewIR.UseCompatibleStateImageBehavior = false;
this.listViewIR.View = System.Windows.Forms.View.List;
this.listViewIR.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewIR_AfterLabelEdit);
- this.listViewIR.DoubleClick += new System.EventHandler(this.listViewIR_DoubleClick);
+ this.listViewIR.SelectedIndexChanged += new System.EventHandler(this.listViewIR_SelectedIndexChanged);
+ this.listViewIR.DoubleClick += new System.EventHandler(this.EditIRCommand);
//
// tabPageMacro
//
- this.tabPageMacro.Controls.Add(this.toolStripMacros);
+ this.tabPageMacro.Controls.Add(this.macrosToolStrip);
this.tabPageMacro.Controls.Add(this.listViewMacro);
this.tabPageMacro.Location = new System.Drawing.Point(4, 22);
this.tabPageMacro.Name = "tabPageMacro";
this.tabPageMacro.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageMacro.Size = new System.Drawing.Size(520, 374);
+ this.tabPageMacro.Size = new System.Drawing.Size(512, 343);
this.tabPageMacro.TabIndex = 2;
this.tabPageMacro.Text = "Macros";
this.tabPageMacro.UseVisualStyleBackColor = true;
//
- // toolStripMacros
+ // macrosToolStrip
//
- this.toolStripMacros.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.toolStripMacros.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
- this.toolStripMacros.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripButtonNewMacro,
- this.toolStripButtonEditMacro,
- this.toolStripButtonDeleteMacro,
- this.toolStripButtonCreateShortcutForMacro,
- this.toolStripButtonTestMacro});
- this.toolStripMacros.Location = new System.Drawing.Point(3, 346);
- this.toolStripMacros.Name = "toolStripMacros";
- this.toolStripMacros.Size = new System.Drawing.Size(514, 25);
- this.toolStripMacros.TabIndex = 1;
- this.toolStripMacros.Text = "Macros";
+ this.macrosToolStrip.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.macrosToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
+ this.macrosToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.newMacroToolStripButton,
+ this.editMacroToolStripButton,
+ this.deleteMacroToolStripButton,
+ this.createShortcutForMacroToolStripButton,
+ this.testMacroToolStripButton});
+ this.macrosToolStrip.Location = new System.Drawing.Point(3, 315);
+ this.macrosToolStrip.Name = "macrosToolStrip";
+ this.macrosToolStrip.Size = new System.Drawing.Size(506, 25);
+ this.macrosToolStrip.TabIndex = 1;
+ this.macrosToolStrip.Text = "Macros";
//
- // toolStripButtonNewMacro
+ // newMacroToolStripButton
//
- this.toolStripButtonNewMacro.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButtonNewMacro.Name = "toolStripButtonNewMacro";
- this.toolStripButtonNewMacro.Size = new System.Drawing.Size(35, 22);
- this.toolStripButtonNewMacro.Text = "New";
- this.toolStripButtonNewMacro.ToolTipText = "Create a new macro";
- this.toolStripButtonNewMacro.Click += new System.EventHandler(this.toolStripButtonNewMacro_Click);
+ this.newMacroToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.newMacroToolStripButton.Name = "newMacroToolStripButton";
+ this.newMacroToolStripButton.Size = new System.Drawing.Size(35, 22);
+ this.newMacroToolStripButton.Text = "New";
+ this.newMacroToolStripButton.ToolTipText = "Create a new macro";
+ this.newMacroToolStripButton.Click += new System.EventHandler(this.NewMacro);
//
- // toolStripButtonEditMacro
+ // editMacroToolStripButton
//
- this.toolStripButtonEditMacro.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButtonEditMacro.Name = "toolStripButtonEditMacro";
- this.toolStripButtonEditMacro.Size = new System.Drawing.Size(31, 22);
- this.toolStripButtonEditMacro.Text = "Edit";
- this.toolStripButtonEditMacro.ToolTipText = "Edit the selected macro";
- this.toolStripButtonEditMacro.Click += new System.EventHandler(this.toolStripButtonEditMacro_Click);
+ this.editMacroToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.editMacroToolStripButton.Name = "editMacroToolStripButton";
+ this.editMacroToolStripButton.Size = new System.Drawing.Size(31, 22);
+ this.editMacroToolStripButton.Text = "Edit";
+ this.editMacroToolStripButton.ToolTipText = "Edit the selected macro";
+ this.editMacroToolStripButton.Click += new System.EventHandler(this.EditMacro);
//
- // toolStripButtonDeleteMacro
+ // deleteMacroToolStripButton
//
- this.toolStripButtonDeleteMacro.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButtonDeleteMacro.Name = "toolStripButtonDeleteMacro";
- this.toolStripButtonDeleteMacro.Size = new System.Drawing.Size(44, 22);
- this.toolStripButtonDeleteMacro.Text = "Delete";
- this.toolStripButtonDeleteMacro.ToolTipText = "Delete the selected macro";
- this.toolStripButtonDeleteMacro.Click += new System.EventHandler(this.toolStripButtonDeleteMacro_Click);
+ this.deleteMacroToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.deleteMacroToolStripButton.Name = "deleteMacroToolStripButton";
+ this.deleteMacroToolStripButton.Size = new System.Drawing.Size(44, 22);
+ this.deleteMacroToolStripButton.Text = "Delete";
+ this.deleteMacroToolStripButton.ToolTipText = "Delete the selected macro";
+ this.deleteMacroToolStripButton.Click += new System.EventHandler(this.DeleteMacro);
//
- // toolStripButtonCreateShortcutForMacro
+ // createShortcutForMacroToolStripButton
//
- this.toolStripButtonCreateShortcutForMacro.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
- this.toolStripButtonCreateShortcutForMacro.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButtonCreateShortcutForMacro.Name = "toolStripButtonCreateShortcutForMacro";
- this.toolStripButtonCreateShortcutForMacro.Size = new System.Drawing.Size(92, 22);
- this.toolStripButtonCreateShortcutForMacro.Text = "Create shortcut";
- this.toolStripButtonCreateShortcutForMacro.ToolTipText = "Create a shortcut to run the selected macro";
- this.toolStripButtonCreateShortcutForMacro.Click += new System.EventHandler(this.toolStripButtonCreateShortcutForMacro_Click);
+ this.createShortcutForMacroToolStripButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.createShortcutForMacroToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.createShortcutForMacroToolStripButton.Name = "createShortcutForMacroToolStripButton";
+ this.createShortcutForMacroToolStripButton.Size = new System.Drawing.Size(92, 22);
+ this.createShortcutForMacroToolStripButton.Text = "Create shortcut";
+ this.createShortcutForMacroToolStripButton.ToolTipText = "Create a shortcut to run the selected macro";
+ this.createShortcutForMacroToolStripButton.Click += new System.EventHandler(this.CreateShortcutForMacro);
//
- // toolStripButtonTestMacro
+ // testMacroToolStripButton
//
- this.toolStripButtonTestMacro.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButtonTestMacro.Name = "toolStripButtonTestMacro";
- this.toolStripButtonTestMacro.Size = new System.Drawing.Size(33, 22);
- this.toolStripButtonTestMacro.Text = "Test";
- this.toolStripButtonTestMacro.ToolTipText = "Test the selected macro";
- this.toolStripButtonTestMacro.Click += new System.EventHandler(this.toolStripButtonTestMacro_Click);
+ this.testMacroToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.testMacroToolStripButton.Name = "testMacroToolStripButton";
+ this.testMacroToolStripButton.Size = new System.Drawing.Size(33, 22);
+ this.testMacroToolStripButton.Text = "Test";
+ this.testMacroToolStripButton.ToolTipText = "Test the selected macro";
+ this.testMacroToolStripButton.Click += new System.EventHandler(this.TestMacro);
//
// listViewMacro
//
this.listViewMacro.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
+ this.listViewMacro.ContextMenuStrip = this.macrosContextMenuStrip;
this.listViewMacro.FullRowSelect = true;
this.listViewMacro.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.listViewMacro.HideSelection = false;
this.listViewMacro.LabelEdit = true;
- this.listViewMacro.Location = new System.Drawing.Point(8, 8);
+ this.listViewMacro.Location = new System.Drawing.Point(6, 6);
this.listViewMacro.MultiSelect = false;
this.listViewMacro.Name = "listViewMacro";
this.listViewMacro.ShowGroups = false;
- this.listViewMacro.Size = new System.Drawing.Size(504, 328);
+ this.listViewMacro.Size = new System.Drawing.Size(500, 306);
this.listViewMacro.TabIndex = 0;
this.listViewMacro.UseCompatibleStateImageBehavior = false;
this.listViewMacro.View = System.Windows.Forms.View.List;
this.listViewMacro.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewMacro_AfterLabelEdit);
- this.listViewMacro.DoubleClick += new System.EventHandler(this.listViewMacro_DoubleClick);
+ this.listViewMacro.SelectedIndexChanged += new System.EventHandler(this.listViewMacro_SelectedIndexChanged);
+ this.listViewMacro.DoubleClick += new System.EventHandler(this.EditMacro);
//
// tabPageEvents
//
@@ -583,7 +600,7 @@
this.tabPageEvents.Location = new System.Drawing.Point(4, 22);
this.tabPageEvents.Name = "tabPageEvents";
this.tabPageEvents.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageEvents.Size = new System.Drawing.Size(520, 374);
+ this.tabPageEvents.Size = new System.Drawing.Size(512, 343);
this.tabPageEvents.TabIndex = 1;
this.tabPageEvents.Text = "Events";
this.tabPageEvents.UseVisualStyleBackColor = true;
@@ -591,29 +608,29 @@
// buttonSetCommand
//
this.buttonSetCommand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonSetCommand.Location = new System.Drawing.Point(456, 344);
+ this.buttonSetCommand.Location = new System.Drawing.Point(450, 313);
this.buttonSetCommand.Name = "buttonSetCommand";
this.buttonSetCommand.Size = new System.Drawing.Size(56, 24);
this.buttonSetCommand.TabIndex = 6;
this.buttonSetCommand.Text = "Set";
this.buttonSetCommand.UseVisualStyleBackColor = true;
- this.buttonSetCommand.Click += new System.EventHandler(this.buttonSetCommand_Click);
+ this.buttonSetCommand.Click += new System.EventHandler(this.SetCommandToEvent);
//
// buttonAddEvent
//
this.buttonAddEvent.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonAddEvent.Location = new System.Drawing.Point(456, 312);
+ this.buttonAddEvent.Location = new System.Drawing.Point(450, 283);
this.buttonAddEvent.Name = "buttonAddEvent";
this.buttonAddEvent.Size = new System.Drawing.Size(56, 24);
this.buttonAddEvent.TabIndex = 3;
this.buttonAddEvent.Text = "Add";
this.buttonAddEvent.UseVisualStyleBackColor = true;
- this.buttonAddEvent.Click += new System.EventHandler(this.buttonAddEvent_Click);
+ this.buttonAddEvent.Click += new System.EventHandler(this.AddEvent);
//
// labelCommand
//
this.labelCommand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.labelCommand.Location = new System.Drawing.Point(8, 344);
+ this.labelCommand.Location = new System.Drawing.Point(8, 315);
this.labelCommand.Name = "labelCommand";
this.labelCommand.Size = new System.Drawing.Size(80, 20);
this.labelCommand.TabIndex = 4;
@@ -626,7 +643,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.comboBoxCommands.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxCommands.FormattingEnabled = true;
- this.comboBoxCommands.Location = new System.Drawing.Point(88, 344);
+ this.comboBoxCommands.Location = new System.Drawing.Point(88, 313);
this.comboBoxCommands.Name = "comboBoxCommands";
this.comboBoxCommands.Size = new System.Drawing.Size(352, 21);
this.comboBoxCommands.TabIndex = 5;
@@ -634,7 +651,7 @@
// labelEvent
//
this.labelEvent.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.labelEvent.Location = new System.Drawing.Point(8, 312);
+ this.labelEvent.Location = new System.Drawing.Point(8, 283);
this.labelEvent.Name = "labelEvent";
this.labelEvent.Size = new System.Drawing.Size(80, 21);
this.labelEvent.TabIndex = 1;
@@ -647,7 +664,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.comboBoxEvents.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxEvents.FormattingEnabled = true;
- this.comboBoxEvents.Location = new System.Drawing.Point(88, 312);
+ this.comboBoxEvents.Location = new System.Drawing.Point(88, 283);
this.comboBoxEvents.Name = "comboBoxEvents";
this.comboBoxEvents.Size = new System.Drawing.Size(352, 21);
this.comboBoxEvents.TabIndex = 2;
@@ -660,15 +677,15 @@
this.listViewEventMap.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeaderEvent,
this.columnHeaderEventCommand});
- this.listViewEventMap.ContextMenuStrip = this.contextMenuStripEvents;
+ this.listViewEventMap.ContextMenuStrip = this.eventsContextMenuStripEvents;
this.listViewEventMap.FullRowSelect = true;
this.listViewEventMap.GridLines = true;
this.listViewEventMap.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.listViewEventMap.HideSelection = false;
- this.listViewEventMap.Location = new System.Drawing.Point(8, 8);
+ this.listViewEventMap.Location = new System.Drawing.Point(6, 6);
this.listViewEventMap.Name = "listViewEventMap";
this.listViewEventMap.ShowGroups = false;
- this.listViewEventMap.Size = new System.Drawing.Size(504, 296);
+ this.listViewEventMap.Size = new System.Drawing.Size(500, 271);
this.listViewEventMap.TabIndex = 0;
this.listViewEventMap.UseCompatibleStateImageBehavior = false;
this.listViewEventMap.View = System.Windows.Forms.View.Details;
@@ -688,17 +705,79 @@
//
// tabPagePrograms
//
+ this.tabPagePrograms.Controls.Add(this.mappingsToolStrip);
this.tabPagePrograms.Controls.Add(this.programsPanel);
this.tabPagePrograms.Controls.Add(this.mappingsListView);
- this.tabPagePrograms.Controls.Add(this.mappingsToolStrip);
this.tabPagePrograms.Location = new System.Drawing.Point(4, 22);
this.tabPagePrograms.Name = "tabPagePrograms";
this.tabPagePrograms.Padding = new System.Windows.Forms.Padding(3);
- this.tabPagePrograms.Size = new System.Drawing.Size(520, 374);
+ this.tabPagePrograms.Size = new System.Drawing.Size(512, 343);
this.tabPagePrograms.TabIndex = 0;
this.tabPagePrograms.Text = "Programs";
this.tabPagePrograms.UseVisualStyleBackColor = true;
//
+ // mappingsToolStrip
+ //
+ this.mappingsToolStrip.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.mappingsToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
+ this.mappingsToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.newMappingToolStripButton,
+ this.editMappingToolStripButton,
+ this.deleteMappingToolStripButton,
+ this.clearMappingsToolStripButton,
+ this.remapToolStripButton});
+ this.mappingsToolStrip.Location = new System.Drawing.Point(3, 315);
+ this.mappingsToolStrip.Name = "mappingsToolStrip";
+ this.mappingsToolStrip.Size = new System.Drawing.Size(506, 25);
+ this.mappingsToolStrip.TabIndex = 2;
+ this.mappingsToolStrip.Text = "Button Mappings";
+ //
+ // newMappingToolStripButton
+ //
+ this.newMappingToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.newMappingToolStripButton.Name = "newMappingToolStripButton";
+ this.newMappingToolStripButton.Size = new System.Drawing.Size(35, 22);
+ this.newMappingToolStripButton.Text = "New";
+ this.newMappingToolStripButton.ToolTipText = "Create a new button mapping";
+ this.newMappingToolStripButton.Click += new System.EventHandler(this.NewButtonMapping);
+ //
+ // editMappingToolStripButton
+ //
+ this.editMappingToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.editMappingToolStripButton.Name = "editMappingToolStripButton";
+ this.editMappingToolStripButton.Size = new System.Drawing.Size(31, 22);
+ this.editMappingToolStripButton.Text = "Edit";
+ this.editMappingToolStripButton.ToolTipText = "Edit the selected button mapping";
+ this.editMappingToolStripButton.Click += new System.EventHandler(this.EditButtonMapping);
+ //
+ // deleteMappingToolStripButton
+ //
+ this.deleteMappingToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.deleteMappingToolStripButton.Name = "deleteMappingToolStripButton";
+ this.deleteMappingToolStripButton.Size = new System.Drawing.Size(44, 22);
+ this.deleteMappingToolStripButton.Text = "Delete";
+ this.deleteMappingToolStripButton.ToolTipText = "Delete the selected button mapping";
+ this.deleteMappingToolStripButton.Click += new System.EventHandler(this.DeleteButtonMapping);
+ //
+ // clearMappingsToolStripButton
+ //
+ this.clearMappingsToolStripButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.clearMappingsToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.clearMappingsToolStripButton.Name = "clearMappingsToolStripButton";
+ this.clearMappingsToolStripButton.Size = new System.Drawing.Size(61, 22);
+ this.clearMappingsToolStripButton.Text = "Delete All";
+ this.clearMappingsToolStripButton.ToolTipText = "Delete all the button mappings";
+ this.clearMappingsToolStripButton.Click += new System.EventHandler(this.ClearButtonMappings);
+ //
+ // remapToolStripButton
+ //
+ this.remapToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.remapToolStripButton.Name = "remapToolStripButton";
+ this.remapToolStripButton.Size = new System.Drawing.Size(48, 22);
+ this.remapToolStripButton.Text = "Remap";
+ this.remapToolStripButton.ToolTipText = "Link a new code to the selected mapping";
+ this.remapToolStripButton.Click += new System.EventHandler(this.RemapButtonMapping);
+ //
// programsPanel
//
this.programsPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
@@ -707,9 +786,9 @@
this.programsPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.programsPanel.Controls.Add(this.programsListView);
this.programsPanel.Controls.Add(this.programsToolStrip);
- this.programsPanel.Location = new System.Drawing.Point(8, 8);
+ this.programsPanel.Location = new System.Drawing.Point(6, 6);
this.programsPanel.Name = "programsPanel";
- this.programsPanel.Size = new System.Drawing.Size(504, 88);
+ this.programsPanel.Size = new System.Drawing.Size(500, 90);
this.programsPanel.TabIndex = 3;
//
// programsToolStrip
@@ -721,9 +800,9 @@
this.editProgramToolStripButton,
this.removeProgramToolStripButton});
this.programsToolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow;
- this.programsToolStrip.Location = new System.Drawing.Point(445, 0);
+ this.programsToolStrip.Location = new System.Drawing.Point(451, 0);
this.programsToolStrip.Name = "programsToolStrip";
- this.programsToolStrip.Size = new System.Drawing.Size(55, 84);
+ this.programsToolStrip.Size = new System.Drawing.Size(45, 86);
this.programsToolStrip.TabIndex = 2;
this.programsToolStrip.Text = "toolStrip1";
//
@@ -732,7 +811,7 @@
this.addProgramToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.addProgramToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.addProgramToolStripButton.Name = "addProgramToolStripButton";
- this.addProgramToolStripButton.Size = new System.Drawing.Size(52, 19);
+ this.addProgramToolStripButton.Size = new System.Drawing.Size(42, 19);
this.addProgramToolStripButton.Text = "Add";
this.addProgramToolStripButton.Click += new System.EventHandler(this.AddProgram);
//
@@ -742,19 +821,19 @@
this.editProgramToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("editProgramToolStripButton.Image")));
this.editProgramToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.editProgramToolStripButton.Name = "editProgramToolStripButton";
- this.editProgramToolStripButton.Size = new System.Drawing.Size(52, 19);
+ this.editProgramToolStripButton.Size = new System.Drawing.Size(42, 19);
this.editProgramToolStripButton.Text = "Edit";
this.editProgramToolStripButton.Click += new System.EventHandler(this.EditProgram);
//
- // removeProgramToolStripButton
+ // deleteProgramToolStripButton
//
this.removeProgramToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
- this.removeProgramToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("removeProgramToolStripButton.Image")));
+ this.removeProgramToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("deleteProgramToolStripButton.Image")));
this.removeProgramToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.removeProgramToolStripButton.Name = "removeProgramToolStripButton";
- this.removeProgramToolStripButton.Size = new System.Drawing.Size(52, 19);
- this.removeProgramToolStripButton.Text = "Remove";
- this.removeProgramToolStripButton.Click += new System.EventHandler(this.RemoveProgram);
+ this.removeProgramToolStripButton.Name = "deleteProgramToolStripButton";
+ this.removeProgramToolStripButton.Size = new System.Drawing.Size(42, 19);
+ this.removeProgramToolStripButton.Text = "Delete";
+ this.removeProgramToolStripButton.Click += new System.EventHandler(this.DeleteProgram);
//
// mappingsListView
//
@@ -771,11 +850,11 @@
this.mappingsListView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.mappingsListView.HideSelection = false;
this.mappingsListView.ImeMode = System.Windows.Forms.ImeMode.On;
- this.mappingsListView.Location = new System.Drawing.Point(8, 104);
+ this.mappingsListView.Location = new System.Drawing.Point(6, 102);
this.mappingsListView.MultiSelect = false;
this.mappingsListView.Name = "mappingsListView";
this.mappingsListView.ShowGroups = false;
- this.mappingsListView.Size = new System.Drawing.Size(504, 232);
+ this.mappingsListView.Size = new System.Drawing.Size(500, 210);
this.mappingsListView.TabIndex = 1;
this.mappingsListView.UseCompatibleStateImageBehavior = false;
this.mappingsListView.View = System.Windows.Forms.View.Details;
@@ -798,73 +877,12 @@
this.columnHeaderCommand.Text = "Command";
this.columnHeaderCommand.Width = 200;
//
- // mappingsToolStrip
- //
- this.mappingsToolStrip.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.mappingsToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
- this.mappingsToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.newMappingToolStripButton,
- this.editMappingToolStripButton,
- this.removeMappingToolStripButton,
- this.clearMappingsToolStripButton,
- this.remapToolStripButton});
- this.mappingsToolStrip.Location = new System.Drawing.Point(3, 346);
- this.mappingsToolStrip.Name = "mappingsToolStrip";
- this.mappingsToolStrip.Size = new System.Drawing.Size(514, 25);
- this.mappingsToolStrip.TabIndex = 2;
- this.mappingsToolStrip.Text = "Button Mappings";
- //
- // newMappingToolStripButton
- //
- this.newMappingToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.newMappingToolStripButton.Name = "newMappingToolStripButton";
- this.newMappingToolStripButton.Size = new System.Drawing.Size(35, 22);
- this.newMappingToolStripButton.Text = "New";
- this.newMappingToolStripButton.ToolTipText = "Create a new button mapping";
- this.newMappingToolStripButton.Click += new System.EventHandler(this.NewButtonMapping);
- //
- // editMappingToolStripButton
- //
- this.editMappingToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.editMappingToolStripButton.Name = "editMappingToolStripButton";
- this.editMappingToolStripButton.Size = new System.Drawing.Size(31, 22);
- this.editMappingToolStripButton.Text = "Edit";
- this.editMappingToolStripButton.ToolTipText = "Edit the selected button mapping";
- this.editMappingToolStripButton.Click += new System.EventHandler(this.EditButtonMapping);
- //
- // removeMappingToolStripButton
- //
- this.removeMappingToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.removeMappingToolStripButton.Name = "removeMappingToolStripButton";
- this.removeMappingToolStripButton.Size = new System.Drawing.Size(44, 22);
- this.removeMappingToolStripButton.Text = "Delete";
- this.removeMappingToolStripButton.ToolTipText = "Delete the selected button mapping";
- this.removeMappingToolStripButton.Click += new System.EventHandler(this.DeleteButtonMapping);
- //
- // clearMappingsToolStripButton
- //
- this.clearMappingsToolStripButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
- this.clearMappingsToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.clearMappingsToolStripButton.Name = "clearMappingsToolStripButton";
- this.clearMappingsToolStripButton.Size = new System.Drawing.Size(61, 22);
- this.clearMappingsToolStripButton.Text = "Delete All";
- this.clearMappingsToolStripButton.ToolTipText = "Delete all the button mappings";
- this.clearMappingsToolStripButton.Click += new System.EventHandler(this.ClearButtonMappings);
- //
- // remapToolStripButton
- //
- this.remapToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.remapToolStripButton.Name = "remapToolStripButton";
- this.remapToolStripButton.Size = new System.Drawing.Size(48, 22);
- this.remapToolStripButton.Text = "Remap";
- this.remapToolStripButton.ToolTipText = "Link a new code to the selected mapping";
- this.remapToolStripButton.Click += new System.EventHandler(this.RemapButtonMapping);
- //
// tabControl
//
this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
+ this.tabControl.ContextMenuStrip = this.irCommandsContextMenuStrip;
this.tabControl.Controls.Add(this.tabPagePrograms);
this.tabControl.Controls.Add(this.tabPageEvents);
this.tabControl.Controls.Add(this.tabPageMacro);
@@ -872,16 +890,104 @@
this.tabControl.Location = new System.Drawing.Point(8, 34);
this.tabControl.Name = "tabControl";
this.tabControl.SelectedIndex = 0;
- this.tabControl.Size = new System.Drawing.Size(528, 400);
+ this.tabControl.Size = new System.Drawing.Size(520, 369);
this.tabControl.TabIndex = 1;
this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged);
//
+ // irCommandsContextMenuStrip
+ //
+ this.irCommandsContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.addIRToolStripMenuItem,
+ this.editIRToolStripMenuItem,
+ this.deleteIRToolStripMenuItem});
+ this.irCommandsContextMenuStrip.Name = "contextMenuStrip1";
+ this.irCommandsContextMenuStrip.Size = new System.Drawing.Size(195, 70);
+ //
+ // addIRToolStripMenuItem
+ //
+ this.addIRToolStripMenuItem.Name = "addIRToolStripMenuItem";
+ this.addIRToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
+ this.addIRToolStripMenuItem.Text = "Add new IR Command";
+ this.addIRToolStripMenuItem.Click += new System.EventHandler(this.NewIRCommand);
+ //
+ // editIRToolStripMenuItem
+ //
+ this.editIRToolStripMenuItem.Name = "editIRToolStripMenuItem";
+ this.editIRToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
+ this.editIRToolStripMenuItem.Text = "Edit IR Command";
+ this.editIRToolStripMenuItem.Click += new System.EventHandler(this.EditIRCommand);
+ //
+ // deleteIRToolStripMenuItem
+ //
+ this.deleteIRToolStripMenuItem.Name = "deleteIRToolStripMenuItem";
+ this.deleteIRToolStripMenuItem.Size = new System.Drawing.Size(194, 22);
+ this.deleteIRToolStripMenuItem.Text = "Delete IR Command";
+ this.deleteIRToo...
[truncated message content] |
|
From: <che...@us...> - 2009-11-25 17:28:14
|
Revision: 3185
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3185&view=rev
Author: chef_koch
Date: 2009-11-25 17:26:51 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
disabled the option for signing the projects ("stronk key")
removed key file
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Abstractor.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Debug Client.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/IR Blast.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MacroScope.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/Sage Setup.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Web Remote.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Commands/Command/Command.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Commands/VariableList/VariableList.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssScheduler/IrssScheduler.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink/ShellLink.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/IRServer.Shared.csproj
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
Removed Paths:
-------------
trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.snk
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Abstractor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Abstractor.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Abstractor/Abstractor.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{66F37FF9-0398-4954-812D-065C2D153746}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -11,7 +11,7 @@
<AssemblyName>Abstractor</AssemblyName>
<StartupObject>Abstractor.Program</StartupObject>
<ApplicationIcon>Icon.ico</ApplicationIcon>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Dbox Tuner/Dbox Tuner.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{F8CC05AA-6306-459E-BD32-40C02489EFEC}</ProjectGuid>
<OutputType>Exe</OutputType>
@@ -11,7 +11,7 @@
<AssemblyName>DboxTuner</AssemblyName>
<StartupObject>DboxTuner.Program</StartupObject>
<ApplicationIcon>Icon.ico</ApplicationIcon>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Debug Client.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{4CD051F4-F2B5-47B3-8647-F47C2E4DC131}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -12,7 +12,7 @@
<StartupObject>DebugClient.Program</StartupObject>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/HCW PVR Tuner/HCW PVR Tuner.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{EDE4F0AC-CA13-4E4F-8466-EF0519B7B0EF}</ProjectGuid>
<OutputType>Exe</OutputType>
@@ -10,7 +10,7 @@
<RootNamespace>HcwPvrTuner</RootNamespace>
<AssemblyName>HcwPvrTuner</AssemblyName>
<StartupObject>HcwPvrTuner.Program</StartupObject>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/IR Blast.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{C6B0CF12-01D3-439A-9FB4-DEFD5B32F6FB}</ProjectGuid>
<OutputType>Exe</OutputType>
@@ -13,7 +13,7 @@
</ApplicationIcon>
<StartupObject>IRBlast.Program</StartupObject>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{54E0E8FA-09C3-4755-B9CE-E7E5DDA3E932}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -13,7 +13,7 @@
</ApplicationIcon>
<StartupObject>IRBlast.Program</StartupObject>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -12,7 +12,7 @@
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
<StartupObject>IrFileTool.Program</StartupObject>
<ApplicationIcon>Icon.ico</ApplicationIcon>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Keyboard Input Relay.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{097F7027-77A1-4623-8D6C-3D2020769EFD}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -11,7 +11,7 @@
<AssemblyName>KeyboardInputRelay</AssemblyName>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<StartupObject>KeyboardInputRelay.Program</StartupObject>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/LogTimeCodeExtractor/LogTimeCodeExtractor.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,14 +2,14 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{58BFF250-541B-4AA4-A62D-ACB819AD317B}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LogTimeCodeExtractor</RootNamespace>
<AssemblyName>LogTimeCodeExtractor</AssemblyName>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MacroScope.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MacroScope.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/MacroScope/MacroScope.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -11,7 +11,7 @@
<AssemblyName>MacroScope</AssemblyName>
<StartupObject>MacroScope.Program</StartupObject>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/Sage Setup.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/Sage Setup.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/SageSetup/Sage Setup.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{905131F8-F8AC-4A65-A722-37783902D7B8}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -11,7 +11,7 @@
<AssemblyName>SageSetup</AssemblyName>
<StartupObject>SageSetup.Program</StartupObject>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Translator.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -12,7 +12,7 @@
<ApplicationIcon>Icon.ico</ApplicationIcon>
<StartupObject>Translator.Program</StartupObject>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0C894165-4BE8-4CF7-8F92-2B6DF68EB43A}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -12,7 +12,7 @@
<StartupObject>TrayLauncher.Program</StartupObject>
<ApplicationIcon>Icon.ico</ApplicationIcon>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{46C08F6B-F3C8-461B-9B6F-3BFD4AAAFD63}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -12,7 +12,7 @@
<ApplicationIcon>Icon.ico</ApplicationIcon>
<StartupObject>VirtualRemote.Program</StartupObject>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D871AB9A-71B3-4D63-8320-084BAD75064E}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -12,7 +12,7 @@
<StartupObject>SkinEditor.Program</StartupObject>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
<ApplicationIcon>Icon.ico</ApplicationIcon>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Web Remote.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Web Remote.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Web Remote.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{CCDBA239-8E8E-4F5F-A098-7132EED5F160}</ProjectGuid>
<OutputType>WinExe</OutputType>
@@ -11,7 +11,7 @@
<AssemblyName>WebRemote</AssemblyName>
<StartupObject>WebRemote.Program</StartupObject>
<ApplicationIcon>Icon.ico</ApplicationIcon>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Commands/Command/Command.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Commands/Command/Command.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Commands/Command/Command.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{21E04B17-D850-43E7-AAD3-876C0E062BDB}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -10,7 +10,7 @@
<RootNamespace>Commands</RootNamespace>
<AssemblyName>CommandBase</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/GeneralCommands.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D1BAC7A9-FFB6-44BA-825F-32506831DC3D}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -10,7 +10,7 @@
<RootNamespace>Commands.General</RootNamespace>
<AssemblyName>GeneralCommands</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Commands/VariableList/VariableList.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Commands/VariableList/VariableList.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Commands/VariableList/VariableList.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{106A69D2-670C-4DE5-A81C-A3CD5D3F21EB}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -10,7 +10,7 @@
<RootNamespace>Commands</RootNamespace>
<AssemblyName>VariableList</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssComms.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -15,7 +15,7 @@
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssScheduler/IrssScheduler.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssScheduler/IrssScheduler.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssScheduler/IrssScheduler.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,14 +2,14 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{28098574-D22E-457C-AFFA-560554499EAC}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>IrssScheduler</RootNamespace>
<AssemblyName>IrssScheduler</AssemblyName>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -13,7 +13,7 @@
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink/ShellLink.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink/ShellLink.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/ShellLink/ShellLink.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -1,7 +1,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{28923F6E-8A68-4BC8-A507-825B09C3F64E}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -25,7 +25,7 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<OldToolsVersion>2.0</OldToolsVersion>
</PropertyGroup>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -12,7 +12,7 @@
<StartupObject>IRServer.Program</StartupObject>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
<ApplicationIcon>Resources\iconGreen.ico</ApplicationIcon>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -17,7 +17,7 @@
</AssemblyOriginatorKeyFile>
<Win32Resource>
</Win32Resource>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/IRServer.Shared.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/IRServer.Shared.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/IRServer.Shared.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -12,7 +12,7 @@
<AssemblyName>IRServer.Shared</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2009-11-25 17:03:02 UTC (rev 3184)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2009-11-25 17:26:51 UTC (rev 3185)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.30729</ProductVersion>
+ <ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -10,7 +10,7 @@
<RootNamespace>IRServer.Plugin</RootNamespace>
<AssemblyName>IRServerPluginInterface</AssemblyName>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\IR Server Suite.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
Deleted: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.snk
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2009-12-13 15:03:31
|
Revision: 3230
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3230&view=rev
Author: chef_koch
Date: 2009-12-13 15:03:20 +0000 (Sun, 13 Dec 2009)
Log Message:
-----------
moved handling of keystrokes to it's own panel to prevent redundant code
- this includes textbox, context menu and it's code
added media and volume keys to vk key enumeration
added media and volume keys to context menu of KeystrokeCommandPanel
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.resx
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Forms/EditKeystrokes.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Forms/EditKeystrokes.cs
trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Forms/EditKeystrokes.resx
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/KeysCommand.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/KeysCommand.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Forms/KeysCommand.resx
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Keyboard.cs
Added Paths:
-----------
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Panels/
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Panels/KeystrokeCommandPanel.Designer.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Panels/KeystrokeCommandPanel.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Panels/KeystrokeCommandPanel.resx
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs 2009-12-12 16:32:05 UTC (rev 3229)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.Designer.cs 2009-12-13 15:03:20 UTC (rev 3230)
@@ -95,67 +95,7 @@
this.radioButtonApplication = new System.Windows.Forms.RadioButton();
this.radioButtonClass = new System.Windows.Forms.RadioButton();
this.tabPageKeystrokes = new System.Windows.Forms.TabPage();
- this.buttonKeyHelp = new System.Windows.Forms.Button();
- this.labelKeystrokes = new System.Windows.Forms.Label();
- this.textBoxKeys = new System.Windows.Forms.TextBox();
- this.contextMenuStripKeystrokes = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.cutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
- this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.selectNoneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
- this.specialKeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.arrowsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.upToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.downToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.leftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.rightToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.functionKeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f5ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f6ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f7ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f8ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f9ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f10ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f11ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f12ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f13ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f14ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f15ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f16ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.keypadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.addToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.subtractToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.multiplyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.divideToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.modifiersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.altToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.controlToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.shiftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.windowsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
- this.backspaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.breakToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.capsLockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.delToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.endToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.enterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.escapeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.homeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.insToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.numLockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.pageDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.pageUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.scrollLockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.tabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.windowsKeyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.keystrokeCommandPanel = new IrssUtils.Panels.KeystrokeCommandPanel();
this.tabPageMouse = new System.Windows.Forms.TabPage();
this.groupBoxMouseScroll = new System.Windows.Forms.GroupBox();
this.checkBoxMouseScrollDown = new System.Windows.Forms.CheckBox();
@@ -195,7 +135,6 @@
((System.ComponentModel.ISupportInitialize)(this.numericUpDownWParam)).BeginInit();
this.groupBoxMessageTarget.SuspendLayout();
this.tabPageKeystrokes.SuspendLayout();
- this.contextMenuStripKeystrokes.SuspendLayout();
this.tabPageMouse.SuspendLayout();
this.groupBoxMouseScroll.SuspendLayout();
this.groupBoxMouseClick.SuspendLayout();
@@ -958,9 +897,7 @@
//
// tabPageKeystrokes
//
- this.tabPageKeystrokes.Controls.Add(this.buttonKeyHelp);
- this.tabPageKeystrokes.Controls.Add(this.labelKeystrokes);
- this.tabPageKeystrokes.Controls.Add(this.textBoxKeys);
+ this.tabPageKeystrokes.Controls.Add(this.keystrokeCommandPanel);
this.tabPageKeystrokes.Location = new System.Drawing.Point(4, 22);
this.tabPageKeystrokes.Name = "tabPageKeystrokes";
this.tabPageKeystrokes.Padding = new System.Windows.Forms.Padding(3);
@@ -969,500 +906,15 @@
this.tabPageKeystrokes.Text = "Keystrokes";
this.tabPageKeystrokes.UseVisualStyleBackColor = true;
//
- // buttonKeyHelp
+ // keystrokeCommandPanel
//
- this.buttonKeyHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonKeyHelp.Location = new System.Drawing.Point(360, 176);
- this.buttonKeyHelp.Name = "buttonKeyHelp";
- this.buttonKeyHelp.Size = new System.Drawing.Size(64, 24);
- this.buttonKeyHelp.TabIndex = 2;
- this.buttonKeyHelp.Text = "Help";
- this.toolTips.SetToolTip(this.buttonKeyHelp, "Click here for help on keystroke commands");
- this.buttonKeyHelp.UseVisualStyleBackColor = true;
- this.buttonKeyHelp.Click += new System.EventHandler(this.buttonKeyHelp_Click);
+ this.keystrokeCommandPanel.CommandString = "";
+ this.keystrokeCommandPanel.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.keystrokeCommandPanel.Location = new System.Drawing.Point(3, 3);
+ this.keystrokeCommandPanel.Name = "keystrokeCommandPanel";
+ this.keystrokeCommandPanel.Size = new System.Drawing.Size(434, 200);
+ this.keystrokeCommandPanel.TabIndex = 0;
//
- // labelKeystrokes
- //
- this.labelKeystrokes.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.labelKeystrokes.Location = new System.Drawing.Point(8, 8);
- this.labelKeystrokes.Name = "labelKeystrokes";
- this.labelKeystrokes.Size = new System.Drawing.Size(416, 16);
- this.labelKeystrokes.TabIndex = 0;
- this.labelKeystrokes.Text = "Keystrokes:";
- this.labelKeystrokes.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
- //
- // textBoxKeys
- //
- this.textBoxKeys.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.textBoxKeys.ContextMenuStrip = this.contextMenuStripKeystrokes;
- this.textBoxKeys.Location = new System.Drawing.Point(8, 24);
- this.textBoxKeys.Multiline = true;
- this.textBoxKeys.Name = "textBoxKeys";
- this.textBoxKeys.ScrollBars = System.Windows.Forms.ScrollBars.Both;
- this.textBoxKeys.ShortcutsEnabled = false;
- this.textBoxKeys.Size = new System.Drawing.Size(416, 144);
- this.textBoxKeys.TabIndex = 1;
- this.toolTips.SetToolTip(this.textBoxKeys, "Enter keystrokes here, right-click for a list of special keys");
- //
- // contextMenuStripKeystrokes
- //
- this.contextMenuStripKeystrokes.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.cutToolStripMenuItem,
- this.copyToolStripMenuItem,
- this.pasteToolStripMenuItem,
- this.toolStripSeparator1,
- this.selectAllToolStripMenuItem,
- this.selectNoneToolStripMenuItem,
- this.toolStripSeparator2,
- this.specialKeysToolStripMenuItem});
- this.contextMenuStripKeystrokes.Name = "contextMenuStripKeystrokes";
- this.contextMenuStripKeystrokes.Size = new System.Drawing.Size(145, 148);
- //
- // cutToolStripMenuItem
- //
- this.cutToolStripMenuItem.Name = "cutToolStripMenuItem";
- this.cutToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
- this.cutToolStripMenuItem.Text = "Cut";
- this.cutToolStripMenuItem.Click += new System.EventHandler(this.cutToolStripMenuItem_Click);
- //
- // copyToolStripMenuItem
- //
- this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
- this.copyToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
- this.copyToolStripMenuItem.Text = "Copy";
- this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
- //
- // pasteToolStripMenuItem
- //
- this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
- this.pasteToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
- this.pasteToolStripMenuItem.Text = "Paste";
- this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click);
- //
- // toolStripSeparator1
- //
- this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(141, 6);
- //
- // selectAllToolStripMenuItem
- //
- this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
- this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
- this.selectAllToolStripMenuItem.Text = "Select All";
- this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click);
- //
- // selectNoneToolStripMenuItem
- //
- this.selectNoneToolStripMenuItem.Name = "selectNoneToolStripMenuItem";
- this.selectNoneToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
- this.selectNoneToolStripMenuItem.Text = "Select None";
- this.selectNoneToolStripMenuItem.Click += new System.EventHandler(this.selectNoneToolStripMenuItem_Click);
- //
- // toolStripSeparator2
- //
- this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(141, 6);
- //
- // specialKeysToolStripMenuItem
- //
- this.specialKeysToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.arrowsToolStripMenuItem,
- this.functionKeysToolStripMenuItem,
- this.keypadToolStripMenuItem,
- this.modifiersToolStripMenuItem,
- this.toolStripSeparator3,
- this.backspaceToolStripMenuItem,
- this.breakToolStripMenuItem,
- this.capsLockToolStripMenuItem,
- this.delToolStripMenuItem,
- this.endToolStripMenuItem,
- this.enterToolStripMenuItem,
- this.escapeToolStripMenuItem,
- this.helpToolStripMenuItem,
- this.homeToolStripMenuItem,
- this.insToolStripMenuItem,
- this.numLockToolStripMenuItem,
- this.pageDownToolStripMenuItem,
- this.pageUpToolStripMenuItem,
- this.scrollLockToolStripMenuItem,
- this.tabToolStripMenuItem,
- this.windowsKeyToolStripMenuItem});
- this.specialKeysToolStripMenuItem.Name = "specialKeysToolStripMenuItem";
- this.specialKeysToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
- this.specialKeysToolStripMenuItem.Text = "Special Keys";
- //
- // arrowsToolStripMenuItem
- //
- this.arrowsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.upToolStripMenuItem,
- this.downToolStripMenuItem,
- this.leftToolStripMenuItem,
- this.rightToolStripMenuItem});
- this.arrowsToolStripMenuItem.Name = "arrowsToolStripMenuItem";
- this.arrowsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.arrowsToolStripMenuItem.Text = "Arrows";
- //
- // upToolStripMenuItem
- //
- this.upToolStripMenuItem.Name = "upToolStripMenuItem";
- this.upToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
- this.upToolStripMenuItem.Text = "Up";
- this.upToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // downToolStripMenuItem
- //
- this.downToolStripMenuItem.Name = "downToolStripMenuItem";
- this.downToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
- this.downToolStripMenuItem.Text = "Down";
- this.downToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // leftToolStripMenuItem
- //
- this.leftToolStripMenuItem.Name = "leftToolStripMenuItem";
- this.leftToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
- this.leftToolStripMenuItem.Text = "Left";
- this.leftToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // rightToolStripMenuItem
- //
- this.rightToolStripMenuItem.Name = "rightToolStripMenuItem";
- this.rightToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
- this.rightToolStripMenuItem.Text = "Right";
- this.rightToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // functionKeysToolStripMenuItem
- //
- this.functionKeysToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.f1ToolStripMenuItem,
- this.f2ToolStripMenuItem,
- this.f3ToolStripMenuItem,
- this.f4ToolStripMenuItem,
- this.f5ToolStripMenuItem,
- this.f6ToolStripMenuItem,
- this.f7ToolStripMenuItem,
- this.f8ToolStripMenuItem,
- this.f9ToolStripMenuItem,
- this.f10ToolStripMenuItem,
- this.f11ToolStripMenuItem,
- this.f12ToolStripMenuItem,
- this.f13ToolStripMenuItem,
- this.f14ToolStripMenuItem,
- this.f15ToolStripMenuItem,
- this.f16ToolStripMenuItem});
- this.functionKeysToolStripMenuItem.Name = "functionKeysToolStripMenuItem";
- this.functionKeysToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.functionKeysToolStripMenuItem.Text = "Function Keys";
- //
- // f1ToolStripMenuItem
- //
- this.f1ToolStripMenuItem.Name = "f1ToolStripMenuItem";
- this.f1ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.f1ToolStripMenuItem.Text = "F1";
- this.f1ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // f2ToolStripMenuItem
- //
- this.f2ToolStripMenuItem.Name = "f2ToolStripMenuItem";
- this.f2ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.f2ToolStripMenuItem.Text = "F2";
- this.f2ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // f3ToolStripMenuItem
- //
- this.f3ToolStripMenuItem.Name = "f3ToolStripMenuItem";
- this.f3ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.f3ToolStripMenuItem.Text = "F3";
- this.f3ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // f4ToolStripMenuItem
- //
- this.f4ToolStripMenuItem.Name = "f4ToolStripMenuItem";
- this.f4ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.f4ToolStripMenuItem.Text = "F4";
- this.f4ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // f5ToolStripMenuItem
- //
- this.f5ToolStripMenuItem.Name = "f5ToolStripMenuItem";
- this.f5ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.f5ToolStripMenuItem.Text = "F5";
- this.f5ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // f6ToolStripMenuItem
- //
- this.f6ToolStripMenuItem.Name = "f6ToolStripMenuItem";
- this.f6ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.f6ToolStripMenuItem.Text = "F6";
- this.f6ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // f7ToolStripMenuItem
- //
- this.f7ToolStripMenuItem.Name = "f7ToolStripMenuItem";
- this.f7ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.f7ToolStripMenuItem.Text = "F7";
- this.f7ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // f8ToolStripMenuItem
- //
- this.f8ToolStripMenuItem.Name = "f8ToolStripMenuItem";
- this.f8ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.f8ToolStripMenuItem.Text = "F8";
- this.f8ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // f9ToolStripMenuItem
- //
- this.f9ToolStripMenuItem.Name = "f9ToolStripMenuItem";
- this.f9ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.f9ToolStripMenuItem.Text = "F9";
- this.f9ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // f10ToolStripMenuItem
- //
- this.f10ToolStripMenuItem.Name = "f10ToolStripMenuItem";
- this.f10ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.f10ToolStripMenuItem.Text = "F10";
- this.f10ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // f11ToolStripMenuItem
- //
- this.f11ToolStripMenuItem.Name = "f11ToolStripMenuItem";
- this.f11ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.f11ToolStripMenuItem.Text = "F11";
- this.f11ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // f12ToolStripMenuItem
- //
- this.f12ToolStripMenuItem.Name = "f12ToolStripMenuItem";
- this.f12ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.f12ToolStripMenuItem.Text = "F12";
- this.f12ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // f13ToolStripMenuItem
- //
- this.f13ToolStripMenuItem.Name = "f13ToolStripMenuItem";
- this.f13ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.f13ToolStripMenuItem.Text = "F13";
- this.f13ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // f14ToolStripMenuItem
- //
- this.f14ToolStripMenuItem.Name = "f14ToolStripMenuItem";
- this.f14ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.f14ToolStripMenuItem.Text = "F14";
- this.f14ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // f15ToolStripMenuItem
- //
- this.f15ToolStripMenuItem.Name = "f15ToolStripMenuItem";
- this.f15ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.f15ToolStripMenuItem.Text = "F15";
- this.f15ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // f16ToolStripMenuItem
- //
- this.f16ToolStripMenuItem.Name = "f16ToolStripMenuItem";
- this.f16ToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
- this.f16ToolStripMenuItem.Text = "F16";
- this.f16ToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // keypadToolStripMenuItem
- //
- this.keypadToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.addToolStripMenuItem,
- this.subtractToolStripMenuItem,
- this.multiplyToolStripMenuItem,
- this.divideToolStripMenuItem});
- this.keypadToolStripMenuItem.Name = "keypadToolStripMenuItem";
- this.keypadToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.keypadToolStripMenuItem.Text = "Keypad";
- //
- // addToolStripMenuItem
- //
- this.addToolStripMenuItem.Name = "addToolStripMenuItem";
- this.addToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
- this.addToolStripMenuItem.Text = "Add";
- this.addToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // subtractToolStripMenuItem
- //
- this.subtractToolStripMenuItem.Name = "subtractToolStripMenuItem";
- this.subtractToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
- this.subtractToolStripMenuItem.Text = "Subtract";
- this.subtractToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // multiplyToolStripMenuItem
- //
- this.multiplyToolStripMenuItem.Name = "multiplyToolStripMenuItem";
- this.multiplyToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
- this.multiplyToolStripMenuItem.Text = "Multiply";
- this.multiplyToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // divideToolStripMenuItem
- //
- this.divideToolStripMenuItem.Name = "divideToolStripMenuItem";
- this.divideToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
- this.divideToolStripMenuItem.Text = "Divide";
- this.divideToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // modifiersToolStripMenuItem
- //
- this.modifiersToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.altToolStripMenuItem,
- this.controlToolStripMenuItem,
- this.shiftToolStripMenuItem,
- this.windowsToolStripMenuItem});
- this.modifiersToolStripMenuItem.Name = "modifiersToolStripMenuItem";
- this.modifiersToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.modifiersToolStripMenuItem.Text = "Modifiers";
- //
- // altToolStripMenuItem
- //
- this.altToolStripMenuItem.Name = "altToolStripMenuItem";
- this.altToolStripMenuItem.Size = new System.Drawing.Size(128, 22);
- this.altToolStripMenuItem.Text = "Alt";
- this.altToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // controlToolStripMenuItem
- //
- this.controlToolStripMenuItem.Name = "controlToolStripMenuItem";
- this.controlToolStripMenuItem.Size = new System.Drawing.Size(128, 22);
- this.controlToolStripMenuItem.Text = "Control";
- this.controlToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // shiftToolStripMenuItem
- //
- this.shiftToolStripMenuItem.Name = "shiftToolStripMenuItem";
- this.shiftToolStripMenuItem.Size = new System.Drawing.Size(128, 22);
- this.shiftToolStripMenuItem.Text = "Shift";
- this.shiftToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // windowsToolStripMenuItem
- //
- this.windowsToolStripMenuItem.Name = "windowsToolStripMenuItem";
- this.windowsToolStripMenuItem.Size = new System.Drawing.Size(128, 22);
- this.windowsToolStripMenuItem.Text = "Windows";
- this.windowsToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // toolStripSeparator3
- //
- this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);
- //
- // backspaceToolStripMenuItem
- //
- this.backspaceToolStripMenuItem.Name = "backspaceToolStripMenuItem";
- this.backspaceToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.backspaceToolStripMenuItem.Text = "Backspace";
- this.backspaceToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // breakToolStripMenuItem
- //
- this.breakToolStripMenuItem.Name = "breakToolStripMenuItem";
- this.breakToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.breakToolStripMenuItem.Text = "Break";
- this.breakToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // capsLockToolStripMenuItem
- //
- this.capsLockToolStripMenuItem.Name = "capsLockToolStripMenuItem";
- this.capsLockToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.capsLockToolStripMenuItem.Text = "Caps Lock";
- this.capsLockToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // delToolStripMenuItem
- //
- this.delToolStripMenuItem.Name = "delToolStripMenuItem";
- this.delToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.delToolStripMenuItem.Text = "Delete";
- this.delToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // endToolStripMenuItem
- //
- this.endToolStripMenuItem.Name = "endToolStripMenuItem";
- this.endToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.endToolStripMenuItem.Text = "End";
- this.endToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // enterToolStripMenuItem
- //
- this.enterToolStripMenuItem.Name = "enterToolStripMenuItem";
- this.enterToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.enterToolStripMenuItem.Text = "Enter";
- this.enterToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // escapeToolStripMenuItem
- //
- this.escapeToolStripMenuItem.Name = "escapeToolStripMenuItem";
- this.escapeToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.escapeToolStripMenuItem.Text = "Escape";
- this.escapeToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // helpToolStripMenuItem
- //
- this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
- this.helpToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.helpToolStripMenuItem.Text = "Help";
- this.helpToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // homeToolStripMenuItem
- //
- this.homeToolStripMenuItem.Name = "homeToolStripMenuItem";
- this.homeToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.homeToolStripMenuItem.Text = "Home";
- this.homeToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // insToolStripMenuItem
- //
- this.insToolStripMenuItem.Name = "insToolStripMenuItem";
- this.insToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.insToolStripMenuItem.Text = "Insert";
- this.insToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // numLockToolStripMenuItem
- //
- this.numLockToolStripMenuItem.Name = "numLockToolStripMenuItem";
- this.numLockToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.numLockToolStripMenuItem.Text = "Num Lock";
- this.numLockToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // pageDownToolStripMenuItem
- //
- this.pageDownToolStripMenuItem.Name = "pageDownToolStripMenuItem";
- this.pageDownToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.pageDownToolStripMenuItem.Text = "Page Down";
- this.pageDownToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // pageUpToolStripMenuItem
- //
- this.pageUpToolStripMenuItem.Name = "pageUpToolStripMenuItem";
- this.pageUpToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.pageUpToolStripMenuItem.Text = "Page Up";
- this.pageUpToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // scrollLockToolStripMenuItem
- //
- this.scrollLockToolStripMenuItem.Name = "scrollLockToolStripMenuItem";
- this.scrollLockToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.scrollLockToolStripMenuItem.Text = "Scroll Lock";
- this.scrollLockToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // tabToolStripMenuItem
- //
- this.tabToolStripMenuItem.Name = "tabToolStripMenuItem";
- this.tabToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.tabToolStripMenuItem.Text = "Tab";
- this.tabToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
- // windowsKeyToolStripMenuItem
- //
- this.windowsKeyToolStripMenuItem.Name = "windowsKeyToolStripMenuItem";
- this.windowsKeyToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.windowsKeyToolStripMenuItem.Text = "Windows Key";
- this.windowsKeyToolStripMenuItem.Click += new System.EventHandler(this.KeystrokeToolStripMenuItem_Click);
- //
// tabPageMouse
//
this.tabPageMouse.Controls.Add(this.groupBoxMouseScroll);
@@ -1491,7 +943,6 @@
// checkBoxMouseScrollDown
//
this.checkBoxMouseScrollDown.Appearance = System.Windows.Forms.Appearance.Button;
- this.checkBoxMouseScrollDown.Image = IrssUtils.Properties.Resources.ScrollDown;
this.checkBoxMouseScrollDown.Location = new System.Drawing.Point(48, 96);
this.checkBoxMouseScrollDown.Name = "checkBoxMouseScrollDown";
this.checkBoxMouseScrollDown.Size = new System.Drawing.Size(32, 32);
@@ -1503,7 +954,6 @@
// checkBoxMouseScrollUp
//
this.checkBoxMouseScrollUp.Appearance = System.Windows.Forms.Appearance.Button;
- this.checkBoxMouseScrollUp.Image = IrssUtils.Properties.Resources.ScrollUp;
this.checkBoxMouseScrollUp.Location = new System.Drawing.Point(48, 40);
this.checkBoxMouseScrollUp.Name = "checkBoxMouseScrollUp";
this.checkBoxMouseScrollUp.Size = new System.Drawing.Size(32, 32);
@@ -1528,7 +978,6 @@
// checkBoxMouseClickRight
//
this.checkBoxMouseClickRight.Appearance = System.Windows.Forms.Appearance.Button;
- this.checkBoxMouseClickRight.Image = IrssUtils.Properties.Resources.ClickRight;
this.checkBoxMouseClickRight.Location = new System.Drawing.Point(88, 64);
this.checkBoxMouseClickRight.Name = "checkBoxMouseClickRight";
this.checkBoxMouseClickRight.Size = new System.Drawing.Size(32, 32);
@@ -1540,7 +989,6 @@
// checkBoxMouseClickMiddle
//
this.checkBoxMouseClickMiddle.Appearance = System.Windows.Forms.Appearance.Button;
- this.checkBoxMouseClickMiddle.Image = IrssUtils.Properties.Resources.ClickMiddle;
this.checkBoxMouseClickMiddle.Location = new System.Drawing.Point(48, 64);
this.checkBoxMouseClickMiddle.Name = "checkBoxMouseClickMiddle";
this.checkBoxMouseClickMiddle.Size = new System.Drawing.Size(32, 32);
@@ -1552,7 +1000,6 @@
// checkBoxMouseClickLeft
//
this.checkBoxMouseClickLeft.Appearance = System.Windows.Forms.Appearance.Button;
- this.checkBoxMouseClickLeft.Image = IrssUtils.Properties.Resources.ClickLeft;
this.checkBoxMouseClickLeft.Location = new System.Drawing.Point(8, 64);
this.checkBoxMouseClickLeft.Name = "checkBoxMouseClickLeft";
this.checkBoxMouseClickLeft.Size = new System.Drawing.Size(32, 32);
@@ -1580,7 +1027,6 @@
// checkBoxMouseMoveLeft
//
this.checkBoxMouseMoveLeft.Appearance = System.Windows.Forms.Appearance.Button;
- this.checkBoxMouseMoveLeft.Image = IrssUtils.Properties.Resources.MoveLeft;
this.checkBoxMouseMoveLeft.Location = new System.Drawing.Point(24, 64);
this.checkBoxMouseMoveLeft.Name = "checkBoxMouseMoveLeft";
this.checkBoxMouseMoveLeft.Size = new System.Drawing.Size(32, 32);
@@ -1592,7 +1038,6 @@
// checkBoxMouseMoveDown
//
this.checkBoxMouseMoveDown.Appearance = System.Windows.Forms.Appearance.Button;
- this.checkBoxMouseMoveDown.Image = IrssUtils.Properties.Resources.MoveDown;
this.checkBoxMouseMoveDown.Location = new System.Drawing.Point(56, 96);
this.checkBoxMouseMoveDown.Name = "checkBoxMouseMoveDown";
this.checkBoxMouseMoveDown.Size = new System.Drawing.Size(32, 32);
@@ -1604,7 +1049,6 @@
// checkBoxMouseMoveRight
//
this.checkBoxMouseMoveRight.Appearance = System.Windows.Forms.Appearance.Button;
- this.checkBoxMouseMoveRight.Image = IrssUtils.Properties.Resources.MoveRight;
this.checkBoxMouseMoveRight.Location = new System.Drawing.Point(88, 64);
this.checkBoxMouseMoveRight.Name = "checkBoxMouseMoveRight";
this.checkBoxMouseMoveRight.Size = new System.Drawing.Size(32, 32);
@@ -1616,7 +1060,6 @@
// checkBoxMouseMoveUp
//
this.checkBoxMouseMoveUp.Appearance = System.Windows.Forms.Appearance.Button;
- this.checkBoxMouseMoveUp.Image = IrssUtils.Properties.Resources.MoveUp;
this.checkBoxMouseMoveUp.Location = new System.Drawing.Point(56, 32);
this.checkBoxMouseMoveUp.Name = "checkBoxMouseMoveUp";
this.checkBoxMouseMoveUp.Size = new System.Drawing.Size(32, 32);
@@ -1769,8 +1212,6 @@
this.groupBoxMessageTarget.ResumeLayout(false);
this.groupBoxMessageTarget.PerformLayout();
this.tabPageKeystrokes.ResumeLayout(false);
- this.tabPageKeystrokes.PerformLayout();
- this.contextMenuStripKeystrokes.ResumeLayout(false);
this.tabPageMouse.ResumeLayout(false);
this.groupBoxMouseScroll.ResumeLayout(false);
this.groupBoxMouseClick.ResumeLayout(false);
@@ -1837,9 +1278,6 @@
private System.Windows.Forms.Label labelWParam;
private System.Windows.Forms.Label labelMessage;
private System.Windows.Forms.TabPage tabPageKeystrokes;
- private System.Windows.Forms.Button buttonKeyHelp;
- private System.Windows.Forms.Label labelKeystrokes;
- private System.Windows.Forms.TextBox textBoxKeys;
private System.Windows.Forms.Button buttonTest;
private System.Windows.Forms.Button buttonCancel;
private System.Windows.Forms.Button buttonOK;
@@ -1868,69 +1306,12 @@
private System.Windows.Forms.CheckBox checkBoxMouseMoveDown;
private System.Windows.Forms.CheckBox checkBoxMouseMoveRight;
private System.Windows.Forms.ToolTip toolTips;
- private System.Windows.Forms.ContextMenuStrip contextMenuStripKeystrokes;
- private System.Windows.Forms.ToolStripMenuItem cutToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem pasteToolStripMenuItem;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
- private System.Windows.Forms.ToolStripMenuItem selectAllToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem selectNoneToolStripMenuItem;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
- private System.Windows.Forms.ToolStripMenuItem specialKeysToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem arrowsToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem upToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem downToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem leftToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem rightToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem functionKeysToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem f1ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem f2ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem f3ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem f4ToolStripMenuItem;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
- private System.Windows.Forms.ToolStripMenuItem backspaceToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem breakToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem capsLockToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem delToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem endToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem enterToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem escapeToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem f5ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem f6ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem f7ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem f8ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem f9ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem f10ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem f11ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem f12ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem f13ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem f14ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem f15ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem f16ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem keypadToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem addToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem subtractToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem multiplyToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem homeToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem insToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem numLockToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem pageDownToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem pageUpToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem scrollLockToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem tabToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem divideToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem modifiersToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem altToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem controlToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem shiftToolStripMenuItem;
private System.Windows.Forms.TabPage tabPageMisc;
private System.Windows.Forms.Label labelMiscCommand;
private System.Windows.Forms.ComboBox comboBoxMiscCommand;
private System.Windows.Forms.CheckBox checkBoxForceFocus;
private System.Windows.Forms.CheckBox checkBoxWaitForResponse;
- private System.Windows.Forms.ToolStripMenuItem windowsToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem windowsKeyToolStripMenuItem;
+ private IrssUtils.Panels.KeystrokeCommandPanel keystrokeCommandPanel;
}
}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2009-12-12 16:32:05 UTC (rev 3229)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2009-12-13 15:03:20 UTC (rev 3230)
@@ -82,6 +82,7 @@
public ButtonMappingForm(string keyCode, string description, string command)
{
InitializeComponent();
+ SetImages();
_keyCode = keyCode;
_description = description;
@@ -90,6 +91,19 @@
#endregion Constructors
+ private void SetImages()
+ {
+ this.checkBoxMouseScrollDown.Image = IrssUtils.Properties.Resources.ScrollDown;
+ this.checkBoxMouseScrollUp.Image = IrssUtils.Properties.Resources.ScrollUp;
+ this.checkBoxMouseClickRight.Image = IrssUtils.Properties.Resources.ClickRight;
+ this.checkBoxMouseClickMiddle.Image = IrssUtils.Properties.Resources.ClickMiddle;
+ this.checkBoxMouseClickLeft.Image = IrssUtils.Properties.Resources.ClickLeft;
+ this.checkBoxMouseMoveLeft.Image = IrssUtils.Properties.Resources.MoveLeft;
+ this.checkBoxMouseMoveDown.Image = IrssUtils.Properties.Resources.MoveDown;
+ this.checkBoxMouseMoveRight.Image = IrssUtils.Properties.Resources.MoveRight;
+ this.checkBoxMouseMoveUp.Image = IrssUtils.Properties.Resources.MoveUp;
+ }
+
private void SetupIRList()
{
comboBoxIRCode.Items.Clear();
@@ -114,16 +128,6 @@
}
}
- private void InsertKeystroke(char key)
- {
- textBoxKeys.Paste(key.ToString());
- }
-
- private void InsertKeystroke(string keystroke)
- {
- textBoxKeys.Paste(keystroke);
- }
-
private void ButtonMappingForm_Load(object sender, EventArgs e)
{
textBoxKeyCode.Text = _keyCode;
@@ -272,7 +276,7 @@
case Common.CmdPrefixKeys:
{
tabControl.SelectTab(tabPageKeystrokes);
- textBoxKeys.Text = suffix;
+ keystrokeCommandPanel.CommandString = suffix;
break;
}
@@ -477,7 +481,7 @@
case "tabPageKeystrokes":
{
- textBoxCommand.Text = _command = Common.CmdPrefixKeys + textBoxKeys.Text;
+ textBoxCommand.Text = _command = Common.CmdPrefixKeys + keystrokeCommandPanel.CommandString;
break;
}
@@ -707,20 +711,6 @@
SetupMacroList();
}
- private void buttonKeyHelp_Click(object sender, EventArgs e)
- {
- try
- {
- string file = Path.Combine(SystemRegistry.GetInstallFolder(), "IR Server Suite.chm");
- Help.ShowHelp(this, file, HelpNavigator.Topic, "Common\\keystrokes_info.html");
- }
- catch (Exception ex)
- {
- IrssLog.Error(ex);
- MessageBox.Show(this, ex.Message, "Failed to load help", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- }
-
private void textBoxButtonDesc_TextChanged(object sender, EventArgs e)
{
_description = textBoxButtonDesc.Text;
@@ -744,180 +734,6 @@
if (origin != checkBoxMouseScrollDown) checkBoxMouseScrollDown.Checked = false;
}
- private void KeystrokeToolStripMenuItem_Click(object sender, EventArgs e)
- {
- ToolStripMenuItem origin = sender as ToolStripMenuItem;
-
- if (origin == null)
- return;
-
- switch (origin.Name)
- {
- case "upToolStripMenuItem":
- InsertKeystroke("{UP}");
- break;
- case "downToolStripMenuItem":
- InsertKeystroke("{DOWN}");
- break;
- case "leftToolStripMenuItem":
- InsertKeystroke("{LEFT}");
- break;
- case "rightToolStripMenuItem":
- InsertKeystroke("{RIGHT}");
- break;
-
- case "f1ToolStripMenuItem":
- InsertKeystroke("{F1}");
- break;
- case "f2ToolStripMenuItem":
- InsertKeystroke("{F2}");
- break;
- case "f3ToolStripMenuItem":
- InsertKeystroke("{F3}");
- break;
- case "f4ToolStripMenuItem":
- InsertKeystroke("{F4}");
- break;
- case "f5ToolStripMenuItem":
- InsertKeystroke("{F5}");
- break;
- case "f6ToolStripMenuItem":
- InsertKeystroke("{F6}");
- break;
- case "f7ToolStripMenuItem":
- InsertKeystroke("{F7}");
- break;
- case "f8ToolStripMenuItem":
- InsertKeystroke("{F8}");
- break;
- case "f9ToolStripMenuItem":
- InsertKeystroke("{F9}");
- break;
- case "f10ToolStripMenuItem":
- InsertKeystroke("{F10}");
- break;
- case "f11ToolStripMenuItem":
- InsertKeystroke("{F11}");
- break;
- case "f12ToolStripMenuItem":
- InsertKeystroke("{F12}");
- break;
- case "f13ToolStripMenuItem":
- InsertKeystroke("{F13}");
- break;
- case "f14ToolStripMenuItem":
- InsertKeystroke("{F14}");
- break;
- case "f15ToolStripMenuItem":
- InsertKeystroke("{F15}");
- break;
- case "f16ToolStripMenuItem":
- InsertKeystroke("{F16}");
- break;
-
- case "addToolStripMenuItem":
- InsertKeystroke("{ADD}");
- break;
- case "subtractToolStripMenuItem":
- InsertKeystroke("{SUBTRACT}");
- break;
- case "multiplyToolStripMenuItem":
- InsertKeystroke("{MULTIPLY}");
- break;
- case "divideToolStripMenuItem":
- InsertKeystroke("{DIVIDE}");
- break;
-
- case "altToolStripMenuItem":
- InsertKeystroke(Keyboard.ModifierAlt);
- break;
- case "controlToolStripMenuItem":
- InsertKeystroke(Keyboard.ModifierControl);
- break;
- case "shiftToolStripMenuItem":
- InsertKeystroke(Keyboard.ModifierShift);
- break;
- case "windowsToolStripMenuItem":
- InsertKeystroke(Keyboard.ModifierWinKey);
- break;
-
- case "backspaceToolStripMenuItem":
- InsertKeystroke("{BACKSPACE}");
- break;
- case "breakToolStripMenuItem":
- InsertKeystroke("{BREAK}");
- break;
- case "capsLockToolStripMenuItem":
- InsertKeystroke("{CAPSLOCK}");
- break;
- case "delToolStripMenuItem":
- InsertKeystroke("{DEL}");
- break;
-
- case "endToolStripMenuItem":
- InsertKeystroke("{END}");
- break;
- case "enterToolStripMenuItem":
- InsertKeystroke("{ENTER}");
- break;
- case "escapeToolStripMenuItem":
- InsertKeystroke("{ESC}");
- break;
- case "helpToolStripMenuItem":
- InsertKeystroke("{HELP}");
- break;
- case "homeToolStripMenuItem":
- InsertKeystroke("{HOME}");
- break;
- case "insToolStripMenuItem":
- InsertKeystroke("{INS}");
- break;
- case "numLockToolStripMenuItem":
- InsertKeystroke("{NUMLOCK}");
- break;
- case "pageDownToolStripMenuItem":
- InsertKeystroke("{PGDN}");
- break;
- case "pageUpToolStripMenuItem":
- InsertKeystroke("{PGUP}");
- break;
- case "scrollLockToolStripMenuItem":
- InsertKeystroke("{SCROLLLOCK}");
- break;
- case "tabToolStripMenuItem":
- InsertKeystroke("{TAB}");
- break;
- case "windowsKeyToolStripMenuItem":
- InsertKeystroke("{WIN}");
- break;
- }
- }
-
- private void cutToolStripMenuItem_Click(object sender, EventArgs e)
- {
- textBoxKeys.Cut();
- }
-
- private void copyToolStripMenuItem_Click(object sender, EventArgs e)
- {
- textBoxKeys.Copy();
- }
-
- private void pasteToolStripMenuItem_Click(object sender, EventArgs e)
- {
- textBoxKeys.Paste();
- }
-
- private void selectAllToolStripMenuItem_Click(object sender, EventArgs e)
- {
- textBoxKeys.SelectAll();
- }
-
- private void selectNoneToolStripMenuItem_Click(object sender, EventArgs e)
- {
- textBoxKeys.SelectionLength = 0;
- }
-
#endregion Controls
}
}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.resx
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.resx 2009-12-12 16:32:05 UTC (rev 3229)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.resx 2009-12-13 15:03:20 UTC (rev 3230)
@@ -120,9 +120,6 @@
<metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <metadata name="contextMenuStripKeystrokes.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>107, 17</value>
- </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2009-12-12 16:32:05 UTC (rev 3229)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2009-12-13 15:03:20 UTC (rev 3230)
@@ -61,7 +61,6 @@
public MainForm()
{
InitializeComponent();
-
SetImages();
RefreshProgramList();
@@ -85,6 +84,8 @@
}
}
+ #endregion Constructor
+
private void SetImages()
{
// main menu
@@ -151,8 +152,6 @@
this.deleteIRToolStripMenuItem.Image = IrssUtils.Properties.Resources.Delete;
}
- #endregion Constructor
-
#region Implementation
#region Main Form
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Forms/EditKeystrokes.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Forms/EditKeystrokes.Designer.cs 2009-12-12 16:32:05 UTC (rev 3229)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Commands/GeneralCommands/Forms/EditKeystrokes.Designer.cs 2009-12-13 15:03:20 UTC (rev 3230)
@@ -30,70 +30,9 @@
/// </summary>
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
this.buttonCancel = new System.Windows.Forms.Button();
this.buttonOK = new System.Windows.Forms.Button();
- this.textBoxKeys = new System.Windows.Forms.TextBox();
- this.contextMenuStripKeystrokes = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.cutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
- this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.selectNoneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
- this.specialKeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.arrowsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.upToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.downToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.leftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.rightToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.functionKeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f5ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f6ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f7ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f8ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f9ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f10ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f11ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f12ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f13ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f14ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f15ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.f16ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.keypadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.addToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.subtractToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.multiplyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.divideToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.modifiersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.altToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.controlToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.shiftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.windowsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
- this.backspaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.breakToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.capsLockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.delToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.endToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.enterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.escapeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.homeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.insToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.numLockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.pageDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.pageUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.scrollLockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.tabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.window...
[truncated message content] |
|
From: <che...@us...> - 2009-12-19 23:09:39
|
Revision: 3284
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3284&view=rev
Author: chef_koch
Date: 2009-12-19 23:09:29 +0000 (Sat, 19 Dec 2009)
Log Message:
-----------
fixed wrong path to other irss apps, when customized installation folder is used
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Common.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Common.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Common.cs 2009-12-19 16:19:07 UTC (rev 3283)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssUtils/Common.cs 2009-12-19 23:09:29 UTC (rev 3284)
@@ -71,12 +71,6 @@
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "IR Server Suite");
/// <summary>
- /// IR Server Suite "Application Data" folder location (includes trailing '\')
- /// </summary>
- public static readonly string FolderProgramFiles =
- Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "IR Server Suite");
-
- /// <summary>
/// IR Server Suite "IR Commands" folder location (includes trailing '\')
/// </summary>
public static readonly string FolderIRCommands = Path.Combine(FolderAppData, "IR Commands");
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-12-19 16:19:07 UTC (rev 3283)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-12-19 23:09:29 UTC (rev 3284)
@@ -43,7 +43,7 @@
{
#region Constants
- internal static readonly string IRServerFile = Path.Combine(Common.FolderProgramFiles, @"IR Server.exe");
+ internal static readonly string IRServerFile = Path.Combine(Application.StartupPath, @"IR Server.exe");
private static readonly TimeSpan defaultServiceTime = new TimeSpan(0, 0, 30);
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs 2009-12-19 16:19:07 UTC (rev 3283)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs 2009-12-19 23:09:29 UTC (rev 3284)
@@ -14,9 +14,9 @@
{
#region Constants
- private static readonly string _configExe = Path.Combine(Common.FolderProgramFiles, @"IR Server Configuration.exe");
- private static readonly string _translatorExe = Path.Combine(Common.FolderProgramFiles, @"Translator.exe");
- private static readonly string _debugClientExe = Path.Combine(Common.FolderProgramFiles, @"DebugClient.exe");
+ private static readonly string _configExe = Path.Combine(Application.StartupPath, @"IR Server Configuration.exe");
+ private static readonly string _translatorExe = Path.Combine(Application.StartupPath, @"Translator.exe");
+ private static readonly string _debugClientExe = Path.Combine(Application.StartupPath, @"DebugClient.exe");
#endregion Constants
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-09-08 23:01:08
|
Revision: 3785
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3785&view=rev
Author: chef_koch
Date: 2010-09-08 23:01:01 +0000 (Wed, 08 Sep 2010)
Log Message:
-----------
reduced redundant code by moving more to IrssComms/IrssMessage.cs
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs
trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssMessage.cs
trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.cs 2010-09-08 13:15:11 UTC (rev 3784)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Debug Client/MainForm.cs 2010-09-08 23:01:01 UTC (rev 3785)
@@ -514,16 +514,8 @@
return;
}
- byte[] deviceNameBytes = Encoding.ASCII.GetBytes(textBoxRemoteDevice.Text);
- byte[] keyCodeBytes = Encoding.ASCII.GetBytes(textBoxRemoteCode.Text);
-
- byte[] bytes = new byte[8 + deviceNameBytes.Length + keyCodeBytes.Length];
-
- BitConverter.GetBytes(deviceNameBytes.Length).CopyTo(bytes, 0);
- deviceNameBytes.CopyTo(bytes, 4);
- BitConverter.GetBytes(keyCodeBytes.Length).CopyTo(bytes, 4 + deviceNameBytes.Length);
- keyCodeBytes.CopyTo(bytes, 8 + deviceNameBytes.Length);
-
+ byte[] bytes = IrssMessage.EncodeRemoteEventData(textBoxRemoteDevice.Text, textBoxRemoteCode.Text);
+
IrssMessage message = new IrssMessage(MessageType.ForwardRemoteEvent, MessageFlags.Notify, bytes);
_client.Send(message);
}
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2010-09-08 13:15:11 UTC (rev 3784)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Keyboard Input Relay/Program.cs 2010-09-08 23:01:01 UTC (rev 3785)
@@ -394,16 +394,8 @@
if (_registered)
{
- byte[] deviceNameBytes = Encoding.ASCII.GetBytes("Keyboard");
- byte[] keyCodeBytes = Encoding.ASCII.GetBytes(String.Format("{0:X8}", keyCode));
+ byte[] bytes = IrssMessage.EncodeRemoteEventData("Keyboard", String.Format("{0:X8}", keyCode));
- byte[] bytes = new byte[8 + deviceNameBytes.Length + keyCodeBytes.Length];
-
- BitConverter.GetBytes(deviceNameBytes.Length).CopyTo(bytes, 0);
- deviceNameBytes.CopyTo(bytes, 4);
- BitConverter.GetBytes(keyCodeBytes.Length).CopyTo(bytes, 4 + deviceNameBytes.Length);
- keyCodeBytes.CopyTo(bytes, 8 + deviceNameBytes.Length);
-
IrssMessage message = new IrssMessage(MessageType.ForwardRemoteEvent, MessageFlags.Notify, bytes);
_client.Send(message);
}
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs 2010-09-08 13:15:11 UTC (rev 3784)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Translator/Program.cs 2010-09-08 23:01:01 UTC (rev 3785)
@@ -794,31 +794,29 @@
switch (received.Type)
{
case MessageType.RemoteEvent:
- string deviceName = received.MessageData[IrssMessage.DEVICE_NAME] as string;
- string keyCode = received.MessageData[IrssMessage.KEY_CODE] as string;
+ {
+ string deviceName = received.MessageData[IrssMessage.DEVICE_NAME] as string;
+ string keyCode = received.MessageData[IrssMessage.KEY_CODE] as string;
- RemoteHandlerCallback(deviceName, keyCode);
+ RemoteHandlerCallback(deviceName, keyCode);
+ }
break;
case MessageType.KeyboardEvent:
{
- byte[] dataBytes = received.GetDataAsBytes();
+ int vKey = (int)received.MessageData[IrssMessage.V_KEY];
+ bool keyUp = (bool)received.MessageData[IrssMessage.KEY_UP];
- int vKey = BitConverter.ToInt32(dataBytes, 0);
- bool keyUp = BitConverter.ToBoolean(dataBytes, 4);
-
KeyboardHandlerCallback("TODO", vKey, keyUp);
break;
}
case MessageType.MouseEvent:
{
- byte[] dataBytes = received.GetDataAsBytes();
+ int deltaX = (int)received.MessageData[IrssMessage.DELTA_X];
+ int deltaY = (int)received.MessageData[IrssMessage.DELTA_Y];
+ int buttons = (int)received.MessageData[IrssMessage.BUTTONS];
- int deltaX = BitConverter.ToInt32(dataBytes, 0);
- int deltaY = BitConverter.ToInt32(dataBytes, 4);
- int buttons = BitConverter.ToInt32(dataBytes, 8);
-
MouseHandlerCallback("TODO", deltaX, deltaY, buttons);
break;
}
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs 2010-09-08 13:15:11 UTC (rev 3784)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Virtual Remote/Program.cs 2010-09-08 23:01:01 UTC (rev 3785)
@@ -415,16 +415,8 @@
if (!_registered)
return;
- byte[] deviceNameBytes = Encoding.ASCII.GetBytes(_device);
- byte[] keyCodeBytes = Encoding.ASCII.GetBytes(keyCode);
+ byte[] bytes = IrssMessage.EncodeRemoteEventData(_device, keyCode);
- byte[] bytes = new byte[8 + deviceNameBytes.Length + keyCodeBytes.Length];
-
- BitConverter.GetBytes(deviceNameBytes.Length).CopyTo(bytes, 0);
- deviceNameBytes.CopyTo(bytes, 4);
- BitConverter.GetBytes(keyCodeBytes.Length).CopyTo(bytes, 4 + deviceNameBytes.Length);
- keyCodeBytes.CopyTo(bytes, 8 + deviceNameBytes.Length);
-
IrssMessage message = new IrssMessage(MessageType.ForwardRemoteEvent, MessageFlags.Request, bytes);
SendMessage(message);
}
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs 2010-09-08 13:15:11 UTC (rev 3784)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Applications/Web Remote/Program.cs 2010-09-08 23:01:01 UTC (rev 3785)
@@ -278,16 +278,8 @@
if (!_registered)
return;
- byte[] deviceNameBytes = Encoding.ASCII.GetBytes(_device);
- byte[] keyCodeBytes = Encoding.ASCII.GetBytes(keyCode);
+ byte[] bytes = IrssMessage.EncodeRemoteEventData(_device, keyCode);
- byte[] bytes = new byte[8 + deviceNameBytes.Length + keyCodeBytes.Length];
-
- BitConverter.GetBytes(deviceNameBytes.Length).CopyTo(bytes, 0);
- deviceNameBytes.CopyTo(bytes, 4);
- BitConverter.GetBytes(keyCodeBytes.Length).CopyTo(bytes, 4 + deviceNameBytes.Length);
- keyCodeBytes.CopyTo(bytes, 8 + deviceNameBytes.Length);
-
IrssMessage message = new IrssMessage(MessageType.ForwardRemoteEvent, MessageFlags.Notify, bytes);
SendMessage(message);
}
Modified: trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssMessage.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssMessage.cs 2010-09-08 13:15:11 UTC (rev 3784)
+++ trunk/plugins/IR Server Suite/IR Server Suite/Common/IrssComms/IrssMessage.cs 2010-09-08 23:01:01 UTC (rev 3785)
@@ -197,16 +197,27 @@
#region Const
public const string DATA = "DATA";
+
+ // remote
public const string DEVICE_NAME = "DEVICE_NAME";
public const string KEY_CODE = "KEY_CODE";
+ // keyboard
+ public const string V_KEY = "V_KEY";
+ public const string KEY_UP = "KEY_UP";
+
+ // mouse
+ public const string DELTA_X = "DELTA_X";
+ public const string DELTA_Y = "DELTA_Y";
+ public const string BUTTONS = "BUTTONS";
+
#endregion
#region Protected fields
protected MessageType _messageType;
- protected IDictionary<string, object> _messageData = new Dictionary<string, object>();
protected MessageFlags _messageFlags;
+ protected IDictionary<string, object> _messageData;
#endregion
@@ -304,7 +315,7 @@
/// <summary>
/// Set message data as bytes.
/// </summary>
- private void SetDataAsBytes(byte[] data)
+ public void SetDataAsBytes(byte[] data)
{
if (data == null)
_messageData[DATA] = null;
@@ -327,7 +338,7 @@
/// <summary>
/// Set message data as string.
/// </summary>
- private void SetDataAsString(string data)
+ public void SetDataAsString(string data)
{
if (String.IsNullOrEmpty(data))
_messageData[DATA] = null;
@@ -345,15 +356,38 @@
switch (_messageType)
{
case MessageType.RemoteEvent:
- byte[] data = GetDataAsBytes();
+ case MessageType.ForwardRemoteEvent:
+ {
+ byte[] data = GetDataAsBytes();
- int deviceNameSize = BitConverter.ToInt32(data, 0);
- _messageData[DEVICE_NAME] = System.Text.Encoding.ASCII.GetString(data, 4, deviceNameSize);
+ int deviceNameSize = BitConverter.ToInt32(data, 0);
+ _messageData[DEVICE_NAME] = System.Text.Encoding.ASCII.GetString(data, 4, deviceNameSize);
- int keyCodeSize = BitConverter.ToInt32(data, 4 + deviceNameSize);
- _messageData[KEY_CODE] = System.Text.Encoding.ASCII.GetString(data, 8 + deviceNameSize, keyCodeSize);
+ int keyCodeSize = BitConverter.ToInt32(data, 4 + deviceNameSize);
+ _messageData[KEY_CODE] = System.Text.Encoding.ASCII.GetString(data, 8 + deviceNameSize, keyCodeSize);
+ }
+ break;
+ case MessageType.KeyboardEvent:
+ case MessageType.ForwardKeyboardEvent:
+ {
+ byte[] data = GetDataAsBytes();
+
+ _messageData[V_KEY] = BitConverter.ToInt32(data, 0);
+ _messageData[KEY_UP] = BitConverter.ToBoolean(data, 4);
+ }
break;
+
+ case MessageType.MouseEvent:
+ case MessageType.ForwardMouseEvent:
+ {
+ byte[] data = GetDataAsBytes();
+
+ _messageData[DELTA_X] = BitConverter.ToInt32(data, 0);
+ _messageData[DELTA_Y] = BitConverter.ToInt32(data, 4);
+ _messageData[BUTTONS] = BitConverter.ToInt32(data, 8);
+ }
+ break;
}
}
@@ -384,7 +418,7 @@
/// </summary>
/// <param name="from">Byte array to generate message from.</param>
/// <returns>New Message.</returns>
- public static IrssMessage FromBytes(byte[] from)
+ internal static IrssMessage FromBytes(byte[] from)
{
if (from == null)
throw new ArgumentNullException("from");
@@ -404,6 +438,42 @@
return new IrssMessage(type, flags, data);
}
+ public static byte[] EncodeRemoteEventData(string deviceName, string keyCode)
+ {
+ byte[] deviceNameBytes = Encoding.ASCII.GetBytes(deviceName);
+ byte[] keyCodeBytes = Encoding.ASCII.GetBytes(keyCode);
+
+ byte[] bytes = new byte[8 + deviceNameBytes.Length + keyCodeBytes.Length];
+
+ BitConverter.GetBytes(deviceNameBytes.Length).CopyTo(bytes, 0);
+ deviceNameBytes.CopyTo(bytes, 4);
+ BitConverter.GetBytes(keyCodeBytes.Length).CopyTo(bytes, 4 + deviceNameBytes.Length);
+ keyCodeBytes.CopyTo(bytes, 8 + deviceNameBytes.Length);
+
+ return bytes;
+ }
+
+ public static byte[] EncodeKeyboardEventData(int vKey, bool keyUp)
+ {
+ byte[] bytes = new byte[8];
+
+ BitConverter.GetBytes(vKey).CopyTo(bytes, 0);
+ BitConverter.GetBytes(keyUp).CopyTo(bytes, 4);
+
+ return bytes;
+ }
+
+ public static byte[] EncodeMouseEventData(int deltaX, int deltaY, int buttons)
+ {
+ byte[] bytes = new byte[12];
+
+ BitConverter.GetBytes(deltaX).CopyTo(bytes, 0);
+ BitConverter.GetBytes(deltaY).CopyTo(bytes, 4);
+ BitConverter.GetBytes(buttons).CopyTo(bytes, 8);
+
+ return bytes;
+ }
+
#endregion Implementation
}
}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs 2010-09-08 13:15:11 UTC (rev 3784)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.cs 2010-09-08 23:01:01 UTC (rev 3785)
@@ -798,16 +798,8 @@
return;
}
- byte[] deviceNameBytes = Encoding.ASCII.GetBytes(messageDeviceName);
- byte[] keyCodeBytes = Encoding.ASCII.GetBytes(messageKeyCode);
+ byte[] bytes = IrssMessage.EncodeRemoteEventData(messageDeviceName, messageKeyCode);
- byte[] bytes = new byte[8 + deviceNameBytes.Length + keyCodeBytes.Length];
-
- BitConverter.GetBytes(deviceNameBytes.Length).CopyTo(bytes, 0);
- deviceNameBytes.CopyTo(bytes, 4);
- BitConverter.GetBytes(keyCodeBytes.Length).CopyTo(bytes, 4 + deviceNameBytes.Length);
- keyCodeBytes.CopyTo(bytes, 8 + deviceNameBytes.Length);
-
switch (Settings.Mode)
{
case IRServerMode.ServerMode:
@@ -830,9 +822,7 @@
{
IrssLog.Debug("{0} generated a keyboard event: {1}, keyUp: {2}", deviceName, vKey, keyUp);
- byte[] bytes = new byte[8];
- BitConverter.GetBytes(vKey).CopyTo(bytes, 0);
- BitConverter.GetBytes(keyUp).CopyTo(bytes, 4);
+ byte[] bytes = IrssMessage.EncodeKeyboardEventData(vKey, keyUp);
switch (Settings.Mode)
{
@@ -863,10 +853,7 @@
IrssLog.Debug("{0} generated a mouse Event - deltaX: {1}, deltaY: {2}, buttons: {3}", deviceName, deltaX, deltaY,
buttons);
- byte[] bytes = new byte[12];
- BitConverter.GetBytes(deltaX).CopyTo(bytes, 0);
- BitConverter.GetBytes(deltaY).CopyTo(bytes, 4);
- BitConverter.GetBytes(buttons).CopyTo(bytes, 8);
+ byte[] bytes = IrssMessage.EncodeMouseEventData(deltaX, deltaY, buttons);
switch (Settings.Mode)
{
@@ -1157,10 +1144,8 @@
if (Settings.AbstractRemoteMode)
{
// Decode message ...
- int deviceNameSize = BitConverter.ToInt32(data, 0);
- string deviceName = Encoding.ASCII.GetString(data, 4, deviceNameSize);
- int keyCodeSize = BitConverter.ToInt32(data, 4 + deviceNameSize);
- string keyCode = Encoding.ASCII.GetString(data, 8 + deviceNameSize, keyCodeSize);
+ string deviceName = combo.Message.MessageData[IrssMessage.DEVICE_NAME] as string;
+ string keyCode = combo.Message.MessageData[IrssMessage.KEY_CODE] as string;
// Check that the device maps are loaded for the forwarded device
bool foundDevice = false;
@@ -1190,15 +1175,7 @@
IrssLog.Info("Abstract Remote Button mapped from forwarded remote event: {0}", abstractButton);
// Encode new message ...
- byte[] deviceNameBytes = Encoding.ASCII.GetBytes("Abstract");
- byte[] keyCodeBytes = Encoding.ASCII.GetBytes(abstractButton);
-
- data = new byte[8 + deviceNameBytes.Length + keyCodeBytes.Length];
-
- BitConverter.GetBytes(deviceNameBytes.Length).CopyTo(data, 0);
- deviceNameBytes.CopyTo(data, 4);
- BitConverter.GetBytes(keyCodeBytes.Length).CopyTo(data, 4 + deviceNameBytes.Length);
- keyCodeBytes.CopyTo(data, 8 + deviceNameBytes.Length);
+ data = IrssMessage.EncodeRemoteEventData("Abstract", abstractButton);
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X