ports/mc
ports/mc
1
1
Форкнуть 0
Код Релизы 2 Активность

1998-12-11 Matt Wilson <msw@redhat.com>

Просмотр исходного кода 
* gscreen.c: The solid lines in the tree are kinda harsh.  Replace
	them with soothing dotted lines.
Этот коммит содержится в:
msw 1998-12-11 23:10:15 +00:00
родитель 61619aac90
Коммит 4a445469be
2 изменённых файлов: 199 добавлений и 198 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

236
gnome/ChangeLog
Просмотреть файл

@ -1,3 +1,8 @@
1998-12-11 Matt Wilson <msw@redhat.com>
* gscreen.c: The solid lines in the tree are kinda harsh. Replace
them with soothing dotted lines.
1998-12-11 Matt Wilson <msw@redhat.com> 1998-12-11 Matt Wilson <msw@redhat.com>
* dir-open.xpm, dir-close.xpm: Away with the tacky yellow folders - * dir-open.xpm, dir-close.xpm: Away with the tacky yellow folders -
@ -11,7 +16,7 @@
1998-12-11 Owen Taylor <otaylor@redhat.com> 1998-12-11 Owen Taylor <otaylor@redhat.com>
* gscreen.c gdesktop.c gdnd.h: enable dragging locale files * gscreen.c gdesktop.c gdnd.h: enable dragging locale files
into Netscape. into Netscape.
1998-12-11 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-12-11 Federico Mena Quintero <federico@nuclecu.unam.mx>
@ -76,7 +81,7 @@
* gdesktop.c (editing_started): Grab on the window for the * gdesktop.c (editing_started): Grab on the window for the
icon, not on the canvas, so we can properly detect icon, not on the canvas, so we can properly detect
clicks elsewhere. clicks elsewhere.
(icon_button_release_after): When the user stops selecting, (icon_button_release_after): When the user stops selecting,
regrab the pointer. regrab the pointer.
@ -159,7 +164,7 @@ Thu Dec 10 21:38:55 1998 Owen Taylor <otaylor@redhat.com>
* gscreen.c (panel_icon_list_select_icon): Middle button opens a * gscreen.c (panel_icon_list_select_icon): Middle button opens a
new panel on a directory. new panel on a directory.
1998-12-08 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-12-08 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gdesktop.c: Moved the old DnD cruft to olddnd.c to keep it there * gdesktop.c: Moved the old DnD cruft to olddnd.c to keep it there
@ -179,10 +184,10 @@ Thu Dec 10 21:38:55 1998 Owen Taylor <otaylor@redhat.com>
1998-12-08 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-12-08 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gtkdtree.c (gtk_dtree_new): Use imlib's visual and colormap. * gtkdtree.c (gtk_dtree_new): Use imlib's visual and colormap.
* gscreen.c (panel_create_tree_view): Use the colormap and visual * gscreen.c (panel_create_tree_view): Use the colormap and visual
from imlib when creating the DTree, from imlib when creating the DTree,
1998-12-08 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-12-08 Federico Mena Quintero <federico@nuclecu.unam.mx>
@ -258,7 +263,7 @@ Thu Dec 10 21:38:55 1998 Owen Taylor <otaylor@redhat.com>
1998-12-04 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-12-04 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gscreen.c (load_imlib_icons): Make it use the new gicon files. * gscreen.c (load_imlib_icons): Make it use the new gicon files.
* gicon.c, gicon.h: New files: they keep an image cache and * gicon.c, gicon.h: New files: they keep an image cache and
provide the right icon to use based on the filename. They use the provide the right icon to use based on the filename. They use the
@ -266,7 +271,7 @@ Thu Dec 10 21:38:55 1998 Owen Taylor <otaylor@redhat.com>
keys for per-image icons. keys for per-image icons.
* gdialogs.c (file_mask_dialog): Commented the help messages until * gdialogs.c (file_mask_dialog): Commented the help messages until
the warnings are figured out. the warnings are figured out.
1998-12-04 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-12-04 Federico Mena Quintero <federico@nuclecu.unam.mx>
@ -298,7 +303,7 @@ Thu Dec 10 21:38:55 1998 Owen Taylor <otaylor@redhat.com>
* gblist.c (blist_select_row): Warning fixes. * gblist.c (blist_select_row): Warning fixes.
* olddnd.c: Moved the old DND code here for reference purposes. * olddnd.c: Moved the old DND code here for reference purposes.
* gscreen.c: Made the tree a drag source. * gscreen.c: Made the tree a drag source.
@ -357,7 +362,7 @@ Thu Dec 10 21:38:55 1998 Owen Taylor <otaylor@redhat.com>
queue an open-directory event. queue an open-directory event.
(panel_tree_scroll): Scroll the tree when the drag pointer is in (panel_tree_scroll): Scroll the tree when the drag pointer is in
one of the boundaries of the tree. one of the boundaries of the tree.
(panel_tree_scrolling_is_desirable): new function to figure out if (panel_tree_scrolling_is_desirable): new function to figure out if
it is a good plan to scroll the tree view instead of opening it. it is a good plan to scroll the tree view instead of opening it.
@ -429,8 +434,8 @@ Thu Dec 10 21:38:55 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.in: now handles gdialogs* * Makefile.in: now handles gdialogs*
* gdialogs.h: * gdialogs.h:
* gdialogs.c:Added new files -- takes the place of ../src/filegui.* * gdialogs.c:Added new files -- takes the place of ../src/filegui.*
1998-12-01 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-12-01 Miguel de Icaza <miguel@nuclecu.unam.mx>
@ -466,9 +471,9 @@ Thu Dec 10 21:38:55 1998 Owen Taylor <otaylor@redhat.com>
1998-11-28 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-11-28 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gwidget.c (x_update_input): Use gtk_editable_changed on the entry. * gwidget.c (x_update_input): Use gtk_editable_changed on the entry.
(x_create_listbox): Fix more CList api change. (x_create_listbox): Fix more CList api change.
* gscreen.c (CLIST_FROM_SW): Adapt to new GtkScrolledWindow * gscreen.c (CLIST_FROM_SW): Adapt to new GtkScrolledWindow
inheritance. inheritance.
1998-11-27 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-11-27 Miguel de Icaza <miguel@nuclecu.unam.mx>
@ -477,7 +482,7 @@ Thu Dec 10 21:38:55 1998 Owen Taylor <otaylor@redhat.com>
* gdesktop.c (check_window_in_one_panel): Provide better error * gdesktop.c (check_window_in_one_panel): Provide better error
messages here for debugging purposes. messages here for debugging purposes.
Disable stubs for filegui.c until they are actually implemented. Disable stubs for filegui.c until they are actually implemented.
I need to debug stuff. I need to debug stuff.
@ -491,7 +496,7 @@ Thu Dec 10 21:38:55 1998 Owen Taylor <otaylor@redhat.com>
Put the ministatus inside an hbox, and use Put the ministatus inside an hbox, and use
gtk_container_set_resize_mode in this hbox to stop any queue gtk_container_set_resize_mode in this hbox to stop any queue
events from being propagated up in the hierachy of widgets events from being propagated up in the hierachy of widgets
This kills all of the CList/GnomeIconList/Scrollbar/Toolbar This kills all of the CList/GnomeIconList/Scrollbar/Toolbar
flickering now. flickering now.
@ -500,7 +505,7 @@ Thu Dec 10 21:38:55 1998 Owen Taylor <otaylor@redhat.com>
* gtree.c: More work on gtree. It is basically ready to stick * gtree.c: More work on gtree. It is basically ready to stick
into gmc-window.c/mc I just need to know when you are ready into gmc-window.c/mc I just need to know when you are ready
Federico. Federico.
1998-11-25 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-11-25 Federico Mena Quintero <federico@nuclecu.unam.mx>
@ -531,7 +536,7 @@ Thu Dec 10 21:38:55 1998 Owen Taylor <otaylor@redhat.com>
1998-11-23 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-11-23 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gwidget.c (x_list_insert): Make it work with the new CList * gwidget.c (x_list_insert): Make it work with the new CList
policies. policies.
1998-11-23 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-11-23 Federico Mena Quintero <federico@nuclecu.unam.mx>
@ -613,7 +618,7 @@ Thu Dec 10 21:38:55 1998 Owen Taylor <otaylor@redhat.com>
1998-11-04 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-11-04 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gdesktop.c (editing_started): * gdesktop.c (editing_started):
(editing_stopped): New functions to install and remove (editing_stopped): New functions to install and remove
pointer/keyboard grabs while icons are being edited, pointer/keyboard grabs while icons are being edited,
respectively. respectively.
@ -682,7 +687,7 @@ Thu Dec 10 21:38:55 1998 Owen Taylor <otaylor@redhat.com>
* gscreen.c (panel_icon_list_button_release): Remove unused * gscreen.c (panel_icon_list_button_release): Remove unused
variable. variable.
Provide hand written CList-start drag code Provide hand written CList-start drag code
1998-10-30 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-10-30 Federico Mena Quintero <federico@nuclecu.unam.mx>
@ -768,25 +773,25 @@ Thu Dec 10 21:38:55 1998 Owen Taylor <otaylor@redhat.com>
1998-10-20 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-10-20 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gscreen.c (x_select_item): Force a canvas update when an icon * gscreen.c (x_select_item): Force a canvas update when an icon
has been selected. has been selected.
1998-10-19 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-10-19 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gscreen.c (panel_drag_data_get): New routine to provide data * gscreen.c (panel_drag_data_get): New routine to provide data
with the new DnD protocol. with the new DnD protocol.
* gmain.c (dialog_key_pressed): If an icon has the focus, then do * gmain.c (dialog_key_pressed): If an icon has the focus, then do
not process any of our events. not process any of our events.
Only stop the signal if we actually handled the event. Only stop the signal if we actually handled the event.
(dialog_key_pressed): (dialog_key_pressed):
1998-10-14 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-10-14 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gscreen.c (panel_icon_renamed): Add support for renaming files. * gscreen.c (panel_icon_renamed): Add support for renaming files.
1998-10-13 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-10-13 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gscreen.c: Use the new icon list. * gscreen.c: Use the new icon list.
1998-09-25 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-09-25 Miguel de Icaza <miguel@nuclecu.unam.mx>
@ -835,7 +840,7 @@ Wed Aug 19 19:45:16 EDT 1998 The Rasterman <raster@redhat.com>
1998-06-22 Manish Vachharajani <mvachhar@vger.rutgers.edu> 1998-06-22 Manish Vachharajani <mvachhar@vger.rutgers.edu>
* gwidget.c: Don't call gtk_entry_scroll_adjust, it is a private member * gwidget.c: Don't call gtk_entry_scroll_adjust, it is a private member
1998-06-02 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-06-02 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gdesktop.c (drop_cb): Mhm. Negotiation of the drop type was not * gdesktop.c (drop_cb): Mhm. Negotiation of the drop type was not
@ -871,7 +876,7 @@ Sun May 31 13:19:59 1998 Norbert Warmuth <k3190@fh-sw.de>
1998-05-25 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-05-25 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gwidget.c (entry_release): Enhanced our marked handler for input * gwidget.c (entry_release): Enhanced our marked handler for input
lines. lines.
* gdesktop.c (desktop_create_directory_entry): Fix, make a * gdesktop.c (desktop_create_directory_entry): Fix, make a
g_strdup copy of the name. Fixes bug report #78. g_strdup copy of the name. Fixes bug report #78.
@ -881,26 +886,26 @@ Sun May 31 13:19:59 1998 Norbert Warmuth <k3190@fh-sw.de>
1998-05-24 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-05-24 Miguel de Icaza <miguel@nuclecu.unam.mx>
* glayout.c: Move the New window menu entry from ``Window'' to * glayout.c: Move the New window menu entry from ``Window'' to
``File''. ``File''.
* gwidget.c (x_unfocus_widget): Fix wartning. * gwidget.c (x_unfocus_widget): Fix wartning.
* glayout.c (set_hintbar): Call flush events after setting the * glayout.c (set_hintbar): Call flush events after setting the
hintbar. hintbar.
1998-05-22 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-05-22 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gwidget.c (x_create_input): Disable the use of the GNOME entries * gwidget.c (x_create_input): Disable the use of the GNOME entries
for now, as they are very slow. We need to figure out what is for now, as they are very slow. We need to figure out what is
wrong with this. wrong with this.
With this change, dialog boxes close quickly instead of taking With this change, dialog boxes close quickly instead of taking
ages to close. ages to close.
* gscreen.c, gdesktop.c (file_popup_add_context, file_popup): * gscreen.c, gdesktop.c (file_popup_add_context, file_popup):
Share the context menu code in gdesktop.c and gscreen.c. The Share the context menu code in gdesktop.c and gscreen.c. The
desktop pop up menus now include all of the stuff that would have desktop pop up menus now include all of the stuff that would have
appeared in the Panel. appeared in the Panel.
* gdesktop.c (desktop_icon_remove): Remove the file associated * gdesktop.c (desktop_icon_remove): Remove the file associated
with this desktop entry if it is on the ~/desktop directory. with this desktop entry if it is on the ~/desktop directory.
@ -909,7 +914,7 @@ Sun May 31 13:19:59 1998 Norbert Warmuth <k3190@fh-sw.de>
* gscreen.c (load_dnd_icons): Remove the code and the icons that * gscreen.c (load_dnd_icons): Remove the code and the icons that
we had here privately. Use new gnome-stock functionality we had here privately. Use new gnome-stock functionality
instead. instead.
1998-05-20 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-05-20 Miguel de Icaza <miguel@nuclecu.unam.mx>
@ -918,10 +923,10 @@ Sun May 31 13:19:59 1998 Norbert Warmuth <k3190@fh-sw.de>
New drag request type: file:ALL. If the user is looking at a New drag request type: file:ALL. If the user is looking at a
remote site, and the target application does not have VFS support remote site, and the target application does not have VFS support
it should not list url:ALL but file:ALL as the accepted drop it should not list url:ALL but file:ALL as the accepted drop
type. type.
This will make copies of the remote files and pass the files to This will make copies of the remote files and pass the files to
the application. the application.
1998-05-20 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-05-20 Federico Mena Quintero <federico@nuclecu.unam.mx>
@ -946,7 +951,7 @@ Sun May 31 13:19:59 1998 Norbert Warmuth <k3190@fh-sw.de>
* gprop.c (perm_owner_new): Forget about history for now. * gprop.c (perm_owner_new): Forget about history for now.
* gpageprop.c (item_properties), gprop.c: Add executable editing * gpageprop.c (item_properties), gprop.c: Add executable editing
(command, and terminal). Save the dentry after modification (command, and terminal). Save the dentry after modification
1998-05-19 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-05-19 Miguel de Icaza <miguel@nuclecu.unam.mx>
@ -957,7 +962,7 @@ Sun May 31 13:19:59 1998 Norbert Warmuth <k3190@fh-sw.de>
(desktop_setup_icon): Fix memory leak. (desktop_setup_icon): Fix memory leak.
(get_desktop_icon): Fix memory leak. (get_desktop_icon): Fix memory leak.
(desktop_create_directory_entry): Set the size of the exec (desktop_create_directory_entry): Set the size of the exec
vector. vector.
(desktop_create_launch_entry): Same. (desktop_create_launch_entry): Same.
We now create launch entries instead of trying to support We now create launch entries instead of trying to support
@ -972,7 +977,7 @@ Sun May 31 13:19:59 1998 Norbert Warmuth <k3190@fh-sw.de>
1998-05-15 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-05-15 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gscreen.c (create_popup_submenu): Use continue, not break on * gscreen.c (create_popup_submenu): Use continue, not break on
this loop. this loop.
Sat May 16 02:29:51 1998 Tom Tromey <tromey@cygnus.com> Sat May 16 02:29:51 1998 Tom Tromey <tromey@cygnus.com>
@ -1009,7 +1014,7 @@ Thu May 14 02:02:56 1998 Norbert Warmuth <k3190@fh-sw.de>
1998-05-09 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-05-09 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gtrans.c (set_window_text): draw pixmaps without transparency * gtrans.c (set_window_text): draw pixmaps without transparency
correctly. correctly.
1998-05-07 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-05-07 Miguel de Icaza <miguel@nuclecu.unam.mx>
@ -1023,33 +1028,33 @@ Thu May 14 02:02:56 1998 Norbert Warmuth <k3190@fh-sw.de>
(x_create_panel): Change in the approach: we create both of the (x_create_panel): Change in the approach: we create both of the
widget views at creation time and we now carefully show every widget views at creation time and we now carefully show every
component. I attach everything to the table, but not necesarly component. I attach everything to the table, but not necesarly
show it. show it.
* gblist.c (blist_select_row): New widget derived from GtkClist. * gblist.c (blist_select_row): New widget derived from GtkClist.
replace select_row and unselect_row with null functions, as the replace select_row and unselect_row with null functions, as the
gmc code takes care of the rest. gmc code takes care of the rest.
1998-05-04 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-05-04 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gdesktop.c (desktop_icon_drag_start): Do not attempt to use * gdesktop.c (desktop_icon_drag_start): Do not attempt to use
icons if we could not load the images for the icon. icons if we could not load the images for the icon.
* gwidget.c (x_update_input): Keep the cursor always visible. * gwidget.c (x_update_input): Keep the cursor always visible.
* gview.c (view): Use a buttonbar widget. * gview.c (view): Use a buttonbar widget.
* gwidget.c (buttonbar_clicked): Provide a trivial implementation * gwidget.c (buttonbar_clicked): Provide a trivial implementation
of the buttonbar that only responds to key sequences. of the buttonbar that only responds to key sequences.
* gmain.c (dialog_panel_callback): Call midnight_callback to get * gmain.c (dialog_panel_callback): Call midnight_callback to get
the main bindings working. the main bindings working.
* gdesktop.c (perform_drop_manually): Use p to walk the dropped * gdesktop.c (perform_drop_manually): Use p to walk the dropped
data. This is an important bug fix. data. This is an important bug fix.
* gmain.c (idle_destroy_window), main.c: Session management now * gmain.c (idle_destroy_window), main.c: Session management now
supports not showing a toplevel window (in case all of the windows supports not showing a toplevel window (in case all of the windows
were closed). were closed).
1998-04-30 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-04-30 Miguel de Icaza <miguel@nuclecu.unam.mx>
@ -1063,9 +1068,9 @@ Thu May 14 02:02:56 1998 Norbert Warmuth <k3190@fh-sw.de>
more than one panel at once. This is not a gmc bug, it appears to more than one panel at once. This is not a gmc bug, it appears to
be an Imlib/gtk/gdk interaction. I am for now creating one panel be an Imlib/gtk/gdk interaction. I am for now creating one panel
in the main program execution thread and the rest during the idle in the main program execution thread and the rest during the idle
handler. handler.
(session_save_state): Added session management support. (session_save_state): Added session management support.
1998-04-29 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-04-29 Federico Mena Quintero <federico@nuclecu.unam.mx>
@ -1074,10 +1079,10 @@ Thu May 14 02:02:56 1998 Norbert Warmuth <k3190@fh-sw.de>
1998-04-29 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-04-29 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gdesktop.c: Finish desktop_icon_remove implementation. * gdesktop.c: Finish desktop_icon_remove implementation.
* glayout.c (update_panels): GNOME specific Implementation of the * glayout.c (update_panels): GNOME specific Implementation of the
update_panels routine. update_panels routine.
Tue Apr 28 06:52:24 1998 Norbert Warmuth <k3190@fh-sw.de> Tue Apr 28 06:52:24 1998 Norbert Warmuth <k3190@fh-sw.de>
@ -1087,15 +1092,15 @@ Tue Apr 28 06:52:24 1998 Norbert Warmuth <k3190@fh-sw.de>
1998-04-27 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-04-27 Miguel de Icaza <miguel@nuclecu.unam.mx>
* glayout.c (layout_panel_gone): Removed debugging information. * glayout.c (layout_panel_gone): Removed debugging information.
Renamed "Panel" to "Window" to make it less confusing to users. Renamed "Panel" to "Window" to make it less confusing to users.
Moved the "New window" from the "File" menu to the "Window" menu. Moved the "New window" from the "File" menu to the "Window" menu.
* gmain.c (dialog_panel_callback): Walk the list of panels to * gmain.c (dialog_panel_callback): Walk the list of panels to
determine to which panel the activated widget belongs. determine to which panel the activated widget belongs.
1998-04-24 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-04-24 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gwidget.c (x_create_radio): Fix the WRadio widgets. * gwidget.c (x_create_radio): Fix the WRadio widgets.
1998-04-21 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-04-21 Miguel de Icaza <miguel@nuclecu.unam.mx>
@ -1116,10 +1121,10 @@ Tue Apr 28 06:52:24 1998 Norbert Warmuth <k3190@fh-sw.de>
* gwidget.c (x_dialog_stop): Only call gtk_main_quit if this * gwidget.c (x_dialog_stop): Only call gtk_main_quit if this
dialog did not inlcude the DLG_GNOME_APP flag, as those windows dialog did not inlcude the DLG_GNOME_APP flag, as those windows
did not launch a gtk_main event loop. did not launch a gtk_main event loop.
* gcmd.c: Try various terminal programs in the PATH before giving * gcmd.c: Try various terminal programs in the PATH before giving
up up
* glayout.c: Unselect command is unselect_cmd, not select_cmd * glayout.c: Unselect command is unselect_cmd, not select_cmd
* gcmd.c (gnome_quit_cmd): Add quit confirmation. * gcmd.c (gnome_quit_cmd): Add quit confirmation.
@ -1143,10 +1148,10 @@ Tue Apr 28 06:52:24 1998 Norbert Warmuth <k3190@fh-sw.de>
not display the special Hotkey specificator. not display the special Hotkey specificator.
* gcmd.c (gnome_close_panel): Implement the close-the-panel * gcmd.c (gnome_close_panel): Implement the close-the-panel
functionality. functionality.
* gscreen.c (x_panel_destroy): Implement the gnome mode way of * gscreen.c (x_panel_destroy): Implement the gnome mode way of
destroying the panel. destroying the panel.
* gview.c (view_status): Add cacheing of the information status, * gview.c (view_status): Add cacheing of the information status,
to avoid excessive flicker. It would be better if GtkLabel did to avoid excessive flicker. It would be better if GtkLabel did
@ -1156,12 +1161,12 @@ Tue Apr 28 06:52:24 1998 Norbert Warmuth <k3190@fh-sw.de>
contents. This displays the scrollbar correctly. contents. This displays the scrollbar correctly.
* gwidget.c (x_listbox_select_nth): This may be invoked before the * gwidget.c (x_listbox_select_nth): This may be invoked before the
widget has been created, work around this problem. widget has been created, work around this problem.
* gscreen.c (show_dir): Set the title bar for the window to the * gscreen.c (show_dir): Set the title bar for the window to the
current directoy. Reported by both Mike and Elliot. current directoy. Reported by both Mike and Elliot.
* layout: Updated to the new hotlist dialog box. * layout: Updated to the new hotlist dialog box.
1998-04-15 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-04-15 Federico Mena Quintero <federico@nuclecu.unam.mx>
@ -1173,7 +1178,7 @@ Tue Apr 28 06:52:24 1998 Norbert Warmuth <k3190@fh-sw.de>
* gview.c (x_init_view): Initialize view->sadj. * gview.c (x_init_view): Initialize view->sadj.
* gdesktop.c (start_desktop): use destkop_load instead of * gdesktop.c (start_desktop): use destkop_load instead of
desktop_reload. desktop_reload.
(desktop_load): This reloads + shows every widget on the (desktop_load): This reloads + shows every widget on the
desktop_icons list. desktop_icons list.
@ -1190,16 +1195,16 @@ Tue Apr 28 06:52:24 1998 Norbert Warmuth <k3190@fh-sw.de>
Fri Apr 12 02:40:41 1998 Norbert Warmuth <k3190@fh-sw.de> Fri Apr 12 02:40:41 1998 Norbert Warmuth <k3190@fh-sw.de>
* gwidget.c (x_create_input): return 1 if the widget has been * gwidget.c (x_create_input): return 1 if the widget has been
initialized manually (there was no return value) initialized manually (there was no return value)
(x_create_buttonbar): to few arguments to sprintf (button number (x_create_buttonbar): to few arguments to sprintf (button number
was missing); return a value. was missing); return a value.
1998-04-08 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-04-08 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gscreen.c (x_create_panel): Added back and forward buttons. I * gscreen.c (x_create_panel): Added back and forward buttons. I
need a "Home" icon too. need a "Home" icon too.
* gwidget.c (x_create_input): Make the selection if the input has * gwidget.c (x_create_input): Make the selection if the input has
not yet been touched. not yet been touched.
@ -1207,16 +1212,16 @@ Fri Apr 12 02:40:41 1998 Norbert Warmuth <k3190@fh-sw.de>
* gscreen.c (panel_action_open): If opening an item fails, try * gscreen.c (panel_action_open): If opening an item fails, try
panel_action_open_with. panel_action_open_with.
* gview.c: Implement the viewer scrollbar. * gview.c: Implement the viewer scrollbar.
1998-04-07 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-04-07 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gscreen.c (panel_drop_data_available): Reload the panel contents * gscreen.c (panel_drop_data_available): Reload the panel contents
upon a drop. upon a drop.
* gmain.c (gnome_dlg_send_destroy): Hide the widgets just before * gmain.c (gnome_dlg_send_destroy): Hide the widgets just before
they are going to get destroyed, to avoid the shutdown they are going to get destroyed, to avoid the shutdown
flickering. flickering.
(x_destroy_dlg_start): New routine/hook invoked when the destroy (x_destroy_dlg_start): New routine/hook invoked when the destroy
has just started has just started
(x_set_idle): Cancel the idle handlers properly. (x_set_idle): Cancel the idle handlers properly.
@ -1234,7 +1239,7 @@ Fri Apr 12 02:40:41 1998 Norbert Warmuth <k3190@fh-sw.de>
* gcache.c: Added an Image cache for all of the imlib-loaded * gcache.c: Added an Image cache for all of the imlib-loaded
images to avoid destroying/reloading the images. images to avoid destroying/reloading the images.
* gdesktop.c, gtrans.c: Use the image cache. * gdesktop.c, gtrans.c: Use the image cache.
1998-03-24 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-03-24 Miguel de Icaza <miguel@nuclecu.unam.mx>
@ -1246,10 +1251,10 @@ Fri Apr 12 02:40:41 1998 Norbert Warmuth <k3190@fh-sw.de>
1998-03-23 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-03-23 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gscreen.c (x_fill_panel): Colors are properly displayed now. * gscreen.c (x_fill_panel): Colors are properly displayed now.
Use the clipped labels. Use the clipped labels.
* gcliplabel.c, gcliplabel.h: Derived label that does label * gcliplabel.c, gcliplabel.h: Derived label that does label
clipping (it does not request the allocation for the whole string, clipping (it does not request the allocation for the whole string,
but settles with whatever is provided in the size_allocation). but settles with whatever is provided in the size_allocation).
@ -1268,7 +1273,7 @@ Mon Mar 23 01:40:35 1998 Norbert Warmuth <k3190@fh-sw.de>
1998-03-20 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-03-20 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gdesktop.c (icon_properties): * gdesktop.c (icon_properties):
* gpageprop.c (item_properties): Modified to accept dentry title * gpageprop.c (item_properties): Modified to accept dentry title
changes as well. changes as well.
(item_properties): Fixed base and fname confusion in call to (item_properties): Fixed base and fname confusion in call to
@ -1294,7 +1299,7 @@ Mon Mar 23 01:40:35 1998 Norbert Warmuth <k3190@fh-sw.de>
1998-03-19 Miguel de Icaza <miguel@nuclecu.unam.mx> 1998-03-19 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gscreen.c (display_mini_info): Implement mini status. * gscreen.c (display_mini_info): Implement mini status.
1998-03-19 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-03-19 Federico Mena Quintero <federico@nuclecu.unam.mx>
@ -1312,7 +1317,7 @@ Mon Mar 23 01:40:35 1998 Norbert Warmuth <k3190@fh-sw.de>
* gpageprop.c (item_properties): Insert icon control if appropriate. * gpageprop.c (item_properties): Insert icon control if appropriate.
* gprop.c (gprop_icon_new): * gprop.c (gprop_icon_new):
(gprop_icon_get_data): Renamed from gprop_dir_*(). (gprop_icon_get_data): Renamed from gprop_dir_*().
* gscreen.c (panel_action_properties): Re-reads panel only if necessary. * gscreen.c (panel_action_properties): Re-reads panel only if necessary.
@ -1324,8 +1329,8 @@ Mon Mar 23 01:40:35 1998 Norbert Warmuth <k3190@fh-sw.de>
* gpageprop.c: #include "../vfs/vfs.h". * gpageprop.c: #include "../vfs/vfs.h".
#include "dialog.h". #include "dialog.h".
* gprop.c (gprop_dir_new): * gprop.c (gprop_dir_new):
(gprop_perm_new): (gprop_perm_new):
(gprop_general_new): Connect to the destroy signal of the toplevel (gprop_general_new): Connect to the destroy signal of the toplevel
widget and destroy the Gprop structure on the callback. widget and destroy the Gprop structure on the callback.
@ -1338,14 +1343,14 @@ Wed Mar 18 22:32:53 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gscreen.c (panel_action_properties): Make Federico's * gscreen.c (panel_action_properties): Make Federico's
page-properties code functional. page-properties code functional.
* gpageprop.c: New file, implements most of the page properties on * gpageprop.c: New file, implements most of the page properties on
top of the gprop.c code. top of the gprop.c code.
Wed Mar 18 20:35:45 1998 Miguel de Icaza <miguel@nuclecu.unam.mx> Wed Mar 18 20:35:45 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gdesktop.c (desktop_create_launch_entry): Support for the "Drop" * gdesktop.c (desktop_create_launch_entry): Support for the "Drop"
target in mc.ext now. target in mc.ext now.
* Add support for dragging the icons on the desktop. * Add support for dragging the icons on the desktop.
@ -1356,11 +1361,11 @@ Wed Mar 18 20:35:45 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
(drop_cb): splitted, call url_drop for regular drops, otherwise it (drop_cb): splitted, call url_drop for regular drops, otherwise it
is a icon drop. is a icon drop.
(artificial_drag_start): new routine, used now by gscreen.c and (artificial_drag_start): new routine, used now by gscreen.c and
gdesktop.c gdesktop.c
(drop_on_directory): Check result value of operation. (drop_on_directory): Check result value of operation.
(desktop_icon_set_position): sane interface. (desktop_icon_set_position): sane interface.
(stop_desktop): Flush all of our state to disk. (stop_desktop): Flush all of our state to disk.
1998-03-18 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-03-18 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gscreen.c: Removed tests for the gprop stuff. * gscreen.c: Removed tests for the gprop stuff.
@ -1378,19 +1383,19 @@ Wed Mar 18 20:35:45 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
* glayout.c: Put gnome_about_cmd as a callback for the About menu item. * glayout.c: Put gnome_about_cmd as a callback for the About menu item.
Tue Mar 17 22:40:36 1998 Miguel de Icaza <miguel@nuclecu.unam.mx> Tue Mar 17 22:40:36 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gdesktop.c (desktop_setup_icon): Lots of changes to accomodate * gdesktop.c (desktop_setup_icon): Lots of changes to accomodate
dropping icons on the root window. dropping icons on the root window.
(do_symlinks): Implement symlink action. (do_symlinks): Implement symlink action.
(icon_delete, desktop_icon_context_popup): Implement icon context (icon_delete, desktop_icon_context_popup): Implement icon context
menus. only deleting an icon is working right now. menus. only deleting an icon is working right now.
* gscreen.c: Load the drag and drop icons from the installation * gscreen.c: Load the drag and drop icons from the installation
directory. directory.
* Makefile.in (install_gmc): Install our icons. * Makefile.in (install_gmc): Install our icons.
Tue Mar 17 02:38:37 1998 Miguel de Icaza <miguel@nuclecu.unam.mx> Tue Mar 17 02:38:37 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
@ -1414,7 +1419,7 @@ Sat Mar 14 17:13:26 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gmain.c (gnome_dlg_send_destroy): New signal handler for * gmain.c (gnome_dlg_send_destroy): New signal handler for
"delete_event". I return TRUE (ie, do not kill this window), and "delete_event". I return TRUE (ie, do not kill this window), and
manually queue que destruction of this window. manually queue que destruction of this window.
* gtools.c (query_dialog): Do not allow resizing; do not destroy * gtools.c (query_dialog): Do not allow resizing; do not destroy
the dialog ourselves, this is properly handled by dlg.c now the dialog ourselves, this is properly handled by dlg.c now
@ -1428,11 +1433,11 @@ Fri Mar 13 16:01:28 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gtools.c: Implement the non-modal version of the message * gtools.c: Implement the non-modal version of the message
routine. routine.
* gview.c: Create a GnomeApp widget to contain the viewer. * gview.c: Create a GnomeApp widget to contain the viewer.
* gmain.c (xtoolkit_create_dialog): Add a new mode where the * gmain.c (xtoolkit_create_dialog): Add a new mode where the
container window is a GNOME_APP window. container window is a GNOME_APP window.
1998-03-13 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-03-13 Federico Mena Quintero <federico@nuclecu.unam.mx>
@ -1454,13 +1459,13 @@ Thu Mar 12 22:11:23 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gwidget.c (listbox_select): Fix for the listbox selection with * gwidget.c (listbox_select): Fix for the listbox selection with
the mouse. the mouse.
(x_create_button): Use stock pixmaps. (x_create_button): Use stock pixmaps.
* gcmd.c: Moved all of the _cmd routines from glayout to this * gcmd.c: Moved all of the _cmd routines from glayout to this
place. place.
(save_panel_types): Provide GNOME implementation. (save_panel_types): Provide GNOME implementation.
* glayout.c: New and improved menu layout. Use stock pixmaps. * glayout.c: New and improved menu layout. Use stock pixmaps.
1998-03-12 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-03-12 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gmc-chargrid.c (gmc_char_grid_draw): Someone teach me how to * gmc-chargrid.c (gmc_char_grid_draw): Someone teach me how to
@ -1488,28 +1493,28 @@ Thu Mar 12 22:11:23 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
Thu Mar 12 00:08:06 1998 Miguel de Icaza <miguel@nuclecu.unam.mx> Thu Mar 12 00:08:06 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gview.c (view_percent): Added status display. * gview.c (view_percent): Added status display.
Wed Mar 11 22:35:02 1998 Miguel de Icaza <miguel@nuclecu.unam.mx> Wed Mar 11 22:35:02 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gwidget.c (entry_release): Now the WEntrys track the current * gwidget.c (entry_release): Now the WEntrys track the current
selection.p selection.p
(x_update_input): Repaint the widget after changing the position. (x_update_input): Repaint the widget after changing the position.
* gscreen.c (x_fill_panel): Remember the selected item on the * gscreen.c (x_fill_panel): Remember the selected item on the
panel before filling it up, as gtk_clist emits a select_item panel before filling it up, as gtk_clist emits a select_item
signal when filling it up, which changes the current selection signal when filling it up, which changes the current selection
(and thus some routines that invoke the reload panel option (and thus some routines that invoke the reload panel option
fail). fail).
(create_popup_submenu): Implement context sensitive menus (regular (create_popup_submenu): Implement context sensitive menus (regular
files, and symlinks). files, and symlinks).
(panel_realized): Use a different icon when we are dragging a (panel_realized): Use a different icon when we are dragging a
group of files. group of files.
(panel_artificial_drag_start): Add Elliot's Artificial drag start (panel_artificial_drag_start): Add Elliot's Artificial drag start
support. support.
1998-03-11 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-03-11 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gmc-chargrid.c (gmc_char_grid_get_size): New public function. * gmc-chargrid.c (gmc_char_grid_get_size): New public function.
@ -1530,16 +1535,16 @@ Tue Mar 10 23:46:29 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gscreen.c (x_adjust_top_file): We no longer adjust the top * gscreen.c (x_adjust_top_file): We no longer adjust the top
displayed filename. displayed filename.
(panel_build_selected_file_list): Fix for the transfered data. (panel_build_selected_file_list): Fix for the transfered data.
(panel_drop_data_available): Now drop support uses the new (panel_drop_data_available): Now drop support uses the new
coords.x and coords.y fields from the DropDataAvailableEvent to coords.x and coords.y fields from the DropDataAvailableEvent to
find out which directory receives the drop. find out which directory receives the drop.
* glayout.c: added: configure_box, configure_vfs * glayout.c: added: configure_box, configure_vfs
(get_other_type): Return the correct value. (get_other_type): Return the correct value.
1998-03-10 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-03-10 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gscreen.c (panel_file_list_size_allocate_hook): Now we * gscreen.c (panel_file_list_size_allocate_hook): Now we
@ -1564,7 +1569,7 @@ Tue Mar 10 00:10:32 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gscreen.c (panel_drop_data_available): Now drop support uses the * gscreen.c (panel_drop_data_available): Now drop support uses the
new coords.x and coords.y fields from the DropDataAvailableEvent new coords.x and coords.y fields from the DropDataAvailableEvent
to find out which directory receives the drop. to find out which directory receives the drop.
* gwidget.c (x_radio_focus_item): Add support for focusing radio * gwidget.c (x_radio_focus_item): Add support for focusing radio
buttons. buttons.
@ -1575,7 +1580,7 @@ Mon Mar 9 15:12:00 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
(dlg_key_event): Support for backtab. (dlg_key_event): Support for backtab.
* gwidget.c: highlight properly the focused radio entry. * gwidget.c: highlight properly the focused radio entry.
* gmain.c (x_init_dlg): After setting up the X widget, set the * gmain.c (x_init_dlg): After setting up the X widget, set the
Gtk focus to h->current; Gtk focus to h->current;
@ -1596,25 +1601,25 @@ Fri Mar 6 20:50:19 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
all of the pending X events. all of the pending X events.
(x_set_idle): Implement idle functions, now the find command works (x_set_idle): Implement idle functions, now the find command works
properly. properly.
* gwidget.c (x_create_radio): Connect to the "toggled" signal to * gwidget.c (x_create_radio): Connect to the "toggled" signal to
keep track of the radio button. keep track of the radio button.
(listbox_select): callback for the select and double click (listbox_select): callback for the select and double click
actions. actions.
(x_update_input): This can be invoked before the (x_update_input): This can be invoked before the
widget X resources have been allocated. Take care of this. widget X resources have been allocated. Take care of this.
(x_create_input): update the cursor position as well. (x_create_input): update the cursor position as well.
(x_list_insert, x_create_listbox, x_list_delete_nth, (x_list_insert, x_create_listbox, x_list_delete_nth,
x_listbox_select_nth): implement the Listbox widget. x_listbox_select_nth): implement the Listbox widget.
* gconf.h: New configuration options: * gconf.h: New configuration options:
PORT_HAS_PANEL_ADJUST_TOP_FILE and PORT_HAS_PANEL_ADJUST_TOP_FILE and
PORT_HAS_PANEL_RESET_SORT_LABELS PORT_HAS_PANEL_RESET_SORT_LABELS
1998-03-06 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-03-06 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gmain.c (get_color): Make it use GdkColorContext correctly. * gmain.c (get_color): Make it use GdkColorContext correctly.
@ -1636,13 +1641,13 @@ Thu Mar 5 23:54:58 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gscreen.c (panel_drop_data_available): Performs the drop action * gscreen.c (panel_drop_data_available): Performs the drop action
on a panel. It needs fixing, as the DropDataAvailabelEvent does on a panel. It needs fixing, as the DropDataAvailabelEvent does
not provide any information as to where the drop actually not provide any information as to where the drop actually
happened. happened.
(fixed_gtk_widget_dnd_drag_set, fixed_gtk_widget_dnd_drop_set): (fixed_gtk_widget_dnd_drag_set, fixed_gtk_widget_dnd_drop_set):
Only set the main window of the clist to be the source/target of Only set the main window of the clist to be the source/target of
the drag and drop code. The little square at the end did not make the drag and drop code. The little square at the end did not make
much sense as a drop/drag spot. much sense as a drop/drag spot.
1998-03-04 Federico Mena Quintero <federico@nuclecu.unam.mx> 1998-03-04 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gmain.h: Added prototype for x_filter_changed(). * gmain.h: Added prototype for x_filter_changed().
@ -1652,7 +1657,7 @@ Thu Mar 5 23:54:58 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
Wed Mar 4 22:43:00 1998 Miguel de Icaza <miguel@nuclecu.unam.mx> Wed Mar 4 22:43:00 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gtools.c (query_dialog): Rewritten to use the MC dialog/widget code. * gtools.c (query_dialog): Rewritten to use the MC dialog/widget code.
* gutil.c (my_system), acconfig.h: By default gnome will not have * gutil.c (my_system), acconfig.h: By default gnome will not have
a subshell (at least for now) and will now exec everything a subshell (at least for now) and will now exec everything
@ -1663,12 +1668,12 @@ Wed Mar 4 22:43:00 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
programming psycologists. It was a huge mistake. programming psycologists. It was a huge mistake.
* gdesktop.c: Use the new icon/text display routine from * gdesktop.c: Use the new icon/text display routine from
Federico. Federico.
Tue Mar 3 21:03:52 1998 Miguel de Icaza <miguel@nuclecu.unam.mx> Tue Mar 3 21:03:52 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gmain.c (x_destroy_dlg): Call gtk_grab_remove when destroying * gmain.c (x_destroy_dlg): Call gtk_grab_remove when destroying
the dialog. the dialog.
* gmain.c (x_focus_widget): Handle special case of toplevels. * gmain.c (x_focus_widget): Handle special case of toplevels.
@ -1676,4 +1681,3 @@ Tue Mar 3 21:03:52 1998 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gscreen.c: Some hackish changes to work around idempotence bugs * gscreen.c: Some hackish changes to work around idempotence bugs
in gtk_clist_select_row(). in gtk_clist_select_row().

