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

Reverting the "no title when maximized" change, better tab style,

Browse Source 
Editor tab icon now correctly set to the left of the label

(see issue #3446)
This commit is contained in:
Hombre
2016-11-03 00:36:35 +01:00
parent 965cadb52e
commit 6438645b21
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtdata/themes/RawTherapee.css
View File

@@ -534,6 +534,19 @@ paned > separator {
padding: 0; padding: 0;
} }
#MainNotebook > header.left tab image {
margin: 0.5em 0 0 0;
}
#MainNotebook > header.top tab image {
margin: 0 0.5em 0 0;
}
#MainNotebook > header.left tab {
margin: 0.5em 0 0.5em 0;
}
#MainNotebook > header.top tab {
margin: 0 0.5em 0 0.5em;
}
#MainNotebook header { #MainNotebook header {
/* OK */ /* OK */
background-color: #2A2A2A; background-color: #2A2A2A;

19
rtgui/rtwindow.cc
View File

@@ -129,7 +129,6 @@ RTWindow::RTWindow ()
set_resize_mode(Gtk::ResizeMode::RESIZE_QUEUE); set_resize_mode(Gtk::ResizeMode::RESIZE_QUEUE);
set_decorated(true); set_decorated(true);
set_default_size(options.windowWidth, options.windowHeight); set_default_size(options.windowWidth, options.windowHeight);
set_hide_titlebar_when_maximized(true);
set_modal(false); set_modal(false);
if (options.windowMaximized) { if (options.windowMaximized) {
@@ -181,10 +180,10 @@ RTWindow::RTWindow ()
mainNB->set_tab_pos (Gtk::POS_LEFT); mainNB->set_tab_pos (Gtk::POS_LEFT);
fpl->set_angle (90); fpl->set_angle (90);
fpanelLabelGrid->attach_next_to(*fpl, Gtk::POS_BOTTOM, 1, 1); fpanelLabelGrid->attach_next_to(*fpl, Gtk::POS_BOTTOM, 1, 1);
fpanelLabelGrid->attach_next_to(*Gtk::manage (new RTImage ("gtk-directory.png")), *fpl, Gtk::POS_TOP, 1, 1); fpanelLabelGrid->attach_next_to(*Gtk::manage (new RTImage ("gtk-directory.png")), Gtk::POS_BOTTOM, 1, 1);
} else { } else {
fpanelLabelGrid->attach_next_to(*fpl, Gtk::POS_LEFT, 1, 1); fpanelLabelGrid->attach_next_to(*fpl, Gtk::POS_LEFT, 1, 1);
fpanelLabelGrid->attach_next_to(*Gtk::manage (new RTImage ("gtk-directory.png")), *fpl, Gtk::POS_RIGHT, 1, 1); fpanelLabelGrid->attach_next_to(*Gtk::manage (new RTImage ("gtk-directory.png")), Gtk::POS_LEFT, 1, 1);
} }
fpanelLabelGrid->set_tooltip_markup (M("MAIN_FRAME_FILEBROWSER_TOOLTIP")); fpanelLabelGrid->set_tooltip_markup (M("MAIN_FRAME_FILEBROWSER_TOOLTIP"));
@@ -217,10 +216,10 @@ RTWindow::RTWindow ()
if (options.mainNBVertical) { if (options.mainNBVertical) {
el->set_angle (90); el->set_angle (90);
editorLabelGrid->attach_next_to(*el, Gtk::POS_BOTTOM, 1, 1); editorLabelGrid->attach_next_to(*el, Gtk::POS_BOTTOM, 1, 1);
editorLabelGrid->attach_next_to(*Gtk::manage (new RTImage ("rt-logo-small.png")), *el, Gtk::POS_TOP, 1, 1); editorLabelGrid->attach_next_to(*Gtk::manage (new RTImage ("rt-logo-small.png")), Gtk::POS_BOTTOM, 1, 1);
} else { } else {
editorLabelGrid->attach_next_to(*el, Gtk::POS_LEFT, 1, 1); editorLabelGrid->attach_next_to(*el, Gtk::POS_LEFT, 1, 1);
editorLabelGrid->attach_next_to(*Gtk::manage (new RTImage ("rt-logo-small.png")), *el, Gtk::POS_RIGHT, 1, 1); editorLabelGrid->attach_next_to(*Gtk::manage (new RTImage ("rt-logo-small.png")), Gtk::POS_LEFT, 1, 1);
} }
editorLabelGrid->set_tooltip_markup (M("MAIN_FRAME_EDITOR_TOOLTIP")); editorLabelGrid->set_tooltip_markup (M("MAIN_FRAME_EDITOR_TOOLTIP"));
@@ -240,20 +239,14 @@ RTWindow::RTWindow ()
//Gtk::LinkButton* rtWeb = Gtk::manage (new Gtk::LinkButton ("http://rawtherapee.com")); // unused... but fail to be linked anyway !? //Gtk::LinkButton* rtWeb = Gtk::manage (new Gtk::LinkButton ("http://rawtherapee.com")); // unused... but fail to be linked anyway !?
//Gtk::Button* preferences = Gtk::manage (new Gtk::Button (M("MAIN_BUTTON_PREFERENCES")+"...")); //Gtk::Button* preferences = Gtk::manage (new Gtk::Button (M("MAIN_BUTTON_PREFERENCES")+"..."));
Gtk::Button* preferences = Gtk::manage (new Gtk::Button ()); Gtk::Button* preferences = Gtk::manage (new Gtk::Button ());
preferences->set_hexpand(false); setExpandAlignProperties(preferences, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
preferences->set_vexpand(false);
preferences->set_halign(Gtk::ALIGN_CENTER);
preferences->set_valign(Gtk::ALIGN_CENTER);
preferences->set_image (*Gtk::manage(new RTImage ("gtk-preferences.png"))); preferences->set_image (*Gtk::manage(new RTImage ("gtk-preferences.png")));
preferences->set_tooltip_markup (M("MAIN_BUTTON_PREFERENCES")); preferences->set_tooltip_markup (M("MAIN_BUTTON_PREFERENCES"));
preferences->signal_clicked().connect( sigc::mem_fun(*this, &RTWindow::showPreferences) ); preferences->signal_clicked().connect( sigc::mem_fun(*this, &RTWindow::showPreferences) );
//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_hexpand(false); setExpandAlignProperties(btn_fullscreen, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
btn_fullscreen->set_vexpand(false);
btn_fullscreen->set_halign(Gtk::ALIGN_CENTER);
btn_fullscreen->set_valign(Gtk::ALIGN_CENTER);
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) );

2
rtgui/thresholdselector.cc
View File

@@ -145,7 +145,7 @@ void ThresholdSelector::initValues ()
style->add_class("drawingarea"); style->add_class("drawingarea");
style->add_class(GTK_STYLE_CLASS_TROUGH); style->add_class(GTK_STYLE_CLASS_TROUGH);
//style->add_class(GTK_STYLE_CLASS_SCALE); //style->add_class(GTK_STYLE_CLASS_SCALE);
//style->add_class(GTK_STYLE_CLASS_SLIDER); style->add_class(GTK_STYLE_CLASS_SLIDER);
set_name("ThresholdSelector"); set_name("ThresholdSelector");
set_can_focus(false); set_can_focus(false);