From abf9370bc5ab81f4bb2a59248a0be1e76e2c3c2b Mon Sep 17 00:00:00 2001 From: "Zeeshan Ali (Khattak)" Date: Mon, 14 Feb 2011 17:47:12 +0200 Subject: [PATCH] data,ui: Remove tracker preferences section --- data/rygel-preferences.ui | 131 ++------------------------------- po/POTFILES.in | 1 - src/ui/Makefile.am | 1 - src/ui/rygel-preferences-dialog.vala | 1 - src/ui/rygel-tracker-pref-section.vala | 76 ------------------- 5 files changed, 7 insertions(+), 203 deletions(-) delete mode 100644 src/ui/rygel-tracker-pref-section.vala diff --git a/data/rygel-preferences.ui b/data/rygel-preferences.ui index 9ee0537..2035c95 100644 --- a/data/rygel-preferences.ui +++ b/data/rygel-preferences.ui @@ -288,7 +288,7 @@ True False - 8 + 3 2 6 6 @@ -303,8 +303,6 @@ True - 5 - 6 GTK_FILL GTK_FILL @@ -319,8 +317,8 @@ True - 6 - 7 + 1 + 2 GTK_FILL GTK_FILL @@ -337,8 +335,8 @@ 1 2 - 6 - 7 + 1 + 2 GTK_FILL @@ -353,8 +351,8 @@ True - 7 - 8 + 2 + 3 GTK_FILL GTK_FILL @@ -450,128 +448,13 @@ 1 2 - 7 - 8 - - - - - Share _Pictures - True - True - False - False - True - True - - - 4 - 5 - GTK_FILL - - 12 - - - - - Share M_usic - True - True - False - False - True - 0.54000002145767212 - True - - - 3 - 4 - GTK_FILL - - 12 - - - - - Share _Videos - True - True - False - False - True - True - - 2 3 - GTK_FILL - - 12 - - - - - True - True - Write %u for username, %n for real name of the user and %h for host name - ● - 30 - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - False - 0 - 12 - 2 - T_itle - True - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - T_racker - True - True - False - False - True - True - - - GTK_FILL - GTK_FILL - - - - - - - - - - - - diff --git a/po/POTFILES.in b/po/POTFILES.in index 9aece2a..2c35cf3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -151,5 +151,4 @@ src/ui/rygel-media-export-pref-section.vala src/ui/rygel-plugin-pref-section.vala src/ui/rygel-preferences-dialog.vala src/ui/rygel-preferences-section.vala -src/ui/rygel-tracker-pref-section.vala src/ui/rygel-writable-user-config.vala diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am index a95baea..79d65b6 100644 --- a/src/ui/Makefile.am +++ b/src/ui/Makefile.am @@ -29,7 +29,6 @@ rygel_preferences_SOURCES = \ rygel-general-pref-section.vala \ rygel-plugin-pref-section.vala \ rygel-media-export-pref-section.vala \ - rygel-tracker-pref-section.vala \ rygel-writable-user-config.vala rygel.stamp: $(rygel_preferences_VALASOURCES) diff --git a/src/ui/rygel-preferences-dialog.vala b/src/ui/rygel-preferences-dialog.vala index 2f1e175..492f2ae 100644 --- a/src/ui/rygel-preferences-dialog.vala +++ b/src/ui/rygel-preferences-dialog.vala @@ -46,7 +46,6 @@ public class Rygel.PreferencesDialog : GLib.Object { this.sections = new ArrayList (); this.sections.add (new GeneralPrefSection (this.builder, this.config)); - this.sections.add (new TrackerPrefSection (this.builder, this.config)); this.sections.add (new MediaExportPrefSection (this.builder, this.config)); } diff --git a/src/ui/rygel-tracker-pref-section.vala b/src/ui/rygel-tracker-pref-section.vala deleted file mode 100644 index a2d56ed..0000000 --- a/src/ui/rygel-tracker-pref-section.vala +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (C) 2009 Nokia Corporation. - * - * Author: Zeeshan Ali (Khattak) - * - * - * This file is part of Rygel. - * - * Rygel 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. - * - * Rygel 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 this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -using Gtk; -using Gee; - -public class Rygel.TrackerPrefSection : Rygel.PluginPrefSection { - const string NAME = "Tracker"; - const string VIDEOS_KEY = "share-videos"; - const string MUSIC_KEY = "share-music"; - const string PICTURES_KEY = "share-pictures"; - const string TAG_KEY = "share-tagged"; - const string VIDEOS_CHECK = VIDEOS_KEY + "-checkbutton"; - const string MUSIC_CHECK = MUSIC_KEY + "-checkbutton"; - const string PICTURES_CHECK = PICTURES_KEY + "-checkbutton"; - - private CheckButton videos_check; - private CheckButton music_check; - private CheckButton pictures_check; - - public TrackerPrefSection (Builder builder, WritableUserConfig config) { - base (builder, config, NAME); - - this.videos_check = (CheckButton) builder.get_object (VIDEOS_CHECK); - assert (this.videos_check != null); - this.music_check = (CheckButton) builder.get_object (MUSIC_CHECK); - assert (this.music_check != null); - this.pictures_check = (CheckButton) builder.get_object (PICTURES_CHECK); - assert (this.pictures_check != null); - - this.widgets.add (this.videos_check); - this.widgets.add (this.music_check); - this.widgets.add (this.pictures_check); - - this.videos_check.active = true; - this.music_check.active = true; - this.pictures_check.active = true; - - try { - this.videos_check.active = config.get_bool (this.name, VIDEOS_KEY); - this.music_check.active = config.get_bool (this.name, MUSIC_KEY); - this.pictures_check.active = config.get_bool (this.name, - PICTURES_KEY); - } catch (Error err) {} - - // Initialize the sensitivity of all widgets - this.reset_widgets_sensitivity (); - } - - public override void save () { - base.save (); - - config.set_bool (this.name, VIDEOS_KEY, this.videos_check.active); - config.set_bool (this.name, MUSIC_KEY, this.music_check.active); - config.set_bool (this.name, PICTURES_KEY, this.pictures_check.active); - } -} -- 2.7.4