Skip to content

Commit

Permalink
merge changes from trunk into 3.2 tag
Browse files Browse the repository at this point in the history
  • Loading branch information
@Altren
Altren committed Feb 28, 2012
1 parent db9c84a commit c81deb7
Show file tree
Hide file tree
Showing 30 changed files with 292 additions and 189 deletions.
1 change: 1 addition & 0 deletions Common/Base/DirectX/BaseManager.h
View file
Expand Up @@ -45,6 +45,7 @@ namespace base

void setWindowCaption(const std::wstring& _text);
void createDefaultScene() { }
void makeScreenShot() { }

const std::string& getRootMedia();
void setResourceFilename(const std::string& _flename);
Expand Down
1 change: 1 addition & 0 deletions Common/Base/DirectX11/BaseManager.h
View file
Expand Up @@ -49,6 +49,7 @@ namespace base

void setWindowCaption(const std::wstring& _text);
void createDefaultScene() { }
void makeScreenShot() { }

const std::string& getRootMedia();
void setResourceFilename(const std::string& _flename);
Expand Down
39 changes: 22 additions & 17 deletions Common/Base/Ogre/BaseManager.cpp
View file
Expand Up @@ -439,23 +439,7 @@ namespace base
}
else if (_key == MyGUI::KeyCode::SysRq)
{
std::ifstream stream;
std::string file;
do
{
stream.close();
static size_t num = 0;
const size_t max_shot = 100;
if (num == max_shot)
{
MYGUI_LOG(Info, "The limit of screenshots is exceeded : " << max_shot);
return;
}
file = MyGUI::utility::toString("screenshot_", ++num, ".png");
stream.open(file.c_str());
}
while (stream.is_open());
mWindow->writeContentsToFile(file);
makeScreenShot();
return;
}
else if (_key == MyGUI::KeyCode::F12)
Expand Down Expand Up @@ -546,4 +530,25 @@ namespace base
return mCamera;
}

void BaseManager::makeScreenShot()
{
std::ifstream stream;
std::string file;
do
{
stream.close();
static size_t num = 0;
const size_t max_shot = 100;
if (num == max_shot)
{
MYGUI_LOG(Info, "The limit of screenshots is exceeded : " << max_shot);
return;
}
file = MyGUI::utility::toString("screenshot_", ++num, ".png");
stream.open(file.c_str());
}
while (stream.is_open());
mWindow->writeContentsToFile(file);
}

} // namespace base
1 change: 1 addition & 0 deletions Common/Base/Ogre/BaseManager.h
View file
Expand Up @@ -42,6 +42,7 @@ namespace base

void setWindowCaption(const std::wstring& _text);
void createDefaultScene();
void makeScreenShot();

const std::string& getRootMedia();
void setResourceFilename(const std::string& _flename);
Expand Down
1 change: 1 addition & 0 deletions Common/Base/OpenGL/BaseManager.h
View file
Expand Up @@ -40,6 +40,7 @@ namespace base

void setWindowCaption(const std::wstring& _text);
void createDefaultScene() { }
void makeScreenShot() { }

const std::string& getRootMedia();
void setResourceFilename(const std::string& _flename);
Expand Down
1 change: 1 addition & 0 deletions Common/Input/InputConverter.h
View file
Expand Up @@ -970,6 +970,7 @@ namespace input
ADD_MAP2(END, END)
ADD_MAP2(PRIOR, PGUP)
ADD_MAP2(NEXT, PGDOWN)
ADD_MAP2(SNAPSHOT, SYSRQ)

ADD_MAP2(NUMLOCK, NUMLOCK)
ADD_MAP2(DIVIDE, DIVIDE)
Expand Down
8 changes: 7 additions & 1 deletion Common/Input/Win32/InputManager.cpp
View file
Expand Up @@ -189,7 +189,13 @@ namespace input
else if (WM_KEYUP == uMsg)
{
int scan_code = VirtualKeyToScanCode(wParam);
msInputManager->injectKeyRelease(MyGUI::KeyCode::Enum(scan_code));
MyGUI::KeyCode code = MyGUI::KeyCode::Enum(scan_code);

// принтскрин приходит только отжатие
if (code == MyGUI::KeyCode::SysRq)
msInputManager->injectKeyPress(code, (MyGUI::Char)0);

msInputManager->injectKeyRelease(code);
}

