From e906427a76bdc4f2b7095c9ac6d9582e3f4467ad Mon Sep 17 00:00:00 2001 From: michael Date: Thu, 2 Jun 2011 21:17:27 -0400 Subject: [PATCH] GUI touchups: panel ending images --- rtdata/images/PanelEnding_01.png | Bin 0 -> 3379 bytes rtgui/toolpanelcoord.cc | 24 ++++++++++++++++++++++++ rtgui/toolpanelcoord.h | 3 +++ 3 files changed, 27 insertions(+) create mode 100644 rtdata/images/PanelEnding_01.png diff --git a/rtdata/images/PanelEnding_01.png b/rtdata/images/PanelEnding_01.png new file mode 100644 index 0000000000000000000000000000000000000000..ad8998178a8d0a0068d1b421b39f84c7efcc76cb GIT binary patch literal 3379 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 JPDHLkV1mM~POks} literal 0 HcmV?d00001 diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc index 8ba366a2f..30a2cfa66 100644 --- a/rtgui/toolpanelcoord.cc +++ b/rtgui/toolpanelcoord.cc @@ -125,11 +125,35 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL) { transformPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); rawPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); + // load panel endings + for (int i=0; i<5; i++) { + vbPanelEnd[i] = Gtk::manage (new Gtk::VBox ()); + imgPanelEnd[i] = Gtk::manage (new Gtk::Image (argv0+"/images/PanelEnding_01.png")); + imgPanelEnd[i]->show (); + vbPanelEnd[i]->pack_start (*imgPanelEnd[i],Gtk::PACK_SHRINK); + vbPanelEnd[i]->show_all(); + } + exposurePanelSW->add (*exposurePanel); + exposurePanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK,4); + exposurePanel->pack_start (*vbPanelEnd[0],Gtk::PACK_SHRINK,4); + detailsPanelSW->add (*detailsPanel); + detailsPanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK,4); + detailsPanel->pack_start (*vbPanelEnd[1],Gtk::PACK_SHRINK,4); + colorPanelSW->add (*colorPanel); + colorPanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK,4); + colorPanel->pack_start (*vbPanelEnd[2],Gtk::PACK_SHRINK,4); + transformPanelSW->add (*transformPanel); + transformPanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK,4); + transformPanel->pack_start (*vbPanelEnd[3],Gtk::PACK_SHRINK,4); + rawPanelSW->add (*rawPanel); + rawPanel->pack_start (*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK,4); + rawPanel->pack_start (*vbPanelEnd[4],Gtk::PACK_SHRINK,4); + Gtk::HBox* hbe = Gtk::manage (new Gtk::HBox ()); hbe->pack_start (*Gtk::manage (new Gtk::Label (M("MAIN_TAB_EXPOSURE")))); diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h index 713ca52ef..ea6b66b18 100644 --- a/rtgui/toolpanelcoord.h +++ b/rtgui/toolpanelcoord.h @@ -127,6 +127,9 @@ class ToolPanelCoordinator : public ToolPanelListener, IPTCPanel* iptcpanel; ToolBar* toolBar; + Gtk::Image* imgPanelEnd[5]; + Gtk::VBox* vbPanelEnd[5]; + Gtk::ScrolledWindow* exposurePanelSW; Gtk::ScrolledWindow* detailsPanelSW; Gtk::ScrolledWindow* colorPanelSW;