Formatted all .cc and .h code in rtengine, rtexif and rtgui using astyle

This commit is contained in:
DrSlony
2015-08-11 11:55:03 +02:00
parent effb46c3e1
commit 0e0cfb9b25
452 changed files with 133354 additions and 99460 deletions

View File

@@ -7,7 +7,7 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
*
* RawTherapee 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
@@ -27,13 +27,15 @@ extern Glib::ustring licensePath;
extern Glib::ustring versionString;
extern Glib::ustring versionSuffixString;
SplashImage::SplashImage () {
SplashImage::SplashImage ()
{
pixbuf = safe_create_from_file ("splash.png");
set_size_request (pixbuf->get_width(), pixbuf->get_height());
}
void SplashImage::on_realize () {
void SplashImage::on_realize ()
{
Gtk::DrawingArea::on_realize();
add_events(Gdk::EXPOSURE_MASK);
@@ -43,12 +45,13 @@ void SplashImage::on_realize () {
Gdk::Color fontc = Gdk::Color ("white");
colormap->alloc_color (fontc);
gc_->set_foreground (fontc);
}
bool SplashImage::on_expose_event (GdkEventExpose* event) {
bool SplashImage::on_expose_event (GdkEventExpose* event)
{
Glib::RefPtr<Gdk::Window> window = get_window();
Glib::RefPtr<Gdk::Window> window = get_window();
pixbuf->render_to_drawable (window, gc_, 0, 0, 0, 0, pixbuf->get_width(), pixbuf->get_height(), Gdk::RGB_DITHER_NONE, 0, 0);
Cairo::FontOptions cfo;
@@ -57,7 +60,7 @@ bool SplashImage::on_expose_event (GdkEventExpose* event) {
context->set_cairo_font_options (cfo);
Pango::FontDescription fontd = context->get_font_description ();
fontd.set_weight (Pango::WEIGHT_LIGHT);
fontd.set_absolute_size (12*Pango::SCALE);
fontd.set_absolute_size (12 * Pango::SCALE);
context->set_font_description (fontd);
Gdk::Color *textColor = new Gdk::Color();
textColor->set_rgb(0, 0, 0);
@@ -65,8 +68,11 @@ bool SplashImage::on_expose_event (GdkEventExpose* event) {
int w, h;
Glib::ustring versionStr(versionString);
if (!versionSuffixString.empty())
versionStr += " "+versionSuffixString;
if (!versionSuffixString.empty()) {
versionStr += " " + versionSuffixString;
}
version = create_pango_layout (versionStr);
version->set_markup("<span foreground=\"white\">" + versionStr + "</span>");
version->get_pixel_size (w, h);
@@ -75,7 +81,8 @@ bool SplashImage::on_expose_event (GdkEventExpose* event) {
return true;
}
Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, true) {
Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, true)
{
set_border_width (4);
@@ -97,121 +104,141 @@ Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, t
splashImage->show ();
// Tab 2: the informations about the current version
std::string buildFileName = Glib::build_filename (creditsPath, "AboutThisBuild.txt");
if ( safe_file_test(buildFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = safe_g_fopen (buildFileName, "rt");
if (f != NULL) {
char* buffer = new char[1024];
std::ostringstream ostr;
while (fgets (buffer, 1024, f))
ostr << buffer;
delete [] buffer;
fclose (f);
std::string buildFileName = Glib::build_filename (creditsPath, "AboutThisBuild.txt");
Glib::RefPtr<Gtk::TextBuffer> textBuffer = Gtk::TextBuffer::create();
textBuffer->set_text((Glib::ustring)(ostr.str()));
if ( safe_file_test(buildFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = safe_g_fopen (buildFileName, "rt");
Gtk::ScrolledWindow *buildSW = Gtk::manage (new Gtk::ScrolledWindow());
Gtk::TextView *buildTV = Gtk::manage (new Gtk::TextView (textBuffer));
buildTV->set_editable(false);
buildTV->set_left_margin (10);
buildTV->set_right_margin (5);
buildSW->add(*buildTV);
nb->append_page (*buildSW, M("ABOUT_TAB_BUILD"));
}
}
if (f != NULL) {
char* buffer = new char[1024];
std::ostringstream ostr;
while (fgets (buffer, 1024, f)) {
ostr << buffer;
}
delete [] buffer;
fclose (f);
Glib::RefPtr<Gtk::TextBuffer> textBuffer = Gtk::TextBuffer::create();
textBuffer->set_text((Glib::ustring)(ostr.str()));
Gtk::ScrolledWindow *buildSW = Gtk::manage (new Gtk::ScrolledWindow());
Gtk::TextView *buildTV = Gtk::manage (new Gtk::TextView (textBuffer));
buildTV->set_editable(false);
buildTV->set_left_margin (10);
buildTV->set_right_margin (5);
buildSW->add(*buildTV);
nb->append_page (*buildSW, M("ABOUT_TAB_BUILD"));
}
}
// Tab 3: the credits
std::string creditsFileName = Glib::build_filename (creditsPath, "AUTHORS.txt");
if ( safe_file_test(creditsFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = safe_g_fopen (creditsFileName, "rt");
if (f != NULL) {
char* buffer = new char[1024];
std::ostringstream ostr;
while (fgets (buffer, 1024, f))
ostr << buffer;
delete [] buffer;
fclose (f);
std::string creditsFileName = Glib::build_filename (creditsPath, "AUTHORS.txt");
Glib::RefPtr<Gtk::TextBuffer> textBuffer = Gtk::TextBuffer::create();
textBuffer->set_text((Glib::ustring)(ostr.str()));
if ( safe_file_test(creditsFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = safe_g_fopen (creditsFileName, "rt");
Gtk::ScrolledWindow *creditsSW = Gtk::manage (new Gtk::ScrolledWindow());
Gtk::TextView *creditsTV = Gtk::manage (new Gtk::TextView (textBuffer));
creditsTV->set_left_margin (10);
creditsTV->set_right_margin (5);
creditsTV->set_wrap_mode(Gtk::WRAP_WORD);
creditsTV->set_editable(false);
creditsSW->add(*creditsTV);
nb->append_page (*creditsSW, M("ABOUT_TAB_CREDITS"));
}
}
if (f != NULL) {
char* buffer = new char[1024];
std::ostringstream ostr;
while (fgets (buffer, 1024, f)) {
ostr << buffer;
}
delete [] buffer;
fclose (f);
Glib::RefPtr<Gtk::TextBuffer> textBuffer = Gtk::TextBuffer::create();
textBuffer->set_text((Glib::ustring)(ostr.str()));
Gtk::ScrolledWindow *creditsSW = Gtk::manage (new Gtk::ScrolledWindow());
Gtk::TextView *creditsTV = Gtk::manage (new Gtk::TextView (textBuffer));
creditsTV->set_left_margin (10);
creditsTV->set_right_margin (5);
creditsTV->set_wrap_mode(Gtk::WRAP_WORD);
creditsTV->set_editable(false);
creditsSW->add(*creditsTV);
nb->append_page (*creditsSW, M("ABOUT_TAB_CREDITS"));
}
}
// Tab 4: the license
std::string licenseFileName = Glib::build_filename (licensePath, "LICENSE.txt");
if ( safe_file_test(licenseFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = safe_g_fopen (licenseFileName, "rt");
if (f != NULL) {
char* buffer = new char[1024];
std::ostringstream ostr;
while (fgets (buffer, 1024, f))
ostr << buffer;
delete [] buffer;
fclose (f);
std::string licenseFileName = Glib::build_filename (licensePath, "LICENSE.txt");
Glib::RefPtr<Gtk::TextBuffer> textBuffer = Gtk::TextBuffer::create();
textBuffer->set_text((Glib::ustring)(ostr.str()));
if ( safe_file_test(licenseFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = safe_g_fopen (licenseFileName, "rt");
Gtk::ScrolledWindow *licenseSW = Gtk::manage (new Gtk::ScrolledWindow());
Gtk::TextView *licenseTV = Gtk::manage (new Gtk::TextView (textBuffer));
if (f != NULL) {
char* buffer = new char[1024];
std::ostringstream ostr;
// set monospace font to enhance readability of formatted text
Pango::FontDescription fdescLicense;
fdescLicense.set_family("monospace");
fdescLicense.set_absolute_size (11*Pango::SCALE);
licenseTV->modify_font(fdescLicense);
while (fgets (buffer, 1024, f)) {
ostr << buffer;
}
licenseTV->set_left_margin (10);
licenseTV->set_right_margin (5);
licenseTV->set_editable(false);
licenseSW->add(*licenseTV);
nb->append_page (*licenseSW, M("ABOUT_TAB_LICENSE"));
}
}
delete [] buffer;
fclose (f);
Glib::RefPtr<Gtk::TextBuffer> textBuffer = Gtk::TextBuffer::create();
textBuffer->set_text((Glib::ustring)(ostr.str()));
Gtk::ScrolledWindow *licenseSW = Gtk::manage (new Gtk::ScrolledWindow());
Gtk::TextView *licenseTV = Gtk::manage (new Gtk::TextView (textBuffer));
// set monospace font to enhance readability of formatted text
Pango::FontDescription fdescLicense;
fdescLicense.set_family("monospace");
fdescLicense.set_absolute_size (11 * Pango::SCALE);
licenseTV->modify_font(fdescLicense);
licenseTV->set_left_margin (10);
licenseTV->set_right_margin (5);
licenseTV->set_editable(false);
licenseSW->add(*licenseTV);
nb->append_page (*licenseSW, M("ABOUT_TAB_LICENSE"));
}
}
// Tab 5: the Release Notes
std::string releaseNotesFileName = Glib::build_filename (creditsPath, "RELEASE_NOTES.txt");
if ( safe_file_test(releaseNotesFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = safe_g_fopen (releaseNotesFileName, "rt");
if (f != NULL) {
char* buffer = new char[1024];
std::ostringstream ostr;
while (fgets (buffer, 1024, f))
ostr << buffer;
delete [] buffer;
fclose (f);
std::string releaseNotesFileName = Glib::build_filename (creditsPath, "RELEASE_NOTES.txt");
Glib::RefPtr<Gtk::TextBuffer> textBuffer = Gtk::TextBuffer::create();
textBuffer->set_text((Glib::ustring)(ostr.str()));
if ( safe_file_test(releaseNotesFileName, (Glib::FILE_TEST_EXISTS)) ) {
FILE *f = safe_g_fopen (releaseNotesFileName, "rt");
releaseNotesSW = Gtk::manage (new Gtk::ScrolledWindow());
Gtk::TextView *releaseNotesTV = Gtk::manage (new Gtk::TextView (textBuffer));
if (f != NULL) {
char* buffer = new char[1024];
std::ostringstream ostr;
// set monospace font to enhance readability of formatted text
Pango::FontDescription fdescReleaseNotes;
fdescReleaseNotes.set_family("monospace");
fdescReleaseNotes.set_absolute_size (11*Pango::SCALE);
releaseNotesTV->modify_font(fdescReleaseNotes);
while (fgets (buffer, 1024, f)) {
ostr << buffer;
}
delete [] buffer;
fclose (f);
Glib::RefPtr<Gtk::TextBuffer> textBuffer = Gtk::TextBuffer::create();
textBuffer->set_text((Glib::ustring)(ostr.str()));
releaseNotesSW = Gtk::manage (new Gtk::ScrolledWindow());
Gtk::TextView *releaseNotesTV = Gtk::manage (new Gtk::TextView (textBuffer));
// set monospace font to enhance readability of formatted text
Pango::FontDescription fdescReleaseNotes;
fdescReleaseNotes.set_family("monospace");
fdescReleaseNotes.set_absolute_size (11 * Pango::SCALE);
releaseNotesTV->modify_font(fdescReleaseNotes);
releaseNotesTV->set_left_margin (10);
releaseNotesTV->set_right_margin (3);
releaseNotesTV->set_editable(false);
releaseNotesTV->set_wrap_mode(Gtk::WRAP_WORD);
releaseNotesSW->add(*releaseNotesTV);
nb->append_page (*releaseNotesSW, M("ABOUT_TAB_RELEASENOTES"));
}
}
releaseNotesTV->set_left_margin (10);
releaseNotesTV->set_right_margin (3);
releaseNotesTV->set_editable(false);
releaseNotesTV->set_wrap_mode(Gtk::WRAP_WORD);
releaseNotesSW->add(*releaseNotesTV);
nb->append_page (*releaseNotesSW, M("ABOUT_TAB_RELEASENOTES"));
}
}
set_position (Gtk::WIN_POS_CENTER);
@@ -224,25 +251,32 @@ Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, t
set_keep_above (true);
}
Splash::Splash (Gtk::Window& parent, int maxtime) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, true) {
Splash::Splash (Gtk::Window& parent, int maxtime) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, true)
{
splashImage = Gtk::manage(new SplashImage ());
// add (*splashImage);
get_vbox()->pack_start (*splashImage);
splashImage->show ();
if (maxtime>0)
if (maxtime > 0) {
Glib::signal_timeout().connect (sigc::mem_fun(*this, &Splash::on_timer), maxtime);
}
set_position (Gtk::WIN_POS_CENTER);
if (maxtime>0)
if (maxtime > 0) {
set_decorated (false);
}
add_events(Gdk::BUTTON_RELEASE_MASK);
set_resizable (false);
set_keep_above (true);
}
bool Splash::on_timer () {
bool Splash::on_timer ()
{
hide ();
return false;
@@ -257,11 +291,14 @@ bool Splash::on_button_release_event (GdkEventButton* event) {
}
*/
void Splash::showReleaseNotes() {
if (releaseNotesSW)
nb->set_current_page(nb->page_num(*releaseNotesSW));
void Splash::showReleaseNotes()
{
if (releaseNotesSW) {
nb->set_current_page(nb->page_num(*releaseNotesSW));
}
}
void Splash::closePressed() {
void Splash::closePressed()
{
hide();
}