161
gnome/gscreen.c
Просмотреть файл

@ -125,7 +125,7 @@ panel_file_list_set_row_colors (GtkCList *cl, int row, int color_pair)
/* /*
* Update the status of the back and forward history buttons. * Update the status of the back and forward history buttons.
* Called from the generic code * Called from the generic code
*/ */
void void
x_panel_update_marks (WPanel *panel) x_panel_update_marks (WPanel *panel)
@ -135,7 +135,7 @@ x_panel_update_marks (WPanel *panel)
if (!panel->fwd_b) if (!panel->fwd_b)
return; return;
gtk_widget_set_sensitive (panel->fwd_b, ff); gtk_widget_set_sensitive (panel->fwd_b, ff);
gtk_widget_set_sensitive (panel->back_b, bf); gtk_widget_set_sensitive (panel->back_b, bf);
} }
@ -160,11 +160,11 @@ panel_fill_panel_list (WPanel *panel)
/* which column holds the type information */ /* which column holds the type information */
type_col = -1; type_col = -1;
for (i = 0; i < top; i++){ for (i = 0; i < top; i++){
file_entry *fe = &panel->dir.list [i]; file_entry *fe = &panel->dir.list [i];
format_e *format = panel->format; format_e *format = panel->format;
for (col = 0; format; format = format->next){ for (col = 0; format; format = format->next){
if (!format->use_in_gui) if (!format->use_in_gui)
continue; continue;
@ -172,7 +172,7 @@ panel_fill_panel_list (WPanel *panel)
if (type_col == -1) if (type_col == -1)
if (strcmp (format->id, "type") == 0) if (strcmp (format->id, "type") == 0)
type_col = col; type_col = col;
if (!format->string_fn) if (!format->string_fn)
texts [col] = ""; texts [col] = "";
else else
@ -204,10 +204,10 @@ panel_fill_panel_icons (WPanel *panel)
const int selected = panel->selected; const int selected = panel->selected;
int i; int i;
GdkImlibImage *image; GdkImlibImage *image;
gnome_icon_list_freeze (icons); gnome_icon_list_freeze (icons);
gnome_icon_list_clear (icons); gnome_icon_list_clear (icons);
for (i = 0; i < top; i++){ for (i = 0; i < top; i++){
file_entry *fe = &panel->dir.list [i]; file_entry *fe = &panel->dir.list [i];
@ -221,7 +221,7 @@ panel_fill_panel_icons (WPanel *panel)
} }
/* /*
* Invoked from the generic code to fill the display * Invoked from the generic code to fill the display
*/ */
void void
x_fill_panel (WPanel *panel) x_fill_panel (WPanel *panel)
@ -233,7 +233,7 @@ x_fill_panel (WPanel *panel)
gtk_signal_handler_block_by_data (GTK_OBJECT (panel->tree), panel); gtk_signal_handler_block_by_data (GTK_OBJECT (panel->tree), panel);
gtk_dtree_select_dir (GTK_DTREE (panel->tree), panel->cwd); gtk_dtree_select_dir (GTK_DTREE (panel->tree), panel->cwd);
gtk_signal_handler_unblock_by_data (GTK_OBJECT (panel->tree), panel); gtk_signal_handler_unblock_by_data (GTK_OBJECT (panel->tree), panel);
} }
@ -243,7 +243,7 @@ gmc_panel_set_size (int index, int boot)
{ {
Widget *w; Widget *w;
WPanel *p; WPanel *p;
w = (Widget *) get_panel_widget (index); w = (Widget *) get_panel_widget (index);
p = (WPanel *) w; p = (WPanel *) w;
w->cols = 40; w->cols = 40;
@ -281,7 +281,7 @@ x_select_item (WPanel *panel)
{ {
if (panel->list_type == list_icons){ if (panel->list_type == list_icons){
GnomeIconList *list = GNOME_ICON_LIST (panel->icons); GnomeIconList *list = GNOME_ICON_LIST (panel->icons);
do_file_mark (panel, panel->selected, 1); do_file_mark (panel, panel->selected, 1);
display_mini_info (panel); display_mini_info (panel);
gnome_icon_list_select_icon (list, panel->selected); gnome_icon_list_select_icon (list, panel->selected);
@ -294,15 +294,15 @@ x_select_item (WPanel *panel)
} else { } else {
GtkCList *clist = CLIST_FROM_SW (panel->list); GtkCList *clist = CLIST_FROM_SW (panel->list);
int color, marked; int color, marked;
if (panel->dir.list [panel->selected].f.marked) if (panel->dir.list [panel->selected].f.marked)
marked = 1; marked = 1;
else else
marked = 0; marked = 0;
color = file_compute_color (marked ? MARKED_SELECTED : SELECTED, &panel->dir.list [panel->selected]); color = file_compute_color (marked ? MARKED_SELECTED : SELECTED, &panel->dir.list [panel->selected]);
panel_file_list_set_row_colors (CLIST_FROM_SW (panel->list), panel->selected, color); panel_file_list_set_row_colors (CLIST_FROM_SW (panel->list), panel->selected, color);
/* Make it visible */ /* Make it visible */
if (gtk_clist_row_is_visible (clist, panel->selected) != GTK_VISIBILITY_FULL) if (gtk_clist_row_is_visible (clist, panel->selected) != GTK_VISIBILITY_FULL)
gtk_clist_moveto (clist, panel->selected, 0, 0.5, 0.0); gtk_clist_moveto (clist, panel->selected, 0, 0.5, 0.0);
@ -454,7 +454,7 @@ panel_file_list_select_row (GtkWidget *file_list, int row, int column, GdkEvent
internal_select_item (file_list, panel, row); internal_select_item (file_list, panel, row);
return; return;
} }
switch (event->type) { switch (event->type) {
case GDK_BUTTON_RELEASE: case GDK_BUTTON_RELEASE:
printf ("1\n"); printf ("1\n");
@ -469,7 +469,7 @@ panel_file_list_select_row (GtkWidget *file_list, int row, int column, GdkEvent
/* fallback if shift-click is pressed */ /* fallback if shift-click is pressed */
do_file_mark_range (panel, row, current_selection); do_file_mark_range (panel, row, current_selection);
break; break;
case 2: case 2:
do_file_mark (panel, row, !panel->dir.list[row].f.marked); do_file_mark (panel, row, !panel->dir.list[row].f.marked);
break; break;
@ -513,7 +513,7 @@ panel_file_list_size_allocate_hook (GtkWidget *sw, GtkAllocation *allocation, WP
gtk_signal_handler_block_by_data (GTK_OBJECT (sw), panel); gtk_signal_handler_block_by_data (GTK_OBJECT (sw), panel);
panel_file_list_configure_contents (sw, panel, allocation->width, allocation->height); panel_file_list_configure_contents (sw, panel, allocation->width, allocation->height);
gtk_signal_handler_unblock_by_data (GTK_OBJECT (sw), panel); gtk_signal_handler_unblock_by_data (GTK_OBJECT (sw), panel);
panel_file_list_compute_lines (GTK_SCROLLED_WINDOW (sw), panel, allocation->height); panel_file_list_compute_lines (GTK_SCROLLED_WINDOW (sw), panel, allocation->height);
} }
@ -522,13 +522,13 @@ panel_file_list_column_callback (GtkWidget *widget, int col, WPanel *panel)
{ {
format_e *format; format_e *format;
int i; int i;
for (i = 0, format = panel->format; format; format = format->next){ for (i = 0, format = panel->format; format; format = format->next){
if (!format->use_in_gui) if (!format->use_in_gui)
continue; continue;
if (i == col){ if (i == col){
sortfn *sorting_routine; sortfn *sorting_routine;
sorting_routine = get_sort_fn (format->id); sorting_routine = get_sort_fn (format->id);
if (!sorting_routine) if (!sorting_routine)
return; return;
@ -590,7 +590,7 @@ panel_configure_file_list (WPanel *panel, GtkWidget *sw, GtkWidget *file_list)
/* Configure the CList */ /* Configure the CList */
gtk_clist_set_selection_mode (GTK_CLIST (file_list), GTK_SELECTION_SINGLE); gtk_clist_set_selection_mode (GTK_CLIST (file_list), GTK_SELECTION_SINGLE);
for (i = 0, format = panel->format; format; format = format->next) { for (i = 0, format = panel->format; format; format = format->next) {
GtkJustification just; GtkJustification just;
@ -602,14 +602,14 @@ panel_configure_file_list (WPanel *panel, GtkWidget *sw, GtkWidget *file_list)
just = GTK_JUSTIFY_LEFT; just = GTK_JUSTIFY_LEFT;
else else
just = GTK_JUSTIFY_RIGHT; just = GTK_JUSTIFY_RIGHT;
gtk_clist_set_column_justification (GTK_CLIST (file_list), i, just); gtk_clist_set_column_justification (GTK_CLIST (file_list), i, just);
i++; i++;
} }
/* Configure the scrolbars */ /* Configure the scrolbars */
adjustment = GTK_OBJECT (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (sw))); adjustment = GTK_OBJECT (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (sw)));
gtk_signal_connect_after (adjustment, "value_changed", gtk_signal_connect_after (adjustment, "value_changed",
GTK_SIGNAL_FUNC (panel_file_list_scrolled), panel); GTK_SIGNAL_FUNC (panel_file_list_scrolled), panel);
} }
@ -626,7 +626,7 @@ panel_build_selected_file_list (WPanel *panel, int *file_list_len)
int cwdlen = strlen (panel->cwd) + 1; int cwdlen = strlen (panel->cwd) + 1;
int filelen = strlen ("file:"); int filelen = strlen ("file:");
int seplen = strlen ("\r\n"); int seplen = strlen ("\r\n");
/* first pass, compute the length */ /* first pass, compute the length */
total_len = 0; total_len = 0;
for (i = 0; i < panel->count; i++) for (i = 0; i < panel->count; i++)
@ -654,7 +654,7 @@ panel_build_selected_file_list (WPanel *panel, int *file_list_len)
uri = copy_strings ("file:", fullname, NULL); uri = copy_strings ("file:", fullname, NULL);
free (fullname); free (fullname);
*file_list_len = strlen (uri) + 1; *file_list_len = strlen (uri) + 1;
return uri; return uri;
} }
@ -677,7 +677,7 @@ panel_drag_data_get (GtkWidget *widget,
int len; int len;
char *data; char *data;
GList *files; GList *files;
data = panel_build_selected_file_list (panel, &len); data = panel_build_selected_file_list (panel, &len);
switch (info){ switch (info){
@ -733,7 +733,7 @@ panel_icon_list_drag_data_received (GtkWidget *widget,
GnomeIconList *gil = GNOME_ICON_LIST (widget); GnomeIconList *gil = GNOME_ICON_LIST (widget);
char *dir; char *dir;
int idx; int idx;
idx = gnome_icon_list_get_icon_at (gil, x, y); idx = gnome_icon_list_get_icon_at (gil, x, y);
if (idx == -1) if (idx == -1)
dir = g_strdup (panel->cwd); dir = g_strdup (panel->cwd);
@ -771,7 +771,7 @@ panel_clist_drag_data_received (GtkWidget *widget,
GtkCList *clist = GTK_CLIST (widget); GtkCList *clist = GTK_CLIST (widget);
char *dir; char *dir;
int row; int row;
if (gtk_clist_get_selection_info (clist, x, y, &row, NULL) == 0) if (gtk_clist_get_selection_info (clist, x, y, &row, NULL) == 0)
dir = g_strdup (panel->cwd); dir = g_strdup (panel->cwd);
else { else {
@ -780,7 +780,7 @@ panel_clist_drag_data_received (GtkWidget *widget,
if (S_ISDIR (panel->dir.list [row].buf.st_mode) || if (S_ISDIR (panel->dir.list [row].buf.st_mode) ||
panel->dir.list [row].f.link_to_dir) panel->dir.list [row].f.link_to_dir)
dir = concat_dir_and_file (panel->cwd, panel->dir.list [row].fname); dir = concat_dir_and_file (panel->cwd, panel->dir.list [row].fname);
else else
dir = g_strdup (panel->cwd); dir = g_strdup (panel->cwd);
} }
@ -810,7 +810,7 @@ panel_tree_drag_data_received (GtkWidget *widget,
GtkCTreeNode *node; GtkCTreeNode *node;
int row, col; int row, col;
char *path; char *path;
if (!gtk_clist_get_selection_info (GTK_CLIST (dtree), x, y, &row, &col)) if (!gtk_clist_get_selection_info (GTK_CLIST (dtree), x, y, &row, &col))
return; return;
@ -821,7 +821,7 @@ panel_tree_drag_data_received (GtkWidget *widget,
path = gtk_dtree_get_row_path (dtree, node, 0); path = gtk_dtree_get_row_path (dtree, node, 0);
gdnd_drop_on_directory (context, selection_data, path); gdnd_drop_on_directory (context, selection_data, path);
g_free (path); g_free (path);
} }
@ -845,7 +845,7 @@ static int
panel_clist_button_press (GtkWidget *widget, GdkEventButton *event, WPanel *panel) panel_clist_button_press (GtkWidget *widget, GdkEventButton *event, WPanel *panel)
{ {
panel->maybe_start_drag = event->button; panel->maybe_start_drag = event->button;
panel->click_x = event->x; panel->click_x = event->x;
panel->click_y = event->y; panel->click_y = event->y;
@ -870,18 +870,18 @@ panel_widget_motion (GtkWidget *widget, GdkEventMotion *event, WPanel *panel)
if (panel->maybe_start_drag == 3) if (panel->maybe_start_drag == 3)
return FALSE; return FALSE;
if ((abs (event->x - panel->click_x) < 4) || if ((abs (event->x - panel->click_x) < 4) ||
(abs (event->y - panel->click_y) < 4)) (abs (event->y - panel->click_y) < 4))
return FALSE; return FALSE;
list = gtk_target_list_new (drag_types, ELEMENTS (drag_types)); list = gtk_target_list_new (drag_types, ELEMENTS (drag_types));
context = gtk_drag_begin (widget, list, context = gtk_drag_begin (widget, list,
GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK | GDK_ACTION_ASK, GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK | GDK_ACTION_ASK,
panel->maybe_start_drag, (GdkEvent *) event); panel->maybe_start_drag, (GdkEvent *) event);
gtk_drag_set_icon_default (context); gtk_drag_set_icon_default (context);
return FALSE; return FALSE;
} }
@ -975,7 +975,7 @@ panel_create_file_list (WPanel *panel)
GTK_SIGNAL_FUNC (panel_drag_begin), panel); GTK_SIGNAL_FUNC (panel_drag_begin), panel);
gtk_signal_connect (GTK_OBJECT (file_list), "drag_end", gtk_signal_connect (GTK_OBJECT (file_list), "drag_end",
GTK_SIGNAL_FUNC (panel_drag_end), panel); GTK_SIGNAL_FUNC (panel_drag_end), panel);
return sw; return sw;
} }
@ -992,7 +992,7 @@ panel_icon_list_select_icon (GtkWidget *widget, int index, GdkEvent *event, WPan
if (!event) if (!event)
return; return;
switch (event->type){ switch (event->type){
case GDK_BUTTON_PRESS: case GDK_BUTTON_PRESS:
if (event->button.button == 3) { if (event->button.button == 3) {
@ -1050,7 +1050,7 @@ load_imlib_icons (void)
if (loaded) if (loaded)
return; return;
loaded = 1; loaded = 1;
} }
@ -1076,7 +1076,7 @@ panel_icon_list_button_press (GtkWidget *widget, GdkEventButton *event, WPanel *
panel->maybe_start_drag = 0; panel->maybe_start_drag = 0;
else else
panel->maybe_start_drag = event->button; panel->maybe_start_drag = event->button;
panel->click_x = event->x; panel->click_x = event->x;
panel->click_y = event->y; panel->click_y = event->y;
return FALSE; return FALSE;
@ -1164,7 +1164,7 @@ panel_switch_new_display_mode (WPanel *panel)
panel->list = panel_create_file_list (panel); panel->list = panel_create_file_list (panel);
gtk_widget_destroy (old_list); gtk_widget_destroy (old_list);
gtk_table_attach (GTK_TABLE (panel->view_table), panel->list, 0, 1, 0, 1, gtk_table_attach (GTK_TABLE (panel->view_table), panel->list, 0, 1, 0, 1,
GTK_EXPAND | GTK_FILL | GTK_SHRINK, GTK_EXPAND | GTK_FILL | GTK_SHRINK,
GTK_EXPAND | GTK_FILL | GTK_SHRINK, GTK_EXPAND | GTK_FILL | GTK_SHRINK,
0, 0); 0, 0);
gtk_widget_show (panel->list); gtk_widget_show (panel->list);
@ -1376,20 +1376,20 @@ display_mini_info (WPanel *panel)
if (S_ISLNK (panel->dir.list [panel->selected].buf.st_mode)){ if (S_ISLNK (panel->dir.list [panel->selected].buf.st_mode)){
char *link, link_target [MC_MAXPATHLEN]; char *link, link_target [MC_MAXPATHLEN];
int len; int len;
link = concat_dir_and_file (panel->cwd, panel->dir.list [panel->selected].fname); link = concat_dir_and_file (panel->cwd, panel->dir.list [panel->selected].fname);
len = mc_readlink (link, link_target, MC_MAXPATHLEN); len = mc_readlink (link, link_target, MC_MAXPATHLEN);
free (link); free (link);
if (len > 0){ if (len > 0){
char *str; char *str;
link_target [len] = 0; link_target [len] = 0;
/* FIXME: Links should be handled differently */ /* FIXME: Links should be handled differently */
/* str = copy_strings ("-> ", link_target, NULL); */ /* str = copy_strings ("-> ", link_target, NULL); */
gtk_label_set (label, " "); gtk_label_set (label, " ");
/*free (str); */ /*free (str); */
} else } else
gtk_label_set (label, _("<readlink failed>")); gtk_label_set (label, _("<readlink failed>"));
return; return;
} }
@ -1480,7 +1480,7 @@ tree_drag_open_directory (gpointer data)
GtkCTreeNode *node; GtkCTreeNode *node;
int row, col; int row, col;
int r; int r;
r = gtk_clist_get_selection_info ( r = gtk_clist_get_selection_info (
GTK_CLIST (panel->tree), GTK_CLIST (panel->tree),
GTK_DTREE (panel->tree)->drag_motion_x, GTK_DTREE (panel->tree)->drag_motion_x,
@ -1489,7 +1489,7 @@ tree_drag_open_directory (gpointer data)
if (!r) if (!r)
return FALSE; return FALSE;
node = gtk_ctree_node_nth (GTK_CTREE (panel->tree), row); node = gtk_ctree_node_nth (GTK_CTREE (panel->tree), row);
if (!node) if (!node)
return FALSE; return FALSE;
@ -1547,7 +1547,7 @@ panel_tree_scroll (gpointer data)
GtkAdjustment *va; GtkAdjustment *va;
va = scrolled_window_get_vadjustment (panel->tree_scrolled_window); va = scrolled_window_get_vadjustment (panel->tree_scrolled_window);
if (GTK_DTREE (panel->tree)->drag_motion_y < 10) if (GTK_DTREE (panel->tree)->drag_motion_y < 10)
gtk_adjustment_set_value (va, va->value - va->step_increment); gtk_adjustment_set_value (va, va->value - va->step_increment);
else{ else{
@ -1556,7 +1556,7 @@ panel_tree_scroll (gpointer data)
return TRUE; return TRUE;
} }
/** /**
* panel_tree_drag_motion: * panel_tree_drag_motion:
* *
* This routine is invoked by GTK+ when an item is being dragged on * This routine is invoked by GTK+ when an item is being dragged on
@ -1569,7 +1569,7 @@ panel_tree_drag_motion (GtkWidget *widget, GdkDragContext *ctx, int x, int y, gu
GtkDTree *dtree = GTK_DTREE (widget); GtkDTree *dtree = GTK_DTREE (widget);
WPanel *panel = data; WPanel *panel = data;
int r, row, col; int r, row, col;
if (dtree->timer_id != -1){ if (dtree->timer_id != -1){
gtk_timeout_remove (dtree->timer_id); gtk_timeout_remove (dtree->timer_id);
dtree->timer_id = -1; dtree->timer_id = -1;
@ -1582,7 +1582,7 @@ panel_tree_drag_motion (GtkWidget *widget, GdkDragContext *ctx, int x, int y, gu
dtree->timer_id = gtk_timeout_add (60, panel_tree_scroll, data); dtree->timer_id = gtk_timeout_add (60, panel_tree_scroll, data);
return TRUE; return TRUE;
} }
r = gtk_clist_get_selection_info ( r = gtk_clist_get_selection_info (
GTK_CLIST (widget), x, y, &row, &col); GTK_CLIST (widget), x, y, &row, &col);
@ -1622,7 +1622,7 @@ panel_tree_drag_begin (GtkWidget *widget, GdkDragContext *context, WPanel *panel
panel->dragging = 1; panel->dragging = 1;
dtree->drag_dir = g_strdup (dtree->current_path); dtree->drag_dir = g_strdup (dtree->current_path);
printf ("This is the directory being dragged: %s\n", dtree->current_path); printf ("This is the directory being dragged: %s\n", dtree->current_path);
} }
/** /**
@ -1665,7 +1665,7 @@ panel_tree_drag_data_get (GtkWidget *widget, GdkDragContext *context,
} }
} }
/** /**
* panel_create_tree_view: * panel_create_tree_view:
* *
* Create and initializes the GtkDTree widget for being used in the * Create and initializes the GtkDTree widget for being used in the
@ -1677,7 +1677,7 @@ panel_create_tree_view (WPanel *panel)
GtkWidget *tree; GtkWidget *tree;
tree = gtk_dtree_new (); tree = gtk_dtree_new ();
gtk_ctree_set_line_style (GTK_CTREE (tree), GTK_CTREE_LINES_SOLID); gtk_ctree_set_line_style (GTK_CTREE (tree), GTK_CTREE_LINES_DOTTED);
gtk_ctree_set_expander_style (GTK_CTREE (tree), GTK_CTREE_EXPANDER_SQUARE); gtk_ctree_set_expander_style (GTK_CTREE (tree), GTK_CTREE_EXPANDER_SQUARE);
gtk_ctree_set_indent (GTK_CTREE (tree), 10); gtk_ctree_set_indent (GTK_CTREE (tree), 10);
@ -1701,18 +1701,18 @@ panel_create_tree_view (WPanel *panel)
GTK_SIGNAL_FUNC (panel_tree_drag_end), panel); GTK_SIGNAL_FUNC (panel_tree_drag_end), panel);
gtk_signal_connect (GTK_OBJECT (tree), "drag_data_get", gtk_signal_connect (GTK_OBJECT (tree), "drag_data_get",
GTK_SIGNAL_FUNC (panel_tree_drag_data_get), panel); GTK_SIGNAL_FUNC (panel_tree_drag_data_get), panel);
/* Make directories draggable */ /* Make directories draggable */
gtk_drag_source_set (GTK_WIDGET (tree), GDK_BUTTON1_MASK, gtk_drag_source_set (GTK_WIDGET (tree), GDK_BUTTON1_MASK,
drag_types, ELEMENTS (drag_types), drag_types, ELEMENTS (drag_types),
GDK_ACTION_LINK | GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_ASK); GDK_ACTION_LINK | GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_ASK);
/* Mouse is being moved over ourselves */ /* Mouse is being moved over ourselves */
gtk_signal_connect (GTK_OBJECT (tree), "drag_motion", gtk_signal_connect (GTK_OBJECT (tree), "drag_motion",
GTK_SIGNAL_FUNC (panel_tree_drag_motion), panel); GTK_SIGNAL_FUNC (panel_tree_drag_motion), panel);
gtk_signal_connect (GTK_OBJECT (tree), "drag_leave", gtk_signal_connect (GTK_OBJECT (tree), "drag_leave",
GTK_SIGNAL_FUNC (panel_tree_drag_leave), panel); GTK_SIGNAL_FUNC (panel_tree_drag_leave), panel);
return tree; return tree;
} }
@ -1728,7 +1728,7 @@ create_and_setup_pane (WPanel *panel)
GtkWidget *pane; GtkWidget *pane;
GtkWidget *tree = panel->tree; GtkWidget *tree = panel->tree;
GdkFont *tree_font = tree->style->font; GdkFont *tree_font = tree->style->font;
pane = gtk_hpaned_new (); pane = gtk_hpaned_new ();
/* /*
@ -1737,7 +1737,7 @@ create_and_setup_pane (WPanel *panel)
*/ */
GTK_PANED (pane)->child1_size = 20 * gdk_string_width (tree_font, "W"); GTK_PANED (pane)->child1_size = 20 * gdk_string_width (tree_font, "W");
GTK_PANED (pane)->position_set = TRUE; GTK_PANED (pane)->position_set = TRUE;
gtk_widget_show (pane); gtk_widget_show (pane);
return pane; return pane;
@ -1770,7 +1770,7 @@ button_switch_to (char **icon, GtkSignalFunc fn, void *closure)
pix = gnome_pixmap_new_from_xpm_d (icon); pix = gnome_pixmap_new_from_xpm_d (icon);
gtk_container_add (GTK_CONTAINER (button), pix); gtk_container_add (GTK_CONTAINER (button), pix);
gtk_signal_connect (GTK_OBJECT (button), "clicked", fn, closure); gtk_signal_connect (GTK_OBJECT (button), "clicked", fn, closure);
return button; return button;
} }
@ -1815,9 +1815,9 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
GtkWidget *frame, *cwd, *back_p, *fwd_p, *up_p; GtkWidget *frame, *cwd, *back_p, *fwd_p, *up_p;
GtkWidget *hbox, *evbox, *dock; GtkWidget *hbox, *evbox, *dock;
GtkWidget *display, *table_frame; GtkWidget *display, *table_frame;
panel->xwindow = gtk_widget_get_toplevel (GTK_WIDGET (panel->widget.wdata)); panel->xwindow = gtk_widget_get_toplevel (GTK_WIDGET (panel->widget.wdata));
panel->table = gtk_table_new (2, 1, 0); panel->table = gtk_table_new (2, 1, 0);
/* /*
@ -1830,14 +1830,14 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
panel->tree = panel_create_tree_view (panel); panel->tree = panel_create_tree_view (panel);
gtk_container_add (GTK_CONTAINER (panel->tree_scrolled_window), panel->tree); gtk_container_add (GTK_CONTAINER (panel->tree_scrolled_window), panel->tree);
gtk_widget_show_all (panel->tree_scrolled_window); gtk_widget_show_all (panel->tree_scrolled_window);
/* /*
* Icon and Listing display * Icon and Listing display
*/ */
panel->icons = panel_create_icon_display (panel); panel->icons = panel_create_icon_display (panel);
panel->scrollbar = gtk_vscrollbar_new (GNOME_ICON_LIST (panel->icons)->adj); panel->scrollbar = gtk_vscrollbar_new (GNOME_ICON_LIST (panel->icons)->adj);
gtk_widget_show (panel->scrollbar); gtk_widget_show (panel->scrollbar);
panel->list = panel_create_file_list (panel); panel->list = panel_create_file_list (panel);
gtk_widget_ref (panel->icons); gtk_widget_ref (panel->icons);
gtk_widget_ref (panel->list); gtk_widget_ref (panel->list);
@ -1852,7 +1852,7 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
*/ */
panel->pane = create_and_setup_pane (panel); panel->pane = create_and_setup_pane (panel);
gtk_paned_add1 (GTK_PANED (panel->pane), panel->tree_scrolled_window); gtk_paned_add1 (GTK_PANED (panel->pane), panel->tree_scrolled_window);
/* /*
* Filter * Filter
*/ */
@ -1862,7 +1862,7 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
* Current Working directory * Current Working directory
*/ */
cwd = panel_create_cwd (h, panel, &panel->current_dir); cwd = panel_create_cwd (h, panel, &panel->current_dir);
/* We do not want the focus by default (and the previos add_widget just gave it to us) */ /* We do not want the focus by default (and the previos add_widget just gave it to us) */
h->current = h->current->prev; h->current = h->current->prev;
@ -1882,10 +1882,10 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
gtk_signal_connect (GTK_OBJECT (panel->fwd_b), "clicked", GTK_SIGNAL_FUNC(panel_fwd), panel); gtk_signal_connect (GTK_OBJECT (panel->fwd_b), "clicked", GTK_SIGNAL_FUNC(panel_fwd), panel);
gtk_signal_connect (GTK_OBJECT (panel->up_b), "clicked", GTK_SIGNAL_FUNC(panel_up), panel); gtk_signal_connect (GTK_OBJECT (panel->up_b), "clicked", GTK_SIGNAL_FUNC(panel_up), panel);
panel_update_marks (panel); panel_update_marks (panel);
/* /*
* Here we make the toolbars * Here we make the toolbars
*/ */
status_line = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH); status_line = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
gtk_container_set_border_width (GTK_CONTAINER (status_line), 3); gtk_container_set_border_width (GTK_CONTAINER (status_line), 3);
@ -1918,8 +1918,8 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
gtk_container_add(GTK_CONTAINER(dock),status_line); gtk_container_add(GTK_CONTAINER(dock),status_line);
gnome_dock_add_item (GNOME_DOCK(GNOME_APP (panel->xwindow)->dock), dock, GNOME_DOCK_POS_TOP, 1, 0, 0, FALSE); gnome_dock_add_item (GNOME_DOCK(GNOME_APP (panel->xwindow)->dock), dock, GNOME_DOCK_POS_TOP, 1, 0, 0, FALSE);
gtk_widget_show_all (dock); gtk_widget_show_all (dock);
/* /*
* ministatus * ministatus
*/ */
@ -1959,10 +1959,10 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
gtk_frame_set_shadow_type (GTK_FRAME (table_frame), GTK_SHADOW_IN); gtk_frame_set_shadow_type (GTK_FRAME (table_frame), GTK_SHADOW_IN);
gtk_widget_show (table_frame); gtk_widget_show (table_frame);
gtk_container_add (GTK_CONTAINER (table_frame), panel->view_table); gtk_container_add (GTK_CONTAINER (table_frame), panel->view_table);
/* Add both the icon view and the listing view */ /* Add both the icon view and the listing view */
gtk_table_attach (GTK_TABLE (panel->view_table), panel->icons, 0, 1, 0, 1, gtk_table_attach (GTK_TABLE (panel->view_table), panel->icons, 0, 1, 0, 1,
GTK_EXPAND | GTK_FILL | GTK_SHRINK, GTK_EXPAND | GTK_FILL | GTK_SHRINK,
GTK_EXPAND | GTK_FILL | GTK_SHRINK, GTK_EXPAND | GTK_FILL | GTK_SHRINK,
0, 0); 0, 0);
gtk_table_attach (GTK_TABLE (panel->view_table), panel->scrollbar, 1, 2, 0, 1, gtk_table_attach (GTK_TABLE (panel->view_table), panel->scrollbar, 1, 2, 0, 1,
@ -1970,18 +1970,18 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
GTK_EXPAND | GTK_FILL | GTK_SHRINK, GTK_EXPAND | GTK_FILL | GTK_SHRINK,
0, 0); 0, 0);
gtk_table_attach (GTK_TABLE (panel->view_table), panel->list, 0, 1, 0, 1, gtk_table_attach (GTK_TABLE (panel->view_table), panel->list, 0, 1, 0, 1,
GTK_EXPAND | GTK_FILL | GTK_SHRINK, GTK_EXPAND | GTK_FILL | GTK_SHRINK,
GTK_EXPAND | GTK_FILL | GTK_SHRINK, GTK_EXPAND | GTK_FILL | GTK_SHRINK,
0, 0); 0, 0);
gtk_widget_show (display); gtk_widget_show (display);
gtk_table_attach (GTK_TABLE (panel->table), panel->pane, 0, 1, 1, 2, gtk_table_attach (GTK_TABLE (panel->table), panel->pane, 0, 1, 1, 2,
GTK_EXPAND | GTK_FILL | GTK_SHRINK, GTK_EXPAND | GTK_FILL | GTK_SHRINK,
GTK_EXPAND | GTK_FILL | GTK_SHRINK, GTK_EXPAND | GTK_FILL | GTK_SHRINK,
0, 0); 0, 0);
gtk_paned_add2 (GTK_PANED (panel->pane), table_frame); gtk_paned_add2 (GTK_PANED (panel->pane), table_frame);
#if 0 #if 0
gtk_table_attach (GTK_TABLE (panel->table), status_line, 0, 1, 0, 1, gtk_table_attach (GTK_TABLE (panel->table), status_line, 0, 1, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
@ -2011,12 +2011,12 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
gtk_table_attach (GTK_TABLE (panel->table), frame, 0, 1, 3, 4, gtk_table_attach (GTK_TABLE (panel->table), frame, 0, 1, 3, 4,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
0, 0, 0); 0, 0, 0);
/* Ultra nasty hack: pull the vbox from wdata */ /* Ultra nasty hack: pull the vbox from wdata */
vbox = GTK_WIDGET (panel->widget.wdata); vbox = GTK_WIDGET (panel->widget.wdata);
panel->widget.wdata = (widget_data) panel->table; panel->widget.wdata = (widget_data) panel->table;
/* Now, insert our table in our parent */ /* Now, insert our table in our parent */
gtk_container_add (GTK_CONTAINER (vbox), panel->table); gtk_container_add (GTK_CONTAINER (vbox), panel->table);
gtk_widget_show (vbox); gtk_widget_show (vbox);
@ -2046,7 +2046,7 @@ char *
get_nth_panel_name (int num) get_nth_panel_name (int num)
{ {
static char buffer [20]; static char buffer [20];
if (!num) if (!num)
return "New Left Panel"; return "New Left Panel";
else if (num == 1) else if (num == 1)
@ -2061,14 +2061,14 @@ void
load_hint (void) load_hint (void)
{ {
char *hint; char *hint;
if ((hint = get_random_hint ())){ if ((hint = get_random_hint ())){
if (*hint) if (*hint)
set_hintbar (hint); set_hintbar (hint);
free (hint); free (hint);
} else } else
set_hintbar ("The GNOME File Manager " VERSION); set_hintbar ("The GNOME File Manager " VERSION);
} }
void void
@ -2105,6 +2105,3 @@ x_panel_destroy (WPanel *panel)
{ {
gtk_widget_destroy (GTK_WIDGET (panel->xwindow)); gtk_widget_destroy (GTK_WIDGET (panel->xwindow));
} }