[gnome-commander] New color theme 'Simple'

[Uwe Scholz <uwescholz src gnome org>]

commit 5cfe94f446a28183f47980cc9cd219cfb23844f9
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Sun May 8 22:04:33 2016 +0200

    New color theme 'Simple'

 NEWS                                    |    1 +
 doc/C/releases.xml                      |    3 +++
 src/dialogs/gnome-cmd-options-dialog.cc |    9 +++++----
 src/gnome-cmd-data.cc                   |   22 ++++++++++++++++------
 src/gnome-cmd-types.h                   |    3 ++-
 5 files changed, 27 insertions(+), 11 deletions(-)
---
diff --git a/NEWS b/NEWS
index 89d78dc..2d215af 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ New features:
  * Button 'Edit files' accepts more than one selected file at the same time
  * Device buttons and device list entries act as 'home buttons' for that device when it is already active
  * Started usage of google test framework for unit tests
+ * New color theme 'Simple'
  * Code cleanup
 New or updated translations: 
      ...
diff --git a/doc/C/releases.xml b/doc/C/releases.xml
index 82ea2f8..5279814 100644
--- a/doc/C/releases.xml
+++ b/doc/C/releases.xml
@@ -59,6 +59,9 @@
                             <para>Started usage of google test framework for unit tests</para>
                         </listitem>
                         <listitem>
+                            <para>New color theme 'Simple'</para>
+                        </listitem>
+                        <listitem>
                             <para>Code cleanup</para>
                         </listitem>
                         <listitem>
diff --git a/src/dialogs/gnome-cmd-options-dialog.cc b/src/dialogs/gnome-cmd-options-dialog.cc
index 9792061..423e08d 100644
--- a/src/dialogs/gnome-cmd-options-dialog.cc
+++ b/src/dialogs/gnome-cmd-options-dialog.cc
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file gnome-cmd-options-dialog.cc
  * @copyright (C) 2001-2006 Marcus Bjurman\n
  * @copyright (C) 2007-2012 Piotr Eljasiak\n
