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

Cleaned up capitalization of 'fullscreen', issue 1002

Browse Source
This commit is contained in:
DrSlony 2011-09-16 01:56:16 +01:00
parent b9fb664670
commit f20c2a5836
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
rtdata/images/FullScreen_exit.png → rtdata/images/fullscreen_exit.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 694 B

After

Width:  |  Height:  |  Size: 694 B

10
rtgui/rtwindow.cc
View File

@ -143,8 +143,8 @@ RTWindow::RTWindow ()
mainBox->pack_start (*mainNB); mainBox->pack_start (*mainNB);
// filling bottom box // filling bottom box
iFullScreen = new Gtk::Image(argv0+"/images/fullscreen.png"); iFullscreen = new Gtk::Image(argv0+"/images/fullscreen.png");
iFullScreen_exit = new Gtk::Image(argv0+"/images/fullscreen_exit.png"); iFullscreen_exit = new Gtk::Image(argv0+"/images/fullscreen_exit.png");
Gtk::LinkButton* rtWeb = Gtk::manage (new Gtk::LinkButton ("http://rawtherapee.com")); Gtk::LinkButton* rtWeb = Gtk::manage (new Gtk::LinkButton ("http://rawtherapee.com"));
//Gtk::Button* preferences = Gtk::manage (new Gtk::Button (M("MAIN_BUTTON_PREFERENCES")+"...")); //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(M("MAIN_BUTTON_FULLSCREEN")));
btn_fullscreen = Gtk::manage( new Gtk::Button()); btn_fullscreen = Gtk::manage( new Gtk::Button());
btn_fullscreen->set_tooltip_markup (M("MAIN_BUTTON_FULLSCREEN")); 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) ); btn_fullscreen->signal_clicked().connect( sigc::mem_fun(*this, &RTWindow::toggle_fullscreen) );
#if GTKMM_MINOR_VERSION >= 20 #if GTKMM_MINOR_VERSION >= 20
if (options.mainNBVertical) { if (options.mainNBVertical) {
@ -415,13 +415,13 @@ void RTWindow::toggle_fullscreen () {
is_fullscreen = false; is_fullscreen = false;
//btn_fullscreen->set_label(M("MAIN_BUTTON_FULLSCREEN")); //btn_fullscreen->set_label(M("MAIN_BUTTON_FULLSCREEN"));
btn_fullscreen->set_tooltip_markup(M("MAIN_BUTTON_FULLSCREEN")); btn_fullscreen->set_tooltip_markup(M("MAIN_BUTTON_FULLSCREEN"));
btn_fullscreen->set_image (*iFullScreen); btn_fullscreen->set_image (*iFullscreen);
} else { } else {
fullscreen(); fullscreen();
is_fullscreen = true; is_fullscreen = true;
//btn_fullscreen->set_label(M("MAIN_BUTTON_UNFULLSCREEN")); //btn_fullscreen->set_label(M("MAIN_BUTTON_UNFULLSCREEN"));
btn_fullscreen->set_tooltip_markup(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);
} }
} }

2
rtgui/rtwindow.h
View File

@ -39,7 +39,7 @@ class RTWindow : public Gtk::Window, public rtengine::ProgressListener{
bool is_fullscreen; bool is_fullscreen;
Gtk::Button * btn_fullscreen; Gtk::Button * btn_fullscreen;
Gtk::Image *iFullScreen, *iFullScreen_exit; Gtk::Image *iFullscreen, *iFullscreen_exit;
bool isSingleTabMode() { return !options.tabbedUI && !EditWindow::isMultiDisplayEnabled(); }; bool isSingleTabMode() { return !options.tabbedUI && !EditWindow::isMultiDisplayEnabled(); };