Differential D11328 Diff 29496 src/lib/bookmarks/bookmarkstools.cpp

Changeset View

Standalone View

View Options

src/lib/bookmarks/bookmarkstools.cpp

Context not available.
147 layout->addWidget(label); 147​ layout->addWidget(label);
148 layout->addWidget(edit); 148​ layout->addWidget(edit);
149 layout->addWidget(folderButton); 149​ layout->addWidget(folderButton);
150​
151​ if (Bookmarks().isBookmarked(url)) {
droscaUnsubmitted
Not Done

As discussed on IRC, please only leave this part in the patch.

drosca: As discussed on IRC, please only leave this part in the patch.
152​ QLabel* warning_label = new QLabel(dialog);
droscaUnsubmitted
Not Done

warningLabel or just label

drosca: `warningLabel` or just `label`
153​ warning_label->setText(Bookmarks::tr("<b>NOTE:</b> This site is already bookmarked"));
154​ layout->addWidget(warning_label);
155​ }
156​
150 layout->addWidget(box); 157​ layout->addWidget(box);
151 158​
152 label->setText(Bookmarks::tr("Choose name and location of this bookmark.")); 159​ label->setText(Bookmarks::tr("Choose name and location of this bookmark."));
Context not available.
191 198​
192 layout->addWidget(label); 199​ layout->addWidget(label);
193 layout->addWidget(folderButton); 200​ layout->addWidget(folderButton);
201​
202​ // -[1] Check for duplicate bookmarks
203​ Bookmarks bookmarks;
204​ bool duplicate_tabs_present = false;
205​ QVector<QUrl> duplicate_urls;
206​
207​ foreach (WebTab* tab, tabWidget->allTabs(false)) {
208​ if (!tab->url().isEmpty() && bookmarks.isBookmarked(tab->url())) {
209​ if (!duplicate_urls.contains(tab->url())) {
210​ duplicate_urls.push_back(tab->url());
211​ } else {
212​ duplicate_tabs_present = true;
213​ }
214​ }
215​ }
216​
217​ if (duplicate_tabs_present) {
218​ QLabel* warning_label = new QLabel(dialog);
219​ warning_label->setText(Bookmarks::tr("<b>NOTE:</b> There are duplicate tabs"));
220​ layout->addWidget(warning_label);
221​ } else if (!duplicate_urls.isEmpty()) {
222​ QLabel* warning_label = new QLabel(dialog);
223​ warning_label->setText(Bookmarks::tr("<b>NOTE:</b> These tabs are already bookmarked"));
224​ layout->addWidget(warning_label);
225​
226​ foreach (QUrl d_url, duplicate_urls) {
227​ QLabel* dup_label = new QLabel(dialog);
228​ dup_label->setText(d_url.toString());
229​ layout->addWidget(dup_label);
230​ }
231​ } // -[1]
232​
194 layout->addWidget(box); 233​ layout->addWidget(box);
195 234​
196 label->setText(Bookmarks::tr("Choose folder for bookmarks:")); 235​ label->setText(Bookmarks::tr("Choose folder for bookmarks:"));
Context not available.