gnome-commander r2052 - in branches/gcmd-1-3: . src

[epiotr svn gnome org]

Author: epiotr
Date: Fri Sep  5 17:22:45 2008
New Revision: 2052
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2052&view=rev

Log:
Code cleanup

Modified:
   branches/gcmd-1-3/NEWS
   branches/gcmd-1-3/src/gnome-cmd-data.cc
   branches/gcmd-1-3/src/gnome-cmd-data.h
   branches/gcmd-1-3/src/gnome-cmd-file-list.cc
   branches/gcmd-1-3/src/gnome-cmd-file-selector.cc
   branches/gcmd-1-3/src/gnome-cmd-file.h
   branches/gcmd-1-3/src/gnome-cmd-search-dialog.cc
   branches/gcmd-1-3/src/gnome-cmd-xfer.cc

Modified: branches/gcmd-1-3/NEWS
==============================================================================
--- branches/gcmd-1-3/NEWS	(original)
+++ branches/gcmd-1-3/NEWS	Fri Sep  5 17:22:45 2008
@@ -140,7 +140,7 @@
  * Fixed update after renaming without FAM
 
 New features:
- * New GNOME commander logo
+ * New GNOME Commander logo
  * Added internal F3 viewer
  * Copying selected filename(s) to clipboard
  * Inserting selected file full path to the cmdline when pressing CTRL+SHIFT+ENTER

Modified: branches/gcmd-1-3/src/gnome-cmd-data.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-data.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-data.cc	Fri Sep  5 17:22:45 2008
@@ -66,7 +66,6 @@
     gint                 list_row_height;
     gchar                *list_font;
     GnomeCmdRightMouseButtonMode right_mouse_button_mode;
-    gboolean             show_toolbar;
     guint                icon_size;
     guint                dev_icon_size;
     GdkInterpType        icon_scale_quality;
@@ -1203,7 +1202,6 @@
 
     gnome_cmd_data_set_int    ("/options/ext_disp_mode", data->priv->ext_disp_mode);
     gnome_cmd_data_set_int    ("/options/right_mouse_button_mode", data->priv->right_mouse_button_mode);
-    gnome_cmd_data_set_bool   ("/options/show_toolbar", data->priv->show_toolbar);
     gnome_cmd_data_set_int    ("/options/icon_size", data->priv->icon_size);
     gnome_cmd_data_set_int    ("/options/dev_icon_size", data->priv->dev_icon_size);
     gnome_cmd_data_set_int    ("/options/icon_scale_quality", data->priv->icon_scale_quality);
@@ -1426,7 +1424,6 @@
 
     data->priv->ext_disp_mode = (GnomeCmdExtDispMode) gnome_cmd_data_get_int ("/options/ext_disp_mode", GNOME_CMD_EXT_DISP_BOTH);
     data->priv->right_mouse_button_mode = (GnomeCmdRightMouseButtonMode) gnome_cmd_data_get_int ("/options/right_mouse_button_mode", RIGHT_BUTTON_POPUPS_MENU);
-    data->priv->show_toolbar = gnome_cmd_data_get_bool ("/options/show_toolbar", TRUE);
     data->priv->icon_size = gnome_cmd_data_get_int ("/options/icon_size", 16);
     data->priv->dev_icon_size = gnome_cmd_data_get_int ("/options/dev_icon_size", 16);
     data->priv->icon_scale_quality = (GdkInterpType) gnome_cmd_data_get_int ("/options/icon_scale_quality", GDK_INTERP_HYPER);
@@ -2046,19 +2043,6 @@
 }
 
 
-void gnome_cmd_data_set_show_toolbar (gboolean value)
-{
-    data->priv->show_toolbar = value;
-}
-
-
-gboolean
-gnome_cmd_data_get_show_toolbar (void)
-{
-    return data->priv->show_toolbar;
-}
-
-
 guint gnome_cmd_data_get_icon_size (void)
 {
     return data->priv->icon_size;

Modified: branches/gcmd-1-3/src/gnome-cmd-data.h
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-data.h	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-data.h	Fri Sep  5 17:22:45 2008
@@ -170,9 +170,6 @@
 
 gboolean gnome_cmd_data_get_use_gcmd_block (void);
 
-gboolean gnome_cmd_data_get_show_toolbar (void);
-void gnome_cmd_data_set_show_toolbar (gboolean value);
-
 guint gnome_cmd_data_get_icon_size (void);
 void gnome_cmd_data_set_icon_size (guint size);
 

Modified: branches/gcmd-1-3/src/gnome-cmd-file-list.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-file-list.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-file-list.cc	Fri Sep  5 17:22:45 2008
@@ -58,8 +58,8 @@
 enum
 {
     FILE_CLICKED,        // A file in the list was clicked
-    LIST_CLICKED,        // The file-list widget was clicked
-    EMPTY_SPACE_CLICKED, // The file-list was clicked but not on a file
+    LIST_CLICKED,        // The file list widget was clicked
+    EMPTY_SPACE_CLICKED, // The file list was clicked but not on a file
     SELECTION_CHANGED,   // At least on file was selected/unselected
     LAST_SIGNAL
 };
@@ -1810,7 +1810,7 @@
     for (GList *list = priv->visible_files.sort(priv->sort_func, this); list; list = list->next)
         add_file_to_clist (this, GNOME_CMD_FILE (list->data), -1);
 
-    // refocus the previously selected file if this file-list has the focus
+    // refocus the previously selected file if this file list has the focus
     if (selfile && GTK_WIDGET_HAS_FOCUS (this))
     {
         gint selrow = get_row_from_file (this, selfile);

Modified: branches/gcmd-1-3/src/gnome-cmd-file-selector.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-file-selector.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-file-selector.cc	Fri Sep  5 17:22:45 2008
@@ -909,7 +909,7 @@
 
     if (file_is_in_list (fs, f))
     {
-        gnome_cmd_file_invalidate_metadata (f);
+        gnome_cmd_file_invalidate_metadata (f);                 // FIXME: should be hadled in GnomeCmdDir, not here
         gnome_cmd_file_list_update_file (fs->file_list(), f);
         update_selected_files_label (fs);
     }
@@ -924,7 +924,7 @@
 
     if (file_is_in_list (fs, f))
     {
-        // gnome_cmd_file_invalidate_metadata (f, TAG_FILE);
+        // gnome_cmd_file_invalidate_metadata (f, TAG_FILE);    // FIXME: should be hadled in GnomeCmdDir, not here
         gnome_cmd_file_list_update_file (fs->file_list(), f);
 
         GnomeCmdFileList::ColumnID sort_col = GNOME_CMD_FILE_LIST (fs->file_list())->get_sort_column();

Modified: branches/gcmd-1-3/src/gnome-cmd-file.h
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-file.h	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-file.h	Fri Sep  5 17:22:45 2008
@@ -119,7 +119,7 @@
 void gnome_cmd_file_show_cap_copy (GnomeCmdFile *f);
 void gnome_cmd_file_show_cap_paste (GnomeCmdFile *f);
 
-//FIXME: These names suck when we have a class called GnomeCmdFileList...
+// FIXME: These names suck when we have a class called GnomeCmdFileList...
 GList *gnome_cmd_file_list_copy (GList *files);
 void gnome_cmd_file_list_free (GList *files);
 void gnome_cmd_file_list_ref (GList *files);

Modified: branches/gcmd-1-3/src/gnome-cmd-search-dialog.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-search-dialog.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-search-dialog.cc	Fri Sep  5 17:22:45 2008
@@ -60,8 +60,8 @@
 
 struct SearchData
 {
-    const gchar *name_pattern;              // the pattern that filenames should match to end up in the file-list
-    const gchar *content_pattern;           // the pattern that the content of a file should match to end up in the file-list
+    const gchar *name_pattern;              // the pattern that file names should match to end up in the file list
+    const gchar *content_pattern;           // the pattern that the content of a file should match to end up in the file list
     const gchar *dir;                       // the current dir of the search routine
 
     Filter *name_filter;

Modified: branches/gcmd-1-3/src/gnome-cmd-xfer.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-xfer.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-xfer.cc	Fri Sep  5 17:22:45 2008
@@ -259,7 +259,7 @@
 
     if (data->done)
     {
-        // Remove files from the source file-list when a move operation has finished
+        // Remove files from the source file list when a move operation has finished
         if (data->xferOptions & GNOME_VFS_XFER_REMOVESOURCE)
             if (data->src_fl && data->src_files)
             {
@@ -268,9 +268,9 @@
                     previous function used here:
                     gnome_cmd_file_list_remove_files (data->src_fl, data->src_files);
 
-                    After 'async_xfer_callback' has been called the file-list, 'src_files' has
+                    After 'async_xfer_callback' has been called the file list, 'src_files' has
                     not been altered and source files that have moved might be write protected.
-                    So we need to check if files that are to be removed from the file-list
+                    So we need to check if files that are to be removed from the file list
                     still exist.
 
                 *************************************************************************/