stardict/patches/002-add-nanonote-support.patch |
13 | 13 | src/conf.cpp | 4 |
14 | 14 | src/desktop.cpp | 2 |
15 | 15 | src/mainwin.cpp | 7 |
16 | | src/stardict.cpp | 40 |
17 | | 9 files changed, 11205 insertions(+), 17413 deletions(-) |
| 16 | src/stardict.cpp | 38 |
| 17 | 9 files changed, 11204 insertions(+), 17412 deletions(-) |
18 | 18 | create mode 100644 m4/nls.m4 |
19 | 19 | |
20 | 20 | |
... | ... | |
34803 | 34803 | progresswin.cpp progresswin.hpp \ |
34804 | 34804 | tray.cpp tray.hpp \ |
34805 | 34805 | diff --git a/src/class_factory.cpp b/src/class_factory.cpp |
34806 | | index 8bff538..e2deb09 100644 |
| 34806 | index 8bff538..9285428 100644 |
34807 | 34807 | --- a/src/class_factory.cpp |
34808 | 34808 | +++ b/src/class_factory.cpp |
34809 | | @@ -53,8 +53,10 @@ void *PlatformFactory::create_class_by_name(const std::string& name, void *param |
| 34809 | @@ -34,7 +34,9 @@ |
| 34810 | # include "win32/win32_iskeyspressed.h" |
| 34811 | # include "win32/systray.h" |
| 34812 | #else |
| 34813 | +#ifndef CONFIG_NANONOTE |
| 34814 | # include "x11_iskeyspressed.hpp" |
| 34815 | +#endif |
| 34816 | # include "docklet.h" |
| 34817 | #endif |
| 34818 | |
| 34819 | @@ -53,6 +55,8 @@ void *PlatformFactory::create_class_by_name(const std::string& name, void *param |
34810 | 34820 | } else if (name=="hotkeys") { |
34811 | 34821 | #ifdef _WIN32 |
34812 | 34822 | return new win32_hotkeys(); |
34813 | 34823 | +#elif defined(CONFIG_NANONOTE) |
34814 | 34824 | + return NULL; |
34815 | 34825 | #else |
34816 | | - return new x11_hotkeys(GTK_WINDOW(param)); |
34817 | | + return new x11_hotkeys(GTK_WINDOW(param)); |
| 34826 | return new x11_hotkeys(GTK_WINDOW(param)); |
34818 | 34827 | #endif |
34819 | | } |
34820 | | return NULL; |
34821 | 34828 | diff --git a/src/conf.cpp b/src/conf.cpp |
34822 | 34829 | index 2d0f89d..9f5e308 100644 |
34823 | 34830 | --- a/src/conf.cpp |
... | ... | |
34904 | 34911 | |
34905 | 34912 | void BottomWin::on_link_eventbox_clicked(GtkWidget *widget, GdkEventButton *event, BottomWin *oBottomWin) |
34906 | 34913 | diff --git a/src/stardict.cpp b/src/stardict.cpp |
34907 | | index 326ca4a..fb027d6 100644 |
| 34914 | index 326ca4a..8b8b8cf 100644 |
34908 | 34915 | --- a/src/stardict.cpp |
34909 | 34916 | +++ b/src/stardict.cpp |
34910 | 34917 | @@ -351,9 +351,9 @@ void AppCore::Create(gchar *queryword) |
... | ... | |
34920 | 34927 | oFloatWin.Create(); |
34921 | 34928 | bool scan=conf->get_bool_at("dictionary/scan_selection"); |
34922 | 34929 | oDockLet.reset(PlatformFactory::create_tray_icon(window, scan, |
34923 | | @@ -2005,10 +2005,22 @@ private: |
| 34930 | @@ -2005,10 +2005,20 @@ private: |
34924 | 34931 | |
34925 | 34932 | void AppCore::PopupPrefsDlg() |
34926 | 34933 | { |
34927 | 34934 | + static std::list<std::string> posb_combs; |
34928 | 34935 | + |
34929 | | + posb_combs = unlock_keys->possible_combs(); |
34930 | | + |
34931 | 34936 | + if (posb_combs.empty()) { |
34932 | 34937 | + posb_combs.push_back("Win"); |
34933 | 34938 | + posb_combs.push_back("Shift"); |
... | ... | |
34945 | 34950 | bool enbcol = |
34946 | 34951 | conf->get_bool_at("dictionary/enable_collation"); |
34947 | 34952 | int colf = |
34948 | | @@ -2153,17 +2165,17 @@ void AppCore::Quit() |
| 34953 | @@ -2153,17 +2163,17 @@ void AppCore::Quit() |
34949 | 34954 | if (!conf->get_bool_at("main_window/maximized")) { |
34950 | 34955 | gint width, height; |
34951 | 34956 | gtk_window_get_size(GTK_WINDOW(window), &width, &height); |
... | ... | |
34968 | 34973 | } |
34969 | 34974 | |
34970 | 34975 | End(); |
34971 | | @@ -2171,9 +2183,9 @@ void AppCore::Quit() |
| 34976 | @@ -2171,9 +2181,9 @@ void AppCore::Quit() |
34972 | 34977 | #ifdef CONFIG_GNOME |
34973 | 34978 | bonobo_object_unref (stardict_app_server); |
34974 | 34979 | #endif |
... | ... | |
34981 | 34986 | } |
34982 | 34987 | |
34983 | 34988 | void AppCore::on_main_win_hide_list_changed(const baseconfval* hideval) |
34984 | | @@ -2439,7 +2451,7 @@ int main(int argc,char **argv) |
| 34989 | @@ -2439,7 +2449,7 @@ int main(int argc,char **argv) |
34985 | 34990 | g_warning("Cannot create directory %s.", userdir.c_str()); |
34986 | 34991 | } |
34987 | 34992 | g_thread_init (NULL); |