Date:2010-02-17 14:11:19 (14 years 1 month ago)
Author:Xiangfu Liu
Commit:738041b5bae68f4865e3a99e5c1907015c73bd2e
Message:[stardict] add --enable-nanonote-support to Makefiel

Files: stardict/Makefile (1 diff)
stardict/patches/002-add-nanonote-support.patch (7 diffs)

Change Details

stardict/Makefile
5858        --disable-schemas-install \
5959        --disable-deprecations \
6060        --disable-gnome-support \
61        --enable-nanonote-support \
6162    )
6263endef
6364
stardict/patches/002-add-nanonote-support.patch
1313 src/conf.cpp | 4
1414 src/desktop.cpp | 2
1515 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(-)
1818 create mode 100644 m4/nls.m4
1919
2020
...... 
3480334803     progresswin.cpp progresswin.hpp \
3480434804     tray.cpp tray.hpp \
3480534805diff --git a/src/class_factory.cpp b/src/class_factory.cpp
34806index 8bff538..e2deb09 100644
34806index 8bff538..9285428 100644
3480734807--- a/src/class_factory.cpp
3480834808+++ 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
3481034820     } else if (name=="hotkeys") {
3481134821 #ifdef _WIN32
3481234822         return new win32_hotkeys();
3481334823+#elif defined(CONFIG_NANONOTE)
3481434824+ return NULL;
3481534825 #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));
3481834827 #endif
34819     }
34820     return NULL;
3482134828diff --git a/src/conf.cpp b/src/conf.cpp
3482234829index 2d0f89d..9f5e308 100644
3482334830--- a/src/conf.cpp
...... 
3490434911
3490534912 void BottomWin::on_link_eventbox_clicked(GtkWidget *widget, GdkEventButton *event, BottomWin *oBottomWin)
3490634913diff --git a/src/stardict.cpp b/src/stardict.cpp
34907index 326ca4a..fb027d6 100644
34914index 326ca4a..8b8b8cf 100644
3490834915--- a/src/stardict.cpp
3490934916+++ b/src/stardict.cpp
3491034917@@ -351,9 +351,9 @@ void AppCore::Create(gchar *queryword)
...... 
3492034927     oFloatWin.Create();
3492134928     bool scan=conf->get_bool_at("dictionary/scan_selection");
3492234929     oDockLet.reset(PlatformFactory::create_tray_icon(window, scan,
34923@@ -2005,10 +2005,22 @@ private:
34930@@ -2005,10 +2005,20 @@ private:
3492434931
3492534932 void AppCore::PopupPrefsDlg()
3492634933 {
3492734934+ static std::list<std::string> posb_combs;
3492834935+
34929+ posb_combs = unlock_keys->possible_combs();
34930+
3493134936+ if (posb_combs.empty()) {
3493234937+ posb_combs.push_back("Win");
3493334938+ posb_combs.push_back("Shift");
...... 
3494534950         bool enbcol =
3494634951             conf->get_bool_at("dictionary/enable_collation");
3494734952         int colf =
34948@@ -2153,17 +2165,17 @@ void AppCore::Quit()
34953@@ -2153,17 +2163,17 @@ void AppCore::Quit()
3494934954     if (!conf->get_bool_at("main_window/maximized")) {
3495034955         gint width, height;
3495134956         gtk_window_get_size(GTK_WINDOW(window), &width, &height);
...... 
3496834973     }
3496934974
3497034975     End();
34971@@ -2171,9 +2183,9 @@ void AppCore::Quit()
34976@@ -2171,9 +2181,9 @@ void AppCore::Quit()
3497234977 #ifdef CONFIG_GNOME
3497334978     bonobo_object_unref (stardict_app_server);
3497434979 #endif
...... 
3498134986 }
3498234987
3498334988 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)
3498534990             g_warning("Cannot create directory %s.", userdir.c_str());
3498634991     }
3498734992     g_thread_init (NULL);

Archive Download the corresponding diff file



interactive