diff options
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/Gui/AspectFrame.h | 4 | ||||
-rw-r--r-- | src/Gui/RenderArea.cpp | 2 | ||||
-rw-r--r-- | src/Gui/RenderArea.h | 4 | ||||
-rw-r--r-- | src/Gui/Window.cpp | 16 | ||||
-rw-r--r-- | src/Gui/Window.h | 4 | ||||
-rw-r--r-- | src/Instance.cpp | 26 | ||||
-rw-r--r-- | src/Instance.h | 4 | ||||
-rw-r--r-- | zoomedit.glade | 323 | ||||
-rw-r--r-- | zoomedit.ui | 282 |
10 files changed, 310 insertions, 357 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c23418a..5081b8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ ENDIF (NOT OPENGL_FOUND) find_package(PkgConfig) pkg_check_modules(XMLPP REQUIRED libxml++-2.6>=2.24) -pkg_check_modules(GTKMM REQUIRED glibmm-2.4>=2.16 libglademm-2.4) +pkg_check_modules(GTKMM REQUIRED glibmm-2.4>=2.16 gtkmm-2.4>=2.16) pkg_check_modules(GTKGLEXT REQUIRED gtkglext-1.0) #include_directories(${Boost_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${GLEW_INCLUDE_DIR} ${GLPNG_INCLUDE_DIR} ${XMLPP_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS} ${GTKGLEXT_INCLUDE_DIRS}) diff --git a/src/Gui/AspectFrame.h b/src/Gui/AspectFrame.h index 0831956..1008464 100644 --- a/src/Gui/AspectFrame.h +++ b/src/Gui/AspectFrame.h @@ -21,7 +21,7 @@ #define ZOOMEDIT_GUI_ASPECTFRAME_H_ #include <gtkmm/aspectframe.h> -#include <iostream> +#include <gtkmm/builder.h> namespace ZoomEdit { namespace Gui { @@ -40,7 +40,7 @@ class AspectFrame : public Gtk::AspectFrame { } public: - AspectFrame(BaseObjectType *cobject, const Glib::RefPtr<Gnome::Glade::Xml>&) + AspectFrame(BaseObjectType *cobject, const Glib::RefPtr<Gtk::Builder>&) : Gtk::AspectFrame(cobject), width(-1) { signal_size_allocate().connect(sigc::mem_fun(this, &AspectFrame::onSizeAllocate)); } diff --git a/src/Gui/RenderArea.cpp b/src/Gui/RenderArea.cpp index 0fcc9ce..8065dc3 100644 --- a/src/Gui/RenderArea.cpp +++ b/src/Gui/RenderArea.cpp @@ -29,7 +29,7 @@ namespace Gui { GdkGLConfig *RenderArea::glconfig = 0; -RenderArea::RenderArea(BaseObjectType *cobject, const Glib::RefPtr<Gnome::Glade::Xml>&) +RenderArea::RenderArea(BaseObjectType *cobject, const Glib::RefPtr<Gtk::Builder>&) : Gtk::DrawingArea(cobject), view(0), inWindow(false) { if(!glconfig) { glconfig = gdk_gl_config_new_by_mode((GdkGLConfigMode)(GDK_GL_MODE_RGB | GDK_GL_MODE_DOUBLE)); diff --git a/src/Gui/RenderArea.h b/src/Gui/RenderArea.h index d42a352..ea3f815 100644 --- a/src/Gui/RenderArea.h +++ b/src/Gui/RenderArea.h @@ -20,9 +20,9 @@ #ifndef ZOOMEDIT_GUI_RENDERAREA_H_ #define ZOOMEDIT_GUI_RENDERAREA_H_ +#include <gtkmm/builder.h> #include <gtkmm/drawingarea.h> #include <gtkmm/scrollbar.h> -#include <libglademm/xml.h> #include <gtk/gtkgl.h> namespace ZoomEdit { @@ -35,7 +35,7 @@ namespace Gui { class RenderArea : public Gtk::DrawingArea { public: - RenderArea(BaseObjectType *cobject, const Glib::RefPtr<Gnome::Glade::Xml>&); + RenderArea(BaseObjectType *cobject, const Glib::RefPtr<Gtk::Builder>&); View::View* getView() const {return view;} void setView(View::View *view0); diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp index 6d614fb..dcc8f45 100644 --- a/src/Gui/Window.cpp +++ b/src/Gui/Window.cpp @@ -21,16 +21,22 @@ #include "RenderArea.h" #include "AspectFrame.h" +#include <gtkmm/action.h> + namespace ZoomEdit { namespace Gui { -Window::Window(BaseObjectType *cobject, const Glib::RefPtr<Gnome::Glade::Xml> &xml) +Window::Window(BaseObjectType *cobject, const Glib::RefPtr<Gtk::Builder> &builder) : Gtk::Window(cobject) { - xml->connect_clicked("MenuItemQuit", sigc::mem_fun(this, &Window::hide)); - xml->get_widget_derived("RenderArea", renderArea); - xml->get_widget_derived("MapArea", mapArea); - xml->get_widget_derived("AspectFrameMap", aspectFrameMap); + Glib::RefPtr<Gtk::Action> itemQuit = Glib::RefPtr<Gtk::Action>::cast_dynamic(builder->get_object("MenuItemQuit")); + if(itemQuit) { + itemQuit->signal_activate().connect(sigc::mem_fun(this, &Window::hide)); + } + + builder->get_widget_derived("RenderArea", renderArea); + builder->get_widget_derived("MapArea", mapArea); + builder->get_widget_derived("AspectFrameMap", aspectFrameMap); } Window::~Window() { diff --git a/src/Gui/Window.h b/src/Gui/Window.h index a0934f5..97ebcda 100644 --- a/src/Gui/Window.h +++ b/src/Gui/Window.h @@ -20,8 +20,8 @@ #ifndef ZOOMEDIT_GUI_WINDOW_H_ #define ZOOMEDIT_GUI_WINDOW_H_ +#include <gtkmm/builder.h> #include <gtkmm/window.h> -#include <libglademm/xml.h> namespace ZoomEdit { namespace Gui { @@ -35,7 +35,7 @@ class Window : public Gtk::Window { AspectFrame *aspectFrameMap; public: - Window(BaseObjectType *cobject, const Glib::RefPtr<Gnome::Glade::Xml> &xml); + Window(BaseObjectType *cobject, const Glib::RefPtr<Gtk::Builder> &builder); virtual ~Window(); RenderArea* getRenderArea() const {return renderArea;} diff --git a/src/Instance.cpp b/src/Instance.cpp index 351a6d7..ce0d239 100644 --- a/src/Instance.cpp +++ b/src/Instance.cpp @@ -35,29 +35,17 @@ guint Instance::instances = 0; Instance::Instance(const Glib::ustring &file) : window(0), levelXml(0), level(0), view(0) { instances++; -#ifdef GLIBMM_EXCEPTIONS_ENABLED - try - { - xml = Gnome::Glade::Xml::create("zoomedit.glade"); + try { + builder = Gtk::Builder::create_from_file("zoomedit.ui"); } - catch(const Gnome::Glade::XmlError& ex) - { + catch(const Glib::Exception& ex) { std::cerr << ex.what() << std::endl; return; } -#else - std::auto_ptr<Gnome::Glade::XmlError> error; - xml = Gnome::Glade::Xml::create("zoomedit.glade", "", "", error); - if(error.get()) - { - std::cerr << error->what() << std::endl; - return; - } -#endif - xml->get_widget_derived("WindowMain", window); + builder->get_widget_derived("WindowMain", window); if(!window) { - xml.clear(); + builder.clear(); return; } @@ -70,10 +58,10 @@ Instance::Instance(const Glib::ustring &file) : window(0), levelXml(0), level(0) window->getMapArea()->setView(mapView); Gtk::ToolButton *button; - xml->get_widget("ToolButtonZoomIn", button); + builder->get_widget("ToolButtonZoomIn", button); button->signal_clicked().connect(sigc::bind(sigc::mem_fun(view, &View::TopView::zoom), 2, 0, 0)); - xml->get_widget("ToolButtonZoomOut", button); + builder->get_widget("ToolButtonZoomOut", button); button->signal_clicked().connect(sigc::bind(sigc::mem_fun(view, &View::TopView::zoom), -2, 0, 0)); if(file.empty()) diff --git a/src/Instance.h b/src/Instance.h index 679ccbe..090e2f1 100644 --- a/src/Instance.h +++ b/src/Instance.h @@ -20,8 +20,8 @@ #ifndef ZOOMEDIT_INSTANCE_H_ #define ZOOMEDIT_INSTANCE_H_ +#include <gtkmm/builder.h> #include <gtkmm/main.h> -#include <libglademm/xml.h> #include <libxml++/parsers/domparser.h> namespace ZoomEdit { @@ -52,7 +52,7 @@ class Instance { private: static guint instances; - Glib::RefPtr<Gnome::Glade::Xml> xml; + Glib::RefPtr<Gtk::Builder> builder; Gui::Window *window; xmlpp::DomParser *levelXml; diff --git a/zoomedit.glade b/zoomedit.glade deleted file mode 100644 index 2cceff1..0000000 --- a/zoomedit.glade +++ /dev/null @@ -1,323 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--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> - <property name="default_width">640</property> - <property name="default_height">480</property> - <child> - <widget class="GtkVBox" id="vbox1"> - <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="GtkMenuBar" id="menubar"> - <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="GtkMenuItem" id="menuitemfile"> - <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" translatable="yes">_File</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="menu1"> - <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="GtkImageMenuItem" id="imagemenuitem1"> - <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" translatable="yes">gtk-new</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="imagemenuitem2"> - <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" translatable="yes">gtk-open</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="imagemenuitem3"> - <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" translatable="yes">gtk-save</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="imagemenuitem4"> - <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" translatable="yes">gtk-save-as</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separatormenuitem1"> - <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> - <child> - <widget class="GtkImageMenuItem" id="MenuItemQuit"> - <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" translatable="yes">gtk-quit</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="menuitemedit"> - <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" translatable="yes">_Edit</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="menu2"> - <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="GtkImageMenuItem" id="imagemenuitem6"> - <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" translatable="yes">gtk-cut</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="imagemenuitem7"> - <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" translatable="yes">gtk-copy</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="imagemenuitem8"> - <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" translatable="yes">gtk-paste</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="imagemenuitem9"> - <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" translatable="yes">gtk-delete</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="menuitemview"> - <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" translatable="yes">_View</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="menuitemhelp"> - <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" translatable="yes">_Help</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="menu3"> - <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="GtkImageMenuItem" id="imagemenuitem10"> - <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" translatable="yes">gtk-about</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - </packing> - </child> - <child> - <widget class="GtkToolbar" id="toolbar"> - <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="GtkToolButton" id="ToolButtonZoomIn"> - <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="stock_id">gtk-zoom-in</property> - </widget> - <packing> - <property name="expand">False</property> - </packing> - </child> - <child> - <widget class="GtkToolButton" id="ToolButtonZoomOut"> - <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="stock_id">gtk-zoom-out</property> - </widget> - <packing> - <property name="expand">False</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkHPaned" id="hpanedMain"> - <property name="visible">True</property> - <property name="can_focus">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="position">480</property> - <child> - <widget class="GtkDrawingArea" id="RenderArea"> - <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 | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property> - </widget> - <packing> - <property name="resize">True</property> - <property name="shrink">True</property> - </packing> - </child> - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <child> - <widget class="GtkViewport" id="viewport1"> - <property name="visible">True</property> - <property name="resize_mode">GTK_RESIZE_QUEUE</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - <child> - <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> - </child> - </widget> - <packing> - <property name="resize">True</property> - <property name="shrink">True</property> - </packing> - </child> - </widget> - <packing> - <property name="position">2</property> - </packing> - </child> - <child> - <widget class="GtkStatusbar" id="statusbar"> - <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="spacing">2</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">3</property> - </packing> - </child> - </widget> - </child> - </widget> -</glade-interface> diff --git a/zoomedit.ui b/zoomedit.ui new file mode 100644 index 0000000..768d6eb --- /dev/null +++ b/zoomedit.ui @@ -0,0 +1,282 @@ +<?xml version="1.0"?> +<!--Generated with glade3 3.4.5 on Thu Jun 5 11:25:46 2008 --> +<interface> + <object class="GtkUIManager" id="uimanager1"> + <child> + <object class="GtkActionGroup" id="actiongroup1"> + <child> + <object class="GtkAction" id="menuitemfile"> + <property name="name">menuitemfile</property> + <property name="label" translatable="yes">_File</property> + </object> + </child> + <child> + <object class="GtkAction" id="imagemenuitem1"> + <property name="stock_id" translatable="yes">gtk-new</property> + <property name="name">imagemenuitem1</property> + </object> + </child> + <child> + <object class="GtkAction" id="imagemenuitem2"> + <property name="stock_id" translatable="yes">gtk-open</property> + <property name="name">imagemenuitem2</property> + </object> + </child> + <child> + <object class="GtkAction" id="imagemenuitem3"> + <property name="stock_id" translatable="yes">gtk-save</property> + <property name="name">imagemenuitem3</property> + </object> + </child> + <child> + <object class="GtkAction" id="imagemenuitem4"> + <property name="stock_id" translatable="yes">gtk-save-as</property> + <property name="name">imagemenuitem4</property> + </object> + </child> + <child> + <object class="GtkAction" id="MenuItemQuit"> + <property name="stock_id" translatable="yes">gtk-quit</property> + <property name="name">MenuItemQuit</property> + </object> + </child> + <child> + <object class="GtkAction" id="menuitemedit"> + <property name="name">menuitemedit</property> + <property name="label" translatable="yes">_Edit</property> + </object> + </child> + <child> + <object class="GtkAction" id="imagemenuitem6"> + <property name="stock_id" translatable="yes">gtk-cut</property> + <property name="name">imagemenuitem6</property> + </object> + </child> + <child> + <object class="GtkAction" id="imagemenuitem7"> + <property name="stock_id" translatable="yes">gtk-copy</property> + <property name="name">imagemenuitem7</property> + </object> + </child> + <child> + <object class="GtkAction" id="imagemenuitem8"> + <property name="stock_id" translatable="yes">gtk-paste</property> + <property name="name">imagemenuitem8</property> + </object> + </child> + <child> + <object class="GtkAction" id="imagemenuitem9"> + <property name="stock_id" translatable="yes">gtk-delete</property> + <property name="name">imagemenuitem9</property> + </object> + </child> + <child> + <object class="GtkAction" id="menuitemview"> + <property name="name">menuitemview</property> + <property name="label" translatable="yes">_View</property> + </object> + </child> + <child> + <object class="GtkAction" id="menuitemhelp"> + <property name="name">menuitemhelp</property> + <property name="label" translatable="yes">_Help</property> + </object> + </child> + <child> + <object class="GtkAction" id="imagemenuitem10"> + <property name="stock_id" translatable="yes">gtk-about</property> + <property name="name">imagemenuitem10</property> + </object> + </child> + </object> + </child> + <ui> + <menubar name="menubar"> + <menu action="menuitemfile"> + <menuitem action="imagemenuitem1"/> + <menuitem action="imagemenuitem2"/> + <menuitem action="imagemenuitem3"/> + <menuitem action="imagemenuitem4"/> + <separator/> + <menuitem action="MenuItemQuit"/> + </menu> + <menu action="menuitemedit"> + <menuitem action="imagemenuitem6"/> + <menuitem action="imagemenuitem7"/> + <menuitem action="imagemenuitem8"/> + <menuitem action="imagemenuitem9"/> + </menu> + <menuitem action="menuitemview"/> + <menu action="menuitemhelp"> + <menuitem action="imagemenuitem10"/> + </menu> + </menubar> + </ui> + </object> + <object 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> + <property name="default_width">640</property> + <property name="default_height">480</property> + <child> + <object class="GtkVBox" id="vbox1"> + <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> + <object class="GtkMenuBar" constructor="uimanager1" id="menubar"> + <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> + </object> + <packing> + <property name="expand">False</property> + </packing> + </child> + <child> + <object class="GtkToolbar" id="toolbar"> + <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> + <object class="GtkToolButton" id="ToolButtonZoomIn"> + <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="stock_id">gtk-zoom-in</property> + </object> + <packing> + <property name="expand">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="ToolButtonZoomOut"> + <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="stock_id">gtk-zoom-out</property> + </object> + <packing> + <property name="expand">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHPaned" id="hpanedMain"> + <property name="visible">True</property> + <property name="can_focus">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="position">480</property> + <child> + <object class="GtkDrawingArea" id="RenderArea"> + <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 | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property> + </object> + <packing> + <property name="resize">True</property> + <property name="shrink">True</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <child> + <object class="GtkViewport" id="viewport1"> + <property name="visible">True</property> + <property name="resize_mode">GTK_RESIZE_QUEUE</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + <child> + <object 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> + <object class="GtkExpander" id="expander1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="expanded">True</property> + <child> + <object 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> + <object 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> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes">Map</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <object class="GtkExpander" id="expander2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="expanded">True</property> + <child> + <object 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> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="label" translatable="yes">Rooms</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="resize">True</property> + <property name="shrink">True</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkStatusbar" id="statusbar"> + <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="spacing">2</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">3</property> + </packing> + </child> + </object> + </child> + </object> +</interface> |