From b4adc20ef08257124a01499436f2b8b447adcb33 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 9 Jan 2010 03:18:25 +0100 Subject: Use room list --- src/Gui/Renderer/RoomListRenderer.cpp | 66 +++++++++++++++++++++++++++++++++++ src/Gui/Renderer/RoomListRenderer.h | 53 ++++++++++++++++++++++++++++ src/Gui/Window.cpp | 14 ++++++++ src/Gui/Window.h | 38 +++++++++++++++++--- 4 files changed, 167 insertions(+), 4 deletions(-) create mode 100644 src/Gui/Renderer/RoomListRenderer.cpp create mode 100644 src/Gui/Renderer/RoomListRenderer.h (limited to 'src/Gui') diff --git a/src/Gui/Renderer/RoomListRenderer.cpp b/src/Gui/Renderer/RoomListRenderer.cpp new file mode 100644 index 0000000..83b0402 --- /dev/null +++ b/src/Gui/Renderer/RoomListRenderer.cpp @@ -0,0 +1,66 @@ +/* + * RoomListRenderer.cpp + * + * Copyright (C) 2010 Matthias Schiffer + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License along + * with this program. If not, see . + */ + +#include "RoomListRenderer.h" +#include + +#include + +namespace ZoomEdit { +namespace Gui { +namespace Renderer { + +void RoomListRenderer::get_size_vfunc(Gtk::Widget &/*widget*/, const Gdk::Rectangle * /*cell_area*/, + int * /*x_offset*/, int * /*y_offset*/, int * /*width*/, int *height) const { + int xpad, ypad; + get_padding(xpad, ypad); + + *height = 60 + ypad*2; +} + +void RoomListRenderer::render_vfunc(const Glib::RefPtr &window, Gtk::Widget &widget, + const Gdk::Rectangle &/*background_area*/, const Gdk::Rectangle &cell_area, + const Gdk::Rectangle &/*expose_area*/, Gtk::CellRendererState /*flags*/) { + + Data::Room *room = reinterpret_cast(value.get_value()); + + int xpad, ypad; + get_padding(xpad, ypad); + + int x = xpad + cell_area.get_x(); + int y = ypad + cell_area.get_y(); + + int width = cell_area.get_width() - 2*xpad; + int height = cell_area.get_height() - 2*ypad; + + Glib::RefPtr gc = Gdk::GC::create(window); + gc->set_rgb_fg_color(Gdk::Color("000000")); + + Glib::RefPtr layout = Pango::Layout::create(widget.get_pango_context()); + + layout->set_width(width); + layout->set_height(height); + layout->set_markup("" + room->getId() + ""); + + window->draw_layout(gc, x, y, layout); +} + +} +} +} diff --git a/src/Gui/Renderer/RoomListRenderer.h b/src/Gui/Renderer/RoomListRenderer.h new file mode 100644 index 0000000..ee2ac9f --- /dev/null +++ b/src/Gui/Renderer/RoomListRenderer.h @@ -0,0 +1,53 @@ +/* + * RoomListRenderer.h + * + * Copyright (C) 2010 Matthias Schiffer + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License along + * with this program. If not, see . + */ + +#ifndef ZOOMEDIT_GUI_RENDERER_ROOMLISTRENDERER_H_ +#define ZOOMEDIT_GUI_RENDERER_ROOMLISTRENDERER_H_ + +#include + +namespace ZoomEdit { +namespace Gui { +namespace Renderer { + +class RoomListRenderer : public virtual Glib::ObjectBase, public Gtk::CellRenderer { + public: + RoomListRenderer() : Glib::ObjectBase(typeid(RoomListRenderer)), value(*this, "value") {} + + Glib::PropertyProxy property_value() { + return value.get_proxy(); + } + + protected: + virtual void get_size_vfunc(Gtk::Widget &widget, const Gdk::Rectangle *cell_area, + int *x_offset, int *y_offset, int *width, int *height) const; + + virtual void render_vfunc(const Glib::RefPtr &window, Gtk::Widget &widget, + const Gdk::Rectangle &background_area, const Gdk::Rectangle &cell_area, + const Gdk::Rectangle &expose_area, Gtk::CellRendererState flags); + + private: + Glib::Property value; +}; + +} +} +} + +#endif /* ZOOMEDIT_GUI_RENDERER_ROOMLISTRENDERER_H_ */ diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp index dcc8f45..9e3722c 100644 --- a/src/Gui/Window.cpp +++ b/src/Gui/Window.cpp @@ -26,6 +26,8 @@ namespace ZoomEdit { namespace Gui { +const Window::RoomListColumnRecord Window::ROOM_LIST_COLUMN_RECORD; + Window::Window(BaseObjectType *cobject, const Glib::RefPtr &builder) : Gtk::Window(cobject) { @@ -37,6 +39,18 @@ Window::Window(BaseObjectType *cobject, const Glib::RefPtr &builde builder->get_widget_derived("RenderArea", renderArea); builder->get_widget_derived("MapArea", mapArea); builder->get_widget_derived("AspectFrameMap", aspectFrameMap); + + roomListStore = Gtk::ListStore::create(ROOM_LIST_COLUMN_RECORD); + + builder->get_widget("RoomList", roomList); + + roomList->set_model(roomListStore); + int colCount = roomList->append_column("Room", roomListRenderer); + Gtk::TreeViewColumn *roomColumn = roomList->get_column(colCount-1); + + if(roomColumn) { + roomColumn->add_attribute(roomListRenderer.property_value(), ROOM_LIST_COLUMN_RECORD.room); + } } Window::~Window() { diff --git a/src/Gui/Window.h b/src/Gui/Window.h index 97ebcda..ce0b1e2 100644 --- a/src/Gui/Window.h +++ b/src/Gui/Window.h @@ -21,25 +21,55 @@ #define ZOOMEDIT_GUI_WINDOW_H_ #include +#include +#include #include +#include "Renderer/RoomListRenderer.h" + namespace ZoomEdit { + +namespace Data { +class Room; +} + namespace Gui { class AspectFrame; class RenderArea; class Window : public Gtk::Window { - private: - RenderArea *renderArea, *mapArea; - AspectFrame *aspectFrameMap; - public: Window(BaseObjectType *cobject, const Glib::RefPtr &builder); virtual ~Window(); RenderArea* getRenderArea() const {return renderArea;} RenderArea* getMapArea() const {return mapArea;} + + Glib::RefPtr getRoomListStore() {return roomListStore;} + Gtk::TreeView* getRoomList() {return roomList;} + + class RoomListColumnRecord : public Gtk::TreeModel::ColumnRecord { + public: + friend class Window; + + Gtk::TreeModelColumn room; + + private: + RoomListColumnRecord() { + add(room); + } + }; + + static const RoomListColumnRecord ROOM_LIST_COLUMN_RECORD; + + private: + RenderArea *renderArea, *mapArea; + AspectFrame *aspectFrameMap; + Gtk::TreeView *roomList; + + Glib::RefPtr roomListStore; + Renderer::RoomListRenderer roomListRenderer; }; } -- cgit v1.2.3