Second attempt to fix bug #59

rtdata/options/options.lin

@@ -10,7 +10,7 @@ MultiUser=true
 Language=English (US)
 Theme=Gray
 Version=300
-FirstRun=false
+FirstRun=true
 
 [External Editor]
 EditorKind=1
@@ -50,7 +50,7 @@ JpegQuality=100
 PngCompression=6
 PngBps=8
 TiffBps=8
-SaveProcParams=false
+SaveProcParams=true
 PathTemplate=%p1/converted/%f
 PathFolder=
 UsePathTemplate=true
@@ -65,8 +65,12 @@ SaveParamsToCache=true
 LoadParamsFromLocation=0
 
 [GUI]
+WindowWidth=1000
+WindowHeight=900
+WindowMaximized=false
 FileBrowserHeight=250
-ToolPanelWidth=270
+ToolPanelWidth=750
+BrowserToolPanelWidth=750
 HistoryPanelWidth=230
 LastPreviewScale=5
 LastCropSize=1

rtdata/options/options.osx

@@ -50,7 +50,7 @@ JpegQuality=100
 PngCompression=6
 PngBps=8
 TiffBps=8
-SaveProcParams=false
+SaveProcParams=true
 PathTemplate=%p1/converted/%f
 PathFolder=
 UsePathTemplate=true
@@ -65,10 +65,12 @@ SaveParamsToCache=true
 LoadParamsFromLocation=0
 
 [GUI]
-WindowWidth=1024
+WindowWidth=1000
-WindowHeight=700
+WindowHeight=900
+WindowMaximized=false
 FileBrowserHeight=250
-ToolPanelWidth=270
+ToolPanelWidth=750
+BrowserToolPanelWidth=750
 HistoryPanelWidth=230
 LastPreviewScale=5
 LastCropSize=1

rtdata/options/options.win

@@ -10,7 +10,7 @@ MultiUser=true
 Language=English (US)
 Theme=Gray
 Version=300
-FirstRun=false
+FirstRun=true
 
 [External Editor]
 EditorKind=1
@@ -50,7 +50,7 @@ JpegQuality=100
 PngCompression=6
 PngBps=8
 TiffBps=8
-SaveProcParams=false
+SaveProcParams=true
 PathTemplate=%p1/converted/%f
 PathFolder=
 UsePathTemplate=true
@@ -65,8 +65,12 @@ SaveParamsToCache=true
 LoadParamsFromLocation=0
 
 [GUI]
+WindowWidth=1000
+WindowHeight=900
+WindowMaximized=false
 FileBrowserHeight=250
-ToolPanelWidth=270
+ToolPanelWidth=750
+BrowserToolPanelWidth=750
 HistoryPanelWidth=230
 LastPreviewScale=5
 LastCropSize=1

rtgui/editorpanel.cc

@@ -192,6 +192,7 @@ EditorPanel::EditorPanel () : beforePreviewHandler(NULL), beforeIarea(NULL), par
 
 	hpanedr->pack1(*hpanedl, true, true);
 	hpanedr->pack2(*vboxright, false, true);
+	hpanedr->set_position(options.toolPanelWidth);
 
     pack_start (*hpanedr);
     show_all ();
@@ -229,12 +230,6 @@ EditorPanel::EditorPanel () : beforePreviewHandler(NULL), beforeIarea(NULL), par
 
 }
 
