From 3329815114f2e352b8b1438899bd92c13facd8a1 Mon Sep 17 00:00:00 2001 From: David Athay Date: Thu, 18 Dec 2008 18:43:14 +0000 Subject: Re-enabled buddy window --- src/channelmanager.cpp | 2 +- src/gui/buddywindow.cpp | 12 ++++++++++-- src/gui/buddywindow.h | 6 ++++++ tmw.cbp | 2 ++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/channelmanager.cpp b/src/channelmanager.cpp index 2a3f4eff..a9654de9 100644 --- a/src/channelmanager.cpp +++ b/src/channelmanager.cpp @@ -43,7 +43,7 @@ Channel *ChannelManager::findById(int id) const itr++) { Channel *c = (*itr); - if (channel->getId() == id) + if (c->getId() == id) { channel = c; break; diff --git a/src/gui/buddywindow.cpp b/src/gui/buddywindow.cpp index 0535f837..25084593 100644 --- a/src/gui/buddywindow.cpp +++ b/src/gui/buddywindow.cpp @@ -34,10 +34,13 @@ BuddyWindow::BuddyWindow(): Window(_("Buddy")) { setVisible(false); - setContentSize(124, 202); + setWindowName("Buddy Window"); setCaption(_("Buddy List")); setResizable(true); setCloseButton(true); + setMinWidth(110); + setMinHeight(200); + setDefaultSize(124, 41, 288, 330); Image *addImg = ResourceManager::getInstance()->getImage("buddyadd.png"); Image *delImg = ResourceManager::getInstance()->getImage("buddydel.png"); @@ -51,10 +54,15 @@ BuddyWindow::BuddyWindow(): add(delBuddy); } - loadWindowState("Buddy"); + loadWindowState(); } void BuddyWindow::action(const gcn::ActionEvent &event) { } + +void BuddyWindow::draw(gcn::Graphics *graphics) +{ + Window::draw(graphics); +} diff --git a/src/gui/buddywindow.h b/src/gui/buddywindow.h index 15594b63..dfe356d5 100644 --- a/src/gui/buddywindow.h +++ b/src/gui/buddywindow.h @@ -47,6 +47,12 @@ class BuddyWindow : public Window, public gcn::ActionListener */ void action(const gcn::ActionEvent &event); + /** + * Draws the window + */ + void draw(gcn::Graphics *graphics); + + private: std::list mBuddyList; }; diff --git a/tmw.cbp b/tmw.cbp index 8aa65fd4..ad9681ff 100644 --- a/tmw.cbp +++ b/tmw.cbp @@ -143,6 +143,8 @@ + +