← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/editor/armyset-window.h

  • 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/editor/armyset-window.h
39
39
#include <gtkmm/radiobutton.h>
40
40
#include <gtkmm/tooltips.h>
41
41
 
42
 
#include "../army.h"
43
 
#include "../armyset.h"
 
42
#include "armyproto.h"
 
43
#include "armyset.h"
44
44
 
45
45
//! Armyset Editor.  Edit an Armyset.
46
46
class ArmySetWindow: public sigc::trackable
64
64
    Gtk::Widget *sdl_widget;
65
65
    std::string current_save_filename;
66
66
    Armyset *d_armyset; //current armyset
67
 
    Army *d_army; //current army
 
67
    ArmyProto *d_army; //current army
68
68
    Gtk::Image *army_image;
69
69
    Gtk::Entry *name_entry;
70
70
    Gtk::TreeView *armies_treeview;
114
114
        { add(name); add(army);}
115
115
        
116
116
        Gtk::TreeModelColumn<Glib::ustring> name;
117
 
        Gtk::TreeModelColumn<Army *> army;
 
117
        Gtk::TreeModelColumn<ArmyProto *> army;
118
118
    };
119
119
    const ArmiesColumns armies_columns;
120
120
    Glib::RefPtr<Gtk::ListStore> armies_list;
134
134
    void on_edit_armyset_info_activated();
135
135
    void on_help_about_activated();
136
136
    void on_army_selected();
137
 
    void fill_army_info(Army *army);
 
137
    void fill_army_info(ArmyProto *army);
138
138
 
139
139
    bool load(std::string tag, XML_Helper *helper);
140
140