X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Frenddesc.h;h=a6c688d2ad0f7bfa151a60ffe4a25c5cc99693fd;hb=e7e1794959f6b4af0d60d69b5501adcd305f2207;hp=5c0a4bdd86dcb961f024c207b2990792511b5ff2;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/renddesc.h b/synfig-studio/trunk/src/gtkmm/renddesc.h
index 5c0a4bd..a6c688d 100644
--- a/synfig-studio/trunk/src/gtkmm/renddesc.h
+++ b/synfig-studio/trunk/src/gtkmm/renddesc.h
@@ -1,18 +1,19 @@
 /*! ========================================================================
-** Sinfg
+** Synfig
 ** Template Header File
 ** $Id: renddesc.h,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
 **
-** 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.
 **
 ** === N O T E S ===========================================================
 **
@@ -20,17 +21,18 @@
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_GTKMM_RENDDESC_H
-#define __SINFG_GTKMM_RENDDESC_H
+#ifndef __SYNFIG_GTKMM_RENDDESC_H
+#define __SYNFIG_GTKMM_RENDDESC_H
 
 /* === H E A D E R S ======================================================= */
 
 #include <gtkmm/table.h>
 #include <gtkmm/frame.h>
-#include <sinfg/renddesc.h>
+#include <synfig/renddesc.h>
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/adjustment.h>
 #include <gtkmm/checkbutton.h>
+#include <gtkmm/notebook.h>
 #include "widget_vector.h"
 #include "widget_time.h"
 
@@ -42,9 +44,9 @@
 
 namespace studio {
 
-class Widget_RendDesc : public Gtk::Table
+class Widget_RendDesc : public Gtk::Notebook
 {
-	sinfg::RendDesc rend_desc_;
+	synfig::RendDesc rend_desc_;
 	sigc::signal<void> signal_changed_;
 
 	Gtk::Adjustment adjustment_width;
@@ -82,7 +84,7 @@ class Widget_RendDesc : public Gtk::Table
 	Gtk::CheckButton *toggle_im_height;
 	Gtk::CheckButton *toggle_im_span;
 
-	Gtk::Table *time_table;
+	/* Gtk::Table *time_table; */
 	Gtk::Frame *time_frame;
 
 	Widget_Vector *entry_tl;
@@ -110,13 +112,13 @@ public:
 	~Widget_RendDesc();
 	
 	//! Sets the RendDesc
-	void set_rend_desc(const sinfg::RendDesc &rend_desc);
+	void set_rend_desc(const synfig::RendDesc &rend_desc);
 
 	//! Applies the given RendDesc to the current RendDesc
-	void apply_rend_desc(const sinfg::RendDesc &rend_desc);
+	void apply_rend_desc(const synfig::RendDesc &rend_desc);
 
 	//! Retrieves the current RendDesc
-	const sinfg::RendDesc &get_rend_desc();
+	const synfig::RendDesc &get_rend_desc();
 
 	void disable_time_section();
 	
@@ -141,6 +143,12 @@ private:
 	void on_lock_changed();
 	void on_focus_changed();
 	void on_span_changed();
+
+	void create_widgets();
+	void connect_signals();
+	Gtk::Widget *create_image_tab();
+	Gtk::Widget *create_time_tab();
+	Gtk::Widget *create_other_tab();
 };
 	
 }; // END of namespace studio