X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdockmanager.cpp;h=a280a325621840a0b20d2375ea71c1ac3fe183df;hb=6f28bee2a11612b1b1ece247dd4914dab4931a30;hp=503aba2dc5d8af0fd49ea8352656ffc8bd2585fb;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/dockmanager.cpp b/synfig-studio/trunk/src/gtkmm/dockmanager.cpp index 503aba2..a280a32 100644 --- a/synfig-studio/trunk/src/gtkmm/dockmanager.cpp +++ b/synfig-studio/trunk/src/gtkmm/dockmanager.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file dockmanager.cpp ** \brief Template File ** ** $Id: dockmanager.cpp,v 1.2 2005/01/12 07:03:42 darco Exp $ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package 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 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package 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. ** \endlegal */ /* ========================================================================= */ @@ -32,8 +33,8 @@ #include #include "dockable.h" #include "dockdialog.h" -#include -#include +#include +#include #include #endif @@ -42,39 +43,39 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ /* === P R O C E D U R E S ================================================= */ -class studio::DockSettings : public sinfgapp::Settings +class studio::DockSettings : public synfigapp::Settings { DockManager* dock_manager; public: DockSettings(DockManager* dock_manager):dock_manager(dock_manager) { - sinfgapp::Main::settings().add_domain(this,"dock"); + synfigapp::Main::settings().add_domain(this,"dock"); } virtual ~DockSettings() { - sinfgapp::Main::settings().remove_domain("dock"); + synfigapp::Main::settings().remove_domain("dock"); } #define SCALE_FACTOR (1280) - virtual bool get_value(const sinfg::String& key_, sinfg::String& value)const + virtual bool get_value(const synfig::String& key_, synfig::String& value)const { int screen_w(Gdk::screen_width()); int screen_h(Gdk::screen_height()); if(key_.size()>6 && String(key_.begin(),key_.begin()+6)=="dialog")try { - sinfg::String key(key_.begin()+7,key_.end()); - int separator=key.find_first_of('.'); - int id(atoi(sinfg::String(key.begin(),key.begin()+separator).c_str())); - key=sinfg::String(key.begin()+separator+1,key.end()); + synfig::String key(key_.begin()+7,key_.end()); + synfig::String::size_type separator=key.find_first_of('.'); + int id(atoi(synfig::String(key.begin(),key.begin()+separator).c_str())); + key=synfig::String(key.begin()+separator+1,key.end()); DockDialog& dock_dialog(dock_manager->find_dock_dialog(id)); @@ -111,20 +112,20 @@ public: return true; } }catch (...) { return false; } - return sinfgapp::Settings::get_value(key_,value); + return synfigapp::Settings::get_value(key_,value); } - virtual bool set_value(const sinfg::String& key_,const sinfg::String& value) + virtual bool set_value(const synfig::String& key_,const synfig::String& value) { int screen_w(Gdk::screen_width()); int screen_h(Gdk::screen_height()); if(key_.size()>6 && String(key_.begin(),key_.begin()+6)=="dialog") { - sinfg::String key(key_.begin()+7,key_.end()); - int separator=key.find_first_of('.'); - int id(atoi(sinfg::String(key.begin(),key.begin()+separator).c_str())); - key=sinfg::String(key.begin()+separator+1,key.end()); + synfig::String key(key_.begin()+7,key_.end()); + synfig::String::size_type separator=key.find_first_of('.'); + int id(atoi(synfig::String(key.begin(),key.begin()+separator).c_str())); + key=synfig::String(key.begin()+separator+1,key.end()); DockDialog& dock_dialog(dock_manager->find_dock_dialog(id)); @@ -133,7 +134,7 @@ public: try { vector data; - int n=0; + String::size_type n=0; String value_(value); while(value_.size() && (signed)value_.size()>n && n>=0){ value_=String(value_.begin()+n,value_.end()); @@ -144,7 +145,7 @@ public: data.push_back(size); n=value_.find(" "); - if((unsigned)n!=String::npos) + if(n!=String::npos) n++; } @@ -152,7 +153,7 @@ public: } catch(...) { - sinfg::error("Exception caught!!!"); + synfig::error("Exception caught!!!"); return false; } return true; @@ -192,12 +193,12 @@ public: return true; } } - return sinfgapp::Settings::set_value(key_,value); + return synfigapp::Settings::set_value(key_,value); } virtual KeyList get_key_list()const { - sinfgapp::Settings::KeyList ret(sinfgapp::Settings::get_key_list()); + synfigapp::Settings::KeyList ret(synfigapp::Settings::get_key_list()); std::list::const_iterator iter; for(iter=dock_manager->dock_dialog_list_.begin();iter!=dock_manager->dock_dialog_list_.end();++iter) @@ -228,7 +229,7 @@ DockManager::~DockManager() while(!dockable_list_.empty()) { Dockable* dockable(dockable_list_.back()); - sinfg::info("DockManager::~DockManager(): Deleting dockable \"%s\"",dockable->get_name().c_str()); + synfig::info("DockManager::~DockManager(): Deleting dockable \"%s\"",dockable->get_name().c_str()); dockable_list_.pop_back(); delete dockable; } @@ -238,7 +239,7 @@ void DockManager::register_dockable(Dockable& x) { dockable_list_.push_back(&x); - sinfg::info("DockManager::register_dockable(): Registered dockable \"%s\"",dockable_list_.back()->get_name().c_str()); + synfig::info("DockManager::register_dockable(): Registered dockable \"%s\"",dockable_list_.back()->get_name().c_str()); signal_dockable_registered()(&x); } @@ -252,7 +253,7 @@ DockManager::unregister_dockable(Dockable& x) { x.detach(); dockable_list_.erase(iter); - sinfg::info("DockManager::unregister_dockable(): \"%s\" has been Unregistered",x.get_name().c_str()); + synfig::info("DockManager::unregister_dockable(): \"%s\" has been Unregistered",x.get_name().c_str()); return true; } } @@ -260,7 +261,7 @@ DockManager::unregister_dockable(Dockable& x) } Dockable& -DockManager::find_dockable(const sinfg::String& x) +DockManager::find_dockable(const synfig::String& x) { std::list::iterator iter; for(iter=dockable_list_.begin();iter!=dockable_list_.end();++iter) @@ -271,7 +272,7 @@ DockManager::find_dockable(const sinfg::String& x) } void -DockManager::present(sinfg::String x) +DockManager::present(synfig::String x) { try {