mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1999-02-10 Federico Mena Quintero <federico@nuclecu.unam.mx> 

* main.h: Added prototype for main_corba_register_server().

1999-02-10  Federico Mena Quintero  <federico@nuclecu.unam.mx>

	* gscreen.c (ILIST_FROM_SW): New macro to extract the icon list
	from the scrolled window.
	(panel_create_icon_display): Create a scrolled window and put the
	icon list inside it.  Changed the rest of the code to know about
	this.

	* gcorba.c (do_window_close): It turns out that we *do* need to
	call CORBA_free().  It was a bug in ORBit which was causing this
	to crash.
This commit is contained in:
Miguel de Icaza 1999-02-10 21:03:04 +00:00
parent e4ef9c4bae
commit aab8269cca
6 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnome/ChangeLog
View File

@ -1,5 +1,11 @@
1999-02-10 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gscreen.c (ILIST_FROM_SW): New macro to extract the icon list
from the scrolled window.
(panel_create_icon_display): Create a scrolled window and put the
icon list inside it. Changed the rest of the code to know about
this.
* gcorba.c (do_window_close): It turns out that we *do* need to
call CORBA_free(). It was a bug in ORBit which was causing this
to crash.

12
gnome/gmain.c
View File

@ -20,6 +20,7 @@
#include "dir.h"
#include "panel.h"
#include "gscreen.h"
#include "gcmd.h"
#include "command.h"
#include "cmd.h"
#include "gdesktop.h"
@ -502,15 +503,9 @@ create_one_panel (char *dir, char *geometry)
void
create_panels (void)
{
GList *p, *g;
char *geo;
WPanel *panel;
#if 1
desktop_init ();
#else
start_desktop ();
#endif
cmdline = command_new (0, 0, 0);
the_hint = label_new (0, 0, 0, NULL);
@ -544,11 +539,8 @@ create_panels (void)
run_dlg (desktop_dlg);
/* shutdown gnome specific bits of midnight commander */
#if 1
desktop_destroy ();
#else
stop_desktop ();
#endif
}
static void

59
gnome/gscreen.c
View File

