mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

1999-08-08 David Martin <dmartina@usa.net>

Browse Source 
* gtkedit/syntax.c (upgrade_syntax_file): Mark error strings for
	translation.

	* gtkedit/editmenu.c (edit_about_cmd): Mark text in "about" for
	translation as it used to be.
This commit is contained in:
Miguel de Icaza 1999-08-12 23:15:03 +00:00
parent 37efb6b935
commit 3ba5595791
3 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUGS
View File

@ -3,7 +3,7 @@ Bugzilla: 3436
bugs.gnome.org:
Important: 1006, 1796
Major cosmetic: 272/875, 487, 845, 899, 923, 1072/1336,
1299, 1415, 1457, 1545, 1559, 1582, 1656, 1758
1299, 1415, 1457, 1545, 1559, 1582, 1656
Minor cosmetic: 55/208, 115, 308, 383, 398, 449, 479, 597, 781,
874, 931, 956/1126, 1022.1, 1045, 1047, 904, 1329,
1468, 1508, 1750

8
gnome/ChangeLog
View File

@ -1,3 +1,11 @@
1999-08-12 Federico Mena Quintero <federico@redhat.com>
* gtkdtree.c (scan_subtree): Scan the subtree unconditionally, as
it is completely orthogonal from the selection status.
(gtk_dtree_select_row): Maintain the dtree->last_node field here.
This fixes the expand/select the same row sequence. BUGFIX: GNOME
bug tracker #1758.
1999-08-12 Jonathan Blandford <jrb@redhat.com>
* gpopup2.c (handle_unmount): We refresh when we unmount/mount a cdrom.

42
gnome/gtkdtree.c
View File

@ -206,19 +206,13 @@ scan_end (GtkDTree *dtree)
}
}
/* Scans a subdirectory in the tree. Returns whether it is worth it to reload
* the directory or not.
*/
static int
/* Scans a subdirectory in the tree */
static void
scan_subtree (GtkDTree *dtree, GtkCTreeNode *row)
{
char *path;
if (row == dtree->last_node)
return FALSE;
dtree->loading_dir++;
dtree->last_node = row;
scan_begin (dtree);
path = gtk_dtree_get_row_path (dtree, row, 0);
@ -229,19 +223,6 @@ scan_subtree (GtkDTree *dtree, GtkCTreeNode *row)
dtree->current_path = path;
gtk_dtree_load_path (dtree, path, row, 1);
#if 0
last_node = GTK_CTREE_ROW (row)->children;
for (; last_node; last_node = GTK_CTREE_ROW (last_node)->sibling){
char *np, *text;
gtk_ctree_node_get_pixtext (GTK_CTREE (dtree), last_node, column,
&text, NULL, NULL, NULL);
np = g_concat_dir_and_file (path, text);
gtk_dtree_load_path (dtree, np, last_node, 0);
g_free (np);
}
#endif
dtree->loading_dir--;
scan_end (dtree);
@ -253,7 +234,6 @@ static void
gtk_dtree_select_row (GtkCTree *ctree, GtkCTreeNode *row, gint column)
{
GtkDTree *dtree;
int do_change;
dtree = GTK_DTREE (ctree);
@ -263,9 +243,17 @@ gtk_dtree_select_row (GtkCTree *ctree, GtkCTreeNode *row, gint column)
scan_begin (dtree);
(* parent_class->tree_select_row) (ctree, row, column);
do_change = scan_subtree (dtree, row);
if (do_change && !dtree->internal)
if (row == dtree->last_node) {
scan_end (dtree);
return;
}
dtree->last_node = row;
scan_subtree (dtree, row);
if (!dtree->internal)
gtk_signal_emit (GTK_OBJECT (dtree), gtk_dtree_signals [DIRECTORY_CHANGED],
dtree->current_path);
@ -678,12 +666,6 @@ gtk_dtree_load_pixmap (char *pix [], GdkPixmap **pixmap, GdkBitmap **bitmap)
*bitmap = gdk_imlib_move_mask (image);
}
/*
* FIXME: This uses the current colormap and pixmap.
* This means that at widget *creation* time the proper
* colormap and visual should be set, dont wait till
* realize for that
*/
static void
gdk_dtree_load_pixmaps (GtkDTree *dtree)
{