Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
804e3770
Commit
804e3770
authored
12 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
* #19195: gnome: GtkTable -> GtkGrid for videoconf
parent
a4c71712
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
gnome/src/config/videoconf.c
+11
-11
11 additions, 11 deletions
gnome/src/config/videoconf.c
with
11 additions
and
11 deletions
gnome/src/config/videoconf.c
+
11
−
11
View file @
804e3770
...
@@ -811,9 +811,9 @@ v4l2_box()
...
@@ -811,9 +811,9 @@ v4l2_box()
gtk_box_pack_start
(
GTK_BOX
(
ret
),
v4l2_hbox
,
TRUE
,
TRUE
,
0
);
gtk_box_pack_start
(
GTK_BOX
(
ret
),
v4l2_hbox
,
TRUE
,
TRUE
,
0
);
gtk_box_pack_start
(
GTK_BOX
(
ret
),
v4l2_nodev
,
TRUE
,
TRUE
,
0
);
gtk_box_pack_start
(
GTK_BOX
(
ret
),
v4l2_nodev
,
TRUE
,
TRUE
,
0
);
GtkWidget
*
table
=
gtk_
table_new
(
6
,
3
,
FALSE
);
GtkWidget
*
grid
=
gtk_
grid_new
(
);
gtk_
table
_set_col_spacing
(
GTK_
TABLE
(
table
),
0
,
40
);
gtk_
grid
_set_col
umn
_spacing
(
GTK_
GRID
(
grid
)
,
40
);
gtk_box_pack_start
(
GTK_BOX
(
v4l2_hbox
)
,
table
,
TRUE
,
TRUE
,
1
);
gtk_box_pack_start
(
GTK_BOX
(
v4l2_hbox
),
grid
,
TRUE
,
TRUE
,
1
);
// Set choices of input devices
// Set choices of input devices
GtkWidget
*
item
=
gtk_label_new
(
_
(
"Device"
));
GtkWidget
*
item
=
gtk_label_new
(
_
(
"Device"
));
...
@@ -822,13 +822,13 @@ v4l2_box()
...
@@ -822,13 +822,13 @@ v4l2_box()
gtk_label_set_mnemonic_widget
(
GTK_LABEL
(
item
),
v4l2Device
);
gtk_label_set_mnemonic_widget
(
GTK_LABEL
(
item
),
v4l2Device
);
g_signal_connect
(
G_OBJECT
(
v4l2Device
),
"changed"
,
G_CALLBACK
(
select_video_input_device_cb
),
NULL
);
g_signal_connect
(
G_OBJECT
(
v4l2Device
),
"changed"
,
G_CALLBACK
(
select_video_input_device_cb
),
NULL
);
gtk_
table
_attach
(
GTK_
TABLE
(
table
),
item
,
0
,
1
,
0
,
1
,
GTK_FILL
|
GTK_EXPAND
,
GTK_SHRINK
,
0
,
0
);
gtk_
grid
_attach
(
GTK_
GRID
(
grid
),
item
,
0
,
0
,
1
,
1
);
// Set rendering
// Set rendering
GtkCellRenderer
*
renderer
=
gtk_cell_renderer_text_new
();
GtkCellRenderer
*
renderer
=
gtk_cell_renderer_text_new
();
gtk_cell_layout_pack_start
(
GTK_CELL_LAYOUT
(
v4l2Device
),
renderer
,
TRUE
);
gtk_cell_layout_pack_start
(
GTK_CELL_LAYOUT
(
v4l2Device
),
renderer
,
TRUE
);
gtk_cell_layout_set_attributes
(
GTK_CELL_LAYOUT
(
v4l2Device
),
renderer
,
"text"
,
0
,
NULL
);
gtk_cell_layout_set_attributes
(
GTK_CELL_LAYOUT
(
v4l2Device
),
renderer
,
"text"
,
0
,
NULL
);
gtk_
table
_attach
(
GTK_
TABLE
(
table
),
v4l2Device
,
1
,
2
,
0
,
1
,
GTK_FILL
|
GTK_EXPAND
,
GTK_SHRINK
,
0
,
0
);
gtk_
grid
_attach
(
GTK_
GRID
(
grid
),
v4l2Device
,
1
,
0
,
1
,
1
);
// Set choices of input
// Set choices of input
item
=
gtk_label_new
(
_
(
"Channel"
));
item
=
gtk_label_new
(
_
(
"Channel"
));
...
@@ -836,13 +836,13 @@ v4l2_box()
...
@@ -836,13 +836,13 @@ v4l2_box()
v4l2Channel
=
gtk_combo_box_new_with_model
(
GTK_TREE_MODEL
(
v4l2ChannelList
));
v4l2Channel
=
gtk_combo_box_new_with_model
(
GTK_TREE_MODEL
(
v4l2ChannelList
));
gtk_label_set_mnemonic_widget
(
GTK_LABEL
(
item
),
v4l2Channel
);
gtk_label_set_mnemonic_widget
(
GTK_LABEL
(
item
),
v4l2Channel
);
g_signal_connect
(
G_OBJECT
(
v4l2Channel
),
"changed"
,
G_CALLBACK
(
select_video_input_device_channel_cb
),
NULL
);
g_signal_connect
(
G_OBJECT
(
v4l2Channel
),
"changed"
,
G_CALLBACK
(
select_video_input_device_channel_cb
),
NULL
);
gtk_
table
_attach
(
GTK_
TABLE
(
table
),
item
,
0
,
1
,
1
,
2
,
GTK_FILL
|
GTK_EXPAND
,
GTK_SHRINK
,
0
,
0
);
gtk_
grid
_attach
(
GTK_
GRID
(
grid
),
item
,
0
,
1
,
1
,
1
);
// Set rendering
// Set rendering
renderer
=
gtk_cell_renderer_text_new
();
renderer
=
gtk_cell_renderer_text_new
();
gtk_cell_layout_pack_start
(
GTK_CELL_LAYOUT
(
v4l2Channel
),
renderer
,
TRUE
);
gtk_cell_layout_pack_start
(
GTK_CELL_LAYOUT
(
v4l2Channel
),
renderer
,
TRUE
);
gtk_cell_layout_set_attributes
(
GTK_CELL_LAYOUT
(
v4l2Channel
),
renderer
,
"text"
,
0
,
NULL
);
gtk_cell_layout_set_attributes
(
GTK_CELL_LAYOUT
(
v4l2Channel
),
renderer
,
"text"
,
0
,
NULL
);
gtk_
table
_attach
(
GTK_
TABLE
(
table
),
v4l2Channel
,
1
,
2
,
1
,
2
,
GTK_FILL
|
GTK_EXPAND
,
GTK_SHRINK
,
0
,
0
);
gtk_
grid
_attach
(
GTK_
GRID
(
grid
),
v4l2Channel
,
1
,
1
,
1
,
1
);
// Set choices of sizes
// Set choices of sizes
item
=
gtk_label_new
(
_
(
"Size"
));
item
=
gtk_label_new
(
_
(
"Size"
));
...
@@ -850,13 +850,13 @@ v4l2_box()
...
@@ -850,13 +850,13 @@ v4l2_box()
v4l2Size
=
gtk_combo_box_new_with_model
(
GTK_TREE_MODEL
(
v4l2SizeList
));
v4l2Size
=
gtk_combo_box_new_with_model
(
GTK_TREE_MODEL
(
v4l2SizeList
));
gtk_label_set_mnemonic_widget
(
GTK_LABEL
(
item
),
v4l2Size
);
gtk_label_set_mnemonic_widget
(
GTK_LABEL
(
item
),
v4l2Size
);
g_signal_connect
(
G_OBJECT
(
v4l2Size
),
"changed"
,
G_CALLBACK
(
select_video_input_device_size_cb
),
NULL
);
g_signal_connect
(
G_OBJECT
(
v4l2Size
),
"changed"
,
G_CALLBACK
(
select_video_input_device_size_cb
),
NULL
);
gtk_
table
_attach
(
GTK_
TABLE
(
table
),
item
,
0
,
1
,
2
,
3
,
GTK_FILL
|
GTK_EXPAND
,
GTK_SHRINK
,
0
,
0
);
gtk_
grid
_attach
(
GTK_
GRID
(
grid
),
item
,
0
,
2
,
1
,
1
);
// Set rendering
// Set rendering
renderer
=
gtk_cell_renderer_text_new
();
renderer
=
gtk_cell_renderer_text_new
();
gtk_cell_layout_pack_start
(
GTK_CELL_LAYOUT
(
v4l2Size
),
renderer
,
TRUE
);
gtk_cell_layout_pack_start
(
GTK_CELL_LAYOUT
(
v4l2Size
),
renderer
,
TRUE
);
gtk_cell_layout_set_attributes
(
GTK_CELL_LAYOUT
(
v4l2Size
),
renderer
,
"text"
,
0
,
NULL
);
gtk_cell_layout_set_attributes
(
GTK_CELL_LAYOUT
(
v4l2Size
),
renderer
,
"text"
,
0
,
NULL
);
gtk_
table
_attach
(
GTK_
TABLE
(
table
),
v4l2Size
,
1
,
2
,
2
,
3
,
GTK_FILL
|
GTK_EXPAND
,
GTK_SHRINK
,
0
,
0
);
gtk_
grid
_attach
(
GTK_
GRID
(
grid
),
v4l2Size
,
1
,
2
,
1
,
1
);
// Set choices of rates
// Set choices of rates
item
=
gtk_label_new
(
_
(
"Rate"
));
item
=
gtk_label_new
(
_
(
"Rate"
));
...
@@ -864,13 +864,13 @@ v4l2_box()
...
@@ -864,13 +864,13 @@ v4l2_box()
v4l2Rate
=
gtk_combo_box_new_with_model
(
GTK_TREE_MODEL
(
v4l2RateList
));
v4l2Rate
=
gtk_combo_box_new_with_model
(
GTK_TREE_MODEL
(
v4l2RateList
));
gtk_label_set_mnemonic_widget
(
GTK_LABEL
(
item
),
v4l2Rate
);
gtk_label_set_mnemonic_widget
(
GTK_LABEL
(
item
),
v4l2Rate
);
g_signal_connect
(
G_OBJECT
(
v4l2Rate
),
"changed"
,
G_CALLBACK
(
select_video_input_device_rate_cb
),
NULL
);
g_signal_connect
(
G_OBJECT
(
v4l2Rate
),
"changed"
,
G_CALLBACK
(
select_video_input_device_rate_cb
),
NULL
);
gtk_
table
_attach
(
GTK_
TABLE
(
table
),
item
,
0
,
1
,
3
,
4
,
GTK_FILL
|
GTK_EXPAND
,
GTK_SHRINK
,
0
,
0
);
gtk_
grid
_attach
(
GTK_
GRID
(
grid
),
item
,
0
,
3
,
1
,
1
);
// Set rendering
// Set rendering
renderer
=
gtk_cell_renderer_text_new
();
renderer
=
gtk_cell_renderer_text_new
();
gtk_cell_layout_pack_start
(
GTK_CELL_LAYOUT
(
v4l2Rate
),
renderer
,
TRUE
);
gtk_cell_layout_pack_start
(
GTK_CELL_LAYOUT
(
v4l2Rate
),
renderer
,
TRUE
);
gtk_cell_layout_set_attributes
(
GTK_CELL_LAYOUT
(
v4l2Rate
),
renderer
,
"text"
,
0
,
NULL
);
gtk_cell_layout_set_attributes
(
GTK_CELL_LAYOUT
(
v4l2Rate
),
renderer
,
"text"
,
0
,
NULL
);
gtk_
table
_attach
(
GTK_
TABLE
(
table
),
v4l2Rate
,
1
,
2
,
3
,
4
,
GTK_FILL
|
GTK_EXPAND
,
GTK_SHRINK
,
0
,
0
);
gtk_
grid
_attach
(
GTK_
GRID
(
grid
),
v4l2Rate
,
1
,
3
,
1
,
1
);
return
ret
;
return
ret
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment