Attachment 188620 Details for Bug 309058

[patch] Proposed solution

gnome-main-menu-bookmark-tile.diff (text/plain), 30.69 KB, created by Lukas Lipka on 2007-12-23 11:06:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lukas Lipka

Created: 2007-12-23 11:06:30 UTC

Size: 30.69 KB

patch

obsolete

>Index: main-menu/src/main-menu-ui.c
>===================================================================
>--- main-menu/src/main-menu-ui.c	(revision 370)
>+++ main-menu/src/main-menu-ui.c	(working copy)
>@@ -38,6 +38,7 @@
> 
> #include "tile.h"
> #include "application-tile.h"
>+#include "bookmark-tile.h"
> #include "document-tile.h"
> #include "directory-tile.h"
> #include "system-tile.h"
>@@ -61,20 +62,20 @@
> #define FILE_MGR_OPEN_GCONF_KEY    ROOT_GCONF_DIR "/file-area/file_mgr_open_cmd"
> #define APP_BLACKLIST_GCONF_KEY    ROOT_GCONF_DIR "/file-area/file_blacklist"
> 
>-#define LOCKDOWN_GCONF_DIR           ROOT_GCONF_DIR "/lock-down"
>-#define MORE_LINK_VIS_GCONF_KEY      LOCKDOWN_GCONF_DIR "/application_browser_link_visible"
>-#define SEARCH_VIS_GCONF_KEY         LOCKDOWN_GCONF_DIR "/search_area_visible"
>-#define STATUS_VIS_GCONF_KEY         LOCKDOWN_GCONF_DIR "/status_area_visible"
>-#define SYSTEM_VIS_GCONF_KEY         LOCKDOWN_GCONF_DIR "/system_area_visible"
>-#define SHOWABLE_TYPES_GCONF_KEY     LOCKDOWN_GCONF_DIR "/showable_file_types"
>-#define MODIFIABLE_SYSTEM_GCONF_KEY  LOCKDOWN_GCONF_DIR "/user_modifiable_system_area"
>-#define MODIFIABLE_APPS_GCONF_KEY    LOCKDOWN_GCONF_DIR "/user_modifiable_apps"
>-#define MODIFIABLE_DOCS_GCONF_KEY    LOCKDOWN_GCONF_DIR "/user_modifiable_docs"
>-#define MODIFIABLE_DIRS_GCONF_KEY    LOCKDOWN_GCONF_DIR "/user_modifiable_dirs"
>-#define DISABLE_TERMINAL_GCONF_KEY   "/desktop/gnome/lockdown/disable_command_line"
>-#define PANEL_LOCKDOWN_GCONF_DIR     "/apps/panel/global"
>-#define DISABLE_LOGOUT_GCONF_KEY     PANEL_LOCKDOWN_GCONF_DIR "/disable_log_out"
>-#define DISABLE_LOCKSCREEN_GCONF_KEY PANEL_LOCKDOWN_GCONF_DIR "/disable_lock_screen"
>+#define LOCKDOWN_GCONF_DIR                ROOT_GCONF_DIR "/lock-down"
>+#define MORE_LINK_VIS_GCONF_KEY           LOCKDOWN_GCONF_DIR "/application_browser_link_visible"
>+#define SEARCH_VIS_GCONF_KEY              LOCKDOWN_GCONF_DIR "/search_area_visible"
>+#define STATUS_VIS_GCONF_KEY              LOCKDOWN_GCONF_DIR "/status_area_visible"
>+#define SYSTEM_VIS_GCONF_KEY              LOCKDOWN_GCONF_DIR "/system_area_visible"
>+#define SHOWABLE_TYPES_GCONF_KEY          LOCKDOWN_GCONF_DIR "/showable_file_types"
>+#define MODIFIABLE_SYSTEM_GCONF_KEY       LOCKDOWN_GCONF_DIR "/user_modifiable_system_area"
>+#define MODIFIABLE_APPS_GCONF_KEY         LOCKDOWN_GCONF_DIR "/user_modifiable_apps"
>+#define MODIFIABLE_DOCS_GCONF_KEY         LOCKDOWN_GCONF_DIR "/user_modifiable_docs"
>+#define MODIFIABLE_BOOKMARKS_GCONF_KEY    LOCKDOWN_GCONF_DIR "/user_modifiable_bookmarks"
>+#define DISABLE_TERMINAL_GCONF_KEY        "/desktop/gnome/lockdown/disable_command_line"
>+#define PANEL_LOCKDOWN_GCONF_DIR          "/apps/panel/global"
>+#define DISABLE_LOGOUT_GCONF_KEY          PANEL_LOCKDOWN_GCONF_DIR "/disable_log_out"
>+#define DISABLE_LOCKSCREEN_GCONF_KEY      PANEL_LOCKDOWN_GCONF_DIR "/disable_lock_screen"
> 
> G_DEFINE_TYPE (MainMenuUI, main_menu_ui, G_TYPE_OBJECT)
> 
>@@ -129,7 +130,7 @@
> 	guint modifiable_system_gconf_mntr_id;
> 	guint modifiable_apps_gconf_mntr_id;
> 	guint modifiable_docs_gconf_mntr_id;
>-	guint modifiable_dirs_gconf_mntr_id;
>+	guint modifiable_bookmarks_gconf_mntr_id;
> 	guint disable_term_gconf_mntr_id;
> 	guint disable_logout_gconf_mntr_id;
> 	guint disable_lockscreen_gconf_mntr_id;
>@@ -142,21 +143,21 @@
> 
> static void main_menu_ui_finalize (GObject *);
> 
>-static void create_panel_button      (MainMenuUI *);
>-static void create_slab_window       (MainMenuUI *);
>-static void create_search_section    (MainMenuUI *);
>-static void create_file_section      (MainMenuUI *);
>-static void create_user_apps_section (MainMenuUI *);
>-static void create_rct_apps_section  (MainMenuUI *);
>-static void create_user_docs_section (MainMenuUI *);
>-static void create_rct_docs_section  (MainMenuUI *);
>-static void create_user_dirs_section (MainMenuUI *);
>-static void create_system_section    (MainMenuUI *);
>-static void create_status_section    (MainMenuUI *);
>-static void create_more_buttons      (MainMenuUI *);
>-static void setup_file_tables        (MainMenuUI *);
>-static void setup_bookmark_agents    (MainMenuUI *);
>-static void setup_lock_down          (MainMenuUI *);
>+static void create_panel_button           (MainMenuUI *);
>+static void create_slab_window            (MainMenuUI *);
>+static void create_search_section         (MainMenuUI *);
>+static void create_file_section           (MainMenuUI *);
>+static void create_user_apps_section      (MainMenuUI *);
>+static void create_rct_apps_section       (MainMenuUI *);
>+static void create_user_docs_section      (MainMenuUI *);
>+static void create_rct_docs_section       (MainMenuUI *);
>+static void create_user_bookmarks_section (MainMenuUI *);
>+static void create_system_section         (MainMenuUI *);
>+static void create_status_section         (MainMenuUI *);
>+static void create_more_buttons           (MainMenuUI *);
>+static void setup_file_tables             (MainMenuUI *);
>+static void setup_bookmark_agents         (MainMenuUI *);
>+static void setup_lock_down               (MainMenuUI *);
> 
> static void       select_page                (MainMenuUI *);
> static void       update_limits              (MainMenuUI *);
>@@ -173,10 +174,10 @@
> static gboolean   app_is_in_blacklist        (const gchar *);
> 
> static Tile *item_to_user_app_tile   (BookmarkItem *, gpointer);
>+static Tile *item_to_bookmark_tile   (BookmarkItem *, gpointer);
> static Tile *item_to_recent_app_tile (BookmarkItem *, gpointer);
> static Tile *item_to_user_doc_tile   (BookmarkItem *, gpointer);
> static Tile *item_to_recent_doc_tile (BookmarkItem *, gpointer);
>-static Tile *item_to_dir_tile        (BookmarkItem *, gpointer);
> static Tile *item_to_system_tile     (BookmarkItem *, gpointer);
> static BookmarkItem *app_uri_to_item (const gchar *, gpointer);
> static BookmarkItem *doc_uri_to_item (const gchar *, gpointer);
>@@ -237,7 +238,7 @@
> enum {
> 	APPS_PAGE,
> 	DOCS_PAGE,
>-	DIRS_PAGE
>+	BOOKMARKS_PAGE
> };
> 
> enum {
>@@ -245,7 +246,7 @@
> 	RCNT_APPS_TABLE,
> 	USER_DOCS_TABLE,
> 	RCNT_DOCS_TABLE,
>-	USER_DIRS_TABLE
>+	USER_BOOKMARKS_TABLE
> };
> 
> enum {
>@@ -277,26 +278,26 @@
> 	priv->panel_button_xml = glade_xml_new (glade_xml_path, "slab-panel-button-root", NULL);
> 	g_free (glade_xml_path);
> 
>-	setup_bookmark_agents    (this);
>-	create_panel_button      (this);
>-	create_slab_window       (this);
>-	create_search_section    (this);
>-	create_file_section      (this);
>-	create_user_apps_section (this);
>-	create_rct_apps_section  (this);
>-	create_user_docs_section (this);
>-	create_rct_docs_section  (this);
>-	create_user_dirs_section (this);
>-	create_system_section    (this);
>-	create_status_section    (this);
>-	create_more_buttons      (this);
>-	setup_file_tables        (this);
>-	setup_lock_down          (this);
>+	setup_bookmark_agents         (this);
>+	create_panel_button           (this);
>+	create_slab_window            (this);
>+	create_search_section         (this);
>+	create_file_section           (this);
>+	create_user_apps_section      (this);
>+	create_rct_apps_section       (this);
>+	create_user_docs_section      (this);
>+	create_rct_docs_section       (this);
>+	create_user_bookmarks_section (this);
>+	create_system_section         (this);
>+	create_status_section         (this);
>+	create_more_buttons           (this);
>+	setup_file_tables             (this);
>+	setup_lock_down               (this);
> 
>-	bind_beagle_search_key  (this);
>-	update_limits           (this);
>-	select_page             (this);
>-	apply_lockdown_settings (this);
>+	bind_beagle_search_key        (this);
>+	update_limits                 (this);
>+	select_page                   (this);
>+	apply_lockdown_settings       (this);
> 
> 	return this;
> }
>@@ -339,35 +340,35 @@
> 	priv->file_section                               = NULL;
> 	priv->page_selectors [APPS_PAGE]                 = NULL;
> 	priv->page_selectors [DOCS_PAGE]                 = NULL;
>-	priv->page_selectors [DIRS_PAGE]                 = NULL;
>+	priv->page_selectors [BOOKMARKS_PAGE]            = NULL;
> 	priv->notebook_page_ids [APPS_PAGE]              = 0;
> 	priv->notebook_page_ids [DOCS_PAGE]              = 0;
>-	priv->notebook_page_ids [DIRS_PAGE]              = 0;
>+	priv->notebook_page_ids [BOOKMARKS_PAGE]         = 0;
> 
> 	priv->file_tables [USER_APPS_TABLE]              = NULL;
> 	priv->file_tables [RCNT_APPS_TABLE]              = NULL;
> 	priv->file_tables [USER_DOCS_TABLE]              = NULL;
> 	priv->file_tables [RCNT_DOCS_TABLE]              = NULL;
>-	priv->file_tables [USER_DIRS_TABLE]              = NULL;
>+	priv->file_tables [USER_BOOKMARKS_TABLE]         = NULL;
> 	priv->table_sections [USER_APPS_TABLE]           = NULL;
> 	priv->table_sections [RCNT_APPS_TABLE]           = NULL;
> 	priv->table_sections [USER_DOCS_TABLE]           = NULL;
> 	priv->table_sections [RCNT_DOCS_TABLE]           = NULL;
>-	priv->table_sections [USER_DIRS_TABLE]           = NULL;
>+	priv->table_sections [USER_BOOKMARKS_TABLE]      = NULL;
> 	priv->allowable_types [USER_APPS_TABLE]          = TRUE;
> 	priv->allowable_types [RCNT_APPS_TABLE]          = TRUE;
> 	priv->allowable_types [USER_DOCS_TABLE]          = TRUE;
> 	priv->allowable_types [RCNT_DOCS_TABLE]          = TRUE;
>-	priv->allowable_types [USER_DIRS_TABLE]          = TRUE;
>+	priv->allowable_types [USER_BOOKMARKS_TABLE]     = TRUE;
> 
> 	priv->sys_table                                  = NULL;
> 
> 	priv->more_buttons [APPS_PAGE]                   = NULL;
> 	priv->more_buttons [DOCS_PAGE]                   = NULL;
>-	priv->more_buttons [DIRS_PAGE]                   = NULL;
>+	priv->more_buttons [BOOKMARKS_PAGE]              = NULL;
> 	priv->more_sections [APPS_PAGE]                  = NULL;
> 	priv->more_sections [DOCS_PAGE]                  = NULL;
>-	priv->more_sections [DIRS_PAGE]                  = NULL;
>+	priv->more_sections [BOOKMARKS_PAGE]             = NULL;
> 
> 	priv->max_total_items                            = 8;
> 
>@@ -386,7 +387,7 @@
> 	priv->modifiable_system_gconf_mntr_id            = 0;
> 	priv->modifiable_apps_gconf_mntr_id              = 0;
> 	priv->modifiable_docs_gconf_mntr_id              = 0;
>-	priv->modifiable_dirs_gconf_mntr_id              = 0;
>+	priv->modifiable_bookmarks_gconf_mntr_id         = 0;
> 	priv->disable_term_gconf_mntr_id                 = 0;
> 	priv->disable_logout_gconf_mntr_id               = 0;
> 	priv->disable_lockscreen_gconf_mntr_id           = 0;
>@@ -425,7 +426,7 @@
> 	libslab_gconf_notify_remove (priv->modifiable_system_gconf_mntr_id);
> 	libslab_gconf_notify_remove (priv->modifiable_apps_gconf_mntr_id);
> 	libslab_gconf_notify_remove (priv->modifiable_docs_gconf_mntr_id);
>-	libslab_gconf_notify_remove (priv->modifiable_dirs_gconf_mntr_id);
>+	libslab_gconf_notify_remove (priv->modifiable_bookmarks_gconf_mntr_id);
> 	libslab_gconf_notify_remove (priv->disable_term_gconf_mntr_id);
> 	libslab_gconf_notify_remove (priv->disable_logout_gconf_mntr_id);
> 	libslab_gconf_notify_remove (priv->disable_lockscreen_gconf_mntr_id);
>@@ -607,12 +608,12 @@
> 		priv->main_menu_xml, "slab-page-selector-button-applications");
> 	priv->page_selectors [DOCS_PAGE] = glade_xml_get_widget (
> 		priv->main_menu_xml, "slab-page-selector-button-documents");
>-	priv->page_selectors [DIRS_PAGE] = glade_xml_get_widget (
>+	priv->page_selectors [BOOKMARKS_PAGE] = glade_xml_get_widget (
> 		priv->main_menu_xml, "slab-page-selector-button-places");
> 
> 	pages [APPS_PAGE] = glade_xml_get_widget (priv->main_menu_xml, "applications-page");
> 	pages [DOCS_PAGE] = glade_xml_get_widget (priv->main_menu_xml, "documents-page");
>-	pages [DIRS_PAGE] = glade_xml_get_widget (priv->main_menu_xml, "places-page");
>+	pages [BOOKMARKS_PAGE] = glade_xml_get_widget (priv->main_menu_xml, "places-page");
> 
> 	for (i = 0; i < 3; ++i) {
> 		gtk_container_child_get (
>@@ -638,8 +639,8 @@
> 		priv->main_menu_xml, "user-docs-section");
> 	priv->table_sections [RCNT_DOCS_TABLE] = glade_xml_get_widget (
> 		priv->main_menu_xml, "recent-docs-section");
>-	priv->table_sections [USER_DIRS_TABLE] = glade_xml_get_widget (
>-		priv->main_menu_xml, "user-dirs-section");
>+	priv->table_sections [USER_BOOKMARKS_TABLE] = glade_xml_get_widget (
>+		priv->main_menu_xml, "user-bookmarks-section");
> }
> 
> static void
>@@ -790,7 +791,7 @@
> }
> 
> static void
>-create_user_dirs_section (MainMenuUI *this)
>+create_user_bookmarks_section (MainMenuUI *this)
> {
> 	MainMenuUIPrivate *priv = PRIVATE (this);
> 
>@@ -798,13 +799,13 @@
> 
> 
> 	ctnr = GTK_CONTAINER (glade_xml_get_widget (
>-		priv->main_menu_xml, "user-dirs-table-container"));
>+		priv->main_menu_xml, "user-bookmarks-table-container"));
> 
>-	priv->file_tables [USER_DIRS_TABLE] = TILE_TABLE (tile_table_new (
>+	priv->file_tables [USER_BOOKMARKS_TABLE] = TILE_TABLE (tile_table_new (
> 		priv->bm_agents [BOOKMARK_STORE_USER_DIRS], -1, 2, FALSE, FALSE,
>-		item_to_dir_tile, this, NULL, NULL));
>+		item_to_bookmark_tile, this, NULL, NULL));
> 
>-	gtk_container_add (ctnr, GTK_WIDGET (priv->file_tables [USER_DIRS_TABLE]));
>+	gtk_container_add (ctnr, GTK_WIDGET (priv->file_tables [USER_BOOKMARKS_TABLE]));
> }
> 
> static void
>@@ -831,7 +832,7 @@
> 
> 	priv->more_sections [0] = glade_xml_get_widget (priv->main_menu_xml, "more-apps-section");
> 	priv->more_sections [1] = glade_xml_get_widget (priv->main_menu_xml, "more-docs-section");
>-	priv->more_sections [2] = glade_xml_get_widget (priv->main_menu_xml, "more-dirs-section");
>+	priv->more_sections [2] = glade_xml_get_widget (priv->main_menu_xml, "more-bookmarks-section");
> }
> 
> static void
>@@ -913,8 +914,8 @@
> 		MODIFIABLE_APPS_GCONF_KEY, lockdown_notify_cb, this);
> 	priv->modifiable_docs_gconf_mntr_id = libslab_gconf_notify_add (
> 		MODIFIABLE_DOCS_GCONF_KEY, lockdown_notify_cb, this);
>-	priv->modifiable_dirs_gconf_mntr_id = libslab_gconf_notify_add (
>-		MODIFIABLE_DIRS_GCONF_KEY, lockdown_notify_cb, this);
>+	priv->modifiable_bookmarks_gconf_mntr_id = libslab_gconf_notify_add (
>+		MODIFIABLE_BOOKMARKS_GCONF_KEY, lockdown_notify_cb, this);
> 	priv->disable_term_gconf_mntr_id = libslab_gconf_notify_add (
> 		DISABLE_TERMINAL_GCONF_KEY, lockdown_notify_cb, this);
> 	priv->disable_logout_gconf_mntr_id = libslab_gconf_notify_add (
>@@ -1000,9 +1001,9 @@
> }
> 
> static Tile *
>-item_to_dir_tile (BookmarkItem *item, gpointer data)
>+item_to_bookmark_tile (BookmarkItem *item, gpointer data)
> {
>-	return TILE (directory_tile_new (item->uri, item->title, item->icon));
>+	return TILE (bookmark_tile_new (item->uri, item->title, item->icon));
> }
> 
> static Tile *
>@@ -1184,7 +1185,7 @@
> 	}
> 
> 	g_object_get (
>-		priv->file_tables [USER_DIRS_TABLE],
>+		priv->file_tables [USER_BOOKMARKS_TABLE],
> 		"n-rows", & n_rows, "n-columns", & n_cols, NULL);
> 
> 	if (priv->max_total_items < (n_rows * n_cols))
>@@ -1302,10 +1303,10 @@
> 	else
> 		gtk_widget_hide (priv->page_selectors [DOCS_PAGE]);
> 
>-	if (GTK_WIDGET_VISIBLE (priv->table_sections [USER_DIRS_TABLE]))
>-		gtk_widget_show (priv->page_selectors [DIRS_PAGE]);
>+	if (GTK_WIDGET_VISIBLE (priv->table_sections [USER_BOOKMARKS_TABLE]))
>+		gtk_widget_show (priv->page_selectors [BOOKMARKS_PAGE]);
> 	else
>-		gtk_widget_hide (priv->page_selectors [DIRS_PAGE]);
>+		gtk_widget_hide (priv->page_selectors [BOOKMARKS_PAGE]);
> }
> 
> static gchar **
>@@ -1517,7 +1518,7 @@
> 	tile_table_reload (priv->file_tables [USER_APPS_TABLE]);
> 	tile_table_reload (priv->file_tables [RCNT_APPS_TABLE]);
> 	tile_table_reload (priv->file_tables [USER_DOCS_TABLE]);
>-	tile_table_reload (priv->file_tables [USER_DIRS_TABLE]);
>+	tile_table_reload (priv->file_tables [USER_BOOKMARKS_TABLE]);
> 
> 	update_limits (this);
> }
>Index: main-menu/src/slab-window.glade
>===================================================================
>--- main-menu/src/slab-window.glade	(revision 370)
>+++ main-menu/src/slab-window.glade	(working copy)
>@@ -721,7 +721,7 @@
> 			  <property name="spacing">12</property>
> 
> 			  <child>
>-			    <widget class="GtkVBox" id="user-dirs-section">
>+			    <widget class="GtkVBox" id="user-bookmarks-section">
> 			      <property name="visible">True</property>
> 			      <property name="homogeneous">False</property>
> 			      <property name="spacing">12</property>
>@@ -752,7 +752,7 @@
> 			      </child>
> 
> 			      <child>
>-				<widget class="GtkAlignment" id="user-dirs-table-container">
>+				<widget class="GtkAlignment" id="user-bookmarks-table-container">
> 				  <property name="visible">True</property>
> 				  <property name="xalign">0.5</property>
> 				  <property name="yalign">0.5</property>
>@@ -782,7 +782,7 @@
> 			  </child>
> 
> 			  <child>
>-			    <widget class="GtkAlignment" id="more-dirs-section">
>+			    <widget class="GtkAlignment" id="more-bookmarks-section">
> 			      <property name="visible">True</property>
> 			      <property name="xalign">1</property>
> 			      <property name="yalign">0.5</property>
>Index: main-menu/etc/slab.schemas.in.in
>===================================================================
>--- main-menu/etc/slab.schemas.in.in	(revision 370)
>+++ main-menu/etc/slab.schemas.in.in	(working copy)
>@@ -254,14 +254,14 @@
> 		</schema>
> 
> 		<schema>
>-			<key>/schemas/desktop/gnome/applications/main-menu/lock-down/user_modifiable_dirs</key>
>-			<applyto>/desktop/gnome/applications/main-menu/lock-down/user_modifiable_dirs</applyto>
>+			<key>/schemas/desktop/gnome/applications/main-menu/lock-down/user_modifiable_bookmarks</key>
>+			<applyto>/desktop/gnome/applications/main-menu/lock-down/user_modifiable_bookmarks</applyto>
> 			<owner>gnome-main-menu</owner>
> 			<type>bool</type>
> 			<default>true</default>
> 			<locale name="C">
>-				<short>lock-down status for the user-specified dirs section</short>
>-				<long>set to true if the user is allowed to modify the list of user-specified or "Favorite" directories or "Places".</long>
>+				<short>lock-down status for the user-specified bookmarks section</short>
>+				<long>set to true if the user is allowed to modify the list of user-specified or "Favorite" bookmarks.</long>
> 			</locale>
> 		</schema>
> 
>Index: ChangeLog
>===================================================================
>--- ChangeLog	(revision 370)
>+++ ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2007-12-19  Lukas Lipka  <lukaslipka@gmail.com>
>+
>+	* main-menu/src/main-menu-ui.c
>+	* main-menu/src/slab-window.glade
>+	* main-menu/etc/slab.schemas.in.in
>+	* libslab/bookmark-tile.c
>+	* libslab/bookmark-tile.h
>+	* libslab/bookmark-agent.c:
>+	Main-Menu "Places" Items have no "Remove from Favorites" - BNC #309058
>+	Create a bookmark-tile which removes the Move to Trash, Delete, Rename,
>+	Send to actions from unlike directory tiles since they don't really make
>+	sense for bookmarks. Do the correct thing upon removal when a bookmark
>+	comes from ~/.gtk-bookmarks.
>+
> 2007-11-28  Scott Reeves  <sreeves@novell.com>
> 	* libslab/app-shell-startup.c
> 	* libslab/app-shell.c:
>Index: libslab/bookmark-tile.c
>===================================================================
>--- libslab/bookmark-tile.c	(revision 0)
>+++ libslab/bookmark-tile.c	(revision 0)
>@@ -0,0 +1,292 @@
>+/*
>+ * This file is part of libtile.
>+ *
>+ * Copyright (c) 2006 Novell, Inc.
>+ *
>+ * Libtile is free software; you can redistribute it and/or modify it under the
>+ * terms of the GNU Lesser General Public License as published by the Free
>+ * Software Foundation; either version 2 of the License, or (at your option)
>+ * any later version.
>+ *
>+ * Libtile is distributed in the hope that it will be useful, but WITHOUT ANY
>+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
>+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
>+ * more details.
>+ *
>+ * You should have received a copy of the GNU Lesser General Public License
>+ * along with libslab; if not, write to the Free Software Foundation, Inc., 51
>+ * Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>+ */
>+
>+#include "bookmark-tile.h"
>+
>+#include <glib/gi18n.h>
>+#include <string.h>
>+#include <libgnomeui/gnome-icon-lookup.h>
>+#include <libgnomevfs/gnome-vfs.h>
>+#include <unistd.h>
>+
>+#include "slab-gnome-util.h"
>+#include "gnome-utils.h"
>+#include "libslab-utils.h"
>+#include "bookmark-agent.h"
>+
>+G_DEFINE_TYPE (BookmarkTile, bookmark_tile, NAMEPLATE_TILE_TYPE)
>+
>+static void bookmark_tile_finalize (GObject *);
>+static void bookmark_tile_style_set (GtkWidget *, GtkStyle *);
>+
>+static void bookmark_tile_private_setup (BookmarkTile *);
>+static void load_image (BookmarkTile *);
>+
>+static GtkWidget *create_header (const gchar *);
>+
>+static void header_size_allocate_cb (GtkWidget *, GtkAllocation *, gpointer);
>+
>+static void open_trigger (Tile *, TileEvent *, TileAction *);
>+static void remove_favorite_trigger (Tile *tile, TileEvent *event, TileAction *action);
>+
>+typedef struct
>+{
>+	gchar *basename;
>+	
>+	GtkBin *header_bin;
>+
>+	gchar *icon_name;
>+	
>+	gboolean image_is_broken;
>+
>+	BookmarkAgent *agent;
>+} BookmarkTilePrivate;
>+
>+#define BOOKMARK_TILE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), BOOKMARK_TILE_TYPE, BookmarkTilePrivate))
>+
>+static void bookmark_tile_class_init (BookmarkTileClass *this_class)
>+{
>+	GObjectClass *g_obj_class = G_OBJECT_CLASS (this_class);
>+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (this_class);
>+
>+	g_obj_class->finalize = bookmark_tile_finalize;
>+
>+	widget_class->style_set = bookmark_tile_style_set;
>+
>+	g_type_class_add_private (this_class, sizeof (BookmarkTilePrivate));
>+}
>+
>+GtkWidget *
>+bookmark_tile_new (const gchar *in_uri, const gchar *title, const gchar *icon_name)
>+{
>+	BookmarkTile *this;
>+	BookmarkTilePrivate *priv;
>+
>+	gchar *uri;
>+	GtkWidget *image;
>+	GtkWidget *header;
>+	GtkMenu *context_menu;
>+
>+	GtkContainer *menu_ctnr;
>+	GtkWidget *menu_item;
>+
>+	TileAction *action;
>+
>+	gchar *basename;
>+
>+	gchar *markup;
>+
>+	AtkObject *accessible;
>+	
>+	gchar *filename;
>+	gchar *tooltip_text;
>+
>+  
>+	uri = g_strdup (in_uri);
>+
>+	image = gtk_image_new ();
>+
>+	if (! title) {
>+		markup = g_path_get_basename (uri);
>+		basename = gnome_vfs_unescape_string (markup, NULL);
>+		g_free (markup);
>+	}
>+	else
>+		basename = g_strdup (title);
>+
>+	header = create_header (basename);
>+
>+	filename = g_filename_from_uri (uri, NULL, NULL);
>+
>+  	if (filename)
>+		tooltip_text = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL);
>+	else
>+		tooltip_text = NULL;
>+
>+	g_free (filename);
>+	
>+	context_menu = GTK_MENU (gtk_menu_new ());
>+
>+	this = g_object_new (
>+		BOOKMARK_TILE_TYPE,
>+		"tile-uri",          uri,
>+		"nameplate-image",   image,
>+		"nameplate-header",  header,
>+		"nameplate-tooltip", tooltip_text,
>+		"context-menu",      context_menu,
>+		NULL);
>+
>+	g_free (uri);
>+	if (tooltip_text)
>+		g_free (tooltip_text);
>+
>+	priv = BOOKMARK_TILE_GET_PRIVATE (this);
>+	priv->basename    = g_strdup (basename);
>+	priv->header_bin  = GTK_BIN (header);
>+	priv->icon_name   = g_strdup (icon_name);
>+
>+	bookmark_tile_private_setup (this);
>+
>+	TILE (this)->actions = g_new0 (TileAction *, 2);
>+	TILE (this)->n_actions = 2;
>+
>+	menu_ctnr = GTK_CONTAINER (TILE (this)->context_menu);
>+
>+	/* make open with default action */
>+
>+	markup = g_markup_printf_escaped (_("<b>Open</b>"));
>+	action = tile_action_new (TILE (this), open_trigger, markup, TILE_ACTION_OPENS_NEW_WINDOW);
>+	g_free (markup);
>+
>+	TILE (this)->default_action = action;
>+
>+	menu_item = GTK_WIDGET (GTK_WIDGET (tile_action_get_menu_item (action)));
>+
>+	TILE (this)->actions [BOOKMARK_TILE_ACTION_OPEN] = action;
>+
>+	gtk_container_add (menu_ctnr, menu_item);
>+
>+	/* insert separator */
>+
>+	menu_item = gtk_separator_menu_item_new ();
>+	gtk_container_add (menu_ctnr, menu_item);
>+
>+	/* make remove from favorites action */
>+
>+	action = tile_action_new (TILE (this), remove_favorite_trigger, _("Remove from Favorites"), 0);
>+	TILE (this)->actions[BOOKMARK_TILE_ACTION_REMOVE_FAVORITE] = action;
>+
>+	menu_item = GTK_WIDGET (tile_action_get_menu_item (action));
>+	gtk_container_add (menu_ctnr, menu_item);
>+
>+
>+	gtk_widget_show_all (GTK_WIDGET (TILE (this)->context_menu));
>+
>+	load_image (this);
>+
>+	accessible = gtk_widget_get_accessible (GTK_WIDGET (this));
>+	if (basename)
>+	  atk_object_set_name (accessible, basename);
>+
>+	g_free (basename);
>+
>+	return GTK_WIDGET (this);
>+}
>+
>+static void
>+bookmark_tile_private_setup (BookmarkTile *tile)
>+{
>+	BookmarkTilePrivate *priv = BOOKMARK_TILE_GET_PRIVATE (tile);
>+
>+
>+	priv->agent = bookmark_agent_get_instance (BOOKMARK_STORE_USER_DIRS);
>+}
>+
>+static void
>+bookmark_tile_init (BookmarkTile *tile)
>+{
>+	BookmarkTilePrivate *priv = BOOKMARK_TILE_GET_PRIVATE (tile);
>+
>+
>+	priv->basename = NULL;
>+	priv->header_bin = NULL;
>+	priv->icon_name = NULL;
>+	priv->image_is_broken = TRUE;
>+}
>+
>+static void
>+bookmark_tile_finalize (GObject *g_object)
>+{
>+	BookmarkTilePrivate *priv = BOOKMARK_TILE_GET_PRIVATE (g_object);
>+
>+
>+	g_free (priv->basename);
>+	g_free (priv->icon_name);
>+
>+	(* G_OBJECT_CLASS (bookmark_tile_parent_class)->finalize) (g_object);
>+}
>+
>+static void
>+bookmark_tile_style_set (GtkWidget *widget, GtkStyle *prev_style)
>+{
>+	load_image (BOOKMARK_TILE (widget));
>+}
>+
>+static void
>+load_image (BookmarkTile *tile)
>+{
>+	BookmarkTilePrivate *priv = BOOKMARK_TILE_GET_PRIVATE (tile);
>+	gchar *icon_name;
>+
>+	if (priv->icon_name)
>+		icon_name = priv->icon_name;
>+	else
>+		icon_name = "gnome-fs-directory";
>+
>+	priv->image_is_broken = slab_load_image (
>+		GTK_IMAGE (NAMEPLATE_TILE (tile)->image), GTK_ICON_SIZE_DND, icon_name);
>+}
>+
>+static GtkWidget *
>+create_header (const gchar *name)
>+{
>+	GtkWidget *header_bin;
>+	GtkWidget *header;
>+
>+	header = gtk_label_new (name);
>+	gtk_label_set_ellipsize (GTK_LABEL (header), PANGO_ELLIPSIZE_END);
>+	gtk_misc_set_alignment (GTK_MISC (header), 0.0, 0.5);
>+
>+	header_bin = gtk_alignment_new (0.0, 0.5, 1.0, 0.0);
>+	gtk_container_add (GTK_CONTAINER (header_bin), header);
>+
>+	g_signal_connect (G_OBJECT (header), "size-allocate", G_CALLBACK (header_size_allocate_cb),
>+		NULL);
>+
>+	return header_bin;
>+}
>+
>+static void
>+header_size_allocate_cb (GtkWidget *widget, GtkAllocation *alloc, gpointer user_data)
>+{
>+	gtk_widget_set_size_request (widget, alloc->width, -1);
>+}
>+
>+static void
>+open_trigger (Tile *tile, TileEvent *event, TileAction *action)
>+{
>+	gchar *cmd;
>+
>+	cmd = string_replace_once (
>+		get_slab_gconf_string (SLAB_FILE_MANAGER_OPEN_CMD), "FILE_URI", tile->uri);
>+
>+	spawn_process (cmd);
>+
>+	g_free (cmd);
>+}
>+
>+static void
>+remove_favorite_trigger (Tile *tile, TileEvent *event, TileAction *action)
>+{
>+	BookmarkTilePrivate *priv = BOOKMARK_TILE_GET_PRIVATE (tile);
>+  
>+	bookmark_agent_remove_item (priv->agent, TILE (tile)->uri);
>+}
>+
>Index: libslab/bookmark-tile.h
>===================================================================
>--- libslab/bookmark-tile.h	(revision 0)
>+++ libslab/bookmark-tile.h	(revision 0)
>@@ -0,0 +1,54 @@
>+/*
>+ * This file is part of libtile.
>+ *
>+ * Copyright (c) 2006 Novell, Inc.
>+ *
>+ * Libtile is free software; you can redistribute it and/or modify it under the
>+ * terms of the GNU Lesser General Public License as published by the Free
>+ * Software Foundation; either version 2 of the License, or (at your option)
>+ * any later version.
>+ *
>+ * Libtile is distributed in the hope that it will be useful, but WITHOUT ANY
>+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
>+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
>+ * more details.
>+ *
>+ * You should have received a copy of the GNU Lesser General Public License
>+ * along with libslab; if not, write to the Free Software Foundation, Inc., 51
>+ * Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>+ */
>+
>+#ifndef __BOOKMARK_TILE_H__
>+#define __BOOKMARK_TILE_H__
>+
>+#include <time.h>
>+
>+#include "nameplate-tile.h"
>+
>+G_BEGIN_DECLS
>+
>+#define BOOKMARK_TILE_TYPE         (bookmark_tile_get_type ())
>+#define BOOKMARK_TILE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), BOOKMARK_TILE_TYPE, BookmarkTile))
>+#define BOOKMARK_TILE_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), BOOKMARK_TILE_TYPE, BookmarkTileClass))
>+#define IS_BOOKMARK_TILE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), BOOKMARK_TILE_TYPE))
>+#define IS_BOOKMARK_TILE_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), BOOKMARK_TILE_TYPE))
>+#define BOOKMARK_TILE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BOOKMARK_TILE_TYPE, BookmarkTileClass))
>+
>+typedef struct {
>+	NameplateTile nameplate_tile;
>+} BookmarkTile;
>+
>+typedef struct {
>+	NameplateTileClass nameplate_tile_class;
>+} BookmarkTileClass;
>+
>+#define BOOKMARK_TILE_ACTION_OPEN            0
>+#define BOOKMARK_TILE_ACTION_REMOVE_FAVORITE 1
>+
>+GType bookmark_tile_get_type (void);
>+
>+GtkWidget *bookmark_tile_new (const gchar *uri, const gchar *title, const gchar *icon_name);
>+
>+G_END_DECLS
>+
>+#endif
>Index: libslab/bookmark-agent.c
>===================================================================
>--- libslab/bookmark-agent.c	(revision 370)
>+++ libslab/bookmark-agent.c	(working copy)
>@@ -121,6 +121,7 @@
> 
> static void load_xbel_store          (BookmarkAgent *);
> static void load_places_store        (BookmarkAgent *);
>+static void save_places_store        (BookmarkAgent *);
> static void load_recent_store        (BookmarkAgent *);
> static void update_user_spec_path    (BookmarkAgent *);
> static void update_recent_store_path (BookmarkAgent *);
>@@ -446,6 +447,7 @@
> 			priv->reorderable     = FALSE;
> 
> 			priv->load_store = load_places_store;
>+			priv->save_store = save_places_store;
> 
> 			priv->gtk_store_path = g_build_filename (g_get_home_dir (), GTK_BOOKMARKS_FILE, NULL);
> 			gnome_vfs_monitor_add (
>@@ -822,6 +824,67 @@
> }
> 
> static void
>+save_places_store (BookmarkAgent *this)
>+{
>+	BookmarkAgentPrivate *priv = PRIVATE (this);
>+	
>+	GError *error = NULL;
>+	
>+	gchar *buffer = NULL;
>+	gchar **uris;
>+	gint i;
>+	gsize count;
>+	
>+	
>+	if (! g_bookmark_file_to_file (priv->store, priv->store_path, & error))
>+		libslab_handle_g_error (
>+			& error, "%s: couldn't save bookmark file [%s]\n", G_STRFUNC, priv->store_path);
>+	
>+	uris = g_bookmark_file_get_uris (priv->store, & count);
>+	
>+	for (i = 0; uris && uris [i]; i++) {
>+		gchar **groups;
>+		gint j;
>+		
>+		groups = g_bookmark_file_get_groups (priv->store, uris [i], & count, & error);
>+		
>+		for (j = 0; groups && groups [j]; j++) {
>+			gchar *line;
>+			gchar *label;
>+
>+			if (g_ascii_strcasecmp (groups [j], "gtk-bookmarks"))
>+				continue;
>+			
>+			label = g_bookmark_file_get_title (priv->store, uris [i], NULL);
>+
>+			if (label != NULL) {
>+				line = g_strconcat (uris [i], " ", label, "\n", NULL);
>+				g_free (label);
>+			} else {
>+				line = g_strconcat (uris [i], "\n", NULL);
>+			}
>+			
>+			if (buffer != NULL) {
>+				gchar *temp = buffer;
>+				buffer = g_strconcat (buffer, line, NULL);
>+				g_free (temp);
>+				g_free (line);
>+			} else {
>+				buffer = line;
>+			}
>+		}
>+		
>+		g_strfreev (groups);
>+	}
>+	
>+	g_strfreev (uris);
>+
>+	if (! g_file_set_contents (priv->gtk_store_path, buffer, -1, & error))
>+		libslab_handle_g_error (
>+			& error, "%s: couldn't save gtk-bookmark file [%s]\n", G_STRFUNC, priv->store_path);
>+}
>+
>+static void
> load_recent_store (BookmarkAgent *this)
> {
> 	BookmarkAgentPrivate *priv = PRIVATE (this);
>Index: libslab/Makefile.am
>===================================================================
>--- libslab/Makefile.am	(revision 370)
>+++ libslab/Makefile.am	(working copy)
>@@ -8,6 +8,7 @@
> 	app-shell.h				\
> 	app-shell-startup.h			\
> 	application-tile.h			\
>+	bookmark-tile.h				\
> 	directory-tile.h			\
> 	document-tile.h				\
> 	gnome-utils.h				\
>@@ -39,6 +40,7 @@
> 	bookmark-agent.h			\
> 	bookmark-agent-libslab.h		\
> 	bookmark-agent.c			\
>+	bookmark-tile.c				\
> 	directory-tile.c			\
> 	document-tile.c				\
> 	double-click-detector.c			\

Actions: View | Diff

Attachments on bug 309058: 188332 | 188620