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
/
synfigapp
/
uimanager.cpp
diff --git
a/synfig-studio/trunk/src/synfigapp/uimanager.cpp
b/synfig-studio/trunk/src/synfigapp/uimanager.cpp
index
cedb1d0
..
68a39a1
100644
(file)
--- a/
synfig-studio/trunk/src/synfigapp/uimanager.cpp
+++ b/
synfig-studio/trunk/src/synfigapp/uimanager.cpp
@@
-2,7
+2,7
@@
/*! \file uimanager.cpp
** \brief Template File
**
/*! \file uimanager.cpp
** \brief Template File
**
-** $Id
: uimanager.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-33,6
+33,8
@@
#include <iostream>
#include <string>
#include <iostream>
#include <string>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-74,7
+76,7
@@
ConsoleUIInterface::yes_no(const std::string &title, const std::string &message,
}
UIInterface::Response
}
UIInterface::Response
-ConsoleUIInterface::yes_no_cancel(const st
ring &title, const string &message,
Response dflt)
+ConsoleUIInterface::yes_no_cancel(const st
d::string &title, const std::string &message,
Response dflt)
{
cout<<title<<": "<<message<<' ';
if(dflt==RESPONSE_NO)
{
cout<<title<<": "<<message<<' ';
if(dflt==RESPONSE_NO)
@@
-126,7
+128,7
@@
ConsoleUIInterface::ok_cancel(const std::string &title, const std::string &messa
return RESPONSE_OK;
}
}
return RESPONSE_OK;
}
}
-
+
bool
ConsoleUIInterface::task(const std::string &task)
{
bool
ConsoleUIInterface::task(const std::string &task)
{
@@
-149,7
+151,7
@@
ConsoleUIInterface::warning(const std::string &task)
}
bool
}
bool
-ConsoleUIInterface::amount_complete(int
current, int total
)
+ConsoleUIInterface::amount_complete(int
/*current*/, int /*total*/
)
{
return true;
}
{
return true;
}