diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp index c9ba752e9..25cd90eae 100644 --- a/apps/openmw/mwgui/console.cpp +++ b/apps/openmw/mwgui/console.cpp @@ -379,10 +379,12 @@ namespace MWGui void Console::setSelectedObject(const MWWorld::Ptr& object) { mPtr = object; + setTitle("#{sConsoleTitle} (" + mPtr.getCellRef().refID + ")"); } void Console::onReferenceUnavailable() { mPtr = MWWorld::Ptr(); + setTitle("#{sConsoleTitle}"); } } diff --git a/files/mygui/openmw_console.skin.xml b/files/mygui/openmw_console.skin.xml index 598252734..1758c728d 100644 --- a/files/mygui/openmw_console.skin.xml +++ b/files/mygui/openmw_console.skin.xml @@ -1,41 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <MyGUI type="Skin"> - <Skin name = "MW_ConsoleWindow" size = "256 54"> - <Property key="TextAlign" value = "ALIGN_CENTER" /> - <Property key="TextColour" value = "0.8 0.8 0.8" /> - <Property key="Snap" value = "true" /> - - <Child type="Widget" skin="BlackBG" offset = "4 4 248 46" align = "ALIGN_STRETCH" name = "Client"/> - - <!-- Outer borders --> - <Child type="Widget" skin="TB_T" offset="4 0 248 4" align="ALIGN_TOP ALIGN_HSTRETCH" name="Action"> - <Property key="Scale" value = "0 1 0 -1"/> - </Child> - <Child type="Widget" skin="TB_L" offset="0 4 4 46" align="ALIGN_LEFT ALIGN_VSTRETCH" name="Action"> - <Property key="Scale" value = "1 0 -1 0"/> - </Child> - <Child type="Widget" skin="TB_B" offset="4 50 248 4" align="ALIGN_BOTTOM ALIGN_HSTRETCH" name="Action"> - <Property key="Scale" value = "0 0 0 1"/> - </Child> - <Child type="Widget" skin="TB_R" offset="252 4 4 46" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="Action"> - <Property key="Scale" value = "0 0 1 0"/> - </Child> - - <Child type="Widget" skin="TB_BR" offset="252 50 4 4" align="ALIGN_RIGHT ALIGN_BOTTOM" name="Action"> - <Property key="Scale" value = "0 0 1 1"/> - </Child> - <Child type="Widget" skin="TB_BL" offset="0 50 4 4" align="ALIGN_LEFT ALIGN_BOTTOM" name="Action"> - <Property key="Scale" value = "1 0 -1 1"/> - </Child> - <Child type="Widget" skin="TB_TR" offset="252 0 4 4" align="ALIGN_RIGHT ALIGN_TOP" name="Action"> - <Property key="Scale" value = "0 1 1 -1"/> - </Child> - <Child type="Widget" skin="TB_TL" offset="0 0 4 4" align="ALIGN_LEFT ALIGN_TOP" name="Action"> - <Property key="Scale" value = "1 1 -1 -1"/> - </Child> - </Skin> - <Skin name = "MW_LogClient" size = "10 10"> <Property key="FontName" value = "MonoFont" /> <Property key="TextAlign" value = "Left Top" /> diff --git a/files/mygui/openmw_console_layout.xml b/files/mygui/openmw_console_layout.xml index a2b883cdb..732684ad1 100644 --- a/files/mygui/openmw_console_layout.xml +++ b/files/mygui/openmw_console_layout.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <MyGUI type="Layout"> - <Widget type="Window" skin="MW_ConsoleWindow" position="0 0 400 400" layer="Console" name="_Main"> - <Property key="Caption" value="Console"/> + <Widget type="Window" skin="MW_Window" position="0 0 400 400" layer="Console" name="_Main"> + <Property key="Caption" value="#{sConsoleTitle}"/> <Property key="MinSize" value="200 100"/> <Property key="MaxSize" value="2000 2000"/> <!-- Log window --> - <Widget type="EditBox" skin="MW_ConsoleLog" position="5 5 390 360" align="Stretch" name="list_History"> + <Widget type="EditBox" skin="MW_ConsoleLog" position="5 5 380 330" align="Stretch" name="list_History"> <Property key="MultiLine" value="1"/> </Widget> <!-- Command line --> - <Widget type="EditBox" skin="MW_ConsoleCommand" position="0 365 392 28" align="HStretch Bottom" name="edit_Command"/> + <Widget type="EditBox" skin="MW_ConsoleCommand" position="0 335 382 28" align="HStretch Bottom" name="edit_Command"/> </Widget> </MyGUI>