diff options
Diffstat (limited to 'src')
40 files changed, 494 insertions, 720 deletions
diff --git a/src/ChildLock.cpp b/src/ChildLock.cpp index 35a8496..4af2211 100644 --- a/src/ChildLock.cpp +++ b/src/ChildLock.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/ChildLock.h b/src/ChildLock.h index f129b67..073b3bb 100644 --- a/src/ChildLock.h +++ b/src/ChildLock.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/CommandMenuNode.cpp b/src/CommandMenuNode.cpp index 5ebb5a5..680b7bd 100644 --- a/src/CommandMenuNode.cpp +++ b/src/CommandMenuNode.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/CommandMenuNode.h b/src/CommandMenuNode.h index 638cee0..f02d6be 100644 --- a/src/CommandMenuNode.h +++ b/src/CommandMenuNode.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/IChildLockService.h b/src/IChildLockService.h index f677f72..fdf8e16 100644 --- a/src/IChildLockService.h +++ b/src/IChildLockService.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/IMenuNodeProcessor.h b/src/IMenuNodeProcessor.h index e0ddab8..4dbe320 100644 --- a/src/IMenuNodeProcessor.h +++ b/src/IMenuNodeProcessor.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/MainMenuItemsProvider.cpp b/src/MainMenuItemsProvider.cpp index 13fab09..14462a1 100644 --- a/src/MainMenuItemsProvider.cpp +++ b/src/MainMenuItemsProvider.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * @@ -29,6 +30,7 @@ MainMenuItemsProvider::MainMenuItemsProvider(MenuConfigurationRepository& menuCo :_menuConfigurationRepository(menuConfigurationRepository) { EnterRootMenu(); + _previousMenu = NULL; } MainMenuItemsProvider::~MainMenuItemsProvider() @@ -45,7 +47,8 @@ MenuItemDefinitions* MainMenuItemsProvider::MainMenuItems() { if (!(*i)->IsHidden()) { - _currentMainMenuItems.push_back(MenuItemDefinitionFactory::CreateFromMenuNode(*i)); + bool isSelected = ((*i) == _previousMenu); + _currentMainMenuItems.push_back(MenuItemDefinitionFactory::CreateFromMenuNode(*i, isSelected)); } } @@ -80,6 +83,7 @@ bool MainMenuItemsProvider::LeaveSubMenu() { if (_currentMenu->Parent()) { + _previousMenu = _currentMenu; _currentMenu = _currentMenu->Parent(); return true; } diff --git a/src/MainMenuItemsProvider.h b/src/MainMenuItemsProvider.h index 91845be..40cc108 100644 --- a/src/MainMenuItemsProvider.h +++ b/src/MainMenuItemsProvider.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * @@ -33,6 +34,7 @@ class MainMenuItemsProvider: public IMainMenuItemsProvider, public IMenuNodeProc { private: SubMenuNode* _currentMenu; + SubMenuNode* _previousMenu; MenuItemDefinitions _currentMainMenuItems; MenuConfigurationRepository& _menuConfigurationRepository; diff --git a/src/MenuConfigurationRepository.cpp b/src/MenuConfigurationRepository.cpp index 63c25a1..9985e4b 100644 --- a/src/MenuConfigurationRepository.cpp +++ b/src/MenuConfigurationRepository.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/MenuConfigurationRepository.h b/src/MenuConfigurationRepository.h index 2dd223e..e5ec9b7 100644 --- a/src/MenuConfigurationRepository.h +++ b/src/MenuConfigurationRepository.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/MenuItemDefinitionFactory.cpp b/src/MenuItemDefinitionFactory.cpp index f2ee3ab..d6c0744 100644 --- a/src/MenuItemDefinitionFactory.cpp +++ b/src/MenuItemDefinitionFactory.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * @@ -33,16 +34,21 @@ using namespace std; -IMenuItemDefinition* MenuItemDefinitionFactory::CreateFromMenuNode(MenuNode* menuNode) +IMenuItemDefinition* MenuItemDefinitionFactory::CreateFromMenuNode(MenuNode* menuNode, bool isSelected) { - MenuItemDefinitionFactory* factory = new MenuItemDefinitionFactory(); + MenuItemDefinitionFactory* factory = new MenuItemDefinitionFactory(isSelected); menuNode->Process(factory); return factory->_createdMenuItemDefinition; } +MenuItemDefinitionFactory::MenuItemDefinitionFactory(bool isSelected) +{ + _isSelected = isSelected; +} + void MenuItemDefinitionFactory::ProcessSystemMenuNode(SystemMenuNode* node) { - _createdMenuItemDefinition = new OsdItemDefinition(new cOsdItem(node->DisplayText().c_str(), node->State().OSState())); + _createdMenuItemDefinition = new OsdItemDefinition(new cOsdItem(node->DisplayText().c_str(), node->State().OSState()), false); } void MenuItemDefinitionFactory::ProcessPluginMenuNode(PluginMenuNode* node) @@ -52,15 +58,15 @@ void MenuItemDefinitionFactory::ProcessPluginMenuNode(PluginMenuNode* node) void MenuItemDefinitionFactory::ProcessSubMenuNode(SubMenuNode* node) { - _createdMenuItemDefinition = new OsdItemDefinition(new cOsdItem(node->Text().c_str(), osUser1)); + _createdMenuItemDefinition = new OsdItemDefinition(new cOsdItem(node->Text().c_str(), osUser1), _isSelected); } void MenuItemDefinitionFactory::ProcessCommandMenuNode(CommandMenuNode* node) { - _createdMenuItemDefinition = new OsdItemDefinition(new cOsdItem(node->Text().c_str(), osUser2)); + _createdMenuItemDefinition = new OsdItemDefinition(new cOsdItem(node->Text().c_str(), osUser2), _isSelected); } void MenuItemDefinitionFactory::ProcessSeparatorMenuNode(SeparatorMenuNode* node) { - _createdMenuItemDefinition = new OsdItemDefinition(new cOsdSeparatorItem(node->DisplayText().c_str())); + _createdMenuItemDefinition = new OsdItemDefinition(new cOsdSeparatorItem(node->DisplayText().c_str()), false); } diff --git a/src/MenuItemDefinitionFactory.h b/src/MenuItemDefinitionFactory.h index 1e0ad5f..9509345 100644 --- a/src/MenuItemDefinitionFactory.h +++ b/src/MenuItemDefinitionFactory.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * @@ -37,9 +38,10 @@ class MenuItemDefinitionFactory: IMenuNodeProcessor { private: IMenuItemDefinition* _createdMenuItemDefinition; + bool _isSelected; public: - static IMenuItemDefinition* CreateFromMenuNode(MenuNode* menuNode); + static IMenuItemDefinition* CreateFromMenuNode(MenuNode* menuNode, bool isSelected); // IMenuNodeProcessor void ProcessSystemMenuNode(SystemMenuNode* node); @@ -49,7 +51,7 @@ class MenuItemDefinitionFactory: IMenuNodeProcessor void ProcessSeparatorMenuNode(SeparatorMenuNode* node); private: - MenuItemDefinitionFactory(){}; + MenuItemDefinitionFactory(bool isSelected); }; #endif diff --git a/src/MenuNode.cpp b/src/MenuNode.cpp index e0b8e1c..4a3c581 100644 --- a/src/MenuNode.cpp +++ b/src/MenuNode.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/MenuNode.h b/src/MenuNode.h index 727c5bb..cdb1792 100644 --- a/src/MenuNode.h +++ b/src/MenuNode.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/MenuOrgPlugin.cpp b/src/MenuOrgPlugin.cpp index 19e5b6b..0a67a1b 100644 --- a/src/MenuOrgPlugin.cpp +++ b/src/MenuOrgPlugin.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * @@ -32,7 +33,6 @@ #include "MenuOrgPlugin.h" #include "MenuConfigurationRepository.h" #include "MainMenuItemsProvider.h" -#include "i18n.h" #include "PluginSetup.h" using namespace std; @@ -59,15 +59,12 @@ const char* MenuOrgPlugin::Version(void) const char* MenuOrgPlugin::Description(void) { - return tr("reorganize main menu"); + return tr("Reorganizes the main menu"); } const char* MenuOrgPlugin::MainMenuEntry(void) { - if(_pluginConfiguration.MainMenuEntryHidden()) - return NULL; - else - return tr("Menu-Organizer"); + return NULL; } const char *MenuOrgPlugin::CommandLineHelp(void) @@ -107,8 +104,6 @@ bool MenuOrgPlugin::ProcessArgs(int argc, char *argv[]) bool MenuOrgPlugin::Initialize(void) { - RegisterI18n(Phrases); - if (_configFile.empty()) { _configFile = (string) ConfigDirectory() + "/menuorg.xml"; diff --git a/src/MenuOrgPlugin.h b/src/MenuOrgPlugin.h index faf67cf..c33b702 100644 --- a/src/MenuOrgPlugin.h +++ b/src/MenuOrgPlugin.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/OsdItemDefinition.cpp b/src/OsdItemDefinition.cpp index 9be51ee..78a7757 100644 --- a/src/OsdItemDefinition.cpp +++ b/src/OsdItemDefinition.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * @@ -22,9 +23,10 @@ #include "OsdItemDefinition.h" -OsdItemDefinition::OsdItemDefinition(cOsdItem* osdItem) +OsdItemDefinition::OsdItemDefinition(cOsdItem* osdItem, bool isSelected) { _osdItem = osdItem; + _isSelected = isSelected; } bool OsdItemDefinition::IsCustomOsdItem() @@ -47,6 +49,11 @@ const char* OsdItemDefinition::PluginMenuEntry() return NULL; } +bool OsdItemDefinition::IsSelected() +{ + return _isSelected; +} + int OsdItemDefinition::PluginIndex() { return 0; diff --git a/src/OsdItemDefinition.h b/src/OsdItemDefinition.h index 0c4bad7..32b0733 100644 --- a/src/OsdItemDefinition.h +++ b/src/OsdItemDefinition.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * @@ -29,13 +30,15 @@ class OsdItemDefinition: public IMenuItemDefinition { private: cOsdItem* _osdItem; + bool _isSelected; public: - OsdItemDefinition(cOsdItem* osdItem); + OsdItemDefinition(cOsdItem* osdItem, bool isSelected); virtual bool IsCustomOsdItem(); virtual bool IsPluginItem(); virtual cOsdItem* CustomOsdItem(); virtual const char* PluginMenuEntry(); + virtual bool IsSelected(); virtual int PluginIndex(); }; diff --git a/src/OsdLineItem.cpp b/src/OsdLineItem.cpp index f0600df..510d70c 100644 --- a/src/OsdLineItem.cpp +++ b/src/OsdLineItem.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/OsdLineItem.h b/src/OsdLineItem.h index 85ce6bf..38358e6 100644 --- a/src/OsdLineItem.h +++ b/src/OsdLineItem.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/PluginConfiguration.cpp b/src/PluginConfiguration.cpp index dbbdef2..5cc0191 100644 --- a/src/PluginConfiguration.cpp +++ b/src/PluginConfiguration.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * @@ -26,8 +27,6 @@ const char* PluginConfiguration::SetupName::CustomMenuActive = "customMenuActive"; const char* PluginConfiguration::SetupName::UnconfiguredPluginsIncluded = "unconfiguredPluginsIncluded"; -const char* PluginConfiguration::SetupName::HideMainMenuEntry = "hideMainMenuEntry"; -const char* PluginConfiguration::SetupName::MenuSetupStyle = "menuSetupStyle"; PluginConfiguration::PluginConfiguration() { @@ -44,21 +43,9 @@ bool PluginConfiguration::UnconfiguredPluginsInluded() return _unconfiguredPluginsIncluded; } -bool PluginConfiguration::MainMenuEntryHidden() -{ - return _hideMainMenuEntry; -} - -int PluginConfiguration::MenuSetupStyle() -{ - return _menuSetupStyle; -} - void PluginConfiguration::SetDefaults() { _customMenuActive = true; - _hideMainMenuEntry = true; - _menuSetupStyle = 0; _unconfiguredPluginsIncluded = true; } @@ -72,14 +59,6 @@ bool PluginConfiguration::SetConfigurationOptionByName(const char* Name, const c { _unconfiguredPluginsIncluded = (atoi(Value) != 0); } - else if(!strcasecmp(Name, SetupName::HideMainMenuEntry)) - { - _hideMainMenuEntry = (atoi(Value) != 0); - } - else if(!strcasecmp(Name, SetupName::MenuSetupStyle)) - { - _menuSetupStyle = (atoi(Value) != 0); - } else return false; diff --git a/src/PluginConfiguration.h b/src/PluginConfiguration.h index b90d6b0..fa6bcaf 100644 --- a/src/PluginConfiguration.h +++ b/src/PluginConfiguration.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * @@ -32,23 +33,17 @@ class PluginConfiguration { static const char* CustomMenuActive; static const char* UnconfiguredPluginsIncluded; - static const char* HideMainMenuEntry; - static const char* MenuSetupStyle; }; private: bool _customMenuActive; bool _unconfiguredPluginsIncluded; - bool _hideMainMenuEntry; - int _menuSetupStyle; public: PluginConfiguration(); bool SetConfigurationOptionByName(const char* Name, const char* Value); bool CustomMenuActive(); bool UnconfiguredPluginsInluded(); - bool MainMenuEntryHidden(); - int MenuSetupStyle(); private: void SetDefaults(); diff --git a/src/PluginCreator.cpp b/src/PluginCreator.cpp index e845f56..ec51372 100644 --- a/src/PluginCreator.cpp +++ b/src/PluginCreator.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/PluginItemDefinition.cpp b/src/PluginItemDefinition.cpp index baf09bd..15e880c 100644 --- a/src/PluginItemDefinition.cpp +++ b/src/PluginItemDefinition.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * @@ -50,6 +51,11 @@ const char* PluginItemDefinition::PluginMenuEntry() return _mainMenuEntry.c_str(); } +bool PluginItemDefinition::IsSelected() +{ + return false; +} + int PluginItemDefinition::PluginIndex() { return _pluginIndex; diff --git a/src/PluginItemDefinition.h b/src/PluginItemDefinition.h index 8a4be57..b150280 100644 --- a/src/PluginItemDefinition.h +++ b/src/PluginItemDefinition.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * @@ -38,6 +39,7 @@ class PluginItemDefinition: public IMenuItemDefinition virtual bool IsPluginItem(); virtual cOsdItem* CustomOsdItem(); virtual const char* PluginMenuEntry(); + virtual bool IsSelected(); virtual int PluginIndex(); }; diff --git a/src/PluginMenuNode.cpp b/src/PluginMenuNode.cpp index 80cfeb2..2e4f4cd 100644 --- a/src/PluginMenuNode.cpp +++ b/src/PluginMenuNode.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/PluginMenuNode.h b/src/PluginMenuNode.h index 4a08102..d056ae9 100644 --- a/src/PluginMenuNode.h +++ b/src/PluginMenuNode.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/PluginSetup.cpp b/src/PluginSetup.cpp index e59b987..8042fe0 100644 --- a/src/PluginSetup.cpp +++ b/src/PluginSetup.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * @@ -39,14 +40,10 @@ void PluginSetup::Store(void) SetupStore(PluginConfiguration::SetupName::UnconfiguredPluginsIncluded, _pluginConfiguration._unconfiguredPluginsIncluded = _newUnconfiguredPluginsIncluded); - - SetupStore(PluginConfiguration::SetupName::HideMainMenuEntry, - _pluginConfiguration._hideMainMenuEntry = _newHideMainMenuEntry); } void PluginSetup::CreateMenuItems() { Add(new cMenuEditBoolItem(tr("Enable custom menu"), &_newCustomMenuActive)); Add(new cMenuEditBoolItem(tr("Include unconfigured plugins"), &_newUnconfiguredPluginsIncluded)); - Add(new cMenuEditBoolItem(tr("Hide main menu entry"), &_newHideMainMenuEntry)); } diff --git a/src/PluginSetup.h b/src/PluginSetup.h index 1394950..817a6ef 100644 --- a/src/PluginSetup.h +++ b/src/PluginSetup.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * @@ -33,7 +34,6 @@ class PluginSetup : public cMenuSetupPage private: int _newCustomMenuActive; int _newUnconfiguredPluginsIncluded; - int _newHideMainMenuEntry; PluginConfiguration& _pluginConfiguration; MenuConfigurationRepository& _menuConfiguration; diff --git a/src/SeparatorMenuNode.cpp b/src/SeparatorMenuNode.cpp index 2d5ce14..358292c 100644 --- a/src/SeparatorMenuNode.cpp +++ b/src/SeparatorMenuNode.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/SeparatorMenuNode.h b/src/SeparatorMenuNode.h index 06d9f09..0a9356b 100644 --- a/src/SeparatorMenuNode.h +++ b/src/SeparatorMenuNode.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/SubMenuNode.cpp b/src/SubMenuNode.cpp index 9d5de39..91e939f 100644 --- a/src/SubMenuNode.cpp +++ b/src/SubMenuNode.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/SubMenuNode.h b/src/SubMenuNode.h index b83c841..c1e77ae 100644 --- a/src/SubMenuNode.h +++ b/src/SubMenuNode.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/SystemMenuNode.cpp b/src/SystemMenuNode.cpp index aac4cf5..0fc5af2 100644 --- a/src/SystemMenuNode.cpp +++ b/src/SystemMenuNode.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * @@ -72,7 +73,7 @@ string SystemMenuNode::DisplayText() { if (_customTitle.empty()) { - return tr(_state.Name().c_str()); + return trVDR(_state.Name().c_str()); } else { diff --git a/src/SystemMenuNode.h b/src/SystemMenuNode.h index 091c7f9..d582b85 100644 --- a/src/SystemMenuNode.h +++ b/src/SystemMenuNode.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/VdrState.cpp b/src/VdrState.cpp index 6e65553..4481780 100644 --- a/src/VdrState.cpp +++ b/src/VdrState.cpp @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/VdrState.h b/src/VdrState.h index 081b7c5..3cfbd52 100644 --- a/src/VdrState.h +++ b/src/VdrState.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * diff --git a/src/i18n.cpp b/src/i18n.cpp deleted file mode 100644 index d17cc13..0000000 --- a/src/i18n.cpp +++ /dev/null @@ -1,218 +0,0 @@ -/* - * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ - * - */ - -/* - * Translators: - * - Italian translations provided by Gringo <vdr-italian@tiscali.it> - * - */ - -#include "i18n.h" - -const tI18nPhrase Phrases[] = -{ - { - "Failed to load MenuOrg's config file!", // 1 English - "Konnte die MenuOrg Konfigurationsdatei nicht laden", // 2 Deutsch - "", // 3 Slovenski - "Impossibile caricare il file di configurazione MenuOrg", // 4 Italiano - "", // 5 Nederlands - "", // 6 Português - "", // 7 Français - "", // 8 Norsk - "", // 9 suomi - Finnish - "", // 10 Polski - "", // 11 Español - "", // 12 ÅëëçíéêÜ - Greek - "", // 13 Svenska - "", // 14 Românã - "", // 15 Magyar - "", // 16 Català - "", // 17 ÀãááÚØÙ - Russian - "", // 18 Hrvatski - "", // 19 Eesti - "", // 20 Dansk - "", // 21 Èesky - Czech - }, - { - "Up/Dn for new location - OK to move", - "Auf/Ab für neue Position - dann OK", - "Gor/Dol za novo poz. - Ok za premik", - "Su/Giu per nuova posizione - OK per muovere", - "Gebruik Omhoog/Omlaag - daarna Ok", - "Cima/Baixo para nova localização - Ok para mover", - "Haut/Bas -> nouvelle place - OK -> déplacer", - "Opp/Ned for ny plass - OK for å flytte", - "'Ylös/Alas' uusi paikka - 'OK' hyväksy", - "Do góry/Na dó³ na now± pozycjê - Ok zatwierdza", - "Arriba/Abajo para mover - OK para confirmar", - "ÐÜíù/ÊÜôù ãéÜ íÝá èÝóç. ÌåôÜ ÏÊ", - "Upp/Ner för nya platsen - därefter OK för att flytta", - "Sus/Jos pentru noua locaþie - OK pentru a muta", - "Fel/Le egy uj opcióért - aztán OK", - "Amunt/Avall per una nova localització - OK per moure", - "½ÐÖØÜÐÙâÕ \"²ÒÕàå\"/\"²ÝØ×\" ÔÛï ÒëÑÞàÐ ßÞ×ØæØØ, Ð ×ÐâÕÜ \"OK\"", - "Gore/Dolje na novu poziciju - zatim OK", - "'Üles/Alla' uus asukoht - 'OK' kinnitus", - "Op/Ned for ny placering - OK for at flytte", - "Nahoru/Dolu pro novou pozici - Ok pøesune", - }, - { - "Name", - "Name", - "Ime", - "Nome", - "Naam", - "Nome", - "Nom", - "Navn", - "Nimi", - "Nazwa", - "Nombre", - "¼íïìá", - "Namn", - "Nume", - "Név", - "Nom", - "½Ð×ÒÐÝØÕ", - "Naziv", - "Nimi", - "Navn", - "Název", - }, - { - "Title", - "Titel", - "Naslov", - "Titolo", - "Titel", - "", - "Titre", - "", - "Kappale", - "tytu³u", - "título", - "Ôßôëï", - "titel", - "nélkül", - "", - "Títol", - "½Ð×ÒÐÝØÕ", - "titla", - "", - "titel", - "názvu", - }, - // Button texts (should not be more than 10 characters!): - { - "Button$Edit", - "Editieren", - "Uredi", - "Modifica", - "Verander", - "Modificar", - "Modifier", - "Editer", - "Muokkaa", - "Edytuj", - "Modificar", - "ÐñïóáñìïãÞ", - "Ändra", - "Modificã", - "Beállítani", - "Editar", - "ÀÕÔÐÚâØàÞÒÐâì", - "Promijeni", - "Muuda", - "Rediger", - "Editace", - }, - { - "Button$New", - "Neu", - "Novo", - "Nuovo", - "Nieuw", - "Novo", - "Nouveau", - "Ny", - "Uusi", - "Nowy", - "Nuevo", - "NÝï", - "Ny", - "Nou", - "Új", - "Nou", - "´ÞÑÐÒØâì", - "Novi", - "Uus", - "Ny", - "Nový", - }, - { - "Button$Delete", - "Löschen", - "Izbri¹i", - "Cancella", - "Verwijder", - "Apagar", - "Supprimer", - "Slett", - "Poista", - "Usuñ", - "Borrar", - "ÄéáãñáöÞ", - "Ta bort", - "ªterge", - "Törölni", - "Esborrar", - "ÃÔÐÛØâì", - "Obri¹i", - "Kustuta", - "Slet", - "Smazat", - }, - { - "Button$Move", - "Verschieben", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - }, - { NULL } -}; diff --git a/src/i18n.h b/src/i18n.h deleted file mode 100644 index 65a1ed1..0000000 --- a/src/i18n.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ - * - */ - -#ifndef ___I18N__H -#define ___I18N__H - -#include <vdr/i18n.h> -#include <vdr/config.h> - -extern const tI18nPhrase Phrases[]; - -#endif diff --git a/src/version.h b/src/version.h index 4a02c5f..30896b9 100644 --- a/src/version.h +++ b/src/version.h @@ -1,20 +1,21 @@ /* * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> + * Copyright (c) 2007 Thomas Creutz <thomas.creutz@gmx.de> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program 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 General Public License for more details. + * This program 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 General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU 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 * * $Id$ * |