mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 10:23:52 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3 from zinnschlag/newlauncher

Browse source
This commit is contained in:
pvdk 2011-07-29 05:25:10 -07:00
commit d14c7089a6
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/launcher/datafilespage.cpp
View file

@ -142,7 +142,7 @@ void DataFilesPage::setupDataFiles(const QStringList &paths, bool strict)
for (Files::MultiDirCollection::TIter iter(esm.begin()); iter!=esm.end(); ++iter)
{
QString currentMaster = QString::fromStdString(iter->second.filename().string());
QString currentMaster = QString::fromStdString(std::string (iter->second.filename()));
const QList<QTableWidgetItem*> itemList = mMastersWidget->findItems(currentMaster, Qt::MatchExactly);
if (itemList.isEmpty()) // Master is not yet in the widget
@ -186,7 +186,7 @@ void DataFilesPage::setupDataFiles(const QStringList &paths, bool strict)
// Now we put the current plugin in the mDataFilesModel under its masters
QStandardItem *parent = new QStandardItem(availableMasters.join(","));
QStandardItem *child = new QStandardItem(QString::fromStdString(iter->second.filename().string()));
QStandardItem *child = new QStandardItem(QString::fromStdString(std::string (iter->second.filename())));
const QList<QStandardItem*> masterList = mDataFilesModel->findItems(availableMasters.join(","));

21
readme.txt
View file

@ -8,21 +8,36 @@ License: GPL (see GPL3.txt for more information)
Website: www.openmw.com
THIS IS A WORK IN PROGRESS
INSTALLATION
Windows:
Text goes here
TODO add description for Windows
Linux:
Ubuntu
TODO add description for Ubuntu
Arch Linux
There's an OpenMW package available in the AUR Repository:
http://aur.archlinux.org/packages.php?ID=21419
OS X:
TODO add description for OS X
BUILD FROM SOURCE
TODO add description here
COMMAND LINE OPTIONS
TODO add description of command line options
CREDITS
Developers:
TODO add list of developers
OpenMW:
Thanks to DokterDume for kindly providing us with the Moon and Star logo
used as the application icon and project logo.
@ -31,4 +46,6 @@ Launcher:
Thanks to Kevin Ryan for kindly providing us with the icon used for the Data Files tab.
CHANGELOG
CHANGELOG
TODO add changelog (take pre 0.11.0 changelog from wiki when it is up again; take 0.11.0 and later changelog from tracker)