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

[epiotr svn gnome org]

Author: epiotr
Date: Sat Sep  6 20:08:41 2008
New Revision: 2056
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2056&view=rev

Log:
Removal of root-dir icon

Removed:
   branches/gcmd-1-3/pixmaps/root_dir.xpm
Modified:
   branches/gcmd-1-3/ChangeLog
   branches/gcmd-1-3/pixmaps/Makefile.am
   branches/gcmd-1-3/src/gnome-cmd-file-selector.cc
   branches/gcmd-1-3/src/gnome-cmd-file-selector.h
   branches/gcmd-1-3/src/imageloader.cc

Modified: branches/gcmd-1-3/pixmaps/Makefile.am
==============================================================================
--- branches/gcmd-1-3/pixmaps/Makefile.am	(original)
+++ branches/gcmd-1-3/pixmaps/Makefile.am	Sat Sep  6 20:08:41 2008
@@ -24,7 +24,6 @@
 	overlay_umount.xpm \
 	parent_dir.xpm \
 	python.svg \
-	root_dir.xpm \
 	rotate-180-16.xpm \
 	rotate-270-16.xpm \
 	rotate-90-16.xpm \

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	Sat Sep  6 20:08:41 2008
@@ -1335,11 +1335,6 @@
     gtk_object_set_data_full (GTK_OBJECT (fs), "vol_label", fs->vol_label, (GtkDestroyNotify) gtk_widget_unref);
     gtk_misc_set_alignment (GTK_MISC (fs->vol_label), 1, 0.5);
 
-    // create the root button
-    fs->root_btn = create_styled_pixmap_button (NULL, IMAGE_get_gnome_cmd_pixmap (PIXMAP_ROOT_DIR));
-    gtk_object_set_data_full (GTK_OBJECT (fs), "root_btn", fs->root_btn, (GtkDestroyNotify) gtk_widget_unref);
-    GTK_WIDGET_UNSET_FLAGS (fs->root_btn, GTK_CAN_FOCUS);
-
     // create the directory indicator
     fs->dir_indicator = gnome_cmd_dir_indicator_new (fs);
     gtk_widget_ref (fs->dir_indicator);
@@ -1372,8 +1367,7 @@
     gtk_box_pack_start (GTK_BOX (vbox), padding, FALSE, TRUE, 0);
     gtk_box_pack_start (GTK_BOX (padding), fs->info_label, FALSE, TRUE, 6);
     gtk_box_pack_start (GTK_BOX (fs->con_hbox), fs->con_combo, FALSE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (fs->con_hbox), fs->vol_label, TRUE, TRUE, 0);
-    gtk_box_pack_start (GTK_BOX (fs->con_hbox), fs->root_btn, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (fs->con_hbox), fs->vol_label, TRUE, TRUE, 6);
 
     // initialize dnd
     init_dnd (fs);
@@ -1392,15 +1386,12 @@
     gtk_signal_connect (GTK_OBJECT (fs->file_list()), "key-press-event", GTK_SIGNAL_FUNC (on_list_key_pressed), fs);
     gtk_signal_connect (GTK_OBJECT (fs->file_list()), "key-press-event", GTK_SIGNAL_FUNC (on_list_key_pressed_private), fs);
 
-    gtk_signal_connect (GTK_OBJECT (fs->root_btn), "clicked", GTK_SIGNAL_FUNC (on_root_btn_clicked), fs);
-
     gtk_signal_connect (GTK_OBJECT (gnome_cmd_con_list_get ()), "list-changed", GTK_SIGNAL_FUNC (on_con_list_list_changed), fs);
 
     // show the widgets
     gtk_widget_show (GTK_WIDGET (vbox));
     fs->update_concombo_visibility();
     gtk_widget_show (fs->con_combo);
-    gtk_widget_show (fs->root_btn);
     gtk_widget_show (fs->vol_label);
     gtk_widget_show (fs->dir_indicator);
     gtk_widget_show (fs->scrolledwindow);

Modified: branches/gcmd-1-3/src/gnome-cmd-file-selector.h
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-file-selector.h	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-file-selector.h	Sat Sep  6 20:08:41 2008
@@ -47,7 +47,6 @@
     GtkWidget *con_btns_hbox;
     GtkWidget *con_hbox;
     GtkWidget *dir_indicator;
-    GtkWidget *root_btn;
     GtkWidget *dir_label;
     GtkWidget *scrolledwindow;
     GtkWidget *info_label;

Modified: branches/gcmd-1-3/src/imageloader.cc
==============================================================================
--- branches/gcmd-1-3/src/imageloader.cc	(original)
+++ branches/gcmd-1-3/src/imageloader.cc	Sat Sep  6 20:08:41 2008
@@ -63,7 +63,6 @@
                                                  "overlay_symlink.xpm",
                                                  "overlay_umount.xpm",
                                                  "parent_dir.xpm",
-                                                 "root_dir.xpm",
                                                  "toggle_vertical.xpm",
                                                  "toggle_horizontal.xpm",