Option to hide window decorations

[geeqie.git] / src / options.cc

diff --git a/src/options.cc b/src/options.cc
index a744f42..e03ce71 100644 (file)
--- a/src/options.cc
+++ b/src/options.cc
@@ -17,17 +17,32 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-#include "main.h"
 #include "options.h"
 
+#include <cstring>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "debug.h"
 #include "histogram.h" /* HCHAN_RGB */
 #include "image-overlay.h" /* OSD_SHOW_NOTHING */
-#include "layout.h"
+#include "intl.h"
 #include "layout-image.h"
+#include "layout.h"
+#include "main-defines.h"
+#include "misc.h"
 #include "rcfile.h"
 #include "ui-bookmark.h"
 #include "ui-fileops.h"
 
+namespace
+{
+
+constexpr gint DEFAULT_THUMB_WIDTH = 96;
+constexpr gint DEFAULT_THUMB_HEIGHT = 72;
+
+} // namespace
+
 ConfOptions *options;
 CommandLine *command_line;
 
@@ -63,6 +78,7 @@ ConfOptions *init_options(ConfOptions *options)
        options->save_window_workspace = FALSE;
        options->tools_restore_state = TRUE;
        options->save_dialog_window_positions = FALSE;
+       options->hide_window_decorations = FALSE;
        options->show_window_ids = FALSE;
 
        options->file_ops.confirm_delete = TRUE;
@@ -88,6 +104,7 @@ ConfOptions *init_options(ConfOptions *options)
        options->collections_duplicates = FALSE;
        options->collections_on_top = FALSE;
        options->hide_window_in_fullscreen = TRUE;
+       options->hide_osd_in_fullscreen = FALSE;
 
        memset(&options->image.border_color, 0, sizeof(options->image.border_color));
        memset(&options->image.alpha_color_1, 0, sizeof(options->image.alpha_color_1));
@@ -110,7 +127,7 @@ ConfOptions *init_options(ConfOptions *options)
        options->image.max_autofit_size = 100;
        options->image.max_enlargement_size = 900;
        options->image.max_window_size = 90;
-       options->image.scroll_reset_method = SCROLL_RESET_NOCHANGE;
+       options->image.scroll_reset_method = ScrollReset::NOCHANGE;
        options->image.tile_cache_max = 10;
        options->image.image_cache_max = 128; /* 4 x 10MPix */
        options->image.use_custom_border_color = FALSE;
@@ -169,6 +186,7 @@ ConfOptions *init_options(ConfOptions *options)
        options->show_star_rating = FALSE;
        options->show_predefined_keyword_tree = TRUE;
        options->expand_menu_toolbar = FALSE;
+       options->hamburger_menu = FALSE;
 
        options->slideshow.delay = 50;
        options->slideshow.random = FALSE;
@@ -176,8 +194,8 @@ ConfOptions *init_options(ConfOptions *options)
 
        options->thumbnails.cache_into_dirs = FALSE;
        options->thumbnails.enable_caching = TRUE;
-       options->thumbnails.max_height = DEFAULT_THUMB_HEIGHT;
        options->thumbnails.max_width = DEFAULT_THUMB_WIDTH;
+       options->thumbnails.max_height = DEFAULT_THUMB_HEIGHT;
        options->thumbnails.quality = GDK_INTERP_TILES;
        options->thumbnails.spec_standard = TRUE;
        options->thumbnails.use_xvpics = TRUE;
@@ -203,7 +221,7 @@ ConfOptions *init_options(ConfOptions *options)
        options->log_window.line_wrap = FALSE;
        options->log_window.paused = FALSE;
        options->log_window.timer_data = FALSE;
-       options->log_window.action = g_strdup("");
+       options->log_window.action = g_strdup("echo");
 
        options->read_metadata_in_idle = FALSE;
        options->star_rating.star = STAR_RATING_STAR;
@@ -216,7 +234,7 @@ ConfOptions *init_options(ConfOptions *options)
        options->printer.image_text_position = 1;
        options->printer.page_text_position = 3;
 
-       options->threads.duplicates = -1;
+       options->threads.duplicates = get_cpu_cores() - 1;
 
        options->disabled_plugins = nullptr;
 
@@ -341,8 +359,8 @@ LayoutOptions *init_layout_options(LayoutOptions *options)
        options->image_overlay.state = OSD_SHOW_NOTHING;
        options->animate = TRUE;
        options->bars_state.hidden = FALSE;
-       options->log_window.w = 520;
-       options->log_window.h = 400;
+       options->log_window.width = 520;
+       options->log_window.height = 400;
        options->preferences_window.w = 700;
        options->preferences_window.h = 600;
        options->split_pane_sync = FALSE;