krageon
/
openmw-tes3coop
forked from teamnwah/openmw-tes3coop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed more gui stuff to use the new tag system

Browse Source
actorid
scrawl 13 years ago
parent a284bfb4d0
commit 7a4de0ed1d
15 changed files with 55 additions and 49 deletions
Show Stats Download Patch File Download Diff File

1
apps/openmw/mwgui/birth.cpp
Unescape Escape View File

@ -27,7 +27,6 @@ BirthDialog::BirthDialog(WindowManager& parWindowManager)
MyGUI::ButtonPtr backButton;
getWidget(backButton, "BackButton");
backButton->setCaption(mWindowManager.getGameSettingString("sBack", ""));
backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &BirthDialog::onBackClicked);
MyGUI::ButtonPtr okButton;

3
apps/openmw/mwgui/class.cpp
Unescape Escape View File

@ -28,7 +28,6 @@ GenerateClassResultDialog::GenerateClassResultDialog(WindowManager& parWindowMan
MyGUI::ButtonPtr backButton;
getWidget(backButton, "BackButton");
backButton->setCaption(mWindowManager.getGameSettingString("sBack", ""));
backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &GenerateClassResultDialog::onBackClicked);
MyGUI::ButtonPtr okButton;
@ -111,7 +110,6 @@ PickClassDialog::PickClassDialog(WindowManager& parWindowManager)
MyGUI::ButtonPtr backButton;
getWidget(backButton, "BackButton");
backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &PickClassDialog::onBackClicked);
backButton->setCaption(mWindowManager.getGameSettingString("sBack", ""));
MyGUI::ButtonPtr okButton;
getWidget(okButton, "OKButton");
@ -432,7 +430,6 @@ CreateClassDialog::CreateClassDialog(WindowManager& parWindowManager)
MyGUI::ButtonPtr backButton;
getWidget(backButton, "BackButton");
backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &CreateClassDialog::onBackClicked);
backButton->setCaption(mWindowManager.getGameSettingString("sBack", ""));
MyGUI::ButtonPtr okButton;
getWidget(okButton, "OKButton");

1
apps/openmw/mwgui/race.cpp
Unescape Escape View File

@ -71,7 +71,6 @@ RaceDialog::RaceDialog(WindowManager& parWindowManager)
MyGUI::ButtonPtr backButton;
getWidget(backButton, "BackButton");
backButton->setCaption(mWindowManager.getGameSettingString("sBack", ""));
backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onBackClicked);
MyGUI::ButtonPtr okButton;

5
apps/openmw/mwgui/review.cpp
Unescape Escape View File

@ -27,25 +27,21 @@ ReviewDialog::ReviewDialog(WindowManager& parWindowManager)
ButtonPtr button;
getWidget(nameWidget, "NameText");
getWidget(button, "NameButton");
button->setCaption(mWindowManager.getGameSettingString("sName", ""));
adjustButtonSize(button);
button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onNameClicked);;
getWidget(raceWidget, "RaceText");
getWidget(button, "RaceButton");
button->setCaption(mWindowManager.getGameSettingString("sRace", ""));
adjustButtonSize(button);
button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onRaceClicked);;
getWidget(classWidget, "ClassText");
getWidget(button, "ClassButton");
button->setCaption(mWindowManager.getGameSettingString("sClass", ""));
adjustButtonSize(button);
button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onClassClicked);;
getWidget(birthSignWidget, "SignText");
getWidget(button, "SignButton");
button->setCaption(mWindowManager.getGameSettingString("sBirthSign", ""));
adjustButtonSize(button);
button->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onBirthSignClicked);;
@ -92,7 +88,6 @@ ReviewDialog::ReviewDialog(WindowManager& parWindowManager)
MyGUI::ButtonPtr backButton;
getWidget(backButton, "BackButton");
backButton->setCaption(mWindowManager.getGameSettingString("sBack", ""));
backButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ReviewDialog::onBackClicked);
MyGUI::ButtonPtr okButton;

6
apps/openmw/mwgui/stats_window.cpp
Unescape Escape View File

@ -49,12 +49,6 @@ StatsWindow::StatsWindow (WindowManager& parWindowManager)
{ "Attrib6", "sAttributeEndurance" },
{ "Attrib7", "sAttributePersonality" },
{ "Attrib8", "sAttributeLuck" },
{ "Health_str", "sHealth" },
{ "Magicka_str", "sMagic" },
{ "Fatigue_str", "sFatigue" },
{ "Level_str", "sLevel" },
{ "Race_str", "sRace" },
{ "Class_str", "sClass" },
{ 0, 0 }
};

6
apps/openmw/mwgui/tradewindow.cpp
Unescape Escape View File

@ -41,12 +41,6 @@ namespace MWGui
getWidget(mTotalBalanceLabel, "TotalBalanceLabel");
getWidget(mBottomPane, "BottomPane");
// this GMST doesn't seem to get retrieved - even though i can clearly see it in the CS !??!?
mMaxSaleButton->setCaption(mWindowManager.getGameSettingString("sMaxSale", "Max. Sale"));
mCancelButton->setCaption(MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sCancel")->str);
mOfferButton->setCaption(MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sBarterDialog8")->str);
// adjust size of buttons to fit text
int curX = 0;
mFilterAll->setSize( mFilterAll->getTextSize().width + 24, mFilterAll->getSize().height );

2
files/mygui/openmw_chargen_birth_layout.xml
Unescape Escape View File

@ -15,7 +15,7 @@
<!-- Dialog buttons -->
<Widget type="Button" skin="MW_Button" position="375 340 53 23" name="BackButton">
<Property key="Caption" value="Back"/>
<Property key="Caption" value="#{sBack}"/>
</Widget>
<Widget type="Button" skin="MW_Button" position="431 340 42 23" name="OKButton">
<Property key="Caption" value="OK"/>

2
files/mygui/openmw_chargen_class_layout.xml
Unescape Escape View File

@ -55,7 +55,7 @@
<!-- Dialog buttons -->
<Widget type="Button" skin="MW_Button" position="382 265 53 23" name="BackButton">
<Property key="Caption" value="Back"/>
<Property key="Caption" value="#{sBack}"/>
</Widget>
<Widget type="Button" skin="MW_Button" position="434 265 42 23" name="OKButton">
<Property key="Caption" value="OK"/>

2
files/mygui/openmw_chargen_create_class_layout.xml
Unescape Escape View File

@ -56,7 +56,7 @@
<Property key="Caption" value="Class Description"/>
</Widget>
<Widget type="Button" skin="MW_Button" position="356 158 53 23" name="BackButton">
<Property key="Caption" value="Back"/>
<Property key="Caption" value="#{sBack}"/>
</Widget>
<Widget type="Button" skin="MW_Button" position="417 158 42 23" name="OKButton">
<Property key="Caption" value="OK"/>

2
files/mygui/openmw_chargen_generate_class_result_layout.xml
Unescape Escape View File

@ -21,7 +21,7 @@
<!-- Dialog buttons -->
<Widget type="Button" skin="MW_Button" position="220 219 53 23" name="BackButton">
<Property key="Caption" value="Back"/>
<Property key="Caption" value="#{sBack}"/>
</Widget>
<Widget type="Button" skin="MW_Button" position="277 219 42 23" name="OKButton">
<Property key="Caption" value="OK"/>

2
files/mygui/openmw_chargen_race_layout.xml
Unescape Escape View File

@ -61,7 +61,7 @@
<!-- Dialog buttons -->
<Widget type="Button" skin="MW_Button" position="471 397 53 23" name="BackButton">
<Property key="Caption" value="Back"/>
<Property key="Caption" value="#{sBack}"/>
</Widget>
<Widget type="Button" skin="MW_Button" position="532 397 42 23" name="OKButton">
<Property key="Caption" value="OK"/>

30
files/mygui/openmw_chargen_review_layout.xml
Unescape Escape View File

@ -5,10 +5,18 @@
<!-- Player name, race, class and birth sign-->
<Widget type="Widget" skin="MW_Box" position="8 12 244 126">
<Widget type="Button" skin="MW_Button" position="8 8 64 23" name="NameButton"/>
<Widget type="Button" skin="MW_Button" position="8 37 56 23" name="RaceButton"/>
<Widget type="Button" skin="MW_Button" position="8 66 56 23" name="ClassButton"/>
<Widget type="Button" skin="MW_Button" position="8 95 54 23" name="SignButton"/>
<Widget type="Button" skin="MW_Button" position="8 8 64 23" name="NameButton">
<Property key="Caption" value="#{sName}"/>
</Widget>
<Widget type="Button" skin="MW_Button" position="8 37 56 23" name="RaceButton">
<Property key="Caption" value="#{sRace}"/>
</Widget>
<Widget type="Button" skin="MW_Button" position="8 66 56 23" name="ClassButton">
<Property key="Caption" value="#{sClass}"/>
</Widget>
<Widget type="Button" skin="MW_Button" position="8 95 54 23" name="SignButton">
<Property key="Caption" value="#{sBirthSign}"/>
</Widget>
<Widget type="TextBox" skin="SandTextRight" position="100 10 140 18" name="NameText"/>
<Widget type="TextBox" skin="SandTextRight" position="100 39 140 18" name="RaceText"/>
<Widget type="TextBox" skin="SandTextRight" position="100 68 140 18" name="ClassText"/>
@ -17,9 +25,15 @@
<!-- Player health, magicka and fatigue -->
<Widget type="Widget" skin="MW_Box" position="8 144 244 64">
<Widget type="MWDynamicStat" skin="MW_DynamicStat_Red" position="4 4 236 18" name="Health"/>
<Widget type="MWDynamicStat" skin="MW_DynamicStat_Blue" position="4 22 236 18" name="Magicka"/>
<Widget type="MWDynamicStat" skin="MW_DynamicStat_Green" position="4 40 236 18" name="Fatigue"/>
<Widget type="MWDynamicStat" skin="MW_DynamicStat_Red" position="4 4 236 18" name="Health">
<Property key="Caption" value="#{sHealth}"/>
</Widget>
<Widget type="MWDynamicStat" skin="MW_DynamicStat_Blue" position="4 22 236 18" name="Magicka">
<Property key="Caption" value="#{sMagic}"/>
</Widget>
<Widget type="MWDynamicStat" skin="MW_DynamicStat_Green" position="4 40 236 18" name="Fatigue">
<Property key="Caption" value="#{sFatigue}"/>
</Widget>
</Widget>
<!-- Player attributes -->
@ -42,7 +56,7 @@
<!-- Dialog buttons -->
<Widget type="Button" skin="MW_Button" position="400 372 53 23" name="BackButton">
<Property key="Caption" value="Back"/>
<Property key="Caption" value="#{sBack}"/>
</Widget>
<Widget type="Button" skin="MW_Button" position="460 372 42 23" name="OKButton">
<Property key="Caption" value="OK"/>

6
files/mygui/openmw_inventory_window_layout.xml
Unescape Escape View File

@ -7,11 +7,7 @@
<!-- Player encumbrance -->
<Widget type="ProgressBar" skin="MW_Progress_Blue" position="8 8 212 24" name="EncumbranceBar" align="Left Top HStretch">
<Property key="Range" value="100"/>
<Property key="RangePosition" value="50"/>
<Widget type="TextBox" skin="ProgressText" position="0 0 212 24" align="Center Stretch" name="EncumbranceBarT">
<Property key="Caption" value="Encumbrance bar"/>
</Widget>
<Widget type="TextBox" skin="ProgressText" position="0 0 212 24" align="Center Stretch" name="EncumbranceBarT"/>
</Widget>
<!-- Avatar -->

24
files/mygui/openmw_stats_window_layout.xml
Unescape Escape View File

@ -7,9 +7,15 @@
<!-- Player health stats -->
<Widget type="Widget" skin="MW_Box" position="8 8 212 62" align="Left Top HStretch">
<Widget type="TextBox" skin="NormalText" position="4 4 70 18" name="Health_str" align="Left Top HStretch"/>
<Widget type="TextBox" skin="NormalText" position="4 22 70 18" name="Magicka_str" align="Left Top HStretch"/>
<Widget type="TextBox" skin="NormalText" position="4 40 70 18" name="Fatigue_str" align="Left Top HStretch"/>
<Widget type="TextBox" skin="NormalText" position="4 4 70 18" name="Health_str" align="Left Top HStretch">
<Property key="Caption" value="#{sHealth}"/>
</Widget>
<Widget type="TextBox" skin="NormalText" position="4 22 70 18" name="Magicka_str" align="Left Top HStretch">
<Property key="Caption" value="#{sMagic}"/>
</Widget>
<Widget type="TextBox" skin="NormalText" position="4 40 70 18" name="Fatigue_str" align="Left Top HStretch">
<Property key="Caption" value="#{sFatigue}"/>
</Widget>
<Widget type="ProgressBar" skin="MW_Progress_Red" position="78 4 130 18" name="HBar" align="Right Top"/>
<Widget type="ProgressBar" skin="MW_Progress_Blue" position="78 22 130 18" name="MBar" align="Right Top"/>
<Widget type="ProgressBar" skin="MW_Progress_Green" position="78 40 130 18" name="FBar" align="Right Top"/>
@ -20,9 +26,15 @@
<!-- Player level, race and class -->
<Widget type="Widget" skin="MW_Box" position="8 78 212 62" align="Left Top HStretch">
<Widget type="TextBox" skin="NormalText" position="4 4 100 18" name="Level_str" align="Left Top HStretch"/>
<Widget type="TextBox" skin="NormalText" position="4 22 100 18" name="Race_str" align="Left Top HStretch"/>
<Widget type="TextBox" skin="NormalText" position="4 40 100 18" name="Class_str" align="Left Top HStretch"/>
<Widget type="TextBox" skin="NormalText" position="4 4 100 18" name="Level_str" align="Left Top HStretch">
<Property key="Caption" value="#{sLevel}"/>
</Widget>
<Widget type="TextBox" skin="NormalText" position="4 22 100 18" name="Race_str" align="Left Top HStretch">
<Property key="Caption" value="#{sRace}"/>
</Widget>
<Widget type="TextBox" skin="NormalText" position="4 40 100 18" name="Class_str" align="Left Top HStretch">
<Property key="Caption" value="#{sClass}"/>
</Widget>
<Widget type="TextBox" skin="SandTextRight" position="104 4 104 18" name="LevelText" align="Right Top"/>
<Widget type="TextBox" skin="SandTextRight" position="104 22 104 18" name="RaceText" align="Right Top"/>
<Widget type="TextBox" skin="SandTextRight" position="104 40 104 18" name="ClassText" align="Right Top"/>

12
files/mygui/openmw_trade_window_layout.xml
Unescape Escape View File

@ -51,9 +51,15 @@
<Property key="TextAlign" value="Center"/>
</Widget>
<Widget type="Button" skin="MW_Button" position="0 60 60 24" name="MaxSaleButton" align="Left Top"/>
<Widget type="Button" skin="MW_Button" position="0 60 60 24" name="CancelButton" align="Right Top"/>
<Widget type="Button" skin="MW_Button" position="0 60 60 24" name="OfferButton" align="Right Top"/>
<Widget type="Button" skin="MW_Button" position="0 60 60 24" name="MaxSaleButton" align="Left Top">
<Property key="Caption" value="Max. Sale"/> <!-- GMST sMaxSale doesn't work -->
</Widget>
<Widget type="Button" skin="MW_Button" position="0 60 60 24" name="CancelButton" align="Right Top">
<Property key="Caption" value="#{sCancel}"/>
</Widget>
<Widget type="Button" skin="MW_Button" position="0 60 60 24" name="OfferButton" align="Right Top">
<Property key="Caption" value="#{sBarterDialog8"/>
</Widget>
</Widget>
</Widget>

Write Preview
Loading…
Cancel
Save