-bool EditorPanel::beforeClosing () {
-
-    options.toolPanelWidth = vboxright->get_width ();
-    return true;
-}
-
 EditorPanel::~EditorPanel () {
 
     history->setHistoryBeforeLineListener (NULL);
@@ -268,12 +263,6 @@ EditorPanel::~EditorPanel () {
     delete saveAsDialog;
 }
 
-void EditorPanel::on_realize () {
-    
-    Gtk::VBox::on_realize ();
-    vboxright->set_size_request (options.toolPanelWidth, -1);
-}
-
 void EditorPanel::open (Thumbnail* tmb, rtengine::InitialImage* isrc) {
 
     // initialize everything
@@ -854,7 +843,7 @@ bool EditorPanel::idle_sentToGimp(ProgressConnector<int> *pc,rtengine::IImage16*
 void EditorPanel::saveOptions () {
 
     options.historyPanelWidth = hpanedl->get_position ();
-    options.toolPanelWidth = vboxright->get_width ();
+    options.toolPanelWidth = hpanedr->get_position ();
 }
 
 void EditorPanel::historyBeforeLineChanged (const rtengine::procparams::ProcParams& params) {

rtgui/editorpanel.h

@@ -104,8 +104,6 @@ class EditorPanel : public Gtk::VBox,
         virtual ~EditorPanel ();
 
         void open (Thumbnail* tmb, rtengine::InitialImage* isrc);
-        bool beforeClosing ();
-        void on_realize ();
 
         void setParent (RTWindow* p) { parent = p; }
 

rtgui/filepanel.cc

@@ -101,6 +101,8 @@ FilePanel::FilePanel () : parent(NULL) {
     pack1(*dirpaned, true, true);
     pack2(*rightBox, true, true);
 
+    set_position(options.browserToolPanelWidth);
+
     fileCatalog->setFileSelectionChangeListener (tpc);
 
     fileCatalog->setFileSelectionListener (this);
@@ -109,12 +111,6 @@ FilePanel::FilePanel () : parent(NULL) {
     show_all ();
 }
 
-void FilePanel::on_realize () {
-    
-    Gtk::HPaned::on_realize ();
-    rightBox->set_size_request (options.browserToolPanelWidth, -1);
-}
-
 void FilePanel::init () {
   
     dirBrowser->fillDirTree ();
@@ -167,7 +163,7 @@ void FilePanel::saveOptions () {
 
     options.dirBrowserWidth = dirpaned->get_position ();
     options.dirBrowserHeight = placespaned->get_position ();
-    options.browserToolPanelWidth = rightBox->get_width ();
+    options.browserToolPanelWidth = get_position();
     if (options.startupDir==STARTUPDIR_LAST && fileCatalog->lastSelectedDir ()!="")
         options.startupPath = fileCatalog->lastSelectedDir ();
     fileCatalog->closeDir (); 

rtgui/filepanel.h

@@ -56,8 +56,6 @@ class FilePanel : public Gtk::HPaned,
     public:
         FilePanel ();
 
-        void on_realize ();
-
         void setParent (RTWindow* p) { parent = p; }
         void init (); // dont call it directly, the constructor calls it as idle source
         void open (const Glib::ustring& d); // open a file or a directory

rtgui/options.cc

@@ -61,8 +61,8 @@ void Options::setDefaults () {
     profilePath = "profiles";
     dirBrowserWidth = 200;
     dirBrowserHeight = 150;
-    toolPanelWidth = 250;
+    toolPanelWidth = 700;
-    browserToolPanelWidth = 250;
+    browserToolPanelWidth = 700;
     historyPanelWidth = 150;
     lastScale = 4;
     lastCropSize = 1;

rtgui/rtwindow.cc

@@ -144,7 +144,6 @@ void RTWindow::addEditorPanel (EditorPanel* ep, const std::string &name) {
 
 void RTWindow::remEditorPanel (EditorPanel* ep) {
 
-    if (ep->beforeClosing ()) {
 	ep->saveOptions ();
 	epanels.erase (ep->getFileName());
 	filesEdited.erase (ep->getFileName ());
@@ -154,7 +153,6 @@ void RTWindow::remEditorPanel (EditorPanel* ep) {
 
 	if (mainNB->get_current_page () == mainNB->page_num (*bpanel))
 		mainNB->set_current_page (mainNB->page_num (*fpanel));
-    }
     // TODO: ask what to do: close & apply, close & apply selection, close & revert, cancel
 }
 
@@ -233,7 +231,6 @@ bool RTWindow::on_delete_event(GdkEventAny* event) {
     else
 		options.windowMaximized = true;
 
-
     Options::save ();
     hide();
     return true;