Ticket #8398: mythbrowser-custom-homepage.patch
File mythbrowser-custom-homepage.patch, 5.8 KB (added by , 14 years ago) |
---|
-
mythbrowser/mythbrowser/main.cpp
old new 42 42 return 0; 43 43 } 44 44 45 void runBookmarkManager() 46 { 47 mythplugin_run(); 48 } 49 50 void runHomepage() 51 { 52 QString homepage = gContext->GetSetting("WebBrowserHomepage"); 53 handleMedia( homepage, "", "", "", "", 0, 0, 0, ""); 54 } 55 45 56 void setupKeys(void) 46 57 { 47 58 REG_KEY("Browser", "NEXTTAB", QT_TRANSLATE_NOOP("MythControls", … … 49 60 REG_KEY("Browser", "PREVTAB", QT_TRANSLATE_NOOP("MythControls", 50 61 "Move to previous browser tab"), ""); 51 62 63 REG_JUMP("Bookmarks", QT_TRANSLATE_NOOP("MythControls", 64 "Show the bookmark manager"), "", runBookmarkManager); 65 REG_JUMP("Homepage", QT_TRANSLATE_NOOP("MythControls", 66 "Show the webbrowser homepage"), "", runHomepage); 67 52 68 REG_MEDIAPLAYER("WebBrowser", QT_TRANSLATE_NOOP("MythControls", 53 69 "Internal Web Browser"), handleMedia); 54 70 } … … 69 85 if (gContext->GetSetting("WebBrowserZoomLevel").isEmpty()) 70 86 gContext->SaveSetting("WebBrowserZoomLevel", "1.4"); 71 87 88 if (gContext->GetSetting("WebBrowserHomepage").isEmpty()) 89 gContext->SaveSetting("WebBrowserHomepage", "http://www.mythtv.org"); 90 72 91 gContext->ActivateSettingsCache(true); 73 92 74 93 setupKeys(); -
mythbrowser/mythbrowser/browserdbutil.cpp
old new 9 9 #include "browserdbutil.h" 10 10 #include "bookmarkmanager.h" 11 11 12 const QString currentDatabaseVersion = "100 2";12 const QString currentDatabaseVersion = "1003"; 13 13 14 14 static bool UpdateDBVersionNumber(const QString &newnumber) 15 15 { … … 110 110 return false; 111 111 } 112 112 113 if (dbver == "1002") 114 { 115 const QString updates[] = 116 { 117 "INSERT INTO settings VALUES ('WebBrowserHomepage', 'www.mythtv.org', NULL);", 118 "" 119 }; 120 if (!performActualUpdate(updates, "1003", dbver)) 121 return false; 122 } 123 113 124 return true; 114 125 } 115 126 -
mythbrowser/mythbrowser/bookmarkmanager.h
50 50 51 51 private: 52 52 MythUITextEdit *m_commandEdit; 53 MythUITextEdit *m_homepageEdit; 53 54 MythUITextEdit *m_zoomEdit; 54 55 55 56 MythUIText *m_descriptionText; -
mythbrowser/theme/default-wide/browser-ui.xml
278 278 <position>445,140</position> 279 279 </textedit> 280 280 281 <textarea name="homepagelabel" from="basetextarea"> 282 <area>130,200,300,30</area> 283 <align>right,vcenter</align> 284 <value>Browser Command:</value> 285 </textarea> 286 287 <textedit name="homepage" from="basetextedit"> 288 <position>445,190</position> 289 </textedit> 290 291 <textarea name="zoomlabel" from="basetextarea"> 292 <area>130,250,300,30</area> 281 293 <textarea name="zoomlabel" from="basetextarea"> 282 294 <area>130,250,300,30</area> 283 295 <align>right,vcenter</align> -
mythbrowser/mythbrowser/bookmarkmanager.cpp
21 21 BrowserConfig::BrowserConfig(MythScreenStack *parent, const char *name) 22 22 : MythScreenType(parent, name), 23 23 m_commandEdit(NULL), m_zoomEdit(NULL), 24 m_homepageEdit(NULL), 24 25 m_descriptionText(NULL), m_titleText(NULL), 25 26 m_okButton(NULL), m_cancelButton(NULL) 26 27 { … … 42 43 m_titleText->SetText(tr("MythBrowser Settings")); 43 44 44 45 m_commandEdit = dynamic_cast<MythUITextEdit *> (GetChild("command")); 46 m_homepageEdit = dynamic_cast<MythUITextEdit *> (GetChild("homepage")); 45 47 m_zoomEdit = dynamic_cast<MythUITextEdit *> (GetChild("zoom")); 46 48 47 49 m_descriptionText = dynamic_cast<MythUIText *> (GetChild("description")); … … 58 60 m_commandEdit->SetText(gContext->GetSetting("WebBrowserCommand", 59 61 "Internal")); 60 62 63 m_homepageEdit->SetText(gContext->GetSetting("WebBrowserHomepage", 64 "http://www.mythtv.org")); 65 61 66 m_zoomEdit->SetText(gContext->GetSetting("WebBrowserZoomLevel", "1.4")); 62 67 63 68 connect(m_okButton, SIGNAL(Clicked()), this, SLOT(slotSave())); 64 69 connect(m_cancelButton, SIGNAL(Clicked()), this, SLOT(Close())); 65 70 66 71 connect(m_commandEdit, SIGNAL(TakingFocus()), SLOT(slotFocusChanged())); 72 connect(m_homepageEdit, SIGNAL(TakingFocus()), SLOT(slotFocusChanged())); 67 73 connect(m_zoomEdit , SIGNAL(TakingFocus()), SLOT(slotFocusChanged())); 68 74 connect(m_okButton, SIGNAL(TakingFocus()), SLOT(slotFocusChanged())); 69 75 connect(m_cancelButton, SIGNAL(TakingFocus()), SLOT(slotFocusChanged())); … … 89 95 gContext->SaveSetting("WebBrowserZoomLevel", QString("%1").arg(zoom)); 90 96 gContext->SaveSetting("WebBrowserCommand", m_commandEdit->GetText()); 91 97 98 gContext->SaveSetting("WebBrowserHomepage", m_homepageEdit->GetText()); 99 92 100 Close(); 93 101 } 94 102 … … 120 128 "for the Internal browser are from 0.3 to 5.0 with 1.0 being " 121 129 "normal size less than 1 is smaller and greater than 1 is " 122 130 "larger than normal size."); 131 else if (GetFocusWidget() == m_homepageEdit) 132 msg = tr("This is the default homepage that will be used if the webbrowser " 133 "is called without an url or if the bookmark editor was not selected."); 123 134 else if (GetFocusWidget() == m_cancelButton) 124 135 msg = tr("Exit without saving settings"); 125 136 else if (GetFocusWidget() == m_okButton)