From e2c39937cecf38a8264f49828dc9e096d233462c Mon Sep 17 00:00:00 2001 From: neoraider Date: Mon, 9 Jun 2008 14:17:02 +0000 Subject: zoomedit: * Revised sidebar --- src/Gui/AspectFrame.h | 52 +++++++++++++++++++++++++++++++ src/Gui/Window.cpp | 5 +++ src/Gui/Window.h | 2 ++ zoomedit.glade | 85 ++++++++++++++++++++++++++++++++++++++++++++------- 4 files changed, 133 insertions(+), 11 deletions(-) create mode 100644 src/Gui/AspectFrame.h diff --git a/src/Gui/AspectFrame.h b/src/Gui/AspectFrame.h new file mode 100644 index 0000000..0831956 --- /dev/null +++ b/src/Gui/AspectFrame.h @@ -0,0 +1,52 @@ +/* + * AspectFrame.h + * + * Copyright (C) 2008 Matthias Schiffer + * + * 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 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef ZOOMEDIT_GUI_ASPECTFRAME_H_ +#define ZOOMEDIT_GUI_ASPECTFRAME_H_ + +#include +#include + +namespace ZoomEdit { +namespace Gui { + +class AspectFrame : public Gtk::AspectFrame { + private: + int width; + + void onSizeAllocate(Gtk::Allocation &allocation) { + if(allocation.get_width() == width) + return; + + width = allocation.get_width(); + + set_size_request(-1, width/property_ratio().get_value()); + } + + public: + AspectFrame(BaseObjectType *cobject, const Glib::RefPtr&) + : Gtk::AspectFrame(cobject), width(-1) { + signal_size_allocate().connect(sigc::mem_fun(this, &AspectFrame::onSizeAllocate)); + } +}; + +} +} + +#endif /*ZOOMEDIT_GUI_ASPECTFRAME_H_*/ diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp index f33edf0..6d614fb 100644 --- a/src/Gui/Window.cpp +++ b/src/Gui/Window.cpp @@ -19,6 +19,7 @@ #include "Window.h" #include "RenderArea.h" +#include "AspectFrame.h" namespace ZoomEdit { namespace Gui { @@ -29,6 +30,7 @@ Window::Window(BaseObjectType *cobject, const Glib::RefPtr &x xml->get_widget_derived("RenderArea", renderArea); xml->get_widget_derived("MapArea", mapArea); + xml->get_widget_derived("AspectFrameMap", aspectFrameMap); } Window::~Window() { @@ -37,6 +39,9 @@ Window::~Window() { if(mapArea) delete mapArea; + + if(aspectFrameMap) + delete aspectFrameMap; } } diff --git a/src/Gui/Window.h b/src/Gui/Window.h index d2bd7aa..a0934f5 100644 --- a/src/Gui/Window.h +++ b/src/Gui/Window.h @@ -26,11 +26,13 @@ namespace ZoomEdit { namespace Gui { +class AspectFrame; class RenderArea; class Window : public Gtk::Window { private: RenderArea *renderArea, *mapArea; + AspectFrame *aspectFrameMap; public: Window(BaseObjectType *cobject, const Glib::RefPtr &xml); diff --git a/zoomedit.glade b/zoomedit.glade index 341299e..2cceff1 100644 --- a/zoomedit.glade +++ b/zoomedit.glade @@ -1,6 +1,6 @@ - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -212,22 +212,85 @@ - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + GTK_POLICY_AUTOMATIC - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - GTK_SHADOW_IN - 0 - 1.3300000429153442 - False + GTK_RESIZE_QUEUE + GTK_SHADOW_NONE - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + True + True + + + True + GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK + 0 + GTK_SHADOW_IN + 0 + 1.3300000429153442 + False + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + + + + True + Map + + + label_item + + + + + False + False + + + + + True + True + True + + + 200 + True + True + False + True + + + + + True + Rooms + + + label_item + + + + + False + 1 + + -- cgit v1.2.3