equal
deleted
inserted
replaced
70 m_viewController->showContent(to); |
70 m_viewController->showContent(to); |
71 } |
71 } |
72 |
72 |
73 void ViewStack::fromSettingsView(const QString &to) // goto WebView |
73 void ViewStack::fromSettingsView(const QString &to) // goto WebView |
74 { |
74 { |
|
75 m_viewController->showContent(to); |
75 ChromeSnippet* tbSnippet = m_chrome->getSnippet("SettingsViewToolbarId"); |
76 ChromeSnippet* tbSnippet = m_chrome->getSnippet("SettingsViewToolbarId"); |
76 if (tbSnippet) |
77 if (tbSnippet) |
77 tbSnippet->hide(); |
78 tbSnippet->hide(); |
78 |
79 |
79 WebPageController::getSingleton()->setSettingsLoaded(0); |
80 WebPageController::getSingleton()->setSettingsLoaded(0); |
80 |
|
81 emit (currentViewChanged()); |
|
82 m_viewController->showContent(to); |
|
83 } |
81 } |
84 |
82 |
85 void ViewStack::fromWebView(const QString &to) |
83 void ViewStack::fromWebView(const QString &to) |
86 { |
84 { |
87 m_viewController->showContent(to); |
85 m_viewController->showContent(to); |
90 tbSnippet->hide(false); |
88 tbSnippet->hide(false); |
91 } |
89 } |
92 |
90 |
93 void ViewStack::fromBookmarkTreeView(const QString &to) |
91 void ViewStack::fromBookmarkTreeView(const QString &to) |
94 { |
92 { |
95 Q_UNUSED(to); |
93 m_viewController->showContent(to); |
96 |
|
97 m_viewController->viewChanged(); |
|
98 |
|
99 // Hide toolbar and dialog if visible |
94 // Hide toolbar and dialog if visible |
100 ChromeSnippet* visibleSnippet = m_chrome->getSnippet("BookmarkViewToolbarId"); |
95 ChromeSnippet* visibleSnippet = m_chrome->getSnippet("BookmarkViewToolbarId"); |
101 if (visibleSnippet) |
96 if (visibleSnippet) |
102 visibleSnippet->hide(); |
97 visibleSnippet->hide(); |
103 |
98 |
107 } |
102 } |
108 |
103 |
109 |
104 |
110 void ViewStack::fromBookmarkHistoryView(const QString &to) |
105 void ViewStack::fromBookmarkHistoryView(const QString &to) |
111 { |
106 { |
112 Q_UNUSED(to); |
107 m_viewController->showContent(to); |
113 |
|
114 m_viewController->viewChanged(); |
|
115 ChromeSnippet* tbSnippet = m_chrome->getSnippet("RecentUrlViewToolbarId"); |
108 ChromeSnippet* tbSnippet = m_chrome->getSnippet("RecentUrlViewToolbarId"); |
116 if (tbSnippet) |
109 if (tbSnippet) |
117 tbSnippet->hide(); |
110 tbSnippet->hide(); |
118 |
111 |
119 ChromeSnippet* visibleSnippet = m_chrome->getSnippet("ClearHistoryDialogId"); |
112 ChromeSnippet* visibleSnippet = m_chrome->getSnippet("ClearHistoryDialogId"); |
142 if (tbSnippet) |
135 if (tbSnippet) |
143 tbSnippet->show(); |
136 tbSnippet->show(); |
144 |
137 |
145 WebPageController::getSingleton()->setSettingsLoaded(0); |
138 WebPageController::getSingleton()->setSettingsLoaded(0); |
146 |
139 |
147 emit(currentViewChanged()); |
|
148 } |
140 } |
149 |
141 |
150 void ViewStack::toWebView() |
142 void ViewStack::toWebView() |
151 { |
143 { |
152 ChromeSnippet* tbSnippet = m_chrome->getSnippet("WebViewToolbarId"); |
144 ChromeSnippet* tbSnippet = m_chrome->getSnippet("WebViewToolbarId"); |
157 void ViewStack::toBookmarkHistoryView() |
149 void ViewStack::toBookmarkHistoryView() |
158 { |
150 { |
159 ChromeSnippet* tbSnippet = m_chrome->getSnippet("RecentUrlViewToolbarId"); |
151 ChromeSnippet* tbSnippet = m_chrome->getSnippet("RecentUrlViewToolbarId"); |
160 if (tbSnippet) |
152 if (tbSnippet) |
161 tbSnippet->show(); |
153 tbSnippet->show(); |
162 |
|
163 m_viewController->viewChanged(); |
|
164 } |
154 } |
165 |
155 |
166 void ViewStack::toBookmarkView() |
156 void ViewStack::toBookmarkView() |
167 { |
157 { |
168 ChromeSnippet* tbSnippet = m_chrome->getSnippet("BookmarkViewToolbarId"); |
158 ChromeSnippet* tbSnippet = m_chrome->getSnippet("BookmarkViewToolbarId"); |
169 if (tbSnippet) |
159 if (tbSnippet) |
170 tbSnippet->show(); |
160 tbSnippet->show(); |
171 |
161 |
172 emit activateBookmark(); |
162 emit activateBookmark(); |
173 |
|
174 |
|
175 m_viewController->viewChanged(); |
|
176 } |
163 } |
177 |
164 |
178 void ViewStack::creatingPage(WRT::WrtBrowserContainer* page) { |
165 void ViewStack::creatingPage(WRT::WrtBrowserContainer* page) { |
179 Q_UNUSED(page); |
166 Q_UNUSED(page); |
180 |
167 |