mirror of
git://git.yoctoproject.org/poky
synced 2026-10-02 16:42:04 +00:00
79031b082b
gtk+: Add Upstream-Status ed: Add Upstream-Status gnome-common: Add Upstream-Status libmatchbox: Add Upstream-Status matchbox-wm: Add Upstream-Status x11vnc: Add Upstream-Status xtscal: Add Upstream-Status eds-dbus: Add Upstream-Status matchbox-desktop: Add Upstream-Status matchbox-keyboard: Add Upstream-Status matchbox-stroke: Add Upstream-Status matchbox-theme-sato: Add Upstream-Status owl-video-widget: Add Upstream-Status beecrypt: Add Upstream-Status gnome-icon-theme: Add Upstream-Status tslib: Add Upstream-Status libowl-av: Add Upstream-Status sato-icon-theme: Add Upstream-Status web-webkit: Add Upstream-Status metacity: Add Upstream-Status apr: Add Upstream-Status gdk-pixbuf: Add Upstream-Status pcmanfm: Add Upstream-Status gpgme: Add Upstream-Status eee-acpi-scripts: Add Upstream-Status libgalago: Add Upstream-Status python-pygtk: Add Upstream-Status gnome-mime-data: Add Upstream-Status clutter: Add Upstream-Status clutter-gtk: Add Upstream-Status tidy: Add Upstream-Status mutter: Add Upstream-Status xcursor-transparent-theme: Add Upstream-Status leafpad: Add Upstream-Status matchbox-config-gtk: Add Upstream-Status contacts: Add Upstream-Status dates: Add Upstream-Status web: Add Upstream-Status webkit: Add Upstream-Status - Also removed empty fix_im.patch apr-util: Add Upstream-Status libcroco: Add Upstream-Status liboil: Add Upstream-Status libxslt: Add Upstream-Status libglade: Add Upstream-Status gnome-terminal: Add Upstream-Status xev: Add Upstream-Status claws-mail: Add Upstream-Status clipboard-manager: Add Upstream-Status epdfview: Add Upstream-Status kf: Add Upstream-Status qemu: Add Upstream-Status clutter-gst: Add Upstream-Status table: Add Upstream-Status matchbox-panel-2: Add Upstream-Status (From OE-Core rev: 10bdb737c2c4c6996fd035849109a1e07580a6b9) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
83 lines
2.5 KiB
Diff
83 lines
2.5 KiB
Diff
0.9.7 use a new menu bar from gtk_ui_manager, so need a translation here to
|
|
enable owl menu
|
|
|
|
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
|
|
|
|
Upstream-Status: Inappropriate [enable feature]
|
|
|
|
Index: pcmanfm-0.9.7/configure.ac
|
|
===================================================================
|
|
--- pcmanfm-0.9.7.orig/configure.ac 2010-07-27 10:28:12.000000000 +0800
|
|
+++ pcmanfm-0.9.7/configure.ac 2010-07-27 18:03:42.000000000 +0800
|
|
@@ -70,6 +70,8 @@
|
|
|
|
gtk_modules="gtk+-2.0 >= 2.16.0"
|
|
PKG_CHECK_MODULES(GTK, [$gtk_modules])
|
|
+OWL_LIBS="-lowl"
|
|
+GTK_LIBS="$GTK_LIBS $OWL_LIBS"
|
|
AC_SUBST(GTK_CFLAGS)
|
|
AC_SUBST(GTK_LIBS)
|
|
|
|
Index: pcmanfm-0.9.7/src/main-win.c
|
|
===================================================================
|
|
--- pcmanfm-0.9.7.orig/src/main-win.c 2010-07-27 10:56:08.000000000 +0800
|
|
+++ pcmanfm-0.9.7/src/main-win.c 2010-07-27 17:28:59.000000000 +0800
|
|
@@ -36,6 +36,8 @@
|
|
#include "main-win.h"
|
|
#include "pref.h"
|
|
|
|
+#include "libowl/owlwindowmenu.h"
|
|
+
|
|
static void fm_main_win_finalize (GObject *object);
|
|
G_DEFINE_TYPE(FmMainWin, fm_main_win, GTK_TYPE_WINDOW);
|
|
|
|
@@ -466,9 +468,27 @@
|
|
fm_main_win_chdir(win, path);
|
|
}
|
|
|
|
+/* Transfer gtk_ui_manager menubar to gtk menubar */
|
|
+static GtkWidget * ui_menubar_to_menu(GtkWidget *menubar)
|
|
+{
|
|
+ GtkWidget *main_menu;
|
|
+ GList *iter;
|
|
+
|
|
+ main_menu = gtk_menu_new();
|
|
+
|
|
+ for ( iter = gtk_container_get_children(GTK_CONTAINER(menubar));
|
|
+ iter;
|
|
+ iter = g_list_next(iter) )
|
|
+ {
|
|
+ GtkWidget *menu = GTK_WIDGET(iter->data);
|
|
+ gtk_widget_reparent(menu, main_menu);
|
|
+ }
|
|
+ return main_menu;
|
|
+}
|
|
+
|
|
static void fm_main_win_init(FmMainWin *self)
|
|
{
|
|
- GtkWidget *vbox, *menubar, *toolitem, *scroll;
|
|
+ GtkWidget *vbox, *menubar, *owl_menubar, *toolitem, *scroll;
|
|
GtkUIManager* ui;
|
|
GtkActionGroup* act_grp;
|
|
GtkAction* act;
|
|
@@ -537,7 +557,6 @@
|
|
|
|
self->popup = gtk_ui_manager_get_widget(ui, "/popup");
|
|
|
|
- gtk_box_pack_start( (GtkBox*)vbox, menubar, FALSE, TRUE, 0 );
|
|
gtk_box_pack_start( (GtkBox*)vbox, self->toolbar, FALSE, TRUE, 0 );
|
|
|
|
/* load bookmarks menu */
|
|
@@ -586,6 +605,11 @@
|
|
gtk_container_add( (GtkContainer*)self, vbox );
|
|
gtk_widget_show_all(vbox);
|
|
|
|
+ owl_menubar = ui_menubar_to_menu(menubar);
|
|
+ gtk_widget_show_all (owl_menubar);
|
|
+ owl_set_window_menu (GTK_WINDOW(self),
|
|
+ GTK_MENU(owl_menubar));
|
|
+
|
|
/* create new tab */
|
|
fm_main_win_add_tab(self, fm_path_get_home());
|
|
gtk_widget_grab_focus(self->folder_view);
|