Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Open Virtual Carcassonne Clone
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jonathan Michalon
Open Virtual Carcassonne Clone
Commits
6ee41771
Commit
6ee41771
authored
Dec 31, 2013
by
Colomban Wendling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OVCCGtk: port OVCCGtkConnectionDialog to GTK3
parent
efeaeca8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
12 deletions
+11
-12
clients/ovcc-gtk/src/ovccgtk-connection-dialog.c
clients/ovcc-gtk/src/ovccgtk-connection-dialog.c
+11
-12
No files found.
clients/ovcc-gtk/src/ovccgtk-connection-dialog.c
View file @
6ee41771
...
...
@@ -61,8 +61,8 @@ static void ovccgtk_connection_dialog_set_propery (GObject *object,
guint
prop_id
,
const
GValue
*
value
,
GParamSpec
*
pspec
);
static
gboolean
ovccgtk_connection_dialog_delete_event
(
GtkWidget
*
widget
,
GdkEvent
*
event
);
static
gboolean
ovccgtk_connection_dialog_delete_event
(
GtkWidget
*
widget
,
GdkEvent
Any
*
event
);
static
void
ovccgtk_connection_dialog_constructed
(
GObject
*
object
);
static
void
ovccgtk_connection_dialog_response
(
GtkDialog
*
dialog
,
gint
response
);
...
...
@@ -145,7 +145,6 @@ ovccgtk_connection_dialog_class_init (OVCCGtkConnectionDialogClass *klass)
object_class
->
constructed
=
ovccgtk_connection_dialog_constructed
;
widget_class
->
show_all
=
gtk_widget_show
;
widget_class
->
hide_all
=
gtk_widget_hide
;
widget_class
->
delete_event
=
ovccgtk_connection_dialog_delete_event
;
dialog_class
->
response
=
ovccgtk_connection_dialog_response
;
...
...
@@ -211,7 +210,7 @@ ovccgtk_connection_dialog_init (OVCCGtkConnectionDialog *self)
content_area
=
gtk_dialog_get_content_area
(
GTK_DIALOG
(
self
));
vbox
=
gtk_
vbox_new
(
FALSE
,
12
);
vbox
=
gtk_
box_new
(
GTK_ORIENTATION_VERTICAL
,
12
);
gtk_container_set_border_width
(
GTK_CONTAINER
(
vbox
),
6
);
gtk_box_pack_start
(
GTK_BOX
(
content_area
),
vbox
,
TRUE
,
TRUE
,
0
);
...
...
@@ -226,10 +225,10 @@ ovccgtk_connection_dialog_init (OVCCGtkConnectionDialog *self)
/* server frame */
frame
=
ovccgtk_frame_new
(
_
(
"Server"
));
gtk_box_pack_start
(
GTK_BOX
(
vbox
),
frame
,
FALSE
,
TRUE
,
0
);
box
=
gtk_
hbox_new
(
FALSE
,
6
);
box
=
gtk_
box_new
(
GTK_ORIENTATION_HORIZONTAL
,
6
);
gtk_container_add
(
GTK_CONTAINER
(
frame
),
box
);
box2
=
gtk_
hbox_new
(
FALSE
,
6
);
box2
=
gtk_
box_new
(
GTK_ORIENTATION_HORIZONTAL
,
6
);
gtk_box_pack_start
(
GTK_BOX
(
box
),
box2
,
TRUE
,
TRUE
,
0
);
label
=
gtk_label_new
(
_
(
"Host:"
));
...
...
@@ -241,7 +240,7 @@ ovccgtk_connection_dialog_init (OVCCGtkConnectionDialog *self)
gtk_entry_set_activates_default
(
GTK_ENTRY
(
self
->
priv
->
host
),
TRUE
);
gtk_box_pack_start
(
GTK_BOX
(
box2
),
self
->
priv
->
host
,
TRUE
,
TRUE
,
0
);
box2
=
gtk_
hbox_new
(
FALSE
,
6
);
box2
=
gtk_
box_new
(
GTK_ORIENTATION_HORIZONTAL
,
6
);
gtk_box_pack_start
(
GTK_BOX
(
box
),
box2
,
FALSE
,
TRUE
,
0
);
label
=
gtk_label_new
(
_
(
"Port:"
));
...
...
@@ -256,10 +255,10 @@ ovccgtk_connection_dialog_init (OVCCGtkConnectionDialog *self)
/* user frame */
frame
=
ovccgtk_frame_new
(
_
(
"User"
));
gtk_box_pack_start
(
GTK_BOX
(
vbox
),
frame
,
FALSE
,
TRUE
,
0
);
box
=
gtk_
vbox_new
(
FALSE
,
6
);
box
=
gtk_
box_new
(
GTK_ORIENTATION_VERTICAL
,
6
);
gtk_container_add
(
GTK_CONTAINER
(
frame
),
box
);
box2
=
gtk_
hbox_new
(
FALSE
,
6
);
box2
=
gtk_
box_new
(
GTK_ORIENTATION_HORIZONTAL
,
6
);
gtk_box_pack_start
(
GTK_BOX
(
box
),
box2
,
TRUE
,
TRUE
,
0
);
label
=
gtk_label_new
(
_
(
"Name:"
));
...
...
@@ -270,7 +269,7 @@ ovccgtk_connection_dialog_init (OVCCGtkConnectionDialog *self)
gtk_entry_set_activates_default
(
GTK_ENTRY
(
self
->
priv
->
username
),
TRUE
);
gtk_box_pack_start
(
GTK_BOX
(
box2
),
self
->
priv
->
username
,
TRUE
,
TRUE
,
0
);
box2
=
gtk_
hbox_new
(
FALSE
,
6
);
box2
=
gtk_
box_new
(
GTK_ORIENTATION_HORIZONTAL
,
6
);
gtk_box_pack_start
(
GTK_BOX
(
box
),
box2
,
TRUE
,
TRUE
,
0
);
label
=
gtk_label_new
(
_
(
"Password:"
));
...
...
@@ -355,8 +354,8 @@ ovccgtk_connection_dialog_constructed (GObject *object)
}
static
gboolean
ovccgtk_connection_dialog_delete_event
(
GtkWidget
*
widget
,
GdkEvent
*
event
)
ovccgtk_connection_dialog_delete_event
(
GtkWidget
*
widget
,
GdkEvent
Any
*
event
)
{
/* never destroy the dialog automatically, just emit let the response be
* emitted and the user do what she wants with it */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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