@ -79,6 +79,7 @@ GtkWidget *drag_multiple_ok = NULL;
#define CLIST_FROM_SW(panel_list) GTK_CLIST (GTK_BIN (panel_list)->child)
#define ILIST_FROM_SW(panel_list) GNOME_ICON_LIST (GTK_BIN (panel_list)->child)
void
@ -220,7 +221,7 @@ panel_fill_panel_list (WPanel *panel)
static void
panel_fill_panel_icons (WPanel *panel)
{
GnomeIconList *icons = GNOME_ICON_LIST (panel->icons);
GnomeIconList *icons = ILIST_FROM_SW (panel->icons);
const int top = panel->count;
const int selected = panel->selected;
int i;
@ -313,7 +314,7 @@ x_select_item (WPanel *panel)
display_mini_info (panel);
if (panel->list_type == list_icons){
GnomeIconList *list = GNOME_ICON_LIST (panel->icons);
GnomeIconList *list = ILIST_FROM_SW (panel->icons);
gnome_icon_list_select_icon (list, panel->selected);
@ -340,7 +341,7 @@ x_unselect_item (WPanel *panel)
int selected = panel->selected;
if (panel->list_type == list_icons)
gnome_icon_list_unselect_all (GNOME_ICON_LIST (panel->icons), NULL, NULL);
gnome_icon_list_unselect_all (ILIST_FROM_SW (panel->icons), NULL, NULL);
else
gtk_clist_unselect_all (CLIST_FROM_SW (panel->list));
@ -1023,7 +1024,7 @@ panel_clist_scrolling_is_desirable (WPanel *panel, int x, int y)
{
GtkAdjustment *va;
va = scrolled_window_get_vadjustment (panel->list);
va = scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (panel->list));
if (y < 10){
if (va->value > va->lower)
@ -1146,13 +1147,13 @@ panel_icon_list_scrolling_is_desirable (WPanel *panel, int x, int y)
{
GtkAdjustment *va;
va = GNOME_ICON_LIST (panel->icons)->adj;
va = scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (panel->icons));
if (y < 10){
if (y < 10) {
if (va->value > va->lower)
return TRUE;
} else {
if (y > (GTK_WIDGET (panel->icons)->allocation.height - 10)){
if (y > (GTK_WIDGET (ILIST_FROM_SW (panel->icons))->allocation.height - 10)) {
if (va->value < va->upper - va->page_size)
return TRUE;
}
@ -1174,7 +1175,7 @@ panel_icon_list_scroll (gpointer data)
GtkAdjustment *va;
double v;
va = GNOME_ICON_LIST (panel->icons)->adj;
va = scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (panel->icons));
if (panel->drag_motion_y < 10) {
v = va->value - va->step_increment;
@ -1268,7 +1269,8 @@ panel_create_file_list (WPanel *panel)
titles [i++] = format->title;
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
file_list = gtk_clist_new_with_titles (items, titles);
gtk_container_add (GTK_CONTAINER (sw), file_list);
@ -1453,13 +1455,19 @@ panel_icon_list_button_release (GtkWidget *widget, GdkEventButton *event, WPanel
static GtkWidget *
panel_create_icon_display (WPanel *panel)
{
GtkWidget *sw;
GnomeIconList *ilist;
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
ilist = GNOME_ICON_LIST (
gnome_icon_list_new_flags (
90, NULL,
GNOME_ICON_LIST_IS_EDITABLE|
GNOME_ICON_LIST_STATIC_TEXT));
gnome_icon_list_new_flags (90, NULL,
(GNOME_ICON_LIST_IS_EDITABLE
| GNOME_ICON_LIST_STATIC_TEXT)));
gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (ilist));
gtk_widget_show (GTK_WIDGET (ilist));
gnome_icon_list_set_separators (ilist, " /-_.");
gnome_icon_list_set_row_spacing (ilist, 2);
@ -1515,16 +1523,15 @@ panel_create_icon_display (WPanel *panel)
GTK_SIGNAL_FUNC (panel_widget_motion),
panel);
/*
* This signal is provide for scrolling the main window if
* data is being dragged
/* This signal is provide for scrolling the main window if data is being
* dragged.
*/
gtk_signal_connect (GTK_OBJECT (ilist), "drag_motion",
GTK_SIGNAL_FUNC (panel_icon_list_drag_motion), panel);
gtk_signal_connect (GTK_OBJECT (ilist), "drag_leave",
GTK_SIGNAL_FUNC (panel_icon_list_drag_leave), panel);
return GTK_WIDGET (ilist);
return sw;
}
static void
@ -2346,7 +2353,7 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
{
GtkWidget *status_line, *filter, *vbox, *ministatus_box;
GtkWidget *cwd;
GtkWidget *dock, *box;
GtkWidget *dock;
GnomeUIBuilderData uibdata;
panel->xwindow = gtk_widget_get_toplevel (GTK_WIDGET (panel->widget.wdata));
@ -2373,27 +2380,19 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
panel->icons = panel_create_icon_display (panel);
gtk_widget_show (panel->icons);
panel->scrollbar = gtk_vscrollbar_new (GNOME_ICON_LIST (panel->icons)->adj);
gtk_widget_show (panel->scrollbar);
panel->list = panel_create_file_list (panel);
gtk_widget_ref (panel->icons);
gtk_widget_ref (panel->list);
box = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (box), panel->icons, TRUE, TRUE, 0);
gtk_box_pack_end (GTK_BOX (box), panel->scrollbar, FALSE, TRUE, 0);
gtk_widget_show (box);
panel->panel_listbox = gtk_event_box_new ();
gtk_widget_show (panel->panel_listbox);
gtk_container_add (GTK_CONTAINER (panel->panel_listbox), panel->list);
gtk_notebook_append_page (GTK_NOTEBOOK (panel->notebook), box, NULL);
gtk_notebook_append_page (GTK_NOTEBOOK (panel->notebook), panel->icons, NULL);
gtk_notebook_append_page (GTK_NOTEBOOK (panel->notebook), panel->panel_listbox, NULL);
gtk_notebook_set_page (GTK_NOTEBOOK (panel->notebook), panel->list_type == list_icons ? 0 : 1);
gtk_widget_show_all (box);
gtk_widget_show (panel->icons);
gtk_widget_show (panel->list);
gtk_widget_show (panel->notebook);

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
1999-02-10 Federico Mena Quintero <federico@nuclecu.unam.mx>
* main.h: Added prototype for main_corba_register_server().
1999-02-09 Miguel de Icaza <miguel@nuclecu.unam.mx>
* view.c (search): Provide GNOME specific code for the search progress

2
src/main.h
View File

@ -187,6 +187,8 @@ void done_menu (void);
void init_menu (void);
void exec_shell (void);
void main_corba_register_server (void);
#ifdef OS2_NT
# define MC_BASE ""
#else

1
src/panel.h
View File

@ -135,7 +135,6 @@ typedef struct {
void *tree;
void *icons;
void *notebook;
void *scrollbar;
void *status;
void *ministatus;
void *tree_scrolled_window;