-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
/*! \file dockdialog.cpp
** \brief Template File
**
** $Id: dockdialog.cpp,v 1.1.1.1 2005/01/07 03:34:36 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
*/
/* ========================================================================= */
#include "dockbook.h"
#include "dockmanager.h"
#include "widget_compselect.h"
-#include <sinfg/general.h>
-#include <sinfg/uniqueid.h>
+#include <synfig/general.h>
+#include <synfig/uniqueid.h>
#include <gtkmm/table.h>
#include <sigc++/hide.h>
#include <sigc++/slot.h>
#include "canvasview.h"
#include <gtkmm/paned.h>
#include <gtkmm/box.h>
-#include <sinfgapp/main.h>
+#include <synfigapp/main.h>
#endif
using namespace std;
using namespace etl;
-using namespace sinfg;
+using namespace synfig;
using namespace studio;
/* === M A C R O S ========================================================= */
-#define GRAB_HINT_DATA(y) { \
+#define GRAB_HINT_DATA(y,default) { \
String x; \
- if(sinfgapp::Main::settings().get_value(String("pref.")+y+"_hints",x)) \
+ if(synfigapp::Main::settings().get_value(String("pref.")+y+"_hints",x)) \
{ \
set_type_hint((Gdk::WindowTypeHint)atoi(x.c_str())); \
+ } else {\
+ set_type_hint(default); \
} \
}
widget_comp_select=new Widget_CompSelect();
// Give ourselves an ID that is most likely unique
- set_id(sinfg::UniqueID().get_uid()^reinterpret_cast<int>(this));
+ set_id(synfig::UniqueID().get_uid()^reinterpret_cast<int>(this));
+
+ set_role(strprintf("dock_dialog_%d",get_id()));
+ GRAB_HINT_DATA(
+ "dock_dialog",
+#ifdef __APPLE__
+ Gdk::WINDOW_TYPE_HINT_NORMAL
+#else
+ Gdk::WINDOW_TYPE_HINT_UTILITY
+#endif
+ );
+ set_keep_below(true);
+ set_keep_above(false);
// Set up the window
//set_type_hint(Gdk::WINDOW_TYPE_HINT_UTILITY);
set_title("Dock Dialog");
- GRAB_HINT_DATA("dock_dialog");
// Register with the dock manager
App::dock_manager->dock_dialog_list_.push_back(this);
*/
add_accel_group(App::ui_manager()->get_accel_group());
- App::signal_present_all().connect(sigc::mem_fun(*this,&DockDialog::present));
+ App::signal_present_all().connect(sigc::mem_fun0(*this,&DockDialog::present));
+
}
DockDialog::~DockDialog()
}
catch(...)
{
- sinfg::warning("DockDialog::~DockDialog(): Exception thrown when trying to remove from dock manager...?");
+ synfig::warning("DockDialog::~DockDialog(): Exception thrown when trying to remove from dock manager...?");
}
delete widget_comp_select;
void
DockDialog::refresh()
{
- sinfg::info("dock_book_list.size()=%d",dock_book_list.size());
+ synfig::info("dock_book_list.size()=%d",dock_book_list.size());
//remove();
if(dock_book_list.empty())
bool
DockDialog::close()
{
- sinfg::info("DockDialog::close(): DELETED!");
+ synfig::info("DockDialog::close(): DELETED!");
empty_sig.disconnect();
//get_dock_book().clear();
delete this;
}
-sinfg::String
+synfig::String
DockDialog::get_contents()const
{
- sinfg::String ret;
+ synfig::String ret;
std::list<DockBook*>::const_iterator iter;
for(iter=dock_book_list.begin();iter!=dock_book_list.end();++iter)
}
void
-DockDialog::set_contents(const sinfg::String& z)
+DockDialog::set_contents(const synfig::String& z)
{
int x,y;
get_size(x,y);
- sinfg::String str(z);
+ synfig::String str(z);
while(!str.empty())
{
unsigned int separator=str.find_first_of('-');
{
unsigned int sep2=str.find_first_of('|');
- if(separator!=sinfg::String::npos || sep2!=sinfg::String::npos)
+ if(separator!=synfig::String::npos || sep2!=synfig::String::npos)
{
- if((separator==sinfg::String::npos || sep2<separator) && sep2!=sinfg::String::npos)
+ if((separator==synfig::String::npos || sep2<separator) && sep2!=synfig::String::npos)
{
separator=sep2;
is_horizontal=true;
}
}
- sinfg::String book_contents;
- if(separator==sinfg::String::npos)
+ synfig::String book_contents;
+ if(separator==synfig::String::npos)
{
book_contents=str;
str.clear();
if(is_deleting)return;
if(dock_book_list.size())
{
- sinfg::String title;
+ synfig::String title;
std::list<DockBook*>::const_iterator iter;
for(iter=dock_book_list.begin();iter!=dock_book_list.end();++iter)