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
/
about.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/about.cpp
b/synfig-studio/trunk/src/gtkmm/about.cpp
index
73091f0
..
e978dc1
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/about.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/about.cpp
@@
-6,6
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-47,6
+48,8
@@
#include "about.h"
#include "app.h"
#include "about.h"
#include "app.h"
+#include "general.h"
+
#endif
using namespace std;
#endif
using namespace std;
@@
-158,25
+161,25
@@
public:
/* === M E T H O D S ======================================================= */
About::About():
/* === M E T H O D S ======================================================= */
About::About():
- Gtk::Window(Gtk::WINDOW_POPUP),
+ Gtk::Window(
getenv("SYNFIG_DISABLE_POPUP_WINDOWS") ? Gtk::WINDOW_TOPLEVEL :
Gtk::WINDOW_POPUP),
can_self_destruct(true)
{
int image_w=300,image_h=350;
std::string imagepath;
#ifdef WIN32
can_self_destruct(true)
{
int image_w=300,image_h=350;
std::string imagepath;
#ifdef WIN32
- imagepath=App::get_base_path()+ETL_DIRECTORY_SEP
E
RATOR+IMAGE_DIR;
+ imagepath=App::get_base_path()+ETL_DIRECTORY_SEP
A
RATOR+IMAGE_DIR;
#else
imagepath=IMAGE_DIR;
#endif
char* synfig_root=getenv("SYNFIG_ROOT");
if(synfig_root) {
imagepath=synfig_root;
#else
imagepath=IMAGE_DIR;
#endif
char* synfig_root=getenv("SYNFIG_ROOT");
if(synfig_root) {
imagepath=synfig_root;
- imagepath+=ETL_DIRECTORY_SEP
E
RATOR;
+ imagepath+=ETL_DIRECTORY_SEP
A
RATOR;
imagepath+="share/pixmaps";
}
imagepath+="share/pixmaps";
}
- imagepath+=ETL_DIRECTORY_SEP
E
RATOR;
+ imagepath+=ETL_DIRECTORY_SEP
A
RATOR;
// Create the Logo
// Create the Logo
@@
-215,7
+218,7
@@
About::About():
CopyrightLabel->modify_font(fd);
// Create the Version information label
CopyrightLabel->modify_font(fd);
// Create the Version information label
- Gtk::Label *VersionLabel = manage(new class Gtk::Label(
"Version"
));
+ Gtk::Label *VersionLabel = manage(new class Gtk::Label(
_("Version")
));
VersionLabel->set_size_request(image_w,80);
VersionLabel->set_flags(Gtk::CAN_FOCUS);
VersionLabel->set_alignment(0.5,0.5);
VersionLabel->set_size_request(image_w,80);
VersionLabel->set_flags(Gtk::CAN_FOCUS);
VersionLabel->set_alignment(0.5,0.5);
@@
-268,7
+271,7
@@
About::About():
CloseButton = manage(new class Gtk::Button());
CloseButton->set_size_request(24,24);
CloseButton->set_flags(Gtk::CAN_FOCUS);
CloseButton = manage(new class Gtk::Button());
CloseButton->set_size_request(24,24);
CloseButton->set_flags(Gtk::CAN_FOCUS);
- _tooltips.set_tip(*CloseButton,
"Close"
, "");
+ _tooltips.set_tip(*CloseButton,
_("Close")
, "");
CloseButton->set_relief(Gtk::RELIEF_NONE);
CloseButton->add(*image2);
CloseButton->set_relief(Gtk::RELIEF_NONE);
CloseButton->add(*image2);