mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 20:33:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some UI beauty patches:

Browse source 
Uppercase first letter for each label word
Tweak the paddings for easier reading
Rename File menu to Log menu
Add a separator before Quit in the Log menu
Remove frame in extended diving info and add 6px padding

Signed-off-by: Hylke Bons <hylkebons@gmail.com>
This commit is contained in:
Hylke Bons 2011-09-04 17:08:40 +02:00
parent a6b9eaee0a
commit c4514b062a
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
info.c
View file

@ -164,21 +164,16 @@ static GtkTextBuffer *text_entry(GtkWidget *box, const char *label, gboolean exp
return buffer; return buffer;
} }
GtkWidget *extended_dive_info_frame(void) GtkWidget *extended_dive_info_box(void)
{ {
GtkWidget *frame;
GtkWidget *vbox; GtkWidget *vbox;
vbox = gtk_vbox_new(FALSE, 6);
frame = gtk_frame_new("Extended dive info");
gtk_widget_show(frame);
vbox = gtk_vbox_new(FALSE, 5);
gtk_container_add(GTK_CONTAINER(frame), vbox);
location = text_entry(vbox, "Location", FALSE); location = text_entry(vbox, "Location", FALSE);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
notes = text_entry(vbox, "Notes", TRUE); notes = text_entry(vbox, "Notes", TRUE);
/* Add extended info here: name, description, yadda yadda */ /* Add extended info here: name, description, yadda yadda */
update_dive_info(current_dive); update_dive_info(current_dive);
return frame; return vbox;
} }

14
main.c
View file

@ -134,7 +134,7 @@ static void quit(GtkWidget *w, gpointer data)
} }
static GtkActionEntry menu_items[] = { static GtkActionEntry menu_items[] = {
{ "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL}, { "FileMenuAction", GTK_STOCK_FILE, "Log", NULL, NULL, NULL},
{ "OpenFile", GTK_STOCK_OPEN, NULL, "<control>O", NULL, G_CALLBACK(file_open) }, { "OpenFile", GTK_STOCK_OPEN, NULL, "<control>O", NULL, G_CALLBACK(file_open) },
{ "SaveFile", GTK_STOCK_SAVE, NULL, "<control>S", NULL, G_CALLBACK(file_save) }, { "SaveFile", GTK_STOCK_SAVE, NULL, "<control>S", NULL, G_CALLBACK(file_save) },
{ "Quit", GTK_STOCK_QUIT, NULL, "<control>Q", NULL, G_CALLBACK(quit) }, { "Quit", GTK_STOCK_QUIT, NULL, "<control>Q", NULL, G_CALLBACK(quit) },
@ -147,6 +147,7 @@ static const gchar* ui_string = " \
<menu name=\"FileMenu\" action=\"FileMenuAction\"> \ <menu name=\"FileMenu\" action=\"FileMenuAction\"> \
<menuitem name=\"Open\" action=\"OpenFile\" /> \ <menuitem name=\"Open\" action=\"OpenFile\" /> \
<menuitem name=\"Save\" action=\"SaveFile\" /> \ <menuitem name=\"Save\" action=\"SaveFile\" /> \
<separator name=\"Seperator\"/> \
<menuitem name=\"Quit\" action=\"Quit\" /> \ <menuitem name=\"Quit\" action=\"Quit\" /> \
</menu> \ </menu> \
</menubar> \ </menubar> \
@ -176,6 +177,7 @@ int main(int argc, char **argv)
GtkWidget *divelist; GtkWidget *divelist;
GtkWidget *table; GtkWidget *table;
GtkWidget *notebook; GtkWidget *notebook;
GtkWidget *box;
GtkWidget *frame; GtkWidget *frame;
GtkWidget *menubar; GtkWidget *menubar;
GtkWidget *vbox; GtkWidget *vbox;
@ -210,6 +212,7 @@ int main(int argc, char **argv)
table = gtk_table_new(2, 2, FALSE); table = gtk_table_new(2, 2, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(table), 5); gtk_container_set_border_width(GTK_CONTAINER(table), 5);
gtk_box_pack_end(GTK_BOX(vbox), table, TRUE, TRUE, 0); gtk_box_pack_end(GTK_BOX(vbox), table, TRUE, TRUE, 0);
gtk_table_set_col_spacings(GTK_TABLE(table), 6);
gtk_widget_show(table); gtk_widget_show(table);
/* Create the atual divelist */ /* Create the atual divelist */
@ -220,11 +223,12 @@ int main(int argc, char **argv)
/* Frame for minimal dive info */ /* Frame for minimal dive info */
frame = dive_info_frame(); frame = dive_info_frame();
gtk_table_attach(GTK_TABLE(table), frame, 1, 2, 0, 1, gtk_table_attach(GTK_TABLE(table), frame, 1, 2, 0, 1,
GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0); GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 6, 6);
/* Notebook for dive info vs profile vs .. */ /* Notebook for dive info vs profile vs .. */
notebook = gtk_notebook_new(); notebook = gtk_notebook_new();
gtk_table_attach_defaults(GTK_TABLE(table), notebook, 1, 2, 1, 2); gtk_table_attach(GTK_TABLE(table), notebook, 1, 2, 1, 2,
GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 6, 6);
/* Frame for dive profile */ /* Frame for dive profile */
frame = dive_profile_frame(); frame = dive_profile_frame();
@ -232,8 +236,8 @@ int main(int argc, char **argv)
dive_profile = frame; dive_profile = frame;
/* Frame for extended dive info */ /* Frame for extended dive info */
frame = extended_dive_info_frame(); box = extended_dive_info_box();
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Extended dive Info")); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), box, gtk_label_new("Extended Dive Info"));
gtk_widget_set_app_paintable(win, TRUE); gtk_widget_set_app_paintable(win, TRUE);
gtk_widget_show_all(win); gtk_widget_show_all(win);

2
profile.c
View file

@ -200,7 +200,7 @@ GtkWidget *dive_profile_frame(void)
GtkWidget *frame; GtkWidget *frame;
GtkWidget *da; GtkWidget *da;
frame = gtk_frame_new("Dive profile"); frame = gtk_frame_new("Dive Profile");
gtk_widget_show(frame); gtk_widget_show(frame);
da = gtk_drawing_area_new(); da = gtk_drawing_area_new();
gtk_widget_set_size_request(da, 450, 350); gtk_widget_set_size_request(da, 450, 350);