Add new object IDs for theming (see issue #3214)
This commit is contained in:
parent
a51cfcacbb
commit
b7a3c45c7e
@ -60,6 +60,8 @@ BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog)
|
|||||||
|
|
||||||
// construct batch queue panel with the extra "start" and "stop" button
|
// construct batch queue panel with the extra "start" and "stop" button
|
||||||
Gtk::VBox* batchQueueButtonBox = Gtk::manage (new Gtk::VBox);
|
Gtk::VBox* batchQueueButtonBox = Gtk::manage (new Gtk::VBox);
|
||||||
|
batchQueueButtonBox->set_name("BatchQueueButtons");
|
||||||
|
|
||||||
start = Gtk::manage (new Gtk::ToggleButton ());
|
start = Gtk::manage (new Gtk::ToggleButton ());
|
||||||
stop = Gtk::manage (new Gtk::ToggleButton ());
|
stop = Gtk::manage (new Gtk::ToggleButton ());
|
||||||
autoStart = Gtk::manage (new Gtk::CheckButton (M("BATCHQUEUE_AUTOSTART")));
|
autoStart = Gtk::manage (new Gtk::CheckButton (M("BATCHQUEUE_AUTOSTART")));
|
||||||
@ -147,6 +149,7 @@ BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog)
|
|||||||
// setup button bar
|
// setup button bar
|
||||||
topBox = Gtk::manage (new Gtk::HBox ());
|
topBox = Gtk::manage (new Gtk::HBox ());
|
||||||
pack_start (*topBox, Gtk::PACK_SHRINK);
|
pack_start (*topBox, Gtk::PACK_SHRINK);
|
||||||
|
topBox->set_name("BatchQueueButtonsMainContainer");
|
||||||
|
|
||||||
topBox->pack_start (*batchQueueButtonBox, Gtk::PACK_SHRINK, 4);
|
topBox->pack_start (*batchQueueButtonBox, Gtk::PACK_SHRINK, 4);
|
||||||
topBox->pack_start (*fdir, Gtk::PACK_EXPAND_WIDGET, 4);
|
topBox->pack_start (*fdir, Gtk::PACK_EXPAND_WIDGET, 4);
|
||||||
|
@ -350,6 +350,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
|
|||||||
afterBox->pack_start (*iareapanel);
|
afterBox->pack_start (*iareapanel);
|
||||||
|
|
||||||
beforeAfterBox = Gtk::manage (new Gtk::HBox());
|
beforeAfterBox = Gtk::manage (new Gtk::HBox());
|
||||||
|
beforeAfterBox->set_name("BeforeAfterContainer");
|
||||||
beforeAfterBox->pack_start (*afterBox);
|
beforeAfterBox->pack_start (*afterBox);
|
||||||
|
|
||||||
editbox->pack_start (*toolBarPanel, Gtk::PACK_SHRINK, 2);
|
editbox->pack_start (*toolBarPanel, Gtk::PACK_SHRINK, 2);
|
||||||
|
@ -1198,6 +1198,8 @@ TextOrIcon::TextOrIcon (Glib::ustring fname, Glib::ustring labelTx, Glib::ustrin
|
|||||||
labelText = labelTx;
|
labelText = labelTx;
|
||||||
tooltipText = tooltipTx;
|
tooltipText = tooltipTx;
|
||||||
|
|
||||||
|
set_name("TextOrIcon");
|
||||||
|
|
||||||
switchTo(type);
|
switchTo(type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,6 +42,7 @@ HistogramPanel::HistogramPanel ()
|
|||||||
set_hexpand(true);
|
set_hexpand(true);
|
||||||
set_valign(Gtk::ALIGN_START);
|
set_valign(Gtk::ALIGN_START);
|
||||||
set_halign(Gtk::ALIGN_FILL);
|
set_halign(Gtk::ALIGN_FILL);
|
||||||
|
set_name("HistogramPanel");
|
||||||
|
|
||||||
histogramArea = Gtk::manage (new HistogramArea (this));
|
histogramArea = Gtk::manage (new HistogramArea (this));
|
||||||
histogramArea->set_hexpand(true);
|
histogramArea->set_hexpand(true);
|
||||||
@ -397,10 +398,10 @@ void HistogramPanel::toggle_button_full ()
|
|||||||
//
|
//
|
||||||
// HistogramRGBArea
|
// HistogramRGBArea
|
||||||
HistogramRGBArea::HistogramRGBArea () ://needChroma unactive by default
|
HistogramRGBArea::HistogramRGBArea () ://needChroma unactive by default
|
||||||
frozen(false), valid(false), needRed(true), needGreen(true), needBlue(true), needLuma(true), rawMode(false), showMode(options.histogramBar), barDisplayed(options.histogramBar), needChroma(false)
|
val(0), r(0), g(0), b(0), frozen(false), valid(false), needRed(true), needGreen(true), needBlue(true), needLuma(true), rawMode(false), showMode(options.histogramBar), barDisplayed(options.histogramBar), needChroma(false), parent(NULL)
|
||||||
{
|
{
|
||||||
|
|
||||||
//set_size_request(60, 12);
|
set_name("HistogramRGBArea");
|
||||||
|
|
||||||
harih = new HistogramRGBAreaIdleHelper;
|
harih = new HistogramRGBAreaIdleHelper;
|
||||||
harih->harea = this;
|
harih->harea = this;
|
||||||
@ -821,7 +822,7 @@ HistogramArea::HistogramArea (FullModeListener *fml) : //needChroma unactive by
|
|||||||
bhist(256);
|
bhist(256);
|
||||||
chist(256);
|
chist(256);
|
||||||
|
|
||||||
Glib::RefPtr<Gtk::StyleContext> style = get_style_context();
|
set_name("HistogramArea");
|
||||||
|
|
||||||
haih = new HistogramAreaIdleHelper;
|
haih = new HistogramAreaIdleHelper;
|
||||||
haih->harea = this;
|
haih->harea = this;
|
||||||
|
@ -33,6 +33,7 @@ Navigator::Navigator ()
|
|||||||
|
|
||||||
set_label (M("MAIN_MSG_NAVIGATOR"));
|
set_label (M("MAIN_MSG_NAVIGATOR"));
|
||||||
Gtk::VBox* mbox = Gtk::manage (new Gtk::VBox ());
|
Gtk::VBox* mbox = Gtk::manage (new Gtk::VBox ());
|
||||||
|
mbox->set_name("Navigator");
|
||||||
previewWindow = Gtk::manage (new PreviewWindow ());
|
previewWindow = Gtk::manage (new PreviewWindow ());
|
||||||
mbox->pack_start (*previewWindow, Gtk::PACK_SHRINK, 2);
|
mbox->pack_start (*previewWindow, Gtk::PACK_SHRINK, 2);
|
||||||
position = Gtk::manage (new Gtk::Label ());
|
position = Gtk::manage (new Gtk::Label ());
|
||||||
|
@ -26,24 +26,24 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring& title, Gtk::Window* paren
|
|||||||
set_default_size(700, 600);
|
set_default_size(700, 600);
|
||||||
|
|
||||||
everything = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_EVERYTHING")));
|
everything = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_EVERYTHING")));
|
||||||
everything ->set_name("partialPasteHeader");
|
everything ->set_name("PartialPasteHeader");
|
||||||
|
|
||||||
basic = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_BASICGROUP")));
|
basic = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_BASICGROUP")));
|
||||||
basic ->set_name("partialPasteHeader");
|
basic ->set_name("PartialPasteHeader");
|
||||||
detail = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_DETAILGROUP")));
|
detail = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_DETAILGROUP")));
|
||||||
detail ->set_name("partialPasteHeader");
|
detail ->set_name("PartialPasteHeader");
|
||||||
color = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COLORGROUP")));
|
color = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COLORGROUP")));
|
||||||
color ->set_name("partialPasteHeader");
|
color ->set_name("PartialPasteHeader");
|
||||||
lens = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_LENSGROUP")));
|
lens = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_LENSGROUP")));
|
||||||
lens ->set_name("partialPasteHeader");
|
lens ->set_name("PartialPasteHeader");
|
||||||
composition = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COMPOSITIONGROUP")));
|
composition = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COMPOSITIONGROUP")));
|
||||||
composition ->set_name("partialPasteHeader");
|
composition ->set_name("PartialPasteHeader");
|
||||||
meta = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_METAGROUP")));
|
meta = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_METAGROUP")));
|
||||||
meta ->set_name("partialPasteHeader");
|
meta ->set_name("PartialPasteHeader");
|
||||||
raw = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAWGROUP")));
|
raw = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAWGROUP")));
|
||||||
raw ->set_name("partialPasteHeader");
|
raw ->set_name("PartialPasteHeader");
|
||||||
wav = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_WAVELETGROUP")));
|
wav = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_WAVELETGROUP")));
|
||||||
wav ->set_name("partialPasteHeader");
|
wav ->set_name("PartialPasteHeader");
|
||||||
|
|
||||||
// options in basic:
|
// options in basic:
|
||||||
wb = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_WHITEBALANCE")));
|
wb = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_WHITEBALANCE")));
|
||||||
@ -129,8 +129,9 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring& title, Gtk::Window* paren
|
|||||||
|
|
||||||
for (int i = 0; i < 8; i++) {
|
for (int i = 0; i < 8; i++) {
|
||||||
vboxes[i] = Gtk::manage (new Gtk::VBox ());
|
vboxes[i] = Gtk::manage (new Gtk::VBox ());
|
||||||
|
vboxes[i]->set_name("PartialPasteGroupContainer");
|
||||||
hseps[i] = Gtk::manage (new Gtk::HSeparator ());
|
hseps[i] = Gtk::manage (new Gtk::HSeparator ());
|
||||||
hseps[i]->set_name("partialPasteHeaderSep");
|
hseps[i]->set_name("PartialPasteHeaderSep");
|
||||||
}
|
}
|
||||||
|
|
||||||
//BASIC
|
//BASIC
|
||||||
@ -254,6 +255,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring& title, Gtk::Window* paren
|
|||||||
Gtk::Dialog::get_content_area()->pack_start (*vbtop, Gtk::PACK_SHRINK, 2); // TODO replace with get_content_area() with GTK upgrade
|
Gtk::Dialog::get_content_area()->pack_start (*vbtop, Gtk::PACK_SHRINK, 2); // TODO replace with get_content_area() with GTK upgrade
|
||||||
|
|
||||||
Gtk::HBox* hbmain = Gtk::manage (new Gtk::HBox ());
|
Gtk::HBox* hbmain = Gtk::manage (new Gtk::HBox ());
|
||||||
|
hbmain->set_name("PartialPaste");
|
||||||
hbmain->pack_start (*vbCol1);
|
hbmain->pack_start (*vbCol1);
|
||||||
hbmain->pack_start (*(Gtk::manage (new Gtk::VSeparator ())));
|
hbmain->pack_start (*(Gtk::manage (new Gtk::VSeparator ())));
|
||||||
hbmain->pack_start (*vbCol2);
|
hbmain->pack_start (*vbCol2);
|
||||||
|
@ -24,9 +24,7 @@
|
|||||||
PreviewWindow::PreviewWindow () : previewHandler(NULL), mainCropWin(NULL), imageArea(NULL), imgX(0), imgY(0), imgW(0), imgH(0),
|
PreviewWindow::PreviewWindow () : previewHandler(NULL), mainCropWin(NULL), imageArea(NULL), imgX(0), imgY(0), imgW(0), imgH(0),
|
||||||
zoom(0.0), isMoving(false), needsUpdate(false), cursor_type(CSUndefined)
|
zoom(0.0), isMoving(false), needsUpdate(false), cursor_type(CSUndefined)
|
||||||
{
|
{
|
||||||
Glib::RefPtr<Gtk::StyleContext> style = get_style_context();
|
set_name("PreviewWindow");
|
||||||
style->add_class(GTK_STYLE_CLASS_BACKGROUND);
|
|
||||||
style->add_class(GTK_STYLE_CLASS_FLAT);
|
|
||||||
rconn = signal_size_allocate().connect( sigc::mem_fun(*this, &PreviewWindow::on_resized) );
|
rconn = signal_size_allocate().connect( sigc::mem_fun(*this, &PreviewWindow::on_resized) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,6 +42,8 @@ void ProfilePanel::cleanup ()
|
|||||||
ProfilePanel::ProfilePanel () : storedPProfile(NULL), lastFilename(""), imagePath("")
|
ProfilePanel::ProfilePanel () : storedPProfile(NULL), lastFilename(""), imagePath("")
|
||||||
{
|
{
|
||||||
|
|
||||||
|
set_name("ProfilePanel");
|
||||||
|
|
||||||
tpc = NULL;
|
tpc = NULL;
|
||||||
|
|
||||||
profileFillModeOnImage = new RTImage("profile-filled.png");
|
profileFillModeOnImage = new RTImage("profile-filled.png");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user