Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
GNOME
gnumeric
Commits
76e414be
Commit
76e414be
authored
Sep 05, 1998
by
Arturo Espinosa
Browse files
Fix various pending small buglettes -mig
parent
47d3133f
Changes
10
Hide whitespace changes
Inline
Side-by-side
ChangeLog-1999-07-09
View file @
76e414be
1998-09-04 Miguel de Icaza <miguel@nuclecu.unam.mx>
* src/gnumeric-sheet.c (gnumeric_sheet_key): Fix the way the
hotkeys were processed (c-a specifically is annoying and all of
the control-keys were being consumed before reaching the
item-edit).
(gnumeric_sheet_key): implemenet control-space
* src/dialog-cell-format.c (create_align_page): Connect to the
toggled signal of auto return.
* src/cell.c (cell_draw): Fix the VALIGN_JUSTIFY case.
* src/item-grid.c (item_grid_draw): Redone the cell draw driver.
* src/cell.c (cell_draw): Now it returns the number of cells it
...
...
ChangeLog-2000-02-23
View file @
76e414be
1998-09-04 Miguel de Icaza <miguel@nuclecu.unam.mx>
* src/gnumeric-sheet.c (gnumeric_sheet_key): Fix the way the
hotkeys were processed (c-a specifically is annoying and all of
the control-keys were being consumed before reaching the
item-edit).
(gnumeric_sheet_key): implemenet control-space
* src/dialog-cell-format.c (create_align_page): Connect to the
toggled signal of auto return.
* src/cell.c (cell_draw): Fix the VALIGN_JUSTIFY case.
* src/item-grid.c (item_grid_draw): Redone the cell draw driver.
* src/cell.c (cell_draw): Now it returns the number of cells it
...
...
OChangeLog-1999-07-09
View file @
76e414be
1998-09-04 Miguel de Icaza <miguel@nuclecu.unam.mx>
* src/gnumeric-sheet.c (gnumeric_sheet_key): Fix the way the
hotkeys were processed (c-a specifically is annoying and all of
the control-keys were being consumed before reaching the
item-edit).
(gnumeric_sheet_key): implemenet control-space
* src/dialog-cell-format.c (create_align_page): Connect to the
toggled signal of auto return.
* src/cell.c (cell_draw): Fix the VALIGN_JUSTIFY case.
* src/item-grid.c (item_grid_draw): Redone the cell draw driver.
* src/cell.c (cell_draw): Now it returns the number of cells it
...
...
OChangeLog-2000-02-23
View file @
76e414be
1998-09-04 Miguel de Icaza <miguel@nuclecu.unam.mx>
* src/gnumeric-sheet.c (gnumeric_sheet_key): Fix the way the
hotkeys were processed (c-a specifically is annoying and all of
the control-keys were being consumed before reaching the
item-edit).
(gnumeric_sheet_key): implemenet control-space
* src/dialog-cell-format.c (create_align_page): Connect to the
toggled signal of auto return.
* src/cell.c (cell_draw): Fix the VALIGN_JUSTIFY case.
* src/item-grid.c (item_grid_draw): Redone the cell draw driver.
* src/cell.c (cell_draw): Now it returns the number of cells it
...
...
TODO
View file @
76e414be
...
...
@@ -12,22 +12,10 @@ GNOME Spread Sheet task list
** Style
Alignment:
Horizontal:
General/Left/Right/Center/Justify/
Center with respect to selection.
Vertical
Up/Center/Fown/Justify
Automatic return check box
This automatically "wraps" text when it overflows the cell
Orientation
horizontal
vertical: 3 types of string display.
Fonts:
Borders:
Color/patterns
...
...
src/cell.c
View file @
76e414be
...
...
@@ -805,22 +805,26 @@ cell_draw (Cell *cell, void *sv, GdkGC *gc, GdkDrawable *drawable, int x1, int y
inter_space
=
font_height
;
break
;
case
VALIGN_BOTTOM
:
y_offset
=
cell_pixel_height
-
(
line_count
*
font_height
);
inter_space
=
font_height
;
break
;
case
VALIGN_CENTER
:
y_offset
=
(
cell_pixel_height
-
(
line_count
*
font_height
))
/
2
;
inter_space
=
font_height
;
break
;
case
VALIGN_JUSTIFY
:
y_offset
=
0
;
inter_space
=
font_height
+
(
cell_pixel_height
-
(
line_count
*
font_height
))
/
line_count
;
if
(
line_count
>
1
){
y_offset
=
0
;
inter_space
=
font_height
+
(
cell_pixel_height
-
(
line_count
*
font_height
))
/
(
line_count
-
1
);
break
;
}
/* Else, we become a VALIGN_BOTTOM line */
case
VALIGN_BOTTOM
:
y_offset
=
cell_pixel_height
-
(
line_count
*
font_height
);
inter_space
=
font_height
;
break
;
default:
g_warning
(
"Unhandled cell vertical alignment
\n
"
);
y_offset
=
0
;
...
...
src/dialog-cell-format.c
View file @
76e414be
...
...
@@ -480,6 +480,8 @@ create_align_page (GtkWidget *prop_win, CellList *cells)
auto_return
=
gtk_check_button_new_with_label
(
_
(
"Auto return"
));
gtk_table_attach
(
t
,
auto_return
,
0
,
3
,
2
,
3
,
0
,
0
,
0
,
0
);
gtk_signal_connect
(
GTK_OBJECT
(
auto_return
),
"toggled"
,
GTK_SIGNAL_FUNC
(
prop_modified
),
prop_win
);
/* Check if all cells have the same properties */
/*
...
...
@@ -667,20 +669,20 @@ create_stipples (GnomeCanvas *canvas)
item
=
GNOME_CANVAS_RE
(
gnome_canvas_item_new
(
group
,
gnome_canvas_rect_get_type
(),
"x1"
,
(
double
)
x
*
1
.
0
+
0
.
1
,
"y1"
,
(
double
)
y
*
1
.
0
+
0
.
1
,
"x2"
,
(
double
)
x
*
1
.
0
+
1
.
2
,
"y2"
,
(
double
)
y
*
1
.
0
+
1
.
2
,
"x1"
,
(
double
)
x
*
1
0
.
0
,
"y1"
,
(
double
)
y
*
1
0
.
0
,
"x2"
,
(
double
)
x
*
1
0
.
0
+
8
.
0
,
"y2"
,
(
double
)
y
*
1
0
.
0
+
8
.
0
,
"fill_color"
,
"black"
,
"width_pixels"
,
(
int
)
1
,
"outline_color"
,
"black"
,
NULL
));
#if 0
patterns
[
i
]
=
gdk_bitmap_create_from_data
(
window
,
gnumeric_sheet_patterns
[
i
].
pattern
,
8
,
8
);
gdk_gc_set_stipple
(
item
->
fill_gc
,
patterns
[
i
]);
gdk_gc_set_fill
(
item
->
fill_gc
,
GDK_STIPPLED
);
#endif
}
}
...
...
@@ -691,8 +693,10 @@ create_pattern_preview (GtkWidget *prop_win)
canvas
=
(
GnomeCanvas
*
)
gnome_canvas_new
();
gnome_canvas_set_scroll_region
(
canvas
,
0
.
0
,
0
.
0
,
14
.
0
,
4
.
0
);
gnome_canvas_set_size
(
canvas
,
112
,
112
);
gnome_canvas_set_size
(
canvas
,
280
,
80
);
gnome_canvas_set_scroll_region
(
canvas
,
0
.
0
,
0
.
0
,
70
.
0
,
80
.
0
);
gnome_canvas_set_pixels_per_unit
(
canvas
,
1
.
0
);
gtk_signal_connect_after
(
GTK_OBJECT
(
canvas
),
"realize"
,
GTK_SIGNAL_FUNC
(
create_stipples
),
NULL
);
...
...
@@ -731,7 +735,7 @@ create_background_radio (GtkWidget *prop_win)
gtk_table_attach
(
GTK_TABLE
(
table
),
cs1
,
1
,
2
,
1
,
2
,
0
,
0
,
0
,
0
);
gtk_table_attach
(
GTK_TABLE
(
table
),
cs2
,
1
,
2
,
2
,
3
,
0
,
0
,
0
,
0
);
gtk_table_attach
(
GTK_TABLE
(
table
),
p
,
0
,
2
,
3
,
4
,
0
,
0
,
0
,
0
);
gtk_table_attach
(
GTK_TABLE
(
table
),
p
,
0
,
2
,
3
,
4
,
GTK_FILL
|
GTK_EXPAND
,
GTK_FILL
|
GTK_EXPAND
,
0
,
0
);
return
frame
;
}
...
...
src/dialogs/dialog-cell-format.c
View file @
76e414be
...
...
@@ -480,6 +480,8 @@ create_align_page (GtkWidget *prop_win, CellList *cells)
auto_return
=
gtk_check_button_new_with_label
(
_
(
"Auto return"
));
gtk_table_attach
(
t
,
auto_return
,
0
,
3
,
2
,
3
,
0
,
0
,
0
,
0
);
gtk_signal_connect
(
GTK_OBJECT
(
auto_return
),
"toggled"
,
GTK_SIGNAL_FUNC
(
prop_modified
),
prop_win
);
/* Check if all cells have the same properties */
/*
...
...
@@ -667,20 +669,20 @@ create_stipples (GnomeCanvas *canvas)
item
=
GNOME_CANVAS_RE
(
gnome_canvas_item_new
(
group
,
gnome_canvas_rect_get_type
(),
"x1"
,
(
double
)
x
*
1
.
0
+
0
.
1
,
"y1"
,
(
double
)
y
*
1
.
0
+
0
.
1
,
"x2"
,
(
double
)
x
*
1
.
0
+
1
.
2
,
"y2"
,
(
double
)
y
*
1
.
0
+
1
.
2
,
"x1"
,
(
double
)
x
*
1
0
.
0
,
"y1"
,
(
double
)
y
*
1
0
.
0
,
"x2"
,
(
double
)
x
*
1
0
.
0
+
8
.
0
,
"y2"
,
(
double
)
y
*
1
0
.
0
+
8
.
0
,
"fill_color"
,
"black"
,
"width_pixels"
,
(
int
)
1
,
"outline_color"
,
"black"
,
NULL
));
#if 0
patterns
[
i
]
=
gdk_bitmap_create_from_data
(
window
,
gnumeric_sheet_patterns
[
i
].
pattern
,
8
,
8
);
gdk_gc_set_stipple
(
item
->
fill_gc
,
patterns
[
i
]);
gdk_gc_set_fill
(
item
->
fill_gc
,
GDK_STIPPLED
);
#endif
}
}
...
...
@@ -691,8 +693,10 @@ create_pattern_preview (GtkWidget *prop_win)
canvas
=
(
GnomeCanvas
*
)
gnome_canvas_new
();
gnome_canvas_set_scroll_region
(
canvas
,
0
.
0
,
0
.
0
,
14
.
0
,
4
.
0
);
gnome_canvas_set_size
(
canvas
,
112
,
112
);
gnome_canvas_set_size
(
canvas
,
280
,
80
);
gnome_canvas_set_scroll_region
(
canvas
,
0
.
0
,
0
.
0
,
70
.
0
,
80
.
0
);
gnome_canvas_set_pixels_per_unit
(
canvas
,
1
.
0
);
gtk_signal_connect_after
(
GTK_OBJECT
(
canvas
),
"realize"
,
GTK_SIGNAL_FUNC
(
create_stipples
),
NULL
);
...
...
@@ -731,7 +735,7 @@ create_background_radio (GtkWidget *prop_win)
gtk_table_attach
(
GTK_TABLE
(
table
),
cs1
,
1
,
2
,
1
,
2
,
0
,
0
,
0
,
0
);
gtk_table_attach
(
GTK_TABLE
(
table
),
cs2
,
1
,
2
,
2
,
3
,
0
,
0
,
0
,
0
);
gtk_table_attach
(
GTK_TABLE
(
table
),
p
,
0
,
2
,
3
,
4
,
0
,
0
,
0
,
0
);
gtk_table_attach
(
GTK_TABLE
(
table
),
p
,
0
,
2
,
3
,
4
,
GTK_FILL
|
GTK_EXPAND
,
GTK_FILL
|
GTK_EXPAND
,
0
,
0
);
return
frame
;
}
...
...
src/gnumeric-canvas.c
View file @
76e414be
...
...
@@ -550,18 +550,33 @@ gnumeric_sheet_key (GtkWidget *widget, GdkEventKey *event)
}
}
if
((
event
->
state
&
GDK_CONTROL_MASK
)
!=
0
)
{
switch
(
event
->
keyval
)
{
case
GDK_a
:
/* Select all */
sheet_select_all
(
gsheet
->
sheet_view
->
sheet
);
sheet_redraw_all
(
gsheet
->
sheet_view
->
sheet
);
break
;
case
GDK_space
:
/* Select row */
break
;
default:
break
;
/*
* The following sequences do not trigger an editor-start
* but if the editor is running we forward the events to it.
*/
if
(
!
gsheet
->
item_editor
){
if
((
event
->
state
&
GDK_CONTROL_MASK
)
!=
0
)
{
switch
(
event
->
keyval
)
{
/* Select all */
case
GDK_a
:
sheet_select_all
(
sheet
);
sheet_redraw_all
(
sheet
);
return
1
;
case
GDK_space
:
sheet_selection_reset_only
(
sheet
);
sheet_selection_append_range
(
sheet
,
sheet
->
cursor_col
,
sheet
->
cursor_row
,
sheet
->
cursor_col
,
0
,
sheet
->
cursor_col
,
SHEET_MAX_ROWS
-
1
);
sheet_redraw_all
(
sheet
);
return
1
;
}
}
return
1
;
}
switch
(
event
->
keyval
){
...
...
@@ -623,7 +638,7 @@ gnumeric_sheet_key (GtkWidget *widget, GdkEventKey *event)
case
GDK_F2
:
gtk_window_set_focus
(
GTK_WINDOW
(
wb
->
toplevel
),
wb
->
ea_input
);
/* fall
back
*/
/* fall
down
*/
default:
if
(
!
gsheet
->
item_editor
){
...
...
src/gnumeric-sheet.c
View file @
76e414be
...
...
@@ -550,18 +550,33 @@ gnumeric_sheet_key (GtkWidget *widget, GdkEventKey *event)
}
}
if
((
event
->
state
&
GDK_CONTROL_MASK
)
!=
0
)
{
switch
(
event
->
keyval
)
{
case
GDK_a
:
/* Select all */
sheet_select_all
(
gsheet
->
sheet_view
->
sheet
);
sheet_redraw_all
(
gsheet
->
sheet_view
->
sheet
);
break
;
case
GDK_space
:
/* Select row */
break
;
default:
break
;
/*
* The following sequences do not trigger an editor-start
* but if the editor is running we forward the events to it.
*/
if
(
!
gsheet
->
item_editor
){
if
((
event
->
state
&
GDK_CONTROL_MASK
)
!=
0
)
{
switch
(
event
->
keyval
)
{
/* Select all */
case
GDK_a
:
sheet_select_all
(
sheet
);
sheet_redraw_all
(
sheet
);
return
1
;
case
GDK_space
:
sheet_selection_reset_only
(
sheet
);
sheet_selection_append_range
(
sheet
,
sheet
->
cursor_col
,
sheet
->
cursor_row
,
sheet
->
cursor_col
,
0
,
sheet
->
cursor_col
,
SHEET_MAX_ROWS
-
1
);
sheet_redraw_all
(
sheet
);
return
1
;
}
}
return
1
;
}
switch
(
event
->
keyval
){
...
...
@@ -623,7 +638,7 @@ gnumeric_sheet_key (GtkWidget *widget, GdkEventKey *event)
case
GDK_F2
:
gtk_window_set_focus
(
GTK_WINDOW
(
wb
->
toplevel
),
wb
->
ea_input
);
/* fall
back
*/
/* fall
down
*/
default:
if
(
!
gsheet
->
item_editor
){
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment