diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-10 21:57:09 +0100 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-10 21:57:09 +0100 |
commit | 9f2a8799eea3d609a3863a7732ec280d83f12e47 (patch) | |
tree | 719f9e8703211937fc2452055c7a8d5be05bd2f8 /src/gui | |
parent | 53840c3fe951c77fa7965efcac4ed77b52da14d9 (diff) | |
parent | a8a992ade40c9d68c9faec1cc3a54e7f064fb9d5 (diff) | |
download | mana-9f2a8799eea3d609a3863a7732ec280d83f12e47.tar.gz mana-9f2a8799eea3d609a3863a7732ec280d83f12e47.tar.bz2 mana-9f2a8799eea3d609a3863a7732ec280d83f12e47.tar.xz mana-9f2a8799eea3d609a3863a7732ec280d83f12e47.zip |
Merge branch 'aethyra/master'
Conflicts:
docs/FAQ.txt
packaging/windows/make-translations.vbs
src/Makefile.am
src/gui/colour.cpp
src/gui/colour.h
src/gui/popupmenu.cpp
src/gui/setup_colours.h
src/main.cpp
src/main.h
src/resources/resourcemanager.cpp
src/text.cpp
src/text.h
src/textmanager.cpp
src/textmanager.h
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/inventorywindow.cpp | 8 | ||||
-rw-r--r-- | src/gui/recorder.cpp | 15 | ||||
-rw-r--r-- | src/gui/status.cpp | 10 |
3 files changed, 17 insertions, 16 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index b9fe1c90..af3b29a2 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -87,12 +87,12 @@ InventoryWindow::InventoryWindow(int invSize): mWeightBar = new ProgressBar(1.0f, 100, 20, 0, 0, 255); setMinHeight(130); - setMinWidth(mWeightLabel->getWidth() + mSlotsLabel->getWidth() + 310); + setMinWidth(mWeightLabel->getWidth() + mSlotsLabel->getWidth() + 280); place(0, 0, mWeightLabel).setPadding(3); - place(1, 0, mWeightBar, 2); - place(3, 0, mSlotsLabel).setPadding(3); - place(4, 0, mSlotsBar, 2); + place(1, 0, mWeightBar, 3); + place(4, 0, mSlotsLabel).setPadding(3); + place(5, 0, mSlotsBar, 2); place(0, 1, mInvenScroll, 7, 4); place(5, 5, mDropButton); place(6, 5, mUseButton); diff --git a/src/gui/recorder.cpp b/src/gui/recorder.cpp index 1e7d8e13..153bffae 100644 --- a/src/gui/recorder.cpp +++ b/src/gui/recorder.cpp @@ -1,15 +1,15 @@ /* - * The Mana World - * Copyright 2004 The Mana World Development Team + * A chat recorder + * Copyright (C) 2008 Lloyd Bryant <lloyd_bryant@netzero.net> * * This file is part of The Mana World. * - * The Mana World is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * any later version. * - * The Mana World is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -52,6 +52,10 @@ Recorder::Recorder(ChatWindow *chat, const std::string &title, loadWindowState(); } +Recorder::~Recorder() +{ +} + void Recorder::record(const std::string &msg) { if (mStream.is_open()) @@ -110,6 +114,3 @@ void Recorder::action(const gcn::ActionEvent &event) changeRecordingStatus(""); } -Recorder::~Recorder() -{ -} diff --git a/src/gui/status.cpp b/src/gui/status.cpp index 21087fad..e8426ec4 100644 --- a/src/gui/status.cpp +++ b/src/gui/status.cpp @@ -41,7 +41,7 @@ StatusWindow::StatusWindow(LocalPlayer *player): setWindowName(_("Status")); setCloseButton(true); setDefaultSize((windowContainer->getWidth() - 365) / 2, - (windowContainer->getHeight() - 255) / 2, 400, 335); + (windowContainer->getHeight() - 255) / 2, 400, 345); // ---------------------- // Status Part @@ -119,13 +119,13 @@ StatusWindow::StatusWindow(LocalPlayer *player): place(0, 0, mLvlLabel, 3); place(5, 0, mJobLvlLabel, 3); place(8, 0, mGpLabel, 3); - place(1, 1, mHpLabel); + place(1, 1, mHpLabel).setPadding(3); place(2, 1, mHpBar, 3); - place(6, 1, mXpLabel); + place(6, 1, mXpLabel).setPadding(3); place(7, 1, mXpBar, 3); - place(1, 2, mMpLabel); + place(1, 2, mMpLabel).setPadding(3); place(2, 2, mMpBar, 3); - place(6, 2, mJobLabel); + place(6, 2, mJobLabel).setPadding(3); place(7, 2, mJobBar, 3); place.getCell().matchColWidth(0, 1); place = getPlacer(0, 3); |