zoomedit:
* Revised sidebar
This commit is contained in:
neoraider
parent
5bb27d2b6d
commit
e2c39937ce
4 changed files with 133 additions and 11 deletions
52
src/Gui/AspectFrame.h
Normal file
52
src/Gui/AspectFrame.h
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
/*
|
||||
* AspectFrame.h
|
||||
*
|
||||
* Copyright (C) 2008 Matthias Schiffer <matthias@gamezock.de>
|
||||
*
|
||||
* 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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef ZOOMEDIT_GUI_ASPECTFRAME_H_
|
||||
#define ZOOMEDIT_GUI_ASPECTFRAME_H_
|
||||
|
||||
#include <gtkmm/aspectframe.h>
|
||||
#include <iostream>
|
||||
|
||||
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<Gnome::Glade::Xml>&)
|
||||
: Gtk::AspectFrame(cobject), width(-1) {
|
||||
signal_size_allocate().connect(sigc::mem_fun(this, &AspectFrame::onSizeAllocate));
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif /*ZOOMEDIT_GUI_ASPECTFRAME_H_*/
|
||||
|
|
@ -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<Gnome::Glade::Xml> &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;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<Gnome::Glade::Xml> &xml);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
|
||||
<!--Generated with glade3 3.4.0 on Fri Apr 18 10:38:23 2008 -->
|
||||
<!--Generated with glade3 3.4.5 on Thu Jun 5 11:25:46 2008 -->
|
||||
<glade-interface>
|
||||
<widget class="GtkWindow" id="WindowMain">
|
||||
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
|
||||
|
|
@ -212,22 +212,85 @@
|
|||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkVBox" id="vboxpane">
|
||||
<widget class="GtkScrolledWindow" id="scrolledwindow1">
|
||||
<property name="visible">True</property>
|
||||
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
|
||||
<child>
|
||||
<widget class="GtkAspectFrame" id="aspectframemap">
|
||||
<widget class="GtkViewport" id="viewport1">
|
||||
<property name="visible">True</property>
|
||||
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
|
||||
<property name="label_xalign">0</property>
|
||||
<property name="shadow_type">GTK_SHADOW_IN</property>
|
||||
<property name="yalign">0</property>
|
||||
<property name="ratio">1.3300000429153442</property>
|
||||
<property name="obey_child">False</property>
|
||||
<property name="resize_mode">GTK_RESIZE_QUEUE</property>
|
||||
<property name="shadow_type">GTK_SHADOW_NONE</property>
|
||||
<child>
|
||||
<widget class="GtkDrawingArea" id="MapArea">
|
||||
<widget class="GtkVBox" id="vboxpane">
|
||||
<property name="visible">True</property>
|
||||
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
|
||||
<child>
|
||||
<widget class="GtkExpander" id="expander1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="expanded">True</property>
|
||||
<child>
|
||||
<widget class="GtkAspectFrame" id="AspectFrameMap">
|
||||
<property name="visible">True</property>
|
||||
<property name="events">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</property>
|
||||
<property name="label_xalign">0</property>
|
||||
<property name="shadow_type">GTK_SHADOW_IN</property>
|
||||
<property name="yalign">0</property>
|
||||
<property name="ratio">1.3300000429153442</property>
|
||||
<property name="obey_child">False</property>
|
||||
<child>
|
||||
<widget class="GtkDrawingArea" id="MapArea">
|
||||
<property name="visible">True</property>
|
||||
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label2">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Map</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="type">label_item</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkExpander" id="expander2">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="expanded">True</property>
|
||||
<child>
|
||||
<widget class="GtkTreeView" id="RoomList">
|
||||
<property name="height_request">200</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="headers_visible">False</property>
|
||||
<property name="headers_clickable">True</property>
|
||||
</widget>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label3">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Rooms</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="type">label_item</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
|
|
|
|||
Reference in a new issue