// вызываем полюбому
Expand Down
Binary file added Docs/Papers/Skin creation/Skining MyGUI.odt
View file
Binary file not shown.
225 changes: 104 additions & 121 deletions Media/Tools/FontViewer/FontPanel.layout
View file
@@ -1,124 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="Window" position="45 5 292 420" layer="Overlapped" name="_Main">
<Property key="Caption" value="Font Properties"/>

<Widget type="TextBox" skin="TextBox" position="5 5 100 24" align="HStretch Top">
<Property key="Caption" value="Font"/>
<Property key="TextAlign" value="Right VCenter"/>
<MyGUI type="Layout" version="3.2.0">
<Widget type="Window" skin="Window" position="45 5 312 420" layer="Overlapped" name="_Main">
<Property key="Caption" value="Font Properties"/>
<Widget type="TextBox" skin="TextBox" position="5 5 110 24" align="HStretch Top">
<Property key="Caption" value="Font"/>
<Property key="TextAlign" value="Right VCenter"/>
</Widget>
<Widget type="ComboBox" skin="ComboBox" position="120 5 179 25" align="HStretch Top" name="combo_Fonts">
<Property key="ModeDrop" value="true"/>
</Widget>
<Widget type="TextBox" skin="TextBox" position="5 33 110 24">
<Property key="Caption" value="Size"/>
<Property key="TextAlign" value="Right VCenter"/>
</Widget>
<Widget type="EditBox" skin="EditBox" position="120 33 179 25" align="HStretch Top" name="edit_Size">
<Property key="Caption" value="10"/>
</Widget>
<Widget type="TextBox" skin="TextBox" position="5 61 110 24">
<Property key="Caption" value="Resolution"/>
<Property key="TextAlign" value="Right VCenter"/>
</Widget>
<Widget type="ComboBox" skin="ComboBox" position="120 61 179 25" align="HStretch Top" name="combo_Resolution">
<Property key="AddItem" value="[DEFAULT: 96]"/>
</Widget>
<Widget type="TextBox" skin="TextBox" position="5 89 110 24">
<Property key="Caption" value="Antialias colour"/>
<Property key="TextAlign" value="Right VCenter"/>
</Widget>
<Widget type="ComboBox" skin="ComboBox" position="120 89 179 25" align="HStretch Top" name="combo_Antialias">
<Property key="ModeDrop" value="true"/>
<Property key="AddItem" value="[DEFAULT: false]"/>
<Property key="AddItem" value="true"/>
<Property key="AddItem" value="false"/>
</Widget>
<Widget type="TextBox" skin="TextBox" position="5 117 110 24">
<Property key="Caption" value="Space width"/>
<Property key="TextAlign" value="Right VCenter"/>
</Widget>
<Widget type="ComboBox" skin="ComboBox" position="120 117 179 25" align="HStretch Top" name="combo_Space">
<Property key="AddItem" value="[DEFAULT: automatic]"/>
</Widget>
<Widget type="TextBox" skin="TextBox" position="5 145 110 24">
<Property key="Caption" value="Tab width"/>
<Property key="TextAlign" value="Right VCenter"/>
</Widget>
<Widget type="ComboBox" skin="ComboBox" position="120 145 179 25" align="HStretch Top" name="combo_Tab">
<Property key="AddItem" value="[DEFAULT: automatic]"/>
</Widget>
<Widget type="TextBox" skin="TextBox" position="5 173 110 24">
<Property key="TextAlign" value="Right VCenter"/>
<Property key="Caption" value="Baseline shift"/>
</Widget>
<Widget type="ComboBox" skin="ComboBox" position="120 173 179 25" align="HStretch Top" name="combo_Offset">
<Property key="AddItem" value="[DEFAULT: 0]"/>
</Widget>
<Widget type="TextBox" skin="TextBox" position="5 201 110 24">
<Property key="TextAlign" value="Right VCenter"/>
<Property key="Caption" value="Include codes"/>
</Widget>
<Widget type="EditBox" skin="EditBox" position="120 201 84 25" name="edit_Range1A"/>
<Widget type="TextBox" skin="TextBox" position="204 201 11 24">
<Property key="TextAlign" value="Center"/>
<Property key="Caption" value="-"/>
</Widget>
<Widget type="EditBox" skin="EditBox" position="215 201 84 25" name="edit_Range1B"/>
<Widget type="TextBox" skin="TextBox" position="5 229 110 24">
<Property key="Caption" value="Include codes"/>
<Property key="TextAlign" value="Right VCenter"/>
</Widget>
<Widget type="EditBox" skin="EditBox" position="120 229 84 25" name="edit_Range2A"/>
<Widget type="TextBox" skin="TextBox" position="204 229 11 24">
<Property key="TextAlign" value="Center"/>
<Property key="Caption" value="-"/>
</Widget>
<Widget type="EditBox" skin="EditBox" position="215 229 84 25" name="edit_Range2B"/>
<Widget type="TextBox" skin="TextBox" position="5 257 110 24">
<Property key="TextAlign" value="Right VCenter"/>
<Property key="Caption" value="Exclude codes"/>
</Widget>
<Widget type="EditBox" skin="EditBox" position="120 257 84 25" name="edit_HideA"/>
<Widget type="TextBox" skin="TextBox" position="204 257 11 24">
<Property key="TextAlign" value="Center"/>
<Property key="Caption" value="-"/>
</Widget>
<Widget type="EditBox" skin="EditBox" position="215 257 84 25" name="edit_HideB"/>
<Widget type="TextBox" skin="TextBox" position="5 285 110 24">
<Property key="TextAlign" value="Right VCenter"/>
<Property key="Caption" value="Substitute code"/>
</Widget>
<Widget type="ComboBox" skin="ComboBox" position="120 285 179 24" align="HStretch Top" name="combo_SubstituteCode">
<Property key="AddItem" value="[DEFAULT: automatic]"/>
</Widget>
<Widget type="Button" skin="Button" position="5 313 294 25" align="HStretch Top" name="button_Generate">
<Property key="Caption" value="Generate"/>
</Widget>
<Widget type="Widget" skin="SepDownHSkin" position="5 345 294 3"/>
<Widget type="TextBox" skin="TextBox" position="5 355 65 24">
<Property key="TextAlign" value="Right VCenter"/>
<Property key="Caption" value="File name"/>
</Widget>
<Widget type="EditBox" skin="EditBox" position="75 355 170 25" name="edit_SaveFileName"/>
<Widget type="Button" skin="Button" position="249 355 50 25" name="button_Save">
<Property key="Caption" value="Save"/>
</Widget>
</Widget>
<Widget type="ComboBox" skin="ComboBox" position="110 5 169 25" align="HStretch Top" name="combo_Fonts">
<Property key="ModeDrop" value="true"/>
</Widget>

<Widget type="TextBox" skin="TextBox" position="5 33 100 24">
<Property key="Caption" value="Size"/>
<Property key="TextAlign" value="Right VCenter"/>
</Widget>
<Widget type="EditBox" skin="EditBox" position="110 33 169 25" align="HStretch Top" name="edit_Size">
<Property key="Caption" value="10"/>
</Widget>

<Widget type="TextBox" skin="TextBox" position="5 61 100 24">
<Property key="Caption" value="Resolution"/>
<Property key="TextAlign" value="Right VCenter"/>
</Widget>
<Widget type="ComboBox" skin="ComboBox" position="110 61 169 25" align="HStretch Top" name="combo_Resolution">
<Property key="AddItem" value="[DEFAULT: 96]"/>
</Widget>

<Widget type="TextBox" skin="TextBox" position="5 89 100 24">
<Property key="Caption" value="Antialias colour"/>
<Property key="TextAlign" value="Right VCenter"/>
</Widget>
<Widget type="ComboBox" skin="ComboBox" position="110 89 169 25" align="HStretch Top" name="combo_Antialias">
<Property key="ModeDrop" value="true"/>
<Property key="AddItem" value="[DEFAULT: false]"/>
<Property key="AddItem" value="true"/>
<Property key="AddItem" value="false"/>
</Widget>

<Widget type="TextBox" skin="TextBox" position="5 117 100 24">
<Property key="Caption" value="Space width"/>
<Property key="TextAlign" value="Right VCenter"/>
</Widget>
<Widget type="ComboBox" skin="ComboBox" position="110 117 169 25" align="HStretch Top" name="combo_Space">
<Property key="AddItem" value="[DEFAULT: automatic]"/>
</Widget>

<Widget type="TextBox" skin="TextBox" position="5 145 100 24">
<Property key="Caption" value="Tab width"/>
<Property key="TextAlign" value="Right VCenter"/>
</Widget>
<Widget type="ComboBox" skin="ComboBox" position="110 145 169 25" align="HStretch Top" name="combo_Tab">
<Property key="AddItem" value="[DEFAULT: automatic]"/>
</Widget>

<Widget type="TextBox" skin="TextBox" position="5 173 100 24">
<Property key="TextAlign" value="Right VCenter"/>
<Property key="Caption" value="Baseline shift"/>
</Widget>
<Widget type="ComboBox" skin="ComboBox" position="110 173 169 25" align="HStretch Top" name="combo_Offset">
<Property key="AddItem" value="[DEFAULT: 0]"/>
</Widget>

<Widget type="TextBox" skin="TextBox" position="5 201 100 24">
<Property key="TextAlign" value="Right VCenter"/>
<Property key="Caption" value="Include codes"/>
</Widget>
<Widget type="EditBox" skin="EditBox" position="110 201 79 25" name="edit_Range1A"/>
<Widget type="TextBox" skin="TextBox" position="189 201 10 24">
<Property key="TextAlign" value="Center"/>
<Property key="Caption" value="-"/>
</Widget>
<Widget type="EditBox" skin="EditBox" position="200 201 79 25" name="edit_Range1B"/>

<Widget type="TextBox" skin="TextBox" position="5 229 100 24">
<Property key="Caption" value="Include codes"/>
<Property key="TextAlign" value="Right VCenter"/>
</Widget>
<Widget type="EditBox" skin="EditBox" position="110 229 79 25" name="edit_Range2A"/>
<Widget type="TextBox" skin="TextBox" position="189 229 10 24">
<Property key="TextAlign" value="Center"/>
<Property key="Caption" value="-"/>
</Widget>
<Widget type="EditBox" skin="EditBox" position="200 229 79 25" name="edit_Range2B"/>

<Widget type="TextBox" skin="TextBox" position="5 257 100 24">
<Property key="TextAlign" value="Right VCenter"/>
<Property key="Caption" value="Exclude codes"/>
</Widget>
<Widget type="EditBox" skin="EditBox" position="110 257 79 25" name="edit_HideA"/>
<Widget type="TextBox" skin="TextBox" position="189 257 10 24">
<Property key="TextAlign" value="Center"/>
<Property key="Caption" value="-"/>
</Widget>
<Widget type="EditBox" skin="EditBox" position="200 257 79 25" name="edit_HideB"/>

<Widget type="TextBox" skin="TextBox" position="5 285 100 24">
<Property key="TextAlign" value="Right VCenter"/>
<Property key="Caption" value="Substitute code"/>
</Widget>
<Widget type="ComboBox" skin="ComboBox" position="110 285 169 24" align="HStretch Top" name="combo_SubstituteCode">
<Property key="AddItem" value="[DEFAULT: automatic]"/>
</Widget>

<Widget type="Button" skin="Button" position="5 313 274 25" align="HStretch Top" name="button_Generate">
<Property key="Caption" value="Generate"/>
</Widget>

<Widget type="Widget" skin="SepDownHSkin" position="5 345 274 3"/>

<Widget type="TextBox" skin="TextBox" position="5 355 65 24">
<Property key="TextAlign" value="Right VCenter"/>
<Property key="Caption" value="File name"/>
</Widget>
<Widget type="EditBox" skin="EditBox" position="75 355 150 25" name="edit_SaveFileName"/>

<Widget type="Button" skin="Button" position="229 355 50 25" name="button_Save">
<Property key="Caption" value="Save"/>
</Widget>

</Widget>

</MyGUI>
2 changes: 1 addition & 1 deletion Media/Tools/FontViewer/FontView.layout
View file
Expand Up @@ -3,7 +3,7 @@
<Widget type="Window" skin="Window" position="45 427 752 171" align="HStretch Bottom" layer="Overlapped" name="_Main">
<Property key="Caption" value="Font View"/>
<Widget type="EditBox" skin="EditBoxStretch" position="0 0 742 134" align="Stretch" name="edit_View">
<Property key="Caption" value="01234567890 ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz 0 1 2 3 4 5 6 7 8 9 0 A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z АБВГДЕЁЖЗИКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ абвгдеёжзиклмнопрстуфхцчшщъыьэюя А Б В Г Д Е Ё Ж З И К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я а б в г д е ё ж з и к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я"/>
<Property key="Caption" value="01234567890 ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz 0 1 2 3 4 5 6 7 8 9 0 A B C D E F G H I J K L M N O P Q R S T U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x y z АБВГДЕЁЖЗИКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ абвгдеёжзиклмнопрстуфхцчшщъыьэюя А Б В Г Д Е Ё Ж З И К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я а б в г д е ё ж з и к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я"/>
<Property key="TextAlign" value="Default"/>
<Property key="MultiLine" value="true"/>
<Property key="WordWrap" value="true"/>
Expand Down
4 changes: 2 additions & 2 deletions Media/Tools/FontViewer/TextureView.layout
View file
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout" version="3.2.0">
<Widget type="Window" skin="Window" position="340 5 457 420" align="Stretch" layer="Overlapped" name="_Main">
<Widget type="Window" skin="Window" position="360 5 437 420" align="Stretch" layer="Overlapped" name="_Main">
<Property key="Caption" value="Texture View"/>
<Widget type="ScrollView" skin="ScrollView" position="2 2 445 381" align="Stretch" name="view_Texture">
<Widget type="ScrollView" skin="ScrollView" position="2 2 425 381" align="Stretch" name="view_Texture">
<Widget type="Widget" skin="WhiteSkin" position="15 15 100 100" name="image_Back">
<Property key="Colour" value="0 0 0"/>
<Property key="NeedMouse" value="false"/>
Expand Down
5 changes: 0 additions & 5 deletions Media/Tools/LayoutEditor/EditorLanguage.xml
View file
@@ -1,16 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>

<MyGUI type="Language">

<Language default="English">
<Info name="English">
<!--Source>core_language_english_tag.xml</Source-->
<Source>EditorLanguageEnglishTag.xml</Source>
</Info>
<Info name="Russian">
<!--Source>core_language_russian_tag.xml</Source-->
<Source>EditorLanguageRussianTag.xml</Source>
</Info>
</Language>

</MyGUI>
1 change: 1 addition & 0 deletions Media/Tools/LayoutEditor/EditorLanguageEnglishTag.xml
View file
Expand Up @@ -61,6 +61,7 @@
<Tag name="SettingsTabUpdateResources">Update</Tag>
<Tag name="SettingsTextUpdateResources">Resources for update</Tag>
<Tag name="SettingsWorkspaceSize">Workspace size</Tag>
<Tag name="TextInterfaceLanguage">Language</Tag>

<Tag name="Key">Key</Tag>
<Tag name="Value">Value</Tag>
Expand Down
1 change: 1 addition & 0 deletions Media/Tools/LayoutEditor/EditorLanguageRussianTag.xml
View file
Expand Up @@ -61,6 +61,7 @@
<Tag name="SettingsTabUpdateResources">Обновление</Tag>
<Tag name="SettingsTextUpdateResources">Ресурсы для обновления</Tag>
<Tag name="SettingsWorkspaceSize">Размер рабочей области</Tag>
<Tag name="TextInterfaceLanguage">Язык</Tag>

<Tag name="Key">Ключ</Tag>
<Tag name="Value">Значение</Tag>
Expand Down
6 changes: 6 additions & 0 deletions Media/Tools/LayoutEditor/Settings/Hotkeys.xml
View file
Expand Up @@ -187,4 +187,10 @@
<Pressed>true</Pressed>
<Modifier></Modifier>
</Command>
<Command>
<Name>Command_ScreenShot</Name>
<KeyCode>SysRq</KeyCode>
<Pressed>true</Pressed>
<Modifier></Modifier>
</Command>
</MyGUI>

0 comments on commit c81deb7

Please sign in to comment.