> Fix icons in the wizard (find tools and packers)
> M +5 -4 BookMan/krbookmarkhandler.cpp
> M +9 -3 Konfigurator/kgarchives.cpp
> M +8 -3 Konfigurator/kggeneral.cpp
> M +14 -7 Locate/locate.cpp
> M +15 -9 Panel/panelfunc.cpp
> M +4 -3 Queue/queuedialog.cpp
> M +1 -1 defaults.h
> --- trunk/kdereview/krusader/krusader/BookMan/krbookmarkhandler.cpp
> #983971:983972
> @@ -53,11 +53,12 @@
> void KrBookmarkHandler::bookmarkCurrent(KUrl url)
> {
> - KrAddBookmarkDlg dlg(krApp, url);
> - if (dlg.exec() == KDialog::Accepted) {
> - KrBookmark *bm = new KrBookmark(dlg.name(), dlg.url(),
> _collection);
> - addBookmark(bm, dlg.folder());
> + QPointer<KrAddBookmarkDlg> dlg = new KrAddBookmarkDlg(krApp,
> url);
> + if (dlg->exec() == KDialog::Accepted) {
> + KrBookmark *bm = new KrBookmark(dlg->name(), dlg->url(),
> _collection);
> + addBookmark(bm, dlg->folder());
> }
> + delete dlg;
> }
> void KrBookmarkHandler::addBookmark(KrBookmark *bm, KrBookmark
> *folder)
> --- trunk/kdereview/krusader/krusader/Konfigurator/kgarchives.cpp
> #983971:983972
> @@ -125,11 +125,17 @@
> void KgArchives::slotAutoConfigure()
> {
> - KrResultTableDialog* dia = new KrResultTableDialog(this,
> KrResultTableDialog::Archiver, i18n("Search results"),
> i18n("Searching for packers..."),
> - "package", i18n("Make sure to install new packers in
> your <code>$PATH</code> (e.g. /usr/bin)"));
> - dia->exec();
> + QPointer<KrResultTableDialog> dlg = new KrResultTableDialog(this,
> +
> KrResultTableDialog::Archiver,
> +
> i18n("Search results"),
> +
> i18n("Searching for packers..."),
> +
> "utilities-file-archiver",
> +
> i18n("Make sure to install new packers in your <code>$PATH</code>
> (e.g. /usr/bin)"));
> + dlg->exec();
> disableNonExistingPackers();
> +
> + delete dlg;
> }
> void KgArchives::disableNonExistingPackers()
> --- trunk/kdereview/krusader/krusader/Konfigurator/kggeneral.cpp
> #983971:983972
> @@ -216,9 +216,14 @@
> void KgGeneral::slotFindTools()
> {
> - KrResultTableDialog* dia = new KrResultTableDialog(this,
> KrResultTableDialog::Tool, i18n("Search results"), i18n("Searching
> for tools..."),
> - "package_settings", i18n("Make sure to install new
> tools in your <code>$PATH</code> (e.g. /usr/bin)"));
> - dia->exec();
> + QPointer<KrResultTableDialog> dlg = new KrResultTableDialog(this,
> +
> KrResultTableDialog::Tool,
> +
> i18n("Search results"),
> +
> i18n("Searching for tools..."),
> +
> "tools-utilities",
> +
> i18n("Make sure to install new tools in your <code>$PATH</code>
> (e.g. /usr/bin)"));
> + dlg->exec();
> + delete dlg;
> }
> void KgGeneral::slotAddExtension()
> --- trunk/kdereview/krusader/krusader/Locate/locate.cpp #983971:983972
> @@ -504,17 +504,21 @@
> long options = group.readEntry("Find Options", (long long)0);
> QStringList list = group.readEntry("Find Patterns",
> QStringList());
> - KFindDialog dlg(this, options, list);
> - if (dlg.exec() != QDialog::Accepted)
> + QPointer<KFindDialog> dlg = new KFindDialog(this, options,
> list);
> + if (dlg->exec() != QDialog::Accepted) {
> + delete dlg;
> return;
> + }
> QString first = QString::null;
> - if (list.count() != 0)
> + if (list.count() != 0) {
> first = list.first();
> - if (first != (findPattern = dlg.pattern()))
> - list.push_front(dlg.pattern());
> + }
> + if (first != (findPattern = dlg->pattern())) {
> + list.push_front(dlg->pattern());
> + }
> - group.writeEntry("Find Options", (long long)(findOptions =
> dlg.options()));
> + group.writeEntry("Find Options", (long long)(findOptions =
> dlg->options()));
> group.writeEntry("Find Patterns", list);
> if (!(findOptions & KFind::FromCursor) && resultList-
> >topLevelItemCount())
> @@ -526,10 +530,13 @@
> if (find() && findCurrentItem) {
> resultList->selectionModel()->clearSelection(); // HACK:
> QT 4 is not able to paint the focus frame because of a bug
> resultList->setCurrentItem(findCurrentItem);
> - } else
> + } else {
> KMessageBox::information(this, i18n("Search string not
> found!"));
> + }
> resultList->scrollTo(resultList->currentIndex());
> +
> + delete dlg;
> }
> break;
> case FIND_NEXT_ID:
> --- trunk/kdereview/krusader/krusader/Panel/panelfunc.cpp
> #983971:983972
> @@ -1054,24 +1054,30 @@
> return ; // nothing to do
> }
> - KrCalcSpaceDialog calc(krApp, panel, items, false);
> - calc.exec();
> + QPointer<KrCalcSpaceDialog> calc = new KrCalcSpaceDialog(krApp,
> panel, items, false);
> + calc->exec();
> for (QStringList::const_iterator it = items.constBegin(); it !=
> items.constEnd(); ++it) {
> KrViewItem *viewItem = panel->view->findItemByName(*it);
> - if (viewItem)
> + if (viewItem) {
> panel->view->updateItem(viewItem);
> + }
> }
> panel->slotUpdateTotals();
> +
> + delete calc;
> }
> bool ListPanelFunc::calcSpace(const QStringList & items,
> KIO::filesize_t & totalSize, unsigned long & totalFiles, unsigned
> long & totalDirs)
> {
> - KrCalcSpaceDialog calc(krApp, panel, items, true);
> - calc.exec();
> - totalSize = calc.getTotalSize();
> - totalFiles = calc.getTotalFiles();
> - totalDirs = calc.getTotalDirs();
> - return !calc.wasCanceled();
> + QPointer<KrCalcSpaceDialog> calc = new KrCalcSpaceDialog(krApp,
> panel, items, true);
> + calc->exec();
> + totalSize = calc->getTotalSize();
> + totalFiles = calc->getTotalFiles();
> + totalDirs = calc->getTotalDirs();
> + bool calcWasCanceled = calc->wasCanceled();
> + delete calc;
> +
> + return !calcWasCanceled;
> }
> void ListPanelFunc::FTPDisconnect()
> --- trunk/kdereview/krusader/krusader/Queue/queuedialog.cpp
> #983971:983972
> @@ -368,12 +368,13 @@
> void QueueDialog::slotScheduleClicked()
> {
> - KrTimeDialog dialog(this);
> - if (dialog.exec() == QDialog::Accepted) {
> - QTime startTime = dialog.getStartTime();
> + QPointer<KrTimeDialog> dialog = new KrTimeDialog(this);
> + if (dialog->exec() == QDialog::Accepted) {
> + QTime startTime = dialog->getStartTime();
> Queue * queue = QueueManager::currentQueue();
> queue->schedule(startTime);
> }
> + delete dialog;
> }
> void QueueDialog::slotNewTab()
> --- trunk/kdereview/krusader/krusader/defaults.h #983971:983972
> @@ -331,4 +331,4 @@
> #define EXEC_SUFFIX ""
> #endif
> -#endif
> \ No newline at end of file
> +#endif
|
