← Back to branch summary

~ubuntu-branches/ubuntu/saucy/lordsawar/saucy

« back to all changes in this revision

Viewing changes to src/gui/hero-offer-dialog.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Barry deFreese, Barry deFreese
  • Date: 2008-12-20 13:52:12 UTC
  • mfrom: (1.1.6 upstream) (5.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20081220135212-noeb2w3y98ebo7o9
Tags: 0.1.4-1
[ Barry deFreese ]
* New upstream release.
* Move 0.0.8-2.1 changelog entry to correct point in changelog.
* Make lordsawar-data suggest lordsawar.
* Update my e-mail address.
* Add build-depends on intltool, uuid-dev, and libboost-dev.
* Don't install locales since there are no translations currently.
* Add simple man page for new lordsawar-pbm binary.
* Drop gcc4.3 patches as they have been fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui/hero-offer-dialog.cpp
28
28
#include "glade-helpers.h"
29
29
#include "image-helpers.h"
30
30
#include "input-helpers.h"
31
 
#include "../ucompose.hpp"
32
 
#include "../defs.h"
33
 
#include "../GameMap.h"
34
 
#include "../File.h"
35
 
#include "../sound.h"
36
 
#include "../city.h"
 
31
#include "ucompose.hpp"
 
32
#include "defs.h"
 
33
#include "GameMap.h"
 
34
#include "File.h"
 
35
#include "sound.h"
 
36
#include "city.h"
37
37
 
38
 
HeroOfferDialog::HeroOfferDialog(Player *player, Hero *h, City *c, int gold)
 
38
HeroOfferDialog::HeroOfferDialog(Player *player, HeroProto *h, City *c, int gold)
39
39
{
40
40
    city = c;
41
41
    hero = h;
48
48
    xml->get_widget("dialog", d);
49
49
    dialog.reset(d);
50
50
 
 
51
    decorate(dialog.get());
 
52
    window_closed.connect(sigc::mem_fun(dialog.get(), &Gtk::Dialog::hide));
 
53
 
51
54
    xml->get_widget("map_image", map_image);
52
55
 
53
56
    heromap.reset(new HeroMap(city));
57
60
    Gtk::EventBox *map_eventbox;
58
61
    xml->get_widget("map_eventbox", map_eventbox);
59
62
 
60
 
    dialog->set_title(String::ucompose(_("Hero offer for %1"),
 
63
    set_title(String::ucompose(_("Hero offer for %1"),
61
64
                                       player->getName()));
62
65
 
63
66
    xml->get_widget("hero_image", hero_image);
65
68
    male_radiobutton->signal_clicked().connect(
66
69
        sigc::mem_fun(this, &HeroOfferDialog::on_male_toggled));
67
70
    
68
 
    male_radiobutton->set_active(hero->getGender() == Army::MALE);
 
71
    male_radiobutton->set_active(hero->getGender() == Hero::MALE);
69
72
    on_male_toggled();
70
73
    
71
74
    xml->get_widget("name", name_entry);
109
112
bool HeroOfferDialog::run()
110
113
{
111
114
    heromap->resize();
112
 
    heromap->draw();
 
115
    heromap->draw(Playerlist::getActiveplayer());
113
116
 
114
117
    Sound::getInstance()->playMusic("hero", 1);
115
118
    dialog->show_all();