QDialogButtonBox *dialogButtonBoxPointer = editFolderDialogUi.dialogButtonBox;
saveButtonPointer = dialogButtonBoxPointer->button(QDialogButtonBox::Save);
- // Get the bookmark struct.
- bookmarkStructPointer = BookmarksDatabase::getBookmark(databaseId);
+ // Get the folder bookmark struct.
+ folderBookmarkStructPointer = BookmarksDatabase::getBookmark(databaseId);
// Set the folder icons.
- currentFolderIconRadioButtonPointer->setIcon(bookmarkStructPointer->favoriteIcon);
+ currentFolderIconRadioButtonPointer->setIcon(folderBookmarkStructPointer->favoriteIcon);
currentWebsiteFavoriteIconRadioButtonPointer->setIcon(currentWebsiteFavoriteIcon);
// Instantiate a folder helper.
parentFolderTreeWidgetPointer->addTopLevelItem(bookmarksTreeWidgetItemPointer);
// Select the root bookmarks folder if it is the initial parent folder.
- if (bookmarkStructPointer->parentFolderId == 0)
+ if (folderBookmarkStructPointer->parentFolderId == 0)
bookmarksTreeWidgetItemPointer->setSelected(true);
// Populate the subfolders, except for the one being edited.
- folderHelperPointer->populateSubfoldersExcept(databaseId, bookmarksTreeWidgetItemPointer, bookmarkStructPointer->parentFolderId);
+ folderHelperPointer->populateSubfoldersExcept(databaseId, bookmarksTreeWidgetItemPointer, folderBookmarkStructPointer->parentFolderId);
// Open all the folders.
parentFolderTreeWidgetPointer->expandAll();
// Populate the line edits.
- folderNameLineEditPointer->setText(bookmarkStructPointer->name);
+ folderNameLineEditPointer->setText(folderBookmarkStructPointer->name);
// Focus the folder name line edit.
folderNameLineEditPointer->setFocus();
// Get the parent folder ID.
double parentFolderId = selectedFolderPointer->text(folderHelperPointer->FOLDER_ID_COLUMN).toDouble();
+ // Determine if it has moved to a new folder.
+ bool movedToNewFolder = parentFolderId != folderBookmarkStructPointer->parentFolderId;
+
// Get the original display order.
- int displayOrder = bookmarkStructPointer->displayOrder;
+ int displayOrder = folderBookmarkStructPointer->displayOrder;
// Get the new display order if the parent folder has changed.
- if (parentFolderId != bookmarkStructPointer->parentFolderId)
+ if (movedToNewFolder)
displayOrder = BookmarksDatabase::getFolderItemCount(parentFolderId);
// Create a favorite icon.
// Update the folder.
BookmarksDatabase::updateBookmark(updatedBookmarkStructPointer);
- // Update the display order of all the items in the previous folder.
- BookmarksDatabase::updateFolderContentsDisplayOrder(bookmarkStructPointer->parentFolderId);
+ // Update the display order of all the items in the previous folder if it has moved to a new folder.
+ if (movedToNewFolder)
+ BookmarksDatabase::updateFolderContentsDisplayOrder(folderBookmarkStructPointer->parentFolderId);
// Emit the folder saved signal.
emit folderSaved();