Root/stardict/patches/040-remove-useless-buttons.patch

1remove useless buttons
2
3From: Xiangfu Liu <xiangfu@sharism.cc>
4
5Signed-off-by: Xiangfu Liu <xiangfu@sharism.cc>
6---
7
8 src/mainwin.cpp | 52 +++++++++++++++++++++++++++++-----------------------
9 src/stardict.cpp | 5 +++--
10 2 files changed, 32 insertions(+), 25 deletions(-)
11
12
13diff --git a/src/mainwin.cpp b/src/mainwin.cpp
14index f7dac0b..ccd5adc 100644
15--- a/src/mainwin.cpp
16+++ b/src/mainwin.cpp
17@@ -79,18 +79,6 @@ void TopWin::Create(GtkWidget *vbox)
18     gtk_box_pack_start(GTK_BOX(vbox),hbox,false,false,3);
19 #endif
20 
21- GtkWidget *button;
22-#ifndef CONFIG_GPE
23- button = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
24- gtk_widget_show(button);
25- gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
26- GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
27- g_signal_connect(G_OBJECT(button),"clicked", G_CALLBACK(ClearCallback),this);
28- g_signal_connect(G_OBJECT(button),"enter_notify_event", G_CALLBACK(stardict_on_enter_notify), NULL);
29- gtk_box_pack_start(GTK_BOX(hbox),button,false,false,3);
30- gtk_widget_set_tooltip_text(button,_("Clear the search box"));
31-#endif
32-
33     GtkListStore* list_store = gtk_list_store_new(1, G_TYPE_STRING);
34     LoadHistory(list_store);
35     WordCombo = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(list_store), 0);
36@@ -106,7 +94,17 @@ void TopWin::Create(GtkWidget *vbox)
37               G_CALLBACK (on_entry_activate), this);
38     gtk_box_pack_start(GTK_BOX(hbox),WordCombo,true,true,3);
39 
40-#ifndef CONFIG_GPE
41+#if !defined(CONFIG_NANONOTE) && !defined(CONFIG_GPE)
42+ GtkWidget *button;
43+ button = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
44+ gtk_widget_show(button);
45+ gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
46+ GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS);
47+ g_signal_connect(G_OBJECT(button),"clicked", G_CALLBACK(ClearCallback),this);
48+ g_signal_connect(G_OBJECT(button),"enter_notify_event", G_CALLBACK(stardict_on_enter_notify), NULL);
49+ gtk_box_pack_start(GTK_BOX(hbox),button,false,false,3);
50+ gtk_widget_set_tooltip_text(button,_("Clear the search box"));
51+
52     button=gtk_button_new();
53     gtk_container_add(GTK_CONTAINER(button),gtk_image_new_from_stock(GTK_STOCK_FIND,GTK_ICON_SIZE_BUTTON));
54     gtk_widget_show_all(button);
55@@ -118,6 +116,7 @@ void TopWin::Create(GtkWidget *vbox)
56     gtk_widget_set_tooltip_text(button,_("Fuzzy Query"));
57 #endif
58 
59+#ifndef CONFIG_NANONOTE
60     button=gtk_button_new();
61     gtk_container_add(GTK_CONTAINER(button),gtk_image_new_from_stock(GTK_STOCK_UNDO,GTK_ICON_SIZE_BUTTON));
62     gtk_widget_show_all(button);
63@@ -129,12 +128,10 @@ void TopWin::Create(GtkWidget *vbox)
64     gtk_box_pack_start(GTK_BOX(hbox),button,false,false,0);
65     gtk_widget_set_tooltip_text(button,_("Go Back - Right button: history (Alt+Left)"));
66 
67-#ifndef CONFIG_NANONOTE
68     GtkWidget *label;
69     label = gtk_label_new("\t");
70     gtk_widget_show(label);
71     gtk_box_pack_start(GTK_BOX(hbox),label,false,false,0);
72-#endif
73 
74     button=gtk_button_new();
75     gtk_container_add(GTK_CONTAINER(button),gtk_image_new_from_stock(GTK_STOCK_HOME,GTK_ICON_SIZE_BUTTON));
76@@ -145,6 +142,7 @@ void TopWin::Create(GtkWidget *vbox)
77     g_signal_connect(G_OBJECT(button),"enter_notify_event", G_CALLBACK(stardict_on_enter_notify), NULL);
78     gtk_box_pack_start(GTK_BOX(hbox),button,false,false,0);
79     gtk_widget_set_tooltip_text(button,_("Show the main menu (Alt+M)"));
80+#endif
81 }
82 
83 void TopWin::Destroy(void)
84@@ -1246,6 +1244,10 @@ LeftWin::~LeftWin()
85 
86 void LeftWin::Create(GtkWidget *hbox, bool has_treedict)
87 {
88+ choosegroup_menu = NULL;
89+ UpdateChooseGroup();
90+
91+#ifndef CONFIG_NANONOTE
92     vbox = gtk_vbox_new(FALSE, 3);
93     if (!conf->get_bool_at("main_window/hide_list"))
94         gtk_widget_show(vbox);
95@@ -1302,8 +1304,6 @@ void LeftWin::Create(GtkWidget *hbox, bool has_treedict)
96     g_signal_connect(G_OBJECT(choosegroup_button),"clicked", G_CALLBACK(on_choose_group_button_clicked),this);
97     gtk_box_pack_start(GTK_BOX(vbox),choosegroup_button,false,false,0);
98     gtk_widget_set_tooltip_text(choosegroup_button, _("Choose dict group"));
99- choosegroup_menu = NULL;
100- UpdateChooseGroup();
101 
102     GtkWidget *button;
103     button=gtk_button_new();
104@@ -1325,6 +1325,7 @@ void LeftWin::Create(GtkWidget *hbox, bool has_treedict)
105     g_signal_connect(G_OBJECT(button),"enter_notify_event", G_CALLBACK(stardict_on_enter_notify), NULL);
106     gtk_box_pack_end(GTK_BOX(vbox),button,false,false,0);
107     gtk_widget_set_tooltip_text(button,_("Previous word (Alt+Up)"));
108+#endif
109 }
110 
111 void LeftWin::on_wazard_button_toggled(GtkToggleButton *button, LeftWin *oLeftWin)
112@@ -1493,12 +1494,13 @@ void ToolWin::Create(GtkWidget *vbox)
113     GtkWidget *hbox;
114     hbox = gtk_hbox_new(false,0);
115     gtk_widget_show(hbox);
116-#ifdef CONFIG_GPE
117+#if defined(CONFIG_GPE) || defined(CONFIG_NANONOTE)
118     gtk_box_pack_start(GTK_BOX(vbox),hbox,false,false,0);
119 #else
120     gtk_box_pack_start(GTK_BOX(vbox),hbox,false,false,3);
121 #endif
122 
123+#ifndef CONFIG_NANONOTE
124     GtkWidget *image;
125     ShowListButton=gtk_button_new();
126     image = gtk_image_new_from_stock(GTK_STOCK_GOTO_LAST,GTK_ICON_SIZE_SMALL_TOOLBAR);
127@@ -1535,10 +1537,10 @@ void ToolWin::Create(GtkWidget *vbox)
128         gtk_widget_show(ShowListButton);
129     else
130         gtk_widget_show(HideListButton);
131-
132+#endif /* CONFIG_NANONOTE */
133 
134     GtkWidget *button;
135-#ifndef CONFIG_GPE
136+#if !defined(CONFIG_NANONOTE) && !defined(CONFIG_GPE)
137     button=gtk_button_new();
138     gtk_container_add(GTK_CONTAINER(button),gtk_image_new_from_stock(GTK_STOCK_COPY,GTK_ICON_SIZE_SMALL_TOOLBAR));
139     gtk_widget_show_all(button);
140@@ -1549,8 +1551,10 @@ void ToolWin::Create(GtkWidget *vbox)
141     gtk_widget_set_tooltip_text(button,_("Copy"));
142 #endif
143 
144- PronounceWordMenuButton = gtk_menu_tool_button_new_from_stock(GTK_STOCK_EXECUTE);
145     UpdatePronounceMenu();
146+
147+#ifndef CONFIG_NANONOTE
148+ PronounceWordMenuButton = gtk_menu_tool_button_new_from_stock(GTK_STOCK_EXECUTE);
149     gtk_widget_show(GTK_WIDGET(PronounceWordMenuButton));
150     GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET(PronounceWordMenuButton), GTK_CAN_FOCUS);
151     gtk_container_forall(GTK_CONTAINER(PronounceWordMenuButton), unfocus_menu_button, this);
152@@ -1575,8 +1579,9 @@ void ToolWin::Create(GtkWidget *vbox)
153     gtk_box_pack_start(GTK_BOX(hbox),button,false,false,5);
154 #endif
155     gtk_widget_set_tooltip_text(button,_("Save to file (Alt+E)"));
156+#endif /* CONFIG_NANONOTE */
157 
158-#ifndef CONFIG_GPE
159+#if !defined(CONFIG_NANONOTE) && !defined(CONFIG_GPE)
160     button=gtk_button_new();
161     gtk_container_add(GTK_CONTAINER(button),gtk_image_new_from_stock(GTK_STOCK_PRINT,GTK_ICON_SIZE_SMALL_TOOLBAR));
162     gtk_widget_show_all(button);
163@@ -1588,6 +1593,7 @@ void ToolWin::Create(GtkWidget *vbox)
164     gtk_widget_set_sensitive(button, false);
165 #endif
166 
167+#ifndef CONFIG_NANONOTE
168     button=gtk_button_new();
169     gtk_container_add(GTK_CONTAINER(button),gtk_image_new_from_stock(GTK_STOCK_FIND,GTK_ICON_SIZE_SMALL_TOOLBAR));
170     gtk_widget_show_all(button);
171@@ -1600,6 +1606,7 @@ void ToolWin::Create(GtkWidget *vbox)
172     gtk_box_pack_start(GTK_BOX(hbox),button,false,false,5);
173 #endif
174     gtk_widget_set_tooltip_text(button,_("Search in the definition text (Ctrl+F)"));
175+#endif
176 }
177 
178 void ToolWin::ShowListCallback(GtkWidget *widget, gpointer data)
179@@ -2691,7 +2698,6 @@ void MidWin::Create(GtkWidget *vbox)
180     oTransWin.Create(notebook);
181 }
182 
183-
184 /*********************************************/
185 BottomWin::BottomWin()
186 {
187diff --git a/src/stardict.cpp b/src/stardict.cpp
188index 2d4acb8..b84f5c5 100644
189--- a/src/stardict.cpp
190+++ b/src/stardict.cpp
191@@ -432,7 +432,7 @@ gboolean AppCore::on_delete_event(GtkWidget * window, GdkEvent *event , AppCore
192 #ifndef CONFIG_NANONOTE
193     app->oDockLet->minimize_to_tray();
194 #endif
195- g_print("Quitting..\n");
196+ g_print("by Windows Manager Quitting..\n");
197     gtk_main_quit();
198     return FALSE;
199 }
200@@ -506,7 +506,7 @@ gboolean AppCore::vKeyPressReleaseCallback(GtkWidget * window, GdkEventKey *even
201     }
202     else if (event->keyval==GDK_F1 && (!(event->state & GDK_CONTROL_MASK)) && (!(event->state & GDK_MOD1_MASK)) && (!(event->state & GDK_SHIFT_MASK))) {
203         if (event->type==GDK_KEY_PRESS)
204- show_help(NULL);
205+ show_help(NULL);
206     }
207     else if ((event->keyval==GDK_f || event->keyval==GDK_F) && only_ctrl_pressed) {
208         if (event->type==GDK_KEY_PRESS)
209@@ -588,6 +588,7 @@ gboolean AppCore::vKeyPressReleaseCallback(GtkWidget * window, GdkEventKey *even
210                     gtk_tree_model_get(model, &iter, 0, &word, -1);
211                     oAppCore->ListClick(word);
212                     g_free(word);
213+ /* here to dispaly the result windows */
214                 }
215             }
216         }
217

Archive Download this file

Branches:
backfire
master
release_2010-11-17
release_2010-12-14
release_2011-02-23
release_2011-05-28
release_2011-08-27
release_2011-11-13
release_2012-03-18
release_2012-04-09
release_2012-07-11
release_2012-10-11



interactive