Commit c14244a6 authored by Jim Krehl's avatar Jim Krehl
Browse files

svn path=/branches/version-2/; revision=163



svn path=/branches/version-2/; revision=163
parent 7c0e4416
......@@ -241,16 +241,52 @@
</locale>
</schema>
<schema>
<key>/schemas/desktop/gnome/applications/main-menu/lock-down/user_modifiable_apps</key>
<applyto>/desktop/gnome/applications/main-menu/lock-down/user_modifiable_apps</applyto>
<owner>gnome-main-menu</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>lock-down status for the user-specified apps section</short>
<long>set to true if the user is allowed to modify the list of user-specified or "Favorite" applications.</long>
</locale>
</schema>
<schema>
<key>/schemas/desktop/gnome/applications/main-menu/lock-down/user_modifiable_docs</key>
<applyto>/desktop/gnome/applications/main-menu/lock-down/user_modifiable_docs</applyto>
<owner>gnome-main-menu</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>lock-down status for the user-specified docs section</short>
<long>set to true if the user is allowed to modify the list of user-specified or "Favorite" documents.</long>
</locale>
</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>
<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>
</locale>
</schema>
<schema>
<key>/schemas/desktop/gnome/applications/main-menu/lock-down/showable_file_types</key>
<applyto>/desktop/gnome/applications/main-menu/lock-down/showable_file_types</applyto>
<owner>gnome-main-menu</owner>
<type>list</type>
<list_type>int</list_type>
<default>[0,1,2]</default>
<default>[0,1,2,3,4,5]</default>
<locale name="C">
<short>lock-down configuration of the file area</short>
<long>contains the list (in no particular order) of allowable file types to show in the file area. possible values (see also the note for /desktop/gnome/applications/main-menu/file-area/file_class): 0 [USER_SPECIFIED_APPS], 1 [RECENTLY_USED_APPS], 2 [RECENT_FILES]. RECENTLY_USED_APPS is the list of recently used (instantiated with the main-menu or the application-browser). USER_SPECIFIED_APPS is equivalent to "Favorite Applications". RECENT_FILES is the list of files from ~/.recently-used.</long>
<long>contains the list (in no particular order) of allowable file tables to show in the file area. possible values: 0 - show the user-specified or "Favorite" applications table, 1 - show the recently used applications table, 2 - show the user-specified or "Favorite" documents table, 3 - show the recently used documents table, 4 - show the user-specified of "Favorite" directories or "Places" table, and 5 - show the recently used directories or "Places" table.</long>
</locale>
</schema>
</schemalist>
......
......@@ -527,6 +527,16 @@ migrate_user_dirs_to_user_bookmark_file ()
uri_new = g_filename_to_uri (path, NULL, NULL);
g_free (path);
}
else if (! strcmp (uris [i], "SPREADSHEET")) {
path = g_build_filename (g_get_home_dir (), "Documents", g_strconcat (_("New Spreadsheet"), ".ods", NULL), NULL);
uri_new = g_filename_to_uri (path, NULL, NULL);
g_free (path);
}
else if (! strcmp (uris [i], "DOCUMENT")) {
path = g_build_filename (g_get_home_dir (), "Documents", g_strconcat (_("New Document"), ".odt", NULL), NULL);
uri_new = g_filename_to_uri (path, NULL, NULL);
g_free (path);
}
else
uri_new = NULL;
......
......@@ -7,7 +7,7 @@
<widget class="GtkWindow" id="slab-main-menu-window">
<property name="border_width">3</property>
<property name="title" translatable="yes">GNOME Main Menu</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="type">GTK_WINDOW_POPUP</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
<property name="resizable">False</property>
......@@ -16,7 +16,7 @@
<property name="decorated">False</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_MENU</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
......@@ -69,7 +69,7 @@
<widget class="GtkHBox" id="search-section">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<property name="spacing">6</property>
<child>
<widget class="GtkImage" id="image1">
......@@ -155,7 +155,7 @@
<widget class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">3</property>
<property name="spacing">6</property>
<child>
<widget class="GtkToggleButton" id="slab-page-selector-button-applications">
......@@ -300,7 +300,7 @@
<property name="yalign">0.5</property>
<property name="xscale">1</property>
<property name="yscale">1</property>
<property name="top_padding">12</property>
<property name="top_padding">6</property>
<property name="bottom_padding">0</property>
<property name="left_padding">12</property>
<property name="right_padding">12</property>
......@@ -309,10 +309,10 @@
<widget class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">18</property>
<property name="spacing">12</property>
<child>
<widget class="GtkLabel" id="label5">
<widget class="GtkLabel" id="slab-favorite-applications">
<property name="visible">True</property>
<property name="label" translatable="yes">Favorite Applications</property>
<property name="use_underline">False</property>
......@@ -360,7 +360,7 @@
</child>
<child>
<widget class="GtkLabel" id="label6">
<widget class="GtkLabel" id="slab-recent-applications">
<property name="visible">True</property>
<property name="label" translatable="yes">Recent Applications</property>
<property name="use_underline">False</property>
......@@ -476,7 +476,7 @@
<property name="yalign">0.5</property>
<property name="xscale">1</property>
<property name="yscale">1</property>
<property name="top_padding">12</property>
<property name="top_padding">6</property>
<property name="bottom_padding">0</property>
<property name="left_padding">12</property>
<property name="right_padding">12</property>
......@@ -485,10 +485,10 @@
<widget class="GtkVBox" id="vbox44">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">18</property>
<property name="spacing">12</property>
<child>
<widget class="GtkLabel" id="label93">
<widget class="GtkLabel" id="slab-favorite-documents">
<property name="visible">True</property>
<property name="label" translatable="yes">Favorite Documents</property>
<property name="use_underline">False</property>
......@@ -536,7 +536,7 @@
</child>
<child>
<widget class="GtkLabel" id="label94">
<widget class="GtkLabel" id="slab-recent-documents">
<property name="visible">True</property>
<property name="label" translatable="yes">Recent Documents</property>
<property name="use_underline">False</property>
......@@ -652,7 +652,7 @@
<property name="yalign">0.5</property>
<property name="xscale">1</property>
<property name="yscale">1</property>
<property name="top_padding">12</property>
<property name="top_padding">6</property>
<property name="bottom_padding">0</property>
<property name="left_padding">12</property>
<property name="right_padding">12</property>
......@@ -661,10 +661,10 @@
<widget class="GtkVBox" id="vbox45">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">18</property>
<property name="spacing">12</property>
<child>
<widget class="GtkLabel" id="label95">
<widget class="GtkLabel" id="slab-favorite-places">
<property name="visible">True</property>
<property name="label" translatable="yes">Favorite Places</property>
<property name="use_underline">False</property>
......@@ -808,7 +808,7 @@
<property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="label59">
<widget class="GtkLabel" id="slab-side-system-label">
<property name="visible">True</property>
<property name="label" translatable="yes">System</property>
<property name="use_underline">False</property>
......@@ -923,7 +923,7 @@
</child>
<child>
<widget class="GtkLabel" id="label63">
<widget class="GtkLabel" id="slab-side-status-label">
<property name="visible">True</property>
<property name="label" translatable="yes">Status</property>
<property name="use_underline">False</property>
......@@ -1146,8 +1146,8 @@
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xscale">1</property>
<property name="yscale">1</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<property name="top_padding">0</property>
<property name="bottom_padding">0</property>
<property name="left_padding">0</property>
......@@ -1266,7 +1266,7 @@
</child>
<child>
<widget class="GtkLabel" id="label96">
<widget class="GtkLabel" id="label93">
<property name="visible">True</property>
<property name="label" translatable="yes">Computer</property>
<property name="use_underline">False</property>
......
......@@ -47,6 +47,8 @@ static GType menu_type = 0;
typedef enum {
FILE_INFO_LAUNCHER,
FILE_INFO_DOCUMENT,
FILE_INFO_LAUNCHER_RM,
FILE_INFO_DOCUMENT_RM,
FILE_INFO_OTHER,
} MenuFileInfo;
......@@ -126,13 +128,22 @@ main_menu_menu_item_new (MenuFileInfo menu_file_info)
name = _("Add to Favorites");
tooltip = _("Add the current document to favorites");
break;
case FILE_INFO_LAUNCHER_RM:
name = _("Remove from Favorites");
tooltip = _("Remove the current document from favorites");
break;
case FILE_INFO_DOCUMENT_RM:
name = _("Remove from Favorites");
tooltip = _("Remove the current document from favorites");
break;
case FILE_INFO_OTHER:
default:
g_assert_not_reached ();
}
ret = nautilus_menu_item_new ("NautilusMainMenu::main_menu",
name, tooltip, "gnome-fs-client");
......
......@@ -6,16 +6,21 @@ application-browser/src/application-browser.c
control-center/etc/control-center.desktop.in.in
control-center/etc/control-center.schemas.in
control-center/src/control-center.c
libslab/app-shell.c
libslab/search-bar.c
libslab/application-tile.c
libslab/app-shell.c
libslab/directory-tile.c
libslab/document-tile.c
libslab/eggbookmarkfile.c
libslab/egg-recent-item.c
libslab/search-bar.c
libslab/system-tile.c
main-menu/etc/GNOME_MainMenu_ContextMenu.xml
main-menu/etc/GNOME_MainMenu.server.in.in
main-menu/etc/GNOME_MainMenu_ContextMenu.xml
main-menu/etc/gnome-screensaver-lock.desktop
main-menu/etc/slab.schemas.in.in
main-menu/src/hard-drive-status-tile.c
main-menu/src/main-menu-migration.c
main-menu/src/main-menu-ui.c
main-menu/src/network-status-tile.c
main-menu/src/slab-window.glade
nautilus-main-menu/nautilus-main-menu.c
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment