diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-06-03 23:58:07 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-06-03 23:58:07 +0300 |
| commit | a57a28014d09abdd695e31acb86a1dbdbedb5faa (patch) | |
| tree | 2f5469b1f8a8b6fccc213613d7c2ada55a095474 | |
| parent | 98c10803f79ce9decb4a431719e18bb27aac4485 (diff) | |
| download | manaverse-a57a28014d09abdd695e31acb86a1dbdbedb5faa.tar.gz manaverse-a57a28014d09abdd695e31acb86a1dbdbedb5faa.tar.bz2 manaverse-a57a28014d09abdd695e31acb86a1dbdbedb5faa.tar.xz manaverse-a57a28014d09abdd695e31acb86a1dbdbedb5faa.zip | |
Add support for help footer.
| -rw-r--r-- | data/help/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | data/help/Makefile.am | 1 | ||||
| -rw-r--r-- | data/help/footer.txt | 1 | ||||
| -rw-r--r-- | src/gui/didyouknowwindow.cpp | 1 | ||||
| -rw-r--r-- | src/gui/helpwindow.cpp | 2 |
5 files changed, 4 insertions, 2 deletions
diff --git a/data/help/CMakeLists.txt b/data/help/CMakeLists.txt index 5f4f21fd9..239539f7f 100644 --- a/data/help/CMakeLists.txt +++ b/data/help/CMakeLists.txt @@ -2,6 +2,7 @@ SET(FILES about.txt commands.txt chatcommands.txt + footer.txt header.txt index.txt skills.txt diff --git a/data/help/Makefile.am b/data/help/Makefile.am index 1fe19a39c..38899eaf1 100644 --- a/data/help/Makefile.am +++ b/data/help/Makefile.am @@ -6,6 +6,7 @@ help_DATA = \ about.txt \ chatcommands.txt \ commands.txt \ + footer.txt \ header.txt \ index.txt \ skills.txt \ diff --git a/data/help/footer.txt b/data/help/footer.txt new file mode 100644 index 000000000..8d1c8b69c --- /dev/null +++ b/data/help/footer.txt @@ -0,0 +1 @@ + diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp index 0dcc01091..50e0f0188 100644 --- a/src/gui/didyouknowwindow.cpp +++ b/src/gui/didyouknowwindow.cpp @@ -132,7 +132,6 @@ void DidYouKnowWindow::loadData(int num) void DidYouKnowWindow::loadFile(int num) { const std::string file = strprintf("tips/%d", num); - const StringVect langs = getLang(); std::string helpPath = branding.getStringValue("helpPath"); if (helpPath.empty()) helpPath = paths.getStringValue("help"); diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp index d58490491..82a70bca9 100644 --- a/src/gui/helpwindow.cpp +++ b/src/gui/helpwindow.cpp @@ -101,6 +101,7 @@ void HelpWindow::loadHelp(const std::string &helpFile) loadFile("header"); loadFile(helpFile); + loadFile("footer"); mScrollArea->setVerticalScrollAmount(0); setVisible(true); @@ -108,7 +109,6 @@ void HelpWindow::loadHelp(const std::string &helpFile) void HelpWindow::loadFile(const std::string &file) { - const StringVect langs = getLang(); std::string helpPath = branding.getStringValue("helpPath"); if (helpPath.empty()) helpPath = paths.getStringValue("help"); |