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

Fix bug #59, at least on Windows

Browse Source
This commit is contained in:
Hombre 2010-09-15 16:46:56 +02:00
parent ee994d36e9
commit b30a93116e
4 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/filepanel.cc
View File

@ -47,11 +47,11 @@ FilePanel::FilePanel () : parent(NULL) {
placespaned->pack1 (*placesBrowser, false, true); placespaned->pack1 (*placesBrowser, false, true);
placespaned->pack2 (*obox, true, true); placespaned->pack2 (*obox, true, true);
dirpaned->pack1 (*placespaned, Gtk::SHRINK); dirpaned->pack1 (*placespaned, true, true);
tpc = new BatchToolPanelCoordinator (this); tpc = new BatchToolPanelCoordinator (this);
fileCatalog = new FileCatalog (tpc->coarse, tpc->getToolBar()); fileCatalog = new FileCatalog (tpc->coarse, tpc->getToolBar());
dirpaned->pack2 (*fileCatalog, Gtk::EXPAND|Gtk::SHRINK); dirpaned->pack2 (*fileCatalog, true, true);
placesBrowser->setDirBrowserRemoteInterface (dirBrowser); placesBrowser->setDirBrowserRemoteInterface (dirBrowser);
recentBrowser->setDirBrowserRemoteInterface (dirBrowser); recentBrowser->setDirBrowserRemoteInterface (dirBrowser);
@ -99,7 +99,7 @@ FilePanel::FilePanel () : parent(NULL) {
rightBox->pack_start (*rightNotebook); rightBox->pack_start (*rightNotebook);
pack1(*dirpaned, true, true); pack1(*dirpaned, true, true);
pack2(*rightBox, false, true); pack2(*rightBox, true, true);
fileCatalog->setFileSelectionChangeListener (tpc); fileCatalog->setFileSelectionChangeListener (tpc);

19
rtgui/options.cc
View File

@ -40,6 +40,7 @@ void Options::setDefaults () {
windowWidth = 1000; windowWidth = 1000;
windowHeight = 600; windowHeight = 600;
windowMaximized = false;
firstRun = true; firstRun = true;
savesParamsAtExit = true; savesParamsAtExit = true;
saveFormat.format = "jpg"; saveFormat.format = "jpg";
@ -242,14 +243,15 @@ if (keyFile.has_group ("Clipping Indication")) {
} }
if (keyFile.has_group ("GUI")) { if (keyFile.has_group ("GUI")) {
if (keyFile.has_key ("GUI", "WindowWidth")) windowWidth = keyFile.get_integer ("GUI", "WindowWidth"); if (keyFile.has_key ("GUI", "WindowWidth")) windowWidth = keyFile.get_integer ("GUI", "WindowWidth");
if (keyFile.has_key ("GUI", "WindowHeight")) windowHeight = keyFile.get_integer ("GUI", "WindowHeight"); if (keyFile.has_key ("GUI", "WindowHeight")) windowHeight = keyFile.get_integer ("GUI", "WindowHeight");
if (keyFile.has_key ("GUI", "DirBrowserWidth")) dirBrowserWidth = keyFile.get_integer ("GUI", "DirBrowserWidth"); if (keyFile.has_key ("GUI", "WindowMaximized")) windowMaximized = keyFile.get_boolean ("GUI", "WindowMaximized");
if (keyFile.has_key ("GUI", "DirBrowserHeight")) dirBrowserHeight = keyFile.get_integer ("GUI", "DirBrowserHeight"); if (keyFile.has_key ("GUI", "DirBrowserWidth")) dirBrowserWidth = keyFile.get_integer ("GUI", "DirBrowserWidth");
if (keyFile.has_key ("GUI", "SaveAsDialogWidth")) saveAsDialogWidth = keyFile.get_integer ("GUI", "SaveAsDialogWidth"); if (keyFile.has_key ("GUI", "DirBrowserHeight")) dirBrowserHeight = keyFile.get_integer ("GUI", "DirBrowserHeight");
if (keyFile.has_key ("GUI", "SaveAsDialogHeight")) saveAsDialogHeight = keyFile.get_integer ("GUI", "SaveAsDialogHeight"); if (keyFile.has_key ("GUI", "SaveAsDialogWidth")) saveAsDialogWidth = keyFile.get_integer ("GUI", "SaveAsDialogWidth");
if (keyFile.has_key ("GUI", "ToolPanelWidth")) toolPanelWidth = keyFile.get_integer ("GUI", "ToolPanelWidth"); if (keyFile.has_key ("GUI", "SaveAsDialogHeight")) saveAsDialogHeight = keyFile.get_integer ("GUI", "SaveAsDialogHeight");
if (keyFile.has_key ("GUI", "BrowserToolPanelWidth"))browserToolPanelWidth = keyFile.get_integer ("GUI", "BrowserToolPanelWidth"); if (keyFile.has_key ("GUI", "ToolPanelWidth")) toolPanelWidth = keyFile.get_integer ("GUI", "ToolPanelWidth");
if (keyFile.has_key ("GUI", "BrowserToolPanelWidth"))browserToolPanelWidth = keyFile.get_integer ("GUI", "BrowserToolPanelWidth");
if (keyFile.has_key ("GUI", "HistoryPanelWidth")) historyPanelWidth = keyFile.get_integer ("GUI", "HistoryPanelWidth"); if (keyFile.has_key ("GUI", "HistoryPanelWidth")) historyPanelWidth = keyFile.get_integer ("GUI", "HistoryPanelWidth");
if (keyFile.has_key ("GUI", "LastPreviewScale")) lastScale = keyFile.get_integer ("GUI", "LastPreviewScale"); if (keyFile.has_key ("GUI", "LastPreviewScale")) lastScale = keyFile.get_integer ("GUI", "LastPreviewScale");
if (keyFile.has_key ("GUI", "LastCropSize")) lastCropSize = keyFile.get_integer ("GUI", "LastCropSize"); if (keyFile.has_key ("GUI", "LastCropSize")) lastCropSize = keyFile.get_integer ("GUI", "LastCropSize");
@ -372,6 +374,7 @@ int Options::saveToFile (Glib::ustring fname) {
keyFile.set_integer ("GUI", "WindowWidth", windowWidth); keyFile.set_integer ("GUI", "WindowWidth", windowWidth);
keyFile.set_integer ("GUI", "WindowHeight", windowHeight); keyFile.set_integer ("GUI", "WindowHeight", windowHeight);
keyFile.set_boolean ("GUI", "WindowMaximized", windowMaximized);
keyFile.set_integer ("GUI", "DirBrowserWidth", dirBrowserWidth); keyFile.set_integer ("GUI", "DirBrowserWidth", dirBrowserWidth);
keyFile.set_integer ("GUI", "DirBrowserHeight", dirBrowserHeight); keyFile.set_integer ("GUI", "DirBrowserHeight", dirBrowserHeight);
keyFile.set_integer ("GUI", "SaveAsDialogWidth", saveAsDialogWidth); keyFile.set_integer ("GUI", "SaveAsDialogWidth", saveAsDialogWidth);

1
rtgui/options.h
View File

@ -69,6 +69,7 @@ class Options {
int historyPanelWidth; int historyPanelWidth;
int windowWidth; int windowWidth;
int windowHeight; int windowHeight;
bool windowMaximized;
int dirBrowserWidth; int dirBrowserWidth;
int dirBrowserHeight; int dirBrowserHeight;
int lastScale; int lastScale;

14
rtgui/rtwindow.cc
View File

@ -39,6 +39,10 @@ RTWindow::RTWindow () {
set_default_size(options.windowWidth, options.windowHeight); set_default_size(options.windowWidth, options.windowHeight);
set_modal(false); set_modal(false);
set_resizable(true); set_resizable(true);
if (options.windowMaximized)
maximize();
else
unmaximize();
property_destroy_with_parent().set_value(false); property_destroy_with_parent().set_value(false);
mainNB = Gtk::manage (new Gtk::Notebook ()); mainNB = Gtk::manage (new Gtk::Notebook ());
@ -220,8 +224,14 @@ bool RTWindow::on_delete_event(GdkEventAny* event) {
options.fbArrangement = fileBrowser->getFileCatalog()->getArrangement (); options.fbArrangement = fileBrowser->getFileCatalog()->getArrangement ();
options.firstRun = false; options.firstRun = false;
*/ */
//options.windowWidth = get_width(); Gdk::WindowState state = get_window()->get_state();
//options.windowHeight = get_height(); if (!(state & (Gdk::WINDOW_STATE_MAXIMIZED | Gdk::WINDOW_STATE_FULLSCREEN))) {
options.windowWidth = get_width();
options.windowHeight = get_height();
options.windowMaximized = false;
}
else
options.windowMaximized = true;
Options::save (); Options::save ();