projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Color::is_straight(). Also, re-enable the optimization for straight blending...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
dialog_soundselect.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/dialog_soundselect.cpp
b/synfig-studio/trunk/src/gtkmm/dialog_soundselect.cpp
index
d26df58
..
264b027
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/dialog_soundselect.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/dialog_soundselect.cpp
@@
-1,20
+1,21
@@
/* === S Y N F I G ========================================================= */
/* === S Y N F I G ========================================================= */
-/*! \file
template
.cpp
+/*! \file
dialog_soundselect
.cpp
** \brief Template File
**
** \brief Template File
**
-** $Id
: dialog_soundselect.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp
$
+** $Id$
**
** \legal
**
** \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
*/
/* ========================================================================= */
** \endlegal
*/
/* ========================================================================= */
@@
-31,6
+32,8
@@
#include "dialog_soundselect.h"
#include <gtkmm/table.h>
#include "dialog_soundselect.h"
#include <gtkmm/table.h>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-49,7
+52,7
@@
using namespace synfig;
/* === E N T R Y P O I N T ================================================= */
/* === E N T R Y P O I N T ================================================= */
-studio::Dialog_SoundSelect::Dialog_SoundSelect(Gtk::Window &
parent
, etl::handle<synfigapp::CanvasInterface> ci)
+studio::Dialog_SoundSelect::Dialog_SoundSelect(Gtk::Window &
/*parent*/
, etl::handle<synfigapp::CanvasInterface> ci)
:Dialog(_("Sound Select")),
okbutton(_("Ok")),
canvas_interface(ci)
:Dialog(_("Sound Select")),
okbutton(_("Ok")),
canvas_interface(ci)
@@
-59,12
+62,12
@@
canvas_interface(ci)
table->attach(soundfile,0,1,0,1);
table->attach(offset,1,2,0,1);
table->attach(okbutton,0,2,1,2);
table->attach(soundfile,0,1,0,1);
table->attach(offset,1,2,0,1);
table->attach(okbutton,0,2,1,2);
-
+
table->show_all();
get_vbox()->pack_start(*table);
table->show_all();
get_vbox()->pack_start(*table);
-
+
offset.set_value(0);
offset.set_value(0);
-
+
okbutton.signal_clicked().connect(sigc::mem_fun(*this,&Dialog_SoundSelect::on_ok));
}
okbutton.signal_clicked().connect(sigc::mem_fun(*this,&Dialog_SoundSelect::on_ok));
}
@@
-85,7
+88,7
@@
void studio::Dialog_SoundSelect::on_offset()
void studio::Dialog_SoundSelect::on_ok()
{
hide();
void studio::Dialog_SoundSelect::on_ok()
{
hide();
-
+
//signal_finish_(a);
signal_file_changed_(soundfile.get_value());
signal_offset_changed_(offset.get_value());
//signal_finish_(a);
signal_file_changed_(soundfile.get_value());
signal_offset_changed_(offset.get_value());