mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

bookmark manager: only add bookmark if OK pressed

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 14999c7015
Author: Christian Schuett <Gaucho316@hotmail.com>
Date: 2015-03-16 (Mon, 16 Mar 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Christian Schuett
2015-03-16 11:57:22 +01:00
committed by vanhofen
parent 2c0369af18
commit fafe2570bb
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/bookmarkmanager.cpp
View File

@@ -84,11 +84,14 @@ inline int CBookmarkManager::createBookmark (const std::string & name, const std
int CBookmarkManager::createBookmark (const std::string & url, const std::string & time) { int CBookmarkManager::createBookmark (const std::string & url, const std::string & time) {
std::string bookmarkname; std::string bookmarkname;
CStringInputSMS bookmarkname_input(LOCALE_MOVIEPLAYER_BOOKMARKNAME, &bookmarkname, 25, LOCALE_MOVIEPLAYER_BOOKMARKNAME_HINT1, LOCALE_MOVIEPLAYER_BOOKMARKNAME_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789-_"); CStringInputSMS bookmarkname_input(LOCALE_MOVIEPLAYER_BOOKMARKNAME, &bookmarkname, 25, LOCALE_MOVIEPLAYER_BOOKMARKNAME_HINT1, LOCALE_MOVIEPLAYER_BOOKMARKNAME_HINT2, "abcdefghijklmnopqrstuvwxyz0123456789-_", this);
bookmarkname_input.exec(NULL, ""); bookmarkname_input.exec(NULL, "");
// TODO: return -1 if no name was entered if (bookmarkname_entered)
if (bookmarkname.empty()) return -1; {
return createBookmark(bookmarkname, url, time); bookmarkname_entered = false;
return createBookmark(bookmarkname, url, time);
}
return -1;
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------
@@ -166,6 +169,7 @@ void CBookmarkManager::writeBookmarkFile() {
CBookmarkManager::CBookmarkManager() : bookmarkfile ('\t') CBookmarkManager::CBookmarkManager() : bookmarkfile ('\t')
{ {
bookmarkname_entered = false;
bookmarksmodified = false; bookmarksmodified = false;
readBookmarkFile(); readBookmarkFile();
} }
@@ -177,6 +181,15 @@ CBookmarkManager::~CBookmarkManager () {
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------
bool CBookmarkManager::changeNotify(const neutrino_locale_t, void *)
{
bookmarkname_entered = true;
return false;
}
//------------------------------------------------------------------------
#if 0 #if 0
//never used //never used
int CBookmarkManager::getBookmarkCount(void) const { int CBookmarkManager::getBookmarkCount(void) const {

4
src/gui/bookmarkmanager.h
View File

@@ -63,7 +63,7 @@ class CBookmark
//----------------------------------------- //-----------------------------------------
class CBookmarkManager class CBookmarkManager : public CChangeObserver
{ {
private: private:
std::vector<CBookmark> bookmarks; std::vector<CBookmark> bookmarks;
@@ -84,6 +84,7 @@ class CBookmarkManager
//int bookmarkCount; //int bookmarkCount;
bool bookmarkname_entered;
bool bookmarksmodified; bool bookmarksmodified;
void readBookmarkFile(); void readBookmarkFile();
void writeBookmarkFile(); void writeBookmarkFile();
@@ -101,6 +102,7 @@ class CBookmarkManager
public: public:
CBookmarkManager(); CBookmarkManager();
~CBookmarkManager(); ~CBookmarkManager();
bool changeNotify(const neutrino_locale_t, void *);
int createBookmark(const std::string & name, const std::string & url, const std::string & time); int createBookmark(const std::string & name, const std::string & url, const std::string & time);
int createBookmark(const std::string & url, const std::string & time); int createBookmark(const std::string & url, const std::string & time);
void removeBookmark(unsigned int index); void removeBookmark(unsigned int index);