p/tdv
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: p:519d6bd108fc09e91904d7e47177be12ddf948d9
Branches Tags
p:master
..
compare: p:ec89870a324c2ba3c707a0aec2330db681283bbc
Branches Tags
p:master

No commits in common. "519d6bd108fc09e91904d7e47177be12ddf948d9" and "ec89870a324c2ba3c707a0aec2330db681283bbc" have entirely different histories.
519d6bd108 ... ec89870a32

1 changed files with 9 additions and 9 deletions
Show Stats Expand all files Collapse all files

18
src/sdgui.c
View File

@ -219,10 +219,6 @@ on_key_press (G_GNUC_UNUSED GtkWidget *widget, GdkEvent *event,
return stardict_view_scroll (view, GTK_SCROLL_PAGES, -0.5), TRUE; return stardict_view_scroll (view, GTK_SCROLL_PAGES, -0.5), TRUE;
if (event->key.keyval == GDK_KEY_Page_Down) if (event->key.keyval == GDK_KEY_Page_Down)
return stardict_view_scroll (view, GTK_SCROLL_PAGES, +0.5), TRUE; return stardict_view_scroll (view, GTK_SCROLL_PAGES, +0.5), TRUE;
if (event->key.keyval == GDK_KEY_Up)
return stardict_view_scroll (view, GTK_SCROLL_STEPS, -1), TRUE;
if (event->key.keyval == GDK_KEY_Down)
return stardict_view_scroll (view, GTK_SCROLL_STEPS, +1), TRUE;
} }
return FALSE; return FALSE;
} }
@ -294,7 +290,7 @@ main (int argc, char *argv[])
"@binding-set Readline {" "@binding-set Readline {"
"bind '<Control>H' { 'delete-from-cursor' (chars, -1) };" "bind '<Control>H' { 'delete-from-cursor' (chars, -1) };"
"bind '<Control>W' { 'delete-from-cursor' (word-ends, -1) }; }" "bind '<Control>W' { 'delete-from-cursor' (word-ends, -1) }; }"
"entry { -gtk-key-bindings: Readline; border-radius: 0; }" "entry { -gtk-key-bindings: Readline }"
"stardict-view { padding: 0 .25em; }" "stardict-view { padding: 0 .25em; }"
"stardict-view.odd {" "stardict-view.odd {"
"background: @theme_base_color; " "background: @theme_base_color; "
@ -316,6 +312,11 @@ main (int argc, char *argv[])
gtk_style_context_add_provider_for_screen (screen, gtk_style_context_add_provider_for_screen (screen,
GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
g.notebook = gtk_notebook_new ();
g_signal_connect (g.notebook, "switch-page",
G_CALLBACK (on_switch_page), NULL);
gtk_notebook_set_scrollable (GTK_NOTEBOOK (g.notebook), TRUE);
g.watch_selection = TRUE; g.watch_selection = TRUE;
GtkWidget *item = GtkWidget *item =
gtk_check_menu_item_new_with_label (_("Follow selection")); gtk_check_menu_item_new_with_label (_("Follow selection"));
@ -335,15 +336,14 @@ main (int argc, char *argv[])
gtk_button_set_relief (GTK_BUTTON (g.hamburger), GTK_RELIEF_NONE); gtk_button_set_relief (GTK_BUTTON (g.hamburger), GTK_RELIEF_NONE);
gtk_widget_show (g.hamburger); gtk_widget_show (g.hamburger);
g.notebook = gtk_notebook_new ();
g_signal_connect (g.notebook, "switch-page",
G_CALLBACK (on_switch_page), NULL);
gtk_notebook_set_scrollable (GTK_NOTEBOOK (g.notebook), TRUE);
gtk_notebook_set_action_widget gtk_notebook_set_action_widget
(GTK_NOTEBOOK (g.notebook), g.hamburger, GTK_PACK_END); (GTK_NOTEBOOK (g.notebook), g.hamburger, GTK_PACK_END);
// FIXME: when the clear icon shows, the widget changes in height
g.entry = gtk_search_entry_new (); g.entry = gtk_search_entry_new ();
g_signal_connect (g.entry, "changed", G_CALLBACK (on_changed), g.view); g_signal_connect (g.entry, "changed", G_CALLBACK (on_changed), g.view);
// TODO: make the entry have a background colour, rather than transparency
gtk_entry_set_has_frame (GTK_ENTRY (g.entry), FALSE);
g.window = gtk_window_new (GTK_WINDOW_TOPLEVEL); g.window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size (GTK_WINDOW (g.window), 300, 600); gtk_window_set_default_size (GTK_WINDOW (g.window), 300, 600);