rudimentary begininnings of a new, revitalized status bar.
Comments are welcome, but probably a tad premature at this point. dobedobedobedo... man it's late...
Этот коммит содержится в:
родитель
d6a8e538fc
Коммит
8651cbfe54
@ -1,5 +1,10 @@
|
|||||||
1999-01-07 Jonathan Blandford <jrb@redhat.com>
|
1999-01-07 Jonathan Blandford <jrb@redhat.com>
|
||||||
|
|
||||||
|
* glayout.c: use the function below.
|
||||||
|
|
||||||
|
* gcmd.c (gnome_filter_cmd): New function (or a sorry excuse for
|
||||||
|
one, anyway...)
|
||||||
|
|
||||||
* gscreen.c (x_create_panel): now uses gnome-appbar instead of the
|
* gscreen.c (x_create_panel): now uses gnome-appbar instead of the
|
||||||
old, psuedo status bar.
|
old, psuedo status bar.
|
||||||
|
|
||||||
|
@ -541,3 +541,10 @@ gnome_select_all_cmd (GtkWidget *widget, WPanel *panel)
|
|||||||
paint_panel (panel);
|
paint_panel (panel);
|
||||||
do_refresh ();
|
do_refresh ();
|
||||||
}
|
}
|
||||||
|
void
|
||||||
|
gnome_filter_cmd (GtkWidget *widget, WPanel *panel)
|
||||||
|
{
|
||||||
|
GtkWidget *filter_dlg;
|
||||||
|
GtkWidget *entry;
|
||||||
|
|
||||||
|
}
|
||||||
|
@ -14,6 +14,7 @@ void gnome_full_view_cmd (GtkWidget *widget, WPanel *panel);
|
|||||||
void gnome_custom_view_cmd (GtkWidget *widget, WPanel *panel);
|
void gnome_custom_view_cmd (GtkWidget *widget, WPanel *panel);
|
||||||
void gnome_sort_cmd (GtkWidget *widget, WPanel *panel);
|
void gnome_sort_cmd (GtkWidget *widget, WPanel *panel);
|
||||||
void gnome_select_all_cmd (GtkWidget *widget, WPanel *panel);
|
void gnome_select_all_cmd (GtkWidget *widget, WPanel *panel);
|
||||||
|
void gnome_filter_cmd (GtkWidget *widget, WPanel *panel);
|
||||||
void gnome_external_panelize (GtkWidget *widget, WPanel *panel);
|
void gnome_external_panelize (GtkWidget *widget, WPanel *panel);
|
||||||
|
|
||||||
#endif /* __GCMD_H */
|
#endif /* __GCMD_H */
|
||||||
|
@ -316,7 +316,7 @@ GnomeUIInfo gnome_panel_view_menu [] = {
|
|||||||
|
|
||||||
GnomeUIInfo gnome_panel_layout_menu [] = {
|
GnomeUIInfo gnome_panel_layout_menu [] = {
|
||||||
{ GNOME_APP_UI_ITEM, N_("_Sort By..."), N_("Confirmation settings"), gnome_sort_cmd },
|
{ GNOME_APP_UI_ITEM, N_("_Sort By..."), N_("Confirmation settings"), gnome_sort_cmd },
|
||||||
{ GNOME_APP_UI_ITEM, N_("_Filter View..."), N_("Global option settings"), filter_cmd },
|
{ GNOME_APP_UI_ITEM, N_("_Filter View..."), N_("Global option settings"), gnome_filter_cmd },
|
||||||
{ GNOME_APP_UI_SEPARATOR },
|
{ GNOME_APP_UI_SEPARATOR },
|
||||||
{ GNOME_APP_UI_RADIOITEMS, NULL , NULL, gnome_panel_view_menu},
|
{ GNOME_APP_UI_RADIOITEMS, NULL , NULL, gnome_panel_view_menu},
|
||||||
{ GNOME_APP_UI_ENDOFINFO, 0, 0 }
|
{ GNOME_APP_UI_ENDOFINFO, 0, 0 }
|
||||||
|
@ -2255,44 +2255,27 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
|
|||||||
gnome_dock_add_item (GNOME_DOCK(GNOME_APP (panel->xwindow)->dock),
|
gnome_dock_add_item (GNOME_DOCK(GNOME_APP (panel->xwindow)->dock),
|
||||||
GNOME_DOCK_ITEM (dock), GNOME_DOCK_TOP, 1, 0, 0, FALSE);
|
GNOME_DOCK_ITEM (dock), GNOME_DOCK_TOP, 1, 0, 0, FALSE);
|
||||||
gtk_widget_show_all (dock);
|
gtk_widget_show_all (dock);
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* ministatus
|
|
||||||
*/
|
|
||||||
panel->ministatus = GNOME_APPBAR(gnome_appbar_new(FALSE, TRUE, GNOME_PREFERENCES_USER));
|
|
||||||
gnome_app_set_statusbar(GNOME_APP (panel->xwindow), GTK_WIDGET(panel->ministatus));
|
|
||||||
#if 0
|
|
||||||
panel->ministatus = gtk_label_new (" "); /* was a cliplabel */
|
|
||||||
gtk_widget_set_usize (panel->ministatus, 0, -1);
|
|
||||||
gtk_misc_set_alignment (GTK_MISC (panel->ministatus), 0.0, 0.0);
|
|
||||||
gtk_misc_set_padding (GTK_MISC (panel->ministatus), 3, 0);
|
|
||||||
gtk_widget_show (panel->ministatus);
|
|
||||||
gtk_label_set_justify (GTK_LABEL (panel->ministatus), GTK_JUSTIFY_LEFT);
|
|
||||||
/*
|
|
||||||
* The statusbar
|
|
||||||
* This status bar now holds the ministatus.
|
|
||||||
*/
|
|
||||||
|
|
||||||
frame = gtk_frame_new (NULL);
|
|
||||||
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
|
|
||||||
gtk_container_set_border_width (GTK_CONTAINER (frame), 0);
|
|
||||||
|
|
||||||
panel->status = gtk_label_new (""); /* used to be a cliplabel */
|
|
||||||
|
|
||||||
|
|
||||||
/* we set up the status_bar */
|
|
||||||
gtk_misc_set_alignment (GTK_MISC (panel->status), 0.0, 0.5);
|
|
||||||
gtk_misc_set_padding (GTK_MISC (panel->status), 3, 0);
|
|
||||||
gtk_container_add (GTK_CONTAINER (frame), panel->ministatus);
|
|
||||||
gtk_label_set_justify (GTK_LABEL (panel->status), GTK_JUSTIFY_LEFT);
|
|
||||||
gtk_widget_show_all (frame);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
panel->view_table = gtk_table_new (1, 1, 0);
|
panel->view_table = gtk_table_new (1, 1, 0);
|
||||||
gtk_widget_show (panel->view_table);
|
gtk_widget_show (panel->view_table);
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The status bar.
|
||||||
|
*/
|
||||||
|
panel->ministatus = GNOME_APPBAR(gnome_appbar_new(FALSE, TRUE, GNOME_PREFERENCES_NEVER));
|
||||||
|
gnome_app_set_statusbar(GNOME_APP (panel->xwindow), GTK_WIDGET(panel->ministatus));
|
||||||
|
ministatus_box = gtk_frame_new (NULL);
|
||||||
|
gtk_frame_set_shadow_type (GTK_FRAME(ministatus_box), GTK_SHADOW_IN);
|
||||||
|
|
||||||
|
panel->status = gtk_label_new (_("Show all Files"));
|
||||||
|
gtk_misc_set_alignment (GTK_MISC (panel->status), 0.0, 0.0);
|
||||||
|
|
||||||
|
gtk_box_pack_start (GTK_BOX (panel->ministatus), ministatus_box, FALSE, FALSE, 0);
|
||||||
|
gtk_container_add (GTK_CONTAINER(ministatus_box), panel->status);
|
||||||
|
|
||||||
|
gtk_widget_show (ministatus_box);
|
||||||
|
gtk_widget_show (panel->status);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Put the icon list and the file listing in a nice frame
|
* Put the icon list and the file listing in a nice frame
|
||||||
*/
|
*/
|
||||||
@ -2342,8 +2325,8 @@ 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);
|
||||||
#endif
|
|
||||||
|
|
||||||
|
#endif
|
||||||
/* 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);
|
||||||
|
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user