From 21e01861748dfb381fee431fc8a0b27f1db8180a Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Mon, 5 Nov 2018 06:05:50 +0100 Subject: [PATCH 1/7] Update TooWaBlue-GTK3-20_.css To fit the pref changes --- rtdata/themes/TooWaBlue-GTK3-20_.css | 29 ++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css index e500ad37c..f660f6ac5 100644 --- a/rtdata/themes/TooWaBlue-GTK3-20_.css +++ b/rtdata/themes/TooWaBlue-GTK3-20_.css @@ -113,6 +113,10 @@ window > box { dialog { background-color: @bg-grey; border-radius: 0; + -GtkDialog-button-spacing: 0; + -GtkDialog-content-area-spacing: 0; + -GtkDialog-content-area-border: 0; + -GtkDialog-action-area-border: 0; } dialog > box { padding: 0.666666666666666666em; @@ -336,9 +340,13 @@ fontchooser scrolledwindow, /*** end ***************************************************************************************/ /*** Load - Save dialog ************************************************************************/ +filechooser { +margin-bottom: 0.25em; +} -filechooser box > box box > button { +filechooser box > box box > button { margin-top: 0.5em; +margin-right: 0; } filechooser image { @@ -537,11 +545,14 @@ menu separator { padding: 0; } -.scrollableToolbar separator:not(.dummy) { +.scrollableToolbar separator.vertical { background-color: shade(@bg-light-grey,.75); margin: 0.166666666666666666em; } - +separator#PrefCacheSeparator.horizontal { + margin: 0.25em 0.166666666666666666em; + padding: 0; +} #MyExpander separator { background-color: @view-grid-border; margin: 0.333333333333333333em 0.166666666666666666em; @@ -944,7 +955,8 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { #PrefNotebook > header { margin: -0.666666666666666666em -0.666666666666666666em 0.333333333333333333em; } -#PrefNotebook > header tab label { +#PrefNotebook > header tab label, +#AboutNotebook > header tab label { padding-top: 0.25em; padding-bottom: 0.25em; } @@ -1435,14 +1447,15 @@ colorchooser colorswatch#add-color-button:first-child { } /* Save, Cancel, OK ... buttons */ -.dialog-action-area button { +dialog .dialog-action-area button { min-height: 2.166666666666666666em; - margin-top: 1em; + margin: 0.5em 0 0 0.333333333333333333em; padding: 0; } messagedialog .dialog-action-area button { min-height: 1.833333333333333333em; - margin: -12px 0.5em 0.5em 0.5em; + margin: -12px 0.5em 0.5em; + padding: 0; } messagedialog .dialog-action-area button:not(:only-child):nth-child(1) { margin-right: 0.25em; @@ -1789,7 +1802,7 @@ radio:disabled { radiobutton label, checkbutton label { - margin: 0 0 0 0.416666666666666666em; + margin: 0 0.416666666666666666em; padding: 0; } From 5edf4d13a992dba6fd7c46221f4e032728ccc725 Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Mon, 5 Nov 2018 06:08:01 +0100 Subject: [PATCH 2/7] Update preferences.cc Save space in File browser tab --- rtgui/preferences.cc | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 9d58244f4..54095f429 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -1206,7 +1206,7 @@ Gtk::Widget* Preferences::getFileBrowserPanel () startupdir = Gtk::manage ( new Gtk::Entry () ); Gtk::Button* sdselect = Gtk::manage ( new Gtk::Button () ); - sdselect->set_image (*Gtk::manage (new RTImage ("folder-open.png"))); + sdselect->set_image (*Gtk::manage (new RTImage ("folder-open-small.png"))); Gtk::RadioButton::Group opts = sdcurrent->get_group(); sdlast->set_group (opts); @@ -1275,20 +1275,26 @@ Gtk::Widget* Preferences::getFileBrowserPanel () Gtk::Frame* frmnu = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_MENUOPTIONS")) ); + + Gtk::Grid* menuGrid = Gtk::manage(new Gtk::Grid()); + menuGrid->get_style_context()->add_class("grid-spacing"); + setExpandAlignProperties(menuGrid, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); + ckbmenuGroupRank = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_MENUGROUPRANK")) ); + setExpandAlignProperties(ckbmenuGroupRank, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); ckbmenuGroupLabel = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_MENUGROUPLABEL")) ); ckbmenuGroupFileOperations = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_MENUGROUPFILEOPERATIONS")) ); + setExpandAlignProperties(ckbmenuGroupFileOperations, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); ckbmenuGroupProfileOperations = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_MENUGROUPPROFILEOPERATIONS")) ); ckbmenuGroupExtProg = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_MENUGROUPEXTPROGS")) ); - Gtk::VBox* vbmnu = Gtk::manage ( new Gtk::VBox () ); + + menuGrid->attach (*ckbmenuGroupRank, 0, 0, 1, 1); + menuGrid->attach (*ckbmenuGroupLabel, 1, 0, 1, 1); + menuGrid->attach (*ckbmenuGroupFileOperations, 0, 1, 1, 1); + menuGrid->attach (*ckbmenuGroupProfileOperations, 1, 1, 1, 1); + menuGrid->attach (*ckbmenuGroupExtProg, 0, 2, 2, 1); - vbmnu->pack_start (*ckbmenuGroupRank, Gtk::PACK_SHRINK, 0); - vbmnu->pack_start (*ckbmenuGroupLabel, Gtk::PACK_SHRINK, 0); - vbmnu->pack_start (*ckbmenuGroupFileOperations, Gtk::PACK_SHRINK, 0); - vbmnu->pack_start (*ckbmenuGroupProfileOperations, Gtk::PACK_SHRINK, 0); - vbmnu->pack_start (*ckbmenuGroupExtProg, Gtk::PACK_SHRINK, 0); - - frmnu->add (*vbmnu); + frmnu->add (*menuGrid); Gtk::Frame* fre = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_PARSEDEXT")) ); @@ -1360,7 +1366,8 @@ Gtk::Widget* Preferences::getFileBrowserPanel () // Separation is needed so that a button is not accidentally clicked when one wanted // to click a spinbox. Ideally, the separation wouldn't require attaching a widget, but how? - Gtk::Label *separator = Gtk::manage (new Gtk::Label()); + Gtk::HSeparator *cacheSeparator = Gtk::manage (new Gtk::HSeparator()); + cacheSeparator->set_name("PrefCacheSeparator"); Gtk::Label* clearThumbsLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHECLEAR_ALLBUTPROFILES"))); setExpandAlignProperties(clearThumbsLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); @@ -1378,7 +1385,7 @@ Gtk::Widget* Preferences::getFileBrowserPanel () cacheGrid->attach (*maxThumbHeightSB, 1, 0, 1, 1); cacheGrid->attach (*maxCacheEntriesLbl, 0, 1, 1, 1); cacheGrid->attach (*maxCacheEntriesSB, 1, 1, 1, 1); - cacheGrid->attach (*separator, 0, 2, 2, 1); + cacheGrid->attach (*cacheSeparator, 0, 2, 2, 1); cacheGrid->attach (*clearThumbsLbl, 0, 3, 1, 1); cacheGrid->attach (*clearThumbsBtn, 1, 3, 1, 1); if (moptions.saveParamsCache) { From 394f4d9b2b1bffbf4c12696f82e9c351ec273704 Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Mon, 5 Nov 2018 06:08:44 +0100 Subject: [PATCH 3/7] Update TooWaBlue-GTK3-20_.css --- rtdata/themes/TooWaBlue-GTK3-20_.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css index f660f6ac5..f2b631165 100644 --- a/rtdata/themes/TooWaBlue-GTK3-20_.css +++ b/rtdata/themes/TooWaBlue-GTK3-20_.css @@ -2,7 +2,7 @@ This file is part of RawTherapee. Copyright (c) 2016-2018 TooWaBoo - Version 2.85 + Version 2.86 RawTherapee is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From 3b48df2c2c5c417e0b8b2df1e8cee9ad894e259c Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Tue, 6 Nov 2018 18:26:00 +0100 Subject: [PATCH 4/7] Fixed console warnings Fix for https://github.com/Beep6581/RawTherapee/issues/4941 --- rtdata/themes/TooWaBlue-GTK3-20_.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css index f2b631165..3fe3c5f38 100644 --- a/rtdata/themes/TooWaBlue-GTK3-20_.css +++ b/rtdata/themes/TooWaBlue-GTK3-20_.css @@ -1421,8 +1421,12 @@ combobox entry + button:not(.dummy) { border-bottom-left-radius: 0; border-left: none; } + #PlacesPaned button.combo { - margin: 0 0 calc(0.416666666666666666em - 8px) 0; + margin: 0; +} +#PlacesPaned combobox { + margin-bottom: calc(0.416666666666666666em - 8px); } /* Reset button */ From bb5d8710e8d29bbca1e9d33c0fd5cc64aa3e80a7 Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Thu, 8 Nov 2018 06:08:51 +0100 Subject: [PATCH 5/7] Removed "#PrefCacheSeparator" ID --- rtdata/themes/TooWaBlue-GTK3-20_.css | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css index 3fe3c5f38..dbe0041a7 100644 --- a/rtdata/themes/TooWaBlue-GTK3-20_.css +++ b/rtdata/themes/TooWaBlue-GTK3-20_.css @@ -473,7 +473,7 @@ separator, background-color: transparent; } grid separator.horizontal, box separator.horizontal { - margin: 0.166666666666666666em 0; + margin: 0.166666666666666666em; padding: 0; } grid separator.vertical, box separator.vertical { @@ -549,10 +549,7 @@ menu separator { background-color: shade(@bg-light-grey,.75); margin: 0.166666666666666666em; } -separator#PrefCacheSeparator.horizontal { - margin: 0.25em 0.166666666666666666em; - padding: 0; -} + #MyExpander separator { background-color: @view-grid-border; margin: 0.333333333333333333em 0.166666666666666666em; From bbb51b1070f2e90999ea96e82f3f9b268ae8c094 Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Thu, 8 Nov 2018 06:11:50 +0100 Subject: [PATCH 6/7] Removed "#PrefCacheSeparator" ID and add class "grid-row-separator" --- rtgui/preferences.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 54095f429..147e6badd 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -1367,7 +1367,7 @@ Gtk::Widget* Preferences::getFileBrowserPanel () // Separation is needed so that a button is not accidentally clicked when one wanted // to click a spinbox. Ideally, the separation wouldn't require attaching a widget, but how? Gtk::HSeparator *cacheSeparator = Gtk::manage (new Gtk::HSeparator()); - cacheSeparator->set_name("PrefCacheSeparator"); + cacheSeparator->get_style_context()->add_class("grid-row-separator"); Gtk::Label* clearThumbsLbl = Gtk::manage (new Gtk::Label(M("PREFERENCES_CACHECLEAR_ALLBUTPROFILES"))); setExpandAlignProperties(clearThumbsLbl, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); From 894a3523463a2401da18c65f7dcecf60830b7af3 Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Thu, 8 Nov 2018 06:33:17 +0100 Subject: [PATCH 7/7] Update TooWaBlue-GTK3-20_.css Changed some separator spacing. --- rtdata/themes/TooWaBlue-GTK3-20_.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css index dbe0041a7..3bc6e0bdc 100644 --- a/rtdata/themes/TooWaBlue-GTK3-20_.css +++ b/rtdata/themes/TooWaBlue-GTK3-20_.css @@ -473,7 +473,7 @@ separator, background-color: transparent; } grid separator.horizontal, box separator.horizontal { - margin: 0.166666666666666666em; + margin: 0.333333333333333333em 0.166666666666666666em; padding: 0; } grid separator.vertical, box separator.vertical { @@ -550,7 +550,7 @@ menu separator { margin: 0.166666666666666666em; } -#MyExpander separator { +#MyExpander separator.horizontal { background-color: @view-grid-border; margin: 0.333333333333333333em 0.166666666666666666em; }