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

Patch on behalf of maweso. issue #470

Browse Source
This commit is contained in:
ffsup2 2011-03-19 19:03:52 +01:00
parent 19163b86b6
commit 0180a683f5
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/options.cc
View File

@ -63,6 +63,8 @@ void Options::setDefaults () {
profilePath = "profiles"; profilePath = "profiles";
dirBrowserWidth = 200; dirBrowserWidth = 200;
dirBrowserHeight = 150; dirBrowserHeight = 150;
preferencesWidth = 0;
preferencesHeight = 0;
toolPanelWidth = 300; toolPanelWidth = 300;
browserToolPanelWidth = 300; browserToolPanelWidth = 300;
browserToolPanelHeight = 300; browserToolPanelHeight = 300;
@ -261,6 +263,8 @@ if (keyFile.has_group ("GUI")) {
if (keyFile.has_key ("GUI", "WindowMaximized")) windowMaximized = keyFile.get_boolean ("GUI", "WindowMaximized"); if (keyFile.has_key ("GUI", "WindowMaximized")) windowMaximized = keyFile.get_boolean ("GUI", "WindowMaximized");
if (keyFile.has_key ("GUI", "DirBrowserWidth")) dirBrowserWidth = keyFile.get_integer ("GUI", "DirBrowserWidth"); if (keyFile.has_key ("GUI", "DirBrowserWidth")) dirBrowserWidth = keyFile.get_integer ("GUI", "DirBrowserWidth");
if (keyFile.has_key ("GUI", "DirBrowserHeight")) dirBrowserHeight = keyFile.get_integer ("GUI", "DirBrowserHeight"); if (keyFile.has_key ("GUI", "DirBrowserHeight")) dirBrowserHeight = keyFile.get_integer ("GUI", "DirBrowserHeight");
if (keyFile.has_key ("GUI", "PreferencesWidth")) preferencesWidth = keyFile.get_integer ("GUI", "PreferencesWidth");
if (keyFile.has_key ("GUI", "PreferencesHeight")) preferencesHeight = keyFile.get_integer ("GUI", "PreferencesHeight");
if (keyFile.has_key ("GUI", "SaveAsDialogWidth")) saveAsDialogWidth = keyFile.get_integer ("GUI", "SaveAsDialogWidth"); if (keyFile.has_key ("GUI", "SaveAsDialogWidth")) saveAsDialogWidth = keyFile.get_integer ("GUI", "SaveAsDialogWidth");
if (keyFile.has_key ("GUI", "SaveAsDialogHeight")) saveAsDialogHeight = keyFile.get_integer ("GUI", "SaveAsDialogHeight"); if (keyFile.has_key ("GUI", "SaveAsDialogHeight")) saveAsDialogHeight = keyFile.get_integer ("GUI", "SaveAsDialogHeight");
if (keyFile.has_key ("GUI", "ToolPanelWidth")) toolPanelWidth = keyFile.get_integer ("GUI", "ToolPanelWidth"); if (keyFile.has_key ("GUI", "ToolPanelWidth")) toolPanelWidth = keyFile.get_integer ("GUI", "ToolPanelWidth");
@ -394,6 +398,8 @@ int Options::saveToFile (Glib::ustring fname) {
keyFile.set_boolean ("GUI", "WindowMaximized", windowMaximized); 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", "PreferencesWidth", preferencesWidth);
keyFile.set_integer ("GUI", "PreferencesHeight", preferencesHeight);
keyFile.set_integer ("GUI", "SaveAsDialogWidth", saveAsDialogWidth); keyFile.set_integer ("GUI", "SaveAsDialogWidth", saveAsDialogWidth);
keyFile.set_integer ("GUI", "SaveAsDialogHeight", saveAsDialogHeight); keyFile.set_integer ("GUI", "SaveAsDialogHeight", saveAsDialogHeight);
keyFile.set_integer ("GUI", "ToolPanelWidth", toolPanelWidth); keyFile.set_integer ("GUI", "ToolPanelWidth", toolPanelWidth);

2
rtgui/options.h
View File

@ -75,6 +75,8 @@ class Options {
bool windowMaximized; bool windowMaximized;
int dirBrowserWidth; int dirBrowserWidth;
int dirBrowserHeight; int dirBrowserHeight;
int preferencesWidth;
int preferencesHeight;
int lastScale; int lastScale;
int lastCropSize; int lastCropSize;
bool fbOnlyRaw; bool fbOnlyRaw;

8
rtgui/preferences.cc
View File

@ -36,6 +36,7 @@ Preferences::Preferences (RTWindow *rtwindow):parent(rtwindow) {
// Do not increase height, since it's not visible on e.g. smaller netbook screens // Do not increase height, since it's not visible on e.g. smaller netbook screens
set_size_request (650, 600); set_size_request (650, 600);
set_default_size (options.preferencesWidth, options.preferencesHeight);
set_border_width (4); set_border_width (4);
Gtk::VBox* mainvb = get_vbox (); Gtk::VBox* mainvb = get_vbox ();
@ -88,6 +89,13 @@ Preferences::Preferences (RTWindow *rtwindow):parent(rtwindow) {
set_modal (true); set_modal (true);
} }
Preferences::~Preferences () {
options.preferencesWidth = get_width();
options.preferencesHeight = get_height();
}
Gtk::Widget* Preferences::getBatchProcPanel () { Gtk::Widget* Preferences::getBatchProcPanel () {
Gtk::VBox* mvbpp = Gtk::manage (new Gtk::VBox ()); Gtk::VBox* mvbpp = Gtk::manage (new Gtk::VBox ());

1
rtgui/preferences.h
View File

@ -133,6 +133,7 @@ class Preferences : public Gtk::Dialog {
public: public:
Preferences (RTWindow *rtwindow); Preferences (RTWindow *rtwindow);
~Preferences ();
void savePressed (); void savePressed ();
void loadPressed (); void loadPressed ();