Removed Windows-style line breaks (^M) from all .cc and .h source files.

This commit is contained in:
Wyatt Olson
2010-05-01 16:26:14 -06:00
parent e1a028e535
commit 1b563a4b82
284 changed files with 39262 additions and 39262 deletions

View File

@@ -1,21 +1,21 @@
/*
* This file is part of RawTherapee.
*
* Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
*
* RawTherapee 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 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
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* This file is part of RawTherapee.
*
* Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
*
* RawTherapee 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 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
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#include <saveformatpanel.h>
#include <multilangmgr.h>
#include <guiutils.h>
@@ -23,35 +23,35 @@
SaveFormatPanel::SaveFormatPanel () : listener (NULL) {
jpegqual = new Adjuster (M("SAVEDLG_JPEGQUAL"), 0, 100, 1, 100);
jpegqual->setAdjusterListener (this);
jpegqual->show ();
pngcompr = new Adjuster (M("SAVEDLG_PNGCOMPR"), 0, 6, 1, 6);
jpegqual->setAdjusterListener (this);
jpegqual->show ();
pngcompr = new Adjuster (M("SAVEDLG_PNGCOMPR"), 0, 6, 1, 6);
pngcompr->setAdjusterListener (this);
pngcompr->show ();
pngcompr->show ();
Gtk::HBox* hb1 = Gtk::manage (new Gtk::HBox ());
Gtk::Label* flab = Gtk::manage (new Gtk::Label (M("SAVEDLG_FILEFORMAT")+":"));
hb1->pack_start (*flab, Gtk::PACK_SHRINK,4);
format = Gtk::manage (new Gtk::ComboBoxText ());
format->append_text ("JPEG (8 bit)");
format->append_text ("TIFF (8 bit)");
format->append_text ("TIFF (16 bit)");
format->append_text ("PNG (8 bit)");
format->append_text ("PNG (16 bit)");
format->set_active (0);
oformat = 0;
format->signal_changed().connect( sigc::mem_fun(*this, &SaveFormatPanel::formatChanged) );
hb1->pack_start (*format);
pack_start (*hb1, Gtk::PACK_SHRINK, 4);
Gtk::HBox* hb1 = Gtk::manage (new Gtk::HBox ());
Gtk::Label* flab = Gtk::manage (new Gtk::Label (M("SAVEDLG_FILEFORMAT")+":"));
hb1->pack_start (*flab, Gtk::PACK_SHRINK,4);
format = Gtk::manage (new Gtk::ComboBoxText ());
format->append_text ("JPEG (8 bit)");
format->append_text ("TIFF (8 bit)");
format->append_text ("TIFF (16 bit)");
format->append_text ("PNG (8 bit)");
format->append_text ("PNG (16 bit)");
format->set_active (0);
oformat = 0;
format->signal_changed().connect( sigc::mem_fun(*this, &SaveFormatPanel::formatChanged) );
hb1->pack_start (*format);
pack_start (*hb1, Gtk::PACK_SHRINK, 4);
formatopts = Gtk::manage (new Gtk::VBox ());
formatopts->pack_start (*jpegqual, Gtk::PACK_SHRINK, 4);
pack_start (*formatopts, Gtk::PACK_SHRINK, 4);
savespp = Gtk::manage (new Gtk::CheckButton (M("SAVEDLG_SAVESPP")));
pack_start (*savespp, Gtk::PACK_SHRINK, 4);
savespp = Gtk::manage (new Gtk::CheckButton (M("SAVEDLG_SAVESPP")));
pack_start (*savespp, Gtk::PACK_SHRINK, 4);
show_all ();
show_all ();
set_border_width (4);
fstr[0] = "jpg";
@@ -60,7 +60,7 @@ SaveFormatPanel::SaveFormatPanel () : listener (NULL) {
fstr[3] = "png";
fstr[4] = "png";
}
void SaveFormatPanel::init (SaveFormat &sf) {
FormatChangeListener* tmp = listener;
@@ -105,9 +105,9 @@ SaveFormat SaveFormatPanel::getFormat () {
void SaveFormatPanel::formatChanged () {
if (oformat==0)
removeIfThere (formatopts, jpegqual);
else if (oformat==3 || oformat==4)
if (oformat==0)
removeIfThere (formatopts, jpegqual);
else if (oformat==3 || oformat==4)
removeIfThere (formatopts, pngcompr);
int act = format->get_active_row_number();
@@ -115,17 +115,17 @@ void SaveFormatPanel::formatChanged () {
return;
Glib::ustring fr = fstr[act];
if (fr=="jpg")
formatopts->pack_start (*jpegqual, Gtk::PACK_SHRINK,4);
else if (fr=="png")
formatopts->pack_start (*pngcompr, Gtk::PACK_SHRINK,4);
if (fr=="jpg")
formatopts->pack_start (*jpegqual, Gtk::PACK_SHRINK,4);
else if (fr=="png")
formatopts->pack_start (*pngcompr, Gtk::PACK_SHRINK,4);
oformat = act;
if (listener)
listener->formatChanged (fr);
listener->formatChanged (fr);
}
void SaveFormatPanel::adjusterChanged (Adjuster* a, double newval) {
formatChanged ();