liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backed out changeset: 159f9e7014f8

Browse Source
This commit is contained in:
Oliver Duis
2012-05-06 23:04:47 +02:00
parent 1483ecb47c
commit 05226a2875
125 changed files with 747 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/rtimage.cc
View File

@@ -33,7 +33,7 @@ std::vector<RTImage*> imagesList; // List of images in order to live upd
*/
RTImage::RTImage(Glib::ustring fileName, Glib::ustring rtlFileName) : Gtk::Image() {
Glib::ustring path;
if (!rtlFileName.empty()) {
if (rtlFileName.length()) {
const Gtk::TextDirection dir = get_direction();
if (dir == Gtk::TEXT_DIR_RTL)
path = findIconAbsolutePath(rtlFileName);
@@ -55,7 +55,7 @@ RTImage::~RTImage() {
}
void RTImage::updateImages() {
for (size_t i=0; i<imagesList.size(); i++) {
for (unsigned int i=0; i<imagesList.size(); i++) {
Glib::ustring oldPath = imagesList[i]->property_file();
Glib::ustring fileName = Glib::path_get_basename(oldPath);
imagesList[i]->clear();
@@ -73,7 +73,7 @@ void RTImage::changeImage(Glib::ustring &newImage) {
Glib::ustring RTImage::findIconAbsolutePath(const Glib::ustring &iconFName) {
Glib::ustring path;
for (size_t i=0; i<imagesPaths.size(); i++) {
for (unsigned int i=0; i<imagesPaths.size(); i++) {
path = Glib::build_filename(imagesPaths[i], iconFName);
//printf("\"%s\" \n", path.c_str());
if (safe_file_test(path, Glib::FILE_TEST_EXISTS)) {
@@ -113,7 +113,7 @@ void RTImage::setPaths(Options &opt) {
if (keyFile.has_key ("General", "Iconset"))
iSet = keyFile.get_string ("General", "Iconset");
if (!iSet.empty()) {
if (iSet.length()) {
imagesPaths.push_back (Glib::build_filename(argv0, Glib::build_filename("images", Glib::build_filename(iSet, "actions"))));
imagesPaths.push_back (Glib::build_filename(argv0, Glib::build_filename("images", iSet)));
imagesPaths.push_back (Glib::build_filename(argv0, Glib::build_filename("images", Glib::build_filename(iSet, "devices"))));
@@ -123,7 +123,7 @@ void RTImage::setPaths(Options &opt) {
iSet.clear();
if (keyFile.has_key ("General", "FallbackIconset"))
iSet = keyFile.get_string ("General", "FallbackIconset");
if (!iSet.empty()) {
if (iSet.length()) {
imagesPaths.push_back (Glib::build_filename(argv0, Glib::build_filename("images", Glib::build_filename(iSet, "actions"))));
imagesPaths.push_back (Glib::build_filename(argv0, Glib::build_filename("images", iSet)));
imagesPaths.push_back (Glib::build_filename(argv0, Glib::build_filename("images", Glib::build_filename(iSet, "devices"))));