@@ -69,7 +69,7 @@ inline GtkWidget *create_general_tab (GtkWidget *parent, GnomeCmdData::Options &
 {
     GtkWidget *frame, *hbox, *vbox, *cat, *cat_box;
     GtkWidget *radio, *check;
-    
+
     frame = create_tabframe (parent);
     hbox = create_tabhbox (parent);
     gtk_container_add (GTK_CONTAINER (frame), hbox);
@@ -82,7 +82,7 @@ inline GtkWidget *create_general_tab (GtkWidget *parent, GnomeCmdData::Options &
     /* the policy is one of GTK_POLICY AUTOMATIC, or GTK_POLICY_ALWAYS.
      * GTK_POLICY_AUTOMATIC will automatically decide whether you need
      * scrollbars, whereas GTK_POLICY_ALWAYS will always leave the scrollbars
-     * there.  The first one is the horizontal scrollbar, the second, 
+     * there.  The first one is the horizontal scrollbar, the second,
      * the vertical. */
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
                                     GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
@@ -709,6 +709,7 @@ inline GtkWidget *create_layout_tab (GtkWidget *parent, GnomeCmdData::Options &c
         _("Deep blue"),
         _("Cafezinho"),
         _("Green tiger"),
+        _("Simple"),
         _("Custom"),
         NULL
     };
@@ -2105,7 +2106,7 @@ gboolean gnome_cmd_options_dialog (GtkWindow *parent, GnomeCmdData::Options &cfg
     notebook->append_page(create_programs_tab (dialog, cfg), _("Programs"));
     notebook->append_page(create_devices_tab (dialog, cfg), _("Devices"));
 
-    // open the tab which was actinve when closing the options notebook last time 
+    // open the tab which was actinve when closing the options notebook last time
     notebook->set_current_page (activetab);
 
 #if GTK_CHECK_VERSION (2, 14, 0)
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index c169889..643bc19 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file gnome-cmd-data.cc
  * @copyright (C) 2001-2006 Marcus Bjurman\n
  * @copyright (C) 2007-2012 Piotr Eljasiak\n
@@ -484,7 +484,7 @@ static void save_fav_apps (const gchar *fname)
            g_free (group_name);
         }
     }
-    
+
     gcmd_key_file_save_to_file (path, key_file);
 
     g_key_file_free(key_file);
@@ -1020,7 +1020,7 @@ static void load_fav_apps (const gchar *fname)
 /**
  * This function reads the given file and sets up favourite applications
  * by filling gnome_cmd_data.options.fav_apps.
- * 
+ *
  * @note Beginning with gcmd-v1.6 GKeyFile is used for storing and
  * loading configuration files. For compatibility reasons, this
  * functions tries to load favourite applications from the given file
@@ -1030,12 +1030,12 @@ static void load_fav_apps (const gchar *fname)
  * backup configuration is stored in @c fav-apps.backup in the old file
  * format. If the result is no, then nothing happens and FALSE is
  * returned.
- * 
+ *
  * @note In later versions of gcmd (later than v1.6), this function
  * might be removed, because when saving the configuration in @link
  * save_fav_apps() @endlink, GKeyFile is used and the old file
  * format isn't used anymore.
- * 
+ *
  * @returns FALSE if the very first letter of the given file is not
  * alphanumeric and TRUE if it is alphanumeric.
  */
@@ -1411,6 +1411,16 @@ void GnomeCmdData::load()
     options.color_themes[GNOME_CMD_COLOR_GREEN_TIGER].curs_fg = gdk_color_new (0,0,0);
     options.color_themes[GNOME_CMD_COLOR_GREEN_TIGER].curs_bg = gdk_color_new (0xaaaa,0xaaaa,0xaaaa);
 
+    options.color_themes[GNOME_CMD_COLOR_SIMPLE].respect_theme = FALSE;
+    options.color_themes[GNOME_CMD_COLOR_SIMPLE].norm_fg = gdk_color_new (0,0,0);
+    options.color_themes[GNOME_CMD_COLOR_SIMPLE].norm_bg = gdk_color_new (0xffff,0xffff,0xffff);
+    options.color_themes[GNOME_CMD_COLOR_SIMPLE].alt_fg = gdk_color_new (0,0,0);
+    options.color_themes[GNOME_CMD_COLOR_SIMPLE].alt_bg = gdk_color_new (0xf0f0, 0xf0f0, 0xf0f0);
+    options.color_themes[GNOME_CMD_COLOR_SIMPLE].sel_fg = gdk_color_new (0,0,0xffff);
+    options.color_themes[GNOME_CMD_COLOR_SIMPLE].sel_bg = gdk_color_new (0xc8c8,0xc8c8,0xc8c8);
+    options.color_themes[GNOME_CMD_COLOR_SIMPLE].curs_fg = gdk_color_new (0,0,0);
+    options.color_themes[GNOME_CMD_COLOR_SIMPLE].curs_bg = gdk_color_new (0,0xffff,0xffff);
+
     options.color_themes[GNOME_CMD_COLOR_NONE].respect_theme = TRUE;
     options.color_themes[GNOME_CMD_COLOR_NONE].norm_fg = NULL;
     options.color_themes[GNOME_CMD_COLOR_NONE].norm_bg = NULL;
@@ -1858,7 +1868,7 @@ void GnomeCmdData::load_more()
 {
     if (load_fav_apps_old ("fav-apps") == FALSE)
        load_fav_apps("fav-apps");
-    
+
     if (!XML_cfg_has_bookmarks)
     {
         load_local_bookmarks();
diff --git a/src/gnome-cmd-types.h b/src/gnome-cmd-types.h
index b6b2b11..996cb3a 100644
--- a/src/gnome-cmd-types.h
+++ b/src/gnome-cmd-types.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file gnome-cmd-types.h
  * @copyright (C) 2001-2006 Marcus Bjurman\n
  * @copyright (C) 2007-2012 Piotr Eljasiak\n
@@ -74,6 +74,7 @@ enum GnomeCmdColorMode
     GNOME_CMD_COLOR_DEEP_BLUE,
     GNOME_CMD_COLOR_CAFEZINHO,
     GNOME_CMD_COLOR_GREEN_TIGER,
+    GNOME_CMD_COLOR_SIMPLE,
     GNOME_CMD_COLOR_CUSTOM,
     GNOME_CMD_NUM_COLOR_MODES
 };