From f20c2a5836a47d7b6fb23d2eacd64b9c354ab7cc Mon Sep 17 00:00:00 2001 From: DrSlony Date: Fri, 16 Sep 2011 01:56:16 +0100 Subject: [PATCH] Cleaned up capitalization of 'fullscreen', issue 1002 --- .../{FullScreen_exit.png => fullscreen_exit.png} | Bin rtgui/rtwindow.cc | 10 +++++----- rtgui/rtwindow.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename rtdata/images/{FullScreen_exit.png => fullscreen_exit.png} (100%) diff --git a/rtdata/images/FullScreen_exit.png b/rtdata/images/fullscreen_exit.png similarity index 100% rename from rtdata/images/FullScreen_exit.png rename to rtdata/images/fullscreen_exit.png diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc index 6a5452984..0e3d8f46d 100644 --- a/rtgui/rtwindow.cc +++ b/rtgui/rtwindow.cc @@ -143,8 +143,8 @@ RTWindow::RTWindow () mainBox->pack_start (*mainNB); // filling bottom box - iFullScreen = new Gtk::Image(argv0+"/images/fullscreen.png"); - iFullScreen_exit = new Gtk::Image(argv0+"/images/fullscreen_exit.png"); + iFullscreen = new Gtk::Image(argv0+"/images/fullscreen.png"); + iFullscreen_exit = new Gtk::Image(argv0+"/images/fullscreen_exit.png"); Gtk::LinkButton* rtWeb = Gtk::manage (new Gtk::LinkButton ("http://rawtherapee.com")); //Gtk::Button* preferences = Gtk::manage (new Gtk::Button (M("MAIN_BUTTON_PREFERENCES")+"...")); @@ -156,7 +156,7 @@ RTWindow::RTWindow () //btn_fullscreen = Gtk::manage( new Gtk::Button(M("MAIN_BUTTON_FULLSCREEN"))); btn_fullscreen = Gtk::manage( new Gtk::Button()); btn_fullscreen->set_tooltip_markup (M("MAIN_BUTTON_FULLSCREEN")); - btn_fullscreen->set_image (*iFullScreen); + btn_fullscreen->set_image (*iFullscreen); btn_fullscreen->signal_clicked().connect( sigc::mem_fun(*this, &RTWindow::toggle_fullscreen) ); #if GTKMM_MINOR_VERSION >= 20 if (options.mainNBVertical) { @@ -415,13 +415,13 @@ void RTWindow::toggle_fullscreen () { is_fullscreen = false; //btn_fullscreen->set_label(M("MAIN_BUTTON_FULLSCREEN")); btn_fullscreen->set_tooltip_markup(M("MAIN_BUTTON_FULLSCREEN")); - btn_fullscreen->set_image (*iFullScreen); + btn_fullscreen->set_image (*iFullscreen); } else { fullscreen(); is_fullscreen = true; //btn_fullscreen->set_label(M("MAIN_BUTTON_UNFULLSCREEN")); btn_fullscreen->set_tooltip_markup(M("MAIN_BUTTON_UNFULLSCREEN")); - btn_fullscreen->set_image (*iFullScreen_exit); + btn_fullscreen->set_image (*iFullscreen_exit); } } diff --git a/rtgui/rtwindow.h b/rtgui/rtwindow.h index 53939b435..3fad8ee0f 100644 --- a/rtgui/rtwindow.h +++ b/rtgui/rtwindow.h @@ -39,7 +39,7 @@ class RTWindow : public Gtk::Window, public rtengine::ProgressListener{ bool is_fullscreen; Gtk::Button * btn_fullscreen; - Gtk::Image *iFullScreen, *iFullScreen_exit; + Gtk::Image *iFullscreen, *iFullscreen_exit; bool isSingleTabMode() { return !options.tabbedUI && !EditWindow::isMultiDisplayEnabled(); };