diff options
| -rw-r--r-- | .SRCINFO | 46 | ||||
| -rw-r--r-- | 20150702-Fix-crashes-when-reloading.patch | 83 | ||||
| -rw-r--r-- | 20151113-Deactivate-SEND_MOVED-code-paths.patch | 48 | ||||
| -rw-r--r-- | 20151130-Fix-missing-return.patch | 22 | ||||
| -rw-r--r-- | PKGBUILD | 67 | ||||
| -rw-r--r-- | split_pane.patch | 327 | ||||
| -rw-r--r-- | thunar.install | 13 |
7 files changed, 606 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..c1a479ac1b2a --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,46 @@ +pkgbase = thunar-split + pkgdesc = Modern file manager for Xfce - patched to include split pane and upstream bug fixes + pkgver = 1.6.10 + pkgrel = 1 + url = http://thunar.xfce.org + install = thunar.install + arch = i686 + arch = x86_64 + groups = xfce4 + license = GPL2 + license = LGPL2.1 + makedepends = intltool + makedepends = xfce4-panel + depends = desktop-file-utils + depends = libexif + depends = hicolor-icon-theme + depends = libnotify + depends = libgudev + depends = gtk2 + depends = exo + depends = libxfce4util + depends = libxfce4ui + depends = libpng + optdepends = gvfs: for trash support, mounting with udisk and remote filesystems + optdepends = xfce4-panel: for trash applet + optdepends = tumbler: for thumbnail previews + optdepends = thunar-volman: manages removable devices + optdepends = thunar-archive-plugin: create and deflate archives + optdepends = thunar-media-tags-plugin: view/edit id3/ogg tags + provides = thunar=1.6.10 + conflicts = thunar + replaces = thunar + options = !libtool + source = http://archive.xfce.org/src/xfce/thunar/1.6/Thunar-1.6.10.tar.bz2 + source = split_pane.patch + source = 20150702-Fix-crashes-when-reloading.patch + source = 20151113-Deactivate-SEND_MOVED-code-paths.patch + source = 20151130-Fix-missing-return.patch + sha256sums = 7e9d24067268900e5e44d3325e60a1a2b2f8f556ec238ec12574fbea15fdee8a + sha256sums = 535797e0c6e54cdf7b44c676e64e52185306497570ae00c62c8a9fef28b79181 + sha256sums = 292e593492678b7e476d5da992bc9c008169b7e0f00048aee100195701842892 + sha256sums = 2461773024336a94fd70d7f2276aec0f9fc819cb8af96c8689e42c429014ea7d + sha256sums = 3f4d8dfba3003f14d29d7b5f8e38debecb2aa3a7244949a564bd183e8ae3d2fe + +pkgname = thunar-split + diff --git a/20150702-Fix-crashes-when-reloading.patch b/20150702-Fix-crashes-when-reloading.patch new file mode 100644 index 000000000000..197c7a3f3bb5 --- /dev/null +++ b/20150702-Fix-crashes-when-reloading.patch @@ -0,0 +1,83 @@ +From 029012f4c39d9d3d9ae617491a69f76f54a4192f Mon Sep 17 00:00:00 2001 +From: Harald Judt <h.judt@gmx.at> +Date: Thu, 2 Jul 2015 10:30:21 +0200 +Subject: Fix crashes when reloading target file after move (bug #11983) + +When moving a file, check the target file for NULL to avoid crashes +or assertions. + +diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c +index 196bb6c..3262dfb 100644 +--- a/thunar/thunar-file.c ++++ b/thunar/thunar-file.c +@@ -795,13 +795,15 @@ thunar_file_monitor (GFileMonitor *monitor, + if (event_type == G_FILE_MONITOR_EVENT_MOVED) + { + /* reload the target file if cached */ ++ if (other_path == NULL) ++ return; + other_file = thunar_file_cache_lookup (other_path); + if (other_file) + thunar_file_reload (other_file); + else + other_file = thunar_file_get (other_path, NULL); + +- if (!other_file) ++ if (other_file == NULL) + return; + + /* notify the thumbnail cache that we can now also move the thumbnail */ +diff --git a/thunar/thunar-folder.c b/thunar/thunar-folder.c +index 217610a..9decb89 100644 +--- a/thunar/thunar-folder.c ++++ b/thunar/thunar-folder.c +@@ -773,27 +773,30 @@ thunar_folder_monitor (GFileMonitor *monitor, + { + /* destroy the old file and update the new one */ + thunar_file_destroy (lp->data); +- file = thunar_file_get(other_file, NULL); +- if (file != NULL && THUNAR_IS_FILE (file)) ++ if (other_file != NULL) + { +- thunar_file_reload (file); +- +- /* if source and target folders are different, also tell +- the target folder to reload for the changes */ +- if (thunar_file_has_parent (file)) ++ file = thunar_file_get(other_file, NULL); ++ if (file != NULL && THUNAR_IS_FILE (file)) + { +- other_parent = thunar_file_get_parent (file, NULL); +- if (other_parent && +- !g_file_equal (thunar_file_get_file(folder->corresponding_file), +- thunar_file_get_file(other_parent))) ++ thunar_file_reload (file); ++ ++ /* if source and target folders are different, also tell ++ the target folder to reload for the changes */ ++ if (thunar_file_has_parent (file)) + { +- thunar_file_reload (other_parent); +- g_object_unref (other_parent); ++ other_parent = thunar_file_get_parent (file, NULL); ++ if (other_parent && ++ !g_file_equal (thunar_file_get_file(folder->corresponding_file), ++ thunar_file_get_file(other_parent))) ++ { ++ thunar_file_reload (other_parent); ++ g_object_unref (other_parent); ++ } + } +- } + +- /* drop reference on the other file */ +- g_object_unref (file); ++ /* drop reference on the other file */ ++ g_object_unref (file); ++ } + } + + /* reload the folder of the source file */ +-- +cgit v0.10.1 + diff --git a/20151113-Deactivate-SEND_MOVED-code-paths.patch b/20151113-Deactivate-SEND_MOVED-code-paths.patch new file mode 100644 index 000000000000..ed1e9ecaab58 --- /dev/null +++ b/20151113-Deactivate-SEND_MOVED-code-paths.patch @@ -0,0 +1,48 @@ +From 95ed18a7322c5cb27024547425a05522d5f34d7b Mon Sep 17 00:00:00 2001 +From: Harald Judt <h.judt@gmx.at> +Date: Fri, 13 Nov 2015 13:29:49 +0100 +Subject: Deactivate SEND_MOVED code paths + +--- + thunar/thunar-file.c | 4 ++-- + thunar/thunar-folder.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c +index 3262dfb..e3f9076 100644 +--- a/thunar/thunar-file.c ++++ b/thunar/thunar-file.c +@@ -853,7 +853,7 @@ thunar_file_watch_reconnect (ThunarFile *file) + } + + /* create a file or directory monitor */ +- file_watch->monitor = g_file_monitor (file->gfile, G_FILE_MONITOR_WATCH_MOUNTS | G_FILE_MONITOR_SEND_MOVED, NULL, NULL); ++ file_watch->monitor = g_file_monitor (file->gfile, G_FILE_MONITOR_WATCH_MOUNTS, NULL, NULL); + if (G_LIKELY (file_watch->monitor != NULL)) + { + /* watch monitor for file changes */ +@@ -3854,7 +3854,7 @@ thunar_file_watch (ThunarFile *file) + file_watch->watch_count = 1; + + /* create a file or directory monitor */ +- file_watch->monitor = g_file_monitor (file->gfile, G_FILE_MONITOR_WATCH_MOUNTS | G_FILE_MONITOR_SEND_MOVED, NULL, NULL); ++ file_watch->monitor = g_file_monitor (file->gfile, G_FILE_MONITOR_WATCH_MOUNTS, NULL, NULL); + if (G_LIKELY (file_watch->monitor != NULL)) + { + /* watch monitor for file changes */ +diff --git a/thunar/thunar-folder.c b/thunar/thunar-folder.c +index 9decb89..bd8249d 100644 +--- a/thunar/thunar-folder.c ++++ b/thunar/thunar-folder.c +@@ -569,7 +569,7 @@ thunar_folder_finished (ExoJob *job, + + /* add us to the file alteration monitor */ + folder->monitor = g_file_monitor_directory (thunar_file_get_file (folder->corresponding_file), +- G_FILE_MONITOR_SEND_MOVED, NULL, NULL); ++ G_FILE_MONITOR_NONE, NULL, NULL); + if (G_LIKELY (folder->monitor != NULL)) + g_signal_connect (folder->monitor, "changed", G_CALLBACK (thunar_folder_monitor), folder); + +-- +2.6.3 + diff --git a/20151130-Fix-missing-return.patch b/20151130-Fix-missing-return.patch new file mode 100644 index 000000000000..a58aea5e44a4 --- /dev/null +++ b/20151130-Fix-missing-return.patch @@ -0,0 +1,22 @@ +From 77cf6ec3a3969589a4e9a8beea6a122b7dbcc2a0 Mon Sep 17 00:00:00 2001 +From: Steve Dodier-Lazaro <sidnioulz@gmail.com> +Date: Mon, 30 Nov 2015 15:29:56 +0000 +Subject: Fixing missing return value in standard view + + +diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c +index 5cc31dd..6b078e3 100644 +--- a/thunar/thunar-standard-view.c ++++ b/thunar/thunar-standard-view.c +@@ -2167,7 +2167,7 @@ thunar_standard_view_get_fallback_directory (ThunarFile *directory, + GFile *path; + GFile *tmp; + +- _thunar_return_if_fail (THUNAR_IS_FILE (directory)); ++ _thunar_return_val_if_fail (THUNAR_IS_FILE (directory), NULL); + + /* determine the path of the directory */ + path = g_object_ref (thunar_file_get_file (directory)); +-- +cgit v0.10.1 + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..b6fa55175990 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,67 @@ +# Maintainer: Marcin Bujar <marcin.bujar at gmail dot com> + +pkgname=thunar-split +pkgver=1.6.10 +pkgrel=1 +pkgdesc="Modern file manager for Xfce - patched to include split pane and upstream bug fixes" +arch=(i686 x86_64) +url="http://thunar.xfce.org" +license=('GPL2' 'LGPL2.1') +groups=('xfce4') +conflicts=('thunar') +replaces=('thunar') +provides=('thunar=1.6.10') +depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify' + 'libgudev' 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng') +makedepends=('intltool' 'xfce4-panel') +optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems' + 'xfce4-panel: for trash applet' + 'tumbler: for thumbnail previews' + 'thunar-volman: manages removable devices' + 'thunar-archive-plugin: create and deflate archives' + 'thunar-media-tags-plugin: view/edit id3/ogg tags') +options=('!libtool') +install=thunar.install +source=(http://archive.xfce.org/src/xfce/thunar/1.6/Thunar-${pkgver}.tar.bz2 + split_pane.patch + 20150702-Fix-crashes-when-reloading.patch + 20151113-Deactivate-SEND_MOVED-code-paths.patch + 20151130-Fix-missing-return.patch +) +sha256sums=('7e9d24067268900e5e44d3325e60a1a2b2f8f556ec238ec12574fbea15fdee8a' + '535797e0c6e54cdf7b44c676e64e52185306497570ae00c62c8a9fef28b79181' + '292e593492678b7e476d5da992bc9c008169b7e0f00048aee100195701842892' + '2461773024336a94fd70d7f2276aec0f9fc819cb8af96c8689e42c429014ea7d' + '3f4d8dfba3003f14d29d7b5f8e38debecb2aa3a7244949a564bd183e8ae3d2fe' +) + +prepare() { + cd "$srcdir/Thunar-$pkgver" +} + +build() { + cd "${srcdir}"/Thunar-${pkgver} + + patch -Np1 -i ../split_pane.patch + patch -Np1 -i ../20150702-Fix-crashes-when-reloading.patch + patch -Np1 -i ../20151113-Deactivate-SEND_MOVED-code-paths.patch + patch -Np1 -i ../20151130-Fix-missing-return.patch + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-gio-unix \ + --enable-dbus \ + --enable-gudev \ + --enable-notifications \ + --enable-exif \ + --enable-pcre \ + --disable-debug + make +} + +package() { + cd "${srcdir}"/Thunar-${pkgver} + make DESTDIR="${pkgdir}" install +} + diff --git a/split_pane.patch b/split_pane.patch new file mode 100644 index 000000000000..5a290a60ab77 --- /dev/null +++ b/split_pane.patch @@ -0,0 +1,327 @@ +diff -rupN Thunar-1.6.7/thunar/thunar-standard-view.c Thunar-1.6.7-splitview/thunar/thunar-standard-view.c +--- Thunar-1.6.7/thunar/thunar-standard-view.c 2015-04-18 16:25:18.000000000 +0200 ++++ Thunar-1.6.7-splitview/thunar/thunar-standard-view.c 2015-04-24 02:08:46.234849486 +0200 +@@ -4262,8 +4262,8 @@ thunar_standard_view_queue_popup (Thunar + standard_view, thunar_standard_view_drag_timer_destroy); + + /* register the motion notify and the button release events on the real view */ +- g_signal_connect (G_OBJECT (view), "button-release-event", G_CALLBACK (thunar_standard_view_button_release_event), standard_view); +- g_signal_connect (G_OBJECT (view), "motion-notify-event", G_CALLBACK (thunar_standard_view_motion_notify_event), standard_view); ++ g_signal_connect_after (G_OBJECT (view), "button-release-event", G_CALLBACK (thunar_standard_view_button_release_event), standard_view); ++ g_signal_connect_after (G_OBJECT (view), "motion-notify-event", G_CALLBACK (thunar_standard_view_motion_notify_event), standard_view); + } + } + +diff -rupN Thunar-1.6.7/thunar/thunar-window.c Thunar-1.6.7-splitview/thunar/thunar-window.c +--- Thunar-1.6.7/thunar/thunar-window.c 2015-04-18 16:25:18.000000000 +0200 ++++ Thunar-1.6.7-splitview/thunar/thunar-window.c 2015-04-24 02:28:18.421547235 +0200 +@@ -81,6 +81,7 @@ enum + enum + { + BACK, ++ PANE_WINDOW, + RELOAD, + TOGGLE_SIDEPANE, + TOGGLE_MENUBAR, +@@ -104,6 +105,7 @@ static void thunar_window_set_proper + const GValue *value, + GParamSpec *pspec); + static gboolean thunar_window_back (ThunarWindow *window); ++static gboolean thunar_window_pane_window (ThunarWindow *window); + static gboolean thunar_window_reload (ThunarWindow *window, + gboolean reload_info); + static gboolean thunar_window_toggle_sidepane (ThunarWindow *window); +@@ -249,6 +251,9 @@ static gboolean thunar_window_save_geome + static void thunar_window_save_geometry_timer_destroy (gpointer user_data); + static void thunar_window_set_zoom_level (ThunarWindow *window, + ThunarZoomLevel zoom_level); ++static gboolean thunar_window_notebook_select (GtkWidget *notebook, ++ GdkEvent *event, ++ ThunarWindow *window); + + + +@@ -258,6 +263,7 @@ struct _ThunarWindowClass + + /* internal action signals */ + gboolean (*back) (ThunarWindow *window); ++ gboolean (*pane_window) (ThunarWindow *window); + gboolean (*reload) (ThunarWindow *window, + gboolean reload_info); + gboolean (*toggle_sidepane) (ThunarWindow *window); +@@ -311,9 +317,12 @@ struct _ThunarWindow + GtkWidget *menubar; + GtkWidget *spinner; + GtkWidget *paned; ++ GtkWidget *panes; + GtkWidget *sidepane; + GtkWidget *view_box; + GtkWidget *notebook; ++ GtkWidget *notebook1; ++ GtkWidget *notebook2; + GtkWidget *view; + GtkWidget *statusbar; + +@@ -420,6 +429,7 @@ thunar_window_class_init (ThunarWindowCl + gtkwidget_class->configure_event = thunar_window_configure_event; + + klass->back = thunar_window_back; ++ klass->pane_window = thunar_window_pane_window; + klass->reload = thunar_window_reload; + klass->toggle_sidepane = thunar_window_toggle_sidepane; + klass->toggle_menubar = thunar_window_toggle_menubar; +@@ -503,6 +513,23 @@ thunar_window_class_init (ThunarWindowCl + G_TYPE_BOOLEAN, 0); + + /** ++ * ThunarWindow::pane-window: ++ * @window : a #ThunarWindow instance. ++ * ++ * Emitted whenever the user requests to pane the window ++ * of the currently displayed folder. This is an internal ++ * signal used to bind the action to keys. ++ **/ ++ window_signals[PANE_WINDOW] = ++ g_signal_new (I_("pane-window"), ++ G_TYPE_FROM_CLASS (klass), ++ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, ++ G_STRUCT_OFFSET (ThunarWindowClass, pane_window), ++ g_signal_accumulator_true_handled, NULL, ++ _thunar_marshal_BOOLEAN__VOID, ++ G_TYPE_BOOLEAN, 0); ++ ++ /** + * ThunarWindow::reload: + * @window : a #ThunarWindow instance. + * +@@ -623,6 +650,7 @@ thunar_window_class_init (ThunarWindowCl + /* setup the key bindings for the windows */ + binding_set = gtk_binding_set_by_class (klass); + gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, 0, "back", 0); ++ gtk_binding_entry_add_signal (binding_set, GDK_F3, 0, "pane-window", 0); + gtk_binding_entry_add_signal (binding_set, GDK_F5, 0, "reload", 1, G_TYPE_BOOLEAN, TRUE); + gtk_binding_entry_add_signal (binding_set, GDK_F9, 0, "toggle-sidepane", 0); + gtk_binding_entry_add_signal (binding_set, GDK_F10, 0, "toggle-menubar", 0); +@@ -861,31 +889,44 @@ thunar_window_init (ThunarWindow *window + g_signal_connect_swapped (window->paned, "button-release-event", G_CALLBACK (thunar_window_save_paned), window); + + window->view_box = gtk_table_new (3, 1, FALSE); +- gtk_paned_pack2 (GTK_PANED (window->paned), window->view_box, TRUE, FALSE); ++ gtk_paned_add2 (GTK_PANED (window->paned), window->view_box); + gtk_widget_show (window->view_box); + ++ /* Create panes when the notebook will be */ ++ window->panes = gtk_hpaned_new (); ++ gtk_widget_add_events (window->panes, GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_BUTTON_PRESS_MASK); ++ gtk_table_attach (GTK_TABLE (window->view_box), window->panes, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); ++ gtk_widget_show (window->panes); ++ + /* tabs */ +- window->notebook = gtk_notebook_new (); +- gtk_table_attach (GTK_TABLE (window->view_box), window->notebook, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); +- g_signal_connect (G_OBJECT (window->notebook), "switch-page", G_CALLBACK (thunar_window_notebook_switch_page), window); +- g_signal_connect (G_OBJECT (window->notebook), "page-added", G_CALLBACK (thunar_window_notebook_page_added), window); +- g_signal_connect (G_OBJECT (window->notebook), "page-removed", G_CALLBACK (thunar_window_notebook_page_removed), window); +- g_signal_connect_after (G_OBJECT (window->notebook), "button-press-event", G_CALLBACK (thunar_window_notebook_button_press_event), window); +- g_signal_connect (G_OBJECT (window->notebook), "popup-menu", G_CALLBACK (thunar_window_notebook_popup_menu), window); +- g_signal_connect (G_OBJECT (window->notebook), "create-window", G_CALLBACK (thunar_window_notebook_create_window), window); +- gtk_notebook_set_show_border (GTK_NOTEBOOK (window->notebook), FALSE); +- gtk_notebook_set_homogeneous_tabs (GTK_NOTEBOOK (window->notebook), TRUE); +- gtk_notebook_set_scrollable (GTK_NOTEBOOK (window->notebook), TRUE); +- gtk_container_set_border_width (GTK_CONTAINER (window->notebook), 0); +- gtk_notebook_set_group_name (GTK_NOTEBOOK (window->notebook), "thunar-tabs"); +- gtk_widget_show (window->notebook); ++ // notebook1 ++ window->notebook1 = gtk_notebook_new (); ++ gtk_paned_pack1 (GTK_PANED (window->panes), window->notebook1, TRUE, FALSE); ++ g_signal_connect (G_OBJECT (window->notebook1), "switch-page", G_CALLBACK (thunar_window_notebook_switch_page), window); ++ g_signal_connect (G_OBJECT (window->notebook1), "page-added", G_CALLBACK (thunar_window_notebook_page_added), window); ++ g_signal_connect (G_OBJECT (window->notebook1), "page-removed", G_CALLBACK (thunar_window_notebook_page_removed), window); ++ g_signal_connect_after (G_OBJECT (window->notebook1), "button-press-event", G_CALLBACK (thunar_window_notebook_button_press_event), window); ++ g_signal_connect (G_OBJECT (window->notebook1), "popup-menu", G_CALLBACK (thunar_window_notebook_popup_menu), window); ++ g_signal_connect (G_OBJECT (window->notebook1), "create-window", G_CALLBACK (thunar_window_notebook_create_window), window); ++ gtk_notebook_set_show_border (GTK_NOTEBOOK (window->notebook1), FALSE); ++ gtk_notebook_set_homogeneous_tabs (GTK_NOTEBOOK (window->notebook1), TRUE); ++ gtk_notebook_set_scrollable (GTK_NOTEBOOK (window->notebook1), TRUE); ++ gtk_container_set_border_width (GTK_CONTAINER (window->notebook1), 0); ++ gtk_notebook_set_group_name (GTK_NOTEBOOK (window->notebook1), "thunar-tabs"); ++ gtk_widget_show (window->notebook1); + + /* drop the notebook borders */ + style = gtk_rc_style_new (); + style->xthickness = style->ythickness = 0; +- gtk_widget_modify_style (window->notebook, style); ++ gtk_widget_modify_style (window->notebook1, style); + g_object_unref (G_OBJECT (style)); + ++ // notebook2 ++ window->notebook2 = NULL; ++ ++ /* The notebook selected and actived */ ++ window->notebook = window->notebook1; ++ + /* determine the selected location selector */ + if (exo_str_is_equal (last_location_bar, g_type_name (THUNAR_TYPE_LOCATION_BUTTONS))) + type = THUNAR_TYPE_LOCATION_BUTTONS; +@@ -1392,6 +1433,130 @@ thunar_window_binding_create (ThunarWind + + + ++static gboolean ++thunar_window_pane_window (ThunarWindow *window) ++{ ++ ThunarFile *directory; ++ GtkRcStyle *style; ++ ++ _thunar_return_val_if_fail (THUNAR_IS_WINDOW (window), FALSE); ++ _thunar_return_val_if_fail (window->view_type != G_TYPE_NONE, FALSE); ++ ++ /* if two panes are showed then remove not selected one */ ++ if (window->notebook1 != NULL && window->notebook2 != NULL) ++ { ++ /* notebook1 is the selected notebook so it destroys notebook2 */ ++ if (window->notebook == window->notebook1) ++ { ++ gtk_widget_destroy (window->notebook2); ++ window->notebook2 = NULL; ++ } ++ /* notebook2 is the selected notebook so it destroys notebook1 */ ++ else ++ { ++ gtk_widget_destroy (window->notebook1); ++ window->notebook1 = NULL; ++ } ++ } ++ /* notebook1 is null so it crates it */ ++ else if (window->notebook1 == NULL) ++ { ++ /* create the notebook1 */ ++ window->notebook1 = gtk_notebook_new (); ++ gtk_paned_pack1 (GTK_PANED (window->panes), window->notebook1, TRUE, FALSE); ++ g_signal_connect (G_OBJECT (window->notebook1), "switch-page", G_CALLBACK (thunar_window_notebook_switch_page), window); ++ g_signal_connect (G_OBJECT (window->notebook1), "page-added", G_CALLBACK (thunar_window_notebook_page_added), window); ++ g_signal_connect (G_OBJECT (window->notebook1), "page-removed", G_CALLBACK (thunar_window_notebook_page_removed), window); ++ g_signal_connect_after (G_OBJECT (window->notebook1), "button-press-event", G_CALLBACK (thunar_window_notebook_button_press_event), window); ++ g_signal_connect (G_OBJECT (window->notebook1), "popup-menu", G_CALLBACK (thunar_window_notebook_popup_menu), window); ++ g_signal_connect (G_OBJECT (window->notebook1), "create-window", G_CALLBACK (thunar_window_notebook_create_window), window); ++ gtk_notebook_set_show_border (GTK_NOTEBOOK (window->notebook1), FALSE); ++ gtk_notebook_set_homogeneous_tabs (GTK_NOTEBOOK (window->notebook1), TRUE); ++ gtk_notebook_set_scrollable (GTK_NOTEBOOK (window->notebook1), TRUE); ++ gtk_container_set_border_width (GTK_CONTAINER (window->notebook1), 0); ++ gtk_notebook_set_group_name (GTK_NOTEBOOK (window->notebook1), "thunar-tabs"); ++ gtk_widget_show (window->notebook1); ++ ++ /* drop the notebook borders */ ++ style = gtk_rc_style_new (); ++ style->xthickness = style->ythickness = 0; ++ gtk_widget_modify_style (window->notebook1, style); ++ g_object_unref (G_OBJECT (style)); ++ ++ /* set notebook2 to selected notebook */ ++ window->notebook = window->notebook1; ++ directory = thunar_window_get_current_directory (window); ++ thunar_window_notebook_insert (window, directory); ++ } ++ /* Otherwise notebook2 is null so it creates it */ ++ else ++ { ++ /* create the notebook2 */ ++ window->notebook2 = gtk_notebook_new (); ++ gtk_paned_pack2 (GTK_PANED (window->panes), window->notebook2, TRUE, FALSE); ++ g_signal_connect (G_OBJECT (window->notebook2), "switch-page", G_CALLBACK (thunar_window_notebook_switch_page), window); ++ g_signal_connect (G_OBJECT (window->notebook2), "page-added", G_CALLBACK (thunar_window_notebook_page_added), window); ++ g_signal_connect (G_OBJECT (window->notebook2), "page-removed", G_CALLBACK (thunar_window_notebook_page_removed), window); ++ g_signal_connect_after (G_OBJECT (window->notebook2), "button-press-event", G_CALLBACK (thunar_window_notebook_button_press_event), window); ++ g_signal_connect (G_OBJECT (window->notebook2), "popup-menu", G_CALLBACK (thunar_window_notebook_popup_menu), window); ++ g_signal_connect (G_OBJECT (window->notebook2), "create-window", G_CALLBACK (thunar_window_notebook_create_window), window); ++ gtk_notebook_set_show_border (GTK_NOTEBOOK (window->notebook2), FALSE); ++ gtk_notebook_set_homogeneous_tabs (GTK_NOTEBOOK (window->notebook2), TRUE); ++ gtk_notebook_set_scrollable (GTK_NOTEBOOK (window->notebook2), TRUE); ++ gtk_container_set_border_width (GTK_CONTAINER (window->notebook2), 0); ++ gtk_notebook_set_group_name (GTK_NOTEBOOK (window->notebook2), "thunar-tabs"); ++ gtk_widget_show (window->notebook2); ++ ++ /* drop the notebook borders */ ++ style = gtk_rc_style_new (); ++ style->xthickness = style->ythickness = 0; ++ gtk_widget_modify_style (window->notebook2, style); ++ g_object_unref (G_OBJECT (style)); ++ ++ /* set notebook2 to selected notebook */ ++ window->notebook = window->notebook2; ++ directory = thunar_window_get_current_directory (window); ++ thunar_window_notebook_insert (window, directory); ++ } ++ ++ return TRUE; ++} ++ ++ ++ ++static gboolean ++thunar_window_notebook_select (GtkWidget *view, ++ GdkEvent *event, ++ ThunarWindow *window) ++{ ++ GtkWidget *selected_notebook; ++ gint current_page_n; ++ GtkWidget *current_page; ++ ++ /* if there is not two panes (notebook2 == NULL) nothing to do */ ++ if (window->notebook2 == NULL) ++ return FALSE; ++ ++ /* notebook selected */ ++ selected_notebook = gtk_widget_get_ancestor (view, GTK_TYPE_NOTEBOOK); ++ ++ /* if the notebook selected is the same than the current notebook selected nothing to do */ ++ if (selected_notebook == window->notebook) ++ return FALSE; ++ ++ /* select and activate selected notebook */ ++ window->notebook = selected_notebook; ++ current_page_n = gtk_notebook_get_current_page (GTK_NOTEBOOK (window->notebook)); ++ current_page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (window->notebook), current_page_n); ++ thunar_component_set_ui_manager (THUNAR_COMPONENT (window->view), NULL); ++ window->view = NULL; ++ thunar_window_notebook_switch_page (window->notebook, current_page, current_page_n, window); ++ ++ return FALSE; ++} ++ ++ ++ + static void + thunar_window_notebook_switch_page (GtkWidget *notebook, + GtkWidget *page, +@@ -1405,7 +1570,8 @@ thunar_window_notebook_switch_page (GtkW + _thunar_return_if_fail (THUNAR_IS_WINDOW (window)); + _thunar_return_if_fail (GTK_IS_NOTEBOOK (notebook)); + _thunar_return_if_fail (THUNAR_IS_VIEW (page)); +- _thunar_return_if_fail (window->notebook == notebook); ++ _thunar_return_if_fail (window->notebook1 == notebook || ++ window->notebook2 == notebook); + + /* leave if nothing changed */ + if (window->view == page) +@@ -1553,7 +1719,7 @@ thunar_window_notebook_page_removed (Gtk + thunar_component_set_ui_manager (THUNAR_COMPONENT (page), NULL); + + n_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook)); +- if (n_pages == 0) ++ if (n_pages == 0 && window->notebook2 == NULL) + { + /* destroy the window */ + gtk_widget_destroy (GTK_WIDGET (window)); +@@ -1784,6 +1950,11 @@ thunar_window_notebook_insert (ThunarWin + gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (window->notebook), view, TRUE); + gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (window->notebook), view, TRUE); + ++ /* connect signal view */ ++ gtk_widget_add_events (GTK_WIDGET (view), GDK_BUTTON_PRESS_MASK); ++ g_signal_connect (G_OBJECT (GTK_BIN (view)->child), "button-press-event", G_CALLBACK (thunar_window_notebook_select), window); ++ g_signal_connect (G_OBJECT (GTK_BIN (view)->child), "button-release-event", G_CALLBACK (thunar_window_notebook_select), window); ++ + /* take focus on the view */ + gtk_widget_grab_focus (view); + } diff --git a/thunar.install b/thunar.install new file mode 100644 index 000000000000..648480c3be68 --- /dev/null +++ b/thunar.install @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + |